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.78 by root, Mon Oct 22 03:11:46 2007 UTC vs.
Revision 1.92 by root, Thu Sep 25 04:09:57 2008 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 <assert.h> 24#include <assert.h>
25#include <global.h> 25#include <global.h>
26#include <living.h> 26#include <living.h>
… …
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->next; 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) && op->other_arch && QUERY_FLAG (op, FLAG_IS_LIGHTABLE))
165 { 165 {
166 const char *arch = op->other_arch->archname; 166 const char *arch = op->other_arch->archname;
167 167
168 op = decrease_ob_nr (op, 1); 168 if (op->decrease ())
169
170 if (op)
171 fix_stopped_item (op, m, originator); 169 fix_stopped_item (op, m, originator);
172 170
173 if ((op = get_archetype (arch)) != NULL) 171 if ((op = archetype::get (arch)))
174 { 172 {
175 if (env) 173 if (env)
176 { 174 env->insert (op);
177 op->x = env->x, op->y = env->y;
178 insert_ob_in_ob (op, env);
179 if (env->contr)
180 esrv_send_item (env, op);
181 }
182 else 175 else
183 {
184 op->x = x, op->y = y;
185 insert_ob_in_map (op, m, originator, 0); 176 m->insert (op, x, y, originator);
186 }
187 } 177 }
188 178
189 return; 179 return;
190 } 180 }
191 181
… …
196 return; 186 return;
197 } 187 }
198 188
199 if (op->nrof > 1) 189 if (op->nrof > 1)
200 { 190 {
201 op = decrease_ob_nr (op, rndm (0, op->nrof - 1)); 191 if (op->decrease (rndm (0, op->nrof - 1)))
202
203 if (op)
204 fix_stopped_item (op, m, originator); 192 fix_stopped_item (op, m, originator);
205 } 193 }
206 else 194 else
207 { 195 {
208 if (op->env) 196 // drop everything to the ground, if possible
209 { 197 op->insert_at (originator);
210 object *tmp = op->in_player ();
211
212 if (tmp)
213 esrv_del_item (tmp->contr, op->count);
214 }
215
216 op->destroy (); 198 op->destroy ();
217 } 199 }
218 200
219 if (type & (AT_FIRE | AT_ELECTRICITY)) 201 if (type & (AT_FIRE | AT_ELECTRICITY))
220 if (env) 202 if (env)
221 { 203 {
222 op = get_archetype ("burnout"); 204 op = archetype::get (shstr_burnout);
223 op->x = env->x, op->y = env->y; 205 op->x = env->x, op->y = env->y;
224 insert_ob_in_ob (op, env); 206 env->insert (op);
225 } 207 }
226 else 208 else
227 replace_insert_ob_in_map ("burnout", originator); 209 replace_insert_ob_in_map (shstr_burnout, originator);
228 210
229 return; 211 return;
230 } 212 }
231 213
232 /* The value of 50 is arbitrary. */ 214 /* The value of 50 is arbitrary. */
233 if (type & AT_COLD && (op->resist[ATNR_COLD] < 50) && !QUERY_FLAG (op, FLAG_NO_PICK) && (RANDOM () & 2)) 215 if (type & AT_COLD && (op->resist[ATNR_COLD] < 50) && !QUERY_FLAG (op, FLAG_NO_PICK) && rndm (2))
234 { 216 {
235 object *tmp;
236 archetype *at = archetype::find ("icecube"); 217 archetype *at = archetype::find (shstr_icecube);
237 218
238 if (at == NULL) 219 if (at == NULL)
239 return; 220 return;
240 221
241 op = stop_item (op); 222 op = stop_item (op);
242 if (op == NULL) 223 if (op == NULL)
243 return; 224 return;
244 225
245 if ((tmp = present_arch (at, op->map, op->x, op->y)) == NULL) 226 object *tmp = present_arch (at, op->map, op->x, op->y);
227 if (!tmp)
246 { 228 {
247 tmp = arch_to_object (at); 229 tmp = arch_to_object (at);
248 tmp->x = op->x, tmp->y = op->y; 230 tmp->x = op->x, tmp->y = op->y;
249 /* This was in the old (pre new movement code) - 231 /* This was in the old (pre new movement code) -
250 * icecubes have slow_move set to 1 - don't want 232 * icecubes have slow_move set to 1 - don't want
… …
253 tmp->move_slow_penalty = 0; 235 tmp->move_slow_penalty = 0;
254 tmp->move_slow = 0; 236 tmp->move_slow = 0;
255 insert_ob_in_map (tmp, op->map, originator, 0); 237 insert_ob_in_map (tmp, op->map, originator, 0);
256 } 238 }
257 239
258 if (!QUERY_FLAG (op, FLAG_REMOVED)) 240 tmp->insert (op);
259 op->remove ();
260
261 insert_ob_in_ob (op, tmp);
262 return; 241 return;
263 } 242 }
264} 243}
265 244
266/* Object op is hitting the map. 245/* Object op is hitting the map.
… …
295 } 274 }
296 275
297 if (op->head) 276 if (op->head)
298 op = op->head; 277 op = op->head;
299 278
300 map = op->map; 279 mapxy pos (op);
301 x = op->x + freearr_x[dir]; 280 pos.move (dir);
302 y = op->y + freearr_y[dir];
303 281
304 if (!xy_normalise (map, x, y)) 282 if (!pos.normalise ())
305 return 0; 283 return 0;
306 284
307 // elmex: a safe map tile can't be hit! 285 // elmex: a safe map tile can't be hit!
308 // this should prevent most harmful effects on items and players there. 286 // this should prevent most harmful effects on items and players there.
309 mapspace &ms = map->at (x, y); 287 mapspace &ms = pos.ms ();
310 288
311 if (ms.flags () & P_SAFE) 289 if (ms.flags () & P_SAFE)
312 return 0; 290 return 0;
313 291
314 /* peterm: a few special cases for special attacktypes --counterspell 292 /* peterm: a few special cases for special attacktypes --counterspell
… …
352 330
353 /* Something could have happened to 'tmp' while 'tmp->below' was processed. 331 /* Something could have happened to 'tmp' while 'tmp->below' was processed.
354 * For example, 'tmp' was put in an icecube. 332 * For example, 'tmp' was put in an icecube.
355 * This is one of the few cases where on_same_map should not be used. 333 * This is one of the few cases where on_same_map should not be used.
356 */ 334 */
357 if (tmp->map != map || tmp->x != x || tmp->y != y) 335 if (tmp->map != pos.m || tmp->x != pos.x || tmp->y != pos.y)
358 continue; 336 continue;
359 337
360 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 338 if (QUERY_FLAG (tmp, FLAG_ALIVE))
361 { 339 {
362 hit_player (tmp, op->stats.dam, op, type, full_hit); 340 hit_player (tmp, op->stats.dam, op, type, full_hit);
… …
539 { 517 {
540 int mtype; 518 int mtype;
541 519
542 switch (hitter->current_weapon->weapontype) 520 switch (hitter->current_weapon->weapontype)
543 { 521 {
544 case WEAP_HIT: 522 case WEAP_HIT:
545 mtype = ATM_BASIC; 523 mtype = ATM_BASIC;
546 break; 524 break;
547 case WEAP_SLASH: 525 case WEAP_SLASH:
548 mtype = ATM_SLASH; 526 mtype = ATM_SLASH;
549 break; 527 break;
550 case WEAP_PIERCE: 528 case WEAP_PIERCE:
551 mtype = ATM_PIERCE; 529 mtype = ATM_PIERCE;
552 break; 530 break;
553 case WEAP_CLEAVE: 531 case WEAP_CLEAVE:
554 mtype = ATM_CLEAVE; 532 mtype = ATM_CLEAVE;
555 break; 533 break;
556 case WEAP_SLICE: 534 case WEAP_SLICE:
557 mtype = ATM_SLICE; 535 mtype = ATM_SLICE;
558 break; 536 break;
559 case WEAP_STAB: 537 case WEAP_STAB:
560 mtype = ATM_STAB; 538 mtype = ATM_STAB;
561 break; 539 break;
562 case WEAP_WHIP: 540 case WEAP_WHIP:
563 mtype = ATM_WHIP; 541 mtype = ATM_WHIP;
564 break; 542 break;
565 case WEAP_CRUSH: 543 case WEAP_CRUSH:
566 mtype = ATM_CRUSH; 544 mtype = ATM_CRUSH;
567 break; 545 break;
568 case WEAP_BLUD: 546 case WEAP_BLUD:
569 mtype = ATM_BLUD; 547 mtype = ATM_BLUD;
570 break; 548 break;
571 default: 549 default:
572 mtype = ATM_BASIC; 550 mtype = ATM_BASIC;
573 break; 551 break;
574 } 552 }
553
575 for (i = 0; i < MAXATTACKMESS && attack_mess[mtype][i].level != -1; i++) 554 for (i = 0; i < MAXATTACKMESS && attack_mess[mtype][i].level != -1; i++)
576 if (dam < attack_mess[mtype][i].level || attack_mess[mtype][i + 1].level == -1) 555 if (dam < attack_mess[mtype][i].level || attack_mess[mtype][i + 1].level == -1)
577 { 556 {
578 sprintf (buf1, "%s %s%s", attack_mess[mtype][i].buf1, &op->name, attack_mess[mtype][i].buf2); 557 sprintf (buf1, "%s %s%s", attack_mess[mtype][i].buf1, &op->name, attack_mess[mtype][i].buf2);
579 strcpy (buf2, attack_mess[mtype][i].buf3); 558 strcpy (buf2, attack_mess[mtype][i].buf3);
… …
696 *target = (*target)->head; 675 *target = (*target)->head;
697 676
698 if ((*hitter)->head) 677 if ((*hitter)->head)
699 *hitter = (*hitter)->head; 678 *hitter = (*hitter)->head;
700 679
680 if ((*target)->type == LOCKED_DOOR)
681 return 1; // locked doors cannot be hit
682
701 if ((*hitter)->env != NULL || (*target)->env != NULL) 683 if ((*hitter)->env || (*target)->env)
702 { 684 {
703 *simple_attack = 1; 685 *simple_attack = 1;
704 return 0; 686 return 0;
705 } 687 }
706 688
… …
885 * debate - 5000 is 5 kg, so arrows, knives, and other light weapons 867 * debate - 5000 is 5 kg, so arrows, knives, and other light weapons
886 * stick around. 868 * stick around.
887 */ 869 */
888 if (op->weight <= 5000 && tmp->stats.hp >= 0) 870 if (op->weight <= 5000 && tmp->stats.hp >= 0)
889 { 871 {
890 tmp = tmp->head_ (); 872 tmp->head_ ()->insert (op);
891
892 op->remove ();
893 op = insert_ob_in_ob (op, tmp);
894
895 if (tmp->type == PLAYER)
896 esrv_send_item (tmp, op);
897
898 return 1; 873 return 1;
899 } 874 }
900 else 875 else
901 return 0; 876 return 0;
902} 877}
… …
1216 1191
1217 /* High damage acid has better chance of corroding 1192 /* High damage acid has better chance of corroding
1218 objects */ 1193 objects */
1219 if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic) 1194 if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic)
1220 { 1195 {
1221 if (op->type == PLAYER)
1222 /* Make this more visible */
1223 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op,
1224 "The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp));
1225 flag = 1; 1196 flag = 1;
1226 tmp->magic--; 1197 tmp->magic--;
1227 if (op->type == PLAYER) 1198
1228 esrv_send_item (op, tmp); 1199 if (object *pl = tmp->visible_to ())
1200 {
1201 /* Make this more visible */
1202 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, pl,
1203 "The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp));
1204
1205 esrv_send_item (op, tmp); //TODO: UPD_NAME should be enough (it's enough in other cases)
1206 }
1229 } 1207 }
1230 } 1208 }
1231 1209
1232 if (flag) 1210 if (flag)
1233 op->update_stats (); /* Something was corroded */ 1211 op->update_stats (); /* Something was corroded */
… …
1403 */ 1381 */
1404int 1382int
1405kill_object (object *op, int dam, object *hitter, int type) 1383kill_object (object *op, int dam, object *hitter, int type)
1406{ 1384{
1407 char buf[MAX_BUF]; 1385 char buf[MAX_BUF];
1408 const char *skill; 1386 shstr skill;
1409 int maxdam = 0; 1387 int maxdam = 0;
1410 int battleg = 0; /* true if op standing on battleground */ 1388 int battleg = 0; /* true if op standing on battleground */
1411 int pk = 0; /* true if op and what controls hitter are both players */ 1389 int pk = 0; /* true if op and what controls hitter are both players */
1412 object *owner = 0; 1390 object *owner = 0;
1413 object *skop = 0; 1391 object *skop = 0;
… …
1440 return maxdam; 1418 return maxdam;
1441 } 1419 }
1442 1420
1443 /* Now lets start dealing with experience we get for killing something */ 1421 /* Now lets start dealing with experience we get for killing something */
1444 1422
1445 owner = hitter->owner; 1423 owner = hitter->outer_owner ();
1446 if (!owner) 1424 if (!owner)
1447 owner = hitter; 1425 owner = hitter;
1448 1426
1449 /* is the victim (op) standing on battleground? */ 1427 /* is the victim (op) standing on battleground? */
1450 if (op_on_battleground (op, NULL, NULL)) 1428 if (op_on_battleground (op, NULL, NULL))
… …
1455 pk = 1; 1433 pk = 1;
1456 1434
1457 /* Player killed something */ 1435 /* Player killed something */
1458 if (owner->type == PLAYER) 1436 if (owner->type == PLAYER)
1459 { 1437 {
1460 Log_Kill (owner->name,
1461 query_name (op), op->type, (owner != hitter) ? query_name (hitter) : NULL, (owner != hitter) ? hitter->type : 0);
1462
1463 /* Log players killing other players - makes it easier to detect 1438 /* Log players killing other players - makes it easier to detect
1464 * and filter out malicious player killers - that is why the 1439 * and filter out malicious player killers - that is why the
1465 * ip address is included. 1440 * ip address is included.
1466 */ 1441 */
1467 if (op->type == PLAYER && !battleg) 1442 if (op->type == PLAYER && !battleg)
… …
1505 1480
1506 /* This code below deals with finding the appropriate skill 1481 /* This code below deals with finding the appropriate skill
1507 * to credit exp to. This is a bit problematic - we should 1482 * to credit exp to. This is a bit problematic - we should
1508 * probably never really have to look at current_weapon->skill 1483 * probably never really have to look at current_weapon->skill
1509 */ 1484 */
1510 skill = 0;
1511
1512 if (hitter->skill && hitter->type != PLAYER) 1485 if (hitter->skill && hitter->type != PLAYER)
1513 skill = hitter->skill; 1486 skill = hitter->skill;
1514 else if (owner->chosen_skill) 1487 else if (owner->chosen_skill)
1515 { 1488 {
1516 skop = owner->chosen_skill; 1489 skop = owner->chosen_skill;
1517 skill = skop->skill; 1490 skill = skop->skill;
1518 } 1491 }
1519 else if (QUERY_FLAG (owner, FLAG_READY_WEAPON)) 1492 else if (QUERY_FLAG (owner, FLAG_READY_WEAPON))
1520 skill = owner->current_weapon->skill; 1493 skill = owner->current_weapon->skill;
1521 else 1494 else
1495 {
1522 LOG (llevError, "kill_object - unable to find skill that killed monster\n"); 1496 LOG (llevError, "kill_object - unable to find skill that killed monster\n");
1497 skill = 0;
1498 }
1523 1499
1524 /* We have the skill we want to credit to - now find the object this goes 1500 /* We have the skill we want to credit to - now find the object this goes
1525 * to. Make sure skop is an actual skill, and not a skill tool! 1501 * to. Make sure skop is an actual skill, and not a skill tool!
1526 */ 1502 */
1527 if ((!skop || skop->type != SKILL) && skill) 1503 if ((!skop || skop->type != SKILL) && skill)
1528 { 1504 for (object *tmp = owner->inv; tmp; tmp = tmp->below)
1529 int i; 1505 if (tmp->skill == skill && tmp->type == SKILL)
1530
1531 for (i = 0; i < NUM_SKILLS; i++)
1532 if (owner->contr->last_skill_ob[i] && !strcmp (owner->contr->last_skill_ob[i]->skill, skill))
1533 { 1506 {
1534 skop = owner->contr->last_skill_ob[i]; 1507 skop = splay (tmp);
1535 break; 1508 break;
1536 } 1509 }
1537 }
1538 } /* Was it a player that hit somethign */ 1510 } /* Was it a player that hit somethign */
1539 else 1511 else
1540 skill = 0; 1512 skill = 0;
1541 1513
1542 /* Pet (or spell) killed something. */
1543 if (owner != hitter)
1544 sprintf (buf, "%s killed %s with %s%s%s.", &owner->name,
1545 query_name (op), query_name (hitter), battleg ? " (duel)" : "", pk ? " (pk)" : "");
1546 else
1547 sprintf (buf, "%s killed %s%s%s%s.", &hitter->name, &op->name,
1548 (QUERY_FLAG (hitter, FLAG_MONSTER)) || hitter->type == PLAYER ?
1549 " in hand to hand combat" : "", battleg ? " (duel)" : "", pk ? " (pk)" : "");
1550
1551 /* These may have been set in the player code section above */ 1514 /* These may have been set in the player code section above */
1552 if (!skop) 1515 if (!skop)
1553 skop = hitter->chosen_skill; 1516 skop = hitter->chosen_skill;
1554 1517
1555 if (!skill && skop) 1518 if (!skill && skop)
1556 skill = skop->skill; 1519 skill = skop->skill;
1557
1558 new_draw_info (NDI_ALL, op->type == PLAYER ? 1 : 10, NULL, buf);
1559 1520
1560 /* If you didn't kill yourself, and your not the wizard */ 1521 /* If you didn't kill yourself, and your not the wizard */
1561 if (owner != op && !QUERY_FLAG (op, FLAG_WIZ)) 1522 if (owner != op && !QUERY_FLAG (op, FLAG_WIZ))
1562 { 1523 {
1563 int exp; 1524 int exp;
… …
1635 1596
1636 if (owner1 && owner1->type == PLAYER) 1597 if (owner1 && owner1->type == PLAYER)
1637 { 1598 {
1638 owner1->contr->play_sound (sound_find ("pet_is_killed")); 1599 owner1->contr->play_sound (sound_find ("pet_is_killed"));
1639 /* Maybe we should include the owner that killed this, maybe not */ 1600 /* Maybe we should include the owner that killed this, maybe not */
1640 new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name); 1601 new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, was killed by %s.", &op->name, &hitter->name);
1641 } 1602 }
1642 1603
1643 remove_friendly_object (op); 1604 remove_friendly_object (op);
1644 } 1605 }
1645 1606
1646 op->destroy (); 1607 op->destroy ();
1647 } 1608 }
1648 else 1609 else
1649 {
1650 /* Player has been killed! */ 1610 /* Player has been killed! */
1651 if (owner->type == PLAYER) 1611 op->contr->killer = owner->type == PLAYER ? owner : hitter;
1652 snprintf (op->contr->killer, sizeof (op->contr->killer), "%s the %s", &owner->name, owner->contr->title);
1653 else
1654 assign (op->contr->killer, hitter->name);
1655 }
1656 1612
1657 /* This was return -1 - that doesn't seem correct - if we return -1, process 1613 /* This was return -1 - that doesn't seem correct - if we return -1, process
1658 * continues in the calling function. 1614 * continues in the calling function.
1659 */ 1615 */
1660 return maxdam; 1616 return maxdam;
… …
2212 return; 2168 return;
2213 2169
2214 def_lev = op->level; 2170 def_lev = op->level;
2215 if (def_lev < 1) 2171 if (def_lev < 1)
2216 { 2172 {
2217 LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->archname, &op->name); 2173 LOG (llevError, "BUG: arch %s with level < 1 (%s)\n", &op->arch->archname, op->debug_desc ());
2218 def_lev = 1; 2174 def_lev = 1;
2219 } 2175 }
2220 2176
2221 atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2; 2177 atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2;
2222 /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n", 2178 /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n",

Diff Legend

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