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.273 by root, Sun Apr 18 05:54:18 2010 UTC vs.
Revision 1.278 by root, Sun May 9 22:33:29 2010 UTC

… …
126 126
127 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 127 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
128 128
129 esrv_new_player (this); 129 esrv_new_player (this);
130 130
131 ob->update_stats ();
132
133 ns->floorbox_update ();
134 esrv_send_inventory (ob, ob);
135 esrv_add_spells (this, 0);
136
137 ob->flag [FLAG_READY_WEAPON] = false; 131 ob->flag [FLAG_READY_WEAPON] = false;
138 ob->flag [FLAG_READY_SKILL] = false; 132 ob->flag [FLAG_READY_SKILL] = false;
139 ob->flag [FLAG_READY_RANGE] = false; 133 ob->flag [FLAG_READY_RANGE] = false;
140 ob->flag [FLAG_READY_BOW] = false; 134 ob->flag [FLAG_READY_BOW] = false;
141 135
142 ob->update_stats (); // we unapplied stuff above 136 ob->update_stats ();
137
138 ns->floorbox_update ();
139 esrv_send_inventory (ob, ob);
140 esrv_add_spells (this, 0);
141
143 activate (); 142 activate ();
144 143
145 INVOKE_PLAYER (CONNECT, this); 144 INVOKE_PLAYER (CONNECT, this);
146 INVOKE_PLAYER (LOGIN, this); 145 INVOKE_PLAYER (LOGIN, this);
147} 146}
… …
182player::set_object (object *op) 181player::set_object (object *op)
183{ 182{
184 ob = observe = viewpoint = op; 183 ob = observe = viewpoint = op;
185 ob->contr = this; /* this aren't yet in archetype */ 184 ob->contr = this; /* this aren't yet in archetype */
186 185
187 ob->speed = 1.0f; 186 ob->set_speed (1.0f);
188 ob->speed_left = 0.5f; 187 ob->speed_left = 0.5f;
189 188
190 ob->direction = 5; /* So player faces south */ 189 ob->direction = 5; /* So player faces south */
191} 190}
192 191
… …
393 return 0; 392 return 0;
394 393
395 while (diff > 1 && max > 0) 394 while (diff > 1 && max > 0)
396 { 395 {
397 mapxy lastpos = pos; 396 mapxy lastpos = pos;
397
398 pos.move (dir); 398 pos.move (dir);
399 399
400 MoveType blocked;
401 bool blocksview;
402
403 if (pos.normalise ())
404 {
405 mapspace &ms = *pos;
406
407 blocksview = ms.flags () & P_BLOCKSVIEW;
408 blocked = ms.move_block;
409 }
410 else
411 {
412 blocksview = true;
413 blocked = MOVE_ALL;
414 }
415
416 /* Space is blocked - try changing direction a little */ 400 /* Space is blocked - try changing direction a little */
417 if ((blocksview || OB_TYPE_MOVE_BLOCK (mon, blocked)) 401 if (!pos.normalise ()
402 || (((pos->flags () & P_BLOCKSVIEW) || OB_TYPE_MOVE_BLOCK (mon, pos->move_block))
418 && (blocked_link (mon, pos.m, pos.x, pos.y))) 403 && blocked_link (mon, pos.m, pos.x, pos.y)))
419 { 404 {
420 /* recalculate direction from last good location. Possible 405 /* recalculate direction from last good location. Possible
421 * we were not traversing ideal location before. 406 * we were not traversing ideal location before.
422 */ 407 */
423 get_rangevector_from_mapcoord (lastpos.m, lastpos.x, lastpos.y, pl, &rv, 0); 408 get_rangevector_from_mapcoord (lastpos.m, lastpos.x, lastpos.y, pl, &rv, 0);
… …
623roll_stat () 608roll_stat ()
624{ 609{
625 int a[4], i, j, k; 610 int a[4], i, j, k;
626 611
627 for (i = 0; i < 4; i++) 612 for (i = 0; i < 4; i++)
628 a[i] = (int) rndm (6) + 1; 613 a[i] = rndm (1, 6);
629 614
630 for (i = 0, j = 0, k = 7; i < 4; i++) 615 for (i = 0, j = 0, k = 7; i < 4; i++)
631 if (a[i] < k) 616 if (a[i] < k)
632 k = a[i], j = i; 617 k = a[i], j = i;
633 618
… …
730 treasurelist *tl = treasurelist::find (shstr_starting_wealth); 715 treasurelist *tl = treasurelist::find (shstr_starting_wealth);
731 if (tl) 716 if (tl)
732 create_treasure (tl, ob, 0, 0, 0); 717 create_treasure (tl, ob, 0, 0, 0);
733 718
734 INVOKE_PLAYER (BIRTH, ob->contr); 719 INVOKE_PLAYER (BIRTH, ob->contr);
735 INVOKE_PLAYER (LOGIN, ob->contr);
736 720
737 ob->contr->ns->state = ST_PLAYING; 721 ob->contr->ns->state = ST_PLAYING;
738 722
739 if (ob->msg) 723 if (ob->msg)
740 ob->msg = 0; 724 ob->msg = 0;
… …
1461#endif 1445#endif
1462 1446
1463 SET_ANIMATION (arrow, arrow->direction); 1447 SET_ANIMATION (arrow, arrow->direction);
1464 1448
1465 /* update the speed */ 1449 /* update the speed */
1466 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1467 + bow->stats.dam / 7.f;
1468 1450
1469 arrow->set_speed (max (arrow->speed, 2.f));
1470 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 ));
1471 1456
1472 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;
1473 1458
1474 if (op->type == PLAYER) 1459 if (op->type == PLAYER)
1475 { 1460 {
… …
2159void 2144void
2160do_some_living (object *op) 2145do_some_living (object *op)
2161{ 2146{
2162 int last_food = op->stats.food; 2147 int last_food = op->stats.food;
2163 int gen_hp, gen_sp, gen_grace; 2148 int gen_hp, gen_sp, gen_grace;
2164 int over_hp, over_sp, over_grace;
2165 int i; 2149 int i;
2166 int rate_hp = 1200; 2150 int rate_hp = 1200;
2167 int rate_sp = 2500; 2151 int rate_sp = 2500;
2168 int rate_grace = 2000; 2152 int rate_grace = 2000;
2169 const int max_hp = 1; 2153 const int max_hp = 1;
… …
2222 if (--op->last_grace < 0) 2206 if (--op->last_grace < 0)
2223 { 2207 {
2224 if (op->stats.grace < op->stats.maxgrace / 2) 2208 if (op->stats.grace < op->stats.maxgrace / 2)
2225 op->stats.grace++; /* no penalty in food for regaining grace */ 2209 op->stats.grace++; /* no penalty in food for regaining grace */
2226 2210
2211 int temp = gen_grace < 20 ? 30 : gen_grace + 10;
2212
2227 if (max_grace > 1) 2213 if (max_grace > 1)
2228 { 2214 {
2229 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace; 2215 int over_grace = temp / rate_grace;
2216
2230 if (over_grace > 0) 2217 if (over_grace > 0)
2231 { 2218 {
2232 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;
2233 + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0;
2234 op->last_grace = 0; 2220 op->last_grace = 0;
2235 } 2221 }
2236 else 2222 else
2237 { 2223 op->last_grace = rate_grace / temp;
2238 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2239 }
2240 } 2224 }
2241 else 2225 else
2242 { 2226 op->last_grace = rate_grace / temp;
2243 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2227
2244 }
2245 /* wearing stuff doesn't detract from grace generation. */ 2228 /* wearing stuff doesn't detract from grace generation. */
2246 } 2229 }
2247 2230
2248 if (op->stats.food > 0) 2231 if (op->stats.food > 0)
2249 { 2232 {
… …
2268 } 2251 }
2269 } 2252 }
2270 2253
2271 if (max_sp > 1) 2254 if (max_sp > 1)
2272 { 2255 {
2273 over_sp = (gen_sp + 10) / rate_sp; 2256 int over_sp = (gen_sp + 10) / rate_sp;
2274 if (over_sp > 0) 2257 if (over_sp > 0)
2275 { 2258 {
2276 if (op->stats.sp < op->stats.maxsp) 2259 if (op->stats.sp < op->stats.maxsp)
2277 { 2260 {
2278 op->stats.sp += over_sp > max_sp ? max_sp : over_sp; 2261 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
… …
2310 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))
2311 op->stats.food = last_food; 2294 op->stats.food = last_food;
2312 } 2295 }
2313 } 2296 }
2314 2297
2298 int temp = gen_hp < 20 ? 30 : gen_hp + 10;
2299
2315 if (max_hp > 1) 2300 if (max_hp > 1)
2316 { 2301 {
2317 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp; 2302 int over_hp = temp / rate_hp;
2318 2303
2319 if (over_hp > 0) 2304 if (over_hp > 0)
2320 { 2305 {
2321 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;
2322 op->last_heal = 0; 2307 op->last_heal = 0;
2323 } 2308 }
2324 else 2309 else
2325 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2310 op->last_heal = rate_hp / temp;
2326 } 2311 }
2327 else 2312 else
2328 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2313 op->last_heal = rate_hp / temp;
2329 } 2314 }
2330 } 2315 }
2331 2316
2332 /* Digestion */ 2317 /* Digestion */
2333 if (--op->last_eat < 0) 2318 if (--op->last_eat < 0)
… …
2675 object *force; 2660 object *force;
2676 int at; 2661 int at;
2677 2662
2678 force = get_archetype (FORCE_NAME); 2663 force = get_archetype (FORCE_NAME);
2679 /* 50 ticks should be enough time for the spell to abate */ 2664 /* 50 ticks should be enough time for the spell to abate */
2680 force->speed = 0.1f;
2681 force->speed_left = -5.f; 2665 force->speed_left = -5.f;
2666 force->set_speed (0.1f);
2682 force->set_flag (FLAG_APPLIED); 2667 force->set_flag (FLAG_APPLIED);
2668
2683 for (at = 0; at < NROFATTACKS; at++) 2669 for (at = 0; at < NROFATTACKS; at++)
2684 if (will_kill_again & (1 << at)) 2670 if (will_kill_again & (1 << at))
2685 force->resist[at] = 100; 2671 force->resist[at] = 100;
2686 2672
2687 insert_ob_in_ob (force, op); 2673 insert_ob_in_ob (force, op);

Diff Legend

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