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

Diff Legend

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