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.38 by root, Sun Jul 1 05:00:20 2007 UTC vs.
Revision 1.73 by root, Sun Nov 8 13:36:14 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT 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 <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <object.h> 26#include <object.h>
26#include <sproto.h> 27#include <sproto.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 new_draw_info (NDI_UNIQUE, 0, op, "But you have no free hands to steal with! "
48 "H<Try to unapply weapons or things you hold in your hands, use the C<body> command.>");
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 (!QUERY_FLAG (victim, 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 */
… …
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 && QUERY_FLAG (equip, FLAG_APPLIED))
69 {
70 roll -= equip->weight / 10000; 71 roll -= equip->weight / 10000;
71 } 72
72 if (equip->type == BOW && QUERY_FLAG (equip, FLAG_APPLIED)) 73 if (equip->type == BOW && QUERY_FLAG (equip, FLAG_APPLIED))
73 roll -= equip->weight / 5000; 74 roll -= equip->weight / 5000;
75
74 if (equip->type == SHIELD && QUERY_FLAG (equip, FLAG_APPLIED)) 76 if (equip->type == SHIELD && QUERY_FLAG (equip, FLAG_APPLIED))
75 {
76 roll -= equip->weight / 2000; 77 roll -= equip->weight / 2000;
77 } 78
78 if (equip->type == ARMOUR && QUERY_FLAG (equip, FLAG_APPLIED)) 79 if (equip->type == ARMOUR && QUERY_FLAG (equip, FLAG_APPLIED))
79 roll -= equip->weight / 5000; 80 roll -= equip->weight / 5000;
81
80 if (equip->type == GLOVES && QUERY_FLAG (equip, FLAG_APPLIED)) 82 if (equip->type == GLOVES && QUERY_FLAG (equip, FLAG_APPLIED))
81 roll -= equip->weight / 100; 83 roll -= equip->weight / 100;
82 } 84 }
85
83 if (roll < 0) 86 if (roll < 0)
84 roll = 0; 87 roll = 0;
88
85 return roll; 89 return roll;
86} 90}
87 91
88/* 92/*
89 * When stealing: dependent on the intelligence/wisdom of whom you're 93 * When stealing: dependent on the intelligence/wisdom of whom you're
… …
99{ 103{
100 object *success = NULL, *tmp = NULL, *next; 104 object *success = NULL, *tmp = NULL, *next;
101 int roll = 0, chance = 0, stats_value; 105 int roll = 0, chance = 0, stats_value;
102 rv_vector rv; 106 rv_vector rv;
103 107
104 stats_value = ((who->stats.Dex + who->stats.Int) * 3) / 2; 108 stats_value = (who->stats.Dex + who->stats.Int) * 3 / 2;
105 109
106 /* if the victim is aware of a thief in the area (FLAG_NO_STEAL set on them) 110 /* if the victim is aware of a thief in the area (FLAG_NO_STEAL set on them)
107 * they will try to prevent stealing if they can. Only unseen theives will 111 * they will try to prevent stealing if they can. Only unseen theives will
108 * have much chance of success. 112 * have much chance of success.
109 */ 113 */
110 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_NO_STEAL)) 114 if (!op->is_player () && op->flag [FLAG_NO_STEAL])
111 { 115 {
112 if (can_detect_enemy (op, who, &rv)) 116 if (can_detect_enemy (op, who, &rv))
113 { 117 {
114 npc_call_help (op); 118 npc_call_help (op);
115 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE); 119 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
116 new_draw_info (NDI_UNIQUE, 0, who, "Your attempt is prevented!"); 120 new_draw_info (NDI_UNIQUE, 0, who, "Your attempt is prevented!");
117 return 0; 121 return 0;
118 } 122 }
119 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 */
120 op->stats.Wis += (op->stats.Int / 5) + 1; 124 op->stats.Wis += (op->stats.Int / 5) + 1;
125
121 if (op->stats.Wis > MAX_STAT) 126 if (op->stats.Wis > MAX_STAT)
122 op->stats.Wis = MAX_STAT; 127 op->stats.Wis = MAX_STAT;
123 } 128 }
124 129
125 if (op->type == PLAYER && QUERY_FLAG (op, FLAG_WIZ)) 130 if (op->is_player () && op->flag [FLAG_WIZ])
126 { 131 {
127 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from the dungeon master!\n"); 132 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from the dungeon master!\n");
128 return 0; 133 return 0;
129 } 134 }
130 135
131 // only allow stealing between hostile players (TODO: probably should change) 136 // only allow stealing between hostile players (TODO: probably should change)
132 if (op->type == PLAYER && who->type == PLAYER && (who->contr->peaceful || op->contr->peaceful)) 137 if (op->is_player () && who->is_player () && (who->contr->peaceful || op->contr->peaceful))
133 { 138 {
134 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from other players!\n"); 139 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from other players!\n");
135 return 0; 140 return 0;
136 } 141 }
137 142
138 /* Ok then, go thru their inventory, stealing */ 143 /* Ok then, go through their inventory, stealing */
139 for (tmp = op->inv; tmp; tmp = next) 144 for (tmp = op->inv; tmp; tmp = next)
140 { 145 {
141 next = tmp->below; 146 next = tmp->below;
142 147
143 /* you can't steal worn items, starting items, wiz stuff, 148 /* you can't steal worn items, starting items, wiz stuff,
… …
177 if (tmp->destroyed () || tmp->env != op) 182 if (tmp->destroyed () || tmp->env != op)
178 { 183 {
179 /* for players, play_sound: steals item */ 184 /* for players, play_sound: steals item */
180 success = tmp; 185 success = tmp;
181 CLEAR_FLAG (tmp, FLAG_INV_LOCKED); 186 CLEAR_FLAG (tmp, FLAG_INV_LOCKED);
182
183 /* Don't delete it from target player until we know
184 * the thief has picked it up. can't just look at tmp->count,
185 * as it's possible that it got merged when picked up.
186 */
187 if (op->type == PLAYER)
188 esrv_del_item (op->contr, tmp->count);
189 } 187 }
188
190 break; 189 break;
191 } 190 }
192 } /* for loop looking for an item */ 191 } /* for loop looking for an item */
193 192
194 if (!tmp) 193 if (!tmp)
… …
203 */ 202 */
204 203
205 if ((roll >= skill->level) || !chance 204 if ((roll >= skill->level) || !chance
206 || (tmp && tmp->weight > (250 * (random_roll (0, stats_value + skill->level * 10 - 1, who, PREFER_LOW))))) 205 || (tmp && tmp->weight > (250 * (random_roll (0, stats_value + skill->level * 10 - 1, who, PREFER_LOW)))))
207 { 206 {
208
209 /* victim figures out where the thief is! */ 207 /* victim figures out where the thief is! */
210 if (who->hide) 208 if (who->flag [FLAG_HIDDEN])
211 make_visible (who); 209 make_visible (who);
212 210
213 if (op->type != PLAYER) 211 if (op->type != PLAYER)
214 { 212 {
215 /* The unaggressives look after themselves 8) */ 213 /* The unaggressives look after themselves 8) */
216 if (who->type == PLAYER) 214 if (who->type == PLAYER)
217 { 215 {
218 npc_call_help (op); 216 npc_call_help (op);
219 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));
220 } 218 }
219
221 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE); 220 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
222 /* all remaining npc items are guarded now. Set flag NO_STEAL 221 /* all remaining npc items are guarded now. Set flag NO_STEAL
223 * on the victim. 222 * on the victim.
224 */ 223 */
225 SET_FLAG (op, FLAG_NO_STEAL); 224 SET_FLAG (op, FLAG_NO_STEAL);
… …
228 { /* stealing from another player */ 227 { /* stealing from another player */
229 char buf[MAX_BUF]; 228 char buf[MAX_BUF];
230 229
231 /* Notify the other player */ 230 /* Notify the other player */
232 if (success && who->stats.Int > random_roll (0, 19, op, PREFER_LOW)) 231 if (success && who->stats.Int > random_roll (0, 19, op, PREFER_LOW))
233 {
234 sprintf (buf, "Your %s is missing!", query_name (success)); 232 sprintf (buf, "Your %s is missing!", query_name (success));
235 }
236 else 233 else
237 {
238 sprintf (buf, "Your pack feels strangely lighter."); 234 sprintf (buf, "Your pack feels strangely lighter.");
239 } 235
240 new_draw_info (NDI_UNIQUE, 0, op, buf); 236 new_draw_info (NDI_UNIQUE, 0, op, buf);
241 if (!success) 237 if (!success)
242 { 238 {
243 if (who->invisible) 239 if (who->invisible)
244 {
245 sprintf (buf, "you feel itchy fingers getting at your pack."); 240 sprintf (buf, "you feel itchy fingers getting at your pack.");
246 }
247 else 241 else
248 {
249 sprintf (buf, "%s looks very shifty.", query_name (who)); 242 sprintf (buf, "%s looks very shifty.", query_name (who));
250 } 243
251 new_draw_info (NDI_UNIQUE, 0, op, buf); 244 new_draw_info (NDI_UNIQUE, 0, op, buf);
252 } 245 }
253 } /* else stealing from another player */ 246 } /* else stealing from another player */
254 /* play_sound("stop! thief!"); kindofthing */ 247 /* play_sound("stop! thief!"); kindofthing */
255 } /* if you weren't 100% successful */ 248 } /* if you weren't 100% successful */
249
256 return success ? 1 : 0; 250 return success ? 1 : 0;
257} 251}
258 252
259int 253int
260steal (object *op, int dir, object *skill) 254steal (object *op, int dir, object *skill)
… …
321 // reduce monster experience by experience we gained, as to 315 // reduce monster experience by experience we gained, as to
322 // limit the amount of exp that can be gained by stealing from monsters 316 // limit the amount of exp that can be gained by stealing from monsters
323 // (jessies gave ~20,000,000 exp otherwise. 317 // (jessies gave ~20,000,000 exp otherwise.
324 int exp = calc_skill_exp (op, tmp, skill); 318 int exp = calc_skill_exp (op, tmp, skill);
325 319
326 exp = MIN (tmp->stats.exp, exp); 320 exp = min (tmp->stats.exp, exp);
327 tmp->stats.exp -= exp; 321 tmp->stats.exp -= exp;
328 return exp; 322 return exp;
329 } 323 }
330 } 324 }
331 return 0; 325 return 0;
… …
437 op->invisible += 100; /* set the level of 'hiddeness' */ 431 op->invisible += 100; /* set the level of 'hiddeness' */
438 432
439 if (op->type == PLAYER) 433 if (op->type == PLAYER)
440 op->contr->tmp_invis = 1; 434 op->contr->tmp_invis = 1;
441 435
442 op->hide = 1; 436 op->flag [FLAG_HIDDEN] = 1;
443 return 1; 437 return 1;
444 } 438 }
445 439
446 return 0; 440 return 0;
447} 441}
… …
456 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 450 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
457 { 451 {
458 new_draw_info (NDI_UNIQUE, 0, op, "You don't need to hide while invisible!"); 452 new_draw_info (NDI_UNIQUE, 0, op, "You don't need to hide while invisible!");
459 return 0; 453 return 0;
460 } 454 }
461 else if (!op->hide && op->invisible > 0 && op->type == PLAYER) 455 else if (!op->flag [FLAG_HIDDEN] && op->invisible > 0 && op->type == PLAYER)
462 { 456 {
463 new_draw_info (NDI_UNIQUE, 0, op, "Your attempt to hide breaks the invisibility spell!"); 457 new_draw_info (NDI_UNIQUE, 0, op, "Your attempt to hide breaks the invisibility spell!");
464 make_visible (op); 458 make_visible (op);
465 } 459 }
466 460
… …
488static void 482static void
489stop_jump (object *pl, int dist, int spaces) 483stop_jump (object *pl, int dist, int spaces)
490{ 484{
491 pl->update_stats (); 485 pl->update_stats ();
492 pl->map->insert (pl, pl->x, pl->y, pl); 486 pl->map->insert (pl, pl->x, pl->y, pl);
487 pl->speed_left -= fabs (pl->speed * 8);
493} 488}
494 489
495static int 490static int
496attempt_jump (object *pl, int dir, int spaces, object *skill) 491attempt_jump (object *pl, int dir, int spaces, object *skill)
497{ 492{
498 object *tmp; 493 object *tmp;
499 int i, exp = 0, dx = freearr_x[dir], dy = freearr_y[dir], mflags; 494 int i, dx = freearr_x[dir], dy = freearr_y[dir], mflags;
500 sint16 x, y; 495 sint16 x, y;
501 maptile *m; 496 maptile *m;
502 497
503 /* Jump loop. Go through spaces opject wants to jump. Halt the 498 /* Jump loop. Go through spaces object wants to jump. Halt the
504 * jump if a wall or creature is in the way. We set FLAG_FLYING 499 * jump if a wall or creature is in the way. We set FLAG_FLYING
505 * temporarily to allow player to aviod exits/archs that are not 500 * temporarily to allow player to aviod exits/archs that are not
506 * fly_on, fly_off. This will also prevent pickup of objects 501 * fly_on, fly_off. This will also prevent pickup of objects
507 * while jumping over them. 502 * while jumping over them.
508 */ 503 */
509
510 pl->remove (); 504 pl->remove ();
511
512 /*
513 * I don't think this is actually needed - all the movement
514 * code is handled in this function, and I don't see anyplace
515 * that cares about the move_type being flying.
516 */
517 pl->move_type |= MOVE_FLY_LOW; 505 pl->move_type |= MOVE_FLY_LOW;
518 506
519 for (i = 0; i <= spaces; i++) 507 for (i = 0; i <= spaces; i++)
520 { 508 {
521 x = pl->x + dx; 509 x = pl->x + dx;
… …
524 512
525 mflags = get_map_flags (m, &m, x, y, &x, &y); 513 mflags = get_map_flags (m, &m, x, y, &x, &y);
526 514
527 if (mflags & P_OUT_OF_MAP) 515 if (mflags & P_OUT_OF_MAP)
528 { 516 {
529 (void) stop_jump (pl, i, spaces); 517 stop_jump (pl, i, spaces);
530 return 0; 518 return 0;
531 } 519 }
520
521 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
522 {
523 /* Jump into creature */
524 if (QUERY_FLAG (tmp, FLAG_MONSTER)
525 || (tmp->type == PLAYER && (!QUERY_FLAG (tmp, FLAG_WIZ) || !tmp->contr->hidden)))
526 {
527 new_draw_info_format (NDI_UNIQUE, 0, pl, "You jump into %s%s.", tmp->type == PLAYER ? "" : "the ", &tmp->name);
528
529 stop_jump (pl, i, spaces);
530
531 int exp = 0;
532
533 if (tmp->type != PLAYER
534 || (pl->type == PLAYER && !pl->contr->party)
535 || (pl->type == PLAYER && tmp->type == PLAYER && pl->contr->party != tmp->contr->party))
536 exp = skill_attack (tmp, pl, pl->facing, "kicked", skill); /* pl makes an attack */
537
538 return exp; /* note that calc_skill_exp() is already called by skill_attack() */
539 }
540 }
541
532 if (OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, x, y))) 542 if (OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, x, y)))
533 { 543 {
534 new_draw_info (NDI_UNIQUE, 0, pl, "Your jump is blocked."); 544 new_draw_info (NDI_UNIQUE, 0, pl, "Your jump is blocked.");
535 stop_jump (pl, i, spaces); 545 stop_jump (pl, i, spaces);
536 return 0; 546 return 0;
537 } 547 }
538 548
539 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
540 {
541 /* Jump into creature */
542 if (QUERY_FLAG (tmp, FLAG_MONSTER) || (tmp->type == PLAYER && (!QUERY_FLAG (tmp, FLAG_WIZ) || !tmp->contr->hidden)))
543 {
544 new_draw_info_format (NDI_UNIQUE, 0, pl, "You jump into %s%s.", tmp->type == PLAYER ? "" : "the ", &tmp->name);
545 if (tmp->type != PLAYER ||
546 (pl->type == PLAYER && pl->contr->party == NULL) ||
547 (pl->type == PLAYER && tmp->type == PLAYER && pl->contr->party != tmp->contr->party))
548 exp = skill_attack (tmp, pl, pl->facing, "kicked", skill); /* pl makes an attack */
549 stop_jump (pl, i, spaces);
550 return exp; /* note that calc_skill_exp() is already called by skill_attack() */
551 }
552 /* If the space has fly on set (no matter what the space is),
553 * we should get the effects - after all, the player is
554 * effectively flying.
555 */
556 if (tmp->move_on & MOVE_FLY_LOW)
557 {
558 pl->x = x;
559 pl->y = y;
560 pl->map = m;
561 stop_jump (pl, i, spaces);
562 return calc_skill_exp (pl, NULL, skill);
563 }
564 }
565 pl->x = x; 549 pl->x = x;
566 pl->y = y; 550 pl->y = y;
567 pl->map = m; 551 pl->map = m;
552
553 if (m->at (x, y).move_on & pl->move_type)
554 {
555 new_draw_info (NDI_UNIQUE, 0, pl, "Your jump is stopped.");
556 stop_jump (pl, i, spaces);
557 return 0;
558 }
568 } 559 }
560
569 stop_jump (pl, i, spaces); 561 stop_jump (pl, i, spaces);
562
570 return calc_skill_exp (pl, NULL, skill); 563 return calc_skill_exp (pl, NULL, skill);
571} 564}
572 565
573/* jump() - this is both a new type of movement for player/monsters and 566/* jump() - this is both a new type of movement for player/monsters and
574 * an attack as well. 567 * an attack as well.
575 * Perhaps we should allow more spaces based on level, eg, level 50 568 * Perhaps we should allow more spaces based on level, eg, level 50
576 * jumper can jump several spaces? 569 * jumper can jump several spaces?
577 */ 570 */
578
579int 571int
580jump (object *pl, int dir, object *skill) 572jump (object *pl, int dir, object *skill)
581{ 573{
582 int spaces = 0, stats;
583 int str = pl->stats.Str; 574 int str = pl->stats.Str;
584 int dex = pl->stats.Dex; 575 int dex = pl->stats.Dex;
585 576
586 dex = dex ? dex : 15; 577 dex = dex ? dex : 15;
587 str = str ? str : 10; 578 str = str ? str : 10;
588 579
589 stats = str * str * str * dex * skill->level; 580 int stats = str * str * str * dex * skill->level;
581 int spaces = min (3, skill->level, stats / (pl->carrying + 1));
590 582
591 if (pl->carrying != 0) /* don't want div by zero !! */
592 spaces = (int) (stats / pl->carrying);
593 else
594 spaces = 2; /* pl has no objects - gets the far jump */
595
596 if (spaces > 2)
597 spaces = 2;
598 else if (spaces == 0) 583 if (spaces == 0)
599 { 584 {
600 new_draw_info (NDI_UNIQUE, 0, pl, "You are carrying too much weight to jump."); 585 new_draw_info (NDI_UNIQUE, 0, pl, "You are carrying too much weight to jump.");
601 return 0; 586 return 0;
602 } 587 }
588
603 return attempt_jump (pl, dir, spaces, skill); 589 return attempt_jump (pl, dir, spaces, skill);
604} 590}
605
606 591
607/* skill_ident() - this code is supposed to allow players to identify 592/* skill_ident() - this code is supposed to allow players to identify
608 * classes of objects with the various "auto-ident" skills. Player must 593 * classes of objects with the various "auto-ident" skills. Player must
609 * have unidentified objects of the right type in order for the skill 594 * have unidentified objects of the right type in order for the skill
610 * to work. While multiple classes of objects may be identified, 595 * to work. While multiple classes of objects may be identified,
611 * this code is kind of yucky -- it would be nice to make it a bit 596 * this code is kind of yucky -- it would be nice to make it a bit
612 * more generalized. Right now, skill indices are embedded in this routine. 597 * more generalized. Right now, skill indices are embedded in this routine.
613 * Returns amount of experience gained (on successful ident). 598 * Returns amount of experience gained (on successful ident).
614 * - b.t. (thomas@astro.psu.edu) 599 * - b.t. (thomas@astro.psu.edu)
615 */ 600 */
616
617static int 601static int
618do_skill_detect_curse (object *pl, object *skill) 602do_skill_detect_curse (object *pl, object *skill)
619{ 603{
620 object *tmp; 604 object *tmp;
621 int success = 0; 605 int success = 0;
… …
675} 659}
676 660
677/* Helper function for do_skill_ident, so that we can loop 661/* Helper function for do_skill_ident, so that we can loop
678 * over inventory AND objects on the ground conveniently. 662 * over inventory AND objects on the ground conveniently.
679 */ 663 */
680int 664static int
681do_skill_ident2 (object *tmp, object *pl, int obj_class, object *skill) 665do_skill_ident2 (object *tmp, object *pl, int obj_class, object *skill)
682{ 666{
683 int success = 0, chance; 667 int success = 0, chance;
684 int skill_value = skill->level * pl->stats.Int ? pl->stats.Int : 10; 668 int skill_value = skill->level * pl->stats.Int ? pl->stats.Int : 10;
685 669
… …
699 if (tmp->msg) 683 if (tmp->msg)
700 { 684 {
701 new_draw_info (NDI_UNIQUE, 0, pl, "The item has a story:"); 685 new_draw_info (NDI_UNIQUE, 0, pl, "The item has a story:");
702 new_draw_info (NDI_UNIQUE, 0, pl, tmp->msg); 686 new_draw_info (NDI_UNIQUE, 0, pl, tmp->msg);
703 } 687 }
704
705 /* identify will take care of updating the item if it is in the players inventory. IF on map, do it here */
706 if (tmp->map)
707 esrv_send_item (pl, tmp);
708 } 688 }
689
709 success += calc_skill_exp (pl, tmp, skill); 690 success += calc_skill_exp (pl, tmp, skill);
710 } 691 }
711 else 692 else
712 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); 693 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT);
713 } 694 }
… …
718/* do_skill_ident() - workhorse for skill_ident() -b.t. 699/* do_skill_ident() - workhorse for skill_ident() -b.t.
719 */ 700 */
720static int 701static int
721do_skill_ident (object *pl, int obj_class, object *skill) 702do_skill_ident (object *pl, int obj_class, object *skill)
722{ 703{
723 object *tmp;
724 int success = 0; 704 int success = 0;
725 705
726 for (tmp = pl->inv; tmp; tmp = tmp->below) 706 for (object *tmp = pl->inv; tmp; tmp = tmp->below)
727 success += do_skill_ident2 (tmp, pl, obj_class, skill); 707 success += do_skill_ident2 (tmp, pl, obj_class, skill);
728 /* check the ground */ 708 /* check the ground */
729 709
730 for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp; tmp = tmp->above) 710 for (object *tmp = pl->ms ().bot; tmp; tmp = tmp->above)
731 success += do_skill_ident2 (tmp, pl, obj_class, skill); 711 success += do_skill_ident2 (tmp, pl, obj_class, skill);
732 712
733 return success; 713 return success;
734} 714}
735 715
… …
743 723
744 new_draw_info (NDI_UNIQUE, 0, pl, "You look at the objects nearby..."); 724 new_draw_info (NDI_UNIQUE, 0, pl, "You look at the objects nearby...");
745 725
746 switch (skill->subtype) 726 switch (skill->subtype)
747 { 727 {
748 case SK_SMITHERY: 728 case SK_SMITHERY:
749 success += do_skill_ident (pl, WEAPON, skill) + do_skill_ident (pl, ARMOUR, skill) 729 success += do_skill_ident (pl, WEAPON, skill) + do_skill_ident (pl, ARMOUR, skill)
750 + do_skill_ident (pl, BRACERS, skill) + do_skill_ident (pl, CLOAK, skill) 730 + do_skill_ident (pl, BRACERS, skill) + do_skill_ident (pl, CLOAK, skill)
751 + do_skill_ident (pl, BOOTS, skill) + do_skill_ident (pl, SHIELD, skill) 731 + do_skill_ident (pl, BOOTS, skill) + do_skill_ident (pl, SHIELD, skill)
752 + do_skill_ident (pl, GIRDLE, skill) + do_skill_ident (pl, HELMET, skill) + do_skill_ident (pl, GLOVES, skill); 732 + do_skill_ident (pl, GIRDLE, skill) + do_skill_ident (pl, HELMET, skill) + do_skill_ident (pl, GLOVES, skill);
753 break; 733 break;
754 734
755 case SK_BOWYER: 735 case SK_BOWYER:
756 success += do_skill_ident (pl, BOW, skill) + do_skill_ident (pl, ARROW, skill); 736 success += do_skill_ident (pl, BOW, skill) + do_skill_ident (pl, ARROW, skill);
757 break; 737 break;
758 738
759 case SK_ALCHEMY: 739 case SK_ALCHEMY:
760 success += do_skill_ident (pl, POTION, skill) + do_skill_ident (pl, POISON, skill) 740 success += do_skill_ident (pl, POTION, skill) + do_skill_ident (pl, POISON, skill)
761 + do_skill_ident (pl, CONTAINER, skill) + do_skill_ident (pl, DRINK, skill) + do_skill_ident (pl, INORGANIC, skill); 741 + do_skill_ident (pl, CONTAINER, skill) + do_skill_ident (pl, DRINK, skill) + do_skill_ident (pl, INORGANIC, skill);
762 break; 742 break;
763 743
764 case SK_WOODSMAN: 744 case SK_WOODSMAN:
765 success += do_skill_ident (pl, FOOD, skill) + do_skill_ident (pl, DRINK, skill) + do_skill_ident (pl, FLESH, skill); 745 success += do_skill_ident (pl, FOOD, skill) + do_skill_ident (pl, DRINK, skill) + do_skill_ident (pl, FLESH, skill);
766 break; 746 break;
767 747
768 case SK_JEWELER: 748 case SK_JEWELER:
769 success += do_skill_ident (pl, GEM, skill) + do_skill_ident (pl, RING, skill) + do_skill_ident (pl, AMULET, skill); 749 success += do_skill_ident (pl, GEM, skill) + do_skill_ident (pl, RING, skill) + do_skill_ident (pl, AMULET, skill);
770 break; 750 break;
771 751
772 case SK_LITERACY: 752 case SK_LITERACY:
773 success += do_skill_ident (pl, SPELLBOOK, skill) + do_skill_ident (pl, SCROLL, skill) + do_skill_ident (pl, BOOK, skill); 753 success += do_skill_ident (pl, SPELLBOOK, skill) + do_skill_ident (pl, SCROLL, skill) + do_skill_ident (pl, BOOK, skill);
774 break; 754 break;
775 755
776 case SK_THAUMATURGY: 756 case SK_THAUMATURGY:
777 success += do_skill_ident (pl, WAND, skill) + do_skill_ident (pl, ROD, skill) + do_skill_ident (pl, HORN, skill); 757 success += do_skill_ident (pl, WAND, skill) + do_skill_ident (pl, ROD, skill) + do_skill_ident (pl, HORN, skill);
778 break; 758 break;
779 759
780 case SK_DET_CURSE: 760 case SK_DET_CURSE:
781 success = do_skill_detect_curse (pl, skill); 761 success = do_skill_detect_curse (pl, skill);
782 if (success) 762 if (success)
783 new_draw_info (NDI_UNIQUE, 0, pl, "...and discover cursed items!"); 763 new_draw_info (NDI_UNIQUE, 0, pl, "...and discover cursed items!");
784 break; 764 break;
785 765
786 case SK_DET_MAGIC: 766 case SK_DET_MAGIC:
787 success = do_skill_detect_magic (pl, skill); 767 success = do_skill_detect_magic (pl, skill);
788 if (success) 768 if (success)
789 new_draw_info (NDI_UNIQUE, 0, pl, "...and discover items imbued with mystic forces!"); 769 new_draw_info (NDI_UNIQUE, 0, pl, "...and discover items imbued with mystic forces!");
790 break; 770 break;
791 771
792 default: 772 default:
793 LOG (llevError, "Error: bad call to skill_ident()\n"); 773 LOG (llevError, "Error: bad call to skill_ident()\n");
794 return 0; 774 return 0;
795 break; 775 break;
796 } 776 }
777
797 if (!success) 778 if (!success)
798 {
799 new_draw_info (NDI_UNIQUE, 0, pl, "...and learn nothing more."); 779 new_draw_info (NDI_UNIQUE, 0, pl, "...and learn nothing more.");
800 } 780
801 return success; 781 return success;
802} 782}
803 783
804/* players using this skill can 'charm' a monster -- 784/* players using this skill can 'charm' a monster --
805 * into working for them. It can only be used on 785 * into working for them. It can only be used on
… …
897 /* Ok, got a 'sucker' lets try to make them a follower */ 877 /* Ok, got a 'sucker' lets try to make them a follower */
898 if (level > 0 && tmp->level < (random_roll (0, level - 1, pl, PREFER_HIGH) - 1)) 878 if (level > 0 && tmp->level < (random_roll (0, level - 1, pl, PREFER_HIGH) - 1))
899 { 879 {
900 new_draw_info_format (NDI_UNIQUE, 0, pl, "You convince the %s to become your follower.\n", query_name (tmp)); 880 new_draw_info_format (NDI_UNIQUE, 0, pl, "You convince the %s to become your follower.\n", query_name (tmp));
901 881
882 INVOKE_OBJECT (KILL, tmp, ARG_OBJECT (pl));
902 tmp->set_owner (pl); 883 tmp->set_owner (pl);
903 tmp->skill = skill->skill; 884 tmp->skill = skill->skill;
904 tmp->stats.exp = 0; 885 tmp->stats.exp = 0;
905 add_friendly_object (tmp);
906 tmp->attack_movement = PETMOVE; 886 tmp->attack_movement = PETMOVE;
887
888 if (!QUERY_FLAG (tmp, FLAG_FRIENDLY))
889 add_friendly_object (tmp);
890
907 return calc_skill_exp (pl, tmp, skill); 891 return calc_skill_exp (pl, tmp, skill);
908 } 892 }
909 /* Charm failed. Creature may be angry now */ 893 /* Charm failed. Creature may be angry now */
910 else if ((skill->level + ((pl->stats.Cha - 10) / 2)) < random_roll (1, 2 * tmp->level, pl, PREFER_LOW)) 894 else if ((skill->level + ((pl->stats.Cha - 10) / 2)) < random_roll (1, 2 * tmp->level, pl, PREFER_LOW))
911 { 895 {
912 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your speech angers the %s!\n", query_name (tmp)); 896 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your speech angers the %s!\n", query_name (tmp));
913 if (QUERY_FLAG (tmp, FLAG_FRIENDLY)) 897 if (QUERY_FLAG (tmp, FLAG_FRIENDLY))
914 { 898 {
915 CLEAR_FLAG (tmp, FLAG_FRIENDLY);
916 remove_friendly_object (tmp); 899 remove_friendly_object (tmp);
917 tmp->attack_movement = 0; /* needed? */ 900 tmp->attack_movement = 0; /* needed? */
918 } 901 }
919 902
920 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 903 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
… …
942 925
943 if (pl->type != PLAYER) 926 if (pl->type != PLAYER)
944 return 0; /* only players use this skill */ 927 return 0; /* only players use this skill */
945 928
946 new_draw_info_format (NDI_UNIQUE, 0, pl, "You sing."); 929 new_draw_info_format (NDI_UNIQUE, 0, pl, "You sing.");
947 for (i = 0; i < MIN (skill->level, SIZEOFFREE); i++) 930 for (i = 0; i < min (skill->level, SIZEOFFREE); i++)
948 { 931 {
949 x = pl->x + freearr_x[i]; 932 x = pl->x + freearr_x[i];
950 y = pl->y + freearr_y[i]; 933 y = pl->y + freearr_y[i];
951 m = pl->map; 934 m = pl->map;
952 935
… …
1003} 986}
1004 987
1005/* The find_traps skill (aka, search). Checks for traps 988/* The find_traps skill (aka, search). Checks for traps
1006 * on the spaces or in certain objects 989 * on the spaces or in certain objects
1007 */ 990 */
1008
1009int 991int
1010find_traps (object *pl, object *skill) 992find_traps (object *pl, object *skill)
1011{ 993{
1012 object *tmp, *tmp2; 994 object *tmp, *tmp2;
1013 int i, expsum = 0, mflags; 995 int i, expsum = 0, mflags;
… …
1015 maptile *m; 997 maptile *m;
1016 998
1017 /* First we search all around us for runes and traps, which are 999 /* First we search all around us for runes and traps, which are
1018 * all type RUNE 1000 * all type RUNE
1019 */ 1001 */
1020
1021 for (i = 0; i < 9; i++) 1002 for (i = 0; i < 9; i++)
1022 { 1003 {
1023 x = pl->x + freearr_x[i]; 1004 x = pl->x + freearr_x[i];
1024 y = pl->y + freearr_y[i]; 1005 y = pl->y + freearr_y[i];
1025 m = pl->map; 1006 m = pl->map;
… …
1027 mflags = get_map_flags (m, &m, x, y, &x, &y); 1008 mflags = get_map_flags (m, &m, x, y, &x, &y);
1028 if (mflags & P_OUT_OF_MAP) 1009 if (mflags & P_OUT_OF_MAP)
1029 continue; 1010 continue;
1030 1011
1031 /* Check everything in the square for trapness */ 1012 /* Check everything in the square for trapness */
1032 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1013 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1033 { 1014 {
1034
1035 /* And now we'd better do an inventory traversal of each 1015 /* And now we'd better do an inventory traversal of each
1036 * of these objects' inventory 1016 * of these objects' inventory
1037 * We can narrow this down a bit - no reason to search through 1017 * We can narrow this down a bit - no reason to search through
1038 * the players inventory or monsters for that matter. 1018 * the players inventory or monsters for that matter.
1039 */ 1019 */
1040 if (tmp->type != PLAYER && !QUERY_FLAG (tmp, FLAG_MONSTER)) 1020 if (tmp->type != PLAYER && !QUERY_FLAG (tmp, FLAG_MONSTER))
1041 {
1042 for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below) 1021 for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below)
1043 if (tmp2->type == RUNE || tmp2->type == TRAP) 1022 if (tmp2->type == RUNE || tmp2->type == TRAP)
1044 if (trap_see (pl, tmp2)) 1023 if (trap_see (pl, tmp2))
1045 { 1024 {
1046 trap_show (tmp2, tmp); 1025 trap_show (tmp2, tmp);
1047 if (tmp2->stats.Cha > 1) 1026 if (tmp2->stats.Cha > 1)
1048 { 1027 {
1049 if (!tmp2->owner || tmp2->owner->type != PLAYER) 1028 if (!tmp2->owner || tmp2->owner->type != PLAYER)
1050 expsum += calc_skill_exp (pl, tmp2, skill); 1029 expsum += calc_skill_exp (pl, tmp2, skill);
1051 1030
1052 tmp2->stats.Cha = 1; /* unhide the trap */ 1031 tmp2->stats.Cha = 1; /* unhide the trap */
1053 } 1032 }
1054 } 1033 }
1055 } 1034
1056 if ((tmp->type == RUNE || tmp->type == TRAP) && trap_see (pl, tmp)) 1035 if ((tmp->type == RUNE || tmp->type == TRAP) && trap_see (pl, tmp))
1057 { 1036 {
1058 trap_show (tmp, tmp); 1037 trap_show (tmp, tmp);
1059 if (tmp->stats.Cha > 1) 1038 if (tmp->stats.Cha > 1)
1060 { 1039 {
… …
1063 tmp->stats.Cha = 1; /* unhide the trap */ 1042 tmp->stats.Cha = 1; /* unhide the trap */
1064 } 1043 }
1065 } 1044 }
1066 } 1045 }
1067 } 1046 }
1047
1068 new_draw_info (NDI_BLACK, 0, pl, "You search the area."); 1048 new_draw_info (NDI_BLACK, 0, pl, "You search the area.");
1069 return expsum; 1049 return expsum;
1070} 1050}
1071 1051
1072/* remove_trap() - This skill will disarm any previously discovered trap 1052/* remove_trap() - This skill will disarm any previously discovered trap
1073 * the algorithm is based (almost totally) on the old command_disarm() - b.t. 1053 * the algorithm is based (almost totally) on the old command_disarm() - b.t.
1074 */ 1054 */
1075
1076int 1055int
1077remove_trap (object *op, int dir, object *skill) 1056remove_trap (object *op, int dir, object *skill)
1078{ 1057{
1079 object *tmp, *tmp2; 1058 object *tmp, *tmp2;
1080 int i, success = 0, mflags; 1059 int i, success = 0, mflags;
… …
1090 mflags = get_map_flags (m, &m, x, y, &x, &y); 1069 mflags = get_map_flags (m, &m, x, y, &x, &y);
1091 if (mflags & P_OUT_OF_MAP) 1070 if (mflags & P_OUT_OF_MAP)
1092 continue; 1071 continue;
1093 1072
1094 /* Check everything in the square for trapness */ 1073 /* Check everything in the square for trapness */
1095 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1074 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1096 { 1075 {
1097 /* And now we'd better do an inventory traversal of each 1076 /* And now we'd better do an inventory traversal of each
1098 * of these objects inventory. Like above, only 1077 * of these objects inventory. Like above, only
1099 * do this for interesting objects. 1078 * do this for interesting objects.
1100 */ 1079 */
1101 1080
1102 if (tmp->type != PLAYER && !QUERY_FLAG (tmp, FLAG_MONSTER)) 1081 if (tmp->type != PLAYER && !QUERY_FLAG (tmp, FLAG_MONSTER))
1103 { 1082 {
1104 for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below) 1083 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1105 if ((tmp2->type == RUNE || tmp2->type == TRAP) && tmp2->stats.Cha <= 1) 1084 if ((tmp2->type == RUNE || tmp2->type == TRAP) && tmp2->stats.Cha <= 1)
1106 { 1085 {
1107 trap_show (tmp2, tmp); 1086 trap_show (tmp2, tmp);
1087
1108 if (trap_disarm (op, tmp2, 1, skill) && (!tmp2->owner || tmp2->owner->type != PLAYER)) 1088 if (trap_disarm (op, tmp2, 1, skill) && (!tmp2->owner || tmp2->owner->type != PLAYER))
1109 { 1089 {
1110 tmp->stats.exp = tmp->stats.Cha * tmp->level; 1090 tmp->stats.exp = tmp->stats.Cha * tmp->level;
1111 success += calc_skill_exp (op, tmp2, skill); 1091 success += calc_skill_exp (op, tmp2, skill);
1112 } 1092 }
1113 } 1093 }
1114 } 1094 }
1095
1115 if ((tmp->type == RUNE || tmp->type == TRAP) && tmp->stats.Cha <= 1) 1096 if ((tmp->type == RUNE || tmp->type == TRAP) && tmp->stats.Cha <= 1)
1116 { 1097 {
1117 trap_show (tmp, tmp); 1098 trap_show (tmp, tmp);
1099
1118 if (trap_disarm (op, tmp, 1, skill) && (!tmp->owner || tmp->owner->type != PLAYER)) 1100 if (trap_disarm (op, tmp, 1, skill) && (!tmp->owner || tmp->owner->type != PLAYER))
1119 { 1101 {
1120 tmp->stats.exp = tmp->stats.Cha * tmp->level; 1102 tmp->stats.exp = tmp->stats.Cha * tmp->level;
1121 success += calc_skill_exp (op, tmp, skill); 1103 success += calc_skill_exp (op, tmp, skill);
1122 } 1104 }
1123 } 1105 }
1124 } 1106 }
1125 } 1107 }
1108
1126 return success; 1109 return success;
1127} 1110}
1128
1129 1111
1130/* pray() - when this skill is called from do_skill(), it allows 1112/* pray() - when this skill is called from do_skill(), it allows
1131 * the player to regain lost grace points at a faster rate. -b.t. 1113 * the player to regain lost grace points at a faster rate. -b.t.
1132 * This always returns 0 - return value is used by calling function 1114 * This always returns 0 - return value is used by calling function
1133 * such that if it returns true, player gets exp in that skill. This 1115 * such that if it returns true, player gets exp in that skill. This
1134 * the effect here can be done on demand, we probably don't want to 1116 * the effect here can be done on demand, we probably don't want to
1135 * give infinite exp by returning true in any cases. 1117 * give infinite exp by returning true in any cases.
1136 */ 1118 */
1137
1138int 1119int
1139pray (object *pl, object *skill) 1120pray (object *pl, object *skill)
1140{ 1121{
1141 char buf[MAX_BUF]; 1122 char buf[MAX_BUF];
1142 object *tmp; 1123 object *tmp;
… …
1149 /* Check all objects - we could stop at floor objects, 1130 /* Check all objects - we could stop at floor objects,
1150 * but if someone buries an altar, I don't see a problem with 1131 * but if someone buries an altar, I don't see a problem with
1151 * going through all the objects, and it shouldn't be much slower 1132 * going through all the objects, and it shouldn't be much slower
1152 * than extra checks on object attributes. 1133 * than extra checks on object attributes.
1153 */ 1134 */
1154 for (tmp = pl->below; tmp != NULL; tmp = tmp->below) 1135 for (tmp = pl->below; tmp; tmp = tmp->below)
1155 { 1136 {
1156 /* Only if the altar actually belongs to someone do you get special benefits */ 1137 /* Only if the altar actually belongs to someone do you get special benefits */
1157 if (tmp && tmp->type == HOLY_ALTAR && tmp->other_arch) 1138 if (tmp && tmp->type == HOLY_ALTAR && tmp->other_arch)
1158 { 1139 {
1159 sprintf (buf, "You pray over the %s.", &tmp->name); 1140 sprintf (buf, "You pray over the %s.", &tmp->name);
… …
1167 if (pl->stats.grace < pl->stats.maxgrace) 1148 if (pl->stats.grace < pl->stats.maxgrace)
1168 { 1149 {
1169 pl->stats.grace++; 1150 pl->stats.grace++;
1170 pl->last_grace = -1; 1151 pl->last_grace = -1;
1171 } 1152 }
1153
1172 return 0; 1154 return 0;
1173} 1155}
1174 1156
1175/* This skill allows the player to regain a few sp or hp for a 1157/* This skill allows the player to regain a few sp or hp for a
1176 * brief period of concentration. No armour or weapons may be 1158 * brief period of concentration. No armour or weapons may be
1177 * wielded/applied for this to work. The amount of time needed 1159 * wielded/applied for this to work. The amount of time needed
1178 * to concentrate and the # of points regained is dependant on 1160 * to concentrate and the # of points regained is dependant on
1179 * the level of the user. - b.t. thomas@astro.psu.edu 1161 * the level of the user. - b.t. thomas@astro.psu.edu
1180 */ 1162 */
1181
1182void 1163void
1183meditate (object *pl, object *skill) 1164meditate (object *pl, object *skill)
1184{ 1165{
1185 object *tmp; 1166 object *tmp;
1186 1167
… …
1229 pl->last_heal = -1; 1210 pl->last_heal = -1;
1230 } 1211 }
1231} 1212}
1232 1213
1233/* write_note() - this routine allows players to inscribe messages in 1214/* write_note() - this routine allows players to inscribe messages in
1234 * ordinary 'books' (anything that is type BOOK). b.t. 1215 * ordinary inscribable 'books' (anything that is not a SPELL). b.t.
1235 */ 1216 */
1236static int 1217static int
1237write_note (object *pl, object *item, const char *msg, object *skill) 1218write_note (object *pl, object *item, const char *msg, object *skill)
1238{ 1219{
1239 char buf[1024]; 1220 if (!msg_is_safe (msg))
1240 object *newBook = NULL;
1241
1242 /* a pair of sanity checks */
1243 if (!item || item->type != BOOK)
1244 return 0;
1245
1246 if (!msg)
1247 {
1248 new_draw_info (NDI_UNIQUE, 0, pl, "No message to write!");
1249 new_draw_info_format (NDI_UNIQUE, 0, pl, "Usage: use_skill %s <message>", &skill->skill);
1250 return 0;
1251 }
1252
1253 if (strcasestr_local (msg, "endmsg"))
1254 { 1221 {
1255 new_draw_info (NDI_UNIQUE, 0, pl, "Trying to cheat now are we?"); 1222 new_draw_info (NDI_UNIQUE, 0, pl, "Trying to cheat now are we?");
1223 LOG (llevInfo, "write_note: player %s tried to write bogus note %s\n", &pl->name, msg);
1224 return 0;
1225 }
1226
1227 int len = strlen (msg);
1228
1229 if (!is_utf8_string ((U8 *)msg, len))
1230 {
1231 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your message is garbled (text must be UTF-8, client-bug)!");
1256 return 0; 1232 return 0;
1257 } 1233 }
1258 1234
1259 if (INVOKE_OBJECT (INSCRIBE_NOTE, item, ARG_PLAYER (pl->contr), ARG_STRING (msg), ARG_OBJECT (skill))) 1235 if (INVOKE_OBJECT (INSCRIBE_NOTE, item, ARG_PLAYER (pl->contr), ARG_STRING (msg), ARG_OBJECT (skill)))
1260 return strlen (msg); 1236 return RESULT_INT (0);
1261 1237
1262 buf[0] = 0; 1238 STRLEN char_len = utf8_length ((U8 *)msg, (U8 *)(msg+len));
1263 if (!book_overflow (item->msg, msg, sizeof (buf)))
1264 { /* add msg string to book */
1265 if (item->msg)
1266 strcpy (buf, item->msg);
1267 1239
1268 strcat (buf, msg); 1240 if (char_len <= item->weight_limit)
1269 strcat (buf, "\n"); /* new msg needs a LF */ 1241 {
1270 if (item->nrof > 1) 1242 object *newbook = arch_to_object (item->other_arch);
1271 { 1243 item->decrease ();
1272 newBook = item->clone ();
1273 decrease_ob (item);
1274 esrv_send_item (pl, item);
1275 newBook->nrof = 1; 1244 newbook->nrof = 1;
1276 newBook->msg = buf; 1245 newbook->msg = shstr (msg);
1277 newBook = insert_ob_in_ob (newBook, pl); 1246 newbook->flag [FLAG_IDENTIFIED] = true;
1278 esrv_send_item (pl, newBook); 1247
1248 if (item->subtype == 1) // mailscrolls
1279 } 1249 {
1280 else 1250 newbook->name = item->name;
1251 newbook->name_pl = item->name_pl;
1281 { 1252 }
1282 item->msg = buf;
1283 /* This shouldn't be necessary - the object hasn't changed in any
1284 * visible way
1285 */
1286 /* esrv_send_item(pl, item); */
1287 }
1288 1253
1254 pl->insert (newbook);
1255
1256 pl->contr->play_sound (sound_find ("inscribe_success"));
1289 new_draw_info_format (NDI_UNIQUE, 0, pl, "You write in the %s.", query_short_name (item)); 1257 new_draw_info_format (NDI_UNIQUE, 0, pl, "You write in the %s.", &item->name);
1290 return strlen (msg); 1258 return char_len;
1291 } 1259 }
1292 else 1260 else
1293 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your message won't fit in the %s!", query_short_name (item)); 1261 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.>",
1262 &item->name, item->weight_limit, char_len);
1294 1263
1295 return 0; 1264 return 0;
1296} 1265}
1297 1266
1298/* write_scroll() - this routine allows players to inscribe spell scrolls 1267/* write_scroll() - this routine allows players to inscribe spell scrolls
1299 * of spells which they know. Backfire effects are possible with the 1268 * of spells which they know. Backfire effects are possible with the
1300 * severity of the backlash correlated with the difficulty of the scroll 1269 * severity of the backlash correlated with the difficulty of the scroll
1301 * that is attempted. -b.t. thomas@astro.psu.edu 1270 * that is attempted. -b.t. thomas@astro.psu.edu
1302 */ 1271 */
1303
1304static int 1272static int
1305write_scroll (object *pl, object *scroll, object *skill) 1273write_scroll (object *pl, object *scroll, object *skill)
1306{ 1274{
1307 int success = 0, confused = 0; 1275 int success = 0, confused = 0;
1308 object *newscroll, *chosen_spell, *tmp;
1309
1310 /* this is a sanity check */
1311 if (scroll->type != SCROLL)
1312 {
1313 new_draw_info (NDI_UNIQUE, 0, pl, "A spell can only be inscribed into a scroll!");
1314 return 0;
1315 }
1316 1276
1317 /* Check if we are ready to attempt inscription */ 1277 /* Check if we are ready to attempt inscription */
1318 chosen_spell = pl->contr->ranged_ob; 1278 object *chosen_spell = pl->contr->ranged_ob;
1279
1319 if (!chosen_spell || chosen_spell->type != SPELL) 1280 if (!chosen_spell || chosen_spell->type != SPELL)
1320 { 1281 {
1321 new_draw_info (NDI_UNIQUE, 0, pl, "You need a spell readied in order to inscribe!"); 1282 new_draw_info (NDI_UNIQUE, 0, pl, "You need a spell readied in order to inscribe!");
1322 return 0; 1283 return 0;
1323 } 1284 }
… …
1329 } 1290 }
1330 1291
1331 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA) > pl->stats.sp) 1292 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA) > pl->stats.sp)
1332 { 1293 {
1333 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough mana to write a scroll of %s.", &chosen_spell->name); 1294 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough mana to write a scroll of %s.", &chosen_spell->name);
1334 return 0;
1335 }
1336
1337 /* if there is a spell already on the scroll then player could easily
1338 * accidently read it while trying to write the new one. give player
1339 * a 50% chance to overwrite spell at their own level
1340 */
1341 if ((scroll->stats.sp || scroll->inv) && random_roll (0, scroll->level * 2, pl, PREFER_LOW) > skill->level)
1342 {
1343 new_draw_info_format (NDI_UNIQUE, 0, pl, "Oops! You accidently read it while trying to write on it.");
1344 manual_apply (pl, scroll, 0);
1345 return 0; 1295 return 0;
1346 } 1296 }
1347 1297
1348 /* ok, we are ready to try inscription */ 1298 /* ok, we are ready to try inscription */
1349 if (QUERY_FLAG (pl, FLAG_CONFUSED)) 1299 if (QUERY_FLAG (pl, FLAG_CONFUSED))
… …
1353 pl->stats.grace -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE); 1303 pl->stats.grace -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE);
1354 pl->stats.sp -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA); 1304 pl->stats.sp -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA);
1355 1305
1356 if (random_roll (0, chosen_spell->level * 4 - 1, pl, PREFER_LOW) < skill->level) 1306 if (random_roll (0, chosen_spell->level * 4 - 1, pl, PREFER_LOW) < skill->level)
1357 { 1307 {
1358 if (scroll->nrof > 1) 1308 object *newscroll = arch_to_object (scroll->other_arch);
1359 { 1309 scroll->decrease ();
1360 newscroll = scroll->clone ();
1361 decrease_ob (scroll);
1362 newscroll->nrof = 1; 1310 newscroll->nrof = 1;
1363 } 1311
1364 else 1312 pl->contr->play_sound (sound_find ("inscribe_success"));
1365 newscroll = scroll;
1366 1313
1367 if (!confused) 1314 if (!confused)
1368 { 1315 {
1369 newscroll->level = MAX (skill->level, chosen_spell->level); 1316 newscroll->level = max (skill->level, chosen_spell->level);
1317 newscroll->flag [FLAG_IDENTIFIED] = true;
1370 new_draw_info (NDI_UNIQUE, 0, pl, "You succeed in writing a new scroll."); 1318 new_draw_info (NDI_UNIQUE, 0, pl, "You succeed in writing the spell.");
1371 } 1319 }
1372 else 1320 else
1373 { 1321 {
1374 chosen_spell = find_random_spell_in_ob (pl, NULL); 1322 chosen_spell = find_random_spell_in_ob (pl, NULL);
1375 if (!chosen_spell) 1323 if (!chosen_spell)
1376 return 0; 1324 return 0;
1377 1325
1378 newscroll->level = MAX (skill->level, chosen_spell->level); 1326 newscroll->level = max (skill->level, chosen_spell->level);
1379 new_draw_info (NDI_UNIQUE, 0, pl, "In your confused state, you write down some odd spell."); 1327 new_draw_info (NDI_UNIQUE, 0, pl, "In your confused state, you write down some odd spell.");
1380 } 1328 }
1381 1329
1382 if (newscroll->inv)
1383 newscroll->inv->destroy ();
1384
1385 tmp = chosen_spell->clone (); 1330 object *tmp = chosen_spell->clone ();
1386 insert_ob_in_ob (tmp, newscroll); 1331 insert_ob_in_ob (tmp, newscroll);
1387 1332
1388 /* Same code as from treasure.c - so they can better merge. 1333 /* Same code as from treasure.C - so they can better merge.
1389 * if players want to sell them, so be it. 1334 * if players want to sell them, so be it.
1390 */ 1335 */
1391 newscroll->value = newscroll->arch->value * newscroll->inv->value * (newscroll->level + 50) / (newscroll->inv->level + 50); 1336 newscroll->value = newscroll->arch->value * newscroll->inv->value * (newscroll->level + 50) / (newscroll->inv->level + 50);
1392 newscroll->stats.exp = newscroll->value / 5; 1337 newscroll->stats.exp = newscroll->value / 5;
1393 1338
1394 /* wait until finished manipulating the scroll before inserting it */ 1339 pl->insert (newscroll);
1395 if (newscroll == scroll)
1396 {
1397 /* Remove to correctly merge with other items which may exist in inventory */
1398 newscroll->remove ();
1399 esrv_del_item (pl->contr, newscroll->count);
1400 }
1401 1340
1402 newscroll = insert_ob_in_ob (newscroll, pl);
1403 esrv_send_item (pl, newscroll);
1404 success = calc_skill_exp (pl, newscroll, skill); 1341 success = calc_skill_exp (pl, newscroll, skill);
1405 if (!confused) 1342 if (!confused)
1406 success *= 2; 1343 success *= 2;
1344
1407 success = success * skill->level; 1345 success = success * skill->level;
1408 return success; 1346 return success;
1409
1410 } 1347 }
1411 else 1348 else
1412 { /* Inscription has failed */ 1349 { /* Inscription has failed */
1350 pl->contr->play_sound (sound_find ("inscribe_fail"));
1413 1351
1414 if (chosen_spell->level > skill->level || confused) 1352 if (chosen_spell->level > skill->level || confused)
1415 { /*backfire! */ 1353 { /*backfire! */
1416 new_draw_info (NDI_UNIQUE, 0, pl, "Ouch! Your attempt to write a new scroll strains your mind!"); 1354 new_draw_info (NDI_UNIQUE, 0, pl, "Ouch! Your attempt to write a new scroll strains your mind!");
1355
1417 if (random_roll (0, 1, pl, PREFER_LOW) == 1) 1356 if (random_roll (0, 1, pl, PREFER_LOW) == 1)
1418 pl->drain_specific_stat (4); 1357 pl->drain_specific_stat (4);
1419 else 1358 else
1420 { 1359 {
1421 confuse_player (pl, pl, 99); 1360 confuse_player (pl, pl, 99);
1422 return (-30 * chosen_spell->level); 1361 return -30 * chosen_spell->level;
1423 } 1362 }
1424 } 1363 }
1425 else if (random_roll (0, pl->stats.Int - 1, pl, PREFER_HIGH) < 15) 1364 else if (random_roll (0, pl->stats.Int - 1, pl, PREFER_HIGH) < 15)
1426 { 1365 {
1427 new_draw_info (NDI_UNIQUE, 0, pl, "Your attempt to write a new scroll rattles your mind!"); 1366 new_draw_info (NDI_UNIQUE, 0, pl, "Your attempt to write a new scroll rattles your mind! H<Frankly spoken, you were too dumb and unlucky.>");
1428 confuse_player (pl, pl, 99); 1367 confuse_player (pl, pl, 99);
1429 } 1368 }
1430 else 1369 else
1431 new_draw_info (NDI_UNIQUE, 0, pl, "You fail to write a new scroll."); 1370 new_draw_info (NDI_UNIQUE, 0, pl, "You fail to write a new scroll. H<Try a lower-level spell, if possible at all.>");
1432 } 1371 }
1433 1372
1434 return 0; 1373 return 0;
1435} 1374}
1436 1375
1437/* write_on_item() - wrapper for write_note and write_scroll */ 1376/* write_on_item() - wrapper for write_note and write_scroll */
1438int 1377int
1439write_on_item (object *pl, const char *params, object *skill) 1378write_on_item (object *pl, const char *params, object *skill)
1440{ 1379{
1441 object *item;
1442 const char *string = params;
1443 int msgtype;
1444 archetype *skat; 1380 archetype *skat;
1445 1381
1446 if (pl->type != PLAYER) 1382 if (pl->type != PLAYER)
1447 return 0; 1383 return 0;
1448 1384
1449 if (!params) 1385 if (!params)
1450 {
1451 params = ""; 1386 params = "";
1452 string = params;
1453 }
1454 1387
1455 skat = get_archetype_by_type_subtype (SKILL, SK_LITERACY); 1388 skat = get_archetype_by_type_subtype (SKILL, SK_LITERACY);
1456 1389
1457 /* Need to be able to read before we can write! */ 1390 /* Need to be able to read before we can write! */
1458 if (!find_skill_by_name (pl, skat->skill)) 1391 if (!find_skill_by_name (pl, skat->skill))
1459 { 1392 {
1460 new_draw_info (NDI_UNIQUE, 0, pl, "You must learn to read before you can write!"); 1393 new_draw_info (NDI_UNIQUE, 0, pl, "You must learn to read before you can write! H<You lack the literacy skill.>");
1461 return 0; 1394 return 0;
1462 } 1395 }
1463 1396
1464 /* if there is a message then it goes in a book and no message means 1397 object *item = find_marked_object (pl);
1465 * write active spell into the scroll
1466 */
1467 msgtype = (string[0] != '\0') ? BOOK : SCROLL;
1468 1398
1469 /* find an item of correct type to write on */ 1399 /* find an item of correct type to write on */
1470 if (!(item = find_marked_object (pl))) 1400 if (!item)
1401 {
1402 new_draw_info (NDI_UNIQUE, 0, pl, "You don't have any marked item to write on. H<Use the mark command or the popup menu to make an item.>");
1403 return 0;
1471 { 1404 }
1472 new_draw_info (NDI_UNIQUE, 0, pl, "You don't have any marked item to write on."); 1405
1406 if (item->type != INSCRIBABLE)
1407 {
1408 new_draw_info_format (NDI_UNIQUE, 0, pl, "You cannot inscribe this! H<You can only inscribe empty scrolls and books.>");
1473 return 0; 1409 return 0;
1474 } 1410 }
1475 1411
1476 if (QUERY_FLAG (item, FLAG_UNPAID)) 1412 if (QUERY_FLAG (item, FLAG_UNPAID))
1477 { 1413 {
1478 new_draw_info (NDI_UNIQUE, 0, pl, "You had better pay for that before you write on it."); 1414 new_draw_info (NDI_UNIQUE, 0, pl, "You had better pay for that before you write on it.");
1479 return 0; 1415 return 0;
1480 } 1416 }
1481 if (msgtype != item->type) 1417
1418 if (item->other_arch->type == SCROLL)
1482 { 1419 {
1483 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no %s to write on", msgtype == BOOK ? "book" : "scroll"); 1420 if (*params)
1421 {
1422 // check readied scroll
1423 new_draw_info_format (NDI_UNIQUE, 0, pl,
1424 "When inscribing spells you need to ready a spell and do not specify a string argument.\n"
1425 "Usage: cast [spell name]; use_skill %s", &skill->skill);
1484 return 0; 1426 return 0;
1485 } 1427 }
1486 1428
1487 if (msgtype == SCROLL)
1488 return write_scroll (pl, item, skill); 1429 return write_scroll (pl, item, skill);
1489 else if (msgtype == BOOK) 1430 }
1431 else
1432 {
1433 if (!*params)
1434 {
1435 new_draw_info_format (NDI_UNIQUE, 0, pl,
1436 "When inscribing books you need to specify the words you want to inscribe as command argument.\n"
1437 "Usage: use_skill %s <message>", &skill->skill);
1438 return 0;
1439 }
1440
1490 return write_note (pl, item, string, skill); 1441 return write_note (pl, item, params, skill);
1442 }
1491 1443
1492 return 0; 1444 return 0;
1493} 1445}
1494 1446
1495/* find_throw_ob() - if we request an object, then 1447/* find_throw_ob() - if we request an object, then
… …
1528 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1480 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
1529 { 1481 {
1530 /* can't toss invisible or inv-locked items */ 1482 /* can't toss invisible or inv-locked items */
1531 if (tmp->invisible || QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 1483 if (tmp->invisible || QUERY_FLAG (tmp, FLAG_INV_LOCKED))
1532 continue; 1484 continue;
1533 if (!request || !strcmp (query_name (tmp), request) || !strcmp (tmp->name, request)) 1485 if (!request || !strcmp (query_name (tmp), request) || !strcmp (&tmp->name, request))
1534 break; 1486 break;
1535 } 1487 }
1536 } 1488 }
1537 1489
1538 /* this should prevent us from throwing away 1490 /* this should prevent us from throwing away
… …
1577 return tmp; 1529 return tmp;
1578} 1530}
1579 1531
1580/* make_throw_ob() We construct the 'carrier' object in 1532/* make_throw_ob() We construct the 'carrier' object in
1581 * which we will insert the object that is being thrown. 1533 * which we will insert the object that is being thrown.
1582 * This combination becomes the 'thrown object'. -b.t. 1534 * This combination becomes the 'thrown object'. -b.t.
1583 */ 1535 */
1584static object * 1536static object *
1585make_throw_ob (object *orig) 1537make_throw_ob (object *orig)
1586{ 1538{
1587 if (!orig) 1539 if (!orig)
1588 return NULL; 1540 return 0;
1589 1541
1590 if (QUERY_FLAG (orig, FLAG_APPLIED)) 1542 if (QUERY_FLAG (orig, FLAG_APPLIED))
1591 { 1543 {
1592 LOG (llevError, "BUG: make_throw_ob(): ob is applied\n"); 1544 LOG (llevError, "BUG: make_throw_ob(): ob is applied\n");
1593 /* insufficient workaround, but better than nothing */ 1545 /* insufficient workaround, but better than nothing */
… …
1597 object *toss_item = orig->clone (); 1549 object *toss_item = orig->clone ();
1598 1550
1599 toss_item->type = THROWN_OBJ; 1551 toss_item->type = THROWN_OBJ;
1600 CLEAR_FLAG (toss_item, FLAG_CHANGING); 1552 CLEAR_FLAG (toss_item, FLAG_CHANGING);
1601 toss_item->stats.dam = 0; /* default damage */ 1553 toss_item->stats.dam = 0; /* default damage */
1602 insert_ob_in_ob (orig, toss_item); 1554 toss_item->insert (orig);
1555
1603 return toss_item; 1556 return toss_item;
1604} 1557}
1605 1558
1606/* do_throw() - op throws any object toss_item. This code 1559/* do_throw() - op throws any object toss_item. This code
1607 * was borrowed from fire_bow. 1560 * was borrowed from fire_bow.
… …
1700 left = throw_ob; /* these are throwing objects left to the player */ 1653 left = throw_ob; /* these are throwing objects left to the player */
1701 1654
1702 /* sometimes get_split_ob can't split an object (because op->nrof==0?) 1655 /* sometimes get_split_ob can't split an object (because op->nrof==0?)
1703 * and returns NULL. We must use 'left' then 1656 * and returns NULL. We must use 'left' then
1704 */ 1657 */
1705 1658 if (!(throw_ob = throw_ob->split ()))
1706 if ((throw_ob = get_split_ob (throw_ob, 1)) == NULL)
1707 { 1659 {
1708 throw_ob = left; 1660 throw_ob = left;
1709 left->remove (); 1661 left->remove ();
1710 if (op->type == PLAYER)
1711 esrv_del_item (op->contr, left->count);
1712 }
1713 else if (op->type == PLAYER)
1714 {
1715 if (left->destroyed ())
1716 esrv_del_item (op->contr, left->count);
1717 else
1718 esrv_update_item (UPD_NROF, op, left);
1719 } 1662 }
1720 1663
1721 /* special case: throwing powdery substances like dust, dirt */ 1664 /* special case: throwing powdery substances like dust, dirt */
1722 if (throw_ob->type == POTION && throw_ob->subtype == POT_DUST) 1665 if (throw_ob->type == POTION && throw_ob->subtype == POT_DUST)
1723 { 1666 {
… …
1747 */ 1690 */
1748 throw_ob->inv->set_owner (op); 1691 throw_ob->inv->set_owner (op);
1749 throw_ob->direction = dir; 1692 throw_ob->direction = dir;
1750 1693
1751 /* the damage bonus from the force of the throw */ 1694 /* the damage bonus from the force of the throw */
1752 dam = (int) (str_factor * dam_bonus[eff_str]); 1695 dam = int (str_factor * dam_bonus[eff_str]);
1753 1696
1754 /* Now, lets adjust the properties of the thrown_ob. */ 1697 /* Now, lets adjust the properties of the thrown_ob. */
1755 1698
1756 /* how far to fly */ 1699 /* how far to fly */
1757 throw_ob->last_sp = (eff_str * 3) / 5; 1700 throw_ob->last_sp = (eff_str * 3) / 5;
… …
1778 { 1721 {
1779 throw_ob->last_sp += eff_str / 3; /* fly a little further */ 1722 throw_ob->last_sp += eff_str / 3; /* fly a little further */
1780 throw_ob->stats.dam += throw_ob->inv->stats.dam + throw_ob->magic + 2; 1723 throw_ob->stats.dam += throw_ob->inv->stats.dam + throw_ob->magic + 2;
1781 throw_ob->stats.wc -= throw_ob->magic + throw_ob->inv->stats.wc; 1724 throw_ob->stats.wc -= throw_ob->magic + throw_ob->inv->stats.wc;
1782 /* only throw objects get directional faces */ 1725 /* only throw objects get directional faces */
1783 if (GET_ANIM_ID (throw_ob) && NUM_ANIMATIONS (throw_ob)) 1726 if (throw_ob->has_anim () && throw_ob->anim_frames ())
1784 SET_ANIMATION (throw_ob, dir); 1727 throw_ob->set_anim_frame (dir);
1785 } 1728 }
1786 else 1729 else
1787 { 1730 {
1788 uint16 mat = throw_ob->materials; 1731 uint16 mat = throw_ob->materials;
1789 1732

Diff Legend

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