Changeset 1000

Timestamp:

10/01/08 03:07:19 (3 months ago)

Author:

takkaria

Message:

(#498) Make it so that the object information screen prints the correct average damage always, by feeding the object examined through the normal calculation routines.

Files:

• trunk/src/object/obj-info.c (modified) (1 diff)
• trunk/src/player/calcs.c (modified) (5 diffs)
• trunk/src/player/player.h (modified) (1 diff)

trunk/src/object/obj-info.c

@@ -361 +361 @@
-        if (weapon)
-        {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-                dam = ((o_ptr->ds + 1) * o_ptr->dd * 5);
-
-
-
-
+
-
-                /* Warn about heavy weapons */
-
-
+
-                        text_out_c(TERM_L_RED, "You are too weak to use this weapon effectively!\n");
-                        blows = 1;
-                }
-
-                text_out("With this weapon, you would currently get ");
-blows
-blows
+state.num_blow
+state.num_blow
-                        text_out("blows per round.  Each blow will do an average damage of ");
-                else

trunk/src/player/calcs.c

@@ -510 +510 @@
- * Calculate the blows a player would get, in current condition, wielding "o_ptr".
- */
-int calc_blows(const object_type *o_ptr
+static int calc_blows(const object_type *o_ptr, player_state *state
-{
-        int blows;
-1, str_index2, dex_index1, dex_index2
+, dex_index
-        int div;
-
-        object_type *j_ptr = &inventory[INVEN_WIELD];
-
-        /* Enforce a minimum "weight" (tenth pounds) */
-        div = ((o_ptr->weight < cp_ptr->min_weight) ? cp_ptr->min_weight : o_ptr->weight);
-
-        /* If we're wielding this weapon, use the current stats */
-        if (o_ptr == j_ptr)
-        {
-                str_index1 = p_ptr->state.stat_ind[A_STR];
-                dex_index1 = p_ptr->state.stat_ind[A_DEX];
-        }
-        else
-        {
-                /* Recalculate bonuses as if we were wielding this weapon */
-
-                int str_change = 0, dex_change = 0;
-                int new_str = p_ptr->state.stat_use[A_STR];
-                int new_dex = p_ptr->state.stat_use[A_DEX];
-
-                /* object_type *j_ptr = &inventory[INVEN_WIELD]; */
-
-                u32b jf1, jf2, jf3;
-                u32b of1, of2, of3;
-
-                /* Examine the wielded weapon */
-                object_flags(j_ptr, &jf1, &jf2, &jf3);
-                if (jf1 & (TR1_STR)) str_change -= j_ptr->pval;
-                if (jf1 & (TR1_DEX)) dex_change -= j_ptr->pval;
-
-                /* Examine the weapon in the pack*/
-                object_flags(o_ptr, &of1, &of2, &of3);
-                if (of1 & (TR1_STR)) str_change += o_ptr->pval;
-                if (of1 & (TR1_DEX)) dex_change += o_ptr->pval;
-
-                new_str = modify_stat_value(new_str, str_change);
-                new_dex = modify_stat_value(new_dex, dex_change);
-
-                if (new_str <= 18)
-                        str_index1 = new_str - 3;
-                else if (new_str <= 18+219)
-                        str_index1 = (15 + (new_str - 18) / 10);
-                else
-                        str_index1 = 37;
-
-                if (new_dex <= 18)
-                        dex_index1 = new_dex - 3;
-                else if (new_dex <= 18+219)
-                        dex_index1 = (15 + (new_dex - 18) / 10);
-                else
-                        dex_index1 = 37;
-        }
-
-
-        /* Get the strength vs weight */
-
+
+
-
-        /* Maximal value */
-2 > 11) str_index2
+ > 11) str_index
-
-        /* Index by dexterity */
-2 = MIN(adj_dex_blow[dex_index1
+ = MIN(adj_dex_blow[p_ptr->state.stat_ind[A_DEX]
-
-        /* Use the blows table */
-2][dex_index2
+][dex_index
-
-        /* Require at least one blow */
@@ -589 +540 @@
- * Computes current weight limit.
- */
-void
+player_state *state
-{
-        int i;
-
-        /* Weight limit based only on strength */
-p_ptr->state.
+state->
-
-        /* Return the result */
@@ -619 +570 @@
- * are actually added in later, at the appropriate place.
- */
-static 
+
-{
-        int i, j, hold;
@@ -956 +907 @@
-
-        /* Extract the "weight limit" (in tenth pounds) */
-
+state
-
-        /* Apply "encumbrance" from weight */
@@ -1145 +1096 @@
-        {
-                /* Calculate number of blows */
-
+, state
-
-                /* Boost digging skill by weapon weight */

trunk/src/player/player.h

@@ -1 +1 @@
-/* calcs.c */
-int calc_blows(const object_type *o_ptr
+void calc_bonuses(object_type inventory[], player_state *state
-void notice_stuff(void);
-void update_stuff(void);