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.95 by elmex, Tue Jan 19 16:13:05 2010 UTC vs.
Revision 1.110 by root, Fri Jan 27 22:00:40 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
… …
675 return 0; 675 return 0;
676 } 676 }
677 677
678 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)))
679 { 679 {
680 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 680 if (!tmp->flag [FLAG_REFLECTING])
681 { 681 {
682 tmp->destroy (); 682 tmp->destroy ();
683 return 0; 683 return 0;
684 } 684 }
685 685
… …
729 op->set_speed (0); 729 op->set_speed (0);
730 return; 730 return;
731 } 731 }
732 732
733 /* lava saves it's life, but not yours :) */ 733 /* lava saves it's life, but not yours :) */
734 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 734 if (op->flag [FLAG_LIFESAVE])
735 { 735 {
736 hit_map (op, 0, op->attacktype, 0); 736 hit_map (op, 0, op->attacktype, 0);
737 return; 737 return;
738 } 738 }
739 739
… …
820 MoveType movetype; 820 MoveType movetype;
821 821
822 if (!spell->other_arch) 822 if (!spell->other_arch)
823 return 0; 823 return 0;
824 824
825 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)
826 { 826 {
827 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!");
828 return 0; 828 return 0;
829 } 829 }
830 830
831 if (!dir) 831 if (!dir)
832 { 832 {
… …
996 tmp->attacktype = op->attacktype; 996 tmp->attacktype = op->attacktype;
997 tmp->set_owner (op); 997 tmp->set_owner (op);
998 if (op->skill && op->skill != tmp->skill) 998 if (op->skill && op->skill != tmp->skill)
999 tmp->skill = op->skill; 999 tmp->skill = op->skill;
1000 1000
1001 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 1001 if (tmp->flag [FLAG_IS_TURNABLE])
1002 SET_ANIMATION (tmp, i); 1002 SET_ANIMATION (tmp, i);
1003 1003
1004 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);
1005 move_bullet (tmp); 1005 move_bullet (tmp);
1006 } 1006 }
… …
1025 // 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).
1026 if (dir) 1026 if (dir)
1027 { 1027 {
1028 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))
1029 { 1029 {
1030 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1030 op->failmsg ("There is something in the way.");
1031 return 0; 1031 return 0;
1032 } 1032 }
1033 } 1033 }
1034 1034
1035 tmp = spell->other_arch->instance (); 1035 tmp = spell->other_arch->instance ();
… …
1089 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW) 1089 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1090 return NULL; 1090 return NULL;
1091 1091
1092 if (mflags & P_IS_ALIVE) 1092 if (mflags & P_IS_ALIVE)
1093 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)
1094 if (QUERY_FLAG (target, FLAG_MONSTER)) 1094 if (target->flag [FLAG_MONSTER])
1095 return target; 1095 return target;
1096 } 1096 }
1097 1097
1098 return NULL; 1098 return NULL;
1099} 1099}
… …
1109int 1109int
1110cast_smite_spell (object *op, object *caster, int dir, object *spell) 1110cast_smite_spell (object *op, object *caster, int dir, object *spell)
1111{ 1111{
1112 object *effect, *target; 1112 object *effect, *target;
1113 object *god = find_god (determine_god (op)); 1113 object *god = find_god (determine_god (op));
1114 int range;
1115 1114
1116 range = spell->range + SP_level_range_adjust (caster, spell);
1117 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);
1118 1116
1119 /* Bunch of conditions for casting this spell. Note that only 1117 /* Bunch of conditions for casting this spell. Note that only
1120 * require a god if this is a cleric spell (requires grace). 1118 * require a god if this is a cleric spell (requires grace).
1121 * 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
… …
1129 || target->flag [FLAG_REFL_SPELL] 1127 || target->flag [FLAG_REFL_SPELL]
1130 || (!god && spell->stats.grace) 1128 || (!god && spell->stats.grace)
1131 || (god && target->title == god->name) 1129 || (god && target->title == god->name)
1132 || (god && target->race.contains (god->race))) 1130 || (god && target->race.contains (god->race)))
1133 { 1131 {
1134 new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded."); 1132 op->failmsg ("Your request is unheeded.");
1135 return 0; 1133 return 0;
1136 } 1134 }
1137 1135
1138 if (spell->other_arch) 1136 if (spell->other_arch)
1139 effect = spell->other_arch->instance (); 1137 effect = spell->other_arch->instance ();
… …
1147 { 1145 {
1148 if (tailor_god_spell (effect, op)) 1146 if (tailor_god_spell (effect, op))
1149 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));
1150 else 1148 else
1151 { 1149 {
1152 new_draw_info (NDI_UNIQUE, 0, op, "Your request is ignored."); 1150 op->failmsg ("Your request is ignored.");
1153 return 0; 1151 return 0;
1154 } 1152 }
1155 } 1153 }
1156 1154
1157 /* size of the area of destruction */ 1155 /* size of the area of destruction */
… …
1161 if (effect->attacktype & AT_DEATH) 1159 if (effect->attacktype & AT_DEATH)
1162 { 1160 {
1163 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1161 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1164 1162
1165 /* casting death spells at undead isn't a good thing */ 1163 /* casting death spells at undead isn't a good thing */
1166 if (QUERY_FLAG (target, FLAG_UNDEAD)) 1164 if (target->flag [FLAG_UNDEAD])
1167 { 1165 {
1168 if (random_roll (0, 2, op, PREFER_LOW)) 1166 if (random_roll (0, 2, op, PREFER_LOW))
1169 { 1167 {
1170 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!"); 1168 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1171 effect->x = op->x; 1169 effect->x = op->x;
… …
1264{ 1262{
1265 /* some things are unaffected... */ 1263 /* some things are unaffected... */
1266 if (op->path_denied & PATH_LIGHT) 1264 if (op->path_denied & PATH_LIGHT)
1267 return 0; 1265 return 0;
1268 1266
1269 object *tmp = get_archetype (FORCE_NAME); 1267 object *tmp = archetype::get (FORCE_NAME);
1270 tmp->speed = 0.01; 1268 tmp->set_speed (0.01);
1271 tmp->stats.food = time; 1269 tmp->stats.food = time;
1272 SET_FLAG (tmp, FLAG_IS_USED_UP); 1270 tmp->set_flag (FLAG_IS_USED_UP);
1273 tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius)); 1271 tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius));
1274 tmp = insert_ob_in_ob (tmp, op); 1272 tmp = insert_ob_in_ob (tmp, op);
1275 1273
1276 if (tmp->glow_radius > op->glow_radius) 1274 if (tmp->glow_radius > op->glow_radius)
1277 op->set_glow_radius (tmp->glow_radius); 1275 op->set_glow_radius (tmp->glow_radius);
… …
1286 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);
1287 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);
1288 1286
1289 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player (); 1287 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player ();
1290 1288
1291 /* destruction doesn't use another spell object, so we need 1289 dynbuf buf;
1292 * update op's skill pointer so that exp is properly awarded.
1293 */
1294 const shstr skill = op->skill;
1295
1296 if (caster == op)
1297 op->skill = spell_ob->skill;
1298 else if (caster->skill)
1299 op->skill = caster->skill;
1300 else
1301 op->skill = 0;
1302
1303 op->change_skill (find_skill_by_name (op, op->skill));
1304
1305 unordered_mapwalk (op, -range, -range, range, range) 1290 unordered_mapwalk (buf, op, -range, -range, range, range)
1306 { 1291 {
1307 mapspace &ms = m->at (nx, ny); 1292 mapspace &ms = m->at (nx, ny);
1308 1293
1309 if (ms.flags () & P_IS_ALIVE) 1294 if (ms.flags () & P_IS_ALIVE)
1310 for (object *next, *tmp = ms.bot; tmp; tmp = next) 1295 for (object *next, *tmp = ms.bot; tmp; tmp = next)
… …
1333 } 1318 }
1334 } 1319 }
1335 } 1320 }
1336 } 1321 }
1337 1322
1338 op->skill = skill;
1339 return 1; 1323 return 1;
1340} 1324}
1341 1325
1342/*************************************************************************** 1326/***************************************************************************
1343 * 1327 *
… …
1351 object *tmp, *force; 1335 object *tmp, *force;
1352 1336
1353 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);
1354 if (!tmp) 1338 if (!tmp)
1355 { 1339 {
1356 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.");
1357 return 0; 1341 return 0;
1358 } 1342 }
1359 1343
1360 tmp = tmp->head_ (); 1344 tmp = tmp->head_ ();
1361 1345
… …
1376 } 1360 }
1377 } 1361 }
1378 1362
1379 if (!force) 1363 if (!force)
1380 { 1364 {
1381 force = get_archetype (FORCE_NAME); 1365 force = archetype::get (FORCE_NAME);
1382 force->subtype = FORCE_CHANGE_ABILITY; 1366 force->subtype = FORCE_CHANGE_ABILITY;
1383 1367
1384 if (spell_ob->race) 1368 if (spell_ob->race)
1385 force->name = spell_ob->race; 1369 force->name = spell_ob->race;
1386 else 1370 else
… …
1404 1388
1405 return 1; 1389 return 1;
1406 } 1390 }
1407 1391
1408 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;
1409 force->speed = 1.f;
1410 force->speed_left = -1.f; 1393 force->speed_left = -1.f;
1411 SET_FLAG (force, FLAG_APPLIED); 1394 force->set_speed (1.f);
1395 force->set_flag (FLAG_APPLIED);
1412 1396
1413 if (god) 1397 if (god)
1414 { 1398 {
1415 if (spell_ob->last_grace) 1399 if (spell_ob->last_grace)
1416 force->path_repelled = god->path_repelled; 1400 force->path_repelled = god->path_repelled;
… …
1469 else if (god && spell->race == shstr_GOD_FRIEND) 1453 else if (god && spell->race == shstr_GOD_FRIEND)
1470 race = god->race; 1454 race = god->race;
1471 else 1455 else
1472 race = spell->race; 1456 race = spell->race;
1473 1457
1458 dynbuf buf;
1474 unordered_mapwalk (op, -range, -range, range, range) 1459 unordered_mapwalk (buf, op, -range, -range, range, range)
1475 { 1460 {
1476 mapspace &ms = m->at (nx, ny); 1461 mapspace &ms = m->at (nx, ny);
1477 1462
1478 /* 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 */
1479 if (!ms.flags () & P_IS_ALIVE) 1464 if (!(ms.flags () & P_IS_ALIVE))
1480 continue; 1465 continue;
1481 1466
1482 // players can only affect spaces that they can actually see 1467 // players can only affect spaces that they can actually see
1483 if (caster 1468 if (caster
1484 && caster->contr 1469 && caster->contr
… …
1498 1483
1499 /* 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 */
1500 if (race && head->race && !strstr (race, head->race)) 1485 if (race && head->race && !strstr (race, head->race))
1501 continue; 1486 continue;
1502 1487
1503 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD)) 1488 if (head->flag [FLAG_UNDEAD] && !spell->flag [FLAG_UNDEAD])
1504 continue; 1489 continue;
1505 1490
1506 /* Now do a bunch of stuff related to saving throws */ 1491 /* Now do a bunch of stuff related to saving throws */
1507 best_at = -1; 1492 best_at = -1;
1508 if (spell->attacktype) 1493 if (spell->attacktype)
… …
1550 1535
1551 /* Done with saving throw. Now start affecting the monster */ 1536 /* Done with saving throw. Now start affecting the monster */
1552 done_one = 0; 1537 done_one = 0;
1553 1538
1554 /* aggravation */ 1539 /* aggravation */
1555 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1540 if (spell->flag [FLAG_MONSTER])
1556 { 1541 {
1557 CLEAR_FLAG (head, FLAG_SLEEP); 1542 head->clr_flag (FLAG_SLEEP);
1558 remove_friendly_object (head); 1543 remove_friendly_object (head);
1559 done_one = 1; 1544 done_one = 1;
1560 head->enemy = op; 1545 head->enemy = op;
1561 } 1546 }
1562 1547
1563 /* calm monsters */ 1548 /* calm monsters */
1564 if (QUERY_FLAG (spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (head, FLAG_UNAGGRESSIVE)) 1549 if (spell->flag [FLAG_UNAGGRESSIVE] && !head->flag [FLAG_UNAGGRESSIVE])
1565 { 1550 {
1566 SET_FLAG (head, FLAG_UNAGGRESSIVE); 1551 head->set_flag (FLAG_UNAGGRESSIVE);
1567 head->enemy = NULL; 1552 head->enemy = NULL;
1568 done_one = 1; 1553 done_one = 1;
1569 } 1554 }
1570 1555
1571 /* berserk monsters */ 1556 /* berserk monsters */
1572 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK)) 1557 if (spell->flag [FLAG_BERSERK] && !head->flag [FLAG_BERSERK])
1573 { 1558 {
1574 SET_FLAG (head, FLAG_BERSERK); 1559 head->set_flag (FLAG_BERSERK);
1575 done_one = 1; 1560 done_one = 1;
1576 } 1561 }
1577 1562
1578 /* charm */ 1563 /* charm */
1579 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY)) 1564 if (spell->flag [FLAG_NO_ATTACK] && !head->flag [FLAG_FRIENDLY])
1580 { 1565 {
1581 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster)); 1566 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster));
1582 1567
1583 /* Prevent uncontrolled outbreaks of self replicating monsters. 1568 /* Prevent uncontrolled outbreaks of self replicating monsters.
1584 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.
1585 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. */
1586 CLEAR_FLAG (head, FLAG_GENERATOR); 1571 head->clr_flag (FLAG_GENERATOR);
1587 head->set_owner (op); 1572 head->set_owner (op);
1588 set_spell_skill (op, caster, spell, head); 1573 set_spell_skill (op, caster, spell, head);
1589 add_friendly_object (head); 1574 add_friendly_object (head);
1590 head->attack_movement = PETMOVE; 1575 head->attack_movement = PETMOVE;
1591 done_one = 1; 1576 done_one = 1;
… …
1885 1870
1886 mflags = get_map_flags (m, &m, x, y, &x, &y); 1871 mflags = get_map_flags (m, &m, x, y, &x, &y);
1887 1872
1888 if (mflags & P_OUT_OF_MAP) 1873 if (mflags & P_OUT_OF_MAP)
1889 { 1874 {
1890 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there."); 1875 op->failmsg ("Nothing is there.");
1891 return 0; 1876 return 0;
1892 } 1877 }
1893 1878
1894 if (mflags & P_IS_ALIVE && spell->attacktype) 1879 if (mflags & P_IS_ALIVE && spell->attacktype)
1895 { 1880 {
1896 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)
1897 if (QUERY_FLAG (target, FLAG_MONSTER)) 1882 if (target->flag [FLAG_MONSTER])
1898 { 1883 {
1899 /* oky doky. got a target monster. Lets make a blinding attack */ 1884 /* oky doky. got a target monster. Lets make a blinding attack */
1900 if (target->head) 1885 if (target->head)
1901 target = target->head; 1886 target = target->head;
1902 1887
… …
1906 } 1891 }
1907 1892
1908 /* no live target, perhaps a wall is in the way? */ 1893 /* no live target, perhaps a wall is in the way? */
1909 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)))
1910 { 1895 {
1911 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1896 op->failmsg ("Something is in the way.");
1912 return 0; 1897 return 0;
1913 } 1898 }
1914 } 1899 }
1915 1900
1916 /* 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 */
… …
1986 /* 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 */
1987 if (mflags & P_IS_ALIVE) 1972 if (mflags & P_IS_ALIVE)
1988 { 1973 {
1989 /* search this square for a victim */ 1974 /* search this square for a victim */
1990 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)
1991 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) 1976 if (walk->flag [FLAG_MONSTER] || (walk->type == PLAYER))
1992 { /* found a victim */ 1977 { /* found a victim */
1993 object *disease = spell->other_arch->instance (); 1978 object *disease = spell->other_arch->instance ();
1994 1979
1995 disease->set_owner (op); 1980 disease->set_owner (op);
1996 set_spell_skill (op, caster, spell, disease); 1981 set_spell_skill (op, caster, spell, disease);
1997 disease->stats.exp = 0; 1982 disease->stats.exp = 0;
1998 disease->level = casting_level (caster, spell); 1983 disease->level = casting_level (caster, spell);
1999 1984
2000 /* do level adjustments */ 1985 /* do level adjustments */
2001 if (disease->stats.wc) 1986 if (disease->stats.wc ) disease->stats.wc += dur_mod / 2;
2002 disease->stats.wc += dur_mod / 2; 1987 if (disease->magic > 0) disease->magic += dur_mod / 8;
2003 1988 if (disease->stats.maxhp > 0) disease->stats.maxhp += dur_mod;
2004 if (disease->magic > 0) 1989 if (disease->stats.maxgrace > 0) disease->stats.maxgrace += dur_mod;
2005 disease->magic += dur_mod / 8;
2006
2007 if (disease->stats.maxhp > 0)
2008 disease->stats.maxhp += dur_mod;
2009
2010 if (disease->stats.maxgrace > 0)
2011 disease->stats.maxgrace += dur_mod;
2012
2013 if (disease->stats.dam)
2014 {
2015 if (disease->stats.dam > 0)
2016 disease->stats.dam += dam_mod;
2017 else
2018 disease->stats.dam -= dam_mod;
2019 }
2020 1990
2021 if (disease->last_sp) 1991 if (disease->last_sp)
2022 { 1992 {
2023 disease->last_sp -= 2 * dam_mod; 1993 disease->last_sp -= 2 * dam_mod;
1994
2024 if (disease->last_sp < 1) 1995 if (disease->last_sp < 1)
2025 disease->last_sp = 1; 1996 disease->last_sp = 1;
2026 } 1997 }
2027 1998
2028 if (disease->stats.maxsp) 1999 if (disease->stats.dam ) disease->stats.dam += copysign (disease->stats.dam , dam_mod);
2029 { 2000 if (disease->stats.maxsp) disease->stats.maxsp += copysign (disease->stats.maxsp, dam_mod);
2030 if (disease->stats.maxsp > 0) 2001 if (disease->stats.ac ) disease->stats.ac += dam_mod;
2031 disease->stats.maxsp += dam_mod; 2002 if (disease->last_eat ) disease->last_eat -= dam_mod;
2032 else 2003 if (disease->stats.hp ) disease->stats.hp -= dam_mod;
2033 disease->stats.maxsp -= dam_mod; 2004 if (disease->stats.sp ) disease->stats.sp -= dam_mod;
2034 }
2035
2036 if (disease->stats.ac)
2037 disease->stats.ac += dam_mod;
2038
2039 if (disease->last_eat)
2040 disease->last_eat -= dam_mod;
2041
2042 if (disease->stats.hp)
2043 disease->stats.hp -= dam_mod;
2044
2045 if (disease->stats.sp)
2046 disease->stats.sp -= dam_mod;
2047 2005
2048 if (infect_object (walk, disease, 1)) 2006 if (infect_object (walk, disease, 1))
2049 { 2007 {
2050 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));
2051 2009
2052 disease->destroy (); /* don't need this one anymore */ 2010 disease->destroy (); /* don't need this one anymore */
2053 walk->map->insert (get_archetype (shstr_detect_magic), x, y, op); 2011 walk->map->insert (archetype::get (shstr_detect_magic), x, y, op);
2054 return 1; 2012 return 1;
2055 } 2013 }
2056 2014
2057 disease->destroy (); 2015 disease->destroy ();
2058 } 2016 }

Diff Legend

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