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.39 by root, Tue Jul 3 06:07:07 2007 UTC vs.
Revision 1.70 by root, Fri Nov 6 12:49:19 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
… …
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)
… …
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 }
… …
896 /* Ok, got a 'sucker' lets try to make them a follower */ 877 /* Ok, got a 'sucker' lets try to make them a follower */
897 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))
898 { 879 {
899 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));
900 881
882 INVOKE_OBJECT (KILL, tmp, ARG_OBJECT (pl));
901 tmp->set_owner (pl); 883 tmp->set_owner (pl);
902 tmp->skill = skill->skill; 884 tmp->skill = skill->skill;
903 tmp->stats.exp = 0; 885 tmp->stats.exp = 0;
904 add_friendly_object (tmp);
905 tmp->attack_movement = PETMOVE; 886 tmp->attack_movement = PETMOVE;
887
888 if (!QUERY_FLAG (tmp, FLAG_FRIENDLY))
889 add_friendly_object (tmp);
890
906 return calc_skill_exp (pl, tmp, skill); 891 return calc_skill_exp (pl, tmp, skill);
907 } 892 }
908 /* Charm failed. Creature may be angry now */ 893 /* Charm failed. Creature may be angry now */
909 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))
910 { 895 {
911 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));
912 if (QUERY_FLAG (tmp, FLAG_FRIENDLY)) 897 if (QUERY_FLAG (tmp, FLAG_FRIENDLY))
913 { 898 {
914 CLEAR_FLAG (tmp, FLAG_FRIENDLY);
915 remove_friendly_object (tmp); 899 remove_friendly_object (tmp);
916 tmp->attack_movement = 0; /* needed? */ 900 tmp->attack_movement = 0; /* needed? */
917 } 901 }
918 902
919 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 903 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
… …
1069} 1053}
1070 1054
1071/* remove_trap() - This skill will disarm any previously discovered trap 1055/* remove_trap() - This skill will disarm any previously discovered trap
1072 * the algorithm is based (almost totally) on the old command_disarm() - b.t. 1056 * the algorithm is based (almost totally) on the old command_disarm() - b.t.
1073 */ 1057 */
1074
1075int 1058int
1076remove_trap (object *op, int dir, object *skill) 1059remove_trap (object *op, int dir, object *skill)
1077{ 1060{
1078 object *tmp, *tmp2; 1061 object *tmp, *tmp2;
1079 int i, success = 0, mflags; 1062 int i, success = 0, mflags;
… …
1089 mflags = get_map_flags (m, &m, x, y, &x, &y); 1072 mflags = get_map_flags (m, &m, x, y, &x, &y);
1090 if (mflags & P_OUT_OF_MAP) 1073 if (mflags & P_OUT_OF_MAP)
1091 continue; 1074 continue;
1092 1075
1093 /* Check everything in the square for trapness */ 1076 /* Check everything in the square for trapness */
1094 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1077 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1095 { 1078 {
1096 /* And now we'd better do an inventory traversal of each 1079 /* And now we'd better do an inventory traversal of each
1097 * of these objects inventory. Like above, only 1080 * of these objects inventory. Like above, only
1098 * do this for interesting objects. 1081 * do this for interesting objects.
1099 */ 1082 */
1100 1083
1101 if (tmp->type != PLAYER && !QUERY_FLAG (tmp, FLAG_MONSTER)) 1084 if (tmp->type != PLAYER && !QUERY_FLAG (tmp, FLAG_MONSTER))
1102 { 1085 {
1103 for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below) 1086 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1104 if ((tmp2->type == RUNE || tmp2->type == TRAP) && tmp2->stats.Cha <= 1) 1087 if ((tmp2->type == RUNE || tmp2->type == TRAP) && tmp2->stats.Cha <= 1)
1105 { 1088 {
1106 trap_show (tmp2, tmp); 1089 trap_show (tmp2, tmp);
1090
1107 if (trap_disarm (op, tmp2, 1, skill) && (!tmp2->owner || tmp2->owner->type != PLAYER)) 1091 if (trap_disarm (op, tmp2, 1, skill) && (!tmp2->owner || tmp2->owner->type != PLAYER))
1108 { 1092 {
1109 tmp->stats.exp = tmp->stats.Cha * tmp->level; 1093 tmp->stats.exp = tmp->stats.Cha * tmp->level;
1110 success += calc_skill_exp (op, tmp2, skill); 1094 success += calc_skill_exp (op, tmp2, skill);
1111 } 1095 }
1112 } 1096 }
1113 } 1097 }
1098
1114 if ((tmp->type == RUNE || tmp->type == TRAP) && tmp->stats.Cha <= 1) 1099 if ((tmp->type == RUNE || tmp->type == TRAP) && tmp->stats.Cha <= 1)
1115 { 1100 {
1116 trap_show (tmp, tmp); 1101 trap_show (tmp, tmp);
1102
1117 if (trap_disarm (op, tmp, 1, skill) && (!tmp->owner || tmp->owner->type != PLAYER)) 1103 if (trap_disarm (op, tmp, 1, skill) && (!tmp->owner || tmp->owner->type != PLAYER))
1118 { 1104 {
1119 tmp->stats.exp = tmp->stats.Cha * tmp->level; 1105 tmp->stats.exp = tmp->stats.Cha * tmp->level;
1120 success += calc_skill_exp (op, tmp, skill); 1106 success += calc_skill_exp (op, tmp, skill);
1121 } 1107 }
1122 } 1108 }
1123 } 1109 }
1124 } 1110 }
1111
1125 return success; 1112 return success;
1126} 1113}
1127
1128 1114
1129/* pray() - when this skill is called from do_skill(), it allows 1115/* pray() - when this skill is called from do_skill(), it allows
1130 * the player to regain lost grace points at a faster rate. -b.t. 1116 * the player to regain lost grace points at a faster rate. -b.t.
1131 * This always returns 0 - return value is used by calling function 1117 * This always returns 0 - return value is used by calling function
1132 * such that if it returns true, player gets exp in that skill. This 1118 * such that if it returns true, player gets exp in that skill. This
1133 * the effect here can be done on demand, we probably don't want to 1119 * the effect here can be done on demand, we probably don't want to
1134 * give infinite exp by returning true in any cases. 1120 * give infinite exp by returning true in any cases.
1135 */ 1121 */
1136
1137int 1122int
1138pray (object *pl, object *skill) 1123pray (object *pl, object *skill)
1139{ 1124{
1140 char buf[MAX_BUF]; 1125 char buf[MAX_BUF];
1141 object *tmp; 1126 object *tmp;
… …
1148 /* Check all objects - we could stop at floor objects, 1133 /* Check all objects - we could stop at floor objects,
1149 * but if someone buries an altar, I don't see a problem with 1134 * but if someone buries an altar, I don't see a problem with
1150 * going through all the objects, and it shouldn't be much slower 1135 * going through all the objects, and it shouldn't be much slower
1151 * than extra checks on object attributes. 1136 * than extra checks on object attributes.
1152 */ 1137 */
1153 for (tmp = pl->below; tmp != NULL; tmp = tmp->below) 1138 for (tmp = pl->below; tmp; tmp = tmp->below)
1154 { 1139 {
1155 /* Only if the altar actually belongs to someone do you get special benefits */ 1140 /* Only if the altar actually belongs to someone do you get special benefits */
1156 if (tmp && tmp->type == HOLY_ALTAR && tmp->other_arch) 1141 if (tmp && tmp->type == HOLY_ALTAR && tmp->other_arch)
1157 { 1142 {
1158 sprintf (buf, "You pray over the %s.", &tmp->name); 1143 sprintf (buf, "You pray over the %s.", &tmp->name);
… …
1166 if (pl->stats.grace < pl->stats.maxgrace) 1151 if (pl->stats.grace < pl->stats.maxgrace)
1167 { 1152 {
1168 pl->stats.grace++; 1153 pl->stats.grace++;
1169 pl->last_grace = -1; 1154 pl->last_grace = -1;
1170 } 1155 }
1156
1171 return 0; 1157 return 0;
1172} 1158}
1173 1159
1174/* This skill allows the player to regain a few sp or hp for a 1160/* This skill allows the player to regain a few sp or hp for a
1175 * brief period of concentration. No armour or weapons may be 1161 * brief period of concentration. No armour or weapons may be
1176 * wielded/applied for this to work. The amount of time needed 1162 * wielded/applied for this to work. The amount of time needed
1177 * to concentrate and the # of points regained is dependant on 1163 * to concentrate and the # of points regained is dependant on
1178 * the level of the user. - b.t. thomas@astro.psu.edu 1164 * the level of the user. - b.t. thomas@astro.psu.edu
1179 */ 1165 */
1180
1181void 1166void
1182meditate (object *pl, object *skill) 1167meditate (object *pl, object *skill)
1183{ 1168{
1184 object *tmp; 1169 object *tmp;
1185 1170
… …
1228 pl->last_heal = -1; 1213 pl->last_heal = -1;
1229 } 1214 }
1230} 1215}
1231 1216
1232/* write_note() - this routine allows players to inscribe messages in 1217/* write_note() - this routine allows players to inscribe messages in
1233 * ordinary 'books' (anything that is type BOOK). b.t. 1218 * ordinary inscribable 'books' (anything that is not a SPELL). b.t.
1234 */ 1219 */
1235static int 1220static int
1236write_note (object *pl, object *item, const char *msg, object *skill) 1221write_note (object *pl, object *item, const char *msg, object *skill)
1237{ 1222{
1238 char buf[1024]; 1223 if (!msg_is_safe (msg))
1239 object *newBook = NULL;
1240
1241 /* a pair of sanity checks */
1242 if (!item || item->type != BOOK)
1243 return 0;
1244
1245 if (!msg)
1246 {
1247 new_draw_info (NDI_UNIQUE, 0, pl, "No message to write!");
1248 new_draw_info_format (NDI_UNIQUE, 0, pl, "Usage: use_skill %s <message>", &skill->skill);
1249 return 0;
1250 }
1251
1252 if (strcasestr_local (msg, "endmsg"))
1253 { 1224 {
1254 new_draw_info (NDI_UNIQUE, 0, pl, "Trying to cheat now are we?"); 1225 new_draw_info (NDI_UNIQUE, 0, pl, "Trying to cheat now are we?");
1226 LOG (llevInfo, "write_note: player %s tried to write bogus note %s\n", &pl->name, msg);
1227 return 0;
1228 }
1229
1230 int len = strlen (msg);
1231
1232 if (!is_utf8_string ((U8 *)msg, len))
1233 {
1234 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your message is garbled (text must be UTF-8, client-bug)!");
1255 return 0; 1235 return 0;
1256 } 1236 }
1257 1237
1258 if (INVOKE_OBJECT (INSCRIBE_NOTE, item, ARG_PLAYER (pl->contr), ARG_STRING (msg), ARG_OBJECT (skill))) 1238 if (INVOKE_OBJECT (INSCRIBE_NOTE, item, ARG_PLAYER (pl->contr), ARG_STRING (msg), ARG_OBJECT (skill)))
1259 return strlen (msg); 1239 return RESULT_INT (0);
1260 1240
1261 buf[0] = 0; 1241 STRLEN char_len = utf8_length ((U8 *)msg, (U8 *)(msg+len));
1262 if (!book_overflow (item->msg, msg, sizeof (buf)))
1263 { /* add msg string to book */
1264 if (item->msg)
1265 strcpy (buf, item->msg);
1266 1242
1267 strcat (buf, msg); 1243 if (char_len <= item->weight_limit)
1268 strcat (buf, "\n"); /* new msg needs a LF */ 1244 {
1269 if (item->nrof > 1) 1245 object *newbook = arch_to_object (item->other_arch);
1270 { 1246 item->decrease ();
1271 newBook = item->clone ();
1272 decrease_ob (item);
1273 esrv_send_item (pl, item);
1274 newBook->nrof = 1; 1247 newbook->nrof = 1;
1275 newBook->msg = buf; 1248 newbook->msg = shstr (msg);
1276 newBook = insert_ob_in_ob (newBook, pl); 1249 newbook->flag [FLAG_IDENTIFIED] = true;
1277 esrv_send_item (pl, newBook); 1250
1251 if (item->subtype == 1) // mailscrolls
1278 } 1252 {
1279 else 1253 newbook->name = item->name;
1254 newbook->name_pl = item->name_pl;
1280 { 1255 }
1281 item->msg = buf;
1282 /* This shouldn't be necessary - the object hasn't changed in any
1283 * visible way
1284 */
1285 /* esrv_send_item(pl, item); */
1286 }
1287 1256
1257 pl->insert (newbook);
1258
1259 pl->contr->play_sound (sound_find ("inscribe_success"));
1288 new_draw_info_format (NDI_UNIQUE, 0, pl, "You write in the %s.", query_short_name (item)); 1260 new_draw_info_format (NDI_UNIQUE, 0, pl, "You write in the %s.", &item->name);
1289 return strlen (msg); 1261 return char_len;
1290 } 1262 }
1291 else 1263 else
1292 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your message won't fit in the %s!", query_short_name (item)); 1264 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.>",
1265 &item->name, item->weight_limit, char_len);
1293 1266
1294 return 0; 1267 return 0;
1295} 1268}
1296 1269
1297/* write_scroll() - this routine allows players to inscribe spell scrolls 1270/* write_scroll() - this routine allows players to inscribe spell scrolls
1298 * of spells which they know. Backfire effects are possible with the 1271 * of spells which they know. Backfire effects are possible with the
1299 * severity of the backlash correlated with the difficulty of the scroll 1272 * severity of the backlash correlated with the difficulty of the scroll
1300 * that is attempted. -b.t. thomas@astro.psu.edu 1273 * that is attempted. -b.t. thomas@astro.psu.edu
1301 */ 1274 */
1302
1303static int 1275static int
1304write_scroll (object *pl, object *scroll, object *skill) 1276write_scroll (object *pl, object *scroll, object *skill)
1305{ 1277{
1306 int success = 0, confused = 0; 1278 int success = 0, confused = 0;
1307 object *newscroll, *chosen_spell, *tmp;
1308
1309 /* this is a sanity check */
1310 if (scroll->type != SCROLL)
1311 {
1312 new_draw_info (NDI_UNIQUE, 0, pl, "A spell can only be inscribed into a scroll!");
1313 return 0;
1314 }
1315 1279
1316 /* Check if we are ready to attempt inscription */ 1280 /* Check if we are ready to attempt inscription */
1317 chosen_spell = pl->contr->ranged_ob; 1281 object *chosen_spell = pl->contr->ranged_ob;
1282
1318 if (!chosen_spell || chosen_spell->type != SPELL) 1283 if (!chosen_spell || chosen_spell->type != SPELL)
1319 { 1284 {
1320 new_draw_info (NDI_UNIQUE, 0, pl, "You need a spell readied in order to inscribe!"); 1285 new_draw_info (NDI_UNIQUE, 0, pl, "You need a spell readied in order to inscribe!");
1321 return 0; 1286 return 0;
1322 } 1287 }
… …
1328 } 1293 }
1329 1294
1330 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA) > pl->stats.sp) 1295 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA) > pl->stats.sp)
1331 { 1296 {
1332 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough mana to write a scroll of %s.", &chosen_spell->name); 1297 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough mana to write a scroll of %s.", &chosen_spell->name);
1333 return 0;
1334 }
1335
1336 /* if there is a spell already on the scroll then player could easily
1337 * accidently read it while trying to write the new one. give player
1338 * a 50% chance to overwrite spell at their own level
1339 */
1340 if ((scroll->stats.sp || scroll->inv) && random_roll (0, scroll->level * 2, pl, PREFER_LOW) > skill->level)
1341 {
1342 new_draw_info_format (NDI_UNIQUE, 0, pl, "Oops! You accidently read it while trying to write on it.");
1343 manual_apply (pl, scroll, 0);
1344 return 0; 1298 return 0;
1345 } 1299 }
1346 1300
1347 /* ok, we are ready to try inscription */ 1301 /* ok, we are ready to try inscription */
1348 if (QUERY_FLAG (pl, FLAG_CONFUSED)) 1302 if (QUERY_FLAG (pl, FLAG_CONFUSED))
… …
1352 pl->stats.grace -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE); 1306 pl->stats.grace -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE);
1353 pl->stats.sp -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA); 1307 pl->stats.sp -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA);
1354 1308
1355 if (random_roll (0, chosen_spell->level * 4 - 1, pl, PREFER_LOW) < skill->level) 1309 if (random_roll (0, chosen_spell->level * 4 - 1, pl, PREFER_LOW) < skill->level)
1356 { 1310 {
1357 if (scroll->nrof > 1) 1311 object *newscroll = arch_to_object (scroll->other_arch);
1358 { 1312 scroll->decrease ();
1359 newscroll = scroll->clone ();
1360 decrease_ob (scroll);
1361 newscroll->nrof = 1; 1313 newscroll->nrof = 1;
1362 } 1314
1363 else 1315 pl->contr->play_sound (sound_find ("inscribe_success"));
1364 newscroll = scroll;
1365 1316
1366 if (!confused) 1317 if (!confused)
1367 { 1318 {
1368 newscroll->level = MAX (skill->level, chosen_spell->level); 1319 newscroll->level = MAX (skill->level, chosen_spell->level);
1320 newscroll->flag [FLAG_IDENTIFIED] = true;
1369 new_draw_info (NDI_UNIQUE, 0, pl, "You succeed in writing a new scroll."); 1321 new_draw_info (NDI_UNIQUE, 0, pl, "You succeed in writing the spell.");
1370 } 1322 }
1371 else 1323 else
1372 { 1324 {
1373 chosen_spell = find_random_spell_in_ob (pl, NULL); 1325 chosen_spell = find_random_spell_in_ob (pl, NULL);
1374 if (!chosen_spell) 1326 if (!chosen_spell)
… …
1376 1328
1377 newscroll->level = MAX (skill->level, chosen_spell->level); 1329 newscroll->level = MAX (skill->level, chosen_spell->level);
1378 new_draw_info (NDI_UNIQUE, 0, pl, "In your confused state, you write down some odd spell."); 1330 new_draw_info (NDI_UNIQUE, 0, pl, "In your confused state, you write down some odd spell.");
1379 } 1331 }
1380 1332
1381 if (newscroll->inv)
1382 newscroll->inv->destroy ();
1383
1384 tmp = chosen_spell->clone (); 1333 object *tmp = chosen_spell->clone ();
1385 insert_ob_in_ob (tmp, newscroll); 1334 insert_ob_in_ob (tmp, newscroll);
1386 1335
1387 /* Same code as from treasure.c - so they can better merge. 1336 /* Same code as from treasure.C - so they can better merge.
1388 * if players want to sell them, so be it. 1337 * if players want to sell them, so be it.
1389 */ 1338 */
1390 newscroll->value = newscroll->arch->value * newscroll->inv->value * (newscroll->level + 50) / (newscroll->inv->level + 50); 1339 newscroll->value = newscroll->arch->value * newscroll->inv->value * (newscroll->level + 50) / (newscroll->inv->level + 50);
1391 newscroll->stats.exp = newscroll->value / 5; 1340 newscroll->stats.exp = newscroll->value / 5;
1392 1341
1393 /* wait until finished manipulating the scroll before inserting it */ 1342 pl->insert (newscroll);
1394 if (newscroll == scroll)
1395 {
1396 /* Remove to correctly merge with other items which may exist in inventory */
1397 newscroll->remove ();
1398 esrv_del_item (pl->contr, newscroll->count);
1399 }
1400 1343
1401 newscroll = insert_ob_in_ob (newscroll, pl);
1402 esrv_send_item (pl, newscroll);
1403 success = calc_skill_exp (pl, newscroll, skill); 1344 success = calc_skill_exp (pl, newscroll, skill);
1404 if (!confused) 1345 if (!confused)
1405 success *= 2; 1346 success *= 2;
1347
1406 success = success * skill->level; 1348 success = success * skill->level;
1407 return success; 1349 return success;
1408
1409 } 1350 }
1410 else 1351 else
1411 { /* Inscription has failed */ 1352 { /* Inscription has failed */
1353 pl->contr->play_sound (sound_find ("inscribe_fail"));
1412 1354
1413 if (chosen_spell->level > skill->level || confused) 1355 if (chosen_spell->level > skill->level || confused)
1414 { /*backfire! */ 1356 { /*backfire! */
1415 new_draw_info (NDI_UNIQUE, 0, pl, "Ouch! Your attempt to write a new scroll strains your mind!"); 1357 new_draw_info (NDI_UNIQUE, 0, pl, "Ouch! Your attempt to write a new scroll strains your mind!");
1358
1416 if (random_roll (0, 1, pl, PREFER_LOW) == 1) 1359 if (random_roll (0, 1, pl, PREFER_LOW) == 1)
1417 pl->drain_specific_stat (4); 1360 pl->drain_specific_stat (4);
1418 else 1361 else
1419 { 1362 {
1420 confuse_player (pl, pl, 99); 1363 confuse_player (pl, pl, 99);
1421 return (-30 * chosen_spell->level); 1364 return -30 * chosen_spell->level;
1422 } 1365 }
1423 } 1366 }
1424 else if (random_roll (0, pl->stats.Int - 1, pl, PREFER_HIGH) < 15) 1367 else if (random_roll (0, pl->stats.Int - 1, pl, PREFER_HIGH) < 15)
1425 { 1368 {
1426 new_draw_info (NDI_UNIQUE, 0, pl, "Your attempt to write a new scroll rattles your mind!"); 1369 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.>");
1427 confuse_player (pl, pl, 99); 1370 confuse_player (pl, pl, 99);
1428 } 1371 }
1429 else 1372 else
1430 new_draw_info (NDI_UNIQUE, 0, pl, "You fail to write a new scroll."); 1373 new_draw_info (NDI_UNIQUE, 0, pl, "You fail to write a new scroll. H<Try a lower-level spell, if possible at all.>");
1431 } 1374 }
1432 1375
1433 return 0; 1376 return 0;
1434} 1377}
1435 1378
1436/* write_on_item() - wrapper for write_note and write_scroll */ 1379/* write_on_item() - wrapper for write_note and write_scroll */
1437int 1380int
1438write_on_item (object *pl, const char *params, object *skill) 1381write_on_item (object *pl, const char *params, object *skill)
1439{ 1382{
1440 object *item;
1441 const char *string = params;
1442 int msgtype;
1443 archetype *skat; 1383 archetype *skat;
1444 1384
1445 if (pl->type != PLAYER) 1385 if (pl->type != PLAYER)
1446 return 0; 1386 return 0;
1447 1387
1448 if (!params) 1388 if (!params)
1449 {
1450 params = ""; 1389 params = "";
1451 string = params;
1452 }
1453 1390
1454 skat = get_archetype_by_type_subtype (SKILL, SK_LITERACY); 1391 skat = get_archetype_by_type_subtype (SKILL, SK_LITERACY);
1455 1392
1456 /* Need to be able to read before we can write! */ 1393 /* Need to be able to read before we can write! */
1457 if (!find_skill_by_name (pl, skat->skill)) 1394 if (!find_skill_by_name (pl, skat->skill))
1458 { 1395 {
1459 new_draw_info (NDI_UNIQUE, 0, pl, "You must learn to read before you can write!"); 1396 new_draw_info (NDI_UNIQUE, 0, pl, "You must learn to read before you can write! H<You lack the literacy skill.>");
1460 return 0; 1397 return 0;
1461 } 1398 }
1462 1399
1463 /* if there is a message then it goes in a book and no message means 1400 object *item = find_marked_object (pl);
1464 * write active spell into the scroll
1465 */
1466 msgtype = (string[0] != '\0') ? BOOK : SCROLL;
1467 1401
1468 /* find an item of correct type to write on */ 1402 /* find an item of correct type to write on */
1469 if (!(item = find_marked_object (pl))) 1403 if (!item)
1404 {
1405 new_draw_info (NDI_UNIQUE, 0, pl, "You don't have any marked item to write on. H<Use the mark command or the popup menu to make an item.>");
1406 return 0;
1470 { 1407 }
1471 new_draw_info (NDI_UNIQUE, 0, pl, "You don't have any marked item to write on."); 1408
1409 if (item->type != INSCRIBABLE)
1410 {
1411 new_draw_info_format (NDI_UNIQUE, 0, pl, "You cannot inscribe this! H<You can only inscribe empty scrolls and books.>");
1472 return 0; 1412 return 0;
1473 } 1413 }
1474 1414
1475 if (QUERY_FLAG (item, FLAG_UNPAID)) 1415 if (QUERY_FLAG (item, FLAG_UNPAID))
1476 { 1416 {
1477 new_draw_info (NDI_UNIQUE, 0, pl, "You had better pay for that before you write on it."); 1417 new_draw_info (NDI_UNIQUE, 0, pl, "You had better pay for that before you write on it.");
1478 return 0; 1418 return 0;
1479 } 1419 }
1480 if (msgtype != item->type) 1420
1421 if (item->other_arch->type == SCROLL)
1481 { 1422 {
1482 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no %s to write on", msgtype == BOOK ? "book" : "scroll"); 1423 if (*params)
1424 {
1425 // check readied scroll
1426 new_draw_info_format (NDI_UNIQUE, 0, pl,
1427 "When inscribing spells you need to ready a spell and do not specify a string argument.\n"
1428 "Usage: cast [spell name]; use_skill %s", &skill->skill);
1483 return 0; 1429 return 0;
1484 } 1430 }
1485 1431
1486 if (msgtype == SCROLL)
1487 return write_scroll (pl, item, skill); 1432 return write_scroll (pl, item, skill);
1488 else if (msgtype == BOOK) 1433 }
1434 else
1435 {
1436 if (!*params)
1437 {
1438 new_draw_info_format (NDI_UNIQUE, 0, pl,
1439 "When inscribing books you need to specify the words you want to inscribe as command argument.\n"
1440 "Usage: use_skill %s <message>", &skill->skill);
1441 return 0;
1442 }
1443
1489 return write_note (pl, item, string, skill); 1444 return write_note (pl, item, params, skill);
1445 }
1490 1446
1491 return 0; 1447 return 0;
1492} 1448}
1493 1449
1494/* find_throw_ob() - if we request an object, then 1450/* find_throw_ob() - if we request an object, then
… …
1527 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1483 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
1528 { 1484 {
1529 /* can't toss invisible or inv-locked items */ 1485 /* can't toss invisible or inv-locked items */
1530 if (tmp->invisible || QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 1486 if (tmp->invisible || QUERY_FLAG (tmp, FLAG_INV_LOCKED))
1531 continue; 1487 continue;
1532 if (!request || !strcmp (query_name (tmp), request) || !strcmp (tmp->name, request)) 1488 if (!request || !strcmp (query_name (tmp), request) || !strcmp (&tmp->name, request))
1533 break; 1489 break;
1534 } 1490 }
1535 } 1491 }
1536 1492
1537 /* this should prevent us from throwing away 1493 /* this should prevent us from throwing away
… …
1576 return tmp; 1532 return tmp;
1577} 1533}
1578 1534
1579/* make_throw_ob() We construct the 'carrier' object in 1535/* make_throw_ob() We construct the 'carrier' object in
1580 * which we will insert the object that is being thrown. 1536 * which we will insert the object that is being thrown.
1581 * This combination becomes the 'thrown object'. -b.t. 1537 * This combination becomes the 'thrown object'. -b.t.
1582 */ 1538 */
1583static object * 1539static object *
1584make_throw_ob (object *orig) 1540make_throw_ob (object *orig)
1585{ 1541{
1586 if (!orig) 1542 if (!orig)
1587 return NULL; 1543 return 0;
1588 1544
1589 if (QUERY_FLAG (orig, FLAG_APPLIED)) 1545 if (QUERY_FLAG (orig, FLAG_APPLIED))
1590 { 1546 {
1591 LOG (llevError, "BUG: make_throw_ob(): ob is applied\n"); 1547 LOG (llevError, "BUG: make_throw_ob(): ob is applied\n");
1592 /* insufficient workaround, but better than nothing */ 1548 /* insufficient workaround, but better than nothing */
… …
1596 object *toss_item = orig->clone (); 1552 object *toss_item = orig->clone ();
1597 1553
1598 toss_item->type = THROWN_OBJ; 1554 toss_item->type = THROWN_OBJ;
1599 CLEAR_FLAG (toss_item, FLAG_CHANGING); 1555 CLEAR_FLAG (toss_item, FLAG_CHANGING);
1600 toss_item->stats.dam = 0; /* default damage */ 1556 toss_item->stats.dam = 0; /* default damage */
1601 insert_ob_in_ob (orig, toss_item); 1557 toss_item->insert (orig);
1558
1602 return toss_item; 1559 return toss_item;
1603} 1560}
1604 1561
1605/* do_throw() - op throws any object toss_item. This code 1562/* do_throw() - op throws any object toss_item. This code
1606 * was borrowed from fire_bow. 1563 * was borrowed from fire_bow.
… …
1699 left = throw_ob; /* these are throwing objects left to the player */ 1656 left = throw_ob; /* these are throwing objects left to the player */
1700 1657
1701 /* sometimes get_split_ob can't split an object (because op->nrof==0?) 1658 /* sometimes get_split_ob can't split an object (because op->nrof==0?)
1702 * and returns NULL. We must use 'left' then 1659 * and returns NULL. We must use 'left' then
1703 */ 1660 */
1704 1661 if (!(throw_ob = throw_ob->split ()))
1705 if ((throw_ob = get_split_ob (throw_ob, 1)) == NULL)
1706 { 1662 {
1707 throw_ob = left; 1663 throw_ob = left;
1708 left->remove (); 1664 left->remove ();
1709 if (op->type == PLAYER)
1710 esrv_del_item (op->contr, left->count);
1711 }
1712 else if (op->type == PLAYER)
1713 {
1714 if (left->destroyed ())
1715 esrv_del_item (op->contr, left->count);
1716 else
1717 esrv_update_item (UPD_NROF, op, left);
1718 } 1665 }
1719 1666
1720 /* special case: throwing powdery substances like dust, dirt */ 1667 /* special case: throwing powdery substances like dust, dirt */
1721 if (throw_ob->type == POTION && throw_ob->subtype == POT_DUST) 1668 if (throw_ob->type == POTION && throw_ob->subtype == POT_DUST)
1722 { 1669 {
… …
1746 */ 1693 */
1747 throw_ob->inv->set_owner (op); 1694 throw_ob->inv->set_owner (op);
1748 throw_ob->direction = dir; 1695 throw_ob->direction = dir;
1749 1696
1750 /* the damage bonus from the force of the throw */ 1697 /* the damage bonus from the force of the throw */
1751 dam = (int) (str_factor * dam_bonus[eff_str]); 1698 dam = int (str_factor * dam_bonus[eff_str]);
1752 1699
1753 /* Now, lets adjust the properties of the thrown_ob. */ 1700 /* Now, lets adjust the properties of the thrown_ob. */
1754 1701
1755 /* how far to fly */ 1702 /* how far to fly */
1756 throw_ob->last_sp = (eff_str * 3) / 5; 1703 throw_ob->last_sp = (eff_str * 3) / 5;
… …
1777 { 1724 {
1778 throw_ob->last_sp += eff_str / 3; /* fly a little further */ 1725 throw_ob->last_sp += eff_str / 3; /* fly a little further */
1779 throw_ob->stats.dam += throw_ob->inv->stats.dam + throw_ob->magic + 2; 1726 throw_ob->stats.dam += throw_ob->inv->stats.dam + throw_ob->magic + 2;
1780 throw_ob->stats.wc -= throw_ob->magic + throw_ob->inv->stats.wc; 1727 throw_ob->stats.wc -= throw_ob->magic + throw_ob->inv->stats.wc;
1781 /* only throw objects get directional faces */ 1728 /* only throw objects get directional faces */
1782 if (GET_ANIM_ID (throw_ob) && NUM_ANIMATIONS (throw_ob)) 1729 if (throw_ob->has_anim () && throw_ob->anim_frames ())
1783 SET_ANIMATION (throw_ob, dir); 1730 throw_ob->set_anim_frame (dir);
1784 } 1731 }
1785 else 1732 else
1786 { 1733 {
1787 uint16 mat = throw_ob->materials; 1734 uint16 mat = throw_ob->materials;
1788 1735

Diff Legend

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