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.50 by pippijn, Thu Mar 1 12:28:16 2007 UTC vs.
Revision 1.56 by root, Tue Apr 24 12:32:15 2007 UTC

… …
24#include <assert.h> 24#include <assert.h>
25#include <global.h> 25#include <global.h>
26#include <living.h> 26#include <living.h>
27#include <material.h> 27#include <material.h>
28#include <skills.h> 28#include <skills.h>
29
30#ifndef __CEXTRACT__
31# include <sproto.h>
32#endif
33
34#include <sounds.h> 29#include <sounds.h>
30#include <sproto.h>
35 31
36typedef struct att_msg_str 32typedef struct att_msg_str
37{ 33{
38 char *msg1; 34 char *msg1;
39 char *msg2; 35 char *msg2;
… …
654 { 650 {
655 i = 4; 651 i = 4;
656 map = hitter->map; 652 map = hitter->map;
657 if (out_of_map (map, hitter->x, hitter->y)) 653 if (out_of_map (map, hitter->x, hitter->y))
658 return; 654 return;
655
659 next = GET_MAP_OB (map, hitter->x, hitter->y); 656 next = GET_MAP_OB (map, hitter->x, hitter->y);
660 if (next) 657 if (next)
661 while (next) 658 while (next)
662 { 659 {
663 if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE)) 660 if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE))
664 i *= 3; 661 i *= 3;
665 tmp = next; 662 tmp = next;
666 next = tmp->above; 663 next = tmp->above;
667 } 664 }
665
668 if (i < 0) 666 if (i < 0)
669 return; 667 return;
668
670 if (rndm (0, i) != 0) 669 if (rndm (0, i) != 0)
671 return; 670 return;
672 } 671 }
673 else if (rndm (0, 5) != 0) 672 else if (rndm (0, 5) != 0)
674 return; 673 return;
674
675 sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name); 675 sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name);
676 play_sound_map (op->map, op->x, op->y, SOUND_PLAYER_HITS4); 676 play_sound_map (op->map, op->x, op->y, SOUND_PLAYER_HITS4);
677 new_draw_info (NDI_BLACK, 0, hitter->owner, buf); 677 new_draw_info (NDI_BLACK, 0, hitter->owner, buf);
678 } 678 }
679} 679}
… …
1438 return maxdam; 1438 return maxdam;
1439 } 1439 }
1440 1440
1441 if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER) 1441 if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER)
1442 { 1442 {
1443 remove_friendly_object (op);
1444
1445 if (op->owner && op->owner->type == PLAYER && op->owner->contr->ranges[range_golem] == op)
1446 op->owner->contr->ranges[range_golem] = 0;
1447
1448 op->destroy (); 1443 op->destroy ();
1449 return maxdam; 1444 return maxdam;
1450 } 1445 }
1451 1446
1452 /* Now lets start dealing with experience we get for killing something */ 1447 /* Now lets start dealing with experience we get for killing something */
… …
1529 skill = owner->current_weapon->skill; 1524 skill = owner->current_weapon->skill;
1530 else 1525 else
1531 LOG (llevError, "kill_object - unable to find skill that killed monster\n"); 1526 LOG (llevError, "kill_object - unable to find skill that killed monster\n");
1532 1527
1533 /* We have the skill we want to credit to - now find the object this goes 1528 /* We have the skill we want to credit to - now find the object this goes
1534 * to. Make sure skop is an actual skill, and not a skill tool! 1529 * to. Make sure skop is an actual skill, and not a skill tool!
1535 */ 1530 */
1536 if ((!skop || skop->type != SKILL) && skill) 1531 if ((!skop || skop->type != SKILL) && skill)
1537 { 1532 {
1538 int i; 1533 int i;
1539 1534
… …
1670} 1665}
1671 1666
1672/* Find out if this is friendly fire (PVP and attacker is peaceful) or not 1667/* Find out if this is friendly fire (PVP and attacker is peaceful) or not
1673 * Returns 0 this is not friendly fire 1668 * Returns 0 this is not friendly fire
1674 */ 1669 */
1675
1676int 1670int
1677friendly_fire (object *op, object *hitter) 1671friendly_fire (object *op, object *hitter)
1678{ 1672{
1679 object *owner; 1673 object *owner;
1680 int friendlyfire; 1674 int friendlyfire;
… …
1737 object *owner = hitter->owner; 1731 object *owner = hitter->owner;
1738 1732
1739 if (!owner) 1733 if (!owner)
1740 owner = hitter; 1734 owner = hitter;
1741 1735
1742 if (owner->type == PLAYER && (!op_on_battleground (op, 0, 0) && (op->contr->peaceful || owner->contr->peaceful)) && op != owner) 1736 if (owner->type == PLAYER
1737 && (!op_on_battleground (op, 0, 0)
1738 && (op->contr->peaceful || owner->contr->peaceful))
1739 && op != owner)
1743 return 0; 1740 return 0;
1744 } 1741 }
1745#endif 1742#endif
1746 1743
1747 if (body_attack) 1744 if (body_attack)
… …
1781 if (!QUERY_FLAG (op, FLAG_ALIVE) || op->stats.hp < 0) 1778 if (!QUERY_FLAG (op, FLAG_ALIVE) || op->stats.hp < 0)
1782 { 1779 {
1783 /* FIXME: If a player is killed by a rune in a door, the 1780 /* FIXME: If a player is killed by a rune in a door, the
1784 * destroyed() check above doesn't return, and might get here. 1781 * destroyed() check above doesn't return, and might get here.
1785 */ 1782 */
1783
1784 /* FIXME: This for example happens when a dead door is on a mover and
1785 gets it's speed_left raised on each mover-tick.
1786 Doors are removed in a kinda funny way by giving them speed and speed_left
1787 and waiting for that to run out.
1788 */
1786 LOG (llevDebug, "victim %s already dead in hit_player()\n", op->debug_desc ()); 1789 LOG (llevDebug, "victim %s (%d) already dead in hit_player()\n", op->debug_desc (), op->stats.hp);
1787 return 0; 1790 return 0;
1788 } 1791 }
1789 1792
1790#ifdef ATTACK_DEBUG 1793#ifdef ATTACK_DEBUG
1791 LOG (llevDebug, "hit player: attacktype %d, dam %d\n", type, dam); 1794 LOG (llevDebug, "hit player: attacktype %d, dam %d\n", type, dam);
… …
1948 /* Used to be ghosthit removal - we now use the ONE_HIT flag. Note 1951 /* Used to be ghosthit removal - we now use the ONE_HIT flag. Note
1949 * that before if the player was immune to ghosthit, the monster 1952 * that before if the player was immune to ghosthit, the monster
1950 * remained - that is no longer the case. 1953 * remained - that is no longer the case.
1951 */ 1954 */
1952 if (QUERY_FLAG (hitter, FLAG_ONE_HIT)) 1955 if (QUERY_FLAG (hitter, FLAG_ONE_HIT))
1953 {
1954 if (QUERY_FLAG (hitter, FLAG_FRIENDLY))
1955 remove_friendly_object (hitter);
1956
1957 hitter->destroy (); 1956 hitter->destroy ();
1958 } 1957
1959 /* Lets handle creatures that are splitting now */ 1958 /* Lets handle creatures that are splitting now */
1960 else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING)) 1959 else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING))
1961 { 1960 {
1962 int i; 1961 int i;
1963 int friendly = QUERY_FLAG (op, FLAG_FRIENDLY); 1962 int friendly = QUERY_FLAG (op, FLAG_FRIENDLY);
… …
2189 op->speed_left = (float) -(FABS (op->speed) * max); 2188 op->speed_left = (float) -(FABS (op->speed) * max);
2190 2189
2191/* tmp->stats.food = (signed short) (max/FABS(op->speed)); */ 2190/* tmp->stats.food = (signed short) (max/FABS(op->speed)); */
2192} 2191}
2193 2192
2194
2195/* Attempts to kill 'op'. hitter is the attack object, dam is 2193/* Attempts to kill 'op'. hitter is the attack object, dam is
2196 * the computed damaged. 2194 * the computed damaged.
2197 */ 2195 */
2198void 2196void
2199deathstrike_player (object *op, object *hitter, int *dam) 2197deathstrike_player (object *op, object *hitter, int *dam)
… …
2216 if (def_lev < 1) 2214 if (def_lev < 1)
2217 { 2215 {
2218 LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->name, &op->name); 2216 LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->name, &op->name);
2219 def_lev = 1; 2217 def_lev = 1;
2220 } 2218 }
2219
2221 atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2; 2220 atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2;
2222 /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n", 2221 /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n",
2223 atk_lev, def_lev); */ 2222 atk_lev, def_lev); */
2224 2223
2225 if (atk_lev >= def_lev) 2224 if (atk_lev >= def_lev)
… …
2240 */ 2239 */
2241 *dam *= kill_lev / def_lev; 2240 *dam *= kill_lev / def_lev;
2242 } 2241 }
2243 } 2242 }
2244 else 2243 else
2245 {
2246 *dam = 0; /* no harm done */ 2244 *dam = 0; /* no harm done */
2247 }
2248} 2245}
2249 2246
2250/* thrown_item_effect() - handles any special effects of thrown 2247/* thrown_item_effect() - handles any special effects of thrown
2251 * items (like attacking living creatures--a potion thrown at a 2248 * items (like attacking living creatures--a potion thrown at a
2252 * monster). 2249 * monster).
… …
2356#endif 2353#endif
2357 2354
2358 return adjust; 2355 return adjust;
2359} 2356}
2360 2357
2361
2362/* determine if the object is an 'aimed' missile */ 2358/* determine if the object is an 'aimed' missile */
2363int 2359int
2364is_aimed_missile (object *op) 2360is_aimed_missile (object *op)
2365{ 2361{
2366 2362
… …
2372 if (op->type == ARROW || op->type == THROWN_OBJ) 2368 if (op->type == ARROW || op->type == THROWN_OBJ)
2373 return 1; 2369 return 1;
2374 else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET || op->subtype == SP_EXPLOSION)) 2370 else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET || op->subtype == SP_EXPLOSION))
2375 return 1; 2371 return 1;
2376 } 2372 }
2373
2377 return 0; 2374 return 0;
2378} 2375}

Diff Legend

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