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

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.89 by root, Fri Nov 6 12:49:19 2009 UTC vs.
Revision 1.102 by root, Sun Apr 11 00:34:06 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
59 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 59 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
60 { 60 {
61 int num_sections = 1; 61 int num_sections = 1;
62 62
63 /* don't move DM */ 63 /* don't move DM */
64 if (QUERY_FLAG (tmp, FLAG_WIZ)) 64 if (tmp->flag [FLAG_WIZ])
65 return; 65 return;
66 66
67 /* don't move parts of objects */ 67 /* don't move parts of objects */
68 if (tmp->head) 68 if (tmp->head)
69 continue; 69 continue;
70 70
71 /* don't move floors or immobile objects */ 71 /* don't move floors or immobile objects */
72 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || (!QUERY_FLAG (tmp, FLAG_ALIVE) && QUERY_FLAG (tmp, FLAG_NO_PICK))) 72 if (tmp->flag [FLAG_IS_FLOOR] || (!tmp->flag [FLAG_ALIVE] && tmp->flag [FLAG_NO_PICK]))
73 continue; 73 continue;
74 74
75 /* count the object's sections */ 75 /* count the object's sections */
76 for (object *tmp2 = tmp; tmp2; tmp2 = tmp2->more) 76 for (object *tmp2 = tmp; tmp2; tmp2 = tmp2->more)
77 num_sections++; 77 num_sections++;
… …
93 * also be safe for objects. 93 * also be safe for objects.
94 * This does return if successful or not, but 94 * This does return if successful or not, but
95 * I don't see us doing anything useful with that information 95 * I don't see us doing anything useful with that information
96 * right now. 96 * right now.
97 */ 97 */
98 move_object (tmp, absdir (op->stats.sp)); 98 tmp->move (absdir (op->stats.sp));
99 } 99 }
100 100
101 } 101 }
102} 102}
103 103
… …
108 ***************************************************************************/ 108 ***************************************************************************/
109 109
110/* Causes op to fork. op is the original bolt, tmp 110/* Causes op to fork. op is the original bolt, tmp
111 * is the first piece of the fork. 111 * is the first piece of the fork.
112 */ 112 */
113void 113static void
114forklightning (object *op, object *tmp) 114forklightning (object *op, object *tmp)
115{ 115{
116 int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */ 116 int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */
117 int t_dir; /* stores temporary dir calculation */ 117 int t_dir; /* stores temporary dir calculation */
118 maptile *m; 118 maptile *m;
… …
194 * on the space. So only call reflwall if we think the data it returns 194 * on the space. So only call reflwall if we think the data it returns
195 * will be useful. 195 * will be useful.
196 */ 196 */
197 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op))) 197 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op)))
198 { 198 {
199 if (!QUERY_FLAG (op, FLAG_REFLECTING)) 199 if (!op->flag [FLAG_REFLECTING])
200 return; 200 return;
201 201
202 /* Since walls don't run diagonal, if the bolt is in 202 /* Since walls don't run diagonal, if the bolt is in
203 * one of 4 main directions, it just reflects back in the 203 * one of 4 main directions, it just reflects back in the
204 * opposite direction. However, if the bolt is travelling 204 * opposite direction. However, if the bolt is travelling
… …
277 int mflags; 277 int mflags;
278 278
279 if (!spob->other_arch) 279 if (!spob->other_arch)
280 return 0; 280 return 0;
281 281
282 tmp = arch_to_object (spob->other_arch); 282 tmp = spob->other_arch->instance ();
283 if (tmp == NULL) 283 if (tmp == NULL)
284 return 0; 284 return 0;
285 285
286 /* peterm: level dependency for bolts */ 286 /* peterm: level dependency for bolts */
287 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob); 287 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob);
… …
294 tmp->duration = spob->duration + SP_level_duration_adjust (caster, spob); 294 tmp->duration = spob->duration + SP_level_duration_adjust (caster, spob);
295 tmp->stats.Dex = spob->stats.Dex; 295 tmp->stats.Dex = spob->stats.Dex;
296 tmp->stats.Con = spob->stats.Con; 296 tmp->stats.Con = spob->stats.Con;
297 297
298 tmp->direction = dir; 298 tmp->direction = dir;
299 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 299 if (tmp->flag [FLAG_IS_TURNABLE])
300 SET_ANIMATION (tmp, dir); 300 SET_ANIMATION (tmp, dir);
301 301
302 tmp->set_owner (op); 302 tmp->set_owner (op);
303 set_spell_skill (op, caster, spob, tmp); 303 set_spell_skill (op, caster, spob, tmp);
304 304
… …
316 316
317 tmp->map = newmap; 317 tmp->map = newmap;
318 318
319 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 319 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
320 { 320 {
321 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 321 if (!tmp->flag [FLAG_REFLECTING])
322 { 322 {
323 tmp->drop_and_destroy (); 323 tmp->drop_and_destroy ();
324 return 0; 324 return 0;
325 } 325 }
326 326
… …
439 if (op->destroyed ()) 439 if (op->destroyed ())
440 return; 440 return;
441 } 441 }
442 442
443 /* other_arch contains what this explodes into */ 443 /* other_arch contains what this explodes into */
444 tmp = arch_to_object (op->other_arch); 444 tmp = op->other_arch->instance ();
445 445
446 tmp->set_owner (op); 446 tmp->set_owner (op);
447 tmp->skill = op->skill; 447 tmp->skill = op->skill;
448 448
449 owner = op->owner; 449 owner = op->owner;
… …
521 if (!(mflags & P_IS_ALIVE)) 521 if (!(mflags & P_IS_ALIVE))
522 return; 522 return;
523 523
524 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 524 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
525 { 525 {
526 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 526 if (tmp->flag [FLAG_ALIVE])
527 { 527 {
528 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 528 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
529 529
530 // TODO: can't understand the following if's 530 // TODO: can't understand the following if's
531 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0) 531 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
532 { 532 {
533 if (!QUERY_FLAG (op, FLAG_REMOVED)) 533 if (!op->flag [FLAG_REMOVED])
534 { 534 {
535 op->destroy (); 535 op->destroy ();
536 return; 536 return;
537 } 537 }
538 } 538 }
… …
640 tmp->stats.hp = spob->duration + SP_level_duration_adjust (caster, spob); 640 tmp->stats.hp = spob->duration + SP_level_duration_adjust (caster, spob);
641 tmp->stats.maxhp = spob->range + SP_level_range_adjust (caster, spob); 641 tmp->stats.maxhp = spob->range + SP_level_range_adjust (caster, spob);
642 tmp->dam_modifier = spob->stats.food + SP_level_dam_adjust (caster, spob); 642 tmp->dam_modifier = spob->stats.food + SP_level_dam_adjust (caster, spob);
643 643
644 tmp->direction = dir; 644 tmp->direction = dir;
645 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 645 if (tmp->flag [FLAG_IS_TURNABLE])
646 SET_ANIMATION (tmp, dir); 646 SET_ANIMATION (tmp, dir);
647 647
648 tmp->set_owner (op); 648 tmp->set_owner (op);
649 set_spell_skill (op, caster, spob, tmp); 649 set_spell_skill (op, caster, spob, tmp);
650 650
… …
660 return 0; 660 return 0;
661 } 661 }
662 662
663 tmp->map = newmap; 663 tmp->map = newmap;
664 664
665 // in case the bullet has direction 0 we explode it in place.
666 // direction 0 is possible for instance when a poison cloud trap springs.
667 if (tmp->direction == 0)
668 {
669 if (tmp->other_arch
670 && (tmp = tmp->insert_at (tmp, op))) // insert before explode cleanly
671 explode_bullet (tmp); // explode object will/should remove tmp
672 else
673 tmp->destroy ();
674
675 return 0;
676 }
677
665 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 678 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
666 { 679 {
667 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 680 if (!tmp->flag [FLAG_REFLECTING])
668 { 681 {
669 tmp->destroy (); 682 tmp->destroy ();
670 return 0; 683 return 0;
671 } 684 }
672 685
… …
690 703
691/* drops an object based on what is in the cone's "other_arch" */ 704/* drops an object based on what is in the cone's "other_arch" */
692static void 705static void
693cone_drop (object *op) 706cone_drop (object *op)
694{ 707{
695 object *new_ob = arch_to_object (op->other_arch); 708 object *new_ob = op->other_arch->instance ();
696 709
697 new_ob->level = op->level; 710 new_ob->level = op->level;
698 new_ob->set_owner (op->owner); 711 new_ob->set_owner (op->owner);
699 712
700 /* preserve skill ownership */ 713 /* preserve skill ownership */
… …
716 op->set_speed (0); 729 op->set_speed (0);
717 return; 730 return;
718 } 731 }
719 732
720 /* lava saves it's life, but not yours :) */ 733 /* lava saves it's life, but not yours :) */
721 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 734 if (op->flag [FLAG_LIFESAVE])
722 { 735 {
723 hit_map (op, 0, op->attacktype, 0); 736 hit_map (op, 0, op->attacktype, 0);
724 return; 737 return;
725 } 738 }
726 739
… …
807 MoveType movetype; 820 MoveType movetype;
808 821
809 if (!spell->other_arch) 822 if (!spell->other_arch)
810 return 0; 823 return 0;
811 824
812 if (op->type == PLAYER && QUERY_FLAG (op, FLAG_UNDEAD) && op->attacktype & AT_TURN_UNDEAD) 825 if (op->type == PLAYER && op->flag [FLAG_UNDEAD] && op->attacktype & AT_TURN_UNDEAD)
813 { 826 {
814 new_draw_info (NDI_UNIQUE, 0, op, "Your undead nature prevents you from turning undead!"); 827 new_draw_info (NDI_UNIQUE, 0, op, "Your undead nature prevents you from turning undead!");
815 return 0; 828 return 0;
816 } 829 }
817 830
… …
861 874
862 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype) 875 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)
863 continue; 876 continue;
864 877
865 success = 1; 878 success = 1;
866 tmp = arch_to_object (spell->other_arch); 879 tmp = spell->other_arch->instance ();
867 tmp->set_owner (op); 880 tmp->set_owner (op);
868 set_spell_skill (op, caster, spell, tmp); 881 set_spell_skill (op, caster, spell, tmp);
869 tmp->level = casting_level (caster, spell); 882 tmp->level = casting_level (caster, spell);
870 tmp->attacktype = spell->attacktype; 883 tmp->attacktype = spell->attacktype;
871 884
… …
973 for (int i = 1; i < 9; i++) 986 for (int i = 1; i < 9; i++)
974 { 987 {
975 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i])) 988 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
976 continue; 989 continue;
977 990
978 object *tmp = arch_to_object (at); 991 object *tmp = at->instance ();
979 tmp->direction = i; 992 tmp->direction = i;
980 tmp->range = op->range; 993 tmp->range = op->range;
981 tmp->stats.dam = op->stats.dam; 994 tmp->stats.dam = op->stats.dam;
982 tmp->duration = op->duration; 995 tmp->duration = op->duration;
983 tmp->attacktype = op->attacktype; 996 tmp->attacktype = op->attacktype;
984 tmp->set_owner (op); 997 tmp->set_owner (op);
985 if (op->skill && op->skill != tmp->skill) 998 if (op->skill && op->skill != tmp->skill)
986 tmp->skill = op->skill; 999 tmp->skill = op->skill;
987 1000
988 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 1001 if (tmp->flag [FLAG_IS_TURNABLE])
989 SET_ANIMATION (tmp, i); 1002 SET_ANIMATION (tmp, i);
990 1003
991 op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op); 1004 op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op);
992 move_bullet (tmp); 1005 move_bullet (tmp);
993 } 1006 }
… …
1017 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1030 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
1018 return 0; 1031 return 0;
1019 } 1032 }
1020 } 1033 }
1021 1034
1022 tmp = arch_to_object (spell->other_arch); 1035 tmp = spell->other_arch->instance ();
1023 1036
1024 /* level dependencies for bomb */ 1037 /* level dependencies for bomb */
1025 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1038 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1026 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1039 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1027 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 1040 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
… …
1047 * dir is the direction to look in. 1060 * dir is the direction to look in.
1048 * range is how far out to look. 1061 * range is how far out to look.
1049 * type is the type of spell - either SPELL_MANA or SPELL_GRACE. 1062 * type is the type of spell - either SPELL_MANA or SPELL_GRACE.
1050 * this info is used for blocked magic/unholy spaces. 1063 * this info is used for blocked magic/unholy spaces.
1051 */ 1064 */
1052object * 1065static object *
1053get_pointed_target (object *op, int dir, int range, int type) 1066get_pointed_target (object *op, int dir, int range, int type)
1054{ 1067{
1055 object *target; 1068 object *target;
1056 sint16 x, y; 1069 sint16 x, y;
1057 int dist, mflags; 1070 int dist, mflags;
… …
1076 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW) 1089 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1077 return NULL; 1090 return NULL;
1078 1091
1079 if (mflags & P_IS_ALIVE) 1092 if (mflags & P_IS_ALIVE)
1080 for (target = GET_MAP_OB (mp, x, y); target; target = target->above) 1093 for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
1081 if (QUERY_FLAG (target, FLAG_MONSTER)) 1094 if (target->flag [FLAG_MONSTER])
1082 return target; 1095 return target;
1083 } 1096 }
1084 1097
1085 return NULL; 1098 return NULL;
1086} 1099}
… …
1121 new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded."); 1134 new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded.");
1122 return 0; 1135 return 0;
1123 } 1136 }
1124 1137
1125 if (spell->other_arch) 1138 if (spell->other_arch)
1126 effect = arch_to_object (spell->other_arch); 1139 effect = spell->other_arch->instance ();
1127 else 1140 else
1128 return 0; 1141 return 0;
1129 1142
1130 /* tailor the effect by priest level and worshipped God */ 1143 /* tailor the effect by priest level and worshipped God */
1131 effect->level = casting_level (caster, spell); 1144 effect->level = casting_level (caster, spell);
… …
1148 if (effect->attacktype & AT_DEATH) 1161 if (effect->attacktype & AT_DEATH)
1149 { 1162 {
1150 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1163 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1151 1164
1152 /* casting death spells at undead isn't a good thing */ 1165 /* casting death spells at undead isn't a good thing */
1153 if (QUERY_FLAG (target, FLAG_UNDEAD)) 1166 if (target->flag [FLAG_UNDEAD])
1154 { 1167 {
1155 if (random_roll (0, 2, op, PREFER_LOW)) 1168 if (random_roll (0, 2, op, PREFER_LOW))
1156 { 1169 {
1157 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!"); 1170 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1158 effect->x = op->x; 1171 effect->x = op->x;
… …
1244 * we do this by creating a force and inserting it in the 1257 * we do this by creating a force and inserting it in the
1245 * object. if time is 0, the object glows permanently. To truely 1258 * object. if time is 0, the object glows permanently. To truely
1246 * make this work for non-living objects, we would have to 1259 * make this work for non-living objects, we would have to
1247 * give them the capability to have an inventory. b.t. 1260 * give them the capability to have an inventory. b.t.
1248 */ 1261 */
1249int 1262static int
1250make_object_glow (object *op, int radius, int time) 1263make_object_glow (object *op, int radius, int time)
1251{ 1264{
1252 /* some things are unaffected... */ 1265 /* some things are unaffected... */
1253 if (op->path_denied & PATH_LIGHT) 1266 if (op->path_denied & PATH_LIGHT)
1254 return 0; 1267 return 0;
1255 1268
1256 object *tmp = get_archetype (FORCE_NAME); 1269 object *tmp = get_archetype (FORCE_NAME);
1257 tmp->speed = 0.01; 1270 tmp->speed = 0.01;
1258 tmp->stats.food = time; 1271 tmp->stats.food = time;
1259 SET_FLAG (tmp, FLAG_IS_USED_UP); 1272 tmp->set_flag (FLAG_IS_USED_UP);
1260 tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius)); 1273 tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius));
1261 tmp = insert_ob_in_ob (tmp, op); 1274 tmp = insert_ob_in_ob (tmp, op);
1262 1275
1263 if (tmp->glow_radius > op->glow_radius) 1276 if (tmp->glow_radius > op->glow_radius)
1264 op->set_glow_radius (tmp->glow_radius); 1277 op->set_glow_radius (tmp->glow_radius);
… …
1273 int dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 1286 int dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
1274 int dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 1287 int dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
1275 1288
1276 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player (); 1289 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player ();
1277 1290
1278 /* destruction doesn't use another spell object, so we need 1291 dynbuf buf;
1279 * update op's skill pointer so that exp is properly awarded.
1280 */
1281 const shstr skill = op->skill;
1282
1283 if (caster == op)
1284 op->skill = spell_ob->skill;
1285 else if (caster->skill)
1286 op->skill = caster->skill;
1287 else
1288 op->skill = 0;
1289
1290 op->change_skill (find_skill_by_name (op, op->skill));
1291
1292 unordered_mapwalk (op, -range, -range, range, range) 1292 unordered_mapwalk (buf, op, -range, -range, range, range)
1293 { 1293 {
1294 mapspace &ms = m->at (nx, ny); 1294 mapspace &ms = m->at (nx, ny);
1295 1295
1296 if (ms.flags () & P_IS_ALIVE) 1296 if (ms.flags () & P_IS_ALIVE)
1297 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1297 for (object *next, *tmp = ms.bot; tmp; tmp = next)
1298 {
1299 next = tmp->above;
1300
1298 if (tmp->flag [FLAG_ALIVE] || tmp->is_player ()) 1301 if (tmp->flag [FLAG_ALIVE] || tmp->is_player ())
1299 { 1302 {
1300 tmp = tmp->head_ (); 1303 tmp = tmp->head_ ();
1301 1304
1302 if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ()) 1305 if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ())
1303 || (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ()))) 1306 || (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ())))
1304 { 1307 {
1305 if (spell_ob->subtype == SP_DESTRUCTION) 1308 if (spell_ob->subtype == SP_DESTRUCTION)
1306 { 1309 {
1307 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1310 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1308 1311
1309 if (spell_ob->other_arch) 1312 if (spell_ob->other_arch)
1310 m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op); 1313 m->insert (spell_ob->other_arch->instance (), nx, ny, op);
1311 } 1314 }
1312 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist [ATNR_MAGIC] != 100) 1315 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist [ATNR_MAGIC] != 100)
1313 { 1316 {
1314 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1317 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1315 m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op); 1318 m->insert (spell_ob->other_arch->instance (), nx, ny, op);
1316 } 1319 }
1317 } 1320 }
1318 } 1321 }
1322 }
1319 } 1323 }
1320 1324
1321 op->skill = skill;
1322 return 1; 1325 return 1;
1323} 1326}
1324 1327
1325/*************************************************************************** 1328/***************************************************************************
1326 * 1329 *
1327 * CURSE 1330 * CURSE
1328 * 1331 *
1329 ***************************************************************************/ 1332 ***************************************************************************/
1330
1331int 1333int
1332cast_curse (object *op, object *caster, object *spell_ob, int dir) 1334cast_curse (object *op, object *caster, object *spell_ob, int dir)
1333{ 1335{
1334 object *god = find_god (determine_god (op)); 1336 object *god = find_god (determine_god (op));
1335 object *tmp, *force; 1337 object *tmp, *force;
… …
1390 } 1392 }
1391 1393
1392 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1394 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1393 force->speed = 1.f; 1395 force->speed = 1.f;
1394 force->speed_left = -1.f; 1396 force->speed_left = -1.f;
1395 SET_FLAG (force, FLAG_APPLIED); 1397 force->set_flag (FLAG_APPLIED);
1396 1398
1397 if (god) 1399 if (god)
1398 { 1400 {
1399 if (spell_ob->last_grace) 1401 if (spell_ob->last_grace)
1400 force->path_repelled = god->path_repelled; 1402 force->path_repelled = god->path_repelled;
… …
1413 force->stats.wc = spell_ob->stats.wc; 1415 force->stats.wc = spell_ob->stats.wc;
1414 1416
1415 change_abil (tmp, force); /* Mostly to display any messages */ 1417 change_abil (tmp, force); /* Mostly to display any messages */
1416 insert_ob_in_ob (force, tmp); 1418 insert_ob_in_ob (force, tmp);
1417 tmp->update_stats (); 1419 tmp->update_stats ();
1420
1418 return 1; 1421 return 1;
1419
1420} 1422}
1421 1423
1422/********************************************************************** 1424/**********************************************************************
1423 * mood change 1425 * mood change
1424 * Arguably, this may or may not be an attack spell. But since it 1426 * Arguably, this may or may not be an attack spell. But since it
… …
1453 else if (god && spell->race == shstr_GOD_FRIEND) 1455 else if (god && spell->race == shstr_GOD_FRIEND)
1454 race = god->race; 1456 race = god->race;
1455 else 1457 else
1456 race = spell->race; 1458 race = spell->race;
1457 1459
1460 dynbuf buf;
1458 unordered_mapwalk (op, -range, -range, range, range) 1461 unordered_mapwalk (buf, op, -range, -range, range, range)
1459 { 1462 {
1460 mapspace &ms = m->at (nx, ny); 1463 mapspace &ms = m->at (nx, ny);
1461 1464
1462 /* If there is nothing living on this space, no need to go further */ 1465 /* If there is nothing living on this space, no need to go further */
1463 if (!ms.flags () & P_IS_ALIVE) 1466 if (!ms.flags () & P_IS_ALIVE)
… …
1482 1485
1483 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */ 1486 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */
1484 if (race && head->race && !strstr (race, head->race)) 1487 if (race && head->race && !strstr (race, head->race))
1485 continue; 1488 continue;
1486 1489
1487 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD)) 1490 if (head->flag [FLAG_UNDEAD] && !spell->flag [FLAG_UNDEAD])
1488 continue; 1491 continue;
1489 1492
1490 /* Now do a bunch of stuff related to saving throws */ 1493 /* Now do a bunch of stuff related to saving throws */
1491 best_at = -1; 1494 best_at = -1;
1492 if (spell->attacktype) 1495 if (spell->attacktype)
… …
1525 Ryo, august 14th 1528 Ryo, august 14th
1526 */ 1529 */
1527 if (head->level > level) 1530 if (head->level > level)
1528 continue; 1531 continue;
1529 1532
1530 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level)))) 1533 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + min (50, 2 * (level - head->level))))
1531 /* Failed, no effect */ 1534 /* Failed, no effect */
1532 continue; 1535 continue;
1533 } 1536 }
1534 1537
1535 /* Done with saving throw. Now start affecting the monster */ 1538 /* Done with saving throw. Now start affecting the monster */
1536 done_one = 0; 1539 done_one = 0;
1537 1540
1538 /* aggravation */ 1541 /* aggravation */
1539 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1542 if (spell->flag [FLAG_MONSTER])
1540 { 1543 {
1541 CLEAR_FLAG (head, FLAG_SLEEP); 1544 head->clr_flag (FLAG_SLEEP);
1542 remove_friendly_object (head); 1545 remove_friendly_object (head);
1543 done_one = 1; 1546 done_one = 1;
1544 head->enemy = op; 1547 head->enemy = op;
1545 } 1548 }
1546 1549
1547 /* calm monsters */ 1550 /* calm monsters */
1548 if (QUERY_FLAG (spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (head, FLAG_UNAGGRESSIVE)) 1551 if (spell->flag [FLAG_UNAGGRESSIVE] && !head->flag [FLAG_UNAGGRESSIVE])
1549 { 1552 {
1550 SET_FLAG (head, FLAG_UNAGGRESSIVE); 1553 head->set_flag (FLAG_UNAGGRESSIVE);
1551 head->enemy = NULL; 1554 head->enemy = NULL;
1552 done_one = 1; 1555 done_one = 1;
1553 } 1556 }
1554 1557
1555 /* berserk monsters */ 1558 /* berserk monsters */
1556 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK)) 1559 if (spell->flag [FLAG_BERSERK] && !head->flag [FLAG_BERSERK])
1557 { 1560 {
1558 SET_FLAG (head, FLAG_BERSERK); 1561 head->set_flag (FLAG_BERSERK);
1559 done_one = 1; 1562 done_one = 1;
1560 } 1563 }
1561 1564
1562 /* charm */ 1565 /* charm */
1563 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY)) 1566 if (spell->flag [FLAG_NO_ATTACK] && !head->flag [FLAG_FRIENDLY])
1564 { 1567 {
1565 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster)); 1568 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster));
1566 1569
1567 /* Prevent uncontrolled outbreaks of self replicating monsters. 1570 /* Prevent uncontrolled outbreaks of self replicating monsters.
1568 Typical use case is charm, go somwhere, use aggravation to make hostile. 1571 Typical use case is charm, go somwhere, use aggravation to make hostile.
1569 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */ 1572 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1570 CLEAR_FLAG (head, FLAG_GENERATOR); 1573 head->clr_flag (FLAG_GENERATOR);
1571 head->set_owner (op); 1574 head->set_owner (op);
1572 set_spell_skill (op, caster, spell, head); 1575 set_spell_skill (op, caster, spell, head);
1573 add_friendly_object (head); 1576 add_friendly_object (head);
1574 head->attack_movement = PETMOVE; 1577 head->attack_movement = PETMOVE;
1575 done_one = 1; 1578 done_one = 1;
… …
1577 head->stats.exp = 0; 1580 head->stats.exp = 0;
1578 } 1581 }
1579 1582
1580 /* If a monster was effected, put an effect in */ 1583 /* If a monster was effected, put an effect in */
1581 if (done_one && spell->other_arch) 1584 if (done_one && spell->other_arch)
1582 m->insert (arch_to_object (spell->other_arch), nx, ny, op); 1585 m->insert (spell->other_arch->instance (), nx, ny, op);
1583 } 1586 }
1584 1587
1585 return 1; 1588 return 1;
1586} 1589}
1587 1590
… …
1670 hit_map (op, j, op->attacktype, 1); 1673 hit_map (op, j, op->attacktype, 1);
1671 } 1674 }
1672 1675
1673 /* insert the other arch */ 1676 /* insert the other arch */
1674 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))) 1677 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))
1675 m->insert (arch_to_object (op->other_arch), hx, hy, op); 1678 m->insert (op->other_arch->instance (), hx, hy, op);
1676 } 1679 }
1677 1680
1678 /* restore to the center location and damage */ 1681 /* restore to the center location and damage */
1679 op->stats.dam = dam_save; 1682 op->stats.dam = dam_save;
1680 1683
… …
1876 } 1879 }
1877 1880
1878 if (mflags & P_IS_ALIVE && spell->attacktype) 1881 if (mflags & P_IS_ALIVE && spell->attacktype)
1879 { 1882 {
1880 for (target = GET_MAP_OB (m, x, y); target; target = target->above) 1883 for (target = GET_MAP_OB (m, x, y); target; target = target->above)
1881 if (QUERY_FLAG (target, FLAG_MONSTER)) 1884 if (target->flag [FLAG_MONSTER])
1882 { 1885 {
1883 /* oky doky. got a target monster. Lets make a blinding attack */ 1886 /* oky doky. got a target monster. Lets make a blinding attack */
1884 if (target->head) 1887 if (target->head)
1885 target = target->head; 1888 target = target->head;
1886 1889
… …
1896 return 0; 1899 return 0;
1897 } 1900 }
1898 } 1901 }
1899 1902
1900 /* ok, looks groovy to just insert a new light on the map */ 1903 /* ok, looks groovy to just insert a new light on the map */
1901 tmp = arch_to_object (spell->other_arch); 1904 tmp = spell->other_arch->instance ();
1902 if (!tmp) 1905 if (!tmp)
1903 { 1906 {
1904 LOG (llevError, "Error: spell arch for cast_light() missing.\n"); 1907 LOG (llevError, "Error: spell arch for cast_light() missing.\n");
1905 return 0; 1908 return 0;
1906 } 1909 }
… …
1970 /* Only bother looking on this space if there is something living here */ 1973 /* Only bother looking on this space if there is something living here */
1971 if (mflags & P_IS_ALIVE) 1974 if (mflags & P_IS_ALIVE)
1972 { 1975 {
1973 /* search this square for a victim */ 1976 /* search this square for a victim */
1974 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above) 1977 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)
1975 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) 1978 if (walk->flag [FLAG_MONSTER] || (walk->type == PLAYER))
1976 { /* found a victim */ 1979 { /* found a victim */
1977 object *disease = arch_to_object (spell->other_arch); 1980 object *disease = spell->other_arch->instance ();
1978 1981
1979 disease->set_owner (op); 1982 disease->set_owner (op);
1980 set_spell_skill (op, caster, spell, disease); 1983 set_spell_skill (op, caster, spell, disease);
1981 disease->stats.exp = 0; 1984 disease->stats.exp = 0;
1982 disease->level = casting_level (caster, spell); 1985 disease->level = casting_level (caster, spell);
1983 1986
1984 /* do level adjustments */ 1987 /* do level adjustments */
1985 if (disease->stats.wc) 1988 if (disease->stats.wc ) disease->stats.wc += dur_mod / 2;
1986 disease->stats.wc += dur_mod / 2; 1989 if (disease->magic > 0) disease->magic += dur_mod / 8;
1987 1990 if (disease->stats.maxhp > 0) disease->stats.maxhp += dur_mod;
1988 if (disease->magic > 0) 1991 if (disease->stats.maxgrace > 0) disease->stats.maxgrace += dur_mod;
1989 disease->magic += dur_mod / 8;
1990
1991 if (disease->stats.maxhp > 0)
1992 disease->stats.maxhp += dur_mod;
1993
1994 if (disease->stats.maxgrace > 0)
1995 disease->stats.maxgrace += dur_mod;
1996
1997 if (disease->stats.dam)
1998 {
1999 if (disease->stats.dam > 0)
2000 disease->stats.dam += dam_mod;
2001 else
2002 disease->stats.dam -= dam_mod;
2003 }
2004 1992
2005 if (disease->last_sp) 1993 if (disease->last_sp)
2006 { 1994 {
2007 disease->last_sp -= 2 * dam_mod; 1995 disease->last_sp -= 2 * dam_mod;
1996
2008 if (disease->last_sp < 1) 1997 if (disease->last_sp < 1)
2009 disease->last_sp = 1; 1998 disease->last_sp = 1;
2010 } 1999 }
2011 2000
2012 if (disease->stats.maxsp) 2001 if (disease->stats.dam ) disease->stats.dam += copysign (disease->stats.dam , dam_mod);
2013 { 2002 if (disease->stats.maxsp) disease->stats.maxsp += copysign (disease->stats.maxsp, dam_mod);
2014 if (disease->stats.maxsp > 0) 2003 if (disease->stats.ac ) disease->stats.ac += dam_mod;
2015 disease->stats.maxsp += dam_mod; 2004 if (disease->last_eat ) disease->last_eat -= dam_mod;
2016 else 2005 if (disease->stats.hp ) disease->stats.hp -= dam_mod;
2017 disease->stats.maxsp -= dam_mod; 2006 if (disease->stats.sp ) disease->stats.sp -= dam_mod;
2018 }
2019
2020 if (disease->stats.ac)
2021 disease->stats.ac += dam_mod;
2022
2023 if (disease->last_eat)
2024 disease->last_eat -= dam_mod;
2025
2026 if (disease->stats.hp)
2027 disease->stats.hp -= dam_mod;
2028
2029 if (disease->stats.sp)
2030 disease->stats.sp -= dam_mod;
2031 2007
2032 if (infect_object (walk, disease, 1)) 2008 if (infect_object (walk, disease, 1))
2033 { 2009 {
2034 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2010 op->statusmsg (format ("You inflict %s on %s!", &disease->name, &walk->name));
2035 2011
2036 disease->destroy (); /* don't need this one anymore */ 2012 disease->destroy (); /* don't need this one anymore */
2037 walk->map->insert (get_archetype ("detect_magic"), x, y, op); 2013 walk->map->insert (get_archetype (shstr_detect_magic), x, y, op);
2038 return 1; 2014 return 1;
2039 } 2015 }
2040 2016
2041 disease->destroy (); 2017 disease->destroy ();
2042 } 2018 }

Diff Legend

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