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.102 by root, Sun Apr 11 00:34:06 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,2010 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 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 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
… …
822 if (!spell->other_arch) 822 if (!spell->other_arch)
823 return 0; 823 return 0;
824 824
825 if (op->type == PLAYER && op->flag [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 {
… …
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 ();
… …
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 */
… …
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 tmp->set_flag (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
… …
1337 object *tmp, *force; 1335 object *tmp, *force;
1338 1336
1339 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);
1340 if (!tmp) 1338 if (!tmp)
1341 { 1339 {
1342 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.");
1343 return 0; 1341 return 0;
1344 } 1342 }
1345 1343
1346 tmp = tmp->head_ (); 1344 tmp = tmp->head_ ();
1347 1345
… …
1362 } 1360 }
1363 } 1361 }
1364 1362
1365 if (!force) 1363 if (!force)
1366 { 1364 {
1367 force = get_archetype (FORCE_NAME); 1365 force = archetype::get (FORCE_NAME);
1368 force->subtype = FORCE_CHANGE_ABILITY; 1366 force->subtype = FORCE_CHANGE_ABILITY;
1369 1367
1370 if (spell_ob->race) 1368 if (spell_ob->race)
1371 force->name = spell_ob->race; 1369 force->name = spell_ob->race;
1372 else 1370 else
… …
1390 1388
1391 return 1; 1389 return 1;
1392 } 1390 }
1393 1391
1394 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;
1395 force->speed = 1.f;
1396 force->speed_left = -1.f; 1393 force->speed_left = -1.f;
1394 force->set_speed (1.f);
1397 force->set_flag (FLAG_APPLIED); 1395 force->set_flag (FLAG_APPLIED);
1398 1396
1399 if (god) 1397 if (god)
1400 { 1398 {
1401 if (spell_ob->last_grace) 1399 if (spell_ob->last_grace)
… …
1461 unordered_mapwalk (buf, 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
… …
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 {
… …
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 */
… …
2008 if (infect_object (walk, disease, 1)) 2006 if (infect_object (walk, disease, 1))
2009 { 2007 {
2010 op->statusmsg (format ("You inflict %s on %s!", &disease->name, &walk->name)); 2008 op->statusmsg (format ("You inflict %s on %s!", &disease->name, &walk->name));
2011 2009
2012 disease->destroy (); /* don't need this one anymore */ 2010 disease->destroy (); /* don't need this one anymore */
2013 walk->map->insert (get_archetype (shstr_detect_magic), x, y, op); 2011 walk->map->insert (archetype::get (shstr_detect_magic), x, y, op);
2014 return 1; 2012 return 1;
2015 } 2013 }
2016 2014
2017 disease->destroy (); 2015 disease->destroy ();
2018 } 2016 }

Diff Legend

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