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.71 by root, Wed Aug 29 20:40:25 2007 UTC vs.
Revision 1.95 by root, Thu Jan 1 16:05:13 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * 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
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
… …
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
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>
… …
61{ 61{
62 object *wand, *tmp; 62 object *wand, *tmp;
63 int ncharges; 63 int ncharges;
64 64
65 wand = find_marked_object (op); 65 wand = find_marked_object (op);
66 if (wand == NULL || wand->type != WAND) 66 if (!wand || wand->type != WAND)
67 { 67 {
68 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.");
69 return 0; 69 return 0;
70 } 70 }
71 if (!(random_roll (0, 3, op, PREFER_HIGH))) 71 if (!(random_roll (0, 3, op, PREFER_HIGH)))
72 { 72 {
73 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));
74 op->play_sound (sound_find ("ob_explode")); 74 op->play_sound (sound_find ("ob_explode"));
75 esrv_del_item (op->contr, wand->count);
76 wand->destroy (); 75 wand->destroy ();
77 tmp = get_archetype ("fireball"); 76 tmp = get_archetype ("fireball");
78 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;
79 78
80 if (!tmp->stats.dam) 79 if (!tmp->stats.dam)
… …
125 * create nonnmagic arrows, or even -1, etc... 124 * create nonnmagic arrows, or even -1, etc...
126 */ 125 */
127int 126int
128cast_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)
129{ 128{
130 int missile_plus = 0, bonus_plus = 0; 129 int bonus_plus = 0;
131 const char *missile_name; 130 const char *missile_name = "arrow";
132 object *tmp, *missile;
133 131
134 missile_name = "arrow";
135
136 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 132 for (object *tmp = op->inv; tmp; tmp = tmp->below)
137 if (tmp->type == BOW && QUERY_FLAG (tmp, FLAG_APPLIED)) 133 if (tmp->type == BOW && QUERY_FLAG (tmp, FLAG_APPLIED))
138 missile_name = tmp->race; 134 missile_name = tmp->race;
139 135
140 missile_plus = spell->stats.dam + SP_level_dam_adjust (caster, spell); 136 int missile_plus = spell->stats.dam + SP_level_dam_adjust (caster, spell);
141 137
142 if (archetype::find (missile_name) == NULL) 138 archetype *missile_arch = archetype::find (missile_name);
139
140 if (!missile_arch)
143 { 141 {
144 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);
145 return 0; 143 return 0;
146 } 144 }
147 145
148 missile = get_archetype (missile_name); 146 object *missile = missile_arch->instance ();
149 147
150 if (stringarg) 148 if (stringarg)
151 { 149 {
152 /* If it starts with a letter, presume it is a description */ 150 /* If it starts with a letter, presume it is a description */
153 if (isalpha (*stringarg)) 151 if (isalpha (*stringarg))
… …
171 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);
172 return 0; 170 return 0;
173 } 171 }
174 172
175 give_artifact_abilities (missile, al->item); 173 give_artifact_abilities (missile, al->item);
176 /* 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 -
177 * 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
178 * the parsing of having to do both plus and type. 176 * the parsing of having to do both plus and type.
179 */ 177 */
180 bonus_plus = 1 + (al->item->value / 5); 178 bonus_plus = 1 + (al->item->value / 5);
181 missile_plus = 0; 179 missile_plus = 0;
182 } 180 }
183 else if (atoi (stringarg) < missile_plus) 181 else if (atoi (stringarg) < missile_plus)
184 missile_plus = atoi (stringarg); 182 missile_plus = atoi (stringarg);
185 } 183 }
186 184
187 if (missile_plus > 4) 185 missile_plus = clamp (missile_plus, -4, 4);
188 missile_plus = 4;
189 else if (missile_plus < -4)
190 missile_plus = -4;
191 186
192 missile->nrof = spell->duration + SP_level_duration_adjust (caster, spell); 187 missile->nrof = spell->duration + SP_level_duration_adjust (caster, spell);
193 missile->nrof -= 3 * (missile_plus + bonus_plus); 188 missile->nrof -= 3 * (missile_plus + bonus_plus);
194 189
195 if (missile->nrof < 1) 190 if (missile->nrof < 1)
… …
215{ 210{
216 int food_value; 211 int food_value;
217 archetype *at = NULL; 212 archetype *at = NULL;
218 object *new_op; 213 object *new_op;
219 214
220 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);
221 216
222 if (stringarg) 217 if (stringarg)
223 { 218 {
224 at = find_archetype_by_object_type_name (FOOD, stringarg); 219 at = find_archetype_by_object_type_name (FOOD, stringarg);
225 if (at == NULL) 220 if (at == NULL)
… …
284{ 279{
285 int r, mflags, maxrange; 280 int r, mflags, maxrange;
286 object *tmp; 281 object *tmp;
287 maptile *m; 282 maptile *m;
288 283
289
290 if (!dir) 284 if (!dir)
291 { 285 {
292 examine_monster (op, op); 286 examine_monster (op, op);
293 return 1; 287 return 1;
294 } 288 }
… …
307 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (mflags & P_NO_MAGIC)) 301 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (mflags & P_NO_MAGIC))
308 { 302 {
309 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic."); 303 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic.");
310 return 0; 304 return 0;
311 } 305 }
306
312 if (mflags & P_IS_ALIVE) 307 if (mflags & P_IS_ALIVE)
313 { 308 {
314 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)
315 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)))
316 { 311 {
317 new_draw_info (NDI_UNIQUE, 0, op, "You detect something."); 312 new_draw_info (NDI_UNIQUE, 0, op, "You detect something.");
318 if (tmp->head != NULL) 313 if (tmp->head != NULL)
319 tmp = tmp->head; 314 tmp = tmp->head;
… …
350 345
351 return 1; 346 return 1;
352 } 347 }
353 348
354 /* invis_race is set if we get here */ 349 /* invis_race is set if we get here */
355 if (!strcmp (pl->contr->invis_race, "undead") && is_true_undead (mon)) 350 if (pl->contr->invis_race == shstr_undead && is_true_undead (mon))
356 return 1; 351 return 1;
357 352
358 /* No race, can't be invisible to it */ 353 /* No race, can't be invisible to it */
359 if (!mon->race) 354 if (!mon->race)
360 return 0; 355 return 0;
361 356
362 if (strstr (mon->race, pl->contr->invis_race)) 357 if (mon->race.contains (pl->contr->invis_race))
363 return 1; 358 return 1;
364 359
365 /* Nothing matched above, return 0 */ 360 /* Nothing matched above, return 0 */
366 return 0; 361 return 0;
367 } 362 }
… …
471 if (object *pl = op->in_player ()) 466 if (object *pl = op->in_player ())
472 { 467 {
473 if (pl->ms ().flags () & P_NO_CLERIC && !QUERY_FLAG (pl, FLAG_WIZCAST)) 468 if (pl->ms ().flags () & P_NO_CLERIC && !QUERY_FLAG (pl, FLAG_WIZCAST))
474 new_draw_info (NDI_UNIQUE, 0, pl, "You feel something fizzle inside you."); 469 new_draw_info (NDI_UNIQUE, 0, pl, "You feel something fizzle inside you.");
475 else 470 else
476 { 471 pl->player_goto (op->slaying, op->stats.hp, op->stats.sp);
477 // remove first so we do not call update_stats
478 op->remove ();
479 pl->enter_exit (op);
480 }
481 } 472 }
482 473
483 op->destroy (); 474 op->destroy ();
484} 475}
485 476
… …
501 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.");
502 return 1; 493 return 1;
503 } 494 }
504 495
505 dummy = get_archetype (FORCE_NAME); 496 dummy = get_archetype (FORCE_NAME);
506 if (dummy == NULL) 497
498 if (!dummy)
507 { 499 {
508 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 500 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
509 LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n"); 501 LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n");
510 return 0; 502 return 0;
511 } 503 }
… …
581 573
582 dynbuf_text buf; 574 dynbuf_text buf;
583 575
584 if (player *pl = op->contr) 576 if (player *pl = op->contr)
585 if (object *race = archetype::find (op->race)) 577 if (object *race = archetype::find (op->race))
586 buf << "You are a " << (pl->gender ? "female" : "male") << " " << &race->name << ".\n"; 578 buf << " - You are a G<male|female> " << &race->name << ".\n";
587 579
588 if (object *god = find_god (determine_god (op))) 580 if (object *god = find_god (determine_god (op)))
589 buf << "You worship " << &god->name << ".\n"; 581 buf << " - You worship " << &god->name << ".\n";
590 else 582 else
591 buf << "You worship no god.\n"; 583 buf << " - You worship no god.\n";
592 584
593 object *tmp = present_arch_in_ob (at, op); 585 object *tmp = present_arch_in_ob (at, op);
594 586
595 if (*cp == '\0' && tmp == NULL) 587 if (*cp == '\0' && !tmp)
596 buf << "You feel very mundane. "; 588 buf << " - You feel very mundane. ";
597 else 589 else
598 { 590 {
599 buf << "You have: " << cp << ".\n"; 591 buf << " - You have: " << cp << ".\n";
600 592
601 if (tmp) 593 if (tmp)
602 for (int i = 0; i < NUM_STATS; i++) 594 for (int i = 0; i < NUM_STATS; i++)
603 if (tmp->stats.stat (i) < 0) 595 if (tmp->stats.stat (i) < 0)
604 buf.printf ("Your %s is depleted by %d.\n", statname[i], -tmp->stats.stat (i)); 596 buf.printf (" - Your %s is depleted by %d.\n", statname[i], -tmp->stats.stat (i));
605 } 597 }
606 598
607 if (is_dragon_pl (op)) 599 if (is_dragon_pl (op))
608 /* now grab the 'dragon_ability'-force from the player's inventory */ 600 /* now grab the 'dragon_ability'-force from the player's inventory */
609 for (tmp = op->inv; tmp; tmp = tmp->below) 601 for (tmp = op->inv; tmp; tmp = tmp->below)
610 { 602 {
611 if (tmp->type == FORCE && tmp->arch->archname == shstr_dragon_ability_force) 603 if (tmp->type == FORCE && tmp->arch->archname == shstr_dragon_ability_force)
612 { 604 {
613 if (tmp->stats.exp == 0) 605 if (tmp->stats.exp == 0)
614 buf << "Your metabolism isn't focused on anything.\n"; 606 buf << " - Your metabolism isn't focused on anything.\n";
615 else 607 else
616 buf << "Your metabolism is focused on " << change_resist_msg[tmp->stats.exp] << ".\n"; 608 buf << " - Your metabolism is focused on " << change_resist_msg[tmp->stats.exp] << ".\n";
617 609
618 break; 610 break;
619 } 611 }
620 } 612 }
621 613
… …
717 */ 709 */
718 if (tmp->type != EARTHWALL) //TODO 710 if (tmp->type != EARTHWALL) //TODO
719 tmp->set_owner (op); 711 tmp->set_owner (op);
720 712
721 set_spell_skill (op, caster, spell_ob, tmp); 713 set_spell_skill (op, caster, spell_ob, tmp);
722 tmp->level = caster_level (caster, spell_ob) / 2; 714 tmp->level = casting_level (caster, spell_ob) / 2;
723 715
724 name = tmp->name; 716 name = tmp->name;
725 if (!(tmp = m->insert (tmp, x, y, op))) 717 if (!(tmp = m->insert (tmp, x, y, op)))
726 { 718 {
727 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);
… …
1044}; 1036};
1045 1037
1046int 1038int
1047cast_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)
1048{ 1040{
1049 object *force = NULL; 1041 object *force = 0;
1050 int i; 1042 int i;
1051 1043
1052 /* 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. */
1053 object *tmp = dir 1045 object *tmp = dir
1054 ? find_target_for_friendly_spell (op, dir) 1046 ? find_target_for_friendly_spell (op, dir)
1055 : op; 1047 : op;
1056 1048
1057 if (!tmp) 1049 if (!tmp)
1058 return 0; 1050 return 0;
1059 1051
1060 /* 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. */
… …
1069 } 1061 }
1070 else if (spell_ob->race && spell_ob->race == tmp2->name) 1062 else if (spell_ob->race && spell_ob->race == tmp2->name)
1071 { 1063 {
1072 if (!silent) 1064 if (!silent)
1073 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
1074 return 0; 1067 return 0;
1075 } 1068 }
1076 } 1069 }
1077 } 1070 }
1078 if (force == NULL) 1071
1072 if (!force)
1079 { 1073 {
1080 force = get_archetype (FORCE_NAME); 1074 force = get_archetype (FORCE_NAME);
1081 force->subtype = FORCE_CHANGE_ABILITY; 1075 force->subtype = FORCE_CHANGE_ABILITY;
1076
1082 if (spell_ob->race) 1077 if (spell_ob->race)
1083 force->name = spell_ob->race; 1078 force->name = spell_ob->race;
1084 else 1079 else
1085 force->name = spell_ob->name; 1080 force->name = spell_ob->name;
1081
1086 force->name_pl = spell_ob->name; 1082 force->name_pl = spell_ob->name;
1087 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.");
1088 1084
1089 } 1085 }
1090 else 1086 else
… …
1096 { 1092 {
1097 force->duration = duration; 1093 force->duration = duration;
1098 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.");
1099 } 1095 }
1100 else 1096 else
1101 {
1102 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.");
1103 }
1104 1098
1105 return 1; 1099 return 1;
1106 } 1100 }
1107 1101
1108 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;
… …
1180 */ 1174 */
1181int 1175int
1182cast_bless (object *op, object *caster, object *spell_ob, int dir) 1176cast_bless (object *op, object *caster, object *spell_ob, int dir)
1183{ 1177{
1184 int i; 1178 int i;
1185 object *god = find_god (determine_god (op)), *tmp2, *force = NULL, *tmp; 1179 object *god = find_god (determine_god (op)), *force = NULL, *tmp;
1186 1180
1187 /* 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. */
1188 if (dir != 0) 1182 if (dir != 0)
1189 { 1183 {
1190 tmp = find_target_for_friendly_spell (op, dir); 1184 tmp = find_target_for_friendly_spell (op, dir);
1185
1186 if (!tmp)
1187 return 0;
1191 } 1188 }
1192 else 1189 else
1193 {
1194 tmp = op; 1190 tmp = op;
1195 }
1196 1191
1197 /* 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. */
1198 for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below) 1193 for (object *tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1199 { 1194 {
1200 if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY) 1195 if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY)
1201 { 1196 {
1202 if (tmp2->name == spell_ob->name) 1197 if (tmp2->name == spell_ob->name)
1203 { 1198 {
… …
1209 new_draw_info_format (NDI_UNIQUE, 0, op, "You can not cast %s while %s is in effect", &spell_ob->name, &tmp2->name_pl); 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);
1210 return 0; 1205 return 0;
1211 } 1206 }
1212 } 1207 }
1213 } 1208 }
1209
1214 if (force == NULL) 1210 if (force == NULL)
1215 { 1211 {
1216 force = get_archetype (FORCE_NAME); 1212 force = get_archetype (FORCE_NAME);
1217 force->subtype = FORCE_CHANGE_ABILITY; 1213 force->subtype = FORCE_CHANGE_ABILITY;
1218 if (spell_ob->race) 1214 if (spell_ob->race)
… …
1299static void 1295static void
1300alchemy_object (object *obj, uint64 &total_value, int &total_weight) 1296alchemy_object (object *obj, uint64 &total_value, int &total_weight)
1301{ 1297{
1302 uint64 value = query_cost (obj, NULL, F_TRUE); 1298 uint64 value = query_cost (obj, NULL, F_TRUE);
1303 1299
1304 /* Give third price when we alchemy money (This should hopefully 1300 /* Give third price when we alchemy money (this should hopefully
1305 * 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
1306 * the nuggets, alchemy the gold from that, etc. 1302 * the nuggets, alchemy the gold from that, etc.
1307 * Otherwise, give 9 silver on the gold for other objects, 1303 * Otherwise, give 9 silver on the gold for other objects,
1308 * so that it would still be more affordable to haul 1304 * so that it would still be more affordable to haul
1309 * the stuff back to town. 1305 * the stuff back to town.
… …
1416 1412
1417bailout: 1413bailout:
1418 return 1; 1414 return 1;
1419} 1415}
1420 1416
1421
1422/* This function removes the cursed/damned status on equipped 1417/* This function removes the cursed/damned status on equipped
1423 * items. 1418 * items.
1424 */ 1419 */
1425int 1420int
1426remove_curse (object *op, object *caster, object *spell) 1421remove_curse (object *op, object *caster, object *spell)
… …
1432 if (QUERY_FLAG (tmp, FLAG_APPLIED) && 1427 if (QUERY_FLAG (tmp, FLAG_APPLIED) &&
1433 ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) || 1428 ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) ||
1434 (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED)))) 1429 (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED))))
1435 { 1430 {
1436 was_one++; 1431 was_one++;
1432
1437 if (tmp->level <= caster_level (caster, spell)) 1433 if (tmp->level <= casting_level (caster, spell))
1438 { 1434 {
1439 success++; 1435 success++;
1440 if (QUERY_FLAG (spell, FLAG_DAMNED)) 1436 if (QUERY_FLAG (spell, FLAG_DAMNED))
1441 CLEAR_FLAG (tmp, FLAG_DAMNED); 1437 CLEAR_FLAG (tmp, FLAG_DAMNED);
1442 1438
1443 CLEAR_FLAG (tmp, FLAG_CURSED); 1439 CLEAR_FLAG (tmp, FLAG_CURSED);
1444 CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED); 1440 CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED);
1445 tmp->value = 0; /* Still can't sell it */ 1441 tmp->value = 0; /* Still can't sell it */
1446 if (op->type == PLAYER) 1442
1443 if (object *pl = tmp->visible_to ())
1447 esrv_send_item (op, tmp); 1444 esrv_update_item (UPD_FLAGS, pl, tmp);
1448 } 1445 }
1449 } 1446 }
1450 1447
1451 if (op->type == PLAYER) 1448 if (op->type == PLAYER)
1452 { 1449 {
… …
1463 1460
1464 return success; 1461 return success;
1465} 1462}
1466 1463
1467/* Identifies objects in the players inventory/on the ground */ 1464/* Identifies objects in the players inventory/on the ground */
1468
1469int 1465int
1470cast_identify (object *op, object *caster, object *spell) 1466cast_identify (object *op, object *caster, object *spell)
1471{ 1467{
1468 dynbuf_text buf;
1472 object *tmp; 1469 object *tmp;
1473 int success = 0, num_ident;
1474 1470
1475 num_ident = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1471 int num_ident = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1476 1472
1477 if (num_ident < 1) 1473 if (num_ident < 1)
1478 num_ident = 1; 1474 num_ident = 1;
1479 1475
1480 for (tmp = op->inv; tmp; tmp = tmp->below) 1476 for (tmp = op->inv; tmp; tmp = tmp->below)
… …
1483 { 1479 {
1484 identify (tmp); 1480 identify (tmp);
1485 1481
1486 if (op->type == PLAYER) 1482 if (op->type == PLAYER)
1487 { 1483 {
1488 new_draw_info_format (NDI_UNIQUE, 0, op, "You identified: %s.", long_desc (tmp, op)); 1484 buf.printf ("You identified: %s.\r", long_desc (tmp, op));
1489 1485
1490 if (tmp->msg) 1486 if (tmp->msg)
1491 { 1487 buf << "The item has a story:\r" << tmp->msg << "\n\n";
1492 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1493 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1494 }
1495 } 1488 }
1496 1489
1497 num_ident--; 1490 num_ident--;
1498 success = 1;
1499 if (!num_ident) 1491 if (!num_ident)
1500 break; 1492 break;
1501 } 1493 }
1502 } 1494 }
1503 1495
… …
1510 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above) 1502 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
1511 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp)) 1503 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))
1512 { 1504 {
1513 identify (tmp); 1505 identify (tmp);
1514 1506
1515 if (op->type == PLAYER) 1507 if (object *pl = tmp->visible_to ())
1516 { 1508 {
1517 new_draw_info_format (NDI_UNIQUE, 0, op, "On the ground you identified: %s.", long_desc (tmp, op)); 1509 buf.printf ("On the ground you identified: %s.\r", long_desc (tmp, op));
1518 1510
1519 if (tmp->msg) 1511 if (tmp->msg)
1520 { 1512 buf << "The item has a story:\r" << tmp->msg << "\n\n";
1521 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1522 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1523 }
1524
1525 esrv_send_item (op, tmp);
1526 } 1513 }
1527 1514
1528 num_ident--; 1515 num_ident--;
1529 success = 1;
1530 if (!num_ident) 1516 if (!num_ident)
1531 break; 1517 break;
1532 } 1518 }
1533 } 1519 }
1534 1520
1535 if (!success) 1521 if (buf.empty ())
1536 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 }
1537 else 1526 else
1527 {
1528 if (op->contr)
1529 op->contr->infobox (MSG_CHANNEL ("identify"), buf);
1530
1538 spell_effect (spell, op->x, op->y, op->map, op); 1531 spell_effect (spell, op->x, op->y, op->map, op);
1539 1532 return 1;
1540 return success; 1533 }
1541} 1534}
1542 1535
1543int 1536int
1544cast_detection (object *op, object *caster, object *spell, object *skill) 1537cast_detection (object *op, object *caster, object *spell, object *skill)
1545{ 1538{
… …
1550 1543
1551 /* 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
1552 * doing it over and over again. 1545 * doing it over and over again.
1553 */ 1546 */
1554 god = find_god (determine_god (op)); 1547 god = find_god (determine_god (op));
1555 level = caster_level (caster, spell); 1548 level = casting_level (caster, spell);
1556 range = spell->range + SP_level_range_adjust (caster, spell); 1549 range = spell->range + SP_level_range_adjust (caster, spell);
1557 1550
1558 if (!skill) 1551 if (!skill)
1559 skill = caster; 1552 skill = caster;
1560 1553
… …
1644 /* Basically, if race is set in the spell, then the creatures race must 1637 /* Basically, if race is set in the spell, then the creatures race must
1645 * match that. if the spell race is set to GOD, then the gods opposing 1638 * match that. if the spell race is set to GOD, then the gods opposing
1646 * race must match. 1639 * race must match.
1647 */ 1640 */
1648 if (spell->race && QUERY_FLAG (tmp, FLAG_MONSTER) && tmp->race && 1641 if (spell->race && QUERY_FLAG (tmp, FLAG_MONSTER) && tmp->race &&
1649 ((!strcmp (spell->race, "GOD") && god && god->slaying && strstr (god->slaying, tmp->race)) || 1642 ((spell->race == shstr_GOD && god && god->slaying && god->slaying.contains (tmp->race)) ||
1650 (strstr (spell->race, tmp->race)))) 1643 spell->race.contains (tmp->race)))
1651 { 1644 {
1652 done_one = 2; 1645 done_one = 2;
1653 if (!detect) 1646 if (!detect)
1654 detect = tmp; 1647 detect = tmp;
1655 } 1648 }
… …
1687 1680
1688 /* 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 */
1689 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))
1690 { 1683 {
1691 done_one = 0; 1684 done_one = 0;
1685
1692 for (tmp = op->inv; tmp; tmp = tmp->below) 1686 for (tmp = op->inv; tmp; tmp = tmp->below)
1693 { 1687 {
1694 if (!tmp->invisible && !QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1688 if (!tmp->invisible && !QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1695 { 1689 {
1696 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))
1697 { 1691 {
1698 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL); 1692 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL);
1699 if (op->type == PLAYER) 1693
1694 if (object *pl = tmp->visible_to ())
1700 esrv_send_item (op, tmp); 1695 esrv_update_item (UPD_FLAGS, pl, tmp);
1701 } 1696 }
1697
1702 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) &&
1703 (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))) 1699 (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))
1704 { 1700 {
1705 SET_FLAG (tmp, FLAG_KNOWN_CURSED); 1701 SET_FLAG (tmp, FLAG_KNOWN_CURSED);
1706 if (op->type == PLAYER) 1702
1703 if (object *pl = tmp->visible_to ())
1707 esrv_send_item (op, tmp); 1704 esrv_update_item (UPD_FLAGS, pl, tmp);
1708 } 1705 }
1709 } /* if item is not identified */ 1706 } /* if item is not identified */
1710 } /* for the players inventory */ 1707 } /* for the players inventory */
1711 } /* if detect magic/curse and object is a player */ 1708 } /* if detect magic/curse and object is a player */
1709
1712 return 1; 1710 return 1;
1713} 1711}
1714 1712
1715 1713
1716/** 1714/**
… …
1742 1740
1743 tmp->insert_at (victim); 1741 tmp->insert_at (victim);
1744 victim->stats.sp = 2 * victim->stats.maxsp; 1742 victim->stats.sp = 2 * victim->stats.maxsp;
1745 } 1743 }
1746 else if (victim->stats.sp >= victim->stats.maxsp * 1.88) 1744 else if (victim->stats.sp >= victim->stats.maxsp * 1.88)
1747 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.");
1748 else if (victim->stats.sp >= victim->stats.maxsp * 1.66) 1746 else if (victim->stats.sp >= victim->stats.maxsp * 1.66)
1749 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!");
1750 else if (victim->stats.sp >= victim->stats.maxsp * 1.5) 1748 else if (victim->stats.sp >= victim->stats.maxsp * 1.5)
1751 { 1749 {
1752 new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world."); 1750 new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world.");
… …
1798 } 1796 }
1799 /* give sp */ 1797 /* give sp */
1800 if (spell->stats.dam > 0) 1798 if (spell->stats.dam > 0)
1801 { 1799 {
1802 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);
1803 charge_mana_effect (plyr, caster_level (caster, spell)); 1801 charge_mana_effect (plyr, casting_level (caster, spell));
1804 return 1; 1802 return 1;
1805 } 1803 }
1806 /* suck sp away. Can't suck sp from yourself */ 1804 /* suck sp away. Can't suck sp from yourself */
1807 else if (op != plyr) 1805 else if (op != plyr)
1808 { 1806 {
… …
1820 /* Player doesn't get full credit */ 1818 /* Player doesn't get full credit */
1821 sucked = (sucked * rate) / 100; 1819 sucked = (sucked * rate) / 100;
1822 op->stats.sp += sucked; 1820 op->stats.sp += sucked;
1823 if (sucked > 0) 1821 if (sucked > 0)
1824 { 1822 {
1825 charge_mana_effect (op, caster_level (caster, spell)); 1823 charge_mana_effect (op, casting_level (caster, spell));
1826 } 1824 }
1827 } 1825 }
1828 return 1; 1826 return 1;
1829 } 1827 }
1830 return 0; 1828 return 0;
… …
1906 break; 1904 break;
1907 } 1905 }
1908 } 1906 }
1909} 1907}
1910 1908
1911
1912
1913/* cast_consecrate() - a spell to make an altar your god's */ 1909/* cast_consecrate() - a spell to make an altar your god's */
1914int 1910int
1915cast_consecrate (object *op, object *caster, object *spell) 1911cast_consecrate (object *op, object *caster, object *spell)
1916{ 1912{
1917 char buf[MAX_BUF]; 1913 char buf[MAX_BUF];
… …
1929 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1925 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1930 break; 1926 break;
1931 if (tmp->type == HOLY_ALTAR) 1927 if (tmp->type == HOLY_ALTAR)
1932 { 1928 {
1933 1929
1934 if (tmp->level > caster_level (caster, spell)) 1930 if (tmp->level > casting_level (caster, spell))
1935 { 1931 {
1936 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);
1937 return 0; 1933 return 0;
1938 } 1934 }
1939 else 1935 else
1940 { 1936 {
1941 /* If we got here, we are consecrating an altar */ 1937 /* If we got here, we are consecrating an altar */
1942 sprintf (buf, "Altar of %s", &god->name); 1938 sprintf (buf, "Altar of %s", &god->name);
1943 tmp->name = buf; 1939 tmp->name = buf;
1944 tmp->level = caster_level (caster, spell); 1940 tmp->level = casting_level (caster, spell);
1945 tmp->other_arch = god->arch; 1941 tmp->other_arch = god->arch;
1942
1946 if (op->type == PLAYER) 1943 if (op->type == PLAYER)
1947 esrv_update_item (UPD_NAME, op, tmp); 1944 esrv_update_item (UPD_NAME, op, tmp);
1945
1948 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);
1949 return 1; 1947 return 1;
1950 } 1948 }
1951 } 1949 }
1952 } 1950 }
… …
1990 return 0; 1988 return 0;
1991 } 1989 }
1992 1990
1993 /* if no direction specified, pick one */ 1991 /* if no direction specified, pick one */
1994 if (!dir) 1992 if (!dir)
1995 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);
1996 1994
1997 m = op->map; 1995 m = op->map;
1998 x = op->x + freearr_x[dir]; 1996 x = op->x + freearr_x[dir];
1999 y = op->y + freearr_y[dir]; 1997 y = op->y + freearr_y[dir];
2000 1998
2001 /* if there's no place to put the golem, abort */ 1999 /* if there's no place to put the golem, abort */
2002 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)
2003 ((spell->other_arch->move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->move_type)) 2001 || ((spell->other_arch->move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->move_type))
2004 { 2002 {
2005 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.");
2006 return 0; 2004 return 0;
2007 } 2005 }
2008 2006
… …
2012 if (!weapon) 2010 if (!weapon)
2013 { 2011 {
2014 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!");
2015 return 0; 2013 return 0;
2016 } 2014 }
2015
2017 if (spell->race && strcmp (weapon->arch->archname, spell->race)) 2016 if (spell->race && weapon->arch->archname != spell->race)
2018 { 2017 {
2019 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.");
2020 return 0; 2019 return 0;
2021 } 2020 }
2021
2022 if (weapon->type != WEAPON) 2022 if (weapon->type != WEAPON)
2023 { 2023 {
2024 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.");
2025 return 0; 2025 return 0;
2026 } 2026 }
2027
2027 if (QUERY_FLAG (weapon, FLAG_APPLIED)) 2028 if (QUERY_FLAG (weapon, FLAG_APPLIED))
2028 { 2029 {
2029 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));
2030 return 0; 2031 return 0;
2031 } 2032 }
2032 2033
2033 if (weapon->nrof > 1) 2034 weapon = weapon->split ();
2034 {
2035 tmp = get_split_ob (weapon, 1);
2036 esrv_send_item (op, weapon);
2037 weapon = tmp;
2038 }
2039 2035
2040 /* create the golem object */ 2036 /* create the golem object */
2041 tmp = arch_to_object (spell->other_arch); 2037 tmp = arch_to_object (spell->other_arch);
2042 2038
2043 /* 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 */
… …
2048 tmp->set_owner (op); 2044 tmp->set_owner (op);
2049 op->contr->golem = tmp; 2045 op->contr->golem = tmp;
2050 set_spell_skill (op, caster, spell, tmp); 2046 set_spell_skill (op, caster, spell, tmp);
2051 2047
2052 /* 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
2053 * removed flag - it should only be set if get_split_object was 2049 * removed flag - it should only be set if weapon->split was
2054 * used above. 2050 * used above.
2055 */ 2051 */
2056 if (!QUERY_FLAG (weapon, FLAG_REMOVED)) 2052 if (!QUERY_FLAG (weapon, FLAG_REMOVED))
2057 weapon->remove (); 2053 weapon->remove ();
2058 2054
2059 insert_ob_in_ob (weapon, tmp); 2055 tmp->insert (weapon);
2060 esrv_send_item (op, weapon); 2056
2061 /* 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,
2062 * 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
2063 * body_info, skills, etc) 2059 * body_info, skills, etc)
2064 */ 2060 */
2065 SET_FLAG (tmp, FLAG_USE_WEAPON); 2061 SET_FLAG (tmp, FLAG_USE_WEAPON);
… …
2139 tmp->state = weapon->state; 2135 tmp->state = weapon->state;
2140 tmp->flag [FLAG_ANIMATE] = weapon->flag [FLAG_ANIMATE]; 2136 tmp->flag [FLAG_ANIMATE] = weapon->flag [FLAG_ANIMATE];
2141 } 2137 }
2142 2138
2143 /* 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. */
2144 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));
2145 2141
2146 tmp->speed_left = -1; 2142 tmp->speed_left = -1;
2147 tmp->direction = dir; 2143 tmp->direction = dir;
2148 2144
2149 m->insert (tmp, x, y, op); 2145 m->insert (tmp, x, y, op);
… …
2153/* cast_daylight() - changes the map darkness level *lower* */ 2149/* cast_daylight() - changes the map darkness level *lower* */
2154 2150
2155/* cast_change_map_lightlevel: Was cast_daylight/nightfall. 2151/* cast_change_map_lightlevel: Was cast_daylight/nightfall.
2156 * This changes the light level for the entire map. 2152 * This changes the light level for the entire map.
2157 */ 2153 */
2158
2159int 2154int
2160cast_change_map_lightlevel (object *op, object *caster, object *spell) 2155cast_change_map_lightlevel (object *op, object *caster, object *spell)
2161{ 2156{
2162 int success; 2157 int success;
2163 2158
… …
2171 if (spell->stats.dam < 0) 2166 if (spell->stats.dam < 0)
2172 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.");
2173 else 2168 else
2174 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.");
2175 } 2170 }
2171
2176 return success; 2172 return success;
2177} 2173}
2178 2174
2179/* 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.
2180 * 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,
… …
2197 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);
2198 2194
2199 set_spell_skill (op, caster, spell, new_aura); 2195 set_spell_skill (op, caster, spell, new_aura);
2200 new_aura->attacktype = spell->attacktype; 2196 new_aura->attacktype = spell->attacktype;
2201 2197
2202 new_aura->level = caster_level (caster, spell); 2198 new_aura->level = casting_level (caster, spell);
2203 2199
2204 if (refresh) 2200 if (refresh)
2205 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.");
2206 else 2202 else
2207 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.");
… …
2209 insert_ob_in_ob (new_aura, op); 2205 insert_ob_in_ob (new_aura, op);
2210 new_aura->set_owner (op); 2206 new_aura->set_owner (op);
2211 2207
2212 return 1; 2208 return 1;
2213} 2209}
2214
2215 2210
2216/* 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,
2217 * 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
2218 * around him. 2213 * around him.
2219 * Aura parameters: 2214 * Aura parameters:
2220 * duration: duration counter. 2215 * duration: duration counter.
2221 * attacktype: aura's attacktype 2216 * attacktype: aura's attacktype
2222 * other_arch: archetype to drop where we attack 2217 * other_arch: archetype to drop where we attack
2223 */ 2218 */
2224
2225void 2219void
2226move_aura (object *aura) 2220move_aura (object *aura)
2227{ 2221{
2228 int i, mflags;
2229 object *env;
2230 maptile *m;
2231
2232 /* auras belong in inventories */ 2222 /* auras belong in inventories */
2233 env = aura->env; 2223 object *env = aura->env;
2224 object *owner = aura->owner;
2234 2225
2235 /* no matter what we've gotta remove the aura... 2226 /* no matter what we've gotta remove the aura...
2236 * we'll put it back if its time isn't up. 2227 * we'll put it back if its time isn't up.
2237 */ 2228 */
2238 aura->remove (); 2229 aura->remove ();
… …
2243 aura->destroy (); 2234 aura->destroy ();
2244 return; 2235 return;
2245 } 2236 }
2246 2237
2247 /* auras only exist in inventories */ 2238 /* auras only exist in inventories */
2248 if (env == NULL || env->map == NULL) 2239 if (!env || !env->map)
2249 { 2240 {
2250 aura->destroy (); 2241 aura->destroy ();
2251 return; 2242 return;
2252 } 2243 }
2253 2244
2254 /* we need to jump out of the inventory for a bit 2245 /* we need to jump out of the inventory for a bit
2255 * in order to hit the map conveniently. 2246 * in order to hit the map conveniently.
2256 */ 2247 */
2257 aura->insert_at (env, aura); 2248 aura->insert_at (env, aura);
2258 2249
2259 for (i = 1; i < 9; i++) 2250 for (int i = 1; i < 9; i++)
2260 { 2251 {
2261 sint16 nx, ny; 2252 mapxy pos (env);
2253 pos.move (i);
2262 2254
2263 nx = aura->x + freearr_x[i];
2264 ny = aura->y + freearr_y[i];
2265 mflags = get_map_flags (env->map, &m, nx, ny, &nx, &ny);
2266
2267 /* Consider the movement tyep of the person with the aura as 2255 /* Consider the movement type of the person with the aura as
2268 * 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
2269 * 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.
2270 */ 2258 */
2271 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)))
2272 { 2260 {
2273 hit_map (aura, i, aura->attacktype, 0); 2261 hit_map (aura, i, aura->attacktype, 0);
2274 2262
2275 if (aura->other_arch) 2263 if (aura->other_arch)
2276 m->insert (arch_to_object (aura->other_arch), nx, ny, aura); 2264 pos.insert (arch_to_object (aura->other_arch), aura);
2277 } 2265 }
2278 } 2266 }
2279 2267
2280 /* put the aura back in the player's inventory */ 2268 /* put the aura back in the player's inventory */
2281 aura->remove (); 2269 env->insert (aura);
2282 insert_ob_in_ob (aura, env); 2270 aura->set_owner (owner);
2283} 2271}
2284 2272
2285/* moves the peacemaker spell. 2273/* moves the peacemaker spell.
2286 * op is the piece object. 2274 * op is the piece object.
2287 */ 2275 */
2288void 2276void
2289move_peacemaker (object *op) 2277move_peacemaker (object *op)
2290{ 2278{
2291 object *tmp; 2279 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
2292
2293 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
2294 { 2280 {
2295 int atk_lev, def_lev; 2281 int atk_lev, def_lev;
2296 object *victim = tmp; 2282 object *victim = tmp->head_ ();
2297 2283
2298 if (tmp->head)
2299 victim = tmp->head;
2300 if (!QUERY_FLAG (victim, FLAG_MONSTER)) 2284 if (!QUERY_FLAG (victim, FLAG_MONSTER))
2301 continue; 2285 continue;
2286
2302 if (QUERY_FLAG (victim, FLAG_UNAGGRESSIVE)) 2287 if (QUERY_FLAG (victim, FLAG_UNAGGRESSIVE))
2303 continue; 2288 continue;
2289
2304 if (victim->stats.exp == 0) 2290 if (victim->stats.exp == 0)
2305 continue; 2291 continue;
2306 2292
2307 def_lev = MAX (1, victim->level); 2293 def_lev = MAX (1, victim->level);
2308 atk_lev = MAX (1, op->level); 2294 atk_lev = MAX (1, op->level);
2309 2295
2310 if (rndm (0, atk_lev - 1) > def_lev) 2296 if (rndm (0, atk_lev - 1) > def_lev)
2311 { 2297 {
2312 /* make this sucker peaceful. */ 2298 /* make this sucker peaceful. */
2313 2299
2300 INVOKE_OBJECT (KILL, victim, ARG_OBJECT (op));
2314 change_exp (op->owner, victim->stats.exp, op->skill, 0); 2301 change_exp (op->owner, victim->stats.exp, op->skill, 0);
2315 victim->stats.exp = 0; 2302 victim->stats.exp = 0;
2316#if 0 2303#if 0
2317 /* No idea why these were all set to zero - if something 2304 /* No idea why these were all set to zero - if something
2318 * makes this creature agressive, he should still do damage. 2305 * makes this creature agressive, he should still do damage.
… …
2325 victim->attack_movement = RANDO2; 2312 victim->attack_movement = RANDO2;
2326 SET_FLAG (victim, FLAG_UNAGGRESSIVE); 2313 SET_FLAG (victim, FLAG_UNAGGRESSIVE);
2327 SET_FLAG (victim, FLAG_RUN_AWAY); 2314 SET_FLAG (victim, FLAG_RUN_AWAY);
2328 SET_FLAG (victim, FLAG_RANDOM_MOVE); 2315 SET_FLAG (victim, FLAG_RANDOM_MOVE);
2329 CLEAR_FLAG (victim, FLAG_MONSTER); 2316 CLEAR_FLAG (victim, FLAG_MONSTER);
2317
2330 if (victim->name) 2318 if (victim->name)
2331 {
2332 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);
2333 } 2320 }
2334 }
2335 } 2321 }
2336} 2322}
2337
2338 2323
2339/* This writes a rune that contains the appropriate message. 2324/* This writes a rune that contains the appropriate message.
2340 * There really isn't any adjustments we make. 2325 * There really isn't any adjustments we make.
2341 */ 2326 */
2342
2343int 2327int
2344write_mark (object *op, object *spell, const char *msg) 2328write_mark (object *op, object *spell, const char *msg)
2345{ 2329{
2346 char rune[HUGE_BUF]; 2330 char rune[HUGE_BUF];
2347 object *tmp; 2331 object *tmp;

Diff Legend

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