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.99 by elmex, Tue Jan 13 13:29:57 2009 UTC vs.
Revision 1.113 by root, Sat Nov 7 18:30:06 2009 UTC

… …
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
… …
71 if (!(random_roll (0, 3, op, PREFER_HIGH))) 72 if (!(random_roll (0, 3, op, PREFER_HIGH)))
72 { 73 {
73 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s vibrates violently, then explodes!", query_name (wand)); 74 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s vibrates violently, then explodes!", query_name (wand));
74 op->play_sound (sound_find ("ob_explode")); 75 op->play_sound (sound_find ("ob_explode"));
75 wand->destroy (); 76 wand->destroy ();
76 tmp = get_archetype ("fireball"); 77 tmp = get_archetype (shstr_fireball);
77 tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10; 78 tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10;
78 79
79 if (!tmp->stats.dam) 80 if (!tmp->stats.dam)
80 tmp->stats.dam = 1; 81 tmp->stats.dam = 1;
81 82
… …
122 * The # of arrows created also goes up with level, so if a 30th level mage 123 * The # of arrows created also goes up with level, so if a 30th level mage
123 * wants LOTS of arrows, and doesn't care what the plus is he could 124 * wants LOTS of arrows, and doesn't care what the plus is he could
124 * create nonnmagic arrows, or even -1, etc... 125 * create nonnmagic arrows, or even -1, etc...
125 */ 126 */
126int 127int
127cast_create_missile (object *op, object *caster, object *spell, int dir, const char *stringarg) 128cast_create_missile (object *op, object *caster, object *spell, int dir, const char *spellparam)
128{ 129{
129 int bonus_plus = 0; 130 int bonus_plus = 0;
130 const char *missile_name = "arrow"; 131 const char *missile_name = "arrow";
131 132
132 for (object *tmp = op->inv; tmp; tmp = tmp->below) 133 for (object *tmp = op->inv; tmp; tmp = tmp->below)
… …
143 return 0; 144 return 0;
144 } 145 }
145 146
146 object *missile = missile_arch->instance (); 147 object *missile = missile_arch->instance ();
147 148
148 if (stringarg) 149 if (spellparam)
149 { 150 {
150 /* If it starts with a letter, presume it is a description */ 151 /* If it starts with a letter, presume it is a description */
151 if (isalpha (*stringarg)) 152 if (isalpha (*spellparam))
152 { 153 {
153 artifact *al = find_artifactlist (missile->type)->items; 154 artifact *al = find_artifactlist (missile->type)->items;
154 155
155 for (; al; al = al->next) 156 for (; al; al = al->next)
156 if (!strcasecmp (al->item->name, stringarg)) 157 if (!strcasecmp (al->item->name, spellparam))
157 break; 158 break;
158 159
159 if (!al) 160 if (!al)
160 { 161 {
161 missile->destroy (); 162 missile->destroy ();
162 new_draw_info_format (NDI_UNIQUE, 0, op, "No such object %ss of %s", missile_name, stringarg); 163 new_draw_info_format (NDI_UNIQUE, 0, op, "No such object %ss of %s", missile_name, spellparam);
163 return 0; 164 return 0;
164 } 165 }
165 166
166 if (al->item->slaying) 167 if (al->item->slaying)
167 { 168 {
168 missile->destroy (); 169 missile->destroy ();
169 new_draw_info_format (NDI_UNIQUE, 0, op, "You are not allowed to create %ss of %s", missile_name, stringarg); 170 new_draw_info_format (NDI_UNIQUE, 0, op, "You are not allowed to create %ss of %s", missile_name, spellparam);
170 return 0; 171 return 0;
171 } 172 }
172 173
173 give_artifact_abilities (missile, al->item); 174 give_artifact_abilities (missile, al->item);
174 /* These special arrows cost something extra. Don't have them also be magical - 175 /* These special arrows cost something extra. Don't have them also be magical -
… …
176 * the parsing of having to do both plus and type. 177 * the parsing of having to do both plus and type.
177 */ 178 */
178 bonus_plus = 1 + (al->item->value / 5); 179 bonus_plus = 1 + (al->item->value / 5);
179 missile_plus = 0; 180 missile_plus = 0;
180 } 181 }
181 else if (atoi (stringarg) < missile_plus) 182 else if (atoi (spellparam) < missile_plus)
182 missile_plus = atoi (stringarg); 183 missile_plus = atoi (spellparam);
183 } 184 }
184 185
185 missile_plus = clamp (missile_plus, -4, 4); 186 missile_plus = clamp (missile_plus, -4, 4);
186 187
187 missile->nrof = spell->duration + SP_level_duration_adjust (caster, spell); 188 missile->nrof = spell->duration + SP_level_duration_adjust (caster, spell);
… …
202 return 1; 203 return 1;
203} 204}
204 205
205 206
206/* allows the choice of what sort of food object to make. 207/* allows the choice of what sort of food object to make.
207 * If stringarg is NULL, it will create food dependent on level --PeterM*/ 208 * If spellparam is NULL, it will create food dependent on level --PeterM*/
208int 209int
209cast_create_food (object *op, object *caster, object *spell_ob, int dir, const char *stringarg) 210cast_create_food (object *op, object *caster, object *spell_ob, int dir, const char *spellparam)
210{ 211{
211 int food_value; 212 int food_value;
212 archetype *at = NULL; 213 archetype *at = NULL;
213 object *new_op; 214 object *new_op;
214 215
215 food_value = spell_ob->stats.food + 50 * SP_level_duration_adjust (caster, spell_ob); 216 food_value = spell_ob->stats.food + 50 * SP_level_duration_adjust (caster, spell_ob);
216 217
217 if (stringarg) 218 if (spellparam)
218 { 219 {
219 at = find_archetype_by_object_type_name (FOOD, stringarg); 220 at = find_archetype_by_object_type_name (FOOD, spellparam);
220 if (at == NULL) 221 if (at == NULL)
221 at = find_archetype_by_object_type_name (DRINK, stringarg); 222 at = find_archetype_by_object_type_name (DRINK, spellparam);
222 if (at == NULL || at->stats.food > food_value) 223 if (at == NULL || at->stats.food > food_value)
223 stringarg = NULL; 224 spellparam = NULL;
224 } 225 }
225 226
226 if (!stringarg) 227 if (!spellparam)
227 { 228 {
228 archetype *at_tmp; 229 archetype *at_tmp;
229 230
230 /* We try to find the archetype with the maximum food value. 231 /* We try to find the archetype with the maximum food value.
231 * This removes the dependancy of hard coded food values in this 232 * This removes the dependancy of hard coded food values in this
… …
425/* earth to dust spell. Basically destroys earthwalls in the area. 426/* earth to dust spell. Basically destroys earthwalls in the area.
426 */ 427 */
427int 428int
428cast_earth_to_dust (object *op, object *caster, object *spell_ob) 429cast_earth_to_dust (object *op, object *caster, object *spell_ob)
429{ 430{
430 object *tmp, *next;
431 int range, i, j, mflags; 431 int range, i, j, mflags;
432 sint16 sx, sy; 432 sint16 sx, sy;
433 maptile *m; 433 maptile *m;
434
435 if (op->type != PLAYER)
436 return 0;
437 434
438 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob); 435 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
439 436
440 for (i = -range; i <= range; i++) 437 for (i = -range; i <= range; i++)
441 for (j = -range; j <= range; j++) 438 for (j = -range; j <= range; j++)
… …
446 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy); 443 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
447 444
448 if (mflags & P_OUT_OF_MAP) 445 if (mflags & P_OUT_OF_MAP)
449 continue; 446 continue;
450 447
451 // earth to dust tears down everything that can be teared down 448 // earth to dust tears down everything that can be torn down
452 for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = next) 449 for (object *next, *tmp = m->at (sx, sy).bot; tmp; tmp = next)
453 { 450 {
454 next = tmp->above; 451 next = tmp->above;
452
455 if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN)) 453 if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN))
456 hit_player (tmp, 9998, op, AT_PHYSICAL, 0); 454 hit_player (tmp, 9998, op, AT_PHYSICAL, 0);
457 } 455 }
458 } 456 }
459 457
… …
567 565
568int 566int
569perceive_self (object *op) 567perceive_self (object *op)
570{ 568{
571 const char *cp = describe_item (op, op); 569 const char *cp = describe_item (op, op);
572 archetype *at = archetype::find (ARCH_DEPLETION); 570 archetype *at = archetype::find (shstr_depletion);
573 571
574 dynbuf_text buf; 572 dynbuf_text &buf = msg_dynbuf; buf.clear ();
575 573
576 if (player *pl = op->contr) 574 if (!op->is_player ())
575 return 0;
576
577 if (object *race = archetype::find (op->race)) 577 if (object *race = archetype::find (op->race))
578 buf << " - You are a G<male|female> " << &race->name << ".\n"; 578 buf << " - You are a G<male|female> " << &race->name << ".\n";
579 579
580 if (object *god = find_god (determine_god (op))) 580 if (object *god = find_god (determine_god (op)))
581 buf << " - You worship " << &god->name << ".\n"; 581 buf << " - You worship " << &god->name << ".\n";
582 else 582 else
583 buf << " - You worship no god.\n"; 583 buf << " - You worship no god.\n";
… …
609 609
610 break; 610 break;
611 } 611 }
612 } 612 }
613 613
614 buf << '\0'; // zero-terminate 614 op->contr->infobox (MSG_CHANNEL ("perceiveself"), buf);
615
616 new_draw_info (NDI_UNIQUE, 0, op, buf.linearise ());
617 615
618 return 1; 616 return 1;
619} 617}
620 618
621/* This creates magic walls. Really, it can create most any object, 619/* This creates magic walls. Really, it can create most any object,
… …
780 778
781 return 1; 779 return 1;
782} 780}
783 781
784int 782int
785dimension_door (object *op, object *caster, object *spob, int dir) 783dimension_door (object *op, object *caster, object *spob, int dir, const char *spellparam)
786{ 784{
787 uint32 dist, maxdist; 785 uint32 dist, maxdist;
788 int mflags; 786 int mflags;
789 maptile *m; 787 maptile *m;
790 sint16 sx, sy; 788 sint16 sx, sy;
… …
801 /* Given the new outdoor maps, can't let players dimension door for 799 /* Given the new outdoor maps, can't let players dimension door for
802 * ever, so put limits in. 800 * ever, so put limits in.
803 */ 801 */
804 maxdist = spob->range + SP_level_range_adjust (caster, spob); 802 maxdist = spob->range + SP_level_range_adjust (caster, spob);
805 803
806 if (op->contr->count) 804 if (spellparam)
807 { 805 {
806 int count = atoi (spellparam);
807
808 if (op->contr->count > maxdist) 808 if (count > maxdist)
809 { 809 {
810 new_draw_info (NDI_UNIQUE, 0, op, "You can't dimension door that far!"); 810 new_draw_info (NDI_UNIQUE, 0, op, "You can't dimension door that far!");
811 return 0; 811 return 0;
812 } 812 }
813 813
814 for (dist = 0; dist < op->contr->count; dist++) 814 for (dist = 0; dist < count; dist++)
815 { 815 {
816 mflags = get_map_flags (op->map, &m, op->x + freearr_x[dir] * (dist + 1), op->y + freearr_y[dir] * (dist + 1), &sx, &sy); 816 mflags = get_map_flags (op->map, &m, op->x + freearr_x[dir] * (dist + 1), op->y + freearr_y[dir] * (dist + 1), &sx, &sy);
817 817
818 if (mflags & (P_NO_MAGIC | P_OUT_OF_MAP)) 818 if (mflags & (P_NO_MAGIC | P_OUT_OF_MAP))
819 break; 819 break;
820 820
821 if ((mflags & P_BLOCKSVIEW) && OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy))) 821 if ((mflags & P_BLOCKSVIEW) && OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy)))
822 break; 822 break;
823 } 823 }
824 824
825 if (dist < op->contr->count) 825 if (dist < count)
826 { 826 {
827 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n"); 827 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n");
828 op->contr->count = 0;
829 return 0; 828 return 0;
830 } 829 }
831
832 op->contr->count = 0;
833 830
834 /* Remove code that puts player on random space on maps. IMO, 831 /* Remove code that puts player on random space on maps. IMO,
835 * a lot of maps probably have areas the player should not get to, 832 * a lot of maps probably have areas the player should not get to,
836 * but may not be marked as NO_MAGIC (as they may be bounded 833 * but may not be marked as NO_MAGIC (as they may be bounded
837 * by such squares). Also, there are probably treasure rooms and 834 * by such squares). Also, there are probably treasure rooms and
… …
888 885
889 /* Actually move the player now */ 886 /* Actually move the player now */
890 if (!(op = op->map->insert (op, op->x + freearr_x[dir] * dist, op->y + freearr_y[dir] * dist, op))) 887 if (!(op = op->map->insert (op, op->x + freearr_x[dir] * dist, op->y + freearr_y[dir] * dist, op)))
891 return 1; 888 return 1;
892 889
893 op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */ 890 op->speed_left = -5. * fabs (op->speed); /* Freeze them for a short while */
891
894 return 1; 892 return 1;
895} 893}
896 894
897/* cast_heal: Heals something. 895/* cast_heal: Heals something.
898 * op is the caster. 896 * op is the caster.
… …
953 if (cure_disease (tmp, op, spell)) 951 if (cure_disease (tmp, op, spell))
954 success = 1; 952 success = 1;
955 953
956 if (spell->attacktype & AT_POISON) 954 if (spell->attacktype & AT_POISON)
957 { 955 {
958 at = archetype::find ("poisoning"); 956 at = archetype::find (shstr_poisoning);
959 poison = present_arch_in_ob (at, tmp); 957 poison = present_arch_in_ob (at, tmp);
960 if (poison) 958 if (poison)
961 { 959 {
962 success = 1; 960 success = 1;
963 new_draw_info (NDI_UNIQUE, 0, tmp, "Your body feels cleansed"); 961 new_draw_info (NDI_UNIQUE, 0, tmp, "Your body feels cleansed");
… …
965 } 963 }
966 } 964 }
967 965
968 if (spell->attacktype & AT_CONFUSION) 966 if (spell->attacktype & AT_CONFUSION)
969 { 967 {
970 poison = present_in_ob_by_name (FORCE, "confusion", tmp); 968 poison = present_in_ob_by_name (FORCE, shstr_confusion, tmp);
971 if (poison) 969 if (poison)
972 { 970 {
973 success = 1; 971 success = 1;
974 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 972 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
975 poison->duration = 1; 973 poison->duration = 1;
976 } 974 }
977 } 975 }
978 976
979 if (spell->attacktype & AT_BLIND) 977 if (spell->attacktype & AT_BLIND)
980 { 978 {
981 at = archetype::find ("blindness"); 979 at = archetype::find (shstr_blindness);
982 poison = present_arch_in_ob (at, tmp); 980 poison = present_arch_in_ob (at, tmp);
983 if (poison) 981 if (poison)
984 { 982 {
985 success = 1; 983 success = 1;
986 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.");
… …
1034 "You don't feel any more powerful." 1032 "You don't feel any more powerful."
1035 "You are no easier to look at.", 1033 "You are no easier to look at.",
1036}; 1034};
1037 1035
1038int 1036int
1037change_ability_duration (object *spell, object *caster)
1038{
1039 return spell->duration + SP_level_duration_adjust (caster, spell) * 50;
1040}
1041
1042int
1039cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent) 1043cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent)
1040{ 1044{
1041 object *force = 0; 1045 object *force = 0;
1042 int i; 1046 int i;
1043 1047
… …
1060 break; 1064 break;
1061 } 1065 }
1062 else if (spell_ob->race && spell_ob->race == tmp2->name) 1066 else if (spell_ob->race && spell_ob->race == tmp2->name)
1063 { 1067 {
1064 if (!silent) 1068 if (!silent)
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); 1069 new_draw_info_format (NDI_UNIQUE, 0, op,
1070 "You can not cast %s while %s is in effect",
1071 &spell_ob->name, &tmp2->name_pl);
1066 1072
1067 return 0; 1073 return 0;
1068 } 1074 }
1069 } 1075 }
1070 } 1076 }
1071 1077
1078 int duration = change_ability_duration (spell_ob, caster);
1079
1072 if (!force) 1080 if (force)
1073 {
1074 force = get_archetype (FORCE_NAME);
1075 force->subtype = FORCE_CHANGE_ABILITY;
1076
1077 if (spell_ob->race)
1078 force->name = spell_ob->race;
1079 else
1080 force->name = spell_ob->name;
1081
1082 force->name_pl = spell_ob->name;
1083 new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force.");
1084
1085 } 1081 {
1086 else
1087 {
1088 int duration;
1089
1090 duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1091 if (duration > force->duration) 1082 if (duration > force->duration)
1092 { 1083 {
1093 force->duration = duration; 1084 force->duration = duration;
1094 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect."); 1085 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
1095 } 1086 }
… …
1097 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); 1088 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1098 1089
1099 return 1; 1090 return 1;
1100 } 1091 }
1101 1092
1102 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1093 new_draw_info_format (NDI_UNIQUE, 0, op,
1094 "You create an aura of magical force. H<The effect will last for about %.10g seconds.>",
1095 TICK2TIME (duration));
1096
1097 force = get_archetype (FORCE_NAME);
1098 force->subtype = FORCE_CHANGE_ABILITY;
1099 force->duration = duration;
1100
1101 if (spell_ob->race)
1102 force->name = spell_ob->race;
1103 else
1104 force->name = spell_ob->name;
1105
1106 force->name_pl = spell_ob->name;
1107
1103 force->speed = 1.0; 1108 force->speed = 1.0;
1104 force->speed_left = -1.0; 1109 force->speed_left = -1.0;
1105 SET_FLAG (force, FLAG_APPLIED); 1110 SET_FLAG (force, FLAG_APPLIED);
1106 1111
1107 /* Now start processing the effects. First, protections */ 1112 /* Now start processing the effects. First, protections */
… …
1245 } 1250 }
1246 else 1251 else
1247 { 1252 {
1248 /* Only give out good benefits, and put a max on it */ 1253 /* Only give out good benefits, and put a max on it */
1249 for (i = 0; i < NROFATTACKS; i++) 1254 for (i = 0; i < NROFATTACKS; i++)
1250 {
1251 if (god->resist[i] > 0) 1255 if (god->resist[i] > 0)
1252 {
1253 force->resist[i] = MIN (god->resist[i], spell_ob->resist[ATNR_GODPOWER]); 1256 force->resist[i] = min (god->resist[i], spell_ob->resist[ATNR_GODPOWER]);
1254 } 1257
1255 }
1256 force->path_attuned |= god->path_attuned; 1258 force->path_attuned |= god->path_attuned;
1257 1259
1258 if (spell_ob->attacktype) 1260 if (spell_ob->attacktype)
1259 force->slaying = god->slaying; 1261 force->slaying = god->slaying;
1260 1262
… …
1325 if (op->type != PLAYER) 1327 if (op->type != PLAYER)
1326 return 0; 1328 return 0;
1327 1329
1328 archetype *nugget[3]; 1330 archetype *nugget[3];
1329 1331
1330 nugget[0] = archetype::find ("pyrite3"); 1332 nugget[0] = archetype::find (shstr_pyrite3);
1331 nugget[1] = archetype::find ("pyrite2"); 1333 nugget[1] = archetype::find (shstr_pyrite2);
1332 nugget[2] = archetype::find ("pyrite"); 1334 nugget[2] = archetype::find (shstr_pyrite);
1333 1335
1334 /* Put a maximum weight of items that can be alchemised. Limits the power 1336 /* Put a maximum weight of items that can be alchemised. Limits the power
1335 * some, and also prevents people from alchemising every table/chair/clock 1337 * some, and also prevents people from alchemising every table/chair/clock
1336 * in sight 1338 * in sight
1337 */ 1339 */
… …
1418 * items. 1420 * items.
1419 */ 1421 */
1420int 1422int
1421remove_curse (object *op, object *caster, object *spell) 1423remove_curse (object *op, object *caster, object *spell)
1422{ 1424{
1423 object *tmp;
1424 int success = 0, was_one = 0; 1425 int success = 0, was_one = 0;
1425 1426
1426 for (tmp = op->inv; tmp; tmp = tmp->below) 1427 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1427 if (QUERY_FLAG (tmp, FLAG_APPLIED) && 1428 if (QUERY_FLAG (tmp, FLAG_APPLIED) &&
1428 ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) || 1429 ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) ||
1429 (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED)))) 1430 (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED))))
1430 { 1431 {
1431 was_one++; 1432 was_one++;
… …
1463 1464
1464/* Identifies objects in the players inventory/on the ground */ 1465/* Identifies objects in the players inventory/on the ground */
1465int 1466int
1466cast_identify (object *op, object *caster, object *spell) 1467cast_identify (object *op, object *caster, object *spell)
1467{ 1468{
1468 dynbuf_text buf;
1469 object *tmp; 1469 object *tmp;
1470 dynbuf_text &buf = msg_dynbuf; buf.clear ();
1470 1471
1471 int num_ident = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1472 int num_ident = max (1, spell->stats.dam + SP_level_dam_adjust (caster, spell));
1472
1473 if (num_ident < 1)
1474 num_ident = 1;
1475 1473
1476 for (tmp = op->inv; tmp; tmp = tmp->below) 1474 for (tmp = op->inv; tmp; tmp = tmp->below)
1477 { 1475 {
1478 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp)) 1476 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))
1479 { 1477 {
… …
1485 1483
1486 if (tmp->msg) 1484 if (tmp->msg)
1487 buf << "The item has a story:\r" << tmp->msg << "\n\n"; 1485 buf << "The item has a story:\r" << tmp->msg << "\n\n";
1488 } 1486 }
1489 1487
1490 num_ident--;
1491 if (!num_ident) 1488 if (!--num_ident)
1492 break; 1489 break;
1493 } 1490 }
1494 } 1491 }
1495 1492
1496 /* If all the power of the spell has been used up, don't go and identify 1493 /* If all the power of the spell has been used up, don't go and identify
… …
1510 1507
1511 if (tmp->msg) 1508 if (tmp->msg)
1512 buf << "The item has a story:\r" << tmp->msg << "\n\n"; 1509 buf << "The item has a story:\r" << tmp->msg << "\n\n";
1513 } 1510 }
1514 1511
1515 num_ident--;
1516 if (!num_ident) 1512 if (!--num_ident)
1517 break; 1513 break;
1518 } 1514 }
1519 } 1515 }
1520 1516
1521 if (buf.empty ()) 1517 if (buf.empty ())
… …
1574 for (tmp = last; tmp; tmp = tmp->below) 1570 for (tmp = last; tmp; tmp = tmp->below)
1575 { 1571 {
1576 /* show invisible */ 1572 /* show invisible */
1577 if (QUERY_FLAG (spell, FLAG_MAKE_INVIS) && 1573 if (QUERY_FLAG (spell, FLAG_MAKE_INVIS) &&
1578 /* Might there be other objects that we can make visible? */ 1574 /* Might there be other objects that we can make visible? */
1579 (tmp->invisible && (QUERY_FLAG (tmp, FLAG_MONSTER) || 1575 (tmp->invisible && (QUERY_FLAG (tmp, FLAG_MONSTER)
1580 (tmp->type == PLAYER && !QUERY_FLAG (tmp, FLAG_WIZ)) 1576 || (tmp->type == PLAYER && !QUERY_FLAG (tmp, FLAG_WIZ))
1581 || tmp->type == CF_HANDLE 1577 || tmp->type == T_HANDLE
1582 || tmp->type == TRAPDOOR || tmp->type == EXIT || tmp->type == HOLE 1578 || tmp->type == TRAPDOOR
1579 || tmp->type == EXIT
1580 || tmp->type == HOLE
1581 || tmp->type == BUTTON
1583 || tmp->type == BUTTON || tmp->type == TELEPORTER 1582 || tmp->type == TELEPORTER
1583 || tmp->type == GATE
1584 || tmp->type == GATE || tmp->type == LOCKED_DOOR 1584 || tmp->type == LOCKED_DOOR
1585 || tmp->type == WEAPON || tmp->type == ALTAR || tmp->type == SIGN 1585 || tmp->type == WEAPON
1586 || tmp->type == ALTAR
1587 || tmp->type == SIGN
1586 || tmp->type == TRIGGER_PEDESTAL || tmp->type == SPECIAL_KEY 1588 || tmp->type == TRIGGER_PEDESTAL
1587 || tmp->type == TREASURE || tmp->type == BOOK || tmp->type == HOLY_ALTAR))) 1589 || tmp->type == SPECIAL_KEY
1590 || tmp->type == TREASURE
1591 || tmp->type == BOOK
1592 || tmp->type == HOLY_ALTAR
1593 || tmp->type == CONTAINER)))
1588 { 1594 {
1589 if (random_roll (0, skill->level - 1, op, PREFER_HIGH) > level / 4) 1595 if (random_roll (0, skill->level - 1, op, PREFER_HIGH) > level / 4)
1590 { 1596 {
1591 tmp->invisible = 0; 1597 tmp->invisible = 0;
1592 done_one = 1; 1598 done_one = 1;
… …
2127 tmp->state = weapon->state; 2133 tmp->state = weapon->state;
2128 tmp->flag [FLAG_ANIMATE] = weapon->flag [FLAG_ANIMATE]; 2134 tmp->flag [FLAG_ANIMATE] = weapon->flag [FLAG_ANIMATE];
2129 } 2135 }
2130 2136
2131 /* make experience increase in proportion to the strength of the summoned creature. */ 2137 /* make experience increase in proportion to the strength of the summoned creature. */
2132 tmp->stats.exp *= 1 + (MAX (spell->stats.maxgrace, spell->stats.sp) / casting_level (caster, spell)); 2138 tmp->stats.exp *= 1 + (max (spell->stats.maxgrace, spell->stats.sp) / casting_level (caster, spell));
2133 2139
2134 tmp->speed_left = -1; 2140 tmp->speed_left = -1;
2135 tmp->direction = dir; 2141 tmp->direction = dir;
2136 2142
2137 m->insert (tmp, x, y, op); 2143 m->insert (tmp, x, y, op);
… …
2280 continue; 2286 continue;
2281 2287
2282 if (victim->stats.exp == 0) 2288 if (victim->stats.exp == 0)
2283 continue; 2289 continue;
2284 2290
2285 def_lev = MAX (1, victim->level); 2291 def_lev = max (1, victim->level);
2286 atk_lev = MAX (1, op->level); 2292 atk_lev = max (1, op->level);
2287 2293
2288 if (rndm (0, atk_lev - 1) > def_lev) 2294 if (rndm (0, atk_lev - 1) > def_lev)
2289 { 2295 {
2290 /* make this sucker peaceful. */ 2296 /* make this sucker peaceful. */
2291 2297
… …
2323 { 2329 {
2324 new_draw_info (NDI_UNIQUE, 0, op, "Write what?"); 2330 new_draw_info (NDI_UNIQUE, 0, op, "Write what?");
2325 return 0; 2331 return 0;
2326 } 2332 }
2327 2333
2328 if (strcasestr_local (msg, "endmsg")) 2334 if (!msg_is_safe (msg))
2329 { 2335 {
2330 new_draw_info (NDI_UNIQUE, 0, op, "Trying to cheat are we?"); 2336 new_draw_info (NDI_UNIQUE, 0, op, "Trying to cheat are we?");
2331 LOG (llevInfo, "write_rune: player %s tried to write bogus rune %s\n", &op->name, msg); 2337 LOG (llevInfo, "write_mark: player %s tried to write bogus rune %s\n", &op->name, msg);
2332 return 0; 2338 return 0;
2333 } 2339 }
2334 2340
2335 if (!spell->other_arch) 2341 if (!spell->other_arch)
2336 return 0; 2342 return 0;

Diff Legend

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