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.50 by root, Sat May 12 08:36:35 2007 UTC vs.
Revision 1.127 by root, Wed Apr 14 02:31:24 2010 UTC

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

Diff Legend

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