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.35 by root, Sat May 19 00:31:08 2007 UTC vs.
Revision 1.60 by root, Wed Dec 31 17:35:38 2008 UTC

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

Diff Legend

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