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.64 by root, Mon Sep 29 06:32:09 2008 UTC vs.
Revision 1.76 by root, Sun Dec 28 08:09:49 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 (); 170 op->drop_and_destroy ();
171 return; 171 return;
172 } 172 }
173 173
174 hit_map (op, 0, op->attacktype, 1); 174 hit_map (op, 0, op->attacktype, 1);
175 175
… …
307 307
308 maptile *newmap; 308 maptile *newmap;
309 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);
310 if (mflags & P_OUT_OF_MAP) 310 if (mflags & P_OUT_OF_MAP)
311 { 311 {
312 tmp->destroy (); 312 tmp->drop_and_destroy ();
313 return 0; 313 return 0;
314 } 314 }
315 315
316 tmp->map = newmap; 316 tmp->map = newmap;
317 317
318 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)))
319 { 319 {
320 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 320 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
321 { 321 {
322 tmp->destroy (); 322 tmp->drop_and_destroy ();
323 return 0; 323 return 0;
324 } 324 }
325 325
326 tmp->x = op->x; 326 tmp->x = op->x;
327 tmp->y = op->y; 327 tmp->y = op->y;
… …
445 tmp->set_owner (op); 445 tmp->set_owner (op);
446 tmp->skill = op->skill; 446 tmp->skill = op->skill;
447 447
448 owner = op->owner; 448 owner = op->owner;
449 449
450 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))
451 { 454 {
452 op->destroy (); 455 op->destroy ();
453 return; 456 return;
454 } 457 }
455 458
… …
521 { 524 {
522 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 525 if (QUERY_FLAG (tmp, FLAG_ALIVE))
523 { 526 {
524 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 527 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
525 528
529 // TODO: can't understand the following if's
526 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0) 530 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
527 { 531 {
528 if (!QUERY_FLAG (op, FLAG_REMOVED)) 532 if (!QUERY_FLAG (op, FLAG_REMOVED))
529 { 533 {
530 op->destroy (); 534 op->destroy ();
… …
733 } 737 }
734#endif 738#endif
735 739
736 hit_map (op, 0, op->attacktype, 0); 740 hit_map (op, 0, op->attacktype, 0);
737 741
742 if (!op->is_on_map ())
743 return;
744
738 /* Check to see if we should push anything. 745 /* Check to see if we should push anything.
739 * Spell objects with weight push whatever they encounter to some 746 * Spell objects with weight push whatever they encounter to some
740 * degree. 747 * degree.
741 */ 748 */
742 if (op->weight) 749 if (op->weight)
750 {
743 check_spell_knockback (op); 751 check_spell_knockback (op);
744 752
745 if (op->destroyed ()) 753 if (!op->is_on_map ())
746 return; 754 return;
755 }
747 756
748 if (op->duration-- < 0) 757 if (op->duration-- < 0)
749 { 758 {
750 op->destroy (); 759 op->destroy ();
751 return; 760 return;
… …
822 for (i = range_min; i <= range_max; i++) 831 for (i = range_min; i <= range_max; i++)
823 { 832 {
824 sint16 x, y, d; 833 sint16 x, y, d;
825 834
826 /* We can't use absdir here, because it never returns 835 /* We can't use absdir here, because it never returns
827 * 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
828 * 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
829 * to hit that person. 838 * to hit that person.
830 */ 839 */
831 d = dir + i; 840 d = (dir + i) % 9;
832 while (d < 0)
833 d += 8;
834 while (d > 8)
835 d -= 8;
836 841
837 /* 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.
838 * In that case, we have to see - if dir is specified, 843 * In that case, we have to see - if dir is specified,
839 * turn this into direction 8. If dir is not specified (all 844 * turn this into direction 8. If dir is not specified (all
840 * direction) skip - otherwise, one line would do more damage 845 * direction) skip - otherwise, one line would do more damage
… …
999 int mflags; 1004 int mflags;
1000 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];
1001 maptile *m; 1006 maptile *m;
1002 1007
1003 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 {
1004 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))
1005 { 1017 {
1006 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.");
1007 return 0; 1019 return 0;
1020 }
1008 } 1021 }
1009 1022
1010 tmp = arch_to_object (spell->other_arch); 1023 tmp = arch_to_object (spell->other_arch);
1011 1024
1012 /* level dependencies for bomb */ 1025 /* level dependencies for bomb */
… …
1179void 1192void
1180move_missile (object *op) 1193move_missile (object *op)
1181{ 1194{
1182 if (op->range-- <= 0) 1195 if (op->range-- <= 0)
1183 { 1196 {
1184 op->destroy (); 1197 op->drop_and_destroy ();
1185 return; 1198 return;
1186 } 1199 }
1187 1200
1188 mapxy pos (op); 1201 mapxy pos (op);
1189 pos.move (op->direction); 1202 pos.move (op->direction);
… …
1241 1254
1242 object *tmp = get_archetype (FORCE_NAME); 1255 object *tmp = get_archetype (FORCE_NAME);
1243 tmp->speed = 0.01; 1256 tmp->speed = 0.01;
1244 tmp->stats.food = time; 1257 tmp->stats.food = time;
1245 SET_FLAG (tmp, FLAG_IS_USED_UP); 1258 SET_FLAG (tmp, FLAG_IS_USED_UP);
1246 tmp->glow_radius = radius;
1247 if (tmp->glow_radius > MAX_LIGHT_RADII)
1248 tmp->glow_radius = MAX_LIGHT_RADII; 1259 tmp->glow_radius = min (MAX_LIGHT_RADIUS, radius);
1249
1250 tmp = insert_ob_in_ob (tmp, op); 1260 tmp = insert_ob_in_ob (tmp, op);
1251 1261
1252 if (tmp->glow_radius > op->glow_radius) 1262 if (tmp->glow_radius > op->glow_radius)
1253 op->glow_radius = tmp->glow_radius; 1263 op->glow_radius = tmp->glow_radius;
1254 1264
… …
1256} 1266}
1257 1267
1258int 1268int
1259cast_destruction (object *op, object *caster, object *spell_ob) 1269cast_destruction (object *op, object *caster, object *spell_ob)
1260{ 1270{
1261 int i, j, range, mflags, friendly = 0, dam, dur;
1262 sint16 sx, sy;
1263 maptile *m;
1264 object *tmp;
1265 const char *skill;
1266
1267 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob); 1271 int range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
1268 dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 1272 int dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
1269 dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 1273 int dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
1270 if (QUERY_FLAG (op, FLAG_FRIENDLY) || op->type == PLAYER) 1274
1271 friendly = 1; 1275 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player ();
1272 1276
1273 /* destruction doesn't use another spell object, so we need 1277 /* destruction doesn't use another spell object, so we need
1274 * update op's skill pointer so that exp is properly awarded. 1278 * update op's skill pointer so that exp is properly awarded.
1275 * We do some shortcuts here - since this is just temporary
1276 * and we'll reset the values back, we don't need to go through
1277 * the full share string/free_string route.
1278 */ 1279 */
1279 skill = op->skill; 1280 const shstr skill = op->skill;
1281
1280 if (caster == op) 1282 if (caster == op)
1281 op->skill = spell_ob->skill; 1283 op->skill = spell_ob->skill;
1282 else if (caster->skill) 1284 else if (caster->skill)
1283 op->skill = caster->skill; 1285 op->skill = caster->skill;
1284 else 1286 else
1285 op->skill = NULL; 1287 op->skill = 0;
1286 1288
1287 op->change_skill (find_skill_by_name (op, op->skill)); 1289 op->change_skill (find_skill_by_name (op, op->skill));
1288 1290
1289 for (i = -range; i <= range; i++) 1291 unordered_mapwalk (op, -range, -range, range, range)
1290 { 1292 {
1291 for (j = -range; j <= range; j++) 1293 mapspace &ms = m->at (nx, ny);
1292 {
1293 m = op->map;
1294 sx = op->x + i;
1295 sy = op->y + j;
1296 1294
1297 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1298 if (mflags & P_OUT_OF_MAP)
1299 continue;
1300
1301 if (mflags & P_IS_ALIVE) 1295 if (ms.flags () & P_IS_ALIVE)
1296 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1297 if (tmp->flag [FLAG_ALIVE] || tmp->is_player ())
1302 { 1298 {
1303 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 1299 tmp = tmp->head_ ();
1304 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
1305 break;
1306 1300
1307 if (tmp) 1301 if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ())
1302 || (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ())))
1308 { 1303 {
1309 if (tmp->head) 1304 if (spell_ob->subtype == SP_DESTRUCTION)
1310 tmp = tmp->head;
1311
1312 if ((friendly && !QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->type != PLAYER) ||
1313 (!friendly && (QUERY_FLAG (tmp, FLAG_FRIENDLY) || tmp->type == PLAYER)))
1314 { 1305 {
1315 if (spell_ob->subtype == SP_DESTRUCTION)
1316 {
1317 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1306 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1318 1307
1319 if (spell_ob->other_arch) 1308 if (spell_ob->other_arch)
1320 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op); 1309 m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op);
1321 } 1310 }
1322 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100) 1311 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist [ATNR_MAGIC] != 100)
1323 { 1312 {
1324 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1313 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1325 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op); 1314 m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op);
1326 }
1327 } 1315 }
1328 } 1316 }
1329 } 1317 }
1330 }
1331 } 1318 }
1332 1319
1333 op->skill = skill; 1320 op->skill = skill;
1334 return 1; 1321 return 1;
1335} 1322}
… …
1442 */ 1429 */
1443int 1430int
1444mood_change (object *op, object *caster, object *spell) 1431mood_change (object *op, object *caster, object *spell)
1445{ 1432{
1446 object *tmp, *god, *head; 1433 object *tmp, *god, *head;
1447 int done_one, range, mflags, level, at, best_at; 1434 int done_one, range, level, at, best_at;
1448 sint16 x, y, nx, ny;
1449 maptile *m;
1450 const char *race; 1435 const char *race;
1451 1436
1452 /* We precompute some values here so that we don't have to keep 1437 /* We precompute some values here so that we don't have to keep
1453 * doing it over and over again. 1438 * doing it over and over again.
1454 */ 1439 */
… …
1467 else if (god && !strcmp (spell->race, "GOD_FRIEND")) 1452 else if (god && !strcmp (spell->race, "GOD_FRIEND"))
1468 race = god->race; 1453 race = god->race;
1469 else 1454 else
1470 race = spell->race; 1455 race = spell->race;
1471 1456
1472 for (x = op->x - range; x <= op->x + range; x++) 1457 unordered_mapwalk (op, -range, -range, range, range)
1473 for (y = op->y - range; y <= op->y + range; y++)
1474 { 1458 {
1475 done_one = 0; 1459 mapspace &ms = m->at (nx, ny);
1476 m = op->map;
1477 nx = x;
1478 ny = y;
1479 mflags = get_map_flags (m, &m, x, y, &nx, &ny);
1480 if (mflags & P_OUT_OF_MAP)
1481 continue;
1482 1460
1483 /* If there is nothing living on this space, no need to go further */ 1461 /* If there is nothing living on this space, no need to go further */
1484 if (!(mflags & P_IS_ALIVE)) 1462 if (!ms.flags () & P_IS_ALIVE)
1485 continue; 1463 continue;
1486 1464
1487 // players can only affect spaces that they can actually see 1465 // players can only affect spaces that they can actually see
1466 if (caster
1488 if (caster && caster->contr 1467 && caster->contr
1489 && caster->contr->visibility_at (m, nx, ny) < 70) 1468 && caster->contr->darkness_at (m, nx, ny) == LOS_BLOCKED)
1490 continue; 1469 continue;
1491 1470
1492 for (tmp = GET_MAP_TOP (m, nx, ny); tmp; tmp = tmp->below) 1471 for (tmp = ms.top; tmp; tmp = tmp->below)
1493 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1472 if (tmp->flag [FLAG_MONSTER])
1494 break; 1473 break;
1495 1474
1496 /* There can be living objects that are not monsters */ 1475 /* There can be living objects that are not monsters */
1497 if (!tmp || tmp->type == PLAYER) 1476 if (!tmp)
1498 continue; 1477 continue;
1499 1478
1500 /* Only the head has meaningful data, so resolve to that */ 1479 /* Only the head has meaningful data, so resolve to that */
1501 if (tmp->head)
1502 head = tmp->head; 1480 head = tmp->head_ ();
1503 else
1504 head = tmp;
1505 1481
1506 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */ 1482 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */
1507 if (race && head->race && !strstr (race, head->race)) 1483 if (race && head->race && !strstr (race, head->race))
1508 continue; 1484 continue;
1509 1485
1510 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD)) 1486 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD))
1511 continue; 1487 continue;
1512 1488
1513 /* Now do a bunch of stuff related to saving throws */ 1489 /* Now do a bunch of stuff related to saving throws */
1514 best_at = -1; 1490 best_at = -1;
1515 if (spell->attacktype) 1491 if (spell->attacktype)
1516 { 1492 {
1517 for (at = 0; at < NROFATTACKS; at++) 1493 for (at = 0; at < NROFATTACKS; at++)
1518 if (spell->attacktype & (1 << at)) 1494 if (spell->attacktype & (1 << at))
1519 if (best_at == -1 || head->resist[at] > head->resist[best_at]) 1495 if (best_at == -1 || head->resist[at] > head->resist[best_at])
1520 best_at = at; 1496 best_at = at;
1521 1497
1522 if (best_at == -1) 1498 if (best_at == -1)
1523 at = 0; 1499 at = 0;
1524 else 1500 else
1525 { 1501 {
1526 if (head->resist[best_at] == 100) 1502 if (head->resist[best_at] == 100)
1527 continue; 1503 continue;
1528 else 1504 else
1529 at = head->resist[best_at] / 5; 1505 at = head->resist[best_at] / 5;
1530 } 1506 }
1507
1531 at -= level / 5; 1508 at -= level / 5;
1532 if (did_make_save (head, head->level, at)) 1509 if (did_make_save (head, head->level, at))
1533 continue; 1510 continue;
1534 } 1511 }
1535 else /* spell->attacktype */ 1512 else /* spell->attacktype */
1536 { 1513 {
1537 /* 1514 /*
1538 Spell has no attacktype (charm & such), so we'll have a specific saving: 1515 Spell has no attacktype (charm & such), so we'll have a specific saving:
1539 * if spell level < monster level, no go 1516 * if spell level < monster level, no go
1540 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) ) 1517 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) )
1541 1518
1542 The chance will then be in the range [20-70] percent, not too bad. 1519 The chance will then be in the range [20-70] percent, not too bad.
1543 1520
1544 This is required to fix the 'charm monster' abuse, where a player level 1 can 1521 This is required to fix the 'charm monster' abuse, where a player level 1 can
1545 charm a level 125 monster... 1522 charm a level 125 monster...
1546 1523
1547 Ryo, august 14th 1524 Ryo, august 14th
1548 */ 1525 */
1549 if (head->level > level) 1526 if (head->level > level)
1550 continue; 1527 continue;
1551 1528
1552 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level)))) 1529 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level))))
1553 /* Failed, no effect */ 1530 /* Failed, no effect */
1554 continue; 1531 continue;
1555 } 1532 }
1556 1533
1557 /* Done with saving throw. Now start affecting the monster */ 1534 /* Done with saving throw. Now start affecting the monster */
1535 done_one = 0;
1558 1536
1559 /* aggravation */ 1537 /* aggravation */
1560 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1538 if (QUERY_FLAG (spell, FLAG_MONSTER))
1561 { 1539 {
1562 CLEAR_FLAG (head, FLAG_SLEEP); 1540 CLEAR_FLAG (head, FLAG_SLEEP);
1563 remove_friendly_object (head); 1541 remove_friendly_object (head);
1564 done_one = 1; 1542 done_one = 1;
1565 head->enemy = op; 1543 head->enemy = op;
1566 } 1544 }
1567 1545
1568 /* calm monsters */ 1546 /* calm monsters */
1569 if (QUERY_FLAG (spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (head, FLAG_UNAGGRESSIVE)) 1547 if (QUERY_FLAG (spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (head, FLAG_UNAGGRESSIVE))
1570 { 1548 {
1571 SET_FLAG (head, FLAG_UNAGGRESSIVE); 1549 SET_FLAG (head, FLAG_UNAGGRESSIVE);
1572 head->enemy = NULL; 1550 head->enemy = NULL;
1573 done_one = 1; 1551 done_one = 1;
1574 } 1552 }
1575 1553
1576 /* berserk monsters */ 1554 /* berserk monsters */
1577 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK)) 1555 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK))
1578 { 1556 {
1579 SET_FLAG (head, FLAG_BERSERK); 1557 SET_FLAG (head, FLAG_BERSERK);
1580 done_one = 1; 1558 done_one = 1;
1581 } 1559 }
1582 1560
1583 /* charm */ 1561 /* charm */
1584 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY)) 1562 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY))
1585 { 1563 {
1586 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster)); 1564 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster));
1587 1565
1588 /* Prevent uncontrolled outbreaks of self replicating monsters. 1566 /* Prevent uncontrolled outbreaks of self replicating monsters.
1589 Typical use case is charm, go somwhere, use aggravation to make hostile. 1567 Typical use case is charm, go somwhere, use aggravation to make hostile.
1590 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */ 1568 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1591 CLEAR_FLAG (head, FLAG_GENERATOR); 1569 CLEAR_FLAG (head, FLAG_GENERATOR);
1592 head->set_owner (op); 1570 head->set_owner (op);
1593 set_spell_skill (op, caster, spell, head); 1571 set_spell_skill (op, caster, spell, head);
1594 add_friendly_object (head); 1572 add_friendly_object (head);
1595 head->attack_movement = PETMOVE; 1573 head->attack_movement = PETMOVE;
1596 done_one = 1; 1574 done_one = 1;
1597 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL); 1575 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);
1598 head->stats.exp = 0; 1576 head->stats.exp = 0;
1599 } 1577 }
1600 1578
1601 /* If a monster was effected, put an effect in */ 1579 /* If a monster was effected, put an effect in */
1602 if (done_one && spell->other_arch) 1580 if (done_one && spell->other_arch)
1603 m->insert (arch_to_object (spell->other_arch), nx, ny, op); 1581 m->insert (arch_to_object (spell->other_arch), nx, ny, op);
1604 } /* for y */ 1582 }
1605 1583
1606 return 1; 1584 return 1;
1607} 1585}
1608
1609 1586
1610/* Move_ball_spell: This handles ball type spells that just sort of wander 1587/* Move_ball_spell: This handles ball type spells that just sort of wander
1611 * about. was called move_ball_lightning, but since more than the ball 1588 * about. was called move_ball_lightning, but since more than the ball
1612 * lightning spell used it, that seemed misnamed. 1589 * lightning spell used it, that seemed misnamed.
1613 * op is the spell effect. 1590 * op is the spell effect.
… …
1639 for (i = 1; i < 9; i++) 1616 for (i = 1; i < 9; i++)
1640 { 1617 {
1641 /* i bit 0: alters sign of offset 1618 /* i bit 0: alters sign of offset
1642 * other bits (i / 2): absolute value of offset 1619 * other bits (i / 2): absolute value of offset
1643 */ 1620 */
1644
1645 int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2); 1621 int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2);
1646 int tmpdir = absdir (op->direction + offset); 1622 int tmpdir = absdir (op->direction + offset);
1647 1623
1648 nx = op->x + freearr_x[tmpdir]; 1624 nx = op->x + freearr_x[tmpdir];
1649 ny = op->y + freearr_y[tmpdir]; 1625 ny = op->y + freearr_y[tmpdir];
… …
1651 { 1627 {
1652 dir = tmpdir; 1628 dir = tmpdir;
1653 break; 1629 break;
1654 } 1630 }
1655 } 1631 }
1632
1656 if (dir == 0) 1633 if (dir == 0)
1657 { 1634 {
1658 nx = op->x; 1635 nx = op->x;
1659 ny = op->y; 1636 ny = op->y;
1660 m = op->map; 1637 m = op->map;
… …
1739 return; 1716 return;
1740 } 1717 }
1741 1718
1742 if (!op->duration || !owner->is_on_map ()) 1719 if (!op->duration || !owner->is_on_map ())
1743 { 1720 {
1744 op->destroy (); 1721 op->drop_and_destroy ();
1745 return; 1722 return;
1746 } 1723 }
1747 1724
1748 op->duration--; 1725 op->duration--;
1749 1726
… …
1881 int dam, mflags; 1858 int dam, mflags;
1882 maptile *m; 1859 maptile *m;
1883 1860
1884 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1861 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1885 1862
1886 if (!dir) 1863 if (dir)
1887 {
1888 new_draw_info (NDI_UNIQUE, 0, op, "In what direction?");
1889 return 0;
1890 } 1864 {
1891
1892 x = op->x + freearr_x[dir]; 1865 x = op->x + freearr_x[dir];
1893 y = op->y + freearr_y[dir]; 1866 y = op->y + freearr_y[dir];
1894 m = op->map; 1867 m = op->map;
1895 1868
1896 mflags = get_map_flags (m, &m, x, y, &x, &y); 1869 mflags = get_map_flags (m, &m, x, y, &x, &y);
1897 1870
1898 if (mflags & P_OUT_OF_MAP) 1871 if (mflags & P_OUT_OF_MAP)
1899 { 1872 {
1900 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there."); 1873 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there.");
1901 return 0; 1874 return 0;
1902 } 1875 }
1903 1876
1904 if (mflags & P_IS_ALIVE && spell->attacktype) 1877 if (mflags & P_IS_ALIVE && spell->attacktype)
1905 { 1878 {
1906 for (target = GET_MAP_OB (m, x, y); target; target = target->above) 1879 for (target = GET_MAP_OB (m, x, y); target; target = target->above)
1907 if (QUERY_FLAG (target, FLAG_MONSTER)) 1880 if (QUERY_FLAG (target, FLAG_MONSTER))
1908 { 1881 {
1909 /* oky doky. got a target monster. Lets make a blinding attack */ 1882 /* oky doky. got a target monster. Lets make a blinding attack */
1910 if (target->head) 1883 if (target->head)
1911 target = target->head; 1884 target = target->head;
1912 1885
1913 hit_player (target, dam, op, spell->attacktype, 1); 1886 hit_player (target, dam, op, spell->attacktype, 1);
1914 return 1; /* one success only! */ 1887 return 1; /* one success only! */
1888 }
1915 } 1889 }
1916 }
1917 1890
1918 /* no live target, perhaps a wall is in the way? */ 1891 /* no live target, perhaps a wall is in the way? */
1919 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y))) 1892 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)))
1920 { 1893 {
1921 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1894 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
1922 return 0; 1895 return 0;
1896 }
1923 } 1897 }
1924 1898
1925 /* ok, looks groovy to just insert a new light on the map */ 1899 /* ok, looks groovy to just insert a new light on the map */
1926 tmp = arch_to_object (spell->other_arch); 1900 tmp = arch_to_object (spell->other_arch);
1927 if (!tmp) 1901 if (!tmp)
1928 { 1902 {
1929 LOG (llevError, "Error: spell arch for cast_light() missing.\n"); 1903 LOG (llevError, "Error: spell arch for cast_light() missing.\n");
1930 return 0; 1904 return 0;
1931 } 1905 }
1906
1932 tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell); 1907 tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell);
1908
1933 if (tmp->glow_radius) 1909 if (tmp->glow_radius)
1934 {
1935 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell); 1910 tmp->glow_radius = min (MAX_LIGHT_RADIUS, spell->range + SP_level_range_adjust (caster, spell));
1936 if (tmp->glow_radius > MAX_LIGHT_RADII)
1937 tmp->glow_radius = MAX_LIGHT_RADII;
1938 }
1939 1911
1912 if (dir)
1940 m->insert (tmp, x, y, op); 1913 m->insert (tmp, x, y, op);
1914 else
1915 caster->outer_env ()->insert (tmp);
1916
1941 return 1; 1917 return 1;
1942} 1918}
1943 1919
1944/* cast_cause_disease: this spell looks along <dir> from the 1920/* cast_cause_disease: this spell looks along <dir> from the
1945 * player and infects someone. 1921 * player and infects someone.

Diff Legend

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