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

Diff Legend

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