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

Comparing deliantra/server/server/skills.C (file contents):
Revision 1.88 by root, Wed Apr 14 21:26:36 2010 UTC vs.
Revision 1.108 by root, Wed Dec 12 02:13:05 2012 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2003 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the Affero GNU General Public License
  * and the GNU General Public License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 #include <global.h>
 #include <object.h>
   /* For all the stacked objects at this point, attempt a steal */
   for (; tmp; tmp = next)
     {
       next = tmp->below;
       /* Minor hack--for multi square beings - make sure we get
        * the 'head' coz 'tail' objects have no inventory! - b.t.
        */
       if (tmp->head)
         tmp = tmp->head;
       if (tmp->type != PLAYER && !tmp->flag [FLAG_MONSTER])
-        continue;
-      /* do not reveal hidden DMs */
-      if (tmp->type == PLAYER && tmp->flag [FLAG_WIZ] && tmp->contr->hidden)
         continue;
       if (attempt_steal (tmp, op, skill))
         {
           if (tmp->type == PLAYER)      /* no xp for stealing from another player */
 int
 pick_lock (object *pl, int dir, object *skill)
 {
   object *tmp;
-  int x = pl->x + freearr_x[dir];
-  int y = pl->y + freearr_y[dir];
   if (!dir)
     dir = pl->facing;
+  mapxy pos (pl); pos.move (dir);
   /* For all the stacked objects at this point find a door */
-  if (out_of_map (pl->map, x, y))
+  if (!pos.normalise ())
     {
       pl->failmsg ("There is no lock there.");
       return 0;
     }
-  for (tmp = GET_MAP_OB (pl->map, x, y); tmp; tmp = tmp->above)
+  for (tmp = pos->bot; tmp; tmp = tmp->above)
     if (tmp->type == DOOR || tmp->type == LOCKED_DOOR)
       break;
   if (!tmp)
     {
         }
       for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
         {
           /* Jump into creature */
-          if (tmp->flag [FLAG_MONSTER]
+          if (tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
-              || (tmp->type == PLAYER && (!tmp->flag [FLAG_WIZ] || !tmp->contr->hidden)))
             {
               new_draw_info_format (NDI_UNIQUE, 0, pl, "You jump into %s%s.", tmp->type == PLAYER ? "" : "the ", &tmp->name);
               stop_jump (pl, i, spaces);
     }
   return attempt_jump (pl, dir, spaces, skill);
 }
 /* skill_ident() - this code is supposed to allow players to identify
  * classes of objects with the various "auto-ident" skills. Player must
  * have unidentified objects of the right type in order for the skill
  * to work. While multiple classes of objects may be identified,
  * this code is kind of yucky -- it would be nice to make it a bit
  * more generalized. Right now, skill indices are embedded in this routine.
  * Returns amount of experience gained (on successful ident).
  * - b.t. (thomas@astro.psu.edu)
  */
 static int
 do_skill_detect_curse (object *pl, object *skill)
 {
-  object *tmp;
   int success = 0;
-  for (tmp = pl->inv; tmp; tmp = tmp->below)
+  for (object *tmp = pl->inv; tmp; tmp = tmp->below)
     if (!tmp->invisible
+        && tmp->need_identify ()
         && !tmp->flag [FLAG_IDENTIFIED] && !tmp->flag [FLAG_KNOWN_CURSED]
-        && (tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED]) && tmp->item_power < skill->level)
+        && (tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED])
+        && tmp->item_power < skill->level)
       {
         tmp->set_flag (FLAG_KNOWN_CURSED);
         esrv_update_item (UPD_FLAGS, pl, tmp);
         success += calc_skill_exp (pl, tmp, skill);
       }
   /* Check ground, too, but only objects the player could pick up */
-  for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp; tmp = tmp->above)
+  for (object *tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp; tmp = tmp->above)
-    if (can_pick (pl, tmp) &&
+    if (can_pick (pl, tmp)
-        !tmp->flag [FLAG_IDENTIFIED] &&
+        && tmp->need_identify ()
-        !tmp->flag [FLAG_KNOWN_CURSED]
+        && !tmp->flag [FLAG_IDENTIFIED] && !tmp->flag [FLAG_KNOWN_CURSED]
-        && (tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED]) && tmp->item_power < skill->level)
+        && (tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED])
+        && tmp->item_power < skill->level)
       {
         tmp->set_flag (FLAG_KNOWN_CURSED);
         esrv_update_item (UPD_FLAGS, pl, tmp);
         success += calc_skill_exp (pl, tmp, skill);
       }
 }
 static int
 do_skill_detect_magic (object *pl, object *skill)
 {
-  object *tmp;
   int success = 0;
-  for (tmp = pl->inv; tmp; tmp = tmp->below)
+  for (object *tmp = pl->inv; tmp; tmp = tmp->below)
     if (!tmp->invisible
+        && tmp->need_identify ()
         && !tmp->flag [FLAG_IDENTIFIED] && !tmp->flag [FLAG_KNOWN_MAGICAL]
+        && is_magical (tmp)
-        && (is_magical (tmp)) && tmp->item_power < skill->level)
+        && tmp->item_power < skill->level)
       {
         tmp->set_flag (FLAG_KNOWN_MAGICAL);
         esrv_update_item (UPD_FLAGS, pl, tmp);
         success += calc_skill_exp (pl, tmp, skill);
       }
   /* Check ground, too, but like above, only if the object can be picked up */
