ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/spell_effect.C
(Generate patch)

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.71 by root, Wed Aug 29 20:40:25 2007 UTC vs.
Revision 1.82 by root, Sun May 4 15:22:14 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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,
… …
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 GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <object.h> 25#include <object.h>
26#include <living.h> 26#include <living.h>
… …
70 } 70 }
71 if (!(random_roll (0, 3, op, PREFER_HIGH))) 71 if (!(random_roll (0, 3, op, PREFER_HIGH)))
72 { 72 {
73 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s vibrates violently, then explodes!", query_name (wand)); 73 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s vibrates violently, then explodes!", query_name (wand));
74 op->play_sound (sound_find ("ob_explode")); 74 op->play_sound (sound_find ("ob_explode"));
75 esrv_del_item (op->contr, wand->count);
76 wand->destroy (); 75 wand->destroy ();
77 tmp = get_archetype ("fireball"); 76 tmp = get_archetype ("fireball");
78 tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10; 77 tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10;
79 78
80 if (!tmp->stats.dam) 79 if (!tmp->stats.dam)
… …
125 * create nonnmagic arrows, or even -1, etc... 124 * create nonnmagic arrows, or even -1, etc...
126 */ 125 */
127int 126int
128cast_create_missile (object *op, object *caster, object *spell, int dir, const char *stringarg) 127cast_create_missile (object *op, object *caster, object *spell, int dir, const char *stringarg)
129{ 128{
130 int missile_plus = 0, bonus_plus = 0; 129 int bonus_plus = 0;
131 const char *missile_name; 130 const char *missile_name = "arrow";
132 object *tmp, *missile;
133 131
134 missile_name = "arrow";
135
136 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 132 for (object *tmp = op->inv; tmp; tmp = tmp->below)
137 if (tmp->type == BOW && QUERY_FLAG (tmp, FLAG_APPLIED)) 133 if (tmp->type == BOW && QUERY_FLAG (tmp, FLAG_APPLIED))
138 missile_name = tmp->race; 134 missile_name = tmp->race;
139 135
140 missile_plus = spell->stats.dam + SP_level_dam_adjust (caster, spell); 136 int missile_plus = spell->stats.dam + SP_level_dam_adjust (caster, spell);
141 137
142 if (archetype::find (missile_name) == NULL) 138 archetype *missile_arch = archetype::find (missile_name);
139
140 if (!missile_arch)
143 { 141 {
144 LOG (llevDebug, "Cast create_missile: could not find archetype %s\n", missile_name); 142 LOG (llevDebug, "Cast create_missile: could not find archetype %s\n", missile_name);
145 return 0; 143 return 0;
146 } 144 }
147 145
148 missile = get_archetype (missile_name); 146 object *missile = missile_arch->instance ();
149 147
150 if (stringarg) 148 if (stringarg)
151 { 149 {
152 /* If it starts with a letter, presume it is a description */ 150 /* If it starts with a letter, presume it is a description */
153 if (isalpha (*stringarg)) 151 if (isalpha (*stringarg))
… …
171 new_draw_info_format (NDI_UNIQUE, 0, op, "You are not allowed to create %ss of %s", missile_name, stringarg); 169 new_draw_info_format (NDI_UNIQUE, 0, op, "You are not allowed to create %ss of %s", missile_name, stringarg);
172 return 0; 170 return 0;
173 } 171 }
174 172
175 give_artifact_abilities (missile, al->item); 173 give_artifact_abilities (missile, al->item);
176 /* These special arrows cost something extra. Don't have them also be magical - 174 /* These special arrows cost something extra. Don't have them also be magical -
177 * otherwise, in most cases, not enough will be created. I don't want to get into 175 * otherwise, in most cases, not enough will be created. I don't want to get into
178 * the parsing of having to do both plus and type. 176 * the parsing of having to do both plus and type.
179 */ 177 */
180 bonus_plus = 1 + (al->item->value / 5); 178 bonus_plus = 1 + (al->item->value / 5);
181 missile_plus = 0; 179 missile_plus = 0;
182 } 180 }
183 else if (atoi (stringarg) < missile_plus) 181 else if (atoi (stringarg) < missile_plus)
184 missile_plus = atoi (stringarg); 182 missile_plus = atoi (stringarg);
185 } 183 }
186 184
187 if (missile_plus > 4) 185 missile_plus = clamp (missile_plus, -4, 4);
188 missile_plus = 4;
189 else if (missile_plus < -4)
190 missile_plus = -4;
191 186
192 missile->nrof = spell->duration + SP_level_duration_adjust (caster, spell); 187 missile->nrof = spell->duration + SP_level_duration_adjust (caster, spell);
193 missile->nrof -= 3 * (missile_plus + bonus_plus); 188 missile->nrof -= 3 * (missile_plus + bonus_plus);
194 189
195 if (missile->nrof < 1) 190 if (missile->nrof < 1)
… …
215{ 210{
216 int food_value; 211 int food_value;
217 archetype *at = NULL; 212 archetype *at = NULL;
218 object *new_op; 213 object *new_op;
219 214
220 food_value = spell_ob->stats.food + +50 * SP_level_duration_adjust (caster, spell_ob); 215 food_value = spell_ob->stats.food + 50 * SP_level_duration_adjust (caster, spell_ob);
221 216
222 if (stringarg) 217 if (stringarg)
223 { 218 {
224 at = find_archetype_by_object_type_name (FOOD, stringarg); 219 at = find_archetype_by_object_type_name (FOOD, stringarg);
225 if (at == NULL) 220 if (at == NULL)
… …
284{ 279{
285 int r, mflags, maxrange; 280 int r, mflags, maxrange;
286 object *tmp; 281 object *tmp;
287 maptile *m; 282 maptile *m;
288 283
289
290 if (!dir) 284 if (!dir)
291 { 285 {
292 examine_monster (op, op); 286 examine_monster (op, op);
293 return 1; 287 return 1;
294 } 288 }
… …
471 if (object *pl = op->in_player ()) 465 if (object *pl = op->in_player ())
472 { 466 {
473 if (pl->ms ().flags () & P_NO_CLERIC && !QUERY_FLAG (pl, FLAG_WIZCAST)) 467 if (pl->ms ().flags () & P_NO_CLERIC && !QUERY_FLAG (pl, FLAG_WIZCAST))
474 new_draw_info (NDI_UNIQUE, 0, pl, "You feel something fizzle inside you."); 468 new_draw_info (NDI_UNIQUE, 0, pl, "You feel something fizzle inside you.");
475 else 469 else
476 { 470 pl->player_goto (op->slaying, op->stats.hp, op->stats.sp);
477 // remove first so we do not call update_stats
478 op->remove ();
479 pl->enter_exit (op);
480 }
481 } 471 }
482 472
483 op->destroy (); 473 op->destroy ();
484} 474}
485 475
… …
1299static void 1289static void
1300alchemy_object (object *obj, uint64 &total_value, int &total_weight) 1290alchemy_object (object *obj, uint64 &total_value, int &total_weight)
1301{ 1291{
1302 uint64 value = query_cost (obj, NULL, F_TRUE); 1292 uint64 value = query_cost (obj, NULL, F_TRUE);
1303 1293
1304 /* Give third price when we alchemy money (This should hopefully 1294 /* Give third price when we alchemy money (this should hopefully
1305 * make it so that it isn't worth it to alchemy money, sell 1295 * make it so that it isn't worth it to alchemy money, sell
1306 * the nuggets, alchemy the gold from that, etc. 1296 * the nuggets, alchemy the gold from that, etc.
1307 * Otherwise, give 9 silver on the gold for other objects, 1297 * Otherwise, give 9 silver on the gold for other objects,
1308 * so that it would still be more affordable to haul 1298 * so that it would still be more affordable to haul
1309 * the stuff back to town. 1299 * the stuff back to town.
… …
1416 1406
1417bailout: 1407bailout:
1418 return 1; 1408 return 1;
1419} 1409}
1420 1410
1421
1422/* This function removes the cursed/damned status on equipped 1411/* This function removes the cursed/damned status on equipped
1423 * items. 1412 * items.
1424 */ 1413 */
1425int 1414int
1426remove_curse (object *op, object *caster, object *spell) 1415remove_curse (object *op, object *caster, object *spell)
… …
1432 if (QUERY_FLAG (tmp, FLAG_APPLIED) && 1421 if (QUERY_FLAG (tmp, FLAG_APPLIED) &&
1433 ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) || 1422 ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) ||
1434 (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED)))) 1423 (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED))))
1435 { 1424 {
1436 was_one++; 1425 was_one++;
1426
1437 if (tmp->level <= caster_level (caster, spell)) 1427 if (tmp->level <= caster_level (caster, spell))
1438 { 1428 {
1439 success++; 1429 success++;
1440 if (QUERY_FLAG (spell, FLAG_DAMNED)) 1430 if (QUERY_FLAG (spell, FLAG_DAMNED))
1441 CLEAR_FLAG (tmp, FLAG_DAMNED); 1431 CLEAR_FLAG (tmp, FLAG_DAMNED);
1442 1432
1443 CLEAR_FLAG (tmp, FLAG_CURSED); 1433 CLEAR_FLAG (tmp, FLAG_CURSED);
1444 CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED); 1434 CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED);
1445 tmp->value = 0; /* Still can't sell it */ 1435 tmp->value = 0; /* Still can't sell it */
1446 if (op->type == PLAYER) 1436
1437 if (object *pl = tmp->visible_to ())
1447 esrv_send_item (op, tmp); 1438 esrv_update_item (UPD_FLAGS, pl, tmp);
1448 } 1439 }
1449 } 1440 }
1450 1441
1451 if (op->type == PLAYER) 1442 if (op->type == PLAYER)
1452 { 1443 {
… …
1463 1454
1464 return success; 1455 return success;
1465} 1456}
1466 1457
1467/* Identifies objects in the players inventory/on the ground */ 1458/* Identifies objects in the players inventory/on the ground */
1468
1469int 1459int
1470cast_identify (object *op, object *caster, object *spell) 1460cast_identify (object *op, object *caster, object *spell)
1471{ 1461{
1462 dynbuf_text buf;
1472 object *tmp; 1463 object *tmp;
1473 int success = 0, num_ident;
1474 1464
1475 num_ident = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1465 int num_ident = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1476 1466
1477 if (num_ident < 1) 1467 if (num_ident < 1)
1478 num_ident = 1; 1468 num_ident = 1;
1479 1469
1480 for (tmp = op->inv; tmp; tmp = tmp->below) 1470 for (tmp = op->inv; tmp; tmp = tmp->below)
… …
1483 { 1473 {
1484 identify (tmp); 1474 identify (tmp);
1485 1475
1486 if (op->type == PLAYER) 1476 if (op->type == PLAYER)
1487 { 1477 {
1488 new_draw_info_format (NDI_UNIQUE, 0, op, "You identified: %s.", long_desc (tmp, op)); 1478 buf.printf ("You identified: %s.\n\n", long_desc (tmp, op));
1489 1479
1490 if (tmp->msg) 1480 if (tmp->msg)
1491 { 1481 buf << "The item has a story:\n\n" << tmp->msg << "\n\n";
1492 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1493 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1494 }
1495 } 1482 }
1496 1483
1497 num_ident--; 1484 num_ident--;
1498 success = 1;
1499 if (!num_ident) 1485 if (!num_ident)
1500 break; 1486 break;
1501 } 1487 }
1502 } 1488 }
1503 1489
… …
1510 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above) 1496 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
1511 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp)) 1497 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))
1512 { 1498 {
1513 identify (tmp); 1499 identify (tmp);
1514 1500
1515 if (op->type == PLAYER) 1501 if (object *pl = tmp->visible_to ())
1516 { 1502 {
1517 new_draw_info_format (NDI_UNIQUE, 0, op, "On the ground you identified: %s.", long_desc (tmp, op)); 1503 buf.printf ("On the ground you identified: %s.\n\n", long_desc (tmp, op));
1518 1504
1519 if (tmp->msg) 1505 if (tmp->msg)
1520 { 1506 buf << "The item has a story:\n\n" << tmp->msg << "\n\n";
1521 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1522 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1523 }
1524
1525 esrv_send_item (op, tmp);
1526 } 1507 }
1527 1508
1528 num_ident--; 1509 num_ident--;
1529 success = 1;
1530 if (!num_ident) 1510 if (!num_ident)
1531 break; 1511 break;
1532 } 1512 }
1533 } 1513 }
1534 1514
1535 if (!success) 1515 if (buf.empty ())
1536 new_draw_info (NDI_UNIQUE, 0, op, "You can't reach anything unidentified."); 1516 {
1517 op->failmsg ("You can't reach anything unidentified.");
1518 return 0;
1519 }
1537 else 1520 else
1521 {
1522 if (op->contr)
1523 op->contr->infobox (MSG_CHANNEL ("identify"), buf);
1524
1538 spell_effect (spell, op->x, op->y, op->map, op); 1525 spell_effect (spell, op->x, op->y, op->map, op);
1539 1526 return 1;
1540 return success; 1527 }
1541} 1528}
1542 1529
1543int 1530int
1544cast_detection (object *op, object *caster, object *spell, object *skill) 1531cast_detection (object *op, object *caster, object *spell, object *skill)
1545{ 1532{
… …
1687 1674
1688 /* Now process objects in the players inventory if detect curse or magic */ 1675 /* Now process objects in the players inventory if detect curse or magic */
1689 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) || QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL)) 1676 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) || QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL))
1690 { 1677 {
1691 done_one = 0; 1678 done_one = 0;
1679
1692 for (tmp = op->inv; tmp; tmp = tmp->below) 1680 for (tmp = op->inv; tmp; tmp = tmp->below)
1693 { 1681 {
1694 if (!tmp->invisible && !QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1682 if (!tmp->invisible && !QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1695 { 1683 {
1696 if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) && is_magical (tmp) && !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)) 1684 if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) && is_magical (tmp) && !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL))
1697 { 1685 {
1698 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL); 1686 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL);
1699 if (op->type == PLAYER) 1687
1688 if (object *pl = tmp->visible_to ())
1700 esrv_send_item (op, tmp); 1689 esrv_update_item (UPD_FLAGS, pl, tmp);
1701 } 1690 }
1691
1702 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && 1692 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) &&
1703 (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))) 1693 (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))
1704 { 1694 {
1705 SET_FLAG (tmp, FLAG_KNOWN_CURSED); 1695 SET_FLAG (tmp, FLAG_KNOWN_CURSED);
1706 if (op->type == PLAYER) 1696
1697 if (object *pl = tmp->visible_to ())
1707 esrv_send_item (op, tmp); 1698 esrv_update_item (UPD_FLAGS, pl, tmp);
1708 } 1699 }
1709 } /* if item is not identified */ 1700 } /* if item is not identified */
1710 } /* for the players inventory */ 1701 } /* for the players inventory */
1711 } /* if detect magic/curse and object is a player */ 1702 } /* if detect magic/curse and object is a player */
1703
1712 return 1; 1704 return 1;
1713} 1705}
1714 1706
1715 1707
1716/** 1708/**
… …
1906 break; 1898 break;
1907 } 1899 }
1908 } 1900 }
1909} 1901}
1910 1902
1911
1912
1913/* cast_consecrate() - a spell to make an altar your god's */ 1903/* cast_consecrate() - a spell to make an altar your god's */
1914int 1904int
1915cast_consecrate (object *op, object *caster, object *spell) 1905cast_consecrate (object *op, object *caster, object *spell)
1916{ 1906{
1917 char buf[MAX_BUF]; 1907 char buf[MAX_BUF];
… …
1941 /* If we got here, we are consecrating an altar */ 1931 /* If we got here, we are consecrating an altar */
1942 sprintf (buf, "Altar of %s", &god->name); 1932 sprintf (buf, "Altar of %s", &god->name);
1943 tmp->name = buf; 1933 tmp->name = buf;
1944 tmp->level = caster_level (caster, spell); 1934 tmp->level = caster_level (caster, spell);
1945 tmp->other_arch = god->arch; 1935 tmp->other_arch = god->arch;
1936
1946 if (op->type == PLAYER) 1937 if (op->type == PLAYER)
1947 esrv_update_item (UPD_NAME, op, tmp); 1938 esrv_update_item (UPD_NAME, op, tmp);
1939
1948 new_draw_info_format (NDI_UNIQUE, 0, op, "You consecrated the altar to %s!", &god->name); 1940 new_draw_info_format (NDI_UNIQUE, 0, op, "You consecrated the altar to %s!", &god->name);
1949 return 1; 1941 return 1;
1950 } 1942 }
1951 } 1943 }
1952 } 1944 }
… …
2028 { 2020 {
2029 new_draw_info_format (NDI_BLACK, 0, op, "You need to unequip %s before using it in this spell", query_name (weapon)); 2021 new_draw_info_format (NDI_BLACK, 0, op, "You need to unequip %s before using it in this spell", query_name (weapon));
2030 return 0; 2022 return 0;
2031 } 2023 }
2032 2024
2033 if (weapon->nrof > 1) 2025 weapon = weapon->split ();
2034 {
2035 tmp = get_split_ob (weapon, 1);
2036 esrv_send_item (op, weapon);
2037 weapon = tmp;
2038 }
2039 2026
2040 /* create the golem object */ 2027 /* create the golem object */
2041 tmp = arch_to_object (spell->other_arch); 2028 tmp = arch_to_object (spell->other_arch);
2042 2029
2043 /* if animated by a player, give the player control of the golem */ 2030 /* if animated by a player, give the player control of the golem */
… …
2048 tmp->set_owner (op); 2035 tmp->set_owner (op);
2049 op->contr->golem = tmp; 2036 op->contr->golem = tmp;
2050 set_spell_skill (op, caster, spell, tmp); 2037 set_spell_skill (op, caster, spell, tmp);
2051 2038
2052 /* Give the weapon to the golem now. A bit of a hack to check the 2039 /* Give the weapon to the golem now. A bit of a hack to check the
2053 * removed flag - it should only be set if get_split_object was 2040 * removed flag - it should only be set if weapon->split was
2054 * used above. 2041 * used above.
2055 */ 2042 */
2056 if (!QUERY_FLAG (weapon, FLAG_REMOVED)) 2043 if (!QUERY_FLAG (weapon, FLAG_REMOVED))
2057 weapon->remove (); 2044 weapon->remove ();
2058 2045
2059 insert_ob_in_ob (weapon, tmp); 2046 tmp->insert (weapon);
2060 esrv_send_item (op, weapon); 2047
2061 /* To do everything necessary to let a golem use the weapon is a pain, 2048 /* To do everything necessary to let a golem use the weapon is a pain,
2062 * so instead, just set it as equipped (otherwise, we need to update 2049 * so instead, just set it as equipped (otherwise, we need to update
2063 * body_info, skills, etc) 2050 * body_info, skills, etc)
2064 */ 2051 */
2065 SET_FLAG (tmp, FLAG_USE_WEAPON); 2052 SET_FLAG (tmp, FLAG_USE_WEAPON);
… …
2210 new_aura->set_owner (op); 2197 new_aura->set_owner (op);
2211 2198
2212 return 1; 2199 return 1;
2213} 2200}
2214 2201
2215
2216/* move aura function. An aura is a part of someone's inventory, 2202/* move aura function. An aura is a part of someone's inventory,
2217 * which he carries with him, but which acts on the map immediately 2203 * which he carries with him, but which acts on the map immediately
2218 * around him. 2204 * around him.
2219 * Aura parameters: 2205 * Aura parameters:
2220 * duration: duration counter. 2206 * duration: duration counter.
2221 * attacktype: aura's attacktype 2207 * attacktype: aura's attacktype
2222 * other_arch: archetype to drop where we attack 2208 * other_arch: archetype to drop where we attack
2223 */ 2209 */
2224
2225void 2210void
2226move_aura (object *aura) 2211move_aura (object *aura)
2227{ 2212{
2228 int i, mflags;
2229 object *env;
2230 maptile *m;
2231
2232 /* auras belong in inventories */ 2213 /* auras belong in inventories */
2233 env = aura->env; 2214 object *env = aura->env;
2215 object *owner = aura->owner;
2234 2216
2235 /* no matter what we've gotta remove the aura... 2217 /* no matter what we've gotta remove the aura...
2236 * we'll put it back if its time isn't up. 2218 * we'll put it back if its time isn't up.
2237 */ 2219 */
2238 aura->remove (); 2220 aura->remove ();
… …
2243 aura->destroy (); 2225 aura->destroy ();
2244 return; 2226 return;
2245 } 2227 }
2246 2228
2247 /* auras only exist in inventories */ 2229 /* auras only exist in inventories */
2248 if (env == NULL || env->map == NULL) 2230 if (!env || !env->map)
2249 { 2231 {
2250 aura->destroy (); 2232 aura->destroy ();
2251 return; 2233 return;
2252 } 2234 }
2253 2235
2254 /* we need to jump out of the inventory for a bit 2236 /* we need to jump out of the inventory for a bit
2255 * in order to hit the map conveniently. 2237 * in order to hit the map conveniently.
2256 */ 2238 */
2257 aura->insert_at (env, aura); 2239 aura->insert_at (env, aura);
2258 2240
2259 for (i = 1; i < 9; i++) 2241 for (int i = 1; i < 9; i++)
2260 { 2242 {
2261 sint16 nx, ny; 2243 mapxy pos (env);
2244 pos.move (i);
2262 2245
2263 nx = aura->x + freearr_x[i];
2264 ny = aura->y + freearr_y[i];
2265 mflags = get_map_flags (env->map, &m, nx, ny, &nx, &ny);
2266
2267 /* Consider the movement tyep of the person with the aura as 2246 /* Consider the movement type of the person with the aura as
2268 * movement type of the aura. Eg, if the player is flying, the aura 2247 * movement type of the aura. Eg, if the player is flying, the aura
2269 * is flying also, if player is walking, it is on the ground, etc. 2248 * is flying also, if player is walking, it is on the ground, etc.
2270 */ 2249 */
2271 if (!(mflags & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (env, GET_MAP_MOVE_BLOCK (m, nx, ny)))) 2250 if (pos.normalise () && !(OB_TYPE_MOVE_BLOCK (env, pos->move_block)))
2272 { 2251 {
2273 hit_map (aura, i, aura->attacktype, 0); 2252 hit_map (aura, i, aura->attacktype, 0);
2274 2253
2275 if (aura->other_arch) 2254 if (aura->other_arch)
2276 m->insert (arch_to_object (aura->other_arch), nx, ny, aura); 2255 pos.insert (arch_to_object (aura->other_arch), aura);
2277 } 2256 }
2278 } 2257 }
2279 2258
2280 /* put the aura back in the player's inventory */ 2259 /* put the aura back in the player's inventory */
2281 aura->remove (); 2260 env->insert (aura);
2282 insert_ob_in_ob (aura, env); 2261 aura->set_owner (owner);
2283} 2262}
2284 2263
2285/* moves the peacemaker spell. 2264/* moves the peacemaker spell.
2286 * op is the piece object. 2265 * op is the piece object.
2287 */ 2266 */
… …
2291 object *tmp; 2270 object *tmp;
2292 2271
2293 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 2272 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
2294 { 2273 {
2295 int atk_lev, def_lev; 2274 int atk_lev, def_lev;
2296 object *victim = tmp; 2275 object *victim = tmp->head_ ();
2297 2276
2298 if (tmp->head)
2299 victim = tmp->head;
2300 if (!QUERY_FLAG (victim, FLAG_MONSTER)) 2277 if (!QUERY_FLAG (victim, FLAG_MONSTER))
2301 continue; 2278 continue;
2279
2302 if (QUERY_FLAG (victim, FLAG_UNAGGRESSIVE)) 2280 if (QUERY_FLAG (victim, FLAG_UNAGGRESSIVE))
2303 continue; 2281 continue;
2282
2304 if (victim->stats.exp == 0) 2283 if (victim->stats.exp == 0)
2305 continue; 2284 continue;
2306 2285
2307 def_lev = MAX (1, victim->level); 2286 def_lev = MAX (1, victim->level);
2308 atk_lev = MAX (1, op->level); 2287 atk_lev = MAX (1, op->level);
2309 2288
2310 if (rndm (0, atk_lev - 1) > def_lev) 2289 if (rndm (0, atk_lev - 1) > def_lev)
2311 { 2290 {
2312 /* make this sucker peaceful. */ 2291 /* make this sucker peaceful. */
2313 2292
2293 INVOKE_OBJECT (KILL, victim, ARG_OBJECT (op));
2314 change_exp (op->owner, victim->stats.exp, op->skill, 0); 2294 change_exp (op->owner, victim->stats.exp, op->skill, 0);
2315 victim->stats.exp = 0; 2295 victim->stats.exp = 0;
2316#if 0 2296#if 0
2317 /* No idea why these were all set to zero - if something 2297 /* No idea why these were all set to zero - if something
2318 * makes this creature agressive, he should still do damage. 2298 * makes this creature agressive, he should still do damage.
… …
2325 victim->attack_movement = RANDO2; 2305 victim->attack_movement = RANDO2;
2326 SET_FLAG (victim, FLAG_UNAGGRESSIVE); 2306 SET_FLAG (victim, FLAG_UNAGGRESSIVE);
2327 SET_FLAG (victim, FLAG_RUN_AWAY); 2307 SET_FLAG (victim, FLAG_RUN_AWAY);
2328 SET_FLAG (victim, FLAG_RANDOM_MOVE); 2308 SET_FLAG (victim, FLAG_RANDOM_MOVE);
2329 CLEAR_FLAG (victim, FLAG_MONSTER); 2309 CLEAR_FLAG (victim, FLAG_MONSTER);
2310
2330 if (victim->name) 2311 if (victim->name)
2331 {
2332 new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s no longer feels like fighting.", &victim->name); 2312 new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s no longer feels like fighting.", &victim->name);
2333 }
2334 } 2313 }
2335 } 2314 }
2336} 2315}
2337 2316
2338 2317

Diff Legend

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