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

Comparing deliantra/server/server/attack.C (file contents):
Revision 1.81 by root, Tue Apr 22 02:46:18 2008 UTC vs.
Revision 1.107 by elmex, Mon Jan 12 00:17:23 2009 UTC

… …
62 CLEAR_FLAG (op, FLAG_DAMNED); 62 CLEAR_FLAG (op, FLAG_DAMNED);
63 CLEAR_FLAG (op, FLAG_CURSED); 63 CLEAR_FLAG (op, FLAG_CURSED);
64 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); 64 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);
65 CLEAR_FLAG (op, FLAG_KNOWN_CURSED); 65 CLEAR_FLAG (op, FLAG_KNOWN_CURSED);
66 66
67 if (op->env && op->env->type == PLAYER) 67 if (object *pl = op->visible_to ())
68 esrv_send_item (op->env, op); 68 esrv_update_item (UPD_FLAGS, pl, op);
69 } 69 }
70} 70}
71 71
72/* did_make_save_item just checks to make sure the item actually 72/* did_make_save_item just checks to make sure the item actually
73 * made its saving throw based on the tables. It does not take 73 * made its saving throw based on the tables. It does not take
… …
77did_make_save_item (object *op, int type, object *originator) 77did_make_save_item (object *op, int type, object *originator)
78{ 78{
79 int i, roll, saves = 0, attacks = 0, number; 79 int i, roll, saves = 0, attacks = 0, number;
80 materialtype_t *mt; 80 materialtype_t *mt;
81 81
82 if (op->materialname == NULL) 82 if (!op->materialname)
83 { 83 {
84 for (mt = materialt; mt != NULL && mt->next != NULL; mt = mt->next) 84 for (mt = materialt; mt; mt = mt->next)
85 if (op->materials & mt->material) 85 if (op->materials & mt->material)
86 break; 86 break;
87 } 87 }
88 else 88 else
89 mt = name_to_material (op->materialname); 89 mt = name_to_material (op->materialname);
… …
104 if (type != AT_MAGIC) 104 if (type != AT_MAGIC)
105 type &= ~(AT_CONFUSION | AT_DRAIN | AT_GHOSTHIT | AT_POISON | AT_SLOW | 105 type &= ~(AT_CONFUSION | AT_DRAIN | AT_GHOSTHIT | AT_POISON | AT_SLOW |
106 AT_PARALYZE | AT_TURN_UNDEAD | AT_FEAR | AT_DEPLETE | AT_DEATH | 106 AT_PARALYZE | AT_TURN_UNDEAD | AT_FEAR | AT_DEPLETE | AT_DEATH |
107 AT_COUNTERSPELL | AT_HOLYWORD | AT_BLIND | AT_LIFE_STEALING | AT_MAGIC); 107 AT_COUNTERSPELL | AT_HOLYWORD | AT_BLIND | AT_LIFE_STEALING | AT_MAGIC);
108 108
109 if (type == 0) 109 if (type == 0) return TRUE;
110 return TRUE; 110
111 if (roll == 20) 111 if (roll == 20) return TRUE;
112 return TRUE; 112 if (roll == 1) return FALSE;
113 if (roll == 1)
114 return FALSE;
115 113
116 for (number = 0; number < NROFATTACKS; number++) 114 for (number = 0; number < NROFATTACKS; number++)
117 { 115 {
118 i = 1 << number; 116 i = 1 << number;
117
119 if (!(i & type)) 118 if (!(i & type))
120 continue; 119 continue;
120
121 attacks++; 121 attacks++;
122 if (op->resist[number] == 100) 122 if (op->resist[number] == 100)
123 saves++; 123 saves++;
124 else if (roll >= mt->save[number] - op->magic - op->resist[number] / 100) 124 else if (roll >= mt->save[number] - op->magic - op->resist[number] / 100)
125 saves++; 125 saves++;
… …
148 object *env = op->env; 148 object *env = op->env;
149 int x = op->x, y = op->y; 149 int x = op->x, y = op->y;
150 maptile *m = op->map; 150 maptile *m = op->map;
151 151
152 op = stop_item (op); 152 op = stop_item (op);
153 if (op == NULL) 153 if (!op)
154 return; 154 return;
155 155
156 /* Hacked the following so that type LIGHTER will work. 156 /* Hacked the following so that type LIGHTER will work.
157 * Also, objects which are potenital "lights" that are hit by 157 * Also, objects which are potential "lights" that are hit by
158 * flame/elect attacks will be set to glow. "lights" are any 158 * flame/elect attacks will be set to glow. "lights" are any
159 * object with +/- glow_radius and an "other_arch" to change to. 159 * object with +/- glow_radius and an "other_arch" to change to.
160 * (and please note that we cant fail our save and reach this 160 * (and please note that we cant fail our save and reach this
161 * function if the object doesnt contain a material that can burn. 161 * function if the object doesnt contain a material that can burn.
162 * So forget lighting magical swords on fire with this!) -b.t. 162 * So forget lighting magical swords on fire with this!) -b.t.
163 */ 163 */
164 if (type & (AT_FIRE | AT_ELECTRICITY) && op->other_arch && QUERY_FLAG (op, FLAG_IS_LIGHTABLE)) 164 if (type & (AT_FIRE | AT_ELECTRICITY)
165 && (QUERY_FLAG (op, FLAG_IS_LIGHTABLE)
166 || op->type == LAMP
167 || op->type == TORCH
165 { 168 ))
166 const char *arch = op->other_arch->archname; 169 {
167 170 switch (op->type)
168 if (op->decrease ())
169 fix_stopped_item (op, m, originator);
170
171 if ((op = get_archetype (arch)))
172 { 171 {
173 if (env) 172 case LAMP:
173 // turn on a lamp
174 apply_lamp (op, true);
175 break;
176
177 default:
178 // for instance icecubes:
179 if (op->other_arch)
174 { 180 {
175 op->x = env->x, op->y = env->y; 181 const char *arch = op->other_arch->archname;
176 insert_ob_in_ob (op, env); 182
183 if (op->decrease ())
184 fix_stopped_item (op, m, originator);
185
186 if ((op = archetype::get (arch)))
187 {
177 if (env->contr) 188 if (env)
178 esrv_send_item (env, op); 189 env->insert (op);
190 else
191 m->insert (op, x, y, originator);
192 }
179 } 193 }
180 else
181 {
182 op->x = x, op->y = y;
183 insert_ob_in_map (op, m, originator, 0);
184 }
185 } 194 }
186
187 return; 195 return;
188 } 196 }
189 197
190 if (type & AT_CANCELLATION) 198 if (type & AT_CANCELLATION)
191 { /* Cancellation. */ 199 { /* Cancellation. */
… …
198 { 206 {
199 if (op->decrease (rndm (0, op->nrof - 1))) 207 if (op->decrease (rndm (0, op->nrof - 1)))
200 fix_stopped_item (op, m, originator); 208 fix_stopped_item (op, m, originator);
201 } 209 }
202 else 210 else
211 {
212 // drop everything to the ground, if possible
213 op->insert_at (originator);
203 op->destroy (); 214 op->drop_and_destroy ();
215 }
204 216
205 if (type & (AT_FIRE | AT_ELECTRICITY)) 217 if (type & (AT_FIRE | AT_ELECTRICITY))
206 if (env) 218 if (env)
207 { 219 {
208 op = get_archetype ("burnout"); 220 op = archetype::get (shstr_burnout);
209 op->x = env->x, op->y = env->y; 221 op->x = env->x, op->y = env->y;
210 insert_ob_in_ob (op, env); 222 env->insert (op);
211 } 223 }
212 else 224 else
213 replace_insert_ob_in_map ("burnout", originator); 225 replace_insert_ob_in_map (shstr_burnout, originator);
214 226
215 return; 227 return;
216 } 228 }
217 229
218 /* The value of 50 is arbitrary. */ 230 /* The value of 50 is arbitrary. */
219 if (type & AT_COLD && (op->resist[ATNR_COLD] < 50) && !QUERY_FLAG (op, FLAG_NO_PICK) && (RANDOM () & 2)) 231 if (type & AT_COLD && (op->resist[ATNR_COLD] < 50) && !QUERY_FLAG (op, FLAG_NO_PICK) && rndm (2))
220 { 232 {
221 object *tmp;
222 archetype *at = archetype::find ("icecube"); 233 archetype *at = archetype::find (shstr_icecube);
223 234
224 if (at == NULL) 235 if (at == NULL)
225 return; 236 return;
226 237
227 op = stop_item (op); 238 op = stop_item (op);
228 if (op == NULL) 239 if (op == NULL)
229 return; 240 return;
230 241
231 if ((tmp = present_arch (at, op->map, op->x, op->y)) == NULL) 242 object *tmp = present_arch (at, op->map, op->x, op->y);
243 if (!tmp)
232 { 244 {
233 tmp = arch_to_object (at); 245 tmp = arch_to_object (at);
234 tmp->x = op->x, tmp->y = op->y; 246 tmp->x = op->x, tmp->y = op->y;
235 /* This was in the old (pre new movement code) - 247 /* This was in the old (pre new movement code) -
236 * icecubes have slow_move set to 1 - don't want 248 * icecubes have slow_move set to 1 - don't want
… …
239 tmp->move_slow_penalty = 0; 251 tmp->move_slow_penalty = 0;
240 tmp->move_slow = 0; 252 tmp->move_slow = 0;
241 insert_ob_in_map (tmp, op->map, originator, 0); 253 insert_ob_in_map (tmp, op->map, originator, 0);
242 } 254 }
243 255
244 if (!QUERY_FLAG (op, FLAG_REMOVED)) 256 tmp->insert (op);
245 op->remove ();
246
247 insert_ob_in_ob (op, tmp);
248 return; 257 return;
249 } 258 }
250} 259}
251 260
252/* Object op is hitting the map. 261/* Object op is hitting the map.
… …
281 } 290 }
282 291
283 if (op->head) 292 if (op->head)
284 op = op->head; 293 op = op->head;
285 294
286 map = op->map; 295 mapxy pos (op);
287 x = op->x + freearr_x[dir]; 296 pos.move (dir);
288 y = op->y + freearr_y[dir];
289 297
290 if (!xy_normalise (map, x, y)) 298 if (!pos.normalise ())
291 return 0; 299 return 0;
292 300
293 // elmex: a safe map tile can't be hit! 301 // elmex: a safe map tile can't be hit!
294 // this should prevent most harmful effects on items and players there. 302 // this should prevent most harmful effects on items and players there.
295 mapspace &ms = map->at (x, y); 303 mapspace &ms = pos.ms ();
296 304
297 if (ms.flags () & P_SAFE) 305 if (ms.flags () & P_SAFE)
298 return 0; 306 return 0;
299 307
300 /* peterm: a few special cases for special attacktypes --counterspell 308 /* peterm: a few special cases for special attacktypes --counterspell
… …
338 346
339 /* Something could have happened to 'tmp' while 'tmp->below' was processed. 347 /* Something could have happened to 'tmp' while 'tmp->below' was processed.
340 * For example, 'tmp' was put in an icecube. 348 * For example, 'tmp' was put in an icecube.
341 * This is one of the few cases where on_same_map should not be used. 349 * This is one of the few cases where on_same_map should not be used.
342 */ 350 */
343 if (tmp->map != map || tmp->x != x || tmp->y != y) 351 if (tmp->map != pos.m || tmp->x != pos.x || tmp->y != pos.y)
344 continue; 352 continue;
345 353
346 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 354 if (QUERY_FLAG (tmp, FLAG_ALIVE))
347 { 355 {
348 hit_player (tmp, op->stats.dam, op, type, full_hit); 356 hit_player (tmp, op->stats.dam, op, type, full_hit);
… …
525 { 533 {
526 int mtype; 534 int mtype;
527 535
528 switch (hitter->current_weapon->weapontype) 536 switch (hitter->current_weapon->weapontype)
529 { 537 {
530 case WEAP_HIT: 538 case WEAP_HIT:
531 mtype = ATM_BASIC; 539 mtype = ATM_BASIC;
532 break; 540 break;
533 case WEAP_SLASH: 541 case WEAP_SLASH:
534 mtype = ATM_SLASH; 542 mtype = ATM_SLASH;
535 break; 543 break;
536 case WEAP_PIERCE: 544 case WEAP_PIERCE:
537 mtype = ATM_PIERCE; 545 mtype = ATM_PIERCE;
538 break; 546 break;
539 case WEAP_CLEAVE: 547 case WEAP_CLEAVE:
540 mtype = ATM_CLEAVE; 548 mtype = ATM_CLEAVE;
541 break; 549 break;
542 case WEAP_SLICE: 550 case WEAP_SLICE:
543 mtype = ATM_SLICE; 551 mtype = ATM_SLICE;
544 break; 552 break;
545 case WEAP_STAB: 553 case WEAP_STAB:
546 mtype = ATM_STAB; 554 mtype = ATM_STAB;
547 break; 555 break;
548 case WEAP_WHIP: 556 case WEAP_WHIP:
549 mtype = ATM_WHIP; 557 mtype = ATM_WHIP;
550 break; 558 break;
551 case WEAP_CRUSH: 559 case WEAP_CRUSH:
552 mtype = ATM_CRUSH; 560 mtype = ATM_CRUSH;
553 break; 561 break;
554 case WEAP_BLUD: 562 case WEAP_BLUD:
555 mtype = ATM_BLUD; 563 mtype = ATM_BLUD;
556 break; 564 break;
557 default: 565 default:
558 mtype = ATM_BASIC; 566 mtype = ATM_BASIC;
559 break; 567 break;
560 } 568 }
569
561 for (i = 0; i < MAXATTACKMESS && attack_mess[mtype][i].level != -1; i++) 570 for (i = 0; i < MAXATTACKMESS && attack_mess[mtype][i].level != -1; i++)
562 if (dam < attack_mess[mtype][i].level || attack_mess[mtype][i + 1].level == -1) 571 if (dam < attack_mess[mtype][i].level || attack_mess[mtype][i + 1].level == -1)
563 { 572 {
564 sprintf (buf1, "%s %s%s", attack_mess[mtype][i].buf1, &op->name, attack_mess[mtype][i].buf2); 573 sprintf (buf1, "%s %s%s", attack_mess[mtype][i].buf1, &op->name, attack_mess[mtype][i].buf2);
565 strcpy (buf2, attack_mess[mtype][i].buf3); 574 strcpy (buf2, attack_mess[mtype][i].buf3);
… …
682 *target = (*target)->head; 691 *target = (*target)->head;
683 692
684 if ((*hitter)->head) 693 if ((*hitter)->head)
685 *hitter = (*hitter)->head; 694 *hitter = (*hitter)->head;
686 695
696 if ((*target)->type == LOCKED_DOOR)
697 return 1; // locked doors cannot be hit
698
687 if ((*hitter)->env != NULL || (*target)->env != NULL) 699 if ((*hitter)->env || (*target)->env)
688 { 700 {
689 *simple_attack = 1; 701 *simple_attack = 1;
690 return 0; 702 return 0;
691 } 703 }
692 704
… …
784 * for help. */ 796 * for help. */
785 if (op->type != PLAYER && !can_see_enemy (op, hitter) && !op->owner && rndm (0, op->stats.Int)) 797 if (op->type != PLAYER && !can_see_enemy (op, hitter) && !op->owner && rndm (0, op->stats.Int))
786 npc_call_help (op); 798 npc_call_help (op);
787 799
788 /* if you were hidden and hit by a creature, you are discovered */ 800 /* if you were hidden and hit by a creature, you are discovered */
789 if (op->hide && QUERY_FLAG (hitter, FLAG_ALIVE)) 801 if (op->flag [FLAG_HIDDEN] && hitter->flag [FLAG_ALIVE])
790 { 802 {
791 make_visible (op); 803 make_visible (op);
792 804
793 if (op->type == PLAYER) 805 if (op->type == PLAYER)
794 new_draw_info (NDI_UNIQUE, 0, op, "You were hit by a wild attack. " "You are no longer hidden!"); 806 new_draw_info (NDI_UNIQUE, 0, op, "You were hit by a wild attack. " "You are no longer hidden!");
… …
871 * debate - 5000 is 5 kg, so arrows, knives, and other light weapons 883 * debate - 5000 is 5 kg, so arrows, knives, and other light weapons
872 * stick around. 884 * stick around.
873 */ 885 */
874 if (op->weight <= 5000 && tmp->stats.hp >= 0) 886 if (op->weight <= 5000 && tmp->stats.hp >= 0)
875 { 887 {
876 tmp = tmp->head_ (); 888 tmp->head_ ()->insert (op);
877
878 op->remove ();
879 op = insert_ob_in_ob (op, tmp);
880
881 if (tmp->type == PLAYER)
882 esrv_send_item (tmp, op);
883
884 return 1; 889 return 1;
885 } 890 }
886 else 891 else
887 return 0; 892 return 0;
888} 893}
… …
902 /* Disassemble missile */ 907 /* Disassemble missile */
903 if (op->inv) 908 if (op->inv)
904 { 909 {
905 container = op; 910 container = op;
906 hitter = op->inv; 911 hitter = op->inv;
907 hitter->remove ();
908 insert_ob_in_map (hitter, container->map, hitter, INS_NO_MERGE | INS_NO_WALK_ON); 912 hitter->insert_at (container, hitter, INS_NO_MERGE | INS_NO_WALK_ON);
909 /* Note that we now have an empty THROWN_OBJ on the map. Code that 913 /* Note that we now have an empty THROWN_OBJ on the map. Code that
910 * might be called until this THROWN_OBJ is either reassembled or 914 * might be called until this THROWN_OBJ is either reassembled or
911 * removed at the end of this function must be able to deal with empty 915 * removed at the end of this function must be able to deal with empty
912 * THROWN_OBJs. */ 916 * THROWN_OBJs. */
913 } 917 }
… …
927 * other places as well!) 931 * other places as well!)
928 */ 932 */
929 if (hitter->destroyed () || hitter->env != NULL) 933 if (hitter->destroyed () || hitter->env != NULL)
930 { 934 {
931 if (container) 935 if (container)
932 {
933 container->remove ();
934 container->destroy (); 936 container->destroy ();
935 }
936 937
937 return 0; 938 return 0;
938 } 939 }
939 940
940 /* Missile hit victim */ 941 /* Missile hit victim */
… …
964 * can fly over but not otherwise move over. What is the correct 965 * can fly over but not otherwise move over. What is the correct
965 * way to handle those otherwise? 966 * way to handle those otherwise?
966 */ 967 */
967 if (victim->x != hitter->x || victim->y != hitter->y) 968 if (victim->x != hitter->x || victim->y != hitter->y)
968 { 969 {
970 if (victim->destroyed ())
971 hitter->destroy ();
972 else
973 {
969 hitter->remove (); 974 hitter->remove ();
970 hitter->x = victim->x; 975 hitter->x = victim->x;
971 hitter->y = victim->y; 976 hitter->y = victim->y;
972 insert_ob_in_map (hitter, victim->map, hitter, 0); 977 insert_ob_in_map (hitter, victim->map, hitter, 0);
978 }
973 } 979 }
974 else 980 else
975 /* Else leave arrow where it is */ 981 /* Else leave arrow where it is */
976 merge_ob (hitter, NULL); 982 merge_ob (hitter, NULL);
977 983
… …
1078 if (attacknum == ATNR_INTERNAL) 1084 if (attacknum == ATNR_INTERNAL)
1079 return dam; 1085 return dam;
1080 1086
1081 if (hitter->slaying) 1087 if (hitter->slaying)
1082 { 1088 {
1083 if ((op->race && strstr (hitter->slaying, op->race)) 1089 if ((op->race && hitter->slaying.contains (op->race))
1084 || (op->arch && op->arch->archname && strstr (op->arch->archname, hitter->slaying))) 1090 || (op->arch && op->arch->archname.contains (hitter->slaying)))
1085 { 1091 {
1086 doesnt_slay = 0; 1092 doesnt_slay = 0;
1087 dam *= 3; 1093 dam *= 3;
1088 } 1094 }
1089 } 1095 }
… …
1202 1208
1203 /* High damage acid has better chance of corroding 1209 /* High damage acid has better chance of corroding
1204 objects */ 1210 objects */
1205 if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic) 1211 if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic)
1206 { 1212 {
1207 if (op->type == PLAYER)
1208 /* Make this more visible */
1209 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op,
1210 "The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp));
1211 flag = 1; 1213 flag = 1;
1212 tmp->magic--; 1214 tmp->magic--;
1213 if (op->type == PLAYER) 1215
1214 esrv_send_item (op, tmp); 1216 if (object *pl = tmp->visible_to ())
1217 {
1218 /* Make this more visible */
1219 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, pl,
1220 "The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp));
1221
1222 esrv_send_item (op, tmp); //TODO: UPD_NAME should be enough (it's enough in other cases)
1223 }
1215 } 1224 }
1216 } 1225 }
1217 1226
1218 if (flag) 1227 if (flag)
1219 op->update_stats (); /* Something was corroded */ 1228 op->update_stats (); /* Something was corroded */
… …
1288 object *god = find_god (determine_god (owner)); 1297 object *god = find_god (determine_god (owner));
1289 int div = 1; 1298 int div = 1;
1290 1299
1291 /* if undead are not an enemy of your god, you turn them 1300 /* if undead are not an enemy of your god, you turn them
1292 * at half strength */ 1301 * at half strength */
1293 if (!god || !god->slaying || strstr (god->slaying, shstr_undead) == NULL) 1302 if (!god || !god->slaying.contains (shstr_undead))
1294 div = 2; 1303 div = 2;
1295 1304
1296 /* Give a bonus if you resist turn undead */ 1305 /* Give a bonus if you resist turn undead */
1297 if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100))) 1306 if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100)))
1298 scare_creature (op, owner); 1307 scare_creature (op, owner);
… …
1389 */ 1398 */
1390int 1399int
1391kill_object (object *op, int dam, object *hitter, int type) 1400kill_object (object *op, int dam, object *hitter, int type)
1392{ 1401{
1393 char buf[MAX_BUF]; 1402 char buf[MAX_BUF];
1394 const char *skill; 1403 shstr skill;
1395 int maxdam = 0; 1404 int maxdam = 0;
1396 int battleg = 0; /* true if op standing on battleground */ 1405 int battleg = 0; /* true if op standing on battleground */
1397 int pk = 0; /* true if op and what controls hitter are both players */ 1406 int pk = 0; /* true if op and what controls hitter are both players */
1398 object *owner = 0; 1407 object *owner = 0;
1399 object *skop = 0; 1408 object *skop = 0;
… …
1420 return maxdam; 1429 return maxdam;
1421 } 1430 }
1422 1431
1423 if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER) 1432 if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER)
1424 { 1433 {
1425 op->destroy (); 1434 op->drop_and_destroy ();
1426 return maxdam; 1435 return maxdam;
1427 } 1436 }
1428 1437
1429 /* Now lets start dealing with experience we get for killing something */ 1438 /* Now lets start dealing with experience we get for killing something */
1430 1439
1431 owner = hitter->owner; 1440 owner = hitter->outer_owner ();
1432 if (!owner) 1441 if (!owner)
1433 owner = hitter; 1442 owner = hitter;
1434 1443
1435 /* is the victim (op) standing on battleground? */ 1444 /* is the victim (op) standing on battleground? */
1436 if (op_on_battleground (op, NULL, NULL)) 1445 if (op_on_battleground (op, NULL, NULL))
… …
1441 pk = 1; 1450 pk = 1;
1442 1451
1443 /* Player killed something */ 1452 /* Player killed something */
1444 if (owner->type == PLAYER) 1453 if (owner->type == PLAYER)
1445 { 1454 {
1446 Log_Kill (owner->name,
1447 query_name (op), op->type, (owner != hitter) ? query_name (hitter) : NULL, (owner != hitter) ? hitter->type : 0);
1448
1449 /* Log players killing other players - makes it easier to detect 1455 /* Log players killing other players - makes it easier to detect
1450 * and filter out malicious player killers - that is why the 1456 * and filter out malicious player killers - that is why the
1451 * ip address is included. 1457 * ip address is included.
1452 */ 1458 */
1453 if (op->type == PLAYER && !battleg) 1459 if (op->type == PLAYER && !battleg)
… …
1491 1497
1492 /* This code below deals with finding the appropriate skill 1498 /* This code below deals with finding the appropriate skill
1493 * to credit exp to. This is a bit problematic - we should 1499 * to credit exp to. This is a bit problematic - we should
1494 * probably never really have to look at current_weapon->skill 1500 * probably never really have to look at current_weapon->skill
1495 */ 1501 */
1496 skill = 0;
1497
1498 if (hitter->skill && hitter->type != PLAYER) 1502 if (hitter->skill && hitter->type != PLAYER)
1499 skill = hitter->skill; 1503 skill = hitter->skill;
1500 else if (owner->chosen_skill) 1504 else if (owner->chosen_skill)
1501 { 1505 {
1502 skop = owner->chosen_skill; 1506 skop = owner->chosen_skill;
1503 skill = skop->skill; 1507 skill = skop->skill;
1504 } 1508 }
1505 else if (QUERY_FLAG (owner, FLAG_READY_WEAPON)) 1509 else if (QUERY_FLAG (owner, FLAG_READY_WEAPON) && owner->current_weapon)
1506 skill = owner->current_weapon->skill; 1510 skill = owner->current_weapon->skill;
1507 else 1511 else
1512 {
1508 LOG (llevError, "kill_object - unable to find skill that killed monster\n"); 1513 LOG (llevError, "BUG: kill_object - unable to find skill that killed monster\n"
1514 "op: %s\n" "hitter: %s\n" "owner: %s\n",
1515 owner->debug_desc (), hitter->debug_desc (), op->debug_desc ());
1516 skill = 0;
1517 }
1509 1518
1510 /* We have the skill we want to credit to - now find the object this goes 1519 /* We have the skill we want to credit to - now find the object this goes
1511 * to. Make sure skop is an actual skill, and not a skill tool! 1520 * to. Make sure skop is an actual skill, and not a skill tool!
1512 */ 1521 */
1513 if ((!skop || skop->type != SKILL) && skill) 1522 skop = owner->contr->find_skill (skill);
1514 {
1515 int i;
1516
1517 for (i = 0; i < NUM_SKILLS; i++)
1518 if (owner->contr->last_skill_ob[i] && !strcmp (owner->contr->last_skill_ob[i]->skill, skill))
1519 {
1520 skop = owner->contr->last_skill_ob[i];
1521 break;
1522 }
1523 }
1524 } /* Was it a player that hit somethign */ 1523 } /* Was it a player that hit somethign */
1525 else 1524 else
1526 skill = 0; 1525 skill = 0;
1527 1526
1528 /* Pet (or spell) killed something. */
1529 if (owner != hitter)
1530 sprintf (buf, "%s killed %s with %s%s%s.", &owner->name,
1531 query_name (op), query_name (hitter), battleg ? " (duel)" : "", pk ? " (pk)" : "");
1532 else
1533 sprintf (buf, "%s killed %s%s%s%s.", &hitter->name, &op->name,
1534 (QUERY_FLAG (hitter, FLAG_MONSTER)) || hitter->type == PLAYER ?
1535 " in hand to hand combat" : "", battleg ? " (duel)" : "", pk ? " (pk)" : "");
1536
1537 /* These may have been set in the player code section above */ 1527 /* These may have been set in the player code section above */
1538 if (!skop) 1528 if (!skop)
1539 skop = hitter->chosen_skill; 1529 skop = hitter->chosen_skill;
1540 1530
1541 if (!skill && skop) 1531 if (!skill && skop)
1542 skill = skop->skill; 1532 skill = skop->skill;
1543
1544 new_draw_info (NDI_ALL, op->type == PLAYER ? 1 : 10, NULL, buf);
1545 1533
1546 /* If you didn't kill yourself, and your not the wizard */ 1534 /* If you didn't kill yourself, and your not the wizard */
1547 if (owner != op && !QUERY_FLAG (op, FLAG_WIZ)) 1535 if (owner != op && !QUERY_FLAG (op, FLAG_WIZ))
1548 { 1536 {
1549 int exp; 1537 int exp;
… …
1621 1609
1622 if (owner1 && owner1->type == PLAYER) 1610 if (owner1 && owner1->type == PLAYER)
1623 { 1611 {
1624 owner1->contr->play_sound (sound_find ("pet_is_killed")); 1612 owner1->contr->play_sound (sound_find ("pet_is_killed"));
1625 /* Maybe we should include the owner that killed this, maybe not */ 1613 /* Maybe we should include the owner that killed this, maybe not */
1626 new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name); 1614 new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, was killed by %s.", &op->name, &hitter->name);
1627 } 1615 }
1628 1616
1629 remove_friendly_object (op); 1617 remove_friendly_object (op);
1630 } 1618 }
1631 1619
1632 op->destroy (); 1620 op->drop_and_destroy ();
1633 } 1621 }
1634 else 1622 else
1635 {
1636 /* Player has been killed! */ 1623 /* Player has been killed! */
1637 if (owner->type == PLAYER) 1624 op->contr->killer = owner->type == PLAYER ? owner : hitter;
1638 snprintf (op->contr->killer, sizeof (op->contr->killer), "%s the %s", &owner->name, owner->contr->title);
1639 else
1640 assign (op->contr->killer, hitter->name);
1641 }
1642 1625
1643 /* This was return -1 - that doesn't seem correct - if we return -1, process 1626 /* This was return -1 - that doesn't seem correct - if we return -1, process
1644 * continues in the calling function. 1627 * continues in the calling function.
1645 */ 1628 */
1646 return maxdam; 1629 return maxdam;
… …
1802 */ 1785 */
1803 if (type & AT_HOLYWORD) 1786 if (type & AT_HOLYWORD)
1804 { 1787 {
1805 object *god; 1788 object *god;
1806 1789
1807 if ((!hitter->slaying || 1790 if ((!hitter->slaying
1808 (!(op->race && strstr (hitter->slaying, op->race)) && 1791 || (!(op->race && hitter->slaying.contains (op->race))
1809 !(op->name && strstr (hitter->slaying, op->name)))) && 1792 && !(op->name && hitter->slaying.contains (op->name))))
1810 (!QUERY_FLAG (op, FLAG_UNDEAD) || 1793 && (!QUERY_FLAG (op, FLAG_UNDEAD)
1811 (hitter->title != NULL 1794 || (hitter->title
1812 && (god = find_god (determine_god (hitter))) != NULL && god->race != NULL && strstr (god->race, shstr_undead) != NULL))) 1795 && (god = find_god (determine_god (hitter))) != NULL
1796 && god->race.contains (shstr_undead))))
1813 return 0; 1797 return 0;
1814 } 1798 }
1815 1799
1816 maxattacktype = type; /* initialise this to something */ 1800 maxattacktype = type; /* initialise this to something */
1817 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum) 1801 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum)
… …
1928 /* See if the creature has been killed */ 1912 /* See if the creature has been killed */
1929 rtn_kill = kill_object (op, maxdam, hitter, type); 1913 rtn_kill = kill_object (op, maxdam, hitter, type);
1930 if (rtn_kill != -1) 1914 if (rtn_kill != -1)
1931 return rtn_kill; 1915 return rtn_kill;
1932 1916
1933
1934 /* Used to be ghosthit removal - we now use the ONE_HIT flag. Note 1917 /* Used to be ghosthit removal - we now use the ONE_HIT flag. Note
1935 * that before if the player was immune to ghosthit, the monster 1918 * that before if the player was immune to ghosthit, the monster
1936 * remained - that is no longer the case. 1919 * remained - that is no longer the case.
1937 */ 1920 */
1938 if (QUERY_FLAG (hitter, FLAG_ONE_HIT)) 1921 if (QUERY_FLAG (hitter, FLAG_ONE_HIT))
1939 hitter->destroy (); 1922 hitter->drop_and_destroy ();
1940
1941 /* Lets handle creatures that are splitting now */ 1923 /* Lets handle creatures that are splitting now */
1942 else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING)) 1924 else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING))
1943 { 1925 {
1944 int i; 1926 int i;
1945 int friendly = QUERY_FLAG (op, FLAG_FRIENDLY); 1927 int friendly = QUERY_FLAG (op, FLAG_FRIENDLY);
… …
1985 } 1967 }
1986 1968
1987 op->destroy (); 1969 op->destroy ();
1988 } 1970 }
1989 else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10) 1971 else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10)
1990 hitter->destroy (); 1972 hitter->drop_and_destroy ();
1991 1973
1992 return maxdam; 1974 return maxdam;
1993} 1975}
1994 1976
1995void 1977void
… …
2192 ** field of the deathstriking object */ 2174 ** field of the deathstriking object */
2193 2175
2194 int atk_lev, def_lev, kill_lev; 2176 int atk_lev, def_lev, kill_lev;
2195 2177
2196 if (hitter->slaying) 2178 if (hitter->slaying)
2197 if (!((QUERY_FLAG (op, FLAG_UNDEAD) && strstr (hitter->slaying, shstr_undead)) || (op->race && strstr (hitter->slaying, op->race)))) 2179 if (!((QUERY_FLAG (op, FLAG_UNDEAD) && hitter->slaying.contains (shstr_undead))
2180 || (op->race && hitter->slaying.contains (op->race))))
2198 return; 2181 return;
2199 2182
2200 def_lev = op->level; 2183 def_lev = op->level;
2201 if (def_lev < 1) 2184 if (def_lev < 1)
2202 { 2185 {
2203 LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->archname, &op->name); 2186 LOG (llevError, "BUG: arch %s with level < 1 (%s)\n", &op->arch->archname, op->debug_desc ());
2204 def_lev = 1; 2187 def_lev = 1;
2205 } 2188 }
2206 2189
2207 atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2; 2190 atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2;
2208 /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n", 2191 /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n",
… …
2301 { 2284 {
2302 /* target is unseen */ 2285 /* target is unseen */
2303 if (target->invisible || QUERY_FLAG (attacker, FLAG_BLIND)) 2286 if (target->invisible || QUERY_FLAG (attacker, FLAG_BLIND))
2304 adjust -= 10; 2287 adjust -= 10;
2305 /* dark map penalty for the hitter (lacks infravision if we got here). */ 2288 /* dark map penalty for the hitter (lacks infravision if we got here). */
2306 else if (target->map && target->map->darkness > 0 && !stand_in_light (target)) 2289 else if (!stand_in_light (target))
2307 adjust -= target->map->darkness; 2290 adjust -= target->map->darklevel ();
2308 } 2291 }
2309 2292
2310 if (QUERY_FLAG (attacker, FLAG_SCARED)) 2293 if (QUERY_FLAG (attacker, FLAG_SCARED))
2311 adjust -= 3; 2294 adjust -= 3;
2312 2295

Diff Legend

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