ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/spell_effect.C
(Generate patch)

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.27 by root, Tue Dec 26 20:04:09 2006 UTC vs.
Revision 1.83 by root, Tue May 6 16:55:26 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.
… …
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
… …
317 examine_monster (op, tmp); 314 examine_monster (op, tmp);
318 return 1; 315 return 1;
319 } 316 }
320 } 317 }
321 } 318 }
319
322 new_draw_info (NDI_UNIQUE, 0, op, "You detect nothing."); 320 new_draw_info (NDI_UNIQUE, 0, op, "You detect nothing.");
323 return 1; 321 return 1;
324} 322}
325
326 323
327/* This checks to see if 'pl' is invisible to 'mon'. 324/* This checks to see if 'pl' is invisible to 'mon'.
328 * does race check, undead check, etc 325 * does race check, undead check, etc
329 * Returns TRUE if mon can't see pl, false 326 * Returns TRUE if mon can't see pl, false
330 * otherwise. This doesn't check range, walls, etc. It 327 * otherwise. This doesn't check range, walls, etc. It
… …
332 * pl is invisible. 329 * pl is invisible.
333 */ 330 */
334int 331int
335makes_invisible_to (object *pl, object *mon) 332makes_invisible_to (object *pl, object *mon)
336{ 333{
337
338 if (!pl->invisible) 334 if (!pl->invisible)
339 return 0; 335 return 0;
336
340 if (pl->type == PLAYER) 337 if (pl->type == PLAYER)
341 { 338 {
342 /* If race isn't set, then invisible unless it is undead */ 339 /* If race isn't set, then invisible unless it is undead */
343 if (!pl->contr->invis_race) 340 if (!pl->contr->invis_race)
344 { 341 {
345 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 342 if (QUERY_FLAG (mon, FLAG_UNDEAD))
346 return 0; 343 return 0;
344
347 return 1; 345 return 1;
348 } 346 }
347
349 /* invis_race is set if we get here */ 348 /* invis_race is set if we get here */
350 if (!strcmp (pl->contr->invis_race, "undead") && is_true_undead (mon)) 349 if (!strcmp (pl->contr->invis_race, "undead") && is_true_undead (mon))
351 return 1; 350 return 1;
351
352 /* No race, can't be invisible to it */ 352 /* No race, can't be invisible to it */
353 if (!mon->race) 353 if (!mon->race)
354 return 0; 354 return 0;
355
355 if (strstr (mon->race, pl->contr->invis_race)) 356 if (strstr (mon->race, pl->contr->invis_race))
356 return 1; 357 return 1;
358
357 /* Nothing matched above, return 0 */ 359 /* Nothing matched above, return 0 */
358 return 0; 360 return 0;
359 } 361 }
360 else 362 else
361 { 363 {
… …
374 * normal applies. 376 * normal applies.
375 */ 377 */
376int 378int
377cast_invisible (object *op, object *caster, object *spell_ob) 379cast_invisible (object *op, object *caster, object *spell_ob)
378{ 380{
379 object *tmp;
380
381 if (op->invisible > 1000) 381 if (op->invisible > 1000)
382 { 382 {
383 new_draw_info (NDI_UNIQUE, 0, op, "You can not extend the duration of your invisibility any further"); 383 new_draw_info (NDI_UNIQUE, 0, op, "You can not extend the duration of your invisibility any further");
384 return 0; 384 return 0;
385 } 385 }
… …
401 else 401 else
402 op->contr->tmp_invis = 1; 402 op->contr->tmp_invis = 1;
403 403
404 op->contr->hidden = 0; 404 op->contr->hidden = 0;
405 } 405 }
406
406 if (makes_invisible_to (op, op)) 407 if (makes_invisible_to (op, op))
407 new_draw_info (NDI_UNIQUE, 0, op, "You can't see your hands!"); 408 new_draw_info (NDI_UNIQUE, 0, op, "You can't see your hands!");
408 else 409 else
409 new_draw_info (NDI_UNIQUE, 0, op, "You feel more transparent!"); 410 new_draw_info (NDI_UNIQUE, 0, op, "You feel more transparent!");
410 411
411 update_object (op, UP_OBJ_FACE); 412 update_object (op, UP_OBJ_CHANGE);
412 413
413 /* Only search the active objects - only these should actually do 414 /* Only search the active objects - only these should actually do
414 * harm to the player. 415 * harm to the player.
415 */ 416 */
416 for (tmp = active_objects; tmp != NULL; tmp = tmp->active_next) 417 for_all_actives (tmp)
417 if (tmp->enemy == op) 418 if (tmp->enemy == op)
418 tmp->enemy = NULL; 419 tmp->enemy = 0;
420
419 return 1; 421 return 1;
420} 422}
421 423
422/* earth to dust spell. Basically destroys earthwalls in the area. 424/* earth to dust spell. Basically destroys earthwalls in the area.
423 */ 425 */
… …
451 next = tmp->above; 453 next = tmp->above;
452 if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN)) 454 if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN))
453 hit_player (tmp, 9998, op, AT_PHYSICAL, 0); 455 hit_player (tmp, 9998, op, AT_PHYSICAL, 0);
454 } 456 }
455 } 457 }
458
456 return 1; 459 return 1;
457} 460}
458
459 461
460void 462void
461execute_word_of_recall (object *op) 463execute_word_of_recall (object *op)
462{ 464{
463 object *wor = op; 465 if (object *pl = op->in_player ())
464 466 {
465 while (op != NULL && op->type != PLAYER) 467 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."); 468 new_draw_info (NDI_UNIQUE, 0, pl, "You feel something fizzle inside you.");
471 else 469 else
472 enter_exit (op, wor); 470 pl->player_goto (op->slaying, op->stats.hp, op->stats.sp);
471 }
473 472
474 wor->destroy (); 473 op->destroy ();
475} 474}
476 475
477/* Word of recall causes the player to return 'home'. 476/* Word of recall causes the player to return 'home'.
478 * we put a force into the player object, so that there is a 477 * we put a force into the player object, so that there is a
479 * time delay effect. 478 * time delay effect.
… …
498 { 497 {
499 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 498 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
500 LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n"); 499 LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n");
501 return 0; 500 return 0;
502 } 501 }
502
503 time = spell_ob->duration - SP_level_duration_adjust (caster, spell_ob); 503 time = spell_ob->duration - SP_level_duration_adjust (caster, spell_ob);
504 if (time < 1) 504 if (time < 1)
505 time = 1; 505 time = 1;
506 506
507 /* value of speed really doesn't make much difference, as long as it is 507 /* value of speed really doesn't make much difference, as long as it is
… …
515 515
516 /* If we could take advantage of enter_player_savebed() here, it would be 516 /* If we could take advantage of enter_player_savebed() here, it would be
517 * nice, but until the map load fails, we can't. 517 * nice, but until the map load fails, we can't.
518 */ 518 */
519 EXIT_PATH (dummy) = op->contr->savebed_map; 519 EXIT_PATH (dummy) = op->contr->savebed_map;
520 EXIT_X (dummy) = op->contr->bed_x; 520 EXIT_X (dummy) = op->contr->bed_x;
521 EXIT_Y (dummy) = op->contr->bed_y; 521 EXIT_Y (dummy) = op->contr->bed_y;
522 522
523 (void) insert_ob_in_ob (dummy, op); 523 op->insert (dummy);
524
524 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you."); 525 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you.");
526
525 return 1; 527 return 1;
526} 528}
527 529
528/* cast_wonder 530/* cast_wonder
529 * wonder is really just a spell that will likely cast another 531 * wonder is really just a spell that will likely cast another
… …
562} 564}
563 565
564int 566int
565perceive_self (object *op) 567perceive_self (object *op)
566{ 568{
567 char *cp = describe_item (op, op), buf[MAX_BUF]; 569 const char *cp = describe_item (op, op);
568 archetype *at = archetype::find (ARCH_DEPLETION); 570 archetype *at = archetype::find (ARCH_DEPLETION);
569 object *tmp;
570 int i;
571 571
572 dynbuf_text buf;
573
574 if (player *pl = op->contr)
575 if (object *race = archetype::find (op->race))
576 buf << "You are a " << (pl->gender ? "female" : "male") << " " << &race->name << ".\n";
577
572 tmp = find_god (determine_god (op)); 578 if (object *god = find_god (determine_god (op)))
573 if (tmp) 579 buf << "You worship " << &god->name << ".\n";
574 new_draw_info_format (NDI_UNIQUE, 0, op, "You worship %s", &tmp->name);
575 else 580 else
576 new_draw_info (NDI_UNIQUE, 0, op, "You worship no god"); 581 buf << "You worship no god.\n";
577 582
578 tmp = present_arch_in_ob (at, op); 583 object *tmp = present_arch_in_ob (at, op);
579 584
580 if (*cp == '\0' && tmp == NULL) 585 if (*cp == '\0' && tmp == NULL)
581 new_draw_info (NDI_UNIQUE, 0, op, "You feel very mundane"); 586 buf << "You feel very mundane. ";
582 else 587 else
583 { 588 {
584 new_draw_info (NDI_UNIQUE, 0, op, "You have:"); 589 buf << "You have: " << cp << ".\n";
585 new_draw_info (NDI_UNIQUE, 0, op, cp); 590
586 if (tmp != NULL) 591 if (tmp)
587 {
588 for (i = 0; i < NUM_STATS; i++) 592 for (int i = 0; i < NUM_STATS; i++)
589 { 593 if (tmp->stats.stat (i) < 0)
590 if (get_attr_value (&tmp->stats, i) < 0) 594 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 } 595 }
597 596
598 if (is_dragon_pl (op)) 597 if (is_dragon_pl (op))
599 {
600 /* now grab the 'dragon_ability'-force from the player's inventory */ 598 /* now grab the 'dragon_ability'-force from the player's inventory */
601 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 599 for (tmp = op->inv; tmp; tmp = tmp->below)
602 { 600 {
603 if (tmp->type == FORCE && !strcmp (tmp->arch->name, "dragon_ability_force")) 601 if (tmp->type == FORCE && tmp->arch->archname == shstr_dragon_ability_force)
604 { 602 {
605 if (tmp->stats.exp == 0) 603 if (tmp->stats.exp == 0)
606 {
607 sprintf (buf, "Your metabolism isn't focused on anything."); 604 buf << "Your metabolism isn't focused on anything.\n";
608 }
609 else 605 else
610 {
611 sprintf (buf, "Your metabolism is focused on %s.", change_resist_msg[tmp->stats.exp]); 606 buf << "Your metabolism is focused on " << change_resist_msg[tmp->stats.exp] << ".\n";
612 } 607
613 new_draw_info (NDI_UNIQUE, 0, op, buf);
614 break; 608 break;
615 } 609 }
616 } 610 }
617 }
618 return 1;
619}
620 611
621/* int cast_create_town_portal (object *op, object *caster, int dir) 612 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 sint16 exitx, exity;
645 maptile *exitmap;
646 int op_level;
647 613
648 /* Check to see if the map the player is currently on is a per player unique 614 new_draw_info (NDI_UNIQUE, 0, op, buf.linearise ());
649 * map. This can be determined in that per player unique maps have the
650 * full pathname listed.
651 */
652 if (!strncmp (op->map->path, settings.localdir, strlen (settings.localdir)) && settings.create_home_portals != TRUE)
653 {
654 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You can't cast that here.\n");
655 return 0;
656 }
657
658 /* The first thing to do is to check if we have a marked destination
659 * dummy is used to make a check inventory for the force
660 */
661 dummy = arch_to_object (spell->other_arch);
662 if (dummy == NULL)
663 {
664 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
665 LOG (llevError, "object::create failed (force in cast_create_town_portal for %s!\n", &op->name);
666 return 0;
667 }
668
669 force = check_inv_recursive (op, dummy);
670
671 if (force == NULL)
672 {
673 /* Here we know there is no destination marked up.
674 * We have 2 things to do:
675 * 1. Mark the destination in the player inventory.
676 * 2. Let the player know it worked.
677 */
678 dummy->name = op->map->path;
679 EXIT_X (dummy) = op->x;
680 EXIT_Y (dummy) = op->y;
681 insert_ob_in_ob (dummy, op);
682 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You fix this place in your mind.\nYou feel you are able to come here from anywhere.");
683 return 1;
684 }
685
686 dummy->destroy ();
687
688 /* Here we know where the town portal should go to
689 * We should kill any existing portal associated with the player.
690 * Than we should create the 2 portals.
691 * For each of them, we need:
692 * - To create the portal with the name of the player+destination map
693 * - set the owner of the town portal
694 * - To mark the position of the portal in the player's inventory
695 * for easier destruction.
696 *
697 * The mark works has follow:
698 * slaying: Existing town portal
699 * hp, sp : x & y of the associated portal
700 * name : name of the portal
701 * race : map the portal is in
702 */
703
704 /* First step: killing existing town portals */
705 dummy = get_archetype (spell->race);
706 if (dummy == NULL)
707 {
708 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
709 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
710 return 0;
711 }
712
713 perm_portal = archetype::find (spell->slaying);
714
715 /* To kill a town portal, we go trough the player's inventory,
716 * for each marked portal in player's inventory,
717 * -We try load the associated map (if impossible, consider the portal destructed)
718 * -We find any portal in the specified location.
719 * If it has the good name, we destruct it.
720 * -We destruct the force indicating that portal.
721 */
722 while ((old_force = check_inv_recursive (op, dummy)))
723 {
724 exitx = EXIT_X (old_force);
725 exity = EXIT_Y (old_force);
726 LOG (llevDebug, "Trying to kill a portal in %s (%d,%d)\n", &old_force->race, exitx, exity);
727
728 if (!strncmp (old_force->race, settings.localdir, strlen (settings.localdir)))
729 exitmap = ready_map_name (old_force->race, MAP_PLAYER_UNIQUE);
730 else
731 exitmap = ready_map_name (old_force->race, 0);
732
733 if (exitmap)
734 {
735 tmp = present_arch (perm_portal, exitmap, exitx, exity);
736 while (tmp)
737 {
738 if (tmp->name == old_force->name)
739 {
740 tmp->destroy ();
741 break;
742 }
743
744 tmp = tmp->above;
745 }
746 }
747
748 old_force->destroy ();
749 LOG (llevDebug, "\n");
750 }
751
752 dummy->destroy ();
753
754 /* Creating the portals.
755 * The very first thing to do is to ensure
756 * access to the destination map.
757 * If we can't, don't fizzle. Simply warn player.
758 * This ensure player pays his mana for the spell
759 * because HE is responsible of forgotting.
760 * 'force' is the destination of the town portal, which we got
761 * from the players inventory above.
762 */
763
764 /* Ensure exit map is loaded */
765 if (!strncmp (force->name, settings.localdir, strlen (settings.localdir)))
766 exitmap = ready_map_name (force->name, MAP_PLAYER_UNIQUE);
767 else
768 exitmap = ready_map_name (force->name, 0);
769
770 /* If we were unable to load (ex. random map deleted), warn player */
771 if (exitmap == NULL)
772 {
773 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Something strange happens.\nYou can't remember where to go!?");
774 force->destroy ();
775 return 1;
776 }
777
778 op_level = caster_level (caster, spell);
779 if (op_level < 15)
780 snprintf (portal_message, 1024,
781 "\nThe air moves around you and\na huge smell of ammonia\nsurounds you as you pass\nthrough %s's tiny portal\nPouah!\n",
782 &op->name);
783 else if (op_level < 30)
784 snprintf (portal_message, 1024,
785 "\n%s's portal smells of ozone.\nYou do a lot of movements and finally pass\nthrough the small hole in the air\n", &op->name);
786 else if (op_level < 60)
787 snprintf (portal_message, 1024, "\nA shining door opens in the air in front of you,\nshowing you the path to another place.\n");
788 else
789 snprintf (portal_message, 1024, "\nAs you walk through %s's portal, flowers come out\nfrom the ground around you.\nYou feel awed.\n",
790 &op->name);
791
792 /* Create a portal in front of player
793 * dummy contain the portal and
794 * force contain the track to kill it later
795 */
796
797 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &force->name);
798 dummy = get_archetype (spell->slaying); /*The portal */
799 if (dummy == NULL)
800 {
801 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
802 LOG (llevError, "object::create failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name);
803 return 0;
804 }
805
806 EXIT_PATH (dummy) = force->name;
807 EXIT_X (dummy) = EXIT_X (force);
808 EXIT_Y (dummy) = EXIT_Y (force);
809 dummy->name = dummy->name_pl = portal_name;
810 dummy->msg = portal_message;
811 dummy->race = op->name; /*Save the owner of the portal */
812 cast_create_obj (op, caster, dummy, 0);
813
814 /* Now we need to to create a town portal marker inside the player
815 * object, so on future castings, we can know that he has an active
816 * town portal.
817 */
818 tmp = get_archetype (spell->race);
819 if (tmp == NULL)
820 {
821 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
822 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
823 return 0;
824 }
825
826 tmp->race = op->map->path;
827 tmp->name = portal_name;
828 EXIT_X (tmp) = dummy->x;
829 EXIT_Y (tmp) = dummy->y;
830 op->insert (tmp);
831
832 /* Create a portal in the destination map
833 * dummy contain the portal and
834 * force the track to kill it later
835 * the 'force' variable still contains the 'reminder' of
836 * where this portal goes to.
837 */
838 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, op->map->path);
839 dummy = get_archetype (spell->slaying); /*The portal */
840 if (dummy == NULL)
841 {
842 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
843 LOG (llevError, "object::create failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name);
844 return 0;
845 }
846
847 EXIT_PATH (dummy) = op->map->path;
848 EXIT_X (dummy) = op->x;
849 EXIT_Y (dummy) = op->y;
850 dummy->name = dummy->name_pl = portal_name;
851 dummy->msg = portal_message;
852 dummy->race = op->name; /*Save the owner of the portal */
853 exitmap->insert (dummy, EXIT_X (force), EXIT_Y (force), op);
854
855 /* Now we create another town portal marker that
856 * points back to the one we just made
857 */
858 tmp = get_archetype (spell->race);
859 if (tmp == NULL)
860 {
861 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
862 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
863 return 0;
864 }
865
866 tmp->race = force->name;
867 tmp->name = portal_name;
868 EXIT_X (tmp) = dummy->x;
869 EXIT_Y (tmp) = dummy->y;
870 insert_ob_in_ob (tmp, op);
871
872 /* Describe the player what happened
873 */
874 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You see air moving and showing you the way home.");
875 force->destroy ();
876 615
877 return 1; 616 return 1;
878} 617}
879 618
880/* This creates magic walls. Really, it can create most any object, 619/* This creates magic walls. Really, it can create most any object,
… …
978 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name); 717 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name);
979 return 0; 718 return 0;
980 } 719 }
981 720
982 /* If this is a spellcasting wall, need to insert the spell object */ 721 /* If this is a spellcasting wall, need to insert the spell object */
983 if (tmp->other_arch && tmp->other_arch->clone.type == SPELL) 722 if (tmp->other_arch && tmp->other_arch->type == SPELL)
984 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp); 723 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp);
985 724
986 /* This code causes the wall to extend some distance in 725 /* This code causes the wall to extend some distance in
987 * each direction, or until an obstruction is encountered. 726 * each direction, or until an obstruction is encountered.
988 * posblocked and negblocked help determine how far the 727 * posblocked and negblocked help determine how far the
… …
1008 { 747 {
1009 object *tmp2 = tmp->clone (); 748 object *tmp2 = tmp->clone ();
1010 m->insert (tmp2, x, y, op); 749 m->insert (tmp2, x, y, op);
1011 750
1012 /* If this is a spellcasting wall, need to insert the spell object */ 751 /* If this is a spellcasting wall, need to insert the spell object */
1013 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 752 if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
1014 tmp2->insert (arch_to_object (tmp2->other_arch)); 753 tmp2->insert (arch_to_object (tmp2->other_arch));
1015 754
1016 } 755 }
1017 else 756 else
1018 posblocked = 1; 757 posblocked = 1;
… …
1025 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !negblocked) 764 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !negblocked)
1026 { 765 {
1027 object *tmp2 = tmp->clone (); 766 object *tmp2 = tmp->clone ();
1028 m->insert (tmp2, x, y, op); 767 m->insert (tmp2, x, y, op);
1029 768
1030 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 769 if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
1031 tmp2->insert (arch_to_object (tmp2->other_arch)); 770 tmp2->insert (arch_to_object (tmp2->other_arch));
1032 } 771 }
1033 else 772 else
1034 negblocked = 1; 773 negblocked = 1;
1035 } 774 }
… …
1151 890
1152 op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */ 891 op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */
1153 return 1; 892 return 1;
1154} 893}
1155 894
1156
1157/* cast_heal: Heals something. 895/* cast_heal: Heals something.
1158 * op is the caster. 896 * op is the caster.
1159 * dir is the direction he is casting it in. 897 * dir is the direction he is casting it in.
1160 * spell is the spell object. 898 * spell is the spell object.
1161 */ 899 */
… …
1167 object *poison; 905 object *poison;
1168 int heal = 0, success = 0; 906 int heal = 0, success = 0;
1169 907
1170 tmp = find_target_for_friendly_spell (op, dir); 908 tmp = find_target_for_friendly_spell (op, dir);
1171 909
1172 if (tmp == NULL) 910 if (!tmp)
1173 return 0; 911 return 0;
1174 912
1175 /* Figure out how many hp this spell might cure. 913 /* Figure out how many hp this spell might cure.
1176 * could be zero if this spell heals effects, not damage. 914 * could be zero if this spell heals effects, not damage.
1177 */ 915 */
… …
1180 heal += random_roll (spell->stats.hp, 6, op, PREFER_HIGH) + spell->stats.hp; 918 heal += random_roll (spell->stats.hp, 6, op, PREFER_HIGH) + spell->stats.hp;
1181 919
1182 if (heal) 920 if (heal)
1183 { 921 {
1184 if (tmp->stats.hp >= tmp->stats.maxhp) 922 if (tmp->stats.hp >= tmp->stats.maxhp)
1185 {
1186 new_draw_info (NDI_UNIQUE, 0, tmp, "You are already fully healed."); 923 new_draw_info (NDI_UNIQUE, 0, tmp, "You are already fully healed.");
1187 }
1188 else 924 else
1189 { 925 {
1190 /* See how many points we actually heal. Instead of messages 926 /* See how many points we actually heal. Instead of messages
1191 * based on type of spell, we instead do messages based 927 * based on type of spell, we instead do messages based
1192 * on amount of damage healed. 928 * on amount of damage healed.
1193 */ 929 */
1194 if (heal > (tmp->stats.maxhp - tmp->stats.hp)) 930 if (heal > tmp->stats.maxhp - tmp->stats.hp)
1195 heal = tmp->stats.maxhp - tmp->stats.hp; 931 heal = tmp->stats.maxhp - tmp->stats.hp;
932
1196 tmp->stats.hp += heal; 933 tmp->stats.hp += heal;
1197 934
1198 if (tmp->stats.hp >= tmp->stats.maxhp) 935 if (tmp->stats.hp >= tmp->stats.maxhp)
1199 {
1200 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel just fine!"); 936 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel just fine!");
1201 }
1202 else if (heal > 50) 937 else if (heal > 50)
1203 {
1204 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds close!"); 938 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds close!");
1205 }
1206 else if (heal > 25) 939 else if (heal > 25)
1207 {
1208 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds mostly close."); 940 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds mostly close.");
1209 }
1210 else if (heal > 10) 941 else if (heal > 10)
1211 {
1212 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds start to fade."); 942 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds start to fade.");
1213 }
1214 else 943 else
1215 {
1216 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds start to close."); 944 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds start to close.");
1217 } 945
1218 success = 1; 946 success = 1;
1219 } 947 }
1220 } 948 }
949
1221 if (spell->attacktype & AT_DISEASE) 950 if (spell->attacktype & AT_DISEASE)
1222 if (cure_disease (tmp, op)) 951 if (cure_disease (tmp, op, spell))
1223 success = 1; 952 success = 1;
1224 953
1225 if (spell->attacktype & AT_POISON) 954 if (spell->attacktype & AT_POISON)
1226 { 955 {
1227 at = archetype::find ("poisoning"); 956 at = archetype::find ("poisoning");
… …
1231 success = 1; 960 success = 1;
1232 new_draw_info (NDI_UNIQUE, 0, tmp, "Your body feels cleansed"); 961 new_draw_info (NDI_UNIQUE, 0, tmp, "Your body feels cleansed");
1233 poison->stats.food = 1; 962 poison->stats.food = 1;
1234 } 963 }
1235 } 964 }
965
1236 if (spell->attacktype & AT_CONFUSION) 966 if (spell->attacktype & AT_CONFUSION)
1237 { 967 {
1238 poison = present_in_ob_by_name (FORCE, "confusion", tmp); 968 poison = present_in_ob_by_name (FORCE, "confusion", tmp);
1239 if (poison) 969 if (poison)
1240 { 970 {
1241 success = 1; 971 success = 1;
1242 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 972 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
1243 poison->duration = 1; 973 poison->duration = 1;
1244 } 974 }
1245 } 975 }
976
1246 if (spell->attacktype & AT_BLIND) 977 if (spell->attacktype & AT_BLIND)
1247 { 978 {
1248 at = archetype::find ("blindness"); 979 at = archetype::find ("blindness");
1249 poison = present_arch_in_ob (at, tmp); 980 poison = present_arch_in_ob (at, tmp);
1250 if (poison) 981 if (poison)
… …
1252 success = 1; 983 success = 1;
1253 new_draw_info (NDI_UNIQUE, 0, tmp, "Your vision begins to return."); 984 new_draw_info (NDI_UNIQUE, 0, tmp, "Your vision begins to return.");
1254 poison->stats.food = 1; 985 poison->stats.food = 1;
1255 } 986 }
1256 } 987 }
988
1257 if (spell->last_sp && tmp->stats.sp < tmp->stats.maxsp) 989 if (spell->last_sp && tmp->stats.sp < tmp->stats.maxsp)
1258 { 990 {
1259 tmp->stats.sp += spell->last_sp; 991 tmp->stats.sp += spell->last_sp;
1260 if (tmp->stats.sp > tmp->stats.maxsp) 992 if (tmp->stats.sp > tmp->stats.maxsp)
1261 tmp->stats.sp = tmp->stats.maxsp; 993 tmp->stats.sp = tmp->stats.maxsp;
1262 success = 1; 994 success = 1;
1263 new_draw_info (NDI_UNIQUE, 0, tmp, "Magical energy surges through your body!"); 995 new_draw_info (NDI_UNIQUE, 0, tmp, "Magical energy surges through your body!");
1264 } 996 }
997
1265 if (spell->last_grace && tmp->stats.grace < tmp->stats.maxgrace) 998 if (spell->last_grace && tmp->stats.grace < tmp->stats.maxgrace)
1266 { 999 {
1267 tmp->stats.grace += spell->last_grace; 1000 tmp->stats.grace += spell->last_grace;
1268 if (tmp->stats.grace > tmp->stats.maxgrace) 1001 if (tmp->stats.grace > tmp->stats.maxgrace)
1269 tmp->stats.grace = tmp->stats.maxgrace; 1002 tmp->stats.grace = tmp->stats.maxgrace;
1270 success = 1; 1003 success = 1;
1271 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel redeemed with your god!"); 1004 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel redeemed with your god!");
1272 } 1005 }
1006
1273 if (spell->stats.food && tmp->stats.food < 999) 1007 if (spell->stats.food && tmp->stats.food < 999)
1274 { 1008 {
1275 tmp->stats.food += spell->stats.food; 1009 tmp->stats.food += spell->stats.food;
1010
1276 if (tmp->stats.food > 999) 1011 if (tmp->stats.food > 999)
1277 tmp->stats.food = 999; 1012 tmp->stats.food = 999;
1013
1278 success = 1; 1014 success = 1;
1279 /* We could do something a bit better like the messages for healing above */ 1015 /* We could do something a bit better like the messages for healing above */
1280 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel your belly fill with food"); 1016 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel your belly fill with food");
1281 } 1017 }
1018
1282 return success; 1019 return success;
1283} 1020}
1284
1285 1021
1286/* This is used for the spells that gain stats. There are no spells 1022/* This is used for the spells that gain stats. There are no spells
1287 * right now that icnrease wis/int/pow on a temp basis, so no 1023 * right now that icnrease wis/int/pow on a temp basis, so no
1288 * good comments for those. 1024 * good comments for those.
1289 */ 1025 */
1290static const char *const no_gain_msgs[NUM_STATS] = { 1026static const char *const no_gain_msgs[NUM_STATS] = {
1291 "You grow no stronger.", 1027 "You grow no stronger.",
1292 "You grow no more agile.", 1028 "You grow no more agile.",
1293 "You don't feel any healthier.", 1029 "You don't feel any healthier.",
1294 "no wis", 1030 "You didn't grow any more intelligent.",
1031 "You do not feel any wiser.",
1032 "You don't feel any more powerful."
1295 "You are no easier to look at.", 1033 "You are no easier to look at.",
1296 "no int",
1297 "no pow"
1298}; 1034};
1299 1035
1300int 1036int
1301cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent) 1037cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent)
1302{ 1038{
… …
1353 } 1089 }
1354 else 1090 else
1355 { 1091 {
1356 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); 1092 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1357 } 1093 }
1094
1358 return 1; 1095 return 1;
1359 } 1096 }
1097
1360 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1098 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1361 force->speed = 1.0; 1099 force->speed = 1.0;
1362 force->speed_left = -1.0; 1100 force->speed_left = -1.0;
1363 SET_FLAG (force, FLAG_APPLIED); 1101 SET_FLAG (force, FLAG_APPLIED);
1364 1102
… …
1370 force->resist[i] = spell_ob->resist[i] + SP_level_dam_adjust (caster, spell_ob); 1108 force->resist[i] = spell_ob->resist[i] + SP_level_dam_adjust (caster, spell_ob);
1371 if (force->resist[i] > 100) 1109 if (force->resist[i] > 100)
1372 force->resist[i] = 100; 1110 force->resist[i] = 100;
1373 } 1111 }
1374 } 1112 }
1113
1375 if (spell_ob->stats.hp) 1114 if (spell_ob->stats.hp)
1376 force->stats.hp = spell_ob->stats.hp + SP_level_dam_adjust (caster, spell_ob); 1115 force->stats.hp = spell_ob->stats.hp + SP_level_dam_adjust (caster, spell_ob);
1377 1116
1378 if (tmp->type == PLAYER) 1117 if (tmp->type == PLAYER)
1379 { 1118 {
1380 /* Stat adjustment spells */ 1119 /* Stat adjustment spells */
1381 for (i = 0; i < NUM_STATS; i++) 1120 for (i = 0; i < NUM_STATS; i++)
1382 { 1121 {
1383 sint8 stat = get_attr_value (&spell_ob->stats, i), k, sm; 1122 if (sint8 stat = spell_ob->stats.stat (i))
1384
1385 if (stat)
1386 { 1123 {
1387 sm = 0; 1124 sint8 sm = 0;
1388 for (k = 0; k < stat; k++) 1125 for (sint8 k = 0; k < stat; k++)
1389 sm += rndm (1, 3); 1126 sm += rndm (1, 3);
1390 1127
1391 if ((get_attr_value (&tmp->stats, i) + sm) > (15 + 5 * stat)) 1128 if (tmp->stats.stat (i) + sm > 15 + 5 * stat)
1392 { 1129 sm = max (0, (15 + 5 * stat) - tmp->stats.stat (i));
1393 sm = (15 + 5 * stat) - get_attr_value (&tmp->stats, i); 1130
1394 if (sm < 0) 1131 force->stats.stat (i) = sm;
1395 sm = 0; 1132
1396 }
1397 set_attr_value (&force->stats, i, sm);
1398 if (!sm) 1133 if (!sm)
1399 new_draw_info (NDI_UNIQUE, 0, op, no_gain_msgs[i]); 1134 new_draw_info (NDI_UNIQUE, 0, op, no_gain_msgs[i]);
1400 } 1135 }
1401 } 1136 }
1402 } 1137 }
… …
1423 force->attacktype = spell_ob->attacktype; 1158 force->attacktype = spell_ob->attacktype;
1424 1159
1425 insert_ob_in_ob (force, tmp); 1160 insert_ob_in_ob (force, tmp);
1426 change_abil (tmp, force); /* Mostly to display any messages */ 1161 change_abil (tmp, force); /* Mostly to display any messages */
1427 tmp->update_stats (); 1162 tmp->update_stats ();
1163
1428 return 1; 1164 return 1;
1429} 1165}
1430 1166
1431/* This used to be part of cast_change_ability, but it really didn't make 1167/* This used to be part of cast_change_ability, but it really didn't make
1432 * a lot of sense, since most of the values it derives are from the god 1168 * a lot of sense, since most of the values it derives are from the god
1433 * of the caster. 1169 * of the caster.
1434 */ 1170 */
1435
1436int 1171int
1437cast_bless (object *op, object *caster, object *spell_ob, int dir) 1172cast_bless (object *op, object *caster, object *spell_ob, int dir)
1438{ 1173{
1439 int i; 1174 int i;
1440 object *god = find_god (determine_god (op)), *tmp2, *force = NULL, *tmp; 1175 object *god = find_god (determine_god (op)), *tmp2, *force = NULL, *tmp;
… …
1535 insert_ob_in_ob (force, tmp); 1270 insert_ob_in_ob (force, tmp);
1536 tmp->update_stats (); 1271 tmp->update_stats ();
1537 return 1; 1272 return 1;
1538} 1273}
1539 1274
1540
1541
1542/* Alchemy code by Mark Wedel 1275/* Alchemy code by Mark Wedel
1543 * 1276 *
1544 * This code adds a new spell, called alchemy. Alchemy will turn 1277 * This code adds a new spell, called alchemy. Alchemy will turn
1545 * objects to gold nuggets, the value of the gold nuggets being 1278 * objects to pyrite ("false gold"), henceforth called gold nuggets.
1546 * about 90% of that of the item itself. It uses the value of the
1547 * object before charisma adjustments, because the nuggets themselves
1548 * will be will be adjusted by charisma when sold.
1549 * 1279 *
1550 * Large nuggets are worth 25 gp each (base). You will always get 1280 * The value of the gold nuggets being about 90% of that of the item
1551 * the maximum number of large nuggets you could get. 1281 * itself. It uses the value of the object before charisma adjustments,
1552 * Small nuggets are worth 1 gp each (base). You will get from 0 1282 * because the nuggets themselves will be will be adjusted by charisma
1553 * to the max amount of small nuggets as you could get. 1283 * when sold.
1554 *
1555 * For example, if an item is worth 110 gold, you will get
1556 * 4 large nuggets, and from 0-10 small nuggets.
1557 * 1284 *
1558 * There is also a chance (1:30) that you will get nothing at all 1285 * There is also a chance (1:30) that you will get nothing at all
1559 * for the object. There is also a maximum weight that will be 1286 * for the object. There is also a maximum weight that will be
1560 * alchemied. 1287 * alchemised.
1561 */ 1288 */
1562
1563/* I didn't feel like passing these as arguements to the
1564 * two functions that need them. Real values are put in them
1565 * when the spell is cast, and these are freed when the spell
1566 * is finished.
1567 */
1568static object *small, *large;
1569
1570static void 1289static void
1571alchemy_object (object *obj, int *small_nuggets, int *large_nuggets, int *weight) 1290alchemy_object (object *obj, uint64 &total_value, int &total_weight)
1572{ 1291{
1573 uint64 value = query_cost (obj, NULL, F_TRUE); 1292 uint64 value = query_cost (obj, NULL, F_TRUE);
1574 1293
1575 /* Give third price when we alchemy money (This should hopefully 1294 /* Give third price when we alchemy money (this should hopefully
1576 * make it so that it isn't worth it to alchemy money, sell 1295 * make it so that it isn't worth it to alchemy money, sell
1577 * the nuggets, alchemy the gold from that, etc. 1296 * the nuggets, alchemy the gold from that, etc.
1578 * Otherwise, give 9 silver on the gold for other objects, 1297 * Otherwise, give 9 silver on the gold for other objects,
1579 * so that it would still be more affordable to haul 1298 * so that it would still be more affordable to haul
1580 * the stuff back to town. 1299 * the stuff back to town.
1581 */ 1300 */
1582
1583 if (QUERY_FLAG (obj, FLAG_UNPAID)) 1301 if (QUERY_FLAG (obj, FLAG_UNPAID))
1584 value = 0; 1302 value = 0;
1585 else if (obj->type == MONEY || obj->type == GEM) 1303 else if (obj->type == MONEY || obj->type == GEM)
1586 value /= 3; 1304 value /= 3;
1587 else 1305 else
1588 value = (value * 9) / 10; 1306 value = value * 9 / 10;
1589 1307
1590 value /= 4; // fix by GHJ, don't understand, pcg
1591
1592 if ((obj->value > 0) && rndm (0, 29)) 1308 if (obj->value > 0 && rndm (0, 29))
1593 { 1309 total_value += value;
1594 int count;
1595 1310
1596 count = value / large->value;
1597 *large_nuggets += count;
1598 value -= (uint64) count *(uint64) large->value;
1599
1600 count = value / small->value;
1601 *small_nuggets += count;
1602 }
1603
1604 /* Turn 25 small nuggets into 1 large nugget. If the value
1605 * of large nuggets is not evenly divisable by the small nugget
1606 * value, take off an extra small_nugget (Assuming small_nuggets!=0)
1607 */
1608 if (*small_nuggets * small->value >= large->value)
1609 {
1610 (*large_nuggets)++;
1611 *small_nuggets -= large->value / small->value;
1612 if (*small_nuggets && large->value % small->value)
1613 (*small_nuggets)--;
1614 }
1615 weight += obj->weight; 1311 total_weight += obj->total_weight ();
1312
1616 obj->destroy (); 1313 obj->destroy ();
1617} 1314}
1618 1315
1619static void
1620update_map (object *op, maptile *m, int small_nuggets, int large_nuggets, int x, int y)
1621{
1622 object *tmp;
1623 int flag = 0;
1624
1625 /* Put any nuggets below the player, but we can only pass this
1626 * flag if we are on the same space as the player
1627 */
1628 if (x == op->x && y == op->y && op->map == m)
1629 flag = INS_BELOW_ORIGINATOR;
1630
1631 if (small_nuggets)
1632 {
1633 tmp = small->clone ();
1634 tmp->nrof = small_nuggets;
1635 m->insert (tmp, x, y, op, flag);
1636 }
1637
1638 if (large_nuggets)
1639 {
1640 tmp = large->clone ();
1641 tmp->nrof = large_nuggets;
1642 m->insert (tmp, x, y, op, flag);
1643 }
1644}
1645
1646int 1316int
1647alchemy (object *op, object *caster, object *spell_ob) 1317alchemy (object *op, object *caster, object *spell_ob)
1648{ 1318{
1649 int x, y, weight = 0, weight_max, large_nuggets, small_nuggets, mflags;
1650 sint16 nx, ny;
1651 object *next, *tmp;
1652 maptile *mp;
1653
1654 if (op->type != PLAYER) 1319 if (op->type != PLAYER)
1655 return 0; 1320 return 0;
1656 1321
1322 archetype *nugget[3];
1323
1324 nugget[0] = archetype::find ("pyrite3");
1325 nugget[1] = archetype::find ("pyrite2");
1326 nugget[2] = archetype::find ("pyrite");
1327
1657 /* Put a maximum weight of items that can be alchemied. Limits the power 1328 /* Put a maximum weight of items that can be alchemised. Limits the power
1658 * some, and also prevents people from alcheming every table/chair/clock 1329 * some, and also prevents people from alchemising every table/chair/clock
1659 * in sight 1330 * in sight
1660 */ 1331 */
1661 weight_max = spell_ob->duration + +SP_level_duration_adjust (caster, spell_ob); 1332 int duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
1662 weight_max *= 1000; 1333 int weight_max = duration * 1000;
1663 small = get_archetype ("smallnugget"), large = get_archetype ("largenugget"); 1334 uint64 value_max = duration * 1000;
1664 1335
1336 int weight = 0;
1337
1665 for (y = op->y - 1; y <= op->y + 1; y++) 1338 for (int y = op->y - 1; y <= op->y + 1; y++)
1666 { 1339 {
1667 for (x = op->x - 1; x <= op->x + 1; x++) 1340 for (int x = op->x - 1; x <= op->x + 1; x++)
1668 { 1341 {
1342 uint64 value = 0;
1343
1669 nx = x; 1344 sint16 nx = x;
1670 ny = y; 1345 sint16 ny = y;
1671 1346
1672 mp = op->map; 1347 maptile *mp = op->map;
1673 1348
1674 mflags = get_map_flags (mp, &mp, nx, ny, &nx, &ny); 1349 int mflags = get_map_flags (mp, &mp, nx, ny, &nx, &ny);
1675 1350
1676 if (mflags & (P_OUT_OF_MAP | P_NO_MAGIC)) 1351 if (mflags & (P_OUT_OF_MAP | P_NO_MAGIC))
1677 continue; 1352 continue;
1678 1353
1679 /* Treat alchemy a little differently - most spell effects 1354 /* Treat alchemy a little differently - most spell effects
… …
1681 * ground level effect. 1356 * ground level effect.
1682 */ 1357 */
1683 if (GET_MAP_MOVE_BLOCK (mp, nx, ny) & MOVE_WALK) 1358 if (GET_MAP_MOVE_BLOCK (mp, nx, ny) & MOVE_WALK)
1684 continue; 1359 continue;
1685 1360
1686 small_nuggets = 0; 1361 for (object *next, *tmp = mp->at (nx, ny).bot; tmp; tmp = next)
1687 large_nuggets = 0;
1688
1689 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = next)
1690 { 1362 {
1691 next = tmp->above; 1363 next = tmp->above;
1364
1692 if (tmp->weight > 0 && !QUERY_FLAG (tmp, FLAG_NO_PICK) && 1365 if (tmp->weight > 0 && !QUERY_FLAG (tmp, FLAG_NO_PICK) &&
1693 !QUERY_FLAG (tmp, FLAG_ALIVE) && !QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) 1366 !QUERY_FLAG (tmp, FLAG_ALIVE) && !QUERY_FLAG (tmp, FLAG_IS_CAULDRON))
1694 { 1367 {
1695
1696 if (tmp->inv) 1368 if (tmp->inv)
1697 { 1369 {
1698 object *next1, *tmp1; 1370 object *next1, *tmp1;
1699 1371
1700 for (tmp1 = tmp->inv; tmp1 != NULL; tmp1 = next1) 1372 for (tmp1 = tmp->inv; tmp1; tmp1 = next1)
1701 { 1373 {
1702 next1 = tmp1->below; 1374 next1 = tmp1->below;
1703 if (tmp1->weight > 0 && !QUERY_FLAG (tmp1, FLAG_NO_PICK) && 1375 if (tmp1->weight > 0 && !QUERY_FLAG (tmp1, FLAG_NO_PICK) &&
1704 !QUERY_FLAG (tmp1, FLAG_ALIVE) && !QUERY_FLAG (tmp1, FLAG_IS_CAULDRON)) 1376 !QUERY_FLAG (tmp1, FLAG_ALIVE) && !QUERY_FLAG (tmp1, FLAG_IS_CAULDRON))
1705 alchemy_object (tmp1, &small_nuggets, &large_nuggets, &weight); 1377 alchemy_object (tmp1, value, weight);
1706 } 1378 }
1707 } 1379 }
1380
1708 alchemy_object (tmp, &small_nuggets, &large_nuggets, &weight); 1381 alchemy_object (tmp, value, weight);
1709 1382
1710 if (weight > weight_max) 1383 if (weight > weight_max)
1711 { 1384 break;
1712 update_map (op, mp, small_nuggets, large_nuggets, nx, ny);
1713 large->destroy ();
1714 small->destroy ();
1715 return 1;
1716 } 1385 }
1717 } /* is alchemable object */
1718 } /* process all objects on this space */
1719
1720 /* Insert all the nuggets at one time. This probably saves time, but
1721 * it also prevents us from alcheming nuggets that were just created
1722 * with this spell.
1723 */ 1386 }
1724 update_map (op, mp, small_nuggets, large_nuggets, nx, ny); 1387
1388 value -= rndm (value >> 4);
1389 value = min (value, value_max);
1390
1391 for (int i = 0; i < sizeof (nugget) / sizeof (nugget [0]); ++i)
1392 if (int nrof = value / nugget [i]->value)
1393 {
1394 value -= nrof * nugget[i]->value;
1395
1396 object *tmp = arch_to_object (nugget[i]);
1397 tmp->nrof = nrof;
1398 tmp->flag [FLAG_IDENTIFIED] = true;
1399 op->map->insert (tmp, x, y, op, 0);
1725 } 1400 }
1726 }
1727 1401
1728 large->destroy (); 1402 if (weight > weight_max)
1729 small->destroy (); 1403 goto bailout;
1730 /* reset this so that if player standing on a big pile of stuff, 1404 }
1731 * it is redrawn properly. 1405 }
1732 */ 1406
1733 op->contr->ns->look_position = 0; 1407bailout:
1734 return 1; 1408 return 1;
1735} 1409}
1736
1737 1410
1738/* This function removes the cursed/damned status on equipped 1411/* This function removes the cursed/damned status on equipped
1739 * items. 1412 * items.
1740 */ 1413 */
1741int 1414int
… …
1748 if (QUERY_FLAG (tmp, FLAG_APPLIED) && 1421 if (QUERY_FLAG (tmp, FLAG_APPLIED) &&
1749 ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) || 1422 ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) ||
1750 (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED)))) 1423 (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED))))
1751 { 1424 {
1752 was_one++; 1425 was_one++;
1426
1753 if (tmp->level <= caster_level (caster, spell)) 1427 if (tmp->level <= caster_level (caster, spell))
1754 { 1428 {
1755 success++; 1429 success++;
1756 if (QUERY_FLAG (spell, FLAG_DAMNED)) 1430 if (QUERY_FLAG (spell, FLAG_DAMNED))
1757 CLEAR_FLAG (tmp, FLAG_DAMNED); 1431 CLEAR_FLAG (tmp, FLAG_DAMNED);
1758 1432
1759 CLEAR_FLAG (tmp, FLAG_CURSED); 1433 CLEAR_FLAG (tmp, FLAG_CURSED);
1760 CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED); 1434 CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED);
1761 tmp->value = 0; /* Still can't sell it */ 1435 tmp->value = 0; /* Still can't sell it */
1762 if (op->type == PLAYER) 1436
1437 if (object *pl = tmp->visible_to ())
1763 esrv_send_item (op, tmp); 1438 esrv_update_item (UPD_FLAGS, pl, tmp);
1764 } 1439 }
1765 } 1440 }
1766 1441
1767 if (op->type == PLAYER) 1442 if (op->type == PLAYER)
1768 { 1443 {
1769 if (success) 1444 if (success)
1770 {
1771 new_draw_info (NDI_UNIQUE, 0, op, "You feel like some of your items are looser now."); 1445 new_draw_info (NDI_UNIQUE, 0, op, "You feel like some of your items are looser now.");
1772 }
1773 else 1446 else
1774 { 1447 {
1775 if (was_one) 1448 if (was_one)
1776 new_draw_info (NDI_UNIQUE, 0, op, "You failed to remove the curse."); 1449 new_draw_info (NDI_UNIQUE, 0, op, "You failed to remove the curse.");
1777 else 1450 else
… …
1781 1454
1782 return success; 1455 return success;
1783} 1456}
1784 1457
1785/* Identifies objects in the players inventory/on the ground */ 1458/* Identifies objects in the players inventory/on the ground */
1786
1787int 1459int
1788cast_identify (object *op, object *caster, object *spell) 1460cast_identify (object *op, object *caster, object *spell)
1789{ 1461{
1462 dynbuf_text buf;
1790 object *tmp; 1463 object *tmp;
1791 int success = 0, num_ident;
1792 1464
1793 num_ident = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1465 int num_ident = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1794 1466
1795 if (num_ident < 1) 1467 if (num_ident < 1)
1796 num_ident = 1; 1468 num_ident = 1;
1797 1469
1798 for (tmp = op->inv; tmp; tmp = tmp->below) 1470 for (tmp = op->inv; tmp; tmp = tmp->below)
… …
1801 { 1473 {
1802 identify (tmp); 1474 identify (tmp);
1803 1475
1804 if (op->type == PLAYER) 1476 if (op->type == PLAYER)
1805 { 1477 {
1806 new_draw_info_format (NDI_UNIQUE, 0, op, "You have %s.", long_desc (tmp, op)); 1478 buf.printf ("You identified: %s.\n\n", long_desc (tmp, op));
1807 1479
1808 if (tmp->msg) 1480 if (tmp->msg)
1809 { 1481 buf << "The item has a story:\n\n" << tmp->msg << "\n\n";
1810 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1811 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1812 }
1813 } 1482 }
1814 1483
1815 num_ident--; 1484 num_ident--;
1816 success = 1;
1817 if (!num_ident) 1485 if (!num_ident)
1818 break; 1486 break;
1819 } 1487 }
1820 } 1488 }
1821 1489
… …
1823 * stuff on the floor. Only identify stuff on the floor if the spell 1491 * stuff on the floor. Only identify stuff on the floor if the spell
1824 * was not fully used. 1492 * was not fully used.
1825 */ 1493 */
1826 if (num_ident) 1494 if (num_ident)
1827 { 1495 {
1828 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1496 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
1829 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp)) 1497 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))
1830 { 1498 {
1831 identify (tmp); 1499 identify (tmp);
1832 1500
1833 if (op->type == PLAYER) 1501 if (object *pl = tmp->visible_to ())
1834 { 1502 {
1835 new_draw_info_format (NDI_UNIQUE, 0, op, "On the ground is %s.", long_desc (tmp, op)); 1503 buf.printf ("On the ground you identified: %s.\n\n", long_desc (tmp, op));
1836 1504
1837 if (tmp->msg) 1505 if (tmp->msg)
1838 { 1506 buf << "The item has a story:\n\n" << tmp->msg << "\n\n";
1839 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1840 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1841 }
1842
1843 esrv_send_item (op, tmp);
1844 } 1507 }
1845 1508
1846 num_ident--; 1509 num_ident--;
1847 success = 1;
1848 if (!num_ident) 1510 if (!num_ident)
1849 break; 1511 break;
1850 } 1512 }
1851 } 1513 }
1852 1514
1853 if (!success) 1515 if (buf.empty ())
1854 new_draw_info (NDI_UNIQUE, 0, op, "You can't reach anything unidentified."); 1516 {
1517 op->failmsg ("You can't reach anything unidentified.");
1518 return 0;
1519 }
1855 else 1520 else
1521 {
1522 if (op->contr)
1523 op->contr->infobox (MSG_CHANNEL ("identify"), buf);
1524
1856 spell_effect (spell, op->x, op->y, op->map, op); 1525 spell_effect (spell, op->x, op->y, op->map, op);
1857 1526 return 1;
1858 return success; 1527 }
1859} 1528}
1860 1529
1861int 1530int
1862cast_detection (object *op, object *caster, object *spell, object *skill) 1531cast_detection (object *op, object *caster, object *spell, object *skill)
1863{ 1532{
… …
2005 1674
2006 /* Now process objects in the players inventory if detect curse or magic */ 1675 /* Now process objects in the players inventory if detect curse or magic */
2007 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) || QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL)) 1676 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) || QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL))
2008 { 1677 {
2009 done_one = 0; 1678 done_one = 0;
1679
2010 for (tmp = op->inv; tmp; tmp = tmp->below) 1680 for (tmp = op->inv; tmp; tmp = tmp->below)
2011 { 1681 {
2012 if (!tmp->invisible && !QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1682 if (!tmp->invisible && !QUERY_FLAG (tmp, FLAG_IDENTIFIED))
2013 { 1683 {
2014 if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) && is_magical (tmp) && !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)) 1684 if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) && is_magical (tmp) && !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL))
2015 { 1685 {
2016 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL); 1686 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL);
2017 if (op->type == PLAYER) 1687
1688 if (object *pl = tmp->visible_to ())
2018 esrv_send_item (op, tmp); 1689 esrv_update_item (UPD_FLAGS, pl, tmp);
2019 } 1690 }
1691
2020 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && 1692 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) &&
2021 (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))) 1693 (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))
2022 { 1694 {
2023 SET_FLAG (tmp, FLAG_KNOWN_CURSED); 1695 SET_FLAG (tmp, FLAG_KNOWN_CURSED);
2024 if (op->type == PLAYER) 1696
1697 if (object *pl = tmp->visible_to ())
2025 esrv_send_item (op, tmp); 1698 esrv_update_item (UPD_FLAGS, pl, tmp);
2026 } 1699 }
2027 } /* if item is not identified */ 1700 } /* if item is not identified */
2028 } /* for the players inventory */ 1701 } /* for the players inventory */
2029 } /* if detect magic/curse and object is a player */ 1702 } /* if detect magic/curse and object is a player */
1703
2030 return 1; 1704 return 1;
2031} 1705}
2032 1706
2033 1707
2034/** 1708/**
… …
2190 /* Basically, if the object is magical and not counterspell, 1864 /* Basically, if the object is magical and not counterspell,
2191 * we will more or less remove the object. Don't counterspell 1865 * we will more or less remove the object. Don't counterspell
2192 * monsters either. 1866 * monsters either.
2193 */ 1867 */
2194 1868
2195 if (head->attacktype & AT_MAGIC && 1869 if (head->attacktype & AT_MAGIC
2196 !(head->attacktype & AT_COUNTERSPELL) && !QUERY_FLAG (head, FLAG_MONSTER) && (op->level > head->level)) 1870 && !(head->attacktype & AT_COUNTERSPELL)
1871 && !QUERY_FLAG (head, FLAG_MONSTER)
1872 && (op->level > head->level))
2197 head->destroy (); 1873 head->destroy ();
2198 else 1874 else
2199 switch (head->type) 1875 switch (head->type)
2200 { 1876 {
2201 case SPELL_EFFECT: 1877 case SPELL_EFFECT:
1878 // XXX: Don't affect floor spelleffects. See also XXX comment
1879 // about sanctuary in spell_util.C
1880 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1881 continue;
1882
2202 if (op->level > head->level) 1883 if (op->level > head->level)
2203 head->destroy (); 1884 head->destroy ();
2204 1885
2205 break; 1886 break;
2206 1887
… …
2217 break; 1898 break;
2218 } 1899 }
2219 } 1900 }
2220} 1901}
2221 1902
2222
2223
2224/* cast_consecrate() - a spell to make an altar your god's */ 1903/* cast_consecrate() - a spell to make an altar your god's */
2225int 1904int
2226cast_consecrate (object *op, object *caster, object *spell) 1905cast_consecrate (object *op, object *caster, object *spell)
2227{ 1906{
2228 char buf[MAX_BUF]; 1907 char buf[MAX_BUF];
… …
2252 /* If we got here, we are consecrating an altar */ 1931 /* If we got here, we are consecrating an altar */
2253 sprintf (buf, "Altar of %s", &god->name); 1932 sprintf (buf, "Altar of %s", &god->name);
2254 tmp->name = buf; 1933 tmp->name = buf;
2255 tmp->level = caster_level (caster, spell); 1934 tmp->level = caster_level (caster, spell);
2256 tmp->other_arch = god->arch; 1935 tmp->other_arch = god->arch;
1936
2257 if (op->type == PLAYER) 1937 if (op->type == PLAYER)
2258 esrv_update_item (UPD_NAME, op, tmp); 1938 esrv_update_item (UPD_NAME, op, tmp);
1939
2259 new_draw_info_format (NDI_UNIQUE, 0, op, "You consecrated the altar to %s!", &god->name); 1940 new_draw_info_format (NDI_UNIQUE, 0, op, "You consecrated the altar to %s!", &god->name);
2260 return 1; 1941 return 1;
2261 } 1942 }
2262 } 1943 }
2263 } 1944 }
… …
2273 * This code was very odd - code early on would only let players use the spell, 1954 * This code was very odd - code early on would only let players use the spell,
2274 * yet the code wass full of player checks. I've presumed that the code 1955 * yet the code wass full of player checks. I've presumed that the code
2275 * that only let players use it was correct, and removed all the other 1956 * that only let players use it was correct, and removed all the other
2276 * player checks. MSW 2003-01-06 1957 * player checks. MSW 2003-01-06
2277 */ 1958 */
2278
2279int 1959int
2280animate_weapon (object *op, object *caster, object *spell, int dir) 1960animate_weapon (object *op, object *caster, object *spell, int dir)
2281{ 1961{
2282 object *weapon, *tmp; 1962 object *weapon, *tmp;
2283 char buf[MAX_BUF]; 1963 char buf[MAX_BUF];
2284 int a, i; 1964 int a, i;
2285 sint16 x, y; 1965 sint16 x, y;
2286 maptile *m; 1966 maptile *m;
2287 materialtype_t *mt;
2288 1967
2289 if (!spell->other_arch) 1968 if (!spell->other_arch)
2290 { 1969 {
2291 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 1970 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
2292 LOG (llevError, "animate_weapon failed: spell %s missing other_arch!\n", &spell->name); 1971 LOG (llevError, "animate_weapon failed: spell %s missing other_arch!\n", &spell->name);
… …
2295 /* exit if it's not a player using this spell. */ 1974 /* exit if it's not a player using this spell. */
2296 if (op->type != PLAYER) 1975 if (op->type != PLAYER)
2297 return 0; 1976 return 0;
2298 1977
2299 /* if player already has a golem, abort */ 1978 /* if player already has a golem, abort */
2300 if (op->contr->ranges[range_golem]) 1979 if (object *golem = op->contr->golem)
2301 { 1980 {
2302 control_golem (op->contr->ranges[range_golem], dir); 1981 control_golem (golem, dir);
2303 return 0; 1982 return 0;
2304 } 1983 }
2305 1984
2306 /* if no direction specified, pick one */ 1985 /* if no direction specified, pick one */
2307 if (!dir) 1986 if (!dir)
… …
2311 x = op->x + freearr_x[dir]; 1990 x = op->x + freearr_x[dir];
2312 y = op->y + freearr_y[dir]; 1991 y = op->y + freearr_y[dir];
2313 1992
2314 /* if there's no place to put the golem, abort */ 1993 /* if there's no place to put the golem, abort */
2315 if ((dir == -1) || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP) || 1994 if ((dir == -1) || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP) ||
2316 ((spell->other_arch->clone.move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->clone.move_type)) 1995 ((spell->other_arch->move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->move_type))
2317 { 1996 {
2318 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1997 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
2319 return 0; 1998 return 0;
2320 } 1999 }
2321 2000
… …
2325 if (!weapon) 2004 if (!weapon)
2326 { 2005 {
2327 new_draw_info (NDI_BLACK, 0, op, "You must mark a weapon to use with this spell!"); 2006 new_draw_info (NDI_BLACK, 0, op, "You must mark a weapon to use with this spell!");
2328 return 0; 2007 return 0;
2329 } 2008 }
2330 if (spell->race && strcmp (weapon->arch->name, spell->race)) 2009 if (spell->race && strcmp (weapon->arch->archname, spell->race))
2331 { 2010 {
2332 new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to transform your weapon."); 2011 new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to transform your weapon.");
2333 return 0; 2012 return 0;
2334 } 2013 }
2335 if (weapon->type != WEAPON) 2014 if (weapon->type != WEAPON)
… …
2341 { 2020 {
2342 new_draw_info_format (NDI_BLACK, 0, op, "You need to unequip %s before using it in this spell", query_name (weapon)); 2021 new_draw_info_format (NDI_BLACK, 0, op, "You need to unequip %s before using it in this spell", query_name (weapon));
2343 return 0; 2022 return 0;
2344 } 2023 }
2345 2024
2346 if (weapon->nrof > 1) 2025 weapon = weapon->split ();
2347 {
2348 tmp = get_split_ob (weapon, 1);
2349 esrv_send_item (op, weapon);
2350 weapon = tmp;
2351 }
2352 2026
2353 /* create the golem object */ 2027 /* create the golem object */
2354 tmp = arch_to_object (spell->other_arch); 2028 tmp = arch_to_object (spell->other_arch);
2355 2029
2356 /* if animated by a player, give the player control of the golem */ 2030 /* if animated by a player, give the player control of the golem */
2357 CLEAR_FLAG (tmp, FLAG_MONSTER); 2031 CLEAR_FLAG (tmp, FLAG_MONSTER);
2358 SET_FLAG (tmp, FLAG_FRIENDLY);
2359 tmp->stats.exp = 0; 2032 tmp->stats.exp = 0;
2360 add_friendly_object (tmp); 2033 add_friendly_object (tmp);
2361 tmp->type = GOLEM; 2034 tmp->type = GOLEM;
2362 tmp->set_owner (op); 2035 tmp->set_owner (op);
2036 op->contr->golem = tmp;
2363 set_spell_skill (op, caster, spell, tmp); 2037 set_spell_skill (op, caster, spell, tmp);
2364 op->contr->ranges[range_golem] = tmp;
2365 op->contr->shoottype = range_golem;
2366 2038
2367 /* Give the weapon to the golem now. A bit of a hack to check the 2039 /* Give the weapon to the golem now. A bit of a hack to check the
2368 * removed flag - it should only be set if get_split_object was 2040 * removed flag - it should only be set if weapon->split was
2369 * used above. 2041 * used above.
2370 */ 2042 */
2371 if (!QUERY_FLAG (weapon, FLAG_REMOVED)) 2043 if (!QUERY_FLAG (weapon, FLAG_REMOVED))
2372 weapon->remove (); 2044 weapon->remove ();
2373 insert_ob_in_ob (weapon, tmp); 2045
2374 esrv_send_item (op, weapon); 2046 tmp->insert (weapon);
2047
2375 /* To do everything necessary to let a golem use the weapon is a pain, 2048 /* To do everything necessary to let a golem use the weapon is a pain,
2376 * so instead, just set it as equipped (otherwise, we need to update 2049 * so instead, just set it as equipped (otherwise, we need to update
2377 * body_info, skills, etc) 2050 * body_info, skills, etc)
2378 */ 2051 */
2379 SET_FLAG (tmp, FLAG_USE_WEAPON); 2052 SET_FLAG (tmp, FLAG_USE_WEAPON);
… …
2405 2078
2406 /* attacktype */ 2079 /* attacktype */
2407 if (!tmp->attacktype) 2080 if (!tmp->attacktype)
2408 tmp->attacktype = AT_PHYSICAL; 2081 tmp->attacktype = AT_PHYSICAL;
2409 2082
2410 mt = NULL;
2411 if (op->materialname != NULL)
2412 mt = name_to_material (op->materialname); 2083 if (materialtype_t *mt = name_to_material (op->materialname))
2413 if (mt != NULL)
2414 { 2084 {
2415 for (i = 0; i < NROFATTACKS; i++) 2085 for (i = 0; i < NROFATTACKS; i++)
2416 tmp->resist[i] = 50 - (mt->save[i] * 5); 2086 tmp->resist[i] = 50 - (mt->save[i] * 5);
2417 a = mt->save[0]; 2087 a = mt->save[0];
2418 } 2088 }
… …
2420 { 2090 {
2421 for (i = 0; i < NROFATTACKS; i++) 2091 for (i = 0; i < NROFATTACKS; i++)
2422 tmp->resist[i] = 5; 2092 tmp->resist[i] = 5;
2423 a = 10; 2093 a = 10;
2424 } 2094 }
2095
2425 /* Set weapon's immunity */ 2096 /* Set weapon's immunity */
2426 tmp->resist[ATNR_CONFUSION] = 100; 2097 tmp->resist[ATNR_CONFUSION] = 100;
2427 tmp->resist[ATNR_POISON] = 100; 2098 tmp->resist[ATNR_POISON] = 100;
2428 tmp->resist[ATNR_SLOW] = 100; 2099 tmp->resist[ATNR_SLOW] = 100;
2429 tmp->resist[ATNR_PARALYZE] = 100; 2100 tmp->resist[ATNR_PARALYZE] = 100;
… …
2435 2106
2436 /* Improve weapon's armour value according to best save vs. physical of its material */ 2107 /* Improve weapon's armour value according to best save vs. physical of its material */
2437 2108
2438 if (a > 14) 2109 if (a > 14)
2439 a = 14; 2110 a = 14;
2111
2440 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a)); 2112 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a));
2441 2113
2442 /* Determine golem's speed */ 2114 /* Determine golem's speed */
2443 tmp->set_speed (min (3.33, 0.4 + 0.1 * SP_level_range_adjust (caster, spell))); 2115 tmp->set_speed (min (3.33, 0.4 + 0.1 * SP_level_range_adjust (caster, spell)));
2444 2116
… …
2477 int success; 2149 int success;
2478 2150
2479 if (!op->map) 2151 if (!op->map)
2480 return 0; /* shouldnt happen */ 2152 return 0; /* shouldnt happen */
2481 2153
2482 success = change_map_light (op->map, spell->stats.dam); 2154 success = op->map->change_map_light (spell->stats.dam);
2155
2483 if (!success) 2156 if (!success)
2484 { 2157 {
2485 if (spell->stats.dam < 0) 2158 if (spell->stats.dam < 0)
2486 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here."); 2159 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here.");
2487 else 2160 else
2488 new_draw_info (NDI_UNIQUE, 0, op, "It can be no darker here."); 2161 new_draw_info (NDI_UNIQUE, 0, op, "It can be no darker here.");
2489 } 2162 }
2490 return success; 2163 return success;
2491} 2164}
2492
2493
2494
2495
2496 2165
2497/* create an aura spell object and put it in the player's inventory. 2166/* create an aura spell object and put it in the player's inventory.
2498 * as usual, op is player, caster is the object casting the spell, 2167 * as usual, op is player, caster is the object casting the spell,
2499 * spell is the spell object itself. 2168 * spell is the spell object itself.
2500 */ 2169 */
… …
2512 2181
2513 new_aura->duration = spell->duration + 10 * SP_level_duration_adjust (caster, spell); 2182 new_aura->duration = spell->duration + 10 * SP_level_duration_adjust (caster, spell);
2514 2183
2515 new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 2184 new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
2516 2185
2517 new_aura->set_owner (op);
2518 set_spell_skill (op, caster, spell, new_aura); 2186 set_spell_skill (op, caster, spell, new_aura);
2519 new_aura->attacktype = spell->attacktype; 2187 new_aura->attacktype = spell->attacktype;
2520 2188
2521 new_aura->level = caster_level (caster, spell); 2189 new_aura->level = caster_level (caster, spell);
2190
2522 if (refresh) 2191 if (refresh)
2523 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect."); 2192 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
2524 else 2193 else
2525 new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force."); 2194 new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force.");
2195
2526 insert_ob_in_ob (new_aura, op); 2196 insert_ob_in_ob (new_aura, op);
2197 new_aura->set_owner (op);
2198
2527 return 1; 2199 return 1;
2528} 2200}
2529
2530 2201
2531/* move aura function. An aura is a part of someone's inventory, 2202/* move aura function. An aura is a part of someone's inventory,
2532 * which he carries with him, but which acts on the map immediately 2203 * which he carries with him, but which acts on the map immediately
2533 * around him. 2204 * around him.
2534 * Aura parameters: 2205 * Aura parameters:
2535 * duration: duration counter. 2206 * duration: duration counter.
2536 * attacktype: aura's attacktype 2207 * attacktype: aura's attacktype
2537 * other_arch: archetype to drop where we attack 2208 * other_arch: archetype to drop where we attack
2538 */ 2209 */
2539
2540void 2210void
2541move_aura (object *aura) 2211move_aura (object *aura)
2542{ 2212{
2543 int i, mflags;
2544 object *env;
2545 maptile *m;
2546
2547 /* auras belong in inventories */ 2213 /* auras belong in inventories */
2548 env = aura->env; 2214 object *env = aura->env;
2215 object *owner = aura->owner;
2549 2216
2550 /* no matter what we've gotta remove the aura... 2217 /* no matter what we've gotta remove the aura...
2551 * we'll put it back if its time isn't up. 2218 * we'll put it back if its time isn't up.
2552 */ 2219 */
2553 aura->remove (); 2220 aura->remove ();
… …
2558 aura->destroy (); 2225 aura->destroy ();
2559 return; 2226 return;
2560 } 2227 }
2561 2228
2562 /* auras only exist in inventories */ 2229 /* auras only exist in inventories */
2563 if (env == NULL || env->map == NULL) 2230 if (!env || !env->map)
2564 { 2231 {
2565 aura->destroy (); 2232 aura->destroy ();
2566 return; 2233 return;
2567 } 2234 }
2568 2235
2569 /* we need to jump out of the inventory for a bit 2236 /* we need to jump out of the inventory for a bit
2570 * in order to hit the map conveniently. 2237 * in order to hit the map conveniently.
2571 */ 2238 */
2572 aura->insert_at (env, aura); 2239 aura->insert_at (env, aura);
2573 2240
2574 for (i = 1; i < 9; i++) 2241 for (int i = 1; i < 9; i++)
2575 { 2242 {
2576 sint16 nx, ny; 2243 mapxy pos (env);
2244 pos.move (i);
2577 2245
2578 nx = aura->x + freearr_x[i];
2579 ny = aura->y + freearr_y[i];
2580 mflags = get_map_flags (env->map, &m, nx, ny, &nx, &ny);
2581
2582 /* Consider the movement tyep of the person with the aura as 2246 /* Consider the movement type of the person with the aura as
2583 * movement type of the aura. Eg, if the player is flying, the aura 2247 * movement type of the aura. Eg, if the player is flying, the aura
2584 * is flying also, if player is walking, it is on the ground, etc. 2248 * is flying also, if player is walking, it is on the ground, etc.
2585 */ 2249 */
2586 if (!(mflags & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (env, GET_MAP_MOVE_BLOCK (m, nx, ny)))) 2250 if (pos.normalise () && !(OB_TYPE_MOVE_BLOCK (env, pos->move_block)))
2587 { 2251 {
2588 hit_map (aura, i, aura->attacktype, 0); 2252 hit_map (aura, i, aura->attacktype, 0);
2589 2253
2590 if (aura->other_arch) 2254 if (aura->other_arch)
2591 m->insert (arch_to_object (aura->other_arch), nx, ny, aura); 2255 pos.insert (arch_to_object (aura->other_arch), aura);
2592 } 2256 }
2593 } 2257 }
2594 2258
2595 /* put the aura back in the player's inventory */ 2259 /* put the aura back in the player's inventory */
2596 aura->remove (); 2260 env->insert (aura);
2597 insert_ob_in_ob (aura, env); 2261 aura->set_owner (owner);
2598} 2262}
2599 2263
2600/* moves the peacemaker spell. 2264/* moves the peacemaker spell.
2601 * op is the piece object. 2265 * op is the piece object.
2602 */ 2266 */
2603
2604void 2267void
2605move_peacemaker (object *op) 2268move_peacemaker (object *op)
2606{ 2269{
2607 object *tmp; 2270 object *tmp;
2608 2271
2609 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 2272 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
2610 { 2273 {
2611 int atk_lev, def_lev; 2274 int atk_lev, def_lev;
2612 object *victim = tmp; 2275 object *victim = tmp->head_ ();
2613 2276
2614 if (tmp->head)
2615 victim = tmp->head;
2616 if (!QUERY_FLAG (victim, FLAG_MONSTER)) 2277 if (!QUERY_FLAG (victim, FLAG_MONSTER))
2617 continue; 2278 continue;
2279
2618 if (QUERY_FLAG (victim, FLAG_UNAGGRESSIVE)) 2280 if (QUERY_FLAG (victim, FLAG_UNAGGRESSIVE))
2619 continue; 2281 continue;
2282
2620 if (victim->stats.exp == 0) 2283 if (victim->stats.exp == 0)
2621 continue; 2284 continue;
2622 2285
2623 def_lev = MAX (1, victim->level); 2286 def_lev = MAX (1, victim->level);
2624 atk_lev = MAX (1, op->level); 2287 atk_lev = MAX (1, op->level);
2625 2288
2626 if (rndm (0, atk_lev - 1) > def_lev) 2289 if (rndm (0, atk_lev - 1) > def_lev)
2627 { 2290 {
2628 /* make this sucker peaceful. */ 2291 /* make this sucker peaceful. */
2629 2292
2293 INVOKE_OBJECT (KILL, victim, ARG_OBJECT (op));
2630 change_exp (op->owner, victim->stats.exp, op->skill, 0); 2294 change_exp (op->owner, victim->stats.exp, op->skill, 0);
2631 victim->stats.exp = 0; 2295 victim->stats.exp = 0;
2632#if 0 2296#if 0
2633 /* No idea why these were all set to zero - if something 2297 /* No idea why these were all set to zero - if something
2634 * makes this creature agressive, he should still do damage. 2298 * makes this creature agressive, he should still do damage.
… …
2641 victim->attack_movement = RANDO2; 2305 victim->attack_movement = RANDO2;
2642 SET_FLAG (victim, FLAG_UNAGGRESSIVE); 2306 SET_FLAG (victim, FLAG_UNAGGRESSIVE);
2643 SET_FLAG (victim, FLAG_RUN_AWAY); 2307 SET_FLAG (victim, FLAG_RUN_AWAY);
2644 SET_FLAG (victim, FLAG_RANDOM_MOVE); 2308 SET_FLAG (victim, FLAG_RANDOM_MOVE);
2645 CLEAR_FLAG (victim, FLAG_MONSTER); 2309 CLEAR_FLAG (victim, FLAG_MONSTER);
2310
2646 if (victim->name) 2311 if (victim->name)
2647 {
2648 new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s no longer feels like fighting.", &victim->name); 2312 new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s no longer feels like fighting.", &victim->name);
2649 }
2650 } 2313 }
2651 } 2314 }
2652} 2315}
2653 2316
2654 2317

Diff Legend

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