Replace "roll0(N) + M" by "roll(N) + M-1"

diff --git a/include/damage.h b/include/damage.h
index 09861f1a458fa271646276bd2cbad194b7416ce0..0e63cf49c5221cb50a4101e4bc4612e507478678 100644 (file)
--- a/include/damage.h
+++ b/include/damage.h
@@ -39,8 +39,8 @@
 #define DPERCENT_DAMAGE(x) (100.0 * (x) / ((x) + 100.0))
 #define DMINE_HITCHANCE(x) ((x) / ((x) + 20.0))
 #define DMINE_LHITCHANCE(x) ((x) / ((x) + 35.0))
-#define MINE_DAMAGE() (22 + roll0(21))
-#define MINE_LDAMAGE() (11 + roll0(20))
+#define MINE_DAMAGE() (21 + roll(21))
+#define MINE_LDAMAGE() (10 + roll(20))
 #define DTORP_HITCHANCE(range, vis) \
     (0.9 / ((range)+1) + (((vis) < 6) ? (5-(vis)) * 0.03 : 0.0))
 #define TORP_DAMAGE() (torpedo_damage + roll0(torpedo_damage) + \

diff --git a/src/lib/subs/attsub.c b/src/lib/subs/attsub.c
index 2d5a169cb736b3e1b886a44b456fc485543e31b8..ef22fac45b158ebbf784344c0827b4094e0349fe 100644 (file)
--- a/src/lib/subs/attsub.c
+++ b/src/lib/subs/attsub.c
@@ -1837,12 +1837,12 @@ att_fight(int combat_mode, struct combat *off, struct emp_qelem *olist,
      * since a single dead guy normally wouldn't cause a commander to
      * rethink his strategies, but 50 dead guys might.
      */
-    odds += (roll0(11) - 5) / 100.0;
+    odds += (roll(11) - 6) / 100.0;
     if (odds < 0.0)
        odds = 0.1;
     if (odds > 1.0)
        odds = 1.0;
-    recalctime = 8 + roll0(43);
+    recalctime = 7 + roll(43);
     while (!success && ototal) {
        if (chance(odds)) {
            pr("!");
@@ -1858,9 +1858,9 @@ att_fight(int combat_mode, struct combat *off, struct emp_qelem *olist,
        if (((a_cas + d_cas) % 70) == 69)
            pr("\n");
        if (recalctime-- <= 0) {
-           recalctime = 8 + roll0(43);
+           recalctime = 7 + roll(43);
            odds = att_calcodds(ototal, dtotal);
-           odds += (roll0(11) - 5) / 100.0;
+           odds += (roll(11) - 6) / 100.0;
            if (odds < 0.0)
                odds = 0.1;
            if (odds > 1.0)

diff --git a/src/lib/subs/landgun.c b/src/lib/subs/landgun.c
index e7bafa4ee82c79dd0e435e822f05eb8fd9cb4a0a..ec833ff310f4e8c539c583945fdb85f96f8b5002 100644 (file)
--- a/src/lib/subs/landgun.c
+++ b/src/lib/subs/landgun.c
@@ -48,7 +48,7 @@ fortgun(int effic, int guns)
     double d;
     double g = MIN(guns, 7);
 
-    d = (roll0(30) + 20.0) * (g / 7.0);
+    d = (roll(30) + 19.0) * (g / 7.0);
     d *= effic / 100.0;
     return d;
 }
@@ -60,7 +60,7 @@ seagun(int effic, int guns)
 
     d = 0.0;
     while (guns--)
-       d += 10.0 + roll0(6);
+       d += 9.0 + roll(6);
     d *= effic * 0.01;
     return d;
 }
@@ -72,7 +72,7 @@ landunitgun(int effic, int guns)
 
     d = 0.0;
     while (guns--)
-       d += 5.0 + roll0(6);
+       d += 4.0 + roll(6);
     d *= effic * 0.01;
     return d;
 }

diff --git a/src/lib/subs/takeover.c b/src/lib/subs/takeover.c
index 12dae13bc78615d82fb73e8ac9544cd30ea43af9..996b01314e1eb850886d5125155ec6c7939f870a 100644 (file)
--- a/src/lib/subs/takeover.c
+++ b/src/lib/subs/takeover.c
@@ -100,7 +100,7 @@ takeover(struct sctstr *sp, natid newown)
            if (!(chance(LND_SPY_DETECT_CHANCE(lp->lnd_effic))))
                continue;
        }
-       n = lp->lnd_effic - (30 + roll0(100));
+       n = lp->lnd_effic - (29 + roll(100));
        if (n < 0)
            n = 0;
        lp->lnd_effic = n;
@@ -129,7 +129,7 @@ takeover(struct sctstr *sp, natid newown)
      * how spunky are these guys?
      * n: random number from -25:75 + (50 - loyalty)
      */
-    n = (50 - sp->sct_loyal) + (roll0(100) - 25);
+    n = (50 - sp->sct_loyal) + (roll(100) - 26);
     if (n > 0 && sp->sct_own == sp->sct_oldown) {
        che_count = (civ * n / 3000) + 5;
        if (che_count * 2 > civ)
@@ -186,7 +186,7 @@ takeover_plane(struct plnstr *pp, natid newown)
      * XXX If this was done right, planes could escape,
      * flying to a nearby friendly airport.
      */
-    n = pp->pln_effic - (30 + roll0(100));
+    n = pp->pln_effic - (29 + roll(100));
     if (n < 0)
        n = 0;
     pp->pln_effic = n;

diff --git a/src/lib/update/human.c b/src/lib/update/human.c
index 10b8d4600befc700365e56abe23fff327b3d296b..e37125755dcac88017dd11685e7c8be190176c37 100644 (file)
--- a/src/lib/update/human.c
+++ b/src/lib/update/human.c
@@ -95,12 +95,12 @@ do_feed(struct sctstr *sp, struct natstr *np, short *vec,
                        nreport(sp->sct_own, N_DIE_FAMINE, 0, 1);
                }
                sp->sct_work = 0;
-               sp->sct_loyal += roll0(8) + 2;
+               sp->sct_loyal += roll(8) + 1;
            }
            sctwork = 0;
        } else {
            if (sp->sct_work < 100)
-               sctwork = sp->sct_work + 8 + roll0(15);
+               sctwork = sp->sct_work + 7 + roll(15);
            if (sctwork > 100)
                sctwork = 100;
            if (!player->simulation)

diff --git a/src/lib/update/populace.c b/src/lib/update/populace.c
index 4347a448d67dfb3a24813acc6fe841223cd6518b..dc727d43ac38657c379adb3a491a2cd302c51686 100644 (file)
--- a/src/lib/update/populace.c
+++ b/src/lib/update/populace.c
@@ -73,7 +73,7 @@ populace(struct natstr *np, struct sctstr *sp, int etu)
        n = roundavg(etu * 0.125);
        if (n == 0)
            n = 1;
-       n = sp->sct_loyal + roll0(n) + 1;
+       n = sp->sct_loyal + roll(n);
        if (n > 127)
            n = 127;
        sp->sct_loyal = n;
@@ -81,7 +81,7 @@ populace(struct natstr *np, struct sctstr *sp, int etu)
     if (sp->sct_loyal > 65 && mil < civ / 20) {
        int work_red;
 
-       work_red = sp->sct_loyal - (50 + roll0(15));
+       work_red = sp->sct_loyal - (49 + roll(15));
        n = sp->sct_work - work_red;
        if (n < 0)
            n = 0;

diff --git a/src/lib/update/revolt.c b/src/lib/update/revolt.c
index dbf2766e690df84cb6ca2339a3efcddb788b7e12..98c2f7934b4fdf3f57a19d9e275e9c5988fc3f10 100644 (file)
--- a/src/lib/update/revolt.c
+++ b/src/lib/update/revolt.c
@@ -77,7 +77,7 @@ revolt(struct sctstr *sp)
     che += che_civ;
     if (che < CHE_MAX) {
        /* che due to uw unrest */
-       n = 10 + roll0(30);
+       n = 9 + roll(30);
        che_uw = 5 + (uw * n / 500);
        if (che_uw > uw)
            che_uw = uw;
@@ -327,9 +327,9 @@ guerrilla(struct sctstr *sp)
        /* loyalty drops during recruitment efforts */
        n = sp->sct_loyal;
        if (n < 30)
-           n += roll0(5) + 1;
+           n += roll(5);
        else if (n < 70)
-           n += roll0(10) + 4;
+           n += roll(10) + 3;
        if (n > 127)
            n = 127;
        sp->sct_loyal = n;
@@ -375,7 +375,7 @@ domove:
            val = roundintby(val, 10);
            /* inject a modicum of indeterminism; also
             * avoids che preferring certain directions */
-           val += roll0(10) - 5;
+           val += roll(10) - 6;
            if (val >= min_mil)
                continue;
            nicest_sp = nsp;

diff --git a/src/util/fairland.c b/src/util/fairland.c
index 4cdd6d94125f93b0e5f9ba0f349a9e191f606ab1..078a23f035561b011a4128b02d1fe18ebf0ac17b 100644 (file)
--- a/src/util/fairland.c
+++ b/src/util/fairland.c
@@ -810,7 +810,7 @@ grow_islands(void)
        secs = 0;
        if (!place_island(c, &x, &y))
            return;
-       isiz = 1 + roll0(2 * is - 1);
+       isiz = roll(2 * is - 1);
        do {
            ++secs;
            find_coast(c);
@@ -973,7 +973,7 @@ elevate_sea(void)
     for (y = 0; y < WORLD_Y; ++y) {
        for (x = y % 2; x < WORLD_X; x += 2) {
            if (elev[x][y] == -INFINITY)
-               elev[x][y] = -roll0((distance_to_land() * 20 + 27)) - 1;
+               elev[x][y] = -roll(distance_to_land() * 20 + 27);
        }
     }
 }