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.60 by root, Sun Jun 24 01:09:28 2007 UTC vs.
Revision 1.84 by root, Tue Jul 8 08:33:27 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,2008 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 it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * 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>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <object.h> 25#include <object.h>
27#include <living.h> 26#include <living.h>
… …
62{ 61{
63 object *wand, *tmp; 62 object *wand, *tmp;
64 int ncharges; 63 int ncharges;
65 64
66 wand = find_marked_object (op); 65 wand = find_marked_object (op);
67 if (wand == NULL || wand->type != WAND) 66 if (!wand || wand->type != WAND)
68 { 67 {
69 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark the wand you want to recharge."); 68 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark the wand you want to recharge.");
70 return 0; 69 return 0;
71 } 70 }
72 if (!(random_roll (0, 3, op, PREFER_HIGH))) 71 if (!(random_roll (0, 3, op, PREFER_HIGH)))
73 { 72 {
74 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));
75 play_sound_map (op->map, op->x, op->y, SOUND_OB_EXPLODE); 74 op->play_sound (sound_find ("ob_explode"));
76 esrv_del_item (op->contr, wand->count);
77 wand->destroy (); 75 wand->destroy ();
78 tmp = get_archetype ("fireball"); 76 tmp = get_archetype ("fireball");
79 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;
80 78
81 if (!tmp->stats.dam) 79 if (!tmp->stats.dam)
… …
123 * great a plus, the default is used. 121 * great a plus, the default is used.
124 * The # of arrows created also goes up with level, so if a 30th level mage 122 * The # of arrows created also goes up with level, so if a 30th level mage
125 * wants LOTS of arrows, and doesn't care what the plus is he could 123 * wants LOTS of arrows, and doesn't care what the plus is he could
126 * create nonnmagic arrows, or even -1, etc... 124 * create nonnmagic arrows, or even -1, etc...
127 */ 125 */
128
129int 126int
130cast_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)
131{ 128{
132 int missile_plus = 0, bonus_plus = 0; 129 int bonus_plus = 0;
133 const char *missile_name; 130 const char *missile_name = "arrow";
134 object *tmp, *missile;
135 131
136 missile_name = "arrow";
137
138 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 132 for (object *tmp = op->inv; tmp; tmp = tmp->below)
139 if (tmp->type == BOW && QUERY_FLAG (tmp, FLAG_APPLIED)) 133 if (tmp->type == BOW && QUERY_FLAG (tmp, FLAG_APPLIED))
140 missile_name = tmp->race; 134 missile_name = tmp->race;
141 135
142 missile_plus = spell->stats.dam + SP_level_dam_adjust (caster, spell); 136 int missile_plus = spell->stats.dam + SP_level_dam_adjust (caster, spell);
143 137
144 if (archetype::find (missile_name) == NULL) 138 archetype *missile_arch = archetype::find (missile_name);
139
140 if (!missile_arch)
145 { 141 {
146 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);
147 return 0; 143 return 0;
148 } 144 }
149 145
150 missile = get_archetype (missile_name); 146 object *missile = missile_arch->instance ();
151 147
152 if (stringarg) 148 if (stringarg)
153 { 149 {
154 /* If it starts with a letter, presume it is a description */ 150 /* If it starts with a letter, presume it is a description */
155 if (isalpha (*stringarg)) 151 if (isalpha (*stringarg))
… …
173 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);
174 return 0; 170 return 0;
175 } 171 }
176 172
177 give_artifact_abilities (missile, al->item); 173 give_artifact_abilities (missile, al->item);
178 /* 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 -
179 * 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
180 * the parsing of having to do both plus and type. 176 * the parsing of having to do both plus and type.
181 */ 177 */
182 bonus_plus = 1 + (al->item->value / 5); 178 bonus_plus = 1 + (al->item->value / 5);
183 missile_plus = 0; 179 missile_plus = 0;
184 } 180 }
185 else if (atoi (stringarg) < missile_plus) 181 else if (atoi (stringarg) < missile_plus)
186 missile_plus = atoi (stringarg); 182 missile_plus = atoi (stringarg);
187 } 183 }
188 184
189 if (missile_plus > 4) 185 missile_plus = clamp (missile_plus, -4, 4);
190 missile_plus = 4;
191 else if (missile_plus < -4)
192 missile_plus = -4;
193 186
194 missile->nrof = spell->duration + SP_level_duration_adjust (caster, spell); 187 missile->nrof = spell->duration + SP_level_duration_adjust (caster, spell);
195 missile->nrof -= 3 * (missile_plus + bonus_plus); 188 missile->nrof -= 3 * (missile_plus + bonus_plus);
196 189
197 if (missile->nrof < 1) 190 if (missile->nrof < 1)
… …
217{ 210{
218 int food_value; 211 int food_value;
219 archetype *at = NULL; 212 archetype *at = NULL;
220 object *new_op; 213 object *new_op;
221 214
222 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);
223 216
224 if (stringarg) 217 if (stringarg)
225 { 218 {
226 at = find_archetype_by_object_type_name (FOOD, stringarg); 219 at = find_archetype_by_object_type_name (FOOD, stringarg);
227 if (at == NULL) 220 if (at == NULL)
… …
257 && at_tmp->weight < at->weight))) 250 && at_tmp->weight < at->weight)))
258 at = at_tmp; 251 at = at_tmp;
259 } 252 }
260 } 253 }
261 } 254 }
255
262 /* Pretty unlikely (there are some very low food items), but you never 256 /* Pretty unlikely (there are some very low food items), but you never
263 * know 257 * know
264 */ 258 */
265 if (!at) 259 if (!at)
266 { 260 {
… …
285{ 279{
286 int r, mflags, maxrange; 280 int r, mflags, maxrange;
287 object *tmp; 281 object *tmp;
288 maptile *m; 282 maptile *m;
289 283
290
291 if (!dir) 284 if (!dir)
292 { 285 {
293 examine_monster (op, op); 286 examine_monster (op, op);
294 return 1; 287 return 1;
295 } 288 }
289
296 maxrange = spell_ob->range + SP_level_range_adjust (caster, spell_ob); 290 maxrange = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
297 for (r = 1; r < maxrange; r++) 291 for (r = 1; r < maxrange; r++)
298 { 292 {
299 sint16 x = op->x + r * freearr_x[dir], y = op->y + r * freearr_y[dir]; 293 sint16 x = op->x + r * freearr_x[dir], y = op->y + r * freearr_y[dir];
300 294
… …
307 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (mflags & P_NO_MAGIC)) 301 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (mflags & P_NO_MAGIC))
308 { 302 {
309 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic."); 303 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic.");
310 return 0; 304 return 0;
311 } 305 }
306
312 if (mflags & P_IS_ALIVE) 307 if (mflags & P_IS_ALIVE)
313 { 308 {
314 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 309 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
315 if (QUERY_FLAG (tmp, FLAG_ALIVE) && (tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 310 if (QUERY_FLAG (tmp, FLAG_ALIVE) && (tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
316 { 311 {
317 new_draw_info (NDI_UNIQUE, 0, op, "You detect something."); 312 new_draw_info (NDI_UNIQUE, 0, op, "You detect something.");
318 if (tmp->head != NULL) 313 if (tmp->head != NULL)
319 tmp = tmp->head; 314 tmp = tmp->head;
320 examine_monster (op, tmp); 315 examine_monster (op, tmp);
321 return 1; 316 return 1;
322 } 317 }
323 } 318 }
324 } 319 }
320
325 new_draw_info (NDI_UNIQUE, 0, op, "You detect nothing."); 321 new_draw_info (NDI_UNIQUE, 0, op, "You detect nothing.");
326 return 1; 322 return 1;
327} 323}
328
329 324
330/* This checks to see if 'pl' is invisible to 'mon'. 325/* This checks to see if 'pl' is invisible to 'mon'.
331 * does race check, undead check, etc 326 * does race check, undead check, etc
332 * Returns TRUE if mon can't see pl, false 327 * Returns TRUE if mon can't see pl, false
333 * otherwise. This doesn't check range, walls, etc. It 328 * otherwise. This doesn't check range, walls, etc. It
… …
335 * pl is invisible. 330 * pl is invisible.
336 */ 331 */
337int 332int
338makes_invisible_to (object *pl, object *mon) 333makes_invisible_to (object *pl, object *mon)
339{ 334{
340
341 if (!pl->invisible) 335 if (!pl->invisible)
342 return 0; 336 return 0;
337
343 if (pl->type == PLAYER) 338 if (pl->type == PLAYER)
344 { 339 {
345 /* If race isn't set, then invisible unless it is undead */ 340 /* If race isn't set, then invisible unless it is undead */
346 if (!pl->contr->invis_race) 341 if (!pl->contr->invis_race)
347 { 342 {
348 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 343 if (QUERY_FLAG (mon, FLAG_UNDEAD))
349 return 0; 344 return 0;
345
350 return 1; 346 return 1;
351 } 347 }
348
352 /* invis_race is set if we get here */ 349 /* invis_race is set if we get here */
353 if (!strcmp (pl->contr->invis_race, "undead") && is_true_undead (mon)) 350 if (!strcmp (pl->contr->invis_race, "undead") && is_true_undead (mon))
354 return 1; 351 return 1;
352
355 /* No race, can't be invisible to it */ 353 /* No race, can't be invisible to it */
356 if (!mon->race) 354 if (!mon->race)
357 return 0; 355 return 0;
356
358 if (strstr (mon->race, pl->contr->invis_race)) 357 if (strstr (mon->race, pl->contr->invis_race))
359 return 1; 358 return 1;
359
360 /* Nothing matched above, return 0 */ 360 /* Nothing matched above, return 0 */
361 return 0; 361 return 0;
362 } 362 }
363 else 363 else
364 { 364 {
… …
466 if (object *pl = op->in_player ()) 466 if (object *pl = op->in_player ())
467 { 467 {
468 if (pl->ms ().flags () & P_NO_CLERIC && !QUERY_FLAG (pl, FLAG_WIZCAST)) 468 if (pl->ms ().flags () & P_NO_CLERIC && !QUERY_FLAG (pl, FLAG_WIZCAST))
469 new_draw_info (NDI_UNIQUE, 0, pl, "You feel something fizzle inside you."); 469 new_draw_info (NDI_UNIQUE, 0, pl, "You feel something fizzle inside you.");
470 else 470 else
471 { 471 pl->player_goto (op->slaying, op->stats.hp, op->stats.sp);
472 // remove first so we do not call update_stats
473 op->remove ();
474 pl->enter_exit (op);
475 }
476 } 472 }
477 473
478 op->destroy (); 474 op->destroy ();
479} 475}
480 476
… …
496 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you."); 492 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you.");
497 return 1; 493 return 1;
498 } 494 }
499 495
500 dummy = get_archetype (FORCE_NAME); 496 dummy = get_archetype (FORCE_NAME);
501 if (dummy == NULL) 497
498 if (!dummy)
502 { 499 {
503 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 500 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
504 LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n"); 501 LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n");
505 return 0; 502 return 0;
506 } 503 }
… …
601 598
602 if (is_dragon_pl (op)) 599 if (is_dragon_pl (op))
603 /* now grab the 'dragon_ability'-force from the player's inventory */ 600 /* now grab the 'dragon_ability'-force from the player's inventory */
604 for (tmp = op->inv; tmp; tmp = tmp->below) 601 for (tmp = op->inv; tmp; tmp = tmp->below)
605 { 602 {
606 if (tmp->type == FORCE && !strcmp (tmp->arch->archname, "dragon_ability_force")) 603 if (tmp->type == FORCE && tmp->arch->archname == shstr_dragon_ability_force)
607 { 604 {
608 if (tmp->stats.exp == 0) 605 if (tmp->stats.exp == 0)
609 buf << "Your metabolism isn't focused on anything.\n"; 606 buf << "Your metabolism isn't focused on anything.\n";
610 else 607 else
611 buf << "Your metabolism is focused on " << change_resist_msg[tmp->stats.exp] << ".\n"; 608 buf << "Your metabolism is focused on " << change_resist_msg[tmp->stats.exp] << ".\n";
612 609
613 break; 610 break;
614 } 611 }
615 } 612 }
613
614 buf << '\0'; // zero-terminate
616 615
617 new_draw_info (NDI_UNIQUE, 0, op, buf.linearise ()); 616 new_draw_info (NDI_UNIQUE, 0, op, buf.linearise ());
618 617
619 return 1; 618 return 1;
620} 619}
… …
893 892
894 op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */ 893 op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */
895 return 1; 894 return 1;
896} 895}
897 896
898
899/* cast_heal: Heals something. 897/* cast_heal: Heals something.
900 * op is the caster. 898 * op is the caster.
901 * dir is the direction he is casting it in. 899 * dir is the direction he is casting it in.
902 * spell is the spell object. 900 * spell is the spell object.
903 */ 901 */
… …
929 { 927 {
930 /* See how many points we actually heal. Instead of messages 928 /* See how many points we actually heal. Instead of messages
931 * based on type of spell, we instead do messages based 929 * based on type of spell, we instead do messages based
932 * on amount of damage healed. 930 * on amount of damage healed.
933 */ 931 */
934 if (heal > (tmp->stats.maxhp - tmp->stats.hp)) 932 if (heal > tmp->stats.maxhp - tmp->stats.hp)
935 heal = tmp->stats.maxhp - tmp->stats.hp; 933 heal = tmp->stats.maxhp - tmp->stats.hp;
934
936 tmp->stats.hp += heal; 935 tmp->stats.hp += heal;
937 936
938 if (tmp->stats.hp >= tmp->stats.maxhp) 937 if (tmp->stats.hp >= tmp->stats.maxhp)
939 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel just fine!"); 938 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel just fine!");
940 else if (heal > 50) 939 else if (heal > 50)
… …
949 success = 1; 948 success = 1;
950 } 949 }
951 } 950 }
952 951
953 if (spell->attacktype & AT_DISEASE) 952 if (spell->attacktype & AT_DISEASE)
954 if (cure_disease (tmp, op)) 953 if (cure_disease (tmp, op, spell))
955 success = 1; 954 success = 1;
956 955
957 if (spell->attacktype & AT_POISON) 956 if (spell->attacktype & AT_POISON)
958 { 957 {
959 at = archetype::find ("poisoning"); 958 at = archetype::find ("poisoning");
… …
1008 } 1007 }
1009 1008
1010 if (spell->stats.food && tmp->stats.food < 999) 1009 if (spell->stats.food && tmp->stats.food < 999)
1011 { 1010 {
1012 tmp->stats.food += spell->stats.food; 1011 tmp->stats.food += spell->stats.food;
1012
1013 if (tmp->stats.food > 999) 1013 if (tmp->stats.food > 999)
1014 tmp->stats.food = 999; 1014 tmp->stats.food = 999;
1015
1015 success = 1; 1016 success = 1;
1016 /* We could do something a bit better like the messages for healing above */ 1017 /* We could do something a bit better like the messages for healing above */
1017 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel your belly fill with food"); 1018 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel your belly fill with food");
1018 } 1019 }
1019 1020
… …
1274} 1275}
1275 1276
1276/* Alchemy code by Mark Wedel 1277/* Alchemy code by Mark Wedel
1277 * 1278 *
1278 * This code adds a new spell, called alchemy. Alchemy will turn 1279 * This code adds a new spell, called alchemy. Alchemy will turn
1279 * objects to gold nuggets, the value of the gold nuggets being 1280 * objects to pyrite ("false gold"), henceforth called gold nuggets.
1280 * about 90% of that of the item itself. It uses the value of the
1281 * object before charisma adjustments, because the nuggets themselves
1282 * will be will be adjusted by charisma when sold.
1283 * 1281 *
1284 * Large nuggets are worth 25 gp each (base). You will always get 1282 * The value of the gold nuggets being about 90% of that of the item
1285 * the maximum number of large nuggets you could get. 1283 * itself. It uses the value of the object before charisma adjustments,
1286 * Small nuggets are worth 1 gp each (base). You will get from 0 1284 * because the nuggets themselves will be will be adjusted by charisma
1287 * to the max amount of small nuggets as you could get. 1285 * when sold.
1288 *
1289 * For example, if an item is worth 110 gold, you will get
1290 * 4 large nuggets, and from 0-10 small nuggets.
1291 * 1286 *
1292 * There is also a chance (1:30) that you will get nothing at all 1287 * There is also a chance (1:30) that you will get nothing at all
1293 * for the object. There is also a maximum weight that will be 1288 * for the object. There is also a maximum weight that will be
1294 * alchemised. 1289 * alchemised.
1295 */ 1290 */
1296static void 1291static void
1297alchemy_object (object *obj, uint64 &total_value, int &total_weight) 1292alchemy_object (object *obj, uint64 &total_value, int &total_weight)
1298{ 1293{
1299 uint64 value = query_cost (obj, NULL, F_TRUE); 1294 uint64 value = query_cost (obj, NULL, F_TRUE);
1300 1295
1301 /* Give third price when we alchemy money (This should hopefully 1296 /* Give third price when we alchemy money (this should hopefully
1302 * make it so that it isn't worth it to alchemy money, sell 1297 * make it so that it isn't worth it to alchemy money, sell
1303 * the nuggets, alchemy the gold from that, etc. 1298 * the nuggets, alchemy the gold from that, etc.
1304 * Otherwise, give 9 silver on the gold for other objects, 1299 * Otherwise, give 9 silver on the gold for other objects,
1305 * so that it would still be more affordable to haul 1300 * so that it would still be more affordable to haul
1306 * the stuff back to town. 1301 * the stuff back to town.
… …
1318 total_weight += obj->total_weight (); 1313 total_weight += obj->total_weight ();
1319 1314
1320 obj->destroy (); 1315 obj->destroy ();
1321} 1316}
1322 1317
1323static void
1324update_map (object *op, maptile *m, int small_nuggets, object *small, int large_nuggets, object *large, int x, int y)
1325{
1326 int flag = 0;
1327
1328 /* Put any nuggets below the player, but we can only pass this
1329 * flag if we are on the same space as the player
1330 */
1331 if (x == op->x && y == op->y && op->map == m)
1332 flag = INS_BELOW_ORIGINATOR;
1333
1334 if (small_nuggets)
1335 {
1336 object *tmp = small->clone ();
1337 tmp->nrof = small_nuggets;
1338 m->insert (tmp, x, y, op, flag);
1339 }
1340
1341 if (large_nuggets)
1342 {
1343 object *tmp = large->clone ();
1344 tmp->nrof = large_nuggets;
1345 m->insert (tmp, x, y, op, flag);
1346 }
1347
1348 if (object *pl = m->at (x, y).player ())
1349 if (pl->contr->ns)
1350 pl->contr->ns->look_position = 0;
1351}
1352
1353int 1318int
1354alchemy (object *op, object *caster, object *spell_ob) 1319alchemy (object *op, object *caster, object *spell_ob)
1355{ 1320{
1356 if (op->type != PLAYER) 1321 if (op->type != PLAYER)
1357 return 0; 1322 return 0;
1358 1323
1359 object *large = get_archetype ("largenugget"); 1324 archetype *nugget[3];
1360 object *small = get_archetype ("smallnugget"); 1325
1326 nugget[0] = archetype::find ("pyrite3");
1327 nugget[1] = archetype::find ("pyrite2");
1328 nugget[2] = archetype::find ("pyrite");
1361 1329
1362 /* Put a maximum weight of items that can be alchemised. Limits the power 1330 /* Put a maximum weight of items that can be alchemised. Limits the power
1363 * some, and also prevents people from alchemising every table/chair/clock 1331 * some, and also prevents people from alchemising every table/chair/clock
1364 * in sight 1332 * in sight
1365 */ 1333 */
… …
1417 if (weight > weight_max) 1385 if (weight > weight_max)
1418 break; 1386 break;
1419 } 1387 }
1420 } 1388 }
1421 1389
1390 value -= rndm (value >> 4);
1422 value = min (value, value_max); 1391 value = min (value, value_max);
1423 1392
1424 uint64 count = value / large->value; 1393 for (int i = 0; i < sizeof (nugget) / sizeof (nugget [0]); ++i)
1425 int large_nuggets = count; 1394 if (int nrof = value / nugget [i]->value)
1426 value -= count * large->value;
1427
1428 count = value / small->value;
1429 int small_nuggets = count;
1430
1431 /* Insert all the nuggets at one time. This probably saves time, but
1432 * it also prevents us from alcheming nuggets that were just created
1433 * with this spell.
1434 */ 1395 {
1435 update_map (op, mp, small_nuggets, small, large_nuggets, large, nx, ny); 1396 value -= nrof * nugget[i]->value;
1397
1398 object *tmp = arch_to_object (nugget[i]);
1399 tmp->nrof = nrof;
1400 tmp->flag [FLAG_IDENTIFIED] = true;
1401 op->map->insert (tmp, x, y, op, 0);
1402 }
1436 1403
1437 if (weight > weight_max) 1404 if (weight > weight_max)
1438 goto bailout; 1405 goto bailout;
1439 } 1406 }
1440 } 1407 }
1441 1408
1442bailout: 1409bailout:
1443 large->destroy ();
1444 small->destroy ();
1445 return 1; 1410 return 1;
1446} 1411}
1447
1448 1412
1449/* This function removes the cursed/damned status on equipped 1413/* This function removes the cursed/damned status on equipped
1450 * items. 1414 * items.
1451 */ 1415 */
1452int 1416int
… …
1459 if (QUERY_FLAG (tmp, FLAG_APPLIED) && 1423 if (QUERY_FLAG (tmp, FLAG_APPLIED) &&
1460 ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) || 1424 ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) ||
1461 (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED)))) 1425 (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED))))
1462 { 1426 {
1463 was_one++; 1427 was_one++;
1428
1464 if (tmp->level <= caster_level (caster, spell)) 1429 if (tmp->level <= caster_level (caster, spell))
1465 { 1430 {
1466 success++; 1431 success++;
1467 if (QUERY_FLAG (spell, FLAG_DAMNED)) 1432 if (QUERY_FLAG (spell, FLAG_DAMNED))
1468 CLEAR_FLAG (tmp, FLAG_DAMNED); 1433 CLEAR_FLAG (tmp, FLAG_DAMNED);
1469 1434
1470 CLEAR_FLAG (tmp, FLAG_CURSED); 1435 CLEAR_FLAG (tmp, FLAG_CURSED);
1471 CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED); 1436 CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED);
1472 tmp->value = 0; /* Still can't sell it */ 1437 tmp->value = 0; /* Still can't sell it */
1473 if (op->type == PLAYER) 1438
1439 if (object *pl = tmp->visible_to ())
1474 esrv_send_item (op, tmp); 1440 esrv_update_item (UPD_FLAGS, pl, tmp);
1475 } 1441 }
1476 } 1442 }
1477 1443
1478 if (op->type == PLAYER) 1444 if (op->type == PLAYER)
1479 { 1445 {
… …
1490 1456
1491 return success; 1457 return success;
1492} 1458}
1493 1459
1494/* Identifies objects in the players inventory/on the ground */ 1460/* Identifies objects in the players inventory/on the ground */
1495
1496int 1461int
1497cast_identify (object *op, object *caster, object *spell) 1462cast_identify (object *op, object *caster, object *spell)
1498{ 1463{
1464 dynbuf_text buf;
1499 object *tmp; 1465 object *tmp;
1500 int success = 0, num_ident;
1501 1466
1502 num_ident = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1467 int num_ident = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1503 1468
1504 if (num_ident < 1) 1469 if (num_ident < 1)
1505 num_ident = 1; 1470 num_ident = 1;
1506 1471
1507 for (tmp = op->inv; tmp; tmp = tmp->below) 1472 for (tmp = op->inv; tmp; tmp = tmp->below)
… …
1510 { 1475 {
1511 identify (tmp); 1476 identify (tmp);
1512 1477
1513 if (op->type == PLAYER) 1478 if (op->type == PLAYER)
1514 { 1479 {
1515 new_draw_info_format (NDI_UNIQUE, 0, op, "You identified: %s.", long_desc (tmp, op)); 1480 buf.printf ("You identified: %s.\n\n", long_desc (tmp, op));
1516 1481
1517 if (tmp->msg) 1482 if (tmp->msg)
1518 { 1483 buf << "The item has a story:\n\n" << tmp->msg << "\n\n";
1519 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1520 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1521 }
1522 } 1484 }
1523 1485
1524 num_ident--; 1486 num_ident--;
1525 success = 1;
1526 if (!num_ident) 1487 if (!num_ident)
1527 break; 1488 break;
1528 } 1489 }
1529 } 1490 }
1530 1491
… …
1537 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above) 1498 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
1538 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp)) 1499 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))
1539 { 1500 {
1540 identify (tmp); 1501 identify (tmp);
1541 1502
1542 if (op->type == PLAYER) 1503 if (object *pl = tmp->visible_to ())
1543 { 1504 {
1544 new_draw_info_format (NDI_UNIQUE, 0, op, "On the ground you identified: %s.", long_desc (tmp, op)); 1505 buf.printf ("On the ground you identified: %s.\n\n", long_desc (tmp, op));
1545 1506
1546 if (tmp->msg) 1507 if (tmp->msg)
1547 { 1508 buf << "The item has a story:\n\n" << tmp->msg << "\n\n";
1548 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1549 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1550 }
1551
1552 esrv_send_item (op, tmp);
1553 } 1509 }
1554 1510
1555 num_ident--; 1511 num_ident--;
1556 success = 1;
1557 if (!num_ident) 1512 if (!num_ident)
1558 break; 1513 break;
1559 } 1514 }
1560 } 1515 }
1561 1516
1562 if (!success) 1517 if (buf.empty ())
1563 new_draw_info (NDI_UNIQUE, 0, op, "You can't reach anything unidentified."); 1518 {
1519 op->failmsg ("You can't reach anything unidentified.");
1520 return 0;
1521 }
1564 else 1522 else
1523 {
1524 if (op->contr)
1525 op->contr->infobox (MSG_CHANNEL ("identify"), buf);
1526
1565 spell_effect (spell, op->x, op->y, op->map, op); 1527 spell_effect (spell, op->x, op->y, op->map, op);
1566 1528 return 1;
1567 return success; 1529 }
1568} 1530}
1569 1531
1570int 1532int
1571cast_detection (object *op, object *caster, object *spell, object *skill) 1533cast_detection (object *op, object *caster, object *spell, object *skill)
1572{ 1534{
… …
1714 1676
1715 /* Now process objects in the players inventory if detect curse or magic */ 1677 /* Now process objects in the players inventory if detect curse or magic */
1716 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) || QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL)) 1678 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) || QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL))
1717 { 1679 {
1718 done_one = 0; 1680 done_one = 0;
1681
1719 for (tmp = op->inv; tmp; tmp = tmp->below) 1682 for (tmp = op->inv; tmp; tmp = tmp->below)
1720 { 1683 {
1721 if (!tmp->invisible && !QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1684 if (!tmp->invisible && !QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1722 { 1685 {
1723 if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) && is_magical (tmp) && !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)) 1686 if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) && is_magical (tmp) && !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL))
1724 { 1687 {
1725 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL); 1688 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL);
1726 if (op->type == PLAYER) 1689
1690 if (object *pl = tmp->visible_to ())
1727 esrv_send_item (op, tmp); 1691 esrv_update_item (UPD_FLAGS, pl, tmp);
1728 } 1692 }
1693
1729 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && 1694 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) &&
1730 (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))) 1695 (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))
1731 { 1696 {
1732 SET_FLAG (tmp, FLAG_KNOWN_CURSED); 1697 SET_FLAG (tmp, FLAG_KNOWN_CURSED);
1733 if (op->type == PLAYER) 1698
1699 if (object *pl = tmp->visible_to ())
1734 esrv_send_item (op, tmp); 1700 esrv_update_item (UPD_FLAGS, pl, tmp);
1735 } 1701 }
1736 } /* if item is not identified */ 1702 } /* if item is not identified */
1737 } /* for the players inventory */ 1703 } /* for the players inventory */
1738 } /* if detect magic/curse and object is a player */ 1704 } /* if detect magic/curse and object is a player */
1705
1739 return 1; 1706 return 1;
1740} 1707}
1741 1708
1742 1709
1743/** 1710/**
… …
1933 break; 1900 break;
1934 } 1901 }
1935 } 1902 }
1936} 1903}
1937 1904
1938
1939
1940/* cast_consecrate() - a spell to make an altar your god's */ 1905/* cast_consecrate() - a spell to make an altar your god's */
1941int 1906int
1942cast_consecrate (object *op, object *caster, object *spell) 1907cast_consecrate (object *op, object *caster, object *spell)
1943{ 1908{
1944 char buf[MAX_BUF]; 1909 char buf[MAX_BUF];
… …
1968 /* If we got here, we are consecrating an altar */ 1933 /* If we got here, we are consecrating an altar */
1969 sprintf (buf, "Altar of %s", &god->name); 1934 sprintf (buf, "Altar of %s", &god->name);
1970 tmp->name = buf; 1935 tmp->name = buf;
1971 tmp->level = caster_level (caster, spell); 1936 tmp->level = caster_level (caster, spell);
1972 tmp->other_arch = god->arch; 1937 tmp->other_arch = god->arch;
1938
1973 if (op->type == PLAYER) 1939 if (op->type == PLAYER)
1974 esrv_update_item (UPD_NAME, op, tmp); 1940 esrv_update_item (UPD_NAME, op, tmp);
1941
1975 new_draw_info_format (NDI_UNIQUE, 0, op, "You consecrated the altar to %s!", &god->name); 1942 new_draw_info_format (NDI_UNIQUE, 0, op, "You consecrated the altar to %s!", &god->name);
1976 return 1; 1943 return 1;
1977 } 1944 }
1978 } 1945 }
1979 } 1946 }
… …
1997 object *weapon, *tmp; 1964 object *weapon, *tmp;
1998 char buf[MAX_BUF]; 1965 char buf[MAX_BUF];
1999 int a, i; 1966 int a, i;
2000 sint16 x, y; 1967 sint16 x, y;
2001 maptile *m; 1968 maptile *m;
2002 materialtype_t *mt;
2003 1969
2004 if (!spell->other_arch) 1970 if (!spell->other_arch)
2005 { 1971 {
2006 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 1972 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
2007 LOG (llevError, "animate_weapon failed: spell %s missing other_arch!\n", &spell->name); 1973 LOG (llevError, "animate_weapon failed: spell %s missing other_arch!\n", &spell->name);
… …
2018 return 0; 1984 return 0;
2019 } 1985 }
2020 1986
2021 /* if no direction specified, pick one */ 1987 /* if no direction specified, pick one */
2022 if (!dir) 1988 if (!dir)
2023 dir = find_free_spot (NULL, op->map, op->x, op->y, 1, 9); 1989 dir = find_free_spot (spell->other_arch, op->map, op->x, op->y, 1, 9);
2024 1990
2025 m = op->map; 1991 m = op->map;
2026 x = op->x + freearr_x[dir]; 1992 x = op->x + freearr_x[dir];
2027 y = op->y + freearr_y[dir]; 1993 y = op->y + freearr_y[dir];
2028 1994
2029 /* if there's no place to put the golem, abort */ 1995 /* if there's no place to put the golem, abort */
2030 if ((dir == -1) || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP) || 1996 if (dir < 0 || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP)
2031 ((spell->other_arch->move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->move_type)) 1997 || ((spell->other_arch->move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->move_type))
2032 { 1998 {
2033 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1999 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
2034 return 0; 2000 return 0;
2035 } 2001 }
2036 2002
… …
2056 { 2022 {
2057 new_draw_info_format (NDI_BLACK, 0, op, "You need to unequip %s before using it in this spell", query_name (weapon)); 2023 new_draw_info_format (NDI_BLACK, 0, op, "You need to unequip %s before using it in this spell", query_name (weapon));
2058 return 0; 2024 return 0;
2059 } 2025 }
2060 2026
2061 if (weapon->nrof > 1) 2027 weapon = weapon->split ();
2062 {
2063 tmp = get_split_ob (weapon, 1);
2064 esrv_send_item (op, weapon);
2065 weapon = tmp;
2066 }
2067 2028
2068 /* create the golem object */ 2029 /* create the golem object */
2069 tmp = arch_to_object (spell->other_arch); 2030 tmp = arch_to_object (spell->other_arch);
2070 2031
2071 /* if animated by a player, give the player control of the golem */ 2032 /* if animated by a player, give the player control of the golem */
… …
2076 tmp->set_owner (op); 2037 tmp->set_owner (op);
2077 op->contr->golem = tmp; 2038 op->contr->golem = tmp;
2078 set_spell_skill (op, caster, spell, tmp); 2039 set_spell_skill (op, caster, spell, tmp);
2079 2040
2080 /* Give the weapon to the golem now. A bit of a hack to check the 2041 /* Give the weapon to the golem now. A bit of a hack to check the
2081 * removed flag - it should only be set if get_split_object was 2042 * removed flag - it should only be set if weapon->split was
2082 * used above. 2043 * used above.
2083 */ 2044 */
2084 if (!QUERY_FLAG (weapon, FLAG_REMOVED)) 2045 if (!QUERY_FLAG (weapon, FLAG_REMOVED))
2085 weapon->remove (); 2046 weapon->remove ();
2086 2047
2087 insert_ob_in_ob (weapon, tmp); 2048 tmp->insert (weapon);
2088 esrv_send_item (op, weapon); 2049
2089 /* To do everything necessary to let a golem use the weapon is a pain, 2050 /* To do everything necessary to let a golem use the weapon is a pain,
2090 * so instead, just set it as equipped (otherwise, we need to update 2051 * so instead, just set it as equipped (otherwise, we need to update
2091 * body_info, skills, etc) 2052 * body_info, skills, etc)
2092 */ 2053 */
2093 SET_FLAG (tmp, FLAG_USE_WEAPON); 2054 SET_FLAG (tmp, FLAG_USE_WEAPON);
… …
2119 2080
2120 /* attacktype */ 2081 /* attacktype */
2121 if (!tmp->attacktype) 2082 if (!tmp->attacktype)
2122 tmp->attacktype = AT_PHYSICAL; 2083 tmp->attacktype = AT_PHYSICAL;
2123 2084
2124 mt = NULL;
2125 if (op->materialname != NULL)
2126 mt = name_to_material (op->materialname); 2085 if (materialtype_t *mt = name_to_material (op->materialname))
2127 if (mt != NULL)
2128 { 2086 {
2129 for (i = 0; i < NROFATTACKS; i++) 2087 for (i = 0; i < NROFATTACKS; i++)
2130 tmp->resist[i] = 50 - (mt->save[i] * 5); 2088 tmp->resist[i] = 50 - (mt->save[i] * 5);
2131 a = mt->save[0]; 2089 a = mt->save[0];
2132 } 2090 }
… …
2134 { 2092 {
2135 for (i = 0; i < NROFATTACKS; i++) 2093 for (i = 0; i < NROFATTACKS; i++)
2136 tmp->resist[i] = 5; 2094 tmp->resist[i] = 5;
2137 a = 10; 2095 a = 10;
2138 } 2096 }
2097
2139 /* Set weapon's immunity */ 2098 /* Set weapon's immunity */
2140 tmp->resist[ATNR_CONFUSION] = 100; 2099 tmp->resist[ATNR_CONFUSION] = 100;
2141 tmp->resist[ATNR_POISON] = 100; 2100 tmp->resist[ATNR_POISON] = 100;
2142 tmp->resist[ATNR_SLOW] = 100; 2101 tmp->resist[ATNR_SLOW] = 100;
2143 tmp->resist[ATNR_PARALYZE] = 100; 2102 tmp->resist[ATNR_PARALYZE] = 100;
… …
2149 2108
2150 /* Improve weapon's armour value according to best save vs. physical of its material */ 2109 /* Improve weapon's armour value according to best save vs. physical of its material */
2151 2110
2152 if (a > 14) 2111 if (a > 14)
2153 a = 14; 2112 a = 14;
2113
2154 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a)); 2114 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a));
2155 2115
2156 /* Determine golem's speed */ 2116 /* Determine golem's speed */
2157 tmp->set_speed (min (3.33, 0.4 + 0.1 * SP_level_range_adjust (caster, spell))); 2117 tmp->set_speed (min (3.33, 0.4 + 0.1 * SP_level_range_adjust (caster, spell)));
2158 2118
… …
2203 new_draw_info (NDI_UNIQUE, 0, op, "It can be no darker here."); 2163 new_draw_info (NDI_UNIQUE, 0, op, "It can be no darker here.");
2204 } 2164 }
2205 return success; 2165 return success;
2206} 2166}
2207 2167
2208
2209
2210
2211
2212/* create an aura spell object and put it in the player's inventory. 2168/* create an aura spell object and put it in the player's inventory.
2213 * as usual, op is player, caster is the object casting the spell, 2169 * as usual, op is player, caster is the object casting the spell,
2214 * spell is the spell object itself. 2170 * spell is the spell object itself.
2215 */ 2171 */
2216int 2172int
… …
2227 2183
2228 new_aura->duration = spell->duration + 10 * SP_level_duration_adjust (caster, spell); 2184 new_aura->duration = spell->duration + 10 * SP_level_duration_adjust (caster, spell);
2229 2185
2230 new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 2186 new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
2231 2187
2232 new_aura->set_owner (op);
2233 set_spell_skill (op, caster, spell, new_aura); 2188 set_spell_skill (op, caster, spell, new_aura);
2234 new_aura->attacktype = spell->attacktype; 2189 new_aura->attacktype = spell->attacktype;
2235 2190
2236 new_aura->level = caster_level (caster, spell); 2191 new_aura->level = caster_level (caster, spell);
2192
2237 if (refresh) 2193 if (refresh)
2238 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect."); 2194 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
2239 else 2195 else
2240 new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force."); 2196 new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force.");
2197
2241 insert_ob_in_ob (new_aura, op); 2198 insert_ob_in_ob (new_aura, op);
2199 new_aura->set_owner (op);
2200
2242 return 1; 2201 return 1;
2243} 2202}
2244
2245 2203
2246/* move aura function. An aura is a part of someone's inventory, 2204/* move aura function. An aura is a part of someone's inventory,
2247 * which he carries with him, but which acts on the map immediately 2205 * which he carries with him, but which acts on the map immediately
2248 * around him. 2206 * around him.
2249 * Aura parameters: 2207 * Aura parameters:
2250 * duration: duration counter. 2208 * duration: duration counter.
2251 * attacktype: aura's attacktype 2209 * attacktype: aura's attacktype
2252 * other_arch: archetype to drop where we attack 2210 * other_arch: archetype to drop where we attack
2253 */ 2211 */
2254
2255void 2212void
2256move_aura (object *aura) 2213move_aura (object *aura)
2257{ 2214{
2258 int i, mflags;
2259 object *env;
2260 maptile *m;
2261
2262 /* auras belong in inventories */ 2215 /* auras belong in inventories */
2263 env = aura->env; 2216 object *env = aura->env;
2217 object *owner = aura->owner;
2264 2218
2265 /* no matter what we've gotta remove the aura... 2219 /* no matter what we've gotta remove the aura...
2266 * we'll put it back if its time isn't up. 2220 * we'll put it back if its time isn't up.
2267 */ 2221 */
2268 aura->remove (); 2222 aura->remove ();
… …
2273 aura->destroy (); 2227 aura->destroy ();
2274 return; 2228 return;
2275 } 2229 }
2276 2230
2277 /* auras only exist in inventories */ 2231 /* auras only exist in inventories */
2278 if (env == NULL || env->map == NULL) 2232 if (!env || !env->map)
2279 { 2233 {
2280 aura->destroy (); 2234 aura->destroy ();
2281 return; 2235 return;
2282 } 2236 }
2283 2237
2284 /* we need to jump out of the inventory for a bit 2238 /* we need to jump out of the inventory for a bit
2285 * in order to hit the map conveniently. 2239 * in order to hit the map conveniently.
2286 */ 2240 */
2287 aura->insert_at (env, aura); 2241 aura->insert_at (env, aura);
2288 2242
2289 for (i = 1; i < 9; i++) 2243 for (int i = 1; i < 9; i++)
2290 { 2244 {
2291 sint16 nx, ny; 2245 mapxy pos (env);
2246 pos.move (i);
2292 2247
2293 nx = aura->x + freearr_x[i];
2294 ny = aura->y + freearr_y[i];
2295 mflags = get_map_flags (env->map, &m, nx, ny, &nx, &ny);
2296
2297 /* Consider the movement tyep of the person with the aura as 2248 /* Consider the movement type of the person with the aura as
2298 * movement type of the aura. Eg, if the player is flying, the aura 2249 * movement type of the aura. Eg, if the player is flying, the aura
2299 * is flying also, if player is walking, it is on the ground, etc. 2250 * is flying also, if player is walking, it is on the ground, etc.
2300 */ 2251 */
2301 if (!(mflags & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (env, GET_MAP_MOVE_BLOCK (m, nx, ny)))) 2252 if (pos.normalise () && !(OB_TYPE_MOVE_BLOCK (env, pos->move_block)))
2302 { 2253 {
2303 hit_map (aura, i, aura->attacktype, 0); 2254 hit_map (aura, i, aura->attacktype, 0);
2304 2255
2305 if (aura->other_arch) 2256 if (aura->other_arch)
2306 m->insert (arch_to_object (aura->other_arch), nx, ny, aura); 2257 pos.insert (arch_to_object (aura->other_arch), aura);
2307 } 2258 }
2308 } 2259 }
2309 2260
2310 /* put the aura back in the player's inventory */ 2261 /* put the aura back in the player's inventory */
2311 aura->remove (); 2262 env->insert (aura);
2312 insert_ob_in_ob (aura, env); 2263 aura->set_owner (owner);
2313} 2264}
2314 2265
2315/* moves the peacemaker spell. 2266/* moves the peacemaker spell.
2316 * op is the piece object. 2267 * op is the piece object.
2317 */ 2268 */
2318
2319void 2269void
2320move_peacemaker (object *op) 2270move_peacemaker (object *op)
2321{ 2271{
2322 object *tmp; 2272 object *tmp;
2323 2273
2324 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 2274 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
2325 { 2275 {
2326 int atk_lev, def_lev; 2276 int atk_lev, def_lev;
2327 object *victim = tmp; 2277 object *victim = tmp->head_ ();
2328 2278
2329 if (tmp->head)
2330 victim = tmp->head;
2331 if (!QUERY_FLAG (victim, FLAG_MONSTER)) 2279 if (!QUERY_FLAG (victim, FLAG_MONSTER))
2332 continue; 2280 continue;
2281
2333 if (QUERY_FLAG (victim, FLAG_UNAGGRESSIVE)) 2282 if (QUERY_FLAG (victim, FLAG_UNAGGRESSIVE))
2334 continue; 2283 continue;
2284
2335 if (victim->stats.exp == 0) 2285 if (victim->stats.exp == 0)
2336 continue; 2286 continue;
2337 2287
2338 def_lev = MAX (1, victim->level); 2288 def_lev = MAX (1, victim->level);
2339 atk_lev = MAX (1, op->level); 2289 atk_lev = MAX (1, op->level);
2340 2290
2341 if (rndm (0, atk_lev - 1) > def_lev) 2291 if (rndm (0, atk_lev - 1) > def_lev)
2342 { 2292 {
2343 /* make this sucker peaceful. */ 2293 /* make this sucker peaceful. */
2344 2294
2295 INVOKE_OBJECT (KILL, victim, ARG_OBJECT (op));
2345 change_exp (op->owner, victim->stats.exp, op->skill, 0); 2296 change_exp (op->owner, victim->stats.exp, op->skill, 0);
2346 victim->stats.exp = 0; 2297 victim->stats.exp = 0;
2347#if 0 2298#if 0
2348 /* No idea why these were all set to zero - if something 2299 /* No idea why these were all set to zero - if something
2349 * makes this creature agressive, he should still do damage. 2300 * makes this creature agressive, he should still do damage.
… …
2356 victim->attack_movement = RANDO2; 2307 victim->attack_movement = RANDO2;
2357 SET_FLAG (victim, FLAG_UNAGGRESSIVE); 2308 SET_FLAG (victim, FLAG_UNAGGRESSIVE);
2358 SET_FLAG (victim, FLAG_RUN_AWAY); 2309 SET_FLAG (victim, FLAG_RUN_AWAY);
2359 SET_FLAG (victim, FLAG_RANDOM_MOVE); 2310 SET_FLAG (victim, FLAG_RANDOM_MOVE);
2360 CLEAR_FLAG (victim, FLAG_MONSTER); 2311 CLEAR_FLAG (victim, FLAG_MONSTER);
2312
2361 if (victim->name) 2313 if (victim->name)
2362 {
2363 new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s no longer feels like fighting.", &victim->name); 2314 new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s no longer feels like fighting.", &victim->name);
2364 }
2365 } 2315 }
2366 } 2316 }
2367} 2317}
2368 2318
2369 2319

Diff Legend

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