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.17 by root, Tue Dec 12 21:39:57 2006 UTC vs.
Revision 1.99 by elmex, Tue Jan 13 13:29:57 2009 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The authors can be reached via e-mail at <crossfire@schmorp.de>
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>
27#ifndef __CEXTRACT__
28# include <sproto.h> 27#include <sproto.h>
29#endif
30#include <spells.h> 28#include <spells.h>
31#include <sounds.h> 29#include <sounds.h>
32 30
33/* cast_magic_storm: This is really used mostly for spell 31/* cast_magic_storm: This is really used mostly for spell
34 * fumbles at the like. tmp is the object to propogate. 32 * fumbles at the like. tmp is the object to propogate.
… …
37void 35void
38cast_magic_storm (object *op, object *tmp, int lvl) 36cast_magic_storm (object *op, object *tmp, int lvl)
39{ 37{
40 if (!tmp) 38 if (!tmp)
41 return; /* error */ 39 return; /* error */
40
42 tmp->level = op->level; 41 tmp->level = op->level;
43 tmp->x = op->x;
44 tmp->y = op->y;
45 tmp->range += lvl / 5; /* increase the area of destruction */ 42 tmp->range += lvl / 5; /* increase the area of destruction */
46 tmp->duration += lvl / 5; 43 tmp->duration += lvl / 5;
47 44
48 /* Put a cap on duration for this - if the player fails in their 45 /* Put a cap on duration for this - if the player fails in their
49 * apartment, don't want it to go on so long that it kills them 46 * apartment, don't want it to go on so long that it kills them
50 * multiple times. Also, damge already increases with level, 47 * multiple times. Also, damge already increases with level,
51 * so don't really need to increase the duration as much either. 48 * so don't really need to increase the duration as much either.
52 */ 49 */
53 if (tmp->duration >= 40) 50 if (tmp->duration >= 40)
54 tmp->duration = 40; 51 tmp->duration = 40;
52
55 tmp->stats.dam = lvl; /* nasty recoils! */ 53 tmp->stats.dam = lvl; /* nasty recoils! */
56 tmp->stats.maxhp = tmp->count; /* tract single parent */ 54 tmp->stats.maxhp = tmp->count; /* tract single parent */
57 insert_ob_in_map (tmp, op->map, op, 0);
58 55
56 tmp->insert_at (op, op);
59} 57}
60
61 58
62int 59int
63recharge (object *op, object *caster, object *spell_ob) 60recharge (object *op, object *caster, object *spell_ob)
64{ 61{
65 object *wand, *tmp; 62 object *wand, *tmp;
66 int ncharges; 63 int ncharges;
67 64
68 wand = find_marked_object (op); 65 wand = find_marked_object (op);
69 if (wand == NULL || wand->type != WAND) 66 if (!wand || wand->type != WAND)
70 { 67 {
71 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.");
72 return 0; 69 return 0;
73 } 70 }
74 if (!(random_roll (0, 3, op, PREFER_HIGH))) 71 if (!(random_roll (0, 3, op, PREFER_HIGH)))
75 { 72 {
76 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));
77 play_sound_map (op->map, op->x, op->y, SOUND_OB_EXPLODE); 74 op->play_sound (sound_find ("ob_explode"));
78 esrv_del_item (op->contr, wand->count);
79 wand->destroy (); 75 wand->destroy ();
80 tmp = get_archetype ("fireball"); 76 tmp = get_archetype ("fireball");
81 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;
78
82 if (!tmp->stats.dam) 79 if (!tmp->stats.dam)
83 tmp->stats.dam = 1; 80 tmp->stats.dam = 1;
81
84 tmp->stats.hp = tmp->stats.dam / 2; 82 tmp->stats.hp = tmp->stats.dam / 2;
83
85 if (tmp->stats.hp < 2) 84 if (tmp->stats.hp < 2)
86 tmp->stats.hp = 2; 85 tmp->stats.hp = 2;
87 tmp->x = op->x; 86
88 tmp->y = op->y; 87 tmp->insert_at (op);
89 insert_ob_in_map (tmp, op->map, NULL, 0);
90 return 1; 88 return 1;
91 } 89 }
92 90
93 ncharges = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)); 91 ncharges = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob));
92
94 if (wand->inv && wand->inv->level) 93 if (wand->inv && wand->inv->level)
95 ncharges /= wand->inv->level; 94 ncharges /= wand->inv->level;
96 else 95 else
97 { 96 {
98 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", query_name (wand)); 97 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", query_name (wand));
99 return 0; 98 return 0;
100 } 99 }
100
101 if (!ncharges) 101 if (!ncharges)
102 ncharges = 1; 102 ncharges = 1;
103 103
104 wand->stats.food += ncharges; 104 wand->stats.food += ncharges;
105 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand)); 105 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand));
106
106 if (wand->arch && QUERY_FLAG (&wand->arch->clone, FLAG_ANIMATE)) 107 if (wand->arch && QUERY_FLAG (wand->arch, FLAG_ANIMATE))
107 { 108 {
108 SET_FLAG (wand, FLAG_ANIMATE); 109 SET_FLAG (wand, FLAG_ANIMATE);
109 wand->speed = wand->arch->clone.speed; 110 wand->set_speed (wand->arch->speed);
110 update_ob_speed (wand);
111 } 111 }
112
112 return 1; 113 return 1;
113} 114}
114 115
115/* Create a missile (nonmagic - magic +4). Will either create bolts or arrows 116/* Create a missile (nonmagic - magic +4). Will either create bolts or arrows
116 * based on whether a crossbow or bow is equiped. If neither, it defaults to 117 * based on whether a crossbow or bow is equiped. If neither, it defaults to
… …
120 * great a plus, the default is used. 121 * great a plus, the default is used.
121 * 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
122 * 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
123 * create nonnmagic arrows, or even -1, etc... 124 * create nonnmagic arrows, or even -1, etc...
124 */ 125 */
125
126int 126int
127cast_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)
128{ 128{
129 int missile_plus = 0, bonus_plus = 0; 129 int bonus_plus = 0;
130 const char *missile_name; 130 const char *missile_name = "arrow";
131 object *tmp, *missile;
132 131
133 missile_name = "arrow";
134
135 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 132 for (object *tmp = op->inv; tmp; tmp = tmp->below)
136 if (tmp->type == BOW && QUERY_FLAG (tmp, FLAG_APPLIED)) 133 if (tmp->type == BOW && QUERY_FLAG (tmp, FLAG_APPLIED))
137 missile_name = tmp->race; 134 missile_name = tmp->race;
138 135
139 missile_plus = spell->stats.dam + SP_level_dam_adjust (caster, spell); 136 int missile_plus = spell->stats.dam + SP_level_dam_adjust (caster, spell);
140 137
141 if (archetype::find (missile_name) == NULL) 138 archetype *missile_arch = archetype::find (missile_name);
139
140 if (!missile_arch)
142 { 141 {
143 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);
144 return 0; 143 return 0;
145 } 144 }
146 145
147 missile = get_archetype (missile_name); 146 object *missile = missile_arch->instance ();
148 147
149 if (stringarg) 148 if (stringarg)
150 { 149 {
151 /* If it starts with a letter, presume it is a description */ 150 /* If it starts with a letter, presume it is a description */
152 if (isalpha (*stringarg)) 151 if (isalpha (*stringarg))
153 { 152 {
154 artifact *al = find_artifactlist (missile->type)->items; 153 artifact *al = find_artifactlist (missile->type)->items;
155 154
156 for (; al != NULL; al = al->next) 155 for (; al; al = al->next)
157 if (!strcasecmp (al->item->name, stringarg)) 156 if (!strcasecmp (al->item->name, stringarg))
158 break; 157 break;
159 158
160 if (!al) 159 if (!al)
161 { 160 {
… …
170 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);
171 return 0; 170 return 0;
172 } 171 }
173 172
174 give_artifact_abilities (missile, al->item); 173 give_artifact_abilities (missile, al->item);
175 /* 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 -
176 * 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
177 * the parsing of having to do both plus and type. 176 * the parsing of having to do both plus and type.
178 */ 177 */
179 bonus_plus = 1 + (al->item->value / 5); 178 bonus_plus = 1 + (al->item->value / 5);
180 missile_plus = 0; 179 missile_plus = 0;
181 } 180 }
182 else if (atoi (stringarg) < missile_plus) 181 else if (atoi (stringarg) < missile_plus)
183 missile_plus = atoi (stringarg); 182 missile_plus = atoi (stringarg);
184 } 183 }
185 184
186 if (missile_plus > 4) 185 missile_plus = clamp (missile_plus, -4, 4);
187 missile_plus = 4;
188 else if (missile_plus < -4)
189 missile_plus = -4;
190 186
191 missile->nrof = spell->duration + SP_level_duration_adjust (caster, spell); 187 missile->nrof = spell->duration + SP_level_duration_adjust (caster, spell);
192 missile->nrof -= 3 * (missile_plus + bonus_plus); 188 missile->nrof -= 3 * (missile_plus + bonus_plus);
193 189
194 if (missile->nrof < 1) 190 if (missile->nrof < 1)
… …
214{ 210{
215 int food_value; 211 int food_value;
216 archetype *at = NULL; 212 archetype *at = NULL;
217 object *new_op; 213 object *new_op;
218 214
219 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);
220 216
221 if (stringarg) 217 if (stringarg)
222 { 218 {
223 at = find_archetype_by_object_type_name (FOOD, stringarg); 219 at = find_archetype_by_object_type_name (FOOD, stringarg);
224 if (at == NULL) 220 if (at == NULL)
225 at = find_archetype_by_object_type_name (DRINK, stringarg); 221 at = find_archetype_by_object_type_name (DRINK, stringarg);
226 if (at == NULL || at->clone.stats.food > food_value) 222 if (at == NULL || at->stats.food > food_value)
227 stringarg = NULL; 223 stringarg = NULL;
228 } 224 }
229 225
230 if (!stringarg) 226 if (!stringarg)
231 { 227 {
… …
237 * We don't use flesh types because the weight values of those need 233 * We don't use flesh types because the weight values of those need
238 * to be altered from the donor. 234 * to be altered from the donor.
239 */ 235 */
240 236
241 /* We assume the food items don't have multiple parts */ 237 /* We assume the food items don't have multiple parts */
242 for (at_tmp = first_archetype; at_tmp != NULL; at_tmp = at_tmp->next) 238 for_all_archetypes (at_tmp)
243 { 239 {
244 if (at_tmp->clone.type == FOOD || at_tmp->clone.type == DRINK) 240 if (at_tmp->type == FOOD || at_tmp->type == DRINK)
245 { 241 {
246 /* Basically, if the food value is something that is creatable 242 /* Basically, if the food value is something that is creatable
247 * under the limits of the spell and it is higher than 243 * under the limits of the spell and it is higher than
248 * the item we have now, take it instead. 244 * the item we have now, take it instead.
249 */ 245 */
250 if (at_tmp->clone.stats.food <= food_value && (!at || at_tmp->clone.stats.food > at->clone.stats.food)) 246 if (at_tmp->stats.food <= food_value
247 && (!at
248 || at_tmp->stats.food > at->stats.food
249 || (at_tmp->stats.food == at->stats.food
250 && at_tmp->weight < at->weight)))
251 at = at_tmp; 251 at = at_tmp;
252 } 252 }
253 } 253 }
254 } 254 }
255
255 /* 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
256 * know 257 * know
257 */ 258 */
258 if (!at) 259 if (!at)
259 { 260 {
260 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough experience to create any food."); 261 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough experience to create any food.");
261 return 0; 262 return 0;
262 } 263 }
263 264
264 food_value /= at->clone.stats.food; 265 food_value /= at->stats.food;
265 new_op = arch_to_object (at); 266 new_op = arch_to_object (at);
266 new_op->nrof = food_value; 267 new_op->nrof = food_value;
267 268
268 new_op->value = 0; 269 new_op->value = 0;
269 if (new_op->nrof < 1) 270 if (new_op->nrof < 1)
… …
278{ 279{
279 int r, mflags, maxrange; 280 int r, mflags, maxrange;
280 object *tmp; 281 object *tmp;
281 maptile *m; 282 maptile *m;
282 283
283
284 if (!dir) 284 if (!dir)
285 { 285 {
286 examine_monster (op, op); 286 examine_monster (op, op);
287 return 1; 287 return 1;
288 } 288 }
289
289 maxrange = spell_ob->range + SP_level_range_adjust (caster, spell_ob); 290 maxrange = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
290 for (r = 1; r < maxrange; r++) 291 for (r = 1; r < maxrange; r++)
291 { 292 {
292 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];
293 294
… …
300 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (mflags & P_NO_MAGIC)) 301 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (mflags & P_NO_MAGIC))
301 { 302 {
302 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic."); 303 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic.");
303 return 0; 304 return 0;
304 } 305 }
306
305 if (mflags & P_IS_ALIVE) 307 if (mflags & P_IS_ALIVE)
306 { 308 {
307 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)
308 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)))
309 { 311 {
310 new_draw_info (NDI_UNIQUE, 0, op, "You detect something."); 312 new_draw_info (NDI_UNIQUE, 0, op, "You detect something.");
311 if (tmp->head != NULL) 313 if (tmp->head != NULL)
312 tmp = tmp->head; 314 tmp = tmp->head;
313 examine_monster (op, tmp); 315 examine_monster (op, tmp);
314 return 1; 316 return 1;
315 } 317 }
316 } 318 }
317 } 319 }
320
318 new_draw_info (NDI_UNIQUE, 0, op, "You detect nothing."); 321 new_draw_info (NDI_UNIQUE, 0, op, "You detect nothing.");
319 return 1; 322 return 1;
320} 323}
321
322 324
323/* This checks to see if 'pl' is invisible to 'mon'. 325/* This checks to see if 'pl' is invisible to 'mon'.
324 * does race check, undead check, etc 326 * does race check, undead check, etc
325 * Returns TRUE if mon can't see pl, false 327 * Returns TRUE if mon can't see pl, false
326 * otherwise. This doesn't check range, walls, etc. It 328 * otherwise. This doesn't check range, walls, etc. It
… …
328 * pl is invisible. 330 * pl is invisible.
329 */ 331 */
330int 332int
331makes_invisible_to (object *pl, object *mon) 333makes_invisible_to (object *pl, object *mon)
332{ 334{
333
334 if (!pl->invisible) 335 if (!pl->invisible)
335 return 0; 336 return 0;
337
336 if (pl->type == PLAYER) 338 if (pl->type == PLAYER)
337 { 339 {
338 /* If race isn't set, then invisible unless it is undead */ 340 /* If race isn't set, then invisible unless it is undead */
339 if (!pl->contr->invis_race) 341 if (!pl->contr->invis_race)
340 { 342 {
341 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 343 if (QUERY_FLAG (mon, FLAG_UNDEAD))
342 return 0; 344 return 0;
345
343 return 1; 346 return 1;
344 } 347 }
348
345 /* invis_race is set if we get here */ 349 /* invis_race is set if we get here */
346 if (!strcmp (pl->contr->invis_race, "undead") && is_true_undead (mon)) 350 if (pl->contr->invis_race == shstr_undead && is_true_undead (mon))
347 return 1; 351 return 1;
352
348 /* No race, can't be invisible to it */ 353 /* No race, can't be invisible to it */
349 if (!mon->race) 354 if (!mon->race)
350 return 0; 355 return 0;
356
351 if (strstr (mon->race, pl->contr->invis_race)) 357 if (mon->race.contains (pl->contr->invis_race))
352 return 1; 358 return 1;
359
353 /* Nothing matched above, return 0 */ 360 /* Nothing matched above, return 0 */
354 return 0; 361 return 0;
355 } 362 }
356 else 363 else
357 { 364 {
… …
370 * normal applies. 377 * normal applies.
371 */ 378 */
372int 379int
373cast_invisible (object *op, object *caster, object *spell_ob) 380cast_invisible (object *op, object *caster, object *spell_ob)
374{ 381{
375 object *tmp;
376
377 if (op->invisible > 1000) 382 if (op->invisible > 1000)
378 { 383 {
379 new_draw_info (NDI_UNIQUE, 0, op, "You can not extend the duration of your invisibility any further"); 384 new_draw_info (NDI_UNIQUE, 0, op, "You can not extend the duration of your invisibility any further");
380 return 0; 385 return 0;
381 } 386 }
… …
397 else 402 else
398 op->contr->tmp_invis = 1; 403 op->contr->tmp_invis = 1;
399 404
400 op->contr->hidden = 0; 405 op->contr->hidden = 0;
401 } 406 }
407
402 if (makes_invisible_to (op, op)) 408 if (makes_invisible_to (op, op))
403 new_draw_info (NDI_UNIQUE, 0, op, "You can't see your hands!"); 409 new_draw_info (NDI_UNIQUE, 0, op, "You can't see your hands!");
404 else 410 else
405 new_draw_info (NDI_UNIQUE, 0, op, "You feel more transparent!"); 411 new_draw_info (NDI_UNIQUE, 0, op, "You feel more transparent!");
406 412
407 update_object (op, UP_OBJ_FACE); 413 update_object (op, UP_OBJ_CHANGE);
408 414
409 /* Only search the active objects - only these should actually do 415 /* Only search the active objects - only these should actually do
410 * harm to the player. 416 * harm to the player.
411 */ 417 */
412 for (tmp = active_objects; tmp != NULL; tmp = tmp->active_next) 418 for_all_actives (tmp)
413 if (tmp->enemy == op) 419 if (tmp->enemy == op)
414 tmp->enemy = NULL; 420 tmp->enemy = 0;
421
415 return 1; 422 return 1;
416} 423}
417 424
418/* earth to dust spell. Basically destroys earthwalls in the area. 425/* earth to dust spell. Basically destroys earthwalls in the area.
419 */ 426 */
… …
440 447
441 if (mflags & P_OUT_OF_MAP) 448 if (mflags & P_OUT_OF_MAP)
442 continue; 449 continue;
443 450
444 // earth to dust tears down everything that can be teared down 451 // earth to dust tears down everything that can be teared down
445 for (tmp = get_map_ob (m, sx, sy); tmp != NULL; tmp = next) 452 for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = next)
446 { 453 {
447 next = tmp->above; 454 next = tmp->above;
448 if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN)) 455 if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN))
449 hit_player (tmp, 9998, op, AT_PHYSICAL, 0); 456 hit_player (tmp, 9998, op, AT_PHYSICAL, 0);
450 } 457 }
451 } 458 }
459
452 return 1; 460 return 1;
453} 461}
454
455 462
456void 463void
457execute_word_of_recall (object *op) 464execute_word_of_recall (object *op)
458{ 465{
459 object *wor = op; 466 if (object *pl = op->in_player ())
460 467 {
461 while (op != NULL && op->type != PLAYER) 468 if (pl->ms ().flags () & P_NO_CLERIC && !QUERY_FLAG (pl, FLAG_WIZCAST))
462 op = op->env;
463
464 if (op != NULL && op->map)
465 if ((get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_CLERIC) && (!QUERY_FLAG (op, FLAG_WIZCAST)))
466 new_draw_info (NDI_UNIQUE, 0, op, "You feel something fizzle inside you."); 469 new_draw_info (NDI_UNIQUE, 0, pl, "You feel something fizzle inside you.");
467 else 470 else
468 enter_exit (op, wor); 471 pl->player_goto (op->slaying, op->stats.hp, op->stats.sp);
472 }
469 473
470 wor->destroy (); 474 op->destroy ();
471} 475}
472 476
473/* Word of recall causes the player to return 'home'. 477/* Word of recall causes the player to return 'home'.
474 * we put a force into the player object, so that there is a 478 * we put a force into the player object, so that there is a
475 * time delay effect. 479 * time delay effect.
… …
488 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.");
489 return 1; 493 return 1;
490 } 494 }
491 495
492 dummy = get_archetype (FORCE_NAME); 496 dummy = get_archetype (FORCE_NAME);
493 if (dummy == NULL) 497
498 if (!dummy)
494 { 499 {
495 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 500 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
496 LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n"); 501 LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n");
497 return 0; 502 return 0;
498 } 503 }
504
499 time = spell_ob->duration - SP_level_duration_adjust (caster, spell_ob); 505 time = spell_ob->duration - SP_level_duration_adjust (caster, spell_ob);
500 if (time < 1) 506 if (time < 1)
501 time = 1; 507 time = 1;
502 508
503 /* value of speed really doesn't make much difference, as long as it is 509 /* value of speed really doesn't make much difference, as long as it is
504 * positive. Lower value may be useful so that the problem doesn't 510 * positive. Lower value may be useful so that the problem doesn't
505 * do anything really odd if it say a -1000 or something. 511 * do anything really odd if it say a -1000 or something.
506 */ 512 */
507 dummy->speed = 0.002; 513 dummy->set_speed (0.002);
508 update_ob_speed (dummy);
509 dummy->speed_left = -dummy->speed * time; 514 dummy->speed_left = -dummy->speed * time;
510 dummy->type = SPELL_EFFECT; 515 dummy->type = SPELL_EFFECT;
511 dummy->subtype = SP_WORD_OF_RECALL; 516 dummy->subtype = SP_WORD_OF_RECALL;
512 517
513 /* If we could take advantage of enter_player_savebed() here, it would be 518 /* If we could take advantage of enter_player_savebed() here, it would be
514 * nice, but until the map load fails, we can't. 519 * nice, but until the map load fails, we can't.
515 */ 520 */
516 EXIT_PATH (dummy) = op->contr->savebed_map; 521 EXIT_PATH (dummy) = op->contr->savebed_map;
517 EXIT_X (dummy) = op->contr->bed_x; 522 EXIT_X (dummy) = op->contr->bed_x;
518 EXIT_Y (dummy) = op->contr->bed_y; 523 EXIT_Y (dummy) = op->contr->bed_y;
519 524
520 (void) insert_ob_in_ob (dummy, op); 525 op->insert (dummy);
526
521 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you."); 527 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you.");
528
522 return 1; 529 return 1;
523} 530}
524 531
525/* cast_wonder 532/* cast_wonder
526 * wonder is really just a spell that will likely cast another 533 * wonder is really just a spell that will likely cast another
… …
556 return cast_spell (op, caster, dir, newspell, NULL); 563 return cast_spell (op, caster, dir, newspell, NULL);
557 } 564 }
558 return 1; 565 return 1;
559} 566}
560 567
561
562int 568int
563perceive_self (object *op) 569perceive_self (object *op)
564{ 570{
565 char *cp = describe_item (op, op), buf[MAX_BUF]; 571 const char *cp = describe_item (op, op);
566 archetype *at = archetype::find (ARCH_DEPLETION); 572 archetype *at = archetype::find (ARCH_DEPLETION);
567 object *tmp;
568 int i;
569 573
574 dynbuf_text buf;
575
576 if (player *pl = op->contr)
577 if (object *race = archetype::find (op->race))
578 buf << " - You are a G<male|female> " << &race->name << ".\n";
579
570 tmp = find_god (determine_god (op)); 580 if (object *god = find_god (determine_god (op)))
571 if (tmp) 581 buf << " - You worship " << &god->name << ".\n";
572 new_draw_info_format (NDI_UNIQUE, 0, op, "You worship %s", &tmp->name);
573 else 582 else
574 new_draw_info (NDI_UNIQUE, 0, op, "You worship no god"); 583 buf << " - You worship no god.\n";
575 584
576 tmp = present_arch_in_ob (at, op); 585 object *tmp = present_arch_in_ob (at, op);
577 586
578 if (*cp == '\0' && tmp == NULL) 587 if (*cp == '\0' && !tmp)
579 new_draw_info (NDI_UNIQUE, 0, op, "You feel very mundane"); 588 buf << " - You feel very mundane. ";
580 else 589 else
581 { 590 {
582 new_draw_info (NDI_UNIQUE, 0, op, "You have:"); 591 buf << " - You have: " << cp << ".\n";
583 new_draw_info (NDI_UNIQUE, 0, op, cp); 592
584 if (tmp != NULL) 593 if (tmp)
585 {
586 for (i = 0; i < NUM_STATS; i++) 594 for (int i = 0; i < NUM_STATS; i++)
587 { 595 if (tmp->stats.stat (i) < 0)
588 if (get_attr_value (&tmp->stats, i) < 0) 596 buf.printf (" - Your %s is depleted by %d.\n", statname[i], -tmp->stats.stat (i));
589 {
590 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is depleted by %d", statname[i], -(get_attr_value (&tmp->stats, i)));
591 }
592 }
593 }
594 } 597 }
595 598
596 if (is_dragon_pl (op)) 599 if (is_dragon_pl (op))
597 {
598 /* now grab the 'dragon_ability'-force from the player's inventory */ 600 /* now grab the 'dragon_ability'-force from the player's inventory */
599 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 601 for (tmp = op->inv; tmp; tmp = tmp->below)
600 { 602 {
601 if (tmp->type == FORCE && !strcmp (tmp->arch->name, "dragon_ability_force")) 603 if (tmp->type == FORCE && tmp->arch->archname == shstr_dragon_ability_force)
602 { 604 {
603 if (tmp->stats.exp == 0) 605 if (tmp->stats.exp == 0)
604 {
605 sprintf (buf, "Your metabolism isn't focused on anything."); 606 buf << " - Your metabolism isn't focused on anything.\n";
606 }
607 else 607 else
608 {
609 sprintf (buf, "Your metabolism is focused on %s.", change_resist_msg[tmp->stats.exp]); 608 buf << " - Your metabolism is focused on " << change_resist_msg[tmp->stats.exp] << ".\n";
610 } 609
611 new_draw_info (NDI_UNIQUE, 0, op, buf);
612 break; 610 break;
613 } 611 }
614 } 612 }
615 } 613
614 buf << '\0'; // zero-terminate
615
616 new_draw_info (NDI_UNIQUE, 0, op, buf.linearise ());
617
616 return 1; 618 return 1;
617} 619}
618
619/* int cast_create_town_portal (object *op, object *caster, int dir)
620 *
621 * This function cast the spell of town portal for op
622 *
623 * The spell operates in two passes. During the first one a place
624 * is marked as a destination for the portal. During the second one,
625 * 2 portals are created, one in the position the player cast it and
626 * one in the destination place. The portal are synchronized and 2 forces
627 * are inserted in the player to destruct the portal next time player
628 * creates a new portal pair.
629 * This spell has a side effect that it allows people to meet each other
630 * in a permanent, private, appartements by making a town portal from it
631 * to the town or another public place. So, check if the map is unique and if
632 * so return an error
633 *
634 * Code by Tchize (david.delbecq@usa.net)
635 */
636int
637cast_create_town_portal (object *op, object *caster, object *spell, int dir)
638{
639 object *dummy, *force, *old_force, *tmp;
640 archetype *perm_portal;
641 char portal_name[1024], portal_message[1024];
642 sint16 exitx, exity;
643 maptile *exitmap;
644 int op_level;
645
646
647 /* Check to see if the map the player is currently on is a per player unique
648 * map. This can be determined in that per player unique maps have the
649 * full pathname listed.
650 */
651 if (!strncmp (op->map->path, settings.localdir, strlen (settings.localdir)) && settings.create_home_portals != TRUE)
652 {
653 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You can't cast that here.\n");
654 return 0;
655 }
656
657 /* The first thing to do is to check if we have a marked destination
658 * dummy is used to make a check inventory for the force
659 */
660 dummy = arch_to_object (spell->other_arch);
661 if (dummy == NULL)
662 {
663 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
664 LOG (llevError, "object::create failed (force in cast_create_town_portal for %s!\n", &op->name);
665 return 0;
666 }
667 force = check_inv_recursive (op, dummy);
668
669 if (force == NULL)
670 {
671 /* Here we know there is no destination marked up.
672 * We have 2 things to do:
673 * 1. Mark the destination in the player inventory.
674 * 2. Let the player know it worked.
675 */
676 dummy->name = op->map->path;
677 EXIT_X (dummy) = op->x;
678 EXIT_Y (dummy) = op->y;
679 insert_ob_in_ob (dummy, op);
680 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You fix this place in your mind.\nYou feel you are able to come here from anywhere.");
681 return 1;
682 }
683
684 dummy->destroy ();
685
686 /* Here we know where the town portal should go to
687 * We should kill any existing portal associated with the player.
688 * Than we should create the 2 portals.
689 * For each of them, we need:
690 * - To create the portal with the name of the player+destination map
691 * - set the owner of the town portal
692 * - To mark the position of the portal in the player's inventory
693 * for easier destruction.
694 *
695 * The mark works has follow:
696 * slaying: Existing town portal
697 * hp, sp : x & y of the associated portal
698 * name : name of the portal
699 * race : map the portal is in
700 */
701
702 /* First step: killing existing town portals */
703 dummy = get_archetype (spell->race);
704 if (dummy == NULL)
705 {
706 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
707 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
708 return 0;
709 }
710 perm_portal = archetype::find (spell->slaying);
711
712 /* To kill a town portal, we go trough the player's inventory,
713 * for each marked portal in player's inventory,
714 * -We try load the associated map (if impossible, consider the portal destructed)
715 * -We find any portal in the specified location.
716 * If it has the good name, we destruct it.
717 * -We destruct the force indicating that portal.
718 */
719 while ((old_force = check_inv_recursive (op, dummy)))
720 {
721 exitx = EXIT_X (old_force);
722 exity = EXIT_Y (old_force);
723 LOG (llevDebug, "Trying to kill a portal in %s (%d,%d)\n", &old_force->race, exitx, exity);
724
725 if (!strncmp (old_force->race, settings.localdir, strlen (settings.localdir)))
726 exitmap = ready_map_name (old_force->race, MAP_PLAYER_UNIQUE);
727 else
728 exitmap = ready_map_name (old_force->race, 0);
729
730 if (exitmap)
731 {
732 tmp = present_arch (perm_portal, exitmap, exitx, exity);
733 while (tmp)
734 {
735 if (tmp->name == old_force->name)
736 {
737 tmp->destroy ();
738 break;
739 }
740
741 tmp = tmp->above;
742 }
743 }
744
745 old_force->destroy ();
746 LOG (llevDebug, "\n");
747 }
748
749 dummy->destroy ();
750
751 /* Creating the portals.
752 * The very first thing to do is to ensure
753 * access to the destination map.
754 * If we can't, don't fizzle. Simply warn player.
755 * This ensure player pays his mana for the spell
756 * because HE is responsible of forgotting.
757 * 'force' is the destination of the town portal, which we got
758 * from the players inventory above.
759 */
760
761 /* Ensure exit map is loaded */
762 if (!strncmp (force->name, settings.localdir, strlen (settings.localdir)))
763 exitmap = ready_map_name (force->name, MAP_PLAYER_UNIQUE);
764 else
765 exitmap = ready_map_name (force->name, 0);
766
767 /* If we were unable to load (ex. random map deleted), warn player */
768 if (exitmap == NULL)
769 {
770 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Something strange happens.\nYou can't remember where to go!?");
771 force->destroy ();
772 return 1;
773 }
774
775 op_level = caster_level (caster, spell);
776 if (op_level < 15)
777 snprintf (portal_message, 1024,
778 "\nThe air moves around you and\na huge smell of ammonia\nsurounds you as you pass\nthrough %s's tiny portal\nPouah!\n",
779 &op->name);
780 else if (op_level < 30)
781 snprintf (portal_message, 1024,
782 "\n%s's portal smells of ozone.\nYou do a lot of movements and finally pass\nthrough the small hole in the air\n", &op->name);
783 else if (op_level < 60)
784 snprintf (portal_message, 1024, "\nA shining door opens in the air in front of you,\nshowing you the path to another place.\n");
785 else
786 snprintf (portal_message, 1024, "\nAs you walk through %s's portal, flowers come out\nfrom the ground around you.\nYou feel awed.\n",
787 &op->name);
788
789 /* Create a portal in front of player
790 * dummy contain the portal and
791 * force contain the track to kill it later
792 */
793
794 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &force->name);
795 dummy = get_archetype (spell->slaying); /*The portal */
796 if (dummy == NULL)
797 {
798 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
799 LOG (llevError, "object::create failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name);
800 return 0;
801 }
802 EXIT_PATH (dummy) = force->name;
803 EXIT_X (dummy) = EXIT_X (force);
804 EXIT_Y (dummy) = EXIT_Y (force);
805 dummy->name = dummy->name_pl = portal_name;
806 dummy->msg = portal_message;
807 dummy->race = op->name; /*Save the owner of the portal */
808 cast_create_obj (op, caster, dummy, 0);
809
810 /* Now we need to to create a town portal marker inside the player
811 * object, so on future castings, we can know that he has an active
812 * town portal.
813 */
814 tmp = get_archetype (spell->race);
815 if (tmp == NULL)
816 {
817 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
818 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
819 return 0;
820 }
821 tmp->race = op->map->path;
822 tmp->name = portal_name;
823 EXIT_X (tmp) = dummy->x;
824 EXIT_Y (tmp) = dummy->y;
825 insert_ob_in_ob (tmp, op);
826
827 /* Create a portal in the destination map
828 * dummy contain the portal and
829 * force the track to kill it later
830 * the 'force' variable still contains the 'reminder' of
831 * where this portal goes to.
832 */
833 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, op->map->path);
834 dummy = get_archetype (spell->slaying); /*The portal */
835 if (dummy == NULL)
836 {
837 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
838 LOG (llevError, "object::create failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name);
839 return 0;
840 }
841 EXIT_PATH (dummy) = op->map->path;
842 EXIT_X (dummy) = op->x;
843 EXIT_Y (dummy) = op->y;
844 dummy->name = dummy->name_pl = portal_name;
845 dummy->msg = portal_message;
846 dummy->x = EXIT_X (force);
847 dummy->y = EXIT_Y (force);
848 dummy->race = op->name; /*Save the owner of the portal */
849 insert_ob_in_map (dummy, exitmap, op, 0);
850
851 /* Now we create another town portal marker that
852 * points back to the one we just made
853 */
854 tmp = get_archetype (spell->race);
855 if (tmp == NULL)
856 {
857 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
858 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
859 return 0;
860 }
861 tmp->race = force->name;
862 tmp->name = portal_name;
863 EXIT_X (tmp) = dummy->x;
864 EXIT_Y (tmp) = dummy->y;
865 insert_ob_in_ob (tmp, op);
866
867 /* Describe the player what happened
868 */
869 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You see air moving and showing you the way home.");
870 force->destroy ();
871
872 return 1;
873}
874
875 620
876/* This creates magic walls. Really, it can create most any object, 621/* This creates magic walls. Really, it can create most any object,
877 * within some reason. 622 * within some reason.
878 */ 623 */
879
880int 624int
881magic_wall (object *op, object *caster, int dir, object *spell_ob) 625magic_wall (object *op, object *caster, int dir, object *spell_ob)
882{ 626{
883 object *tmp, *tmp2; 627 object *tmp;
884 int i, posblocked, negblocked, maxrange; 628 int i, posblocked, negblocked, maxrange;
885 sint16 x, y; 629 sint16 x, y;
886 maptile *m; 630 maptile *m;
887 const char *name; 631 const char *name;
888 archetype *at; 632 archetype *at;
… …
896 else 640 else
897 { 641 {
898 x = op->x + freearr_x[dir]; 642 x = op->x + freearr_x[dir];
899 y = op->y + freearr_y[dir]; 643 y = op->y + freearr_y[dir];
900 } 644 }
645
901 m = op->map; 646 m = op->map;
902 647
903 if ((spell_ob->move_block || x != op->x || y != op->y) && 648 if ((spell_ob->move_block || x != op->x || y != op->y) &&
904 (get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE) || 649 (get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE) ||
905 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) == spell_ob->move_block))) 650 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) == spell_ob->move_block)))
906 { 651 {
907 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 652 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
908 return 0; 653 return 0;
909 } 654 }
655
910 if (spell_ob->other_arch) 656 if (spell_ob->other_arch)
911 {
912 tmp = arch_to_object (spell_ob->other_arch); 657 tmp = arch_to_object (spell_ob->other_arch);
913 }
914 else if (spell_ob->race) 658 else if (spell_ob->race)
915 { 659 {
916 char buf1[MAX_BUF]; 660 char buf1[MAX_BUF];
917 661
918 sprintf (buf1, spell_ob->race, dir); 662 sprintf (buf1, spell_ob->race, dir);
… …
921 { 665 {
922 LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1); 666 LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1);
923 new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken."); 667 new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken.");
924 return 0; 668 return 0;
925 } 669 }
670
926 tmp = arch_to_object (at); 671 tmp = arch_to_object (at);
927 } 672 }
928 else 673 else
929 { 674 {
930 LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name); 675 LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name);
… …
940 } 685 }
941 else if (QUERY_FLAG (tmp, FLAG_ALIVE)) 686 else if (QUERY_FLAG (tmp, FLAG_ALIVE))
942 { 687 {
943 tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 688 tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
944 tmp->stats.maxhp = tmp->stats.hp; 689 tmp->stats.maxhp = tmp->stats.hp;
945 set_owner (tmp, op);
946 set_spell_skill (op, caster, spell_ob, tmp);
947 } 690 }
691
948 if (QUERY_FLAG (spell_ob, FLAG_IS_USED_UP) || QUERY_FLAG (tmp, FLAG_IS_USED_UP)) 692 if (QUERY_FLAG (spell_ob, FLAG_IS_USED_UP) || QUERY_FLAG (tmp, FLAG_IS_USED_UP))
949 { 693 {
950 tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 694 tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
951 SET_FLAG (tmp, FLAG_IS_USED_UP); 695 SET_FLAG (tmp, FLAG_IS_USED_UP);
952 } 696 }
697
953 if (QUERY_FLAG (spell_ob, FLAG_TEAR_DOWN)) 698 if (QUERY_FLAG (spell_ob, FLAG_TEAR_DOWN))
954 { 699 {
955 tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 700 tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
956 tmp->stats.maxhp = tmp->stats.hp; 701 tmp->stats.maxhp = tmp->stats.hp;
957 SET_FLAG (tmp, FLAG_TEAR_DOWN); 702 SET_FLAG (tmp, FLAG_TEAR_DOWN);
958 SET_FLAG (tmp, FLAG_ALIVE); 703 SET_FLAG (tmp, FLAG_ALIVE);
959 } 704 }
960 705
961 /* This can't really hurt - if the object doesn't kill anything, 706 /* This can't really hurt - if the object doesn't kill anything,
962 * these fields just won't be used. 707 * these fields just won't be used. Do not set the owner for
708 * earthwalls, though, so they survive restarts.
963 */ 709 */
964 set_owner (tmp, op); 710 if (tmp->type != EARTHWALL) //TODO
711 tmp->set_owner (op);
712
965 set_spell_skill (op, caster, spell_ob, tmp); 713 set_spell_skill (op, caster, spell_ob, tmp);
966 tmp->x = x;
967 tmp->y = y;
968 tmp->level = caster_level (caster, spell_ob) / 2; 714 tmp->level = casting_level (caster, spell_ob) / 2;
969 715
970 name = tmp->name; 716 name = tmp->name;
971 if ((tmp = insert_ob_in_map (tmp, m, op, 0)) == NULL) 717 if (!(tmp = m->insert (tmp, x, y, op)))
972 { 718 {
973 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name); 719 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name);
974 return 0; 720 return 0;
975 } 721 }
722
976 /* If this is a spellcasting wall, need to insert the spell object */ 723 /* If this is a spellcasting wall, need to insert the spell object */
977 if (tmp->other_arch && tmp->other_arch->clone.type == SPELL) 724 if (tmp->other_arch && tmp->other_arch->type == SPELL)
978 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp); 725 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp);
979 726
980 /* This code causes the wall to extend some distance in 727 /* This code causes the wall to extend some distance in
981 * each direction, or until an obstruction is encountered. 728 * each direction, or until an obstruction is encountered.
982 * posblocked and negblocked help determine how far the 729 * posblocked and negblocked help determine how far the
… …
998 m = tmp->map; 745 m = tmp->map;
999 746
1000 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) && 747 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) &&
1001 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !posblocked) 748 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !posblocked)
1002 { 749 {
1003 tmp2 = object::create (); 750 object *tmp2 = tmp->clone ();
1004 tmp->copy_to (tmp2); 751 m->insert (tmp2, x, y, op);
1005 tmp2->x = x; 752
1006 tmp2->y = y;
1007 insert_ob_in_map (tmp2, m, op, 0);
1008 /* If this is a spellcasting wall, need to insert the spell object */ 753 /* If this is a spellcasting wall, need to insert the spell object */
1009 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 754 if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
1010 insert_ob_in_ob (arch_to_object (tmp2->other_arch), tmp2); 755 tmp2->insert (arch_to_object (tmp2->other_arch));
1011 756
1012 } 757 }
1013 else 758 else
1014 posblocked = 1; 759 posblocked = 1;
1015 760
… …
1018 m = tmp->map; 763 m = tmp->map;
1019 764
1020 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) && 765 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) &&
1021 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !negblocked) 766 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !negblocked)
1022 { 767 {
1023 tmp2 = object::create (); 768 object *tmp2 = tmp->clone ();
1024 tmp->copy_to (tmp2); 769 m->insert (tmp2, x, y, op);
1025 tmp2->x = x; 770
1026 tmp2->y = y;
1027 insert_ob_in_map (tmp2, m, op, 0);
1028 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 771 if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
1029 insert_ob_in_ob (arch_to_object (tmp2->other_arch), tmp2); 772 tmp2->insert (arch_to_object (tmp2->other_arch));
1030 } 773 }
1031 else 774 else
1032 negblocked = 1; 775 negblocked = 1;
1033 } 776 }
1034 777
… …
1083 { 826 {
1084 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n"); 827 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n");
1085 op->contr->count = 0; 828 op->contr->count = 0;
1086 return 0; 829 return 0;
1087 } 830 }
831
1088 op->contr->count = 0; 832 op->contr->count = 0;
1089 833
1090 /* Remove code that puts player on random space on maps. IMO, 834 /* Remove code that puts player on random space on maps. IMO,
1091 * a lot of maps probably have areas the player should not get to, 835 * a lot of maps probably have areas the player should not get to,
1092 * but may not be marked as NO_MAGIC (as they may be bounded 836 * but may not be marked as NO_MAGIC (as they may be bounded
… …
1141 return 0; 885 return 0;
1142 } 886 }
1143 } 887 }
1144 888
1145 /* Actually move the player now */ 889 /* Actually move the player now */
1146 op->remove (); 890 if (!(op = op->map->insert (op, op->x + freearr_x[dir] * dist, op->y + freearr_y[dir] * dist, op)))
1147 op->x += freearr_x[dir] * dist;
1148 op->y += freearr_y[dir] * dist;
1149 if ((op = insert_ob_in_map (op, op->map, op, 0)) == NULL)
1150 return 1; 891 return 1;
1151 892
1152 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 */
1153 return 1; 894 return 1;
1154} 895}
1155
1156 896
1157/* cast_heal: Heals something. 897/* cast_heal: Heals something.
1158 * op is the caster. 898 * op is the caster.
1159 * dir is the direction he is casting it in. 899 * dir is the direction he is casting it in.
1160 * spell is the spell object. 900 * spell is the spell object.
… …
1167 object *poison; 907 object *poison;
1168 int heal = 0, success = 0; 908 int heal = 0, success = 0;
1169 909
1170 tmp = find_target_for_friendly_spell (op, dir); 910 tmp = find_target_for_friendly_spell (op, dir);
1171 911
1172 if (tmp == NULL) 912 if (!tmp)
1173 return 0; 913 return 0;
1174 914
1175 /* Figure out how many hp this spell might cure. 915 /* Figure out how many hp this spell might cure.
1176 * could be zero if this spell heals effects, not damage. 916 * could be zero if this spell heals effects, not damage.
1177 */ 917 */
… …
1180 heal += random_roll (spell->stats.hp, 6, op, PREFER_HIGH) + spell->stats.hp; 920 heal += random_roll (spell->stats.hp, 6, op, PREFER_HIGH) + spell->stats.hp;
1181 921
1182 if (heal) 922 if (heal)
1183 { 923 {
1184 if (tmp->stats.hp >= tmp->stats.maxhp) 924 if (tmp->stats.hp >= tmp->stats.maxhp)
1185 {
1186 new_draw_info (NDI_UNIQUE, 0, tmp, "You are already fully healed."); 925 new_draw_info (NDI_UNIQUE, 0, tmp, "You are already fully healed.");
1187 }
1188 else 926 else
1189 { 927 {
1190 /* See how many points we actually heal. Instead of messages 928 /* See how many points we actually heal. Instead of messages
1191 * based on type of spell, we instead do messages based 929 * based on type of spell, we instead do messages based
1192 * on amount of damage healed. 930 * on amount of damage healed.
1193 */ 931 */
1194 if (heal > (tmp->stats.maxhp - tmp->stats.hp)) 932 if (heal > tmp->stats.maxhp - tmp->stats.hp)
1195 heal = tmp->stats.maxhp - tmp->stats.hp; 933 heal = tmp->stats.maxhp - tmp->stats.hp;
934
1196 tmp->stats.hp += heal; 935 tmp->stats.hp += heal;
1197 936
1198 if (tmp->stats.hp >= tmp->stats.maxhp) 937 if (tmp->stats.hp >= tmp->stats.maxhp)
1199 {
1200 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel just fine!"); 938 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel just fine!");
1201 }
1202 else if (heal > 50) 939 else if (heal > 50)
1203 {
1204 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds close!"); 940 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds close!");
1205 }
1206 else if (heal > 25) 941 else if (heal > 25)
1207 {
1208 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds mostly close."); 942 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds mostly close.");
1209 }
1210 else if (heal > 10) 943 else if (heal > 10)
1211 {
1212 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds start to fade."); 944 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds start to fade.");
1213 }
1214 else 945 else
1215 {
1216 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds start to close."); 946 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds start to close.");
1217 } 947
1218 success = 1; 948 success = 1;
1219 } 949 }
1220 } 950 }
951
1221 if (spell->attacktype & AT_DISEASE) 952 if (spell->attacktype & AT_DISEASE)
1222 if (cure_disease (tmp, op)) 953 if (cure_disease (tmp, op, spell))
1223 success = 1; 954 success = 1;
1224 955
1225 if (spell->attacktype & AT_POISON) 956 if (spell->attacktype & AT_POISON)
1226 { 957 {
1227 at = archetype::find ("poisoning"); 958 at = archetype::find ("poisoning");
… …
1231 success = 1; 962 success = 1;
1232 new_draw_info (NDI_UNIQUE, 0, tmp, "Your body feels cleansed"); 963 new_draw_info (NDI_UNIQUE, 0, tmp, "Your body feels cleansed");
1233 poison->stats.food = 1; 964 poison->stats.food = 1;
1234 } 965 }
1235 } 966 }
967
1236 if (spell->attacktype & AT_CONFUSION) 968 if (spell->attacktype & AT_CONFUSION)
1237 { 969 {
1238 poison = present_in_ob_by_name (FORCE, "confusion", tmp); 970 poison = present_in_ob_by_name (FORCE, "confusion", tmp);
1239 if (poison) 971 if (poison)
1240 { 972 {
1241 success = 1; 973 success = 1;
1242 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 974 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
1243 poison->duration = 1; 975 poison->duration = 1;
1244 } 976 }
1245 } 977 }
978
1246 if (spell->attacktype & AT_BLIND) 979 if (spell->attacktype & AT_BLIND)
1247 { 980 {
1248 at = archetype::find ("blindness"); 981 at = archetype::find ("blindness");
1249 poison = present_arch_in_ob (at, tmp); 982 poison = present_arch_in_ob (at, tmp);
1250 if (poison) 983 if (poison)
… …
1252 success = 1; 985 success = 1;
1253 new_draw_info (NDI_UNIQUE, 0, tmp, "Your vision begins to return."); 986 new_draw_info (NDI_UNIQUE, 0, tmp, "Your vision begins to return.");
1254 poison->stats.food = 1; 987 poison->stats.food = 1;
1255 } 988 }
1256 } 989 }
990
1257 if (spell->last_sp && tmp->stats.sp < tmp->stats.maxsp) 991 if (spell->last_sp && tmp->stats.sp < tmp->stats.maxsp)
1258 { 992 {
1259 tmp->stats.sp += spell->last_sp; 993 tmp->stats.sp += spell->last_sp;
1260 if (tmp->stats.sp > tmp->stats.maxsp) 994 if (tmp->stats.sp > tmp->stats.maxsp)
1261 tmp->stats.sp = tmp->stats.maxsp; 995 tmp->stats.sp = tmp->stats.maxsp;
1262 success = 1; 996 success = 1;
1263 new_draw_info (NDI_UNIQUE, 0, tmp, "Magical energy surges through your body!"); 997 new_draw_info (NDI_UNIQUE, 0, tmp, "Magical energy surges through your body!");
1264 } 998 }
999
1265 if (spell->last_grace && tmp->stats.grace < tmp->stats.maxgrace) 1000 if (spell->last_grace && tmp->stats.grace < tmp->stats.maxgrace)
1266 { 1001 {
1267 tmp->stats.grace += spell->last_grace; 1002 tmp->stats.grace += spell->last_grace;
1268 if (tmp->stats.grace > tmp->stats.maxgrace) 1003 if (tmp->stats.grace > tmp->stats.maxgrace)
1269 tmp->stats.grace = tmp->stats.maxgrace; 1004 tmp->stats.grace = tmp->stats.maxgrace;
1270 success = 1; 1005 success = 1;
1271 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel redeemed with your god!"); 1006 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel redeemed with your god!");
1272 } 1007 }
1008
1273 if (spell->stats.food && tmp->stats.food < 999) 1009 if (spell->stats.food && tmp->stats.food < 999)
1274 { 1010 {
1275 tmp->stats.food += spell->stats.food; 1011 tmp->stats.food += spell->stats.food;
1012
1276 if (tmp->stats.food > 999) 1013 if (tmp->stats.food > 999)
1277 tmp->stats.food = 999; 1014 tmp->stats.food = 999;
1015
1278 success = 1; 1016 success = 1;
1279 /* 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 */
1280 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");
1281 } 1019 }
1020
1282 return success; 1021 return success;
1283} 1022}
1284
1285 1023
1286/* This is used for the spells that gain stats. There are no spells 1024/* This is used for the spells that gain stats. There are no spells
1287 * right now that icnrease wis/int/pow on a temp basis, so no 1025 * right now that icnrease wis/int/pow on a temp basis, so no
1288 * good comments for those. 1026 * good comments for those.
1289 */ 1027 */
1290static const char *const no_gain_msgs[NUM_STATS] = { 1028static const char *const no_gain_msgs[NUM_STATS] = {
1291 "You grow no stronger.", 1029 "You grow no stronger.",
1292 "You grow no more agile.", 1030 "You grow no more agile.",
1293 "You don't feel any healthier.", 1031 "You don't feel any healthier.",
1294 "no wis", 1032 "You didn't grow any more intelligent.",
1033 "You do not feel any wiser.",
1034 "You don't feel any more powerful."
1295 "You are no easier to look at.", 1035 "You are no easier to look at.",
1296 "no int",
1297 "no pow"
1298}; 1036};
1299 1037
1300int 1038int
1301cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent) 1039cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent)
1302{ 1040{
1303 object *tmp, *tmp2 = NULL;
1304 object *force = NULL; 1041 object *force = 0;
1305 int i; 1042 int i;
1306 1043
1307 /* if dir = 99 op defaults to tmp, eat_special_food() requires this. */ 1044 /* if dir = 99 op defaults to tmp, eat_special_food() requires this. */
1308 if (dir != 0) 1045 object *tmp = dir
1309 {
1310 tmp = find_target_for_friendly_spell (op, dir); 1046 ? find_target_for_friendly_spell (op, dir)
1311 } 1047 : op;
1312 else
1313 {
1314 tmp = op;
1315 }
1316 1048
1317 if (tmp == NULL) 1049 if (!tmp)
1318 return 0; 1050 return 0;
1319 1051
1320 /* If we've already got a force of this type, don't add a new one. */ 1052 /* If we've already got a force of this type, don't add a new one. */
1321 for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below) 1053 for (object *tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1322 { 1054 {
1323 if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY) 1055 if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY)
1324 { 1056 {
1325 if (tmp2->name == spell_ob->name) 1057 if (tmp2->name == spell_ob->name)
1326 { 1058 {
… …
1329 } 1061 }
1330 else if (spell_ob->race && spell_ob->race == tmp2->name) 1062 else if (spell_ob->race && spell_ob->race == tmp2->name)
1331 { 1063 {
1332 if (!silent) 1064 if (!silent)
1333 new_draw_info_format (NDI_UNIQUE, 0, op, "You can not cast %s while %s is in effect", &spell_ob->name, &tmp2->name_pl); 1065 new_draw_info_format (NDI_UNIQUE, 0, op, "You can not cast %s while %s is in effect", &spell_ob->name, &tmp2->name_pl);
1066
1334 return 0; 1067 return 0;
1335 } 1068 }
1336 } 1069 }
1337 } 1070 }
1338 if (force == NULL) 1071
1072 if (!force)
1339 { 1073 {
1340 force = get_archetype (FORCE_NAME); 1074 force = get_archetype (FORCE_NAME);
1341 force->subtype = FORCE_CHANGE_ABILITY; 1075 force->subtype = FORCE_CHANGE_ABILITY;
1076
1342 if (spell_ob->race) 1077 if (spell_ob->race)
1343 force->name = spell_ob->race; 1078 force->name = spell_ob->race;
1344 else 1079 else
1345 force->name = spell_ob->name; 1080 force->name = spell_ob->name;
1081
1346 force->name_pl = spell_ob->name; 1082 force->name_pl = spell_ob->name;
1347 new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force."); 1083 new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force.");
1348 1084
1349 } 1085 }
1350 else 1086 else
… …
1356 { 1092 {
1357 force->duration = duration; 1093 force->duration = duration;
1358 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect."); 1094 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
1359 } 1095 }
1360 else 1096 else
1361 {
1362 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); 1097 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1363 } 1098
1364 return 1; 1099 return 1;
1365 } 1100 }
1101
1366 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1102 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1367 force->speed = 1.0; 1103 force->speed = 1.0;
1368 force->speed_left = -1.0; 1104 force->speed_left = -1.0;
1369 SET_FLAG (force, FLAG_APPLIED); 1105 SET_FLAG (force, FLAG_APPLIED);
1370 1106
… …
1376 force->resist[i] = spell_ob->resist[i] + SP_level_dam_adjust (caster, spell_ob); 1112 force->resist[i] = spell_ob->resist[i] + SP_level_dam_adjust (caster, spell_ob);
1377 if (force->resist[i] > 100) 1113 if (force->resist[i] > 100)
1378 force->resist[i] = 100; 1114 force->resist[i] = 100;
1379 } 1115 }
1380 } 1116 }
1117
1381 if (spell_ob->stats.hp) 1118 if (spell_ob->stats.hp)
1382 force->stats.hp = spell_ob->stats.hp + SP_level_dam_adjust (caster, spell_ob); 1119 force->stats.hp = spell_ob->stats.hp + SP_level_dam_adjust (caster, spell_ob);
1383 1120
1384 if (tmp->type == PLAYER) 1121 if (tmp->type == PLAYER)
1385 { 1122 {
1386 /* Stat adjustment spells */ 1123 /* Stat adjustment spells */
1387 for (i = 0; i < NUM_STATS; i++) 1124 for (i = 0; i < NUM_STATS; i++)
1388 { 1125 {
1389 sint8 stat = get_attr_value (&spell_ob->stats, i), k, sm; 1126 if (sint8 stat = spell_ob->stats.stat (i))
1390
1391 if (stat)
1392 { 1127 {
1393 sm = 0; 1128 sint8 sm = 0;
1394 for (k = 0; k < stat; k++) 1129 for (sint8 k = 0; k < stat; k++)
1395 sm += rndm (1, 3); 1130 sm += rndm (1, 3);
1396 1131
1397 if ((get_attr_value (&tmp->stats, i) + sm) > (15 + 5 * stat)) 1132 if (tmp->stats.stat (i) + sm > 15 + 5 * stat)
1398 { 1133 sm = max (0, (15 + 5 * stat) - tmp->stats.stat (i));
1399 sm = (15 + 5 * stat) - get_attr_value (&tmp->stats, i); 1134
1400 if (sm < 0) 1135 force->stats.stat (i) = sm;
1401 sm = 0; 1136
1402 }
1403 set_attr_value (&force->stats, i, sm);
1404 if (!sm) 1137 if (!sm)
1405 new_draw_info (NDI_UNIQUE, 0, op, no_gain_msgs[i]); 1138 new_draw_info (NDI_UNIQUE, 0, op, no_gain_msgs[i]);
1406 } 1139 }
1407 } 1140 }
1408 } 1141 }
… …
1428 force->stats.ac = spell_ob->stats.ac; 1161 force->stats.ac = spell_ob->stats.ac;
1429 force->attacktype = spell_ob->attacktype; 1162 force->attacktype = spell_ob->attacktype;
1430 1163
1431 insert_ob_in_ob (force, tmp); 1164 insert_ob_in_ob (force, tmp);
1432 change_abil (tmp, force); /* Mostly to display any messages */ 1165 change_abil (tmp, force); /* Mostly to display any messages */
1433 fix_player (tmp); 1166 tmp->update_stats ();
1167
1434 return 1; 1168 return 1;
1435} 1169}
1436 1170
1437/* This used to be part of cast_change_ability, but it really didn't make 1171/* This used to be part of cast_change_ability, but it really didn't make
1438 * a lot of sense, since most of the values it derives are from the god 1172 * a lot of sense, since most of the values it derives are from the god
1439 * of the caster. 1173 * of the caster.
1440 */ 1174 */
1441
1442int 1175int
1443cast_bless (object *op, object *caster, object *spell_ob, int dir) 1176cast_bless (object *op, object *caster, object *spell_ob, int dir)
1444{ 1177{
1445 int i; 1178 int i;
1446 object *god = find_god (determine_god (op)), *tmp2, *force = NULL, *tmp; 1179 object *god = find_god (determine_god (op)), *force = NULL, *tmp;
1447 1180
1448 /* if dir = 99 op defaults to tmp, eat_special_food() requires this. */ 1181 /* if dir = 99 op defaults to tmp, eat_special_food() requires this. */
1449 if (dir != 0) 1182 if (dir != 0)
1450 { 1183 {
1451 tmp = find_target_for_friendly_spell (op, dir); 1184 tmp = find_target_for_friendly_spell (op, dir);
1185
1186 if (!tmp)
1187 return 0;
1452 } 1188 }
1453 else 1189 else
1454 {
1455 tmp = op; 1190 tmp = op;
1456 }
1457 1191
1458 /* If we've already got a force of this type, don't add a new one. */ 1192 /* If we've already got a force of this type, don't add a new one. */
1459 for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below) 1193 for (object *tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1460 { 1194 {
1461 if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY) 1195 if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY)
1462 { 1196 {
1463 if (tmp2->name == spell_ob->name) 1197 if (tmp2->name == spell_ob->name)
1464 { 1198 {
… …
1470 new_draw_info_format (NDI_UNIQUE, 0, op, "You can not cast %s while %s is in effect", &spell_ob->name, &tmp2->name_pl); 1204 new_draw_info_format (NDI_UNIQUE, 0, op, "You can not cast %s while %s is in effect", &spell_ob->name, &tmp2->name_pl);
1471 return 0; 1205 return 0;
1472 } 1206 }
1473 } 1207 }
1474 } 1208 }
1209
1475 if (force == NULL) 1210 if (force == NULL)
1476 { 1211 {
1477 force = get_archetype (FORCE_NAME); 1212 force = get_archetype (FORCE_NAME);
1478 force->subtype = FORCE_CHANGE_ABILITY; 1213 force->subtype = FORCE_CHANGE_ABILITY;
1479 if (spell_ob->race) 1214 if (spell_ob->race)
… …
1537 force->stats.wc = spell_ob->stats.wc; 1272 force->stats.wc = spell_ob->stats.wc;
1538 force->stats.ac = spell_ob->stats.ac; 1273 force->stats.ac = spell_ob->stats.ac;
1539 1274
1540 change_abil (tmp, force); /* Mostly to display any messages */ 1275 change_abil (tmp, force); /* Mostly to display any messages */
1541 insert_ob_in_ob (force, tmp); 1276 insert_ob_in_ob (force, tmp);
1542 fix_player (tmp); 1277 tmp->update_stats ();
1543 return 1; 1278 return 1;
1544} 1279}
1545
1546
1547 1280
1548/* Alchemy code by Mark Wedel 1281/* Alchemy code by Mark Wedel
1549 * 1282 *
1550 * This code adds a new spell, called alchemy. Alchemy will turn 1283 * This code adds a new spell, called alchemy. Alchemy will turn
1551 * objects to gold nuggets, the value of the gold nuggets being 1284 * objects to pyrite ("false gold"), henceforth called gold nuggets.
1552 * about 90% of that of the item itself. It uses the value of the
1553 * object before charisma adjustments, because the nuggets themselves
1554 * will be will be adjusted by charisma when sold.
1555 * 1285 *
1556 * Large nuggets are worth 25 gp each (base). You will always get 1286 * The value of the gold nuggets being about 90% of that of the item
1557 * the maximum number of large nuggets you could get. 1287 * itself. It uses the value of the object before charisma adjustments,
1558 * Small nuggets are worth 1 gp each (base). You will get from 0 1288 * because the nuggets themselves will be will be adjusted by charisma
1559 * to the max amount of small nuggets as you could get. 1289 * when sold.
1560 *
1561 * For example, if an item is worth 110 gold, you will get
1562 * 4 large nuggets, and from 0-10 small nuggets.
1563 * 1290 *
1564 * There is also a chance (1:30) that you will get nothing at all 1291 * There is also a chance (1:30) that you will get nothing at all
1565 * for the object. There is also a maximum weight that will be 1292 * for the object. There is also a maximum weight that will be
1566 * alchemied. 1293 * alchemised.
1567 */ 1294 */
1568
1569/* I didn't feel like passing these as arguements to the
1570 * two functions that need them. Real values are put in them
1571 * when the spell is cast, and these are freed when the spell
1572 * is finished.
1573 */
1574static object *small, *large;
1575
1576static void 1295static void
1577alchemy_object (object *obj, int *small_nuggets, int *large_nuggets, int *weight) 1296alchemy_object (object *obj, uint64 &total_value, int &total_weight)
1578{ 1297{
1579 uint64 value = query_cost (obj, NULL, F_TRUE); 1298 uint64 value = query_cost (obj, NULL, F_TRUE);
1580 1299
1581 /* Give third price when we alchemy money (This should hopefully 1300 /* Give third price when we alchemy money (this should hopefully
1582 * make it so that it isn't worth it to alchemy money, sell 1301 * make it so that it isn't worth it to alchemy money, sell
1583 * the nuggets, alchemy the gold from that, etc. 1302 * the nuggets, alchemy the gold from that, etc.
1584 * Otherwise, give 9 silver on the gold for other objects, 1303 * Otherwise, give 9 silver on the gold for other objects,
1585 * so that it would still be more affordable to haul 1304 * so that it would still be more affordable to haul
1586 * the stuff back to town. 1305 * the stuff back to town.
1587 */ 1306 */
1588
1589 if (QUERY_FLAG (obj, FLAG_UNPAID)) 1307 if (QUERY_FLAG (obj, FLAG_UNPAID))
1590 value = 0; 1308 value = 0;
1591 else if (obj->type == MONEY || obj->type == GEM) 1309 else if (obj->type == MONEY || obj->type == GEM)
1592 value /= 3; 1310 value /= 3;
1593 else 1311 else
1594 value = (value * 9) / 10; 1312 value = value * 9 / 10;
1595 1313
1596 value /= 4; // fix by GHJ, don't understand, pcg
1597
1598 if ((obj->value > 0) && rndm (0, 29)) 1314 if (obj->value > 0 && rndm (0, 29))
1599 { 1315 total_value += value;
1600 int count;
1601 1316
1602 count = value / large->value;
1603 *large_nuggets += count;
1604 value -= (uint64) count *(uint64) large->value;
1605
1606 count = value / small->value;
1607 *small_nuggets += count;
1608 }
1609
1610 /* Turn 25 small nuggets into 1 large nugget. If the value
1611 * of large nuggets is not evenly divisable by the small nugget
1612 * value, take off an extra small_nugget (Assuming small_nuggets!=0)
1613 */
1614 if (*small_nuggets * small->value >= large->value)
1615 {
1616 (*large_nuggets)++;
1617 *small_nuggets -= large->value / small->value;
1618 if (*small_nuggets && large->value % small->value)
1619 (*small_nuggets)--;
1620 }
1621 weight += obj->weight; 1317 total_weight += obj->total_weight ();
1318
1622 obj->destroy (); 1319 obj->destroy ();
1623} 1320}
1624 1321
1625static void
1626update_map (object *op, maptile *m, int small_nuggets, int large_nuggets, int x, int y)
1627{
1628 object *tmp;
1629 int flag = 0;
1630
1631 /* Put any nuggets below the player, but we can only pass this
1632 * flag if we are on the same space as the player
1633 */
1634 if (x == op->x && y == op->y && op->map == m)
1635 flag = INS_BELOW_ORIGINATOR;
1636
1637 if (small_nuggets)
1638 {
1639 tmp = object::create ();
1640 small->copy_to (tmp);
1641 tmp->nrof = small_nuggets;
1642 tmp->x = x;
1643 tmp->y = y;
1644 insert_ob_in_map (tmp, m, op, flag);
1645 }
1646 if (large_nuggets)
1647 {
1648 tmp = object::create ();
1649 large->copy_to (tmp);
1650 tmp->nrof = large_nuggets;
1651 tmp->x = x;
1652 tmp->y = y;
1653 insert_ob_in_map (tmp, m, op, flag);
1654 }
1655}
1656
1657int 1322int
1658alchemy (object *op, object *caster, object *spell_ob) 1323alchemy (object *op, object *caster, object *spell_ob)
1659{ 1324{
1660 int x, y, weight = 0, weight_max, large_nuggets, small_nuggets, mflags;
1661 sint16 nx, ny;
1662 object *next, *tmp;
1663 maptile *mp;
1664
1665 if (op->type != PLAYER) 1325 if (op->type != PLAYER)
1666 return 0; 1326 return 0;
1667 1327
1328 archetype *nugget[3];
1329
1330 nugget[0] = archetype::find ("pyrite3");
1331 nugget[1] = archetype::find ("pyrite2");
1332 nugget[2] = archetype::find ("pyrite");
1333
1668 /* Put a maximum weight of items that can be alchemied. Limits the power 1334 /* Put a maximum weight of items that can be alchemised. Limits the power
1669 * some, and also prevents people from alcheming every table/chair/clock 1335 * some, and also prevents people from alchemising every table/chair/clock
1670 * in sight 1336 * in sight
1671 */ 1337 */
1672 weight_max = spell_ob->duration + +SP_level_duration_adjust (caster, spell_ob); 1338 int duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
1673 weight_max *= 1000; 1339 int weight_max = duration * 1000;
1674 small = get_archetype ("smallnugget"), large = get_archetype ("largenugget"); 1340 uint64 value_max = duration * 1000;
1675 1341
1342 int weight = 0;
1343
1676 for (y = op->y - 1; y <= op->y + 1; y++) 1344 for (int y = op->y - 1; y <= op->y + 1; y++)
1677 { 1345 {
1678 for (x = op->x - 1; x <= op->x + 1; x++) 1346 for (int x = op->x - 1; x <= op->x + 1; x++)
1679 { 1347 {
1348 uint64 value = 0;
1349
1680 nx = x; 1350 sint16 nx = x;
1681 ny = y; 1351 sint16 ny = y;
1682 1352
1683 mp = op->map; 1353 maptile *mp = op->map;
1684 1354
1685 mflags = get_map_flags (mp, &mp, nx, ny, &nx, &ny); 1355 int mflags = get_map_flags (mp, &mp, nx, ny, &nx, &ny);
1686 1356
1687 if (mflags & (P_OUT_OF_MAP | P_NO_MAGIC)) 1357 if (mflags & (P_OUT_OF_MAP | P_NO_MAGIC))
1688 continue; 1358 continue;
1689 1359
1690 /* Treat alchemy a little differently - most spell effects 1360 /* Treat alchemy a little differently - most spell effects
… …
1692 * ground level effect. 1362 * ground level effect.
1693 */ 1363 */
1694 if (GET_MAP_MOVE_BLOCK (mp, nx, ny) & MOVE_WALK) 1364 if (GET_MAP_MOVE_BLOCK (mp, nx, ny) & MOVE_WALK)
1695 continue; 1365 continue;
1696 1366
1697 small_nuggets = 0; 1367 for (object *next, *tmp = mp->at (nx, ny).bot; tmp; tmp = next)
1698 large_nuggets = 0;
1699
1700 for (tmp = get_map_ob (mp, nx, ny); tmp != NULL; tmp = next)
1701 { 1368 {
1702 next = tmp->above; 1369 next = tmp->above;
1370
1703 if (tmp->weight > 0 && !QUERY_FLAG (tmp, FLAG_NO_PICK) && 1371 if (tmp->weight > 0 && !QUERY_FLAG (tmp, FLAG_NO_PICK) &&
1704 !QUERY_FLAG (tmp, FLAG_ALIVE) && !QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) 1372 !QUERY_FLAG (tmp, FLAG_ALIVE) && !QUERY_FLAG (tmp, FLAG_IS_CAULDRON))
1705 { 1373 {
1706
1707 if (tmp->inv) 1374 if (tmp->inv)
1708 { 1375 {
1709 object *next1, *tmp1; 1376 object *next1, *tmp1;
1710 1377
1711 for (tmp1 = tmp->inv; tmp1 != NULL; tmp1 = next1) 1378 for (tmp1 = tmp->inv; tmp1; tmp1 = next1)
1712 { 1379 {
1713 next1 = tmp1->below; 1380 next1 = tmp1->below;
1714 if (tmp1->weight > 0 && !QUERY_FLAG (tmp1, FLAG_NO_PICK) && 1381 if (tmp1->weight > 0 && !QUERY_FLAG (tmp1, FLAG_NO_PICK) &&
1715 !QUERY_FLAG (tmp1, FLAG_ALIVE) && !QUERY_FLAG (tmp1, FLAG_IS_CAULDRON)) 1382 !QUERY_FLAG (tmp1, FLAG_ALIVE) && !QUERY_FLAG (tmp1, FLAG_IS_CAULDRON))
1716 alchemy_object (tmp1, &small_nuggets, &large_nuggets, &weight); 1383 alchemy_object (tmp1, value, weight);
1717 } 1384 }
1718 } 1385 }
1386
1719 alchemy_object (tmp, &small_nuggets, &large_nuggets, &weight); 1387 alchemy_object (tmp, value, weight);
1720 1388
1721 if (weight > weight_max) 1389 if (weight > weight_max)
1722 { 1390 break;
1723 update_map (op, mp, small_nuggets, large_nuggets, nx, ny);
1724 large->destroy ();
1725 small->destroy ();
1726 return 1;
1727 } 1391 }
1728 } /* is alchemable object */
1729 } /* process all objects on this space */
1730
1731 /* Insert all the nuggets at one time. This probably saves time, but
1732 * it also prevents us from alcheming nuggets that were just created
1733 * with this spell.
1734 */ 1392 }
1735 update_map (op, mp, small_nuggets, large_nuggets, nx, ny); 1393
1394 value -= rndm (value >> 4);
1395 value = min (value, value_max);
1396
1397 for (int i = 0; i < sizeof (nugget) / sizeof (nugget [0]); ++i)
1398 if (int nrof = value / nugget [i]->value)
1399 {
1400 value -= nrof * nugget[i]->value;
1401
1402 object *tmp = arch_to_object (nugget[i]);
1403 tmp->nrof = nrof;
1404 tmp->flag [FLAG_IDENTIFIED] = true;
1405 op->map->insert (tmp, x, y, op, 0);
1736 } 1406 }
1737 }
1738 1407
1739 large->destroy (); 1408 if (weight > weight_max)
1740 small->destroy (); 1409 goto bailout;
1741 /* reset this so that if player standing on a big pile of stuff, 1410 }
1742 * it is redrawn properly. 1411 }
1743 */ 1412
1744 op->contr->socket.look_position = 0; 1413bailout:
1745 return 1; 1414 return 1;
1746} 1415}
1747
1748 1416
1749/* This function removes the cursed/damned status on equipped 1417/* This function removes the cursed/damned status on equipped
1750 * items. 1418 * items.
1751 */ 1419 */
1752int 1420int
… …
1758 for (tmp = op->inv; tmp; tmp = tmp->below) 1426 for (tmp = op->inv; tmp; tmp = tmp->below)
1759 if (QUERY_FLAG (tmp, FLAG_APPLIED) && 1427 if (QUERY_FLAG (tmp, FLAG_APPLIED) &&
1760 ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) || 1428 ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) ||
1761 (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED)))) 1429 (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED))))
1762 { 1430 {
1763
1764 was_one++; 1431 was_one++;
1432
1765 if (tmp->level <= caster_level (caster, spell)) 1433 if (tmp->level <= casting_level (caster, spell))
1766 { 1434 {
1767 success++; 1435 success++;
1768 if (QUERY_FLAG (spell, FLAG_DAMNED)) 1436 if (QUERY_FLAG (spell, FLAG_DAMNED))
1769 CLEAR_FLAG (tmp, FLAG_DAMNED); 1437 CLEAR_FLAG (tmp, FLAG_DAMNED);
1770 1438
1771 CLEAR_FLAG (tmp, FLAG_CURSED); 1439 CLEAR_FLAG (tmp, FLAG_CURSED);
1772 CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED); 1440 CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED);
1773 tmp->value = 0; /* Still can't sell it */ 1441 tmp->value = 0; /* Still can't sell it */
1774 if (op->type == PLAYER) 1442
1443 if (object *pl = tmp->visible_to ())
1775 esrv_send_item (op, tmp); 1444 esrv_update_item (UPD_FLAGS, pl, tmp);
1776 } 1445 }
1777 } 1446 }
1778 1447
1779 if (op->type == PLAYER) 1448 if (op->type == PLAYER)
1780 { 1449 {
1781 if (success) 1450 if (success)
1782 {
1783 new_draw_info (NDI_UNIQUE, 0, op, "You feel like some of your items are looser now."); 1451 new_draw_info (NDI_UNIQUE, 0, op, "You feel like some of your items are looser now.");
1784 }
1785 else 1452 else
1786 { 1453 {
1787 if (was_one) 1454 if (was_one)
1788 new_draw_info (NDI_UNIQUE, 0, op, "You failed to remove the curse."); 1455 new_draw_info (NDI_UNIQUE, 0, op, "You failed to remove the curse.");
1789 else 1456 else
1790 new_draw_info (NDI_UNIQUE, 0, op, "You are not using any cursed items."); 1457 new_draw_info (NDI_UNIQUE, 0, op, "You are not using any cursed items.");
1791 } 1458 }
1792 } 1459 }
1460
1793 return success; 1461 return success;
1794} 1462}
1795 1463
1796/* Identifies objects in the players inventory/on the ground */ 1464/* Identifies objects in the players inventory/on the ground */
1797
1798int 1465int
1799cast_identify (object *op, object *caster, object *spell) 1466cast_identify (object *op, object *caster, object *spell)
1800{ 1467{
1468 dynbuf_text buf;
1801 object *tmp; 1469 object *tmp;
1802 int success = 0, num_ident;
1803 1470
1804 num_ident = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1471 int num_ident = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1805 1472
1806 if (num_ident < 1) 1473 if (num_ident < 1)
1807 num_ident = 1; 1474 num_ident = 1;
1808 1475
1809
1810 for (tmp = op->inv; tmp; tmp = tmp->below) 1476 for (tmp = op->inv; tmp; tmp = tmp->below)
1811 { 1477 {
1812 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp)) 1478 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))
1813 { 1479 {
1814 identify (tmp); 1480 identify (tmp);
1481
1815 if (op->type == PLAYER) 1482 if (op->type == PLAYER)
1816 { 1483 {
1817 new_draw_info_format (NDI_UNIQUE, 0, op, "You have %s.", long_desc (tmp, op)); 1484 buf.printf ("You identified: %s.\r", long_desc (tmp, op));
1485
1818 if (tmp->msg) 1486 if (tmp->msg)
1819 { 1487 buf << "The item has a story:\r" << tmp->msg << "\n\n";
1820 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1821 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1822 }
1823 } 1488 }
1489
1824 num_ident--; 1490 num_ident--;
1825 success = 1;
1826 if (!num_ident) 1491 if (!num_ident)
1827 break; 1492 break;
1828 } 1493 }
1829 } 1494 }
1495
1830 /* If all the power of the spell has been used up, don't go and identify 1496 /* If all the power of the spell has been used up, don't go and identify
1831 * stuff on the floor. Only identify stuff on the floor if the spell 1497 * stuff on the floor. Only identify stuff on the floor if the spell
1832 * was not fully used. 1498 * was not fully used.
1833 */ 1499 */
1834 if (num_ident) 1500 if (num_ident)
1835 { 1501 {
1836 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1502 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
1837 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp)) 1503 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))
1838 { 1504 {
1839
1840 identify (tmp); 1505 identify (tmp);
1841 if (op->type == PLAYER) 1506
1507 if (object *pl = tmp->visible_to ())
1842 { 1508 {
1843 new_draw_info_format (NDI_UNIQUE, 0, op, "On the ground is %s.", long_desc (tmp, op)); 1509 buf.printf ("On the ground you identified: %s.\r", long_desc (tmp, op));
1510
1844 if (tmp->msg) 1511 if (tmp->msg)
1845 { 1512 buf << "The item has a story:\r" << tmp->msg << "\n\n";
1846 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1847 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1848 }
1849 esrv_send_item (op, tmp);
1850 } 1513 }
1514
1851 num_ident--; 1515 num_ident--;
1852 success = 1;
1853 if (!num_ident) 1516 if (!num_ident)
1854 break; 1517 break;
1855 } 1518 }
1856 } 1519 }
1857 if (!success) 1520
1858 new_draw_info (NDI_UNIQUE, 0, op, "You can't reach anything unidentified."); 1521 if (buf.empty ())
1522 {
1523 op->failmsg ("You can't reach anything unidentified.");
1524 return 0;
1525 }
1859 else 1526 else
1860 { 1527 {
1528 if (op->contr)
1529 op->contr->infobox (MSG_CHANNEL ("identify"), buf);
1530
1861 spell_effect (spell, op->x, op->y, op->map, op); 1531 spell_effect (spell, op->x, op->y, op->map, op);
1532 return 1;
1862 } 1533 }
1863 return success;
1864} 1534}
1865
1866 1535
1867int 1536int
1868cast_detection (object *op, object *caster, object *spell, object *skill) 1537cast_detection (object *op, object *caster, object *spell, object *skill)
1869{ 1538{
1870 object *tmp, *last, *god, *detect; 1539 object *tmp, *last, *god, *detect;
… …
1874 1543
1875 /* We precompute some values here so that we don't have to keep 1544 /* We precompute some values here so that we don't have to keep
1876 * doing it over and over again. 1545 * doing it over and over again.
1877 */ 1546 */
1878 god = find_god (determine_god (op)); 1547 god = find_god (determine_god (op));
1879 level = caster_level (caster, spell); 1548 level = casting_level (caster, spell);
1880 range = spell->range + SP_level_range_adjust (caster, spell); 1549 range = spell->range + SP_level_range_adjust (caster, spell);
1881 1550
1882 if (!skill) 1551 if (!skill)
1883 skill = caster; 1552 skill = caster;
1884 1553
1885 for (x = op->x - range; x <= op->x + range; x++) 1554 unordered_mapwalk (op, -range, -range, range, range)
1886 for (y = op->y - range; y <= op->y + range; y++)
1887 { 1555 {
1888
1889 m = op->map;
1890 mflags = get_map_flags (m, &m, x, y, &nx, &ny);
1891 if (mflags & P_OUT_OF_MAP)
1892 continue;
1893
1894 /* For most of the detections, we only detect objects above the 1556 /* For most of the detections, we only detect objects above the
1895 * floor. But this is not true for show invisible. 1557 * floor. But this is not true for show invisible.
1896 * Basically, we just go and find the top object and work 1558 * Basically, we just go and find the top object and work
1897 * down - that is easier than working up. 1559 * down - that is easier than working up.
1898 */ 1560 */
1899 1561
1900 for (last = NULL, tmp = get_map_ob (m, nx, ny); tmp; tmp = tmp->above) 1562 for (last = NULL, tmp = m->at (nx, ny).bot; tmp; tmp = tmp->above)
1901 last = tmp; 1563 last = tmp;
1564
1902 /* Shouldn't happen, but if there are no objects on a space, this 1565 /* Shouldn't happen, but if there are no objects on a space, this
1903 * would happen. 1566 * would happen.
1904 */ 1567 */
1905 if (!last) 1568 if (!last)
1906 continue; 1569 continue;
1907 1570
1908 done_one = 0; 1571 done_one = 0;
1909 floor = 0; 1572 floor = 0;
1910 detect = NULL; 1573 detect = NULL;
1911 for (tmp = last; tmp; tmp = tmp->below) 1574 for (tmp = last; tmp; tmp = tmp->below)
1912 { 1575 {
1913
1914 /* show invisible */ 1576 /* show invisible */
1915 if (QUERY_FLAG (spell, FLAG_MAKE_INVIS) && 1577 if (QUERY_FLAG (spell, FLAG_MAKE_INVIS) &&
1916 /* Might there be other objects that we can make visibile? */ 1578 /* Might there be other objects that we can make visible? */
1917 (tmp->invisible && (QUERY_FLAG (tmp, FLAG_MONSTER) || 1579 (tmp->invisible && (QUERY_FLAG (tmp, FLAG_MONSTER) ||
1918 (tmp->type == PLAYER && !QUERY_FLAG (tmp, FLAG_WIZ)) || 1580 (tmp->type == PLAYER && !QUERY_FLAG (tmp, FLAG_WIZ))
1919 tmp->type == CF_HANDLE || 1581 || tmp->type == CF_HANDLE
1920 tmp->type == TRAPDOOR || tmp->type == EXIT || tmp->type == HOLE || 1582 || tmp->type == TRAPDOOR || tmp->type == EXIT || tmp->type == HOLE
1921 tmp->type == BUTTON || tmp->type == TELEPORTER || 1583 || tmp->type == BUTTON || tmp->type == TELEPORTER
1922 tmp->type == GATE || tmp->type == LOCKED_DOOR || 1584 || tmp->type == GATE || tmp->type == LOCKED_DOOR
1923 tmp->type == WEAPON || tmp->type == ALTAR || tmp->type == SIGN || 1585 || tmp->type == WEAPON || tmp->type == ALTAR || tmp->type == SIGN
1924 tmp->type == TRIGGER_PEDESTAL || tmp->type == SPECIAL_KEY || 1586 || tmp->type == TRIGGER_PEDESTAL || tmp->type == SPECIAL_KEY
1925 tmp->type == TREASURE || tmp->type == BOOK || tmp->type == HOLY_ALTAR))) 1587 || tmp->type == TREASURE || tmp->type == BOOK || tmp->type == HOLY_ALTAR)))
1926 { 1588 {
1927 if (random_roll (0, skill->level - 1, op, PREFER_HIGH) > level / 4) 1589 if (random_roll (0, skill->level - 1, op, PREFER_HIGH) > level / 4)
1928 { 1590 {
1929 tmp->invisible = 0; 1591 tmp->invisible = 0;
1930 done_one = 1; 1592 done_one = 1;
1931 } 1593 }
1932 } 1594 }
1595
1933 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1596 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1934 floor = 1; 1597 floor = 1;
1935 1598
1936 /* All detections below this point don't descend beneath the floor, 1599 /* All detections below this point don't descend beneath the floor,
1937 * so just continue on. We could be clever and look at the type of 1600 * so just continue on. We could be clever and look at the type of
1938 * detection to completely break out if we don't care about objects beneath 1601 * detection to completely break out if we don't care about objects beneath
1939 * the floor, but once we get to the floor, not likely a very big issue anyways. 1602 * the floor, but once we get to the floor, not likely a very big issue anyways.
1940 */ 1603 */
1941 if (floor) 1604 if (floor)
1942 continue; 1605 continue;
1943 1606
1944 /* I had thought about making detect magic and detect curse 1607 /* I had thought about making detect magic and detect curse
1945 * show the flash the magic item like it does for detect monster. 1608 * show the flash the magic item like it does for detect monster.
1946 * however, if the object is within sight, this would then make it 1609 * however, if the object is within sight, this would then make it
1947 * difficult to see what object is magical/cursed, so the 1610 * difficult to see what object is magical/cursed, so the
1948 * effect wouldn't be as apparant. 1611 * effect wouldn't be as apparent.
1949 */ 1612 */
1950 1613
1951 /* detect magic */ 1614 /* detect magic */
1952 if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) && 1615 if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) &&
1953 !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && is_magical (tmp)) 1616 !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && is_magical (tmp))
1954 { 1617 {
1955 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL); 1618 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL);
1956 /* make runes more visibile */ 1619 /* make runes more visibile */
1957 if (tmp->type == RUNE && tmp->attacktype & AT_MAGIC) 1620 if (tmp->type == RUNE && tmp->attacktype & AT_MAGIC)
1958 tmp->stats.Cha /= 4; 1621 tmp->stats.Cha /= 4;
1622
1959 done_one = 1; 1623 done_one = 1;
1960 } 1624 }
1625
1961 /* detect monster */ 1626 /* detect monster */
1962 if (QUERY_FLAG (spell, FLAG_MONSTER) && (QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER)) 1627 if (QUERY_FLAG (spell, FLAG_MONSTER) && (QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER))
1963 { 1628 {
1964 done_one = 2; 1629 done_one = 2;
1630
1965 if (!detect) 1631 if (!detect)
1966 detect = tmp; 1632 detect = tmp;
1967 } 1633 }
1634
1968 /* Basically, if race is set in the spell, then the creatures race must 1635 /* Basically, if race is set in the spell, then the creatures race must
1969 * match that. if the spell race is set to GOD, then the gods opposing 1636 * match that. if the spell race is set to GOD, then the gods opposing
1970 * race must match. 1637 * race must match.
1971 */ 1638 */
1972 if (spell->race && QUERY_FLAG (tmp, FLAG_MONSTER) && tmp->race && 1639 if (spell->race && QUERY_FLAG (tmp, FLAG_MONSTER) && tmp->race &&
1973 ((!strcmp (spell->race, "GOD") && god && god->slaying && strstr (god->slaying, tmp->race)) || 1640 ((spell->race == shstr_GOD && god && god->slaying.contains (tmp->race)) ||
1974 (strstr (spell->race, tmp->race)))) 1641 spell->race.contains (tmp->race)))
1975 { 1642 {
1976 done_one = 2; 1643 done_one = 2;
1644
1977 if (!detect) 1645 if (!detect)
1978 detect = tmp; 1646 detect = tmp;
1979 } 1647 }
1648
1980 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && 1649 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) &&
1981 (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))) 1650 (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))
1982 { 1651 {
1983 SET_FLAG (tmp, FLAG_KNOWN_CURSED); 1652 SET_FLAG (tmp, FLAG_KNOWN_CURSED);
1984 done_one = 1; 1653 done_one = 1;
1985 } 1654 }
1986 } /* for stack of objects on this space */ 1655 } /* for stack of objects on this space */
1987 1656
1988 /* Code here puts an effect of the spell on the space, so you can see 1657 /* Code here puts an effect of the spell on the space, so you can see
1989 * where the magic is. 1658 * where the magic is.
1990 */ 1659 */
1991 if (done_one) 1660 if (done_one)
1992 { 1661 {
1993 object *detect_ob = arch_to_object (spell->other_arch); 1662 object *detect_ob = arch_to_object (spell->other_arch);
1994 1663
1995 detect_ob->x = nx;
1996 detect_ob->y = ny;
1997 /* if this is set, we want to copy the face */ 1664 /* if this is set, we want to copy the face */
1998 if (done_one == 2 && detect) 1665 if (done_one == 2 && detect)
1999 { 1666 {
2000 detect_ob->face = detect->face; 1667 detect_ob->face = detect->face;
2001 detect_ob->animation_id = detect->animation_id; 1668 detect_ob->animation_id = detect->animation_id;
2002 detect_ob->anim_speed = detect->anim_speed; 1669 detect_ob->anim_speed = detect->anim_speed;
2003 detect_ob->last_anim = 0; 1670 detect_ob->last_anim = 0;
2004 /* by default, the detect_ob is already animated */ 1671 /* by default, the detect_ob is already animated */
2005 if (!QUERY_FLAG (detect, FLAG_ANIMATE)) 1672 if (!QUERY_FLAG (detect, FLAG_ANIMATE))
2006 CLEAR_FLAG (detect_ob, FLAG_ANIMATE); 1673 CLEAR_FLAG (detect_ob, FLAG_ANIMATE);
2007 } 1674 }
2008 insert_ob_in_map (detect_ob, m, op, 0); 1675
1676 m->insert (detect_ob, nx, ny, op);
2009 } 1677 }
2010 } /* for processing the surrounding spaces */ 1678 } /* for processing the surrounding spaces */
2011 1679
2012 1680
2013 /* Now process objects in the players inventory if detect curse or magic */ 1681 /* Now process objects in the players inventory if detect curse or magic */
2014 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) || QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL)) 1682 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) || QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL))
2015 { 1683 {
2016 done_one = 0; 1684 done_one = 0;
1685
2017 for (tmp = op->inv; tmp; tmp = tmp->below) 1686 for (tmp = op->inv; tmp; tmp = tmp->below)
2018 { 1687 {
2019 if (!tmp->invisible && !QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1688 if (!tmp->invisible && !QUERY_FLAG (tmp, FLAG_IDENTIFIED))
2020 { 1689 {
2021 if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) && is_magical (tmp) && !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)) 1690 if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) && is_magical (tmp) && !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL))
2022 { 1691 {
2023 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL); 1692 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL);
2024 if (op->type == PLAYER) 1693
1694 if (object *pl = tmp->visible_to ())
2025 esrv_send_item (op, tmp); 1695 esrv_update_item (UPD_FLAGS, pl, tmp);
2026 } 1696 }
1697
2027 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && 1698 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) &&
2028 (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))) 1699 (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))
2029 { 1700 {
2030 SET_FLAG (tmp, FLAG_KNOWN_CURSED); 1701 SET_FLAG (tmp, FLAG_KNOWN_CURSED);
2031 if (op->type == PLAYER) 1702
1703 if (object *pl = tmp->visible_to ())
2032 esrv_send_item (op, tmp); 1704 esrv_update_item (UPD_FLAGS, pl, tmp);
2033 } 1705 }
2034 } /* if item is not identified */ 1706 } /* if item is not identified */
2035 } /* for the players inventory */ 1707 } /* for the players inventory */
2036 } /* if detect magic/curse and object is a player */ 1708 } /* if detect magic/curse and object is a player */
1709
2037 return 1; 1710 return 1;
2038} 1711}
2039 1712
2040 1713
2041/** 1714/**
… …
2054 1727
2055 new_draw_info (NDI_UNIQUE, 0, victim, "You feel energy course through you."); 1728 new_draw_info (NDI_UNIQUE, 0, victim, "You feel energy course through you.");
2056 1729
2057 if (victim->stats.sp >= victim->stats.maxsp * 2) 1730 if (victim->stats.sp >= victim->stats.maxsp * 2)
2058 { 1731 {
2059 object *tmp;
2060
2061 new_draw_info (NDI_UNIQUE, 0, victim, "Your head explodes!"); 1732 new_draw_info (NDI_UNIQUE, 0, victim, "Your head explodes!");
2062
2063 /* Explodes a fireball centered at player */
2064 tmp = get_archetype (EXPLODING_FIREBALL);
2065 tmp->dam_modifier = random_roll (1, caster_level, victim, PREFER_LOW) / 5 + 1;
2066 tmp->stats.maxhp = random_roll (1, caster_level, victim, PREFER_LOW) / 10 + 2;
2067 tmp->x = victim->x;
2068 tmp->y = victim->y;
2069 insert_ob_in_map (tmp, victim->map, NULL, 0);
2070 victim->stats.sp = 2 * victim->stats.maxsp; 1733 victim->stats.sp = 2 * victim->stats.maxsp;
1734 create_exploding_ball_at (victim, caster_level);
2071 } 1735 }
2072 else if (victim->stats.sp >= victim->stats.maxsp * 1.88) 1736 else if (victim->stats.sp >= victim->stats.maxsp * 1.88)
2073 {
2074 new_draw_info (NDI_UNIQUE, NDI_ORANGE, victim, "You feel like your head is going to explode."); 1737 new_draw_info (NDI_UNIQUE | NDI_ORANGE, 0, victim, "You feel like your head is going to explode.");
2075 }
2076 else if (victim->stats.sp >= victim->stats.maxsp * 1.66) 1738 else if (victim->stats.sp >= victim->stats.maxsp * 1.66)
2077 {
2078 new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!"); 1739 new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!");
2079 }
2080 else if (victim->stats.sp >= victim->stats.maxsp * 1.5) 1740 else if (victim->stats.sp >= victim->stats.maxsp * 1.5)
2081 { 1741 {
2082 new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world."); 1742 new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world.");
2083 confuse_player (victim, victim, 99); 1743 confuse_player (victim, victim, 99);
2084 } 1744 }
2085 else if (victim->stats.sp >= victim->stats.maxsp * 1.25) 1745 else if (victim->stats.sp >= victim->stats.maxsp * 1.25)
2086 {
2087 new_draw_info (NDI_UNIQUE, 0, victim, "You start hearing voices."); 1746 new_draw_info (NDI_UNIQUE, 0, victim, "You start hearing voices.");
2088 }
2089} 1747}
2090 1748
2091/* cast_transfer 1749/* cast_transfer
2092 * This spell transfers sp from the player to another person. 1750 * This spell transfers sp from the player to another person.
2093 * We let the target go above their normal maximum SP. 1751 * We let the target go above their normal maximum SP.
… …
2107 1765
2108 mflags = get_map_flags (m, &m, x, y, &x, &y); 1766 mflags = get_map_flags (m, &m, x, y, &x, &y);
2109 1767
2110 if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE) 1768 if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE)
2111 { 1769 {
2112 for (plyr = get_map_ob (m, x, y); plyr != NULL; plyr = plyr->above) 1770 for (plyr = GET_MAP_OB (m, x, y); plyr != NULL; plyr = plyr->above)
2113 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE)) 1771 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE))
2114 break; 1772 break;
2115 } 1773 }
2116 1774
2117 1775
2118 /* If we did not find a player in the specified direction, transfer 1776 /* If we did not find a player in the specified direction, transfer
2119 * to anyone on top of us. This is used for the rune of transference mostly. 1777 * to anyone on top of us. This is used for the rune of transference mostly.
2120 */ 1778 */
2121 if (plyr == NULL) 1779 if (plyr == NULL)
2122 for (plyr = get_map_ob (op->map, op->x, op->y); plyr != NULL; plyr = plyr->above) 1780 for (plyr = GET_MAP_OB (op->map, op->x, op->y); plyr != NULL; plyr = plyr->above)
2123 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE)) 1781 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE))
2124 break; 1782 break;
2125 1783
2126 if (!plyr) 1784 if (!plyr)
2127 { 1785 {
… …
2130 } 1788 }
2131 /* give sp */ 1789 /* give sp */
2132 if (spell->stats.dam > 0) 1790 if (spell->stats.dam > 0)
2133 { 1791 {
2134 plyr->stats.sp += spell->stats.dam + SP_level_dam_adjust (caster, spell); 1792 plyr->stats.sp += spell->stats.dam + SP_level_dam_adjust (caster, spell);
2135 charge_mana_effect (plyr, caster_level (caster, spell)); 1793 charge_mana_effect (plyr, casting_level (caster, spell));
2136 return 1; 1794 return 1;
2137 } 1795 }
2138 /* suck sp away. Can't suck sp from yourself */ 1796 /* suck sp away. Can't suck sp from yourself */
2139 else if (op != plyr) 1797 else if (op != plyr)
2140 { 1798 {
… …
2152 /* Player doesn't get full credit */ 1810 /* Player doesn't get full credit */
2153 sucked = (sucked * rate) / 100; 1811 sucked = (sucked * rate) / 100;
2154 op->stats.sp += sucked; 1812 op->stats.sp += sucked;
2155 if (sucked > 0) 1813 if (sucked > 0)
2156 { 1814 {
2157 charge_mana_effect (op, caster_level (caster, spell)); 1815 charge_mana_effect (op, casting_level (caster, spell));
2158 } 1816 }
2159 } 1817 }
2160 return 1; 1818 return 1;
2161 } 1819 }
2162 return 0; 1820 return 0;
… …
2182 m = op->map; 1840 m = op->map;
2183 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy); 1841 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
2184 if (mflags & P_OUT_OF_MAP) 1842 if (mflags & P_OUT_OF_MAP)
2185 return; 1843 return;
2186 1844
2187 for (tmp = get_map_ob (m, sx, sy); tmp != NULL; tmp = next) 1845 for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = next)
2188 { 1846 {
2189 next = tmp->above; 1847 next = tmp->above;
2190 1848
2191 /* Need to look at the head object - otherwise, if tmp 1849 /* Need to look at the head object - otherwise, if tmp
2192 * points to a monster, we don't have all the necessary 1850 * points to a monster, we don't have all the necessary
… …
2204 /* Basically, if the object is magical and not counterspell, 1862 /* Basically, if the object is magical and not counterspell,
2205 * we will more or less remove the object. Don't counterspell 1863 * we will more or less remove the object. Don't counterspell
2206 * monsters either. 1864 * monsters either.
2207 */ 1865 */
2208 1866
2209 if (head->attacktype & AT_MAGIC && 1867 if (head->attacktype & AT_MAGIC
2210 !(head->attacktype & AT_COUNTERSPELL) && !QUERY_FLAG (head, FLAG_MONSTER) && (op->level > head->level)) 1868 && !(head->attacktype & AT_COUNTERSPELL)
1869 && !QUERY_FLAG (head, FLAG_MONSTER)
1870 && (op->level > head->level))
2211 head->destroy (); 1871 head->destroy ();
2212 else 1872 else
2213 switch (head->type) 1873 switch (head->type)
2214 { 1874 {
2215 case SPELL_EFFECT: 1875 case SPELL_EFFECT:
1876 // XXX: Don't affect floor spelleffects. See also XXX comment
1877 // about sanctuary in spell_util.C
1878 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1879 continue;
1880
2216 if (op->level > head->level) 1881 if (op->level > head->level)
2217 head->destroy (); 1882 head->destroy ();
2218 1883
2219 break; 1884 break;
2220 1885
… …
2231 break; 1896 break;
2232 } 1897 }
2233 } 1898 }
2234} 1899}
2235 1900
2236
2237
2238/* cast_consecrate() - a spell to make an altar your god's */ 1901/* cast_consecrate() - a spell to make an altar your god's */
2239int 1902int
2240cast_consecrate (object *op, object *caster, object *spell) 1903cast_consecrate (object *op, object *caster, object *spell)
2241{ 1904{
2242 char buf[MAX_BUF]; 1905 char buf[MAX_BUF];
… …
2254 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1917 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
2255 break; 1918 break;
2256 if (tmp->type == HOLY_ALTAR) 1919 if (tmp->type == HOLY_ALTAR)
2257 { 1920 {
2258 1921
2259 if (tmp->level > caster_level (caster, spell)) 1922 if (tmp->level > casting_level (caster, spell))
2260 { 1923 {
2261 new_draw_info_format (NDI_UNIQUE, 0, op, "You are not powerful enough to reconsecrate the %s", &tmp->name); 1924 new_draw_info_format (NDI_UNIQUE, 0, op, "You are not powerful enough to reconsecrate the %s", &tmp->name);
2262 return 0; 1925 return 0;
2263 } 1926 }
2264 else 1927 else
2265 { 1928 {
2266 /* If we got here, we are consecrating an altar */ 1929 /* If we got here, we are consecrating an altar */
2267 sprintf (buf, "Altar of %s", &god->name); 1930 sprintf (buf, "Altar of %s", &god->name);
2268 tmp->name = buf; 1931 tmp->name = buf;
2269 tmp->level = caster_level (caster, spell); 1932 tmp->level = casting_level (caster, spell);
2270 tmp->other_arch = god->arch; 1933 tmp->other_arch = god->arch;
1934
2271 if (op->type == PLAYER) 1935 if (op->type == PLAYER)
2272 esrv_update_item (UPD_NAME, op, tmp); 1936 esrv_update_item (UPD_NAME, op, tmp);
1937
2273 new_draw_info_format (NDI_UNIQUE, 0, op, "You consecrated the altar to %s!", &god->name); 1938 new_draw_info_format (NDI_UNIQUE, 0, op, "You consecrated the altar to %s!", &god->name);
2274 return 1; 1939 return 1;
2275 } 1940 }
2276 } 1941 }
2277 } 1942 }
… …
2287 * This code was very odd - code early on would only let players use the spell, 1952 * This code was very odd - code early on would only let players use the spell,
2288 * yet the code wass full of player checks. I've presumed that the code 1953 * yet the code wass full of player checks. I've presumed that the code
2289 * that only let players use it was correct, and removed all the other 1954 * that only let players use it was correct, and removed all the other
2290 * player checks. MSW 2003-01-06 1955 * player checks. MSW 2003-01-06
2291 */ 1956 */
2292
2293int 1957int
2294animate_weapon (object *op, object *caster, object *spell, int dir) 1958animate_weapon (object *op, object *caster, object *spell, int dir)
2295{ 1959{
2296 object *weapon, *tmp; 1960 object *weapon, *tmp;
2297 char buf[MAX_BUF]; 1961 char buf[MAX_BUF];
2298 int a, i; 1962 int a, i;
2299 sint16 x, y; 1963 sint16 x, y;
2300 maptile *m; 1964 maptile *m;
2301 materialtype_t *mt;
2302 1965
2303 if (!spell->other_arch) 1966 if (!spell->other_arch)
2304 { 1967 {
2305 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 1968 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
2306 LOG (llevError, "animate_weapon failed: spell %s missing other_arch!\n", &spell->name); 1969 LOG (llevError, "animate_weapon failed: spell %s missing other_arch!\n", &spell->name);
… …
2309 /* exit if it's not a player using this spell. */ 1972 /* exit if it's not a player using this spell. */
2310 if (op->type != PLAYER) 1973 if (op->type != PLAYER)
2311 return 0; 1974 return 0;
2312 1975
2313 /* if player already has a golem, abort */ 1976 /* if player already has a golem, abort */
2314 if (op->contr->ranges[range_golem]) 1977 if (object *golem = op->contr->golem)
2315 { 1978 {
2316 control_golem (op->contr->ranges[range_golem], dir); 1979 control_golem (golem, dir);
2317 return 0; 1980 return 0;
2318 } 1981 }
2319 1982
2320 /* if no direction specified, pick one */ 1983 /* if no direction specified, pick one */
2321 if (!dir) 1984 if (!dir)
2322 dir = find_free_spot (NULL, op->map, op->x, op->y, 1, 9); 1985 dir = find_free_spot (spell->other_arch, op->map, op->x, op->y, 1, 9);
2323 1986
2324 m = op->map; 1987 m = op->map;
2325 x = op->x + freearr_x[dir]; 1988 x = op->x + freearr_x[dir];
2326 y = op->y + freearr_y[dir]; 1989 y = op->y + freearr_y[dir];
2327 1990
2328 /* if there's no place to put the golem, abort */ 1991 /* if there's no place to put the golem, abort */
2329 if ((dir == -1) || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP) || 1992 if (dir < 0 || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP)
2330 ((spell->other_arch->clone.move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->clone.move_type)) 1993 || ((spell->other_arch->move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->move_type))
2331 { 1994 {
2332 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1995 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
2333 return 0; 1996 return 0;
2334 } 1997 }
2335 1998
… …
2339 if (!weapon) 2002 if (!weapon)
2340 { 2003 {
2341 new_draw_info (NDI_BLACK, 0, op, "You must mark a weapon to use with this spell!"); 2004 new_draw_info (NDI_BLACK, 0, op, "You must mark a weapon to use with this spell!");
2342 return 0; 2005 return 0;
2343 } 2006 }
2007
2344 if (spell->race && strcmp (weapon->arch->name, spell->race)) 2008 if (spell->race && weapon->arch->archname != spell->race)
2345 { 2009 {
2346 new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to transform your weapon."); 2010 new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to transform your weapon.");
2347 return 0; 2011 return 0;
2348 } 2012 }
2013
2349 if (weapon->type != WEAPON) 2014 if (weapon->type != WEAPON)
2350 { 2015 {
2351 new_draw_info (NDI_UNIQUE, 0, op, "You need to wield a weapon to animate it."); 2016 new_draw_info (NDI_UNIQUE, 0, op, "You need to wield a weapon to animate it.");
2352 return 0; 2017 return 0;
2353 } 2018 }
2019
2354 if (QUERY_FLAG (weapon, FLAG_APPLIED)) 2020 if (QUERY_FLAG (weapon, FLAG_APPLIED))
2355 { 2021 {
2356 new_draw_info_format (NDI_BLACK, 0, op, "You need to unequip %s before using it in this spell", query_name (weapon)); 2022 new_draw_info_format (NDI_BLACK, 0, op, "You need to unequip %s before using it in this spell", query_name (weapon));
2357 return 0; 2023 return 0;
2358 } 2024 }
2359 2025
2360 if (weapon->nrof > 1) 2026 weapon = weapon->split ();
2361 {
2362 tmp = get_split_ob (weapon, 1);
2363 esrv_send_item (op, weapon);
2364 weapon = tmp;
2365 }
2366 2027
2367 /* create the golem object */ 2028 /* create the golem object */
2368 tmp = arch_to_object (spell->other_arch); 2029 tmp = arch_to_object (spell->other_arch);
2369 2030
2370 /* if animated by a player, give the player control of the golem */ 2031 /* if animated by a player, give the player control of the golem */
2371 CLEAR_FLAG (tmp, FLAG_MONSTER); 2032 CLEAR_FLAG (tmp, FLAG_MONSTER);
2372 SET_FLAG (tmp, FLAG_FRIENDLY);
2373 tmp->stats.exp = 0; 2033 tmp->stats.exp = 0;
2374 add_friendly_object (tmp); 2034 add_friendly_object (tmp);
2375 tmp->type = GOLEM; 2035 tmp->type = GOLEM;
2376 set_owner (tmp, op); 2036 tmp->set_owner (op);
2037 op->contr->golem = tmp;
2377 set_spell_skill (op, caster, spell, tmp); 2038 set_spell_skill (op, caster, spell, tmp);
2378 op->contr->ranges[range_golem] = tmp;
2379 op->contr->shoottype = range_golem;
2380 2039
2381 /* Give the weapon to the golem now. A bit of a hack to check the 2040 /* Give the weapon to the golem now. A bit of a hack to check the
2382 * removed flag - it should only be set if get_split_object was 2041 * removed flag - it should only be set if weapon->split was
2383 * used above. 2042 * used above.
2384 */ 2043 */
2385 if (!QUERY_FLAG (weapon, FLAG_REMOVED)) 2044 if (!QUERY_FLAG (weapon, FLAG_REMOVED))
2386 weapon->remove (); 2045 weapon->remove ();
2387 insert_ob_in_ob (weapon, tmp); 2046
2388 esrv_send_item (op, weapon); 2047 tmp->insert (weapon);
2048
2389 /* To do everything necessary to let a golem use the weapon is a pain, 2049 /* To do everything necessary to let a golem use the weapon is a pain,
2390 * so instead, just set it as equipped (otherwise, we need to update 2050 * so instead, just set it as equipped (otherwise, we need to update
2391 * body_info, skills, etc) 2051 * body_info, skills, etc)
2392 */ 2052 */
2393 SET_FLAG (tmp, FLAG_USE_WEAPON); 2053 SET_FLAG (tmp, FLAG_USE_WEAPON);
2394 SET_FLAG (weapon, FLAG_APPLIED); 2054 SET_FLAG (weapon, FLAG_APPLIED);
2395 fix_player (tmp); 2055 tmp->update_stats ();
2396 2056
2397 /* There used to be 'odd' code that basically seemed to take the absolute 2057 /* There used to be 'odd' code that basically seemed to take the absolute
2398 * value of the weapon->magic an use that. IMO, that doesn't make sense - 2058 * value of the weapon->magic an use that. IMO, that doesn't make sense -
2399 * if you're using a crappy weapon, it shouldn't be as good. 2059 * if you're using a crappy weapon, it shouldn't be as good.
2400 */ 2060 */
… …
2419 2079
2420 /* attacktype */ 2080 /* attacktype */
2421 if (!tmp->attacktype) 2081 if (!tmp->attacktype)
2422 tmp->attacktype = AT_PHYSICAL; 2082 tmp->attacktype = AT_PHYSICAL;
2423 2083
2424 mt = NULL;
2425 if (op->materialname != NULL)
2426 mt = name_to_material (op->materialname); 2084 if (materialtype_t *mt = name_to_material (op->materialname))
2427 if (mt != NULL)
2428 { 2085 {
2429 for (i = 0; i < NROFATTACKS; i++) 2086 for (i = 0; i < NROFATTACKS; i++)
2430 tmp->resist[i] = 50 - (mt->save[i] * 5); 2087 tmp->resist[i] = 50 - (mt->save[i] * 5);
2431 a = mt->save[0]; 2088 a = mt->save[0];
2432 } 2089 }
… …
2434 { 2091 {
2435 for (i = 0; i < NROFATTACKS; i++) 2092 for (i = 0; i < NROFATTACKS; i++)
2436 tmp->resist[i] = 5; 2093 tmp->resist[i] = 5;
2437 a = 10; 2094 a = 10;
2438 } 2095 }
2096
2439 /* Set weapon's immunity */ 2097 /* Set weapon's immunity */
2440 tmp->resist[ATNR_CONFUSION] = 100; 2098 tmp->resist[ATNR_CONFUSION] = 100;
2441 tmp->resist[ATNR_POISON] = 100; 2099 tmp->resist[ATNR_POISON] = 100;
2442 tmp->resist[ATNR_SLOW] = 100; 2100 tmp->resist[ATNR_SLOW] = 100;
2443 tmp->resist[ATNR_PARALYZE] = 100; 2101 tmp->resist[ATNR_PARALYZE] = 100;
… …
2449 2107
2450 /* Improve weapon's armour value according to best save vs. physical of its material */ 2108 /* Improve weapon's armour value according to best save vs. physical of its material */
2451 2109
2452 if (a > 14) 2110 if (a > 14)
2453 a = 14; 2111 a = 14;
2112
2454 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a)); 2113 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a));
2455 2114
2456 /* Determine golem's speed */ 2115 /* Determine golem's speed */
2457 tmp->speed = 0.4 + 0.1 * SP_level_range_adjust (caster, spell); 2116 tmp->set_speed (min (3.33, 0.4 + 0.1 * SP_level_range_adjust (caster, spell)));
2458
2459 if (tmp->speed > 3.33)
2460 tmp->speed = 3.33;
2461 2117
2462 if (!spell->race) 2118 if (!spell->race)
2463 { 2119 {
2464 sprintf (buf, "animated %s", &weapon->name); 2120 sprintf (buf, "animated %s", &weapon->name);
2465 tmp->name = buf; 2121 tmp->name = buf;
… …
2467 tmp->face = weapon->face; 2123 tmp->face = weapon->face;
2468 tmp->animation_id = weapon->animation_id; 2124 tmp->animation_id = weapon->animation_id;
2469 tmp->anim_speed = weapon->anim_speed; 2125 tmp->anim_speed = weapon->anim_speed;
2470 tmp->last_anim = weapon->last_anim; 2126 tmp->last_anim = weapon->last_anim;
2471 tmp->state = weapon->state; 2127 tmp->state = weapon->state;
2472 if (QUERY_FLAG (weapon, FLAG_ANIMATE)) 2128 tmp->flag [FLAG_ANIMATE] = weapon->flag [FLAG_ANIMATE];
2473 {
2474 SET_FLAG (tmp, FLAG_ANIMATE);
2475 }
2476 else
2477 {
2478 CLEAR_FLAG (tmp, FLAG_ANIMATE);
2479 }
2480 update_ob_speed (tmp);
2481 } 2129 }
2482 2130
2483 /* make experience increase in proportion to the strength of the summoned creature. */ 2131 /* make experience increase in proportion to the strength of the summoned creature. */
2484 tmp->stats.exp *= 1 + (MAX (spell->stats.maxgrace, spell->stats.sp) / caster_level (caster, spell)); 2132 tmp->stats.exp *= 1 + (MAX (spell->stats.maxgrace, spell->stats.sp) / casting_level (caster, spell));
2485 2133
2486 tmp->speed_left = -1; 2134 tmp->speed_left = -1;
2487 tmp->x = x;
2488 tmp->y = y;
2489 tmp->direction = dir; 2135 tmp->direction = dir;
2490 insert_ob_in_map (tmp, m, op, 0); 2136
2137 m->insert (tmp, x, y, op);
2491 return 1; 2138 return 1;
2492} 2139}
2493 2140
2494/* cast_daylight() - changes the map darkness level *lower* */ 2141/* cast_daylight() - changes the map darkness level *lower* */
2495 2142
2496/* cast_change_map_lightlevel: Was cast_daylight/nightfall. 2143/* cast_change_map_lightlevel: Was cast_daylight/nightfall.
2497 * This changes the light level for the entire map. 2144 * This changes the light level for the entire map.
2498 */ 2145 */
2499
2500int 2146int
2501cast_change_map_lightlevel (object *op, object *caster, object *spell) 2147cast_change_map_lightlevel (object *op, object *caster, object *spell)
2502{ 2148{
2503 int success; 2149 int success;
2504 2150
2505 if (!op->map) 2151 if (!op->map)
2506 return 0; /* shouldnt happen */ 2152 return 0; /* shouldnt happen */
2507 2153
2508 success = change_map_light (op->map, spell->stats.dam); 2154 success = op->map->change_map_light (spell->stats.dam);
2155
2509 if (!success) 2156 if (!success)
2510 { 2157 {
2511 if (spell->stats.dam < 0) 2158 if (spell->stats.dam < 0)
2512 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here."); 2159 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here.");
2513 else 2160 else
2514 new_draw_info (NDI_UNIQUE, 0, op, "It can be no darker here."); 2161 new_draw_info (NDI_UNIQUE, 0, op, "It can be no darker here.");
2515 } 2162 }
2163
2516 return success; 2164 return success;
2517} 2165}
2518
2519
2520
2521
2522 2166
2523/* create an aura spell object and put it in the player's inventory. 2167/* create an aura spell object and put it in the player's inventory.
2524 * as usual, op is player, caster is the object casting the spell, 2168 * as usual, op is player, caster is the object casting the spell,
2525 * spell is the spell object itself. 2169 * spell is the spell object itself.
2526 */ 2170 */
… …
2538 2182
2539 new_aura->duration = spell->duration + 10 * SP_level_duration_adjust (caster, spell); 2183 new_aura->duration = spell->duration + 10 * SP_level_duration_adjust (caster, spell);
2540 2184
2541 new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 2185 new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
2542 2186
2543 set_owner (new_aura, op);
2544 set_spell_skill (op, caster, spell, new_aura); 2187 set_spell_skill (op, caster, spell, new_aura);
2545 new_aura->attacktype = spell->attacktype; 2188 new_aura->attacktype = spell->attacktype;
2546 2189
2547 new_aura->level = caster_level (caster, spell); 2190 new_aura->level = casting_level (caster, spell);
2191
2548 if (refresh) 2192 if (refresh)
2549 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect."); 2193 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
2550 else 2194 else
2551 new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force."); 2195 new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force.");
2196
2552 insert_ob_in_ob (new_aura, op); 2197 insert_ob_in_ob (new_aura, op);
2198 new_aura->set_owner (op);
2199
2553 return 1; 2200 return 1;
2554} 2201}
2555
2556 2202
2557/* move aura function. An aura is a part of someone's inventory, 2203/* move aura function. An aura is a part of someone's inventory,
2558 * which he carries with him, but which acts on the map immediately 2204 * which he carries with him, but which acts on the map immediately
2559 * around him. 2205 * around him.
2560 * Aura parameters: 2206 * Aura parameters:
2561 * duration: duration counter. 2207 * duration: duration counter.
2562 * attacktype: aura's attacktype 2208 * attacktype: aura's attacktype
2563 * other_arch: archetype to drop where we attack 2209 * other_arch: archetype to drop where we attack
2564 */ 2210 */
2565
2566void 2211void
2567move_aura (object *aura) 2212move_aura (object *aura)
2568{ 2213{
2569 int i, mflags;
2570 object *env;
2571 maptile *m;
2572
2573 /* auras belong in inventories */ 2214 /* auras belong in inventories */
2574 env = aura->env; 2215 object *env = aura->env;
2216 object *owner = aura->owner;
2575 2217
2576 /* no matter what we've gotta remove the aura... 2218 /* no matter what we've gotta remove the aura...
2577 * we'll put it back if its time isn't up. 2219 * we'll put it back if its time isn't up.
2578 */ 2220 */
2579 aura->remove (); 2221 aura->remove ();
… …
2584 aura->destroy (); 2226 aura->destroy ();
2585 return; 2227 return;
2586 } 2228 }
2587 2229
2588 /* auras only exist in inventories */ 2230 /* auras only exist in inventories */
2589 if (env == NULL || env->map == NULL) 2231 if (!env || !env->map)
2590 { 2232 {
2591 aura->destroy (); 2233 aura->destroy ();
2592 return; 2234 return;
2593 } 2235 }
2594
2595 aura->x = env->x;
2596 aura->y = env->y;
2597 2236
2598 /* we need to jump out of the inventory for a bit 2237 /* we need to jump out of the inventory for a bit
2599 * in order to hit the map conveniently. 2238 * in order to hit the map conveniently.
2600 */ 2239 */
2601 insert_ob_in_map (aura, env->map, aura, 0); 2240 aura->insert_at (env, aura);
2602 2241
2603 for (i = 1; i < 9; i++) 2242 for (int i = 1; i < 9; i++)
2604 { 2243 {
2605 sint16 nx, ny; 2244 mapxy pos (env);
2245 pos.move (i);
2606 2246
2607 nx = aura->x + freearr_x[i];
2608 ny = aura->y + freearr_y[i];
2609 mflags = get_map_flags (env->map, &m, nx, ny, &nx, &ny);
2610
2611 /* Consider the movement tyep of the person with the aura as 2247 /* Consider the movement type of the person with the aura as
2612 * movement type of the aura. Eg, if the player is flying, the aura 2248 * movement type of the aura. Eg, if the player is flying, the aura
2613 * is flying also, if player is walking, it is on the ground, etc. 2249 * is flying also, if player is walking, it is on the ground, etc.
2614 */ 2250 */
2615 if (!(mflags & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (env, GET_MAP_MOVE_BLOCK (m, nx, ny)))) 2251 if (pos.normalise () && !(OB_TYPE_MOVE_BLOCK (env, pos->move_block)))
2616 { 2252 {
2617 hit_map (aura, i, aura->attacktype, 0); 2253 hit_map (aura, i, aura->attacktype, 0);
2618 2254
2619 if (aura->other_arch) 2255 if (aura->other_arch)
2620 {
2621 object *new_ob;
2622
2623 new_ob = arch_to_object (aura->other_arch); 2256 pos.insert (arch_to_object (aura->other_arch), aura);
2624 new_ob->x = nx;
2625 new_ob->y = ny;
2626 insert_ob_in_map (new_ob, m, aura, 0);
2627 } 2257 }
2628 }
2629 } 2258 }
2259
2630 /* put the aura back in the player's inventory */ 2260 /* put the aura back in the player's inventory */
2631 aura->remove (); 2261 env->insert (aura);
2632 insert_ob_in_ob (aura, env); 2262 aura->set_owner (owner);
2633} 2263}
2634 2264
2635/* moves the peacemaker spell. 2265/* moves the peacemaker spell.
2636 * op is the piece object. 2266 * op is the piece object.
2637 */ 2267 */
2638
2639void 2268void
2640move_peacemaker (object *op) 2269move_peacemaker (object *op)
2641{ 2270{
2642 object *tmp; 2271 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
2643
2644 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
2645 { 2272 {
2646 int atk_lev, def_lev; 2273 int atk_lev, def_lev;
2647 object *victim = tmp; 2274 object *victim = tmp->head_ ();
2648 2275
2649 if (tmp->head)
2650 victim = tmp->head;
2651 if (!QUERY_FLAG (victim, FLAG_MONSTER)) 2276 if (!QUERY_FLAG (victim, FLAG_MONSTER))
2652 continue; 2277 continue;
2278
2653 if (QUERY_FLAG (victim, FLAG_UNAGGRESSIVE)) 2279 if (QUERY_FLAG (victim, FLAG_UNAGGRESSIVE))
2654 continue; 2280 continue;
2281
2655 if (victim->stats.exp == 0) 2282 if (victim->stats.exp == 0)
2656 continue; 2283 continue;
2657 2284
2658 def_lev = MAX (1, victim->level); 2285 def_lev = MAX (1, victim->level);
2659 atk_lev = MAX (1, op->level); 2286 atk_lev = MAX (1, op->level);
2660 2287
2661 if (rndm (0, atk_lev - 1) > def_lev) 2288 if (rndm (0, atk_lev - 1) > def_lev)
2662 { 2289 {
2663 /* make this sucker peaceful. */ 2290 /* make this sucker peaceful. */
2664 2291
2292 INVOKE_OBJECT (KILL, victim, ARG_OBJECT (op));
2665 change_exp (get_owner (op), victim->stats.exp, op->skill, 0); 2293 change_exp (op->owner, victim->stats.exp, op->skill, 0);
2666 victim->stats.exp = 0; 2294 victim->stats.exp = 0;
2667#if 0 2295#if 0
2668 /* No idea why these were all set to zero - if something 2296 /* No idea why these were all set to zero - if something
2669 * makes this creature agressive, he should still do damage. 2297 * makes this creature agressive, he should still do damage.
2670 */ 2298 */
… …
2676 victim->attack_movement = RANDO2; 2304 victim->attack_movement = RANDO2;
2677 SET_FLAG (victim, FLAG_UNAGGRESSIVE); 2305 SET_FLAG (victim, FLAG_UNAGGRESSIVE);
2678 SET_FLAG (victim, FLAG_RUN_AWAY); 2306 SET_FLAG (victim, FLAG_RUN_AWAY);
2679 SET_FLAG (victim, FLAG_RANDOM_MOVE); 2307 SET_FLAG (victim, FLAG_RANDOM_MOVE);
2680 CLEAR_FLAG (victim, FLAG_MONSTER); 2308 CLEAR_FLAG (victim, FLAG_MONSTER);
2309
2681 if (victim->name) 2310 if (victim->name)
2682 {
2683 new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s no longer feels like fighting.", &victim->name); 2311 new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s no longer feels like fighting.", &victim->name);
2684 } 2312 }
2685 }
2686 } 2313 }
2687} 2314}
2688
2689 2315
2690/* This writes a rune that contains the appropriate message. 2316/* This writes a rune that contains the appropriate message.
2691 * There really isn't any adjustments we make. 2317 * There really isn't any adjustments we make.
2692 */ 2318 */
2693
2694int 2319int
2695write_mark (object *op, object *spell, const char *msg) 2320write_mark (object *op, object *spell, const char *msg)
2696{ 2321{
2697 char rune[HUGE_BUF];
2698 object *tmp;
2699
2700 if (!msg || msg[0] == 0) 2322 if (!msg || msg[0] == 0)
2701 { 2323 {
2702 new_draw_info (NDI_UNIQUE, 0, op, "Write what?"); 2324 new_draw_info (NDI_UNIQUE, 0, op, "Write what?");
2703 return 0; 2325 return 0;
2704 } 2326 }
… …
2707 { 2329 {
2708 new_draw_info (NDI_UNIQUE, 0, op, "Trying to cheat are we?"); 2330 new_draw_info (NDI_UNIQUE, 0, op, "Trying to cheat are we?");
2709 LOG (llevInfo, "write_rune: player %s tried to write bogus rune %s\n", &op->name, msg); 2331 LOG (llevInfo, "write_rune: player %s tried to write bogus rune %s\n", &op->name, msg);
2710 return 0; 2332 return 0;
2711 } 2333 }
2334
2712 if (!spell->other_arch) 2335 if (!spell->other_arch)
2713 return 0; 2336 return 0;
2337
2714 tmp = arch_to_object (spell->other_arch); 2338 object *tmp = arch_to_object (spell->other_arch);
2715
2716 snprintf (rune, sizeof (rune), "%s\n", msg);
2717 2339
2718 tmp->race = op->name; /*Save the owner of the rune */ 2340 tmp->race = op->name; /*Save the owner of the rune */
2719 tmp->msg = rune; 2341 tmp->msg = msg;
2720 tmp->x = op->x; 2342
2721 tmp->y = op->y; 2343 tmp->insert_at (op, op, INS_BELOW_ORIGINATOR);
2722 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR); 2344
2723 return 1; 2345 return 1;
2724} 2346}
2347

Diff Legend

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