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.3 by root, Sat Aug 26 23:36:34 2006 UTC vs.
Revision 1.117 by root, Sat Jan 30 23:30:26 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines