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

Comparing deliantra/server/server/monster.C (file contents):
Revision 1.51 by root, Fri Dec 26 13:33:22 2008 UTC vs.
Revision 1.56 by root, Sat Dec 27 08:41:44 2008 UTC

  * set to sane values.
  */
 object *
 check_enemy (object *npc, rv_vector * rv)
 {
   /* if this is pet, let him attack the same enemy as his owner
    * TODO: when there is no ower enemy, try to find a target,
    * which CAN attack the owner. */
   if ((npc->attack_movement & HI4) == PETMOVE)
     {
       op->last_heal += (int) ((float) (8 * op->stats.Con) / FABS (op->speed));
       op->stats.hp = MIN ((sint32) op->stats.hp + op->last_heal / 32, op->stats.maxhp); /* causes Con/4 hp/tick */
       op->last_heal %= 32;
       /* So if the monster has gained enough HP that they are no longer afraid */
-      if (QUERY_FLAG (op, FLAG_RUN_AWAY) && op->stats.hp >= (signed short) (((float) op->run_away / (float) 100) * (float) op->stats.maxhp))
+      if (QUERY_FLAG (op, FLAG_RUN_AWAY) && op->stats.hp >= (signed short)(((float)op->run_away / 100.f) * (float)op->stats.maxhp))
         CLEAR_FLAG (op, FLAG_RUN_AWAY);
       if (op->stats.hp > op->stats.maxhp)
         op->stats.hp = op->stats.maxhp;
     }
   /* generate sp, if applicable */
   if (op->stats.Pow > 0 && op->stats.sp < op->stats.maxsp)
     {
-      /*  last_sp is in funny units.  Dividing by speed puts
+      /* last_sp is in funny units. Dividing by speed puts
        * the regeneration rate on a basis of time instead of
-       * #moves the monster makes.  The scaling by 8 is
+       * #moves the monster makes. The scaling by 8 is
        * to capture 8th's of a sp fraction regens
        *
        * Cast to sint32 before comparing to maxhp since otherwise an (sint16)
        * overflow might produce monsters with negative sp.
        */
-      op->last_sp += (int) ((float) (8 * op->stats.Pow) / FABS (op->speed));
+      op->last_sp += (int) ((float) (8 * op->stats.Pow) / fabsf (op->speed));
-      op->stats.sp = MIN (op->stats.sp + op->last_sp / 128, op->stats.maxsp);   /* causes Pow/16 sp/tick */
+      op->stats.sp = min (op->stats.sp + op->last_sp / 128, op->stats.maxsp);   /* causes Pow/16 sp/tick */
       op->last_sp %= 128;
     }
   /* this should probably get modified by many more values.
    * (eg, creatures resistance to fear, level, etc. )
             if (monster_use_bow (op, part, enemy, dir))
               return 0;
         }                       /* for processing of all parts */
     }                           /* If not scared */
   part = rv.part;
   dir = rv.direction;
+#if DEVEL
+  // if the enemy is a player, we have los. if los says we
+  // can directly reach the player, we do not deviate.
+  // for non-players, we never deviate
+  if (enemy->contr && enemy->contr->darkness_at (op->map, op->x, op->y) == LOS_BLOCKED)
+    {
+      int sdir = 0;
+      for (int dir = 1; dir <= 8; ++dir)
+        {
+          mapxy pos (op); pos.move (dir);
+          if (pos.normalise ())
+            {
+              mapspace &ms = pos.ms ();
+              if (ms.smell > op->ms ().smell)
+                {
+                  printf ("%s: found smell, following it, apparently (%d, %d)\n",& op->name,op->ms().smell,ms.smell);//D
+                  op->ms ().smell = ms.smell - 1;
+                  sdir = dir;
+                  // perturbing the path might let the monster lose track,
+                  // but it will also wide the actual path, spreading information
+                  if (!rndm (20))
+                    sdir += absdir (1 - rndm (2) * 2);
+                }
+            }
+        }
+      if (sdir)
+        dir = sdir;
+      else
+        // no better smell found, so assume the player jumped, and erase this smell
+        {if (op->ms ().smell) printf ("erasing smell %d\n", op->ms ().smell);//D
+          ordered_mapwalk_begin (op, -1, -1, 1, 1)
+            if (m)
+              m->at (nx, ny).smell = 0;
+          ordered_mapwalk_end
+        }//D
+    }
+#endif
   if (QUERY_FLAG (op, FLAG_SCARED) || QUERY_FLAG (op, FLAG_RUN_AWAY))
     dir = absdir (dir + 4);
   if (QUERY_FLAG (op, FLAG_CONFUSED))
         }
       if (QUERY_FLAG (op, FLAG_SCARED) || !can_hit (part, enemy, &rv) || QUERY_FLAG (op, FLAG_RUN_AWAY))
         {
           /* Try move around corners if !close */
-          int maxdiff = (QUERY_FLAG (op, FLAG_ONLY_ATTACK) || RANDOM () & 1) ? 1 : 2;
+          int maxdiff = (QUERY_FLAG (op, FLAG_ONLY_ATTACK) || rndm (2)) ? 1 : 2;
           for (diff = 1; diff <= maxdiff; diff++)
             {
               /* try different detours */
-              int m = 1 - (RANDOM () & 2);      /* Try left or right first? */
+              int m = 1 - rndm (2) * 2;      /* Try left or right first? */
               if (move_object (op, absdir (dir + diff * m)) || move_object (op, absdir (dir - diff * m)))
                 return 0;
             }
         }
     radius = max (MIN_MON_RADIUS, op->stats.Wis / 5 + 1);
   else
     {                           /* a level/INT/Dex adjustment for hiding */
       int bonus = op->level / 2 + op->stats.Int / 5;
-      if (enemy->type == PLAYER)
+      if (enemy->is_player ())
         {
           if (object *sk_hide = find_skill_by_number (enemy, SK_HIDING))
             bonus -= sk_hide->level;
           else
             {
        */
       if (!QUERY_FLAG (looker, FLAG_SEE_INVISIBLE))
         if (makes_invisible_to (enemy, looker))
           return 0;
     }
-  else if (looker->type == PLAYER)      /* for players, a (possible) shortcut */
+  else if (looker->is_player ())      /* for players, a (possible) shortcut */
     if (player_can_view (looker, enemy))
       return 1;
   /* ENEMY IN DARK MAP. Without infravision, the enemy is not seen
    * unless they carry a light or stand in light. Darkness doesnt

Diff Legend

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

Comparing deliantra/server/server/monster.C (file contents): Revision 1.51 by root, Fri Dec 26 13:33:22 2008 UTC vs. Revision 1.56 by root, Sat Dec 27 08:41:44 2008 UTC

Diff Legend

Comparing deliantra/server/server/monster.C (file contents):
Revision 1.51 by root, Fri Dec 26 13:33:22 2008 UTC vs.
Revision 1.56 by root, Sat Dec 27 08:41:44 2008 UTC