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.34 by root, Fri May 18 13:54:52 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];
824 int mflags, chance;
825 object *tmp;
826 maptile *m;
827
828 if (pl->type != PLAYER) 813 if (pl->type != PLAYER)
829 return 0; /* only players use this skill */ 814 return 0; /* only players use this skill */
815
816 sint16 x = pl->x + freearr_x[dir],
817 y = pl->y + freearr_y[dir];
830 m = pl->map; 818 maptile *m = pl->map;
819
831 mflags = get_map_flags (m, &m, x, y, &x, &y); 820 int mflags = get_map_flags (m, &m, x, y, &x, &y);
832 if (mflags & P_OUT_OF_MAP) 821 if (mflags & P_OUT_OF_MAP)
833 return 0; 822 return 0;
834 823
835 /* Save some processing - we have the flag already anyways 824 /* Save some processing - we have the flag already anyways
836 */ 825 */
… …
838 { 827 {
839 new_draw_info (NDI_UNIQUE, 0, pl, "There is nothing to orate to."); 828 new_draw_info (NDI_UNIQUE, 0, pl, "There is nothing to orate to.");
840 return 0; 829 return 0;
841 } 830 }
842 831
832 object *tmp;
843 for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above) 833 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
844 { 834 {
845 /* can't persuade players - return because there is nothing else 835 /* can't persuade players - return because there is nothing else
846 * on that space to charm. Same for multi space monsters and 836 * on that space to charm. Same for multi space monsters and
847 * special monsters - we don't allow them to be charmed, and there 837 * 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 838 * is no reason to do further processing since they should be the
849 * only monster on the space. 839 * only monster on the space.
850 */ 840 */
851 if (tmp->type == PLAYER) 841 if (tmp->type == PLAYER
852 return 0; 842 || tmp->more || tmp->head_ () != tmp
853 if (tmp->more || tmp->head) 843 || tmp->msg)
854 return 0;
855 if (tmp->msg)
856 return 0; 844 return 0;
857 845
858 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 846 if (QUERY_FLAG (tmp, FLAG_MONSTER))
859 break; 847 break;
860 } 848 }
… …
875 new_draw_info_format (NDI_UNIQUE, 0, pl, "Too bad the %s isn't listening!\n", query_name (tmp)); 863 new_draw_info_format (NDI_UNIQUE, 0, pl, "Too bad the %s isn't listening!\n", query_name (tmp));
876 return 0; 864 return 0;
877 } 865 }
878 866
879 /* it's already allied! */ 867 /* it's already allied! */
880 if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && (tmp->attack_movement == PETMOVE)) 868 if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->attack_movement == PETMOVE)
881 { 869 {
882 if (get_owner (tmp) == pl) 870 if (tmp->owner == pl)
883 { 871 {
884 new_draw_info (NDI_UNIQUE, 0, pl, "Your follower loves your speech.\n"); 872 new_draw_info (NDI_UNIQUE, 0, pl, "Your follower loves your speech.\n");
885 return 0; 873 return 0;
886 } 874 }
887 else if (skill->level > tmp->level) 875 else if (skill->level > tmp->level)
888 { 876 {
889 /* you steal the follower. Perhaps we should really look at the 877 /* you steal the follower. Perhaps we should really look at the
890 * level of the owner above? 878 * level of the owner above?
891 */ 879 */
892 set_owner (tmp, pl); 880 tmp->set_owner (pl);
881 tmp->skill = skill->skill;
882
893 new_draw_info_format (NDI_UNIQUE, 0, pl, "You convince the %s to follow you instead!\n", query_name (tmp)); 883 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 884 /* Abuse fix - don't give exp since this can otherwise
895 * be used by a couple players to gets lots of exp. 885 * be used by a couple players to gets lots of exp.
896 */ 886 */
897 return 0; 887 return 0;
… …
901 /* In this case, you can't steal it from the other player */ 891 /* In this case, you can't steal it from the other player */
902 return 0; 892 return 0;
903 } 893 }
904 } /* Creature was already a pet of someone */ 894 } /* Creature was already a pet of someone */
905 895
906 chance = skill->level * 2 + (pl->stats.Cha - 2 * tmp->stats.Int) / 2; 896 int level = skill->level + (pl->stats.Cha - tmp->stats.Int) / 2;
907 897
908 /* Ok, got a 'sucker' lets try to make them a follower */ 898 /* 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)) 899 if (level > 0 && tmp->level < (random_roll (0, level - 1, pl, PREFER_HIGH) - 1))
910 { 900 {
911 new_draw_info_format (NDI_UNIQUE, 0, pl, "You convince the %s to become your follower.\n", query_name (tmp)); 901 new_draw_info_format (NDI_UNIQUE, 0, pl, "You convince the %s to become your follower.\n", query_name (tmp));
912 902
913 set_owner (tmp, pl); 903 tmp->set_owner (pl);
904 tmp->skill = skill->skill;
914 tmp->stats.exp = 0; 905 tmp->stats.exp = 0;
915 add_friendly_object (tmp); 906 add_friendly_object (tmp);
916 SET_FLAG (tmp, FLAG_FRIENDLY);
917 tmp->attack_movement = PETMOVE; 907 tmp->attack_movement = PETMOVE;
918 return calc_skill_exp (pl, tmp, skill); 908 return calc_skill_exp (pl, tmp, skill);
919 } 909 }
920 /* Charm failed. Creature may be angry now */ 910 /* 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)) 911 else if ((skill->level + ((pl->stats.Cha - 10) / 2)) < random_roll (1, 2 * tmp->level, pl, PREFER_LOW))
… …
925 { 915 {
926 CLEAR_FLAG (tmp, FLAG_FRIENDLY); 916 CLEAR_FLAG (tmp, FLAG_FRIENDLY);
927 remove_friendly_object (tmp); 917 remove_friendly_object (tmp);
928 tmp->attack_movement = 0; /* needed? */ 918 tmp->attack_movement = 0; /* needed? */
929 } 919 }
920
930 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 921 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
931 } 922 }
923
932 return 0; /* Fall through - if we get here, we didn't charm anything */ 924 return 0; /* Fall through - if we get here, we didn't charm anything */
933} 925}
934 926
935/* Singing() -this skill allows the player to pacify nearby creatures. 927/* Singing() -this skill allows the player to pacify nearby creatures.
936 * There are few limitations on who/what kind of 928 * There are few limitations on who/what kind of
… …
939 * successfully pacified the creature gets Int=1. Thus, a player 931 * successfully pacified the creature gets Int=1. Thus, a player
940 * may only pacify a creature once. 932 * may only pacify a creature once.
941 * BTW, I appologize for the naming of the skill, I couldnt think 933 * BTW, I appologize for the naming of the skill, I couldnt think
942 * of anything better! -b.t. 934 * of anything better! -b.t.
943 */ 935 */
944
945int 936int
946singing (object *pl, int dir, object *skill) 937singing (object *pl, int dir, object *skill)
947{ 938{
948 int i, exp = 0, chance, mflags; 939 int i, exp = 0;
949 object *tmp; 940 object *tmp;
950 maptile *m; 941 maptile *m;
951 sint16 x, y; 942 sint16 x, y;
952 943
953 if (pl->type != PLAYER) 944 if (pl->type != PLAYER)
… …
958 { 949 {
959 x = pl->x + freearr_x[i]; 950 x = pl->x + freearr_x[i];
960 y = pl->y + freearr_y[i]; 951 y = pl->y + freearr_y[i];
961 m = pl->map; 952 m = pl->map;
962 953
963 mflags = get_map_flags (m, &m, x, y, &x, &y); 954 int mflags = get_map_flags (m, &m, x, y, &x, &y);
964 if (mflags & P_OUT_OF_MAP) 955 if (mflags & P_OUT_OF_MAP)
965 continue; 956 continue;
966 if (!(mflags & P_IS_ALIVE)) 957 if (!(mflags & P_IS_ALIVE))
967 continue; 958 continue;
968 959
969 for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above) 960 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
970 { 961 {
971 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 962 if (QUERY_FLAG (tmp, FLAG_MONSTER))
972 break; 963 break;
973 /* can't affect players */ 964 /* can't affect players */
974 if (tmp->type == PLAYER) 965 if (tmp->type == PLAYER)
… …
987 978
988 /* stealing isn't really related (although, maybe it should 979 /* stealing isn't really related (although, maybe it should
989 * be). This is mainly to prevent singing to the same monster 980 * be). This is mainly to prevent singing to the same monster
990 * over and over again and getting exp for it. 981 * over and over again and getting exp for it.
991 */ 982 */
992 chance = skill->level * 2 + (pl->stats.Cha - 5 - tmp->stats.Int) / 2; 983 int level = skill->level + (pl->stats.Cha - 5 - tmp->stats.Int) / 2;
984
993 if (chance && tmp->level * 2 < random_roll (0, chance - 1, pl, PREFER_HIGH)) 985 if (level && tmp->level < random_roll (0, level - 1, pl, PREFER_HIGH))
994 { 986 {
995 SET_FLAG (tmp, FLAG_UNAGGRESSIVE); 987 SET_FLAG (tmp, FLAG_UNAGGRESSIVE);
996 new_draw_info_format (NDI_UNIQUE, 0, pl, "You calm down the %s\n", query_name (tmp)); 988 new_draw_info_format (NDI_UNIQUE, 0, pl, "You calm down the %s\n", query_name (tmp));
997 /* Give exp only if they are not aware */ 989 /* Give exp only if they are not aware */
990
998 if (!QUERY_FLAG (tmp, FLAG_NO_STEAL)) 991 if (!QUERY_FLAG (tmp, FLAG_NO_STEAL))
999 exp += calc_skill_exp (pl, tmp, skill); 992 exp += calc_skill_exp (pl, tmp, skill);
993
1000 SET_FLAG (tmp, FLAG_NO_STEAL); 994 SET_FLAG (tmp, FLAG_NO_STEAL);
1001 } 995 }
1002 else 996 else
1003 { 997 {
1004 new_draw_info_format (NDI_UNIQUE, 0, pl, "Too bad the %s isn't listening!\n", query_name (tmp)); 998 new_draw_info_format (NDI_UNIQUE, 0, pl, "Too bad the %s isn't listening!\n", query_name (tmp));
… …
1034 mflags = get_map_flags (m, &m, x, y, &x, &y); 1028 mflags = get_map_flags (m, &m, x, y, &x, &y);
1035 if (mflags & P_OUT_OF_MAP) 1029 if (mflags & P_OUT_OF_MAP)
1036 continue; 1030 continue;
1037 1031
1038 /* Check everything in the square for trapness */ 1032 /* Check everything in the square for trapness */
1039 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above) 1033 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1040 { 1034 {
1041 1035
1042 /* And now we'd better do an inventory traversal of each 1036 /* And now we'd better do an inventory traversal of each
1043 * of these objects' inventory 1037 * of these objects' inventory
1044 * We can narrow this down a bit - no reason to search through 1038 * We can narrow this down a bit - no reason to search through
… …
1097 mflags = get_map_flags (m, &m, x, y, &x, &y); 1091 mflags = get_map_flags (m, &m, x, y, &x, &y);
1098 if (mflags & P_OUT_OF_MAP) 1092 if (mflags & P_OUT_OF_MAP)
1099 continue; 1093 continue;
1100 1094
1101 /* Check everything in the square for trapness */ 1095 /* Check everything in the square for trapness */
1102 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above) 1096 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1103 { 1097 {
1104 /* And now we'd better do an inventory traversal of each 1098 /* And now we'd better do an inventory traversal of each
1105 * of these objects inventory. Like above, only 1099 * of these objects inventory. Like above, only
1106 * do this for interesting objects. 1100 * do this for interesting objects.
1107 */ 1101 */
… …
1236} 1230}
1237 1231
1238/* write_note() - this routine allows players to inscribe messages in 1232/* write_note() - this routine allows players to inscribe messages in
1239 * ordinary 'books' (anything that is type BOOK). b.t. 1233 * ordinary 'books' (anything that is type BOOK). b.t.
1240 */ 1234 */
1241
1242static int 1235static int
1243write_note (object *pl, object *item, const char *msg, object *skill) 1236write_note (object *pl, object *item, const char *msg, object *skill)
1244{ 1237{
1245 char buf[1024]; 1238 char buf[1024];
1246 object *newBook = NULL; 1239 object *newBook = NULL;
… …
1253 { 1246 {
1254 new_draw_info (NDI_UNIQUE, 0, pl, "No message to write!"); 1247 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); 1248 new_draw_info_format (NDI_UNIQUE, 0, pl, "Usage: use_skill %s <message>", &skill->skill);
1256 return 0; 1249 return 0;
1257 } 1250 }
1251
1258 if (strcasestr_local (msg, "endmsg")) 1252 if (strcasestr_local (msg, "endmsg"))
1259 { 1253 {
1260 new_draw_info (NDI_UNIQUE, 0, pl, "Trying to cheat now are we?"); 1254 new_draw_info (NDI_UNIQUE, 0, pl, "Trying to cheat now are we?");
1261 return 0; 1255 return 0;
1262 } 1256 }
… …
1272 1266
1273 strcat (buf, msg); 1267 strcat (buf, msg);
1274 strcat (buf, "\n"); /* new msg needs a LF */ 1268 strcat (buf, "\n"); /* new msg needs a LF */
1275 if (item->nrof > 1) 1269 if (item->nrof > 1)
1276 { 1270 {
1277 newBook = get_object (); 1271 newBook = item->clone ();
1278 copy_object (item, newBook);
1279 decrease_ob (item); 1272 decrease_ob (item);
1280 esrv_send_item (pl, item); 1273 esrv_send_item (pl, item);
1281 newBook->nrof = 1; 1274 newBook->nrof = 1;
1282 newBook->msg = buf; 1275 newBook->msg = buf;
1283 newBook = insert_ob_in_ob (newBook, pl); 1276 newBook = insert_ob_in_ob (newBook, pl);
… …
1289 /* This shouldn't be necessary - the object hasn't changed in any 1282 /* This shouldn't be necessary - the object hasn't changed in any
1290 * visible way 1283 * visible way
1291 */ 1284 */
1292 /* esrv_send_item(pl, item); */ 1285 /* esrv_send_item(pl, item); */
1293 } 1286 }
1287
1294 new_draw_info_format (NDI_UNIQUE, 0, pl, "You write in the %s.", query_short_name (item)); 1288 new_draw_info_format (NDI_UNIQUE, 0, pl, "You write in the %s.", query_short_name (item));
1295 return strlen (msg); 1289 return strlen (msg);
1296 } 1290 }
1297 else 1291 else
1298 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your message won't fit in the %s!", query_short_name (item)); 1292 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!"); 1312 new_draw_info (NDI_UNIQUE, 0, pl, "A spell can only be inscribed into a scroll!");
1319 return 0; 1313 return 0;
1320 } 1314 }
1321 1315
1322 /* Check if we are ready to attempt inscription */ 1316 /* Check if we are ready to attempt inscription */
1323 chosen_spell = pl->contr->ranges[range_magic]; 1317 chosen_spell = pl->contr->ranged_ob;
1324 if (!chosen_spell) 1318 if (!chosen_spell || chosen_spell->type != SPELL)
1325 { 1319 {
1326 new_draw_info (NDI_UNIQUE, 0, pl, "You need a spell readied in order to inscribe!"); 1320 new_draw_info (NDI_UNIQUE, 0, pl, "You need a spell readied in order to inscribe!");
1327 return 0; 1321 return 0;
1328 } 1322 }
1323
1329 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE) > pl->stats.grace) 1324 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE) > pl->stats.grace)
1330 { 1325 {
1331 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough grace to write a scroll of %s.", &chosen_spell->name); 1326 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; 1327 return 0;
1333 } 1328 }
1329
1334 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA) > pl->stats.sp) 1330 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA) > pl->stats.sp)
1335 { 1331 {
1336 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough mana to write a scroll of %s.", &chosen_spell->name); 1332 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; 1333 return 0;
1338 } 1334 }
… …
1358 1354
1359 if (random_roll (0, chosen_spell->level * 4 - 1, pl, PREFER_LOW) < skill->level) 1355 if (random_roll (0, chosen_spell->level * 4 - 1, pl, PREFER_LOW) < skill->level)
1360 { 1356 {
1361 if (scroll->nrof > 1) 1357 if (scroll->nrof > 1)
1362 { 1358 {
1363 newscroll = get_object (); 1359 newscroll = scroll->clone ();
1364 copy_object (scroll, newscroll);
1365 decrease_ob (scroll); 1360 decrease_ob (scroll);
1366 newscroll->nrof = 1; 1361 newscroll->nrof = 1;
1367 } 1362 }
1368 else 1363 else
1369 {
1370 newscroll = scroll; 1364 newscroll = scroll;
1371 }
1372 1365
1373 if (!confused) 1366 if (!confused)
1374 { 1367 {
1375 newscroll->level = MAX (skill->level, chosen_spell->level); 1368 newscroll->level = MAX (skill->level, chosen_spell->level);
1376 new_draw_info (NDI_UNIQUE, 0, pl, "You succeed in writing a new scroll."); 1369 new_draw_info (NDI_UNIQUE, 0, pl, "You succeed in writing a new scroll.");
… …
1384 newscroll->level = MAX (skill->level, chosen_spell->level); 1377 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."); 1378 new_draw_info (NDI_UNIQUE, 0, pl, "In your confused state, you write down some odd spell.");
1386 } 1379 }
1387 1380
1388 if (newscroll->inv) 1381 if (newscroll->inv)
1389 { 1382 newscroll->inv->destroy ();
1390 object *ninv;
1391 1383
1392 ninv = newscroll->inv; 1384 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); 1385 insert_ob_in_ob (tmp, newscroll);
1399 1386
1400 /* Same code as from treasure.c - so they can better merge. 1387 /* Same code as from treasure.c - so they can better merge.
1401 * if players want to sell them, so be it. 1388 * if players want to sell them, so be it.
1402 */ 1389 */
… …
1405 1392
1406 /* wait until finished manipulating the scroll before inserting it */ 1393 /* wait until finished manipulating the scroll before inserting it */
1407 if (newscroll == scroll) 1394 if (newscroll == scroll)
1408 { 1395 {
1409 /* Remove to correctly merge with other items which may exist in inventory */ 1396 /* Remove to correctly merge with other items which may exist in inventory */
1410 remove_ob (newscroll); 1397 newscroll->remove ();
1411 esrv_del_item (pl->contr, newscroll->count); 1398 esrv_del_item (pl->contr, newscroll->count);
1412 } 1399 }
1400
1413 newscroll = insert_ob_in_ob (newscroll, pl); 1401 newscroll = insert_ob_in_ob (newscroll, pl);
1414 esrv_send_item (pl, newscroll); 1402 esrv_send_item (pl, newscroll);
1415 success = calc_skill_exp (pl, newscroll, skill); 1403 success = calc_skill_exp (pl, newscroll, skill);
1416 if (!confused) 1404 if (!confused)
1417 success *= 2; 1405 success *= 2;
… …
1424 1412
1425 if (chosen_spell->level > skill->level || confused) 1413 if (chosen_spell->level > skill->level || confused)
1426 { /*backfire! */ 1414 { /*backfire! */
1427 new_draw_info (NDI_UNIQUE, 0, pl, "Ouch! Your attempt to write a new scroll strains your mind!"); 1415 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) 1416 if (random_roll (0, 1, pl, PREFER_LOW) == 1)
1429 drain_specific_stat (pl, 4); 1417 pl->drain_specific_stat (4);
1430 else 1418 else
1431 { 1419 {
1432 confuse_player (pl, pl, 99); 1420 confuse_player (pl, pl, 99);
1433 return (-30 * chosen_spell->level); 1421 return (-30 * chosen_spell->level);
1434 } 1422 }
… …
1439 confuse_player (pl, pl, 99); 1427 confuse_player (pl, pl, 99);
1440 } 1428 }
1441 else 1429 else
1442 new_draw_info (NDI_UNIQUE, 0, pl, "You fail to write a new scroll."); 1430 new_draw_info (NDI_UNIQUE, 0, pl, "You fail to write a new scroll.");
1443 } 1431 }
1432
1444 return 0; 1433 return 0;
1445} 1434}
1446 1435
1447/* write_on_item() - wrapper for write_note and write_scroll */ 1436/* write_on_item() - wrapper for write_note and write_scroll */
1448int 1437int
… …
1459 if (!params) 1448 if (!params)
1460 { 1449 {
1461 params = ""; 1450 params = "";
1462 string = params; 1451 string = params;
1463 } 1452 }
1453
1464 skat = get_archetype_by_type_subtype (SKILL, SK_LITERACY); 1454 skat = get_archetype_by_type_subtype (SKILL, SK_LITERACY);
1465 1455
1466 /* Need to be able to read before we can write! */ 1456 /* Need to be able to read before we can write! */
1467 if (!find_skill_by_name (pl, skat->clone.skill)) 1457 if (!find_skill_by_name (pl, skat->clone.skill))
1468 { 1458 {
… …
1492 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no %s to write on", msgtype == BOOK ? "book" : "scroll"); 1482 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no %s to write on", msgtype == BOOK ? "book" : "scroll");
1493 return 0; 1483 return 0;
1494 } 1484 }
1495 1485
1496 if (msgtype == SCROLL) 1486 if (msgtype == SCROLL)
1497 {
1498 return write_scroll (pl, item, skill); 1487 return write_scroll (pl, item, skill);
1499 }
1500 else if (msgtype == BOOK) 1488 else if (msgtype == BOOK)
1501 {
1502 return write_note (pl, item, string, skill); 1489 return write_note (pl, item, string, skill);
1503 } 1490
1504 return 0; 1491 return 0;
1505} 1492}
1506
1507
1508 1493
1509/* find_throw_ob() - if we request an object, then 1494/* find_throw_ob() - if we request an object, then
1510 * we search for it in the inventory of the owner (you've 1495 * we search for it in the inventory of the owner (you've
1511 * got to be carrying something in order to throw it!). 1496 * got to be carrying something in order to throw it!).
1512 * If we didnt request an object, then the top object in inventory 1497 * If we didnt request an object, then the top object in inventory
1513 * (that is "throwable", ie no throwing your skills away!) 1498 * (that is "throwable", ie no throwing your skills away!)
1514 * is the object of choice. Also check to see if object is 1499 * is the object of choice. Also check to see if object is
1515 * 'throwable' (ie not applied cursed obj, worn, etc). 1500 * 'throwable' (ie not applied cursed obj, worn, etc).
1516 */ 1501 */
1517
1518static object * 1502static object *
1519find_throw_ob (object *op, const char *request) 1503find_throw_ob (object *op, const char *request)
1520{ 1504{
1521 object *tmp; 1505 object *tmp;
1522 1506
… …
1594 1578
1595/* make_throw_ob() We construct the 'carrier' object in 1579/* make_throw_ob() We construct the 'carrier' object in
1596 * which we will insert the object that is being thrown. 1580 * which we will insert the object that is being thrown.
1597 * This combination becomes the 'thrown object'. -b.t. 1581 * This combination becomes the 'thrown object'. -b.t.
1598 */ 1582 */
1599
1600static object * 1583static object *
1601make_throw_ob (object *orig) 1584make_throw_ob (object *orig)
1602{ 1585{
1603 object *toss_item;
1604
1605 if (!orig) 1586 if (!orig)
1606 return NULL; 1587 return NULL;
1607 1588
1608 toss_item = get_object ();
1609 if (QUERY_FLAG (orig, FLAG_APPLIED)) 1589 if (QUERY_FLAG (orig, FLAG_APPLIED))
1610 { 1590 {
1611 LOG (llevError, "BUG: make_throw_ob(): ob is applied\n"); 1591 LOG (llevError, "BUG: make_throw_ob(): ob is applied\n");
1612 /* insufficient workaround, but better than nothing */ 1592 /* insufficient workaround, but better than nothing */
1613 CLEAR_FLAG (orig, FLAG_APPLIED); 1593 CLEAR_FLAG (orig, FLAG_APPLIED);
1614 } 1594 }
1615 copy_object (orig, toss_item); 1595
1596 object *toss_item = orig->clone ();
1597
1616 toss_item->type = THROWN_OBJ; 1598 toss_item->type = THROWN_OBJ;
1617 CLEAR_FLAG (toss_item, FLAG_CHANGING); 1599 CLEAR_FLAG (toss_item, FLAG_CHANGING);
1618 toss_item->stats.dam = 0; /* default damage */ 1600 toss_item->stats.dam = 0; /* default damage */
1619 insert_ob_in_ob (orig, toss_item); 1601 insert_ob_in_ob (orig, toss_item);
1620 return toss_item; 1602 return toss_item;
1621} 1603}
1622 1604
1623
1624/* do_throw() - op throws any object toss_item. This code 1605/* do_throw() - op throws any object toss_item. This code
1625 * was borrowed from fire_bow. 1606 * was borrowed from fire_bow.
1626 * Returns 1 if skill was successfully used, 0 if not 1607 * Returns 1 if skill was successfully used, 0 if not
1627 */ 1608 */
1628
1629static int 1609static int
1630do_throw (object *op, object *part, object *toss_item, int dir, object *skill) 1610do_throw (object *op, object *part, object *toss_item, int dir, object *skill)
1631{ 1611{
1632 object *throw_ob = toss_item, *left = NULL; 1612 object *throw_ob = toss_item, *left = NULL;
1633 int eff_str = 0, maxc, str = op->stats.Str, dam = 0; 1613 int eff_str = 0, maxc, str = op->stats.Str, dam = 0;
… …
1698 */ 1678 */
1699 mflags = get_map_flags (part->map, &m, part->x + freearr_x[dir], part->y + freearr_y[dir], &sx, &sy); 1679 mflags = get_map_flags (part->map, &m, part->x + freearr_x[dir], part->y + freearr_y[dir], &sx, &sy);
1700 1680
1701 if (!dir || (eff_str <= 1) || (mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, sx, sy) & MOVE_FLY_LOW)) 1681 if (!dir || (eff_str <= 1) || (mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, sx, sy) & MOVE_FLY_LOW))
1702 { 1682 {
1703
1704 /* bounces off 'wall', and drops to feet */ 1683 /* bounces off 'wall', and drops to feet */
1705 remove_ob (throw_ob); 1684 throw_ob->insert_at (part, op);
1706 throw_ob->x = part->x; 1685
1707 throw_ob->y = part->y;
1708 insert_ob_in_map (throw_ob, part->map, op, 0);
1709 if (op->type == PLAYER) 1686 if (op->type == PLAYER)
1710 { 1687 {
1711 if (eff_str <= 1) 1688 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)); 1689 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) 1690 else if (!dir)
1716 {
1717 new_draw_info_format (NDI_UNIQUE, 0, op, "You throw %s at the ground.", query_name (throw_ob)); 1691 new_draw_info_format (NDI_UNIQUE, 0, op, "You throw %s at the ground.", query_name (throw_ob));
1718 }
1719 else 1692 else
1720 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1693 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
1721 } 1694 }
1695
1722 return 0; 1696 return 0;
1723 } /* if object can't be thrown */ 1697 } /* if object can't be thrown */
1724 1698
1725 left = throw_ob; /* these are throwing objects left to the player */ 1699 left = throw_ob; /* these are throwing objects left to the player */
1726 1700
… …
1729 */ 1703 */
1730 1704
1731 if ((throw_ob = get_split_ob (throw_ob, 1)) == NULL) 1705 if ((throw_ob = get_split_ob (throw_ob, 1)) == NULL)
1732 { 1706 {
1733 throw_ob = left; 1707 throw_ob = left;
1734 remove_ob (left); 1708 left->remove ();
1735 if (op->type == PLAYER) 1709 if (op->type == PLAYER)
1736 esrv_del_item (op->contr, left->count); 1710 esrv_del_item (op->contr, left->count);
1737 } 1711 }
1738 else if (op->type == PLAYER) 1712 else if (op->type == PLAYER)
1739 { 1713 {
… …
1763 { 1737 {
1764 insert_ob_in_ob (throw_ob, op); 1738 insert_ob_in_ob (throw_ob, op);
1765 return 0; 1739 return 0;
1766 } 1740 }
1767 1741
1768 set_owner (throw_ob, op); 1742 throw_ob->set_owner (op);
1769 /* At some point in the attack code, the actual real object (op->inv) 1743 /* 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 1744 * becomes the hitter. As such, we need to make sure that has a proper
1771 * owner value so exp goes to the right place. 1745 * owner value so exp goes to the right place.
1772 */ 1746 */
1773 set_owner (throw_ob->inv, op); 1747 throw_ob->inv->set_owner (op);
1774 throw_ob->direction = dir; 1748 throw_ob->direction = dir;
1775 throw_ob->x = part->x;
1776 throw_ob->y = part->y;
1777 1749
1778 /* the damage bonus from the force of the throw */ 1750 /* the damage bonus from the force of the throw */
1779 dam = (int) (str_factor * dam_bonus[eff_str]); 1751 dam = (int) (str_factor * dam_bonus[eff_str]);
1780 1752
1781 /* Now, lets adjust the properties of the thrown_ob. */ 1753 /* Now, lets adjust the properties of the thrown_ob. */
1782 1754
1783 /* how far to fly */ 1755 /* how far to fly */
1784 throw_ob->last_sp = (eff_str * 3) / 5; 1756 throw_ob->last_sp = (eff_str * 3) / 5;
1785 1757
1786 /* speed */ 1758 /* speed */
1787 throw_ob->speed = (speed_bonus[eff_str] + 1.0) / 1.5; 1759 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 1760
1790 /* item damage. Eff_str and item weight influence damage done */ 1761 /* 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); 1762 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; 1763 throw_ob->stats.dam += (dam / 3) + dam_bonus[weight_f] + (throw_ob->weight / 15000) - 2;
1793 1764
1794 /* chance of breaking. Proportional to force used and weight of item */ 1765 /* chance of breaking. Proportional to force used and weight of item */
1795 throw_ob->stats.food = (dam / 2) + (throw_ob->weight / 60000); 1766 throw_ob->stats.food = (dam / 2) + (throw_ob->weight / 60000);
1796 1767
1797 /* replace 25 with a call to clone.arch wc? messes up w/ NPC */ 1768 /* 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; 1769 throw_ob->stats.wc = 25 - dex_bonus[op->stats.Dex] - thaco_bonus[eff_str] - skill->level;
1799
1800 1770
1801 /* the properties of objects which are meant to be thrown (ie dart, 1771 /* the properties of objects which are meant to be thrown (ie dart,
1802 * throwing knife, etc) will differ from ordinary items. Lets tailor 1772 * throwing knife, etc) will differ from ordinary items. Lets tailor
1803 * this stuff in here. 1773 * this stuff in here.
1804 */ 1774 */
… …
1812 if (GET_ANIM_ID (throw_ob) && NUM_ANIMATIONS (throw_ob)) 1782 if (GET_ANIM_ID (throw_ob) && NUM_ANIMATIONS (throw_ob))
1813 SET_ANIMATION (throw_ob, dir); 1783 SET_ANIMATION (throw_ob, dir);
1814 } 1784 }
1815 else 1785 else
1816 { 1786 {
1787 uint16 mat = throw_ob->materials;
1788
1817 /* some materials will adjust properties.. */ 1789 /* some materials will adjust properties.. */
1818 if (throw_ob->material & M_LEATHER) 1790 if (mat & M_LEATHER)
1819 { 1791 {
1820 throw_ob->stats.dam -= 1; 1792 throw_ob->stats.dam -= 1;
1821 throw_ob->stats.food -= 10; 1793 throw_ob->stats.food -= 10;
1822 } 1794 }
1795
1823 if (throw_ob->material & M_GLASS) 1796 if (mat & M_GLASS)
1824 throw_ob->stats.food += 60; 1797 throw_ob->stats.food += 60;
1825 1798
1826 if (throw_ob->material & M_ORGANIC) 1799 if (mat & M_ORGANIC)
1827 { 1800 {
1828 throw_ob->stats.dam -= 3; 1801 throw_ob->stats.dam -= 3;
1829 throw_ob->stats.food += 55; 1802 throw_ob->stats.food += 55;
1830 } 1803 }
1831 if (throw_ob->material & M_PAPER || throw_ob->material & M_CLOTH) 1804
1805 if (mat & M_PAPER || mat & M_CLOTH)
1832 { 1806 {
1833 throw_ob->stats.dam -= 5; 1807 throw_ob->stats.dam -= 5;
1834 throw_ob->speed *= 0.8; 1808 throw_ob->speed *= 0.8;
1835 throw_ob->stats.wc += 3; 1809 throw_ob->stats.wc += 3;
1836 throw_ob->stats.food -= 30; 1810 throw_ob->stats.food -= 30;
1837 } 1811 }
1812
1838 /* light obj have more wind resistance, fly slower */ 1813 /* light obj have more wind resistance, fly slower */
1839 if (throw_ob->weight > 500) 1814 if (throw_ob->weight > 500)
1840 throw_ob->speed *= 0.8; 1815 throw_ob->speed *= 0.8;
1816
1841 if (throw_ob->weight > 50) 1817 if (throw_ob->weight > 50)
1842 throw_ob->speed *= 0.5; 1818 throw_ob->speed *= 0.5;
1843
1844 } /* else tailor thrown object */ 1819 } /* else tailor thrown object */
1845 1820
1846 /* some limits, and safeties (needed?) */ 1821 /* some limits, and safeties (needed?) */
1847 if (throw_ob->stats.dam < 0) 1822 if (throw_ob->stats.dam < 0)
1848 throw_ob->stats.dam = 0; 1823 throw_ob->stats.dam = 0;
… …
1868 * In short summary, a throw can take anywhere between speed 5 and 1843 * In short summary, a throw can take anywhere between speed 5 and
1869 * speed 0.5 1844 * speed 0.5
1870 */ 1845 */
1871 op->speed_left -= 50 / pause_f; 1846 op->speed_left -= 50 / pause_f;
1872 1847
1873 update_ob_speed (throw_ob);
1874 throw_ob->speed_left = 0; 1848 throw_ob->speed_left = 0;
1875 throw_ob->map = part->map; 1849 throw_ob->map = part->map;
1876 1850
1877 throw_ob->move_type = MOVE_FLY_LOW; 1851 throw_ob->move_type = MOVE_FLY_LOW;
1878 throw_ob->move_on = MOVE_FLY_LOW | MOVE_WALK; 1852 throw_ob->move_on = MOVE_FLY_LOW | MOVE_WALK;
… …
1888 LOG (llevDebug, " pause_f=%d \n", pause_f); 1862 LOG (llevDebug, " pause_f=%d \n", pause_f);
1889 LOG (llevDebug, " %s stats: wc=%d dam=%d dist=%d spd=%f break=%d\n", 1863 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); 1864 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); 1865 LOG (llevDebug, "inserting tossitem (%d) into map\n", throw_ob->count);
1892#endif 1866#endif
1893 insert_ob_in_map (throw_ob, part->map, op, 0); 1867
1868 throw_ob->insert_at (part, op);
1894 1869
1895 if (!throw_ob->destroyed ()) 1870 if (!throw_ob->destroyed ())
1896 move_arrow (throw_ob); 1871 move_arrow (throw_ob);
1897 1872
1898 return 1; 1873 return 1;

Diff Legend

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