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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.276 by root, Sun May 2 11:23:52 2010 UTC vs.
Revision 1.278 by root, Sun May 9 22:33:29 2010 UTC

… …
181player::set_object (object *op) 181player::set_object (object *op)
182{ 182{
183 ob = observe = viewpoint = op; 183 ob = observe = viewpoint = op;
184 ob->contr = this; /* this aren't yet in archetype */ 184 ob->contr = this; /* this aren't yet in archetype */
185 185
186 ob->speed = 1.0f; 186 ob->set_speed (1.0f);
187 ob->speed_left = 0.5f; 187 ob->speed_left = 0.5f;
188 188
189 ob->direction = 5; /* So player faces south */ 189 ob->direction = 5; /* So player faces south */
190} 190}
191 191
… …
1445#endif 1445#endif
1446 1446
1447 SET_ANIMATION (arrow, arrow->direction); 1447 SET_ANIMATION (arrow, arrow->direction);
1448 1448
1449 /* update the speed */ 1449 /* update the speed */
1450 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1451 + bow->stats.dam / 7.f;
1452 1450
1453 arrow->set_speed (max (arrow->speed, 2.f));
1454 arrow->speed_left = 0; 1451 arrow->speed_left = 0;
1452 arrow->set_speed (max (2.f,
1453 ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1454 + bow->stats.dam / 7.f
1455 ));
1455 1456
1456 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc; 1457 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1457 1458
1458 if (op->type == PLAYER) 1459 if (op->type == PLAYER)
1459 { 1460 {
… …
2143void 2144void
2144do_some_living (object *op) 2145do_some_living (object *op)
2145{ 2146{
2146 int last_food = op->stats.food; 2147 int last_food = op->stats.food;
2147 int gen_hp, gen_sp, gen_grace; 2148 int gen_hp, gen_sp, gen_grace;
2148 int over_hp, over_sp, over_grace;
2149 int i; 2149 int i;
2150 int rate_hp = 1200; 2150 int rate_hp = 1200;
2151 int rate_sp = 2500; 2151 int rate_sp = 2500;
2152 int rate_grace = 2000; 2152 int rate_grace = 2000;
2153 const int max_hp = 1; 2153 const int max_hp = 1;
… …
2206 if (--op->last_grace < 0) 2206 if (--op->last_grace < 0)
2207 { 2207 {
2208 if (op->stats.grace < op->stats.maxgrace / 2) 2208 if (op->stats.grace < op->stats.maxgrace / 2)
2209 op->stats.grace++; /* no penalty in food for regaining grace */ 2209 op->stats.grace++; /* no penalty in food for regaining grace */
2210 2210
2211 int temp = gen_grace < 20 ? 30 : gen_grace + 10;
2212
2211 if (max_grace > 1) 2213 if (max_grace > 1)
2212 { 2214 {
2213 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace; 2215 int over_grace = temp / rate_grace;
2216
2214 if (over_grace > 0) 2217 if (over_grace > 0)
2215 { 2218 {
2216 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;
2217 + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0;
2218 op->last_grace = 0; 2220 op->last_grace = 0;
2219 } 2221 }
2220 else 2222 else
2221 { 2223 op->last_grace = rate_grace / temp;
2222 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2223 }
2224 } 2224 }
2225 else 2225 else
2226 { 2226 op->last_grace = rate_grace / temp;
2227 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2227
2228 }
2229 /* wearing stuff doesn't detract from grace generation. */ 2228 /* wearing stuff doesn't detract from grace generation. */
2230 } 2229 }
2231 2230
2232 if (op->stats.food > 0) 2231 if (op->stats.food > 0)
2233 { 2232 {
… …
2252 } 2251 }
2253 } 2252 }
2254 2253
2255 if (max_sp > 1) 2254 if (max_sp > 1)
2256 { 2255 {
2257 over_sp = (gen_sp + 10) / rate_sp; 2256 int over_sp = (gen_sp + 10) / rate_sp;
2258 if (over_sp > 0) 2257 if (over_sp > 0)
2259 { 2258 {
2260 if (op->stats.sp < op->stats.maxsp) 2259 if (op->stats.sp < op->stats.maxsp)
2261 { 2260 {
2262 op->stats.sp += over_sp > max_sp ? max_sp : over_sp; 2261 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
… …
2294 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))
2295 op->stats.food = last_food; 2294 op->stats.food = last_food;
2296 } 2295 }
2297 } 2296 }
2298 2297
2298 int temp = gen_hp < 20 ? 30 : gen_hp + 10;
2299
2299 if (max_hp > 1) 2300 if (max_hp > 1)
2300 { 2301 {
2301 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp; 2302 int over_hp = temp / rate_hp;
2302 2303
2303 if (over_hp > 0) 2304 if (over_hp > 0)
2304 { 2305 {
2305 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;
2306 op->last_heal = 0; 2307 op->last_heal = 0;
2307 } 2308 }
2308 else 2309 else
2309 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2310 op->last_heal = rate_hp / temp;
2310 } 2311 }
2311 else 2312 else
2312 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2313 op->last_heal = rate_hp / temp;
2313 } 2314 }
2314 } 2315 }
2315 2316
2316 /* Digestion */ 2317 /* Digestion */
2317 if (--op->last_eat < 0) 2318 if (--op->last_eat < 0)
… …
2659 object *force; 2660 object *force;
2660 int at; 2661 int at;
2661 2662
2662 force = get_archetype (FORCE_NAME); 2663 force = get_archetype (FORCE_NAME);
2663 /* 50 ticks should be enough time for the spell to abate */ 2664 /* 50 ticks should be enough time for the spell to abate */
2664 force->speed = 0.1f;
2665 force->speed_left = -5.f; 2665 force->speed_left = -5.f;
2666 force->set_speed (0.1f);
2666 force->set_flag (FLAG_APPLIED); 2667 force->set_flag (FLAG_APPLIED);
2668
2667 for (at = 0; at < NROFATTACKS; at++) 2669 for (at = 0; at < NROFATTACKS; at++)
2668 if (will_kill_again & (1 << at)) 2670 if (will_kill_again & (1 << at))
2669 force->resist[at] = 100; 2671 force->resist[at] = 100;
2670 2672
2671 insert_ob_in_ob (force, op); 2673 insert_ob_in_ob (force, op);

Diff Legend

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