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.75 by root, Mon Aug 27 05:10:51 2007 UTC

… …
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT 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 <crossfire@schmorp.de>
23 */ 22 */
24 23
25#include <assert.h> 24#include <assert.h>
… …
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
… …
614 if (hitter->owner != NULL) 613 if (hitter->owner != NULL)
615 sprintf (buf, "%s's %s%s you.", &hitter->owner->name, &hitter->name, buf2); 614 sprintf (buf, "%s's %s%s you.", &hitter->owner->name, &hitter->name, buf2);
616 else 615 else
617 { 616 {
618 sprintf (buf, "%s%s you.", &hitter->name, buf2); 617 sprintf (buf, "%s%s you.", &hitter->name, buf2);
618
619 if (dam != 0) 619 if (dam != 0)
620 { 620 {
621 if (dam < 10) 621 if (dam < 10)
622 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT1, 0, 0); 622 op->contr->play_sound (sound_find ("player_is_hit1"));
623 else if (dam < 20) 623 else if (dam < 20)
624 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT2, 0, 0); 624 op->contr->play_sound (sound_find ("player_is_hit2"));
625 else 625 else
626 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT3, 0, 0); 626 op->contr->play_sound (sound_find ("player_is_hit3"));
627 } 627 }
628 } 628 }
629
629 new_draw_info (NDI_BLACK, 0, op, buf); 630 new_draw_info (NDI_BLACK, 0, op, buf);
630 } /* end of player hitting player */ 631 } /* end of player hitting player */
631 632
632 if (hitter->type == PLAYER) 633 if (hitter->type == PLAYER)
633 { 634 {
634 sprintf (buf, "You %s.", buf1); 635 sprintf (buf, "You %s.", buf1);
636
635 if (dam != 0) 637 if (dam != 0)
636 { 638 {
637 if (dam < 10) 639 if (dam < 10)
638 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS1, 0, 0); 640 op->play_sound (sound_find ("player_hits1"));
639 else if (dam < 20) 641 else if (dam < 20)
640 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS2, 0, 0); 642 op->play_sound (sound_find ("player_hits2"));
641 else 643 else
642 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS3, 0, 0); 644 op->play_sound (sound_find ("player_hits3"));
643 } 645 }
646
644 new_draw_info (NDI_BLACK, 0, hitter, buf); 647 new_draw_info (NDI_BLACK, 0, hitter, buf);
645 } 648 }
646 else if (hitter->owner != NULL && hitter->owner->type == PLAYER) 649 else if (hitter->owner != NULL && hitter->owner->type == PLAYER)
647 { 650 {
648 /* look for stacked spells and start reducing the message chances */ 651 /* look for stacked spells and start reducing the message chances */
… …
657 if (next) 660 if (next)
658 while (next) 661 while (next)
659 { 662 {
660 if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE)) 663 if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE))
661 i *= 3; 664 i *= 3;
665
662 tmp = next; 666 tmp = next;
663 next = tmp->above; 667 next = tmp->above;
664 } 668 }
665 669
666 if (i < 0) 670 if (i < 0)
… …
671 } 675 }
672 else if (rndm (0, 5) != 0) 676 else if (rndm (0, 5) != 0)
673 return; 677 return;
674 678
675 sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name); 679 sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name);
676 play_sound_map (op->map, op->x, op->y, SOUND_PLAYER_HITS4); 680 op->play_sound (sound_find ("player_hits4"));
677 new_draw_info (NDI_BLACK, 0, hitter->owner, buf); 681 new_draw_info (NDI_BLACK, 0, hitter->owner, buf);
678 } 682 }
679} 683}
680 684
681 685
… …
1290 object *god = find_god (determine_god (owner)); 1294 object *god = find_god (determine_god (owner));
1291 int div = 1; 1295 int div = 1;
1292 1296
1293 /* if undead are not an enemy of your god, you turn them 1297 /* if undead are not an enemy of your god, you turn them
1294 * at half strength */ 1298 * at half strength */
1295 if (!god || !god->slaying || strstr (god->slaying, undead_name) == NULL) 1299 if (!god || !god->slaying || strstr (god->slaying, shstr_undead) == NULL)
1296 div = 2; 1300 div = 2;
1297 1301
1298 /* Give a bonus if you resist turn undead */ 1302 /* 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))) 1303 if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100)))
1300 scare_creature (op, owner); 1304 scare_creature (op, owner);
… …
1475 else 1479 else
1476 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op)); 1480 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op));
1477 1481
1478 /* Only play sounds for melee kills */ 1482 /* Only play sounds for melee kills */
1479 if (hitter->type == PLAYER) 1483 if (hitter->type == PLAYER)
1480 play_sound_map (owner->map, owner->x, owner->y, SOUND_PLAYER_KILLS); 1484 owner->play_sound (sound_find ("player_kills"));
1481 } 1485 }
1482 1486
1483 /* If a player kills another player, not on 1487 /* If a player kills another player, not on
1484 * battleground, the "killer" looses 1 luck. Since this is 1488 * battleground, the "killer" looses 1 luck. Since this is
1485 * not reversible, it's actually quite a pain IMHO. -AV 1489 * not reversible, it's actually quite a pain IMHO. -AV
… …
1621 { 1625 {
1622 object *owner1 = op->owner; 1626 object *owner1 = op->owner;
1623 1627
1624 if (owner1 && owner1->type == PLAYER) 1628 if (owner1 && owner1->type == PLAYER)
1625 { 1629 {
1626 play_sound_player_only (owner1->contr, SOUND_PET_IS_KILLED, 0, 0); 1630 owner1->contr->play_sound (sound_find ("pet_is_killed"));
1627 /* Maybe we should include the owner that killed this, maybe not */ 1631 /* 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); 1632 new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name);
1629 } 1633 }
1630 1634
1631 remove_friendly_object (op); 1635 remove_friendly_object (op);
… …
1809 if ((!hitter->slaying || 1813 if ((!hitter->slaying ||
1810 (!(op->race && strstr (hitter->slaying, op->race)) && 1814 (!(op->race && strstr (hitter->slaying, op->race)) &&
1811 !(op->name && strstr (hitter->slaying, op->name)))) && 1815 !(op->name && strstr (hitter->slaying, op->name)))) &&
1812 (!QUERY_FLAG (op, FLAG_UNDEAD) || 1816 (!QUERY_FLAG (op, FLAG_UNDEAD) ||
1813 (hitter->title != NULL 1817 (hitter->title != NULL
1814 && (god = find_god (determine_god (hitter))) != NULL && god->race != NULL && strstr (god->race, undead_name) != NULL))) 1818 && (god = find_god (determine_god (hitter))) != NULL && god->race != NULL && strstr (god->race, shstr_undead) != NULL)))
1815 return 0; 1819 return 0;
1816 } 1820 }
1817 1821
1818 maxattacktype = type; /* initialise this to something */ 1822 maxattacktype = type; /* initialise this to something */
1819 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum) 1823 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum)
… …
2036 tmp->stats.Dex = MAX (-(dam / 6 + 1), -10); 2040 tmp->stats.Dex = MAX (-(dam / 6 + 1), -10);
2037 tmp->stats.Int = MAX (-dam / 7, -10); 2041 tmp->stats.Int = MAX (-dam / 7, -10);
2038 SET_FLAG (tmp, FLAG_APPLIED); 2042 SET_FLAG (tmp, FLAG_APPLIED);
2039 op->update_stats (); 2043 op->update_stats ();
2040 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill."); 2044 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill.");
2045 op->play_sound (tmp->sound);
2041 } 2046 }
2042 2047
2043 if (hitter->type == PLAYER) 2048 if (hitter->type == PLAYER)
2044 new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name); 2049 new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name);
2045 else if (hitter->owner != NULL && hitter->owner->type == PLAYER) 2050 else if (hitter->owner != NULL && hitter->owner->type == PLAYER)
… …
2193 ** field of the deathstriking object */ 2198 ** field of the deathstriking object */
2194 2199
2195 int atk_lev, def_lev, kill_lev; 2200 int atk_lev, def_lev, kill_lev;
2196 2201
2197 if (hitter->slaying) 2202 if (hitter->slaying)
2198 if (!((QUERY_FLAG (op, FLAG_UNDEAD) && strstr (hitter->slaying, undead_name)) || (op->race && strstr (hitter->slaying, op->race)))) 2203 if (!((QUERY_FLAG (op, FLAG_UNDEAD) && strstr (hitter->slaying, shstr_undead)) || (op->race && strstr (hitter->slaying, op->race))))
2199 return; 2204 return;
2200 2205
2201 def_lev = op->level; 2206 def_lev = op->level;
2202 if (def_lev < 1) 2207 if (def_lev < 1)
2203 { 2208 {

Diff Legend

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