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.75 by root, Sun Dec 28 08:08:25 2008 UTC

… …
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.
… …
961 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding 963 // 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 964 // on a safe map. I don't like this special casing, but it seems to be neccessary
963 // as bombs can be carried. 965 // as bombs can be carried.
964 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 966 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
965 { 967 {
966 op->destroy (true); 968 op->destroy ();
967 return; 969 return;
968 } 970 }
969 971
970 /* This copies a lot of the code from the fire bullet, 972 /* This copies a lot of the code from the fire bullet,
971 * but using the cast_bullet isn't really feasible, 973 * but using the cast_bullet isn't really feasible,
… …
1006 int mflags; 1008 int mflags;
1007 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir]; 1009 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];
1008 maptile *m; 1010 maptile *m;
1009 1011
1010 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy); 1012 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);
1013
1014 // when creating a bomb below ourself it should always work, even
1015 // when movement is blocked (somehow we got here, somehow we are here,
1016 // so we should also be able to make a bomb here). (originally added
1017 // to fix create bomb traps in doors, which cast with dir=0).
1018 if (dir)
1019 {
1011 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK)) 1020 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1012 { 1021 {
1013 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1022 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
1014 return 0; 1023 return 0;
1024 }
1015 } 1025 }
1016 1026
1017 tmp = arch_to_object (spell->other_arch); 1027 tmp = arch_to_object (spell->other_arch);
1018 1028
1019 /* level dependencies for bomb */ 1029 /* level dependencies for bomb */
… …
1153 } 1163 }
1154 else 1164 else
1155 { 1165 {
1156 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target)); 1166 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target));
1157 target->stats.hp = target->stats.maxhp * 2; 1167 target->stats.hp = target->stats.maxhp * 2;
1158 effect->destroy (true); 1168 effect->destroy ();
1159 return 0; 1169 return 0;
1160 } 1170 }
1161 } 1171 }
1162 } 1172 }
1163 else 1173 else
… …
1186void 1196void
1187move_missile (object *op) 1197move_missile (object *op)
1188{ 1198{
1189 if (op->range-- <= 0) 1199 if (op->range-- <= 0)
1190 { 1200 {
1191 op->destroy_inv (true); // be explicit about dropping
1192 op->destroy (true); 1201 op->drop_and_destroy ();
1193 return; 1202 return;
1194 } 1203 }
1195 1204
1196 mapxy pos (op); 1205 mapxy pos (op);
1197 pos.move (op->direction); 1206 pos.move (op->direction);
1198 1207
1199 if (!pos.normalise ()) 1208 if (!pos.normalise ())
1200 { 1209 {
1201 op->destroy (true); 1210 op->destroy ();
1202 return; 1211 return;
1203 } 1212 }
1204 1213
1205 mapspace &ms = pos.ms (); 1214 mapspace &ms = pos.ms ();
1206 1215
… …
1208 { 1217 {
1209 hit_map (op, op->direction, AT_MAGIC, 1); 1218 hit_map (op, op->direction, AT_MAGIC, 1);
1210 /* Basically, missile only hits one thing then goes away. 1219 /* Basically, missile only hits one thing then goes away.
1211 * we need to remove it if someone hasn't already done so. 1220 * we need to remove it if someone hasn't already done so.
1212 */ 1221 */
1213 op->destroy (true); 1222 op->destroy ();
1214 return; 1223 return;
1215 } 1224 }
1216 1225
1217 if (!op->direction) 1226 if (!op->direction)
1218 { 1227 {
1219 op->destroy (true); 1228 op->destroy ();
1220 return; 1229 return;
1221 } 1230 }
1222 1231
1223 int i = spell_find_dir (pos.m, pos.x, pos.y, op->owner); 1232 int i = spell_find_dir (pos.m, pos.x, pos.y, op->owner);
1224 if (i > 0 && i != op->direction) 1233 if (i > 0 && i != op->direction)
… …
1249 1258
1250 object *tmp = get_archetype (FORCE_NAME); 1259 object *tmp = get_archetype (FORCE_NAME);
1251 tmp->speed = 0.01; 1260 tmp->speed = 0.01;
1252 tmp->stats.food = time; 1261 tmp->stats.food = time;
1253 SET_FLAG (tmp, FLAG_IS_USED_UP); 1262 SET_FLAG (tmp, FLAG_IS_USED_UP);
1254 tmp->glow_radius = radius;
1255 if (tmp->glow_radius > MAX_LIGHT_RADII)
1256 tmp->glow_radius = MAX_LIGHT_RADII; 1263 tmp->glow_radius = min (MAX_LIGHT_RADIUS, radius);
1257
1258 tmp = insert_ob_in_ob (tmp, op); 1264 tmp = insert_ob_in_ob (tmp, op);
1259 1265
1260 if (tmp->glow_radius > op->glow_radius) 1266 if (tmp->glow_radius > op->glow_radius)
1261 op->glow_radius = tmp->glow_radius; 1267 op->glow_radius = tmp->glow_radius;
1262 1268
… …
1264} 1270}
1265 1271
1266int 1272int
1267cast_destruction (object *op, object *caster, object *spell_ob) 1273cast_destruction (object *op, object *caster, object *spell_ob)
1268{ 1274{
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); 1275 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); 1276 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); 1277 int dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
1278 if (QUERY_FLAG (op, FLAG_FRIENDLY) || op->type == PLAYER) 1278
1279 friendly = 1; 1279 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player ();
1280 1280
1281 /* destruction doesn't use another spell object, so we need 1281 /* destruction doesn't use another spell object, so we need
1282 * update op's skill pointer so that exp is properly awarded. 1282 * 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 */ 1283 */
1287 skill = op->skill; 1284 const shstr skill = op->skill;
1285
1288 if (caster == op) 1286 if (caster == op)
1289 op->skill = spell_ob->skill; 1287 op->skill = spell_ob->skill;
1290 else if (caster->skill) 1288 else if (caster->skill)
1291 op->skill = caster->skill; 1289 op->skill = caster->skill;
1292 else 1290 else
1293 op->skill = NULL; 1291 op->skill = 0;
1294 1292
1295 op->change_skill (find_skill_by_name (op, op->skill)); 1293 op->change_skill (find_skill_by_name (op, op->skill));
1296 1294
1297 for (i = -range; i <= range; i++) 1295 unordered_mapwalk (op, -range, -range, range, range)
1298 { 1296 {
1299 for (j = -range; j <= range; j++) 1297 mapspace &ms = m->at (nx, ny);
1300 {
1301 m = op->map;
1302 sx = op->x + i;
1303 sy = op->y + j;
1304 1298
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) 1299 if (ms.flags () & P_IS_ALIVE)
1300 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1301 if (tmp->flag [FLAG_ALIVE] || tmp->is_player ())
1310 { 1302 {
1311 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 1303 tmp = tmp->head_ ();
1312 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
1313 break;
1314 1304
1315 if (tmp) 1305 if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ())
1306 || (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ())))
1316 { 1307 {
1317 if (tmp->head) 1308 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 { 1309 {
1323 if (spell_ob->subtype == SP_DESTRUCTION)
1324 {
1325 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1310 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1326 1311
1327 if (spell_ob->other_arch) 1312 if (spell_ob->other_arch)
1328 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op); 1313 m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op);
1329 } 1314 }
1330 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100) 1315 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist [ATNR_MAGIC] != 100)
1331 { 1316 {
1332 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1317 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1333 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op); 1318 m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op);
1334 }
1335 } 1319 }
1336 } 1320 }
1337 } 1321 }
1338 }
1339 } 1322 }
1340 1323
1341 op->skill = skill; 1324 op->skill = skill;
1342 return 1; 1325 return 1;
1343} 1326}
… …
1450 */ 1433 */
1451int 1434int
1452mood_change (object *op, object *caster, object *spell) 1435mood_change (object *op, object *caster, object *spell)
1453{ 1436{
1454 object *tmp, *god, *head; 1437 object *tmp, *god, *head;
1455 int done_one, range, mflags, level, at, best_at; 1438 int done_one, range, level, at, best_at;
1456 sint16 x, y, nx, ny;
1457 maptile *m;
1458 const char *race; 1439 const char *race;
1459 1440
1460 /* We precompute some values here so that we don't have to keep 1441 /* We precompute some values here so that we don't have to keep
1461 * doing it over and over again. 1442 * doing it over and over again.
1462 */ 1443 */
… …
1475 else if (god && !strcmp (spell->race, "GOD_FRIEND")) 1456 else if (god && !strcmp (spell->race, "GOD_FRIEND"))
1476 race = god->race; 1457 race = god->race;
1477 else 1458 else
1478 race = spell->race; 1459 race = spell->race;
1479 1460
1480 for (x = op->x - range; x <= op->x + range; x++) 1461 unordered_mapwalk (op, -range, -range, range, range)
1481 for (y = op->y - range; y <= op->y + range; y++)
1482 { 1462 {
1483 done_one = 0; 1463 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 1464
1491 /* If there is nothing living on this space, no need to go further */ 1465 /* If there is nothing living on this space, no need to go further */
1492 if (!(mflags & P_IS_ALIVE)) 1466 if (!ms.flags () & P_IS_ALIVE)
1493 continue; 1467 continue;
1494 1468
1495 // players can only affect spaces that they can actually see 1469 // players can only affect spaces that they can actually see
1470 if (caster
1496 if (caster && caster->contr 1471 && caster->contr
1497 && caster->contr->visibility_at (m, nx, ny) < 70) 1472 && caster->contr->darkness_at (m, nx, ny) == LOS_BLOCKED)
1498 continue; 1473 continue;
1499 1474
1500 for (tmp = GET_MAP_TOP (m, nx, ny); tmp; tmp = tmp->below) 1475 for (tmp = ms.top; tmp; tmp = tmp->below)
1501 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1476 if (tmp->flag [FLAG_MONSTER])
1502 break; 1477 break;
1503 1478
1504 /* There can be living objects that are not monsters */ 1479 /* There can be living objects that are not monsters */
1505 if (!tmp || tmp->type == PLAYER) 1480 if (!tmp)
1506 continue; 1481 continue;
1507 1482
1508 /* Only the head has meaningful data, so resolve to that */ 1483 /* Only the head has meaningful data, so resolve to that */
1509 if (tmp->head)
1510 head = tmp->head; 1484 head = tmp->head_ ();
1511 else
1512 head = tmp;
1513 1485
1514 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */ 1486 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */
1515 if (race && head->race && !strstr (race, head->race)) 1487 if (race && head->race && !strstr (race, head->race))
1516 continue; 1488 continue;
1517 1489
1518 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD)) 1490 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD))
1519 continue; 1491 continue;
1520 1492
1521 /* Now do a bunch of stuff related to saving throws */ 1493 /* Now do a bunch of stuff related to saving throws */
1522 best_at = -1; 1494 best_at = -1;
1523 if (spell->attacktype) 1495 if (spell->attacktype)
1524 { 1496 {
1525 for (at = 0; at < NROFATTACKS; at++) 1497 for (at = 0; at < NROFATTACKS; at++)
1526 if (spell->attacktype & (1 << at)) 1498 if (spell->attacktype & (1 << at))
1527 if (best_at == -1 || head->resist[at] > head->resist[best_at]) 1499 if (best_at == -1 || head->resist[at] > head->resist[best_at])
1528 best_at = at; 1500 best_at = at;
1529 1501
1530 if (best_at == -1) 1502 if (best_at == -1)
1531 at = 0; 1503 at = 0;
1532 else 1504 else
1533 { 1505 {
1534 if (head->resist[best_at] == 100) 1506 if (head->resist[best_at] == 100)
1535 continue; 1507 continue;
1536 else 1508 else
1537 at = head->resist[best_at] / 5; 1509 at = head->resist[best_at] / 5;
1538 } 1510 }
1511
1539 at -= level / 5; 1512 at -= level / 5;
1540 if (did_make_save (head, head->level, at)) 1513 if (did_make_save (head, head->level, at))
1541 continue; 1514 continue;
1542 } 1515 }
1543 else /* spell->attacktype */ 1516 else /* spell->attacktype */
1544 { 1517 {
1545 /* 1518 /*
1546 Spell has no attacktype (charm & such), so we'll have a specific saving: 1519 Spell has no attacktype (charm & such), so we'll have a specific saving:
1547 * if spell level < monster level, no go 1520 * if spell level < monster level, no go
1548 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) ) 1521 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) )
1549 1522
1550 The chance will then be in the range [20-70] percent, not too bad. 1523 The chance will then be in the range [20-70] percent, not too bad.
1551 1524
1552 This is required to fix the 'charm monster' abuse, where a player level 1 can 1525 This is required to fix the 'charm monster' abuse, where a player level 1 can
1553 charm a level 125 monster... 1526 charm a level 125 monster...
1554 1527
1555 Ryo, august 14th 1528 Ryo, august 14th
1556 */ 1529 */
1557 if (head->level > level) 1530 if (head->level > level)
1558 continue; 1531 continue;
1559 1532
1560 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level)))) 1533 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level))))
1561 /* Failed, no effect */ 1534 /* Failed, no effect */
1562 continue; 1535 continue;
1563 } 1536 }
1564 1537
1565 /* Done with saving throw. Now start affecting the monster */ 1538 /* Done with saving throw. Now start affecting the monster */
1539 done_one = 0;
1566 1540
1567 /* aggravation */ 1541 /* aggravation */
1568 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1542 if (QUERY_FLAG (spell, FLAG_MONSTER))
1569 { 1543 {
1570 CLEAR_FLAG (head, FLAG_SLEEP); 1544 CLEAR_FLAG (head, FLAG_SLEEP);
1571 remove_friendly_object (head); 1545 remove_friendly_object (head);
1572 done_one = 1; 1546 done_one = 1;
1573 head->enemy = op; 1547 head->enemy = op;
1574 } 1548 }
1575 1549
1576 /* calm monsters */ 1550 /* calm monsters */
1577 if (QUERY_FLAG (spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (head, FLAG_UNAGGRESSIVE)) 1551 if (QUERY_FLAG (spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (head, FLAG_UNAGGRESSIVE))
1578 { 1552 {
1579 SET_FLAG (head, FLAG_UNAGGRESSIVE); 1553 SET_FLAG (head, FLAG_UNAGGRESSIVE);
1580 head->enemy = NULL; 1554 head->enemy = NULL;
1581 done_one = 1; 1555 done_one = 1;
1582 } 1556 }
1583 1557
1584 /* berserk monsters */ 1558 /* berserk monsters */
1585 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK)) 1559 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK))
1586 { 1560 {
1587 SET_FLAG (head, FLAG_BERSERK); 1561 SET_FLAG (head, FLAG_BERSERK);
1588 done_one = 1; 1562 done_one = 1;
1589 } 1563 }
1590 1564
1591 /* charm */ 1565 /* charm */
1592 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY)) 1566 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY))
1593 { 1567 {
1594 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster)); 1568 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster));
1595 1569
1596 /* Prevent uncontrolled outbreaks of self replicating monsters. 1570 /* Prevent uncontrolled outbreaks of self replicating monsters.
1597 Typical use case is charm, go somwhere, use aggravation to make hostile. 1571 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. */ 1572 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1599 CLEAR_FLAG (head, FLAG_GENERATOR); 1573 CLEAR_FLAG (head, FLAG_GENERATOR);
1600 head->set_owner (op); 1574 head->set_owner (op);
1601 set_spell_skill (op, caster, spell, head); 1575 set_spell_skill (op, caster, spell, head);
1602 add_friendly_object (head); 1576 add_friendly_object (head);
1603 head->attack_movement = PETMOVE; 1577 head->attack_movement = PETMOVE;
1604 done_one = 1; 1578 done_one = 1;
1605 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL); 1579 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);
1606 head->stats.exp = 0; 1580 head->stats.exp = 0;
1607 } 1581 }
1608 1582
1609 /* If a monster was effected, put an effect in */ 1583 /* If a monster was effected, put an effect in */
1610 if (done_one && spell->other_arch) 1584 if (done_one && spell->other_arch)
1611 m->insert (arch_to_object (spell->other_arch), nx, ny, op); 1585 m->insert (arch_to_object (spell->other_arch), nx, ny, op);
1612 } /* for y */ 1586 }
1613 1587
1614 return 1; 1588 return 1;
1615} 1589}
1616
1617 1590
1618/* Move_ball_spell: This handles ball type spells that just sort of wander 1591/* 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 1592 * about. was called move_ball_lightning, but since more than the ball
1620 * lightning spell used it, that seemed misnamed. 1593 * lightning spell used it, that seemed misnamed.
1621 * op is the spell effect. 1594 * op is the spell effect.
… …
1647 for (i = 1; i < 9; i++) 1620 for (i = 1; i < 9; i++)
1648 { 1621 {
1649 /* i bit 0: alters sign of offset 1622 /* i bit 0: alters sign of offset
1650 * other bits (i / 2): absolute value of offset 1623 * other bits (i / 2): absolute value of offset
1651 */ 1624 */
1652
1653 int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2); 1625 int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2);
1654 int tmpdir = absdir (op->direction + offset); 1626 int tmpdir = absdir (op->direction + offset);
1655 1627
1656 nx = op->x + freearr_x[tmpdir]; 1628 nx = op->x + freearr_x[tmpdir];
1657 ny = op->y + freearr_y[tmpdir]; 1629 ny = op->y + freearr_y[tmpdir];
… …
1659 { 1631 {
1660 dir = tmpdir; 1632 dir = tmpdir;
1661 break; 1633 break;
1662 } 1634 }
1663 } 1635 }
1636
1664 if (dir == 0) 1637 if (dir == 0)
1665 { 1638 {
1666 nx = op->x; 1639 nx = op->x;
1667 ny = op->y; 1640 ny = op->y;
1668 m = op->map; 1641 m = op->map;
… …
1741 object *owner = op->env; 1714 object *owner = op->env;
1742 1715
1743 if (!owner) // MUST not happen, remove when true TODO 1716 if (!owner) // MUST not happen, remove when true TODO
1744 { 1717 {
1745 LOG (llevError, "swarm spell found outside inventory: %s\n", op->debug_desc ()); 1718 LOG (llevError, "swarm spell found outside inventory: %s\n", op->debug_desc ());
1746 op->destroy (true); 1719 op->destroy ();
1747 return; 1720 return;
1748 } 1721 }
1749 1722
1750 if (!op->duration || !owner->is_on_map ()) 1723 if (!op->duration || !owner->is_on_map ())
1751 { 1724 {
1752 op->destroy_inv (true); // be explicit about dropping
1753 op->destroy (true); 1725 op->drop_and_destroy ();
1754 return; 1726 return;
1755 } 1727 }
1756 1728
1757 op->duration--; 1729 op->duration--;
1758 1730
… …
1890 int dam, mflags; 1862 int dam, mflags;
1891 maptile *m; 1863 maptile *m;
1892 1864
1893 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1865 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1894 1866
1895 if (!dir) 1867 if (dir)
1896 {
1897 new_draw_info (NDI_UNIQUE, 0, op, "In what direction?");
1898 return 0;
1899 } 1868 {
1900
1901 x = op->x + freearr_x[dir]; 1869 x = op->x + freearr_x[dir];
1902 y = op->y + freearr_y[dir]; 1870 y = op->y + freearr_y[dir];
1903 m = op->map; 1871 m = op->map;
1904 1872
1905 mflags = get_map_flags (m, &m, x, y, &x, &y); 1873 mflags = get_map_flags (m, &m, x, y, &x, &y);
1906 1874
1907 if (mflags & P_OUT_OF_MAP) 1875 if (mflags & P_OUT_OF_MAP)
1908 { 1876 {
1909 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there."); 1877 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there.");
1910 return 0; 1878 return 0;
1911 } 1879 }
1912 1880
1913 if (mflags & P_IS_ALIVE && spell->attacktype) 1881 if (mflags & P_IS_ALIVE && spell->attacktype)
1914 { 1882 {
1915 for (target = GET_MAP_OB (m, x, y); target; target = target->above) 1883 for (target = GET_MAP_OB (m, x, y); target; target = target->above)
1916 if (QUERY_FLAG (target, FLAG_MONSTER)) 1884 if (QUERY_FLAG (target, FLAG_MONSTER))
1917 { 1885 {
1918 /* oky doky. got a target monster. Lets make a blinding attack */ 1886 /* oky doky. got a target monster. Lets make a blinding attack */
1919 if (target->head) 1887 if (target->head)
1920 target = target->head; 1888 target = target->head;
1921 1889
1922 hit_player (target, dam, op, spell->attacktype, 1); 1890 hit_player (target, dam, op, spell->attacktype, 1);
1923 return 1; /* one success only! */ 1891 return 1; /* one success only! */
1892 }
1924 } 1893 }
1925 }
1926 1894
1927 /* no live target, perhaps a wall is in the way? */ 1895 /* no live target, perhaps a wall is in the way? */
1928 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y))) 1896 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)))
1929 { 1897 {
1930 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1898 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
1931 return 0; 1899 return 0;
1900 }
1932 } 1901 }
1933 1902
1934 /* ok, looks groovy to just insert a new light on the map */ 1903 /* ok, looks groovy to just insert a new light on the map */
1935 tmp = arch_to_object (spell->other_arch); 1904 tmp = arch_to_object (spell->other_arch);
1936 if (!tmp) 1905 if (!tmp)
1937 { 1906 {
1938 LOG (llevError, "Error: spell arch for cast_light() missing.\n"); 1907 LOG (llevError, "Error: spell arch for cast_light() missing.\n");
1939 return 0; 1908 return 0;
1940 } 1909 }
1910
1941 tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell); 1911 tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell);
1912
1942 if (tmp->glow_radius) 1913 if (tmp->glow_radius)
1943 {
1944 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell); 1914 tmp->glow_radius = min (MAX_LIGHT_RADIUS, spell->range + SP_level_range_adjust (caster, spell));
1945 if (tmp->glow_radius > MAX_LIGHT_RADII)
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