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.86 by root, Sun Apr 11 00:34:06 2010 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 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.
… …
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 new_draw_info (NDI_UNIQUE, 0, who, "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;
… …
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;
… …
444hide (object *op, object *skill) 444hide (object *op, object *skill)
445{ 445{
446 /* the preliminaries -- Can we really hide now? */ 446 /* the preliminaries -- Can we really hide now? */
447 /* this keeps monsters from using invisibilty spells and hiding */ 447 /* this keeps monsters from using invisibilty spells and hiding */
448 448
449 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 449 if (op->flag [FLAG_MAKE_INVIS])
450 { 450 {
451 new_draw_info (NDI_UNIQUE, 0, op, "You don't need to hide while invisible!"); 451 new_draw_info (NDI_UNIQUE, 0, op, "You don't need to hide while invisible!");
452 return 0; 452 return 0;
453 } 453 }
454 else if (!op->flag [FLAG_HIDDEN] && op->invisible > 0 && op->type == PLAYER) 454 else if (!op->flag [FLAG_HIDDEN] && op->invisible > 0 && op->type == PLAYER)
… …
518 } 518 }
519 519
520 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 520 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
521 { 521 {
522 /* Jump into creature */ 522 /* Jump into creature */
523 if (QUERY_FLAG (tmp, FLAG_MONSTER) 523 if (tmp->flag [FLAG_MONSTER]
524 || (tmp->type == PLAYER && (!QUERY_FLAG (tmp, FLAG_WIZ) || !tmp->contr->hidden))) 524 || (tmp->type == PLAYER && (!tmp->flag [FLAG_WIZ] || !tmp->contr->hidden)))
525 { 525 {
526 new_draw_info_format (NDI_UNIQUE, 0, pl, "You jump into %s%s.", tmp->type == PLAYER ? "" : "the ", &tmp->name); 526 new_draw_info_format (NDI_UNIQUE, 0, pl, "You jump into %s%s.", tmp->type == PLAYER ? "" : "the ", &tmp->name);
527 527
528 stop_jump (pl, i, spaces); 528 stop_jump (pl, i, spaces);
529 529
… …
603 object *tmp; 603 object *tmp;
604 int success = 0; 604 int success = 0;
605 605
606 for (tmp = pl->inv; tmp; tmp = tmp->below) 606 for (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->flag [FLAG_IDENTIFIED] && !tmp->flag [FLAG_KNOWN_CURSED]
609 && (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->item_power < skill->level) 609 && (tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED]) && tmp->item_power < skill->level)
610 { 610 {
611 SET_FLAG (tmp, FLAG_KNOWN_CURSED); 611 tmp->set_flag (FLAG_KNOWN_CURSED);
612 esrv_update_item (UPD_FLAGS, pl, tmp); 612 esrv_update_item (UPD_FLAGS, pl, tmp);
613 success += calc_skill_exp (pl, tmp, skill); 613 success += calc_skill_exp (pl, tmp, skill);
614 } 614 }
615 615
616 /* Check ground, too, but only objects the player could pick up */ 616 /* 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) 617 for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp; tmp = tmp->above)
618 if (can_pick (pl, tmp) && 618 if (can_pick (pl, tmp) &&
619 !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && 619 !tmp->flag [FLAG_IDENTIFIED] &&
620 !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) 620 !tmp->flag [FLAG_KNOWN_CURSED]
621 && (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->item_power < skill->level) 621 && (tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED]) && tmp->item_power < skill->level)
622 { 622 {
623 SET_FLAG (tmp, FLAG_KNOWN_CURSED); 623 tmp->set_flag (FLAG_KNOWN_CURSED);
624 esrv_update_item (UPD_FLAGS, pl, tmp); 624 esrv_update_item (UPD_FLAGS, pl, tmp);
625 success += calc_skill_exp (pl, tmp, skill); 625 success += calc_skill_exp (pl, tmp, skill);
626 } 626 }
627 627
628 return success; 628 return success;
… …
634 object *tmp; 634 object *tmp;
635 int success = 0; 635 int success = 0;
636 636
637 for (tmp = pl->inv; tmp; tmp = tmp->below) 637 for (tmp = pl->inv; tmp; tmp = tmp->below)
638 if (!tmp->invisible 638 if (!tmp->invisible
639 && !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) 639 && !tmp->flag [FLAG_IDENTIFIED] && !tmp->flag [FLAG_KNOWN_MAGICAL]
640 && (is_magical (tmp)) && tmp->item_power < skill->level) 640 && (is_magical (tmp)) && tmp->item_power < skill->level)
641 { 641 {
642 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL); 642 tmp->set_flag (FLAG_KNOWN_MAGICAL);
643 esrv_update_item (UPD_FLAGS, pl, tmp); 643 esrv_update_item (UPD_FLAGS, pl, tmp);
644 success += calc_skill_exp (pl, tmp, skill); 644 success += calc_skill_exp (pl, tmp, skill);
645 } 645 }
646 646
647 /* Check ground, too, but like above, only if the object can be picked up */ 647 /* 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) 648 for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp; tmp = tmp->above)
649 if (can_pick (pl, tmp) && 649 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) 650 !tmp->flag [FLAG_IDENTIFIED] && !tmp->flag [FLAG_KNOWN_MAGICAL] && (is_magical (tmp)) && tmp->item_power < skill->level)
651 { 651 {
652 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL); 652 tmp->set_flag (FLAG_KNOWN_MAGICAL);
653 esrv_update_item (UPD_FLAGS, pl, tmp); 653 esrv_update_item (UPD_FLAGS, pl, tmp);
654 success += calc_skill_exp (pl, tmp, skill); 654 success += calc_skill_exp (pl, tmp, skill);
655 } 655 }
656 656
657 return success; 657 return success;
… …
664do_skill_ident2 (object *tmp, object *pl, int obj_class, object *skill) 664do_skill_ident2 (object *tmp, object *pl, int obj_class, object *skill)
665{ 665{
666 int success = 0, chance; 666 int success = 0, chance;
667 int skill_value = skill->level * pl->stats.Int ? pl->stats.Int : 10; 667 int skill_value = skill->level * pl->stats.Int ? pl->stats.Int : 10;
668 668
669 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT) 669 if (!tmp->flag [FLAG_IDENTIFIED] && !tmp->flag [FLAG_NO_SKILL_IDENT]
670 && need_identify (tmp) && !tmp->invisible && tmp->type == obj_class) 670 && need_identify (tmp) && !tmp->invisible && tmp->type == obj_class)
671 { 671 {
672 chance = die_roll (3, 10, pl, PREFER_LOW) - 3 + rndm (0, (tmp->magic ? tmp->magic * 5 : 1) - 1); 672 chance = die_roll (3, 10, pl, PREFER_LOW) - 3 + rndm (0, (tmp->magic ? tmp->magic * 5 : 1) - 1);
673 673
674 if (skill_value >= chance) 674 if (skill_value >= chance)
… …
687 } 687 }
688 688
689 success += calc_skill_exp (pl, tmp, skill); 689 success += calc_skill_exp (pl, tmp, skill);
690 } 690 }
691 else 691 else
692 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); 692 tmp->set_flag (FLAG_NO_SKILL_IDENT);
693 } 693 }
694 694
695 return success; 695 return success;
696} 696}
697 697
… …
788int 788int
789use_oratory (object *pl, int dir, object *skill) 789use_oratory (object *pl, int dir, object *skill)
790{ 790{
791 if (pl->type != PLAYER) 791 if (pl->type != PLAYER)
792 return 0; /* only players use this skill */ 792 return 0; /* only players use this skill */
793
794 if (!dir)
795 {
796 pl->failmsg ("In what direction?");
797 return 0;
798 }
793 799
794 sint16 x = pl->x + freearr_x[dir], 800 sint16 x = pl->x + freearr_x[dir],
795 y = pl->y + freearr_y[dir]; 801 y = pl->y + freearr_y[dir];
796 maptile *m = pl->map; 802 maptile *m = pl->map;
797 803
… …
819 if (tmp->type == PLAYER 825 if (tmp->type == PLAYER
820 || tmp->more || tmp->head_ () != tmp 826 || tmp->more || tmp->head_ () != tmp
821 || tmp->msg) 827 || tmp->msg)
822 return 0; 828 return 0;
823 829
824 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 830 if (tmp->flag [FLAG_MONSTER])
825 break; 831 break;
826 } 832 }
827 833
828 if (!tmp) 834 if (!tmp)
829 { 835 {
… …
834 new_draw_info_format (NDI_UNIQUE, 0, pl, "You orate to the %s.", query_name (tmp)); 840 new_draw_info_format (NDI_UNIQUE, 0, pl, "You orate to the %s.", query_name (tmp));
835 841
836 /* the following conditions limit who may be 'charmed' */ 842 /* the following conditions limit who may be 'charmed' */
837 843
838 /* it's hostile! */ 844 /* it's hostile! */
839 if (!QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY)) 845 if (!tmp->flag [FLAG_UNAGGRESSIVE] && !tmp->flag [FLAG_FRIENDLY])
840 { 846 {
841 new_draw_info_format (NDI_UNIQUE, 0, pl, "Too bad the %s isn't listening!\n", query_name (tmp)); 847 new_draw_info_format (NDI_UNIQUE, 0, pl, "Too bad the %s isn't listening!\n", query_name (tmp));
842 return 0; 848 return 0;
843 } 849 }
844 850
845 /* it's already allied! */ 851 /* it's already allied! */
846 if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->attack_movement == PETMOVE) 852 if (tmp->flag [FLAG_FRIENDLY] && tmp->attack_movement == PETMOVE)
847 { 853 {
848 if (tmp->owner == pl) 854 if (tmp->owner == pl)
849 { 855 {
850 new_draw_info (NDI_UNIQUE, 0, pl, "Your follower loves your speech.\n"); 856 new_draw_info (NDI_UNIQUE, 0, pl, "Your follower loves your speech.\n");
851 return 0; 857 return 0;
… …
882 tmp->set_owner (pl); 888 tmp->set_owner (pl);
883 tmp->skill = skill->skill; 889 tmp->skill = skill->skill;
884 tmp->stats.exp = 0; 890 tmp->stats.exp = 0;
885 tmp->attack_movement = PETMOVE; 891 tmp->attack_movement = PETMOVE;
886 892
887 if (!QUERY_FLAG (tmp, FLAG_FRIENDLY)) 893 if (!tmp->flag [FLAG_FRIENDLY])
888 add_friendly_object (tmp); 894 add_friendly_object (tmp);
889 895
890 return calc_skill_exp (pl, tmp, skill); 896 return calc_skill_exp (pl, tmp, skill);
891 } 897 }
892 /* Charm failed. Creature may be angry now */ 898 /* 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)) 899 else if ((skill->level + ((pl->stats.Cha - 10) / 2)) < random_roll (1, 2 * tmp->level, pl, PREFER_LOW))
894 { 900 {
895 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your speech angers the %s!\n", query_name (tmp)); 901 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your speech angers the %s!\n", query_name (tmp));
896 if (QUERY_FLAG (tmp, FLAG_FRIENDLY)) 902 if (tmp->flag [FLAG_FRIENDLY])
897 { 903 {
898 remove_friendly_object (tmp); 904 remove_friendly_object (tmp);
899 tmp->attack_movement = 0; /* needed? */ 905 tmp->attack_movement = 0; /* needed? */
900 } 906 }
901 907
902 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 908 tmp->clr_flag (FLAG_UNAGGRESSIVE);
903 } 909 }
904 910
905 return 0; /* Fall through - if we get here, we didn't charm anything */ 911 return 0; /* Fall through - if we get here, we didn't charm anything */
906} 912}
907 913
… …
923 sint16 x, y; 929 sint16 x, y;
924 930
925 if (pl->type != PLAYER) 931 if (pl->type != PLAYER)
926 return 0; /* only players use this skill */ 932 return 0; /* only players use this skill */
927 933
934 if (!dir)
935 {
936 pl->failmsg ("In what direction?");
937 return 0;
938 }
939
928 new_draw_info_format (NDI_UNIQUE, 0, pl, "You sing."); 940 new_draw_info_format (NDI_UNIQUE, 0, pl, "You sing.");
941 for (int i = skill->level >= SIZEOFFREE1 ? 0 : dir;
929 for (i = 0; i < min (skill->level, SIZEOFFREE); i++) 942 i < min (skill->level, SIZEOFFREE);
943 i++)
930 { 944 {
931 x = pl->x + freearr_x[i]; 945 x = pl->x + freearr_x[i];
932 y = pl->y + freearr_y[i]; 946 y = pl->y + freearr_y[i];
933 m = pl->map; 947 m = pl->map;
934 948
… …
938 if (!(mflags & P_IS_ALIVE)) 952 if (!(mflags & P_IS_ALIVE))
939 continue; 953 continue;
940 954
941 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 955 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
942 { 956 {
943 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 957 if (tmp->flag [FLAG_MONSTER])
944 break; 958 break;
945 /* can't affect players */ 959 /* can't affect players */
946 if (tmp->type == PLAYER) 960 if (tmp->type == PLAYER)
947 break; 961 break;
948 } 962 }
949 963
950 /* Whole bunch of checks to see if this is a type of monster that would 964 /* Whole bunch of checks to see if this is a type of monster that would
951 * listen to singing. 965 * listen to singing.
952 */ 966 */
953 if (tmp && QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_NO_STEAL) && /* Been charmed or abused before */ 967 if (tmp && tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_NO_STEAL] && /* Been charmed or abused before */
954 !QUERY_FLAG (tmp, FLAG_SPLITTING) && /* no ears */ 968 !tmp->flag [FLAG_SPLITTING] && /* no ears */
955 !QUERY_FLAG (tmp, FLAG_HITBACK) && /* was here before */ 969 !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 */ 970 (tmp->level <= skill->level) && (!tmp->head) && !tmp->flag [FLAG_UNDEAD] && !tmp->flag [FLAG_UNAGGRESSIVE] && /* already calm */
957 !QUERY_FLAG (tmp, FLAG_FRIENDLY)) 971 !tmp->flag [FLAG_FRIENDLY])
958 { /* already calm */ 972 { /* already calm */
959 973
960 /* stealing isn't really related (although, maybe it should 974 /* stealing isn't really related (although, maybe it should
961 * be). This is mainly to prevent singing to the same monster 975 * be). This is mainly to prevent singing to the same monster
962 * over and over again and getting exp for it. 976 * over and over again and getting exp for it.
963 */ 977 */
964 int level = skill->level + (pl->stats.Cha - 5 - tmp->stats.Int) / 2; 978 int level = skill->level + (pl->stats.Cha - 5 - tmp->stats.Int) / 2;
965 979
966 if (level && tmp->level < random_roll (0, level - 1, pl, PREFER_HIGH)) 980 if (level && tmp->level < random_roll (0, level - 1, pl, PREFER_HIGH))
967 { 981 {
968 SET_FLAG (tmp, FLAG_UNAGGRESSIVE); 982 tmp->set_flag (FLAG_UNAGGRESSIVE);
969 new_draw_info_format (NDI_UNIQUE, 0, pl, "You calm down the %s\n", query_name (tmp)); 983 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 */ 984 /* Give exp only if they are not aware */
971 985
972 if (!QUERY_FLAG (tmp, FLAG_NO_STEAL)) 986 if (!tmp->flag [FLAG_NO_STEAL])
973 exp += calc_skill_exp (pl, tmp, skill); 987 exp += calc_skill_exp (pl, tmp, skill);
974 988
975 SET_FLAG (tmp, FLAG_NO_STEAL); 989 tmp->set_flag (FLAG_NO_STEAL);
976 } 990 }
977 else 991 else
978 { 992 {
979 new_draw_info_format (NDI_UNIQUE, 0, pl, "Too bad the %s isn't listening!\n", query_name (tmp)); 993 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); 994 tmp->set_flag (FLAG_NO_STEAL);
981 } 995 }
982 } 996 }
983 } 997 }
984 return exp; 998 return exp;
985} 999}
… …
1014 /* And now we'd better do an inventory traversal of each 1028 /* And now we'd better do an inventory traversal of each
1015 * of these objects' inventory 1029 * of these objects' inventory
1016 * We can narrow this down a bit - no reason to search through 1030 * We can narrow this down a bit - no reason to search through
1017 * the players inventory or monsters for that matter. 1031 * the players inventory or monsters for that matter.
1018 */ 1032 */
1019 if (tmp->type != PLAYER && !QUERY_FLAG (tmp, FLAG_MONSTER)) 1033 if (tmp->type != PLAYER && !tmp->flag [FLAG_MONSTER])
1020 for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below) 1034 for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below)
1021 if (tmp2->type == RUNE || tmp2->type == TRAP) 1035 if (tmp2->type == RUNE || tmp2->type == TRAP)
1022 if (trap_see (pl, tmp2)) 1036 if (trap_see (pl, tmp2))
1023 { 1037 {
1024 trap_show (tmp2, tmp); 1038 trap_show (tmp2, tmp);
… …
1075 /* And now we'd better do an inventory traversal of each 1089 /* And now we'd better do an inventory traversal of each
1076 * of these objects inventory. Like above, only 1090 * of these objects inventory. Like above, only
1077 * do this for interesting objects. 1091 * do this for interesting objects.
1078 */ 1092 */
1079 1093
1080 if (tmp->type != PLAYER && !QUERY_FLAG (tmp, FLAG_MONSTER)) 1094 if (tmp->type != PLAYER && !tmp->flag [FLAG_MONSTER])
1081 { 1095 {
1082 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below) 1096 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1083 if ((tmp2->type == RUNE || tmp2->type == TRAP) && tmp2->stats.Cha <= 1) 1097 if ((tmp2->type == RUNE || tmp2->type == TRAP) && tmp2->stats.Cha <= 1)
1084 { 1098 {
1085 trap_show (tmp2, tmp); 1099 trap_show (tmp2, tmp);
… …
1166 1180
1167 if (pl->type != PLAYER) 1181 if (pl->type != PLAYER)
1168 return; /* players only */ 1182 return; /* players only */
1169 1183
1170 /* check if pl has removed encumbering armour and weapons */ 1184 /* check if pl has removed encumbering armour and weapons */
1171 if (QUERY_FLAG (pl, FLAG_READY_WEAPON) && (skill->level < 6)) 1185 if (pl->flag [FLAG_READY_WEAPON] && (skill->level < 6))
1172 { 1186 {
1173 new_draw_info (NDI_UNIQUE, 0, pl, "You can't concentrate while wielding a weapon!\n"); 1187 new_draw_info (NDI_UNIQUE, 0, pl, "You can't concentrate while wielding a weapon!\n");
1174 return; 1188 return;
1175 } 1189 }
1176 else 1190 else
… …
1179 if (((tmp->type == ARMOUR && skill->level < 12) 1193 if (((tmp->type == ARMOUR && skill->level < 12)
1180 || (tmp->type == HELMET && skill->level < 10) 1194 || (tmp->type == HELMET && skill->level < 10)
1181 || (tmp->type == SHIELD && skill->level < 6) 1195 || (tmp->type == SHIELD && skill->level < 6)
1182 || (tmp->type == BOOTS && skill->level < 4) 1196 || (tmp->type == BOOTS && skill->level < 4)
1183 || (tmp->type == GLOVES && skill->level < 2)) 1197 || (tmp->type == GLOVES && skill->level < 2))
1184 && QUERY_FLAG (tmp, FLAG_APPLIED)) 1198 && tmp->flag [FLAG_APPLIED])
1185 { 1199 {
1186 new_draw_info (NDI_UNIQUE, 0, pl, "You can't concentrate while wearing so much armour!\n"); 1200 new_draw_info (NDI_UNIQUE, 0, pl, "You can't concentrate while wearing so much armour!\n");
1187 return; 1201 return;
1188 } 1202 }
1189 } 1203 }
… …
1293 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough mana to write a scroll of %s.", &chosen_spell->name); 1307 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough mana to write a scroll of %s.", &chosen_spell->name);
1294 return 0; 1308 return 0;
1295 } 1309 }
1296 1310
1297 /* ok, we are ready to try inscription */ 1311 /* ok, we are ready to try inscription */
1298 if (QUERY_FLAG (pl, FLAG_CONFUSED)) 1312 if (pl->flag [FLAG_CONFUSED])
1299 confused = 1; 1313 confused = 1;
1300 1314
1301 /* Lost mana/grace no matter what */ 1315 /* Lost mana/grace no matter what */
1302 pl->stats.grace -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE); 1316 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); 1317 pl->stats.sp -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA);
… …
1406 { 1420 {
1407 new_draw_info_format (NDI_UNIQUE, 0, pl, "You cannot inscribe this! H<You can only inscribe empty scrolls and books.>"); 1421 new_draw_info_format (NDI_UNIQUE, 0, pl, "You cannot inscribe this! H<You can only inscribe empty scrolls and books.>");
1408 return 0; 1422 return 0;
1409 } 1423 }
1410 1424
1411 if (QUERY_FLAG (item, FLAG_UNPAID)) 1425 if (item->flag [FLAG_UNPAID])
1412 { 1426 {
1413 new_draw_info (NDI_UNIQUE, 0, pl, "You had better pay for that before you write on it."); 1427 new_draw_info (NDI_UNIQUE, 0, pl, "You had better pay for that before you write on it.");
1414 return 0; 1428 return 0;
1415 } 1429 }
1416 1430
… …
1452 * 'throwable' (ie not applied cursed obj, worn, etc). 1466 * 'throwable' (ie not applied cursed obj, worn, etc).
1453 */ 1467 */
1454static object * 1468static object *
1455find_throw_ob (object *op, const char *request) 1469find_throw_ob (object *op, const char *request)
1456{ 1470{
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 */ 1471 /* prefer marked item */
1466 tmp = find_marked_object (op); 1472 object *tmp = find_marked_object (op);
1467 if (tmp != NULL) 1473
1468 {
1469 /* can't toss invisible or inv-locked items */ 1474 /* can't toss invisible or inv-locked items */
1470 if (tmp->invisible || QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 1475 if (tmp && (tmp->invisible || tmp->flag [FLAG_INV_LOCKED]))
1471 { 1476 tmp = 0;
1472 tmp = NULL;
1473 }
1474 }
1475 1477
1476 /* look through the inventory */ 1478 /* look through the inventory */
1477 if (tmp == NULL) 1479 if (tmp)
1478 {
1479 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1480 for (tmp = op->inv; tmp; tmp = tmp->below)
1480 { 1481 {
1481 /* can't toss invisible or inv-locked items */ 1482 /* can't toss invisible or inv-locked items */
1482 if (tmp->invisible || QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 1483 if (tmp->invisible || tmp->flag [FLAG_INV_LOCKED])
1483 continue; 1484 continue;
1485
1484 if (!request || !strcmp (query_name (tmp), request) || !strcmp (&tmp->name, request)) 1486 if (!request || !strcmp (query_name (tmp), request) || !strcmp (&tmp->name, request))
1485 break; 1487 break;
1486 } 1488 }
1487 }
1488 1489
1489 /* this should prevent us from throwing away 1490 /* this should prevent us from throwing away
1490 * cursed items, worn armour, etc. Only weapons 1491 * cursed items, worn armour, etc. Only weapons
1491 * can be thrown from 'hand'. 1492 * can be thrown from 'hand'.
1492 */ 1493 */
1493 if (!tmp) 1494 if (!tmp)
1494 return NULL; 1495 return 0;
1495 1496
1496 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 1497 if (tmp->flag [FLAG_APPLIED])
1497 { 1498 {
1498 if (tmp->type != WEAPON) 1499 if (tmp->type != WEAPON)
1499 { 1500 {
1500 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't throw %s.", query_name (tmp)); 1501 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't throw %s. H<Unapply it first.>", query_name (tmp));
1501 tmp = NULL; 1502 tmp = 0;
1502 }
1503 else if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
1504 { 1503 }
1504 else if (tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED])
1505 {
1505 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s sticks to your hand!", query_name (tmp)); 1506 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; 1507 tmp = 0;
1507 } 1508 }
1508 else 1509 else
1509 { 1510 {
1510 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 1511 if (!op->apply (tmp, AP_UNAPPLY))
1511 { 1512 {
1512 LOG (llevError, "BUG: find_throw_ob(): couldn't unapply\n"); 1513 LOG (llevError, "BUG: find_throw_ob(): couldn't unapply\n");
1513 tmp = NULL; 1514 tmp = 0;
1514 } 1515 }
1515 } 1516 }
1516 } 1517 }
1517 else if (QUERY_FLAG (tmp, FLAG_UNPAID)) 1518 else if (tmp->flag [FLAG_UNPAID])
1518 { 1519 {
1519 new_draw_info_format (NDI_UNIQUE, 0, op, "You should pay for the %s first.", query_name (tmp)); 1520 new_draw_info_format (NDI_UNIQUE, 0, op, "You should pay for the %s first.", query_name (tmp));
1520 tmp = NULL; 1521 tmp = 0;
1521 } 1522 }
1522 1523
1523 if (tmp && QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 1524 //TODO: why not chekc first and give sensible message to player?
1525 if (tmp && tmp->flag [FLAG_INV_LOCKED])
1524 { 1526 {
1525 LOG (llevError, "BUG: find_throw_ob(): object is locked\n"); 1527 LOG (llevError, "BUG: find_throw_ob(): object is locked\n");
1526 tmp = NULL; 1528 tmp = 0;
1527 } 1529 }
1530
1528 return tmp; 1531 return tmp;
1529} 1532}
1530 1533
1531/* make_throw_ob() We construct the 'carrier' object in 1534/* make_throw_ob() We construct the 'carrier' object in
1532 * which we will insert the object that is being thrown. 1535 * which we will insert the object that is being thrown.
… …
1536make_throw_ob (object *orig) 1539make_throw_ob (object *orig)
1537{ 1540{
1538 if (!orig) 1541 if (!orig)
1539 return 0; 1542 return 0;
1540 1543
1541 if (QUERY_FLAG (orig, FLAG_APPLIED)) 1544 if (orig->flag [FLAG_APPLIED])
1542 { 1545 {
1543 LOG (llevError, "BUG: make_throw_ob(): ob is applied\n"); 1546 LOG (llevError, "BUG: make_throw_ob(): ob is applied\n");
1544 /* insufficient workaround, but better than nothing */ 1547 /* insufficient workaround, but better than nothing */
1545 CLEAR_FLAG (orig, FLAG_APPLIED); 1548 orig->clr_flag (FLAG_APPLIED);
1546 } 1549 }
1547 1550
1548 object *toss_item = orig->clone (); 1551 object *toss_item = orig->clone ();
1549 1552
1550 toss_item->type = THROWN_OBJ; 1553 toss_item->type = THROWN_OBJ;
1551 CLEAR_FLAG (toss_item, FLAG_CHANGING); 1554 toss_item->clr_flag (FLAG_CHANGING);
1552 toss_item->stats.dam = 0; /* default damage */ 1555 toss_item->stats.dam = 0; /* default damage */
1553 toss_item->insert (orig); 1556 toss_item->insert (orig);
1554 1557
1555 return toss_item; 1558 return toss_item;
1556} 1559}
… …
1567 int pause_f, weight_f = 0, mflags; 1570 int pause_f, weight_f = 0, mflags;
1568 float str_factor = 1.0, load_factor = 1.0, item_factor = 1.0; 1571 float str_factor = 1.0, load_factor = 1.0, item_factor = 1.0;
1569 maptile *m; 1572 maptile *m;
1570 sint16 sx, sy; 1573 sint16 sx, sy;
1571 1574
1572 if (throw_ob == NULL) 1575 if (!throw_ob)
1573 { 1576 {
1574 if (op->type == PLAYER) 1577 if (op->type == PLAYER)
1575 new_draw_info (NDI_UNIQUE, 0, op, "You have nothing to throw."); 1578 new_draw_info (NDI_UNIQUE, 0, op, "You have nothing to throw.");
1576 1579
1577 return 0; 1580 return 0;
1578 } 1581 }
1579 if (QUERY_FLAG (throw_ob, FLAG_STARTEQUIP)) 1582
1583 if (throw_ob->flag [FLAG_STARTEQUIP])
1580 { 1584 {
1581 if (op->type == PLAYER) 1585 if (op->type == PLAYER)
1582 new_draw_info (NDI_UNIQUE, 0, op, "The gods won't let you throw that."); 1586 new_draw_info (NDI_UNIQUE, 0, op,
1587 "The gods won't let you throw that. "
1588 "H<Well, they would, but they would retrieve it "
1589 "- you wouldn't want that, would you?>");
1583 1590
1584 return 0; 1591 return 0;
1585 } 1592 }
1586 1593
1587 /* Because throwing effectiveness must be reduced by the 1594 /* Because throwing effectiveness must be reduced by the
… …
1604 /* lighter items are thrown harder, farther, faster */ 1611 /* lighter items are thrown harder, farther, faster */
1605 if (throw_ob->weight > 0) 1612 if (throw_ob->weight > 0)
1606 item_factor = (float) maxc / (float) (3.0 * throw_ob->weight); 1613 item_factor = (float) maxc / (float) (3.0 * throw_ob->weight);
1607 else 1614 else
1608 { /* 0 or negative weight?!? Odd object, can't throw it */ 1615 { /* 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)); 1616 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't throw %s. H<Better report this to your dungeon master.>\n", query_name (throw_ob));
1610 return 0; 1617 return 0;
1611 } 1618 }
1612 1619
1613 eff_str = (int) (str * (load_factor < 1.0 ? load_factor : 1.0)); 1620 eff_str = (str * (load_factor < 1.0 ? load_factor : 1.0))
1614 eff_str = (int) ((float) eff_str * item_factor * str_factor); 1621 * item_factor * str_factor;
1615 1622
1616 /* alas, arrays limit us to a value of MAX_STAT (30). Use str_factor to 1623 /* alas, arrays limit us to a value of MAX_STAT (30). Use str_factor to
1617 * account for super-strong throwers. */ 1624 * account for super-strong throwers. */
1618 if (eff_str > MAX_STAT) 1625 min_it (eff_str, MAX_STAT);
1619 eff_str = MAX_STAT;
1620 1626
1621#ifdef DEBUG_THROW 1627#ifdef DEBUG_THROW
1622 LOG (llevDebug, "%s carries %d, eff_str=%d\n", op->name, op->carrying, eff_str); 1628 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); 1629 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); 1630 LOG (llevDebug, " str_factor=%f\n", str_factor);
… …
1714 /* the properties of objects which are meant to be thrown (ie dart, 1720 /* the properties of objects which are meant to be thrown (ie dart,
1715 * throwing knife, etc) will differ from ordinary items. Lets tailor 1721 * throwing knife, etc) will differ from ordinary items. Lets tailor
1716 * this stuff in here. 1722 * this stuff in here.
1717 */ 1723 */
1718 1724
1719 if (QUERY_FLAG (throw_ob->inv, FLAG_IS_THROWN)) 1725 if (throw_ob->inv->flag [FLAG_IS_THROWN])
1720 { 1726 {
1721 throw_ob->last_sp += eff_str / 3; /* fly a little further */ 1727 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; 1728 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; 1729 throw_ob->stats.wc -= throw_ob->magic + throw_ob->inv->stats.wc;
1724 /* only throw objects get directional faces */ 1730 /* only throw objects get directional faces */
… …
1760 if (throw_ob->weight > 50) 1766 if (throw_ob->weight > 50)
1761 throw_ob->speed *= 0.5; 1767 throw_ob->speed *= 0.5;
1762 } /* else tailor thrown object */ 1768 } /* else tailor thrown object */
1763 1769
1764 /* some limits, and safeties (needed?) */ 1770 /* some limits, and safeties (needed?) */
1765 if (throw_ob->stats.dam < 0) 1771 max_it (throw_ob->stats.dam, 0);
1766 throw_ob->stats.dam = 0;
1767 if (throw_ob->last_sp > eff_str) 1772 min_it (throw_ob->last_sp, eff_str);
1768 throw_ob->last_sp = eff_str;
1769 if (throw_ob->stats.food < 0) 1773 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) 1774 min_it (throw_ob->stats.wc, 30);
1774 throw_ob->stats.wc = 30;
1775 1775
1776 /* how long to pause the thrower. Higher values mean less pause */ 1776 /* how long to pause the thrower. Higher values mean less pause */
1777 pause_f = ((2 * eff_str) / 3) + 20 + skill->level; 1777 pause_f = ((2 * eff_str) / 3) + 20 + skill->level;
1778 1778
1779 /* Put a lower limit on this */ 1779 /* Put a lower limit on this */
1780 if (pause_f < 10) 1780 clamp_it (pause_f, 10, 100);
1781 pause_f = 10;
1782 if (pause_f > 100)
1783 pause_f = 100;
1784 1781
1785 /* Changed in 0.94.2 - the calculation before was really goofy. 1782 /* Changed in 0.94.2 - the calculation before was really goofy.
1786 * In short summary, a throw can take anywhere between speed 5 and 1783 * In short summary, a throw can take anywhere between speed 5 and
1787 * speed 0.5 1784 * speed 0.5
1788 */ 1785 */
… …
1826 else 1823 else
1827 throw_ob = find_mon_throw_ob (op); 1824 throw_ob = find_mon_throw_ob (op);
1828 1825
1829 return do_throw (op, part, throw_ob, dir, skill); 1826 return do_throw (op, part, throw_ob, dir, skill);
1830} 1827}
1828
1829bool
1830skill_mining (object *who, object *tool, object *skill, int dir, const char *string)
1831{
1832 if (!who->is_player ())
1833 return 0;
1834
1835 if (!dir)
1836 {
1837 who->failmsg ("In what direction?");
1838 return 0;
1839 }
1840
1841 mapxy pos (who); pos.move (dir);
1842
1843 if (!pos.normalise ())
1844 {
1845 who->failmsgf (
1846 "You brandish your %s, with not so convincing results. "
1847 "H<There is nothing in this direction.>",
1848 &tool->name
1849 );
1850 return 0;
1851 }
1852
1853 mapspace &ms = pos.ms ();
1854
1855 for (object *vein = pos.ms ().top; vein; vein = vein->below)
1856 if (vein->type == VEIN)
1857 {
1858 who->speed_left -= who->speed / tool->speed;
1859
1860 who->play_sound (tool->sound);
1861
1862 if (rndm (100 - vein->stats.ac) > rndm (tool->stats.wc))
1863 who->failmsgf (
1864 "You use your %s.... nothing. "
1865 "H<Try again, perhaps?>",
1866 &tool->name
1867 );
1868 else if (vein->race != tool->race)
1869 who->failmsgf (
1870 "You use your %s.... but it doesn't work. "
1871 "H<Maybe you are using the wrong tool?>",
1872 &tool->name
1873 );
1874 else if (!vein->stats.food)
1875 who->failmsgf (
1876 "You use your %s.... but there is nothing. "
1877 "H<This space is exhausted, you should try somewhere else.>",
1878 &tool->name
1879 );
1880 else
1881 {
1882 --vein->stats.food;
1883
1884 object *ore = vein->other_arch->instance ();
1885
1886 who->statusmsg (format (
1887 "You use your %s.... and find some %s!",
1888 &tool->name, &ore->name
1889 ));
1890
1891 ore->insert_at (who);
1892
1893 return true;
1894 }
1895 }
1896
1897 return false;
1898}
1899
1900bool
1901skill_fishing (object *who, object *tool, object *skill, int dir, const char *string)
1902{
1903 printf ("******** fishing\n");
1904 return false;
1905}

Diff Legend

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