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.94 by root, Fri Dec 18 03:49:46 2009 UTC vs.
Revision 1.112 by root, Mon Oct 29 23:55:57 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.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the Affero GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25/* This file contains all the spell attack code. Grouping this code 25/* This file contains all the spell attack code. Grouping this code
26 * together should hopefully make it easier to find the relevent bits 26 * together should hopefully make it easier to find the relevent bits
… …
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}
1087 1100
1088/* cast_smite_arch() - the priest points to a creature and causes 1101/* cast_smite_spell() - the priest points to a creature and causes
1089 * a 'godly curse' to decend. 1102 * a 'godly curse' to decend.
1090 * usual params - 1103 * usual params -
1091 * op = player 1104 * op = player
1092 * caster = object casting the spell. 1105 * caster = object casting the spell.
1093 * dir = direction being cast 1106 * dir = direction being cast
… …
1096int 1109int
1097cast_smite_spell (object *op, object *caster, int dir, object *spell) 1110cast_smite_spell (object *op, object *caster, int dir, object *spell)
1098{ 1111{
1099 object *effect, *target; 1112 object *effect, *target;
1100 object *god = find_god (determine_god (op)); 1113 object *god = find_god (determine_god (op));
1101 int range;
1102 1114
1103 range = spell->range + SP_level_range_adjust (caster, spell);
1104 target = get_pointed_target (op, dir, 50, spell->stats.grace ? SPELL_GRACE : SPELL_MANA); 1115 target = get_pointed_target (op, dir, 50, spell->stats.grace ? SPELL_GRACE : SPELL_MANA);
1105 1116
1106 /* Bunch of conditions for casting this spell. Note that only 1117 /* Bunch of conditions for casting this spell. Note that only
1107 * require a god if this is a cleric spell (requires grace). 1118 * require a god if this is a cleric spell (requires grace).
1108 * This makes this spell much more general purpose - it can be used 1119 * This makes this spell much more general purpose - it can be used
… …
1116 || target->flag [FLAG_REFL_SPELL] 1127 || target->flag [FLAG_REFL_SPELL]
1117 || (!god && spell->stats.grace) 1128 || (!god && spell->stats.grace)
1118 || (god && target->title == god->name) 1129 || (god && target->title == god->name)
1119 || (god && target->race.contains (god->race))) 1130 || (god && target->race.contains (god->race)))
1120 { 1131 {
1121 new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded."); 1132 op->failmsg ("Your request is unheeded.");
1122 return 0; 1133 return 0;
1123 } 1134 }
1124 1135
1125 if (spell->other_arch) 1136 if (spell->other_arch)
1126 effect = spell->other_arch->instance (); 1137 effect = spell->other_arch->instance ();
… …
1134 { 1145 {
1135 if (tailor_god_spell (effect, op)) 1146 if (tailor_god_spell (effect, op))
1136 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", (const char *)determine_god (op)); 1147 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", (const char *)determine_god (op));
1137 else 1148 else
1138 { 1149 {
1139 new_draw_info (NDI_UNIQUE, 0, op, "Your request is ignored."); 1150 op->failmsg ("Your request is ignored.");
1140 return 0; 1151 return 0;
1141 } 1152 }
1142 } 1153 }
1143 1154
1144 /* size of the area of destruction */ 1155 /* size of the area of destruction */
… …
1148 if (effect->attacktype & AT_DEATH) 1159 if (effect->attacktype & AT_DEATH)
1149 { 1160 {
1150 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1161 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1151 1162
1152 /* casting death spells at undead isn't a good thing */ 1163 /* casting death spells at undead isn't a good thing */
1153 if (QUERY_FLAG (target, FLAG_UNDEAD)) 1164 if (target->flag [FLAG_UNDEAD])
1154 { 1165 {
1155 if (random_roll (0, 2, op, PREFER_LOW)) 1166 if (random_roll (0, 2, op, PREFER_LOW))
1156 { 1167 {
1157 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!"); 1168 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1158 effect->x = op->x; 1169 effect->x = op->x;
… …
1251{ 1262{
1252 /* some things are unaffected... */ 1263 /* some things are unaffected... */
1253 if (op->path_denied & PATH_LIGHT) 1264 if (op->path_denied & PATH_LIGHT)
1254 return 0; 1265 return 0;
1255 1266
1256 object *tmp = get_archetype (FORCE_NAME); 1267 object *tmp = archetype::get (FORCE_NAME);
1257 tmp->speed = 0.01; 1268 tmp->set_speed (0.01);
1258 tmp->stats.food = time; 1269 tmp->stats.food = time;
1259 SET_FLAG (tmp, FLAG_IS_USED_UP); 1270 tmp->set_flag (FLAG_IS_USED_UP);
1260 tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius)); 1271 tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius));
1261 tmp = insert_ob_in_ob (tmp, op); 1272 tmp = insert_ob_in_ob (tmp, op);
1262 1273
1263 if (tmp->glow_radius > op->glow_radius) 1274 if (tmp->glow_radius > op->glow_radius)
1264 op->set_glow_radius (tmp->glow_radius); 1275 op->set_glow_radius (tmp->glow_radius);
… …
1273 int dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 1284 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); 1285 int dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
1275 1286
1276 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player (); 1287 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player ();
1277 1288
1278 /* destruction doesn't use another spell object, so we need 1289 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) 1290 unordered_mapwalk (buf, op, -range, -range, range, range)
1293 { 1291 {
1294 mapspace &ms = m->at (nx, ny); 1292 mapspace &ms = m->at (nx, ny);
1295 1293
1296 if (ms.flags () & P_IS_ALIVE) 1294 if (ms.flags () & P_IS_ALIVE)
1297 for (object *next, *tmp = ms.bot; tmp; tmp = next) 1295 for (object *next, *tmp = ms.bot; tmp; tmp = next)
… …
1320 } 1318 }
1321 } 1319 }
1322 } 1320 }
1323 } 1321 }
1324 1322
1325 op->skill = skill;
1326 return 1; 1323 return 1;
1327} 1324}
1328 1325
1329/*************************************************************************** 1326/***************************************************************************
1330 * 1327 *
… …
1338 object *tmp, *force; 1335 object *tmp, *force;
1339 1336
1340 tmp = get_pointed_target (op, (dir == 0) ? op->direction : dir, spell_ob->range, SPELL_GRACE); 1337 tmp = get_pointed_target (op, (dir == 0) ? op->direction : dir, spell_ob->range, SPELL_GRACE);
1341 if (!tmp) 1338 if (!tmp)
1342 { 1339 {
1343 new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse."); 1340 op->failmsg ("There is no one in that direction to curse.");
1344 return 0; 1341 return 0;
1345 } 1342 }
1346 1343
1347 tmp = tmp->head_ (); 1344 tmp = tmp->head_ ();
1348 1345
… …
1363 } 1360 }
1364 } 1361 }
1365 1362
1366 if (!force) 1363 if (!force)
1367 { 1364 {
1368 force = get_archetype (FORCE_NAME); 1365 force = archetype::get (FORCE_NAME);
1369 force->subtype = FORCE_CHANGE_ABILITY; 1366 force->subtype = FORCE_CHANGE_ABILITY;
1370 1367
1371 if (spell_ob->race) 1368 if (spell_ob->race)
1372 force->name = spell_ob->race; 1369 force->name = spell_ob->race;
1373 else 1370 else
… …
1391 1388
1392 return 1; 1389 return 1;
1393 } 1390 }
1394 1391
1395 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1392 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1396 force->speed = 1.f;
1397 force->speed_left = -1.f; 1393 force->speed_left = -1.f;
1398 SET_FLAG (force, FLAG_APPLIED); 1394 force->set_speed (1.f);
1395 force->set_flag (FLAG_APPLIED);
1399 1396
1400 if (god) 1397 if (god)
1401 { 1398 {
1402 if (spell_ob->last_grace) 1399 if (spell_ob->last_grace)
1403 force->path_repelled = god->path_repelled; 1400 force->path_repelled = god->path_repelled;
… …
1456 else if (god && spell->race == shstr_GOD_FRIEND) 1453 else if (god && spell->race == shstr_GOD_FRIEND)
1457 race = god->race; 1454 race = god->race;
1458 else 1455 else
1459 race = spell->race; 1456 race = spell->race;
1460 1457
1458 dynbuf buf;
1461 unordered_mapwalk (op, -range, -range, range, range) 1459 unordered_mapwalk (buf, op, -range, -range, range, range)
1462 { 1460 {
1463 mapspace &ms = m->at (nx, ny); 1461 mapspace &ms = m->at (nx, ny);
1464 1462
1465 /* 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 */
1466 if (!ms.flags () & P_IS_ALIVE) 1464 if (!(ms.flags () & P_IS_ALIVE))
1467 continue; 1465 continue;
1468 1466
1469 // players can only affect spaces that they can actually see 1467 // players can only affect spaces that they can actually see
1470 if (caster 1468 if (caster
1471 && caster->contr 1469 && caster->contr
… …
1485 1483
1486 /* 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 */
1487 if (race && head->race && !strstr (race, head->race)) 1485 if (race && head->race && !strstr (race, head->race))
1488 continue; 1486 continue;
1489 1487
1490 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD)) 1488 if (head->flag [FLAG_UNDEAD] && !spell->flag [FLAG_UNDEAD])
1491 continue; 1489 continue;
1492 1490
1493 /* Now do a bunch of stuff related to saving throws */ 1491 /* Now do a bunch of stuff related to saving throws */
1494 best_at = -1; 1492 best_at = -1;
1495 if (spell->attacktype) 1493 if (spell->attacktype)
… …
1537 1535
1538 /* Done with saving throw. Now start affecting the monster */ 1536 /* Done with saving throw. Now start affecting the monster */
1539 done_one = 0; 1537 done_one = 0;
1540 1538
1541 /* aggravation */ 1539 /* aggravation */
1542 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1540 if (spell->flag [FLAG_MONSTER])
1543 { 1541 {
1544 CLEAR_FLAG (head, FLAG_SLEEP); 1542 head->clr_flag (FLAG_SLEEP);
1545 remove_friendly_object (head); 1543 remove_friendly_object (head);
1546 done_one = 1; 1544 done_one = 1;
1547 head->enemy = op; 1545 head->enemy = op;
1548 } 1546 }
1549 1547
1550 /* calm monsters */ 1548 /* calm monsters */
1551 if (QUERY_FLAG (spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (head, FLAG_UNAGGRESSIVE)) 1549 if (spell->flag [FLAG_UNAGGRESSIVE] && !head->flag [FLAG_UNAGGRESSIVE])
1552 { 1550 {
1553 SET_FLAG (head, FLAG_UNAGGRESSIVE); 1551 head->set_flag (FLAG_UNAGGRESSIVE);
1554 head->enemy = NULL; 1552 head->enemy = NULL;
1555 done_one = 1; 1553 done_one = 1;
1556 } 1554 }
1557 1555
1558 /* berserk monsters */ 1556 /* berserk monsters */
1559 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK)) 1557 if (spell->flag [FLAG_BERSERK] && !head->flag [FLAG_BERSERK])
1560 { 1558 {
1561 SET_FLAG (head, FLAG_BERSERK); 1559 head->set_flag (FLAG_BERSERK);
1562 done_one = 1; 1560 done_one = 1;
1563 } 1561 }
1564 1562
1565 /* charm */ 1563 /* charm */
1566 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY)) 1564 if (spell->flag [FLAG_NO_ATTACK] && !head->flag [FLAG_FRIENDLY])
1567 { 1565 {
1568 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster)); 1566 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster));
1569 1567
1570 /* Prevent uncontrolled outbreaks of self replicating monsters. 1568 /* Prevent uncontrolled outbreaks of self replicating monsters.
1571 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.
1572 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. */
1573 CLEAR_FLAG (head, FLAG_GENERATOR); 1571 head->clr_flag (FLAG_GENERATOR);
1574 head->set_owner (op); 1572 head->set_owner (op);
1575 set_spell_skill (op, caster, spell, head); 1573 set_spell_skill (op, caster, spell, head);
1576 add_friendly_object (head); 1574 add_friendly_object (head);
1577 head->attack_movement = PETMOVE; 1575 head->attack_movement = PETMOVE;
1578 done_one = 1; 1576 done_one = 1;
… …
1872 1870
1873 mflags = get_map_flags (m, &m, x, y, &x, &y); 1871 mflags = get_map_flags (m, &m, x, y, &x, &y);
1874 1872
1875 if (mflags & P_OUT_OF_MAP) 1873 if (mflags & P_OUT_OF_MAP)
1876 { 1874 {
1877 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there."); 1875 op->failmsg ("Nothing is there.");
1878 return 0; 1876 return 0;
1879 } 1877 }
1880 1878
1881 if (mflags & P_IS_ALIVE && spell->attacktype) 1879 if (mflags & P_IS_ALIVE && spell->attacktype)
1882 { 1880 {
1883 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)
1884 if (QUERY_FLAG (target, FLAG_MONSTER)) 1882 if (target->flag [FLAG_MONSTER])
1885 { 1883 {
1886 /* oky doky. got a target monster. Lets make a blinding attack */ 1884 /* oky doky. got a target monster. Lets make a blinding attack */
1887 if (target->head) 1885 if (target->head)
1888 target = target->head; 1886 target = target->head;
1889 1887
… …
1893 } 1891 }
1894 1892
1895 /* no live target, perhaps a wall is in the way? */ 1893 /* no live target, perhaps a wall is in the way? */
1896 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)))
1897 { 1895 {
1898 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1896 op->failmsg ("Something is in the way.");
1899 return 0; 1897 return 0;
1900 } 1898 }
1901 } 1899 }
1902 1900
1903 /* 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 */
… …
1973 /* Only bother looking on this space if there is something living here */ 1971 /* Only bother looking on this space if there is something living here */
1974 if (mflags & P_IS_ALIVE) 1972 if (mflags & P_IS_ALIVE)
1975 { 1973 {
1976 /* search this square for a victim */ 1974 /* search this square for a victim */
1977 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above) 1975 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)
1978 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) 1976 if (walk->flag [FLAG_MONSTER] || (walk->type == PLAYER))
1979 { /* found a victim */ 1977 { /* found a victim */
1980 object *disease = spell->other_arch->instance (); 1978 object *disease = spell->other_arch->instance ();
1981 1979
1982 disease->set_owner (op); 1980 disease->set_owner (op);
1983 set_spell_skill (op, caster, spell, disease); 1981 set_spell_skill (op, caster, spell, disease);
1984 disease->stats.exp = 0; 1982 disease->stats.exp = 0;
1985 disease->level = casting_level (caster, spell); 1983 disease->level = casting_level (caster, spell);
1986 1984
1987 /* do level adjustments */ 1985 /* do level adjustments */
1988 if (disease->stats.wc) 1986 if (disease->stats.wc ) disease->stats.wc += dur_mod / 2;
1989 disease->stats.wc += dur_mod / 2; 1987 if (disease->magic > 0) disease->magic += dur_mod / 8;
1990 1988 if (disease->stats.maxhp > 0) disease->stats.maxhp += dur_mod;
1991 if (disease->magic > 0) 1989 if (disease->stats.maxgrace > 0) disease->stats.maxgrace += dur_mod;
1992 disease->magic += dur_mod / 8;
1993
1994 if (disease->stats.maxhp > 0)
1995 disease->stats.maxhp += dur_mod;
1996
1997 if (disease->stats.maxgrace > 0)
1998 disease->stats.maxgrace += dur_mod;
1999
2000 if (disease->stats.dam)
2001 {
2002 if (disease->stats.dam > 0)
2003 disease->stats.dam += dam_mod;
2004 else
2005 disease->stats.dam -= dam_mod;
2006 }
2007 1990
2008 if (disease->last_sp) 1991 if (disease->last_sp)
2009 { 1992 {
2010 disease->last_sp -= 2 * dam_mod; 1993 disease->last_sp -= 2 * dam_mod;
1994
2011 if (disease->last_sp < 1) 1995 if (disease->last_sp < 1)
2012 disease->last_sp = 1; 1996 disease->last_sp = 1;
2013 } 1997 }
2014 1998
2015 if (disease->stats.maxsp) 1999 if (disease->stats.dam ) disease->stats.dam += copysign (disease->stats.dam , dam_mod);
2016 { 2000 if (disease->stats.maxsp) disease->stats.maxsp += copysign (disease->stats.maxsp, dam_mod);
2017 if (disease->stats.maxsp > 0) 2001 if (disease->stats.ac ) disease->stats.ac += dam_mod;
2018 disease->stats.maxsp += dam_mod; 2002 if (disease->last_eat ) disease->last_eat -= dam_mod;
2019 else 2003 if (disease->stats.hp ) disease->stats.hp -= dam_mod;
2020 disease->stats.maxsp -= dam_mod; 2004 if (disease->stats.sp ) disease->stats.sp -= dam_mod;
2021 }
2022
2023 if (disease->stats.ac)
2024 disease->stats.ac += dam_mod;
2025
2026 if (disease->last_eat)
2027 disease->last_eat -= dam_mod;
2028
2029 if (disease->stats.hp)
2030 disease->stats.hp -= dam_mod;
2031
2032 if (disease->stats.sp)
2033 disease->stats.sp -= dam_mod;
2034 2005
2035 if (infect_object (walk, disease, 1)) 2006 if (infect_object (walk, disease, 1))
2036 { 2007 {
2037 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2008 op->statusmsg (format ("You inflict %s on %s!", &disease->name, &walk->name));
2038 2009
2039 disease->destroy (); /* don't need this one anymore */ 2010 disease->destroy (); /* don't need this one anymore */
2040 walk->map->insert (get_archetype (shstr_detect_magic), x, y, op); 2011 walk->map->insert (archetype::get (shstr_detect_magic), x, y, op);
2041 return 1; 2012 return 1;
2042 } 2013 }
2043 2014
2044 disease->destroy (); 2015 disease->destroy ();
2045 } 2016 }

Diff Legend

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