[ViewVC] Diff of: cvs/deliantra/server/server/attack.C

Comparing deliantra/server/server/attack.C (file contents):
Revision 1.150 by root, Wed Nov 16 23:42:02 2016 UTC vs.
Revision 1.152 by root, Sun Jan 29 02:47:05 2017 UTC

       op = stop_item (op);
       if (!op)
         return;
       /* Hacked the following so that type LIGHTER will work.
        * Also, objects which are potential "lights" that are hit by
        * flame/elect attacks will be set to glow. "lights" are any
        * object with +/- glow_radius and an "other_arch" to change to.
        * (and please note that we cant fail our save and reach this
        * function if the object doesnt contain a material that can burn.
        * So forget lighting magical swords on fire with this!) -b.t.
        */
       if (type & (AT_FIRE | AT_ELECTRICITY))
         {
           // seems LAMPs and TORCHes are always IS_LIGHTABLE?
           if (op->destroyed ())
             break;
         }
       /* Here we are potentially destroying an object.  If the object has
        * NO_PASS set, it is also immune - you can't destroy walls.  Note
        * that weak walls have is_alive set, which prevent objects from
        * passing over/through them.  We don't care what type of movement
        * the wall blocks - if it blocks any type of movement, can't be
        * destroyed right now.
        * Without the material check the server completely fails to work,
 static void
 thrown_item_effect (object *hitter, object *victim)
 {
   if (!hitter->flag [FLAG_ALIVE])
     {
       /* May not need a switch for just 2 types, but this makes it
        * easier for expansion.
        */
       switch (hitter->type)
         {
             case POTION:
         attacker = hitter;
     }
   else if (!hitter->flag [FLAG_ALIVE])
     return 0;
   /* determine the condtions under which we make an attack.
    * Add more cases, as the need occurs. */
   if (!can_see_enemy (attacker, target))
     {
       /* target is unseen */
       int hitdam = base_dam;
       if (!simple_attack)
         {
           /* If you hit something, the victim should *always* wake up.
            * Before, invisible hitters could avoid doing this.
            * -b.t. */
           if (op->flag [FLAG_SLEEP])
             op->clr_flag (FLAG_SLEEP);
           /* If the victim can't see the attacker, it may alert others
       /* Ok, because some of the brainfucks of the good *sigh* old *sigh*
        * Crossfire we have to default the attacktype here to AT_PHYSICAL.
        * This check is important for the most simple monsters out there in the
        * game content (maps, archs). For example orcs: They would have
        * no attacktype at all.
        *
        * Some time in the future someone should just go into the game data
        * and fix every monster out there ;-/ Until then we will kill some
        * more trees in the african rain forests with this check.
        */
    */
   if (hit_something)
     if (op->speed < 10.0)
       {
         /* Stop arrow */
-        if (!container)
+        if (container)
+          container->destroy ();
+        else
           {
             hitter = fix_stopped_arrow (hitter);
             if (!hitter)
               return 0;
           }
-        else
-          container->destroy ();
         /* Try to stick arrow into victim */
         if (!victim->destroyed () && stick_arrow (hitter, victim))
           return 0;
             owner->play_sound (sound_find ("player_kills"));
         }
       /* If a player kills another player, not on
        * battleground, the "killer" looses 1 luck. Since this is
        * not reversible, it's actually quite a pain IMHO. -AV
        * Fix bug in that we were changing the luck of the hitter, not
        * player that the object belonged to - so if you killed another player
        * with spells, pets, whatever, there was no penalty.
        * Changed to make luck penalty configurable in settings.
        */
    * continues in the calling function.
    */
   return maxdam;
 }
 /* Find out if this is friendly fire (PVP and attacker is peaceful) or not
  *  Returns 0 this is not friendly fire
  */
 int
 friendly_fire (object *op, object *hitter)
 {
       /*  peterm:  give poisoning some teeth.  It should
        * be able to kill things better than it does:
        * damage should be dependent something--I choose to
        * do this:  if it's a monster, the damage from the
        * poisoning goes as the level of the monster/2.
        * If anything else, goes as damage.
        */
       if (hitter->flag [FLAG_ALIVE])
         tmp->stats.dam += hitter->level / 2;
       else
       tmp = archetype::get (FORCE_NAME);
       tmp = insert_ob_in_ob (tmp, op);
     }
   /* Duration added per hit and max. duration of confusion both depend
    *  on the player's resistance
    */
   tmp->set_speed (0.05);
   tmp->subtype = FORCE_CONFUSION;
   tmp->duration = 8 + max (1, 5 * (100 - op->resist[ATNR_CONFUSION]) / 100);
   tmp->name = shstr_confusion;
 void
 paralyze_player (object *op, object *hitter, int dam)
 {
   /* This is strange stuff... someone knows for what this is
    * written? Well, i think this can and should be removed
    */
   /*
      if((tmp=present(PARAIMAGE,op->map,op->x,op->y))==NULL) {
      tmp=clone_arch(PARAIMAGE);
        * redone.
        */
       if (kill_lev >= def_lev)
         {
           *dam = op->stats.hp + 10;     /* take all hp. they can still save for 1/2 */
           /* I think this doesn't really do much.  Because of
            * integer rounding, this only makes any difference if the
            * attack level is double the defender level.
            */
           *dam *= kill_lev / def_lev;
         }
     }
         /*  here also check for diseases */
         check_physically_infect (op, hitter);
         break;
         /* Don't need to do anything for:
            magic,
            fire,
            electricity,
            cold */
       case ATNR_CONFUSION:
       case ATNR_POISON:
       case ATNR_CANCELLATION:
       case ATNR_DEPLETE:
       case ATNR_BLIND:
         {
           /* chance for inflicting a special attack depends on the
            * difference between attacker's and defender's level
            */
           int level_diff = min (110, max (0, op->level - hitter->level));
           /* First, only creatures/players with speed can be affected.
            * Second, just getting hit doesn't mean it always affects
            * you.  Third, you still get a saving through against the
            * effect.
            */
           if (op->has_active_speed ()
               && (op->flag [FLAG_MONSTER] || op->type == PLAYER)
               && !(rndm (0, (attacknum == ATNR_SLOW ? 6 : 3) - 1))
               && !did_make_save (op, level_diff, op->resist[attacknum] / 10))
          * does no damage. */
         break;
       case ATNR_HOLYWORD:
         {
           /* This has already been handled by hit_player,
            *  no need to check twice  -- DAMN */
           object *owner = hitter->owner ? (object *)hitter->owner : hitter;
           /* As with turn undead above, give a bonus on the saving throw */
           if ((op->level + (op->resist[ATNR_HOLYWORD] / 100)) < owner->level + turn_bonus[owner->stats.Wis])

Diff Legend

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

Comparing deliantra/server/server/attack.C (file contents): Revision 1.150 by root, Wed Nov 16 23:42:02 2016 UTC vs. Revision 1.152 by root, Sun Jan 29 02:47:05 2017 UTC

Diff Legend

Comparing deliantra/server/server/attack.C (file contents):
Revision 1.150 by root, Wed Nov 16 23:42:02 2016 UTC vs.
Revision 1.152 by root, Sun Jan 29 02:47:05 2017 UTC