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.68 by root, Tue Jun 5 13:05:02 2007 UTC vs.
Revision 1.87 by root, Mon Jul 14 18:36:43 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 it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * 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>
23 */ 22 */
24 23
25#include <assert.h> 24#include <assert.h>
26#include <global.h> 25#include <global.h>
27#include <living.h> 26#include <living.h>
… …
63 CLEAR_FLAG (op, FLAG_DAMNED); 62 CLEAR_FLAG (op, FLAG_DAMNED);
64 CLEAR_FLAG (op, FLAG_CURSED); 63 CLEAR_FLAG (op, FLAG_CURSED);
65 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); 64 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);
66 CLEAR_FLAG (op, FLAG_KNOWN_CURSED); 65 CLEAR_FLAG (op, FLAG_KNOWN_CURSED);
67 66
68 if (op->env && op->env->type == PLAYER) 67 if (object *pl = op->visible_to ())
69 esrv_send_item (op->env, op); 68 esrv_update_item (UPD_FLAGS, pl, op);
70 } 69 }
71} 70}
72 71
73/* 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
74 * 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
… …
78did_make_save_item (object *op, int type, object *originator) 77did_make_save_item (object *op, int type, object *originator)
79{ 78{
80 int i, roll, saves = 0, attacks = 0, number; 79 int i, roll, saves = 0, attacks = 0, number;
81 materialtype_t *mt; 80 materialtype_t *mt;
82 81
83 if (op->materialname == NULL) 82 if (!op->materialname)
84 { 83 {
85 for (mt = materialt; mt != NULL && mt->next != NULL; mt = mt->next) 84 for (mt = materialt; mt && mt->next; mt = mt->next)
86 if (op->materials & mt->material) 85 if (op->materials & mt->material)
87 break; 86 break;
88 } 87 }
89 else 88 else
90 mt = name_to_material (op->materialname); 89 mt = name_to_material (op->materialname);
91 90
92 if (mt == NULL) 91 if (!mt)
93 return TRUE; 92 return TRUE;
94 93
95 roll = rndm (1, 20); 94 roll = rndm (1, 20);
96 95
97 /* the attacktypes have no meaning for object saves 96 /* the attacktypes have no meaning for object saves
… …
105 if (type != AT_MAGIC) 104 if (type != AT_MAGIC)
106 type &= ~(AT_CONFUSION | AT_DRAIN | AT_GHOSTHIT | AT_POISON | AT_SLOW | 105 type &= ~(AT_CONFUSION | AT_DRAIN | AT_GHOSTHIT | AT_POISON | AT_SLOW |
107 AT_PARALYZE | AT_TURN_UNDEAD | AT_FEAR | AT_DEPLETE | AT_DEATH | 106 AT_PARALYZE | AT_TURN_UNDEAD | AT_FEAR | AT_DEPLETE | AT_DEATH |
108 AT_COUNTERSPELL | AT_HOLYWORD | AT_BLIND | AT_LIFE_STEALING | AT_MAGIC); 107 AT_COUNTERSPELL | AT_HOLYWORD | AT_BLIND | AT_LIFE_STEALING | AT_MAGIC);
109 108
110 if (type == 0) 109 if (type == 0) return TRUE;
111 return TRUE; 110
112 if (roll == 20) 111 if (roll == 20) return TRUE;
113 return TRUE; 112 if (roll == 1) return FALSE;
114 if (roll == 1)
115 return FALSE;
116 113
117 for (number = 0; number < NROFATTACKS; number++) 114 for (number = 0; number < NROFATTACKS; number++)
118 { 115 {
119 i = 1 << number; 116 i = 1 << number;
117
120 if (!(i & type)) 118 if (!(i & type))
121 continue; 119 continue;
120
122 attacks++; 121 attacks++;
123 if (op->resist[number] == 100) 122 if (op->resist[number] == 100)
124 saves++; 123 saves++;
125 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)
126 saves++; 125 saves++;
… …
153 op = stop_item (op); 152 op = stop_item (op);
154 if (op == NULL) 153 if (op == NULL)
155 return; 154 return;
156 155
157 /* Hacked the following so that type LIGHTER will work. 156 /* Hacked the following so that type LIGHTER will work.
158 * Also, objects which are potenital "lights" that are hit by 157 * Also, objects which are potential "lights" that are hit by
159 * flame/elect attacks will be set to glow. "lights" are any 158 * flame/elect attacks will be set to glow. "lights" are any
160 * object with +/- glow_radius and an "other_arch" to change to. 159 * object with +/- glow_radius and an "other_arch" to change to.
161 * (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
162 * function if the object doesnt contain a material that can burn. 161 * function if the object doesnt contain a material that can burn.
163 * So forget lighting magical swords on fire with this!) -b.t. 162 * So forget lighting magical swords on fire with this!) -b.t.
164 */ 163 */
165 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))
166 { 165 {
167 const char *arch = op->other_arch->archname; 166 const char *arch = op->other_arch->archname;
168 167
169 op = decrease_ob_nr (op, 1); 168 if (op->decrease ())
170
171 if (op)
172 fix_stopped_item (op, m, originator); 169 fix_stopped_item (op, m, originator);
173 170
174 if ((op = get_archetype (arch)) != NULL) 171 if ((op = archetype::get (arch)))
175 { 172 {
176 if (env) 173 if (env)
177 { 174 env->insert (op);
178 op->x = env->x, op->y = env->y;
179 insert_ob_in_ob (op, env);
180 if (env->contr)
181 esrv_send_item (env, op);
182 }
183 else 175 else
184 {
185 op->x = x, op->y = y;
186 insert_ob_in_map (op, m, originator, 0); 176 m->insert (op, x, y, originator);
187 }
188 } 177 }
189 178
190 return; 179 return;
191 } 180 }
192 181
… …
197 return; 186 return;
198 } 187 }
199 188
200 if (op->nrof > 1) 189 if (op->nrof > 1)
201 { 190 {
202 op = decrease_ob_nr (op, rndm (0, op->nrof - 1)); 191 if (op->decrease (rndm (0, op->nrof - 1)))
203
204 if (op)
205 fix_stopped_item (op, m, originator); 192 fix_stopped_item (op, m, originator);
206 } 193 }
207 else 194 else
208 { 195 {
196 // drop everything to the ground, if possible
209 if (op->env) 197 while (op->inv)
210 { 198 op->inv->insert_at (originator);
211 object *tmp = op->in_player ();
212
213 if (tmp)
214 esrv_del_item (tmp->contr, op->count);
215 }
216 199
217 op->destroy (); 200 op->destroy ();
218 } 201 }
219 202
220 if (type & (AT_FIRE | AT_ELECTRICITY)) 203 if (type & (AT_FIRE | AT_ELECTRICITY))
221 if (env) 204 if (env)
222 { 205 {
223 op = get_archetype ("burnout"); 206 op = archetype::get (shstr_burnout);
224 op->x = env->x, op->y = env->y; 207 op->x = env->x, op->y = env->y;
225 insert_ob_in_ob (op, env); 208 env->insert (op);
226 } 209 }
227 else 210 else
228 replace_insert_ob_in_map ("burnout", originator); 211 replace_insert_ob_in_map (shstr_burnout, originator);
229 212
230 return; 213 return;
231 } 214 }
232 215
233 /* The value of 50 is arbitrary. */ 216 /* The value of 50 is arbitrary. */
234 if (type & AT_COLD && (op->resist[ATNR_COLD] < 50) && !QUERY_FLAG (op, FLAG_NO_PICK) && (RANDOM () & 2)) 217 if (type & AT_COLD && (op->resist[ATNR_COLD] < 50) && !QUERY_FLAG (op, FLAG_NO_PICK) && (RANDOM () & 2))
235 { 218 {
236 object *tmp;
237 archetype *at = archetype::find ("icecube"); 219 archetype *at = archetype::find (shstr_icecube);
238 220
239 if (at == NULL) 221 if (at == NULL)
240 return; 222 return;
241 223
242 op = stop_item (op); 224 op = stop_item (op);
243 if (op == NULL) 225 if (op == NULL)
244 return; 226 return;
245 227
246 if ((tmp = present_arch (at, op->map, op->x, op->y)) == NULL) 228 object *tmp = present_arch (at, op->map, op->x, op->y);
229 if (!tmp)
247 { 230 {
248 tmp = arch_to_object (at); 231 tmp = arch_to_object (at);
249 tmp->x = op->x, tmp->y = op->y; 232 tmp->x = op->x, tmp->y = op->y;
250 /* This was in the old (pre new movement code) - 233 /* This was in the old (pre new movement code) -
251 * icecubes have slow_move set to 1 - don't want 234 * icecubes have slow_move set to 1 - don't want
… …
254 tmp->move_slow_penalty = 0; 237 tmp->move_slow_penalty = 0;
255 tmp->move_slow = 0; 238 tmp->move_slow = 0;
256 insert_ob_in_map (tmp, op->map, originator, 0); 239 insert_ob_in_map (tmp, op->map, originator, 0);
257 } 240 }
258 241
259 if (!QUERY_FLAG (op, FLAG_REMOVED)) 242 tmp->insert (op);
260 op->remove ();
261
262 insert_ob_in_ob (op, tmp);
263 return; 243 return;
264 } 244 }
265} 245}
266 246
267/* Object op is hitting the map. 247/* Object op is hitting the map.
… …
296 } 276 }
297 277
298 if (op->head) 278 if (op->head)
299 op = op->head; 279 op = op->head;
300 280
301 map = op->map; 281 mapxy pos (op);
302 x = op->x + freearr_x[dir]; 282 pos.move (dir);
303 y = op->y + freearr_y[dir];
304 283
305 if (!xy_normalise (map, x, y)) 284 if (!pos.normalise ())
306 return 0; 285 return 0;
307 286
308 // elmex: a safe map tile can't be hit! 287 // elmex: a safe map tile can't be hit!
309 // this should prevent most harmful effects on items and players there. 288 // this should prevent most harmful effects on items and players there.
310 mapspace &ms = map->at (x, y); 289 mapspace &ms = pos.ms ();
311 290
312 if (ms.flags () & P_SAFE) 291 if (ms.flags () & P_SAFE)
313 return 0; 292 return 0;
314 293
315 /* peterm: a few special cases for special attacktypes --counterspell 294 /* peterm: a few special cases for special attacktypes --counterspell
… …
353 332
354 /* Something could have happened to 'tmp' while 'tmp->below' was processed. 333 /* Something could have happened to 'tmp' while 'tmp->below' was processed.
355 * For example, 'tmp' was put in an icecube. 334 * For example, 'tmp' was put in an icecube.
356 * This is one of the few cases where on_same_map should not be used. 335 * This is one of the few cases where on_same_map should not be used.
357 */ 336 */
358 if (tmp->map != map || tmp->x != x || tmp->y != y) 337 if (tmp->map != pos.m || tmp->x != pos.x || tmp->y != pos.y)
359 continue; 338 continue;
360 339
361 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 340 if (QUERY_FLAG (tmp, FLAG_ALIVE))
362 { 341 {
363 hit_player (tmp, op->stats.dam, op, type, full_hit); 342 hit_player (tmp, op->stats.dam, op, type, full_hit);
… …
540 { 519 {
541 int mtype; 520 int mtype;
542 521
543 switch (hitter->current_weapon->weapontype) 522 switch (hitter->current_weapon->weapontype)
544 { 523 {
545 case WEAP_HIT: 524 case WEAP_HIT:
546 mtype = ATM_BASIC; 525 mtype = ATM_BASIC;
547 break; 526 break;
548 case WEAP_SLASH: 527 case WEAP_SLASH:
549 mtype = ATM_SLASH; 528 mtype = ATM_SLASH;
550 break; 529 break;
551 case WEAP_PIERCE: 530 case WEAP_PIERCE:
552 mtype = ATM_PIERCE; 531 mtype = ATM_PIERCE;
553 break; 532 break;
554 case WEAP_CLEAVE: 533 case WEAP_CLEAVE:
555 mtype = ATM_CLEAVE; 534 mtype = ATM_CLEAVE;
556 break; 535 break;
557 case WEAP_SLICE: 536 case WEAP_SLICE:
558 mtype = ATM_SLICE; 537 mtype = ATM_SLICE;
559 break; 538 break;
560 case WEAP_STAB: 539 case WEAP_STAB:
561 mtype = ATM_STAB; 540 mtype = ATM_STAB;
562 break; 541 break;
563 case WEAP_WHIP: 542 case WEAP_WHIP:
564 mtype = ATM_WHIP; 543 mtype = ATM_WHIP;
565 break; 544 break;
566 case WEAP_CRUSH: 545 case WEAP_CRUSH:
567 mtype = ATM_CRUSH; 546 mtype = ATM_CRUSH;
568 break; 547 break;
569 case WEAP_BLUD: 548 case WEAP_BLUD:
570 mtype = ATM_BLUD; 549 mtype = ATM_BLUD;
571 break; 550 break;
572 default: 551 default:
573 mtype = ATM_BASIC; 552 mtype = ATM_BASIC;
574 break; 553 break;
575 } 554 }
555
576 for (i = 0; i < MAXATTACKMESS && attack_mess[mtype][i].level != -1; i++) 556 for (i = 0; i < MAXATTACKMESS && attack_mess[mtype][i].level != -1; i++)
577 if (dam < attack_mess[mtype][i].level || attack_mess[mtype][i + 1].level == -1) 557 if (dam < attack_mess[mtype][i].level || attack_mess[mtype][i + 1].level == -1)
578 { 558 {
579 sprintf (buf1, "%s %s%s", attack_mess[mtype][i].buf1, &op->name, attack_mess[mtype][i].buf2); 559 sprintf (buf1, "%s %s%s", attack_mess[mtype][i].buf1, &op->name, attack_mess[mtype][i].buf2);
580 strcpy (buf2, attack_mess[mtype][i].buf3); 560 strcpy (buf2, attack_mess[mtype][i].buf3);
… …
614 if (hitter->owner != NULL) 594 if (hitter->owner != NULL)
615 sprintf (buf, "%s's %s%s you.", &hitter->owner->name, &hitter->name, buf2); 595 sprintf (buf, "%s's %s%s you.", &hitter->owner->name, &hitter->name, buf2);
616 else 596 else
617 { 597 {
618 sprintf (buf, "%s%s you.", &hitter->name, buf2); 598 sprintf (buf, "%s%s you.", &hitter->name, buf2);
599
619 if (dam != 0) 600 if (dam != 0)
620 { 601 {
621 if (dam < 10) 602 if (dam < 10)
622 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT1, 0, 0); 603 op->contr->play_sound (sound_find ("player_is_hit1"));
623 else if (dam < 20) 604 else if (dam < 20)
624 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT2, 0, 0); 605 op->contr->play_sound (sound_find ("player_is_hit2"));
625 else 606 else
626 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT3, 0, 0); 607 op->contr->play_sound (sound_find ("player_is_hit3"));
627 } 608 }
628 } 609 }
610
629 new_draw_info (NDI_BLACK, 0, op, buf); 611 new_draw_info (NDI_BLACK, 0, op, buf);
630 } /* end of player hitting player */ 612 } /* end of player hitting player */
631 613
632 if (hitter->type == PLAYER) 614 if (hitter->type == PLAYER)
633 { 615 {
634 sprintf (buf, "You %s.", buf1); 616 sprintf (buf, "You %s.", buf1);
617
635 if (dam != 0) 618 if (dam != 0)
636 { 619 {
637 if (dam < 10) 620 if (dam < 10)
638 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS1, 0, 0); 621 op->play_sound (sound_find ("player_hits1"));
639 else if (dam < 20) 622 else if (dam < 20)
640 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS2, 0, 0); 623 op->play_sound (sound_find ("player_hits2"));
641 else 624 else
642 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS3, 0, 0); 625 op->play_sound (sound_find ("player_hits3"));
643 } 626 }
627
644 new_draw_info (NDI_BLACK, 0, hitter, buf); 628 new_draw_info (NDI_BLACK, 0, hitter, buf);
645 } 629 }
646 else if (hitter->owner != NULL && hitter->owner->type == PLAYER) 630 else if (hitter->owner != NULL && hitter->owner->type == PLAYER)
647 { 631 {
648 /* look for stacked spells and start reducing the message chances */ 632 /* look for stacked spells and start reducing the message chances */
… …
657 if (next) 641 if (next)
658 while (next) 642 while (next)
659 { 643 {
660 if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE)) 644 if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE))
661 i *= 3; 645 i *= 3;
646
662 tmp = next; 647 tmp = next;
663 next = tmp->above; 648 next = tmp->above;
664 } 649 }
665 650
666 if (i < 0) 651 if (i < 0)
… …
671 } 656 }
672 else if (rndm (0, 5) != 0) 657 else if (rndm (0, 5) != 0)
673 return; 658 return;
674 659
675 sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name); 660 sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name);
676 play_sound_map (op->map, op->x, op->y, SOUND_PLAYER_HITS4); 661 op->play_sound (sound_find ("player_hits4"));
677 new_draw_info (NDI_BLACK, 0, hitter->owner, buf); 662 new_draw_info (NDI_BLACK, 0, hitter->owner, buf);
678 } 663 }
679} 664}
680 665
681 666
… …
685 if (QUERY_FLAG (*target, FLAG_FREED) || QUERY_FLAG (*hitter, FLAG_FREED)) 670 if (QUERY_FLAG (*target, FLAG_FREED) || QUERY_FLAG (*hitter, FLAG_FREED))
686 { 671 {
687 LOG (llevError, "BUG: get_attack_mode(): freed object\n"); 672 LOG (llevError, "BUG: get_attack_mode(): freed object\n");
688 return 1; 673 return 1;
689 } 674 }
675
690 if ((*target)->head) 676 if ((*target)->head)
691 *target = (*target)->head; 677 *target = (*target)->head;
678
692 if ((*hitter)->head) 679 if ((*hitter)->head)
693 *hitter = (*hitter)->head; 680 *hitter = (*hitter)->head;
681
682 if ((*target)->type == LOCKED_DOOR)
683 return 1; // locked doors cannot be hit
684
694 if ((*hitter)->env != NULL || (*target)->env != NULL) 685 if ((*hitter)->env || (*target)->env)
695 { 686 {
696 *simple_attack = 1; 687 *simple_attack = 1;
697 return 0; 688 return 0;
698 } 689 }
690
699 if (QUERY_FLAG (*target, FLAG_REMOVED) 691 if (QUERY_FLAG (*target, FLAG_REMOVED)
700 || QUERY_FLAG (*hitter, FLAG_REMOVED) || (*hitter)->map == NULL || !on_same_map ((*hitter), (*target))) 692 || QUERY_FLAG (*hitter, FLAG_REMOVED)
693 || !(*hitter)->map
694 || !on_same_map (*hitter, *target))
701 { 695 {
702 LOG (llevError, "BUG: hitter (arch %s, name %s) with no relation to " "target\n", &(*hitter)->arch->archname, &(*hitter)->name); 696 LOG (llevError | logBacktrace, "BUG: hitter (%s) with no relation to target (%s)\n",
697 (*hitter)->debug_desc (), (*target)->debug_desc ());
703 return 1; 698 return 1;
704 } 699 }
700
705 *simple_attack = 0; 701 *simple_attack = 0;
706 return 0; 702 return 0;
707} 703}
708 704
709static int 705static int
… …
873 * debate - 5000 is 5 kg, so arrows, knives, and other light weapons 869 * debate - 5000 is 5 kg, so arrows, knives, and other light weapons
874 * stick around. 870 * stick around.
875 */ 871 */
876 if (op->weight <= 5000 && tmp->stats.hp >= 0) 872 if (op->weight <= 5000 && tmp->stats.hp >= 0)
877 { 873 {
878 tmp = tmp->head_ (); 874 tmp->head_ ()->insert (op);
879
880 op->remove ();
881 op = insert_ob_in_ob (op, tmp);
882
883 if (tmp->type == PLAYER)
884 esrv_send_item (tmp, op);
885
886 return 1; 875 return 1;
887 } 876 }
888 else 877 else
889 return 0; 878 return 0;
890} 879}
… …
1204 1193
1205 /* High damage acid has better chance of corroding 1194 /* High damage acid has better chance of corroding
1206 objects */ 1195 objects */
1207 if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic) 1196 if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic)
1208 { 1197 {
1209 if (op->type == PLAYER)
1210 /* Make this more visible */
1211 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op,
1212 "The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp));
1213 flag = 1; 1198 flag = 1;
1214 tmp->magic--; 1199 tmp->magic--;
1215 if (op->type == PLAYER) 1200
1216 esrv_send_item (op, tmp); 1201 if (object *pl = tmp->visible_to ())
1202 {
1203 /* Make this more visible */
1204 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, pl,
1205 "The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp));
1206
1207 esrv_send_item (op, tmp); //TODO: UPD_NAME should be enough (it's enough in other cases)
1208 }
1217 } 1209 }
1218 } 1210 }
1219 1211
1220 if (flag) 1212 if (flag)
1221 op->update_stats (); /* Something was corroded */ 1213 op->update_stats (); /* Something was corroded */
… …
1290 object *god = find_god (determine_god (owner)); 1282 object *god = find_god (determine_god (owner));
1291 int div = 1; 1283 int div = 1;
1292 1284
1293 /* if undead are not an enemy of your god, you turn them 1285 /* if undead are not an enemy of your god, you turn them
1294 * at half strength */ 1286 * at half strength */
1295 if (!god || !god->slaying || strstr (god->slaying, undead_name) == NULL) 1287 if (!god || !god->slaying || strstr (god->slaying, shstr_undead) == NULL)
1296 div = 2; 1288 div = 2;
1297 1289
1298 /* Give a bonus if you resist turn undead */ 1290 /* Give a bonus if you resist turn undead */
1299 if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100))) 1291 if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100)))
1300 scare_creature (op, owner); 1292 scare_creature (op, owner);
… …
1443 pk = 1; 1435 pk = 1;
1444 1436
1445 /* Player killed something */ 1437 /* Player killed something */
1446 if (owner->type == PLAYER) 1438 if (owner->type == PLAYER)
1447 { 1439 {
1448 Log_Kill (owner->name,
1449 query_name (op), op->type, (owner != hitter) ? query_name (hitter) : NULL, (owner != hitter) ? hitter->type : 0);
1450
1451 /* Log players killing other players - makes it easier to detect 1440 /* Log players killing other players - makes it easier to detect
1452 * and filter out malicious player killers - that is why the 1441 * and filter out malicious player killers - that is why the
1453 * ip address is included. 1442 * ip address is included.
1454 */ 1443 */
1455 if (op->type == PLAYER && !battleg) 1444 if (op->type == PLAYER && !battleg)
… …
1475 else 1464 else
1476 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op)); 1465 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op));
1477 1466
1478 /* Only play sounds for melee kills */ 1467 /* Only play sounds for melee kills */
1479 if (hitter->type == PLAYER) 1468 if (hitter->type == PLAYER)
1480 play_sound_map (owner->map, owner->x, owner->y, SOUND_PLAYER_KILLS); 1469 owner->play_sound (sound_find ("player_kills"));
1481 } 1470 }
1482 1471
1483 /* If a player kills another player, not on 1472 /* If a player kills another player, not on
1484 * battleground, the "killer" looses 1 luck. Since this is 1473 * battleground, the "killer" looses 1 luck. Since this is
1485 * not reversible, it's actually quite a pain IMHO. -AV 1474 * not reversible, it's actually quite a pain IMHO. -AV
… …
1621 { 1610 {
1622 object *owner1 = op->owner; 1611 object *owner1 = op->owner;
1623 1612
1624 if (owner1 && owner1->type == PLAYER) 1613 if (owner1 && owner1->type == PLAYER)
1625 { 1614 {
1626 play_sound_player_only (owner1->contr, SOUND_PET_IS_KILLED, 0, 0); 1615 owner1->contr->play_sound (sound_find ("pet_is_killed"));
1627 /* Maybe we should include the owner that killed this, maybe not */ 1616 /* Maybe we should include the owner that killed this, maybe not */
1628 new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name); 1617 new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name);
1629 } 1618 }
1630 1619
1631 remove_friendly_object (op); 1620 remove_friendly_object (op);
1632 } 1621 }
1633 1622
1634 op->destroy (); 1623 op->destroy ();
1635 } 1624 }
1636 else 1625 else
1637 {
1638 /* Player has been killed! */ 1626 /* Player has been killed! */
1639 if (owner->type == PLAYER) 1627 op->contr->killer = owner->type == PLAYER ? owner : hitter;
1640 snprintf (op->contr->killer, sizeof (op->contr->killer), "%s the %s", &owner->name, owner->contr->title);
1641 else
1642 assign (op->contr->killer, hitter->name);
1643 }
1644 1628
1645 /* This was return -1 - that doesn't seem correct - if we return -1, process 1629 /* This was return -1 - that doesn't seem correct - if we return -1, process
1646 * continues in the calling function. 1630 * continues in the calling function.
1647 */ 1631 */
1648 return maxdam; 1632 return maxdam;
… …
1809 if ((!hitter->slaying || 1793 if ((!hitter->slaying ||
1810 (!(op->race && strstr (hitter->slaying, op->race)) && 1794 (!(op->race && strstr (hitter->slaying, op->race)) &&
1811 !(op->name && strstr (hitter->slaying, op->name)))) && 1795 !(op->name && strstr (hitter->slaying, op->name)))) &&
1812 (!QUERY_FLAG (op, FLAG_UNDEAD) || 1796 (!QUERY_FLAG (op, FLAG_UNDEAD) ||
1813 (hitter->title != NULL 1797 (hitter->title != NULL
1814 && (god = find_god (determine_god (hitter))) != NULL && god->race != NULL && strstr (god->race, undead_name) != NULL))) 1798 && (god = find_god (determine_god (hitter))) != NULL && god->race != NULL && strstr (god->race, shstr_undead) != NULL)))
1815 return 0; 1799 return 0;
1816 } 1800 }
1817 1801
1818 maxattacktype = type; /* initialise this to something */ 1802 maxattacktype = type; /* initialise this to something */
1819 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum) 1803 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum)
… …
1954 return maxdam; 1938 return maxdam;
1955 } 1939 }
1956 1940
1957 op->remove (); 1941 op->remove ();
1958 1942
1959 for (i = 0; i < NROFNEWOBJS (op); i++) 1943 for (i = 0; i < op->stats.food; i++)
1960 { /* This doesn't handle op->more yet */ 1944 { /* This doesn't handle op->more yet */
1961 object *tmp = arch_to_object (op->other_arch); 1945 object *tmp = arch_to_object (op->other_arch);
1962 int j; 1946 int j;
1963 1947
1964 tmp->stats.hp = op->stats.hp; 1948 tmp->stats.hp = op->stats.hp;
… …
2036 tmp->stats.Dex = MAX (-(dam / 6 + 1), -10); 2020 tmp->stats.Dex = MAX (-(dam / 6 + 1), -10);
2037 tmp->stats.Int = MAX (-dam / 7, -10); 2021 tmp->stats.Int = MAX (-dam / 7, -10);
2038 SET_FLAG (tmp, FLAG_APPLIED); 2022 SET_FLAG (tmp, FLAG_APPLIED);
2039 op->update_stats (); 2023 op->update_stats ();
2040 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill."); 2024 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill.");
2025 op->play_sound (tmp->sound);
2041 } 2026 }
2042 2027
2043 if (hitter->type == PLAYER) 2028 if (hitter->type == PLAYER)
2044 new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name); 2029 new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name);
2045 else if (hitter->owner != NULL && hitter->owner->type == PLAYER) 2030 else if (hitter->owner != NULL && hitter->owner->type == PLAYER)
… …
2193 ** field of the deathstriking object */ 2178 ** field of the deathstriking object */
2194 2179
2195 int atk_lev, def_lev, kill_lev; 2180 int atk_lev, def_lev, kill_lev;
2196 2181
2197 if (hitter->slaying) 2182 if (hitter->slaying)
2198 if (!((QUERY_FLAG (op, FLAG_UNDEAD) && strstr (hitter->slaying, undead_name)) || (op->race && strstr (hitter->slaying, op->race)))) 2183 if (!((QUERY_FLAG (op, FLAG_UNDEAD) && strstr (hitter->slaying, shstr_undead)) || (op->race && strstr (hitter->slaying, op->race))))
2199 return; 2184 return;
2200 2185
2201 def_lev = op->level; 2186 def_lev = op->level;
2202 if (def_lev < 1) 2187 if (def_lev < 1)
2203 { 2188 {

Diff Legend

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