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

Comparing deliantra/server/server/skills.C (file contents):
Revision 1.11 by root, Sat Sep 16 22:24:13 2006 UTC vs.
Revision 1.49 by root, Tue Apr 22 02:46:18 2008 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2003,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <object.h> 25#include <object.h>
26#ifndef __CEXTRACT__
27# include <sproto.h> 26#include <sproto.h>
28#endif
29#include <living.h> 27#include <living.h>
30#include <skills.h> 28#include <skills.h>
31#include <spells.h> 29#include <spells.h>
32#include <book.h> 30#include <book.h>
33 31
… …
41 return -1; 39 return -1;
42 40
43 /* Only prohibit stealing if the player does not have a free 41 /* Only prohibit stealing if the player does not have a free
44 * hand available and in fact does have hands. 42 * hand available and in fact does have hands.
45 */ 43 */
46 if (op->type == PLAYER && op->body_used[BODY_ARMS] <= 0 && op->body_info[BODY_ARMS]) 44 if (op->type == PLAYER && op->slot[body_arm].used <= 0 && op->slot[body_arm].info)
47 { 45 {
48 new_draw_info (NDI_UNIQUE, 0, op, "But you have no free hands to steal with!"); 46 new_draw_info (NDI_UNIQUE, 0, op, "But you have no free hands to steal with!");
49 return -1; 47 return -1;
50 } 48 }
51 49
… …
94 * or not. 92 * or not.
95 * op is the target (person being pilfered) 93 * op is the target (person being pilfered)
96 * who is the person doing the stealing. 94 * who is the person doing the stealing.
97 * skill is the skill object (stealing). 95 * skill is the skill object (stealing).
98 */ 96 */
99
100static int 97static int
101attempt_steal (object *op, object *who, object *skill) 98attempt_steal (object *op, object *who, object *skill)
102{ 99{
103 object *success = NULL, *tmp = NULL, *next; 100 object *success = NULL, *tmp = NULL, *next;
104 int roll = 0, chance = 0, stats_value; 101 int roll = 0, chance = 0, stats_value;
… …
122 else /* help npc to detect thief next time by raising its wisdom */ 119 else /* help npc to detect thief next time by raising its wisdom */
123 op->stats.Wis += (op->stats.Int / 5) + 1; 120 op->stats.Wis += (op->stats.Int / 5) + 1;
124 if (op->stats.Wis > MAX_STAT) 121 if (op->stats.Wis > MAX_STAT)
125 op->stats.Wis = MAX_STAT; 122 op->stats.Wis = MAX_STAT;
126 } 123 }
124
127 if (op->type == PLAYER && QUERY_FLAG (op, FLAG_WIZ)) 125 if (op->type == PLAYER && QUERY_FLAG (op, FLAG_WIZ))
128 { 126 {
129 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from the dungeon master!\n"); 127 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from the dungeon master!\n");
130 return 0; 128 return 0;
131 } 129 }
132#ifdef PROHIBIT_PLAYERKILL 130
131 // only allow stealing between hostile players (TODO: probably should change)
133 if (op->type == PLAYER && who->type == PLAYER && (who->contr->peaceful || op->contr->peaceful)) 132 if (op->type == PLAYER && who->type == PLAYER && (who->contr->peaceful || op->contr->peaceful))
134 { 133 {
135 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from other players!\n"); 134 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from other players!\n");
136 return 0; 135 return 0;
137 } 136 }
138#else
139 if (op->type == PLAYER && who->type == PLAYER && settings.no_player_stealing)
140 {
141 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from other players!\n");
142 return 0;
143 }
144#endif
145
146 137
147 /* Ok then, go thru their inventory, stealing */ 138 /* Ok then, go thru their inventory, stealing */
148 for (tmp = op->inv; tmp != NULL; tmp = next) 139 for (tmp = op->inv; tmp; tmp = next)
149 { 140 {
150 next = tmp->below; 141 next = tmp->below;
151 142
152 /* you can't steal worn items, starting items, wiz stuff, 143 /* you can't steal worn items, starting items, wiz stuff,
153 * innate abilities, or items w/o a type. Generally 144 * innate abilities, or items w/o a type. Generally
… …
157 * future possible problems. -b.t. 148 * future possible problems. -b.t.
158 * Flesh items generated w/ fix_flesh_item should have FLAG_NO_STEAL 149 * Flesh items generated w/ fix_flesh_item should have FLAG_NO_STEAL
159 * already -b.t. 150 * already -b.t.
160 */ 151 */
161 152
162 if (QUERY_FLAG (tmp, FLAG_WAS_WIZ) || QUERY_FLAG (tmp, FLAG_APPLIED) 153 if (QUERY_FLAG (tmp, FLAG_APPLIED)
163 || !(tmp->type) 154 || !tmp->type
164 || tmp->type == EXPERIENCE || tmp->type == SPELL 155 || tmp->type == SPELL
165 || QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_STEAL) || tmp->invisible) 156 || QUERY_FLAG (tmp, FLAG_STARTEQUIP)
157 || QUERY_FLAG (tmp, FLAG_NO_STEAL)
158 || tmp->invisible)
166 continue; 159 continue;
167 160
168 /* Okay, try stealing this item. Dependent on dexterity of thief, 161 /* Okay, try stealing this item. Dependent on dexterity of thief,
169 * skill level, see the adj_stealroll fctn for more detail. 162 * skill level, see the adj_stealroll fctn for more detail.
170 */ 163 */
… …
186 /* for players, play_sound: steals item */ 179 /* for players, play_sound: steals item */
187 success = tmp; 180 success = tmp;
188 CLEAR_FLAG (tmp, FLAG_INV_LOCKED); 181 CLEAR_FLAG (tmp, FLAG_INV_LOCKED);
189 182
190 /* Don't delete it from target player until we know 183 /* Don't delete it from target player until we know
191 * the thief has picked it up. can't just look at tmp->count, 184 * the thief has picked it up. can't just look at tmp->count,
192 * as it's possible that it got merged when picked up. 185 * as it's possible that it got merged when picked up.
193 */ 186 */
194 if (op->type == PLAYER) 187 if (op->type == PLAYER)
195 esrv_del_item (op->contr, tmp->count); 188 esrv_del_item (op->contr, tmp->count);
196 } 189 }
… …
261 /* play_sound("stop! thief!"); kindofthing */ 254 /* play_sound("stop! thief!"); kindofthing */
262 } /* if you weren't 100% successful */ 255 } /* if you weren't 100% successful */
263 return success ? 1 : 0; 256 return success ? 1 : 0;
264} 257}
265 258
266
267int 259int
268steal (object *op, int dir, object *skill) 260steal (object *op, int dir, object *skill)
269{ 261{
270 object *tmp, *next; 262 object *tmp, *next;
271 sint16 x, y; 263 sint16 x, y;
… …
292 /* If player can't move onto the space, can't steal from it. */ 284 /* If player can't move onto the space, can't steal from it. */
293 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y))) 285 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)))
294 return 0; 286 return 0;
295 287
296 /* Find the topmost object at this spot */ 288 /* Find the topmost object at this spot */
297 for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); 289 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
298 290
299 /* For all the stacked objects at this point, attempt a steal */ 291 /* For all the stacked objects at this point, attempt a steal */
300 for (; tmp != NULL; tmp = next) 292 for (; tmp != NULL; tmp = next)
301 { 293 {
302 next = tmp->below; 294 next = tmp->below;
… …
318 return 0; 310 return 0;
319 311
320 /* no xp for stealing from pets (of players) */ 312 /* no xp for stealing from pets (of players) */
321 if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->attack_movement == PETMOVE) 313 if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->attack_movement == PETMOVE)
322 { 314 {
323 object *owner = get_owner (tmp); 315 object *owner = tmp->owner;
324 316
325 if (owner != NULL && owner->type == PLAYER) 317 if (owner != NULL && owner->type == PLAYER)
326 return 0; 318 return 0;
327 } 319 }
328 320
… …
383 { 375 {
384 new_draw_info (NDI_UNIQUE, 0, pl, "There is no lock there."); 376 new_draw_info (NDI_UNIQUE, 0, pl, "There is no lock there.");
385 return 0; 377 return 0;
386 } 378 }
387 379
388 for (tmp = get_map_ob (pl->map, x, y); tmp; tmp = tmp->above) 380 for (tmp = GET_MAP_OB (pl->map, x, y); tmp; tmp = tmp->above)
389 if (tmp->type == DOOR || tmp->type == LOCKED_DOOR) 381 if (tmp->type == DOOR || tmp->type == LOCKED_DOOR)
390 break; 382 break;
391 383
392 if (!tmp) 384 if (!tmp)
393 { 385 {
… …
415 { 407 {
416 new_draw_info (NDI_UNIQUE, 0, pl, "You fail to pick the lock."); 408 new_draw_info (NDI_UNIQUE, 0, pl, "You fail to pick the lock.");
417 return 0; 409 return 0;
418 } 410 }
419} 411}
420
421 412
422/* HIDE CODE. The user becomes undetectable (not just 'invisible') for 413/* HIDE CODE. The user becomes undetectable (not just 'invisible') for
423 * a short while (success and duration dependant on player SK_level, 414 * a short while (success and duration dependant on player SK_level,
424 * dexterity, charisma, and map difficulty). 415 * dexterity, charisma, and map difficulty).
425 * Players have a good chance of becoming 'unhidden' if they move 416 * Players have a good chance of becoming 'unhidden' if they move
426 * and like invisiblity will be come visible if they attack 417 * and like invisiblity will be come visible if they attack
427 * Implemented by b.t. (thomas@astro.psu.edu) 418 * Implemented by b.t. (thomas@astro.psu.edu)
428 * July 7, 1995 - made hiding possible for monsters. -b.t. 419 * July 7, 1995 - made hiding possible for monsters. -b.t.
429 */ 420 */
430
431static int 421static int
432attempt_hide (object *op, object *skill) 422attempt_hide (object *op, object *skill)
433{ 423{
434 int number, difficulty = op->map->difficulty; 424 int number, difficulty = op->map->difficulty;
435 int terrain = hideability (op); 425 int terrain = hideability (op);
… …
438 return 0; 428 return 0;
439 429
440 /* Hiding success and duration dependant on skill level, 430 /* Hiding success and duration dependant on skill level,
441 * op->stats.Dex, map difficulty and terrain. 431 * op->stats.Dex, map difficulty and terrain.
442 */ 432 */
443
444 number = (die_roll (2, 25, op, PREFER_LOW) - 2) / 2; 433 number = (die_roll (2, 25, op, PREFER_LOW) - 2) / 2;
434
445 if (!stand_near_hostile (op) && (number < (op->stats.Dex + skill->level + terrain - difficulty))) 435 if (!stand_near_hostile (op) && (number < (op->stats.Dex + skill->level + terrain - difficulty)))
446 { 436 {
447 op->invisible += 100; /* set the level of 'hiddeness' */ 437 op->invisible += 100; /* set the level of 'hiddeness' */
438
448 if (op->type == PLAYER) 439 if (op->type == PLAYER)
449 op->contr->tmp_invis = 1; 440 op->contr->tmp_invis = 1;
441
450 op->hide = 1; 442 op->hide = 1;
451 return 1; 443 return 1;
452 } 444 }
445
453 return 0; 446 return 0;
454} 447}
455 448
456/* patched this to take terrain into consideration */ 449/* patched this to take terrain into consideration */
457int 450int
458hide (object *op, object *skill) 451hide (object *op, object *skill)
459{ 452{
460
461 /* the preliminaries -- Can we really hide now? */ 453 /* the preliminaries -- Can we really hide now? */
462 /* this keeps monsters from using invisibilty spells and hiding */ 454 /* this keeps monsters from using invisibilty spells and hiding */
463 455
464 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 456 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
465 { 457 {
… …
470 { 462 {
471 new_draw_info (NDI_UNIQUE, 0, op, "Your attempt to hide breaks the invisibility spell!"); 463 new_draw_info (NDI_UNIQUE, 0, op, "Your attempt to hide breaks the invisibility spell!");
472 make_visible (op); 464 make_visible (op);
473 } 465 }
474 466
475 if (op->invisible > (50 * skill->level)) 467 if (op->invisible > 50 * skill->level)
476 { 468 {
477 new_draw_info (NDI_UNIQUE, 0, op, "You are as hidden as you can get."); 469 new_draw_info (NDI_UNIQUE, 0, op, "You are as hidden as you can get.");
478 return 0; 470 return 0;
479 } 471 }
480 472
… …
482 { 474 {
483 new_draw_info (NDI_UNIQUE, 0, op, "You hide in the shadows."); 475 new_draw_info (NDI_UNIQUE, 0, op, "You hide in the shadows.");
484 update_object (op, UP_OBJ_FACE); 476 update_object (op, UP_OBJ_FACE);
485 return calc_skill_exp (op, NULL, skill); 477 return calc_skill_exp (op, NULL, skill);
486 } 478 }
479
487 new_draw_info (NDI_UNIQUE, 0, op, "You fail to conceal yourself."); 480 new_draw_info (NDI_UNIQUE, 0, op, "You fail to conceal yourself.");
488 return 0; 481 return 0;
489} 482}
490
491 483
492/* stop_jump() - End of jump. Clear flags, restore the map, and 484/* stop_jump() - End of jump. Clear flags, restore the map, and
493 * freeze the jumper a while to simulate the exhaustion 485 * freeze the jumper a while to simulate the exhaustion
494 * of jumping. 486 * of jumping.
495 */ 487 */
496static void 488static void
497stop_jump (object *pl, int dist, int spaces) 489stop_jump (object *pl, int dist, int spaces)
498{ 490{
499 fix_player (pl); 491 pl->update_stats ();
500 insert_ob_in_map (pl, pl->map, pl, 0); 492 pl->map->insert (pl, pl->x, pl->y, pl);
501} 493}
502
503 494
504static int 495static int
505attempt_jump (object *pl, int dir, int spaces, object *skill) 496attempt_jump (object *pl, int dir, int spaces, object *skill)
506{ 497{
507 object *tmp; 498 object *tmp;
508 int i, exp = 0, dx = freearr_x[dir], dy = freearr_y[dir], mflags; 499 int i, exp = 0, dx = freearr_x[dir], dy = freearr_y[dir], mflags;
509 sint16 x, y; 500 sint16 x, y;
510 maptile *m; 501 maptile *m;
511 502
512 /* Jump loop. Go through spaces opject wants to jump. Halt the 503 /* Jump loop. Go through spaces object wants to jump. Halt the
513 * jump if a wall or creature is in the way. We set FLAG_FLYING 504 * jump if a wall or creature is in the way. We set FLAG_FLYING
514 * temporarily to allow player to aviod exits/archs that are not 505 * temporarily to allow player to aviod exits/archs that are not
515 * fly_on, fly_off. This will also prevent pickup of objects 506 * fly_on, fly_off. This will also prevent pickup of objects
516 * while jumping over them. 507 * while jumping over them.
517 */ 508 */
518 509 pl->remove ();
519 remove_ob (pl);
520 510
521 /* 511 /*
522 * I don't think this is actually needed - all the movement 512 * I don't think this is actually needed - all the movement
523 * code is handled in this function, and I don't see anyplace 513 * code is handled in this function, and I don't see anyplace
524 * that cares about the move_type being flying. 514 * that cares about the move_type being flying.
… …
533 523
534 mflags = get_map_flags (m, &m, x, y, &x, &y); 524 mflags = get_map_flags (m, &m, x, y, &x, &y);
535 525
536 if (mflags & P_OUT_OF_MAP) 526 if (mflags & P_OUT_OF_MAP)
537 { 527 {
538 (void) stop_jump (pl, i, spaces); 528 stop_jump (pl, i, spaces);
539 return 0; 529 return 0;
540 } 530 }
531
541 if (OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, x, y))) 532 if (OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, x, y)))
542 { 533 {
543 new_draw_info (NDI_UNIQUE, 0, pl, "Your jump is blocked."); 534 new_draw_info (NDI_UNIQUE, 0, pl, "Your jump is blocked.");
544 stop_jump (pl, i, spaces); 535 stop_jump (pl, i, spaces);
545 return 0; 536 return 0;
546 } 537 }
547 538
548 for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above) 539 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
549 { 540 {
550 /* Jump into creature */ 541 /* Jump into creature */
551 if (QUERY_FLAG (tmp, FLAG_MONSTER) || (tmp->type == PLAYER && (!QUERY_FLAG (tmp, FLAG_WIZ) || !tmp->contr->hidden))) 542 if (QUERY_FLAG (tmp, FLAG_MONSTER) || (tmp->type == PLAYER && (!QUERY_FLAG (tmp, FLAG_WIZ) || !tmp->contr->hidden)))
552 { 543 {
553 new_draw_info_format (NDI_UNIQUE, 0, pl, "You jump into %s%s.", tmp->type == PLAYER ? "" : "the ", &tmp->name); 544 new_draw_info_format (NDI_UNIQUE, 0, pl, "You jump into %s%s.", tmp->type == PLAYER ? "" : "the ", &tmp->name);
545
546 stop_jump (pl, i, spaces);
547
554 if (tmp->type != PLAYER || 548 if (tmp->type != PLAYER ||
555 (pl->type == PLAYER && pl->contr->party == NULL) || 549 (pl->type == PLAYER && pl->contr->party == NULL) ||
556 (pl->type == PLAYER && tmp->type == PLAYER && pl->contr->party != tmp->contr->party)) 550 (pl->type == PLAYER && tmp->type == PLAYER && pl->contr->party != tmp->contr->party))
557 exp = skill_attack (tmp, pl, pl->facing, "kicked", skill); /* pl makes an attack */ 551 exp = skill_attack (tmp, pl, pl->facing, "kicked", skill); /* pl makes an attack */
558 stop_jump (pl, i, spaces); 552
559 return exp; /* note that calc_skill_exp() is already called by skill_attack() */ 553 return exp; /* note that calc_skill_exp() is already called by skill_attack() */
560 } 554 }
555
561 /* If the space has fly on set (no matter what the space is), 556 /* If the space has fly on set (no matter what the space is),
562 * we should get the effects - after all, the player is 557 * we should get the effects - after all, the player is
563 * effectively flying. 558 * effectively flying.
564 */ 559 */
565 if (tmp->move_on & MOVE_FLY_LOW) 560 if (tmp->move_on & MOVE_FLY_LOW)
… …
569 pl->map = m; 564 pl->map = m;
570 stop_jump (pl, i, spaces); 565 stop_jump (pl, i, spaces);
571 return calc_skill_exp (pl, NULL, skill); 566 return calc_skill_exp (pl, NULL, skill);
572 } 567 }
573 } 568 }
569
574 pl->x = x; 570 pl->x = x;
575 pl->y = y; 571 pl->y = y;
576 pl->map = m; 572 pl->map = m;
577 } 573 }
574
578 stop_jump (pl, i, spaces); 575 stop_jump (pl, i, spaces);
576
579 return calc_skill_exp (pl, NULL, skill); 577 return calc_skill_exp (pl, NULL, skill);
580} 578}
581 579
582/* jump() - this is both a new type of movement for player/monsters and 580/* jump() - this is both a new type of movement for player/monsters and
583 * an attack as well. 581 * an attack as well.
584 * Perhaps we should allow more spaces based on level, eg, level 50 582 * Perhaps we should allow more spaces based on level, eg, level 50
585 * jumper can jump several spaces? 583 * jumper can jump several spaces?
586 */ 584 */
587
588int 585int
589jump (object *pl, int dir, object *skill) 586jump (object *pl, int dir, object *skill)
590{ 587{
591 int spaces = 0, stats;
592 int str = pl->stats.Str; 588 int str = pl->stats.Str;
593 int dex = pl->stats.Dex; 589 int dex = pl->stats.Dex;
594 590
595 dex = dex ? dex : 15; 591 dex = dex ? dex : 15;
596 str = str ? str : 10; 592 str = str ? str : 10;
597 593
598 stats = str * str * str * dex * skill->level; 594 int stats = str * str * str * dex * skill->level;
595 int spaces = min (3, skill->level, stats / (pl->carrying + 1));
599 596
600 if (pl->carrying != 0) /* don't want div by zero !! */
601 spaces = (int) (stats / pl->carrying);
602 else
603 spaces = 2; /* pl has no objects - gets the far jump */
604
605 if (spaces > 2)
606 spaces = 2;
607 else if (spaces == 0) 597 if (spaces == 0)
608 { 598 {
609 new_draw_info (NDI_UNIQUE, 0, pl, "You are carrying too much weight to jump."); 599 new_draw_info (NDI_UNIQUE, 0, pl, "You are carrying too much weight to jump.");
610 return 0; 600 return 0;
611 } 601 }
602
612 return attempt_jump (pl, dir, spaces, skill); 603 return attempt_jump (pl, dir, spaces, skill);
613} 604}
614
615 605
616/* skill_ident() - this code is supposed to allow players to identify 606/* skill_ident() - this code is supposed to allow players to identify
617 * classes of objects with the various "auto-ident" skills. Player must 607 * classes of objects with the various "auto-ident" skills. Player must
618 * have unidentified objects of the right type in order for the skill 608 * have unidentified objects of the right type in order for the skill
619 * to work. While multiple classes of objects may be identified, 609 * to work. While multiple classes of objects may be identified,
620 * this code is kind of yucky -- it would be nice to make it a bit 610 * this code is kind of yucky -- it would be nice to make it a bit
621 * more generalized. Right now, skill indices are embedded in this routine. 611 * more generalized. Right now, skill indices are embedded in this routine.
622 * Returns amount of experience gained (on successful ident). 612 * Returns amount of experience gained (on successful ident).
623 * - b.t. (thomas@astro.psu.edu) 613 * - b.t. (thomas@astro.psu.edu)
624 */ 614 */
625
626static int 615static int
627do_skill_detect_curse (object *pl, object *skill) 616do_skill_detect_curse (object *pl, object *skill)
628{ 617{
629 object *tmp; 618 object *tmp;
630 int success = 0; 619 int success = 0;
… …
638 esrv_update_item (UPD_FLAGS, pl, tmp); 627 esrv_update_item (UPD_FLAGS, pl, tmp);
639 success += calc_skill_exp (pl, tmp, skill); 628 success += calc_skill_exp (pl, tmp, skill);
640 } 629 }
641 630
642 /* Check ground, too, but only objects the player could pick up */ 631 /* Check ground, too, but only objects the player could pick up */
643 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp; tmp = tmp->above) 632 for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp; tmp = tmp->above)
644 if (can_pick (pl, tmp) && 633 if (can_pick (pl, tmp) &&
645 !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && 634 !QUERY_FLAG (tmp, FLAG_IDENTIFIED) &&
646 !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) 635 !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)
647 && (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->item_power < skill->level) 636 && (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->item_power < skill->level)
648 { 637 {
… …
669 esrv_update_item (UPD_FLAGS, pl, tmp); 658 esrv_update_item (UPD_FLAGS, pl, tmp);
670 success += calc_skill_exp (pl, tmp, skill); 659 success += calc_skill_exp (pl, tmp, skill);
671 } 660 }
672 661
673 /* Check ground, too, but like above, only if the object can be picked up */ 662 /* Check ground, too, but like above, only if the object can be picked up */
674 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp; tmp = tmp->above) 663 for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp; tmp = tmp->above)
675 if (can_pick (pl, tmp) && 664 if (can_pick (pl, tmp) &&
676 !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && (is_magical (tmp)) && tmp->item_power < skill->level) 665 !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && (is_magical (tmp)) && tmp->item_power < skill->level)
677 { 666 {
678 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL); 667 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL);
679 esrv_update_item (UPD_FLAGS, pl, tmp); 668 esrv_update_item (UPD_FLAGS, pl, tmp);
… …
727/* do_skill_ident() - workhorse for skill_ident() -b.t. 716/* do_skill_ident() - workhorse for skill_ident() -b.t.
728 */ 717 */
729static int 718static int
730do_skill_ident (object *pl, int obj_class, object *skill) 719do_skill_ident (object *pl, int obj_class, object *skill)
731{ 720{
732 object *tmp;
733 int success = 0; 721 int success = 0;
734 722
735 for (tmp = pl->inv; tmp; tmp = tmp->below) 723 for (object *tmp = pl->inv; tmp; tmp = tmp->below)
736 success += do_skill_ident2 (tmp, pl, obj_class, skill); 724 success += do_skill_ident2 (tmp, pl, obj_class, skill);
737 /* check the ground */ 725 /* check the ground */
738 726
739 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp; tmp = tmp->above) 727 for (object *tmp = pl->ms ().bot; tmp; tmp = tmp->above)
740 success += do_skill_ident2 (tmp, pl, obj_class, skill); 728 success += do_skill_ident2 (tmp, pl, obj_class, skill);
741 729
742 return success; 730 return success;
743} 731}
744 732
… …
752 740
753 new_draw_info (NDI_UNIQUE, 0, pl, "You look at the objects nearby..."); 741 new_draw_info (NDI_UNIQUE, 0, pl, "You look at the objects nearby...");
754 742
755 switch (skill->subtype) 743 switch (skill->subtype)
756 { 744 {
757 case SK_SMITHERY: 745 case SK_SMITHERY:
758 success += do_skill_ident (pl, WEAPON, skill) + do_skill_ident (pl, ARMOUR, skill) 746 success += do_skill_ident (pl, WEAPON, skill) + do_skill_ident (pl, ARMOUR, skill)
759 + do_skill_ident (pl, BRACERS, skill) + do_skill_ident (pl, CLOAK, skill) 747 + do_skill_ident (pl, BRACERS, skill) + do_skill_ident (pl, CLOAK, skill)
760 + do_skill_ident (pl, BOOTS, skill) + do_skill_ident (pl, SHIELD, skill) 748 + do_skill_ident (pl, BOOTS, skill) + do_skill_ident (pl, SHIELD, skill)
761 + do_skill_ident (pl, GIRDLE, skill) + do_skill_ident (pl, HELMET, skill) + do_skill_ident (pl, GLOVES, skill); 749 + do_skill_ident (pl, GIRDLE, skill) + do_skill_ident (pl, HELMET, skill) + do_skill_ident (pl, GLOVES, skill);
762 break; 750 break;
763 751
764 case SK_BOWYER: 752 case SK_BOWYER:
765 success += do_skill_ident (pl, BOW, skill) + do_skill_ident (pl, ARROW, skill); 753 success += do_skill_ident (pl, BOW, skill) + do_skill_ident (pl, ARROW, skill);
766 break; 754 break;
767 755
768 case SK_ALCHEMY: 756 case SK_ALCHEMY:
769 success += do_skill_ident (pl, POTION, skill) + do_skill_ident (pl, POISON, skill) 757 success += do_skill_ident (pl, POTION, skill) + do_skill_ident (pl, POISON, skill)
770 + do_skill_ident (pl, CONTAINER, skill) + do_skill_ident (pl, DRINK, skill) + do_skill_ident (pl, INORGANIC, skill); 758 + do_skill_ident (pl, CONTAINER, skill) + do_skill_ident (pl, DRINK, skill) + do_skill_ident (pl, INORGANIC, skill);
771 break; 759 break;
772 760
773 case SK_WOODSMAN: 761 case SK_WOODSMAN:
774 success += do_skill_ident (pl, FOOD, skill) + do_skill_ident (pl, DRINK, skill) + do_skill_ident (pl, FLESH, skill); 762 success += do_skill_ident (pl, FOOD, skill) + do_skill_ident (pl, DRINK, skill) + do_skill_ident (pl, FLESH, skill);
775 break; 763 break;
776 764
777 case SK_JEWELER: 765 case SK_JEWELER:
778 success += do_skill_ident (pl, GEM, skill) + do_skill_ident (pl, RING, skill) + do_skill_ident (pl, AMULET, skill); 766 success += do_skill_ident (pl, GEM, skill) + do_skill_ident (pl, RING, skill) + do_skill_ident (pl, AMULET, skill);
779 break; 767 break;
780 768
781 case SK_LITERACY: 769 case SK_LITERACY:
782 success += do_skill_ident (pl, SPELLBOOK, skill) + do_skill_ident (pl, SCROLL, skill) + do_skill_ident (pl, BOOK, skill); 770 success += do_skill_ident (pl, SPELLBOOK, skill) + do_skill_ident (pl, SCROLL, skill) + do_skill_ident (pl, BOOK, skill);
783 break; 771 break;
784 772
785 case SK_THAUMATURGY: 773 case SK_THAUMATURGY:
786 success += do_skill_ident (pl, WAND, skill) + do_skill_ident (pl, ROD, skill) + do_skill_ident (pl, HORN, skill); 774 success += do_skill_ident (pl, WAND, skill) + do_skill_ident (pl, ROD, skill) + do_skill_ident (pl, HORN, skill);
787 break; 775 break;
788 776
789 case SK_DET_CURSE: 777 case SK_DET_CURSE:
790 success = do_skill_detect_curse (pl, skill); 778 success = do_skill_detect_curse (pl, skill);
791 if (success) 779 if (success)
792 new_draw_info (NDI_UNIQUE, 0, pl, "...and discover cursed items!"); 780 new_draw_info (NDI_UNIQUE, 0, pl, "...and discover cursed items!");
793 break; 781 break;
794 782
795 case SK_DET_MAGIC: 783 case SK_DET_MAGIC:
796 success = do_skill_detect_magic (pl, skill); 784 success = do_skill_detect_magic (pl, skill);
797 if (success) 785 if (success)
798 new_draw_info (NDI_UNIQUE, 0, pl, "...and discover items imbued with mystic forces!"); 786 new_draw_info (NDI_UNIQUE, 0, pl, "...and discover items imbued with mystic forces!");
799 break; 787 break;
800 788
801 default: 789 default:
802 LOG (llevError, "Error: bad call to skill_ident()\n"); 790 LOG (llevError, "Error: bad call to skill_ident()\n");
803 return 0; 791 return 0;
804 break; 792 break;
805 } 793 }
794
806 if (!success) 795 if (!success)
807 {
808 new_draw_info (NDI_UNIQUE, 0, pl, "...and learn nothing more."); 796 new_draw_info (NDI_UNIQUE, 0, pl, "...and learn nothing more.");
809 } 797
810 return success; 798 return success;
811} 799}
812
813 800
814/* players using this skill can 'charm' a monster -- 801/* players using this skill can 'charm' a monster --
815 * into working for them. It can only be used on 802 * into working for them. It can only be used on
816 * non-special (see below) 'neutral' creatures. 803 * non-special (see below) 'neutral' creatures.
817 * -b.t. (thomas@astro.psu.edu) 804 * -b.t. (thomas@astro.psu.edu)
818 */ 805 */
819
820int 806int
821use_oratory (object *pl, int dir, object *skill) 807use_oratory (object *pl, int dir, object *skill)
822{ 808{
823 sint16 x = pl->x + freearr_x[dir], y = pl->y + freearr_y[dir];
824 int mflags, chance;
825 object *tmp;
826 maptile *m;
827
828 if (pl->type != PLAYER) 809 if (pl->type != PLAYER)
829 return 0; /* only players use this skill */ 810 return 0; /* only players use this skill */
811
812 sint16 x = pl->x + freearr_x[dir],
813 y = pl->y + freearr_y[dir];
830 m = pl->map; 814 maptile *m = pl->map;
815
831 mflags = get_map_flags (m, &m, x, y, &x, &y); 816 int mflags = get_map_flags (m, &m, x, y, &x, &y);
832 if (mflags & P_OUT_OF_MAP) 817 if (mflags & P_OUT_OF_MAP)
833 return 0; 818 return 0;
834 819
835 /* Save some processing - we have the flag already anyways 820 /* Save some processing - we have the flag already anyways
836 */ 821 */
… …
838 { 823 {
839 new_draw_info (NDI_UNIQUE, 0, pl, "There is nothing to orate to."); 824 new_draw_info (NDI_UNIQUE, 0, pl, "There is nothing to orate to.");
840 return 0; 825 return 0;
841 } 826 }
842 827
828 object *tmp;
843 for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above) 829 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
844 { 830 {
845 /* can't persuade players - return because there is nothing else 831 /* can't persuade players - return because there is nothing else
846 * on that space to charm. Same for multi space monsters and 832 * on that space to charm. Same for multi space monsters and
847 * special monsters - we don't allow them to be charmed, and there 833 * special monsters - we don't allow them to be charmed, and there
848 * is no reason to do further processing since they should be the 834 * is no reason to do further processing since they should be the
849 * only monster on the space. 835 * only monster on the space.
850 */ 836 */
851 if (tmp->type == PLAYER) 837 if (tmp->type == PLAYER
852 return 0; 838 || tmp->more || tmp->head_ () != tmp
853 if (tmp->more || tmp->head) 839 || tmp->msg)
854 return 0;
855 if (tmp->msg)
856 return 0; 840 return 0;
857 841
858 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 842 if (QUERY_FLAG (tmp, FLAG_MONSTER))
859 break; 843 break;
860 } 844 }
… …
875 new_draw_info_format (NDI_UNIQUE, 0, pl, "Too bad the %s isn't listening!\n", query_name (tmp)); 859 new_draw_info_format (NDI_UNIQUE, 0, pl, "Too bad the %s isn't listening!\n", query_name (tmp));
876 return 0; 860 return 0;
877 } 861 }
878 862
879 /* it's already allied! */ 863 /* it's already allied! */
880 if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && (tmp->attack_movement == PETMOVE)) 864 if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->attack_movement == PETMOVE)
881 { 865 {
882 if (get_owner (tmp) == pl) 866 if (tmp->owner == pl)
883 { 867 {
884 new_draw_info (NDI_UNIQUE, 0, pl, "Your follower loves your speech.\n"); 868 new_draw_info (NDI_UNIQUE, 0, pl, "Your follower loves your speech.\n");
885 return 0; 869 return 0;
886 } 870 }
887 else if (skill->level > tmp->level) 871 else if (skill->level > tmp->level)
888 { 872 {
889 /* you steal the follower. Perhaps we should really look at the 873 /* you steal the follower. Perhaps we should really look at the
890 * level of the owner above? 874 * level of the owner above?
891 */ 875 */
892 set_owner (tmp, pl); 876 tmp->set_owner (pl);
877 tmp->skill = skill->skill;
878
893 new_draw_info_format (NDI_UNIQUE, 0, pl, "You convince the %s to follow you instead!\n", query_name (tmp)); 879 new_draw_info_format (NDI_UNIQUE, 0, pl, "You convince the %s to follow you instead!\n", query_name (tmp));
894 /* Abuse fix - don't give exp since this can otherwise 880 /* Abuse fix - don't give exp since this can otherwise
895 * be used by a couple players to gets lots of exp. 881 * be used by a couple players to gets lots of exp.
896 */ 882 */
897 return 0; 883 return 0;
… …
901 /* In this case, you can't steal it from the other player */ 887 /* In this case, you can't steal it from the other player */
902 return 0; 888 return 0;
903 } 889 }
904 } /* Creature was already a pet of someone */ 890 } /* Creature was already a pet of someone */
905 891
906 chance = skill->level * 2 + (pl->stats.Cha - 2 * tmp->stats.Int) / 2; 892 int level = skill->level + (pl->stats.Cha - tmp->stats.Int) / 2;
907 893
908 /* Ok, got a 'sucker' lets try to make them a follower */ 894 /* Ok, got a 'sucker' lets try to make them a follower */
909 if (chance > 0 && tmp->level < (random_roll (0, chance - 1, pl, PREFER_HIGH) - 1)) 895 if (level > 0 && tmp->level < (random_roll (0, level - 1, pl, PREFER_HIGH) - 1))
910 { 896 {
911 new_draw_info_format (NDI_UNIQUE, 0, pl, "You convince the %s to become your follower.\n", query_name (tmp)); 897 new_draw_info_format (NDI_UNIQUE, 0, pl, "You convince the %s to become your follower.\n", query_name (tmp));
912 898
913 set_owner (tmp, pl); 899 tmp->set_owner (pl);
900 tmp->skill = skill->skill;
914 tmp->stats.exp = 0; 901 tmp->stats.exp = 0;
915 add_friendly_object (tmp);
916 SET_FLAG (tmp, FLAG_FRIENDLY);
917 tmp->attack_movement = PETMOVE; 902 tmp->attack_movement = PETMOVE;
903
904 if (!QUERY_FLAG (tmp, FLAG_FRIENDLY))
905 add_friendly_object (tmp);
906
918 return calc_skill_exp (pl, tmp, skill); 907 return calc_skill_exp (pl, tmp, skill);
919 } 908 }
920 /* Charm failed. Creature may be angry now */ 909 /* Charm failed. Creature may be angry now */
921 else if ((skill->level + ((pl->stats.Cha - 10) / 2)) < random_roll (1, 2 * tmp->level, pl, PREFER_LOW)) 910 else if ((skill->level + ((pl->stats.Cha - 10) / 2)) < random_roll (1, 2 * tmp->level, pl, PREFER_LOW))
922 { 911 {
923 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your speech angers the %s!\n", query_name (tmp)); 912 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your speech angers the %s!\n", query_name (tmp));
924 if (QUERY_FLAG (tmp, FLAG_FRIENDLY)) 913 if (QUERY_FLAG (tmp, FLAG_FRIENDLY))
925 { 914 {
926 CLEAR_FLAG (tmp, FLAG_FRIENDLY);
927 remove_friendly_object (tmp); 915 remove_friendly_object (tmp);
928 tmp->attack_movement = 0; /* needed? */ 916 tmp->attack_movement = 0; /* needed? */
929 } 917 }
918
930 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 919 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
931 } 920 }
921
932 return 0; /* Fall through - if we get here, we didn't charm anything */ 922 return 0; /* Fall through - if we get here, we didn't charm anything */
933} 923}
934 924
935/* Singing() -this skill allows the player to pacify nearby creatures. 925/* Singing() -this skill allows the player to pacify nearby creatures.
936 * There are few limitations on who/what kind of 926 * There are few limitations on who/what kind of
… …
939 * successfully pacified the creature gets Int=1. Thus, a player 929 * successfully pacified the creature gets Int=1. Thus, a player
940 * may only pacify a creature once. 930 * may only pacify a creature once.
941 * BTW, I appologize for the naming of the skill, I couldnt think 931 * BTW, I appologize for the naming of the skill, I couldnt think
942 * of anything better! -b.t. 932 * of anything better! -b.t.
943 */ 933 */
944
945int 934int
946singing (object *pl, int dir, object *skill) 935singing (object *pl, int dir, object *skill)
947{ 936{
948 int i, exp = 0, chance, mflags; 937 int i, exp = 0;
949 object *tmp; 938 object *tmp;
950 maptile *m; 939 maptile *m;
951 sint16 x, y; 940 sint16 x, y;
952 941
953 if (pl->type != PLAYER) 942 if (pl->type != PLAYER)
… …
958 { 947 {
959 x = pl->x + freearr_x[i]; 948 x = pl->x + freearr_x[i];
960 y = pl->y + freearr_y[i]; 949 y = pl->y + freearr_y[i];
961 m = pl->map; 950 m = pl->map;
962 951
963 mflags = get_map_flags (m, &m, x, y, &x, &y); 952 int mflags = get_map_flags (m, &m, x, y, &x, &y);
964 if (mflags & P_OUT_OF_MAP) 953 if (mflags & P_OUT_OF_MAP)
965 continue; 954 continue;
966 if (!(mflags & P_IS_ALIVE)) 955 if (!(mflags & P_IS_ALIVE))
967 continue; 956 continue;
968 957
969 for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above) 958 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
970 { 959 {
971 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 960 if (QUERY_FLAG (tmp, FLAG_MONSTER))
972 break; 961 break;
973 /* can't affect players */ 962 /* can't affect players */
974 if (tmp->type == PLAYER) 963 if (tmp->type == PLAYER)
… …
987 976
988 /* stealing isn't really related (although, maybe it should 977 /* stealing isn't really related (although, maybe it should
989 * be). This is mainly to prevent singing to the same monster 978 * be). This is mainly to prevent singing to the same monster
990 * over and over again and getting exp for it. 979 * over and over again and getting exp for it.
991 */ 980 */
992 chance = skill->level * 2 + (pl->stats.Cha - 5 - tmp->stats.Int) / 2; 981 int level = skill->level + (pl->stats.Cha - 5 - tmp->stats.Int) / 2;
982
993 if (chance && tmp->level * 2 < random_roll (0, chance - 1, pl, PREFER_HIGH)) 983 if (level && tmp->level < random_roll (0, level - 1, pl, PREFER_HIGH))
994 { 984 {
995 SET_FLAG (tmp, FLAG_UNAGGRESSIVE); 985 SET_FLAG (tmp, FLAG_UNAGGRESSIVE);
996 new_draw_info_format (NDI_UNIQUE, 0, pl, "You calm down the %s\n", query_name (tmp)); 986 new_draw_info_format (NDI_UNIQUE, 0, pl, "You calm down the %s\n", query_name (tmp));
997 /* Give exp only if they are not aware */ 987 /* Give exp only if they are not aware */
988
998 if (!QUERY_FLAG (tmp, FLAG_NO_STEAL)) 989 if (!QUERY_FLAG (tmp, FLAG_NO_STEAL))
999 exp += calc_skill_exp (pl, tmp, skill); 990 exp += calc_skill_exp (pl, tmp, skill);
991
1000 SET_FLAG (tmp, FLAG_NO_STEAL); 992 SET_FLAG (tmp, FLAG_NO_STEAL);
1001 } 993 }
1002 else 994 else
1003 { 995 {
1004 new_draw_info_format (NDI_UNIQUE, 0, pl, "Too bad the %s isn't listening!\n", query_name (tmp)); 996 new_draw_info_format (NDI_UNIQUE, 0, pl, "Too bad the %s isn't listening!\n", query_name (tmp));
… …
1034 mflags = get_map_flags (m, &m, x, y, &x, &y); 1026 mflags = get_map_flags (m, &m, x, y, &x, &y);
1035 if (mflags & P_OUT_OF_MAP) 1027 if (mflags & P_OUT_OF_MAP)
1036 continue; 1028 continue;
1037 1029
1038 /* Check everything in the square for trapness */ 1030 /* Check everything in the square for trapness */
1039 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above) 1031 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1040 { 1032 {
1041 1033
1042 /* And now we'd better do an inventory traversal of each 1034 /* And now we'd better do an inventory traversal of each
1043 * of these objects' inventory 1035 * of these objects' inventory
1044 * We can narrow this down a bit - no reason to search through 1036 * We can narrow this down a bit - no reason to search through
… …
1097 mflags = get_map_flags (m, &m, x, y, &x, &y); 1089 mflags = get_map_flags (m, &m, x, y, &x, &y);
1098 if (mflags & P_OUT_OF_MAP) 1090 if (mflags & P_OUT_OF_MAP)
1099 continue; 1091 continue;
1100 1092
1101 /* Check everything in the square for trapness */ 1093 /* Check everything in the square for trapness */
1102 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above) 1094 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1103 { 1095 {
1104 /* And now we'd better do an inventory traversal of each 1096 /* And now we'd better do an inventory traversal of each
1105 * of these objects inventory. Like above, only 1097 * of these objects inventory. Like above, only
1106 * do this for interesting objects. 1098 * do this for interesting objects.
1107 */ 1099 */
… …
1128 success += calc_skill_exp (op, tmp, skill); 1120 success += calc_skill_exp (op, tmp, skill);
1129 } 1121 }
1130 } 1122 }
1131 } 1123 }
1132 } 1124 }
1125
1133 return success; 1126 return success;
1134} 1127}
1135
1136 1128
1137/* pray() - when this skill is called from do_skill(), it allows 1129/* pray() - when this skill is called from do_skill(), it allows
1138 * the player to regain lost grace points at a faster rate. -b.t. 1130 * the player to regain lost grace points at a faster rate. -b.t.
1139 * This always returns 0 - return value is used by calling function 1131 * This always returns 0 - return value is used by calling function
1140 * such that if it returns true, player gets exp in that skill. This 1132 * such that if it returns true, player gets exp in that skill. This
1141 * the effect here can be done on demand, we probably don't want to 1133 * the effect here can be done on demand, we probably don't want to
1142 * give infinite exp by returning true in any cases. 1134 * give infinite exp by returning true in any cases.
1143 */ 1135 */
1144
1145int 1136int
1146pray (object *pl, object *skill) 1137pray (object *pl, object *skill)
1147{ 1138{
1148 char buf[MAX_BUF]; 1139 char buf[MAX_BUF];
1149 object *tmp; 1140 object *tmp;
… …
1174 if (pl->stats.grace < pl->stats.maxgrace) 1165 if (pl->stats.grace < pl->stats.maxgrace)
1175 { 1166 {
1176 pl->stats.grace++; 1167 pl->stats.grace++;
1177 pl->last_grace = -1; 1168 pl->last_grace = -1;
1178 } 1169 }
1170
1179 return 0; 1171 return 0;
1180} 1172}
1181 1173
1182/* This skill allows the player to regain a few sp or hp for a 1174/* This skill allows the player to regain a few sp or hp for a
1183 * brief period of concentration. No armour or weapons may be 1175 * brief period of concentration. No armour or weapons may be
1184 * wielded/applied for this to work. The amount of time needed 1176 * wielded/applied for this to work. The amount of time needed
1185 * to concentrate and the # of points regained is dependant on 1177 * to concentrate and the # of points regained is dependant on
1186 * the level of the user. - b.t. thomas@astro.psu.edu 1178 * the level of the user. - b.t. thomas@astro.psu.edu
1187 */ 1179 */
1188
1189void 1180void
1190meditate (object *pl, object *skill) 1181meditate (object *pl, object *skill)
1191{ 1182{
1192 object *tmp; 1183 object *tmp;
1193 1184
… …
1201 return; 1192 return;
1202 } 1193 }
1203 else 1194 else
1204 { 1195 {
1205 for (tmp = pl->inv; tmp; tmp = tmp->below) 1196 for (tmp = pl->inv; tmp; tmp = tmp->below)
1206 if (((tmp->type == ARMOUR && skill->level < 12) 1197 if (((tmp->type == ARMOUR && skill->level < 12)
1207 || (tmp->type == HELMET && skill->level < 10) 1198 || (tmp->type == HELMET && skill->level < 10)
1208 || (tmp->type == SHIELD && skill->level < 6) 1199 || (tmp->type == SHIELD && skill->level < 6)
1209 || (tmp->type == BOOTS && skill->level < 4) || (tmp->type == GLOVES && skill->level < 2)) && QUERY_FLAG (tmp, FLAG_APPLIED)) 1200 || (tmp->type == BOOTS && skill->level < 4)
1201 || (tmp->type == GLOVES && skill->level < 2))
1202 && QUERY_FLAG (tmp, FLAG_APPLIED))
1210 { 1203 {
1211 new_draw_info (NDI_UNIQUE, 0, pl, "You can't concentrate while wearing so much armour!\n"); 1204 new_draw_info (NDI_UNIQUE, 0, pl, "You can't concentrate while wearing so much armour!\n");
1212 return; 1205 return;
1213 } 1206 }
1214 } 1207 }
… …
1234 pl->last_heal = -1; 1227 pl->last_heal = -1;
1235 } 1228 }
1236} 1229}
1237 1230
1238/* write_note() - this routine allows players to inscribe messages in 1231/* write_note() - this routine allows players to inscribe messages in
1239 * ordinary 'books' (anything that is type BOOK). b.t. 1232 * ordinary inscribable 'books' (anything that is not a SPELL). b.t.
1240 */ 1233 */
1241
1242static int 1234static int
1243write_note (object *pl, object *item, const char *msg, object *skill) 1235write_note (object *pl, object *item, const char *msg, object *skill)
1244{ 1236{
1237
1238 if (strstr (msg, "\nendmsg"))
1239 {
1240 new_draw_info (NDI_UNIQUE, 0, pl, "Trying to cheat now are we?");
1241 return 0;
1242 }
1243
1244 int len = strlen (msg);
1245
1246 if (!is_utf8_string ((U8 *)msg, len))
1247 {
1248 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your message is garbled (text must be UTF-8, client-bug)!");
1249 return 0;
1250 }
1251
1252 if (INVOKE_OBJECT (INSCRIBE_NOTE, item, ARG_PLAYER (pl->contr), ARG_STRING (msg), ARG_OBJECT (skill)))
1253 return RESULT_INT (0);
1254
1245 char buf[1024]; 1255 char buf[1024];
1246 object *newBook = NULL;
1247 1256
1248 /* a pair of sanity checks */ 1257 if (len < sizeof (buf) - 2)
1249 if (!item || item->type != BOOK)
1250 return 0;
1251
1252 if (!msg)
1253 {
1254 new_draw_info (NDI_UNIQUE, 0, pl, "No message to write!");
1255 new_draw_info_format (NDI_UNIQUE, 0, pl, "Usage: use_skill %s <message>", &skill->skill);
1256 return 0;
1257 } 1258 {
1258 if (strcasestr_local (msg, "endmsg")) 1259 snprintf (buf, sizeof (buf), "%s\n", msg);
1259 {
1260 new_draw_info (NDI_UNIQUE, 0, pl, "Trying to cheat now are we?");
1261 return 0;
1262 }
1263 1260
1264 if (INVOKE_OBJECT (INSCRIBE_NOTE, item, ARG_PLAYER (pl->contr), ARG_STRING (msg), ARG_OBJECT (skill))) 1261 object *newbook = arch_to_object (item->other_arch);
1265 return strlen (msg); 1262 item->decrease ();
1266
1267 buf[0] = 0;
1268 if (!book_overflow (item->msg, msg, sizeof (buf)))
1269 { /* add msg string to book */
1270 if (item->msg)
1271 strcpy (buf, item->msg);
1272
1273 strcat (buf, msg);
1274 strcat (buf, "\n"); /* new msg needs a LF */
1275 if (item->nrof > 1)
1276 {
1277 newBook = get_object ();
1278 copy_object (item, newBook);
1279 decrease_ob (item);
1280 esrv_send_item (pl, item); 1263 esrv_send_item (pl, item);
1281 newBook->nrof = 1; 1264 newbook->nrof = 1;
1282 newBook->msg = buf; 1265 newbook->msg = buf;
1266 newbook->flag [FLAG_IDENTIFIED] = true;
1267
1268 if (item->subtype == 1) // mailscrolls
1269 {
1270 newbook->name = item->name;
1271 newbook->name_pl = item->name_pl;
1272 }
1273
1283 newBook = insert_ob_in_ob (newBook, pl); 1274 newbook = insert_ob_in_ob (newbook, pl);
1284 esrv_send_item (pl, newBook); 1275 esrv_send_item (pl, newbook);
1285 } 1276
1286 else 1277 pl->contr->play_sound (sound_find ("inscribe_success"));
1287 {
1288 item->msg = buf;
1289 /* This shouldn't be necessary - the object hasn't changed in any
1290 * visible way
1291 */
1292 /* esrv_send_item(pl, item); */
1293 }
1294 new_draw_info_format (NDI_UNIQUE, 0, pl, "You write in the %s.", query_short_name (item)); 1278 new_draw_info_format (NDI_UNIQUE, 0, pl, "You write in the %s.", &item->name);
1295 return strlen (msg); 1279 return strlen (msg);
1296 } 1280 }
1297 else 1281 else
1298 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your message won't fit in the %s!", query_short_name (item)); 1282 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your message won't fit in the %s!", &item->name);
1299 1283
1300 return 0; 1284 return 0;
1301} 1285}
1302 1286
1303/* write_scroll() - this routine allows players to inscribe spell scrolls 1287/* write_scroll() - this routine allows players to inscribe spell scrolls
1304 * of spells which they know. Backfire effects are possible with the 1288 * of spells which they know. Backfire effects are possible with the
1305 * severity of the backlash correlated with the difficulty of the scroll 1289 * severity of the backlash correlated with the difficulty of the scroll
1306 * that is attempted. -b.t. thomas@astro.psu.edu 1290 * that is attempted. -b.t. thomas@astro.psu.edu
1307 */ 1291 */
1308
1309static int 1292static int
1310write_scroll (object *pl, object *scroll, object *skill) 1293write_scroll (object *pl, object *scroll, object *skill)
1311{ 1294{
1312 int success = 0, confused = 0; 1295 int success = 0, confused = 0;
1313 object *newscroll, *chosen_spell, *tmp;
1314
1315 /* this is a sanity check */
1316 if (scroll->type != SCROLL)
1317 {
1318 new_draw_info (NDI_UNIQUE, 0, pl, "A spell can only be inscribed into a scroll!");
1319 return 0;
1320 }
1321 1296
1322 /* Check if we are ready to attempt inscription */ 1297 /* Check if we are ready to attempt inscription */
1323 chosen_spell = pl->contr->ranges[range_magic]; 1298 object *chosen_spell = pl->contr->ranged_ob;
1324 if (!chosen_spell) 1299
1300 if (!chosen_spell || chosen_spell->type != SPELL)
1325 { 1301 {
1326 new_draw_info (NDI_UNIQUE, 0, pl, "You need a spell readied in order to inscribe!"); 1302 new_draw_info (NDI_UNIQUE, 0, pl, "You need a spell readied in order to inscribe!");
1327 return 0; 1303 return 0;
1328 } 1304 }
1305
1329 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE) > pl->stats.grace) 1306 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE) > pl->stats.grace)
1330 { 1307 {
1331 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough grace to write a scroll of %s.", &chosen_spell->name); 1308 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough grace to write a scroll of %s.", &chosen_spell->name);
1332 return 0; 1309 return 0;
1333 } 1310 }
1311
1334 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA) > pl->stats.sp) 1312 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA) > pl->stats.sp)
1335 { 1313 {
1336 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough mana to write a scroll of %s.", &chosen_spell->name); 1314 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough mana to write a scroll of %s.", &chosen_spell->name);
1337 return 0;
1338 }
1339
1340 /* if there is a spell already on the scroll then player could easily
1341 * accidently read it while trying to write the new one. give player
1342 * a 50% chance to overwrite spell at their own level
1343 */
1344 if ((scroll->stats.sp || scroll->inv) && random_roll (0, scroll->level * 2, pl, PREFER_LOW) > skill->level)
1345 {
1346 new_draw_info_format (NDI_UNIQUE, 0, pl, "Oops! You accidently read it while trying to write on it.");
1347 manual_apply (pl, scroll, 0);
1348 return 0; 1315 return 0;
1349 } 1316 }
1350 1317
1351 /* ok, we are ready to try inscription */ 1318 /* ok, we are ready to try inscription */
1352 if (QUERY_FLAG (pl, FLAG_CONFUSED)) 1319 if (QUERY_FLAG (pl, FLAG_CONFUSED))
… …
1356 pl->stats.grace -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE); 1323 pl->stats.grace -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE);
1357 pl->stats.sp -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA); 1324 pl->stats.sp -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA);
1358 1325
1359 if (random_roll (0, chosen_spell->level * 4 - 1, pl, PREFER_LOW) < skill->level) 1326 if (random_roll (0, chosen_spell->level * 4 - 1, pl, PREFER_LOW) < skill->level)
1360 { 1327 {
1361 if (scroll->nrof > 1) 1328 object *newscroll = arch_to_object (scroll->other_arch);
1362 { 1329 scroll->decrease ();
1363 newscroll = get_object ();
1364 copy_object (scroll, newscroll);
1365 decrease_ob (scroll);
1366 newscroll->nrof = 1; 1330 newscroll->nrof = 1;
1367 } 1331
1368 else 1332 pl->contr->play_sound (sound_find ("inscribe_success"));
1369 {
1370 newscroll = scroll;
1371 }
1372 1333
1373 if (!confused) 1334 if (!confused)
1374 { 1335 {
1375 newscroll->level = MAX (skill->level, chosen_spell->level); 1336 newscroll->level = MAX (skill->level, chosen_spell->level);
1337 newscroll->flag [FLAG_IDENTIFIED] = true;
1376 new_draw_info (NDI_UNIQUE, 0, pl, "You succeed in writing a new scroll."); 1338 new_draw_info (NDI_UNIQUE, 0, pl, "You succeed in writing the spell.");
1377 } 1339 }
1378 else 1340 else
1379 { 1341 {
1380 chosen_spell = find_random_spell_in_ob (pl, NULL); 1342 chosen_spell = find_random_spell_in_ob (pl, NULL);
1381 if (!chosen_spell) 1343 if (!chosen_spell)
… …
1383 1345
1384 newscroll->level = MAX (skill->level, chosen_spell->level); 1346 newscroll->level = MAX (skill->level, chosen_spell->level);
1385 new_draw_info (NDI_UNIQUE, 0, pl, "In your confused state, you write down some odd spell."); 1347 new_draw_info (NDI_UNIQUE, 0, pl, "In your confused state, you write down some odd spell.");
1386 } 1348 }
1387 1349
1388 if (newscroll->inv) 1350 object *tmp = chosen_spell->clone ();
1389 {
1390 object *ninv;
1391
1392 ninv = newscroll->inv;
1393 remove_ob (ninv);
1394 free_object (ninv);
1395 }
1396 tmp = get_object ();
1397 copy_object (chosen_spell, tmp);
1398 insert_ob_in_ob (tmp, newscroll); 1351 insert_ob_in_ob (tmp, newscroll);
1399 1352
1400 /* Same code as from treasure.c - so they can better merge. 1353 /* Same code as from treasure.C - so they can better merge.
1401 * if players want to sell them, so be it. 1354 * if players want to sell them, so be it.
1402 */ 1355 */
1403 newscroll->value = newscroll->arch->clone.value * newscroll->inv->value * (newscroll->level + 50) / (newscroll->inv->level + 50); 1356 newscroll->value = newscroll->arch->value * newscroll->inv->value * (newscroll->level + 50) / (newscroll->inv->level + 50);
1404 newscroll->stats.exp = newscroll->value / 5; 1357 newscroll->stats.exp = newscroll->value / 5;
1405 1358
1406 /* wait until finished manipulating the scroll before inserting it */
1407 if (newscroll == scroll)
1408 {
1409 /* Remove to correctly merge with other items which may exist in inventory */
1410 remove_ob (newscroll);
1411 esrv_del_item (pl->contr, newscroll->count);
1412 }
1413 newscroll = insert_ob_in_ob (newscroll, pl); 1359 newscroll = insert_ob_in_ob (newscroll, pl);
1414 esrv_send_item (pl, newscroll); 1360 esrv_send_item (pl, newscroll);
1361
1415 success = calc_skill_exp (pl, newscroll, skill); 1362 success = calc_skill_exp (pl, newscroll, skill);
1416 if (!confused) 1363 if (!confused)
1417 success *= 2; 1364 success *= 2;
1365
1418 success = success * skill->level; 1366 success = success * skill->level;
1419 return success; 1367 return success;
1420
1421 } 1368 }
1422 else 1369 else
1423 { /* Inscription has failed */ 1370 { /* Inscription has failed */
1371 pl->contr->play_sound (sound_find ("inscribe_fail"));
1424 1372
1425 if (chosen_spell->level > skill->level || confused) 1373 if (chosen_spell->level > skill->level || confused)
1426 { /*backfire! */ 1374 { /*backfire! */
1427 new_draw_info (NDI_UNIQUE, 0, pl, "Ouch! Your attempt to write a new scroll strains your mind!"); 1375 new_draw_info (NDI_UNIQUE, 0, pl, "Ouch! Your attempt to write a new scroll strains your mind!");
1376
1428 if (random_roll (0, 1, pl, PREFER_LOW) == 1) 1377 if (random_roll (0, 1, pl, PREFER_LOW) == 1)
1429 drain_specific_stat (pl, 4); 1378 pl->drain_specific_stat (4);
1430 else 1379 else
1431 { 1380 {
1432 confuse_player (pl, pl, 99); 1381 confuse_player (pl, pl, 99);
1433 return (-30 * chosen_spell->level); 1382 return -30 * chosen_spell->level;
1434 } 1383 }
1435 } 1384 }
1436 else if (random_roll (0, pl->stats.Int - 1, pl, PREFER_HIGH) < 15) 1385 else if (random_roll (0, pl->stats.Int - 1, pl, PREFER_HIGH) < 15)
1437 { 1386 {
1438 new_draw_info (NDI_UNIQUE, 0, pl, "Your attempt to write a new scroll rattles your mind!"); 1387 new_draw_info (NDI_UNIQUE, 0, pl, "Your attempt to write a new scroll rattles your mind! H<Frankly spoken, you were too dumb and unlucky.>");
1439 confuse_player (pl, pl, 99); 1388 confuse_player (pl, pl, 99);
1440 } 1389 }
1441 else 1390 else
1442 new_draw_info (NDI_UNIQUE, 0, pl, "You fail to write a new scroll."); 1391 new_draw_info (NDI_UNIQUE, 0, pl, "You fail to write a new scroll. H<Try a lower-level spell, if possible at all.>");
1443 } 1392 }
1393
1444 return 0; 1394 return 0;
1445} 1395}
1446 1396
1447/* write_on_item() - wrapper for write_note and write_scroll */ 1397/* write_on_item() - wrapper for write_note and write_scroll */
1448int 1398int
1449write_on_item (object *pl, const char *params, object *skill) 1399write_on_item (object *pl, const char *params, object *skill)
1450{ 1400{
1451 object *item;
1452 const char *string = params;
1453 int msgtype;
1454 archetype *skat; 1401 archetype *skat;
1455 1402
1456 if (pl->type != PLAYER) 1403 if (pl->type != PLAYER)
1457 return 0; 1404 return 0;
1458 1405
1459 if (!params) 1406 if (!params)
1460 {
1461 params = ""; 1407 params = "";
1462 string = params; 1408
1463 }
1464 skat = get_archetype_by_type_subtype (SKILL, SK_LITERACY); 1409 skat = get_archetype_by_type_subtype (SKILL, SK_LITERACY);
1465 1410
1466 /* Need to be able to read before we can write! */ 1411 /* Need to be able to read before we can write! */
1467 if (!find_skill_by_name (pl, skat->clone.skill)) 1412 if (!find_skill_by_name (pl, skat->skill))
1468 { 1413 {
1469 new_draw_info (NDI_UNIQUE, 0, pl, "You must learn to read before you can write!"); 1414 new_draw_info (NDI_UNIQUE, 0, pl, "You must learn to read before you can write! H<You lack the literacy skill.>");
1470 return 0; 1415 return 0;
1471 } 1416 }
1472 1417
1473 /* if there is a message then it goes in a book and no message means 1418 object *item = find_marked_object (pl);
1474 * write active spell into the scroll
1475 */
1476 msgtype = (string[0] != '\0') ? BOOK : SCROLL;
1477 1419
1478 /* find an item of correct type to write on */ 1420 /* find an item of correct type to write on */
1479 if (!(item = find_marked_object (pl))) 1421 if (!item)
1422 {
1423 new_draw_info (NDI_UNIQUE, 0, pl, "You don't have any marked item to write on. H<Use the mark command or the popup menu to makr an item.>");
1424 return 0;
1480 { 1425 }
1481 new_draw_info (NDI_UNIQUE, 0, pl, "You don't have any marked item to write on."); 1426
1427 if (item->type != INSCRIBABLE)
1428 {
1429 new_draw_info_format (NDI_UNIQUE, 0, pl, "You cannot inscribe this! H<You can only inscribe empty scrolls and books.>");
1482 return 0; 1430 return 0;
1483 } 1431 }
1484 1432
1485 if (QUERY_FLAG (item, FLAG_UNPAID)) 1433 if (QUERY_FLAG (item, FLAG_UNPAID))
1486 { 1434 {
1487 new_draw_info (NDI_UNIQUE, 0, pl, "You had better pay for that before you write on it."); 1435 new_draw_info (NDI_UNIQUE, 0, pl, "You had better pay for that before you write on it.");
1488 return 0; 1436 return 0;
1489 } 1437 }
1490 if (msgtype != item->type) 1438
1439 if (item->other_arch->type == SCROLL)
1491 { 1440 {
1492 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no %s to write on", msgtype == BOOK ? "book" : "scroll"); 1441 if (*params)
1442 {
1443 // check readied scroll
1444 new_draw_info_format (NDI_UNIQUE, 0, pl,
1445 "When inscribing spells you need to ready a spell and do not specify a string argument.\n"
1446 "Usage: cast [spell name]; use_skill %s", &skill->skill);
1493 return 0; 1447 return 0;
1494 } 1448 }
1495 1449
1496 if (msgtype == SCROLL)
1497 {
1498 return write_scroll (pl, item, skill); 1450 return write_scroll (pl, item, skill);
1499 } 1451 }
1500 else if (msgtype == BOOK) 1452 else
1501 { 1453 {
1454 if (!*params)
1455 {
1456 new_draw_info_format (NDI_UNIQUE, 0, pl,
1457 "When inscribing books you need to specify the words you want to inscribe as command argument.\n"
1458 "Usage: use_skill %s <message>", &skill->skill);
1459 return 0;
1460 }
1461
1502 return write_note (pl, item, string, skill); 1462 return write_note (pl, item, params, skill);
1503 } 1463 }
1464
1504 return 0; 1465 return 0;
1505} 1466}
1506
1507
1508 1467
1509/* find_throw_ob() - if we request an object, then 1468/* find_throw_ob() - if we request an object, then
1510 * we search for it in the inventory of the owner (you've 1469 * we search for it in the inventory of the owner (you've
1511 * got to be carrying something in order to throw it!). 1470 * got to be carrying something in order to throw it!).
1512 * If we didnt request an object, then the top object in inventory 1471 * If we didnt request an object, then the top object in inventory
1513 * (that is "throwable", ie no throwing your skills away!) 1472 * (that is "throwable", ie no throwing your skills away!)
1514 * is the object of choice. Also check to see if object is 1473 * is the object of choice. Also check to see if object is
1515 * 'throwable' (ie not applied cursed obj, worn, etc). 1474 * 'throwable' (ie not applied cursed obj, worn, etc).
1516 */ 1475 */
1517
1518static object * 1476static object *
1519find_throw_ob (object *op, const char *request) 1477find_throw_ob (object *op, const char *request)
1520{ 1478{
1521 object *tmp; 1479 object *tmp;
1522 1480
… …
1594 1552
1595/* make_throw_ob() We construct the 'carrier' object in 1553/* make_throw_ob() We construct the 'carrier' object in
1596 * which we will insert the object that is being thrown. 1554 * which we will insert the object that is being thrown.
1597 * This combination becomes the 'thrown object'. -b.t. 1555 * This combination becomes the 'thrown object'. -b.t.
1598 */ 1556 */
1599
1600static object * 1557static object *
1601make_throw_ob (object *orig) 1558make_throw_ob (object *orig)
1602{ 1559{
1603 object *toss_item;
1604
1605 if (!orig) 1560 if (!orig)
1606 return NULL; 1561 return NULL;
1607 1562
1608 toss_item = get_object ();
1609 if (QUERY_FLAG (orig, FLAG_APPLIED)) 1563 if (QUERY_FLAG (orig, FLAG_APPLIED))
1610 { 1564 {
1611 LOG (llevError, "BUG: make_throw_ob(): ob is applied\n"); 1565 LOG (llevError, "BUG: make_throw_ob(): ob is applied\n");
1612 /* insufficient workaround, but better than nothing */ 1566 /* insufficient workaround, but better than nothing */
1613 CLEAR_FLAG (orig, FLAG_APPLIED); 1567 CLEAR_FLAG (orig, FLAG_APPLIED);
1614 } 1568 }
1615 copy_object (orig, toss_item); 1569
1570 object *toss_item = orig->clone ();
1571
1616 toss_item->type = THROWN_OBJ; 1572 toss_item->type = THROWN_OBJ;
1617 CLEAR_FLAG (toss_item, FLAG_CHANGING); 1573 CLEAR_FLAG (toss_item, FLAG_CHANGING);
1618 toss_item->stats.dam = 0; /* default damage */ 1574 toss_item->stats.dam = 0; /* default damage */
1619 insert_ob_in_ob (orig, toss_item); 1575 toss_item->insert (orig);
1576
1620 return toss_item; 1577 return toss_item;
1621} 1578}
1622
1623 1579
1624/* do_throw() - op throws any object toss_item. This code 1580/* do_throw() - op throws any object toss_item. This code
1625 * was borrowed from fire_bow. 1581 * was borrowed from fire_bow.
1626 * Returns 1 if skill was successfully used, 0 if not 1582 * Returns 1 if skill was successfully used, 0 if not
1627 */ 1583 */
1628
1629static int 1584static int
1630do_throw (object *op, object *part, object *toss_item, int dir, object *skill) 1585do_throw (object *op, object *part, object *toss_item, int dir, object *skill)
1631{ 1586{
1632 object *throw_ob = toss_item, *left = NULL; 1587 object *throw_ob = toss_item, *left = NULL;
1633 int eff_str = 0, maxc, str = op->stats.Str, dam = 0; 1588 int eff_str = 0, maxc, str = op->stats.Str, dam = 0;
… …
1698 */ 1653 */
1699 mflags = get_map_flags (part->map, &m, part->x + freearr_x[dir], part->y + freearr_y[dir], &sx, &sy); 1654 mflags = get_map_flags (part->map, &m, part->x + freearr_x[dir], part->y + freearr_y[dir], &sx, &sy);
1700 1655
1701 if (!dir || (eff_str <= 1) || (mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, sx, sy) & MOVE_FLY_LOW)) 1656 if (!dir || (eff_str <= 1) || (mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, sx, sy) & MOVE_FLY_LOW))
1702 { 1657 {
1703
1704 /* bounces off 'wall', and drops to feet */ 1658 /* bounces off 'wall', and drops to feet */
1705 remove_ob (throw_ob); 1659 throw_ob->insert_at (part, op);
1706 throw_ob->x = part->x; 1660
1707 throw_ob->y = part->y;
1708 insert_ob_in_map (throw_ob, part->map, op, 0);
1709 if (op->type == PLAYER) 1661 if (op->type == PLAYER)
1710 { 1662 {
1711 if (eff_str <= 1) 1663 if (eff_str <= 1)
1712 {
1713 new_draw_info_format (NDI_UNIQUE, 0, op, "Your load is so heavy you drop %s to the ground.", query_name (throw_ob)); 1664 new_draw_info_format (NDI_UNIQUE, 0, op, "Your load is so heavy you drop %s to the ground.", query_name (throw_ob));
1714 }
1715 else if (!dir) 1665 else if (!dir)
1716 {
1717 new_draw_info_format (NDI_UNIQUE, 0, op, "You throw %s at the ground.", query_name (throw_ob)); 1666 new_draw_info_format (NDI_UNIQUE, 0, op, "You throw %s at the ground.", query_name (throw_ob));
1718 }
1719 else 1667 else
1720 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1668 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
1721 } 1669 }
1670
1722 return 0; 1671 return 0;
1723 } /* if object can't be thrown */ 1672 } /* if object can't be thrown */
1724 1673
1725 left = throw_ob; /* these are throwing objects left to the player */ 1674 left = throw_ob; /* these are throwing objects left to the player */
1726 1675
1727 /* sometimes get_split_ob can't split an object (because op->nrof==0?) 1676 /* sometimes get_split_ob can't split an object (because op->nrof==0?)
1728 * and returns NULL. We must use 'left' then 1677 * and returns NULL. We must use 'left' then
1729 */ 1678 */
1730 1679 if (!(throw_ob = throw_ob->split ()))
1731 if ((throw_ob = get_split_ob (throw_ob, 1)) == NULL)
1732 { 1680 {
1733 throw_ob = left; 1681 throw_ob = left;
1734 remove_ob (left); 1682 left->remove ();
1735 if (op->type == PLAYER)
1736 esrv_del_item (op->contr, left->count);
1737 }
1738 else if (op->type == PLAYER)
1739 {
1740 if (left->destroyed ())
1741 esrv_del_item (op->contr, left->count);
1742 else
1743 esrv_update_item (UPD_NROF, op, left);
1744 } 1683 }
1745 1684
1746 /* special case: throwing powdery substances like dust, dirt */ 1685 /* special case: throwing powdery substances like dust, dirt */
1747 if (throw_ob->type == POTION && throw_ob->subtype == POT_DUST) 1686 if (throw_ob->type == POTION && throw_ob->subtype == POT_DUST)
1748 { 1687 {
… …
1763 { 1702 {
1764 insert_ob_in_ob (throw_ob, op); 1703 insert_ob_in_ob (throw_ob, op);
1765 return 0; 1704 return 0;
1766 } 1705 }
1767 1706
1768 set_owner (throw_ob, op); 1707 throw_ob->set_owner (op);
1769 /* At some point in the attack code, the actual real object (op->inv) 1708 /* At some point in the attack code, the actual real object (op->inv)
1770 * becomes the hitter. As such, we need to make sure that has a proper 1709 * becomes the hitter. As such, we need to make sure that has a proper
1771 * owner value so exp goes to the right place. 1710 * owner value so exp goes to the right place.
1772 */ 1711 */
1773 set_owner (throw_ob->inv, op); 1712 throw_ob->inv->set_owner (op);
1774 throw_ob->direction = dir; 1713 throw_ob->direction = dir;
1775 throw_ob->x = part->x;
1776 throw_ob->y = part->y;
1777 1714
1778 /* the damage bonus from the force of the throw */ 1715 /* the damage bonus from the force of the throw */
1779 dam = (int) (str_factor * dam_bonus[eff_str]); 1716 dam = int (str_factor * dam_bonus[eff_str]);
1780 1717
1781 /* Now, lets adjust the properties of the thrown_ob. */ 1718 /* Now, lets adjust the properties of the thrown_ob. */
1782 1719
1783 /* how far to fly */ 1720 /* how far to fly */
1784 throw_ob->last_sp = (eff_str * 3) / 5; 1721 throw_ob->last_sp = (eff_str * 3) / 5;
1785 1722
1786 /* speed */ 1723 /* speed */
1787 throw_ob->speed = (speed_bonus[eff_str] + 1.0) / 1.5; 1724 throw_ob->set_speed (min (1.0, speed_bonus[eff_str] + 1.0) / 1.5); /* no faster than an arrow! */
1788 throw_ob->speed = MIN (1.0, throw_ob->speed); /* no faster than an arrow! */
1789 1725
1790 /* item damage. Eff_str and item weight influence damage done */ 1726 /* item damage. Eff_str and item weight influence damage done */
1791 weight_f = (throw_ob->weight / 2000) > MAX_STAT ? MAX_STAT : (throw_ob->weight / 2000); 1727 weight_f = (throw_ob->weight / 2000) > MAX_STAT ? MAX_STAT : (throw_ob->weight / 2000);
1792 throw_ob->stats.dam += (dam / 3) + dam_bonus[weight_f] + (throw_ob->weight / 15000) - 2; 1728 throw_ob->stats.dam += (dam / 3) + dam_bonus[weight_f] + (throw_ob->weight / 15000) - 2;
1793 1729
1794 /* chance of breaking. Proportional to force used and weight of item */ 1730 /* chance of breaking. Proportional to force used and weight of item */
1795 throw_ob->stats.food = (dam / 2) + (throw_ob->weight / 60000); 1731 throw_ob->stats.food = (dam / 2) + (throw_ob->weight / 60000);
1796 1732
1797 /* replace 25 with a call to clone.arch wc? messes up w/ NPC */ 1733 /* replace 25 with a call to clone.arch wc? messes up w/ NPC */
1798 throw_ob->stats.wc = 25 - dex_bonus[op->stats.Dex] - thaco_bonus[eff_str] - skill->level; 1734 throw_ob->stats.wc = 25 - dex_bonus[op->stats.Dex] - thaco_bonus[eff_str] - skill->level;
1799
1800 1735
1801 /* the properties of objects which are meant to be thrown (ie dart, 1736 /* the properties of objects which are meant to be thrown (ie dart,
1802 * throwing knife, etc) will differ from ordinary items. Lets tailor 1737 * throwing knife, etc) will differ from ordinary items. Lets tailor
1803 * this stuff in here. 1738 * this stuff in here.
1804 */ 1739 */
… …
1812 if (GET_ANIM_ID (throw_ob) && NUM_ANIMATIONS (throw_ob)) 1747 if (GET_ANIM_ID (throw_ob) && NUM_ANIMATIONS (throw_ob))
1813 SET_ANIMATION (throw_ob, dir); 1748 SET_ANIMATION (throw_ob, dir);
1814 } 1749 }
1815 else 1750 else
1816 { 1751 {
1752 uint16 mat = throw_ob->materials;
1753
1817 /* some materials will adjust properties.. */ 1754 /* some materials will adjust properties.. */
1818 if (throw_ob->material & M_LEATHER) 1755 if (mat & M_LEATHER)
1819 { 1756 {
1820 throw_ob->stats.dam -= 1; 1757 throw_ob->stats.dam -= 1;
1821 throw_ob->stats.food -= 10; 1758 throw_ob->stats.food -= 10;
1822 } 1759 }
1760
1823 if (throw_ob->material & M_GLASS) 1761 if (mat & M_GLASS)
1824 throw_ob->stats.food += 60; 1762 throw_ob->stats.food += 60;
1825 1763
1826 if (throw_ob->material & M_ORGANIC) 1764 if (mat & M_ORGANIC)
1827 { 1765 {
1828 throw_ob->stats.dam -= 3; 1766 throw_ob->stats.dam -= 3;
1829 throw_ob->stats.food += 55; 1767 throw_ob->stats.food += 55;
1830 } 1768 }
1831 if (throw_ob->material & M_PAPER || throw_ob->material & M_CLOTH) 1769
1770 if (mat & M_PAPER || mat & M_CLOTH)
1832 { 1771 {
1833 throw_ob->stats.dam -= 5; 1772 throw_ob->stats.dam -= 5;
1834 throw_ob->speed *= 0.8; 1773 throw_ob->speed *= 0.8;
1835 throw_ob->stats.wc += 3; 1774 throw_ob->stats.wc += 3;
1836 throw_ob->stats.food -= 30; 1775 throw_ob->stats.food -= 30;
1837 } 1776 }
1777
1838 /* light obj have more wind resistance, fly slower */ 1778 /* light obj have more wind resistance, fly slower */
1839 if (throw_ob->weight > 500) 1779 if (throw_ob->weight > 500)
1840 throw_ob->speed *= 0.8; 1780 throw_ob->speed *= 0.8;
1781
1841 if (throw_ob->weight > 50) 1782 if (throw_ob->weight > 50)
1842 throw_ob->speed *= 0.5; 1783 throw_ob->speed *= 0.5;
1843
1844 } /* else tailor thrown object */ 1784 } /* else tailor thrown object */
1845 1785
1846 /* some limits, and safeties (needed?) */ 1786 /* some limits, and safeties (needed?) */
1847 if (throw_ob->stats.dam < 0) 1787 if (throw_ob->stats.dam < 0)
1848 throw_ob->stats.dam = 0; 1788 throw_ob->stats.dam = 0;
… …
1868 * In short summary, a throw can take anywhere between speed 5 and 1808 * In short summary, a throw can take anywhere between speed 5 and
1869 * speed 0.5 1809 * speed 0.5
1870 */ 1810 */
1871 op->speed_left -= 50 / pause_f; 1811 op->speed_left -= 50 / pause_f;
1872 1812
1873 update_ob_speed (throw_ob);
1874 throw_ob->speed_left = 0; 1813 throw_ob->speed_left = 0;
1875 throw_ob->map = part->map; 1814 throw_ob->map = part->map;
1876 1815
1877 throw_ob->move_type = MOVE_FLY_LOW; 1816 throw_ob->move_type = MOVE_FLY_LOW;
1878 throw_ob->move_on = MOVE_FLY_LOW | MOVE_WALK; 1817 throw_ob->move_on = MOVE_FLY_LOW | MOVE_WALK;
… …
1888 LOG (llevDebug, " pause_f=%d \n", pause_f); 1827 LOG (llevDebug, " pause_f=%d \n", pause_f);
1889 LOG (llevDebug, " %s stats: wc=%d dam=%d dist=%d spd=%f break=%d\n", 1828 LOG (llevDebug, " %s stats: wc=%d dam=%d dist=%d spd=%f break=%d\n",
1890 throw_ob->name, throw_ob->stats.wc, throw_ob->stats.dam, throw_ob->last_sp, throw_ob->speed, throw_ob->stats.food); 1829 throw_ob->name, throw_ob->stats.wc, throw_ob->stats.dam, throw_ob->last_sp, throw_ob->speed, throw_ob->stats.food);
1891 LOG (llevDebug, "inserting tossitem (%d) into map\n", throw_ob->count); 1830 LOG (llevDebug, "inserting tossitem (%d) into map\n", throw_ob->count);
1892#endif 1831#endif
1893 insert_ob_in_map (throw_ob, part->map, op, 0); 1832
1833 throw_ob->insert_at (part, op);
1894 1834
1895 if (!throw_ob->destroyed ()) 1835 if (!throw_ob->destroyed ())
1896 move_arrow (throw_ob); 1836 move_arrow (throw_ob);
1897 1837
1898 return 1; 1838 return 1;

Diff Legend

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