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.77 by root, Fri Mar 19 17:48:49 2010 UTC vs.
Revision 1.96 by elmex, Thu Apr 28 14:58:08 2011 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
42 /* Only prohibit stealing if the player does not have a free 42 /* Only prohibit stealing if the player does not have a free
43 * hand available and in fact does have hands. 43 * hand available and in fact does have hands.
44 */ 44 */
45 if (op->type == PLAYER && op->slot[body_arm].used <= 0 && op->slot[body_arm].info) 45 if (op->type == PLAYER && op->slot[body_arm].used <= 0 && op->slot[body_arm].info)
46 { 46 {
47 new_draw_info (NDI_UNIQUE, 0, op, "But you have no free hands to steal with! " 47 op->failmsg ("But you have no free hands to steal with! "
48 "H<Try to unapply weapons or things you hold in your hands, use the C<body> command.>"); 48 "H<Try to unapply weapons or things you hold in your hands, use the C<body> command.>");
49 return -1; 49 return -1;
50 } 50 }
51 51
52 /* ADJUSTMENTS */ 52 /* ADJUSTMENTS */
53 53
54 /* It's harder to steal from hostile beings! */ 54 /* It's harder to steal from hostile beings! */
55 if (!QUERY_FLAG (victim, FLAG_UNAGGRESSIVE)) 55 if (!victim->flag [FLAG_UNAGGRESSIVE])
56 roll = roll / 2; 56 roll = roll / 2;
57 57
58 /* Easier to steal from sleeping beings, or if the thief is 58 /* Easier to steal from sleeping beings, or if the thief is
59 * unseen */ 59 * unseen */
60 if (QUERY_FLAG (victim, FLAG_SLEEP)) 60 if (victim->flag [FLAG_SLEEP])
61 roll = roll * 3; 61 roll = roll * 3;
62 else if (op->invisible) 62 else if (op->invisible)
63 roll = roll * 2; 63 roll = roll * 2;
64 64
65 /* check stealing 'encumberance'. Having this equipment applied makes 65 /* check stealing 'encumberance'. Having this equipment applied makes
66 * it quite a bit harder to steal. 66 * it quite a bit harder to steal.
67 */ 67 */
68 for (equip = op->inv; equip; equip = equip->below) 68 for (equip = op->inv; equip; equip = equip->below)
69 { 69 {
70 if (equip->type == WEAPON && QUERY_FLAG (equip, FLAG_APPLIED)) 70 if (equip->type == WEAPON && equip->flag [FLAG_APPLIED])
71 roll -= equip->weight / 10000; 71 roll -= equip->weight / 10000;
72 72
73 if (equip->type == BOW && QUERY_FLAG (equip, FLAG_APPLIED)) 73 if (equip->type == BOW && equip->flag [FLAG_APPLIED])
74 roll -= equip->weight / 5000; 74 roll -= equip->weight / 5000;
75 75
76 if (equip->type == SHIELD && QUERY_FLAG (equip, FLAG_APPLIED)) 76 if (equip->type == SHIELD && equip->flag [FLAG_APPLIED])
77 roll -= equip->weight / 2000; 77 roll -= equip->weight / 2000;
78 78
79 if (equip->type == ARMOUR && QUERY_FLAG (equip, FLAG_APPLIED)) 79 if (equip->type == ARMOUR && equip->flag [FLAG_APPLIED])
80 roll -= equip->weight / 5000; 80 roll -= equip->weight / 5000;
81 81
82 if (equip->type == GLOVES && QUERY_FLAG (equip, FLAG_APPLIED)) 82 if (equip->type == GLOVES && equip->flag [FLAG_APPLIED])
83 roll -= equip->weight / 100; 83 roll -= equip->weight / 100;
84 } 84 }
85 85
86 if (roll < 0) 86 if (roll < 0)
87 roll = 0; 87 roll = 0;
… …
114 if (!op->is_player () && op->flag [FLAG_NO_STEAL]) 114 if (!op->is_player () && op->flag [FLAG_NO_STEAL])
115 { 115 {
116 if (can_detect_enemy (op, who, &rv)) 116 if (can_detect_enemy (op, who, &rv))
117 { 117 {
118 npc_call_help (op); 118 npc_call_help (op);
119 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE); 119 op->clr_flag (FLAG_UNAGGRESSIVE);
120 new_draw_info (NDI_UNIQUE, 0, who, "Your attempt is prevented!"); 120 who->failmsg ("Your attempt is prevented!");
121 return 0; 121 return 0;
122 } 122 }
123 else /* help npc to detect thief next time by raising its wisdom */ 123 else /* help npc to detect thief next time by raising its wisdom */
124 op->stats.Wis += (op->stats.Int / 5) + 1; 124 op->stats.Wis += (op->stats.Int / 5) + 1;
125 125
… …
127 op->stats.Wis = MAX_STAT; 127 op->stats.Wis = MAX_STAT;
128 } 128 }
129 129
130 if (op->is_player () && op->flag [FLAG_WIZ]) 130 if (op->is_player () && op->flag [FLAG_WIZ])
131 { 131 {
132 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from the dungeon master!\n"); 132 who->failmsg ("You can't steal from the dungeon master!\n");
133 return 0; 133 return 0;
134 } 134 }
135 135
136 // only allow stealing between hostile players (TODO: probably should change) 136 // only allow stealing between hostile players (TODO: probably should change)
137 if (op->is_player () && who->is_player () && (who->contr->peaceful || op->contr->peaceful)) 137 if (op->is_player () && who->is_player () && (who->contr->peaceful || op->contr->peaceful))
138 { 138 {
139 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from other players!\n"); 139 who->failmsg ("You can't steal from other players!\n");
140 return 0; 140 return 0;
141 } 141 }
142 142
143 /* Ok then, go through their inventory, stealing */ 143 /* Ok then, go through their inventory, stealing */
144 for (tmp = op->inv; tmp; tmp = next) 144 for (tmp = op->inv; tmp; tmp = next)
… …
153 * future possible problems. -b.t. 153 * future possible problems. -b.t.
154 * Flesh items generated w/ fix_flesh_item should have FLAG_NO_STEAL 154 * Flesh items generated w/ fix_flesh_item should have FLAG_NO_STEAL
155 * already -b.t. 155 * already -b.t.
156 */ 156 */
157 157
158 if (QUERY_FLAG (tmp, FLAG_APPLIED) 158 if (tmp->flag [FLAG_APPLIED]
159 || !tmp->type 159 || !tmp->type
160 || tmp->type == SPELL 160 || tmp->type == SPELL
161 || QUERY_FLAG (tmp, FLAG_STARTEQUIP) 161 || tmp->flag [FLAG_STARTEQUIP]
162 || QUERY_FLAG (tmp, FLAG_NO_STEAL) 162 || tmp->flag [FLAG_NO_STEAL]
163 || tmp->invisible) 163 || tmp->invisible)
164 continue; 164 continue;
165 165
166 /* Okay, try stealing this item. Dependent on dexterity of thief, 166 /* Okay, try stealing this item. Dependent on dexterity of thief,
167 * skill level, see the adj_stealroll fctn for more detail. 167 * skill level, see the adj_stealroll fctn for more detail.
… …
181 */ 181 */
182 if (tmp->destroyed () || tmp->env != op) 182 if (tmp->destroyed () || tmp->env != op)
183 { 183 {
184 /* for players, play_sound: steals item */ 184 /* for players, play_sound: steals item */
185 success = tmp; 185 success = tmp;
186 CLEAR_FLAG (tmp, FLAG_INV_LOCKED); 186 tmp->clr_flag (FLAG_INV_LOCKED);
187 } 187 }
188 188
189 break; 189 break;
190 } 190 }
191 } /* for loop looking for an item */ 191 } /* for loop looking for an item */
… …
215 { 215 {
216 npc_call_help (op); 216 npc_call_help (op);
217 new_draw_info_format (NDI_UNIQUE, 0, who, "%s notices your attempted pilfering!", query_name (op)); 217 new_draw_info_format (NDI_UNIQUE, 0, who, "%s notices your attempted pilfering!", query_name (op));
218 } 218 }
219 219
220 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE); 220 op->clr_flag (FLAG_UNAGGRESSIVE);
221 /* all remaining npc items are guarded now. Set flag NO_STEAL 221 /* all remaining npc items are guarded now. Set flag NO_STEAL
222 * on the victim. 222 * on the victim.
223 */ 223 */
224 SET_FLAG (op, FLAG_NO_STEAL); 224 op->set_flag (FLAG_NO_STEAL);
225 } 225 }
226 else 226 else
227 { /* stealing from another player */ 227 { /* stealing from another player */
228 char buf[MAX_BUF]; 228 char buf[MAX_BUF];
229 229
… …
287 * the 'head' coz 'tail' objects have no inventory! - b.t. 287 * the 'head' coz 'tail' objects have no inventory! - b.t.
288 */ 288 */
289 if (tmp->head) 289 if (tmp->head)
290 tmp = tmp->head; 290 tmp = tmp->head;
291 291
292 if (tmp->type != PLAYER && !QUERY_FLAG (tmp, FLAG_MONSTER)) 292 if (tmp->type != PLAYER && !tmp->flag [FLAG_MONSTER])
293 continue; 293 continue;
294 294
295 /* do not reveal hidden DMs */ 295 /* do not reveal hidden DMs */
296 if (tmp->type == PLAYER && QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden) 296 if (tmp->type == PLAYER && tmp->flag [FLAG_WIZ] && tmp->contr->hidden)
297 continue; 297 continue;
298 298
299 if (attempt_steal (tmp, op, skill)) 299 if (attempt_steal (tmp, op, skill))
300 { 300 {
301 if (tmp->type == PLAYER) /* no xp for stealing from another player */ 301 if (tmp->type == PLAYER) /* no xp for stealing from another player */
302 return 0; 302 return 0;
303 303
304 /* no xp for stealing from pets (of players) */ 304 /* no xp for stealing from pets (of players) */
305 if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->attack_movement == PETMOVE) 305 if (tmp->flag [FLAG_FRIENDLY] && tmp->attack_movement == PETMOVE)
306 { 306 {
307 object *owner = tmp->owner; 307 object *owner = tmp->owner;
308 308
309 if (owner && owner->type == PLAYER) 309 if (owner && owner->type == PLAYER)
310 return 0; 310 return 0;
… …
364 dir = pl->facing; 364 dir = pl->facing;
365 365
366 /* For all the stacked objects at this point find a door */ 366 /* For all the stacked objects at this point find a door */
367 if (out_of_map (pl->map, x, y)) 367 if (out_of_map (pl->map, x, y))
368 { 368 {
369 new_draw_info (NDI_UNIQUE, 0, pl, "There is no lock there."); 369 pl->failmsg ("There is no lock there.");
370 return 0; 370 return 0;
371 } 371 }
372 372
373 for (tmp = GET_MAP_OB (pl->map, x, y); tmp; tmp = tmp->above) 373 for (tmp = GET_MAP_OB (pl->map, x, y); tmp; tmp = tmp->above)
374 if (tmp->type == DOOR || tmp->type == LOCKED_DOOR) 374 if (tmp->type == DOOR || tmp->type == LOCKED_DOOR)
375 break; 375 break;
376 376
377 if (!tmp) 377 if (!tmp)
378 { 378 {
379 new_draw_info (NDI_UNIQUE, 0, pl, "There is no lock there."); 379 pl->failmsg ("There is no lock there.");
380 return 0; 380 return 0;
381 } 381 }
382
382 if (tmp->type == LOCKED_DOOR) 383 if (tmp->type == LOCKED_DOOR)
383 { 384 {
384 new_draw_info (NDI_UNIQUE, 0, pl, "You can't pick that lock!"); 385 pl->failmsg ("You can't pick that lock! H<You need the right key, no matter how skilled you might be.>");
385 return 0; 386 return 0;
386 } 387 }
387 388
388 if (!tmp->move_block) 389 if (!tmp->move_block)
389 { 390 {
390 new_draw_info (NDI_UNIQUE, 0, pl, "The door has no lock!"); 391 pl->failmsg ("The door has no lock!");
391 return 0; 392 return 0;
392 } 393 }
393 394
394 if (attempt_pick_lock (tmp, pl, skill)) 395 if (attempt_pick_lock (tmp, pl, skill))
395 { 396 {
… …
444hide (object *op, object *skill) 445hide (object *op, object *skill)
445{ 446{
446 /* the preliminaries -- Can we really hide now? */ 447 /* the preliminaries -- Can we really hide now? */
447 /* this keeps monsters from using invisibilty spells and hiding */ 448 /* this keeps monsters from using invisibilty spells and hiding */
448 449
449 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 450 if (op->flag [FLAG_MAKE_INVIS])
450 { 451 {
451 new_draw_info (NDI_UNIQUE, 0, op, "You don't need to hide while invisible!"); 452 new_draw_info (NDI_UNIQUE, 0, op, "You don't need to hide while invisible!");
452 return 0; 453 return 0;
453 } 454 }
454 else if (!op->flag [FLAG_HIDDEN] && op->invisible > 0 && op->type == PLAYER) 455 else if (!op->flag [FLAG_HIDDEN] && op->invisible > 0 && op->type == PLAYER)
… …
518 } 519 }
519 520
520 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 521 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
521 { 522 {
522 /* Jump into creature */ 523 /* Jump into creature */
523 if (QUERY_FLAG (tmp, FLAG_MONSTER) 524 if (tmp->flag [FLAG_MONSTER]
524 || (tmp->type == PLAYER && (!QUERY_FLAG (tmp, FLAG_WIZ) || !tmp->contr->hidden))) 525 || (tmp->type == PLAYER && (!tmp->flag [FLAG_WIZ] || !tmp->contr->hidden)))
525 { 526 {
526 new_draw_info_format (NDI_UNIQUE, 0, pl, "You jump into %s%s.", tmp->type == PLAYER ? "" : "the ", &tmp->name); 527 new_draw_info_format (NDI_UNIQUE, 0, pl, "You jump into %s%s.", tmp->type == PLAYER ? "" : "the ", &tmp->name);
527 528
528 stop_jump (pl, i, spaces); 529 stop_jump (pl, i, spaces);
529 530
… …
579 int stats = str * str * str * dex * skill->level; 580 int stats = str * str * str * dex * skill->level;
580 int spaces = min (3, skill->level, stats / (pl->carrying + 1)); 581 int spaces = min (3, skill->level, stats / (pl->carrying + 1));
581 582
582 if (spaces == 0) 583 if (spaces == 0)
583 { 584 {
584 new_draw_info (NDI_UNIQUE, 0, pl, "You are carrying too much weight to jump."); 585 pl->failmsg ("You are carrying too much weight to jump.");
585 return 0; 586 return 0;
586 } 587 }
587 588
588 return attempt_jump (pl, dir, spaces, skill); 589 return attempt_jump (pl, dir, spaces, skill);
589} 590}
… …
598 * - b.t. (thomas@astro.psu.edu) 599 * - b.t. (thomas@astro.psu.edu)
599 */ 600 */
600static int 601static int
601do_skill_detect_curse (object *pl, object *skill) 602do_skill_detect_curse (object *pl, object *skill)
602{ 603{
603 object *tmp;
604 int success = 0; 604 int success = 0;
605 605
606 for (tmp = pl->inv; tmp; tmp = tmp->below) 606 for (object *tmp = pl->inv; tmp; tmp = tmp->below)
607 if (!tmp->invisible 607 if (!tmp->invisible
608 && !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) 608 && tmp->need_identify ()
609 && (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->item_power < skill->level) 609 && !tmp->flag [FLAG_IDENTIFIED] && !tmp->flag [FLAG_KNOWN_CURSED]
610 && (tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED])
611 && tmp->item_power < skill->level)
610 { 612 {
611 SET_FLAG (tmp, FLAG_KNOWN_CURSED); 613 tmp->set_flag (FLAG_KNOWN_CURSED);
612 esrv_update_item (UPD_FLAGS, pl, tmp); 614 esrv_update_item (UPD_FLAGS, pl, tmp);
613 success += calc_skill_exp (pl, tmp, skill); 615 success += calc_skill_exp (pl, tmp, skill);
614 } 616 }
615 617
616 /* Check ground, too, but only objects the player could pick up */ 618 /* Check ground, too, but only objects the player could pick up */
617 for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp; tmp = tmp->above) 619 for (object *tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp; tmp = tmp->above)
618 if (can_pick (pl, tmp) && 620 if (can_pick (pl, tmp)
619 !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && 621 && tmp->need_identify ()
620 !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) 622 && !tmp->flag [FLAG_IDENTIFIED] && !tmp->flag [FLAG_KNOWN_CURSED]
621 && (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->item_power < skill->level) 623 && (tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED])
624 && tmp->item_power < skill->level)
622 { 625 {
623 SET_FLAG (tmp, FLAG_KNOWN_CURSED); 626 tmp->set_flag (FLAG_KNOWN_CURSED);
624 esrv_update_item (UPD_FLAGS, pl, tmp); 627 esrv_update_item (UPD_FLAGS, pl, tmp);
625 success += calc_skill_exp (pl, tmp, skill); 628 success += calc_skill_exp (pl, tmp, skill);
626 } 629 }
627 630
628 return success; 631 return success;
629} 632}
630 633
631static int 634static int
632do_skill_detect_magic (object *pl, object *skill) 635do_skill_detect_magic (object *pl, object *skill)
633{ 636{
634 object *tmp;
635 int success = 0; 637 int success = 0;
636 638
637 for (tmp = pl->inv; tmp; tmp = tmp->below) 639 for (object *tmp = pl->inv; tmp; tmp = tmp->below)
638 if (!tmp->invisible 640 if (!tmp->invisible
639 && !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) 641 && tmp->need_identify ()
642 && !tmp->flag [FLAG_IDENTIFIED] && !tmp->flag [FLAG_KNOWN_MAGICAL]
643 && is_magical (tmp)
640 && (is_magical (tmp)) && tmp->item_power < skill->level) 644 && tmp->item_power < skill->level)
641 { 645 {
642 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL); 646 tmp->set_flag (FLAG_KNOWN_MAGICAL);
643 esrv_update_item (UPD_FLAGS, pl, tmp); 647 esrv_update_item (UPD_FLAGS, pl, tmp);
644 success += calc_skill_exp (pl, tmp, skill); 648 success += calc_skill_exp (pl, tmp, skill);
645 } 649 }
646 650
647 /* Check ground, too, but like above, only if the object can be picked up */ 651 /* Check ground, too, but like above, only if the object can be picked up */
648 for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp; tmp = tmp->above) 652 for (object *tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp; tmp = tmp->above)
649 if (can_pick (pl, tmp) && 653 if (can_pick (pl, tmp)
650 !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && (is_magical (tmp)) && tmp->item_power < skill->level) 654 && tmp->need_identify ()
655 && !tmp->flag [FLAG_IDENTIFIED] && !tmp->flag [FLAG_KNOWN_MAGICAL]
656 && is_magical (tmp)
657 && tmp->item_power < skill->level)
651 { 658 {
652 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL); 659 tmp->set_flag (FLAG_KNOWN_MAGICAL);
653 esrv_update_item (UPD_FLAGS, pl, tmp); 660 esrv_update_item (UPD_FLAGS, pl, tmp);
654 success += calc_skill_exp (pl, tmp, skill); 661 success += calc_skill_exp (pl, tmp, skill);
655 } 662 }
656 663
657 return success; 664 return success;
… …
664do_skill_ident2 (object *tmp, object *pl, int obj_class, object *skill) 671do_skill_ident2 (object *tmp, object *pl, int obj_class, object *skill)
665{ 672{
666 int success = 0, chance; 673 int success = 0, chance;
667 int skill_value = skill->level * pl->stats.Int ? pl->stats.Int : 10; 674 int skill_value = skill->level * pl->stats.Int ? pl->stats.Int : 10;
668 675
669 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT) 676 if (!tmp->flag [FLAG_IDENTIFIED]
670 && need_identify (tmp) && !tmp->invisible && tmp->type == obj_class) 677 && !tmp->flag [FLAG_NO_SKILL_IDENT]
678 && tmp->need_identify ()
679 && !tmp->invisible
680 && tmp->type == obj_class)
671 { 681 {
672 chance = die_roll (3, 10, pl, PREFER_LOW) - 3 + rndm (0, (tmp->magic ? tmp->magic * 5 : 1) - 1); 682 chance = die_roll (3, 10, pl, PREFER_LOW) - 3 + rndm (0, (tmp->magic ? tmp->magic * 5 : 1) - 1);
673 683
674 if (skill_value >= chance) 684 if (skill_value >= chance)
675 { 685 {
… …
687 } 697 }
688 698
689 success += calc_skill_exp (pl, tmp, skill); 699 success += calc_skill_exp (pl, tmp, skill);
690 } 700 }
691 else 701 else
692 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); 702 tmp->set_flag (FLAG_NO_SKILL_IDENT);
693 } 703 }
694 704
695 return success; 705 return success;
696} 706}
697 707
… …
757 break; 767 break;
758 768
759 case SK_DET_CURSE: 769 case SK_DET_CURSE:
760 success = do_skill_detect_curse (pl, skill); 770 success = do_skill_detect_curse (pl, skill);
761 if (success) 771 if (success)
762 new_draw_info (NDI_UNIQUE, 0, pl, "...and discover cursed items!"); 772 new_draw_info (NDI_UNIQUE, 0, pl, "... and discover cursed items!");
763 break; 773 break;
764 774
765 case SK_DET_MAGIC: 775 case SK_DET_MAGIC:
766 success = do_skill_detect_magic (pl, skill); 776 success = do_skill_detect_magic (pl, skill);
767 if (success) 777 if (success)
768 new_draw_info (NDI_UNIQUE, 0, pl, "...and discover items imbued with mystic forces!"); 778 new_draw_info (NDI_UNIQUE, 0, pl, "... and discover items imbued with mystic forces!");
769 break; 779 break;
770 780
771 default: 781 default:
772 LOG (llevError, "Error: bad call to skill_ident()\n"); 782 LOG (llevError, "Error: bad call to skill_ident()\n");
773 return 0; 783 return 0;
774 break;
775 } 784 }
776 785
777 if (!success) 786 if (!success)
778 new_draw_info (NDI_UNIQUE, 0, pl, "...and learn nothing more."); 787 new_draw_info (NDI_UNIQUE, 0, pl, "... and learn nothing more.");
779 788
780 return success; 789 return success;
781} 790}
782 791
783/* players using this skill can 'charm' a monster -- 792/* players using this skill can 'charm' a monster --
… …
789use_oratory (object *pl, int dir, object *skill) 798use_oratory (object *pl, int dir, object *skill)
790{ 799{
791 if (pl->type != PLAYER) 800 if (pl->type != PLAYER)
792 return 0; /* only players use this skill */ 801 return 0; /* only players use this skill */
793 802
803 if (!dir)
804 {
805 pl->failmsg ("In what direction?");
806 return 0;
807 }
808
794 sint16 x = pl->x + freearr_x[dir], 809 sint16 x = pl->x + freearr_x[dir],
795 y = pl->y + freearr_y[dir]; 810 y = pl->y + freearr_y[dir];
796 maptile *m = pl->map; 811 maptile *m = pl->map;
797 812
798 int mflags = get_map_flags (m, &m, x, y, &x, &y); 813 int mflags = get_map_flags (m, &m, x, y, &x, &y);
… …
801 816
802 /* Save some processing - we have the flag already anyways 817 /* Save some processing - we have the flag already anyways
803 */ 818 */
804 if (!(mflags & P_IS_ALIVE)) 819 if (!(mflags & P_IS_ALIVE))
805 { 820 {
806 new_draw_info (NDI_UNIQUE, 0, pl, "There is nothing to orate to."); 821 pl->failmsg ("There is nothing to orate to.");
807 return 0; 822 return 0;
808 } 823 }
809 824
810 object *tmp; 825 object *tmp;
811 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 826 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
… …
819 if (tmp->type == PLAYER 834 if (tmp->type == PLAYER
820 || tmp->more || tmp->head_ () != tmp 835 || tmp->more || tmp->head_ () != tmp
821 || tmp->msg) 836 || tmp->msg)
822 return 0; 837 return 0;
823 838
824 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 839 if (tmp->flag [FLAG_MONSTER])
825 break; 840 break;
826 } 841 }
827 842
828 if (!tmp) 843 if (!tmp)
829 { 844 {
830 new_draw_info (NDI_UNIQUE, 0, pl, "There is nothing to orate to."); 845 pl->failmsg ("There is nothing to orate to.");
831 return 0; 846 return 0;
832 } 847 }
833 848
834 new_draw_info_format (NDI_UNIQUE, 0, pl, "You orate to the %s.", query_name (tmp)); 849 new_draw_info_format (NDI_UNIQUE, 0, pl, "You orate to the %s.", query_name (tmp));
835 850
836 /* the following conditions limit who may be 'charmed' */ 851 /* the following conditions limit who may be 'charmed' */
837 852
838 /* it's hostile! */ 853 /* it's hostile! */
839 if (!QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY)) 854 if (!tmp->flag [FLAG_UNAGGRESSIVE] && !tmp->flag [FLAG_FRIENDLY])
840 { 855 {
841 new_draw_info_format (NDI_UNIQUE, 0, pl, "Too bad the %s isn't listening!\n", query_name (tmp)); 856 new_draw_info_format (NDI_UNIQUE, 0, pl, "Too bad the %s isn't listening!\n", query_name (tmp));
842 return 0; 857 return 0;
843 } 858 }
844 859
845 /* it's already allied! */ 860 /* it's already allied! */
846 if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->attack_movement == PETMOVE) 861 if (tmp->flag [FLAG_FRIENDLY] && tmp->attack_movement == PETMOVE)
847 { 862 {
848 if (tmp->owner == pl) 863 if (tmp->owner == pl)
849 { 864 {
850 new_draw_info (NDI_UNIQUE, 0, pl, "Your follower loves your speech.\n"); 865 new_draw_info (NDI_UNIQUE, 0, pl, "Your follower loves your speech.\n");
851 return 0; 866 return 0;
… …
882 tmp->set_owner (pl); 897 tmp->set_owner (pl);
883 tmp->skill = skill->skill; 898 tmp->skill = skill->skill;
884 tmp->stats.exp = 0; 899 tmp->stats.exp = 0;
885 tmp->attack_movement = PETMOVE; 900 tmp->attack_movement = PETMOVE;
886 901
887 if (!QUERY_FLAG (tmp, FLAG_FRIENDLY)) 902 if (!tmp->flag [FLAG_FRIENDLY])
888 add_friendly_object (tmp); 903 add_friendly_object (tmp);
889 904
890 return calc_skill_exp (pl, tmp, skill); 905 return calc_skill_exp (pl, tmp, skill);
891 } 906 }
892 /* Charm failed. Creature may be angry now */ 907 /* Charm failed. Creature may be angry now */
893 else if ((skill->level + ((pl->stats.Cha - 10) / 2)) < random_roll (1, 2 * tmp->level, pl, PREFER_LOW)) 908 else if ((skill->level + ((pl->stats.Cha - 10) / 2)) < random_roll (1, 2 * tmp->level, pl, PREFER_LOW))
894 { 909 {
895 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your speech angers the %s!\n", query_name (tmp)); 910 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your speech angers the %s!\n", query_name (tmp));
896 if (QUERY_FLAG (tmp, FLAG_FRIENDLY)) 911 if (tmp->flag [FLAG_FRIENDLY])
897 { 912 {
898 remove_friendly_object (tmp); 913 remove_friendly_object (tmp);
899 tmp->attack_movement = 0; /* needed? */ 914 tmp->attack_movement = 0; /* needed? */
900 } 915 }
901 916
902 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 917 tmp->clr_flag (FLAG_UNAGGRESSIVE);
903 } 918 }
904 919
905 return 0; /* Fall through - if we get here, we didn't charm anything */ 920 return 0; /* Fall through - if we get here, we didn't charm anything */
906} 921}
907 922
… …
923 sint16 x, y; 938 sint16 x, y;
924 939
925 if (pl->type != PLAYER) 940 if (pl->type != PLAYER)
926 return 0; /* only players use this skill */ 941 return 0; /* only players use this skill */
927 942
943 if (!dir)
944 {
945 pl->failmsg ("In what direction?");
946 return 0;
947 }
948
928 new_draw_info_format (NDI_UNIQUE, 0, pl, "You sing."); 949 new_draw_info_format (NDI_UNIQUE, 0, pl, "You sing.");
950 for (int i = skill->level >= SIZEOFFREE1 ? 0 : dir;
929 for (i = 0; i < min (skill->level, SIZEOFFREE); i++) 951 i < min (skill->level, SIZEOFFREE);
952 i++)
930 { 953 {
931 x = pl->x + freearr_x[i]; 954 x = pl->x + freearr_x[i];
932 y = pl->y + freearr_y[i]; 955 y = pl->y + freearr_y[i];
933 m = pl->map; 956 m = pl->map;
934 957
… …
938 if (!(mflags & P_IS_ALIVE)) 961 if (!(mflags & P_IS_ALIVE))
939 continue; 962 continue;
940 963
941 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 964 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
942 { 965 {
943 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 966 if (tmp->flag [FLAG_MONSTER])
944 break; 967 break;
945 /* can't affect players */ 968 /* can't affect players */
946 if (tmp->type == PLAYER) 969 if (tmp->type == PLAYER)
947 break; 970 break;
948 } 971 }
949 972
950 /* Whole bunch of checks to see if this is a type of monster that would 973 /* Whole bunch of checks to see if this is a type of monster that would
951 * listen to singing. 974 * listen to singing.
952 */ 975 */
953 if (tmp && QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_NO_STEAL) && /* Been charmed or abused before */ 976 if (tmp && tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_NO_STEAL] && /* Been charmed or abused before */
954 !QUERY_FLAG (tmp, FLAG_SPLITTING) && /* no ears */ 977 !tmp->flag [FLAG_SPLITTING] && /* no ears */
955 !QUERY_FLAG (tmp, FLAG_HITBACK) && /* was here before */ 978 !tmp->flag [FLAG_HITBACK] && /* was here before */
956 (tmp->level <= skill->level) && (!tmp->head) && !QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && /* already calm */ 979 (tmp->level <= skill->level) && (!tmp->head) && !tmp->flag [FLAG_UNDEAD] && !tmp->flag [FLAG_UNAGGRESSIVE] && /* already calm */
957 !QUERY_FLAG (tmp, FLAG_FRIENDLY)) 980 !tmp->flag [FLAG_FRIENDLY])
958 { /* already calm */ 981 { /* already calm */
959 982
960 /* stealing isn't really related (although, maybe it should 983 /* stealing isn't really related (although, maybe it should
961 * be). This is mainly to prevent singing to the same monster 984 * be). This is mainly to prevent singing to the same monster
962 * over and over again and getting exp for it. 985 * over and over again and getting exp for it.
963 */ 986 */
964 int level = skill->level + (pl->stats.Cha - 5 - tmp->stats.Int) / 2; 987 int level = skill->level + (pl->stats.Cha - 5 - tmp->stats.Int) / 2;
965 988
966 if (level && tmp->level < random_roll (0, level - 1, pl, PREFER_HIGH)) 989 if (level && tmp->level < random_roll (0, level - 1, pl, PREFER_HIGH))
967 { 990 {
968 SET_FLAG (tmp, FLAG_UNAGGRESSIVE); 991 tmp->set_flag (FLAG_UNAGGRESSIVE);
969 new_draw_info_format (NDI_UNIQUE, 0, pl, "You calm down the %s\n", query_name (tmp)); 992 new_draw_info_format (NDI_UNIQUE, 0, pl, "You calm down the %s\n", query_name (tmp));
970 /* Give exp only if they are not aware */ 993 /* Give exp only if they are not aware */
971 994
972 if (!QUERY_FLAG (tmp, FLAG_NO_STEAL)) 995 if (!tmp->flag [FLAG_NO_STEAL])
973 exp += calc_skill_exp (pl, tmp, skill); 996 exp += calc_skill_exp (pl, tmp, skill);
974 997
975 SET_FLAG (tmp, FLAG_NO_STEAL); 998 tmp->set_flag (FLAG_NO_STEAL);
976 } 999 }
977 else 1000 else
978 { 1001 {
979 new_draw_info_format (NDI_UNIQUE, 0, pl, "Too bad the %s isn't listening!\n", query_name (tmp)); 1002 new_draw_info_format (NDI_UNIQUE, 0, pl, "Too bad the %s isn't listening!\n", query_name (tmp));
980 SET_FLAG (tmp, FLAG_NO_STEAL); 1003 tmp->set_flag (FLAG_NO_STEAL);
981 } 1004 }
982 } 1005 }
983 } 1006 }
984 return exp; 1007 return exp;
985} 1008}
… …
1014 /* And now we'd better do an inventory traversal of each 1037 /* And now we'd better do an inventory traversal of each
1015 * of these objects' inventory 1038 * of these objects' inventory
1016 * We can narrow this down a bit - no reason to search through 1039 * We can narrow this down a bit - no reason to search through
1017 * the players inventory or monsters for that matter. 1040 * the players inventory or monsters for that matter.
1018 */ 1041 */
1019 if (tmp->type != PLAYER && !QUERY_FLAG (tmp, FLAG_MONSTER)) 1042 if (tmp->type != PLAYER && !tmp->flag [FLAG_MONSTER])
1020 for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below) 1043 for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below)
1021 if (tmp2->type == RUNE || tmp2->type == TRAP) 1044 if (tmp2->type == RUNE || tmp2->type == TRAP)
1022 if (trap_see (pl, tmp2)) 1045 if (trap_see (pl, tmp2))
1023 { 1046 {
1024 trap_show (tmp2, tmp); 1047 trap_show (tmp2, tmp);
… …
1075 /* And now we'd better do an inventory traversal of each 1098 /* And now we'd better do an inventory traversal of each
1076 * of these objects inventory. Like above, only 1099 * of these objects inventory. Like above, only
1077 * do this for interesting objects. 1100 * do this for interesting objects.
1078 */ 1101 */
1079 1102
1080 if (tmp->type != PLAYER && !QUERY_FLAG (tmp, FLAG_MONSTER)) 1103 if (tmp->type != PLAYER && !tmp->flag [FLAG_MONSTER])
1081 { 1104 {
1082 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below) 1105 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1083 if ((tmp2->type == RUNE || tmp2->type == TRAP) && tmp2->stats.Cha <= 1) 1106 if ((tmp2->type == RUNE || tmp2->type == TRAP) && tmp2->stats.Cha <= 1)
1084 { 1107 {
1085 trap_show (tmp2, tmp); 1108 trap_show (tmp2, tmp);
… …
1166 1189
1167 if (pl->type != PLAYER) 1190 if (pl->type != PLAYER)
1168 return; /* players only */ 1191 return; /* players only */
1169 1192
1170 /* check if pl has removed encumbering armour and weapons */ 1193 /* check if pl has removed encumbering armour and weapons */
1171 if (QUERY_FLAG (pl, FLAG_READY_WEAPON) && (skill->level < 6)) 1194 if (pl->flag [FLAG_READY_WEAPON] && skill->level < 6)
1172 { 1195 {
1173 new_draw_info (NDI_UNIQUE, 0, pl, "You can't concentrate while wielding a weapon!\n"); 1196 pl->failmsg ("You can't concentrate while wielding a weapon!\n");
1174 return; 1197 return;
1175 } 1198 }
1176 else 1199 else
1177 { 1200 {
1178 for (tmp = pl->inv; tmp; tmp = tmp->below) 1201 for (tmp = pl->inv; tmp; tmp = tmp->below)
1179 if (((tmp->type == ARMOUR && skill->level < 12) 1202 if (((tmp->type == ARMOUR && skill->level < 12)
1180 || (tmp->type == HELMET && skill->level < 10) 1203 || (tmp->type == HELMET && skill->level < 10)
1181 || (tmp->type == SHIELD && skill->level < 6) 1204 || (tmp->type == SHIELD && skill->level < 6)
1182 || (tmp->type == BOOTS && skill->level < 4) 1205 || (tmp->type == BOOTS && skill->level < 4)
1183 || (tmp->type == GLOVES && skill->level < 2)) 1206 || (tmp->type == GLOVES && skill->level < 2))
1184 && QUERY_FLAG (tmp, FLAG_APPLIED)) 1207 && tmp->flag [FLAG_APPLIED])
1185 { 1208 {
1186 new_draw_info (NDI_UNIQUE, 0, pl, "You can't concentrate while wearing so much armour!\n"); 1209 pl->failmsg ("You can't concentrate while wearing so much armour!\n");
1187 return; 1210 return;
1188 } 1211 }
1189 } 1212 }
1190 1213
1191 /* ok let's meditate! Spell points are regained first, then once 1214 /* ok let's meditate! Spell points are regained first, then once
… …
1216static int 1239static int
1217write_note (object *pl, object *item, const char *msg, object *skill) 1240write_note (object *pl, object *item, const char *msg, object *skill)
1218{ 1241{
1219 if (!msg_is_safe (msg)) 1242 if (!msg_is_safe (msg))
1220 { 1243 {
1221 new_draw_info (NDI_UNIQUE, 0, pl, "Trying to cheat now are we?"); 1244 pl->failmsg ("Trying to cheat now are we? H<@-signs are not allowed in notes.>");
1222 LOG (llevInfo, "write_note: player %s tried to write bogus note %s\n", &pl->name, msg); 1245 LOG (llevInfo, "write_note: player %s tried to write bogus note %s\n", &pl->name, msg);
1223 return 0; 1246 return 0;
1224 } 1247 }
1225 1248
1226 int len = strlen (msg); 1249 int len = strlen (msg);
1227 1250
1228 if (!is_utf8_string ((U8 *)msg, len)) 1251 if (!is_utf8_string ((U8 *)msg, len))
1229 { 1252 {
1230 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your message is garbled (text must be UTF-8, client-bug)!"); 1253 pl->failmsg ("Your message is garbled (text must be UTF-8, client-bug)!");
1231 return 0; 1254 return 0;
1232 } 1255 }
1233 1256
1234 if (INVOKE_OBJECT (INSCRIBE_NOTE, item, ARG_PLAYER (pl->contr), ARG_STRING (msg), ARG_OBJECT (skill))) 1257 if (INVOKE_OBJECT (INSCRIBE_NOTE, item, ARG_PLAYER (pl->contr), ARG_STRING (msg), ARG_OBJECT (skill)))
1235 return RESULT_INT (0); 1258 return RESULT_INT (0);
… …
1276 /* Check if we are ready to attempt inscription */ 1299 /* Check if we are ready to attempt inscription */
1277 object *chosen_spell = pl->contr->ranged_ob; 1300 object *chosen_spell = pl->contr->ranged_ob;
1278 1301
1279 if (!chosen_spell || chosen_spell->type != SPELL) 1302 if (!chosen_spell || chosen_spell->type != SPELL)
1280 { 1303 {
1281 new_draw_info (NDI_UNIQUE, 0, pl, "You need a spell readied in order to inscribe!"); 1304 pl->failmsg ("You need a spell readied in order to inscribe!");
1282 return 0; 1305 return 0;
1283 } 1306 }
1284 1307
1285 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE) > pl->stats.grace) 1308 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE) > pl->stats.grace)
1286 { 1309 {
1287 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough grace to write a scroll of %s.", &chosen_spell->name); 1310 pl->failmsgf ("You don't have enough grace to write a scroll of %s.", &chosen_spell->name);
1288 return 0; 1311 return 0;
1289 } 1312 }
1290 1313
1291 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA) > pl->stats.sp) 1314 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA) > pl->stats.sp)
1292 { 1315 {
1293 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough mana to write a scroll of %s.", &chosen_spell->name); 1316 pl->failmsgf ("You don't have enough mana to write a scroll of %s.", &chosen_spell->name);
1294 return 0; 1317 return 0;
1295 } 1318 }
1296 1319
1297 /* ok, we are ready to try inscription */ 1320 /* ok, we are ready to try inscription */
1298 if (QUERY_FLAG (pl, FLAG_CONFUSED)) 1321 if (pl->flag [FLAG_CONFUSED])
1299 confused = 1; 1322 confused = 1;
1300 1323
1301 /* Lost mana/grace no matter what */ 1324 /* Lost mana/grace no matter what */
1302 pl->stats.grace -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE); 1325 pl->stats.grace -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE);
1303 pl->stats.sp -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA); 1326 pl->stats.sp -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA);
… …
1391 { 1414 {
1392 new_draw_info (NDI_UNIQUE, 0, pl, "You must learn to read before you can write! H<You lack the literacy skill.>"); 1415 new_draw_info (NDI_UNIQUE, 0, pl, "You must learn to read before you can write! H<You lack the literacy skill.>");
1393 return 0; 1416 return 0;
1394 } 1417 }
1395 1418
1396 object *item = find_marked_object (pl); 1419 object *item = pl->mark ();
1397 1420
1398 /* find an item of correct type to write on */ 1421 /* find an item of correct type to write on */
1399 if (!item) 1422 if (!item)
1400 { 1423 {
1401 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 make an item.>"); 1424 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 make an item.>");
… …
1406 { 1429 {
1407 new_draw_info_format (NDI_UNIQUE, 0, pl, "You cannot inscribe this! H<You can only inscribe empty scrolls and books.>"); 1430 new_draw_info_format (NDI_UNIQUE, 0, pl, "You cannot inscribe this! H<You can only inscribe empty scrolls and books.>");
1408 return 0; 1431 return 0;
1409 } 1432 }
1410 1433
1411 if (QUERY_FLAG (item, FLAG_UNPAID)) 1434 if (item->flag [FLAG_UNPAID])
1412 { 1435 {
1413 new_draw_info (NDI_UNIQUE, 0, pl, "You had better pay for that before you write on it."); 1436 new_draw_info (NDI_UNIQUE, 0, pl, "You had better pay for that before you write on it.");
1414 return 0; 1437 return 0;
1415 } 1438 }
1416 1439
1417 if (item->other_arch->type == SCROLL) 1440 if (item->other_arch->type == SCROLL)
1418 { 1441 {
1419 if (*params) 1442 if (*params)
1420 { 1443 {
1421 // check readied scroll 1444 // check readied scroll
1422 new_draw_info_format (NDI_UNIQUE, 0, pl,
1423 "When inscribing spells you need to ready a spell and do not specify a string argument.\n" 1445 pl->failmsgf ("When inscribing spells you need to ready a spell and do not specify a string argument.\n"
1424 "Usage: cast [spell name]; use_skill %s", &skill->skill); 1446 "Usage: cast [spell name]; use_skill %s", &skill->skill);
1425 return 0; 1447 return 0;
1426 } 1448 }
1427 1449
1428 return write_scroll (pl, item, skill); 1450 return write_scroll (pl, item, skill);
1429 } 1451 }
1430 else 1452 else
1431 { 1453 {
1432 if (!*params) 1454 if (!*params)
1433 { 1455 {
1434 new_draw_info_format (NDI_UNIQUE, 0, pl,
1435 "When inscribing books you need to specify the words you want to inscribe as command argument.\n" 1456 pl->failmsgf ("When inscribing books you need to specify the words you want to inscribe as command argument.\n"
1436 "Usage: use_skill %s <message>", &skill->skill); 1457 "Usage: use_skill %s <message>", &skill->skill);
1437 return 0; 1458 return 0;
1438 } 1459 }
1439 1460
1440 return write_note (pl, item, params, skill); 1461 return write_note (pl, item, params, skill);
1441 } 1462 }
… …
1452 * 'throwable' (ie not applied cursed obj, worn, etc). 1473 * 'throwable' (ie not applied cursed obj, worn, etc).
1453 */ 1474 */
1454static object * 1475static object *
1455find_throw_ob (object *op, const char *request) 1476find_throw_ob (object *op, const char *request)
1456{ 1477{
1457 object *tmp;
1458
1459 if (!op)
1460 { /* safety */
1461 LOG (llevError, "find_throw_ob(): confused! have a NULL thrower!\n");
1462 return (object *) NULL;
1463 }
1464
1465 /* prefer marked item */ 1478 /* prefer marked item */
1466 tmp = find_marked_object (op); 1479 object *tmp = op->mark ();
1467 if (tmp != NULL) 1480
1468 {
1469 /* can't toss invisible or inv-locked items */ 1481 /* can't toss invisible or inv-locked items */
1470 if (tmp->invisible || QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 1482 if (tmp && (tmp->invisible || tmp->flag [FLAG_INV_LOCKED]))
1471 { 1483 tmp = 0;
1472 tmp = NULL;
1473 }
1474 }
1475 1484
1476 /* look through the inventory */ 1485 /* look through the inventory */
1477 if (tmp == NULL) 1486 if (!tmp)
1478 {
1479 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1487 for (tmp = op->inv; tmp; tmp = tmp->below)
1480 { 1488 {
1481 /* can't toss invisible or inv-locked items */ 1489 /* can't toss invisible or inv-locked items */
1482 if (tmp->invisible || QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 1490 if (tmp->invisible || tmp->flag [FLAG_INV_LOCKED])
1483 continue; 1491 continue;
1492
1484 if (!request || !strcmp (query_name (tmp), request) || !strcmp (&tmp->name, request)) 1493 if (!request || !strcmp (query_name (tmp), request) || !strcmp (&tmp->name, request))
1485 break; 1494 break;
1486 } 1495 }
1487 }
1488 1496
1489 /* this should prevent us from throwing away 1497 /* this should prevent us from throwing away
1490 * cursed items, worn armour, etc. Only weapons 1498 * cursed items, worn armour, etc. Only weapons
1491 * can be thrown from 'hand'. 1499 * can be thrown from 'hand'.
1492 */ 1500 */
1493 if (!tmp) 1501 if (!tmp)
1494 return NULL; 1502 return 0;
1495 1503
1496 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 1504 if (tmp->flag [FLAG_APPLIED])
1497 { 1505 {
1498 if (tmp->type != WEAPON) 1506 if (tmp->type != WEAPON)
1499 { 1507 {
1500 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't throw %s.", query_name (tmp)); 1508 op->failmsgf ("You can't throw %s. H<Unapply it first.>", query_name (tmp));
1501 tmp = NULL; 1509 tmp = 0;
1502 }
1503 else if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
1504 { 1510 }
1511 else if (tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED])
1512 {
1505 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s sticks to your hand!", query_name (tmp)); 1513 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s sticks to your hand! H<Cursed or damned items cannot be removed.>", query_name (tmp));
1506 tmp = NULL; 1514 tmp = 0;
1507 } 1515 }
1508 else 1516 else
1509 { 1517 {
1510 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 1518 if (!op->apply (tmp, AP_UNAPPLY))
1511 { 1519 {
1512 LOG (llevError, "BUG: find_throw_ob(): couldn't unapply\n"); 1520 LOG (llevError, "BUG: find_throw_ob(): couldn't unapply\n");
1513 tmp = NULL; 1521 tmp = 0;
1514 } 1522 }
1515 } 1523 }
1516 } 1524 }
1517 else if (QUERY_FLAG (tmp, FLAG_UNPAID)) 1525 else if (tmp->flag [FLAG_UNPAID])
1518 { 1526 {
1519 new_draw_info_format (NDI_UNIQUE, 0, op, "You should pay for the %s first.", query_name (tmp)); 1527 op->failmsgf ("You should pay for the %s first.", query_name (tmp));
1520 tmp = NULL; 1528 tmp = 0;
1521 } 1529 }
1522 1530
1523 if (tmp && QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 1531 //TODO: why not chekc first and give sensible message to player?
1532 if (tmp && tmp->flag [FLAG_INV_LOCKED])
1524 { 1533 {
1525 LOG (llevError, "BUG: find_throw_ob(): object is locked\n"); 1534 LOG (llevError, "BUG: find_throw_ob(): object is locked\n");
1526 tmp = NULL; 1535 tmp = 0;
1527 } 1536 }
1537
1528 return tmp; 1538 return tmp;
1529} 1539}
1530 1540
1531/* make_throw_ob() We construct the 'carrier' object in 1541/* make_throw_ob() We construct the 'carrier' object in
1532 * which we will insert the object that is being thrown. 1542 * which we will insert the object that is being thrown.
… …
1536make_throw_ob (object *orig) 1546make_throw_ob (object *orig)
1537{ 1547{
1538 if (!orig) 1548 if (!orig)
1539 return 0; 1549 return 0;
1540 1550
1541 if (QUERY_FLAG (orig, FLAG_APPLIED)) 1551 if (orig->flag [FLAG_APPLIED])
1542 { 1552 {
1543 LOG (llevError, "BUG: make_throw_ob(): ob is applied\n"); 1553 LOG (llevError, "BUG: make_throw_ob(): ob is applied\n");
1544 /* insufficient workaround, but better than nothing */ 1554 /* insufficient workaround, but better than nothing */
1545 CLEAR_FLAG (orig, FLAG_APPLIED); 1555 orig->clr_flag (FLAG_APPLIED);
1546 } 1556 }
1547 1557
1548 object *toss_item = orig->clone (); 1558 object *toss_item = orig->clone ();
1549 1559
1550 toss_item->type = THROWN_OBJ; 1560 toss_item->type = THROWN_OBJ;
1551 CLEAR_FLAG (toss_item, FLAG_CHANGING); 1561 toss_item->clr_flag (FLAG_CHANGING);
1552 toss_item->stats.dam = 0; /* default damage */ 1562 toss_item->stats.dam = 0; /* default damage */
1553 toss_item->insert (orig); 1563 toss_item->insert (orig);
1554 1564
1555 return toss_item; 1565 return toss_item;
1556} 1566}
… …
1567 int pause_f, weight_f = 0, mflags; 1577 int pause_f, weight_f = 0, mflags;
1568 float str_factor = 1.0, load_factor = 1.0, item_factor = 1.0; 1578 float str_factor = 1.0, load_factor = 1.0, item_factor = 1.0;
1569 maptile *m; 1579 maptile *m;
1570 sint16 sx, sy; 1580 sint16 sx, sy;
1571 1581
1572 if (throw_ob == NULL) 1582 if (!throw_ob)
1573 {
1574 if (op->type == PLAYER)
1575 new_draw_info (NDI_UNIQUE, 0, op, "You have nothing to throw.");
1576
1577 return 0;
1578 } 1583 {
1579 if (QUERY_FLAG (throw_ob, FLAG_STARTEQUIP)) 1584 op->failmsg ("You have nothing to throw.");
1585 return 0;
1580 { 1586 }
1581 if (op->type == PLAYER) 1587
1582 new_draw_info (NDI_UNIQUE, 0, op, "The gods won't let you throw that."); 1588 if (throw_ob->flag [FLAG_STARTEQUIP])
1589 {
1590 op->failmsg ("The gods won't let you throw that. "
1591 "H<Well, they would, but they would retrieve it "
1592 "- you wouldn't want that, would you?>");
1583 1593
1584 return 0; 1594 return 0;
1585 } 1595 }
1586 1596
1587 /* Because throwing effectiveness must be reduced by the 1597 /* Because throwing effectiveness must be reduced by the
… …
1604 /* lighter items are thrown harder, farther, faster */ 1614 /* lighter items are thrown harder, farther, faster */
1605 if (throw_ob->weight > 0) 1615 if (throw_ob->weight > 0)
1606 item_factor = (float) maxc / (float) (3.0 * throw_ob->weight); 1616 item_factor = (float) maxc / (float) (3.0 * throw_ob->weight);
1607 else 1617 else
1608 { /* 0 or negative weight?!? Odd object, can't throw it */ 1618 { /* 0 or negative weight?!? Odd object, can't throw it */
1609 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't throw %s.\n", query_name (throw_ob)); 1619 op->failmsgf ("You can't throw %s. H<Better report this to your dungeon master.>\n", query_name (throw_ob));
1610 return 0; 1620 return 0;
1611 } 1621 }
1612 1622
1613 eff_str = (int) (str * (load_factor < 1.0 ? load_factor : 1.0)); 1623 eff_str = (str * (load_factor < 1.0 ? load_factor : 1.0))
1614 eff_str = (int) ((float) eff_str * item_factor * str_factor); 1624 * item_factor * str_factor;
1615 1625
1616 /* alas, arrays limit us to a value of MAX_STAT (30). Use str_factor to 1626 /* alas, arrays limit us to a value of MAX_STAT (30). Use str_factor to
1617 * account for super-strong throwers. */ 1627 * account for super-strong throwers. */
1618 if (eff_str > MAX_STAT) 1628 min_it (eff_str, MAX_STAT);
1619 eff_str = MAX_STAT;
1620 1629
1621#ifdef DEBUG_THROW 1630#ifdef DEBUG_THROW
1622 LOG (llevDebug, "%s carries %d, eff_str=%d\n", op->name, op->carrying, eff_str); 1631 LOG (llevDebug, "%s carries %d, eff_str=%d\n", op->name, op->carrying, eff_str);
1623 LOG (llevDebug, " max_c=%d, item_f=%f, load_f=%f, str=%d\n", maxc, item_factor, load_factor, op->stats.Str); 1632 LOG (llevDebug, " max_c=%d, item_f=%f, load_f=%f, str=%d\n", maxc, item_factor, load_factor, op->stats.Str);
1624 LOG (llevDebug, " str_factor=%f\n", str_factor); 1633 LOG (llevDebug, " str_factor=%f\n", str_factor);
… …
1714 /* the properties of objects which are meant to be thrown (ie dart, 1723 /* the properties of objects which are meant to be thrown (ie dart,
1715 * throwing knife, etc) will differ from ordinary items. Lets tailor 1724 * throwing knife, etc) will differ from ordinary items. Lets tailor
1716 * this stuff in here. 1725 * this stuff in here.
1717 */ 1726 */
1718 1727
1719 if (QUERY_FLAG (throw_ob->inv, FLAG_IS_THROWN)) 1728 if (throw_ob->inv->flag [FLAG_IS_THROWN])
1720 { 1729 {
1721 throw_ob->last_sp += eff_str / 3; /* fly a little further */ 1730 throw_ob->last_sp += eff_str / 3; /* fly a little further */
1722 throw_ob->stats.dam += throw_ob->inv->stats.dam + throw_ob->magic + 2; 1731 throw_ob->stats.dam += throw_ob->inv->stats.dam + throw_ob->magic + 2;
1723 throw_ob->stats.wc -= throw_ob->magic + throw_ob->inv->stats.wc; 1732 throw_ob->stats.wc -= throw_ob->magic + throw_ob->inv->stats.wc;
1724 /* only throw objects get directional faces */ 1733 /* only throw objects get directional faces */
… …
1760 if (throw_ob->weight > 50) 1769 if (throw_ob->weight > 50)
1761 throw_ob->speed *= 0.5; 1770 throw_ob->speed *= 0.5;
1762 } /* else tailor thrown object */ 1771 } /* else tailor thrown object */
1763 1772
1764 /* some limits, and safeties (needed?) */ 1773 /* some limits, and safeties (needed?) */
1765 if (throw_ob->stats.dam < 0) 1774 max_it (throw_ob->stats.dam, 0);
1766 throw_ob->stats.dam = 0;
1767 if (throw_ob->last_sp > eff_str) 1775 min_it (throw_ob->last_sp, eff_str);
1768 throw_ob->last_sp = eff_str;
1769 if (throw_ob->stats.food < 0) 1776 max_it (throw_ob->stats.food, 0);
1770 throw_ob->stats.food = 0;
1771 if (throw_ob->stats.food > 100)
1772 throw_ob->stats.food = 100;
1773 if (throw_ob->stats.wc > 30) 1777 min_it (throw_ob->stats.wc, 30);
1774 throw_ob->stats.wc = 30;
1775 1778
1776 /* how long to pause the thrower. Higher values mean less pause */ 1779 /* how long to pause the thrower. Higher values mean less pause */
1777 pause_f = ((2 * eff_str) / 3) + 20 + skill->level; 1780 pause_f = ((2 * eff_str) / 3) + 20 + skill->level;
1778 1781
1779 /* Put a lower limit on this */ 1782 /* Put a lower limit on this */
1780 if (pause_f < 10) 1783 clamp_it (pause_f, 10, 100);
1781 pause_f = 10;
1782 if (pause_f > 100)
1783 pause_f = 100;
1784 1784
1785 /* Changed in 0.94.2 - the calculation before was really goofy. 1785 /* Changed in 0.94.2 - the calculation before was really goofy.
1786 * In short summary, a throw can take anywhere between speed 5 and 1786 * In short summary, a throw can take anywhere between speed 5 and
1787 * speed 0.5 1787 * speed 0.5
1788 */ 1788 */
… …
1791 throw_ob->speed_left = 0; 1791 throw_ob->speed_left = 0;
1792 throw_ob->map = part->map; 1792 throw_ob->map = part->map;
1793 1793
1794 throw_ob->move_type = MOVE_FLY_LOW; 1794 throw_ob->move_type = MOVE_FLY_LOW;
1795 throw_ob->move_on = MOVE_FLY_LOW | MOVE_WALK; 1795 throw_ob->move_on = MOVE_FLY_LOW | MOVE_WALK;
1796
1797 throw_ob->set_speed (throw_ob->speed);
1796 1798
1797#if 0 1799#if 0
1798 /* need to put in a good sound for this */ 1800 /* need to put in a good sound for this */
1799 play_sound_map (op->map, op->x, op->y, SOUND_THROW_OBJ); 1801 play_sound_map (op->map, op->x, op->y, SOUND_THROW_OBJ);
1800#endif 1802#endif
… …
1826 else 1828 else
1827 throw_ob = find_mon_throw_ob (op); 1829 throw_ob = find_mon_throw_ob (op);
1828 1830
1829 return do_throw (op, part, throw_ob, dir, skill); 1831 return do_throw (op, part, throw_ob, dir, skill);
1830} 1832}
1833
1834bool
1835skill_mining (object *who, object *tool, object *skill, int dir, const char *string)
1836{
1837 if (!who->is_player ())
1838 return 0;
1839
1840 if (!dir)
1841 {
1842 who->failmsg ("In what direction?");
1843 return 0;
1844 }
1845
1846 mapxy pos (who); pos.move (dir);
1847
1848 if (!pos.normalise ())
1849 {
1850 who->failmsgf (
1851 "You brandish your %s, with not so convincing results. "
1852 "H<There is nothing in this direction.>",
1853 &tool->name
1854 );
1855 return 0;
1856 }
1857
1858 mapspace &ms = pos.ms ();
1859
1860 for (object *mine_obj = pos.ms ().top; mine_obj; mine_obj = mine_obj->below)
1861 if (mine_obj->type == VEIN)
1862 {
1863 who->speed_left -= who->speed / tool->speed;
1864
1865 who->play_sound (tool->sound);
1866
1867 if (rndm (100 - mine_obj->stats.ac) > rndm (tool->stats.wc))
1868 who->failmsgf (
1869 "You use your %s.... nothing. "
1870 "H<Try again, perhaps?>",
1871 &tool->name
1872 );
1873 else if (mine_obj->race != tool->race)
1874 who->failmsgf (
1875 "You use your %s.... but it doesn't work. "
1876 "H<Maybe you are using the wrong tool?>",
1877 &tool->name
1878 );
1879 else if (!mine_obj->stats.food)
1880 who->failmsgf (
1881 "You use your %s.... but there is nothing. "
1882 "H<This space is exhausted, you should try somewhere else.>",
1883 &tool->name
1884 );
1885 else
1886 {
1887 --mine_obj->stats.food;
1888
1889 object *ore = mine_obj->other_arch->instance ();
1890
1891 who->statusmsg (format (
1892 "You use your %s.... and find some %s!",
1893 &tool->name, &ore->name
1894 ));
1895
1896 ore->insert_at (who);
1897
1898 return true;
1899 }
1900 }
1901 else if (mine_obj->flag [FLAG_IS_QUAD])
1902 {
1903 if (mine_obj->flag [FLAG_IS_FLOOR])
1904 {
1905 if (mine_obj->arch->archname == shstr_quad_open_space)
1906 {
1907 }
1908
1909 maptile *lower_floor = pos.m->tile_available (TILE_DOWN);
1910 if (!lower_floor)
1911 {
1912 who->failmsgf (
1913 "Whoops, your attempt to remove the floor failed. "
1914 "H<Try it again until it works.>"
1915 );
1916 return false;
1917 }
1918
1919 mapxy below_pos (lower_floor, pos.x, pos.y);
1920 if (!below_pos.normalise ())
1921 {
1922 who->failmsgf (
1923 "Whoops, your attempt to remove the floor failed. "
1924 "H<Try it again until it works.>"
1925 );
1926 return false;
1927 }
1928
1929 // first insert open space here:
1930 struct archetype *open_space_arch = archetype::find (shstr_quad_open_space);
1931 if (!open_space_arch)
1932 {
1933 who->failmsgf (
1934 "Ouch, the quad building system is broken. Contact a dungeon master!"
1935 );
1936 return false;
1937 }
1938
1939 object *open_space_floor = open_space_arch->instance ();
1940 insert_ob_in_map_at (
1941 open_space_floor, pos.m, mine_obj, INS_BELOW_ORIGINATOR, pos.x, pos.y);
1942
1943 // next we will remove the wall in the lower layer:
1944 mapspace &below_ms = below_pos.ms ();
1945 for (object *quad_obj = below_ms.top; quad_obj; quad_obj = quad_obj->below)
1946 {
1947 if (quad_obj->flag [FLAG_IS_FLOOR])
1948 break;
1949
1950 if (quad_obj->flag [FLAG_IS_QUAD])
1951 {
1952 quad_obj->remove ();
1953 who->insert (quad_obj);
1954 break;
1955 }
1956 }
1957 }
1958
1959 // FIXME: there should be chance assigned, like above with veins!
1960 who->play_sound (tool->sound);
1961 who->insert (mine_obj);
1962 return true;
1963 }
1964
1965 return false;
1966}
1967

Diff Legend

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