-  for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp; tmp = tmp->above)
+  for (object *tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp; tmp = tmp->above)
-    if (can_pick (pl, tmp) &&
+    if (can_pick (pl, tmp)
-        !tmp->flag [FLAG_IDENTIFIED] && !tmp->flag [FLAG_KNOWN_MAGICAL] && (is_magical (tmp)) && tmp->item_power < skill->level)
+        && tmp->need_identify ()
+        && !tmp->flag [FLAG_IDENTIFIED] && !tmp->flag [FLAG_KNOWN_MAGICAL]
+        && is_magical (tmp)
+        && tmp->item_power < skill->level)
       {
         tmp->set_flag (FLAG_KNOWN_MAGICAL);
         esrv_update_item (UPD_FLAGS, pl, tmp);
         success += calc_skill_exp (pl, tmp, skill);
       }
 do_skill_ident2 (object *tmp, object *pl, int obj_class, object *skill)
 {
   int success = 0, chance;
   int skill_value = skill->level * pl->stats.Int ? pl->stats.Int : 10;
-  if (!tmp->flag [FLAG_IDENTIFIED] && !tmp->flag [FLAG_NO_SKILL_IDENT]
+  if (!tmp->flag [FLAG_IDENTIFIED]
-      && need_identify (tmp) && !tmp->invisible && tmp->type == obj_class)
+      && !tmp->flag [FLAG_NO_SKILL_IDENT]
+      && tmp->need_identify ()
+      && !tmp->invisible
+      && tmp->type == obj_class)
     {
       chance = die_roll (3, 10, pl, PREFER_LOW) - 3 + rndm (0, (tmp->magic ? tmp->magic * 5 : 1) - 1);
       if (skill_value >= chance)
         {
         break;
       default:
         LOG (llevError, "Error: bad call to skill_ident()\n");
         return 0;
-        break;
     }
   if (!success)
     new_draw_info (NDI_UNIQUE, 0, pl, "... and learn nothing more.");
  * of anything better! -b.t.
  */
 int
 singing (object *pl, int dir, object *skill)
 {
-  int i, exp = 0;
+  int exp = 0;
   object *tmp;
   maptile *m;
   sint16 x, y;
   if (pl->type != PLAYER)
   if (pl->type != PLAYER)
     return;                     /* players only */
   /* check if pl has removed encumbering armour and weapons */
-  if (pl->flag [FLAG_READY_WEAPON] && (skill->level < 6))
+  if (pl->flag [FLAG_READY_WEAPON] && skill->level < 6)
     {
       pl->failmsg ("You can't concentrate while wielding a weapon!\n");
       return;
     }
   else
   /* ok let's meditate!  Spell points are regained first, then once
    * they are maxed we get back hp. Actual incrementing of values
    * is handled by the do_some_living() (in player.c). This way magical
    * bonuses for healing/sp regeneration are included properly
    * No matter what, we will eat up some playing time trying to
    * meditate. (see 'factor' variable for what sets the amount of time)
    */
   new_draw_info (NDI_BLACK, 0, pl, "You meditate.");
   if (pl->stats.sp < pl->stats.maxsp)
       pl->stats.hp++;
       pl->last_heal = -1;
     }
 }
 /* write_note() - this routine allows players to inscribe messages in
  * ordinary inscribable 'books' (anything that is not a SPELL). b.t.
  */
 static int
 write_note (object *pl, object *item, const char *msg, object *skill)
 {
   return 0;
 }
 /* write_scroll() - this routine allows players to inscribe spell scrolls
  * of spells which they know. Backfire effects are possible with the
  * severity of the backlash correlated with the difficulty of the scroll
  * that is attempted. -b.t. thomas@astro.psu.edu
  */
 static int
 write_scroll (object *pl, object *scroll, object *skill)
 {
   if (random_roll (0, chosen_spell->level * 4 - 1, pl, PREFER_LOW) < skill->level)
     {
       object *newscroll = scroll->other_arch->instance ();
       scroll->decrease ();
       newscroll->nrof = 1;
+      newscroll->randomitems = 0; // make sure randomitems doesn't destroy the scroll
       pl->contr->play_sound (sound_find ("inscribe_success"));
       if (!confused)
         {
           newscroll->level = max (skill->level, chosen_spell->level);
           new_draw_info (NDI_UNIQUE, 0, pl, "In your confused state, you write down some odd spell.");
         }
       object *tmp = chosen_spell->clone ();
+      tmp->flag [FLAG_APPLIED] = false;
       insert_ob_in_ob (tmp, newscroll);
       /* Same code as from treasure.C - so they can better merge.
        * if players want to sell them, so be it.
        */
     {
       new_draw_info (NDI_UNIQUE, 0, pl, "You must learn to read before you can write! H<You lack the literacy skill.>");
       return 0;
     }
-  object *item = find_marked_object (pl);
+  object *item = pl->mark ();
   /* find an item of correct type to write on */
   if (!item)
     {
       new_draw_info (NDI_UNIQUE, 0, pl, "You don't have any marked item to write on. H<Use the mark command or the popup menu to make an item.>");
  */
 static object *
 find_throw_ob (object *op, const char *request)
 {
   /* prefer marked item */
-  object *tmp = find_marked_object (op);
+  object *tmp = op->mark ();
   /* can't toss invisible or inv-locked items */
   if (tmp && (tmp->invisible || tmp->flag [FLAG_INV_LOCKED]))
     tmp = 0;
   throw_ob->speed_left = 0;
   throw_ob->map = part->map;
   throw_ob->move_type = MOVE_FLY_LOW;
   throw_ob->move_on = MOVE_FLY_LOW | MOVE_WALK;
+  throw_ob->set_speed (throw_ob->speed);
 #if 0
   /* need to put in a good sound for this */
   play_sound_map (op->map, op->x, op->y, SOUND_THROW_OBJ);
 #endif
     throw_ob = find_mon_throw_ob (op);
   return do_throw (op, part, throw_ob, dir, skill);
 }
+static void
+give_player_quad_material_for (object *pl, object *ob)
+{
+  if (!ob->flag [FLAG_IS_QUAD] || !ob->other_arch)
+    return;
+  object *t = ob->other_arch->instance ();
+  pl->insert (t);
+}
 bool
 skill_mining (object *who, object *tool, object *skill, int dir, const char *string)
 {
   if (!who->is_player ())
     return 0;
       return 0;
     }
   mapspace &ms = pos.ms ();
-  for (object *vein = pos.ms ().top; vein; vein = vein->below)
+  for (object *mine_obj = pos.ms ().top; mine_obj; mine_obj = mine_obj->below)
-    if (vein->type == VEIN)
+    if (mine_obj->type == VEIN)
       {
         who->speed_left -= who->speed / tool->speed;
         who->play_sound (tool->sound);
-        if (rndm (100 - vein->stats.ac) > rndm (tool->stats.wc))
+        if (rndm (100 - mine_obj->stats.ac) > rndm (tool->stats.wc))
           who->failmsgf (
             "You use your %s.... nothing. "
             "H<Try again, perhaps?>",
             &tool->name
           );
-        else if (vein->race != tool->race)
+        else if (mine_obj->race != tool->race)
           who->failmsgf (
             "You use your %s.... but it doesn't work. "
             "H<Maybe you are using the wrong tool?>",
             &tool->name
           );
-        else if (!vein->stats.food)
+        else if (!mine_obj->stats.food)
           who->failmsgf (
             "You use your %s.... but there is nothing. "
             "H<This space is exhausted, you should try somewhere else.>",
             &tool->name
           );
         else
           {
-            --vein->stats.food;
+            --mine_obj->stats.food;
-            object *ore = vein->other_arch->instance ();
+            object *ore = mine_obj->other_arch->instance ();
             who->statusmsg (format (
               "You use your %s.... and find some %s!",
               &tool->name, &ore->name
             ));
             ore->insert_at (who);
             return true;
           }
       }
+    else if (mine_obj->flag [FLAG_IS_QUAD])
+      {
+        if (mine_obj->flag [FLAG_IS_FLOOR])
+          {
+            maptile *lower_floor = pos.m->tile_available (TILE_DOWN);
+            if (!lower_floor)
+              {
+                who->failmsgf (
+                  "Whoops, you failed to remove the %s. H<You may try again.>",
+                  &mine_obj->name
+                );
+                return false;
+              }
+            mapxy below_pos (lower_floor, pos.x, pos.y);
+            if (!below_pos.normalise ())
+              {
+                who->failmsgf (
+                  "Whoops, you failed to remove the %s. H<You may try again.>",
+                  &mine_obj->name
+                );
+                return false;
+              }
+            // first insert open space here:
+            object *open_space_floor = archetype::get (shstr_quad_open_space);
+            open_space_floor->stats.hp = pos.x;
+            open_space_floor->stats.sp = pos.y;
+            insert_ob_in_map_at (open_space_floor, pos.m, mine_obj,
+                                 INS_BELOW_ORIGINATOR, pos.x, pos.y);
+            // next we will remove the wall in the lower layer:
+            mapspace &below_ms = below_pos.ms ();
+            for (object *quad_obj = below_ms.top; quad_obj; quad_obj = quad_obj->below)
+              {
+                if (quad_obj->flag [FLAG_IS_FLOOR])
+                  break;
+                if (quad_obj->flag [FLAG_IS_QUAD])
+                  {
+                    quad_obj->map->queue_physics_at (quad_obj->x, quad_obj->y);
+                    give_player_quad_material_for (who, quad_obj);
+                    quad_obj->destroy ();
+                    break;
+                  }
+              }
+          }
+        mine_obj->map->queue_physics_at (mine_obj->x, mine_obj->y);
+        // FIXME: there should be chance assigned, like above with veins!
+        who->play_sound (tool->sound);
+        give_player_quad_material_for (who, mine_obj);
+        mine_obj->destroy ();
+        who->contr->fire_on = 0; // TODO: stopgap, do not remove more than one per keypress
+        return true;
+      }
   return false;
 }
-bool
-skill_fishing (object *who, object *tool, object *skill, int dir, const char *string)
-{
-  printf ("******** fishing\n");
-  return false;
-}

Diff Legend

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

Comparing deliantra/server/server/skills.C (file contents): Revision 1.88 by root, Wed Apr 14 21:26:36 2010 UTC vs. Revision 1.108 by root, Wed Dec 12 02:13:05 2012 UTC

Diff Legend

Comparing deliantra/server/server/skills.C (file contents):
Revision 1.88 by root, Wed Apr 14 21:26:36 2010 UTC vs.
Revision 1.108 by root, Wed Dec 12 02:13:05 2012 UTC