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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.187 by elmex, Tue Jan 13 13:29:57 2009 UTC vs.
Revision 1.190 by root, Fri Apr 3 00:11:26 2009 UTC

 /****************************************************************************
  * Weapon improvement code follows
  ****************************************************************************/
 /**
+ * This function just checks whether who can handle equipping an item
+ * with item_power.
+ */
+bool
+check_item_power (object *who, int item_power)
+{
+  if (who->type == PLAYER
+      && item_power
+      && item_power + who->contr->item_power > settings.item_power_factor * who->level)
+    return false;
+  else
+    return true;
+}
+/**
  * This returns the sum of nrof of item (arch name).
  */
 static int
 check_item (object *op, shstr_cmp item)
 {
         }
       prev = op;
       op = op->below;
     }
-}
-/**
- * This checks to see of the player (who) is sufficient level to use a weapon
- * with improvs improvements (typically last_eat).  We take an int here
- * instead of the object so that the improvement code can pass along the
- * increased value to see if the object is usuable.
- * we return 1 (true) if the player can use the weapon.
- */
-static int
-check_weapon_power (const object *who, int improvs)
-{
-/* Old code is below (commented out).  Basically, since weapons are the only
- * object players really have any control to improve, it's a bit harsh to
- * require high level in some combat skill, so we just use overall level.
- */
-#if 1
-  if (((who->level / 5) + 5) >= improvs)
-    return 1;
-  else
-    return 0;
-#else
-  int level = 0;
-  /* The skill system hands out wc and dam bonuses to fighters
-   * more generously than the old system (see fix_player). Thus
-   * we need to curtail the power of player enchanted weapons.
-   * I changed this to 1 improvement per "fighter" level/5 -b.t.
-   * Note:  Nothing should break by allowing this ratio to be different or
-   * using normal level - it is just a matter of play balance.
-   */
-  if (who->type == PLAYER)
-    {
-      object *wc_obj = NULL;
-      for (wc_obj = who->inv; wc_obj; wc_obj = wc_obj->below)
-        if (wc_obj->type == SKILL && IS_COMBAT_SKILL (wc_obj->subtype) && wc_obj->level > level)
-          level = wc_obj->level;
-      if (!level)
-        {
-          LOG (llevError, "Error: Player: %s lacks wc experience object\n", who->name);
-          level = who->level;
-        }
-    }
-  else
-    level = who->level;
-  return (improvs <= ((level / 5) + 5));
-#endif
 }
 /**
  * Returns how many items of type improver->slaying there are under op.
  * Will display a message if none found, and 1 if improver->slaying is NULL.
   if (improver->stats.sp == IMPROVE_PREPARE)
     return prepare_weapon (op, improver, weapon);
   if (weapon->level == 0)
     {
-      op->failmsg ("This weapon has not been prepared. H<You first ahve to prepare a weapon with a prepare weapon scroll.>");
+      op->failmsg (
+        "This weapon has not been prepared."
+        " H<You first have to prepare a weapon with a prepare weapon scroll.>");
       return 0;
     }
-  if (weapon->level == weapon->last_eat && weapon->item_power >= 100)
+  if (weapon->last_eat >= weapon->level   // improvements used up
+      || weapon->item_power >= 100)       // or item_power >= arbitrary limit of 100
     {
       op->failmsg ("This weapon cannot be improved any more.");
       return 0;
     }
-  if (QUERY_FLAG (weapon, FLAG_APPLIED) && !check_weapon_power (op, weapon->last_eat + 1))
+  if (QUERY_FLAG (weapon, FLAG_APPLIED)
+      && !check_item_power (op, weapon->item_power + 1))
     {
       op->failmsg ("Improving the weapon will make it too "
                     "powerful for you to use. Unready it if you "
                     "really want to improve it.");
       return 0;
       LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name);
       op->failmsg ("The spellbook symbols make no sense. This is a bug, please report!");
       return;
     }
-  if (skop->level < int (sqrtf (spell->level) * 1.5f))
+  int learn_level = sqrtf (spell->level) * 1.5f;
+  if (skop->level < learn_level)
     {
-      op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low.>", &tmp->skill));
+      op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low, it must be at least %d.>",
+                           &tmp->skill, learn_level));
       return;
     }
   op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));
          * skill so that the dam and wc get updated
          */
         who->change_skill (skop);
     }
-  if (who->type == PLAYER
+  if (!check_item_power (who, op->item_power))
-      && op->item_power
-      && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
     {
       who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER);
       return 1;
     }
     return RESULT_INT (0);
   switch (op->type)
     {
       case WEAPON:
-        if (!check_weapon_power (who, op->last_eat))
-          {
-            op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
-            if (tmp)
-              insert_ob_in_ob (tmp, who);
-            return 1;
-          }
         //TODO: this obviously fails for players using a shorter prefix
         // i.e. "R" can use Ragnarok's sword.
         if (op->level && !op->name.starts_with (who->name))
           {
             /* if the weapon does not have the name as the character, can't use it. */
           }
         break;
       case BOW:
-        if (!check_weapon_power (who, op->last_eat))
-          {
-            who->failmsg ("That weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
-            if (tmp)
-              insert_ob_in_ob (tmp, who);
-            return 1;
-          }
         if (op->level && !op->name.starts_with (who->name))
           {
             who->failmsg ("The weapon does not recognize you as its owner. "
                            "H<Its name indicates that it belongs to somebody else.>");
             if (tmp)

Diff Legend

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

Comparing deliantra/server/server/apply.C (file contents): Revision 1.187 by elmex, Tue Jan 13 13:29:57 2009 UTC vs. Revision 1.190 by root, Fri Apr 3 00:11:26 2009 UTC

Diff Legend

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.187 by elmex, Tue Jan 13 13:29:57 2009 UTC vs.
Revision 1.190 by root, Fri Apr 3 00:11:26 2009 UTC