ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/utils.C
(Generate patch)

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.54 by root, Fri Apr 27 20:06:37 2007 UTC vs.
Revision 1.55 by root, Sat Apr 28 21:34:37 2007 UTC

… …
95int 95int
96random_roll (int r_min, int r_max, const object *op, int goodbad) 96random_roll (int r_min, int r_max, const object *op, int goodbad)
97{ 97{
98 int base = r_max - r_min > 1 ? 20 : 50; /* d2 and d3 are corner cases */ 98 int base = r_max - r_min > 1 ? 20 : 50; /* d2 and d3 are corner cases */
99 99
100 if (r_max < 1 || r_max < r_min) 100 if (r_max < r_min)
101 { 101 {
102 LOG (llevError | logBacktrace, "Calling random_roll with min=%d max=%d\n", r_min, r_max); 102 LOG (llevError | logBacktrace, "Calling random_roll with min=%d max=%d\n", r_min, r_max);
103 return r_min; 103 return r_min;
104 } 104 }
105 105
… …
121 * for exp loss calculations for players changing religions. 121 * for exp loss calculations for players changing religions.
122 */ 122 */
123sint64 123sint64
124random_roll64 (sint64 min, sint64 max, const object *op, int goodbad) 124random_roll64 (sint64 min, sint64 max, const object *op, int goodbad)
125{ 125{
126 sint64 omin, diff, luck, ran;
127 int base;
128
129 omin = min; 126 sint64 omin = min;
130 diff = max - min + 1; 127 sint64 diff = max - min + 1;
131 ((diff > 2) ? (base = 20) : (base = 50)); /* d2 and d3 are corner cases */ 128 int base = diff > 2 ? 20 : 50; /* d2 and d3 are corner cases */
132 129
133 if (max < 1 || diff < 1) 130 if (diff < 0)
134 { 131 {
135 LOG (llevError | logBacktrace, "Calling random_roll64 with min=%" PRId64 " max=%" PRId64 "\n", min, max); 132 LOG (llevError | logBacktrace, "Calling random_roll64 with min=%" PRId64 " max=%" PRId64 "\n", min, max);
136 return (min); /* avoids a float exception */ 133 return (min); /* avoids a float exception */
137 } 134 }
138 135
139 /* 136 /*
140 * Make a call to get two 32 bit unsigned random numbers, and just to 137 * Make a call to get two 32 bit unsigned random numbers, and just to
141 * a little bitshifting. 138 * a little bitshifting.
142 */ 139 */
143 ran = (sint64) rndm.next () ^ ((sint64) rndm.next () << 31); 140 sint64 ran = (sint64) rndm.next () ^ ((sint64) rndm.next () << 31);
144 141
145 if (op->type != PLAYER) 142 if (op->type != PLAYER)
146 return ((ran % diff) + min); 143 return ((ran % diff) + min);
147 144
148 luck = op->stats.luck; 145 int luck = op->stats.luck;
146
149 if (rndm (base) < MIN (10, abs (luck))) 147 if (rndm (base) < MIN (10, abs (luck)))
150 { 148 {
151 /* we have a winner */ 149 /* we have a winner */
152 ((luck > 0) ? (luck = 1) : (luck = -1)); 150 ((luck > 0) ? (luck = 1) : (luck = -1));
153 diff -= luck; 151 diff -= luck;
154 if (diff < 1) 152 if (diff < 1)
155 return (omin); /*check again */ 153 return (omin); /*check again */
154
156 ((goodbad) ? (min += luck) : (diff)); 155 ((goodbad) ? (min += luck) : (diff));
157 156
158 return (MAX (omin, MIN (max, (ran % diff) + min))); 157 return (MAX (omin, MIN (max, (ran % diff) + min)));
159 } 158 }
160 159
161 return ((ran % diff) + min); 160 return ran % diff + min;
162} 161}
163 162
164/* 163/*
165 * Roll a number of dice (2d3, 4d6). Uses op to determine luck, 164 * Roll a number of dice (2d3, 4d6). Uses op to determine luck,
166 * If goodbad is non-zero, luck increases the roll, if zero, it decreases. 165 * If goodbad is non-zero, luck increases the roll, if zero, it decreases.
167 * Generally, op should be the player/caster/hitter requesting the roll, 166 * Generally, op should be the player/caster/hitter requesting the roll,
168 * not the recipient (ie, the poor slob getting hit). 167 * not the recipient (ie, the poor slob getting hit).
169 * The args are num D size (ie 4d6) [garbled 20010916] 168 * The args are num D size (ie 4d6) [garbled 20010916]
170 */ 169 */
171
172int 170int
173die_roll (int num, int size, const object *op, int goodbad) 171die_roll (int num, int size, const object *op, int goodbad)
174{ 172{
175 int min, diff, luck, total, i, gotlucky, base; 173 int min, luck, total, i, gotlucky;
176 174
177 diff = size; 175 int diff = size;
178 min = 1; 176 min = 1;
179 luck = total = gotlucky = 0; 177 luck = total = gotlucky = 0;
180 ((diff > 2) ? (base = 20) : (base = 50)); /* d2 and d3 are corner cases */ 178 int base = diff > 2 ? 20 : 50; /* d2 and d3 are corner cases */
179
181 if (size < 2 || diff < 1) 180 if (size < 2 || diff < 1)
182 { 181 {
183 LOG (llevError, "Calling die_roll with num=%d size=%d\n", num, size); 182 LOG (llevError, "Calling die_roll with num=%d size=%d\n", num, size);
184 return (num); /* avoids a float exception */ 183 return num; /* avoids a float exception */
185 } 184 }
186 185
187 if (op->type == PLAYER) 186 if (op->type == PLAYER)
188 luck = op->stats.luck; 187 luck = op->stats.luck;
189 188

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines