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

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.66 by root, Mon Sep 29 10:31:32 2008 UTC vs.
Revision 1.88 by root, Mon Oct 12 14:00:59 2009 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/* This file contains all the spell attack code. Grouping this code 25/* This file contains all the spell attack code. Grouping this code
… …
351 maptile *m = op->map; 352 maptile *m = op->map;
352 int i; 353 int i;
353 354
354 if (--op->duration < 0) 355 if (--op->duration < 0)
355 { 356 {
356 op->destroy (true); 357 op->destroy ();
357 return; 358 return;
358 } 359 }
359 360
360 hit_map (op, 0, op->attacktype, 0); 361 hit_map (op, 0, op->attacktype, 0);
361 362
… …
396 object *tmp, *owner; 397 object *tmp, *owner;
397 398
398 if (!op->other_arch) 399 if (!op->other_arch)
399 { 400 {
400 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n"); 401 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
401 op->destroy (true); 402 op->destroy ();
402 return; 403 return;
403 } 404 }
404 405
405 if (op->env) 406 if (op->env)
406 { 407 {
407 object *env = op->outer_env (); 408 object *env = op->outer_env ();
408 409
409 if (!env->map || out_of_map (env->map, env->x, env->y)) 410 if (!env->map || out_of_map (env->map, env->x, env->y))
410 { 411 {
411 LOG (llevError, "BUG: explode_bullet(): env out of map\n"); 412 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
412 op->destroy (true); 413 op->destroy ();
413 return; 414 return;
414 } 415 }
415 416
416 op->insert_at (env, op, INS_NO_MERGE | INS_NO_WALK_ON); 417 op->insert_at (env, op, INS_NO_MERGE | INS_NO_WALK_ON);
417 } 418 }
418 else if (out_of_map (op->map, op->x, op->y)) 419 else if (out_of_map (op->map, op->x, op->y))
419 { 420 {
420 LOG (llevError, "BUG: explode_bullet(): op out of map\n"); 421 LOG (llevError, "BUG: explode_bullet(): op out of map\n");
421 op->destroy (true); 422 op->destroy ();
422 return; 423 return;
423 } 424 }
424 425
425 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps 426 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps
426 // NOTE: If this breaks something important: remove this. I can't think of anything 427 // NOTE: If this breaks something important: remove this. I can't think of anything
427 // bad at the moment that might happen from this. 428 // bad at the moment that might happen from this.
428 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 429 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
429 { 430 {
430 op->destroy (true); 431 op->destroy ();
431 return; 432 return;
432 } 433 }
433 434
434 if (op->attacktype) 435 if (op->attacktype)
435 { 436 {
… …
450 if ((tmp->attacktype & AT_HOLYWORD 451 if ((tmp->attacktype & AT_HOLYWORD
451 || tmp->attacktype & AT_GODPOWER) 452 || tmp->attacktype & AT_GODPOWER)
452 && owner 453 && owner
453 && !tailor_god_spell (tmp, owner)) 454 && !tailor_god_spell (tmp, owner))
454 { 455 {
455 op->destroy (true); 456 op->destroy ();
456 return; 457 return;
457 } 458 }
458 459
459 /* special for bombs - it actually has sane values for these */ 460 /* special for bombs - it actually has sane values for these */
460 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) 461 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB)
… …
488 489
489 tmp->insert_at (op, op); 490 tmp->insert_at (op, op);
490 tmp->play_sound (tmp->sound); 491 tmp->play_sound (tmp->sound);
491 492
492 /* remove the firebullet */ 493 /* remove the firebullet */
493 op->destroy (true); 494 op->destroy ();
494} 495}
495 496
496/* checks to see what op should do, given the space it is on 497/* checks to see what op should do, given the space it is on
497 * (eg, explode, damage player, etc) 498 * (eg, explode, damage player, etc)
498 */ 499 */
… …
529 // TODO: can't understand the following if's 530 // TODO: can't understand the following if's
530 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0) 531 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
531 { 532 {
532 if (!QUERY_FLAG (op, FLAG_REMOVED)) 533 if (!QUERY_FLAG (op, FLAG_REMOVED))
533 { 534 {
534 op->destroy (true); 535 op->destroy ();
535 return; 536 return;
536 } 537 }
537 } 538 }
538 } 539 }
539 } 540 }
… …
545 * fired arches (eg, bolts). 546 * fired arches (eg, bolts).
546 */ 547 */
547void 548void
548move_bullet (object *op) 549move_bullet (object *op)
549{ 550{
550 sint16 new_x, new_y;
551 int mflags;
552 maptile *m;
553
554#if 0 551#if 0
555 /* We need a better general purpose way to do this */ 552 /* We need a better general purpose way to do this */
556 553
557 /* peterm: added to make comet leave a trail of burnouts 554 /* peterm: added to make comet leave a trail of burnouts
558 it's an unadulterated hack, but the effect is cool. */ 555 it's an unadulterated hack, but the effect is cool. */
… …
568 if (--op->range <= 0) 565 if (--op->range <= 0)
569 { 566 {
570 if (op->other_arch) 567 if (op->other_arch)
571 explode_bullet (op); 568 explode_bullet (op);
572 else 569 else
573 op->destroy (true); 570 op->destroy ();
574 571
575 return; 572 return;
576 }
577
578 new_x = op->x + DIRX (op);
579 new_y = op->y + DIRY (op);
580 m = op->map;
581 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
582
583 if (mflags & P_OUT_OF_MAP)
584 { 573 }
574
575 mapxy pos (op);
576 pos.move (op->direction);
577
578 if (!pos.normalise ())
579 {
585 op->destroy (true); 580 op->destroy ();
586 return; 581 return;
587 } 582 }
588 583
589 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))) 584 mapspace &ms = pos.ms ();
585
586 ms.update ();
587
588 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, ms.move_block))
590 { 589 {
591 if (op->other_arch) 590 if (op->other_arch)
592 explode_bullet (op); 591 explode_bullet (op);
593 else 592 else
594 op->destroy (true); 593 op->destroy ();
595 594
596 return; 595 return;
597 } 596 }
598 597
599 if (!(op = m->insert (op, new_x, new_y, op))) 598 if (!(op = pos.insert (op, op)))
600 return; 599 return;
601 600
602 if (reflwall (op->map, op->x, op->y, op)) 601 if (reflwall (op->map, op->x, op->y, op))
603 { 602 {
604 op->direction = absdir (op->direction + 4); 603 op->direction = absdir (op->direction + 4);
… …
655 654
656 maptile *newmap; 655 maptile *newmap;
657 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y); 656 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
658 if (mflags & P_OUT_OF_MAP) 657 if (mflags & P_OUT_OF_MAP)
659 { 658 {
660 tmp->destroy (true); 659 tmp->destroy ();
661 return 0; 660 return 0;
662 } 661 }
663 662
664 tmp->map = newmap; 663 tmp->map = newmap;
665 664
666 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 665 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
667 { 666 {
668 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 667 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
669 { 668 {
670 tmp->destroy (true); 669 tmp->destroy ();
671 return 0; 670 return 0;
672 } 671 }
673 672
674 tmp->x = op->x; 673 tmp->x = op->x;
675 tmp->y = op->y; 674 tmp->y = op->y;
… …
730 * when their cone dies when they die. 729 * when their cone dies when they die.
731 */ 730 */
732 /* If no owner left, the spell dies out. */ 731 /* If no owner left, the spell dies out. */
733 if (op->owner == NULL) 732 if (op->owner == NULL)
734 { 733 {
735 op->destroy (true); 734 op->destroy ();
736 return; 735 return;
737 } 736 }
738#endif 737#endif
739 738
740 hit_map (op, 0, op->attacktype, 0); 739 hit_map (op, 0, op->attacktype, 0);
740
741 if (!op->is_on_map ())
742 return;
741 743
742 /* Check to see if we should push anything. 744 /* Check to see if we should push anything.
743 * Spell objects with weight push whatever they encounter to some 745 * Spell objects with weight push whatever they encounter to some
744 * degree. 746 * degree.
745 */ 747 */
746 if (op->weight) 748 if (op->weight)
749 {
747 check_spell_knockback (op); 750 check_spell_knockback (op);
748 751
749 if (op->destroyed ()) 752 if (!op->is_on_map ())
750 return; 753 return;
754 }
751 755
752 if (op->duration-- < 0) 756 if (op->duration-- < 0)
753 { 757 {
754 op->destroy (true); 758 op->destroy ();
755 return; 759 return;
756 } 760 }
757 /* Object has hit maximum range, so don't have it move 761 /* Object has hit maximum range, so don't have it move
758 * any further. When the duration above expires, 762 * any further. When the duration above expires,
759 * then the object will get removed. 763 * then the object will get removed.
… …
823 */ 827 */
824 movetype = spell->other_arch->move_type; 828 movetype = spell->other_arch->move_type;
825 829
826 for (i = range_min; i <= range_max; i++) 830 for (i = range_min; i <= range_max; i++)
827 { 831 {
828 sint16 x, y, d; 832 sint16 x, y;
829 833
830 /* We can't use absdir here, because it never returns 834 /* We can't use absdir here, because it never returns
831 * 0. If this is a rune, we want to hit the person on top 835 * 0. If this is a rune, we want to hit the person on top
832 * of the trap (d==0). If it is not a rune, then we don't want 836 * of the trap (d==0). If it is not a rune, then we don't want
833 * to hit that person. 837 * to hit that person.
834 */ 838 */
835 d = dir + i; 839 int d = dir ? absdir (dir + i) : i;
836 while (d < 0)
837 d += 8;
838 while (d > 8)
839 d -= 8;
840 840
841 /* If it's not a rune, we don't want to blast the caster. 841 /* If it's not a rune, we don't want to blast the caster.
842 * In that case, we have to see - if dir is specified, 842 * In that case, we have to see - if dir is specified,
843 * turn this into direction 8. If dir is not specified (all 843 * turn this into direction 8. If dir is not specified (all
844 * direction) skip - otherwise, one line would do more damage 844 * direction) skip - otherwise, one line would do more damage
… …
946 946
947 object *env = op->outer_env (); 947 object *env = op->outer_env ();
948 948
949 if (op->env) 949 if (op->env)
950 { 950 {
951 if (env->map == NULL) 951 if (!env->map)
952 return; 952 return;
953 953
954 if (!(op = op->insert_at (env, op))) 954 if (!(op = op->insert_at (env, op)))
955 return; 955 return;
956 } 956 }
957 957
958 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding 958 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
959 // on a safe map. I don't like this special casing, but it seems to be neccessary 959 // on a safe map. I don't like this special casing, but it seems to be neccessary
960 // as bombs can be carried. 960 // as bombs can be carried.
961 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 961 if (op->ms ().flags () & P_SAFE)
962 { 962 {
963 op->destroy (true); 963 op->destroy ();
964 return; 964 return;
965 } 965 }
966 966
967 /* This copies a lot of the code from the fire bullet, 967 /* This copies a lot of the code from the fire bullet,
968 * but using the cast_bullet isn't really feasible, 968 * but using the cast_bullet isn't really feasible,
… …
1003 int mflags; 1003 int mflags;
1004 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir]; 1004 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];
1005 maptile *m; 1005 maptile *m;
1006 1006
1007 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy); 1007 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);
1008
1009 // when creating a bomb below ourself it should always work, even
1010 // when movement is blocked (somehow we got here, somehow we are here,
1011 // so we should also be able to make a bomb here). (originally added
1012 // to fix create bomb traps in doors, which cast with dir=0).
1013 if (dir)
1014 {
1008 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK)) 1015 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1009 { 1016 {
1010 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1017 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
1011 return 0; 1018 return 0;
1019 }
1012 } 1020 }
1013 1021
1014 tmp = arch_to_object (spell->other_arch); 1022 tmp = arch_to_object (spell->other_arch);
1015 1023
1016 /* level dependencies for bomb */ 1024 /* level dependencies for bomb */
… …
1102 * interesting spell. 1110 * interesting spell.
1103 * if it is a cleric spell, you need a god, and the creature 1111 * if it is a cleric spell, you need a god, and the creature
1104 * can't be friendly to your god. 1112 * can't be friendly to your god.
1105 */ 1113 */
1106 1114
1107 if (!target || QUERY_FLAG (target, FLAG_REFL_SPELL) 1115 if (!target
1116 || target->flag [FLAG_REFL_SPELL]
1108 || (!god && spell->stats.grace) 1117 || (!god && spell->stats.grace)
1109 || (target->title && god && !strcmp (target->title, god->name)) || (target->race && god && strstr (target->race, god->race))) 1118 || (god && target->title == god->name)
1119 || (god && target->race.contains (god->race)))
1110 { 1120 {
1111 new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded."); 1121 new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded.");
1112 return 0; 1122 return 0;
1113 } 1123 }
1114 1124
… …
1121 effect->level = casting_level (caster, spell); 1131 effect->level = casting_level (caster, spell);
1122 effect->attacktype = spell->attacktype; 1132 effect->attacktype = spell->attacktype;
1123 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER)) 1133 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER))
1124 { 1134 {
1125 if (tailor_god_spell (effect, op)) 1135 if (tailor_god_spell (effect, op))
1126 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", determine_god (op)); 1136 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", (const char *)determine_god (op));
1127 else 1137 else
1128 { 1138 {
1129 new_draw_info (NDI_UNIQUE, 0, op, "Your request is ignored."); 1139 new_draw_info (NDI_UNIQUE, 0, op, "Your request is ignored.");
1130 return 0; 1140 return 0;
1131 } 1141 }
… …
1150 } 1160 }
1151 else 1161 else
1152 { 1162 {
1153 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target)); 1163 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target));
1154 target->stats.hp = target->stats.maxhp * 2; 1164 target->stats.hp = target->stats.maxhp * 2;
1155 effect->destroy (true); 1165 effect->destroy ();
1156 return 0; 1166 return 0;
1157 } 1167 }
1158 } 1168 }
1159 } 1169 }
1160 else 1170 else
… …
1192 mapxy pos (op); 1202 mapxy pos (op);
1193 pos.move (op->direction); 1203 pos.move (op->direction);
1194 1204
1195 if (!pos.normalise ()) 1205 if (!pos.normalise ())
1196 { 1206 {
1197 op->destroy (true); 1207 op->destroy ();
1198 return; 1208 return;
1199 } 1209 }
1200 1210
1201 mapspace &ms = pos.ms (); 1211 mapspace &ms = pos.ms ();
1202 1212
… …
1204 { 1214 {
1205 hit_map (op, op->direction, AT_MAGIC, 1); 1215 hit_map (op, op->direction, AT_MAGIC, 1);
1206 /* Basically, missile only hits one thing then goes away. 1216 /* Basically, missile only hits one thing then goes away.
1207 * we need to remove it if someone hasn't already done so. 1217 * we need to remove it if someone hasn't already done so.
1208 */ 1218 */
1209 op->destroy (true); 1219 op->destroy ();
1210 return; 1220 return;
1211 } 1221 }
1212 1222
1213 if (!op->direction) 1223 if (!op->direction)
1214 { 1224 {
1215 op->destroy (true); 1225 op->destroy ();
1216 return; 1226 return;
1217 } 1227 }
1218 1228
1219 int i = spell_find_dir (pos.m, pos.x, pos.y, op->owner); 1229 int i = spell_find_dir (pos.m, pos.x, pos.y, op->owner);
1220 if (i > 0 && i != op->direction) 1230 if (i > 0 && i != op->direction)
… …
1245 1255
1246 object *tmp = get_archetype (FORCE_NAME); 1256 object *tmp = get_archetype (FORCE_NAME);
1247 tmp->speed = 0.01; 1257 tmp->speed = 0.01;
1248 tmp->stats.food = time; 1258 tmp->stats.food = time;
1249 SET_FLAG (tmp, FLAG_IS_USED_UP); 1259 SET_FLAG (tmp, FLAG_IS_USED_UP);
1250 tmp->glow_radius = radius; 1260 tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius));
1251 if (tmp->glow_radius > MAX_LIGHT_RADII)
1252 tmp->glow_radius = MAX_LIGHT_RADII;
1253
1254 tmp = insert_ob_in_ob (tmp, op); 1261 tmp = insert_ob_in_ob (tmp, op);
1255 1262
1256 if (tmp->glow_radius > op->glow_radius) 1263 if (tmp->glow_radius > op->glow_radius)
1257 op->glow_radius = tmp->glow_radius; 1264 op->set_glow_radius (tmp->glow_radius);
1258 1265
1259 return 1; 1266 return 1;
1260} 1267}
1261 1268
1262int 1269int
1263cast_destruction (object *op, object *caster, object *spell_ob) 1270cast_destruction (object *op, object *caster, object *spell_ob)
1264{ 1271{
1265 int i, j, range, mflags, friendly = 0, dam, dur;
1266 sint16 sx, sy;
1267 maptile *m;
1268 object *tmp;
1269 const char *skill;
1270
1271 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob); 1272 int range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
1272 dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 1273 int dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
1273 dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 1274 int dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
1274 if (QUERY_FLAG (op, FLAG_FRIENDLY) || op->type == PLAYER) 1275
1275 friendly = 1; 1276 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player ();
1276 1277
1277 /* destruction doesn't use another spell object, so we need 1278 /* destruction doesn't use another spell object, so we need
1278 * update op's skill pointer so that exp is properly awarded. 1279 * update op's skill pointer so that exp is properly awarded.
1279 * We do some shortcuts here - since this is just temporary
1280 * and we'll reset the values back, we don't need to go through
1281 * the full share string/free_string route.
1282 */ 1280 */
1283 skill = op->skill; 1281 const shstr skill = op->skill;
1282
1284 if (caster == op) 1283 if (caster == op)
1285 op->skill = spell_ob->skill; 1284 op->skill = spell_ob->skill;
1286 else if (caster->skill) 1285 else if (caster->skill)
1287 op->skill = caster->skill; 1286 op->skill = caster->skill;
1288 else 1287 else
1289 op->skill = NULL; 1288 op->skill = 0;
1290 1289
1291 op->change_skill (find_skill_by_name (op, op->skill)); 1290 op->change_skill (find_skill_by_name (op, op->skill));
1292 1291
1293 for (i = -range; i <= range; i++) 1292 unordered_mapwalk (op, -range, -range, range, range)
1294 { 1293 {
1295 for (j = -range; j <= range; j++) 1294 mapspace &ms = m->at (nx, ny);
1296 {
1297 m = op->map;
1298 sx = op->x + i;
1299 sy = op->y + j;
1300 1295
1301 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1302 if (mflags & P_OUT_OF_MAP)
1303 continue;
1304
1305 if (mflags & P_IS_ALIVE) 1296 if (ms.flags () & P_IS_ALIVE)
1297 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1298 if (tmp->flag [FLAG_ALIVE] || tmp->is_player ())
1306 { 1299 {
1307 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 1300 tmp = tmp->head_ ();
1308 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
1309 break;
1310 1301
1311 if (tmp) 1302 if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ())
1303 || (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ())))
1312 { 1304 {
1313 if (tmp->head) 1305 if (spell_ob->subtype == SP_DESTRUCTION)
1314 tmp = tmp->head;
1315
1316 if ((friendly && !QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->type != PLAYER) ||
1317 (!friendly && (QUERY_FLAG (tmp, FLAG_FRIENDLY) || tmp->type == PLAYER)))
1318 { 1306 {
1319 if (spell_ob->subtype == SP_DESTRUCTION)
1320 {
1321 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1307 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1322 1308
1323 if (spell_ob->other_arch) 1309 if (spell_ob->other_arch)
1324 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op); 1310 m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op);
1325 } 1311 }
1326 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100) 1312 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist [ATNR_MAGIC] != 100)
1327 { 1313 {
1328 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1314 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1329 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op); 1315 m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op);
1330 }
1331 } 1316 }
1332 } 1317 }
1333 } 1318 }
1334 }
1335 } 1319 }
1336 1320
1337 op->skill = skill; 1321 op->skill = skill;
1338 return 1; 1322 return 1;
1339} 1323}
… …
1446 */ 1430 */
1447int 1431int
1448mood_change (object *op, object *caster, object *spell) 1432mood_change (object *op, object *caster, object *spell)
1449{ 1433{
1450 object *tmp, *god, *head; 1434 object *tmp, *god, *head;
1451 int done_one, range, mflags, level, at, best_at; 1435 int done_one, range, level, at, best_at;
1452 sint16 x, y, nx, ny;
1453 maptile *m;
1454 const char *race; 1436 const char *race;
1455 1437
1456 /* We precompute some values here so that we don't have to keep 1438 /* We precompute some values here so that we don't have to keep
1457 * doing it over and over again. 1439 * doing it over and over again.
1458 */ 1440 */
… …
1464 * so even if the player doesn't worship a god, if race=GOD_.., it 1446 * so even if the player doesn't worship a god, if race=GOD_.., it
1465 * won't ever match anything. 1447 * won't ever match anything.
1466 */ 1448 */
1467 if (!spell->race) 1449 if (!spell->race)
1468 race = NULL; 1450 race = NULL;
1469 else if (god && !strcmp (spell->race, "GOD_SLAYING")) 1451 else if (god && spell->race == shstr_GOD_SLAYING)
1470 race = god->slaying; 1452 race = god->slaying;
1471 else if (god && !strcmp (spell->race, "GOD_FRIEND")) 1453 else if (god && spell->race == shstr_GOD_FRIEND)
1472 race = god->race; 1454 race = god->race;
1473 else 1455 else
1474 race = spell->race; 1456 race = spell->race;
1475 1457
1476 for (x = op->x - range; x <= op->x + range; x++) 1458 unordered_mapwalk (op, -range, -range, range, range)
1477 for (y = op->y - range; y <= op->y + range; y++)
1478 { 1459 {
1479 done_one = 0; 1460 mapspace &ms = m->at (nx, ny);
1480 m = op->map;
1481 nx = x;
1482 ny = y;
1483 mflags = get_map_flags (m, &m, x, y, &nx, &ny);
1484 if (mflags & P_OUT_OF_MAP)
1485 continue;
1486 1461
1487 /* If there is nothing living on this space, no need to go further */ 1462 /* If there is nothing living on this space, no need to go further */
1488 if (!(mflags & P_IS_ALIVE)) 1463 if (!ms.flags () & P_IS_ALIVE)
1489 continue; 1464 continue;
1490 1465
1491 // players can only affect spaces that they can actually see 1466 // players can only affect spaces that they can actually see
1467 if (caster
1492 if (caster && caster->contr 1468 && caster->contr
1493 && caster->contr->visibility_at (m, nx, ny) < 70) 1469 && caster->contr->darkness_at (m, nx, ny) == LOS_BLOCKED)
1494 continue; 1470 continue;
1495 1471
1496 for (tmp = GET_MAP_TOP (m, nx, ny); tmp; tmp = tmp->below) 1472 for (tmp = ms.top; tmp; tmp = tmp->below)
1497 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1473 if (tmp->flag [FLAG_MONSTER])
1498 break; 1474 break;
1499 1475
1500 /* There can be living objects that are not monsters */ 1476 /* There can be living objects that are not monsters */
1501 if (!tmp || tmp->type == PLAYER) 1477 if (!tmp)
1502 continue; 1478 continue;
1503 1479
1504 /* Only the head has meaningful data, so resolve to that */ 1480 /* Only the head has meaningful data, so resolve to that */
1505 if (tmp->head)
1506 head = tmp->head; 1481 head = tmp->head_ ();
1507 else
1508 head = tmp;
1509 1482
1510 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */ 1483 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */
1511 if (race && head->race && !strstr (race, head->race)) 1484 if (race && head->race && !strstr (race, head->race))
1512 continue; 1485 continue;
1513 1486
1514 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD)) 1487 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD))
1515 continue; 1488 continue;
1516 1489
1517 /* Now do a bunch of stuff related to saving throws */ 1490 /* Now do a bunch of stuff related to saving throws */
1518 best_at = -1; 1491 best_at = -1;
1519 if (spell->attacktype) 1492 if (spell->attacktype)
1520 { 1493 {
1521 for (at = 0; at < NROFATTACKS; at++) 1494 for (at = 0; at < NROFATTACKS; at++)
1522 if (spell->attacktype & (1 << at)) 1495 if (spell->attacktype & (1 << at))
1523 if (best_at == -1 || head->resist[at] > head->resist[best_at]) 1496 if (best_at == -1 || head->resist[at] > head->resist[best_at])
1524 best_at = at; 1497 best_at = at;
1525 1498
1526 if (best_at == -1) 1499 if (best_at == -1)
1527 at = 0; 1500 at = 0;
1528 else 1501 else
1529 { 1502 {
1530 if (head->resist[best_at] == 100) 1503 if (head->resist[best_at] == 100)
1531 continue; 1504 continue;
1532 else 1505 else
1533 at = head->resist[best_at] / 5; 1506 at = head->resist[best_at] / 5;
1534 } 1507 }
1508
1535 at -= level / 5; 1509 at -= level / 5;
1536 if (did_make_save (head, head->level, at)) 1510 if (did_make_save (head, head->level, at))
1537 continue; 1511 continue;
1538 } 1512 }
1539 else /* spell->attacktype */ 1513 else /* spell->attacktype */
1540 { 1514 {
1541 /* 1515 /*
1542 Spell has no attacktype (charm & such), so we'll have a specific saving: 1516 Spell has no attacktype (charm & such), so we'll have a specific saving:
1543 * if spell level < monster level, no go 1517 * if spell level < monster level, no go
1544 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) ) 1518 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) )
1545 1519
1546 The chance will then be in the range [20-70] percent, not too bad. 1520 The chance will then be in the range [20-70] percent, not too bad.
1547 1521
1548 This is required to fix the 'charm monster' abuse, where a player level 1 can 1522 This is required to fix the 'charm monster' abuse, where a player level 1 can
1549 charm a level 125 monster... 1523 charm a level 125 monster...
1550 1524
1551 Ryo, august 14th 1525 Ryo, august 14th
1552 */ 1526 */
1553 if (head->level > level) 1527 if (head->level > level)
1554 continue; 1528 continue;
1555 1529
1556 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level)))) 1530 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level))))
1557 /* Failed, no effect */ 1531 /* Failed, no effect */
1558 continue; 1532 continue;
1559 } 1533 }
1560 1534
1561 /* Done with saving throw. Now start affecting the monster */ 1535 /* Done with saving throw. Now start affecting the monster */
1536 done_one = 0;
1562 1537
1563 /* aggravation */ 1538 /* aggravation */
1564 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1539 if (QUERY_FLAG (spell, FLAG_MONSTER))
1565 { 1540 {
1566 CLEAR_FLAG (head, FLAG_SLEEP); 1541 CLEAR_FLAG (head, FLAG_SLEEP);
1567 remove_friendly_object (head); 1542 remove_friendly_object (head);
1568 done_one = 1; 1543 done_one = 1;
1569 head->enemy = op; 1544 head->enemy = op;
1570 } 1545 }
1571 1546
1572 /* calm monsters */ 1547 /* calm monsters */
1573 if (QUERY_FLAG (spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (head, FLAG_UNAGGRESSIVE)) 1548 if (QUERY_FLAG (spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (head, FLAG_UNAGGRESSIVE))
1574 { 1549 {
1575 SET_FLAG (head, FLAG_UNAGGRESSIVE); 1550 SET_FLAG (head, FLAG_UNAGGRESSIVE);
1576 head->enemy = NULL; 1551 head->enemy = NULL;
1577 done_one = 1; 1552 done_one = 1;
1578 } 1553 }
1579 1554
1580 /* berserk monsters */ 1555 /* berserk monsters */
1581 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK)) 1556 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK))
1582 { 1557 {
1583 SET_FLAG (head, FLAG_BERSERK); 1558 SET_FLAG (head, FLAG_BERSERK);
1584 done_one = 1; 1559 done_one = 1;
1585 } 1560 }
1586 1561
1587 /* charm */ 1562 /* charm */
1588 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY)) 1563 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY))
1589 { 1564 {
1590 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster)); 1565 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster));
1591 1566
1592 /* Prevent uncontrolled outbreaks of self replicating monsters. 1567 /* Prevent uncontrolled outbreaks of self replicating monsters.
1593 Typical use case is charm, go somwhere, use aggravation to make hostile. 1568 Typical use case is charm, go somwhere, use aggravation to make hostile.
1594 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */ 1569 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1595 CLEAR_FLAG (head, FLAG_GENERATOR); 1570 CLEAR_FLAG (head, FLAG_GENERATOR);
1596 head->set_owner (op); 1571 head->set_owner (op);
1597 set_spell_skill (op, caster, spell, head); 1572 set_spell_skill (op, caster, spell, head);
1598 add_friendly_object (head); 1573 add_friendly_object (head);
1599 head->attack_movement = PETMOVE; 1574 head->attack_movement = PETMOVE;
1600 done_one = 1; 1575 done_one = 1;
1601 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL); 1576 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);
1602 head->stats.exp = 0; 1577 head->stats.exp = 0;
1603 } 1578 }
1604 1579
1605 /* If a monster was effected, put an effect in */ 1580 /* If a monster was effected, put an effect in */
1606 if (done_one && spell->other_arch) 1581 if (done_one && spell->other_arch)
1607 m->insert (arch_to_object (spell->other_arch), nx, ny, op); 1582 m->insert (arch_to_object (spell->other_arch), nx, ny, op);
1608 } /* for y */ 1583 }
1609 1584
1610 return 1; 1585 return 1;
1611} 1586}
1612
1613 1587
1614/* Move_ball_spell: This handles ball type spells that just sort of wander 1588/* Move_ball_spell: This handles ball type spells that just sort of wander
1615 * about. was called move_ball_lightning, but since more than the ball 1589 * about. was called move_ball_lightning, but since more than the ball
1616 * lightning spell used it, that seemed misnamed. 1590 * lightning spell used it, that seemed misnamed.
1617 * op is the spell effect. 1591 * op is the spell effect.
… …
1643 for (i = 1; i < 9; i++) 1617 for (i = 1; i < 9; i++)
1644 { 1618 {
1645 /* i bit 0: alters sign of offset 1619 /* i bit 0: alters sign of offset
1646 * other bits (i / 2): absolute value of offset 1620 * other bits (i / 2): absolute value of offset
1647 */ 1621 */
1648
1649 int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2); 1622 int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2);
1650 int tmpdir = absdir (op->direction + offset); 1623 int tmpdir = absdir (op->direction + offset);
1651 1624
1652 nx = op->x + freearr_x[tmpdir]; 1625 nx = op->x + freearr_x[tmpdir];
1653 ny = op->y + freearr_y[tmpdir]; 1626 ny = op->y + freearr_y[tmpdir];
… …
1655 { 1628 {
1656 dir = tmpdir; 1629 dir = tmpdir;
1657 break; 1630 break;
1658 } 1631 }
1659 } 1632 }
1633
1660 if (dir == 0) 1634 if (dir == 0)
1661 { 1635 {
1662 nx = op->x; 1636 nx = op->x;
1663 ny = op->y; 1637 ny = op->y;
1664 m = op->map; 1638 m = op->map;
… …
1737 object *owner = op->env; 1711 object *owner = op->env;
1738 1712
1739 if (!owner) // MUST not happen, remove when true TODO 1713 if (!owner) // MUST not happen, remove when true TODO
1740 { 1714 {
1741 LOG (llevError, "swarm spell found outside inventory: %s\n", op->debug_desc ()); 1715 LOG (llevError, "swarm spell found outside inventory: %s\n", op->debug_desc ());
1742 op->destroy (true); 1716 op->destroy ();
1743 return; 1717 return;
1744 } 1718 }
1745 1719
1746 if (!op->duration || !owner->is_on_map ()) 1720 if (!op->duration || !owner->is_on_map ())
1747 { 1721 {
… …
1885 int dam, mflags; 1859 int dam, mflags;
1886 maptile *m; 1860 maptile *m;
1887 1861
1888 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1862 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1889 1863
1890 if (!dir) 1864 if (dir)
1891 {
1892 new_draw_info (NDI_UNIQUE, 0, op, "In what direction?");
1893 return 0;
1894 } 1865 {
1895
1896 x = op->x + freearr_x[dir]; 1866 x = op->x + freearr_x[dir];
1897 y = op->y + freearr_y[dir]; 1867 y = op->y + freearr_y[dir];
1898 m = op->map; 1868 m = op->map;
1899 1869
1900 mflags = get_map_flags (m, &m, x, y, &x, &y); 1870 mflags = get_map_flags (m, &m, x, y, &x, &y);
1901 1871
1902 if (mflags & P_OUT_OF_MAP) 1872 if (mflags & P_OUT_OF_MAP)
1903 { 1873 {
1904 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there."); 1874 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there.");
1905 return 0; 1875 return 0;
1906 } 1876 }
1907 1877
1908 if (mflags & P_IS_ALIVE && spell->attacktype) 1878 if (mflags & P_IS_ALIVE && spell->attacktype)
1909 { 1879 {
1910 for (target = GET_MAP_OB (m, x, y); target; target = target->above) 1880 for (target = GET_MAP_OB (m, x, y); target; target = target->above)
1911 if (QUERY_FLAG (target, FLAG_MONSTER)) 1881 if (QUERY_FLAG (target, FLAG_MONSTER))
1912 { 1882 {
1913 /* oky doky. got a target monster. Lets make a blinding attack */ 1883 /* oky doky. got a target monster. Lets make a blinding attack */
1914 if (target->head) 1884 if (target->head)
1915 target = target->head; 1885 target = target->head;
1916 1886
1917 hit_player (target, dam, op, spell->attacktype, 1); 1887 hit_player (target, dam, op, spell->attacktype, 1);
1918 return 1; /* one success only! */ 1888 return 1; /* one success only! */
1889 }
1919 } 1890 }
1920 }
1921 1891
1922 /* no live target, perhaps a wall is in the way? */ 1892 /* no live target, perhaps a wall is in the way? */
1923 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y))) 1893 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)))
1924 { 1894 {
1925 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1895 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
1926 return 0; 1896 return 0;
1897 }
1927 } 1898 }
1928 1899
1929 /* ok, looks groovy to just insert a new light on the map */ 1900 /* ok, looks groovy to just insert a new light on the map */
1930 tmp = arch_to_object (spell->other_arch); 1901 tmp = arch_to_object (spell->other_arch);
1931 if (!tmp) 1902 if (!tmp)
1932 { 1903 {
1933 LOG (llevError, "Error: spell arch for cast_light() missing.\n"); 1904 LOG (llevError, "Error: spell arch for cast_light() missing.\n");
1934 return 0; 1905 return 0;
1935 } 1906 }
1907
1936 tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell); 1908 tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell);
1909
1937 if (tmp->glow_radius) 1910 if (tmp->glow_radius)
1938 { 1911 tmp->set_glow_radius (
1939 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell); 1912 clamp (spell->range + SP_level_range_adjust (caster, spell), 1, MAX_LIGHT_RADIUS)
1940 if (tmp->glow_radius > MAX_LIGHT_RADII) 1913 );
1941 tmp->glow_radius = MAX_LIGHT_RADII;
1942 }
1943 1914
1915 if (dir)
1944 m->insert (tmp, x, y, op); 1916 m->insert (tmp, x, y, op);
1917 else
1918 caster->outer_env_or_self ()->insert (tmp);
1919
1945 return 1; 1920 return 1;
1946} 1921}
1947 1922
1948/* cast_cause_disease: this spell looks along <dir> from the 1923/* cast_cause_disease: this spell looks along <dir> from the
1949 * player and infects someone. 1924 * player and infects someone.
… …
2056 2031
2057 if (infect_object (walk, disease, 1)) 2032 if (infect_object (walk, disease, 1))
2058 { 2033 {
2059 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2034 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2060 2035
2061 disease->destroy (true); /* don't need this one anymore */ 2036 disease->destroy (); /* don't need this one anymore */
2062 walk->map->insert (get_archetype ("detect_magic"), x, y, op); 2037 walk->map->insert (get_archetype ("detect_magic"), x, y, op);
2063 return 1; 2038 return 1;
2064 } 2039 }
2065 2040
2066 disease->destroy (true); 2041 disease->destroy ();
2067 } 2042 }
2068 } /* if living creature */ 2043 } /* if living creature */
2069 } /* for range of spaces */ 2044 } /* for range of spaces */
2070 2045
2071 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!"); 2046 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");

Diff Legend

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