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

Comparing deliantra/server/server/skills.C (file contents):
Revision 1.11 by root, Sat Sep 16 22:24:13 2006 UTC vs.
Revision 1.33 by root, Fri May 18 13:15:29 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2003 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2003 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <object.h> 26#include <object.h>
26#ifndef __CEXTRACT__
27# include <sproto.h> 27#include <sproto.h>
28#endif
29#include <living.h> 28#include <living.h>
30#include <skills.h> 29#include <skills.h>
31#include <spells.h> 30#include <spells.h>
32#include <book.h> 31#include <book.h>
33 32
… …
41 return -1; 40 return -1;
42 41
43 /* Only prohibit stealing if the player does not have a free 42 /* Only prohibit stealing if the player does not have a free
44 * hand available and in fact does have hands. 43 * hand available and in fact does have hands.
45 */ 44 */
46 if (op->type == PLAYER && op->body_used[BODY_ARMS] <= 0 && op->body_info[BODY_ARMS]) 45 if (op->type == PLAYER && op->slot[body_arm].used <= 0 && op->slot[body_arm].info)
47 { 46 {
48 new_draw_info (NDI_UNIQUE, 0, op, "But you have no free hands to steal with!"); 47 new_draw_info (NDI_UNIQUE, 0, op, "But you have no free hands to steal with!");
49 return -1; 48 return -1;
50 } 49 }
51 50
… …
94 * or not. 93 * or not.
95 * op is the target (person being pilfered) 94 * op is the target (person being pilfered)
96 * who is the person doing the stealing. 95 * who is the person doing the stealing.
97 * skill is the skill object (stealing). 96 * skill is the skill object (stealing).
98 */ 97 */
99
100static int 98static int
101attempt_steal (object *op, object *who, object *skill) 99attempt_steal (object *op, object *who, object *skill)
102{ 100{
103 object *success = NULL, *tmp = NULL, *next; 101 object *success = NULL, *tmp = NULL, *next;
104 int roll = 0, chance = 0, stats_value; 102 int roll = 0, chance = 0, stats_value;
… …
122 else /* help npc to detect thief next time by raising its wisdom */ 120 else /* help npc to detect thief next time by raising its wisdom */
123 op->stats.Wis += (op->stats.Int / 5) + 1; 121 op->stats.Wis += (op->stats.Int / 5) + 1;
124 if (op->stats.Wis > MAX_STAT) 122 if (op->stats.Wis > MAX_STAT)
125 op->stats.Wis = MAX_STAT; 123 op->stats.Wis = MAX_STAT;
126 } 124 }
125
127 if (op->type == PLAYER && QUERY_FLAG (op, FLAG_WIZ)) 126 if (op->type == PLAYER && QUERY_FLAG (op, FLAG_WIZ))
128 { 127 {
129 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from the dungeon master!\n"); 128 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from the dungeon master!\n");
130 return 0; 129 return 0;
131 } 130 }
132#ifdef PROHIBIT_PLAYERKILL 131
132 // only allow stealing between hostile players (TODO: probably should change)
133 if (op->type == PLAYER && who->type == PLAYER && (who->contr->peaceful || op->contr->peaceful)) 133 if (op->type == PLAYER && who->type == PLAYER && (who->contr->peaceful || op->contr->peaceful))
134 { 134 {
135 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from other players!\n"); 135 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from other players!\n");
136 return 0; 136 return 0;
137 } 137 }
138#else
139 if (op->type == PLAYER && who->type == PLAYER && settings.no_player_stealing)
140 {
141 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from other players!\n");
142 return 0;
143 }
144#endif
145
146 138
147 /* Ok then, go thru their inventory, stealing */ 139 /* Ok then, go thru their inventory, stealing */
148 for (tmp = op->inv; tmp != NULL; tmp = next) 140 for (tmp = op->inv; tmp; tmp = next)
149 { 141 {
150 next = tmp->below; 142 next = tmp->below;
151 143
152 /* you can't steal worn items, starting items, wiz stuff, 144 /* you can't steal worn items, starting items, wiz stuff,
153 * innate abilities, or items w/o a type. Generally 145 * innate abilities, or items w/o a type. Generally
… …
157 * future possible problems. -b.t. 149 * future possible problems. -b.t.
158 * Flesh items generated w/ fix_flesh_item should have FLAG_NO_STEAL 150 * Flesh items generated w/ fix_flesh_item should have FLAG_NO_STEAL
159 * already -b.t. 151 * already -b.t.
160 */ 152 */
161 153
162 if (QUERY_FLAG (tmp, FLAG_WAS_WIZ) || QUERY_FLAG (tmp, FLAG_APPLIED) 154 if (QUERY_FLAG (tmp, FLAG_APPLIED)
163 || !(tmp->type) 155 || !tmp->type
164 || tmp->type == EXPERIENCE || tmp->type == SPELL 156 || tmp->type == SPELL
165 || QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_STEAL) || tmp->invisible) 157 || QUERY_FLAG (tmp, FLAG_STARTEQUIP)
158 || QUERY_FLAG (tmp, FLAG_NO_STEAL)
159 || tmp->invisible)
166 continue; 160 continue;
167 161
168 /* Okay, try stealing this item. Dependent on dexterity of thief, 162 /* Okay, try stealing this item. Dependent on dexterity of thief,
169 * skill level, see the adj_stealroll fctn for more detail. 163 * skill level, see the adj_stealroll fctn for more detail.
170 */ 164 */
… …
261 /* play_sound("stop! thief!"); kindofthing */ 255 /* play_sound("stop! thief!"); kindofthing */
262 } /* if you weren't 100% successful */ 256 } /* if you weren't 100% successful */
263 return success ? 1 : 0; 257 return success ? 1 : 0;
264} 258}
265 259
266
267int 260int
268steal (object *op, int dir, object *skill) 261steal (object *op, int dir, object *skill)
269{ 262{
270 object *tmp, *next; 263 object *tmp, *next;
271 sint16 x, y; 264 sint16 x, y;
… …
292 /* If player can't move onto the space, can't steal from it. */ 285 /* If player can't move onto the space, can't steal from it. */
293 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y))) 286 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)))
294 return 0; 287 return 0;
295 288
296 /* Find the topmost object at this spot */ 289 /* Find the topmost object at this spot */
297 for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); 290 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
298 291
299 /* For all the stacked objects at this point, attempt a steal */ 292 /* For all the stacked objects at this point, attempt a steal */
300 for (; tmp != NULL; tmp = next) 293 for (; tmp != NULL; tmp = next)
301 { 294 {
302 next = tmp->below; 295 next = tmp->below;
… …
318 return 0; 311 return 0;
319 312
320 /* no xp for stealing from pets (of players) */ 313 /* no xp for stealing from pets (of players) */
321 if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->attack_movement == PETMOVE) 314 if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->attack_movement == PETMOVE)
322 { 315 {
323 object *owner = get_owner (tmp); 316 object *owner = tmp->owner;
324 317
325 if (owner != NULL && owner->type == PLAYER) 318 if (owner != NULL && owner->type == PLAYER)
326 return 0; 319 return 0;
327 } 320 }
328 321
… …
383 { 376 {
384 new_draw_info (NDI_UNIQUE, 0, pl, "There is no lock there."); 377 new_draw_info (NDI_UNIQUE, 0, pl, "There is no lock there.");
385 return 0; 378 return 0;
386 } 379 }
387 380
388 for (tmp = get_map_ob (pl->map, x, y); tmp; tmp = tmp->above) 381 for (tmp = GET_MAP_OB (pl->map, x, y); tmp; tmp = tmp->above)
389 if (tmp->type == DOOR || tmp->type == LOCKED_DOOR) 382 if (tmp->type == DOOR || tmp->type == LOCKED_DOOR)
390 break; 383 break;
391 384
392 if (!tmp) 385 if (!tmp)
393 { 386 {
… …
494 * of jumping. 487 * of jumping.
495 */ 488 */
496static void 489static void
497stop_jump (object *pl, int dist, int spaces) 490stop_jump (object *pl, int dist, int spaces)
498{ 491{
499 fix_player (pl); 492 pl->update_stats ();
500 insert_ob_in_map (pl, pl->map, pl, 0); 493 pl->map->insert (pl, pl->x, pl->y, pl);
501} 494}
502
503 495
504static int 496static int
505attempt_jump (object *pl, int dir, int spaces, object *skill) 497attempt_jump (object *pl, int dir, int spaces, object *skill)
506{ 498{
507 object *tmp; 499 object *tmp;
… …
514 * temporarily to allow player to aviod exits/archs that are not 506 * temporarily to allow player to aviod exits/archs that are not
515 * fly_on, fly_off. This will also prevent pickup of objects 507 * fly_on, fly_off. This will also prevent pickup of objects
516 * while jumping over them. 508 * while jumping over them.
517 */ 509 */
518 510
519 remove_ob (pl); 511 pl->remove ();
520 512
521 /* 513 /*
522 * I don't think this is actually needed - all the movement 514 * I don't think this is actually needed - all the movement
523 * code is handled in this function, and I don't see anyplace 515 * code is handled in this function, and I don't see anyplace
524 * that cares about the move_type being flying. 516 * that cares about the move_type being flying.
… …
543 new_draw_info (NDI_UNIQUE, 0, pl, "Your jump is blocked."); 535 new_draw_info (NDI_UNIQUE, 0, pl, "Your jump is blocked.");
544 stop_jump (pl, i, spaces); 536 stop_jump (pl, i, spaces);
545 return 0; 537 return 0;
546 } 538 }
547 539
548 for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above) 540 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
549 { 541 {
550 /* Jump into creature */ 542 /* Jump into creature */
551 if (QUERY_FLAG (tmp, FLAG_MONSTER) || (tmp->type == PLAYER && (!QUERY_FLAG (tmp, FLAG_WIZ) || !tmp->contr->hidden))) 543 if (QUERY_FLAG (tmp, FLAG_MONSTER) || (tmp->type == PLAYER && (!QUERY_FLAG (tmp, FLAG_WIZ) || !tmp->contr->hidden)))
552 { 544 {
553 new_draw_info_format (NDI_UNIQUE, 0, pl, "You jump into %s%s.", tmp->type == PLAYER ? "" : "the ", &tmp->name); 545 new_draw_info_format (NDI_UNIQUE, 0, pl, "You jump into %s%s.", tmp->type == PLAYER ? "" : "the ", &tmp->name);
… …
638 esrv_update_item (UPD_FLAGS, pl, tmp); 630 esrv_update_item (UPD_FLAGS, pl, tmp);
639 success += calc_skill_exp (pl, tmp, skill); 631 success += calc_skill_exp (pl, tmp, skill);
640 } 632 }
641 633
642 /* Check ground, too, but only objects the player could pick up */ 634 /* Check ground, too, but only objects the player could pick up */
643 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp; tmp = tmp->above) 635 for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp; tmp = tmp->above)
644 if (can_pick (pl, tmp) && 636 if (can_pick (pl, tmp) &&
645 !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && 637 !QUERY_FLAG (tmp, FLAG_IDENTIFIED) &&
646 !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) 638 !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)
647 && (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->item_power < skill->level) 639 && (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->item_power < skill->level)
648 { 640 {
… …
669 esrv_update_item (UPD_FLAGS, pl, tmp); 661 esrv_update_item (UPD_FLAGS, pl, tmp);
670 success += calc_skill_exp (pl, tmp, skill); 662 success += calc_skill_exp (pl, tmp, skill);
671 } 663 }
672 664
673 /* Check ground, too, but like above, only if the object can be picked up */ 665 /* Check ground, too, but like above, only if the object can be picked up */
674 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp; tmp = tmp->above) 666 for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp; tmp = tmp->above)
675 if (can_pick (pl, tmp) && 667 if (can_pick (pl, tmp) &&
676 !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && (is_magical (tmp)) && tmp->item_power < skill->level) 668 !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && (is_magical (tmp)) && tmp->item_power < skill->level)
677 { 669 {
678 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL); 670 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL);
679 esrv_update_item (UPD_FLAGS, pl, tmp); 671 esrv_update_item (UPD_FLAGS, pl, tmp);
… …
734 726
735 for (tmp = pl->inv; tmp; tmp = tmp->below) 727 for (tmp = pl->inv; tmp; tmp = tmp->below)
736 success += do_skill_ident2 (tmp, pl, obj_class, skill); 728 success += do_skill_ident2 (tmp, pl, obj_class, skill);
737 /* check the ground */ 729 /* check the ground */
738 730
739 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp; tmp = tmp->above) 731 for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp; tmp = tmp->above)
740 success += do_skill_ident2 (tmp, pl, obj_class, skill); 732 success += do_skill_ident2 (tmp, pl, obj_class, skill);
741 733
742 return success; 734 return success;
743} 735}
744 736
… …
808 new_draw_info (NDI_UNIQUE, 0, pl, "...and learn nothing more."); 800 new_draw_info (NDI_UNIQUE, 0, pl, "...and learn nothing more.");
809 } 801 }
810 return success; 802 return success;
811} 803}
812 804
813
814/* players using this skill can 'charm' a monster -- 805/* players using this skill can 'charm' a monster --
815 * into working for them. It can only be used on 806 * into working for them. It can only be used on
816 * non-special (see below) 'neutral' creatures. 807 * non-special (see below) 'neutral' creatures.
817 * -b.t. (thomas@astro.psu.edu) 808 * -b.t. (thomas@astro.psu.edu)
818 */ 809 */
819
820int 810int
821use_oratory (object *pl, int dir, object *skill) 811use_oratory (object *pl, int dir, object *skill)
822{ 812{
823 sint16 x = pl->x + freearr_x[dir], y = pl->y + freearr_y[dir]; 813 sint16 x = pl->x + freearr_x[dir], y = pl->y + freearr_y[dir];
824 int mflags, chance; 814 int mflags, chance;
825 object *tmp; 815 object *tmp;
826 maptile *m; 816 maptile *m;
827 817
828 if (pl->type != PLAYER) 818 if (pl->type != PLAYER)
829 return 0; /* only players use this skill */ 819 return 0; /* only players use this skill */
820
830 m = pl->map; 821 m = pl->map;
831 mflags = get_map_flags (m, &m, x, y, &x, &y); 822 mflags = get_map_flags (m, &m, x, y, &x, &y);
832 if (mflags & P_OUT_OF_MAP) 823 if (mflags & P_OUT_OF_MAP)
833 return 0; 824 return 0;
834 825
… …
838 { 829 {
839 new_draw_info (NDI_UNIQUE, 0, pl, "There is nothing to orate to."); 830 new_draw_info (NDI_UNIQUE, 0, pl, "There is nothing to orate to.");
840 return 0; 831 return 0;
841 } 832 }
842 833
843 for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above) 834 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
844 { 835 {
845 /* can't persuade players - return because there is nothing else 836 /* can't persuade players - return because there is nothing else
846 * on that space to charm. Same for multi space monsters and 837 * on that space to charm. Same for multi space monsters and
847 * special monsters - we don't allow them to be charmed, and there 838 * special monsters - we don't allow them to be charmed, and there
848 * is no reason to do further processing since they should be the 839 * is no reason to do further processing since they should be the
849 * only monster on the space. 840 * only monster on the space.
850 */ 841 */
851 if (tmp->type == PLAYER) 842 if (tmp->type == PLAYER
852 return 0; 843 || tmp->more || tmp->head_ () != tmp
853 if (tmp->more || tmp->head) 844 || tmp->msg)
854 return 0;
855 if (tmp->msg)
856 return 0; 845 return 0;
857 846
858 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 847 if (QUERY_FLAG (tmp, FLAG_MONSTER))
859 break; 848 break;
860 } 849 }
… …
877 } 866 }
878 867
879 /* it's already allied! */ 868 /* it's already allied! */
880 if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && (tmp->attack_movement == PETMOVE)) 869 if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && (tmp->attack_movement == PETMOVE))
881 { 870 {
882 if (get_owner (tmp) == pl) 871 if (tmp->owner == pl)
883 { 872 {
884 new_draw_info (NDI_UNIQUE, 0, pl, "Your follower loves your speech.\n"); 873 new_draw_info (NDI_UNIQUE, 0, pl, "Your follower loves your speech.\n");
885 return 0; 874 return 0;
886 } 875 }
887 else if (skill->level > tmp->level) 876 else if (skill->level > tmp->level)
888 { 877 {
889 /* you steal the follower. Perhaps we should really look at the 878 /* you steal the follower. Perhaps we should really look at the
890 * level of the owner above? 879 * level of the owner above?
891 */ 880 */
892 set_owner (tmp, pl); 881 tmp->set_owner (pl);
882 tmp->skill = skill->skill;
883
893 new_draw_info_format (NDI_UNIQUE, 0, pl, "You convince the %s to follow you instead!\n", query_name (tmp)); 884 new_draw_info_format (NDI_UNIQUE, 0, pl, "You convince the %s to follow you instead!\n", query_name (tmp));
894 /* Abuse fix - don't give exp since this can otherwise 885 /* Abuse fix - don't give exp since this can otherwise
895 * be used by a couple players to gets lots of exp. 886 * be used by a couple players to gets lots of exp.
896 */ 887 */
897 return 0; 888 return 0;
… …
908 /* Ok, got a 'sucker' lets try to make them a follower */ 899 /* Ok, got a 'sucker' lets try to make them a follower */
909 if (chance > 0 && tmp->level < (random_roll (0, chance - 1, pl, PREFER_HIGH) - 1)) 900 if (chance > 0 && tmp->level < (random_roll (0, chance - 1, pl, PREFER_HIGH) - 1))
910 { 901 {
911 new_draw_info_format (NDI_UNIQUE, 0, pl, "You convince the %s to become your follower.\n", query_name (tmp)); 902 new_draw_info_format (NDI_UNIQUE, 0, pl, "You convince the %s to become your follower.\n", query_name (tmp));
912 903
913 set_owner (tmp, pl); 904 tmp->set_owner (pl);
905 tmp->skill = skill->skill;
914 tmp->stats.exp = 0; 906 tmp->stats.exp = 0;
915 add_friendly_object (tmp); 907 add_friendly_object (tmp);
916 SET_FLAG (tmp, FLAG_FRIENDLY);
917 tmp->attack_movement = PETMOVE; 908 tmp->attack_movement = PETMOVE;
918 return calc_skill_exp (pl, tmp, skill); 909 return calc_skill_exp (pl, tmp, skill);
919 } 910 }
920 /* Charm failed. Creature may be angry now */ 911 /* Charm failed. Creature may be angry now */
921 else if ((skill->level + ((pl->stats.Cha - 10) / 2)) < random_roll (1, 2 * tmp->level, pl, PREFER_LOW)) 912 else if ((skill->level + ((pl->stats.Cha - 10) / 2)) < random_roll (1, 2 * tmp->level, pl, PREFER_LOW))
… …
925 { 916 {
926 CLEAR_FLAG (tmp, FLAG_FRIENDLY); 917 CLEAR_FLAG (tmp, FLAG_FRIENDLY);
927 remove_friendly_object (tmp); 918 remove_friendly_object (tmp);
928 tmp->attack_movement = 0; /* needed? */ 919 tmp->attack_movement = 0; /* needed? */
929 } 920 }
921
930 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 922 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
931 } 923 }
924
932 return 0; /* Fall through - if we get here, we didn't charm anything */ 925 return 0; /* Fall through - if we get here, we didn't charm anything */
933} 926}
934 927
935/* Singing() -this skill allows the player to pacify nearby creatures. 928/* Singing() -this skill allows the player to pacify nearby creatures.
936 * There are few limitations on who/what kind of 929 * There are few limitations on who/what kind of
… …
964 if (mflags & P_OUT_OF_MAP) 957 if (mflags & P_OUT_OF_MAP)
965 continue; 958 continue;
966 if (!(mflags & P_IS_ALIVE)) 959 if (!(mflags & P_IS_ALIVE))
967 continue; 960 continue;
968 961
969 for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above) 962 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
970 { 963 {
971 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 964 if (QUERY_FLAG (tmp, FLAG_MONSTER))
972 break; 965 break;
973 /* can't affect players */ 966 /* can't affect players */
974 if (tmp->type == PLAYER) 967 if (tmp->type == PLAYER)
… …
1034 mflags = get_map_flags (m, &m, x, y, &x, &y); 1027 mflags = get_map_flags (m, &m, x, y, &x, &y);
1035 if (mflags & P_OUT_OF_MAP) 1028 if (mflags & P_OUT_OF_MAP)
1036 continue; 1029 continue;
1037 1030
1038 /* Check everything in the square for trapness */ 1031 /* Check everything in the square for trapness */
1039 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above) 1032 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1040 { 1033 {
1041 1034
1042 /* And now we'd better do an inventory traversal of each 1035 /* And now we'd better do an inventory traversal of each
1043 * of these objects' inventory 1036 * of these objects' inventory
1044 * We can narrow this down a bit - no reason to search through 1037 * We can narrow this down a bit - no reason to search through
… …
1097 mflags = get_map_flags (m, &m, x, y, &x, &y); 1090 mflags = get_map_flags (m, &m, x, y, &x, &y);
1098 if (mflags & P_OUT_OF_MAP) 1091 if (mflags & P_OUT_OF_MAP)
1099 continue; 1092 continue;
1100 1093
1101 /* Check everything in the square for trapness */ 1094 /* Check everything in the square for trapness */
1102 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above) 1095 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1103 { 1096 {
1104 /* And now we'd better do an inventory traversal of each 1097 /* And now we'd better do an inventory traversal of each
1105 * of these objects inventory. Like above, only 1098 * of these objects inventory. Like above, only
1106 * do this for interesting objects. 1099 * do this for interesting objects.
1107 */ 1100 */
… …
1236} 1229}
1237 1230
1238/* write_note() - this routine allows players to inscribe messages in 1231/* write_note() - this routine allows players to inscribe messages in
1239 * ordinary 'books' (anything that is type BOOK). b.t. 1232 * ordinary 'books' (anything that is type BOOK). b.t.
1240 */ 1233 */
1241
1242static int 1234static int
1243write_note (object *pl, object *item, const char *msg, object *skill) 1235write_note (object *pl, object *item, const char *msg, object *skill)
1244{ 1236{
1245 char buf[1024]; 1237 char buf[1024];
1246 object *newBook = NULL; 1238 object *newBook = NULL;
… …
1253 { 1245 {
1254 new_draw_info (NDI_UNIQUE, 0, pl, "No message to write!"); 1246 new_draw_info (NDI_UNIQUE, 0, pl, "No message to write!");
1255 new_draw_info_format (NDI_UNIQUE, 0, pl, "Usage: use_skill %s <message>", &skill->skill); 1247 new_draw_info_format (NDI_UNIQUE, 0, pl, "Usage: use_skill %s <message>", &skill->skill);
1256 return 0; 1248 return 0;
1257 } 1249 }
1250
1258 if (strcasestr_local (msg, "endmsg")) 1251 if (strcasestr_local (msg, "endmsg"))
1259 { 1252 {
1260 new_draw_info (NDI_UNIQUE, 0, pl, "Trying to cheat now are we?"); 1253 new_draw_info (NDI_UNIQUE, 0, pl, "Trying to cheat now are we?");
1261 return 0; 1254 return 0;
1262 } 1255 }
… …
1272 1265
1273 strcat (buf, msg); 1266 strcat (buf, msg);
1274 strcat (buf, "\n"); /* new msg needs a LF */ 1267 strcat (buf, "\n"); /* new msg needs a LF */
1275 if (item->nrof > 1) 1268 if (item->nrof > 1)
1276 { 1269 {
1277 newBook = get_object (); 1270 newBook = item->clone ();
1278 copy_object (item, newBook);
1279 decrease_ob (item); 1271 decrease_ob (item);
1280 esrv_send_item (pl, item); 1272 esrv_send_item (pl, item);
1281 newBook->nrof = 1; 1273 newBook->nrof = 1;
1282 newBook->msg = buf; 1274 newBook->msg = buf;
1283 newBook = insert_ob_in_ob (newBook, pl); 1275 newBook = insert_ob_in_ob (newBook, pl);
… …
1289 /* This shouldn't be necessary - the object hasn't changed in any 1281 /* This shouldn't be necessary - the object hasn't changed in any
1290 * visible way 1282 * visible way
1291 */ 1283 */
1292 /* esrv_send_item(pl, item); */ 1284 /* esrv_send_item(pl, item); */
1293 } 1285 }
1286
1294 new_draw_info_format (NDI_UNIQUE, 0, pl, "You write in the %s.", query_short_name (item)); 1287 new_draw_info_format (NDI_UNIQUE, 0, pl, "You write in the %s.", query_short_name (item));
1295 return strlen (msg); 1288 return strlen (msg);
1296 } 1289 }
1297 else 1290 else
1298 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your message won't fit in the %s!", query_short_name (item)); 1291 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your message won't fit in the %s!", query_short_name (item));
… …
1318 new_draw_info (NDI_UNIQUE, 0, pl, "A spell can only be inscribed into a scroll!"); 1311 new_draw_info (NDI_UNIQUE, 0, pl, "A spell can only be inscribed into a scroll!");
1319 return 0; 1312 return 0;
1320 } 1313 }
1321 1314
1322 /* Check if we are ready to attempt inscription */ 1315 /* Check if we are ready to attempt inscription */
1323 chosen_spell = pl->contr->ranges[range_magic]; 1316 chosen_spell = pl->contr->ranged_ob;
1324 if (!chosen_spell) 1317 if (!chosen_spell || chosen_spell->type != SPELL)
1325 { 1318 {
1326 new_draw_info (NDI_UNIQUE, 0, pl, "You need a spell readied in order to inscribe!"); 1319 new_draw_info (NDI_UNIQUE, 0, pl, "You need a spell readied in order to inscribe!");
1327 return 0; 1320 return 0;
1328 } 1321 }
1322
1329 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE) > pl->stats.grace) 1323 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE) > pl->stats.grace)
1330 { 1324 {
1331 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough grace to write a scroll of %s.", &chosen_spell->name); 1325 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough grace to write a scroll of %s.", &chosen_spell->name);
1332 return 0; 1326 return 0;
1333 } 1327 }
1328
1334 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA) > pl->stats.sp) 1329 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA) > pl->stats.sp)
1335 { 1330 {
1336 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough mana to write a scroll of %s.", &chosen_spell->name); 1331 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough mana to write a scroll of %s.", &chosen_spell->name);
1337 return 0; 1332 return 0;
1338 } 1333 }
… …
1358 1353
1359 if (random_roll (0, chosen_spell->level * 4 - 1, pl, PREFER_LOW) < skill->level) 1354 if (random_roll (0, chosen_spell->level * 4 - 1, pl, PREFER_LOW) < skill->level)
1360 { 1355 {
1361 if (scroll->nrof > 1) 1356 if (scroll->nrof > 1)
1362 { 1357 {
1363 newscroll = get_object (); 1358 newscroll = scroll->clone ();
1364 copy_object (scroll, newscroll);
1365 decrease_ob (scroll); 1359 decrease_ob (scroll);
1366 newscroll->nrof = 1; 1360 newscroll->nrof = 1;
1367 } 1361 }
1368 else 1362 else
1369 {
1370 newscroll = scroll; 1363 newscroll = scroll;
1371 }
1372 1364
1373 if (!confused) 1365 if (!confused)
1374 { 1366 {
1375 newscroll->level = MAX (skill->level, chosen_spell->level); 1367 newscroll->level = MAX (skill->level, chosen_spell->level);
1376 new_draw_info (NDI_UNIQUE, 0, pl, "You succeed in writing a new scroll."); 1368 new_draw_info (NDI_UNIQUE, 0, pl, "You succeed in writing a new scroll.");
… …
1384 newscroll->level = MAX (skill->level, chosen_spell->level); 1376 newscroll->level = MAX (skill->level, chosen_spell->level);
1385 new_draw_info (NDI_UNIQUE, 0, pl, "In your confused state, you write down some odd spell."); 1377 new_draw_info (NDI_UNIQUE, 0, pl, "In your confused state, you write down some odd spell.");
1386 } 1378 }
1387 1379
1388 if (newscroll->inv) 1380 if (newscroll->inv)
1389 { 1381 newscroll->inv->destroy ();
1390 object *ninv;
1391 1382
1392 ninv = newscroll->inv; 1383 tmp = chosen_spell->clone ();
1393 remove_ob (ninv);
1394 free_object (ninv);
1395 }
1396 tmp = get_object ();
1397 copy_object (chosen_spell, tmp);
1398 insert_ob_in_ob (tmp, newscroll); 1384 insert_ob_in_ob (tmp, newscroll);
1399 1385
1400 /* Same code as from treasure.c - so they can better merge. 1386 /* Same code as from treasure.c - so they can better merge.
1401 * if players want to sell them, so be it. 1387 * if players want to sell them, so be it.
1402 */ 1388 */
… …
1405 1391
1406 /* wait until finished manipulating the scroll before inserting it */ 1392 /* wait until finished manipulating the scroll before inserting it */
1407 if (newscroll == scroll) 1393 if (newscroll == scroll)
1408 { 1394 {
1409 /* Remove to correctly merge with other items which may exist in inventory */ 1395 /* Remove to correctly merge with other items which may exist in inventory */
1410 remove_ob (newscroll); 1396 newscroll->remove ();
1411 esrv_del_item (pl->contr, newscroll->count); 1397 esrv_del_item (pl->contr, newscroll->count);
1412 } 1398 }
1399
1413 newscroll = insert_ob_in_ob (newscroll, pl); 1400 newscroll = insert_ob_in_ob (newscroll, pl);
1414 esrv_send_item (pl, newscroll); 1401 esrv_send_item (pl, newscroll);
1415 success = calc_skill_exp (pl, newscroll, skill); 1402 success = calc_skill_exp (pl, newscroll, skill);
1416 if (!confused) 1403 if (!confused)
1417 success *= 2; 1404 success *= 2;
… …
1424 1411
1425 if (chosen_spell->level > skill->level || confused) 1412 if (chosen_spell->level > skill->level || confused)
1426 { /*backfire! */ 1413 { /*backfire! */
1427 new_draw_info (NDI_UNIQUE, 0, pl, "Ouch! Your attempt to write a new scroll strains your mind!"); 1414 new_draw_info (NDI_UNIQUE, 0, pl, "Ouch! Your attempt to write a new scroll strains your mind!");
1428 if (random_roll (0, 1, pl, PREFER_LOW) == 1) 1415 if (random_roll (0, 1, pl, PREFER_LOW) == 1)
1429 drain_specific_stat (pl, 4); 1416 pl->drain_specific_stat (4);
1430 else 1417 else
1431 { 1418 {
1432 confuse_player (pl, pl, 99); 1419 confuse_player (pl, pl, 99);
1433 return (-30 * chosen_spell->level); 1420 return (-30 * chosen_spell->level);
1434 } 1421 }
… …
1439 confuse_player (pl, pl, 99); 1426 confuse_player (pl, pl, 99);
1440 } 1427 }
1441 else 1428 else
1442 new_draw_info (NDI_UNIQUE, 0, pl, "You fail to write a new scroll."); 1429 new_draw_info (NDI_UNIQUE, 0, pl, "You fail to write a new scroll.");
1443 } 1430 }
1431
1444 return 0; 1432 return 0;
1445} 1433}
1446 1434
1447/* write_on_item() - wrapper for write_note and write_scroll */ 1435/* write_on_item() - wrapper for write_note and write_scroll */
1448int 1436int
… …
1459 if (!params) 1447 if (!params)
1460 { 1448 {
1461 params = ""; 1449 params = "";
1462 string = params; 1450 string = params;
1463 } 1451 }
1452
1464 skat = get_archetype_by_type_subtype (SKILL, SK_LITERACY); 1453 skat = get_archetype_by_type_subtype (SKILL, SK_LITERACY);
1465 1454
1466 /* Need to be able to read before we can write! */ 1455 /* Need to be able to read before we can write! */
1467 if (!find_skill_by_name (pl, skat->clone.skill)) 1456 if (!find_skill_by_name (pl, skat->clone.skill))
1468 { 1457 {
… …
1492 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no %s to write on", msgtype == BOOK ? "book" : "scroll"); 1481 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no %s to write on", msgtype == BOOK ? "book" : "scroll");
1493 return 0; 1482 return 0;
1494 } 1483 }
1495 1484
1496 if (msgtype == SCROLL) 1485 if (msgtype == SCROLL)
1497 {
1498 return write_scroll (pl, item, skill); 1486 return write_scroll (pl, item, skill);
1499 }
1500 else if (msgtype == BOOK) 1487 else if (msgtype == BOOK)
1501 {
1502 return write_note (pl, item, string, skill); 1488 return write_note (pl, item, string, skill);
1503 } 1489
1504 return 0; 1490 return 0;
1505} 1491}
1506
1507
1508 1492
1509/* find_throw_ob() - if we request an object, then 1493/* find_throw_ob() - if we request an object, then
1510 * we search for it in the inventory of the owner (you've 1494 * we search for it in the inventory of the owner (you've
1511 * got to be carrying something in order to throw it!). 1495 * got to be carrying something in order to throw it!).
1512 * If we didnt request an object, then the top object in inventory 1496 * If we didnt request an object, then the top object in inventory
1513 * (that is "throwable", ie no throwing your skills away!) 1497 * (that is "throwable", ie no throwing your skills away!)
1514 * is the object of choice. Also check to see if object is 1498 * is the object of choice. Also check to see if object is
1515 * 'throwable' (ie not applied cursed obj, worn, etc). 1499 * 'throwable' (ie not applied cursed obj, worn, etc).
1516 */ 1500 */
1517
1518static object * 1501static object *
1519find_throw_ob (object *op, const char *request) 1502find_throw_ob (object *op, const char *request)
1520{ 1503{
1521 object *tmp; 1504 object *tmp;
1522 1505
… …
1594 1577
1595/* make_throw_ob() We construct the 'carrier' object in 1578/* make_throw_ob() We construct the 'carrier' object in
1596 * which we will insert the object that is being thrown. 1579 * which we will insert the object that is being thrown.
1597 * This combination becomes the 'thrown object'. -b.t. 1580 * This combination becomes the 'thrown object'. -b.t.
1598 */ 1581 */
1599
1600static object * 1582static object *
1601make_throw_ob (object *orig) 1583make_throw_ob (object *orig)
1602{ 1584{
1603 object *toss_item;
1604
1605 if (!orig) 1585 if (!orig)
1606 return NULL; 1586 return NULL;
1607 1587
1608 toss_item = get_object ();
1609 if (QUERY_FLAG (orig, FLAG_APPLIED)) 1588 if (QUERY_FLAG (orig, FLAG_APPLIED))
1610 { 1589 {
1611 LOG (llevError, "BUG: make_throw_ob(): ob is applied\n"); 1590 LOG (llevError, "BUG: make_throw_ob(): ob is applied\n");
1612 /* insufficient workaround, but better than nothing */ 1591 /* insufficient workaround, but better than nothing */
1613 CLEAR_FLAG (orig, FLAG_APPLIED); 1592 CLEAR_FLAG (orig, FLAG_APPLIED);
1614 } 1593 }
1615 copy_object (orig, toss_item); 1594
1595 object *toss_item = orig->clone ();
1596
1616 toss_item->type = THROWN_OBJ; 1597 toss_item->type = THROWN_OBJ;
1617 CLEAR_FLAG (toss_item, FLAG_CHANGING); 1598 CLEAR_FLAG (toss_item, FLAG_CHANGING);
1618 toss_item->stats.dam = 0; /* default damage */ 1599 toss_item->stats.dam = 0; /* default damage */
1619 insert_ob_in_ob (orig, toss_item); 1600 insert_ob_in_ob (orig, toss_item);
1620 return toss_item; 1601 return toss_item;
1621} 1602}
1622 1603
1623
1624/* do_throw() - op throws any object toss_item. This code 1604/* do_throw() - op throws any object toss_item. This code
1625 * was borrowed from fire_bow. 1605 * was borrowed from fire_bow.
1626 * Returns 1 if skill was successfully used, 0 if not 1606 * Returns 1 if skill was successfully used, 0 if not
1627 */ 1607 */
1628
1629static int 1608static int
1630do_throw (object *op, object *part, object *toss_item, int dir, object *skill) 1609do_throw (object *op, object *part, object *toss_item, int dir, object *skill)
1631{ 1610{
1632 object *throw_ob = toss_item, *left = NULL; 1611 object *throw_ob = toss_item, *left = NULL;
1633 int eff_str = 0, maxc, str = op->stats.Str, dam = 0; 1612 int eff_str = 0, maxc, str = op->stats.Str, dam = 0;
… …
1698 */ 1677 */
1699 mflags = get_map_flags (part->map, &m, part->x + freearr_x[dir], part->y + freearr_y[dir], &sx, &sy); 1678 mflags = get_map_flags (part->map, &m, part->x + freearr_x[dir], part->y + freearr_y[dir], &sx, &sy);
1700 1679
1701 if (!dir || (eff_str <= 1) || (mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, sx, sy) & MOVE_FLY_LOW)) 1680 if (!dir || (eff_str <= 1) || (mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, sx, sy) & MOVE_FLY_LOW))
1702 { 1681 {
1703
1704 /* bounces off 'wall', and drops to feet */ 1682 /* bounces off 'wall', and drops to feet */
1705 remove_ob (throw_ob); 1683 throw_ob->insert_at (part, op);
1706 throw_ob->x = part->x; 1684
1707 throw_ob->y = part->y;
1708 insert_ob_in_map (throw_ob, part->map, op, 0);
1709 if (op->type == PLAYER) 1685 if (op->type == PLAYER)
1710 { 1686 {
1711 if (eff_str <= 1) 1687 if (eff_str <= 1)
1712 {
1713 new_draw_info_format (NDI_UNIQUE, 0, op, "Your load is so heavy you drop %s to the ground.", query_name (throw_ob)); 1688 new_draw_info_format (NDI_UNIQUE, 0, op, "Your load is so heavy you drop %s to the ground.", query_name (throw_ob));
1714 }
1715 else if (!dir) 1689 else if (!dir)
1716 {
1717 new_draw_info_format (NDI_UNIQUE, 0, op, "You throw %s at the ground.", query_name (throw_ob)); 1690 new_draw_info_format (NDI_UNIQUE, 0, op, "You throw %s at the ground.", query_name (throw_ob));
1718 }
1719 else 1691 else
1720 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1692 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
1721 } 1693 }
1694
1722 return 0; 1695 return 0;
1723 } /* if object can't be thrown */ 1696 } /* if object can't be thrown */
1724 1697
1725 left = throw_ob; /* these are throwing objects left to the player */ 1698 left = throw_ob; /* these are throwing objects left to the player */
1726 1699
… …
1729 */ 1702 */
1730 1703
1731 if ((throw_ob = get_split_ob (throw_ob, 1)) == NULL) 1704 if ((throw_ob = get_split_ob (throw_ob, 1)) == NULL)
1732 { 1705 {
1733 throw_ob = left; 1706 throw_ob = left;
1734 remove_ob (left); 1707 left->remove ();
1735 if (op->type == PLAYER) 1708 if (op->type == PLAYER)
1736 esrv_del_item (op->contr, left->count); 1709 esrv_del_item (op->contr, left->count);
1737 } 1710 }
1738 else if (op->type == PLAYER) 1711 else if (op->type == PLAYER)
1739 { 1712 {
… …
1763 { 1736 {
1764 insert_ob_in_ob (throw_ob, op); 1737 insert_ob_in_ob (throw_ob, op);
1765 return 0; 1738 return 0;
1766 } 1739 }
1767 1740
1768 set_owner (throw_ob, op); 1741 throw_ob->set_owner (op);
1769 /* At some point in the attack code, the actual real object (op->inv) 1742 /* At some point in the attack code, the actual real object (op->inv)
1770 * becomes the hitter. As such, we need to make sure that has a proper 1743 * becomes the hitter. As such, we need to make sure that has a proper
1771 * owner value so exp goes to the right place. 1744 * owner value so exp goes to the right place.
1772 */ 1745 */
1773 set_owner (throw_ob->inv, op); 1746 throw_ob->inv->set_owner (op);
1774 throw_ob->direction = dir; 1747 throw_ob->direction = dir;
1775 throw_ob->x = part->x;
1776 throw_ob->y = part->y;
1777 1748
1778 /* the damage bonus from the force of the throw */ 1749 /* the damage bonus from the force of the throw */
1779 dam = (int) (str_factor * dam_bonus[eff_str]); 1750 dam = (int) (str_factor * dam_bonus[eff_str]);
1780 1751
1781 /* Now, lets adjust the properties of the thrown_ob. */ 1752 /* Now, lets adjust the properties of the thrown_ob. */
1782 1753
1783 /* how far to fly */ 1754 /* how far to fly */
1784 throw_ob->last_sp = (eff_str * 3) / 5; 1755 throw_ob->last_sp = (eff_str * 3) / 5;
1785 1756
1786 /* speed */ 1757 /* speed */
1787 throw_ob->speed = (speed_bonus[eff_str] + 1.0) / 1.5; 1758 throw_ob->set_speed (min (1.0, speed_bonus[eff_str] + 1.0) / 1.5); /* no faster than an arrow! */
1788 throw_ob->speed = MIN (1.0, throw_ob->speed); /* no faster than an arrow! */
1789 1759
1790 /* item damage. Eff_str and item weight influence damage done */ 1760 /* item damage. Eff_str and item weight influence damage done */
1791 weight_f = (throw_ob->weight / 2000) > MAX_STAT ? MAX_STAT : (throw_ob->weight / 2000); 1761 weight_f = (throw_ob->weight / 2000) > MAX_STAT ? MAX_STAT : (throw_ob->weight / 2000);
1792 throw_ob->stats.dam += (dam / 3) + dam_bonus[weight_f] + (throw_ob->weight / 15000) - 2; 1762 throw_ob->stats.dam += (dam / 3) + dam_bonus[weight_f] + (throw_ob->weight / 15000) - 2;
1793 1763
1794 /* chance of breaking. Proportional to force used and weight of item */ 1764 /* chance of breaking. Proportional to force used and weight of item */
1795 throw_ob->stats.food = (dam / 2) + (throw_ob->weight / 60000); 1765 throw_ob->stats.food = (dam / 2) + (throw_ob->weight / 60000);
1796 1766
1797 /* replace 25 with a call to clone.arch wc? messes up w/ NPC */ 1767 /* replace 25 with a call to clone.arch wc? messes up w/ NPC */
1798 throw_ob->stats.wc = 25 - dex_bonus[op->stats.Dex] - thaco_bonus[eff_str] - skill->level; 1768 throw_ob->stats.wc = 25 - dex_bonus[op->stats.Dex] - thaco_bonus[eff_str] - skill->level;
1799
1800 1769
1801 /* the properties of objects which are meant to be thrown (ie dart, 1770 /* the properties of objects which are meant to be thrown (ie dart,
1802 * throwing knife, etc) will differ from ordinary items. Lets tailor 1771 * throwing knife, etc) will differ from ordinary items. Lets tailor
1803 * this stuff in here. 1772 * this stuff in here.
1804 */ 1773 */
… …
1812 if (GET_ANIM_ID (throw_ob) && NUM_ANIMATIONS (throw_ob)) 1781 if (GET_ANIM_ID (throw_ob) && NUM_ANIMATIONS (throw_ob))
1813 SET_ANIMATION (throw_ob, dir); 1782 SET_ANIMATION (throw_ob, dir);
1814 } 1783 }
1815 else 1784 else
1816 { 1785 {
1786 uint16 mat = throw_ob->materials;
1787
1817 /* some materials will adjust properties.. */ 1788 /* some materials will adjust properties.. */
1818 if (throw_ob->material & M_LEATHER) 1789 if (mat & M_LEATHER)
1819 { 1790 {
1820 throw_ob->stats.dam -= 1; 1791 throw_ob->stats.dam -= 1;
1821 throw_ob->stats.food -= 10; 1792 throw_ob->stats.food -= 10;
1822 } 1793 }
1794
1823 if (throw_ob->material & M_GLASS) 1795 if (mat & M_GLASS)
1824 throw_ob->stats.food += 60; 1796 throw_ob->stats.food += 60;
1825 1797
1826 if (throw_ob->material & M_ORGANIC) 1798 if (mat & M_ORGANIC)
1827 { 1799 {
1828 throw_ob->stats.dam -= 3; 1800 throw_ob->stats.dam -= 3;
1829 throw_ob->stats.food += 55; 1801 throw_ob->stats.food += 55;
1830 } 1802 }
1831 if (throw_ob->material & M_PAPER || throw_ob->material & M_CLOTH) 1803
1804 if (mat & M_PAPER || mat & M_CLOTH)
1832 { 1805 {
1833 throw_ob->stats.dam -= 5; 1806 throw_ob->stats.dam -= 5;
1834 throw_ob->speed *= 0.8; 1807 throw_ob->speed *= 0.8;
1835 throw_ob->stats.wc += 3; 1808 throw_ob->stats.wc += 3;
1836 throw_ob->stats.food -= 30; 1809 throw_ob->stats.food -= 30;
1837 } 1810 }
1811
1838 /* light obj have more wind resistance, fly slower */ 1812 /* light obj have more wind resistance, fly slower */
1839 if (throw_ob->weight > 500) 1813 if (throw_ob->weight > 500)
1840 throw_ob->speed *= 0.8; 1814 throw_ob->speed *= 0.8;
1815
1841 if (throw_ob->weight > 50) 1816 if (throw_ob->weight > 50)
1842 throw_ob->speed *= 0.5; 1817 throw_ob->speed *= 0.5;
1843
1844 } /* else tailor thrown object */ 1818 } /* else tailor thrown object */
1845 1819
1846 /* some limits, and safeties (needed?) */ 1820 /* some limits, and safeties (needed?) */
1847 if (throw_ob->stats.dam < 0) 1821 if (throw_ob->stats.dam < 0)
1848 throw_ob->stats.dam = 0; 1822 throw_ob->stats.dam = 0;
… …
1868 * In short summary, a throw can take anywhere between speed 5 and 1842 * In short summary, a throw can take anywhere between speed 5 and
1869 * speed 0.5 1843 * speed 0.5
1870 */ 1844 */
1871 op->speed_left -= 50 / pause_f; 1845 op->speed_left -= 50 / pause_f;
1872 1846
1873 update_ob_speed (throw_ob);
1874 throw_ob->speed_left = 0; 1847 throw_ob->speed_left = 0;
1875 throw_ob->map = part->map; 1848 throw_ob->map = part->map;
1876 1849
1877 throw_ob->move_type = MOVE_FLY_LOW; 1850 throw_ob->move_type = MOVE_FLY_LOW;
1878 throw_ob->move_on = MOVE_FLY_LOW | MOVE_WALK; 1851 throw_ob->move_on = MOVE_FLY_LOW | MOVE_WALK;
… …
1888 LOG (llevDebug, " pause_f=%d \n", pause_f); 1861 LOG (llevDebug, " pause_f=%d \n", pause_f);
1889 LOG (llevDebug, " %s stats: wc=%d dam=%d dist=%d spd=%f break=%d\n", 1862 LOG (llevDebug, " %s stats: wc=%d dam=%d dist=%d spd=%f break=%d\n",
1890 throw_ob->name, throw_ob->stats.wc, throw_ob->stats.dam, throw_ob->last_sp, throw_ob->speed, throw_ob->stats.food); 1863 throw_ob->name, throw_ob->stats.wc, throw_ob->stats.dam, throw_ob->last_sp, throw_ob->speed, throw_ob->stats.food);
1891 LOG (llevDebug, "inserting tossitem (%d) into map\n", throw_ob->count); 1864 LOG (llevDebug, "inserting tossitem (%d) into map\n", throw_ob->count);
1892#endif 1865#endif
1893 insert_ob_in_map (throw_ob, part->map, op, 0); 1866
1867 throw_ob->insert_at (part, op);
1894 1868
1895 if (!throw_ob->destroyed ()) 1869 if (!throw_ob->destroyed ())
1896 move_arrow (throw_ob); 1870 move_arrow (throw_ob);
1897 1871
1898 return 1; 1872 return 1;

Diff Legend

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