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

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

Diff Legend

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