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.22 by root, Mon Jan 8 01:19:04 2007 UTC vs.
Revision 1.64 by root, Tue May 5 04:51:56 2009 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 Copyright (C) 2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2003,2007 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 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
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 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,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 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
19 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
21 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 The authors can be reached via e-mail to <crossfire@schmorp.de>
23*/ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <object.h> 25#include <object.h>
27#ifndef __CEXTRACT__
28# include <sproto.h> 26#include <sproto.h>
29#endif
30#include <living.h> 27#include <living.h>
31#include <skills.h> 28#include <skills.h>
32#include <spells.h> 29#include <spells.h>
33#include <book.h> 30#include <book.h>
34 31
… …
42 return -1; 39 return -1;
43 40
44 /* Only prohibit stealing if the player does not have a free 41 /* Only prohibit stealing if the player does not have a free
45 * hand available and in fact does have hands. 42 * hand available and in fact does have hands.
46 */ 43 */
47 if (op->type == PLAYER && op->body_used[BODY_ARMS] <= 0 && op->body_info[BODY_ARMS]) 44 if (op->type == PLAYER && op->slot[body_arm].used <= 0 && op->slot[body_arm].info)
48 { 45 {
49 new_draw_info (NDI_UNIQUE, 0, op, "But you have no free hands to steal with!"); 46 new_draw_info (NDI_UNIQUE, 0, op, "But you have no free hands to steal with! "
47 "H<Try to unapply weapons or things you hold in your hands, use the C<body> command.>");
50 return -1; 48 return -1;
51 } 49 }
52 50
53 /* ADJUSTMENTS */ 51 /* ADJUSTMENTS */
54 52
… …
67 * it quite a bit harder to steal. 65 * it quite a bit harder to steal.
68 */ 66 */
69 for (equip = op->inv; equip; equip = equip->below) 67 for (equip = op->inv; equip; equip = equip->below)
70 { 68 {
71 if (equip->type == WEAPON && QUERY_FLAG (equip, FLAG_APPLIED)) 69 if (equip->type == WEAPON && QUERY_FLAG (equip, FLAG_APPLIED))
72 {
73 roll -= equip->weight / 10000; 70 roll -= equip->weight / 10000;
74 } 71
75 if (equip->type == BOW && QUERY_FLAG (equip, FLAG_APPLIED)) 72 if (equip->type == BOW && QUERY_FLAG (equip, FLAG_APPLIED))
76 roll -= equip->weight / 5000; 73 roll -= equip->weight / 5000;
74
77 if (equip->type == SHIELD && QUERY_FLAG (equip, FLAG_APPLIED)) 75 if (equip->type == SHIELD && QUERY_FLAG (equip, FLAG_APPLIED))
78 {
79 roll -= equip->weight / 2000; 76 roll -= equip->weight / 2000;
80 } 77
81 if (equip->type == ARMOUR && QUERY_FLAG (equip, FLAG_APPLIED)) 78 if (equip->type == ARMOUR && QUERY_FLAG (equip, FLAG_APPLIED))
82 roll -= equip->weight / 5000; 79 roll -= equip->weight / 5000;
80
83 if (equip->type == GLOVES && QUERY_FLAG (equip, FLAG_APPLIED)) 81 if (equip->type == GLOVES && QUERY_FLAG (equip, FLAG_APPLIED))
84 roll -= equip->weight / 100; 82 roll -= equip->weight / 100;
85 } 83 }
84
86 if (roll < 0) 85 if (roll < 0)
87 roll = 0; 86 roll = 0;
87
88 return roll; 88 return roll;
89} 89}
90 90
91/* 91/*
92 * When stealing: dependent on the intelligence/wisdom of whom you're 92 * When stealing: dependent on the intelligence/wisdom of whom you're
… …
95 * or not. 95 * or not.
96 * op is the target (person being pilfered) 96 * op is the target (person being pilfered)
97 * who is the person doing the stealing. 97 * who is the person doing the stealing.
98 * skill is the skill object (stealing). 98 * skill is the skill object (stealing).
99 */ 99 */
100
101static int 100static int
102attempt_steal (object *op, object *who, object *skill) 101attempt_steal (object *op, object *who, object *skill)
103{ 102{
104 object *success = NULL, *tmp = NULL, *next; 103 object *success = NULL, *tmp = NULL, *next;
105 int roll = 0, chance = 0, stats_value; 104 int roll = 0, chance = 0, stats_value;
106 rv_vector rv; 105 rv_vector rv;
107 106
108 stats_value = ((who->stats.Dex + who->stats.Int) * 3) / 2; 107 stats_value = (who->stats.Dex + who->stats.Int) * 3 / 2;
109 108
110 /* if the victim is aware of a thief in the area (FLAG_NO_STEAL set on them) 109 /* if the victim is aware of a thief in the area (FLAG_NO_STEAL set on them)
111 * they will try to prevent stealing if they can. Only unseen theives will 110 * they will try to prevent stealing if they can. Only unseen theives will
112 * have much chance of success. 111 * have much chance of success.
113 */ 112 */
114 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_NO_STEAL)) 113 if (!op->is_player () && op->flag [FLAG_NO_STEAL])
115 { 114 {
116 if (can_detect_enemy (op, who, &rv)) 115 if (can_detect_enemy (op, who, &rv))
117 { 116 {
118 npc_call_help (op); 117 npc_call_help (op);
119 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE); 118 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
120 new_draw_info (NDI_UNIQUE, 0, who, "Your attempt is prevented!"); 119 new_draw_info (NDI_UNIQUE, 0, who, "Your attempt is prevented!");
121 return 0; 120 return 0;
122 } 121 }
123 else /* help npc to detect thief next time by raising its wisdom */ 122 else /* help npc to detect thief next time by raising its wisdom */
124 op->stats.Wis += (op->stats.Int / 5) + 1; 123 op->stats.Wis += (op->stats.Int / 5) + 1;
124
125 if (op->stats.Wis > MAX_STAT) 125 if (op->stats.Wis > MAX_STAT)
126 op->stats.Wis = MAX_STAT; 126 op->stats.Wis = MAX_STAT;
127 } 127 }
128 if (op->type == PLAYER && QUERY_FLAG (op, FLAG_WIZ)) 128
129 if (op->is_player () && op->flag [FLAG_WIZ])
129 { 130 {
130 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from the dungeon master!\n"); 131 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from the dungeon master!\n");
131 return 0; 132 return 0;
132 } 133 }
133#ifdef PROHIBIT_PLAYERKILL 134
135 // only allow stealing between hostile players (TODO: probably should change)
134 if (op->type == PLAYER && who->type == PLAYER && (who->contr->peaceful || op->contr->peaceful)) 136 if (op->is_player () && who->is_player () && (who->contr->peaceful || op->contr->peaceful))
135 { 137 {
136 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from other players!\n"); 138 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from other players!\n");
137 return 0; 139 return 0;
138 } 140 }
139#else
140 if (op->type == PLAYER && who->type == PLAYER && settings.no_player_stealing)
141 {
142 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from other players!\n");
143 return 0;
144 }
145#endif
146 141
147
148 /* Ok then, go thru their inventory, stealing */ 142 /* Ok then, go through their inventory, stealing */
149 for (tmp = op->inv; tmp != NULL; tmp = next) 143 for (tmp = op->inv; tmp; tmp = next)
150 { 144 {
151 next = tmp->below; 145 next = tmp->below;
152 146
153 /* you can't steal worn items, starting items, wiz stuff, 147 /* you can't steal worn items, starting items, wiz stuff,
154 * innate abilities, or items w/o a type. Generally 148 * innate abilities, or items w/o a type. Generally
… …
158 * future possible problems. -b.t. 152 * future possible problems. -b.t.
159 * Flesh items generated w/ fix_flesh_item should have FLAG_NO_STEAL 153 * Flesh items generated w/ fix_flesh_item should have FLAG_NO_STEAL
160 * already -b.t. 154 * already -b.t.
161 */ 155 */
162 156
163 if (QUERY_FLAG (tmp, FLAG_WAS_WIZ) || QUERY_FLAG (tmp, FLAG_APPLIED) 157 if (QUERY_FLAG (tmp, FLAG_APPLIED)
164 || !(tmp->type) 158 || !tmp->type
165 || tmp->type == SPELL 159 || tmp->type == SPELL
166 || QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_STEAL) || tmp->invisible) 160 || QUERY_FLAG (tmp, FLAG_STARTEQUIP)
161 || QUERY_FLAG (tmp, FLAG_NO_STEAL)
162 || tmp->invisible)
167 continue; 163 continue;
168 164
169 /* Okay, try stealing this item. Dependent on dexterity of thief, 165 /* Okay, try stealing this item. Dependent on dexterity of thief,
170 * skill level, see the adj_stealroll fctn for more detail. 166 * skill level, see the adj_stealroll fctn for more detail.
171 */ 167 */
… …
185 if (tmp->destroyed () || tmp->env != op) 181 if (tmp->destroyed () || tmp->env != op)
186 { 182 {
187 /* for players, play_sound: steals item */ 183 /* for players, play_sound: steals item */
188 success = tmp; 184 success = tmp;
189 CLEAR_FLAG (tmp, FLAG_INV_LOCKED); 185 CLEAR_FLAG (tmp, FLAG_INV_LOCKED);
190
191 /* Don't delete it from target player until we know
192 * the thief has picked it up. can't just look at tmp->count,
193 * as it's possible that it got merged when picked up.
194 */
195 if (op->type == PLAYER)
196 esrv_del_item (op->contr, tmp->count);
197 } 186 }
187
198 break; 188 break;
199 } 189 }
200 } /* for loop looking for an item */ 190 } /* for loop looking for an item */
201 191
202 if (!tmp) 192 if (!tmp)
… …
211 */ 201 */
212 202
213 if ((roll >= skill->level) || !chance 203 if ((roll >= skill->level) || !chance
214 || (tmp && tmp->weight > (250 * (random_roll (0, stats_value + skill->level * 10 - 1, who, PREFER_LOW))))) 204 || (tmp && tmp->weight > (250 * (random_roll (0, stats_value + skill->level * 10 - 1, who, PREFER_LOW)))))
215 { 205 {
216
217 /* victim figures out where the thief is! */ 206 /* victim figures out where the thief is! */
218 if (who->hide) 207 if (who->flag [FLAG_HIDDEN])
219 make_visible (who); 208 make_visible (who);
220 209
221 if (op->type != PLAYER) 210 if (op->type != PLAYER)
222 { 211 {
223 /* The unaggressives look after themselves 8) */ 212 /* The unaggressives look after themselves 8) */
224 if (who->type == PLAYER) 213 if (who->type == PLAYER)
225 { 214 {
226 npc_call_help (op); 215 npc_call_help (op);
227 new_draw_info_format (NDI_UNIQUE, 0, who, "%s notices your attempted pilfering!", query_name (op)); 216 new_draw_info_format (NDI_UNIQUE, 0, who, "%s notices your attempted pilfering!", query_name (op));
228 } 217 }
218
229 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE); 219 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
230 /* all remaining npc items are guarded now. Set flag NO_STEAL 220 /* all remaining npc items are guarded now. Set flag NO_STEAL
231 * on the victim. 221 * on the victim.
232 */ 222 */
233 SET_FLAG (op, FLAG_NO_STEAL); 223 SET_FLAG (op, FLAG_NO_STEAL);
… …
236 { /* stealing from another player */ 226 { /* stealing from another player */
237 char buf[MAX_BUF]; 227 char buf[MAX_BUF];
238 228
239 /* Notify the other player */ 229 /* Notify the other player */
240 if (success && who->stats.Int > random_roll (0, 19, op, PREFER_LOW)) 230 if (success && who->stats.Int > random_roll (0, 19, op, PREFER_LOW))
241 {
242 sprintf (buf, "Your %s is missing!", query_name (success)); 231 sprintf (buf, "Your %s is missing!", query_name (success));
243 }
244 else 232 else
245 {
246 sprintf (buf, "Your pack feels strangely lighter."); 233 sprintf (buf, "Your pack feels strangely lighter.");
247 } 234
248 new_draw_info (NDI_UNIQUE, 0, op, buf); 235 new_draw_info (NDI_UNIQUE, 0, op, buf);
249 if (!success) 236 if (!success)
250 { 237 {
251 if (who->invisible) 238 if (who->invisible)
252 {
253 sprintf (buf, "you feel itchy fingers getting at your pack."); 239 sprintf (buf, "you feel itchy fingers getting at your pack.");
254 }
255 else 240 else
256 {
257 sprintf (buf, "%s looks very shifty.", query_name (who)); 241 sprintf (buf, "%s looks very shifty.", query_name (who));
258 } 242
259 new_draw_info (NDI_UNIQUE, 0, op, buf); 243 new_draw_info (NDI_UNIQUE, 0, op, buf);
260 } 244 }
261 } /* else stealing from another player */ 245 } /* else stealing from another player */
262 /* play_sound("stop! thief!"); kindofthing */ 246 /* play_sound("stop! thief!"); kindofthing */
263 } /* if you weren't 100% successful */ 247 } /* if you weren't 100% successful */
248
264 return success ? 1 : 0; 249 return success ? 1 : 0;
265} 250}
266
267 251
268int 252int
269steal (object *op, int dir, object *skill) 253steal (object *op, int dir, object *skill)
270{ 254{
271 object *tmp, *next; 255 object *tmp, *next;
… …
416 { 400 {
417 new_draw_info (NDI_UNIQUE, 0, pl, "You fail to pick the lock."); 401 new_draw_info (NDI_UNIQUE, 0, pl, "You fail to pick the lock.");
418 return 0; 402 return 0;
419 } 403 }
420} 404}
421
422 405
423/* HIDE CODE. The user becomes undetectable (not just 'invisible') for 406/* HIDE CODE. The user becomes undetectable (not just 'invisible') for
424 * a short while (success and duration dependant on player SK_level, 407 * a short while (success and duration dependant on player SK_level,
425 * dexterity, charisma, and map difficulty). 408 * dexterity, charisma, and map difficulty).
426 * Players have a good chance of becoming 'unhidden' if they move 409 * Players have a good chance of becoming 'unhidden' if they move
427 * and like invisiblity will be come visible if they attack 410 * and like invisiblity will be come visible if they attack
428 * Implemented by b.t. (thomas@astro.psu.edu) 411 * Implemented by b.t. (thomas@astro.psu.edu)
429 * July 7, 1995 - made hiding possible for monsters. -b.t. 412 * July 7, 1995 - made hiding possible for monsters. -b.t.
430 */ 413 */
431
432static int 414static int
433attempt_hide (object *op, object *skill) 415attempt_hide (object *op, object *skill)
434{ 416{
435 int number, difficulty = op->map->difficulty; 417 int number, difficulty = op->map->difficulty;
436 int terrain = hideability (op); 418 int terrain = hideability (op);
… …
439 return 0; 421 return 0;
440 422
441 /* Hiding success and duration dependant on skill level, 423 /* Hiding success and duration dependant on skill level,
442 * op->stats.Dex, map difficulty and terrain. 424 * op->stats.Dex, map difficulty and terrain.
443 */ 425 */
444
445 number = (die_roll (2, 25, op, PREFER_LOW) - 2) / 2; 426 number = (die_roll (2, 25, op, PREFER_LOW) - 2) / 2;
427
446 if (!stand_near_hostile (op) && (number < (op->stats.Dex + skill->level + terrain - difficulty))) 428 if (!stand_near_hostile (op) && (number < (op->stats.Dex + skill->level + terrain - difficulty)))
447 { 429 {
448 op->invisible += 100; /* set the level of 'hiddeness' */ 430 op->invisible += 100; /* set the level of 'hiddeness' */
431
449 if (op->type == PLAYER) 432 if (op->type == PLAYER)
450 op->contr->tmp_invis = 1; 433 op->contr->tmp_invis = 1;
451 op->hide = 1; 434
435 op->flag [FLAG_HIDDEN] = 1;
452 return 1; 436 return 1;
453 } 437 }
438
454 return 0; 439 return 0;
455} 440}
456 441
457/* patched this to take terrain into consideration */ 442/* patched this to take terrain into consideration */
458int 443int
459hide (object *op, object *skill) 444hide (object *op, object *skill)
460{ 445{
461
462 /* the preliminaries -- Can we really hide now? */ 446 /* the preliminaries -- Can we really hide now? */
463 /* this keeps monsters from using invisibilty spells and hiding */ 447 /* this keeps monsters from using invisibilty spells and hiding */
464 448
465 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 449 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
466 { 450 {
467 new_draw_info (NDI_UNIQUE, 0, op, "You don't need to hide while invisible!"); 451 new_draw_info (NDI_UNIQUE, 0, op, "You don't need to hide while invisible!");
468 return 0; 452 return 0;
469 } 453 }
470 else if (!op->hide && op->invisible > 0 && op->type == PLAYER) 454 else if (!op->flag [FLAG_HIDDEN] && op->invisible > 0 && op->type == PLAYER)
471 { 455 {
472 new_draw_info (NDI_UNIQUE, 0, op, "Your attempt to hide breaks the invisibility spell!"); 456 new_draw_info (NDI_UNIQUE, 0, op, "Your attempt to hide breaks the invisibility spell!");
473 make_visible (op); 457 make_visible (op);
474 } 458 }
475 459
476 if (op->invisible > (50 * skill->level)) 460 if (op->invisible > 50 * skill->level)
477 { 461 {
478 new_draw_info (NDI_UNIQUE, 0, op, "You are as hidden as you can get."); 462 new_draw_info (NDI_UNIQUE, 0, op, "You are as hidden as you can get.");
479 return 0; 463 return 0;
480 } 464 }
481 465
… …
483 { 467 {
484 new_draw_info (NDI_UNIQUE, 0, op, "You hide in the shadows."); 468 new_draw_info (NDI_UNIQUE, 0, op, "You hide in the shadows.");
485 update_object (op, UP_OBJ_FACE); 469 update_object (op, UP_OBJ_FACE);
486 return calc_skill_exp (op, NULL, skill); 470 return calc_skill_exp (op, NULL, skill);
487 } 471 }
472
488 new_draw_info (NDI_UNIQUE, 0, op, "You fail to conceal yourself."); 473 new_draw_info (NDI_UNIQUE, 0, op, "You fail to conceal yourself.");
489 return 0; 474 return 0;
490} 475}
491
492 476
493/* stop_jump() - End of jump. Clear flags, restore the map, and 477/* stop_jump() - End of jump. Clear flags, restore the map, and
494 * freeze the jumper a while to simulate the exhaustion 478 * freeze the jumper a while to simulate the exhaustion
495 * of jumping. 479 * of jumping.
496 */ 480 */
497static void 481static void
498stop_jump (object *pl, int dist, int spaces) 482stop_jump (object *pl, int dist, int spaces)
499{ 483{
500 pl->update_stats (); 484 pl->update_stats ();
501 pl->map->insert (pl, pl->x, pl->y, pl); 485 pl->map->insert (pl, pl->x, pl->y, pl);
486 pl->speed_left -= fabs (pl->speed * 8);
502} 487}
503 488
504static int 489static int
505attempt_jump (object *pl, int dir, int spaces, object *skill) 490attempt_jump (object *pl, int dir, int spaces, object *skill)
506{ 491{
507 object *tmp; 492 object *tmp;
508 int i, exp = 0, dx = freearr_x[dir], dy = freearr_y[dir], mflags; 493 int i, dx = freearr_x[dir], dy = freearr_y[dir], mflags;
509 sint16 x, y; 494 sint16 x, y;
510 maptile *m; 495 maptile *m;
511 496
512 /* Jump loop. Go through spaces opject wants to jump. Halt the 497 /* Jump loop. Go through spaces object wants to jump. Halt the
513 * jump if a wall or creature is in the way. We set FLAG_FLYING 498 * jump if a wall or creature is in the way. We set FLAG_FLYING
514 * temporarily to allow player to aviod exits/archs that are not 499 * temporarily to allow player to aviod exits/archs that are not
515 * fly_on, fly_off. This will also prevent pickup of objects 500 * fly_on, fly_off. This will also prevent pickup of objects
516 * while jumping over them. 501 * while jumping over them.
517 */ 502 */
518
519 pl->remove (); 503 pl->remove ();
520
521 /*
522 * I don't think this is actually needed - all the movement
523 * code is handled in this function, and I don't see anyplace
524 * that cares about the move_type being flying.
525 */
526 pl->move_type |= MOVE_FLY_LOW; 504 pl->move_type |= MOVE_FLY_LOW;
527 505
528 for (i = 0; i <= spaces; i++) 506 for (i = 0; i <= spaces; i++)
529 { 507 {
530 x = pl->x + dx; 508 x = pl->x + dx;
… …
533 511
534 mflags = get_map_flags (m, &m, x, y, &x, &y); 512 mflags = get_map_flags (m, &m, x, y, &x, &y);
535 513
536 if (mflags & P_OUT_OF_MAP) 514 if (mflags & P_OUT_OF_MAP)
537 { 515 {
538 (void) stop_jump (pl, i, spaces); 516 stop_jump (pl, i, spaces);
539 return 0; 517 return 0;
540 } 518 }
519
520 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
521 {
522 /* Jump into creature */
523 if (QUERY_FLAG (tmp, FLAG_MONSTER)
524 || (tmp->type == PLAYER && (!QUERY_FLAG (tmp, FLAG_WIZ) || !tmp->contr->hidden)))
525 {
526 new_draw_info_format (NDI_UNIQUE, 0, pl, "You jump into %s%s.", tmp->type == PLAYER ? "" : "the ", &tmp->name);
527
528 stop_jump (pl, i, spaces);
529
530 int exp = 0;
531
532 if (tmp->type != PLAYER
533 || (pl->type == PLAYER && !pl->contr->party)
534 || (pl->type == PLAYER && tmp->type == PLAYER && pl->contr->party != tmp->contr->party))
535 exp = skill_attack (tmp, pl, pl->facing, "kicked", skill); /* pl makes an attack */
536
537 return exp; /* note that calc_skill_exp() is already called by skill_attack() */
538 }
539 }
540
541 if (OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, x, y))) 541 if (OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, x, y)))
542 { 542 {
543 new_draw_info (NDI_UNIQUE, 0, pl, "Your jump is blocked."); 543 new_draw_info (NDI_UNIQUE, 0, pl, "Your jump is blocked.");
544 stop_jump (pl, i, spaces); 544 stop_jump (pl, i, spaces);
545 return 0; 545 return 0;
546 } 546 }
547 547
548 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
549 {
550 /* Jump into creature */
551 if (QUERY_FLAG (tmp, FLAG_MONSTER) || (tmp->type == PLAYER && (!QUERY_FLAG (tmp, FLAG_WIZ) || !tmp->contr->hidden)))
552 {
553 new_draw_info_format (NDI_UNIQUE, 0, pl, "You jump into %s%s.", tmp->type == PLAYER ? "" : "the ", &tmp->name);
554 if (tmp->type != PLAYER ||
555 (pl->type == PLAYER && pl->contr->party == NULL) ||
556 (pl->type == PLAYER && tmp->type == PLAYER && pl->contr->party != tmp->contr->party))
557 exp = skill_attack (tmp, pl, pl->facing, "kicked", skill); /* pl makes an attack */
558 stop_jump (pl, i, spaces);
559 return exp; /* note that calc_skill_exp() is already called by skill_attack() */
560 }
561 /* If the space has fly on set (no matter what the space is),
562 * we should get the effects - after all, the player is
563 * effectively flying.
564 */
565 if (tmp->move_on & MOVE_FLY_LOW)
566 {
567 pl->x = x;
568 pl->y = y;
569 pl->map = m;
570 stop_jump (pl, i, spaces);
571 return calc_skill_exp (pl, NULL, skill);
572 }
573 }
574 pl->x = x; 548 pl->x = x;
575 pl->y = y; 549 pl->y = y;
576 pl->map = m; 550 pl->map = m;
551
552 if (m->at (x, y).move_on & pl->move_type)
553 {
554 new_draw_info (NDI_UNIQUE, 0, pl, "Your jump is stopped.");
555 stop_jump (pl, i, spaces);
556 return 0;
557 }
577 } 558 }
559
578 stop_jump (pl, i, spaces); 560 stop_jump (pl, i, spaces);
561
579 return calc_skill_exp (pl, NULL, skill); 562 return calc_skill_exp (pl, NULL, skill);
580} 563}
581 564
582/* jump() - this is both a new type of movement for player/monsters and 565/* jump() - this is both a new type of movement for player/monsters and
583 * an attack as well. 566 * an attack as well.
584 * Perhaps we should allow more spaces based on level, eg, level 50 567 * Perhaps we should allow more spaces based on level, eg, level 50
585 * jumper can jump several spaces? 568 * jumper can jump several spaces?
586 */ 569 */
587
588int 570int
589jump (object *pl, int dir, object *skill) 571jump (object *pl, int dir, object *skill)
590{ 572{
591 int spaces = 0, stats;
592 int str = pl->stats.Str; 573 int str = pl->stats.Str;
593 int dex = pl->stats.Dex; 574 int dex = pl->stats.Dex;
594 575
595 dex = dex ? dex : 15; 576 dex = dex ? dex : 15;
596 str = str ? str : 10; 577 str = str ? str : 10;
597 578
598 stats = str * str * str * dex * skill->level; 579 int stats = str * str * str * dex * skill->level;
580 int spaces = min (3, skill->level, stats / (pl->carrying + 1));
599 581
600 if (pl->carrying != 0) /* don't want div by zero !! */
601 spaces = (int) (stats / pl->carrying);
602 else
603 spaces = 2; /* pl has no objects - gets the far jump */
604
605 if (spaces > 2)
606 spaces = 2;
607 else if (spaces == 0) 582 if (spaces == 0)
608 { 583 {
609 new_draw_info (NDI_UNIQUE, 0, pl, "You are carrying too much weight to jump."); 584 new_draw_info (NDI_UNIQUE, 0, pl, "You are carrying too much weight to jump.");
610 return 0; 585 return 0;
611 } 586 }
587
612 return attempt_jump (pl, dir, spaces, skill); 588 return attempt_jump (pl, dir, spaces, skill);
613} 589}
614
615 590
616/* skill_ident() - this code is supposed to allow players to identify 591/* skill_ident() - this code is supposed to allow players to identify
617 * classes of objects with the various "auto-ident" skills. Player must 592 * classes of objects with the various "auto-ident" skills. Player must
618 * have unidentified objects of the right type in order for the skill 593 * have unidentified objects of the right type in order for the skill
619 * to work. While multiple classes of objects may be identified, 594 * to work. While multiple classes of objects may be identified,
620 * this code is kind of yucky -- it would be nice to make it a bit 595 * this code is kind of yucky -- it would be nice to make it a bit
621 * more generalized. Right now, skill indices are embedded in this routine. 596 * more generalized. Right now, skill indices are embedded in this routine.
622 * Returns amount of experience gained (on successful ident). 597 * Returns amount of experience gained (on successful ident).
623 * - b.t. (thomas@astro.psu.edu) 598 * - b.t. (thomas@astro.psu.edu)
624 */ 599 */
625
626static int 600static int
627do_skill_detect_curse (object *pl, object *skill) 601do_skill_detect_curse (object *pl, object *skill)
628{ 602{
629 object *tmp; 603 object *tmp;
630 int success = 0; 604 int success = 0;
… …
708 if (tmp->msg) 682 if (tmp->msg)
709 { 683 {
710 new_draw_info (NDI_UNIQUE, 0, pl, "The item has a story:"); 684 new_draw_info (NDI_UNIQUE, 0, pl, "The item has a story:");
711 new_draw_info (NDI_UNIQUE, 0, pl, tmp->msg); 685 new_draw_info (NDI_UNIQUE, 0, pl, tmp->msg);
712 } 686 }
713
714 /* identify will take care of updating the item if it is in the players inventory. IF on map, do it here */
715 if (tmp->map)
716 esrv_send_item (pl, tmp);
717 } 687 }
688
718 success += calc_skill_exp (pl, tmp, skill); 689 success += calc_skill_exp (pl, tmp, skill);
719 } 690 }
720 else 691 else
721 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); 692 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT);
722 } 693 }
… …
727/* do_skill_ident() - workhorse for skill_ident() -b.t. 698/* do_skill_ident() - workhorse for skill_ident() -b.t.
728 */ 699 */
729static int 700static int
730do_skill_ident (object *pl, int obj_class, object *skill) 701do_skill_ident (object *pl, int obj_class, object *skill)
731{ 702{
732 object *tmp;
733 int success = 0; 703 int success = 0;
734 704
735 for (tmp = pl->inv; tmp; tmp = tmp->below) 705 for (object *tmp = pl->inv; tmp; tmp = tmp->below)
736 success += do_skill_ident2 (tmp, pl, obj_class, skill); 706 success += do_skill_ident2 (tmp, pl, obj_class, skill);
737 /* check the ground */ 707 /* check the ground */
738 708
739 for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp; tmp = tmp->above) 709 for (object *tmp = pl->ms ().bot; tmp; tmp = tmp->above)
740 success += do_skill_ident2 (tmp, pl, obj_class, skill); 710 success += do_skill_ident2 (tmp, pl, obj_class, skill);
741 711
742 return success; 712 return success;
743} 713}
744 714
… …
752 722
753 new_draw_info (NDI_UNIQUE, 0, pl, "You look at the objects nearby..."); 723 new_draw_info (NDI_UNIQUE, 0, pl, "You look at the objects nearby...");
754 724
755 switch (skill->subtype) 725 switch (skill->subtype)
756 { 726 {
757 case SK_SMITHERY: 727 case SK_SMITHERY:
758 success += do_skill_ident (pl, WEAPON, skill) + do_skill_ident (pl, ARMOUR, skill) 728 success += do_skill_ident (pl, WEAPON, skill) + do_skill_ident (pl, ARMOUR, skill)
759 + do_skill_ident (pl, BRACERS, skill) + do_skill_ident (pl, CLOAK, skill) 729 + do_skill_ident (pl, BRACERS, skill) + do_skill_ident (pl, CLOAK, skill)
760 + do_skill_ident (pl, BOOTS, skill) + do_skill_ident (pl, SHIELD, skill) 730 + do_skill_ident (pl, BOOTS, skill) + do_skill_ident (pl, SHIELD, skill)
761 + do_skill_ident (pl, GIRDLE, skill) + do_skill_ident (pl, HELMET, skill) + do_skill_ident (pl, GLOVES, skill); 731 + do_skill_ident (pl, GIRDLE, skill) + do_skill_ident (pl, HELMET, skill) + do_skill_ident (pl, GLOVES, skill);
762 break; 732 break;
763 733
764 case SK_BOWYER: 734 case SK_BOWYER:
765 success += do_skill_ident (pl, BOW, skill) + do_skill_ident (pl, ARROW, skill); 735 success += do_skill_ident (pl, BOW, skill) + do_skill_ident (pl, ARROW, skill);
766 break; 736 break;
767 737
768 case SK_ALCHEMY: 738 case SK_ALCHEMY:
769 success += do_skill_ident (pl, POTION, skill) + do_skill_ident (pl, POISON, skill) 739 success += do_skill_ident (pl, POTION, skill) + do_skill_ident (pl, POISON, skill)
770 + do_skill_ident (pl, CONTAINER, skill) + do_skill_ident (pl, DRINK, skill) + do_skill_ident (pl, INORGANIC, skill); 740 + do_skill_ident (pl, CONTAINER, skill) + do_skill_ident (pl, DRINK, skill) + do_skill_ident (pl, INORGANIC, skill);
771 break; 741 break;
772 742
773 case SK_WOODSMAN: 743 case SK_WOODSMAN:
774 success += do_skill_ident (pl, FOOD, skill) + do_skill_ident (pl, DRINK, skill) + do_skill_ident (pl, FLESH, skill); 744 success += do_skill_ident (pl, FOOD, skill) + do_skill_ident (pl, DRINK, skill) + do_skill_ident (pl, FLESH, skill);
775 break; 745 break;
776 746
777 case SK_JEWELER: 747 case SK_JEWELER:
778 success += do_skill_ident (pl, GEM, skill) + do_skill_ident (pl, RING, skill) + do_skill_ident (pl, AMULET, skill); 748 success += do_skill_ident (pl, GEM, skill) + do_skill_ident (pl, RING, skill) + do_skill_ident (pl, AMULET, skill);
779 break; 749 break;
780 750
781 case SK_LITERACY: 751 case SK_LITERACY:
782 success += do_skill_ident (pl, SPELLBOOK, skill) + do_skill_ident (pl, SCROLL, skill) + do_skill_ident (pl, BOOK, skill); 752 success += do_skill_ident (pl, SPELLBOOK, skill) + do_skill_ident (pl, SCROLL, skill) + do_skill_ident (pl, BOOK, skill);
783 break; 753 break;
784 754
785 case SK_THAUMATURGY: 755 case SK_THAUMATURGY:
786 success += do_skill_ident (pl, WAND, skill) + do_skill_ident (pl, ROD, skill) + do_skill_ident (pl, HORN, skill); 756 success += do_skill_ident (pl, WAND, skill) + do_skill_ident (pl, ROD, skill) + do_skill_ident (pl, HORN, skill);
787 break; 757 break;
788 758
789 case SK_DET_CURSE: 759 case SK_DET_CURSE:
790 success = do_skill_detect_curse (pl, skill); 760 success = do_skill_detect_curse (pl, skill);
791 if (success) 761 if (success)
792 new_draw_info (NDI_UNIQUE, 0, pl, "...and discover cursed items!"); 762 new_draw_info (NDI_UNIQUE, 0, pl, "...and discover cursed items!");
793 break; 763 break;
794 764
795 case SK_DET_MAGIC: 765 case SK_DET_MAGIC:
796 success = do_skill_detect_magic (pl, skill); 766 success = do_skill_detect_magic (pl, skill);
797 if (success) 767 if (success)
798 new_draw_info (NDI_UNIQUE, 0, pl, "...and discover items imbued with mystic forces!"); 768 new_draw_info (NDI_UNIQUE, 0, pl, "...and discover items imbued with mystic forces!");
799 break; 769 break;
800 770
801 default: 771 default:
802 LOG (llevError, "Error: bad call to skill_ident()\n"); 772 LOG (llevError, "Error: bad call to skill_ident()\n");
803 return 0; 773 return 0;
804 break; 774 break;
805 } 775 }
776
806 if (!success) 777 if (!success)
807 {
808 new_draw_info (NDI_UNIQUE, 0, pl, "...and learn nothing more."); 778 new_draw_info (NDI_UNIQUE, 0, pl, "...and learn nothing more.");
809 } 779
810 return success; 780 return success;
811} 781}
812
813 782
814/* players using this skill can 'charm' a monster -- 783/* players using this skill can 'charm' a monster --
815 * into working for them. It can only be used on 784 * into working for them. It can only be used on
816 * non-special (see below) 'neutral' creatures. 785 * non-special (see below) 'neutral' creatures.
817 * -b.t. (thomas@astro.psu.edu) 786 * -b.t. (thomas@astro.psu.edu)
818 */ 787 */
819
820int 788int
821use_oratory (object *pl, int dir, object *skill) 789use_oratory (object *pl, int dir, object *skill)
822{ 790{
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) 791 if (pl->type != PLAYER)
829 return 0; /* only players use this skill */ 792 return 0; /* only players use this skill */
793
794 sint16 x = pl->x + freearr_x[dir],
795 y = pl->y + freearr_y[dir];
830 m = pl->map; 796 maptile *m = pl->map;
797
831 mflags = get_map_flags (m, &m, x, y, &x, &y); 798 int mflags = get_map_flags (m, &m, x, y, &x, &y);
832 if (mflags & P_OUT_OF_MAP) 799 if (mflags & P_OUT_OF_MAP)
833 return 0; 800 return 0;
834 801
835 /* Save some processing - we have the flag already anyways 802 /* Save some processing - we have the flag already anyways
836 */ 803 */
… …
838 { 805 {
839 new_draw_info (NDI_UNIQUE, 0, pl, "There is nothing to orate to."); 806 new_draw_info (NDI_UNIQUE, 0, pl, "There is nothing to orate to.");
840 return 0; 807 return 0;
841 } 808 }
842 809
810 object *tmp;
843 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 811 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
844 { 812 {
845 /* can't persuade players - return because there is nothing else 813 /* can't persuade players - return because there is nothing else
846 * on that space to charm. Same for multi space monsters and 814 * on that space to charm. Same for multi space monsters and
847 * special monsters - we don't allow them to be charmed, and there 815 * 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 816 * is no reason to do further processing since they should be the
849 * only monster on the space. 817 * only monster on the space.
850 */ 818 */
851 if (tmp->type == PLAYER) 819 if (tmp->type == PLAYER
852 return 0; 820 || tmp->more || tmp->head_ () != tmp
853 if (tmp->more || tmp->head) 821 || tmp->msg)
854 return 0;
855 if (tmp->msg)
856 return 0; 822 return 0;
857 823
858 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 824 if (QUERY_FLAG (tmp, FLAG_MONSTER))
859 break; 825 break;
860 } 826 }
… …
875 new_draw_info_format (NDI_UNIQUE, 0, pl, "Too bad the %s isn't listening!\n", query_name (tmp)); 841 new_draw_info_format (NDI_UNIQUE, 0, pl, "Too bad the %s isn't listening!\n", query_name (tmp));
876 return 0; 842 return 0;
877 } 843 }
878 844
879 /* it's already allied! */ 845 /* it's already allied! */
880 if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && (tmp->attack_movement == PETMOVE)) 846 if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->attack_movement == PETMOVE)
881 { 847 {
882 if (tmp->owner == pl) 848 if (tmp->owner == pl)
883 { 849 {
884 new_draw_info (NDI_UNIQUE, 0, pl, "Your follower loves your speech.\n"); 850 new_draw_info (NDI_UNIQUE, 0, pl, "Your follower loves your speech.\n");
885 return 0; 851 return 0;
… …
888 { 854 {
889 /* you steal the follower. Perhaps we should really look at the 855 /* you steal the follower. Perhaps we should really look at the
890 * level of the owner above? 856 * level of the owner above?
891 */ 857 */
892 tmp->set_owner (pl); 858 tmp->set_owner (pl);
859 tmp->skill = skill->skill;
860
893 new_draw_info_format (NDI_UNIQUE, 0, pl, "You convince the %s to follow you instead!\n", query_name (tmp)); 861 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 862 /* Abuse fix - don't give exp since this can otherwise
895 * be used by a couple players to gets lots of exp. 863 * be used by a couple players to gets lots of exp.
896 */ 864 */
897 return 0; 865 return 0;
… …
901 /* In this case, you can't steal it from the other player */ 869 /* In this case, you can't steal it from the other player */
902 return 0; 870 return 0;
903 } 871 }
904 } /* Creature was already a pet of someone */ 872 } /* Creature was already a pet of someone */
905 873
906 chance = skill->level * 2 + (pl->stats.Cha - 2 * tmp->stats.Int) / 2; 874 int level = skill->level + (pl->stats.Cha - tmp->stats.Int) / 2;
907 875
908 /* Ok, got a 'sucker' lets try to make them a follower */ 876 /* 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)) 877 if (level > 0 && tmp->level < (random_roll (0, level - 1, pl, PREFER_HIGH) - 1))
910 { 878 {
911 new_draw_info_format (NDI_UNIQUE, 0, pl, "You convince the %s to become your follower.\n", query_name (tmp)); 879 new_draw_info_format (NDI_UNIQUE, 0, pl, "You convince the %s to become your follower.\n", query_name (tmp));
912 880
881 INVOKE_OBJECT (KILL, tmp, ARG_OBJECT (pl));
913 tmp->set_owner (pl); 882 tmp->set_owner (pl);
883 tmp->skill = skill->skill;
914 tmp->stats.exp = 0; 884 tmp->stats.exp = 0;
915 add_friendly_object (tmp);
916 tmp->attack_movement = PETMOVE; 885 tmp->attack_movement = PETMOVE;
886
887 if (!QUERY_FLAG (tmp, FLAG_FRIENDLY))
888 add_friendly_object (tmp);
889
917 return calc_skill_exp (pl, tmp, skill); 890 return calc_skill_exp (pl, tmp, skill);
918 } 891 }
919 /* Charm failed. Creature may be angry now */ 892 /* Charm failed. Creature may be angry now */
920 else if ((skill->level + ((pl->stats.Cha - 10) / 2)) < random_roll (1, 2 * tmp->level, pl, PREFER_LOW)) 893 else if ((skill->level + ((pl->stats.Cha - 10) / 2)) < random_roll (1, 2 * tmp->level, pl, PREFER_LOW))
921 { 894 {
922 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your speech angers the %s!\n", query_name (tmp)); 895 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your speech angers the %s!\n", query_name (tmp));
923 if (QUERY_FLAG (tmp, FLAG_FRIENDLY)) 896 if (QUERY_FLAG (tmp, FLAG_FRIENDLY))
924 { 897 {
925 CLEAR_FLAG (tmp, FLAG_FRIENDLY);
926 remove_friendly_object (tmp); 898 remove_friendly_object (tmp);
927 tmp->attack_movement = 0; /* needed? */ 899 tmp->attack_movement = 0; /* needed? */
928 } 900 }
901
929 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 902 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
930 } 903 }
904
931 return 0; /* Fall through - if we get here, we didn't charm anything */ 905 return 0; /* Fall through - if we get here, we didn't charm anything */
932} 906}
933 907
934/* Singing() -this skill allows the player to pacify nearby creatures. 908/* Singing() -this skill allows the player to pacify nearby creatures.
935 * There are few limitations on who/what kind of 909 * There are few limitations on who/what kind of
… …
938 * successfully pacified the creature gets Int=1. Thus, a player 912 * successfully pacified the creature gets Int=1. Thus, a player
939 * may only pacify a creature once. 913 * may only pacify a creature once.
940 * BTW, I appologize for the naming of the skill, I couldnt think 914 * BTW, I appologize for the naming of the skill, I couldnt think
941 * of anything better! -b.t. 915 * of anything better! -b.t.
942 */ 916 */
943
944int 917int
945singing (object *pl, int dir, object *skill) 918singing (object *pl, int dir, object *skill)
946{ 919{
947 int i, exp = 0, chance, mflags; 920 int i, exp = 0;
948 object *tmp; 921 object *tmp;
949 maptile *m; 922 maptile *m;
950 sint16 x, y; 923 sint16 x, y;
951 924
952 if (pl->type != PLAYER) 925 if (pl->type != PLAYER)
… …
957 { 930 {
958 x = pl->x + freearr_x[i]; 931 x = pl->x + freearr_x[i];
959 y = pl->y + freearr_y[i]; 932 y = pl->y + freearr_y[i];
960 m = pl->map; 933 m = pl->map;
961 934
962 mflags = get_map_flags (m, &m, x, y, &x, &y); 935 int mflags = get_map_flags (m, &m, x, y, &x, &y);
963 if (mflags & P_OUT_OF_MAP) 936 if (mflags & P_OUT_OF_MAP)
964 continue; 937 continue;
965 if (!(mflags & P_IS_ALIVE)) 938 if (!(mflags & P_IS_ALIVE))
966 continue; 939 continue;
967 940
… …
986 959
987 /* stealing isn't really related (although, maybe it should 960 /* stealing isn't really related (although, maybe it should
988 * be). This is mainly to prevent singing to the same monster 961 * be). This is mainly to prevent singing to the same monster
989 * over and over again and getting exp for it. 962 * over and over again and getting exp for it.
990 */ 963 */
991 chance = skill->level * 2 + (pl->stats.Cha - 5 - tmp->stats.Int) / 2; 964 int level = skill->level + (pl->stats.Cha - 5 - tmp->stats.Int) / 2;
965
992 if (chance && tmp->level * 2 < random_roll (0, chance - 1, pl, PREFER_HIGH)) 966 if (level && tmp->level < random_roll (0, level - 1, pl, PREFER_HIGH))
993 { 967 {
994 SET_FLAG (tmp, FLAG_UNAGGRESSIVE); 968 SET_FLAG (tmp, FLAG_UNAGGRESSIVE);
995 new_draw_info_format (NDI_UNIQUE, 0, pl, "You calm down the %s\n", query_name (tmp)); 969 new_draw_info_format (NDI_UNIQUE, 0, pl, "You calm down the %s\n", query_name (tmp));
996 /* Give exp only if they are not aware */ 970 /* Give exp only if they are not aware */
971
997 if (!QUERY_FLAG (tmp, FLAG_NO_STEAL)) 972 if (!QUERY_FLAG (tmp, FLAG_NO_STEAL))
998 exp += calc_skill_exp (pl, tmp, skill); 973 exp += calc_skill_exp (pl, tmp, skill);
974
999 SET_FLAG (tmp, FLAG_NO_STEAL); 975 SET_FLAG (tmp, FLAG_NO_STEAL);
1000 } 976 }
1001 else 977 else
1002 { 978 {
1003 new_draw_info_format (NDI_UNIQUE, 0, pl, "Too bad the %s isn't listening!\n", query_name (tmp)); 979 new_draw_info_format (NDI_UNIQUE, 0, pl, "Too bad the %s isn't listening!\n", query_name (tmp));
… …
1127 success += calc_skill_exp (op, tmp, skill); 1103 success += calc_skill_exp (op, tmp, skill);
1128 } 1104 }
1129 } 1105 }
1130 } 1106 }
1131 } 1107 }
1108
1132 return success; 1109 return success;
1133} 1110}
1134
1135 1111
1136/* pray() - when this skill is called from do_skill(), it allows 1112/* pray() - when this skill is called from do_skill(), it allows
1137 * the player to regain lost grace points at a faster rate. -b.t. 1113 * the player to regain lost grace points at a faster rate. -b.t.
1138 * This always returns 0 - return value is used by calling function 1114 * This always returns 0 - return value is used by calling function
1139 * such that if it returns true, player gets exp in that skill. This 1115 * such that if it returns true, player gets exp in that skill. This
1140 * the effect here can be done on demand, we probably don't want to 1116 * the effect here can be done on demand, we probably don't want to
1141 * give infinite exp by returning true in any cases. 1117 * give infinite exp by returning true in any cases.
1142 */ 1118 */
1143
1144int 1119int
1145pray (object *pl, object *skill) 1120pray (object *pl, object *skill)
1146{ 1121{
1147 char buf[MAX_BUF]; 1122 char buf[MAX_BUF];
1148 object *tmp; 1123 object *tmp;
… …
1173 if (pl->stats.grace < pl->stats.maxgrace) 1148 if (pl->stats.grace < pl->stats.maxgrace)
1174 { 1149 {
1175 pl->stats.grace++; 1150 pl->stats.grace++;
1176 pl->last_grace = -1; 1151 pl->last_grace = -1;
1177 } 1152 }
1153
1178 return 0; 1154 return 0;
1179} 1155}
1180 1156
1181/* This skill allows the player to regain a few sp or hp for a 1157/* This skill allows the player to regain a few sp or hp for a
1182 * brief period of concentration. No armour or weapons may be 1158 * brief period of concentration. No armour or weapons may be
1183 * wielded/applied for this to work. The amount of time needed 1159 * wielded/applied for this to work. The amount of time needed
1184 * to concentrate and the # of points regained is dependant on 1160 * to concentrate and the # of points regained is dependant on
1185 * the level of the user. - b.t. thomas@astro.psu.edu 1161 * the level of the user. - b.t. thomas@astro.psu.edu
1186 */ 1162 */
1187
1188void 1163void
1189meditate (object *pl, object *skill) 1164meditate (object *pl, object *skill)
1190{ 1165{
1191 object *tmp; 1166 object *tmp;
1192 1167
… …
1200 return; 1175 return;
1201 } 1176 }
1202 else 1177 else
1203 { 1178 {
1204 for (tmp = pl->inv; tmp; tmp = tmp->below) 1179 for (tmp = pl->inv; tmp; tmp = tmp->below)
1205 if (((tmp->type == ARMOUR && skill->level < 12) 1180 if (((tmp->type == ARMOUR && skill->level < 12)
1206 || (tmp->type == HELMET && skill->level < 10) 1181 || (tmp->type == HELMET && skill->level < 10)
1207 || (tmp->type == SHIELD && skill->level < 6) 1182 || (tmp->type == SHIELD && skill->level < 6)
1208 || (tmp->type == BOOTS && skill->level < 4) || (tmp->type == GLOVES && skill->level < 2)) && QUERY_FLAG (tmp, FLAG_APPLIED)) 1183 || (tmp->type == BOOTS && skill->level < 4)
1184 || (tmp->type == GLOVES && skill->level < 2))
1185 && QUERY_FLAG (tmp, FLAG_APPLIED))
1209 { 1186 {
1210 new_draw_info (NDI_UNIQUE, 0, pl, "You can't concentrate while wearing so much armour!\n"); 1187 new_draw_info (NDI_UNIQUE, 0, pl, "You can't concentrate while wearing so much armour!\n");
1211 return; 1188 return;
1212 } 1189 }
1213 } 1190 }
… …
1233 pl->last_heal = -1; 1210 pl->last_heal = -1;
1234 } 1211 }
1235} 1212}
1236 1213
1237/* write_note() - this routine allows players to inscribe messages in 1214/* write_note() - this routine allows players to inscribe messages in
1238 * ordinary 'books' (anything that is type BOOK). b.t. 1215 * ordinary inscribable 'books' (anything that is not a SPELL). b.t.
1239 */ 1216 */
1240
1241static int 1217static int
1242write_note (object *pl, object *item, const char *msg, object *skill) 1218write_note (object *pl, object *item, const char *msg, object *skill)
1243{ 1219{
1220 if (strstr (msg, "\nendmsg"))
1221 {
1222 new_draw_info (NDI_UNIQUE, 0, pl, "Trying to cheat now are we?");
1223 return 0;
1224 }
1225
1226 int len = strlen (msg);
1227
1228 if (!is_utf8_string ((U8 *)msg, len))
1229 {
1230 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your message is garbled (text must be UTF-8, client-bug)!");
1231 return 0;
1232 }
1233
1234 if (INVOKE_OBJECT (INSCRIBE_NOTE, item, ARG_PLAYER (pl->contr), ARG_STRING (msg), ARG_OBJECT (skill)))
1235 return RESULT_INT (0);
1236
1244 char buf[1024]; 1237 char buf[1024];
1245 object *newBook = NULL;
1246 1238
1247 /* a pair of sanity checks */ 1239 if (len < sizeof (buf) - 2)
1248 if (!item || item->type != BOOK)
1249 return 0;
1250
1251 if (!msg)
1252 {
1253 new_draw_info (NDI_UNIQUE, 0, pl, "No message to write!");
1254 new_draw_info_format (NDI_UNIQUE, 0, pl, "Usage: use_skill %s <message>", &skill->skill);
1255 return 0;
1256 } 1240 {
1257 if (strcasestr_local (msg, "endmsg")) 1241 snprintf (buf, sizeof (buf), "%s\n", msg);
1258 {
1259 new_draw_info (NDI_UNIQUE, 0, pl, "Trying to cheat now are we?");
1260 return 0;
1261 }
1262 1242
1263 if (INVOKE_OBJECT (INSCRIBE_NOTE, item, ARG_PLAYER (pl->contr), ARG_STRING (msg), ARG_OBJECT (skill))) 1243 object *newbook = arch_to_object (item->other_arch);
1264 return strlen (msg); 1244 item->decrease ();
1265
1266 buf[0] = 0;
1267 if (!book_overflow (item->msg, msg, sizeof (buf)))
1268 { /* add msg string to book */
1269 if (item->msg)
1270 strcpy (buf, item->msg);
1271
1272 strcat (buf, msg);
1273 strcat (buf, "\n"); /* new msg needs a LF */
1274 if (item->nrof > 1)
1275 {
1276 newBook = item->clone ();
1277 decrease_ob (item);
1278 esrv_send_item (pl, item);
1279 newBook->nrof = 1; 1245 newbook->nrof = 1;
1280 newBook->msg = buf; 1246 newbook->msg = buf;
1281 newBook = insert_ob_in_ob (newBook, pl); 1247 newbook->flag [FLAG_IDENTIFIED] = true;
1282 esrv_send_item (pl, newBook); 1248
1249 if (item->subtype == 1) // mailscrolls
1283 } 1250 {
1284 else 1251 newbook->name = item->name;
1252 newbook->name_pl = item->name_pl;
1285 { 1253 }
1286 item->msg = buf; 1254
1287 /* This shouldn't be necessary - the object hasn't changed in any 1255 pl->insert (newbook);
1288 * visible way 1256
1289 */ 1257 pl->contr->play_sound (sound_find ("inscribe_success"));
1290 /* esrv_send_item(pl, item); */
1291 }
1292 new_draw_info_format (NDI_UNIQUE, 0, pl, "You write in the %s.", query_short_name (item)); 1258 new_draw_info_format (NDI_UNIQUE, 0, pl, "You write in the %s.", &item->name);
1293 return strlen (msg); 1259 return strlen (msg);
1294 } 1260 }
1295 else 1261 else
1296 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your message won't fit in the %s!", query_short_name (item)); 1262 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your message won't fit in the %s!", &item->name);
1297 1263
1298 return 0; 1264 return 0;
1299} 1265}
1300 1266
1301/* write_scroll() - this routine allows players to inscribe spell scrolls 1267/* write_scroll() - this routine allows players to inscribe spell scrolls
1302 * of spells which they know. Backfire effects are possible with the 1268 * of spells which they know. Backfire effects are possible with the
1303 * severity of the backlash correlated with the difficulty of the scroll 1269 * severity of the backlash correlated with the difficulty of the scroll
1304 * that is attempted. -b.t. thomas@astro.psu.edu 1270 * that is attempted. -b.t. thomas@astro.psu.edu
1305 */ 1271 */
1306
1307static int 1272static int
1308write_scroll (object *pl, object *scroll, object *skill) 1273write_scroll (object *pl, object *scroll, object *skill)
1309{ 1274{
1310 int success = 0, confused = 0; 1275 int success = 0, confused = 0;
1311 object *newscroll, *chosen_spell, *tmp;
1312
1313 /* this is a sanity check */
1314 if (scroll->type != SCROLL)
1315 {
1316 new_draw_info (NDI_UNIQUE, 0, pl, "A spell can only be inscribed into a scroll!");
1317 return 0;
1318 }
1319 1276
1320 /* Check if we are ready to attempt inscription */ 1277 /* Check if we are ready to attempt inscription */
1321 chosen_spell = pl->contr->ranges[range_magic]; 1278 object *chosen_spell = pl->contr->ranged_ob;
1322 if (!chosen_spell) 1279
1280 if (!chosen_spell || chosen_spell->type != SPELL)
1323 { 1281 {
1324 new_draw_info (NDI_UNIQUE, 0, pl, "You need a spell readied in order to inscribe!"); 1282 new_draw_info (NDI_UNIQUE, 0, pl, "You need a spell readied in order to inscribe!");
1325 return 0; 1283 return 0;
1326 } 1284 }
1285
1327 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE) > pl->stats.grace) 1286 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE) > pl->stats.grace)
1328 { 1287 {
1329 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough grace to write a scroll of %s.", &chosen_spell->name); 1288 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough grace to write a scroll of %s.", &chosen_spell->name);
1330 return 0; 1289 return 0;
1331 } 1290 }
1291
1332 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA) > pl->stats.sp) 1292 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA) > pl->stats.sp)
1333 { 1293 {
1334 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough mana to write a scroll of %s.", &chosen_spell->name); 1294 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough mana to write a scroll of %s.", &chosen_spell->name);
1335 return 0;
1336 }
1337
1338 /* if there is a spell already on the scroll then player could easily
1339 * accidently read it while trying to write the new one. give player
1340 * a 50% chance to overwrite spell at their own level
1341 */
1342 if ((scroll->stats.sp || scroll->inv) && random_roll (0, scroll->level * 2, pl, PREFER_LOW) > skill->level)
1343 {
1344 new_draw_info_format (NDI_UNIQUE, 0, pl, "Oops! You accidently read it while trying to write on it.");
1345 manual_apply (pl, scroll, 0);
1346 return 0; 1295 return 0;
1347 } 1296 }
1348 1297
1349 /* ok, we are ready to try inscription */ 1298 /* ok, we are ready to try inscription */
1350 if (QUERY_FLAG (pl, FLAG_CONFUSED)) 1299 if (QUERY_FLAG (pl, FLAG_CONFUSED))
… …
1354 pl->stats.grace -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE); 1303 pl->stats.grace -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE);
1355 pl->stats.sp -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA); 1304 pl->stats.sp -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA);
1356 1305
1357 if (random_roll (0, chosen_spell->level * 4 - 1, pl, PREFER_LOW) < skill->level) 1306 if (random_roll (0, chosen_spell->level * 4 - 1, pl, PREFER_LOW) < skill->level)
1358 { 1307 {
1359 if (scroll->nrof > 1) 1308 object *newscroll = arch_to_object (scroll->other_arch);
1360 { 1309 scroll->decrease ();
1361 newscroll = scroll->clone ();
1362 decrease_ob (scroll);
1363 newscroll->nrof = 1; 1310 newscroll->nrof = 1;
1364 } 1311
1365 else 1312 pl->contr->play_sound (sound_find ("inscribe_success"));
1366 {
1367 newscroll = scroll;
1368 }
1369 1313
1370 if (!confused) 1314 if (!confused)
1371 { 1315 {
1372 newscroll->level = MAX (skill->level, chosen_spell->level); 1316 newscroll->level = MAX (skill->level, chosen_spell->level);
1317 newscroll->flag [FLAG_IDENTIFIED] = true;
1373 new_draw_info (NDI_UNIQUE, 0, pl, "You succeed in writing a new scroll."); 1318 new_draw_info (NDI_UNIQUE, 0, pl, "You succeed in writing the spell.");
1374 } 1319 }
1375 else 1320 else
1376 { 1321 {
1377 chosen_spell = find_random_spell_in_ob (pl, NULL); 1322 chosen_spell = find_random_spell_in_ob (pl, NULL);
1378 if (!chosen_spell) 1323 if (!chosen_spell)
… …
1380 1325
1381 newscroll->level = MAX (skill->level, chosen_spell->level); 1326 newscroll->level = MAX (skill->level, chosen_spell->level);
1382 new_draw_info (NDI_UNIQUE, 0, pl, "In your confused state, you write down some odd spell."); 1327 new_draw_info (NDI_UNIQUE, 0, pl, "In your confused state, you write down some odd spell.");
1383 } 1328 }
1384 1329
1385 if (newscroll->inv)
1386 newscroll->inv->destroy ();
1387
1388 tmp = chosen_spell->clone (); 1330 object *tmp = chosen_spell->clone ();
1389 insert_ob_in_ob (tmp, newscroll); 1331 insert_ob_in_ob (tmp, newscroll);
1390 1332
1391 /* Same code as from treasure.c - so they can better merge. 1333 /* Same code as from treasure.C - so they can better merge.
1392 * if players want to sell them, so be it. 1334 * if players want to sell them, so be it.
1393 */ 1335 */
1394 newscroll->value = newscroll->arch->clone.value * newscroll->inv->value * (newscroll->level + 50) / (newscroll->inv->level + 50); 1336 newscroll->value = newscroll->arch->value * newscroll->inv->value * (newscroll->level + 50) / (newscroll->inv->level + 50);
1395 newscroll->stats.exp = newscroll->value / 5; 1337 newscroll->stats.exp = newscroll->value / 5;
1396 1338
1397 /* wait until finished manipulating the scroll before inserting it */ 1339 pl->insert (newscroll);
1398 if (newscroll == scroll) 1340
1399 {
1400 /* Remove to correctly merge with other items which may exist in inventory */
1401 newscroll->remove ();
1402 esrv_del_item (pl->contr, newscroll->count);
1403 }
1404 newscroll = insert_ob_in_ob (newscroll, pl);
1405 esrv_send_item (pl, newscroll);
1406 success = calc_skill_exp (pl, newscroll, skill); 1341 success = calc_skill_exp (pl, newscroll, skill);
1407 if (!confused) 1342 if (!confused)
1408 success *= 2; 1343 success *= 2;
1344
1409 success = success * skill->level; 1345 success = success * skill->level;
1410 return success; 1346 return success;
1411
1412 } 1347 }
1413 else 1348 else
1414 { /* Inscription has failed */ 1349 { /* Inscription has failed */
1350 pl->contr->play_sound (sound_find ("inscribe_fail"));
1415 1351
1416 if (chosen_spell->level > skill->level || confused) 1352 if (chosen_spell->level > skill->level || confused)
1417 { /*backfire! */ 1353 { /*backfire! */
1418 new_draw_info (NDI_UNIQUE, 0, pl, "Ouch! Your attempt to write a new scroll strains your mind!"); 1354 new_draw_info (NDI_UNIQUE, 0, pl, "Ouch! Your attempt to write a new scroll strains your mind!");
1355
1419 if (random_roll (0, 1, pl, PREFER_LOW) == 1) 1356 if (random_roll (0, 1, pl, PREFER_LOW) == 1)
1420 pl->drain_specific_stat (4); 1357 pl->drain_specific_stat (4);
1421 else 1358 else
1422 { 1359 {
1423 confuse_player (pl, pl, 99); 1360 confuse_player (pl, pl, 99);
1424 return (-30 * chosen_spell->level); 1361 return -30 * chosen_spell->level;
1425 } 1362 }
1426 } 1363 }
1427 else if (random_roll (0, pl->stats.Int - 1, pl, PREFER_HIGH) < 15) 1364 else if (random_roll (0, pl->stats.Int - 1, pl, PREFER_HIGH) < 15)
1428 { 1365 {
1429 new_draw_info (NDI_UNIQUE, 0, pl, "Your attempt to write a new scroll rattles your mind!"); 1366 new_draw_info (NDI_UNIQUE, 0, pl, "Your attempt to write a new scroll rattles your mind! H<Frankly spoken, you were too dumb and unlucky.>");
1430 confuse_player (pl, pl, 99); 1367 confuse_player (pl, pl, 99);
1431 } 1368 }
1432 else 1369 else
1433 new_draw_info (NDI_UNIQUE, 0, pl, "You fail to write a new scroll."); 1370 new_draw_info (NDI_UNIQUE, 0, pl, "You fail to write a new scroll. H<Try a lower-level spell, if possible at all.>");
1434 } 1371 }
1435 1372
1436 return 0; 1373 return 0;
1437} 1374}
1438 1375
1439/* write_on_item() - wrapper for write_note and write_scroll */ 1376/* write_on_item() - wrapper for write_note and write_scroll */
1440int 1377int
1441write_on_item (object *pl, const char *params, object *skill) 1378write_on_item (object *pl, const char *params, object *skill)
1442{ 1379{
1443 object *item;
1444 const char *string = params;
1445 int msgtype;
1446 archetype *skat; 1380 archetype *skat;
1447 1381
1448 if (pl->type != PLAYER) 1382 if (pl->type != PLAYER)
1449 return 0; 1383 return 0;
1450 1384
1451 if (!params) 1385 if (!params)
1452 {
1453 params = ""; 1386 params = "";
1454 string = params; 1387
1455 }
1456 skat = get_archetype_by_type_subtype (SKILL, SK_LITERACY); 1388 skat = get_archetype_by_type_subtype (SKILL, SK_LITERACY);
1457 1389
1458 /* Need to be able to read before we can write! */ 1390 /* Need to be able to read before we can write! */
1459 if (!find_skill_by_name (pl, skat->clone.skill)) 1391 if (!find_skill_by_name (pl, skat->skill))
1460 { 1392 {
1461 new_draw_info (NDI_UNIQUE, 0, pl, "You must learn to read before you can write!"); 1393 new_draw_info (NDI_UNIQUE, 0, pl, "You must learn to read before you can write! H<You lack the literacy skill.>");
1462 return 0; 1394 return 0;
1463 } 1395 }
1464 1396
1465 /* if there is a message then it goes in a book and no message means 1397 object *item = find_marked_object (pl);
1466 * write active spell into the scroll
1467 */
1468 msgtype = (string[0] != '\0') ? BOOK : SCROLL;
1469 1398
1470 /* find an item of correct type to write on */ 1399 /* find an item of correct type to write on */
1471 if (!(item = find_marked_object (pl))) 1400 if (!item)
1401 {
1402 new_draw_info (NDI_UNIQUE, 0, pl, "You don't have any marked item to write on. H<Use the mark command or the popup menu to make an item.>");
1403 return 0;
1472 { 1404 }
1473 new_draw_info (NDI_UNIQUE, 0, pl, "You don't have any marked item to write on."); 1405
1406 if (item->type != INSCRIBABLE)
1407 {
1408 new_draw_info_format (NDI_UNIQUE, 0, pl, "You cannot inscribe this! H<You can only inscribe empty scrolls and books.>");
1474 return 0; 1409 return 0;
1475 } 1410 }
1476 1411
1477 if (QUERY_FLAG (item, FLAG_UNPAID)) 1412 if (QUERY_FLAG (item, FLAG_UNPAID))
1478 { 1413 {
1479 new_draw_info (NDI_UNIQUE, 0, pl, "You had better pay for that before you write on it."); 1414 new_draw_info (NDI_UNIQUE, 0, pl, "You had better pay for that before you write on it.");
1480 return 0; 1415 return 0;
1481 } 1416 }
1482 if (msgtype != item->type) 1417
1418 if (item->other_arch->type == SCROLL)
1483 { 1419 {
1484 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no %s to write on", msgtype == BOOK ? "book" : "scroll"); 1420 if (*params)
1421 {
1422 // check readied scroll
1423 new_draw_info_format (NDI_UNIQUE, 0, pl,
1424 "When inscribing spells you need to ready a spell and do not specify a string argument.\n"
1425 "Usage: cast [spell name]; use_skill %s", &skill->skill);
1485 return 0; 1426 return 0;
1486 } 1427 }
1487 1428
1488 if (msgtype == SCROLL)
1489 {
1490 return write_scroll (pl, item, skill); 1429 return write_scroll (pl, item, skill);
1491 } 1430 }
1492 else if (msgtype == BOOK) 1431 else
1493 { 1432 {
1433 if (!*params)
1434 {
1435 new_draw_info_format (NDI_UNIQUE, 0, pl,
1436 "When inscribing books you need to specify the words you want to inscribe as command argument.\n"
1437 "Usage: use_skill %s <message>", &skill->skill);
1438 return 0;
1439 }
1440
1494 return write_note (pl, item, string, skill); 1441 return write_note (pl, item, params, skill);
1495 } 1442 }
1443
1496 return 0; 1444 return 0;
1497} 1445}
1498
1499
1500 1446
1501/* find_throw_ob() - if we request an object, then 1447/* find_throw_ob() - if we request an object, then
1502 * we search for it in the inventory of the owner (you've 1448 * we search for it in the inventory of the owner (you've
1503 * got to be carrying something in order to throw it!). 1449 * got to be carrying something in order to throw it!).
1504 * If we didnt request an object, then the top object in inventory 1450 * If we didnt request an object, then the top object in inventory
1505 * (that is "throwable", ie no throwing your skills away!) 1451 * (that is "throwable", ie no throwing your skills away!)
1506 * is the object of choice. Also check to see if object is 1452 * is the object of choice. Also check to see if object is
1507 * 'throwable' (ie not applied cursed obj, worn, etc). 1453 * 'throwable' (ie not applied cursed obj, worn, etc).
1508 */ 1454 */
1509
1510static object * 1455static object *
1511find_throw_ob (object *op, const char *request) 1456find_throw_ob (object *op, const char *request)
1512{ 1457{
1513 object *tmp; 1458 object *tmp;
1514 1459
… …
1535 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1480 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
1536 { 1481 {
1537 /* can't toss invisible or inv-locked items */ 1482 /* can't toss invisible or inv-locked items */
1538 if (tmp->invisible || QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 1483 if (tmp->invisible || QUERY_FLAG (tmp, FLAG_INV_LOCKED))
1539 continue; 1484 continue;
1540 if (!request || !strcmp (query_name (tmp), request) || !strcmp (tmp->name, request)) 1485 if (!request || !strcmp (query_name (tmp), request) || !strcmp (&tmp->name, request))
1541 break; 1486 break;
1542 } 1487 }
1543 } 1488 }
1544 1489
1545 /* this should prevent us from throwing away 1490 /* this should prevent us from throwing away
… …
1584 return tmp; 1529 return tmp;
1585} 1530}
1586 1531
1587/* make_throw_ob() We construct the 'carrier' object in 1532/* make_throw_ob() We construct the 'carrier' object in
1588 * which we will insert the object that is being thrown. 1533 * which we will insert the object that is being thrown.
1589 * This combination becomes the 'thrown object'. -b.t. 1534 * This combination becomes the 'thrown object'. -b.t.
1590 */ 1535 */
1591
1592static object * 1536static object *
1593make_throw_ob (object *orig) 1537make_throw_ob (object *orig)
1594{ 1538{
1595 if (!orig) 1539 if (!orig)
1596 return NULL; 1540 return 0;
1597 1541
1598 if (QUERY_FLAG (orig, FLAG_APPLIED)) 1542 if (QUERY_FLAG (orig, FLAG_APPLIED))
1599 { 1543 {
1600 LOG (llevError, "BUG: make_throw_ob(): ob is applied\n"); 1544 LOG (llevError, "BUG: make_throw_ob(): ob is applied\n");
1601 /* insufficient workaround, but better than nothing */ 1545 /* insufficient workaround, but better than nothing */
… …
1605 object *toss_item = orig->clone (); 1549 object *toss_item = orig->clone ();
1606 1550
1607 toss_item->type = THROWN_OBJ; 1551 toss_item->type = THROWN_OBJ;
1608 CLEAR_FLAG (toss_item, FLAG_CHANGING); 1552 CLEAR_FLAG (toss_item, FLAG_CHANGING);
1609 toss_item->stats.dam = 0; /* default damage */ 1553 toss_item->stats.dam = 0; /* default damage */
1610 insert_ob_in_ob (orig, toss_item); 1554 toss_item->insert (orig);
1555
1611 return toss_item; 1556 return toss_item;
1612} 1557}
1613
1614 1558
1615/* do_throw() - op throws any object toss_item. This code 1559/* do_throw() - op throws any object toss_item. This code
1616 * was borrowed from fire_bow. 1560 * was borrowed from fire_bow.
1617 * Returns 1 if skill was successfully used, 0 if not 1561 * Returns 1 if skill was successfully used, 0 if not
1618 */ 1562 */
1619
1620static int 1563static int
1621do_throw (object *op, object *part, object *toss_item, int dir, object *skill) 1564do_throw (object *op, object *part, object *toss_item, int dir, object *skill)
1622{ 1565{
1623 object *throw_ob = toss_item, *left = NULL; 1566 object *throw_ob = toss_item, *left = NULL;
1624 int eff_str = 0, maxc, str = op->stats.Str, dam = 0; 1567 int eff_str = 0, maxc, str = op->stats.Str, dam = 0;
… …
1710 left = throw_ob; /* these are throwing objects left to the player */ 1653 left = throw_ob; /* these are throwing objects left to the player */
1711 1654
1712 /* sometimes get_split_ob can't split an object (because op->nrof==0?) 1655 /* sometimes get_split_ob can't split an object (because op->nrof==0?)
1713 * and returns NULL. We must use 'left' then 1656 * and returns NULL. We must use 'left' then
1714 */ 1657 */
1715 1658 if (!(throw_ob = throw_ob->split ()))
1716 if ((throw_ob = get_split_ob (throw_ob, 1)) == NULL)
1717 { 1659 {
1718 throw_ob = left; 1660 throw_ob = left;
1719 left->remove (); 1661 left->remove ();
1720 if (op->type == PLAYER)
1721 esrv_del_item (op->contr, left->count);
1722 }
1723 else if (op->type == PLAYER)
1724 {
1725 if (left->destroyed ())
1726 esrv_del_item (op->contr, left->count);
1727 else
1728 esrv_update_item (UPD_NROF, op, left);
1729 } 1662 }
1730 1663
1731 /* special case: throwing powdery substances like dust, dirt */ 1664 /* special case: throwing powdery substances like dust, dirt */
1732 if (throw_ob->type == POTION && throw_ob->subtype == POT_DUST) 1665 if (throw_ob->type == POTION && throw_ob->subtype == POT_DUST)
1733 { 1666 {
… …
1757 */ 1690 */
1758 throw_ob->inv->set_owner (op); 1691 throw_ob->inv->set_owner (op);
1759 throw_ob->direction = dir; 1692 throw_ob->direction = dir;
1760 1693
1761 /* the damage bonus from the force of the throw */ 1694 /* the damage bonus from the force of the throw */
1762 dam = (int) (str_factor * dam_bonus[eff_str]); 1695 dam = int (str_factor * dam_bonus[eff_str]);
1763 1696
1764 /* Now, lets adjust the properties of the thrown_ob. */ 1697 /* Now, lets adjust the properties of the thrown_ob. */
1765 1698
1766 /* how far to fly */ 1699 /* how far to fly */
1767 throw_ob->last_sp = (eff_str * 3) / 5; 1700 throw_ob->last_sp = (eff_str * 3) / 5;
… …
1788 { 1721 {
1789 throw_ob->last_sp += eff_str / 3; /* fly a little further */ 1722 throw_ob->last_sp += eff_str / 3; /* fly a little further */
1790 throw_ob->stats.dam += throw_ob->inv->stats.dam + throw_ob->magic + 2; 1723 throw_ob->stats.dam += throw_ob->inv->stats.dam + throw_ob->magic + 2;
1791 throw_ob->stats.wc -= throw_ob->magic + throw_ob->inv->stats.wc; 1724 throw_ob->stats.wc -= throw_ob->magic + throw_ob->inv->stats.wc;
1792 /* only throw objects get directional faces */ 1725 /* only throw objects get directional faces */
1793 if (GET_ANIM_ID (throw_ob) && NUM_ANIMATIONS (throw_ob)) 1726 if (throw_ob->has_anim () && throw_ob->anim_frames ())
1794 SET_ANIMATION (throw_ob, dir); 1727 throw_ob->set_anim_frame (dir);
1795 } 1728 }
1796 else 1729 else
1797 { 1730 {
1731 uint16 mat = throw_ob->materials;
1732
1798 /* some materials will adjust properties.. */ 1733 /* some materials will adjust properties.. */
1799 if (throw_ob->material & M_LEATHER) 1734 if (mat & M_LEATHER)
1800 { 1735 {
1801 throw_ob->stats.dam -= 1; 1736 throw_ob->stats.dam -= 1;
1802 throw_ob->stats.food -= 10; 1737 throw_ob->stats.food -= 10;
1803 } 1738 }
1804 1739
1805 if (throw_ob->material & M_GLASS) 1740 if (mat & M_GLASS)
1806 throw_ob->stats.food += 60; 1741 throw_ob->stats.food += 60;
1807 1742
1808 if (throw_ob->material & M_ORGANIC) 1743 if (mat & M_ORGANIC)
1809 { 1744 {
1810 throw_ob->stats.dam -= 3; 1745 throw_ob->stats.dam -= 3;
1811 throw_ob->stats.food += 55; 1746 throw_ob->stats.food += 55;
1812 } 1747 }
1813 1748
1814 if (throw_ob->material & M_PAPER || throw_ob->material & M_CLOTH) 1749 if (mat & M_PAPER || mat & M_CLOTH)
1815 { 1750 {
1816 throw_ob->stats.dam -= 5; 1751 throw_ob->stats.dam -= 5;
1817 throw_ob->speed *= 0.8; 1752 throw_ob->speed *= 0.8;
1818 throw_ob->stats.wc += 3; 1753 throw_ob->stats.wc += 3;
1819 throw_ob->stats.food -= 30; 1754 throw_ob->stats.food -= 30;

Diff Legend

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