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.93 by root, Sun Nov 29 17:41:08 2009 UTC vs.
Revision 1.108 by root, Tue Jan 3 11:25:37 2012 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
59 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 59 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
60 { 60 {
61 int num_sections = 1; 61 int num_sections = 1;
62 62
63 /* don't move DM */ 63 /* don't move DM */
64 if (QUERY_FLAG (tmp, FLAG_WIZ)) 64 if (tmp->flag [FLAG_WIZ])
65 return; 65 return;
66 66
67 /* don't move parts of objects */ 67 /* don't move parts of objects */
68 if (tmp->head) 68 if (tmp->head)
69 continue; 69 continue;
70 70
71 /* don't move floors or immobile objects */ 71 /* don't move floors or immobile objects */
72 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || (!QUERY_FLAG (tmp, FLAG_ALIVE) && QUERY_FLAG (tmp, FLAG_NO_PICK))) 72 if (tmp->flag [FLAG_IS_FLOOR] || (!tmp->flag [FLAG_ALIVE] && tmp->flag [FLAG_NO_PICK]))
73 continue; 73 continue;
74 74
75 /* count the object's sections */ 75 /* count the object's sections */
76 for (object *tmp2 = tmp; tmp2; tmp2 = tmp2->more) 76 for (object *tmp2 = tmp; tmp2; tmp2 = tmp2->more)
77 num_sections++; 77 num_sections++;
93 * also be safe for objects. 93 * also be safe for objects.
94 * This does return if successful or not, but 94 * This does return if successful or not, but
95 * I don't see us doing anything useful with that information 95 * I don't see us doing anything useful with that information
96 * right now. 96 * right now.
97 */ 97 */
98 move_object (tmp, absdir (op->stats.sp)); 98 tmp->move (absdir (op->stats.sp));
99 } 99 }
100 100
101 } 101 }
102} 102}
103 103
194 * on the space. So only call reflwall if we think the data it returns 194 * on the space. So only call reflwall if we think the data it returns
195 * will be useful. 195 * will be useful.
196 */ 196 */
197 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op))) 197 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op)))
198 { 198 {
199 if (!QUERY_FLAG (op, FLAG_REFLECTING)) 199 if (!op->flag [FLAG_REFLECTING])
200 return; 200 return;
201 201
202 /* Since walls don't run diagonal, if the bolt is in 202 /* Since walls don't run diagonal, if the bolt is in
203 * one of 4 main directions, it just reflects back in the 203 * one of 4 main directions, it just reflects back in the
204 * opposite direction. However, if the bolt is travelling 204 * opposite direction. However, if the bolt is travelling
294 tmp->duration = spob->duration + SP_level_duration_adjust (caster, spob); 294 tmp->duration = spob->duration + SP_level_duration_adjust (caster, spob);
295 tmp->stats.Dex = spob->stats.Dex; 295 tmp->stats.Dex = spob->stats.Dex;
296 tmp->stats.Con = spob->stats.Con; 296 tmp->stats.Con = spob->stats.Con;
297 297
298 tmp->direction = dir; 298 tmp->direction = dir;
299 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 299 if (tmp->flag [FLAG_IS_TURNABLE])
300 SET_ANIMATION (tmp, dir); 300 SET_ANIMATION (tmp, dir);
301 301
302 tmp->set_owner (op); 302 tmp->set_owner (op);
303 set_spell_skill (op, caster, spob, tmp); 303 set_spell_skill (op, caster, spob, tmp);
304 304
316 316
317 tmp->map = newmap; 317 tmp->map = newmap;
318 318
319 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 319 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
320 { 320 {
321 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 321 if (!tmp->flag [FLAG_REFLECTING])
322 { 322 {
323 tmp->drop_and_destroy (); 323 tmp->drop_and_destroy ();
324 return 0; 324 return 0;
325 } 325 }
326 326
521 if (!(mflags & P_IS_ALIVE)) 521 if (!(mflags & P_IS_ALIVE))
522 return; 522 return;
523 523
524 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 524 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
525 { 525 {
526 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 526 if (tmp->flag [FLAG_ALIVE])
527 { 527 {
528 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 528 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
529 529
530 // TODO: can't understand the following if's 530 // TODO: can't understand the following if's
531 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0) 531 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
532 { 532 {
533 if (!QUERY_FLAG (op, FLAG_REMOVED)) 533 if (!op->flag [FLAG_REMOVED])
534 { 534 {
535 op->destroy (); 535 op->destroy ();
536 return; 536 return;
537 } 537 }
538 } 538 }
640 tmp->stats.hp = spob->duration + SP_level_duration_adjust (caster, spob); 640 tmp->stats.hp = spob->duration + SP_level_duration_adjust (caster, spob);
641 tmp->stats.maxhp = spob->range + SP_level_range_adjust (caster, spob); 641 tmp->stats.maxhp = spob->range + SP_level_range_adjust (caster, spob);
642 tmp->dam_modifier = spob->stats.food + SP_level_dam_adjust (caster, spob); 642 tmp->dam_modifier = spob->stats.food + SP_level_dam_adjust (caster, spob);
643 643
644 tmp->direction = dir; 644 tmp->direction = dir;
645 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 645 if (tmp->flag [FLAG_IS_TURNABLE])
646 SET_ANIMATION (tmp, dir); 646 SET_ANIMATION (tmp, dir);
647 647
648 tmp->set_owner (op); 648 tmp->set_owner (op);
649 set_spell_skill (op, caster, spob, tmp); 649 set_spell_skill (op, caster, spob, tmp);
650 650
660 return 0; 660 return 0;
661 } 661 }
662 662
663 tmp->map = newmap; 663 tmp->map = newmap;
664 664
665 // in case the bullet has direction 0 we explode it in place.
666 // direction 0 is possible for instance when a poison cloud trap springs.
667 if (tmp->direction == 0)
668 {
669 if (tmp->other_arch
670 && (tmp = tmp->insert_at (tmp, op))) // insert before explode cleanly
671 explode_bullet (tmp); // explode object will/should remove tmp
672 else
673 tmp->destroy ();
674
675 return 0;
676 }
677
665 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 678 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
666 { 679 {
667 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 680 if (!tmp->flag [FLAG_REFLECTING])
668 { 681 {
669 tmp->destroy (); 682 tmp->destroy ();
670 return 0; 683 return 0;
671 } 684 }
672 685
716 op->set_speed (0); 729 op->set_speed (0);
717 return; 730 return;
718 } 731 }
719 732
720 /* lava saves it's life, but not yours :) */ 733 /* lava saves it's life, but not yours :) */
721 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 734 if (op->flag [FLAG_LIFESAVE])
722 { 735 {
723 hit_map (op, 0, op->attacktype, 0); 736 hit_map (op, 0, op->attacktype, 0);
724 return; 737 return;
725 } 738 }
726 739
807 MoveType movetype; 820 MoveType movetype;
808 821
809 if (!spell->other_arch) 822 if (!spell->other_arch)
810 return 0; 823 return 0;
811 824
812 if (op->type == PLAYER && QUERY_FLAG (op, FLAG_UNDEAD) && op->attacktype & AT_TURN_UNDEAD) 825 if (op->type == PLAYER && op->flag [FLAG_UNDEAD] && op->attacktype & AT_TURN_UNDEAD)
813 { 826 {
814 new_draw_info (NDI_UNIQUE, 0, op, "Your undead nature prevents you from turning undead!"); 827 op->failmsg ("Your undead nature prevents you from turning undead!");
815 return 0; 828 return 0;
816 } 829 }
817 830
818 if (!dir) 831 if (!dir)
819 { 832 {
983 tmp->attacktype = op->attacktype; 996 tmp->attacktype = op->attacktype;
984 tmp->set_owner (op); 997 tmp->set_owner (op);
985 if (op->skill && op->skill != tmp->skill) 998 if (op->skill && op->skill != tmp->skill)
986 tmp->skill = op->skill; 999 tmp->skill = op->skill;
987 1000
988 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 1001 if (tmp->flag [FLAG_IS_TURNABLE])
989 SET_ANIMATION (tmp, i); 1002 SET_ANIMATION (tmp, i);
990 1003
991 op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op); 1004 op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op);
992 move_bullet (tmp); 1005 move_bullet (tmp);
993 } 1006 }
1012 // to fix create bomb traps in doors, which cast with dir=0). 1025 // to fix create bomb traps in doors, which cast with dir=0).
1013 if (dir) 1026 if (dir)
1014 { 1027 {
1015 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK)) 1028 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1016 { 1029 {
1017 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1030 op->failmsg ("There is something in the way.");
1018 return 0; 1031 return 0;
1019 } 1032 }
1020 } 1033 }
1021 1034
1022 tmp = spell->other_arch->instance (); 1035 tmp = spell->other_arch->instance ();
1076 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW) 1089 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1077 return NULL; 1090 return NULL;
1078 1091
1079 if (mflags & P_IS_ALIVE) 1092 if (mflags & P_IS_ALIVE)
1080 for (target = GET_MAP_OB (mp, x, y); target; target = target->above) 1093 for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
1081 if (QUERY_FLAG (target, FLAG_MONSTER)) 1094 if (target->flag [FLAG_MONSTER])
1082 return target; 1095 return target;
1083 } 1096 }
1084 1097
1085 return NULL; 1098 return NULL;
1086} 1099}
1116 || target->flag [FLAG_REFL_SPELL] 1129 || target->flag [FLAG_REFL_SPELL]
1117 || (!god && spell->stats.grace) 1130 || (!god && spell->stats.grace)
1118 || (god && target->title == god->name) 1131 || (god && target->title == god->name)
1119 || (god && target->race.contains (god->race))) 1132 || (god && target->race.contains (god->race)))
1120 { 1133 {
1121 new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded."); 1134 op->failmsg ("Your request is unheeded.");
1122 return 0; 1135 return 0;
1123 } 1136 }
1124 1137
1125 if (spell->other_arch) 1138 if (spell->other_arch)
1126 effect = spell->other_arch->instance (); 1139 effect = spell->other_arch->instance ();
1134 { 1147 {
1135 if (tailor_god_spell (effect, op)) 1148 if (tailor_god_spell (effect, op))
1136 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", (const char *)determine_god (op)); 1149 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", (const char *)determine_god (op));
1137 else 1150 else
1138 { 1151 {
1139 new_draw_info (NDI_UNIQUE, 0, op, "Your request is ignored."); 1152 op->failmsg ("Your request is ignored.");
1140 return 0; 1153 return 0;
1141 } 1154 }
1142 } 1155 }
1143 1156
1144 /* size of the area of destruction */ 1157 /* size of the area of destruction */
1148 if (effect->attacktype & AT_DEATH) 1161 if (effect->attacktype & AT_DEATH)
1149 { 1162 {
1150 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1163 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1151 1164
1152 /* casting death spells at undead isn't a good thing */ 1165 /* casting death spells at undead isn't a good thing */
1153 if (QUERY_FLAG (target, FLAG_UNDEAD)) 1166 if (target->flag [FLAG_UNDEAD])
1154 { 1167 {
1155 if (random_roll (0, 2, op, PREFER_LOW)) 1168 if (random_roll (0, 2, op, PREFER_LOW))
1156 { 1169 {
1157 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!"); 1170 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1158 effect->x = op->x; 1171 effect->x = op->x;
1251{ 1264{
1252 /* some things are unaffected... */ 1265 /* some things are unaffected... */
1253 if (op->path_denied & PATH_LIGHT) 1266 if (op->path_denied & PATH_LIGHT)
1254 return 0; 1267 return 0;
1255 1268
1256 object *tmp = get_archetype (FORCE_NAME); 1269 object *tmp = archetype::get (FORCE_NAME);
1257 tmp->speed = 0.01; 1270 tmp->set_speed (0.01);
1258 tmp->stats.food = time; 1271 tmp->stats.food = time;
1259 SET_FLAG (tmp, FLAG_IS_USED_UP); 1272 tmp->set_flag (FLAG_IS_USED_UP);
1260 tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius)); 1273 tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius));
1261 tmp = insert_ob_in_ob (tmp, op); 1274 tmp = insert_ob_in_ob (tmp, op);
1262 1275
1263 if (tmp->glow_radius > op->glow_radius) 1276 if (tmp->glow_radius > op->glow_radius)
1264 op->set_glow_radius (tmp->glow_radius); 1277 op->set_glow_radius (tmp->glow_radius);
1273 int dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 1286 int dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
1274 int dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 1287 int dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
1275 1288
1276 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player (); 1289 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player ();
1277 1290
1278 /* destruction doesn't use another spell object, so we need 1291 dynbuf buf;
1279 * update op's skill pointer so that exp is properly awarded.
1280 */
1281 const shstr skill = op->skill;
1282
1283 if (caster == op)
1284 op->skill = spell_ob->skill;
1285 else if (caster->skill)
1286 op->skill = caster->skill;
1287 else
1288 op->skill = 0;
1289
1290 op->change_skill (find_skill_by_name (op, op->skill));
1291
1292 unordered_mapwalk (op, -range, -range, range, range) 1292 unordered_mapwalk (buf, op, -range, -range, range, range)
1293 { 1293 {
1294 mapspace &ms = m->at (nx, ny); 1294 mapspace &ms = m->at (nx, ny);
1295 1295
1296 if (ms.flags () & P_IS_ALIVE) 1296 if (ms.flags () & P_IS_ALIVE)
1297 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1297 for (object *next, *tmp = ms.bot; tmp; tmp = next)
1298 {
1299 next = tmp->above;
1300
1298 if (tmp->flag [FLAG_ALIVE] || tmp->is_player ()) 1301 if (tmp->flag [FLAG_ALIVE] || tmp->is_player ())
1299 { 1302 {
1300 tmp = tmp->head_ (); 1303 tmp = tmp->head_ ();
1301 1304
1302 if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ()) 1305 if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ())
1303 || (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ()))) 1306 || (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ())))
1304 { 1307 {
1305 if (spell_ob->subtype == SP_DESTRUCTION) 1308 if (spell_ob->subtype == SP_DESTRUCTION)
1306 { 1309 {
1307 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1310 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1308 1311
1309 if (spell_ob->other_arch) 1312 if (spell_ob->other_arch)
1310 m->insert (spell_ob->other_arch->instance (), nx, ny, op); 1313 m->insert (spell_ob->other_arch->instance (), nx, ny, op);
1311 } 1314 }
1312 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)
1313 { 1316 {
1314 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1317 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1315 m->insert (spell_ob->other_arch->instance (), nx, ny, op); 1318 m->insert (spell_ob->other_arch->instance (), nx, ny, op);
1316 } 1319 }
1317 } 1320 }
1318 } 1321 }
1322 }
1319 } 1323 }
1320 1324
1321 op->skill = skill;
1322 return 1; 1325 return 1;
1323} 1326}
1324 1327
1325/*************************************************************************** 1328/***************************************************************************
1326 * 1329 *
1334 object *tmp, *force; 1337 object *tmp, *force;
1335 1338
1336 tmp = get_pointed_target (op, (dir == 0) ? op->direction : dir, spell_ob->range, SPELL_GRACE); 1339 tmp = get_pointed_target (op, (dir == 0) ? op->direction : dir, spell_ob->range, SPELL_GRACE);
1337 if (!tmp) 1340 if (!tmp)
1338 { 1341 {
1339 new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse."); 1342 op->failmsg ("There is no one in that direction to curse.");
1340 return 0; 1343 return 0;
1341 } 1344 }
1342 1345
1343 tmp = tmp->head_ (); 1346 tmp = tmp->head_ ();
1344 1347
1359 } 1362 }
1360 } 1363 }
1361 1364
1362 if (!force) 1365 if (!force)
1363 { 1366 {
1364 force = get_archetype (FORCE_NAME); 1367 force = archetype::get (FORCE_NAME);
1365 force->subtype = FORCE_CHANGE_ABILITY; 1368 force->subtype = FORCE_CHANGE_ABILITY;
1366 1369
1367 if (spell_ob->race) 1370 if (spell_ob->race)
1368 force->name = spell_ob->race; 1371 force->name = spell_ob->race;
1369 else 1372 else
1387 1390
1388 return 1; 1391 return 1;
1389 } 1392 }
1390 1393
1391 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1394 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1392 force->speed = 1.f;
1393 force->speed_left = -1.f; 1395 force->speed_left = -1.f;
1394 SET_FLAG (force, FLAG_APPLIED); 1396 force->set_speed (1.f);
1397 force->set_flag (FLAG_APPLIED);
1395 1398
1396 if (god) 1399 if (god)
1397 { 1400 {
1398 if (spell_ob->last_grace) 1401 if (spell_ob->last_grace)
1399 force->path_repelled = god->path_repelled; 1402 force->path_repelled = god->path_repelled;
1452 else if (god && spell->race == shstr_GOD_FRIEND) 1455 else if (god && spell->race == shstr_GOD_FRIEND)
1453 race = god->race; 1456 race = god->race;
1454 else 1457 else
1455 race = spell->race; 1458 race = spell->race;
1456 1459
1460 dynbuf buf;
1457 unordered_mapwalk (op, -range, -range, range, range) 1461 unordered_mapwalk (buf, op, -range, -range, range, range)
1458 { 1462 {
1459 mapspace &ms = m->at (nx, ny); 1463 mapspace &ms = m->at (nx, ny);
1460 1464
1461 /* 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 */
1462 if (!ms.flags () & P_IS_ALIVE) 1466 if (!ms.flags () & P_IS_ALIVE)
1481 1485
1482 /* 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 */
1483 if (race && head->race && !strstr (race, head->race)) 1487 if (race && head->race && !strstr (race, head->race))
1484 continue; 1488 continue;
1485 1489
1486 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD)) 1490 if (head->flag [FLAG_UNDEAD] && !spell->flag [FLAG_UNDEAD])
1487 continue; 1491 continue;
1488 1492
1489 /* Now do a bunch of stuff related to saving throws */ 1493 /* Now do a bunch of stuff related to saving throws */
1490 best_at = -1; 1494 best_at = -1;
1491 if (spell->attacktype) 1495 if (spell->attacktype)
1533 1537
1534 /* Done with saving throw. Now start affecting the monster */ 1538 /* Done with saving throw. Now start affecting the monster */
1535 done_one = 0; 1539 done_one = 0;
1536 1540
1537 /* aggravation */ 1541 /* aggravation */
1538 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1542 if (spell->flag [FLAG_MONSTER])
1539 { 1543 {
1540 CLEAR_FLAG (head, FLAG_SLEEP); 1544 head->clr_flag (FLAG_SLEEP);
1541 remove_friendly_object (head); 1545 remove_friendly_object (head);
1542 done_one = 1; 1546 done_one = 1;
1543 head->enemy = op; 1547 head->enemy = op;
1544 } 1548 }
1545 1549
1546 /* calm monsters */ 1550 /* calm monsters */
1547 if (QUERY_FLAG (spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (head, FLAG_UNAGGRESSIVE)) 1551 if (spell->flag [FLAG_UNAGGRESSIVE] && !head->flag [FLAG_UNAGGRESSIVE])
1548 { 1552 {
1549 SET_FLAG (head, FLAG_UNAGGRESSIVE); 1553 head->set_flag (FLAG_UNAGGRESSIVE);
1550 head->enemy = NULL; 1554 head->enemy = NULL;
1551 done_one = 1; 1555 done_one = 1;
1552 } 1556 }
1553 1557
1554 /* berserk monsters */ 1558 /* berserk monsters */
1555 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK)) 1559 if (spell->flag [FLAG_BERSERK] && !head->flag [FLAG_BERSERK])
1556 { 1560 {
1557 SET_FLAG (head, FLAG_BERSERK); 1561 head->set_flag (FLAG_BERSERK);
1558 done_one = 1; 1562 done_one = 1;
1559 } 1563 }
1560 1564
1561 /* charm */ 1565 /* charm */
1562 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY)) 1566 if (spell->flag [FLAG_NO_ATTACK] && !head->flag [FLAG_FRIENDLY])
1563 { 1567 {
1564 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster)); 1568 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster));
1565 1569
1566 /* Prevent uncontrolled outbreaks of self replicating monsters. 1570 /* Prevent uncontrolled outbreaks of self replicating monsters.
1567 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.
1568 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. */
1569 CLEAR_FLAG (head, FLAG_GENERATOR); 1573 head->clr_flag (FLAG_GENERATOR);
1570 head->set_owner (op); 1574 head->set_owner (op);
1571 set_spell_skill (op, caster, spell, head); 1575 set_spell_skill (op, caster, spell, head);
1572 add_friendly_object (head); 1576 add_friendly_object (head);
1573 head->attack_movement = PETMOVE; 1577 head->attack_movement = PETMOVE;
1574 done_one = 1; 1578 done_one = 1;
1868 1872
1869 mflags = get_map_flags (m, &m, x, y, &x, &y); 1873 mflags = get_map_flags (m, &m, x, y, &x, &y);
1870 1874
1871 if (mflags & P_OUT_OF_MAP) 1875 if (mflags & P_OUT_OF_MAP)
1872 { 1876 {
1873 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there."); 1877 op->failmsg ("Nothing is there.");
1874 return 0; 1878 return 0;
1875 } 1879 }
1876 1880
1877 if (mflags & P_IS_ALIVE && spell->attacktype) 1881 if (mflags & P_IS_ALIVE && spell->attacktype)
1878 { 1882 {
1879 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)
1880 if (QUERY_FLAG (target, FLAG_MONSTER)) 1884 if (target->flag [FLAG_MONSTER])
1881 { 1885 {
1882 /* oky doky. got a target monster. Lets make a blinding attack */ 1886 /* oky doky. got a target monster. Lets make a blinding attack */
1883 if (target->head) 1887 if (target->head)
1884 target = target->head; 1888 target = target->head;
1885 1889
1889 } 1893 }
1890 1894
1891 /* no live target, perhaps a wall is in the way? */ 1895 /* no live target, perhaps a wall is in the way? */
1892 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)))
1893 { 1897 {
1894 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1898 op->failmsg ("Something is in the way.");
1895 return 0; 1899 return 0;
1896 } 1900 }
1897 } 1901 }
1898 1902
1899 /* 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 */
1969 /* Only bother looking on this space if there is something living here */ 1973 /* Only bother looking on this space if there is something living here */
1970 if (mflags & P_IS_ALIVE) 1974 if (mflags & P_IS_ALIVE)
1971 { 1975 {
1972 /* search this square for a victim */ 1976 /* search this square for a victim */
1973 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above) 1977 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)
1974 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) 1978 if (walk->flag [FLAG_MONSTER] || (walk->type == PLAYER))
1975 { /* found a victim */ 1979 { /* found a victim */
1976 object *disease = spell->other_arch->instance (); 1980 object *disease = spell->other_arch->instance ();
1977 1981
1978 disease->set_owner (op); 1982 disease->set_owner (op);
1979 set_spell_skill (op, caster, spell, disease); 1983 set_spell_skill (op, caster, spell, disease);
1980 disease->stats.exp = 0; 1984 disease->stats.exp = 0;
1981 disease->level = casting_level (caster, spell); 1985 disease->level = casting_level (caster, spell);
1982 1986
1983 /* do level adjustments */ 1987 /* do level adjustments */
1984 if (disease->stats.wc) 1988 if (disease->stats.wc ) disease->stats.wc += dur_mod / 2;
1985 disease->stats.wc += dur_mod / 2; 1989 if (disease->magic > 0) disease->magic += dur_mod / 8;
1986 1990 if (disease->stats.maxhp > 0) disease->stats.maxhp += dur_mod;
1987 if (disease->magic > 0) 1991 if (disease->stats.maxgrace > 0) disease->stats.maxgrace += dur_mod;
1988 disease->magic += dur_mod / 8;
1989
1990 if (disease->stats.maxhp > 0)
1991 disease->stats.maxhp += dur_mod;
1992
1993 if (disease->stats.maxgrace > 0)
1994 disease->stats.maxgrace += dur_mod;
1995
1996 if (disease->stats.dam)
1997 {
1998 if (disease->stats.dam > 0)
1999 disease->stats.dam += dam_mod;
2000 else
2001 disease->stats.dam -= dam_mod;
2002 }
2003 1992
2004 if (disease->last_sp) 1993 if (disease->last_sp)
2005 { 1994 {
2006 disease->last_sp -= 2 * dam_mod; 1995 disease->last_sp -= 2 * dam_mod;
1996
2007 if (disease->last_sp < 1) 1997 if (disease->last_sp < 1)
2008 disease->last_sp = 1; 1998 disease->last_sp = 1;
2009 } 1999 }
2010 2000
2011 if (disease->stats.maxsp) 2001 if (disease->stats.dam ) disease->stats.dam += copysign (disease->stats.dam , dam_mod);
2012 { 2002 if (disease->stats.maxsp) disease->stats.maxsp += copysign (disease->stats.maxsp, dam_mod);
2013 if (disease->stats.maxsp > 0) 2003 if (disease->stats.ac ) disease->stats.ac += dam_mod;
2014 disease->stats.maxsp += dam_mod; 2004 if (disease->last_eat ) disease->last_eat -= dam_mod;
2015 else 2005 if (disease->stats.hp ) disease->stats.hp -= dam_mod;
2016 disease->stats.maxsp -= dam_mod; 2006 if (disease->stats.sp ) disease->stats.sp -= dam_mod;
2017 }
2018
2019 if (disease->stats.ac)
2020 disease->stats.ac += dam_mod;
2021
2022 if (disease->last_eat)
2023 disease->last_eat -= dam_mod;
2024
2025 if (disease->stats.hp)
2026 disease->stats.hp -= dam_mod;
2027
2028 if (disease->stats.sp)
2029 disease->stats.sp -= dam_mod;
2030 2007
2031 if (infect_object (walk, disease, 1)) 2008 if (infect_object (walk, disease, 1))
2032 { 2009 {
2033 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2010 op->statusmsg (format ("You inflict %s on %s!", &disease->name, &walk->name));
2034 2011
2035 disease->destroy (); /* don't need this one anymore */ 2012 disease->destroy (); /* don't need this one anymore */
2036 walk->map->insert (get_archetype (shstr_detect_magic), x, y, op); 2013 walk->map->insert (archetype::get (shstr_detect_magic), x, y, op);
2037 return 1; 2014 return 1;
2038 } 2015 }
2039 2016
2040 disease->destroy (); 2017 disease->destroy ();
2041 } 2018 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines