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.107 by elmex, Thu Sep 17 16:53:15 2009 UTC

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

Diff Legend

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