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

Comparing deliantra/server/server/monster.C (file contents):
Revision 1.55 by root, Sat Dec 27 07:50:05 2008 UTC vs.
Revision 1.64 by root, Fri Sep 25 18:13:02 2009 UTC

 {
   /* Trim work - if no enemy, no need to do anything below */
   if (!enemy)
     return 0;
+  if (!op->flag [FLAG_SLEEP])
+    return 1;
   int radius = max (op->stats.Wis, MIN_MON_RADIUS);
   if (op->flag [FLAG_BLIND])
     /* blinded monsters can only find nearby objects to attack */
     radius = MIN_MON_RADIUS;
      * and has an enemy. If the enemy has no carried light (or isnt
      * glowing!) then the monster has trouble finding the enemy.
      * Remember we already checked to see if the monster can see in
      * the dark. */
     radius = min (radius, MIN_MON_RADIUS + MAX_DARKNESS - op->map->darklevel ());
-  else if (!op->flag [FLAG_SLEEP])
-    return 1;
   if (enemy->flag [FLAG_STEALTH])
     radius = radius / 2 + 1;
   /* enemy should already be on this map, so don't really need to check
         {
           if (op->attack_movement & HI4)
             {
               switch (op->attack_movement & HI4)
                 {
-                  case (PETMOVE):
+                  case PETMOVE:
                     pet_move (op);
                     break;
-                  case (CIRCLE1):
+                  case CIRCLE1:
                     circ1_move (op);
                     break;
-                  case (CIRCLE2):
+                  case CIRCLE2:
                     circ2_move (op);
                     break;
-                  case (PACEV):
+                  case PACEV:
                     pace_movev (op);
                     break;
-                  case (PACEH):
+                  case PACEH:
                     pace_moveh (op);
                     break;
-                  case (PACEV2):
+                  case PACEV2:
                     pace2_movev (op);
                     break;
-                  case (PACEH2):
+                  case PACEH2:
                     pace2_moveh (op);
                     break;
-                  case (RANDO):
+                  case RANDO:
                     rand_move (op);
                     break;
-                  case (RANDO2):
+                  case RANDO2:
                     move_randomly (op);
                     break;
                 }
               return 0;
   /* doppleganger code to change monster facing to that of the nearest
    * player. Hmm. The code is here, but no monster in the current
    * arch set uses it.
    */
-  if (op->race && strcmp (op->race, "doppleganger") == 0)
+  if (op->race == shstr_doppleganger)
     {
       op->face = enemy->face;
       op->name = enemy->name;
     }
     }                           /* 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 (op->stats.Wis >= 8
+      && enemy->contr && enemy->contr->darkness_at (op->map, op->x, op->y) == LOS_BLOCKED)
+    {
-  int sdir = 0;
+      int sdir = 0;
+      uint32_t &smell = op->ms ().smell;
-  for (int dir = 1; dir <= 8; ++dir)
+      for (int ndir = 1; ndir <= 8; ++ndir)
-    {
+        {
-      mapxy pos (op); pos.move (dir);
+          mapxy pos (op); pos.move (ndir);
-      if (pos.normalise ())
+          if (pos.normalise ())
-        {
-          mapspace &ms = pos.ms ();
-          if (ms.smell > op->ms ().smell)
             {
+              mapspace &ms = pos.ms ();
+              if (ms.smell > smell)
+                {
-              printf ("%s: found smell, following it, apparently (%d, %d)\n",& op->name,op->ms().smell,ms.smell);//D
+                  //printf ("%s: found smell, following it, apparently (%d, %d)\n",& op->name,op->ms().smell,ms.smell);//D
-              op->ms ().smell = ms.smell - 1;
+                  if (op->stats.Wis >= 10)
+                    smell = ms.smell - 1; // smarter: tell others
-              sdir = dir;
+                  sdir = ndir;
-              // perturbing the path might let the monster lose track,
+                  // perturbing the path might let the monster lose track,
-              // but it will also wide the actual path, spreading information
+                  // but it will also widen the actual path, spreading information
-              if (!rndm (20))
+                  if (op->stats.Wis >= 15 && !rndm (20)) // even smarter, deviate and spread?
-                sdir += absdir (1 - rndm (2) * 2);
+                    sdir = absdir (sdir + 1 - rndm (2) * 2);
+                }
             }
         }
-    }
-  if (sdir)
+      if (sdir)
-    dir = sdir;
+        dir = sdir;
-  else
+      else if (smell)
+        {
-    // no better smell found, so assume the player jumped, and erase this smell
+          // 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
+          //printf ("erasing smell %d\n", op->ms ().smell);//D
-      ordered_mapwalk_begin (op, -1, -1, 1, 1)
+          unordered_mapwalk (op, -1, -1, 1, 1)
-        if (m)
-          m->at (nx, ny).smell = 0;
+            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))
  * Returns 0 if enemy can not be detected, 1 if it is detected
  */
 int
 can_detect_enemy (object *op, object *enemy, rv_vector * rv)
 {
-  int radius = MIN_MON_RADIUS, hide_discovery;
   /* null detection for any of these condtions always */
   if (!op || !enemy || !op->map || !enemy->map)
     return 0;
   /* If the monster (op) has no way to get to the enemy, do nothing */
     return 0;
   get_rangevector (op, enemy, rv, 0);
   /* Monsters always ignore the DM */
-  if (op->type != PLAYER && QUERY_FLAG (enemy, FLAG_WIZ))
+  if (!op->is_player () && QUERY_FLAG (enemy, FLAG_WIZ))
     return 0;
   /* simple check.  Should probably put some range checks in here. */
   if (can_see_enemy (op, enemy))
     return 1;
   /* The rest of this is for monsters. Players are on their own for
    * finding enemies!
    */
-  if (op->type == PLAYER)
+  if (op->is_player ())
     return 0;
   /* Quality invisible? Bah, we wont see them w/o SEE_INVISIBLE
-   * flag (which was already checked) in can_see_enmy (). Lets get out of here
+   * flag (which was already checked) in can_see_enemy (). Lets get out of here
    */
   if (enemy->invisible && (!enemy->contr || (!enemy->contr->tmp_invis && !enemy->contr->hidden)))
     return 0;
+  int radius = MIN_MON_RADIUS;
   /* use this for invis also */
-  hide_discovery = op->stats.Int / 5;
+  int hide_discovery = op->stats.Int / 5;
   /* Determine Detection radii */
   if (!enemy->flag [FLAG_HIDDEN])             /* to detect non-hidden (eg dark/invis enemy) */
-    radius = max (MIN_MON_RADIUS, op->stats.Wis / 5 + 1);
+    radius = max (MIN_MON_RADIUS, op->stats.Wis / 3 + 1);
   else
     {                           /* a level/INT/Dex adjustment for hiding */
       int bonus = op->level / 2 + op->stats.Int / 5;
       if (enemy->is_player ())
       radius /= 2;
       hide_discovery /= 3;
     }
   /* Radii adjustment for enemy standing in the dark */
-  if (op->map->darklevel () > 0 && !stand_in_light (enemy))
+  if (!stand_in_light (enemy))
     {
       /* on dark maps body heat can help indicate location with infravision
        * undead don't have body heat, so no benefit detecting them.
        */
       if (QUERY_FLAG (op, FLAG_SEE_IN_DARK) && !is_true_undead (enemy))
         radius -= op->map->darklevel () / 2;
       /* op next to a monster (and not in complete darkness)
        * the monster should have a chance to see you.
        */
-      if (radius < MIN_MON_RADIUS && op->map->darklevel () < 5 && rv->distance <= 1)
+      if (radius < MIN_MON_RADIUS && op->map->darklevel () < MAX_DARKNESS && rv->distance <= 1)
         radius = MIN_MON_RADIUS;
     }                           /* if on dark map */
   /* Lets not worry about monsters that have incredible detection
    * radii, we only need to worry here about things the player can
   /* Wasn't detected above, so still hidden */
   return 0;
 }
 /* determine if op stands in a lighted square. This is not a very
- * intellegent algorithm. For one thing, we ignore los here, SO it
+ * intelligent algorithm. For one thing, we ignore los here, SO it
  * is possible for a bright light to illuminate a player on the
  * other side of a wall (!).
  */
 int
 stand_in_light (object *op)
 {
   if (op)
     {
+      if (!op->is_on_map ())
+        return 0;
+      if (op->map->darklevel () <= 0)
+        return 1;
       if (op->glow_radius > 0)
         return 1;
       if (op->map)
         unordered_mapwalk (op, -MAX_LIGHT_RADIUS, -MAX_LIGHT_RADIUS, MAX_LIGHT_RADIUS, MAX_LIGHT_RADIUS)
     {
       /* HIDDEN ENEMY. by definition, you can't see hidden stuff!
        * However,if you carry any source of light, then the hidden
        * creature is seeable (and stupid) */
-      if (has_carried_lights (enemy))
+      if (enemy->has_carried_lights ())
         {
           if (enemy->flag [FLAG_HIDDEN])
             {
               make_visible (enemy);
               new_draw_info (NDI_UNIQUE, 0, enemy, "Your light reveals your hiding spot!");
    * we care about the enemy maps status, not the looker.
    * only relevant for tiled maps, but it is possible that the
    * enemy is on a bright map and the looker on a dark - in that
    * case, the looker can still see the enemy
    */
-  if (enemy->map->darklevel () > 0
-      && !stand_in_light (enemy)
+  if (!stand_in_light (enemy)
       && (!QUERY_FLAG (looker, FLAG_SEE_IN_DARK) || !is_true_undead (looker) || !QUERY_FLAG (looker, FLAG_XRAYS)))
     return 0;
   return 1;
 }

Diff Legend

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

Comparing deliantra/server/server/monster.C (file contents): Revision 1.55 by root, Sat Dec 27 07:50:05 2008 UTC vs. Revision 1.64 by root, Fri Sep 25 18:13:02 2009 UTC

Diff Legend

Comparing deliantra/server/server/monster.C (file contents):
Revision 1.55 by root, Sat Dec 27 07:50:05 2008 UTC vs.
Revision 1.64 by root, Fri Sep 25 18:13:02 2009 UTC