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.272 by root, Thu Apr 15 02:51:39 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
… …
374 */ 373 */
375int 374int
376path_to_player (object *mon, object *pl, unsigned mindiff) 375path_to_player (object *mon, object *pl, unsigned mindiff)
377{ 376{
378 rv_vector rv; 377 rv_vector rv;
379 sint16 x, y;
380 int lastx, lasty, dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked; 378 int dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked;
381 maptile *m, *lastmap;
382 379
383 get_rangevector (mon, pl, &rv, 0); 380 get_rangevector (mon, pl, &rv, 0);
384 381
385 if (rv.distance < mindiff) 382 if (rv.distance < mindiff)
386 return 0; 383 return 0;
387 384
388 x = mon->x; 385 mapxy pos (mon);
389 y = mon->y;
390 m = mon->map;
391 dir = rv.direction; 386 dir = rv.direction;
392 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 387 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
393 diff = ::max (abs (rv.distance_x), abs (rv.distance_y)); 388 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
394 389
395 /* If we can't solve it within the search distance, return now. */ 390 /* If we can't solve it within the search distance, return now. */
396 if (diff > max) 391 if (diff > max)
397 return 0; 392 return 0;
398 393
399 while (diff > 1 && max > 0) 394 while (diff > 1 && max > 0)
400 { 395 {
401 lastx = x; 396 mapxy lastpos = pos;
402 lasty = y;
403 lastmap = m;
404 x = lastx + freearr_x[dir];
405 y = lasty + freearr_y[dir];
406 397
407 mflags = get_map_flags (m, &m, x, y, &x, &y); 398 pos.move (dir);
408 blocked = (mflags & P_OUT_OF_MAP) ? MOVE_ALL : GET_MAP_MOVE_BLOCK (m, x, y);
409 399
410 /* Space is blocked - try changing direction a little */ 400 /* Space is blocked - try changing direction a little */
411 if ((mflags & P_OUT_OF_MAP) || ((OB_TYPE_MOVE_BLOCK (mon, blocked) || (mflags & P_BLOCKSVIEW)) 401 if (!pos.normalise ()
412 && (m == mon->map && blocked_link (mon, m, x, y)))) 402 || (((pos->flags () & P_BLOCKSVIEW) || OB_TYPE_MOVE_BLOCK (mon, pos->move_block))
403 && blocked_link (mon, pos.m, pos.x, pos.y)))
413 { 404 {
414 /* recalculate direction from last good location. Possible 405 /* recalculate direction from last good location. Possible
415 * we were not traversing ideal location before. 406 * we were not traversing ideal location before.
416 */ 407 */
417 get_rangevector_from_mapcoord (lastmap, lastx, lasty, pl, &rv, 0); 408 get_rangevector_from_mapcoord (lastpos.m, lastpos.x, lastpos.y, pl, &rv, 0);
418 if (rv.direction != dir) 409 if (rv.direction != dir)
419 { 410 {
420 /* OK - says direction should be different - lets reset the 411 /* OK - says direction should be different - lets reset the
421 * the values so it will try again. 412 * the values so it will try again.
422 */ 413 */
423 x = lastx;
424 y = lasty;
425 m = lastmap; 414 pos = lastpos;
426 dir = firstdir = rv.direction; 415 dir = firstdir = rv.direction;
427 } 416 }
428 else 417 else
429 { 418 {
430 /* direct path is blocked - try taking a side step to 419 /* direct path is blocked - try taking a side step to
… …
437 */ 426 */
438 for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++) 427 for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)
439 { 428 {
440 if (i == 0) 429 if (i == 0)
441 continue; /* already did this, so skip it */ 430 continue; /* already did this, so skip it */
431
442 /* Use lastdir here - otherwise, 432 /* Use lastdir here - otherwise,
443 * since the direction that the creature should move in 433 * since the direction that the creature should move in
444 * may change, you could get infinite loops. 434 * may change, you could get infinite loops.
445 * ie, player is northwest, but monster can only 435 * ie, player is northwest, but monster can only
446 * move west, so it does that. It goes some distance, 436 * move west, so it does that. It goes some distance,
… …
448 * can't do that, but now finds it can move east, and 438 * can't do that, but now finds it can move east, and
449 * gets back to its original point. lastdir contains 439 * gets back to its original point. lastdir contains
450 * the last direction the creature has successfully 440 * the last direction the creature has successfully
451 * moved. 441 * moved.
452 */ 442 */
453
454 x = lastx + freearr_x[absdir (lastdir + i)];
455 y = lasty + freearr_y[absdir (lastdir + i)];
456 m = lastmap; 443 pos = lastpos;
457 mflags = get_map_flags (m, &m, x, y, &x, &y); 444 pos.move (absdir (lastdir + i));
458 if (mflags & P_OUT_OF_MAP) 445
446 if (!pos.normalise ())
459 continue; 447 continue;
460 blocked = GET_MAP_MOVE_BLOCK (m, x, y); 448
461 if (OB_TYPE_MOVE_BLOCK (mon, blocked)) 449 mapspace &ms = *pos;
450
451 if (ms.flags () & P_BLOCKSVIEW)
462 continue; 452 continue;
463 if (mflags & P_BLOCKSVIEW) 453
454 if (OB_TYPE_MOVE_BLOCK (mon, ms.move_block))
464 continue; 455 continue;
465 456
466 if (m == mon->map && blocked_link (mon, m, x, y)) 457 if (blocked_link (mon, pos.m, pos.x, pos.y))
467 break; 458 break;
468 } 459 }
460
469 /* go through entire loop without finding a valid 461 /* go through entire loop without finding a valid
470 * sidestep to take - thus, no valid path. 462 * sidestep to take - thus, no valid path.
471 */ 463 */
472 if (i == (DETOUR_AMOUNT + 1)) 464 if (i == DETOUR_AMOUNT + 1)
473 return 0; 465 return 0;
466
474 diff--; 467 diff--;
475 lastdir = dir; 468 lastdir = dir;
476 max--; 469 max--;
477 if (!firstdir) 470 if (!firstdir)
478 firstdir = dir + i; 471 firstdir = dir + i;
… …
482 { 475 {
483 /* we moved towards creature, so diff is less */ 476 /* we moved towards creature, so diff is less */
484 diff--; 477 diff--;
485 max--; 478 max--;
486 lastdir = dir; 479 lastdir = dir;
480
487 if (!firstdir) 481 if (!firstdir)
488 firstdir = dir; 482 firstdir = dir;
489 } 483 }
490 484
491 if (diff <= 1) 485 if (diff <= 1)
492 { 486 {
493 /* Recalculate diff (distance) because we may not have actually 487 /* Recalculate diff (distance) because we may not have actually
494 * headed toward player for entire distance. 488 * headed toward player for entire distance.
495 */ 489 */
496 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 490 get_rangevector_from_mapcoord (pos.m, pos.x, pos.y, pl, &rv, 0);
497 diff = ::max (abs (rv.distance_x), abs (rv.distance_y)); 491 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
498 } 492 }
499 493
500 if (diff > max) 494 if (diff > max)
501 return 0; 495 return 0;
… …
614roll_stat () 608roll_stat ()
615{ 609{
616 int a[4], i, j, k; 610 int a[4], i, j, k;
617 611
618 for (i = 0; i < 4; i++) 612 for (i = 0; i < 4; i++)
619 a[i] = (int) rndm (6) + 1; 613 a[i] = rndm (1, 6);
620 614
621 for (i = 0, j = 0, k = 7; i < 4; i++) 615 for (i = 0, j = 0, k = 7; i < 4; i++)
622 if (a[i] < k) 616 if (a[i] < k)
623 k = a[i], j = i; 617 k = a[i], j = i;
624 618
… …
721 treasurelist *tl = treasurelist::find (shstr_starting_wealth); 715 treasurelist *tl = treasurelist::find (shstr_starting_wealth);
722 if (tl) 716 if (tl)
723 create_treasure (tl, ob, 0, 0, 0); 717 create_treasure (tl, ob, 0, 0, 0);
724 718
725 INVOKE_PLAYER (BIRTH, ob->contr); 719 INVOKE_PLAYER (BIRTH, ob->contr);
726 INVOKE_PLAYER (LOGIN, ob->contr);
727 720
728 ob->contr->ns->state = ST_PLAYING; 721 ob->contr->ns->state = ST_PLAYING;
729 722
730 if (ob->msg) 723 if (ob->msg)
731 ob->msg = 0; 724 ob->msg = 0;
… …
1452#endif 1445#endif
1453 1446
1454 SET_ANIMATION (arrow, arrow->direction); 1447 SET_ANIMATION (arrow, arrow->direction);
1455 1448
1456 /* update the speed */ 1449 /* update the speed */
1457 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1458 + bow->stats.dam / 7.f;
1459 1450
1460 arrow->set_speed (max (arrow->speed, 2.f));
1461 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 ));
1462 1456
1463 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;
1464 1458
1465 if (op->type == PLAYER) 1459 if (op->type == PLAYER)
1466 { 1460 {
… …
2150void 2144void
2151do_some_living (object *op) 2145do_some_living (object *op)
2152{ 2146{
2153 int last_food = op->stats.food; 2147 int last_food = op->stats.food;
2154 int gen_hp, gen_sp, gen_grace; 2148 int gen_hp, gen_sp, gen_grace;
2155 int over_hp, over_sp, over_grace;
2156 int i; 2149 int i;
2157 int rate_hp = 1200; 2150 int rate_hp = 1200;
2158 int rate_sp = 2500; 2151 int rate_sp = 2500;
2159 int rate_grace = 2000; 2152 int rate_grace = 2000;
2160 const int max_hp = 1; 2153 const int max_hp = 1;
… …
2213 if (--op->last_grace < 0) 2206 if (--op->last_grace < 0)
2214 { 2207 {
2215 if (op->stats.grace < op->stats.maxgrace / 2) 2208 if (op->stats.grace < op->stats.maxgrace / 2)
2216 op->stats.grace++; /* no penalty in food for regaining grace */ 2209 op->stats.grace++; /* no penalty in food for regaining grace */
2217 2210
2211 int temp = gen_grace < 20 ? 30 : gen_grace + 10;
2212
2218 if (max_grace > 1) 2213 if (max_grace > 1)
2219 { 2214 {
2220 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace; 2215 int over_grace = temp / rate_grace;
2216
2221 if (over_grace > 0) 2217 if (over_grace > 0)
2222 { 2218 {
2223 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;
2224 + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0;
2225 op->last_grace = 0; 2220 op->last_grace = 0;
2226 } 2221 }
2227 else 2222 else
2228 { 2223 op->last_grace = rate_grace / temp;
2229 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2230 }
2231 } 2224 }
2232 else 2225 else
2233 { 2226 op->last_grace = rate_grace / temp;
2234 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2227
2235 }
2236 /* wearing stuff doesn't detract from grace generation. */ 2228 /* wearing stuff doesn't detract from grace generation. */
2237 } 2229 }
2238 2230
2239 if (op->stats.food > 0) 2231 if (op->stats.food > 0)
2240 { 2232 {
… …
2259 } 2251 }
2260 } 2252 }
2261 2253
2262 if (max_sp > 1) 2254 if (max_sp > 1)
2263 { 2255 {
2264 over_sp = (gen_sp + 10) / rate_sp; 2256 int over_sp = (gen_sp + 10) / rate_sp;
2265 if (over_sp > 0) 2257 if (over_sp > 0)
2266 { 2258 {
2267 if (op->stats.sp < op->stats.maxsp) 2259 if (op->stats.sp < op->stats.maxsp)
2268 { 2260 {
2269 op->stats.sp += over_sp > max_sp ? max_sp : over_sp; 2261 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
… …
2301 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))
2302 op->stats.food = last_food; 2294 op->stats.food = last_food;
2303 } 2295 }
2304 } 2296 }
2305 2297
2298 int temp = gen_hp < 20 ? 30 : gen_hp + 10;
2299
2306 if (max_hp > 1) 2300 if (max_hp > 1)
2307 { 2301 {
2308 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp; 2302 int over_hp = temp / rate_hp;
2309 2303
2310 if (over_hp > 0) 2304 if (over_hp > 0)
2311 { 2305 {
2312 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;
2313 op->last_heal = 0; 2307 op->last_heal = 0;
2314 } 2308 }
2315 else 2309 else
2316 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2310 op->last_heal = rate_hp / temp;
2317 } 2311 }
2318 else 2312 else
2319 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2313 op->last_heal = rate_hp / temp;
2320 } 2314 }
2321 } 2315 }
2322 2316
2323 /* Digestion */ 2317 /* Digestion */
2324 if (--op->last_eat < 0) 2318 if (--op->last_eat < 0)
… …
2666 object *force; 2660 object *force;
2667 int at; 2661 int at;
2668 2662
2669 force = get_archetype (FORCE_NAME); 2663 force = get_archetype (FORCE_NAME);
2670 /* 50 ticks should be enough time for the spell to abate */ 2664 /* 50 ticks should be enough time for the spell to abate */
2671 force->speed = 0.1f;
2672 force->speed_left = -5.f; 2665 force->speed_left = -5.f;
2666 force->set_speed (0.1f);
2673 force->set_flag (FLAG_APPLIED); 2667 force->set_flag (FLAG_APPLIED);
2668
2674 for (at = 0; at < NROFATTACKS; at++) 2669 for (at = 0; at < NROFATTACKS; at++)
2675 if (will_kill_again & (1 << at)) 2670 if (will_kill_again & (1 << at))
2676 force->resist[at] = 100; 2671 force->resist[at] = 100;
2677 2672
2678 insert_ob_in_ob (force, op); 2673 insert_ob_in_ob (force, op);

Diff Legend

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