ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/spell_effect.C
(Generate patch)

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.118 by root, Sun Feb 7 04:22:33 2010 UTC vs.
Revision 1.141 by root, Fri Jan 27 22:00:40 2012 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
58} 58}
59 59
60int 60int
61recharge (object *op, object *caster, object *spell_ob) 61recharge (object *op, object *caster, object *spell_ob)
62{ 62{
63 object *wand, *tmp;
64 int ncharges; 63 int ncharges;
65 64
66 wand = find_marked_object (op); 65 object *wand = op->mark ();
66
67 if (!wand || wand->type != WAND) 67 if (!wand || wand->type != WAND)
68 { 68 {
69 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark the wand you want to recharge."); 69 op->failmsg ("You need to mark the wand you want to recharge.");
70 return 0; 70 return 0;
71 } 71 }
72
72 if (!(random_roll (0, 3, op, PREFER_HIGH))) 73 if (!(random_roll (0, 3, op, PREFER_HIGH)))
73 { 74 {
74 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s vibrates violently, then explodes!", query_name (wand)); 75 op->failmsgf ("The %s vibrates violently, then explodes!", query_name (wand));
75 op->play_sound (sound_find ("ob_explode")); 76 op->play_sound (sound_find ("ob_explode"));
76 wand->destroy (); 77 wand->destroy ();
77 tmp = get_archetype (shstr_fireball); 78 object *tmp = archetype::get (shstr_fireball);
78 tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10; 79 tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10;
79 80
80 if (!tmp->stats.dam) 81 if (!tmp->stats.dam)
81 tmp->stats.dam = 1; 82 tmp->stats.dam = 1;
82 83
… …
93 94
94 if (wand->inv && wand->inv->level) 95 if (wand->inv && wand->inv->level)
95 ncharges /= wand->inv->level; 96 ncharges /= wand->inv->level;
96 else 97 else
97 { 98 {
98 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", query_name (wand)); 99 op->failmsgf ("Your %s is broken.", query_name (wand));
99 return 0; 100 return 0;
100 } 101 }
101 102
102 if (!ncharges) 103 if (!ncharges)
103 ncharges = 1; 104 ncharges = 1;
104 105
105 wand->stats.food += ncharges; 106 wand->stats.food += ncharges;
106 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand)); 107 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand));
107 108
108 if (wand->arch && QUERY_FLAG (wand->arch, FLAG_ANIMATE)) 109 if (wand->arch && wand->arch->flag [FLAG_ANIMATE])
109 { 110 {
110 SET_FLAG (wand, FLAG_ANIMATE); 111 wand->set_flag (FLAG_ANIMATE);
111 wand->set_speed (wand->arch->speed); 112 wand->set_speed (wand->arch->speed);
112 } 113 }
113 114
114 return 1; 115 return 1;
115} 116}
… …
129{ 130{
130 int bonus_plus = 0; 131 int bonus_plus = 0;
131 const char *missile_name = "arrow"; 132 const char *missile_name = "arrow";
132 133
133 for (object *tmp = op->inv; tmp; tmp = tmp->below) 134 for (object *tmp = op->inv; tmp; tmp = tmp->below)
134 if (tmp->type == BOW && QUERY_FLAG (tmp, FLAG_APPLIED)) 135 if (tmp->type == BOW && tmp->flag [FLAG_APPLIED])
135 missile_name = tmp->race; 136 missile_name = tmp->race;
136 137
137 int missile_plus = spell->stats.dam + SP_level_dam_adjust (caster, spell); 138 int missile_plus = spell->stats.dam + SP_level_dam_adjust (caster, spell);
138 139
139 archetype *missile_arch = archetype::find (missile_name); 140 archetype *missile_arch = archetype::find (missile_name);
… …
158 break; 159 break;
159 160
160 if (!al) 161 if (!al)
161 { 162 {
162 missile->destroy (); 163 missile->destroy ();
163 new_draw_info_format (NDI_UNIQUE, 0, op, "No such object %ss of %s", missile_name, spellparam); 164 op->failmsgf ("No such object %ss of %s", missile_name, spellparam);
164 return 0; 165 return 0;
165 } 166 }
166 167
167 if (al->item->slaying) 168 if (al->item->slaying)
168 { 169 {
169 missile->destroy (); 170 missile->destroy ();
170 new_draw_info_format (NDI_UNIQUE, 0, op, "You are not allowed to create %ss of %s", missile_name, spellparam); 171 op->failmsgf ("You are not allowed to create %ss of %s", missile_name, spellparam);
171 return 0; 172 return 0;
172 } 173 }
173 174
174 give_artifact_abilities (missile, al->item); 175 give_artifact_abilities (missile, al->item);
175 /* These special arrows cost something extra. Don't have them also be magical - 176 /* These special arrows cost something extra. Don't have them also be magical -
… …
193 194
194 missile->magic = missile_plus; 195 missile->magic = missile_plus;
195 /* Can't get any money for these objects */ 196 /* Can't get any money for these objects */
196 missile->value = 0; 197 missile->value = 0;
197 198
198 SET_FLAG (missile, FLAG_IDENTIFIED); 199 missile->set_flag (FLAG_IDENTIFIED);
199 200
200 if (!cast_create_obj (op, caster, missile, dir) && op->type == PLAYER && !missile->destroyed ()) 201 if (!cast_create_obj (op, caster, missile, dir) && op->type == PLAYER && !missile->destroyed ())
201 pick_up (op, missile); 202 pick_up (op, missile);
202 203
203 return 1; 204 return 1;
… …
257 /* Pretty unlikely (there are some very low food items), but you never 258 /* Pretty unlikely (there are some very low food items), but you never
258 * know 259 * know
259 */ 260 */
260 if (!at) 261 if (!at)
261 { 262 {
262 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough experience to create any food."); 263 op->failmsgf ("You don't have enough experience to create any food.");
263 return 0; 264 return 0;
264 } 265 }
265 266
266 food_value /= at->stats.food; 267 food_value /= at->stats.food;
267 new_op = at->instance (); 268 new_op = at->instance ();
… …
297 mflags = get_map_flags (m, &m, x, y, &x, &y); 298 mflags = get_map_flags (m, &m, x, y, &x, &y);
298 299
299 if (mflags & P_OUT_OF_MAP) 300 if (mflags & P_OUT_OF_MAP)
300 break; 301 break;
301 302
302 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (mflags & P_NO_MAGIC)) 303 if (!op->flag [FLAG_WIZCAST] && (mflags & P_NO_MAGIC))
303 { 304 {
304 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic."); 305 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic.");
305 return 0; 306 return 0;
306 } 307 }
307 308
308 if (mflags & P_IS_ALIVE) 309 if (mflags & P_IS_ALIVE)
309 { 310 {
310 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 311 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
311 if (QUERY_FLAG (tmp, FLAG_ALIVE) && (tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 312 if (tmp->flag [FLAG_ALIVE] && (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
312 { 313 {
313 new_draw_info (NDI_UNIQUE, 0, op, "You detect something."); 314 new_draw_info (NDI_UNIQUE, 0, op, "You detect something.");
314 if (tmp->head != NULL) 315 if (tmp->head != NULL)
315 tmp = tmp->head; 316 tmp = tmp->head;
316 examine_monster (op, tmp); 317 examine_monster (op, tmp);
… …
339 if (pl->type == PLAYER) 340 if (pl->type == PLAYER)
340 { 341 {
341 /* If race isn't set, then invisible unless it is undead */ 342 /* If race isn't set, then invisible unless it is undead */
342 if (!pl->contr->invis_race) 343 if (!pl->contr->invis_race)
343 { 344 {
344 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 345 if (mon->flag [FLAG_UNDEAD])
345 return 0; 346 return 0;
346 347
347 return 1; 348 return 1;
348 } 349 }
349 350
… …
380int 381int
381cast_invisible (object *op, object *caster, object *spell_ob) 382cast_invisible (object *op, object *caster, object *spell_ob)
382{ 383{
383 if (op->invisible > 1000) 384 if (op->invisible > 1000)
384 { 385 {
385 new_draw_info (NDI_UNIQUE, 0, op, "You can not extend the duration of your invisibility any further"); 386 op->failmsg ("You can not extend the duration of your invisibility any further");
386 return 0; 387 return 0;
387 } 388 }
388 389
389 /* Remove the switch with 90% duplicate code - just handle the differences with 390 /* Remove the switch with 90% duplicate code - just handle the differences with
390 * and if statement or two. 391 * and if statement or two.
391 */ 392 */
392 op->invisible += spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 393 op->invisible += spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
394
393 /* max duration */ 395 /* limit duration */
394 if (op->invisible > 1000) 396 min_it (op->invisible, 1000);
395 op->invisible = 1000;
396 397
397 if (op->type == PLAYER) 398 if (op->type == PLAYER)
398 { 399 {
399 op->contr->invis_race = spell_ob->race; 400 op->contr->invis_race = spell_ob->race;
400 401
401 if (QUERY_FLAG (spell_ob, FLAG_MAKE_INVIS)) 402 if (spell_ob->flag [FLAG_MAKE_INVIS])
402 op->contr->tmp_invis = 0; 403 op->contr->tmp_invis = 0;
403 else 404 else
404 op->contr->tmp_invis = 1; 405 op->contr->tmp_invis = 1;
405 406
406 op->contr->hidden = 0; 407 op->contr->hidden = 0;
… …
448 // earth to dust tears down everything that can be torn down 449 // earth to dust tears down everything that can be torn down
449 for (object *next, *tmp = m->at (sx, sy).bot; tmp; tmp = next) 450 for (object *next, *tmp = m->at (sx, sy).bot; tmp; tmp = next)
450 { 451 {
451 next = tmp->above; 452 next = tmp->above;
452 453
453 if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN)) 454 if (tmp->flag [FLAG_TEAR_DOWN])
454 hit_player (tmp, 9998, op, AT_PHYSICAL, 0); 455 hit_player (tmp, 9998, op, AT_PHYSICAL, 0);
455 } 456 }
456 } 457 }
457 458
458 return 1; 459 return 1;
… …
460 461
461void 462void
462execute_word_of_recall (object *op) 463execute_word_of_recall (object *op)
463{ 464{
464 if (object *pl = op->in_player ()) 465 if (object *pl = op->in_player ())
465 {
466 if (pl->ms ().flags () & P_NO_CLERIC && !QUERY_FLAG (pl, FLAG_WIZCAST)) 466 if (pl->ms ().flags () & P_NO_CLERIC && !pl->flag [FLAG_WIZCAST])
467 new_draw_info (NDI_UNIQUE, 0, pl, "You feel something fizzle inside you."); 467 new_draw_info (NDI_UNIQUE, 0, pl, "You feel something fizzle inside you.");
468 else 468 else
469 pl->player_goto (op->slaying, op->stats.hp, op->stats.sp); 469 pl->player_goto (op->slaying, op->stats.hp, op->stats.sp);
470 }
471 470
472 op->destroy (); 471 op->destroy ();
473} 472}
474 473
475/* Word of recall causes the player to return 'home'. 474/* Word of recall causes the player to return 'home'.
… …
477 * time delay effect. 476 * time delay effect.
478 */ 477 */
479int 478int
480cast_word_of_recall (object *op, object *caster, object *spell_ob) 479cast_word_of_recall (object *op, object *caster, object *spell_ob)
481{ 480{
482 object *dummy; 481 if (!op->is_player ())
483 int time;
484
485 if (op->type != PLAYER)
486 return 0; 482 return 0;
487 483
488 if (find_obj_by_type_subtype (op, SPELL_EFFECT, SP_WORD_OF_RECALL)) 484 if (find_obj_by_type_subtype (op, SPELL_EFFECT, SP_WORD_OF_RECALL))
489 { 485 {
490 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you."); 486 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you.");
491 return 1; 487 return 1;
492 } 488 }
493 489
494 dummy = get_archetype (FORCE_NAME); 490 object *dummy = archetype::get (FORCE_NAME);
495 491
496 if (!dummy)
497 {
498 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
499 LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n");
500 return 0;
501 }
502
503 time = spell_ob->duration - SP_level_duration_adjust (caster, spell_ob); 492 int time = max (1, spell_ob->duration - SP_level_duration_adjust (caster, spell_ob));
504 if (time < 1)
505 time = 1;
506 493
507 /* value of speed really doesn't make much difference, as long as it is 494 /* value of speed really doesn't make much difference, as long as it is
508 * positive. Lower value may be useful so that the problem doesn't 495 * positive. Lower value may be useful so that the problem doesn't
509 * do anything really odd if it say a -1000 or something. 496 * do anything really odd if it say a -1000 or something.
510 */ 497 */
511 dummy->set_speed (0.002); 498 dummy->set_speed (0.002);
512 dummy->speed_left = -dummy->speed * time; 499 dummy->speed_left = -dummy->speed * time;
513 dummy->type = SPELL_EFFECT; 500 dummy->type = SPELL_EFFECT;
514 dummy->subtype = SP_WORD_OF_RECALL; 501 dummy->subtype = SP_WORD_OF_RECALL;
515 502 dummy->slaying = op->contr->savebed_map;
516 /* If we could take advantage of enter_player_savebed() here, it would be 503 dummy->stats.hp = op->contr->bed_x;
517 * nice, but until the map load fails, we can't. 504 dummy->stats.sp = op->contr->bed_y;
518 */
519 EXIT_PATH (dummy) = op->contr->savebed_map;
520 EXIT_X (dummy) = op->contr->bed_x;
521 EXIT_Y (dummy) = op->contr->bed_y;
522 505
523 op->insert (dummy); 506 op->insert (dummy);
524 507
525 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you."); 508 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you.");
526 509
… …
645 628
646 if ((spell_ob->move_block || x != op->x || y != op->y) && 629 if ((spell_ob->move_block || x != op->x || y != op->y) &&
647 (get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE) || 630 (get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE) ||
648 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) == spell_ob->move_block))) 631 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) == spell_ob->move_block)))
649 { 632 {
650 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 633 op->failmsg ("Something is in the way.");
651 return 0; 634 return 0;
652 } 635 }
653 636
654 if (spell_ob->other_arch) 637 if (spell_ob->other_arch)
655 tmp = spell_ob->other_arch->instance (); 638 tmp = spell_ob->other_arch->instance ();
… …
679 tmp->attacktype = spell_ob->attacktype; 662 tmp->attacktype = spell_ob->attacktype;
680 tmp->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 663 tmp->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
681 tmp->stats.dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 664 tmp->stats.dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
682 tmp->range = 0; 665 tmp->range = 0;
683 } 666 }
684 else if (QUERY_FLAG (tmp, FLAG_ALIVE)) 667 else if (tmp->flag [FLAG_ALIVE])
685 { 668 {
686 tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 669 tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
687 tmp->stats.maxhp = tmp->stats.hp; 670 tmp->stats.maxhp = tmp->stats.hp;
688 } 671 }
689 672
690 if (QUERY_FLAG (spell_ob, FLAG_IS_USED_UP) || QUERY_FLAG (tmp, FLAG_IS_USED_UP)) 673 if (spell_ob->flag [FLAG_IS_USED_UP] || tmp->flag [FLAG_IS_USED_UP])
691 { 674 {
692 tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 675 tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
693 SET_FLAG (tmp, FLAG_IS_USED_UP); 676 tmp->set_flag (FLAG_IS_USED_UP);
694 } 677 }
695 678
696 if (QUERY_FLAG (spell_ob, FLAG_TEAR_DOWN)) 679 if (spell_ob->flag [FLAG_TEAR_DOWN])
697 { 680 {
698 tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 681 tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
699 tmp->stats.maxhp = tmp->stats.hp; 682 tmp->stats.maxhp = tmp->stats.hp;
700 SET_FLAG (tmp, FLAG_TEAR_DOWN); 683 tmp->set_flag (FLAG_TEAR_DOWN);
701 SET_FLAG (tmp, FLAG_ALIVE); 684 tmp->set_flag (FLAG_ALIVE);
702 } 685 }
703 686
704 /* This can't really hurt - if the object doesn't kill anything, 687 /* This can't really hurt - if the object doesn't kill anything,
705 * these fields just won't be used. Do not set the owner for 688 * these fields just won't be used. Do not set the owner for
706 * earthwalls, though, so they survive restarts. 689 * earthwalls, though, so they survive restarts.
… …
771 } 754 }
772 else 755 else
773 negblocked = 1; 756 negblocked = 1;
774 } 757 }
775 758
776 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) 759 if (tmp->flag [FLAG_BLOCKSVIEW])
777 update_all_los (op->map, op->x, op->y); 760 update_all_los (op->map, op->x, op->y);
778 761
779 return 1; 762 return 1;
780} 763}
781 764
… …
790 if (op->type != PLAYER) 773 if (op->type != PLAYER)
791 return 0; 774 return 0;
792 775
793 if (!dir) 776 if (!dir)
794 { 777 {
795 new_draw_info (NDI_UNIQUE, 0, op, "In what direction?"); 778 op->failmsg ("In what direction?");
796 return 0; 779 return 0;
797 } 780 }
798 781
799 /* Given the new outdoor maps, can't let players dimension door for 782 /* Given the new outdoor maps, can't let players dimension door for
800 * ever, so put limits in. 783 * ever, so put limits in.
… …
805 { 788 {
806 int count = atoi (spellparam); 789 int count = atoi (spellparam);
807 790
808 if (count > maxdist) 791 if (count > maxdist)
809 { 792 {
810 new_draw_info (NDI_UNIQUE, 0, op, "You can't dimension door that far!"); 793 op->failmsg ("You can't dimension door that far!");
811 return 0; 794 return 0;
812 } 795 }
813 796
814 for (dist = 0; dist < count; dist++) 797 for (dist = 0; dist < count; dist++)
815 { 798 {
… …
876 break; 859 break;
877 860
878 } 861 }
879 if (!dist) 862 if (!dist)
880 { 863 {
881 new_draw_info (NDI_UNIQUE, 0, op, "Your spell failed!\n"); 864 op->failmsg ("Your spell failed!\n");
882 return 0; 865 return 0;
883 } 866 }
884 } 867 }
885 868
886 /* Actually move the player now */ 869 /* Actually move the player now */
… …
1002 tmp->stats.grace = tmp->stats.maxgrace; 985 tmp->stats.grace = tmp->stats.maxgrace;
1003 success = 1; 986 success = 1;
1004 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel redeemed with your god!"); 987 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel redeemed with your god!");
1005 } 988 }
1006 989
1007 if (spell->stats.food && tmp->stats.food < 999) 990 if (spell->stats.food && tmp->stats.food < MAX_FOOD)
1008 { 991 {
1009 tmp->stats.food += spell->stats.food; 992 tmp->stats.food += spell->stats.food;
1010 993 min_it (tmp->stats.food, MAX_FOOD);
1011 if (tmp->stats.food > 999)
1012 tmp->stats.food = 999;
1013 994
1014 success = 1; 995 success = 1;
1015 /* We could do something a bit better like the messages for healing above */ 996 /* We could do something a bit better like the messages for healing above */
1016 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel your belly fill with food"); 997 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel your belly fill with food");
1017 } 998 }
… …
1064 break; 1045 break;
1065 } 1046 }
1066 else if (spell_ob->race && spell_ob->race == tmp2->name) 1047 else if (spell_ob->race && spell_ob->race == tmp2->name)
1067 { 1048 {
1068 if (!silent) 1049 if (!silent)
1069 new_draw_info_format (NDI_UNIQUE, 0, op,
1070 "You can not cast %s while %s is in effect", 1050 op->failmsgf ("You can not cast %s while %s is in effect",
1071 &spell_ob->name, &tmp2->name_pl); 1051 &spell_ob->name, &tmp2->name_pl);
1072 1052
1073 return 0; 1053 return 0;
1074 } 1054 }
1075 } 1055 }
1076 } 1056 }
… …
1092 1072
1093 new_draw_info_format (NDI_UNIQUE, 0, op, 1073 new_draw_info_format (NDI_UNIQUE, 0, op,
1094 "You create an aura of magical force. H<The effect will last for about %.10g seconds.>", 1074 "You create an aura of magical force. H<The effect will last for about %.10g seconds.>",
1095 TICK2TIME (duration)); 1075 TICK2TIME (duration));
1096 1076
1097 force = get_archetype (FORCE_NAME); 1077 force = archetype::get (FORCE_NAME);
1098 force->subtype = FORCE_CHANGE_ABILITY; 1078 force->subtype = FORCE_CHANGE_ABILITY;
1099 force->duration = duration; 1079 force->duration = duration;
1100 1080
1101 if (spell_ob->race) 1081 if (spell_ob->race)
1102 force->name = spell_ob->race; 1082 force->name = spell_ob->race;
… …
1105 1085
1106 force->name_pl = spell_ob->name; 1086 force->name_pl = spell_ob->name;
1107 1087
1108 force->speed = 1.0; 1088 force->speed = 1.0;
1109 force->speed_left = -1.0; 1089 force->speed_left = -1.0;
1110 SET_FLAG (force, FLAG_APPLIED); 1090 force->set_flag (FLAG_APPLIED);
1111 1091
1112 /* Now start processing the effects. First, protections */ 1092 /* Now start processing the effects. First, protections */
1113 for (i = 0; i < NROFATTACKS; i++) 1093 for (i = 0; i < NROFATTACKS; i++)
1114 {
1115 if (spell_ob->resist[i]) 1094 if (spell_ob->resist[i])
1116 {
1117 force->resist[i] = spell_ob->resist[i] + SP_level_dam_adjust (caster, spell_ob); 1095 force->resist[i] = min (100, spell_ob->resist[i] + SP_level_dam_adjust (caster, spell_ob));
1118 if (force->resist[i] > 100)
1119 force->resist[i] = 100;
1120 }
1121 }
1122 1096
1123 if (spell_ob->stats.hp) 1097 if (spell_ob->stats.hp)
1124 force->stats.hp = spell_ob->stats.hp + SP_level_dam_adjust (caster, spell_ob); 1098 force->stats.hp = spell_ob->stats.hp + SP_level_dam_adjust (caster, spell_ob);
1125 1099
1126 if (tmp->type == PLAYER) 1100 if (tmp->type == PLAYER)
… …
1145 } 1119 }
1146 } 1120 }
1147 1121
1148 force->move_type = spell_ob->move_type; 1122 force->move_type = spell_ob->move_type;
1149 1123
1150 if (QUERY_FLAG (spell_ob, FLAG_SEE_IN_DARK)) 1124 if (spell_ob->flag [FLAG_SEE_IN_DARK])
1151 SET_FLAG (force, FLAG_SEE_IN_DARK); 1125 force->set_flag (FLAG_SEE_IN_DARK);
1152 1126
1153 if (QUERY_FLAG (spell_ob, FLAG_XRAYS)) 1127 if (spell_ob->flag [FLAG_XRAYS])
1154 SET_FLAG (force, FLAG_XRAYS); 1128 force->set_flag (FLAG_XRAYS);
1155 1129
1156 /* Haste/bonus speed */ 1130 /* Haste/bonus speed */
1157 if (spell_ob->stats.exp) 1131 if (spell_ob->stats.exp)
1158 { 1132 {
1159 if (op->speed > 0.5f) 1133 if (op->speed > 0.5f)
… …
1212 } 1186 }
1213 } 1187 }
1214 1188
1215 if (force == NULL) 1189 if (force == NULL)
1216 { 1190 {
1217 force = get_archetype (FORCE_NAME); 1191 force = archetype::get (FORCE_NAME);
1218 force->subtype = FORCE_CHANGE_ABILITY; 1192 force->subtype = FORCE_CHANGE_ABILITY;
1219 if (spell_ob->race) 1193 if (spell_ob->race)
1220 force->name = spell_ob->race; 1194 force->name = spell_ob->race;
1221 else 1195 else
1222 force->name = spell_ob->name; 1196 force->name = spell_ob->name;
… …
1237 { 1211 {
1238 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); 1212 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1239 } 1213 }
1240 return 0; 1214 return 0;
1241 } 1215 }
1216
1242 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1217 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1243 force->speed = 1.0; 1218 force->speed = 1.0;
1244 force->speed_left = -1.0; 1219 force->speed_left = -1.0;
1245 SET_FLAG (force, FLAG_APPLIED); 1220 force->set_flag (FLAG_APPLIED);
1246 1221
1247 if (!god) 1222 if (!god)
1248 { 1223 {
1249 new_draw_info (NDI_UNIQUE, 0, op, "Your blessing seems empty."); 1224 new_draw_info (NDI_UNIQUE, 0, op, "Your blessing seems empty.");
1250 } 1225 }
… …
1304 * the nuggets, alchemy the gold from that, etc. 1279 * the nuggets, alchemy the gold from that, etc.
1305 * Otherwise, give 9 silver on the gold for other objects, 1280 * Otherwise, give 9 silver on the gold for other objects,
1306 * so that it would still be more affordable to haul 1281 * so that it would still be more affordable to haul
1307 * the stuff back to town. 1282 * the stuff back to town.
1308 */ 1283 */
1309 if (QUERY_FLAG (obj, FLAG_UNPAID)) 1284 if (obj->flag [FLAG_UNPAID])
1310 value = 0; 1285 value = 0;
1311 else if (obj->type == MONEY || obj->type == GEM) 1286 else if (obj->type == MONEY || obj->type == GEM)
1312 value /= 3; 1287 value /= 3;
1313 else 1288 else
1314 value = value * 9 / 10; 1289 value = value * 9 / 10;
… …
1368 1343
1369 for (object *next, *tmp = mp->at (nx, ny).bot; tmp; tmp = next) 1344 for (object *next, *tmp = mp->at (nx, ny).bot; tmp; tmp = next)
1370 { 1345 {
1371 next = tmp->above; 1346 next = tmp->above;
1372 1347
1373 if (tmp->weight > 0 && !QUERY_FLAG (tmp, FLAG_NO_PICK) && 1348 if (tmp->weight > 0 && !tmp->flag [FLAG_NO_PICK] &&
1374 !QUERY_FLAG (tmp, FLAG_ALIVE) && !QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) 1349 !tmp->flag [FLAG_ALIVE] && !tmp->flag [FLAG_IS_CAULDRON])
1375 { 1350 {
1376 if (tmp->inv) 1351 if (tmp->inv)
1377 { 1352 {
1378 object *next1, *tmp1; 1353 object *next1, *tmp1;
1379 1354
1380 for (tmp1 = tmp->inv; tmp1; tmp1 = next1) 1355 for (tmp1 = tmp->inv; tmp1; tmp1 = next1)
1381 { 1356 {
1382 next1 = tmp1->below; 1357 next1 = tmp1->below;
1383 if (tmp1->weight > 0 && !QUERY_FLAG (tmp1, FLAG_NO_PICK) && 1358 if (tmp1->weight > 0 && !tmp1->flag [FLAG_NO_PICK] &&
1384 !QUERY_FLAG (tmp1, FLAG_ALIVE) && !QUERY_FLAG (tmp1, FLAG_IS_CAULDRON)) 1359 !tmp1->flag [FLAG_ALIVE] && !tmp1->flag [FLAG_IS_CAULDRON])
1385 alchemy_object (tmp1, value, weight); 1360 alchemy_object (tmp1, value, weight);
1386 } 1361 }
1387 } 1362 }
1388 1363
1389 alchemy_object (tmp, value, weight); 1364 alchemy_object (tmp, value, weight);
… …
1394 } 1369 }
1395 1370
1396 value -= rndm (value >> 4); 1371 value -= rndm (value >> 4);
1397 value = min (value, value_max); 1372 value = min (value, value_max);
1398 1373
1399 for (int i = 0; i < sizeof (nugget) / sizeof (nugget [0]); ++i) 1374 for (int i = 0; i < array_length (nugget); ++i)
1400 if (int nrof = value / nugget [i]->value) 1375 if (int nrof = value / nugget [i]->value)
1401 { 1376 {
1402 value -= nrof * nugget[i]->value; 1377 value -= nrof * nugget[i]->value;
1403 1378
1404 object *tmp = nugget[i]->instance (); 1379 object *tmp = nugget[i]->instance ();
… …
1422int 1397int
1423remove_curse (object *op, object *caster, object *spell) 1398remove_curse (object *op, object *caster, object *spell)
1424{ 1399{
1425 int success = 0, was_one = 0; 1400 int success = 0, was_one = 0;
1426 1401
1402 int num_uncurse = max (1, spell->stats.dam + SP_level_dam_adjust (caster, spell));
1403
1404 op->splay_marked ();
1405
1406 int typeflag = spell->last_sp ? FLAG_DAMNED : FLAG_CURSED;
1407
1427 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1408 for (object *tmp = op->inv; tmp && num_uncurse; tmp = tmp->below)
1428 if (QUERY_FLAG (tmp, FLAG_APPLIED) && 1409 if (!tmp->invisible && tmp->flag [typeflag])
1429 ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) ||
1430 (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED))))
1431 { 1410 {
1432 was_one++; 1411 ++was_one;
1433 1412
1434 if (tmp->level <= casting_level (caster, spell)) 1413 if (tmp->level <= casting_level (caster, spell))
1435 { 1414 {
1436 success++; 1415 ++success;
1437 if (QUERY_FLAG (spell, FLAG_DAMNED)) 1416 --num_uncurse;
1438 CLEAR_FLAG (tmp, FLAG_DAMNED);
1439 1417
1440 CLEAR_FLAG (tmp, FLAG_CURSED); 1418 tmp->clr_flag (typeflag);
1441 CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED); 1419 tmp->clr_flag (FLAG_CURSED);
1420 tmp->clr_flag (FLAG_KNOWN_CURSED);
1442 tmp->value = 0; /* Still can't sell it */ 1421 tmp->value = 0; /* Still can't sell it */
1443 1422
1444 if (object *pl = tmp->visible_to ()) 1423 if (object *pl = tmp->visible_to ())
1445 esrv_update_item (UPD_FLAGS, pl, tmp); 1424 esrv_update_item (UPD_FLAGS, pl, tmp);
1446 } 1425 }
1447 } 1426 }
1448 1427
1449 if (op->type == PLAYER) 1428 if (op->type == PLAYER)
1450 { 1429 {
1451 if (success) 1430 if (success)
1452 new_draw_info (NDI_UNIQUE, 0, op, "You feel like some of your items are looser now."); 1431 new_draw_info (NDI_UNIQUE, 0, op, "You realise that some of your items look shinier now. H<You successfully removed some curses.>");
1453 else 1432 else
1454 { 1433 {
1455 if (was_one) 1434 if (was_one)
1456 new_draw_info (NDI_UNIQUE, 0, op, "You failed to remove the curse."); 1435 new_draw_info (NDI_UNIQUE, 0, op, "You failed to remove any curse. H<The spell was not strong enough.>");
1457 else 1436 else
1458 new_draw_info (NDI_UNIQUE, 0, op, "You are not using any cursed items."); 1437 new_draw_info (NDI_UNIQUE, 0, op, "You are not having any cursed items. H<Epic fail.>");
1459 } 1438 }
1460 } 1439 }
1461 1440
1462 return success; 1441 return success;
1463} 1442}
1464 1443
1465/* Identifies objects in the players inventory/on the ground */ 1444/* Identifies objects in the players inventory/on the ground */
1466int 1445int
1467cast_identify (object *op, object *caster, object *spell) 1446cast_identify (object *op, object *caster, object *spell)
1468{ 1447{
1469 object *tmp;
1470 dynbuf_text &buf = msg_dynbuf; buf.clear (); 1448 dynbuf_text &buf = msg_dynbuf; buf.clear ();
1471 1449
1472 int num_ident = max (1, spell->stats.dam + SP_level_dam_adjust (caster, spell)); 1450 int num_ident = max (1, spell->stats.dam + SP_level_dam_adjust (caster, spell));
1473 1451
1452 op->splay_marked ();
1453
1474 for (tmp = op->inv; tmp; tmp = tmp->below) 1454 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1475 { 1455 {
1476 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp)) 1456 if (!tmp->flag [FLAG_IDENTIFIED] && !tmp->invisible && tmp->need_identify ())
1477 { 1457 {
1478 identify (tmp); 1458 identify (tmp);
1479 1459
1480 if (op->type == PLAYER) 1460 if (op->type == PLAYER)
1481 { 1461 {
… …
1494 * stuff on the floor. Only identify stuff on the floor if the spell 1474 * stuff on the floor. Only identify stuff on the floor if the spell
1495 * was not fully used. 1475 * was not fully used.
1496 */ 1476 */
1497 if (num_ident) 1477 if (num_ident)
1498 { 1478 {
1499 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above) 1479 for (object *tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
1500 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp)) 1480 if (!tmp->flag [FLAG_IDENTIFIED] && !tmp->invisible && tmp->need_identify ())
1501 { 1481 {
1502 identify (tmp); 1482 identify (tmp);
1503 1483
1504 if (object *pl = tmp->visible_to ()) 1484 if (object *pl = tmp->visible_to ())
1505 { 1485 {
… …
1531 1511
1532int 1512int
1533cast_detection (object *op, object *caster, object *spell, object *skill) 1513cast_detection (object *op, object *caster, object *spell, object *skill)
1534{ 1514{
1535 object *tmp, *last, *god, *detect; 1515 object *tmp, *last, *god, *detect;
1536 int done_one, range, mflags, floor, level; 1516 int done_one, range, floor, level;
1537 sint16 x, y, nx, ny; 1517 sint16 x, y, nx, ny;
1538 maptile *m; 1518 maptile *m;
1539 1519
1540 /* We precompute some values here so that we don't have to keep 1520 /* We precompute some values here so that we don't have to keep
1541 * doing it over and over again. 1521 * doing it over and over again.
… …
1554 * floor. But this is not true for show invisible. 1534 * floor. But this is not true for show invisible.
1555 * Basically, we just go and find the top object and work 1535 * Basically, we just go and find the top object and work
1556 * down - that is easier than working up. 1536 * down - that is easier than working up.
1557 */ 1537 */
1558 1538
1559 for (last = NULL, tmp = m->at (nx, ny).bot; tmp; tmp = tmp->above) 1539 for (last = 0, tmp = m->at (nx, ny).bot; tmp; tmp = tmp->above)
1560 last = tmp; 1540 last = tmp;
1561 1541
1562 /* Shouldn't happen, but if there are no objects on a space, this 1542 /* Shouldn't happen, but if there are no objects on a space, this
1563 * would happen. 1543 * would happen.
1564 */ 1544 */
1565 if (!last) 1545 if (!last)
1566 continue; 1546 continue;
1567 1547
1568 done_one = 0; 1548 done_one = 0;
1569 floor = 0; 1549 floor = 0;
1570 detect = NULL; 1550 detect = 0;
1571 for (tmp = last; tmp; tmp = tmp->below) 1551 for (tmp = last; tmp; tmp = tmp->below)
1572 { 1552 {
1573 /* show invisible */ 1553 /* show invisible */
1574 if (QUERY_FLAG (spell, FLAG_MAKE_INVIS) && 1554 if (spell->flag [FLAG_MAKE_INVIS]
1575 /* Might there be other objects that we can make visible? */ 1555 /* Might there be other objects that we can make visible? */
1576 (tmp->invisible && (QUERY_FLAG (tmp, FLAG_MONSTER) 1556 && (tmp->invisible && (tmp->flag [FLAG_MONSTER]
1577 || (tmp->type == PLAYER && !QUERY_FLAG (tmp, FLAG_WIZ)) 1557 || (tmp->type == PLAYER && !tmp->flag [FLAG_WIZ])
1578 || tmp->type == T_HANDLE 1558 || tmp->type == T_HANDLE
1579 || tmp->type == TRAPDOOR 1559 || tmp->type == TRAPDOOR
1580 || tmp->type == EXIT 1560 || tmp->type == EXIT
1581 || tmp->type == HOLE 1561 || tmp->type == HOLE
1582 || tmp->type == BUTTON 1562 || tmp->type == BUTTON
1583 || tmp->type == TELEPORTER 1563 || tmp->type == TELEPORTER
1584 || tmp->type == GATE 1564 || tmp->type == GATE
1585 || tmp->type == LOCKED_DOOR 1565 || tmp->type == LOCKED_DOOR
1586 || tmp->type == WEAPON 1566 || tmp->type == WEAPON
1587 || tmp->type == ALTAR 1567 || tmp->type == ALTAR
1588 || tmp->type == SIGN 1568 || (tmp->type == SIGN && tmp->face != magicmouth_face)
1589 || tmp->type == TRIGGER_PEDESTAL 1569 || tmp->type == TRIGGER_PEDESTAL
1590 || tmp->type == SPECIAL_KEY 1570 || tmp->type == SPECIAL_KEY
1591 || tmp->type == TREASURE 1571 || tmp->type == TREASURE
1592 || tmp->type == BOOK 1572 || tmp->type == BOOK
1593 || tmp->type == HOLY_ALTAR 1573 || tmp->type == HOLY_ALTAR
1594 || tmp->type == CONTAINER))) 1574 || tmp->type == CONTAINER)))
1595 { 1575 {
1576 printf ("show inv %s\n", tmp->debug_desc());//D
1596 if (random_roll (0, skill->level - 1, op, PREFER_HIGH) > level / 4) 1577 if (random_roll (0, skill->level - 1, op, PREFER_HIGH) > level / 4)
1597 { 1578 {
1598 tmp->invisible = 0; 1579 tmp->invisible = 0;
1599 done_one = 1; 1580 done_one = 1;
1600 } 1581 }
1601 } 1582 }
1602 1583
1603 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1584 if (tmp->flag [FLAG_IS_FLOOR])
1604 floor = 1; 1585 floor = 1;
1605 1586
1606 /* All detections below this point don't descend beneath the floor, 1587 /* All detections below this point don't descend beneath the floor,
1607 * so just continue on. We could be clever and look at the type of 1588 * so just continue on. We could be clever and look at the type of
1608 * detection to completely break out if we don't care about objects beneath 1589 * detection to completely break out if we don't care about objects beneath
… …
1617 * difficult to see what object is magical/cursed, so the 1598 * difficult to see what object is magical/cursed, so the
1618 * effect wouldn't be as apparent. 1599 * effect wouldn't be as apparent.
1619 */ 1600 */
1620 1601
1621 /* detect magic */ 1602 /* detect magic */
1622 if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) && 1603 if (spell->flag [FLAG_KNOWN_MAGICAL]
1623 !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && is_magical (tmp)) 1604 && !tmp->flag [FLAG_KNOWN_MAGICAL]
1605 && !tmp->flag [FLAG_IDENTIFIED]
1606 && tmp->need_identify ()
1607 && is_magical (tmp))
1624 { 1608 {
1625 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL); 1609 tmp->set_flag (FLAG_KNOWN_MAGICAL);
1626 /* make runes more visibile */ 1610 /* make runes more visible */
1627 if (tmp->type == RUNE && tmp->attacktype & AT_MAGIC) 1611 if (tmp->type == RUNE && tmp->attacktype & AT_MAGIC)
1628 tmp->stats.Cha /= 4; 1612 tmp->stats.Cha /= 4;
1629 1613
1630 done_one = 1; 1614 done_one = 1;
1631 } 1615 }
1632 1616
1633 /* detect monster */ 1617 /* detect monster */
1634 if (QUERY_FLAG (spell, FLAG_MONSTER) && (QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER)) 1618 if (spell->flag [FLAG_MONSTER] && (tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER))
1635 { 1619 {
1636 done_one = 2; 1620 done_one = 2;
1637 1621
1638 if (!detect) 1622 if (!detect)
1639 detect = tmp; 1623 detect = tmp;
… …
1641 1625
1642 /* Basically, if race is set in the spell, then the creatures race must 1626 /* Basically, if race is set in the spell, then the creatures race must
1643 * match that. if the spell race is set to GOD, then the gods opposing 1627 * match that. if the spell race is set to GOD, then the gods opposing
1644 * race must match. 1628 * race must match.
1645 */ 1629 */
1646 if (spell->race && QUERY_FLAG (tmp, FLAG_MONSTER) && tmp->race && 1630 if (spell->race && tmp->flag [FLAG_MONSTER] && tmp->race &&
1647 ((spell->race == shstr_GOD && god && god->slaying.contains (tmp->race)) || 1631 ((spell->race == shstr_GOD && god && god->slaying.contains (tmp->race)) ||
1648 spell->race.contains (tmp->race))) 1632 spell->race.contains (tmp->race)))
1649 { 1633 {
1650 done_one = 2; 1634 done_one = 2;
1651 1635
1652 if (!detect) 1636 if (!detect)
1653 detect = tmp; 1637 detect = tmp;
1654 } 1638 }
1655 1639
1656 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && 1640 if (spell->flag [FLAG_KNOWN_CURSED]
1657 (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))) 1641 && !tmp->flag [FLAG_KNOWN_CURSED]
1642 && tmp->need_identify ()
1643 && (tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED]))
1658 { 1644 {
1659 SET_FLAG (tmp, FLAG_KNOWN_CURSED); 1645 tmp->set_flag (FLAG_KNOWN_CURSED);
1660 done_one = 1; 1646 done_one = 1;
1647 }
1648
1649 // Do mining detection spell:
1650 if (spell->last_sp == 1) // 1 - detect any vein
1651 {
1652 if (tmp->type == VEIN)
1653 {
1654 if (tmp->other_arch)
1655 {
1656 if (!detect)
1657 detect = tmp->other_arch;
1658 done_one = 2;
1659 }
1660 else
1661 done_one = 1;
1662 }
1661 } 1663 }
1662 } /* for stack of objects on this space */ 1664 } /* for stack of objects on this space */
1663 1665
1664 /* Code here puts an effect of the spell on the space, so you can see 1666 /* Code here puts an effect of the spell on the space, so you can see
1665 * where the magic is. 1667 * where the magic is.
… …
1674 detect_ob->face = detect->face; 1676 detect_ob->face = detect->face;
1675 detect_ob->animation_id = detect->animation_id; 1677 detect_ob->animation_id = detect->animation_id;
1676 detect_ob->anim_speed = detect->anim_speed; 1678 detect_ob->anim_speed = detect->anim_speed;
1677 detect_ob->last_anim = 0; 1679 detect_ob->last_anim = 0;
1678 /* by default, the detect_ob is already animated */ 1680 /* by default, the detect_ob is already animated */
1679 if (!QUERY_FLAG (detect, FLAG_ANIMATE)) 1681 if (!detect->flag [FLAG_ANIMATE])
1680 CLEAR_FLAG (detect_ob, FLAG_ANIMATE); 1682 detect_ob->clr_flag (FLAG_ANIMATE);
1681 } 1683 }
1682 1684
1683 m->insert (detect_ob, nx, ny, op); 1685 m->insert (detect_ob, nx, ny, op, INS_ON_TOP);
1684 } 1686 }
1685 } /* for processing the surrounding spaces */ 1687 } /* for processing the surrounding spaces */
1686 1688
1687 1689
1688 /* Now process objects in the players inventory if detect curse or magic */ 1690 /* Now process objects in the players inventory if detect curse or magic */
1689 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) || QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL)) 1691 if (spell->flag [FLAG_KNOWN_CURSED] || spell->flag [FLAG_KNOWN_MAGICAL])
1690 { 1692 {
1691 done_one = 0; 1693 done_one = 0;
1692 1694
1693 for (tmp = op->inv; tmp; tmp = tmp->below) 1695 for (tmp = op->inv; tmp; tmp = tmp->below)
1694 { 1696 {
1695 if (!tmp->invisible && !QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1697 if (!tmp->invisible && !tmp->flag [FLAG_IDENTIFIED])
1696 { 1698 {
1697 if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) && is_magical (tmp) && !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)) 1699 if (spell->flag [FLAG_KNOWN_MAGICAL] && is_magical (tmp) && !tmp->flag [FLAG_KNOWN_MAGICAL])
1698 { 1700 {
1699 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL); 1701 tmp->set_flag (FLAG_KNOWN_MAGICAL);
1700 1702
1701 if (object *pl = tmp->visible_to ()) 1703 if (object *pl = tmp->visible_to ())
1702 esrv_update_item (UPD_FLAGS, pl, tmp); 1704 esrv_update_item (UPD_FLAGS, pl, tmp);
1703 } 1705 }
1704 1706
1705 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && 1707 if (spell->flag [FLAG_KNOWN_CURSED] && !tmp->flag [FLAG_KNOWN_CURSED] &&
1706 (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))) 1708 (tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED]))
1707 { 1709 {
1708 SET_FLAG (tmp, FLAG_KNOWN_CURSED); 1710 tmp->set_flag (FLAG_KNOWN_CURSED);
1709 1711
1710 if (object *pl = tmp->visible_to ()) 1712 if (object *pl = tmp->visible_to ())
1711 esrv_update_item (UPD_FLAGS, pl, tmp); 1713 esrv_update_item (UPD_FLAGS, pl, tmp);
1712 } 1714 }
1713 } /* if item is not identified */ 1715 } /* if item is not identified */
… …
1773 mflags = get_map_flags (m, &m, x, y, &x, &y); 1775 mflags = get_map_flags (m, &m, x, y, &x, &y);
1774 1776
1775 if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE) 1777 if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE)
1776 { 1778 {
1777 for (plyr = GET_MAP_OB (m, x, y); plyr != NULL; plyr = plyr->above) 1779 for (plyr = GET_MAP_OB (m, x, y); plyr != NULL; plyr = plyr->above)
1778 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE)) 1780 if (plyr != op && plyr->flag [FLAG_ALIVE])
1779 break; 1781 break;
1780 } 1782 }
1781 1783
1782 1784
1783 /* If we did not find a player in the specified direction, transfer 1785 /* If we did not find a player in the specified direction, transfer
1784 * to anyone on top of us. This is used for the rune of transference mostly. 1786 * to anyone on top of us. This is used for the rune of transference mostly.
1785 */ 1787 */
1786 if (plyr == NULL) 1788 if (plyr == NULL)
1787 for (plyr = GET_MAP_OB (op->map, op->x, op->y); plyr != NULL; plyr = plyr->above) 1789 for (plyr = GET_MAP_OB (op->map, op->x, op->y); plyr != NULL; plyr = plyr->above)
1788 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE)) 1790 if (plyr != op && plyr->flag [FLAG_ALIVE])
1789 break; 1791 break;
1790 1792
1791 if (!plyr) 1793 if (!plyr)
1792 { 1794 {
1793 new_draw_info (NDI_BLACK, 0, op, "There is no one there."); 1795 op->failmsg ("There is no one there.");
1794 return 0; 1796 return 0;
1795 } 1797 }
1796 /* give sp */ 1798 /* give sp */
1797 if (spell->stats.dam > 0) 1799 if (spell->stats.dam > 0)
1798 { 1800 {
… …
1810 if (rate > 95) 1812 if (rate > 95)
1811 rate = 95; 1813 rate = 95;
1812 1814
1813 sucked = (plyr->stats.sp * rate) / 100; 1815 sucked = (plyr->stats.sp * rate) / 100;
1814 plyr->stats.sp -= sucked; 1816 plyr->stats.sp -= sucked;
1815 if (QUERY_FLAG (op, FLAG_ALIVE)) 1817 if (op->flag [FLAG_ALIVE])
1816 { 1818 {
1817 /* Player doesn't get full credit */ 1819 /* Player doesn't get full credit */
1818 sucked = (sucked * rate) / 100; 1820 sucked = (sucked * rate) / 100;
1819 op->stats.sp += sucked; 1821 op->stats.sp += sucked;
1820 if (sucked > 0) 1822 if (sucked > 0)
… …
1871 * monsters either. 1873 * monsters either.
1872 */ 1874 */
1873 1875
1874 if (head->attacktype & AT_MAGIC 1876 if (head->attacktype & AT_MAGIC
1875 && !(head->attacktype & AT_COUNTERSPELL) 1877 && !(head->attacktype & AT_COUNTERSPELL)
1876 && !QUERY_FLAG (head, FLAG_MONSTER) 1878 && !head->flag [FLAG_MONSTER]
1877 && (op->level > head->level)) 1879 && (op->level > head->level))
1878 head->destroy (); 1880 head->destroy ();
1879 else 1881 else
1880 switch (head->type) 1882 switch (head->type)
1881 { 1883 {
1882 case SPELL_EFFECT: 1884 case SPELL_EFFECT:
1883 // XXX: Don't affect floor spelleffects. See also XXX comment 1885 // XXX: Don't affect floor spelleffects. See also XXX comment
1884 // about sanctuary in spell_util.C 1886 // about sanctuary in spell_util.C
1885 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1887 if (tmp->flag [FLAG_IS_FLOOR])
1886 continue; 1888 continue;
1887 1889
1888 if (op->level > head->level) 1890 if (op->level > head->level)
1889 head->destroy (); 1891 head->destroy ();
1890 1892
… …
1913 1915
1914 object *tmp, *god = find_god (determine_god (op)); 1916 object *tmp, *god = find_god (determine_god (op));
1915 1917
1916 if (!god) 1918 if (!god)
1917 { 1919 {
1918 new_draw_info (NDI_UNIQUE, 0, op, "You can't consecrate anything if you don't worship a god!"); 1920 op->failmsg ("You can't consecrate anything if you don't worship a god!");
1919 return 0; 1921 return 0;
1920 } 1922 }
1921 1923
1922 for (tmp = op->below; tmp; tmp = tmp->below) 1924 for (tmp = op->below; tmp; tmp = tmp->below)
1923 { 1925 {
1924 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1926 if (tmp->flag [FLAG_IS_FLOOR])
1925 break; 1927 break;
1926 if (tmp->type == HOLY_ALTAR) 1928 if (tmp->type == HOLY_ALTAR)
1927 { 1929 {
1928 1930
1929 if (tmp->level > casting_level (caster, spell)) 1931 if (tmp->level > casting_level (caster, spell))
1930 { 1932 {
1931 new_draw_info_format (NDI_UNIQUE, 0, op, "You are not powerful enough to reconsecrate the %s", &tmp->name); 1933 op->failmsgf ("You are not powerful enough to reconsecrate the %s", &tmp->name);
1932 return 0; 1934 return 0;
1933 } 1935 }
1934 else 1936 else
1935 { 1937 {
1936 /* If we got here, we are consecrating an altar */ 1938 /* If we got here, we are consecrating an altar */
… …
1945 new_draw_info_format (NDI_UNIQUE, 0, op, "You consecrated the altar to %s!", &god->name); 1947 new_draw_info_format (NDI_UNIQUE, 0, op, "You consecrated the altar to %s!", &god->name);
1946 return 1; 1948 return 1;
1947 } 1949 }
1948 } 1950 }
1949 } 1951 }
1950 new_draw_info (NDI_UNIQUE, 0, op, "You are not standing over an altar!"); 1952
1953 op->failmsg ("You are not standing over an altar!");
1951 return 0; 1954 return 0;
1952} 1955}
1953 1956
1954/* animate_weapon - 1957/* animate_weapon -
1955 * Generalization of staff_to_snake. Makes a golem out of the caster's weapon. 1958 * Generalization of staff_to_snake. Makes a golem out of the caster's weapon.
… …
1962 * player checks. MSW 2003-01-06 1965 * player checks. MSW 2003-01-06
1963 */ 1966 */
1964int 1967int
1965animate_weapon (object *op, object *caster, object *spell, int dir) 1968animate_weapon (object *op, object *caster, object *spell, int dir)
1966{ 1969{
1967 object *weapon, *tmp;
1968 char buf[MAX_BUF]; 1970 char buf[MAX_BUF];
1969 int a, i; 1971 int a, i;
1970 sint16 x, y; 1972 sint16 x, y;
1971 maptile *m; 1973 maptile *m;
1972 1974
… …
1997 1999
1998 /* if there's no place to put the golem, abort */ 2000 /* if there's no place to put the golem, abort */
1999 if (dir < 0 || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP) 2001 if (dir < 0 || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP)
2000 || ((spell->other_arch->move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->move_type)) 2002 || ((spell->other_arch->move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->move_type))
2001 { 2003 {
2002 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 2004 op->failmsg ("There is something in the way.");
2003 return 0; 2005 return 0;
2004 } 2006 }
2005 2007
2006 /* Use the weapon marked by the player. */ 2008 /* Use the weapon marked by the player. */
2007 weapon = find_marked_object (op); 2009 object *weapon = op->mark ();
2008 2010
2009 if (!weapon) 2011 if (!weapon)
2010 { 2012 {
2011 new_draw_info (NDI_BLACK, 0, op, "You must mark a weapon to use with this spell!"); 2013 op->failmsg ("You must mark a weapon to use with this spell!");
2012 return 0; 2014 return 0;
2013 } 2015 }
2014 2016
2015 if (spell->race && weapon->arch->archname != spell->race) 2017 if (spell->race && weapon->arch->archname != spell->race)
2016 { 2018 {
2017 new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to transform your weapon."); 2019 op->failmsg ("The spell fails to transform your weapon.");
2018 return 0; 2020 return 0;
2019 } 2021 }
2020 2022
2021 if (weapon->type != WEAPON) 2023 if (weapon->type != WEAPON)
2022 { 2024 {
2023 new_draw_info (NDI_UNIQUE, 0, op, "You need to wield a weapon to animate it."); 2025 op->failmsg ("You need to wield a weapon to animate it.");
2024 return 0; 2026 return 0;
2025 } 2027 }
2026 2028
2027 if (QUERY_FLAG (weapon, FLAG_APPLIED)) 2029 if (weapon->flag [FLAG_APPLIED])
2028 { 2030 {
2029 new_draw_info_format (NDI_BLACK, 0, op, "You need to unequip %s before using it in this spell", query_name (weapon)); 2031 op->failmsgf ("You need to unequip %s before using it in this spell", query_name (weapon));
2030 return 0; 2032 return 0;
2031 } 2033 }
2032 2034
2033 weapon = weapon->split (); 2035 weapon = weapon->split ();
2034 2036
2035 /* create the golem object */ 2037 /* create the golem object */
2036 tmp = spell->other_arch->instance (); 2038 object *tmp = spell->other_arch->instance ();
2037 2039
2038 /* if animated by a player, give the player control of the golem */ 2040 /* if animated by a player, give the player control of the golem */
2039 CLEAR_FLAG (tmp, FLAG_MONSTER); 2041 tmp->clr_flag (FLAG_MONSTER);
2040 tmp->stats.exp = 0; 2042 tmp->stats.exp = 0;
2041 add_friendly_object (tmp); 2043 add_friendly_object (tmp);
2042 tmp->type = GOLEM; 2044 tmp->type = GOLEM;
2043 tmp->set_owner (op); 2045 tmp->set_owner (op);
2044 op->contr->golem = tmp; 2046 op->contr->golem = tmp;
… …
2046 2048
2047 /* Give the weapon to the golem now. A bit of a hack to check the 2049 /* Give the weapon to the golem now. A bit of a hack to check the
2048 * removed flag - it should only be set if weapon->split was 2050 * removed flag - it should only be set if weapon->split was
2049 * used above. 2051 * used above.
2050 */ 2052 */
2051 if (!QUERY_FLAG (weapon, FLAG_REMOVED)) 2053 if (!weapon->flag [FLAG_REMOVED])
2052 weapon->remove (); 2054 weapon->remove ();
2053 2055
2054 tmp->insert (weapon); 2056 tmp->insert (weapon);
2055 2057
2056 /* To do everything necessary to let a golem use the weapon is a pain, 2058 /* To do everything necessary to let a golem use the weapon is a pain,
2057 * so instead, just set it as equipped (otherwise, we need to update 2059 * so instead, just set it as equipped (otherwise, we need to update
2058 * body_info, skills, etc) 2060 * body_info, skills, etc)
2059 */ 2061 */
2060 SET_FLAG (tmp, FLAG_USE_WEAPON); 2062 tmp->set_flag (FLAG_USE_WEAPON);
2061 SET_FLAG (weapon, FLAG_APPLIED); 2063 weapon->set_flag (FLAG_APPLIED);
2062 tmp->update_stats (); 2064 tmp->update_stats ();
2063 2065
2064 /* There used to be 'odd' code that basically seemed to take the absolute 2066 /* There used to be 'odd' code that basically seemed to take the absolute
2065 * value of the weapon->magic an use that. IMO, that doesn't make sense - 2067 * value of the weapon->magic an use that. IMO, that doesn't make sense -
2066 * if you're using a crappy weapon, it shouldn't be as good. 2068 * if you're using a crappy weapon, it shouldn't be as good.
… …
2107 /* Improve weapon's armour value according to best save vs. physical of its material */ 2109 /* Improve weapon's armour value according to best save vs. physical of its material */
2108 2110
2109 if (a > 14) 2111 if (a > 14)
2110 a = 14; 2112 a = 14;
2111 2113
2112 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a)); 2114 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.f - (float) tmp->resist[ATNR_PHYSICAL]) / (30.f - 2.f * a));
2113 2115
2114 /* Determine golem's speed */ 2116 /* Determine golem's speed */
2115 tmp->set_speed (min (3.33, 0.4 + 0.1 * SP_level_range_adjust (caster, spell))); 2117 tmp->set_speed (min (3.33f, 0.4f + 0.1f * SP_level_range_adjust (caster, spell)));
2116 2118
2117 if (!spell->race) 2119 if (!spell->race)
2118 { 2120 {
2119 sprintf (buf, "animated %s", &weapon->name); 2121 sprintf (buf, "animated %s", &weapon->name);
2120 tmp->name = buf; 2122 tmp->name = buf;
… …
2153 success = op->map->change_map_light (spell->stats.dam); 2155 success = op->map->change_map_light (spell->stats.dam);
2154 2156
2155 if (!success) 2157 if (!success)
2156 { 2158 {
2157 if (spell->stats.dam < 0) 2159 if (spell->stats.dam < 0)
2158 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here."); 2160 op->failmsg ("It can be no brighter here.");
2159 else 2161 else
2160 new_draw_info (NDI_UNIQUE, 0, op, "It can be no darker here."); 2162 op->failmsg ("It can be no darker here.");
2161 } 2163 }
2162 2164
2163 return success; 2165 return success;
2164} 2166}
2165 2167
… …
2270 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 2272 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
2271 { 2273 {
2272 int atk_lev, def_lev; 2274 int atk_lev, def_lev;
2273 object *victim = tmp->head_ (); 2275 object *victim = tmp->head_ ();
2274 2276
2275 if (!QUERY_FLAG (victim, FLAG_MONSTER)) 2277 if (!victim->flag [FLAG_MONSTER])
2276 continue; 2278 continue;
2277 2279
2278 if (QUERY_FLAG (victim, FLAG_UNAGGRESSIVE)) 2280 if (victim->flag [FLAG_UNAGGRESSIVE])
2279 continue; 2281 continue;
2280 2282
2281 if (victim->stats.exp == 0) 2283 if (victim->stats.exp == 0)
2282 continue; 2284 continue;
2283 2285
… …
2299 victim->stats.sp = 0; 2301 victim->stats.sp = 0;
2300 victim->stats.grace = 0; 2302 victim->stats.grace = 0;
2301 victim->stats.Pow = 0; 2303 victim->stats.Pow = 0;
2302#endif 2304#endif
2303 victim->attack_movement = RANDO2; 2305 victim->attack_movement = RANDO2;
2304 SET_FLAG (victim, FLAG_UNAGGRESSIVE); 2306 victim->set_flag (FLAG_UNAGGRESSIVE);
2305 SET_FLAG (victim, FLAG_RUN_AWAY); 2307 victim->set_flag (FLAG_RUN_AWAY);
2306 SET_FLAG (victim, FLAG_RANDOM_MOVE); 2308 victim->set_flag (FLAG_RANDOM_MOVE);
2307 CLEAR_FLAG (victim, FLAG_MONSTER); 2309 victim->clr_flag (FLAG_MONSTER);
2308 2310
2309 if (victim->name) 2311 if (victim->name)
2310 new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s no longer feels like fighting.", &victim->name); 2312 new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s no longer feels like fighting.", &victim->name);
2311 } 2313 }
2312 } 2314 }
… …
2318int 2320int
2319write_mark (object *op, object *spell, const char *msg) 2321write_mark (object *op, object *spell, const char *msg)
2320{ 2322{
2321 if (!msg || msg[0] == 0) 2323 if (!msg || msg[0] == 0)
2322 { 2324 {
2323 new_draw_info (NDI_UNIQUE, 0, op, "Write what?"); 2325 op->failmsg ("Write what?");
2324 return 0; 2326 return 0;
2325 } 2327 }
2326 2328
2327 if (!msg_is_safe (msg)) 2329 if (!msg_is_safe (msg))
2328 { 2330 {
2329 new_draw_info (NDI_UNIQUE, 0, op, "Trying to cheat are we?"); 2331 op->failmsg ("Trying to cheat are we? H<@-signs are not allowed in marking runes.>");
2330 LOG (llevInfo, "write_mark: player %s tried to write bogus rune %s\n", &op->name, msg); 2332 LOG (llevInfo, "write_mark: player %s tried to write bogus rune %s\n", &op->name, msg);
2331 return 0; 2333 return 0;
2332 } 2334 }
2333 2335
2334 if (!spell->other_arch) 2336 if (!spell->other_arch)

Diff Legend

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