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.37 by root, Mon Jun 4 13:04:00 2007 UTC vs.
Revision 1.58 by elmex, Sun Dec 14 13:49:11 2008 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 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 it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 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
… …
134 { 135 {
135 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from other players!\n"); 136 new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from other players!\n");
136 return 0; 137 return 0;
137 } 138 }
138 139
139 /* Ok then, go thru their inventory, stealing */ 140 /* Ok then, go through their inventory, stealing */
140 for (tmp = op->inv; tmp; tmp = next) 141 for (tmp = op->inv; tmp; tmp = next)
141 { 142 {
142 next = tmp->below; 143 next = tmp->below;
143 144
144 /* you can't steal worn items, starting items, wiz stuff, 145 /* you can't steal worn items, starting items, wiz stuff,
… …
178 if (tmp->destroyed () || tmp->env != op) 179 if (tmp->destroyed () || tmp->env != op)
179 { 180 {
180 /* for players, play_sound: steals item */ 181 /* for players, play_sound: steals item */
181 success = tmp; 182 success = tmp;
182 CLEAR_FLAG (tmp, FLAG_INV_LOCKED); 183 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 } 184 }
185
191 break; 186 break;
192 } 187 }
193 } /* for loop looking for an item */ 188 } /* for loop looking for an item */
194 189
195 if (!tmp) 190 if (!tmp)
… …
204 */ 199 */
205 200
206 if ((roll >= skill->level) || !chance 201 if ((roll >= skill->level) || !chance
207 || (tmp && tmp->weight > (250 * (random_roll (0, stats_value + skill->level * 10 - 1, who, PREFER_LOW))))) 202 || (tmp && tmp->weight > (250 * (random_roll (0, stats_value + skill->level * 10 - 1, who, PREFER_LOW)))))
208 { 203 {
209
210 /* victim figures out where the thief is! */ 204 /* victim figures out where the thief is! */
211 if (who->hide) 205 if (who->flag [FLAG_HIDDEN])
212 make_visible (who); 206 make_visible (who);
213 207
214 if (op->type != PLAYER) 208 if (op->type != PLAYER)
215 { 209 {
216 /* The unaggressives look after themselves 8) */ 210 /* The unaggressives look after themselves 8) */
217 if (who->type == PLAYER) 211 if (who->type == PLAYER)
218 { 212 {
219 npc_call_help (op); 213 npc_call_help (op);
220 new_draw_info_format (NDI_UNIQUE, 0, who, "%s notices your attempted pilfering!", query_name (op)); 214 new_draw_info_format (NDI_UNIQUE, 0, who, "%s notices your attempted pilfering!", query_name (op));
221 } 215 }
216
222 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE); 217 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
223 /* all remaining npc items are guarded now. Set flag NO_STEAL 218 /* all remaining npc items are guarded now. Set flag NO_STEAL
224 * on the victim. 219 * on the victim.
225 */ 220 */
226 SET_FLAG (op, FLAG_NO_STEAL); 221 SET_FLAG (op, FLAG_NO_STEAL);
… …
229 { /* stealing from another player */ 224 { /* stealing from another player */
230 char buf[MAX_BUF]; 225 char buf[MAX_BUF];
231 226
232 /* Notify the other player */ 227 /* Notify the other player */
233 if (success && who->stats.Int > random_roll (0, 19, op, PREFER_LOW)) 228 if (success && who->stats.Int > random_roll (0, 19, op, PREFER_LOW))
234 {
235 sprintf (buf, "Your %s is missing!", query_name (success)); 229 sprintf (buf, "Your %s is missing!", query_name (success));
236 }
237 else 230 else
238 {
239 sprintf (buf, "Your pack feels strangely lighter."); 231 sprintf (buf, "Your pack feels strangely lighter.");
240 } 232
241 new_draw_info (NDI_UNIQUE, 0, op, buf); 233 new_draw_info (NDI_UNIQUE, 0, op, buf);
242 if (!success) 234 if (!success)
243 { 235 {
244 if (who->invisible) 236 if (who->invisible)
245 {
246 sprintf (buf, "you feel itchy fingers getting at your pack."); 237 sprintf (buf, "you feel itchy fingers getting at your pack.");
247 }
248 else 238 else
249 {
250 sprintf (buf, "%s looks very shifty.", query_name (who)); 239 sprintf (buf, "%s looks very shifty.", query_name (who));
251 } 240
252 new_draw_info (NDI_UNIQUE, 0, op, buf); 241 new_draw_info (NDI_UNIQUE, 0, op, buf);
253 } 242 }
254 } /* else stealing from another player */ 243 } /* else stealing from another player */
255 /* play_sound("stop! thief!"); kindofthing */ 244 /* play_sound("stop! thief!"); kindofthing */
256 } /* if you weren't 100% successful */ 245 } /* if you weren't 100% successful */
246
257 return success ? 1 : 0; 247 return success ? 1 : 0;
258} 248}
259 249
260int 250int
261steal (object *op, int dir, object *skill) 251steal (object *op, int dir, object *skill)
… …
438 op->invisible += 100; /* set the level of 'hiddeness' */ 428 op->invisible += 100; /* set the level of 'hiddeness' */
439 429
440 if (op->type == PLAYER) 430 if (op->type == PLAYER)
441 op->contr->tmp_invis = 1; 431 op->contr->tmp_invis = 1;
442 432
443 op->hide = 1; 433 op->flag [FLAG_HIDDEN] = 1;
444 return 1; 434 return 1;
445 } 435 }
446 436
447 return 0; 437 return 0;
448} 438}
… …
457 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 447 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
458 { 448 {
459 new_draw_info (NDI_UNIQUE, 0, op, "You don't need to hide while invisible!"); 449 new_draw_info (NDI_UNIQUE, 0, op, "You don't need to hide while invisible!");
460 return 0; 450 return 0;
461 } 451 }
462 else if (!op->hide && op->invisible > 0 && op->type == PLAYER) 452 else if (!op->flag [FLAG_HIDDEN] && op->invisible > 0 && op->type == PLAYER)
463 { 453 {
464 new_draw_info (NDI_UNIQUE, 0, op, "Your attempt to hide breaks the invisibility spell!"); 454 new_draw_info (NDI_UNIQUE, 0, op, "Your attempt to hide breaks the invisibility spell!");
465 make_visible (op); 455 make_visible (op);
466 } 456 }
467 457
… …
489static void 479static void
490stop_jump (object *pl, int dist, int spaces) 480stop_jump (object *pl, int dist, int spaces)
491{ 481{
492 pl->update_stats (); 482 pl->update_stats ();
493 pl->map->insert (pl, pl->x, pl->y, pl); 483 pl->map->insert (pl, pl->x, pl->y, pl);
484 pl->speed_left -= fabs (pl->speed * 8);
494} 485}
495 486
496static int 487static int
497attempt_jump (object *pl, int dir, int spaces, object *skill) 488attempt_jump (object *pl, int dir, int spaces, object *skill)
498{ 489{
499 object *tmp; 490 object *tmp;
500 int i, exp = 0, dx = freearr_x[dir], dy = freearr_y[dir], mflags; 491 int i, dx = freearr_x[dir], dy = freearr_y[dir], mflags;
501 sint16 x, y; 492 sint16 x, y;
502 maptile *m; 493 maptile *m;
503 494
504 /* Jump loop. Go through spaces opject wants to jump. Halt the 495 /* 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 496 * 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 497 * temporarily to allow player to aviod exits/archs that are not
507 * fly_on, fly_off. This will also prevent pickup of objects 498 * fly_on, fly_off. This will also prevent pickup of objects
508 * while jumping over them. 499 * while jumping over them.
509 */ 500 */
510
511 pl->remove (); 501 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; 502 pl->move_type |= MOVE_FLY_LOW;
519 503
520 for (i = 0; i <= spaces; i++) 504 for (i = 0; i <= spaces; i++)
521 { 505 {
522 x = pl->x + dx; 506 x = pl->x + dx;
… …
525 509
526 mflags = get_map_flags (m, &m, x, y, &x, &y); 510 mflags = get_map_flags (m, &m, x, y, &x, &y);
527 511
528 if (mflags & P_OUT_OF_MAP) 512 if (mflags & P_OUT_OF_MAP)
529 { 513 {
530 (void) stop_jump (pl, i, spaces); 514 stop_jump (pl, i, spaces);
531 return 0; 515 return 0;
532 } 516 }
517
518 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
519 {
520 /* Jump into creature */
521 if (QUERY_FLAG (tmp, FLAG_MONSTER)
522 || (tmp->type == PLAYER && (!QUERY_FLAG (tmp, FLAG_WIZ) || !tmp->contr->hidden)))
523 {
524 new_draw_info_format (NDI_UNIQUE, 0, pl, "You jump into %s%s.", tmp->type == PLAYER ? "" : "the ", &tmp->name);
525
526 stop_jump (pl, i, spaces);
527
528 int exp = 0;
529
530 if (tmp->type != PLAYER
531 || (pl->type == PLAYER && !pl->contr->party)
532 || (pl->type == PLAYER && tmp->type == PLAYER && pl->contr->party != tmp->contr->party))
533 exp = skill_attack (tmp, pl, pl->facing, "kicked", skill); /* pl makes an attack */
534
535 return exp; /* note that calc_skill_exp() is already called by skill_attack() */
536 }
537 }
538
533 if (OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, x, y))) 539 if (OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, x, y)))
534 { 540 {
535 new_draw_info (NDI_UNIQUE, 0, pl, "Your jump is blocked."); 541 new_draw_info (NDI_UNIQUE, 0, pl, "Your jump is blocked.");
536 stop_jump (pl, i, spaces); 542 stop_jump (pl, i, spaces);
537 return 0; 543 return 0;
538 } 544 }
539 545
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; 546 pl->x = x;
567 pl->y = y; 547 pl->y = y;
568 pl->map = m; 548 pl->map = m;
569 } 549 }
550
570 stop_jump (pl, i, spaces); 551 stop_jump (pl, i, spaces);
552
571 return calc_skill_exp (pl, NULL, skill); 553 return calc_skill_exp (pl, NULL, skill);
572} 554}
573 555
574/* jump() - this is both a new type of movement for player/monsters and 556/* jump() - this is both a new type of movement for player/monsters and
575 * an attack as well. 557 * an attack as well.
576 * Perhaps we should allow more spaces based on level, eg, level 50 558 * Perhaps we should allow more spaces based on level, eg, level 50
577 * jumper can jump several spaces? 559 * jumper can jump several spaces?
578 */ 560 */
579
580int 561int
581jump (object *pl, int dir, object *skill) 562jump (object *pl, int dir, object *skill)
582{ 563{
583 int spaces = 0, stats;
584 int str = pl->stats.Str; 564 int str = pl->stats.Str;
585 int dex = pl->stats.Dex; 565 int dex = pl->stats.Dex;
586 566
587 dex = dex ? dex : 15; 567 dex = dex ? dex : 15;
588 str = str ? str : 10; 568 str = str ? str : 10;
589 569
590 stats = str * str * str * dex * skill->level; 570 int stats = str * str * str * dex * skill->level;
571 int spaces = min (3, skill->level, stats / (pl->carrying + 1));
591 572
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) 573 if (spaces == 0)
600 { 574 {
601 new_draw_info (NDI_UNIQUE, 0, pl, "You are carrying too much weight to jump."); 575 new_draw_info (NDI_UNIQUE, 0, pl, "You are carrying too much weight to jump.");
602 return 0; 576 return 0;
603 } 577 }
578
604 return attempt_jump (pl, dir, spaces, skill); 579 return attempt_jump (pl, dir, spaces, skill);
605} 580}
606
607 581
608/* skill_ident() - this code is supposed to allow players to identify 582/* skill_ident() - this code is supposed to allow players to identify
609 * classes of objects with the various "auto-ident" skills. Player must 583 * classes of objects with the various "auto-ident" skills. Player must
610 * have unidentified objects of the right type in order for the skill 584 * have unidentified objects of the right type in order for the skill
611 * to work. While multiple classes of objects may be identified, 585 * 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 586 * 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. 587 * more generalized. Right now, skill indices are embedded in this routine.
614 * Returns amount of experience gained (on successful ident). 588 * Returns amount of experience gained (on successful ident).
615 * - b.t. (thomas@astro.psu.edu) 589 * - b.t. (thomas@astro.psu.edu)
616 */ 590 */
617
618static int 591static int
619do_skill_detect_curse (object *pl, object *skill) 592do_skill_detect_curse (object *pl, object *skill)
620{ 593{
621 object *tmp; 594 object *tmp;
622 int success = 0; 595 int success = 0;
… …
700 if (tmp->msg) 673 if (tmp->msg)
701 { 674 {
702 new_draw_info (NDI_UNIQUE, 0, pl, "The item has a story:"); 675 new_draw_info (NDI_UNIQUE, 0, pl, "The item has a story:");
703 new_draw_info (NDI_UNIQUE, 0, pl, tmp->msg); 676 new_draw_info (NDI_UNIQUE, 0, pl, tmp->msg);
704 } 677 }
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 } 678 }
679
710 success += calc_skill_exp (pl, tmp, skill); 680 success += calc_skill_exp (pl, tmp, skill);
711 } 681 }
712 else 682 else
713 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); 683 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT);
714 } 684 }
… …
719/* do_skill_ident() - workhorse for skill_ident() -b.t. 689/* do_skill_ident() - workhorse for skill_ident() -b.t.
720 */ 690 */
721static int 691static int
722do_skill_ident (object *pl, int obj_class, object *skill) 692do_skill_ident (object *pl, int obj_class, object *skill)
723{ 693{
724 object *tmp;
725 int success = 0; 694 int success = 0;
726 695
727 for (tmp = pl->inv; tmp; tmp = tmp->below) 696 for (object *tmp = pl->inv; tmp; tmp = tmp->below)
728 success += do_skill_ident2 (tmp, pl, obj_class, skill); 697 success += do_skill_ident2 (tmp, pl, obj_class, skill);
729 /* check the ground */ 698 /* check the ground */
730 699
731 for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp; tmp = tmp->above) 700 for (object *tmp = pl->ms ().bot; tmp; tmp = tmp->above)
732 success += do_skill_ident2 (tmp, pl, obj_class, skill); 701 success += do_skill_ident2 (tmp, pl, obj_class, skill);
733 702
734 return success; 703 return success;
735} 704}
736 705
… …
744 713
745 new_draw_info (NDI_UNIQUE, 0, pl, "You look at the objects nearby..."); 714 new_draw_info (NDI_UNIQUE, 0, pl, "You look at the objects nearby...");
746 715
747 switch (skill->subtype) 716 switch (skill->subtype)
748 { 717 {
749 case SK_SMITHERY: 718 case SK_SMITHERY:
750 success += do_skill_ident (pl, WEAPON, skill) + do_skill_ident (pl, ARMOUR, skill) 719 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) 720 + 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) 721 + 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); 722 + do_skill_ident (pl, GIRDLE, skill) + do_skill_ident (pl, HELMET, skill) + do_skill_ident (pl, GLOVES, skill);
754 break; 723 break;
755 724
756 case SK_BOWYER: 725 case SK_BOWYER:
757 success += do_skill_ident (pl, BOW, skill) + do_skill_ident (pl, ARROW, skill); 726 success += do_skill_ident (pl, BOW, skill) + do_skill_ident (pl, ARROW, skill);
758 break; 727 break;
759 728
760 case SK_ALCHEMY: 729 case SK_ALCHEMY:
761 success += do_skill_ident (pl, POTION, skill) + do_skill_ident (pl, POISON, skill) 730 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); 731 + do_skill_ident (pl, CONTAINER, skill) + do_skill_ident (pl, DRINK, skill) + do_skill_ident (pl, INORGANIC, skill);
763 break; 732 break;
764 733
765 case SK_WOODSMAN: 734 case SK_WOODSMAN:
766 success += do_skill_ident (pl, FOOD, skill) + do_skill_ident (pl, DRINK, skill) + do_skill_ident (pl, FLESH, skill); 735 success += do_skill_ident (pl, FOOD, skill) + do_skill_ident (pl, DRINK, skill) + do_skill_ident (pl, FLESH, skill);
767 break; 736 break;
768 737
769 case SK_JEWELER: 738 case SK_JEWELER:
770 success += do_skill_ident (pl, GEM, skill) + do_skill_ident (pl, RING, skill) + do_skill_ident (pl, AMULET, skill); 739 success += do_skill_ident (pl, GEM, skill) + do_skill_ident (pl, RING, skill) + do_skill_ident (pl, AMULET, skill);
771 break; 740 break;
772 741
773 case SK_LITERACY: 742 case SK_LITERACY:
774 success += do_skill_ident (pl, SPELLBOOK, skill) + do_skill_ident (pl, SCROLL, skill) + do_skill_ident (pl, BOOK, skill); 743 success += do_skill_ident (pl, SPELLBOOK, skill) + do_skill_ident (pl, SCROLL, skill) + do_skill_ident (pl, BOOK, skill);
775 break; 744 break;
776 745
777 case SK_THAUMATURGY: 746 case SK_THAUMATURGY:
778 success += do_skill_ident (pl, WAND, skill) + do_skill_ident (pl, ROD, skill) + do_skill_ident (pl, HORN, skill); 747 success += do_skill_ident (pl, WAND, skill) + do_skill_ident (pl, ROD, skill) + do_skill_ident (pl, HORN, skill);
779 break; 748 break;
780 749
781 case SK_DET_CURSE: 750 case SK_DET_CURSE:
782 success = do_skill_detect_curse (pl, skill); 751 success = do_skill_detect_curse (pl, skill);
783 if (success) 752 if (success)
784 new_draw_info (NDI_UNIQUE, 0, pl, "...and discover cursed items!"); 753 new_draw_info (NDI_UNIQUE, 0, pl, "...and discover cursed items!");
785 break; 754 break;
786 755
787 case SK_DET_MAGIC: 756 case SK_DET_MAGIC:
788 success = do_skill_detect_magic (pl, skill); 757 success = do_skill_detect_magic (pl, skill);
789 if (success) 758 if (success)
790 new_draw_info (NDI_UNIQUE, 0, pl, "...and discover items imbued with mystic forces!"); 759 new_draw_info (NDI_UNIQUE, 0, pl, "...and discover items imbued with mystic forces!");
791 break; 760 break;
792 761
793 default: 762 default:
794 LOG (llevError, "Error: bad call to skill_ident()\n"); 763 LOG (llevError, "Error: bad call to skill_ident()\n");
795 return 0; 764 return 0;
796 break; 765 break;
797 } 766 }
767
798 if (!success) 768 if (!success)
799 {
800 new_draw_info (NDI_UNIQUE, 0, pl, "...and learn nothing more."); 769 new_draw_info (NDI_UNIQUE, 0, pl, "...and learn nothing more.");
801 } 770
802 return success; 771 return success;
803} 772}
804 773
805/* players using this skill can 'charm' a monster -- 774/* players using this skill can 'charm' a monster --
806 * into working for them. It can only be used on 775 * into working for them. It can only be used on
… …
898 /* Ok, got a 'sucker' lets try to make them a follower */ 867 /* 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)) 868 if (level > 0 && tmp->level < (random_roll (0, level - 1, pl, PREFER_HIGH) - 1))
900 { 869 {
901 new_draw_info_format (NDI_UNIQUE, 0, pl, "You convince the %s to become your follower.\n", query_name (tmp)); 870 new_draw_info_format (NDI_UNIQUE, 0, pl, "You convince the %s to become your follower.\n", query_name (tmp));
902 871
872 INVOKE_OBJECT (KILL, tmp, ARG_OBJECT (pl));
903 tmp->set_owner (pl); 873 tmp->set_owner (pl);
904 tmp->skill = skill->skill; 874 tmp->skill = skill->skill;
905 tmp->stats.exp = 0; 875 tmp->stats.exp = 0;
906 add_friendly_object (tmp);
907 tmp->attack_movement = PETMOVE; 876 tmp->attack_movement = PETMOVE;
877
878 if (!QUERY_FLAG (tmp, FLAG_FRIENDLY))
879 add_friendly_object (tmp);
880
908 return calc_skill_exp (pl, tmp, skill); 881 return calc_skill_exp (pl, tmp, skill);
909 } 882 }
910 /* Charm failed. Creature may be angry now */ 883 /* 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)) 884 else if ((skill->level + ((pl->stats.Cha - 10) / 2)) < random_roll (1, 2 * tmp->level, pl, PREFER_LOW))
912 { 885 {
913 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your speech angers the %s!\n", query_name (tmp)); 886 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your speech angers the %s!\n", query_name (tmp));
914 if (QUERY_FLAG (tmp, FLAG_FRIENDLY)) 887 if (QUERY_FLAG (tmp, FLAG_FRIENDLY))
915 { 888 {
916 CLEAR_FLAG (tmp, FLAG_FRIENDLY);
917 remove_friendly_object (tmp); 889 remove_friendly_object (tmp);
918 tmp->attack_movement = 0; /* needed? */ 890 tmp->attack_movement = 0; /* needed? */
919 } 891 }
920 892
921 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 893 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
… …
1122 success += calc_skill_exp (op, tmp, skill); 1094 success += calc_skill_exp (op, tmp, skill);
1123 } 1095 }
1124 } 1096 }
1125 } 1097 }
1126 } 1098 }
1099
1127 return success; 1100 return success;
1128} 1101}
1129
1130 1102
1131/* pray() - when this skill is called from do_skill(), it allows 1103/* 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. 1104 * 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 1105 * 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 1106 * 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 1107 * the effect here can be done on demand, we probably don't want to
1136 * give infinite exp by returning true in any cases. 1108 * give infinite exp by returning true in any cases.
1137 */ 1109 */
1138
1139int 1110int
1140pray (object *pl, object *skill) 1111pray (object *pl, object *skill)
1141{ 1112{
1142 char buf[MAX_BUF]; 1113 char buf[MAX_BUF];
1143 object *tmp; 1114 object *tmp;
… …
1168 if (pl->stats.grace < pl->stats.maxgrace) 1139 if (pl->stats.grace < pl->stats.maxgrace)
1169 { 1140 {
1170 pl->stats.grace++; 1141 pl->stats.grace++;
1171 pl->last_grace = -1; 1142 pl->last_grace = -1;
1172 } 1143 }
1144
1173 return 0; 1145 return 0;
1174} 1146}
1175 1147
1176/* This skill allows the player to regain a few sp or hp for a 1148/* 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 1149 * brief period of concentration. No armour or weapons may be
1178 * wielded/applied for this to work. The amount of time needed 1150 * wielded/applied for this to work. The amount of time needed
1179 * to concentrate and the # of points regained is dependant on 1151 * to concentrate and the # of points regained is dependant on
1180 * the level of the user. - b.t. thomas@astro.psu.edu 1152 * the level of the user. - b.t. thomas@astro.psu.edu
1181 */ 1153 */
1182
1183void 1154void
1184meditate (object *pl, object *skill) 1155meditate (object *pl, object *skill)
1185{ 1156{
1186 object *tmp; 1157 object *tmp;
1187 1158
… …
1230 pl->last_heal = -1; 1201 pl->last_heal = -1;
1231 } 1202 }
1232} 1203}
1233 1204
1234/* write_note() - this routine allows players to inscribe messages in 1205/* write_note() - this routine allows players to inscribe messages in
1235 * ordinary 'books' (anything that is type BOOK). b.t. 1206 * ordinary inscribable 'books' (anything that is not a SPELL). b.t.
1236 */ 1207 */
1237static int 1208static int
1238write_note (object *pl, object *item, const char *msg, object *skill) 1209write_note (object *pl, object *item, const char *msg, object *skill)
1239{ 1210{
1211 if (strstr (msg, "\nendmsg"))
1212 {
1213 new_draw_info (NDI_UNIQUE, 0, pl, "Trying to cheat now are we?");
1214 return 0;
1215 }
1216
1217 int len = strlen (msg);
1218
1219 if (!is_utf8_string ((U8 *)msg, len))
1220 {
1221 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your message is garbled (text must be UTF-8, client-bug)!");
1222 return 0;
1223 }
1224
1225 if (INVOKE_OBJECT (INSCRIBE_NOTE, item, ARG_PLAYER (pl->contr), ARG_STRING (msg), ARG_OBJECT (skill)))
1226 return RESULT_INT (0);
1227
1240 char buf[1024]; 1228 char buf[1024];
1241 object *newBook = NULL;
1242 1229
1243 /* a pair of sanity checks */ 1230 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 } 1231 {
1232 snprintf (buf, sizeof (buf), "%s\n", msg);
1253 1233
1254 if (strcasestr_local (msg, "endmsg")) 1234 object *newbook = arch_to_object (item->other_arch);
1255 { 1235 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; 1236 newbook->nrof = 1;
1277 newBook->msg = buf; 1237 newbook->msg = buf;
1278 newBook = insert_ob_in_ob (newBook, pl); 1238 newbook->flag [FLAG_IDENTIFIED] = true;
1279 esrv_send_item (pl, newBook); 1239
1240 if (item->subtype == 1) // mailscrolls
1280 } 1241 {
1281 else 1242 newbook->name = item->name;
1243 newbook->name_pl = item->name_pl;
1282 { 1244 }
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 1245
1246 pl->insert (newbook);
1247
1248 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)); 1249 new_draw_info_format (NDI_UNIQUE, 0, pl, "You write in the %s.", &item->name);
1291 return strlen (msg); 1250 return strlen (msg);
1292 } 1251 }
1293 else 1252 else
1294 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your message won't fit in the %s!", query_short_name (item)); 1253 new_draw_info_format (NDI_UNIQUE, 0, pl, "Your message won't fit in the %s!", &item->name);
1295 1254
1296 return 0; 1255 return 0;
1297} 1256}
1298 1257
1299/* write_scroll() - this routine allows players to inscribe spell scrolls 1258/* write_scroll() - this routine allows players to inscribe spell scrolls
1300 * of spells which they know. Backfire effects are possible with the 1259 * of spells which they know. Backfire effects are possible with the
1301 * severity of the backlash correlated with the difficulty of the scroll 1260 * severity of the backlash correlated with the difficulty of the scroll
1302 * that is attempted. -b.t. thomas@astro.psu.edu 1261 * that is attempted. -b.t. thomas@astro.psu.edu
1303 */ 1262 */
1304
1305static int 1263static int
1306write_scroll (object *pl, object *scroll, object *skill) 1264write_scroll (object *pl, object *scroll, object *skill)
1307{ 1265{
1308 int success = 0, confused = 0; 1266 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 1267
1318 /* Check if we are ready to attempt inscription */ 1268 /* Check if we are ready to attempt inscription */
1319 chosen_spell = pl->contr->ranged_ob; 1269 object *chosen_spell = pl->contr->ranged_ob;
1270
1320 if (!chosen_spell || chosen_spell->type != SPELL) 1271 if (!chosen_spell || chosen_spell->type != SPELL)
1321 { 1272 {
1322 new_draw_info (NDI_UNIQUE, 0, pl, "You need a spell readied in order to inscribe!"); 1273 new_draw_info (NDI_UNIQUE, 0, pl, "You need a spell readied in order to inscribe!");
1323 return 0; 1274 return 0;
1324 } 1275 }
… …
1330 } 1281 }
1331 1282
1332 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA) > pl->stats.sp) 1283 if (SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA) > pl->stats.sp)
1333 { 1284 {
1334 new_draw_info_format (NDI_UNIQUE, 0, pl, "You don't have enough mana to write a scroll of %s.", &chosen_spell->name); 1285 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; 1286 return 0;
1347 } 1287 }
1348 1288
1349 /* ok, we are ready to try inscription */ 1289 /* ok, we are ready to try inscription */
1350 if (QUERY_FLAG (pl, FLAG_CONFUSED)) 1290 if (QUERY_FLAG (pl, FLAG_CONFUSED))
… …
1354 pl->stats.grace -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE); 1294 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); 1295 pl->stats.sp -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA);
1356 1296
1357 if (random_roll (0, chosen_spell->level * 4 - 1, pl, PREFER_LOW) < skill->level) 1297 if (random_roll (0, chosen_spell->level * 4 - 1, pl, PREFER_LOW) < skill->level)
1358 { 1298 {
1359 if (scroll->nrof > 1) 1299 object *newscroll = arch_to_object (scroll->other_arch);
1360 { 1300 scroll->decrease ();
1361 newscroll = scroll->clone ();
1362 decrease_ob (scroll);
1363 newscroll->nrof = 1; 1301 newscroll->nrof = 1;
1364 } 1302
1365 else 1303 pl->contr->play_sound (sound_find ("inscribe_success"));
1366 newscroll = scroll;
1367 1304
1368 if (!confused) 1305 if (!confused)
1369 { 1306 {
1370 newscroll->level = MAX (skill->level, chosen_spell->level); 1307 newscroll->level = MAX (skill->level, chosen_spell->level);
1308 newscroll->flag [FLAG_IDENTIFIED] = true;
1371 new_draw_info (NDI_UNIQUE, 0, pl, "You succeed in writing a new scroll."); 1309 new_draw_info (NDI_UNIQUE, 0, pl, "You succeed in writing the spell.");
1372 } 1310 }
1373 else 1311 else
1374 { 1312 {
1375 chosen_spell = find_random_spell_in_ob (pl, NULL); 1313 chosen_spell = find_random_spell_in_ob (pl, NULL);
1376 if (!chosen_spell) 1314 if (!chosen_spell)
… …
1378 1316
1379 newscroll->level = MAX (skill->level, chosen_spell->level); 1317 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."); 1318 new_draw_info (NDI_UNIQUE, 0, pl, "In your confused state, you write down some odd spell.");
1381 } 1319 }
1382 1320
1383 if (newscroll->inv)
1384 newscroll->inv->destroy ();
1385
1386 tmp = chosen_spell->clone (); 1321 object *tmp = chosen_spell->clone ();
1387 insert_ob_in_ob (tmp, newscroll); 1322 insert_ob_in_ob (tmp, newscroll);
1388 1323
1389 /* Same code as from treasure.c - so they can better merge. 1324 /* Same code as from treasure.C - so they can better merge.
1390 * if players want to sell them, so be it. 1325 * if players want to sell them, so be it.
1391 */ 1326 */
1392 newscroll->value = newscroll->arch->value * newscroll->inv->value * (newscroll->level + 50) / (newscroll->inv->level + 50); 1327 newscroll->value = newscroll->arch->value * newscroll->inv->value * (newscroll->level + 50) / (newscroll->inv->level + 50);
1393 newscroll->stats.exp = newscroll->value / 5; 1328 newscroll->stats.exp = newscroll->value / 5;
1394 1329
1395 /* wait until finished manipulating the scroll before inserting it */ 1330 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 1331
1403 newscroll = insert_ob_in_ob (newscroll, pl);
1404 esrv_send_item (pl, newscroll);
1405 success = calc_skill_exp (pl, newscroll, skill); 1332 success = calc_skill_exp (pl, newscroll, skill);
1406 if (!confused) 1333 if (!confused)
1407 success *= 2; 1334 success *= 2;
1335
1408 success = success * skill->level; 1336 success = success * skill->level;
1409 return success; 1337 return success;
1410
1411 } 1338 }
1412 else 1339 else
1413 { /* Inscription has failed */ 1340 { /* Inscription has failed */
1341 pl->contr->play_sound (sound_find ("inscribe_fail"));
1414 1342
1415 if (chosen_spell->level > skill->level || confused) 1343 if (chosen_spell->level > skill->level || confused)
1416 { /*backfire! */ 1344 { /*backfire! */
1417 new_draw_info (NDI_UNIQUE, 0, pl, "Ouch! Your attempt to write a new scroll strains your mind!"); 1345 new_draw_info (NDI_UNIQUE, 0, pl, "Ouch! Your attempt to write a new scroll strains your mind!");
1346
1418 if (random_roll (0, 1, pl, PREFER_LOW) == 1) 1347 if (random_roll (0, 1, pl, PREFER_LOW) == 1)
1419 pl->drain_specific_stat (4); 1348 pl->drain_specific_stat (4);
1420 else 1349 else
1421 { 1350 {
1422 confuse_player (pl, pl, 99); 1351 confuse_player (pl, pl, 99);
1423 return (-30 * chosen_spell->level); 1352 return -30 * chosen_spell->level;
1424 } 1353 }
1425 } 1354 }
1426 else if (random_roll (0, pl->stats.Int - 1, pl, PREFER_HIGH) < 15) 1355 else if (random_roll (0, pl->stats.Int - 1, pl, PREFER_HIGH) < 15)
1427 { 1356 {
1428 new_draw_info (NDI_UNIQUE, 0, pl, "Your attempt to write a new scroll rattles your mind!"); 1357 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); 1358 confuse_player (pl, pl, 99);
1430 } 1359 }
1431 else 1360 else
1432 new_draw_info (NDI_UNIQUE, 0, pl, "You fail to write a new scroll."); 1361 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 } 1362 }
1434 1363
1435 return 0; 1364 return 0;
1436} 1365}
1437 1366
1438/* write_on_item() - wrapper for write_note and write_scroll */ 1367/* write_on_item() - wrapper for write_note and write_scroll */
1439int 1368int
1440write_on_item (object *pl, const char *params, object *skill) 1369write_on_item (object *pl, const char *params, object *skill)
1441{ 1370{
1442 object *item;
1443 const char *string = params;
1444 int msgtype;
1445 archetype *skat; 1371 archetype *skat;
1446 1372
1447 if (pl->type != PLAYER) 1373 if (pl->type != PLAYER)
1448 return 0; 1374 return 0;
1449 1375
1450 if (!params) 1376 if (!params)
1451 {
1452 params = ""; 1377 params = "";
1453 string = params;
1454 }
1455 1378
1456 skat = get_archetype_by_type_subtype (SKILL, SK_LITERACY); 1379 skat = get_archetype_by_type_subtype (SKILL, SK_LITERACY);
1457 1380
1458 /* Need to be able to read before we can write! */ 1381 /* Need to be able to read before we can write! */
1459 if (!find_skill_by_name (pl, skat->skill)) 1382 if (!find_skill_by_name (pl, skat->skill))
1460 { 1383 {
1461 new_draw_info (NDI_UNIQUE, 0, pl, "You must learn to read before you can write!"); 1384 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; 1385 return 0;
1463 } 1386 }
1464 1387
1465 /* if there is a message then it goes in a book and no message means 1388 object *item = find_marked_object (pl);
1466 * write active spell into the scroll
1467 */
1468 msgtype = (string[0] != '\0') ? BOOK : SCROLL;
1469 1389
1470 /* find an item of correct type to write on */ 1390 /* find an item of correct type to write on */
1471 if (!(item = find_marked_object (pl))) 1391 if (!item)
1392 {
1393 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.>");
1394 return 0;
1472 { 1395 }
1473 new_draw_info (NDI_UNIQUE, 0, pl, "You don't have any marked item to write on."); 1396
1397 if (item->type != INSCRIBABLE)
1398 {
1399 new_draw_info_format (NDI_UNIQUE, 0, pl, "You cannot inscribe this! H<You can only inscribe empty scrolls and books.>");
1474 return 0; 1400 return 0;
1475 } 1401 }
1476 1402
1477 if (QUERY_FLAG (item, FLAG_UNPAID)) 1403 if (QUERY_FLAG (item, FLAG_UNPAID))
1478 { 1404 {
1479 new_draw_info (NDI_UNIQUE, 0, pl, "You had better pay for that before you write on it."); 1405 new_draw_info (NDI_UNIQUE, 0, pl, "You had better pay for that before you write on it.");
1480 return 0; 1406 return 0;
1481 } 1407 }
1482 if (msgtype != item->type) 1408
1409 if (item->other_arch->type == SCROLL)
1483 { 1410 {
1484 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no %s to write on", msgtype == BOOK ? "book" : "scroll"); 1411 if (*params)
1412 {
1413 // check readied scroll
1414 new_draw_info_format (NDI_UNIQUE, 0, pl,
1415 "When inscribing spells you need to ready a spell and do not specify a string argument.\n"
1416 "Usage: cast [spell name]; use_skill %s", &skill->skill);
1485 return 0; 1417 return 0;
1486 } 1418 }
1487 1419
1488 if (msgtype == SCROLL)
1489 return write_scroll (pl, item, skill); 1420 return write_scroll (pl, item, skill);
1490 else if (msgtype == BOOK) 1421 }
1422 else
1423 {
1424 if (!*params)
1425 {
1426 new_draw_info_format (NDI_UNIQUE, 0, pl,
1427 "When inscribing books you need to specify the words you want to inscribe as command argument.\n"
1428 "Usage: use_skill %s <message>", &skill->skill);
1429 return 0;
1430 }
1431
1491 return write_note (pl, item, string, skill); 1432 return write_note (pl, item, params, skill);
1433 }
1492 1434
1493 return 0; 1435 return 0;
1494} 1436}
1495 1437
1496/* find_throw_ob() - if we request an object, then 1438/* find_throw_ob() - if we request an object, then
… …
1578 return tmp; 1520 return tmp;
1579} 1521}
1580 1522
1581/* make_throw_ob() We construct the 'carrier' object in 1523/* make_throw_ob() We construct the 'carrier' object in
1582 * which we will insert the object that is being thrown. 1524 * which we will insert the object that is being thrown.
1583 * This combination becomes the 'thrown object'. -b.t. 1525 * This combination becomes the 'thrown object'. -b.t.
1584 */ 1526 */
1585static object * 1527static object *
1586make_throw_ob (object *orig) 1528make_throw_ob (object *orig)
1587{ 1529{
1588 if (!orig) 1530 if (!orig)
1589 return NULL; 1531 return 0;
1590 1532
1591 if (QUERY_FLAG (orig, FLAG_APPLIED)) 1533 if (QUERY_FLAG (orig, FLAG_APPLIED))
1592 { 1534 {
1593 LOG (llevError, "BUG: make_throw_ob(): ob is applied\n"); 1535 LOG (llevError, "BUG: make_throw_ob(): ob is applied\n");
1594 /* insufficient workaround, but better than nothing */ 1536 /* insufficient workaround, but better than nothing */
… …
1598 object *toss_item = orig->clone (); 1540 object *toss_item = orig->clone ();
1599 1541
1600 toss_item->type = THROWN_OBJ; 1542 toss_item->type = THROWN_OBJ;
1601 CLEAR_FLAG (toss_item, FLAG_CHANGING); 1543 CLEAR_FLAG (toss_item, FLAG_CHANGING);
1602 toss_item->stats.dam = 0; /* default damage */ 1544 toss_item->stats.dam = 0; /* default damage */
1603 insert_ob_in_ob (orig, toss_item); 1545 toss_item->insert (orig);
1546
1604 return toss_item; 1547 return toss_item;
1605} 1548}
1606 1549
1607/* do_throw() - op throws any object toss_item. This code 1550/* do_throw() - op throws any object toss_item. This code
1608 * was borrowed from fire_bow. 1551 * was borrowed from fire_bow.
… …
1701 left = throw_ob; /* these are throwing objects left to the player */ 1644 left = throw_ob; /* these are throwing objects left to the player */
1702 1645
1703 /* sometimes get_split_ob can't split an object (because op->nrof==0?) 1646 /* sometimes get_split_ob can't split an object (because op->nrof==0?)
1704 * and returns NULL. We must use 'left' then 1647 * and returns NULL. We must use 'left' then
1705 */ 1648 */
1706 1649 if (!(throw_ob = throw_ob->split ()))
1707 if ((throw_ob = get_split_ob (throw_ob, 1)) == NULL)
1708 { 1650 {
1709 throw_ob = left; 1651 throw_ob = left;
1710 left->remove (); 1652 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 } 1653 }
1721 1654
1722 /* special case: throwing powdery substances like dust, dirt */ 1655 /* special case: throwing powdery substances like dust, dirt */
1723 if (throw_ob->type == POTION && throw_ob->subtype == POT_DUST) 1656 if (throw_ob->type == POTION && throw_ob->subtype == POT_DUST)
1724 { 1657 {
… …
1748 */ 1681 */
1749 throw_ob->inv->set_owner (op); 1682 throw_ob->inv->set_owner (op);
1750 throw_ob->direction = dir; 1683 throw_ob->direction = dir;
1751 1684
1752 /* the damage bonus from the force of the throw */ 1685 /* the damage bonus from the force of the throw */
1753 dam = (int) (str_factor * dam_bonus[eff_str]); 1686 dam = int (str_factor * dam_bonus[eff_str]);
1754 1687
1755 /* Now, lets adjust the properties of the thrown_ob. */ 1688 /* Now, lets adjust the properties of the thrown_ob. */
1756 1689
1757 /* how far to fly */ 1690 /* how far to fly */
1758 throw_ob->last_sp = (eff_str * 3) / 5; 1691 throw_ob->last_sp = (eff_str * 3) / 5;

Diff Legend

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