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.28 by root, Sat Dec 30 10:16:11 2006 UTC vs.
Revision 1.93 by root, Wed Dec 31 17:35:38 2008 UTC

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

Diff Legend

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