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.102 by root, Sun Apr 11 00:34:06 2010 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 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 new_draw_info (NDI_UNIQUE, 0, op, "Your undead nature prevents you from turning undead!");
828 return 0; 828 return 0;
829 } 829 }
830 830
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 }
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}
1161 if (effect->attacktype & AT_DEATH) 1161 if (effect->attacktype & AT_DEATH)
1162 { 1162 {
1163 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1163 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1164 1164
1165 /* casting death spells at undead isn't a good thing */ 1165 /* casting death spells at undead isn't a good thing */
1166 if (QUERY_FLAG (target, FLAG_UNDEAD)) 1166 if (target->flag [FLAG_UNDEAD])
1167 { 1167 {
1168 if (random_roll (0, 2, op, PREFER_LOW)) 1168 if (random_roll (0, 2, op, PREFER_LOW))
1169 { 1169 {
1170 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!"); 1170 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1171 effect->x = op->x; 1171 effect->x = op->x;
1267 return 0; 1267 return 0;
1268 1268
1269 object *tmp = get_archetype (FORCE_NAME); 1269 object *tmp = get_archetype (FORCE_NAME);
1270 tmp->speed = 0.01; 1270 tmp->speed = 0.01;
1271 tmp->stats.food = time; 1271 tmp->stats.food = time;
1272 SET_FLAG (tmp, FLAG_IS_USED_UP); 1272 tmp->set_flag (FLAG_IS_USED_UP);
1273 tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius)); 1273 tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius));
1274 tmp = insert_ob_in_ob (tmp, op); 1274 tmp = insert_ob_in_ob (tmp, op);
1275 1275
1276 if (tmp->glow_radius > op->glow_radius) 1276 if (tmp->glow_radius > op->glow_radius)
1277 op->set_glow_radius (tmp->glow_radius); 1277 op->set_glow_radius (tmp->glow_radius);
1286 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);
1287 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);
1288 1288
1289 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player (); 1289 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player ();
1290 1290
1291 /* destruction doesn't use another spell object, so we need 1291 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) 1292 unordered_mapwalk (buf, op, -range, -range, range, range)
1306 { 1293 {
1307 mapspace &ms = m->at (nx, ny); 1294 mapspace &ms = m->at (nx, ny);
1308 1295
1309 if (ms.flags () & P_IS_ALIVE) 1296 if (ms.flags () & P_IS_ALIVE)
1310 for (object *next, *tmp = ms.bot; tmp; tmp = next) 1297 for (object *next, *tmp = ms.bot; tmp; tmp = next)
1333 } 1320 }
1334 } 1321 }
1335 } 1322 }
1336 } 1323 }
1337 1324
1338 op->skill = skill;
1339 return 1; 1325 return 1;
1340} 1326}
1341 1327
1342/*************************************************************************** 1328/***************************************************************************
1343 * 1329 *
1406 } 1392 }
1407 1393
1408 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;
1409 force->speed = 1.f; 1395 force->speed = 1.f;
1410 force->speed_left = -1.f; 1396 force->speed_left = -1.f;
1411 SET_FLAG (force, FLAG_APPLIED); 1397 force->set_flag (FLAG_APPLIED);
1412 1398
1413 if (god) 1399 if (god)
1414 { 1400 {
1415 if (spell_ob->last_grace) 1401 if (spell_ob->last_grace)
1416 force->path_repelled = god->path_repelled; 1402 force->path_repelled = god->path_repelled;
1469 else if (god && spell->race == shstr_GOD_FRIEND) 1455 else if (god && spell->race == shstr_GOD_FRIEND)
1470 race = god->race; 1456 race = god->race;
1471 else 1457 else
1472 race = spell->race; 1458 race = spell->race;
1473 1459
1460 dynbuf buf;
1474 unordered_mapwalk (op, -range, -range, range, range) 1461 unordered_mapwalk (buf, op, -range, -range, range, range)
1475 { 1462 {
1476 mapspace &ms = m->at (nx, ny); 1463 mapspace &ms = m->at (nx, ny);
1477 1464
1478 /* 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 */
1479 if (!ms.flags () & P_IS_ALIVE) 1466 if (!ms.flags () & P_IS_ALIVE)
1498 1485
1499 /* 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 */
1500 if (race && head->race && !strstr (race, head->race)) 1487 if (race && head->race && !strstr (race, head->race))
1501 continue; 1488 continue;
1502 1489
1503 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD)) 1490 if (head->flag [FLAG_UNDEAD] && !spell->flag [FLAG_UNDEAD])
1504 continue; 1491 continue;
1505 1492
1506 /* Now do a bunch of stuff related to saving throws */ 1493 /* Now do a bunch of stuff related to saving throws */
1507 best_at = -1; 1494 best_at = -1;
1508 if (spell->attacktype) 1495 if (spell->attacktype)
1550 1537
1551 /* Done with saving throw. Now start affecting the monster */ 1538 /* Done with saving throw. Now start affecting the monster */
1552 done_one = 0; 1539 done_one = 0;
1553 1540
1554 /* aggravation */ 1541 /* aggravation */
1555 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1542 if (spell->flag [FLAG_MONSTER])
1556 { 1543 {
1557 CLEAR_FLAG (head, FLAG_SLEEP); 1544 head->clr_flag (FLAG_SLEEP);
1558 remove_friendly_object (head); 1545 remove_friendly_object (head);
1559 done_one = 1; 1546 done_one = 1;
1560 head->enemy = op; 1547 head->enemy = op;
1561 } 1548 }
1562 1549
1563 /* calm monsters */ 1550 /* calm monsters */
1564 if (QUERY_FLAG (spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (head, FLAG_UNAGGRESSIVE)) 1551 if (spell->flag [FLAG_UNAGGRESSIVE] && !head->flag [FLAG_UNAGGRESSIVE])
1565 { 1552 {
1566 SET_FLAG (head, FLAG_UNAGGRESSIVE); 1553 head->set_flag (FLAG_UNAGGRESSIVE);
1567 head->enemy = NULL; 1554 head->enemy = NULL;
1568 done_one = 1; 1555 done_one = 1;
1569 } 1556 }
1570 1557
1571 /* berserk monsters */ 1558 /* berserk monsters */
1572 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK)) 1559 if (spell->flag [FLAG_BERSERK] && !head->flag [FLAG_BERSERK])
1573 { 1560 {
1574 SET_FLAG (head, FLAG_BERSERK); 1561 head->set_flag (FLAG_BERSERK);
1575 done_one = 1; 1562 done_one = 1;
1576 } 1563 }
1577 1564
1578 /* charm */ 1565 /* charm */
1579 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY)) 1566 if (spell->flag [FLAG_NO_ATTACK] && !head->flag [FLAG_FRIENDLY])
1580 { 1567 {
1581 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster)); 1568 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster));
1582 1569
1583 /* Prevent uncontrolled outbreaks of self replicating monsters. 1570 /* Prevent uncontrolled outbreaks of self replicating monsters.
1584 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.
1585 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. */
1586 CLEAR_FLAG (head, FLAG_GENERATOR); 1573 head->clr_flag (FLAG_GENERATOR);
1587 head->set_owner (op); 1574 head->set_owner (op);
1588 set_spell_skill (op, caster, spell, head); 1575 set_spell_skill (op, caster, spell, head);
1589 add_friendly_object (head); 1576 add_friendly_object (head);
1590 head->attack_movement = PETMOVE; 1577 head->attack_movement = PETMOVE;
1591 done_one = 1; 1578 done_one = 1;
1892 } 1879 }
1893 1880
1894 if (mflags & P_IS_ALIVE && spell->attacktype) 1881 if (mflags & P_IS_ALIVE && spell->attacktype)
1895 { 1882 {
1896 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)
1897 if (QUERY_FLAG (target, FLAG_MONSTER)) 1884 if (target->flag [FLAG_MONSTER])
1898 { 1885 {
1899 /* oky doky. got a target monster. Lets make a blinding attack */ 1886 /* oky doky. got a target monster. Lets make a blinding attack */
1900 if (target->head) 1887 if (target->head)
1901 target = target->head; 1888 target = target->head;
1902 1889
1986 /* 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 */
1987 if (mflags & P_IS_ALIVE) 1974 if (mflags & P_IS_ALIVE)
1988 { 1975 {
1989 /* search this square for a victim */ 1976 /* search this square for a victim */
1990 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)
1991 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) 1978 if (walk->flag [FLAG_MONSTER] || (walk->type == PLAYER))
1992 { /* found a victim */ 1979 { /* found a victim */
1993 object *disease = spell->other_arch->instance (); 1980 object *disease = spell->other_arch->instance ();
1994 1981
1995 disease->set_owner (op); 1982 disease->set_owner (op);
1996 set_spell_skill (op, caster, spell, disease); 1983 set_spell_skill (op, caster, spell, disease);
1997 disease->stats.exp = 0; 1984 disease->stats.exp = 0;
1998 disease->level = casting_level (caster, spell); 1985 disease->level = casting_level (caster, spell);
1999 1986
2000 /* do level adjustments */ 1987 /* do level adjustments */
2001 if (disease->stats.wc) 1988 if (disease->stats.wc ) disease->stats.wc += dur_mod / 2;
2002 disease->stats.wc += dur_mod / 2; 1989 if (disease->magic > 0) disease->magic += dur_mod / 8;
2003 1990 if (disease->stats.maxhp > 0) disease->stats.maxhp += dur_mod;
2004 if (disease->magic > 0) 1991 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 1992
2021 if (disease->last_sp) 1993 if (disease->last_sp)
2022 { 1994 {
2023 disease->last_sp -= 2 * dam_mod; 1995 disease->last_sp -= 2 * dam_mod;
1996
2024 if (disease->last_sp < 1) 1997 if (disease->last_sp < 1)
2025 disease->last_sp = 1; 1998 disease->last_sp = 1;
2026 } 1999 }
2027 2000
2028 if (disease->stats.maxsp) 2001 if (disease->stats.dam ) disease->stats.dam += copysign (disease->stats.dam , dam_mod);
2029 { 2002 if (disease->stats.maxsp) disease->stats.maxsp += copysign (disease->stats.maxsp, dam_mod);
2030 if (disease->stats.maxsp > 0) 2003 if (disease->stats.ac ) disease->stats.ac += dam_mod;
2031 disease->stats.maxsp += dam_mod; 2004 if (disease->last_eat ) disease->last_eat -= dam_mod;
2032 else 2005 if (disease->stats.hp ) disease->stats.hp -= dam_mod;
2033 disease->stats.maxsp -= dam_mod; 2006 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 2007
2048 if (infect_object (walk, disease, 1)) 2008 if (infect_object (walk, disease, 1))
2049 { 2009 {
2050 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));
2051 2011
2052 disease->destroy (); /* don't need this one anymore */ 2012 disease->destroy (); /* don't need this one anymore */
2053 walk->map->insert (get_archetype (shstr_detect_magic), x, y, op); 2013 walk->map->insert (get_archetype (shstr_detect_magic), x, y, op);
2054 return 1; 2014 return 1;
2055 } 2015 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines