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

Diff Legend

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