Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

prefer dice to dice_rand

This commit is contained in:
Enno Rehling 2017-03-06 06:28:12 +01:00
parent 4d07782e7d
commit f4eda9f59e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/items.c
View File

@ -178,8 +178,8 @@ struct order *ord)
return 0; return 0;
} }
#define BAGPIPEFRACTION dice_rand("2d4+2") #define BAGPIPEFRACTION (dice(2,4)+2)
#define BAGPIPEDURATION dice_rand("2d10+4") #define BAGPIPEDURATION (dice(2,10)+4)
static int static int
use_bagpipeoffear(struct unit *u, const struct item_type *itype, use_bagpipeoffear(struct unit *u, const struct item_type *itype,

2
src/kernel/region.c
View File

@ -1217,7 +1217,7 @@ void terraform_region(region * r, const terrain_type * terrain)
if (!fval(r, RF_CHAOTIC)) { if (!fval(r, RF_CHAOTIC)) {
int peasants; int peasants;
peasants = (region_maxworkers(r) * (20 + dice_rand("6d10"))) / 100; peasants = (region_maxworkers(r) * (20 + dice(6, 10))) / 100;
rsetpeasants(r, MAX(100, peasants)); rsetpeasants(r, MAX(100, peasants));
rsetmoney(r, rpeasants(r) * ((wage(r, NULL, NULL, rsetmoney(r, rpeasants(r) * ((wage(r, NULL, NULL,
INT_MAX) + 1) + rng_int() % 5)); INT_MAX) + 1) + rng_int() % 5));