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.71 by root, Tue Jul 10 07:31:20 2007 UTC vs.
Revision 1.81 by root, Tue Apr 22 02:46:18 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>
… …
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 = get_archetype (arch)))
174 { 172 {
175 if (env) 173 if (env)
176 { 174 {
177 op->x = env->x, op->y = env->y; 175 op->x = env->x, op->y = env->y;
178 insert_ob_in_ob (op, env); 176 insert_ob_in_ob (op, env);
… …
196 return; 194 return;
197 } 195 }
198 196
199 if (op->nrof > 1) 197 if (op->nrof > 1)
200 { 198 {
201 op = decrease_ob_nr (op, rndm (0, op->nrof - 1)); 199 if (op->decrease (rndm (0, op->nrof - 1)))
202
203 if (op)
204 fix_stopped_item (op, m, originator); 200 fix_stopped_item (op, m, originator);
205 } 201 }
206 else 202 else
207 {
208 if (op->env)
209 {
210 object *tmp = op->in_player ();
211
212 if (tmp)
213 esrv_del_item (tmp->contr, op->count);
214 }
215
216 op->destroy (); 203 op->destroy ();
217 }
218 204
219 if (type & (AT_FIRE | AT_ELECTRICITY)) 205 if (type & (AT_FIRE | AT_ELECTRICITY))
220 if (env) 206 if (env)
221 { 207 {
222 op = get_archetype ("burnout"); 208 op = get_archetype ("burnout");
… …
613 if (hitter->owner != NULL) 599 if (hitter->owner != NULL)
614 sprintf (buf, "%s's %s%s you.", &hitter->owner->name, &hitter->name, buf2); 600 sprintf (buf, "%s's %s%s you.", &hitter->owner->name, &hitter->name, buf2);
615 else 601 else
616 { 602 {
617 sprintf (buf, "%s%s you.", &hitter->name, buf2); 603 sprintf (buf, "%s%s you.", &hitter->name, buf2);
604
618 if (dam != 0) 605 if (dam != 0)
619 { 606 {
620 if (dam < 10) 607 if (dam < 10)
621 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT1, 0, 0); 608 op->contr->play_sound (sound_find ("player_is_hit1"));
622 else if (dam < 20) 609 else if (dam < 20)
623 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT2, 0, 0); 610 op->contr->play_sound (sound_find ("player_is_hit2"));
624 else 611 else
625 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT3, 0, 0); 612 op->contr->play_sound (sound_find ("player_is_hit3"));
626 } 613 }
627 } 614 }
615
628 new_draw_info (NDI_BLACK, 0, op, buf); 616 new_draw_info (NDI_BLACK, 0, op, buf);
629 } /* end of player hitting player */ 617 } /* end of player hitting player */
630 618
631 if (hitter->type == PLAYER) 619 if (hitter->type == PLAYER)
632 { 620 {
633 sprintf (buf, "You %s.", buf1); 621 sprintf (buf, "You %s.", buf1);
622
634 if (dam != 0) 623 if (dam != 0)
635 { 624 {
636 if (dam < 10) 625 if (dam < 10)
637 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS1, 0, 0); 626 op->play_sound (sound_find ("player_hits1"));
638 else if (dam < 20) 627 else if (dam < 20)
639 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS2, 0, 0); 628 op->play_sound (sound_find ("player_hits2"));
640 else 629 else
641 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS3, 0, 0); 630 op->play_sound (sound_find ("player_hits3"));
642 } 631 }
632
643 new_draw_info (NDI_BLACK, 0, hitter, buf); 633 new_draw_info (NDI_BLACK, 0, hitter, buf);
644 } 634 }
645 else if (hitter->owner != NULL && hitter->owner->type == PLAYER) 635 else if (hitter->owner != NULL && hitter->owner->type == PLAYER)
646 { 636 {
647 /* look for stacked spells and start reducing the message chances */ 637 /* look for stacked spells and start reducing the message chances */
… …
656 if (next) 646 if (next)
657 while (next) 647 while (next)
658 { 648 {
659 if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE)) 649 if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE))
660 i *= 3; 650 i *= 3;
651
661 tmp = next; 652 tmp = next;
662 next = tmp->above; 653 next = tmp->above;
663 } 654 }
664 655
665 if (i < 0) 656 if (i < 0)
… …
670 } 661 }
671 else if (rndm (0, 5) != 0) 662 else if (rndm (0, 5) != 0)
672 return; 663 return;
673 664
674 sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name); 665 sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name);
675 play_sound_map (op->map, op->x, op->y, SOUND_PLAYER_HITS4); 666 op->play_sound (sound_find ("player_hits4"));
676 new_draw_info (NDI_BLACK, 0, hitter->owner, buf); 667 new_draw_info (NDI_BLACK, 0, hitter->owner, buf);
677 } 668 }
678} 669}
679 670
680 671
… …
684 if (QUERY_FLAG (*target, FLAG_FREED) || QUERY_FLAG (*hitter, FLAG_FREED)) 675 if (QUERY_FLAG (*target, FLAG_FREED) || QUERY_FLAG (*hitter, FLAG_FREED))
685 { 676 {
686 LOG (llevError, "BUG: get_attack_mode(): freed object\n"); 677 LOG (llevError, "BUG: get_attack_mode(): freed object\n");
687 return 1; 678 return 1;
688 } 679 }
680
689 if ((*target)->head) 681 if ((*target)->head)
690 *target = (*target)->head; 682 *target = (*target)->head;
683
691 if ((*hitter)->head) 684 if ((*hitter)->head)
692 *hitter = (*hitter)->head; 685 *hitter = (*hitter)->head;
686
693 if ((*hitter)->env != NULL || (*target)->env != NULL) 687 if ((*hitter)->env != NULL || (*target)->env != NULL)
694 { 688 {
695 *simple_attack = 1; 689 *simple_attack = 1;
696 return 0; 690 return 0;
697 } 691 }
692
698 if (QUERY_FLAG (*target, FLAG_REMOVED) 693 if (QUERY_FLAG (*target, FLAG_REMOVED)
699 || QUERY_FLAG (*hitter, FLAG_REMOVED) || (*hitter)->map == NULL || !on_same_map ((*hitter), (*target))) 694 || QUERY_FLAG (*hitter, FLAG_REMOVED)
695 || !(*hitter)->map
696 || !on_same_map (*hitter, *target))
700 { 697 {
701 LOG (llevError, "BUG: hitter (arch %s, name %s) with no relation to " "target\n", &(*hitter)->arch->archname, &(*hitter)->name); 698 LOG (llevError | logBacktrace, "BUG: hitter (%s) with no relation to target (%s)\n",
699 (*hitter)->debug_desc (), (*target)->debug_desc ());
702 return 1; 700 return 1;
703 } 701 }
702
704 *simple_attack = 0; 703 *simple_attack = 0;
705 return 0; 704 return 0;
706} 705}
707 706
708static int 707static int
… …
1474 else 1473 else
1475 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op)); 1474 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op));
1476 1475
1477 /* Only play sounds for melee kills */ 1476 /* Only play sounds for melee kills */
1478 if (hitter->type == PLAYER) 1477 if (hitter->type == PLAYER)
1479 play_sound_map (owner->map, owner->x, owner->y, SOUND_PLAYER_KILLS); 1478 owner->play_sound (sound_find ("player_kills"));
1480 } 1479 }
1481 1480
1482 /* If a player kills another player, not on 1481 /* If a player kills another player, not on
1483 * battleground, the "killer" looses 1 luck. Since this is 1482 * battleground, the "killer" looses 1 luck. Since this is
1484 * not reversible, it's actually quite a pain IMHO. -AV 1483 * not reversible, it's actually quite a pain IMHO. -AV
… …
1620 { 1619 {
1621 object *owner1 = op->owner; 1620 object *owner1 = op->owner;
1622 1621
1623 if (owner1 && owner1->type == PLAYER) 1622 if (owner1 && owner1->type == PLAYER)
1624 { 1623 {
1625 play_sound_player_only (owner1->contr, SOUND_PET_IS_KILLED, 0, 0); 1624 owner1->contr->play_sound (sound_find ("pet_is_killed"));
1626 /* Maybe we should include the owner that killed this, maybe not */ 1625 /* Maybe we should include the owner that killed this, maybe not */
1627 new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name); 1626 new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name);
1628 } 1627 }
1629 1628
1630 remove_friendly_object (op); 1629 remove_friendly_object (op);
… …
1953 return maxdam; 1952 return maxdam;
1954 } 1953 }
1955 1954
1956 op->remove (); 1955 op->remove ();
1957 1956
1958 for (i = 0; i < NROFNEWOBJS (op); i++) 1957 for (i = 0; i < op->stats.food; i++)
1959 { /* This doesn't handle op->more yet */ 1958 { /* This doesn't handle op->more yet */
1960 object *tmp = arch_to_object (op->other_arch); 1959 object *tmp = arch_to_object (op->other_arch);
1961 int j; 1960 int j;
1962 1961
1963 tmp->stats.hp = op->stats.hp; 1962 tmp->stats.hp = op->stats.hp;
… …
2035 tmp->stats.Dex = MAX (-(dam / 6 + 1), -10); 2034 tmp->stats.Dex = MAX (-(dam / 6 + 1), -10);
2036 tmp->stats.Int = MAX (-dam / 7, -10); 2035 tmp->stats.Int = MAX (-dam / 7, -10);
2037 SET_FLAG (tmp, FLAG_APPLIED); 2036 SET_FLAG (tmp, FLAG_APPLIED);
2038 op->update_stats (); 2037 op->update_stats ();
2039 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill."); 2038 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill.");
2039 op->play_sound (tmp->sound);
2040 } 2040 }
2041 2041
2042 if (hitter->type == PLAYER) 2042 if (hitter->type == PLAYER)
2043 new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name); 2043 new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name);
2044 else if (hitter->owner != NULL && hitter->owner->type == PLAYER) 2044 else if (hitter->owner != NULL && hitter->owner->type == PLAYER)

Diff Legend

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