| … | |
… | |
| 2144 | void |
2144 | void |
| 2145 | do_some_living (object *op) |
2145 | do_some_living (object *op) |
| 2146 | { |
2146 | { |
| 2147 | int last_food = op->stats.food; |
2147 | int last_food = op->stats.food; |
| 2148 | int gen_hp, gen_sp, gen_grace; |
2148 | int gen_hp, gen_sp, gen_grace; |
| 2149 | int over_hp, over_sp, over_grace; |
|
|
| 2150 | int i; |
2149 | int i; |
| 2151 | int rate_hp = 1200; |
2150 | int rate_hp = 1200; |
| 2152 | int rate_sp = 2500; |
2151 | int rate_sp = 2500; |
| 2153 | int rate_grace = 2000; |
2152 | int rate_grace = 2000; |
| 2154 | const int max_hp = 1; |
2153 | const int max_hp = 1; |
| … | |
… | |
| 2207 | if (--op->last_grace < 0) |
2206 | if (--op->last_grace < 0) |
| 2208 | { |
2207 | { |
| 2209 | if (op->stats.grace < op->stats.maxgrace / 2) |
2208 | if (op->stats.grace < op->stats.maxgrace / 2) |
| 2210 | op->stats.grace++; /* no penalty in food for regaining grace */ |
2209 | op->stats.grace++; /* no penalty in food for regaining grace */ |
| 2211 | |
2210 | |
|
|
2211 | int temp = gen_grace < 20 ? 30 : gen_grace + 10; |
|
|
2212 | |
| 2212 | if (max_grace > 1) |
2213 | if (max_grace > 1) |
| 2213 | { |
2214 | { |
| 2214 | over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace; |
2215 | int over_grace = temp / rate_grace; |
|
|
2216 | |
| 2215 | if (over_grace > 0) |
2217 | if (over_grace > 0) |
| 2216 | { |
2218 | { |
| 2217 | op->stats.sp += over_grace |
2219 | op->stats.sp += over_grace + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > (temp % rate_grace)) ? -1 : 0; |
| 2218 | + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0; |
|
|
| 2219 | op->last_grace = 0; |
2220 | op->last_grace = 0; |
| 2220 | } |
2221 | } |
| 2221 | else |
2222 | else |
| 2222 | { |
2223 | op->last_grace = rate_grace / temp; |
| 2223 | op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); |
|
|
| 2224 | } |
|
|
| 2225 | } |
2224 | } |
| 2226 | else |
2225 | else |
| 2227 | { |
2226 | op->last_grace = rate_grace / temp; |
| 2228 | op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); |
2227 | |
| 2229 | } |
|
|
| 2230 | /* wearing stuff doesn't detract from grace generation. */ |
2228 | /* wearing stuff doesn't detract from grace generation. */ |
| 2231 | } |
2229 | } |
| 2232 | |
2230 | |
| 2233 | if (op->stats.food > 0) |
2231 | if (op->stats.food > 0) |
| 2234 | { |
2232 | { |
| … | |
… | |
| 2253 | } |
2251 | } |
| 2254 | } |
2252 | } |
| 2255 | |
2253 | |
| 2256 | if (max_sp > 1) |
2254 | if (max_sp > 1) |
| 2257 | { |
2255 | { |
| 2258 | over_sp = (gen_sp + 10) / rate_sp; |
2256 | int over_sp = (gen_sp + 10) / rate_sp; |
| 2259 | if (over_sp > 0) |
2257 | if (over_sp > 0) |
| 2260 | { |
2258 | { |
| 2261 | if (op->stats.sp < op->stats.maxsp) |
2259 | if (op->stats.sp < op->stats.maxsp) |
| 2262 | { |
2260 | { |
| 2263 | op->stats.sp += over_sp > max_sp ? max_sp : over_sp; |
2261 | op->stats.sp += over_sp > max_sp ? max_sp : over_sp; |
| … | |
… | |
| 2295 | else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) |
2293 | else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) |
| 2296 | op->stats.food = last_food; |
2294 | op->stats.food = last_food; |
| 2297 | } |
2295 | } |
| 2298 | } |
2296 | } |
| 2299 | |
2297 | |
|
|
2298 | int temp = gen_hp < 20 ? 30 : gen_hp + 10; |
|
|
2299 | |
| 2300 | if (max_hp > 1) |
2300 | if (max_hp > 1) |
| 2301 | { |
2301 | { |
| 2302 | over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp; |
2302 | int over_hp = temp / rate_hp; |
| 2303 | |
2303 | |
| 2304 | if (over_hp > 0) |
2304 | if (over_hp > 0) |
| 2305 | { |
2305 | { |
| 2306 | op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; |
2306 | op->stats.sp += over_hp + (random_roll (0, rate_hp - 1, op, PREFER_HIGH) > (temp % rate_hp)) ? -1 : 0; |
| 2307 | op->last_heal = 0; |
2307 | op->last_heal = 0; |
| 2308 | } |
2308 | } |
| 2309 | else |
2309 | else |
| 2310 | op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); |
2310 | op->last_heal = rate_hp / temp; |
| 2311 | } |
2311 | } |
| 2312 | else |
2312 | else |
| 2313 | op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); |
2313 | op->last_heal = rate_hp / temp; |
| 2314 | } |
2314 | } |
| 2315 | } |
2315 | } |
| 2316 | |
2316 | |
| 2317 | /* Digestion */ |
2317 | /* Digestion */ |
| 2318 | if (--op->last_eat < 0) |
2318 | if (--op->last_eat < 0) |
