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.27 by root, Tue Dec 26 20:04:09 2006 UTC vs.
Revision 1.117 by root, Sat Jan 30 23:30:26 2010 UTC

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

Diff Legend

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