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.56 by root, Sat May 17 01:05:57 2008 UTC vs.
Revision 1.83 by root, Mon Mar 2 11:45:19 2009 UTC

… …
36/* this function checks to see if a spell pushes objects as well 36/* this function checks to see if a spell pushes objects as well
37 * as flies over and damages them (only used for cones for now) 37 * as flies over and damages them (only used for cones for now)
38 * but moved here so it could be applied to bolts too 38 * but moved here so it could be applied to bolts too
39 * op is the spell object. 39 * op is the spell object.
40 */ 40 */
41
42void 41void
43check_spell_knockback (object *op) 42check_spell_knockback (object *op)
44{ 43{
45 object *tmp, *tmp2; /* object on the map */
46 int weight_move; 44 int weight_move;
47 int frictionmod = 2; /*poor man's physics - multipy targets weight by this amount */ 45 int frictionmod = 2; /*poor man's physics - multipy targets weight by this amount */
48 46
49 if (!op->weight) 47 if (!op->weight)
50 { /*shouldn't happen but if cone object has no weight drop out */ 48 { /*shouldn't happen but if cone object has no weight drop out */
… …
55 { 53 {
56 weight_move = op->weight + (op->weight * op->level) / 3; 54 weight_move = op->weight + (op->weight * op->level) / 3;
57 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */ 55 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */
58 } 56 }
59 57
60 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 58 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
61 { 59 {
62 int num_sections = 1; 60 int num_sections = 1;
63 61
64 /* don't move DM */ 62 /* don't move DM */
65 if (QUERY_FLAG (tmp, FLAG_WIZ)) 63 if (QUERY_FLAG (tmp, FLAG_WIZ))
… …
72 /* don't move floors or immobile objects */ 70 /* don't move floors or immobile objects */
73 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || (!QUERY_FLAG (tmp, FLAG_ALIVE) && QUERY_FLAG (tmp, FLAG_NO_PICK))) 71 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || (!QUERY_FLAG (tmp, FLAG_ALIVE) && QUERY_FLAG (tmp, FLAG_NO_PICK)))
74 continue; 72 continue;
75 73
76 /* count the object's sections */ 74 /* count the object's sections */
77 for (tmp2 = tmp; tmp2 != NULL; tmp2 = tmp2->more) 75 for (object *tmp2 = tmp; tmp2; tmp2 = tmp2->more)
78 num_sections++; 76 num_sections++;
79 77
80 /* I'm not sure if it makes sense to divide by num_sections - bigger 78 /* I'm not sure if it makes sense to divide by num_sections - bigger
81 * objects should be harder to move, and we are moving the entire 79 * objects should be harder to move, and we are moving the entire
82 * object, not just the head, so the total weight should be relevant. 80 * object, not just the head, so the total weight should be relevant.
… …
106 * 104 *
107 * BOLT CODE 105 * BOLT CODE
108 * 106 *
109 ***************************************************************************/ 107 ***************************************************************************/
110 108
111/* Causes op to fork. op is the original bolt, tmp 109/* Causes op to fork. op is the original bolt, tmp
112 * is the first piece of the fork. 110 * is the first piece of the fork.
113 */ 111 */
114
115void 112void
116forklightning (object *op, object *tmp) 113forklightning (object *op, object *tmp)
117{ 114{
118 int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */ 115 int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */
119 int t_dir; /* stores temporary dir calculation */ 116 int t_dir; /* stores temporary dir calculation */
… …
151 new_bolt->duration++; 148 new_bolt->duration++;
152 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */ 149 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */
153 new_bolt->stats.dam++; 150 new_bolt->stats.dam++;
154 tmp->stats.dam /= 2; /* reduce father bolt damage */ 151 tmp->stats.dam /= 2; /* reduce father bolt damage */
155 tmp->stats.dam++; 152 tmp->stats.dam++;
153
156 if ((new_bolt = m->insert (new_bolt, sx, sy, op))) 154 if ((new_bolt = m->insert (new_bolt, sx, sy, op)))
157 update_turn_face (new_bolt); 155 update_turn_face (new_bolt);
158} 156}
159 157
160/* move_bolt: moves bolt 'op'. Basically, it just advances a space, 158/* move_bolt: moves bolt 'op'. Basically, it just advances a space,
161 * and checks for various things that may stop it. 159 * and checks for various things that may stop it.
162 */ 160 */
163
164void 161void
165move_bolt (object *op) 162move_bolt (object *op)
166{ 163{
167 int mflags; 164 int mflags;
168 sint16 x, y; 165 sint16 x, y;
169 maptile *m; 166 maptile *m;
170 167
171 if (--op->duration < 0) 168 if (--op->duration < 0)
172 { 169 {
173 op->destroy (); 170 op->drop_and_destroy ();
174 return; 171 return;
175 } 172 }
176 173
177 hit_map (op, 0, op->attacktype, 1); 174 hit_map (op, 0, op->attacktype, 1);
178 175
… …
251 tmp->duration++; 248 tmp->duration++;
252 249
253 /* New forking code. Possibly create forks of this object 250 /* New forking code. Possibly create forks of this object
254 * going off in other directions. 251 * going off in other directions.
255 */ 252 */
256 if (rndm (0, 99) < tmp->stats.Dex) 253 if (tmp->stats.Dex && rndm (0, 99) < tmp->stats.Dex)
257 { /* stats.Dex % of forking */ 254 forklightning (op, tmp); /* stats.Dex % of forking */
258 forklightning (op, tmp);
259 }
260 255
261 /* In this way, the object left behind sticks on the space, but 256 /* In this way, the object left behind sticks on the space, but
262 * doesn't create any bolts that continue to move onward. 257 * doesn't create any bolts that continue to move onward.
263 */ 258 */
264 op->range = 0; 259 op->range = 0;
… …
288 return 0; 283 return 0;
289 284
290 /* peterm: level dependency for bolts */ 285 /* peterm: level dependency for bolts */
291 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob); 286 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob);
292 tmp->attacktype = spob->attacktype; 287 tmp->attacktype = spob->attacktype;
288
293 if (spob->slaying) 289 if (spob->slaying)
294 tmp->slaying = spob->slaying; 290 tmp->slaying = spob->slaying;
291
295 tmp->range = spob->range + SP_level_range_adjust (caster, spob); 292 tmp->range = spob->range + SP_level_range_adjust (caster, spob);
296 tmp->duration = spob->duration + SP_level_duration_adjust (caster, spob); 293 tmp->duration = spob->duration + SP_level_duration_adjust (caster, spob);
297 tmp->stats.Dex = spob->stats.Dex; 294 tmp->stats.Dex = spob->stats.Dex;
298 tmp->stats.Con = spob->stats.Con; 295 tmp->stats.Con = spob->stats.Con;
299 296
… …
310 307
311 maptile *newmap; 308 maptile *newmap;
312 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);
313 if (mflags & P_OUT_OF_MAP) 310 if (mflags & P_OUT_OF_MAP)
314 { 311 {
315 tmp->destroy (); 312 tmp->drop_and_destroy ();
316 return 0; 313 return 0;
317 } 314 }
318 315
319 tmp->map = newmap; 316 tmp->map = newmap;
320 317
321 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)))
322 { 319 {
323 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 320 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
324 { 321 {
325 tmp->destroy (); 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;
… …
396void 393void
397explode_bullet (object *op) 394explode_bullet (object *op)
398{ 395{
399 object *tmp, *owner; 396 object *tmp, *owner;
400 397
401 if (op->other_arch == NULL) 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 (); 401 op->destroy ();
405 return; 402 return;
406 } 403 }
… …
435 } 432 }
436 433
437 if (op->attacktype) 434 if (op->attacktype)
438 { 435 {
439 hit_map (op, 0, op->attacktype, 1); 436 hit_map (op, 0, op->attacktype, 1);
437
440 if (op->destroyed ()) 438 if (op->destroyed ())
441 return; 439 return;
442 } 440 }
443 441
444 /* other_arch contains what this explodes into */ 442 /* other_arch contains what this explodes into */
… …
447 tmp->set_owner (op); 445 tmp->set_owner (op);
448 tmp->skill = op->skill; 446 tmp->skill = op->skill;
449 447
450 owner = op->owner; 448 owner = op->owner;
451 449
452 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner)) 450 if ((tmp->attacktype & AT_HOLYWORD
451 || tmp->attacktype & AT_GODPOWER)
452 && owner
453 && !tailor_god_spell (tmp, owner))
453 { 454 {
454 op->destroy (); 455 op->destroy ();
455 return; 456 return;
456 } 457 }
457 458
… …
522 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 523 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
523 { 524 {
524 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 525 if (QUERY_FLAG (tmp, FLAG_ALIVE))
525 { 526 {
526 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 527 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
528
529 // TODO: can't understand the following if's
527 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0) 530 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
528 { 531 {
529 if (!QUERY_FLAG (op, FLAG_REMOVED)) 532 if (!QUERY_FLAG (op, FLAG_REMOVED))
530 { 533 {
531 op->destroy (); 534 op->destroy ();
… …
705/* move_cone: causes cone object 'op' to move a space/hit creatures */ 708/* move_cone: causes cone object 'op' to move a space/hit creatures */
706 709
707void 710void
708move_cone (object *op) 711move_cone (object *op)
709{ 712{
710 int i;
711
712 /* if no map then hit_map will crash so just ignore object */ 713 /* if no map then hit_map will crash so just ignore object */
713 if (!op->map) 714 if (!op->map)
714 { 715 {
715 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown"); 716 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown");
716 op->set_speed (0); 717 op->set_speed (0);
… …
736 } 737 }
737#endif 738#endif
738 739
739 hit_map (op, 0, op->attacktype, 0); 740 hit_map (op, 0, op->attacktype, 0);
740 741
742 if (!op->is_on_map ())
743 return;
744
741 /* Check to see if we should push anything. 745 /* Check to see if we should push anything.
742 * Spell objects with weight push whatever they encounter to some 746 * Spell objects with weight push whatever they encounter to some
743 * degree. 747 * degree.
744 */ 748 */
745 if (op->weight) 749 if (op->weight)
750 {
746 check_spell_knockback (op); 751 check_spell_knockback (op);
747 752
748 if (op->destroyed ()) 753 if (!op->is_on_map ())
749 return; 754 return;
755 }
750 756
751 if ((op->duration--) < 0) 757 if (op->duration-- < 0)
752 { 758 {
753 op->destroy (); 759 op->destroy ();
754 return; 760 return;
755 } 761 }
756 /* Object has hit maximum range, so don't have it move 762 /* Object has hit maximum range, so don't have it move
… …
761 { 767 {
762 op->range = 0; /* just so it doesn't wrap */ 768 op->range = 0; /* just so it doesn't wrap */
763 return; 769 return;
764 } 770 }
765 771
766 for (i = -1; i < 2; i++) 772 for (int i = -1; i <= 1; i++)
767 { 773 {
768 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)]; 774 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)];
769 775
770 if (ok_to_put_more (op->map, x, y, op, op->attacktype)) 776 if (ok_to_put_more (op->map, x, y, op, op->attacktype))
771 { 777 {
… …
822 */ 828 */
823 movetype = spell->other_arch->move_type; 829 movetype = spell->other_arch->move_type;
824 830
825 for (i = range_min; i <= range_max; i++) 831 for (i = range_min; i <= range_max; i++)
826 { 832 {
827 sint16 x, y, d; 833 sint16 x, y;
828 834
829 /* We can't use absdir here, because it never returns 835 /* We can't use absdir here, because it never returns
830 * 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
831 * 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
832 * to hit that person. 838 * to hit that person.
833 */ 839 */
834 d = dir + i; 840 int d = dir ? absdir (dir + i) : i;
835 while (d < 0)
836 d += 8;
837 while (d > 8)
838 d -= 8;
839 841
840 /* 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.
841 * In that case, we have to see - if dir is specified, 843 * In that case, we have to see - if dir is specified,
842 * turn this into direction 8. If dir is not specified (all 844 * turn this into direction 8. If dir is not specified (all
843 * direction) skip - otherwise, one line would do more damage 845 * direction) skip - otherwise, one line would do more damage
… …
863 865
864 success = 1; 866 success = 1;
865 tmp = arch_to_object (spell->other_arch); 867 tmp = arch_to_object (spell->other_arch);
866 tmp->set_owner (op); 868 tmp->set_owner (op);
867 set_spell_skill (op, caster, spell, tmp); 869 set_spell_skill (op, caster, spell, tmp);
868 tmp->level = caster_level (caster, spell); 870 tmp->level = casting_level (caster, spell);
869 tmp->attacktype = spell->attacktype; 871 tmp->attacktype = spell->attacktype;
870 872
871 /* holy word stuff */ 873 /* holy word stuff */
872 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) 874 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER))
873 if (!tailor_god_spell (tmp, op)) 875 if (!tailor_god_spell (tmp, op))
… …
1002 int mflags; 1004 int mflags;
1003 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];
1004 maptile *m; 1006 maptile *m;
1005 1007
1006 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 {
1007 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))
1008 { 1017 {
1009 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.");
1010 return 0; 1019 return 0;
1020 }
1011 } 1021 }
1012 1022
1013 tmp = arch_to_object (spell->other_arch); 1023 tmp = arch_to_object (spell->other_arch);
1014 1024
1015 /* level dependencies for bomb */ 1025 /* level dependencies for bomb */
… …
1101 * interesting spell. 1111 * interesting spell.
1102 * 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
1103 * can't be friendly to your god. 1113 * can't be friendly to your god.
1104 */ 1114 */
1105 1115
1106 if (!target || QUERY_FLAG (target, FLAG_REFL_SPELL) 1116 if (!target
1117 || target->flag [FLAG_REFL_SPELL]
1107 || (!god && spell->stats.grace) 1118 || (!god && spell->stats.grace)
1108 || (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)))
1109 { 1121 {
1110 new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded."); 1122 new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded.");
1111 return 0; 1123 return 0;
1112 } 1124 }
1113 1125
… …
1115 effect = arch_to_object (spell->other_arch); 1127 effect = arch_to_object (spell->other_arch);
1116 else 1128 else
1117 return 0; 1129 return 0;
1118 1130
1119 /* tailor the effect by priest level and worshipped God */ 1131 /* tailor the effect by priest level and worshipped God */
1120 effect->level = caster_level (caster, spell); 1132 effect->level = casting_level (caster, spell);
1121 effect->attacktype = spell->attacktype; 1133 effect->attacktype = spell->attacktype;
1122 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER)) 1134 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER))
1123 { 1135 {
1124 if (tailor_god_spell (effect, op)) 1136 if (tailor_god_spell (effect, op))
1125 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));
1126 else 1138 else
1127 { 1139 {
1128 new_draw_info (NDI_UNIQUE, 0, op, "Your request is ignored."); 1140 new_draw_info (NDI_UNIQUE, 0, op, "Your request is ignored.");
1129 return 0; 1141 return 0;
1130 } 1142 }
… …
1180 1192
1181/* op is a missile that needs to be moved */ 1193/* op is a missile that needs to be moved */
1182void 1194void
1183move_missile (object *op) 1195move_missile (object *op)
1184{ 1196{
1185 int i, mflags;
1186 object *owner;
1187 sint16 new_x, new_y;
1188 maptile *m;
1189
1190 if (op->range-- <= 0) 1197 if (op->range-- <= 0)
1191 { 1198 {
1199 op->drop_and_destroy ();
1200 return;
1201 }
1202
1203 mapxy pos (op);
1204 pos.move (op->direction);
1205
1206 if (!pos.normalise ())
1207 {
1192 op->destroy (); 1208 op->destroy ();
1193 return; 1209 return;
1194 } 1210 }
1195 1211
1196 owner = op->owner; 1212 mapspace &ms = pos.ms ();
1197#if 0
1198 /* It'd make things nastier if this wasn't here - spells cast by
1199 * monster that are then killed would continue to survive
1200 */
1201 if (owner == NULL)
1202 {
1203 op->destroy ();
1204 return;
1205 }
1206#endif
1207 1213
1208 new_x = op->x + DIRX (op); 1214 if (ms.flags () & P_IS_ALIVE || ms.blocks (op))
1209 new_y = op->y + DIRY (op);
1210
1211 mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y);
1212
1213 if (!(mflags & P_OUT_OF_MAP) && ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))))
1214 { 1215 {
1215 hit_map (op, op->direction, AT_MAGIC, 1); 1216 hit_map (op, op->direction, AT_MAGIC, 1);
1216 /* Basically, missile only hits one thing then goes away. 1217 /* Basically, missile only hits one thing then goes away.
1217 * 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.
1218 */ 1219 */
1219 if (!op->destroyed ())
1220 op->destroy ();
1221
1222 return;
1223 }
1224
1225 op->remove ();
1226
1227 if (!op->direction || (mflags & P_OUT_OF_MAP))
1228 {
1229 op->destroy (); 1220 op->destroy ();
1230 return; 1221 return;
1231 } 1222 }
1232 1223
1224 if (!op->direction)
1225 {
1226 op->destroy ();
1227 return;
1228 }
1229
1233 i = spell_find_dir (m, new_x, new_y, op->owner); 1230 int i = spell_find_dir (pos.m, pos.x, pos.y, op->owner);
1234 if (i > 0 && i != op->direction) 1231 if (i > 0 && i != op->direction)
1235 { 1232 {
1236 op->direction = i; 1233 op->direction = i;
1237 SET_ANIMATION (op, op->direction); 1234 SET_ANIMATION (op, op->direction);
1238 } 1235 }
1239 1236
1240 m->insert (op, new_x, new_y, op); 1237 pos.insert (op, op);
1241} 1238}
1242 1239
1243/**************************************************************************** 1240/****************************************************************************
1244 * Destruction 1241 * Destruction
1245 ****************************************************************************/ 1242 ****************************************************************************/
… …
1259 1256
1260 object *tmp = get_archetype (FORCE_NAME); 1257 object *tmp = get_archetype (FORCE_NAME);
1261 tmp->speed = 0.01; 1258 tmp->speed = 0.01;
1262 tmp->stats.food = time; 1259 tmp->stats.food = time;
1263 SET_FLAG (tmp, FLAG_IS_USED_UP); 1260 SET_FLAG (tmp, FLAG_IS_USED_UP);
1264 tmp->glow_radius = radius; 1261 tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius));
1265 if (tmp->glow_radius > MAX_LIGHT_RADII)
1266 tmp->glow_radius = MAX_LIGHT_RADII;
1267
1268 tmp = insert_ob_in_ob (tmp, op); 1262 tmp = insert_ob_in_ob (tmp, op);
1269 1263
1270 if (tmp->glow_radius > op->glow_radius) 1264 if (tmp->glow_radius > op->glow_radius)
1271 op->glow_radius = tmp->glow_radius; 1265 op->set_glow_radius (tmp->glow_radius);
1272 1266
1273 return 1; 1267 return 1;
1274} 1268}
1275 1269
1276int 1270int
1277cast_destruction (object *op, object *caster, object *spell_ob) 1271cast_destruction (object *op, object *caster, object *spell_ob)
1278{ 1272{
1279 int i, j, range, mflags, friendly = 0, dam, dur;
1280 sint16 sx, sy;
1281 maptile *m;
1282 object *tmp;
1283 const char *skill;
1284
1285 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob); 1273 int range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
1286 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);
1287 dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 1275 int dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
1288 if (QUERY_FLAG (op, FLAG_FRIENDLY) || op->type == PLAYER) 1276
1289 friendly = 1; 1277 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player ();
1290 1278
1291 /* destruction doesn't use another spell object, so we need 1279 /* destruction doesn't use another spell object, so we need
1292 * update op's skill pointer so that exp is properly awarded. 1280 * update op's skill pointer so that exp is properly awarded.
1293 * We do some shortcuts here - since this is just temporary
1294 * and we'll reset the values back, we don't need to go through
1295 * the full share string/free_string route.
1296 */ 1281 */
1297 skill = op->skill; 1282 const shstr skill = op->skill;
1283
1298 if (caster == op) 1284 if (caster == op)
1299 op->skill = spell_ob->skill; 1285 op->skill = spell_ob->skill;
1300 else if (caster->skill) 1286 else if (caster->skill)
1301 op->skill = caster->skill; 1287 op->skill = caster->skill;
1302 else 1288 else
1303 op->skill = NULL; 1289 op->skill = 0;
1304 1290
1305 op->change_skill (find_skill_by_name (op, op->skill)); 1291 op->change_skill (find_skill_by_name (op, op->skill));
1306 1292
1307 for (i = -range; i < range; i++) 1293 unordered_mapwalk (op, -range, -range, range, range)
1308 { 1294 {
1309 for (j = -range; j < range; j++) 1295 mapspace &ms = m->at (nx, ny);
1310 {
1311 m = op->map;
1312 sx = op->x + i;
1313 sy = op->y + j;
1314 1296
1315 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1316 if (mflags & P_OUT_OF_MAP)
1317 continue;
1318
1319 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 ())
1320 { 1300 {
1321 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 1301 tmp = tmp->head_ ();
1322 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
1323 break;
1324 1302
1325 if (tmp) 1303 if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ())
1304 || (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ())))
1326 { 1305 {
1327 if (tmp->head) 1306 if (spell_ob->subtype == SP_DESTRUCTION)
1328 tmp = tmp->head;
1329
1330 if ((friendly && !QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->type != PLAYER) ||
1331 (!friendly && (QUERY_FLAG (tmp, FLAG_FRIENDLY) || tmp->type == PLAYER)))
1332 { 1307 {
1333 if (spell_ob->subtype == SP_DESTRUCTION)
1334 {
1335 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1308 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1309
1336 if (spell_ob->other_arch) 1310 if (spell_ob->other_arch)
1337 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);
1338 } 1312 }
1339 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)
1340 { 1314 {
1341 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1315 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1342 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);
1343 }
1344 } 1317 }
1345 } 1318 }
1346 } 1319 }
1347 }
1348 } 1320 }
1349 1321
1350 op->skill = skill; 1322 op->skill = skill;
1351 return 1; 1323 return 1;
1352} 1324}
… …
1459 */ 1431 */
1460int 1432int
1461mood_change (object *op, object *caster, object *spell) 1433mood_change (object *op, object *caster, object *spell)
1462{ 1434{
1463 object *tmp, *god, *head; 1435 object *tmp, *god, *head;
1464 int done_one, range, mflags, level, at, best_at; 1436 int done_one, range, level, at, best_at;
1465 sint16 x, y, nx, ny;
1466 maptile *m;
1467 const char *race; 1437 const char *race;
1468 1438
1469 /* 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
1470 * doing it over and over again. 1440 * doing it over and over again.
1471 */ 1441 */
1472 god = find_god (determine_god (op)); 1442 god = find_god (determine_god (op));
1473 level = caster_level (caster, spell); 1443 level = casting_level (caster, spell);
1474 range = spell->range + SP_level_range_adjust (caster, spell); 1444 range = spell->range + SP_level_range_adjust (caster, spell);
1475 1445
1476 /* On the bright side, no monster should ever have a race of GOD_... 1446 /* On the bright side, no monster should ever have a race of GOD_...
1477 * 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
1478 * won't ever match anything. 1448 * won't ever match anything.
1479 */ 1449 */
1480 if (!spell->race) 1450 if (!spell->race)
1481 race = NULL; 1451 race = NULL;
1482 else if (god && !strcmp (spell->race, "GOD_SLAYING")) 1452 else if (god && spell->race == shstr_GOD_SLAYING)
1483 race = god->slaying; 1453 race = god->slaying;
1484 else if (god && !strcmp (spell->race, "GOD_FRIEND")) 1454 else if (god && spell->race == shstr_GOD_FRIEND)
1485 race = god->race; 1455 race = god->race;
1486 else 1456 else
1487 race = spell->race; 1457 race = spell->race;
1488 1458
1489 for (x = op->x - range; x <= op->x + range; x++) 1459 unordered_mapwalk (op, -range, -range, range, range)
1490 for (y = op->y - range; y <= op->y + range; y++)
1491 { 1460 {
1492 done_one = 0; 1461 mapspace &ms = m->at (nx, ny);
1493 m = op->map;
1494 nx = x;
1495 ny = y;
1496 mflags = get_map_flags (m, &m, x, y, &nx, &ny);
1497 if (mflags & P_OUT_OF_MAP)
1498 continue;
1499 1462
1500 /* 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 */
1501 if (!(mflags & P_IS_ALIVE)) 1464 if (!ms.flags () & P_IS_ALIVE)
1502 continue; 1465 continue;
1503 1466
1504 // players can only affect spaces that they can actually see 1467 // players can only affect spaces that they can actually see
1468 if (caster
1505 if (caster && caster->contr 1469 && caster->contr
1506 && caster->contr->visibility_at (m, nx, ny) < 70) 1470 && caster->contr->darkness_at (m, nx, ny) == LOS_BLOCKED)
1507 continue; 1471 continue;
1508 1472
1509 for (tmp = GET_MAP_TOP (m, nx, ny); tmp; tmp = tmp->below) 1473 for (tmp = ms.top; tmp; tmp = tmp->below)
1510 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1474 if (tmp->flag [FLAG_MONSTER])
1511 break; 1475 break;
1512 1476
1513 /* There can be living objects that are not monsters */ 1477 /* There can be living objects that are not monsters */
1514 if (!tmp || tmp->type == PLAYER) 1478 if (!tmp)
1515 continue; 1479 continue;
1516 1480
1517 /* Only the head has meaningful data, so resolve to that */ 1481 /* Only the head has meaningful data, so resolve to that */
1518 if (tmp->head)
1519 head = tmp->head; 1482 head = tmp->head_ ();
1520 else
1521 head = tmp;
1522 1483
1523 /* 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 */
1524 if (race && head->race && !strstr (race, head->race)) 1485 if (race && head->race && !strstr (race, head->race))
1525 continue; 1486 continue;
1526 1487
1527 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD)) 1488 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD))
1528 continue; 1489 continue;
1529 1490
1530 /* Now do a bunch of stuff related to saving throws */ 1491 /* Now do a bunch of stuff related to saving throws */
1531 best_at = -1; 1492 best_at = -1;
1532 if (spell->attacktype) 1493 if (spell->attacktype)
1533 { 1494 {
1534 for (at = 0; at < NROFATTACKS; at++) 1495 for (at = 0; at < NROFATTACKS; at++)
1535 if (spell->attacktype & (1 << at)) 1496 if (spell->attacktype & (1 << at))
1536 if (best_at == -1 || head->resist[at] > head->resist[best_at]) 1497 if (best_at == -1 || head->resist[at] > head->resist[best_at])
1537 best_at = at; 1498 best_at = at;
1538 1499
1539 if (best_at == -1) 1500 if (best_at == -1)
1540 at = 0; 1501 at = 0;
1541 else 1502 else
1542 { 1503 {
1543 if (head->resist[best_at] == 100) 1504 if (head->resist[best_at] == 100)
1544 continue; 1505 continue;
1545 else 1506 else
1546 at = head->resist[best_at] / 5; 1507 at = head->resist[best_at] / 5;
1547 } 1508 }
1509
1548 at -= level / 5; 1510 at -= level / 5;
1549 if (did_make_save (head, head->level, at)) 1511 if (did_make_save (head, head->level, at))
1550 continue; 1512 continue;
1551 } 1513 }
1552 else /* spell->attacktype */ 1514 else /* spell->attacktype */
1553 { 1515 {
1554 /* 1516 /*
1555 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:
1556 * if spell level < monster level, no go 1518 * if spell level < monster level, no go
1557 * 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 ) )
1558 1520
1559 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.
1560 1522
1561 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
1562 charm a level 125 monster... 1524 charm a level 125 monster...
1563 1525
1564 Ryo, august 14th 1526 Ryo, august 14th
1565 */ 1527 */
1566 if (head->level > level) 1528 if (head->level > level)
1567 continue; 1529 continue;
1568 1530
1569 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))))
1570 /* Failed, no effect */ 1532 /* Failed, no effect */
1571 continue; 1533 continue;
1572 } 1534 }
1573 1535
1574 /* Done with saving throw. Now start affecting the monster */ 1536 /* Done with saving throw. Now start affecting the monster */
1537 done_one = 0;
1575 1538
1576 /* aggravation */ 1539 /* aggravation */
1577 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1540 if (QUERY_FLAG (spell, FLAG_MONSTER))
1578 { 1541 {
1579 CLEAR_FLAG (head, FLAG_SLEEP); 1542 CLEAR_FLAG (head, FLAG_SLEEP);
1580 remove_friendly_object (head); 1543 remove_friendly_object (head);
1581 done_one = 1; 1544 done_one = 1;
1582 head->enemy = op; 1545 head->enemy = op;
1583 } 1546 }
1584 1547
1585 /* calm monsters */ 1548 /* calm monsters */
1586 if (QUERY_FLAG (spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (head, FLAG_UNAGGRESSIVE)) 1549 if (QUERY_FLAG (spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (head, FLAG_UNAGGRESSIVE))
1587 { 1550 {
1588 SET_FLAG (head, FLAG_UNAGGRESSIVE); 1551 SET_FLAG (head, FLAG_UNAGGRESSIVE);
1589 head->enemy = NULL; 1552 head->enemy = NULL;
1590 done_one = 1; 1553 done_one = 1;
1591 } 1554 }
1592 1555
1593 /* berserk monsters */ 1556 /* berserk monsters */
1594 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK)) 1557 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK))
1595 { 1558 {
1596 SET_FLAG (head, FLAG_BERSERK); 1559 SET_FLAG (head, FLAG_BERSERK);
1597 done_one = 1; 1560 done_one = 1;
1598 } 1561 }
1599 1562
1600 /* charm */ 1563 /* charm */
1601 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))
1602 { 1565 {
1603 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster)); 1566 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster));
1604 1567
1605 /* Prevent uncontrolled outbreaks of self replicating monsters. 1568 /* Prevent uncontrolled outbreaks of self replicating monsters.
1606 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.
1607 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. */
1608 CLEAR_FLAG (head, FLAG_GENERATOR); 1571 CLEAR_FLAG (head, FLAG_GENERATOR);
1609 head->set_owner (op); 1572 head->set_owner (op);
1610 set_spell_skill (op, caster, spell, head); 1573 set_spell_skill (op, caster, spell, head);
1611 add_friendly_object (head); 1574 add_friendly_object (head);
1612 head->attack_movement = PETMOVE; 1575 head->attack_movement = PETMOVE;
1613 done_one = 1; 1576 done_one = 1;
1614 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);
1615 head->stats.exp = 0; 1578 head->stats.exp = 0;
1616 } 1579 }
1617 1580
1618 /* If a monster was effected, put an effect in */ 1581 /* If a monster was effected, put an effect in */
1619 if (done_one && spell->other_arch) 1582 if (done_one && spell->other_arch)
1620 m->insert (arch_to_object (spell->other_arch), nx, ny, op); 1583 m->insert (arch_to_object (spell->other_arch), nx, ny, op);
1621 } /* for y */ 1584 }
1622 1585
1623 return 1; 1586 return 1;
1624} 1587}
1625
1626 1588
1627/* 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
1628 * 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
1629 * lightning spell used it, that seemed misnamed. 1591 * lightning spell used it, that seemed misnamed.
1630 * op is the spell effect. 1592 * op is the spell effect.
1631 * note that duration is handled by process_object() in time.c 1593 * note that duration is handled by process_object() in time.c
1632 */ 1594 */
1633
1634void 1595void
1635move_ball_spell (object *op) 1596move_ball_spell (object *op)
1636{ 1597{
1637 int i, j, dam_save, dir, mflags; 1598 int i, j, dam_save, dir, mflags;
1638 sint16 nx, ny, hx, hy; 1599 sint16 nx, ny, hx, hy;
… …
1657 for (i = 1; i < 9; i++) 1618 for (i = 1; i < 9; i++)
1658 { 1619 {
1659 /* i bit 0: alters sign of offset 1620 /* i bit 0: alters sign of offset
1660 * other bits (i / 2): absolute value of offset 1621 * other bits (i / 2): absolute value of offset
1661 */ 1622 */
1662
1663 int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2); 1623 int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2);
1664 int tmpdir = absdir (op->direction + offset); 1624 int tmpdir = absdir (op->direction + offset);
1665 1625
1666 nx = op->x + freearr_x[tmpdir]; 1626 nx = op->x + freearr_x[tmpdir];
1667 ny = op->y + freearr_y[tmpdir]; 1627 ny = op->y + freearr_y[tmpdir];
… …
1669 { 1629 {
1670 dir = tmpdir; 1630 dir = tmpdir;
1671 break; 1631 break;
1672 } 1632 }
1673 } 1633 }
1634
1674 if (dir == 0) 1635 if (dir == 0)
1675 { 1636 {
1676 nx = op->x; 1637 nx = op->x;
1677 ny = op->y; 1638 ny = op->y;
1678 m = op->map; 1639 m = op->map;
… …
1704 1665
1705 if ((mflags & P_IS_ALIVE) && (!owner || owner->x != hx || owner->y != hy || !on_same_map (owner, op))) 1666 if ((mflags & P_IS_ALIVE) && (!owner || owner->x != hx || owner->y != hy || !on_same_map (owner, op)))
1706 { 1667 {
1707 if (j) 1668 if (j)
1708 op->stats.dam = dam_save / 2; 1669 op->stats.dam = dam_save / 2;
1670
1709 hit_map (op, j, op->attacktype, 1); 1671 hit_map (op, j, op->attacktype, 1);
1710
1711 } 1672 }
1712 1673
1713 /* insert the other arch */ 1674 /* insert the other arch */
1714 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))) 1675 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))
1715 m->insert (arch_to_object (op->other_arch), hx, hy, op); 1676 m->insert (arch_to_object (op->other_arch), hx, hy, op);
… …
1748 int adjustdir; 1709 int adjustdir;
1749 maptile *m; 1710 maptile *m;
1750#endif 1711#endif
1751 object *owner = op->env; 1712 object *owner = op->env;
1752 1713
1714 if (!owner) // MUST not happen, remove when true TODO
1715 {
1716 LOG (llevError, "swarm spell found outside inventory: %s\n", op->debug_desc ());
1717 op->destroy ();
1718 return;
1719 }
1720
1753 if (!op->duration || !owner->is_on_map ()) 1721 if (!op->duration || !owner->is_on_map ())
1754 { 1722 {
1755 op->destroy (); 1723 op->drop_and_destroy ();
1756 return; 1724 return;
1757 } 1725 }
1758 1726
1759 op->duration--; 1727 op->duration--;
1760 1728
1761 int basedir = op->direction; 1729 int basedir = op->direction;
1762 if (!basedir) 1730 if (!basedir)
1731 {
1763 /* spray in all directions! 8) */ 1732 /* spray in all directions! 8) */
1764 basedir = 1 + (op->facing += op->state) % 8; 1733 op->facing = (op->facing + op->state) & 7;
1734 basedir = op->facing + 1;
1735 }
1765 1736
1766#if 0 1737#if 0
1767 // this is bogus: it causes wrong places to be checked below 1738 // this is bogus: it causes wrong places to be checked below
1768 // (a wall 2 cells away will block the effect...) and 1739 // (a wall 2 cells away will block the effect...) and
1769 // doesn't work for SP_BULLET anyhow, so again tests the wrong 1740 // doesn't work for SP_BULLET anyhow, so again tests the wrong
… …
1829 { 1800 {
1830 /* Bullet spells have a bunch more customization that needs to be done */ 1801 /* Bullet spells have a bunch more customization that needs to be done */
1831 if (op->spell->subtype == SP_BULLET) 1802 if (op->spell->subtype == SP_BULLET)
1832 fire_bullet (owner, op, basedir, op->spell); 1803 fire_bullet (owner, op, basedir, op->spell);
1833 else if (op->spell->subtype == SP_MAGIC_MISSILE) 1804 else if (op->spell->subtype == SP_MAGIC_MISSILE)
1834 fire_arch_from_position (owner, op, op->x, op->y, basedir, op->spell); 1805 fire_arch_from_position (owner, op, owner->x, owner->y, basedir, op->spell);
1835 } 1806 }
1836} 1807}
1837 1808
1838/* fire_swarm: 1809/* fire_swarm:
1839 * The following routine creates a swarm of objects. It actually 1810 * The following routine creates a swarm of objects. It actually
… …
1851{ 1822{
1852 if (!spell->other_arch) 1823 if (!spell->other_arch)
1853 return 0; 1824 return 0;
1854 1825
1855 object *tmp = archetype::get (SWARM_SPELL); 1826 object *tmp = archetype::get (SWARM_SPELL);
1827
1856 set_spell_skill (op, caster, spell, tmp); 1828 set_spell_skill (op, caster, spell, tmp);
1857 tmp->level = caster_level (caster, spell); /* needed later, to get level dep. right. */ 1829 tmp->level = casting_level (caster, spell); /* needed later, to get level dep. right. */
1858 tmp->spell = spell->other_arch->instance (); 1830 tmp->spell = spell->other_arch->instance ();
1859 tmp->attacktype = tmp->spell->attacktype; 1831 tmp->attacktype = tmp->spell->attacktype;
1860 1832
1861 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 1833 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
1862 if (!tailor_god_spell (tmp, op)) 1834 if (!tailor_god_spell (tmp, op))
… …
1864 1836
1865 tmp->duration = SP_level_duration_adjust (caster, spell); 1837 tmp->duration = SP_level_duration_adjust (caster, spell);
1866 for (int i = 0; i < spell->duration; i++) 1838 for (int i = 0; i < spell->duration; i++)
1867 tmp->duration += die_roll (1, 3, op, PREFER_HIGH); 1839 tmp->duration += die_roll (1, 3, op, PREFER_HIGH);
1868 1840
1841 tmp->invisible = 1;
1842 tmp->flag [FLAG_NO_DROP] = 1; // make sure it stays in inv, or else
1869 tmp->direction = dir; 1843 tmp->direction = dir;
1870 tmp->invisible = 1;
1871 tmp->facing = rndm (8); // initial firing direction 1844 tmp->facing = rndm (1, 8); // initial firing direction
1872 tmp->state = rndm (4) * 2 + 1; // direction increment 1845 tmp->state = rndm (4) * 2 + 1; // direction increment
1873 1846
1874 op->insert (tmp); 1847 op->insert (tmp);
1875 1848
1876 return 1; 1849 return 1;
… …
1887 int dam, mflags; 1860 int dam, mflags;
1888 maptile *m; 1861 maptile *m;
1889 1862
1890 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1863 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1891 1864
1892 if (!dir) 1865 if (dir)
1893 {
1894 new_draw_info (NDI_UNIQUE, 0, op, "In what direction?");
1895 return 0;
1896 } 1866 {
1897
1898 x = op->x + freearr_x[dir]; 1867 x = op->x + freearr_x[dir];
1899 y = op->y + freearr_y[dir]; 1868 y = op->y + freearr_y[dir];
1900 m = op->map; 1869 m = op->map;
1901 1870
1902 mflags = get_map_flags (m, &m, x, y, &x, &y); 1871 mflags = get_map_flags (m, &m, x, y, &x, &y);
1903 1872
1904 if (mflags & P_OUT_OF_MAP) 1873 if (mflags & P_OUT_OF_MAP)
1905 { 1874 {
1906 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there."); 1875 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there.");
1907 return 0; 1876 return 0;
1908 } 1877 }
1909 1878
1910 if (mflags & P_IS_ALIVE && spell->attacktype) 1879 if (mflags & P_IS_ALIVE && spell->attacktype)
1911 { 1880 {
1912 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)
1913 if (QUERY_FLAG (target, FLAG_MONSTER)) 1882 if (QUERY_FLAG (target, FLAG_MONSTER))
1914 { 1883 {
1915 /* oky doky. got a target monster. Lets make a blinding attack */ 1884 /* oky doky. got a target monster. Lets make a blinding attack */
1916 if (target->head) 1885 if (target->head)
1917 target = target->head; 1886 target = target->head;
1887
1918 (void) hit_player (target, dam, op, spell->attacktype, 1); 1888 hit_player (target, dam, op, spell->attacktype, 1);
1919 return 1; /* one success only! */ 1889 return 1; /* one success only! */
1890 }
1920 } 1891 }
1921 }
1922 1892
1923 /* no live target, perhaps a wall is in the way? */ 1893 /* no live target, perhaps a wall is in the way? */
1924 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)))
1925 { 1895 {
1926 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.");
1927 return 0; 1897 return 0;
1898 }
1928 } 1899 }
1929 1900
1930 /* 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 */
1931 tmp = arch_to_object (spell->other_arch); 1902 tmp = arch_to_object (spell->other_arch);
1932 if (!tmp) 1903 if (!tmp)
1933 { 1904 {
1934 LOG (llevError, "Error: spell arch for cast_light() missing.\n"); 1905 LOG (llevError, "Error: spell arch for cast_light() missing.\n");
1935 return 0; 1906 return 0;
1936 } 1907 }
1908
1937 tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell); 1909 tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell);
1910
1938 if (tmp->glow_radius) 1911 if (tmp->glow_radius)
1939 { 1912 tmp->set_glow_radius (
1940 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell); 1913 min (MAX_LIGHT_RADIUS, spell->range + SP_level_range_adjust (caster, spell)));
1941 if (tmp->glow_radius > MAX_LIGHT_RADII)
1942 tmp->glow_radius = MAX_LIGHT_RADII;
1943 }
1944 1914
1915 if (dir)
1945 m->insert (tmp, x, y, op); 1916 m->insert (tmp, x, y, op);
1917 else
1918 caster->outer_env ()->insert (tmp);
1919
1946 return 1; 1920 return 1;
1947} 1921}
1948 1922
1949/* cast_cause_disease: this spell looks along <dir> from the 1923/* cast_cause_disease: this spell looks along <dir> from the
1950 * player and infects someone. 1924 * player and infects someone.
… …
2003 object *disease = arch_to_object (spell->other_arch); 1977 object *disease = arch_to_object (spell->other_arch);
2004 1978
2005 disease->set_owner (op); 1979 disease->set_owner (op);
2006 set_spell_skill (op, caster, spell, disease); 1980 set_spell_skill (op, caster, spell, disease);
2007 disease->stats.exp = 0; 1981 disease->stats.exp = 0;
2008 disease->level = caster_level (caster, spell); 1982 disease->level = casting_level (caster, spell);
2009 1983
2010 /* do level adjustments */ 1984 /* do level adjustments */
2011 if (disease->stats.wc) 1985 if (disease->stats.wc)
2012 disease->stats.wc += dur_mod / 2; 1986 disease->stats.wc += dur_mod / 2;
2013 1987

Diff Legend

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