[ViewVC] Diff of: cvs/deliantra/server/server/skill

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.79 by root, Sat Nov 7 18:30:06 2009 UTC vs.
Revision 1.93 by root, Sat Apr 10 05:12:57 2010 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * 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.
 /* init_skills basically just sets up the skill_names table
  * above.  The index into the array is set up by the
  * subtypes.
  */
 void
-init_skills (void)
+init_skills ()
 {
   for_all_archetypes (at)
     if (at->type == SKILL)
       {
         if (skill_names[at->subtype])
   if (!skill)
     skill = give_skill_by_name (who, skill_tool->skill);
   if (!skill_tool->flag [FLAG_APPLIED])
-    if (apply_special (who, splay (skill_tool), AP_APPLY | AP_NO_READY))
+    if (!who->apply (splay (skill_tool)))
       return 0;
   return splay (skill);
 }
 object *
 find_skill_by_name_fuzzy (object *who, const char *name)
 {
-  if (!name)
+  if (name)
-    return 0;
-  for (object *tmp = who->inv; tmp; tmp = tmp->below)
+    for (object *tmp = who->inv; tmp; tmp = tmp->below)
-    if ((tmp->type == SKILL || tmp->type == SKILL_TOOL)
+      if ((tmp->type == SKILL || tmp->type == SKILL_TOOL)
-        && tmp->skill.starts_with (name))
+          && tmp->skill.starts_with (name))
-      if (object *skop = find_skill_by_name (who, tmp->skill))
+        if (object *skop = find_skill_by_name (who, tmp->skill))
-        return skop;
+          return skop;
   return 0;
 }
 /* This returns the skill pointer of the given name (the
     if (tmp->type == SKILL && tmp->subtype == skillno)
       if (object *skop = find_skill_by_name (who, tmp->skill))
         return skop;
   return 0;
-}
-/* This changes the objects chosen_skill to new_skill.
- * return 1 on success, 0 on error
- */
-bool
-object::change_skill (object *new_skill)
-{
-  if (type != PLAYER)
-    return 0;
-  // optimise this supposedly common case
-  if (new_skill == chosen_skill)
-    return 1;
-  if (chosen_skill)
-    {
-      chosen_skill->flag [FLAG_APPLIED] = false;
-      change_abil (this, chosen_skill);
-    }
-  chosen_skill = new_skill;
-  if (chosen_skill)
-    {
-      chosen_skill->flag [FLAG_APPLIED] = true;
-      change_abil (this, chosen_skill);
-    }
-  // always clear current weapon, as the selected skill could
-  // conflict with the current weapon skill, which would go
-  // undetected and exp would be given to the wrong skill.
-  current_weapon = 0;
-  update_stats ();
-  return 1;
 }
 /* do_skill() - Main skills use function-similar in scope to cast_spell().
  * We handle all requests for skill use outside of some combat here.
  * We require a separate routine outside of fire() so as to allow monsters
                 {
                   found_cauldron = true;
                   if (tmp->skill != skill->skill)
                     {
-                      op->failmsg (format ("You can't use the %s with the %s skill!",
+                      op->failmsgf ("You can't use the %s with the %s skill!",
-                                           query_name (tmp),
+                                    query_name (tmp),
-                                           query_name (skill)));
+                                    query_name (skill));
                       break;
                     }
                   attempt_do_alchemy (op, tmp, skill);
       case SK_EVOCATION:
       case SK_PYROMANCY:
       case SK_SUMMONING:
       case SK_CLIMBING:
         new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect.");
+        break;
+      case SK_MINING:
+        success = skill_mining (op, part, skill, dir, string);
+        break;
+      case SK_FISHING:
+        success = skill_fishing (op, part, skill, dir, string);
         break;
       default:
         LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp);
         break;
   if (!string)
     return 0;
   for (skop = op->inv; skop; skop = skop->below)
-    {
+    if ((skop->type == SKILL || skop->type == SKILL_TOOL)
-      if (skop->type == SKILL
-          && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL)
-          && !strncasecmp (string, skop->skill, min (strlen (string), (size_t) strlen (skop->skill))))
+        && !strncmp (string, skop->skill, min (strlen (string), strlen (skop->skill))))
+      {
+        skop = find_skill_by_name (op, skop->skill);
         break;
-      else if (skop->type == SKILL_TOOL
-               && !strncasecmp (string, skop->skill, min (strlen (string), (size_t) strlen (skop->skill))))
-        break;
-    }
+      }
   if (!skop)
     {
-      new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string);
+      op->failmsgf ("Unable to find skill %s.", string);
+      return 0;
+    }
+  if (!(skill_flags [skop->subtype] & SF_USE))
+    {
+      op->failmsgf (
+         "You feel as if you wanted to do something funny, but you can't remember what. "
+         "H<The %s skill cannot be C<use_skill>'ed - maybe you need to C<ready_skill> it, "
+         "use it with some item, or it's always active.>",
+         &skop->skill
+      );
       return 0;
     }
   len = strlen (skop->skill);
 }
 static bool
 hth_skill_p (object *skill)
 {
-  return (skill_flags [skill->subtype] & (SF_COMBAT | SF_NEED_WEAPON)) == SF_COMBAT;
+  return (skill_flags [skill->subtype] & (SF_COMBAT | SF_NEED_ITEM)) == SF_COMBAT;
 }
 /* This finds the first unarmed skill the player has, and returns it.
  */
 static object *
    * through that code if skill is set to change to the skill.
    */
   if (player *pl = op->contr)
     {
       if (skill)
-        op->change_skill (skill);
+        {
+          if (!op->apply (skill))
+            return 0;
+        }
       else
         {
           if (!pl->combat_ob)
             {
               if (QUERY_FLAG (op, FLAG_READY_WEAPON))
                       if (!skill)
                         new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!");
                     }
-                  if (skill)
+                  op->apply (skill);
-                    {
-                      op->change_skill (0);
-                      apply_special (op, skill, AP_APPLY);
-                    }
                 }
               if (!pl->combat_ob)
                 {
                   LOG (llevError, "Could not find anything to attack on %s\n", &op->name);
                   return 0;
                 }
             }
-          if (!op->change_weapon (pl->combat_ob))
+          if (!op->apply (pl->combat_ob))
             return 0;
         }
       /* lose invisiblity/hiding status for running attacks */
       if (pl->tmp_invis)

Diff Legend

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

Comparing deliantra/server/server/skill_util.C (file contents): Revision 1.79 by root, Sat Nov 7 18:30:06 2009 UTC vs. Revision 1.93 by root, Sat Apr 10 05:12:57 2010 UTC

Diff Legend

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.79 by root, Sat Nov 7 18:30:06 2009 UTC vs.
Revision 1.93 by root, Sat Apr 10 05:12:57 2010 UTC