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

Diff Legend

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