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.60 by root, Wed Dec 31 17:35:38 2008 UTC vs.
Revision 1.108 by root, Wed Dec 12 02:13:05 2012 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 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 (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * 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
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <object.h> 26#include <object.h>
… …
41 /* Only prohibit stealing if the player does not have a free 42 /* Only prohibit stealing if the player does not have a free
42 * hand available and in fact does have hands. 43 * hand available and in fact does have hands.
43 */ 44 */
44 if (op->type == PLAYER && op->slot[body_arm].used <= 0 && op->slot[body_arm].info) 45 if (op->type == PLAYER && op->slot[body_arm].used <= 0 && op->slot[body_arm].info)
45 { 46 {
46 new_draw_info (NDI_UNIQUE, 0, op, "But you have no free hands to steal with!"); 47 op->failmsg ("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.>");
47 return -1; 49 return -1;
48 } 50 }
49 51
50 /* ADJUSTMENTS */ 52 /* ADJUSTMENTS */
51 53
52 /* Its harder to steal from hostile beings! */ 54 /* It's harder to steal from hostile beings! */
53 if (!QUERY_FLAG (victim, FLAG_UNAGGRESSIVE)) 55 if (!victim->flag [FLAG_UNAGGRESSIVE])
54 roll = roll / 2; 56 roll = roll / 2;
55 57
56 /* Easier to steal from sleeping beings, or if the thief is 58 /* Easier to steal from sleeping beings, or if the thief is
57 * unseen */ 59 * unseen */
58 if (QUERY_FLAG (victim, FLAG_SLEEP)) 60 if (victim->flag [FLAG_SLEEP])
59 roll = roll * 3; 61 roll = roll * 3;
60 else if (op->invisible) 62 else if (op->invisible)
61 roll = roll * 2; 63 roll = roll * 2;
62 64
63 /* check stealing 'encumberance'. Having this equipment applied makes 65 /* check stealing 'encumberance'. Having this equipment applied makes
64 * it quite a bit harder to steal. 66 * it quite a bit harder to steal.
65 */ 67 */
66 for (equip = op->inv; equip; equip = equip->below) 68 for (equip = op->inv; equip; equip = equip->below)
67 { 69 {
68 if (equip->type == WEAPON && QUERY_FLAG (equip, FLAG_APPLIED)) 70 if (equip->type == WEAPON && equip->flag [FLAG_APPLIED])
69 roll -= equip->weight / 10000; 71 roll -= equip->weight / 10000;
70 72
71 if (equip->type == BOW && QUERY_FLAG (equip, FLAG_APPLIED)) 73 if (equip->type == BOW && equip->flag [FLAG_APPLIED])
72 roll -= equip->weight / 5000; 74 roll -= equip->weight / 5000;
73 75
74 if (equip->type == SHIELD && QUERY_FLAG (equip, FLAG_APPLIED)) 76 if (equip->type == SHIELD && equip->flag [FLAG_APPLIED])
75 roll -= equip->weight / 2000; 77 roll -= equip->weight / 2000;
76 78
77 if (equip->type == ARMOUR && QUERY_FLAG (equip, FLAG_APPLIED)) 79 if (equip->type == ARMOUR && equip->flag [FLAG_APPLIED])
78 roll -= equip->weight / 5000; 80 roll -= equip->weight / 5000;
79 81
80 if (equip->type == GLOVES && QUERY_FLAG (equip, FLAG_APPLIED)) 82 if (equip->type == GLOVES && equip->flag [FLAG_APPLIED])
81 roll -= equip->weight / 100; 83 roll -= equip->weight / 100;
82 } 84 }
83 85
84 if (roll < 0) 86 if (roll < 0)
85 roll = 0; 87 roll = 0;
… …
112 if (!op->is_player () && op->flag [FLAG_NO_STEAL]) 114 if (!op->is_player () && op->flag [FLAG_NO_STEAL])
113 { 115 {
114 if (can_detect_enemy (op, who, &rv)) 116 if (can_detect_enemy (op, who, &rv))
115 { 117 {
116 npc_call_help (op); 118 npc_call_help (op);
117 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE); 119 op->clr_flag (FLAG_UNAGGRESSIVE);
118 new_draw_info (NDI_UNIQUE, 0, who, "Your attempt is prevented!"); 120 who->failmsg ("Your attempt is prevented!");
119 return 0; 121 return 0;
120 } 122 }
121 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 */
122 op->stats.Wis += (op->stats.Int / 5) + 1; 124 op->stats.Wis += (op->stats.Int / 5) + 1;
123 125
… …
125 op->stats.Wis = MAX_STAT; 127 op->stats.Wis = MAX_STAT;
126 } 128 }
127 129
128 if (op->is_player () && op->flag [FLAG_WIZ]) 130 if (op->is_player () && op->flag [FLAG_WIZ])
129 { 131 {
130 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from the dungeon master!\n"); 132 who->failmsg ("You can't steal from the dungeon master!\n");
131 return 0; 133 return 0;
132 } 134 }
133 135
134 // only allow stealing between hostile players (TODO: probably should change) 136 // only allow stealing between hostile players (TODO: probably should change)
135 if (op->is_player () && who->is_player () && (who->contr->peaceful || op->contr->peaceful)) 137 if (op->is_player () && who->is_player () && (who->contr->peaceful || op->contr->peaceful))
136 { 138 {
137 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from other players!\n"); 139 who->failmsg ("You can't steal from other players!\n");
138 return 0; 140 return 0;
139 } 141 }
140 142
141 /* Ok then, go through their inventory, stealing */ 143 /* Ok then, go through their inventory, stealing */
142 for (tmp = op->inv; tmp; tmp = next) 144 for (tmp = op->inv; tmp; tmp = next)
… …
151 * future possible problems. -b.t. 153 * future possible problems. -b.t.
152 * 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
153 * already -b.t. 155 * already -b.t.
154 */ 156 */
155 157
156 if (QUERY_FLAG (tmp, FLAG_APPLIED) 158 if (tmp->flag [FLAG_APPLIED]
157 || !tmp->type 159 || !tmp->type
158 || tmp->type == SPELL 160 || tmp->type == SPELL
159 || QUERY_FLAG (tmp, FLAG_STARTEQUIP) 161 || tmp->flag [FLAG_STARTEQUIP]
160 || QUERY_FLAG (tmp, FLAG_NO_STEAL) 162 || tmp->flag [FLAG_NO_STEAL]
161 || tmp->invisible) 163 || tmp->invisible)
162 continue; 164 continue;
163 165
164 /* Okay, try stealing this item. Dependent on dexterity of thief, 166 /* Okay, try stealing this item. Dependent on dexterity of thief,
165 * skill level, see the adj_stealroll fctn for more detail. 167 * skill level, see the adj_stealroll fctn for more detail.
… …
179 */ 181 */
180 if (tmp->destroyed () || tmp->env != op) 182 if (tmp->destroyed () || tmp->env != op)
181 { 183 {
182 /* for players, play_sound: steals item */ 184 /* for players, play_sound: steals item */
183 success = tmp; 185 success = tmp;
184 CLEAR_FLAG (tmp, FLAG_INV_LOCKED); 186 tmp->clr_flag (FLAG_INV_LOCKED);
185 } 187 }
186 188
187 break; 189 break;
188 } 190 }
189 } /* for loop looking for an item */ 191 } /* for loop looking for an item */
… …
213 { 215 {
214 npc_call_help (op); 216 npc_call_help (op);
215 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));
216 } 218 }
217 219
218 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE); 220 op->clr_flag (FLAG_UNAGGRESSIVE);
219 /* all remaining npc items are guarded now. Set flag NO_STEAL 221 /* all remaining npc items are guarded now. Set flag NO_STEAL
220 * on the victim. 222 * on the victim.
221 */ 223 */
222 SET_FLAG (op, FLAG_NO_STEAL); 224 op->set_flag (FLAG_NO_STEAL);
223 } 225 }
224 else 226 else
225 { /* stealing from another player */ 227 { /* stealing from another player */
226 char buf[MAX_BUF]; 228 char buf[MAX_BUF];
227 229
… …
258 260
259 x = op->x + freearr_x[dir]; 261 x = op->x + freearr_x[dir];
260 y = op->y + freearr_y[dir]; 262 y = op->y + freearr_y[dir];
261 263
262 if (dir == 0) 264 if (dir == 0)
263 { 265 return 0; // you can't steal from ourself!
264 /* Can't steal from ourself! */
265 return 0;
266 }
267 266
268 m = op->map; 267 m = op->map;
269 mflags = get_map_flags (m, &m, x, y, &x, &y); 268 mflags = get_map_flags (m, &m, x, y, &x, &y);
270 /* Out of map - can't do it. If nothing alive on this space, 269 /* Out of map - can't do it. If nothing alive on this space,
271 * don't need to look any further. 270 * don't need to look any further.
… …
279 278
280 /* Find the topmost object at this spot */ 279 /* Find the topmost object at this spot */
281 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); 280 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
282 281
283 /* For all the stacked objects at this point, attempt a steal */ 282 /* For all the stacked objects at this point, attempt a steal */
284 for (; tmp != NULL; tmp = next) 283 for (; tmp; tmp = next)
285 { 284 {
286 next = tmp->below; 285 next = tmp->below;
287 /* Minor hack--for multi square beings - make sure we get 286 /* Minor hack--for multi square beings - make sure we get
288 * the 'head' coz 'tail' objects have no inventory! - b.t. 287 * the 'head' coz 'tail' objects have no inventory! - b.t.
289 */ 288 */
290 if (tmp->head) 289 if (tmp->head)
291 tmp = tmp->head; 290 tmp = tmp->head;
292 291
293 if (tmp->type != PLAYER && !QUERY_FLAG (tmp, FLAG_MONSTER)) 292 if (tmp->type != PLAYER && !tmp->flag [FLAG_MONSTER])
294 continue; 293 continue;
295 294
296 /* do not reveal hidden DMs */
297 if (tmp->type == PLAYER && QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden)
298 continue;
299 if (attempt_steal (tmp, op, skill)) 295 if (attempt_steal (tmp, op, skill))
300 { 296 {
301 if (tmp->type == PLAYER) /* no xp for stealing from another player */ 297 if (tmp->type == PLAYER) /* no xp for stealing from another player */
302 return 0; 298 return 0;
303 299
304 /* no xp for stealing from pets (of players) */ 300 /* no xp for stealing from pets (of players) */
305 if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->attack_movement == PETMOVE) 301 if (tmp->flag [FLAG_FRIENDLY] && tmp->attack_movement == PETMOVE)
306 { 302 {
307 object *owner = tmp->owner; 303 object *owner = tmp->owner;
308 304
309 if (owner != NULL && owner->type == PLAYER) 305 if (owner && owner->type == PLAYER)
310 return 0; 306 return 0;
311 } 307 }
312 308
313 // reduce monster experience by experience we gained, as to 309 // reduce monster experience by experience we gained, as to
314 // limit the amount of exp that can be gained by stealing from monsters 310 // limit the amount of exp that can be gained by stealing from monsters
315 // (jessies gave ~20,000,000 exp otherwise. 311 // (jessies gave ~20,000,000 exp otherwise.
316 int exp = calc_skill_exp (op, tmp, skill); 312 int exp = calc_skill_exp (op, tmp, skill);
317 313
318 exp = MIN (tmp->stats.exp, exp); 314 exp = min (tmp->stats.exp, exp);
319 tmp->stats.exp -= exp; 315 tmp->stats.exp -= exp;
320 return exp; 316 return exp;
321 } 317 }
322 } 318 }
319
323 return 0; 320 return 0;
324} 321}
325 322
326static int 323static int
327attempt_pick_lock (object *door, object *pl, object *skill) 324attempt_pick_lock (object *door, object *pl, object *skill)
… …
354 351
355int 352int
356pick_lock (object *pl, int dir, object *skill) 353pick_lock (object *pl, int dir, object *skill)
357{ 354{
358 object *tmp; 355 object *tmp;
359 int x = pl->x + freearr_x[dir];
360 int y = pl->y + freearr_y[dir];
361 356
362 if (!dir) 357 if (!dir)
363 dir = pl->facing; 358 dir = pl->facing;
364 359
360 mapxy pos (pl); pos.move (dir);
361
365 /* For all the stacked objects at this point find a door */ 362 /* For all the stacked objects at this point find a door */
366 if (out_of_map (pl->map, x, y)) 363 if (!pos.normalise ())
367 {
368 new_draw_info (NDI_UNIQUE, 0, pl, "There is no lock there.");
369 return 0;
370 } 364 {
365 pl->failmsg ("There is no lock there.");
366 return 0;
367 }
371 368
372 for (tmp = GET_MAP_OB (pl->map, x, y); tmp; tmp = tmp->above) 369 for (tmp = pos->bot; tmp; tmp = tmp->above)
373 if (tmp->type == DOOR || tmp->type == LOCKED_DOOR) 370 if (tmp->type == DOOR || tmp->type == LOCKED_DOOR)
374 break; 371 break;
375 372
376 if (!tmp) 373 if (!tmp)
377 { 374 {
378 new_draw_info (NDI_UNIQUE, 0, pl, "There is no lock there."); 375 pl->failmsg ("There is no lock there.");
379 return 0; 376 return 0;
380 } 377 }
378
381 if (tmp->type == LOCKED_DOOR) 379 if (tmp->type == LOCKED_DOOR)
382 { 380 {
383 new_draw_info (NDI_UNIQUE, 0, pl, "You can't pick that lock!"); 381 pl->failmsg ("You can't pick that lock! H<You need the right key, no matter how skilled you might be.>");
384 return 0; 382 return 0;
385 } 383 }
386 384
387 if (!tmp->move_block) 385 if (!tmp->move_block)
388 { 386 {
389 new_draw_info (NDI_UNIQUE, 0, pl, "The door has no lock!"); 387 pl->failmsg ("The door has no lock!");
390 return 0; 388 return 0;
391 } 389 }
392 390
393 if (attempt_pick_lock (tmp, pl, skill)) 391 if (attempt_pick_lock (tmp, pl, skill))
394 { 392 {
… …
443hide (object *op, object *skill) 441hide (object *op, object *skill)
444{ 442{
445 /* the preliminaries -- Can we really hide now? */ 443 /* the preliminaries -- Can we really hide now? */
446 /* this keeps monsters from using invisibilty spells and hiding */ 444 /* this keeps monsters from using invisibilty spells and hiding */
447 445
448 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 446 if (op->flag [FLAG_MAKE_INVIS])
449 { 447 {
450 new_draw_info (NDI_UNIQUE, 0, op, "You don't need to hide while invisible!"); 448 new_draw_info (NDI_UNIQUE, 0, op, "You don't need to hide while invisible!");
451 return 0; 449 return 0;
452 } 450 }
453 else if (!op->flag [FLAG_HIDDEN] && op->invisible > 0 && op->type == PLAYER) 451 else if (!op->flag [FLAG_HIDDEN] && op->invisible > 0 && op->type == PLAYER)
… …
480static void 478static void
481stop_jump (object *pl, int dist, int spaces) 479stop_jump (object *pl, int dist, int spaces)
482{ 480{
483 pl->update_stats (); 481 pl->update_stats ();
484 pl->map->insert (pl, pl->x, pl->y, pl); 482 pl->map->insert (pl, pl->x, pl->y, pl);
485 pl->speed_left -= fabs (pl->speed * 8); 483 pl->speed_left -= pl->speed * 8.;
486} 484}
487 485
488static int 486static int
489attempt_jump (object *pl, int dir, int spaces, object *skill) 487attempt_jump (object *pl, int dir, int spaces, object *skill)
490{ 488{
… …
517 } 515 }
518 516
519 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 517 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
520 { 518 {
521 /* Jump into creature */ 519 /* Jump into creature */
522 if (QUERY_FLAG (tmp, FLAG_MONSTER) 520 if (tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
523 || (tmp->type == PLAYER && (!QUERY_FLAG (tmp, FLAG_WIZ) || !tmp->contr->hidden)))
524 { 521 {
525 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);
526 523
527 stop_jump (pl, i, spaces); 524 stop_jump (pl, i, spaces);
528 525
… …
578 int stats = str * str * str * dex * skill->level; 575 int stats = str * str * str * dex * skill->level;
579 int spaces = min (3, skill->level, stats / (pl->carrying + 1)); 576 int spaces = min (3, skill->level, stats / (pl->carrying + 1));
580 577
581 if (spaces == 0) 578 if (spaces == 0)
582 { 579 {
583 new_draw_info (NDI_UNIQUE, 0, pl, "You are carrying too much weight to jump."); 580 pl->failmsg ("You are carrying too much weight to jump.");
584 return 0; 581 return 0;
585 } 582 }
586 583
587 return attempt_jump (pl, dir, spaces, skill); 584 return attempt_jump (pl, dir, spaces, skill);
588} 585}
589 586
590/* skill_ident() - this code is supposed to allow players to identify 587/* skill_ident() - this code is supposed to allow players to identify
591 * classes of objects with the various "auto-ident" skills. Player must 588 * classes of objects with the various "auto-ident" skills. Player must
592 * have unidentified objects of the right type in order for the skill 589 * have unidentified objects of the right type in order for the skill
593 * to work. While multiple classes of objects may be identified, 590 * to work. While multiple classes of objects may be identified,
594 * this code is kind of yucky -- it would be nice to make it a bit 591 * this code is kind of yucky -- it would be nice to make it a bit
595 * more generalized. Right now, skill indices are embedded in this routine. 592 * more generalized. Right now, skill indices are embedded in this routine.
596 * Returns amount of experience gained (on successful ident). 593 * Returns amount of experience gained (on successful ident).
597 * - b.t. (thomas@astro.psu.edu) 594 * - b.t. (thomas@astro.psu.edu)
598 */ 595 */
599static int 596static int
600do_skill_detect_curse (object *pl, object *skill) 597do_skill_detect_curse (object *pl, object *skill)
601{ 598{
602 object *tmp;
603 int success = 0; 599 int success = 0;
604 600
605 for (tmp = pl->inv; tmp; tmp = tmp->below) 601 for (object *tmp = pl->inv; tmp; tmp = tmp->below)
606 if (!tmp->invisible 602 if (!tmp->invisible
607 && !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) 603 && tmp->need_identify ()
608 && (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->item_power < skill->level) 604 && !tmp->flag [FLAG_IDENTIFIED] && !tmp->flag [FLAG_KNOWN_CURSED]
605 && (tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED])
606 && tmp->item_power < skill->level)
609 { 607 {
610 SET_FLAG (tmp, FLAG_KNOWN_CURSED); 608 tmp->set_flag (FLAG_KNOWN_CURSED);
611 esrv_update_item (UPD_FLAGS, pl, tmp); 609 esrv_update_item (UPD_FLAGS, pl, tmp);
612 success += calc_skill_exp (pl, tmp, skill); 610 success += calc_skill_exp (pl, tmp, skill);
613 } 611 }
614 612
615 /* Check ground, too, but only objects the player could pick up */ 613 /* Check ground, too, but only objects the player could pick up */
616 for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp; tmp = tmp->above) 614 for (object *tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp; tmp = tmp->above)
617 if (can_pick (pl, tmp) && 615 if (can_pick (pl, tmp)
618 !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && 616 && tmp->need_identify ()
619 !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) 617 && !tmp->flag [FLAG_IDENTIFIED] && !tmp->flag [FLAG_KNOWN_CURSED]
620 && (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->item_power < skill->level) 618 && (tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED])
619 && tmp->item_power < skill->level)
621 { 620 {
622 SET_FLAG (tmp, FLAG_KNOWN_CURSED); 621 tmp->set_flag (FLAG_KNOWN_CURSED);
623 esrv_update_item (UPD_FLAGS, pl, tmp); 622 esrv_update_item (UPD_FLAGS, pl, tmp);
624 success += calc_skill_exp (pl, tmp, skill); 623 success += calc_skill_exp (pl, tmp, skill);
625 } 624 }
626 625
627 return success; 626 return success;
628} 627}
629 628
630static int 629static int
631do_skill_detect_magic (object *pl, object *skill) 630do_skill_detect_magic (object *pl, object *skill)
632{ 631{
633 object *tmp;
634 int success = 0; 632 int success = 0;
635 633
636 for (tmp = pl->inv; tmp; tmp = tmp->below) 634 for (object *tmp = pl->inv; tmp; tmp = tmp->below)
637 if (!tmp->invisible 635 if (!tmp->invisible
638 && !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) 636 && tmp->need_identify ()
637 && !tmp->flag [FLAG_IDENTIFIED] && !tmp->flag [FLAG_KNOWN_MAGICAL]
638 && is_magical (tmp)
639 && (is_magical (tmp)) && tmp->item_power < skill->level) 639 && tmp->item_power < skill->level)
640 { 640 {
641 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL); 641 tmp->set_flag (FLAG_KNOWN_MAGICAL);
642 esrv_update_item (UPD_FLAGS, pl, tmp); 642 esrv_update_item (UPD_FLAGS, pl, tmp);
643 success += calc_skill_exp (pl, tmp, skill); 643 success += calc_skill_exp (pl, tmp, skill);
644 } 644 }
645 645
646 /* Check ground, too, but like above, only if the object can be picked up */ 646 /* Check ground, too, but like above, only if the object can be picked up */
647 for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp; tmp = tmp->above) 647 for (object *tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp; tmp = tmp->above)
648 if (can_pick (pl, tmp) && 648 if (can_pick (pl, tmp)
649 !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && (is_magical (tmp)) && tmp->item_power < skill->level) 649 && tmp->need_identify ()
650 && !tmp->flag [FLAG_IDENTIFIED] && !tmp->flag [FLAG_KNOWN_MAGICAL]
651 && is_magical (tmp)
652 && tmp->item_power < skill->level)
650 { 653 {
651 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL); 654 tmp->set_flag (FLAG_KNOWN_MAGICAL);
652 esrv_update_item (UPD_FLAGS, pl, tmp); 655 esrv_update_item (UPD_FLAGS, pl, tmp);
653 success += calc_skill_exp (pl, tmp, skill); 656 success += calc_skill_exp (pl, tmp, skill);
654 } 657 }
655 658
656 return success; 659 return success;
657} 660}
658 661
659/* Helper function for do_skill_ident, so that we can loop 662/* Helper function for do_skill_ident, so that we can loop
660 * over inventory AND objects on the ground conveniently. 663 * over inventory AND objects on the ground conveniently.
661 */ 664 */
662int 665static int
663do_skill_ident2 (object *tmp, object *pl, int obj_class, object *skill) 666do_skill_ident2 (object *tmp, object *pl, int obj_class, object *skill)
664{ 667{
665 int success = 0, chance; 668 int success = 0, chance;
666 int skill_value = skill->level * pl->stats.Int ? pl->stats.Int : 10; 669 int skill_value = skill->level * pl->stats.Int ? pl->stats.Int : 10;
667 670
668 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT) 671 if (!tmp->flag [FLAG_IDENTIFIED]
669 && need_identify (tmp) && !tmp->invisible && tmp->type == obj_class) 672 && !tmp->flag [FLAG_NO_SKILL_IDENT]
673 && tmp->need_identify ()
674 && !tmp->invisible
675 && tmp->type == obj_class)
670 { 676 {
671 chance = die_roll (3, 10, pl, PREFER_LOW) - 3 + rndm (0, (tmp->magic ? tmp->magic * 5 : 1) - 1); 677 chance = die_roll (3, 10, pl, PREFER_LOW) - 3 + rndm (0, (tmp->magic ? tmp->magic * 5 : 1) - 1);
672 678
673 if (skill_value >= chance) 679 if (skill_value >= chance)
674 { 680 {
… …
686 } 692 }
687 693
688 success += calc_skill_exp (pl, tmp, skill); 694 success += calc_skill_exp (pl, tmp, skill);
689 } 695 }
690 else 696 else
691 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); 697 tmp->set_flag (FLAG_NO_SKILL_IDENT);
692 } 698 }
693 699
694 return success; 700 return success;
695} 701}
696 702
… …
756 break; 762 break;
757 763
758 case SK_DET_CURSE: 764 case SK_DET_CURSE:
759 success = do_skill_detect_curse (pl, skill); 765 success = do_skill_detect_curse (pl, skill);
760 if (success) 766 if (success)
761 new_draw_info (NDI_UNIQUE, 0, pl, "...and discover cursed items!"); 767 new_draw_info (NDI_UNIQUE, 0, pl, "... and discover cursed items!");
762 break; 768 break;
763 769
764 case SK_DET_MAGIC: 770 case SK_DET_MAGIC:
765 success = do_skill_detect_magic (pl, skill); 771 success = do_skill_detect_magic (pl, skill);
766 if (success) 772 if (success)
767 new_draw_info (NDI_UNIQUE, 0, pl, "...and discover items imbued with mystic forces!"); 773 new_draw_info (NDI_UNIQUE, 0, pl, "... and discover items imbued with mystic forces!");
768 break; 774 break;
769 775
770 default: 776 default:
771 LOG (llevError, "Error: bad call to skill_ident()\n"); 777 LOG (llevError, "Error: bad call to skill_ident()\n");
772 return 0; 778 return 0;
773 break;
774 } 779 }
775 780
776 if (!success) 781 if (!success)
777 new_draw_info (NDI_UNIQUE, 0, pl, "...and learn nothing more."); 782 new_draw_info (NDI_UNIQUE, 0, pl, "... and learn nothing more.");
778 783
779 return success; 784 return success;
780} 785}
781 786
782/* players using this skill can 'charm' a monster -- 787/* players using this skill can 'charm' a monster --
… …
788use_oratory (object *pl, int dir, object *skill) 793use_oratory (object *pl, int dir, object *skill)
789{ 794{
790 if (pl->type != PLAYER) 795 if (pl->type != PLAYER)
791 return 0; /* only players use this skill */ 796 return 0; /* only players use this skill */
792 797
798 if (!dir)
799 {
800 pl->failmsg ("In what direction?");
801 return 0;
802 }
803
793 sint16 x = pl->x + freearr_x[dir], 804 sint16 x = pl->x + freearr_x[dir],
794 y = pl->y + freearr_y[dir]; 805 y = pl->y + freearr_y[dir];
795 maptile *m = pl->map; 806 maptile *m = pl->map;
796 807
797 int mflags = get_map_flags (m, &m, x, y, &x, &y); 808 int mflags = get_map_flags (m, &m, x, y, &x, &y);
… …
800 811
801 /* Save some processing - we have the flag already anyways 812 /* Save some processing - we have the flag already anyways
802 */ 813 */
803 if (!(mflags & P_IS_ALIVE)) 814 if (!(mflags & P_IS_ALIVE))
804 { 815 {
805 new_draw_info (NDI_UNIQUE, 0, pl, "There is nothing to orate to."); 816 pl->failmsg ("There is nothing to orate to.");
806 return 0; 817 return 0;
807 } 818 }
808 819
809 object *tmp; 820 object *tmp;
810 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 821 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
… …
818 if (tmp->type == PLAYER 829 if (tmp->type == PLAYER
819 || tmp->more || tmp->head_ () != tmp 830 || tmp->more || tmp->head_ () != tmp
820 || tmp->msg) 831 || tmp->msg)
821 return 0; 832 return 0;
822 833
823 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 834 if (tmp->flag [FLAG_MONSTER])
824 break; 835 break;
825 } 836 }
826 837
827 if (!tmp) 838 if (!tmp)
828 { 839 {
829 new_draw_info (NDI_UNIQUE, 0, pl, "There is nothing to orate to."); 840 pl->failmsg ("There is nothing to orate to.");
830 return 0; 841 return 0;
831 } 842 }
832 843
833 new_draw_info_format (NDI_UNIQUE, 0, pl, "You orate to the %s.", query_name (tmp)); 844 new_draw_info_format (NDI_UNIQUE, 0, pl, "You orate to the %s.", query_name (tmp));
834 845
835 /* the following conditions limit who may be 'charmed' */ 846 /* the following conditions limit who may be 'charmed' */
836 847
837 /* it's hostile! */ 848 /* it's hostile! */
838 if (!QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY)) 849 if (!tmp->flag [FLAG_UNAGGRESSIVE] && !tmp->flag [FLAG_FRIENDLY])
839 { 850 {
840 new_draw_info_format (NDI_UNIQUE, 0, pl, "Too bad the %s isn't listening!\n", query_name (tmp)); 851 new_draw_info_format (NDI_UNIQUE, 0, pl, "Too bad the %s isn't listening!\n", query_name (tmp));
841 return 0; 852 return 0;
842 } 853 }
843 854
844 /* it's already allied! */ 855 /* it's already allied! */
845 if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->attack_movement == PETMOVE) 856 if (tmp->flag [FLAG_FRIENDLY] && tmp->attack_movement == PETMOVE)
846 { 857 {
847 if (tmp->owner == pl) 858 if (tmp->owner == pl)
848 { 859 {
849 new_draw_info (NDI_UNIQUE, 0, pl, "Your follower loves your speech.\n"); 860 new_draw_info (NDI_UNIQUE, 0, pl, "Your follower loves your speech.\n");
850 return 0; 861 return 0;
… …
881 tmp->set_owner (pl); 892 tmp->set_owner (pl);
882 tmp->skill = skill->skill; 893 tmp->skill = skill->skill;
883 tmp->stats.exp = 0; 894 tmp->stats.exp = 0;
884 tmp->attack_movement = PETMOVE; 895 tmp->attack_movement = PETMOVE;
885 896
886 if (!QUERY_FLAG (tmp, FLAG_FRIENDLY)) 897 if (!tmp->flag [FLAG_FRIENDLY])
887 add_friendly_object (tmp); 898 add_friendly_object (tmp);
888 899
889 return calc_skill_exp (pl, tmp, skill); 900 return calc_skill_exp (pl, tmp, skill);
890 } 901 }
891 /* Charm failed. Creature may be angry now */ 902 /* Charm failed. Creature may be angry now */
892 else if ((skill->level + ((pl->stats.Cha - 10) / 2)) < random_roll (1, 2 * tmp->level, pl, PREFER_LOW)) 903 else if ((skill->level + ((pl->stats.Cha - 10) / 2)) < random_roll (1, 2 * tmp->level, pl, PREFER_LOW))
893 { 904 {
894 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your speech angers the %s!\n", query_name (tmp)); 905 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your speech angers the %s!\n", query_name (tmp));
895 if (QUERY_FLAG (tmp, FLAG_FRIENDLY)) 906 if (tmp->flag [FLAG_FRIENDLY])
896 { 907 {
897 remove_friendly_object (tmp); 908 remove_friendly_object (tmp);
898 tmp->attack_movement = 0; /* needed? */ 909 tmp->attack_movement = 0; /* needed? */
899 } 910 }
900 911
901 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 912 tmp->clr_flag (FLAG_UNAGGRESSIVE);
902 } 913 }
903 914
904 return 0; /* Fall through - if we get here, we didn't charm anything */ 915 return 0; /* Fall through - if we get here, we didn't charm anything */
905} 916}
906 917
… …
914 * of anything better! -b.t. 925 * of anything better! -b.t.
915 */ 926 */
916int 927int
917singing (object *pl, int dir, object *skill) 928singing (object *pl, int dir, object *skill)
918{ 929{
919 int i, exp = 0; 930 int exp = 0;
920 object *tmp; 931 object *tmp;
921 maptile *m; 932 maptile *m;
922 sint16 x, y; 933 sint16 x, y;
923 934
924 if (pl->type != PLAYER) 935 if (pl->type != PLAYER)
925 return 0; /* only players use this skill */ 936 return 0; /* only players use this skill */
926 937
938 if (!dir)
939 {
940 pl->failmsg ("In what direction?");
941 return 0;
942 }
943
927 new_draw_info_format (NDI_UNIQUE, 0, pl, "You sing."); 944 new_draw_info_format (NDI_UNIQUE, 0, pl, "You sing.");
928 for (i = 0; i < MIN (skill->level, SIZEOFFREE); i++) 945 for (int i = skill->level >= SIZEOFFREE1 ? 0 : dir;
946 i < min (skill->level, SIZEOFFREE);
947 i++)
929 { 948 {
930 x = pl->x + freearr_x[i]; 949 x = pl->x + freearr_x[i];
931 y = pl->y + freearr_y[i]; 950 y = pl->y + freearr_y[i];
932 m = pl->map; 951 m = pl->map;
933 952
… …
937 if (!(mflags & P_IS_ALIVE)) 956 if (!(mflags & P_IS_ALIVE))
938 continue; 957 continue;
939 958
940 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 959 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
941 { 960 {
942 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 961 if (tmp->flag [FLAG_MONSTER])
943 break; 962 break;
944 /* can't affect players */ 963 /* can't affect players */
945 if (tmp->type == PLAYER) 964 if (tmp->type == PLAYER)
946 break; 965 break;
947 } 966 }
948 967
949 /* Whole bunch of checks to see if this is a type of monster that would 968 /* Whole bunch of checks to see if this is a type of monster that would
950 * listen to singing. 969 * listen to singing.
951 */ 970 */
952 if (tmp && QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_NO_STEAL) && /* Been charmed or abused before */ 971 if (tmp && tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_NO_STEAL] && /* Been charmed or abused before */
953 !QUERY_FLAG (tmp, FLAG_SPLITTING) && /* no ears */ 972 !tmp->flag [FLAG_SPLITTING] && /* no ears */
954 !QUERY_FLAG (tmp, FLAG_HITBACK) && /* was here before */ 973 !tmp->flag [FLAG_HITBACK] && /* was here before */
955 (tmp->level <= skill->level) && (!tmp->head) && !QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && /* already calm */ 974 (tmp->level <= skill->level) && (!tmp->head) && !tmp->flag [FLAG_UNDEAD] && !tmp->flag [FLAG_UNAGGRESSIVE] && /* already calm */
956 !QUERY_FLAG (tmp, FLAG_FRIENDLY)) 975 !tmp->flag [FLAG_FRIENDLY])
957 { /* already calm */ 976 { /* already calm */
958 977
959 /* stealing isn't really related (although, maybe it should 978 /* stealing isn't really related (although, maybe it should
960 * be). This is mainly to prevent singing to the same monster 979 * be). This is mainly to prevent singing to the same monster
961 * over and over again and getting exp for it. 980 * over and over again and getting exp for it.
962 */ 981 */
963 int level = skill->level + (pl->stats.Cha - 5 - tmp->stats.Int) / 2; 982 int level = skill->level + (pl->stats.Cha - 5 - tmp->stats.Int) / 2;
964 983
965 if (level && tmp->level < random_roll (0, level - 1, pl, PREFER_HIGH)) 984 if (level && tmp->level < random_roll (0, level - 1, pl, PREFER_HIGH))
966 { 985 {
967 SET_FLAG (tmp, FLAG_UNAGGRESSIVE); 986 tmp->set_flag (FLAG_UNAGGRESSIVE);
968 new_draw_info_format (NDI_UNIQUE, 0, pl, "You calm down the %s\n", query_name (tmp)); 987 new_draw_info_format (NDI_UNIQUE, 0, pl, "You calm down the %s\n", query_name (tmp));
969 /* Give exp only if they are not aware */ 988 /* Give exp only if they are not aware */
970 989
971 if (!QUERY_FLAG (tmp, FLAG_NO_STEAL)) 990 if (!tmp->flag [FLAG_NO_STEAL])
972 exp += calc_skill_exp (pl, tmp, skill); 991 exp += calc_skill_exp (pl, tmp, skill);
973 992
974 SET_FLAG (tmp, FLAG_NO_STEAL); 993 tmp->set_flag (FLAG_NO_STEAL);
975 } 994 }
976 else 995 else
977 { 996 {
978 new_draw_info_format (NDI_UNIQUE, 0, pl, "Too bad the %s isn't listening!\n", query_name (tmp)); 997 new_draw_info_format (NDI_UNIQUE, 0, pl, "Too bad the %s isn't listening!\n", query_name (tmp));
979 SET_FLAG (tmp, FLAG_NO_STEAL); 998 tmp->set_flag (FLAG_NO_STEAL);
980 } 999 }
981 } 1000 }
982 } 1001 }
983 return exp; 1002 return exp;
984} 1003}
985 1004
986/* The find_traps skill (aka, search). Checks for traps 1005/* The find_traps skill (aka, search). Checks for traps
987 * on the spaces or in certain objects 1006 * on the spaces or in certain objects
988 */ 1007 */
989
990int 1008int
991find_traps (object *pl, object *skill) 1009find_traps (object *pl, object *skill)
992{ 1010{
993 object *tmp, *tmp2; 1011 object *tmp, *tmp2;
994 int i, expsum = 0, mflags; 1012 int i, expsum = 0, mflags;
… …
996 maptile *m; 1014 maptile *m;
997 1015
998 /* First we search all around us for runes and traps, which are 1016 /* First we search all around us for runes and traps, which are
999 * all type RUNE 1017 * all type RUNE
1000 */ 1018 */
1001
1002 for (i = 0; i < 9; i++) 1019 for (i = 0; i < 9; i++)
1003 { 1020 {
1004 x = pl->x + freearr_x[i]; 1021 x = pl->x + freearr_x[i];
1005 y = pl->y + freearr_y[i]; 1022 y = pl->y + freearr_y[i];
1006 m = pl->map; 1023 m = pl->map;
… …
1008 mflags = get_map_flags (m, &m, x, y, &x, &y); 1025 mflags = get_map_flags (m, &m, x, y, &x, &y);
1009 if (mflags & P_OUT_OF_MAP) 1026 if (mflags & P_OUT_OF_MAP)
1010 continue; 1027 continue;
1011 1028
1012 /* Check everything in the square for trapness */ 1029 /* Check everything in the square for trapness */
1013 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1030 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1014 { 1031 {
1015
1016 /* And now we'd better do an inventory traversal of each 1032 /* And now we'd better do an inventory traversal of each
1017 * of these objects' inventory 1033 * of these objects' inventory
1018 * We can narrow this down a bit - no reason to search through 1034 * We can narrow this down a bit - no reason to search through
1019 * the players inventory or monsters for that matter. 1035 * the players inventory or monsters for that matter.
1020 */ 1036 */
1021 if (tmp->type != PLAYER && !QUERY_FLAG (tmp, FLAG_MONSTER)) 1037 if (tmp->type != PLAYER && !tmp->flag [FLAG_MONSTER])
1022 {
1023 for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below) 1038 for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below)
1024 if (tmp2->type == RUNE || tmp2->type == TRAP) 1039 if (tmp2->type == RUNE || tmp2->type == TRAP)
1025 if (trap_see (pl, tmp2)) 1040 if (trap_see (pl, tmp2))
1026 { 1041 {
1027 trap_show (tmp2, tmp); 1042 trap_show (tmp2, tmp);
1028 if (tmp2->stats.Cha > 1) 1043 if (tmp2->stats.Cha > 1)
1029 { 1044 {
1030 if (!tmp2->owner || tmp2->owner->type != PLAYER) 1045 if (!tmp2->owner || tmp2->owner->type != PLAYER)
1031 expsum += calc_skill_exp (pl, tmp2, skill); 1046 expsum += calc_skill_exp (pl, tmp2, skill);
1032 1047
1033 tmp2->stats.Cha = 1; /* unhide the trap */ 1048 tmp2->stats.Cha = 1; /* unhide the trap */
1034 } 1049 }
1035 } 1050 }
1036 } 1051
1037 if ((tmp->type == RUNE || tmp->type == TRAP) && trap_see (pl, tmp)) 1052 if ((tmp->type == RUNE || tmp->type == TRAP) && trap_see (pl, tmp))
1038 { 1053 {
1039 trap_show (tmp, tmp); 1054 trap_show (tmp, tmp);
1040 if (tmp->stats.Cha > 1) 1055 if (tmp->stats.Cha > 1)
1041 { 1056 {
… …
1044 tmp->stats.Cha = 1; /* unhide the trap */ 1059 tmp->stats.Cha = 1; /* unhide the trap */
1045 } 1060 }
1046 } 1061 }
1047 } 1062 }
1048 } 1063 }
1064
1049 new_draw_info (NDI_BLACK, 0, pl, "You search the area."); 1065 new_draw_info (NDI_BLACK, 0, pl, "You search the area.");
1050 return expsum; 1066 return expsum;
1051} 1067}
1052 1068
1053/* remove_trap() - This skill will disarm any previously discovered trap 1069/* remove_trap() - This skill will disarm any previously discovered trap
1054 * the algorithm is based (almost totally) on the old command_disarm() - b.t. 1070 * the algorithm is based (almost totally) on the old command_disarm() - b.t.
1055 */ 1071 */
1056
1057int 1072int
1058remove_trap (object *op, int dir, object *skill) 1073remove_trap (object *op, int dir, object *skill)
1059{ 1074{
1060 object *tmp, *tmp2; 1075 object *tmp, *tmp2;
1061 int i, success = 0, mflags; 1076 int i, success = 0, mflags;
… …
1071 mflags = get_map_flags (m, &m, x, y, &x, &y); 1086 mflags = get_map_flags (m, &m, x, y, &x, &y);
1072 if (mflags & P_OUT_OF_MAP) 1087 if (mflags & P_OUT_OF_MAP)
1073 continue; 1088 continue;
1074 1089
1075 /* Check everything in the square for trapness */ 1090 /* Check everything in the square for trapness */
1076 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1091 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1077 { 1092 {
1078 /* And now we'd better do an inventory traversal of each 1093 /* And now we'd better do an inventory traversal of each
1079 * of these objects inventory. Like above, only 1094 * of these objects inventory. Like above, only
1080 * do this for interesting objects. 1095 * do this for interesting objects.
1081 */ 1096 */
1082 1097
1083 if (tmp->type != PLAYER && !QUERY_FLAG (tmp, FLAG_MONSTER)) 1098 if (tmp->type != PLAYER && !tmp->flag [FLAG_MONSTER])
1084 { 1099 {
1085 for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below) 1100 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1086 if ((tmp2->type == RUNE || tmp2->type == TRAP) && tmp2->stats.Cha <= 1) 1101 if ((tmp2->type == RUNE || tmp2->type == TRAP) && tmp2->stats.Cha <= 1)
1087 { 1102 {
1088 trap_show (tmp2, tmp); 1103 trap_show (tmp2, tmp);
1104
1089 if (trap_disarm (op, tmp2, 1, skill) && (!tmp2->owner || tmp2->owner->type != PLAYER)) 1105 if (trap_disarm (op, tmp2, 1, skill) && (!tmp2->owner || tmp2->owner->type != PLAYER))
1090 { 1106 {
1091 tmp->stats.exp = tmp->stats.Cha * tmp->level; 1107 tmp->stats.exp = tmp->stats.Cha * tmp->level;
1092 success += calc_skill_exp (op, tmp2, skill); 1108 success += calc_skill_exp (op, tmp2, skill);
1093 } 1109 }
1094 } 1110 }
1095 } 1111 }
1112
1096 if ((tmp->type == RUNE || tmp->type == TRAP) && tmp->stats.Cha <= 1) 1113 if ((tmp->type == RUNE || tmp->type == TRAP) && tmp->stats.Cha <= 1)
1097 { 1114 {
1098 trap_show (tmp, tmp); 1115 trap_show (tmp, tmp);
1116
1099 if (trap_disarm (op, tmp, 1, skill) && (!tmp->owner || tmp->owner->type != PLAYER)) 1117 if (trap_disarm (op, tmp, 1, skill) && (!tmp->owner || tmp->owner->type != PLAYER))
1100 { 1118 {
1101 tmp->stats.exp = tmp->stats.Cha * tmp->level; 1119 tmp->stats.exp = tmp->stats.Cha * tmp->level;
1102 success += calc_skill_exp (op, tmp, skill); 1120 success += calc_skill_exp (op, tmp, skill);
1103 } 1121 }
… …
1129 /* Check all objects - we could stop at floor objects, 1147 /* Check all objects - we could stop at floor objects,
1130 * but if someone buries an altar, I don't see a problem with 1148 * but if someone buries an altar, I don't see a problem with
1131 * going through all the objects, and it shouldn't be much slower 1149 * going through all the objects, and it shouldn't be much slower
1132 * than extra checks on object attributes. 1150 * than extra checks on object attributes.
1133 */ 1151 */
1134 for (tmp = pl->below; tmp != NULL; tmp = tmp->below) 1152 for (tmp = pl->below; tmp; tmp = tmp->below)
1135 { 1153 {
1136 /* Only if the altar actually belongs to someone do you get special benefits */ 1154 /* Only if the altar actually belongs to someone do you get special benefits */
1137 if (tmp && tmp->type == HOLY_ALTAR && tmp->other_arch) 1155 if (tmp && tmp->type == HOLY_ALTAR && tmp->other_arch)
1138 { 1156 {
1139 sprintf (buf, "You pray over the %s.", &tmp->name); 1157 sprintf (buf, "You pray over the %s.", &tmp->name);
… …
1166 1184
1167 if (pl->type != PLAYER) 1185 if (pl->type != PLAYER)
1168 return; /* players only */ 1186 return; /* players only */
1169 1187
1170 /* check if pl has removed encumbering armour and weapons */ 1188 /* check if pl has removed encumbering armour and weapons */
1171 if (QUERY_FLAG (pl, FLAG_READY_WEAPON) && (skill->level < 6)) 1189 if (pl->flag [FLAG_READY_WEAPON] && skill->level < 6)
1172 { 1190 {
1173 new_draw_info (NDI_UNIQUE, 0, pl, "You can't concentrate while wielding a weapon!\n"); 1191 pl->failmsg ("You can't concentrate while wielding a weapon!\n");
1174 return; 1192 return;
1175 } 1193 }
1176 else 1194 else
1177 { 1195 {
1178 for (tmp = pl->inv; tmp; tmp = tmp->below) 1196 for (tmp = pl->inv; tmp; tmp = tmp->below)
1179 if (((tmp->type == ARMOUR && skill->level < 12) 1197 if (((tmp->type == ARMOUR && skill->level < 12)
1180 || (tmp->type == HELMET && skill->level < 10) 1198 || (tmp->type == HELMET && skill->level < 10)
1181 || (tmp->type == SHIELD && skill->level < 6) 1199 || (tmp->type == SHIELD && skill->level < 6)
1182 || (tmp->type == BOOTS && skill->level < 4) 1200 || (tmp->type == BOOTS && skill->level < 4)
1183 || (tmp->type == GLOVES && skill->level < 2)) 1201 || (tmp->type == GLOVES && skill->level < 2))
1184 && QUERY_FLAG (tmp, FLAG_APPLIED)) 1202 && tmp->flag [FLAG_APPLIED])
1185 { 1203 {
1186 new_draw_info (NDI_UNIQUE, 0, pl, "You can't concentrate while wearing so much armour!\n"); 1204 pl->failmsg ("You can't concentrate while wearing so much armour!\n");
1187 return; 1205 return;
1188 } 1206 }
1189 } 1207 }
1190 1208
1191 /* ok let's meditate! Spell points are regained first, then once 1209 /* ok let's meditate! Spell points are regained first, then once
1192 * they are maxed we get back hp. Actual incrementing of values 1210 * they are maxed we get back hp. Actual incrementing of values
1193 * is handled by the do_some_living() (in player.c). This way magical 1211 * is handled by the do_some_living() (in player.c). This way magical
1194 * bonuses for healing/sp regeneration are included properly 1212 * bonuses for healing/sp regeneration are included properly
1195 * No matter what, we will eat up some playing time trying to 1213 * No matter what, we will eat up some playing time trying to
1196 * meditate. (see 'factor' variable for what sets the amount of time) 1214 * meditate. (see 'factor' variable for what sets the amount of time)
1197 */ 1215 */
1198 1216
1199 new_draw_info (NDI_BLACK, 0, pl, "You meditate."); 1217 new_draw_info (NDI_BLACK, 0, pl, "You meditate.");
1200 1218
1201 if (pl->stats.sp < pl->stats.maxsp) 1219 if (pl->stats.sp < pl->stats.maxsp)
… …
1208 pl->stats.hp++; 1226 pl->stats.hp++;
1209 pl->last_heal = -1; 1227 pl->last_heal = -1;
1210 } 1228 }
1211} 1229}
1212 1230
1213/* write_note() - this routine allows players to inscribe messages in 1231/* write_note() - this routine allows players to inscribe messages in
1214 * ordinary inscribable 'books' (anything that is not a SPELL). b.t. 1232 * ordinary inscribable 'books' (anything that is not a SPELL). b.t.
1215 */ 1233 */
1216static int 1234static int
1217write_note (object *pl, object *item, const char *msg, object *skill) 1235write_note (object *pl, object *item, const char *msg, object *skill)
1218{ 1236{
1219 if (strstr (msg, "\nendmsg")) 1237 if (!msg_is_safe (msg))
1220 { 1238 {
1221 new_draw_info (NDI_UNIQUE, 0, pl, "Trying to cheat now are we?"); 1239 pl->failmsg ("Trying to cheat now are we? H<@-signs are not allowed in notes.>");
1240 LOG (llevInfo, "write_note: player %s tried to write bogus note %s\n", &pl->name, msg);
1222 return 0; 1241 return 0;
1223 } 1242 }
1224 1243
1225 int len = strlen (msg); 1244 int len = strlen (msg);
1226 1245
1227 if (!is_utf8_string ((U8 *)msg, len)) 1246 if (!is_utf8_string ((U8 *)msg, len))
1228 { 1247 {
1229 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your message is garbled (text must be UTF-8, client-bug)!"); 1248 pl->failmsg ("Your message is garbled (text must be UTF-8, client-bug)!");
1230 return 0; 1249 return 0;
1231 } 1250 }
1232 1251
1233 if (INVOKE_OBJECT (INSCRIBE_NOTE, item, ARG_PLAYER (pl->contr), ARG_STRING (msg), ARG_OBJECT (skill))) 1252 if (INVOKE_OBJECT (INSCRIBE_NOTE, item, ARG_PLAYER (pl->contr), ARG_STRING (msg), ARG_OBJECT (skill)))
1234 return RESULT_INT (0); 1253 return RESULT_INT (0);
1235 1254
1236 char buf[1024]; 1255 STRLEN char_len = utf8_length ((U8 *)msg, (U8 *)(msg+len));
1237 1256
1238 if (len < sizeof (buf) - 2) 1257 if (char_len <= item->weight_limit)
1239 { 1258 {
1240 snprintf (buf, sizeof (buf), "%s\n", msg);
1241
1242 object *newbook = arch_to_object (item->other_arch); 1259 object *newbook = item->other_arch->instance ();
1243 item->decrease (); 1260 item->decrease ();
1244 newbook->nrof = 1; 1261 newbook->nrof = 1;
1245 newbook->msg = buf; 1262 newbook->msg = shstr (msg);
1246 newbook->flag [FLAG_IDENTIFIED] = true; 1263 newbook->flag [FLAG_IDENTIFIED] = true;
1247 1264
1248 if (item->subtype == 1) // mailscrolls 1265 if (item->subtype == 1) // mailscrolls
1249 { 1266 {
1250 newbook->name = item->name; 1267 newbook->name = item->name;
… …
1253 1270
1254 pl->insert (newbook); 1271 pl->insert (newbook);
1255 1272
1256 pl->contr->play_sound (sound_find ("inscribe_success")); 1273 pl->contr->play_sound (sound_find ("inscribe_success"));
1257 new_draw_info_format (NDI_UNIQUE, 0, pl, "You write in the %s.", &item->name); 1274 new_draw_info_format (NDI_UNIQUE, 0, pl, "You write in the %s.", &item->name);
1258 return strlen (msg); 1275 return char_len;
1259 } 1276 }
1260 else 1277 else
1261 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your message won't fit in the %s!", &item->name); 1278 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.>",
1279 &item->name, item->weight_limit, char_len);
1262 1280
1263 return 0; 1281 return 0;
1264} 1282}
1265 1283
1266/* write_scroll() - this routine allows players to inscribe spell scrolls 1284/* write_scroll() - this routine allows players to inscribe spell scrolls
1267 * of spells which they know. Backfire effects are possible with the 1285 * of spells which they know. Backfire effects are possible with the
1268 * severity of the backlash correlated with the difficulty of the scroll 1286 * severity of the backlash correlated with the difficulty of the scroll
1269 * that is attempted. -b.t. thomas@astro.psu.edu 1287 * that is attempted. -b.t. thomas@astro.psu.edu
1270 */ 1288 */
1271static int 1289static int
1272write_scroll (object *pl, object *scroll, object *skill) 1290write_scroll (object *pl, object *scroll, object *skill)
1273{ 1291{
… …
1276 /* Check if we are ready to attempt inscription */ 1294 /* Check if we are ready to attempt inscription */
1277 object *chosen_spell = pl->contr->ranged_ob; 1295 object *chosen_spell = pl->contr->ranged_ob;
1278 1296
1279 if (!chosen_spell || chosen_spell->type != SPELL) 1297 if (!chosen_spell || chosen_spell->type != SPELL)
1280 { 1298 {
1281 new_draw_info (NDI_UNIQUE, 0, pl, "You need a spell readied in order to inscribe!"); 1299 pl->failmsg ("You need a spell readied in order to inscribe!");
1282 return 0; 1300 return 0;
1283 } 1301 }
1284 1302
1285 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE) > pl->stats.grace) 1303 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE) > pl->stats.grace)
1286 { 1304 {
1287 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough grace to write a scroll of %s.", &chosen_spell->name); 1305 pl->failmsgf ("You don't have enough grace to write a scroll of %s.", &chosen_spell->name);
1288 return 0; 1306 return 0;
1289 } 1307 }
1290 1308
1291 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA) > pl->stats.sp) 1309 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA) > pl->stats.sp)
1292 { 1310 {
1293 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough mana to write a scroll of %s.", &chosen_spell->name); 1311 pl->failmsgf ("You don't have enough mana to write a scroll of %s.", &chosen_spell->name);
1294 return 0; 1312 return 0;
1295 } 1313 }
1296 1314
1297 /* ok, we are ready to try inscription */ 1315 /* ok, we are ready to try inscription */
1298 if (QUERY_FLAG (pl, FLAG_CONFUSED)) 1316 if (pl->flag [FLAG_CONFUSED])
1299 confused = 1; 1317 confused = 1;
1300 1318
1301 /* Lost mana/grace no matter what */ 1319 /* Lost mana/grace no matter what */
1302 pl->stats.grace -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE); 1320 pl->stats.grace -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE);
1303 pl->stats.sp -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA); 1321 pl->stats.sp -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA);
1304 1322
1305 if (random_roll (0, chosen_spell->level * 4 - 1, pl, PREFER_LOW) < skill->level) 1323 if (random_roll (0, chosen_spell->level * 4 - 1, pl, PREFER_LOW) < skill->level)
1306 { 1324 {
1307 object *newscroll = arch_to_object (scroll->other_arch); 1325 object *newscroll = scroll->other_arch->instance ();
1308 scroll->decrease (); 1326 scroll->decrease ();
1309 newscroll->nrof = 1; 1327 newscroll->nrof = 1;
1328 newscroll->randomitems = 0; // make sure randomitems doesn't destroy the scroll
1310 1329
1311 pl->contr->play_sound (sound_find ("inscribe_success")); 1330 pl->contr->play_sound (sound_find ("inscribe_success"));
1312 1331
1313 if (!confused) 1332 if (!confused)
1314 { 1333 {
1315 newscroll->level = MAX (skill->level, chosen_spell->level); 1334 newscroll->level = max (skill->level, chosen_spell->level);
1316 newscroll->flag [FLAG_IDENTIFIED] = true; 1335 newscroll->flag [FLAG_IDENTIFIED] = true;
1317 new_draw_info (NDI_UNIQUE, 0, pl, "You succeed in writing the spell."); 1336 new_draw_info (NDI_UNIQUE, 0, pl, "You succeed in writing the spell.");
1318 } 1337 }
1319 else 1338 else
1320 { 1339 {
1321 chosen_spell = find_random_spell_in_ob (pl, NULL); 1340 chosen_spell = find_random_spell_in_ob (pl, NULL);
1322 if (!chosen_spell) 1341 if (!chosen_spell)
1323 return 0; 1342 return 0;
1324 1343
1325 newscroll->level = MAX (skill->level, chosen_spell->level); 1344 newscroll->level = max (skill->level, chosen_spell->level);
1326 new_draw_info (NDI_UNIQUE, 0, pl, "In your confused state, you write down some odd spell."); 1345 new_draw_info (NDI_UNIQUE, 0, pl, "In your confused state, you write down some odd spell.");
1327 } 1346 }
1328 1347
1329 object *tmp = chosen_spell->clone (); 1348 object *tmp = chosen_spell->clone ();
1349 tmp->flag [FLAG_APPLIED] = false;
1330 insert_ob_in_ob (tmp, newscroll); 1350 insert_ob_in_ob (tmp, newscroll);
1331 1351
1332 /* Same code as from treasure.C - so they can better merge. 1352 /* Same code as from treasure.C - so they can better merge.
1333 * if players want to sell them, so be it. 1353 * if players want to sell them, so be it.
1334 */ 1354 */
… …
1348 { /* Inscription has failed */ 1368 { /* Inscription has failed */
1349 pl->contr->play_sound (sound_find ("inscribe_fail")); 1369 pl->contr->play_sound (sound_find ("inscribe_fail"));
1350 1370
1351 if (chosen_spell->level > skill->level || confused) 1371 if (chosen_spell->level > skill->level || confused)
1352 { /*backfire! */ 1372 { /*backfire! */
1353 new_draw_info (NDI_UNIQUE, 0, pl, "Ouch! Your attempt to write a new scroll strains your mind!"); 1373 new_draw_info (NDI_UNIQUE, 0, pl, "Ouch! Your attempt to write a new scroll strains your mind! H<The spell level is too high for your inscription skill.>");
1354 1374
1355 if (random_roll (0, 1, pl, PREFER_LOW) == 1) 1375 if (random_roll (0, 1, pl, PREFER_LOW) == 1)
1356 pl->drain_specific_stat (4); 1376 pl->drain_specific_stat (4);
1357 else 1377 else
1358 { 1378 {
… …
1391 { 1411 {
1392 new_draw_info (NDI_UNIQUE, 0, pl, "You must learn to read before you can write! H<You lack the literacy skill.>"); 1412 new_draw_info (NDI_UNIQUE, 0, pl, "You must learn to read before you can write! H<You lack the literacy skill.>");
1393 return 0; 1413 return 0;
1394 } 1414 }
1395 1415
1396 object *item = find_marked_object (pl); 1416 object *item = pl->mark ();
1397 1417
1398 /* find an item of correct type to write on */ 1418 /* find an item of correct type to write on */
1399 if (!item) 1419 if (!item)
1400 { 1420 {
1401 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.>"); 1421 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.>");
… …
1406 { 1426 {
1407 new_draw_info_format (NDI_UNIQUE, 0, pl, "You cannot inscribe this! H<You can only inscribe empty scrolls and books.>"); 1427 new_draw_info_format (NDI_UNIQUE, 0, pl, "You cannot inscribe this! H<You can only inscribe empty scrolls and books.>");
1408 return 0; 1428 return 0;
1409 } 1429 }
1410 1430
1411 if (QUERY_FLAG (item, FLAG_UNPAID)) 1431 if (item->flag [FLAG_UNPAID])
1412 { 1432 {
1413 new_draw_info (NDI_UNIQUE, 0, pl, "You had better pay for that before you write on it."); 1433 new_draw_info (NDI_UNIQUE, 0, pl, "You had better pay for that before you write on it.");
1414 return 0; 1434 return 0;
1415 } 1435 }
1416 1436
1417 if (item->other_arch->type == SCROLL) 1437 if (item->other_arch->type == SCROLL)
1418 { 1438 {
1419 if (*params) 1439 if (*params)
1420 { 1440 {
1421 // check readied scroll 1441 // check readied scroll
1422 new_draw_info_format (NDI_UNIQUE, 0, pl,
1423 "When inscribing spells you need to ready a spell and do not specify a string argument.\n" 1442 pl->failmsgf ("When inscribing spells you need to ready a spell and do not specify a string argument.\n"
1424 "Usage: cast [spell name]; use_skill %s", &skill->skill); 1443 "Usage: cast [spell name]; use_skill %s", &skill->skill);
1425 return 0; 1444 return 0;
1426 } 1445 }
1427 1446
1428 return write_scroll (pl, item, skill); 1447 return write_scroll (pl, item, skill);
1429 } 1448 }
1430 else 1449 else
1431 { 1450 {
1432 if (!*params) 1451 if (!*params)
1433 { 1452 {
1434 new_draw_info_format (NDI_UNIQUE, 0, pl,
1435 "When inscribing books you need to specify the words you want to inscribe as command argument.\n" 1453 pl->failmsgf ("When inscribing books you need to specify the words you want to inscribe as command argument.\n"
1436 "Usage: use_skill %s <message>", &skill->skill); 1454 "Usage: use_skill %s <message>", &skill->skill);
1437 return 0; 1455 return 0;
1438 } 1456 }
1439 1457
1440 return write_note (pl, item, params, skill); 1458 return write_note (pl, item, params, skill);
1441 } 1459 }
… …
1452 * 'throwable' (ie not applied cursed obj, worn, etc). 1470 * 'throwable' (ie not applied cursed obj, worn, etc).
1453 */ 1471 */
1454static object * 1472static object *
1455find_throw_ob (object *op, const char *request) 1473find_throw_ob (object *op, const char *request)
1456{ 1474{
1457 object *tmp;
1458
1459 if (!op)
1460 { /* safety */
1461 LOG (llevError, "find_throw_ob(): confused! have a NULL thrower!\n");
1462 return (object *) NULL;
1463 }
1464
1465 /* prefer marked item */ 1475 /* prefer marked item */
1466 tmp = find_marked_object (op); 1476 object *tmp = op->mark ();
1467 if (tmp != NULL) 1477
1468 {
1469 /* can't toss invisible or inv-locked items */ 1478 /* can't toss invisible or inv-locked items */
1470 if (tmp->invisible || QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 1479 if (tmp && (tmp->invisible || tmp->flag [FLAG_INV_LOCKED]))
1471 { 1480 tmp = 0;
1472 tmp = NULL;
1473 }
1474 }
1475 1481
1476 /* look through the inventory */ 1482 /* look through the inventory */
1477 if (tmp == NULL) 1483 if (!tmp)
1478 {
1479 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1484 for (tmp = op->inv; tmp; tmp = tmp->below)
1480 { 1485 {
1481 /* can't toss invisible or inv-locked items */ 1486 /* can't toss invisible or inv-locked items */
1482 if (tmp->invisible || QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 1487 if (tmp->invisible || tmp->flag [FLAG_INV_LOCKED])
1483 continue; 1488 continue;
1489
1484 if (!request || !strcmp (query_name (tmp), request) || !strcmp (tmp->name, request)) 1490 if (!request || !strcmp (query_name (tmp), request) || !strcmp (&tmp->name, request))
1485 break; 1491 break;
1486 } 1492 }
1487 }
1488 1493
1489 /* this should prevent us from throwing away 1494 /* this should prevent us from throwing away
1490 * cursed items, worn armour, etc. Only weapons 1495 * cursed items, worn armour, etc. Only weapons
1491 * can be thrown from 'hand'. 1496 * can be thrown from 'hand'.
1492 */ 1497 */
1493 if (!tmp) 1498 if (!tmp)
1494 return NULL; 1499 return 0;
1495 1500
1496 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 1501 if (tmp->flag [FLAG_APPLIED])
1497 { 1502 {
1498 if (tmp->type != WEAPON) 1503 if (tmp->type != WEAPON)
1499 { 1504 {
1500 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't throw %s.", query_name (tmp)); 1505 op->failmsgf ("You can't throw %s. H<Unapply it first.>", query_name (tmp));
1501 tmp = NULL; 1506 tmp = 0;
1502 }
1503 else if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
1504 { 1507 }
1508 else if (tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED])
1509 {
1505 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s sticks to your hand!", query_name (tmp)); 1510 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s sticks to your hand! H<Cursed or damned items cannot be removed.>", query_name (tmp));
1506 tmp = NULL; 1511 tmp = 0;
1507 } 1512 }
1508 else 1513 else
1509 { 1514 {
1510 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 1515 if (!op->apply (tmp, AP_UNAPPLY))
1511 { 1516 {
1512 LOG (llevError, "BUG: find_throw_ob(): couldn't unapply\n"); 1517 LOG (llevError, "BUG: find_throw_ob(): couldn't unapply\n");
1513 tmp = NULL; 1518 tmp = 0;
1514 } 1519 }
1515 } 1520 }
1516 } 1521 }
1517 else if (QUERY_FLAG (tmp, FLAG_UNPAID)) 1522 else if (tmp->flag [FLAG_UNPAID])
1518 { 1523 {
1519 new_draw_info_format (NDI_UNIQUE, 0, op, "You should pay for the %s first.", query_name (tmp)); 1524 op->failmsgf ("You should pay for the %s first.", query_name (tmp));
1520 tmp = NULL; 1525 tmp = 0;
1521 } 1526 }
1522 1527
1523 if (tmp && QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 1528 //TODO: why not chekc first and give sensible message to player?
1529 if (tmp && tmp->flag [FLAG_INV_LOCKED])
1524 { 1530 {
1525 LOG (llevError, "BUG: find_throw_ob(): object is locked\n"); 1531 LOG (llevError, "BUG: find_throw_ob(): object is locked\n");
1526 tmp = NULL; 1532 tmp = 0;
1527 } 1533 }
1534
1528 return tmp; 1535 return tmp;
1529} 1536}
1530 1537
1531/* make_throw_ob() We construct the 'carrier' object in 1538/* make_throw_ob() We construct the 'carrier' object in
1532 * which we will insert the object that is being thrown. 1539 * which we will insert the object that is being thrown.
… …
1536make_throw_ob (object *orig) 1543make_throw_ob (object *orig)
1537{ 1544{
1538 if (!orig) 1545 if (!orig)
1539 return 0; 1546 return 0;
1540 1547
1541 if (QUERY_FLAG (orig, FLAG_APPLIED)) 1548 if (orig->flag [FLAG_APPLIED])
1542 { 1549 {
1543 LOG (llevError, "BUG: make_throw_ob(): ob is applied\n"); 1550 LOG (llevError, "BUG: make_throw_ob(): ob is applied\n");
1544 /* insufficient workaround, but better than nothing */ 1551 /* insufficient workaround, but better than nothing */
1545 CLEAR_FLAG (orig, FLAG_APPLIED); 1552 orig->clr_flag (FLAG_APPLIED);
1546 } 1553 }
1547 1554
1548 object *toss_item = orig->clone (); 1555 object *toss_item = orig->clone ();
1549 1556
1550 toss_item->type = THROWN_OBJ; 1557 toss_item->type = THROWN_OBJ;
1551 CLEAR_FLAG (toss_item, FLAG_CHANGING); 1558 toss_item->clr_flag (FLAG_CHANGING);
1552 toss_item->stats.dam = 0; /* default damage */ 1559 toss_item->stats.dam = 0; /* default damage */
1553 toss_item->insert (orig); 1560 toss_item->insert (orig);
1554 1561
1555 return toss_item; 1562 return toss_item;
1556} 1563}
… …
1567 int pause_f, weight_f = 0, mflags; 1574 int pause_f, weight_f = 0, mflags;
1568 float str_factor = 1.0, load_factor = 1.0, item_factor = 1.0; 1575 float str_factor = 1.0, load_factor = 1.0, item_factor = 1.0;
1569 maptile *m; 1576 maptile *m;
1570 sint16 sx, sy; 1577 sint16 sx, sy;
1571 1578
1572 if (throw_ob == NULL) 1579 if (!throw_ob)
1573 {
1574 if (op->type == PLAYER)
1575 new_draw_info (NDI_UNIQUE, 0, op, "You have nothing to throw.");
1576
1577 return 0;
1578 } 1580 {
1579 if (QUERY_FLAG (throw_ob, FLAG_STARTEQUIP)) 1581 op->failmsg ("You have nothing to throw.");
1582 return 0;
1580 { 1583 }
1581 if (op->type == PLAYER) 1584
1582 new_draw_info (NDI_UNIQUE, 0, op, "The gods won't let you throw that."); 1585 if (throw_ob->flag [FLAG_STARTEQUIP])
1586 {
1587 op->failmsg ("The gods won't let you throw that. "
1588 "H<Well, they would, but they would retrieve it "
1589 "- you wouldn't want that, would you?>");
1583 1590
1584 return 0; 1591 return 0;
1585 } 1592 }
1586 1593
1587 /* Because throwing effectiveness must be reduced by the 1594 /* Because throwing effectiveness must be reduced by the
… …
1604 /* lighter items are thrown harder, farther, faster */ 1611 /* lighter items are thrown harder, farther, faster */
1605 if (throw_ob->weight > 0) 1612 if (throw_ob->weight > 0)
1606 item_factor = (float) maxc / (float) (3.0 * throw_ob->weight); 1613 item_factor = (float) maxc / (float) (3.0 * throw_ob->weight);
1607 else 1614 else
1608 { /* 0 or negative weight?!? Odd object, can't throw it */ 1615 { /* 0 or negative weight?!? Odd object, can't throw it */
1609 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't throw %s.\n", query_name (throw_ob)); 1616 op->failmsgf ("You can't throw %s. H<Better report this to your dungeon master.>\n", query_name (throw_ob));
1610 return 0; 1617 return 0;
1611 } 1618 }
1612 1619
1613 eff_str = (int) (str * (load_factor < 1.0 ? load_factor : 1.0)); 1620 eff_str = (str * (load_factor < 1.0 ? load_factor : 1.0))
1614 eff_str = (int) ((float) eff_str * item_factor * str_factor); 1621 * item_factor * str_factor;
1615 1622
1616 /* alas, arrays limit us to a value of MAX_STAT (30). Use str_factor to 1623 /* alas, arrays limit us to a value of MAX_STAT (30). Use str_factor to
1617 * account for super-strong throwers. */ 1624 * account for super-strong throwers. */
1618 if (eff_str > MAX_STAT) 1625 min_it (eff_str, MAX_STAT);
1619 eff_str = MAX_STAT;
1620 1626
1621#ifdef DEBUG_THROW 1627#ifdef DEBUG_THROW
1622 LOG (llevDebug, "%s carries %d, eff_str=%d\n", op->name, op->carrying, eff_str); 1628 LOG (llevDebug, "%s carries %d, eff_str=%d\n", op->name, op->carrying, eff_str);
1623 LOG (llevDebug, " max_c=%d, item_f=%f, load_f=%f, str=%d\n", maxc, item_factor, load_factor, op->stats.Str); 1629 LOG (llevDebug, " max_c=%d, item_f=%f, load_f=%f, str=%d\n", maxc, item_factor, load_factor, op->stats.Str);
1624 LOG (llevDebug, " str_factor=%f\n", str_factor); 1630 LOG (llevDebug, " str_factor=%f\n", str_factor);
… …
1714 /* the properties of objects which are meant to be thrown (ie dart, 1720 /* the properties of objects which are meant to be thrown (ie dart,
1715 * throwing knife, etc) will differ from ordinary items. Lets tailor 1721 * throwing knife, etc) will differ from ordinary items. Lets tailor
1716 * this stuff in here. 1722 * this stuff in here.
1717 */ 1723 */
1718 1724
1719 if (QUERY_FLAG (throw_ob->inv, FLAG_IS_THROWN)) 1725 if (throw_ob->inv->flag [FLAG_IS_THROWN])
1720 { 1726 {
1721 throw_ob->last_sp += eff_str / 3; /* fly a little further */ 1727 throw_ob->last_sp += eff_str / 3; /* fly a little further */
1722 throw_ob->stats.dam += throw_ob->inv->stats.dam + throw_ob->magic + 2; 1728 throw_ob->stats.dam += throw_ob->inv->stats.dam + throw_ob->magic + 2;
1723 throw_ob->stats.wc -= throw_ob->magic + throw_ob->inv->stats.wc; 1729 throw_ob->stats.wc -= throw_ob->magic + throw_ob->inv->stats.wc;
1724 /* only throw objects get directional faces */ 1730 /* only throw objects get directional faces */
1725 if (GET_ANIM_ID (throw_ob) && NUM_ANIMATIONS (throw_ob)) 1731 if (throw_ob->has_anim () && throw_ob->anim_frames ())
1726 SET_ANIMATION (throw_ob, dir); 1732 throw_ob->set_anim_frame (dir);
1727 } 1733 }
1728 else 1734 else
1729 { 1735 {
1730 uint16 mat = throw_ob->materials; 1736 uint16 mat = throw_ob->materials;
1731 1737
… …
1760 if (throw_ob->weight > 50) 1766 if (throw_ob->weight > 50)
1761 throw_ob->speed *= 0.5; 1767 throw_ob->speed *= 0.5;
1762 } /* else tailor thrown object */ 1768 } /* else tailor thrown object */
1763 1769
1764 /* some limits, and safeties (needed?) */ 1770 /* some limits, and safeties (needed?) */
1765 if (throw_ob->stats.dam < 0) 1771 max_it (throw_ob->stats.dam, 0);
1766 throw_ob->stats.dam = 0;
1767 if (throw_ob->last_sp > eff_str) 1772 min_it (throw_ob->last_sp, eff_str);
1768 throw_ob->last_sp = eff_str;
1769 if (throw_ob->stats.food < 0) 1773 max_it (throw_ob->stats.food, 0);
1770 throw_ob->stats.food = 0;
1771 if (throw_ob->stats.food > 100)
1772 throw_ob->stats.food = 100;
1773 if (throw_ob->stats.wc > 30) 1774 min_it (throw_ob->stats.wc, 30);
1774 throw_ob->stats.wc = 30;
1775 1775
1776 /* how long to pause the thrower. Higher values mean less pause */ 1776 /* how long to pause the thrower. Higher values mean less pause */
1777 pause_f = ((2 * eff_str) / 3) + 20 + skill->level; 1777 pause_f = ((2 * eff_str) / 3) + 20 + skill->level;
1778 1778
1779 /* Put a lower limit on this */ 1779 /* Put a lower limit on this */
1780 if (pause_f < 10) 1780 clamp_it (pause_f, 10, 100);
1781 pause_f = 10;
1782 if (pause_f > 100)
1783 pause_f = 100;
1784 1781
1785 /* Changed in 0.94.2 - the calculation before was really goofy. 1782 /* Changed in 0.94.2 - the calculation before was really goofy.
1786 * In short summary, a throw can take anywhere between speed 5 and 1783 * In short summary, a throw can take anywhere between speed 5 and
1787 * speed 0.5 1784 * speed 0.5
1788 */ 1785 */
… …
1791 throw_ob->speed_left = 0; 1788 throw_ob->speed_left = 0;
1792 throw_ob->map = part->map; 1789 throw_ob->map = part->map;
1793 1790
1794 throw_ob->move_type = MOVE_FLY_LOW; 1791 throw_ob->move_type = MOVE_FLY_LOW;
1795 throw_ob->move_on = MOVE_FLY_LOW | MOVE_WALK; 1792 throw_ob->move_on = MOVE_FLY_LOW | MOVE_WALK;
1793
1794 throw_ob->set_speed (throw_ob->speed);
1796 1795
1797#if 0 1796#if 0
1798 /* need to put in a good sound for this */ 1797 /* need to put in a good sound for this */
1799 play_sound_map (op->map, op->x, op->y, SOUND_THROW_OBJ); 1798 play_sound_map (op->map, op->x, op->y, SOUND_THROW_OBJ);
1800#endif 1799#endif
… …
1826 else 1825 else
1827 throw_ob = find_mon_throw_ob (op); 1826 throw_ob = find_mon_throw_ob (op);
1828 1827
1829 return do_throw (op, part, throw_ob, dir, skill); 1828 return do_throw (op, part, throw_ob, dir, skill);
1830} 1829}
1830
1831static void
1832give_player_quad_material_for (object *pl, object *ob)
1833{
1834 if (!ob->flag [FLAG_IS_QUAD] || !ob->other_arch)
1835 return;
1836
1837 object *t = ob->other_arch->instance ();
1838 pl->insert (t);
1839}
1840
1841bool
1842skill_mining (object *who, object *tool, object *skill, int dir, const char *string)
1843{
1844 if (!who->is_player ())
1845 return 0;
1846
1847 if (!dir)
1848 {
1849 who->failmsg ("In what direction?");
1850 return 0;
1851 }
1852
1853 mapxy pos (who); pos.move (dir);
1854
1855 if (!pos.normalise ())
1856 {
1857 who->failmsgf (
1858 "You brandish your %s, with not so convincing results. "
1859 "H<There is nothing in this direction.>",
1860 &tool->name
1861 );
1862 return 0;
1863 }
1864
1865 mapspace &ms = pos.ms ();
1866
1867 for (object *mine_obj = pos.ms ().top; mine_obj; mine_obj = mine_obj->below)
1868 if (mine_obj->type == VEIN)
1869 {
1870 who->speed_left -= who->speed / tool->speed;
1871
1872 who->play_sound (tool->sound);
1873
1874 if (rndm (100 - mine_obj->stats.ac) > rndm (tool->stats.wc))
1875 who->failmsgf (
1876 "You use your %s.... nothing. "
1877 "H<Try again, perhaps?>",
1878 &tool->name
1879 );
1880 else if (mine_obj->race != tool->race)
1881 who->failmsgf (
1882 "You use your %s.... but it doesn't work. "
1883 "H<Maybe you are using the wrong tool?>",
1884 &tool->name
1885 );
1886 else if (!mine_obj->stats.food)
1887 who->failmsgf (
1888 "You use your %s.... but there is nothing. "
1889 "H<This space is exhausted, you should try somewhere else.>",
1890 &tool->name
1891 );
1892 else
1893 {
1894 --mine_obj->stats.food;
1895
1896 object *ore = mine_obj->other_arch->instance ();
1897
1898 who->statusmsg (format (
1899 "You use your %s.... and find some %s!",
1900 &tool->name, &ore->name
1901 ));
1902
1903 ore->insert_at (who);
1904
1905 return true;
1906 }
1907 }
1908 else if (mine_obj->flag [FLAG_IS_QUAD])
1909 {
1910 if (mine_obj->flag [FLAG_IS_FLOOR])
1911 {
1912 maptile *lower_floor = pos.m->tile_available (TILE_DOWN);
1913
1914 if (!lower_floor)
1915 {
1916 who->failmsgf (
1917 "Whoops, you failed to remove the %s. H<You may try again.>",
1918 &mine_obj->name
1919 );
1920 return false;
1921 }
1922
1923 mapxy below_pos (lower_floor, pos.x, pos.y);
1924
1925 if (!below_pos.normalise ())
1926 {
1927 who->failmsgf (
1928 "Whoops, you failed to remove the %s. H<You may try again.>",
1929 &mine_obj->name
1930 );
1931 return false;
1932 }
1933
1934 // first insert open space here:
1935 object *open_space_floor = archetype::get (shstr_quad_open_space);
1936 open_space_floor->stats.hp = pos.x;
1937 open_space_floor->stats.sp = pos.y;
1938 insert_ob_in_map_at (open_space_floor, pos.m, mine_obj,
1939 INS_BELOW_ORIGINATOR, pos.x, pos.y);
1940
1941 // next we will remove the wall in the lower layer:
1942 mapspace &below_ms = below_pos.ms ();
1943 for (object *quad_obj = below_ms.top; quad_obj; quad_obj = quad_obj->below)
1944 {
1945 if (quad_obj->flag [FLAG_IS_FLOOR])
1946 break;
1947
1948 if (quad_obj->flag [FLAG_IS_QUAD])
1949 {
1950 quad_obj->map->queue_physics_at (quad_obj->x, quad_obj->y);
1951 give_player_quad_material_for (who, quad_obj);
1952 quad_obj->destroy ();
1953 break;
1954 }
1955 }
1956 }
1957
1958 mine_obj->map->queue_physics_at (mine_obj->x, mine_obj->y);
1959
1960 // FIXME: there should be chance assigned, like above with veins!
1961 who->play_sound (tool->sound);
1962 give_player_quad_material_for (who, mine_obj);
1963 mine_obj->destroy ();
1964 who->contr->fire_on = 0; // TODO: stopgap, do not remove more than one per keypress
1965 return true;
1966 }
1967
1968 return false;
1969}
1970

Diff Legend

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