Changeset 753

Timestamp:

03/07/08 18:55:45 (5 months ago)

Author:

GabeCunningham

Message:

Partially fix #498: you should now get see the correct number of blows when looking at a weapon you don't have equipped. The average damage is still off. Fix #401: weapons that radiate light now say "Radius 1 Light" instead of just "Radius 1". Artifact weapons that radiate light now have the correct radius of 1 instead of 4.

Files:

• trunk/src/obj-info.c (modified) (4 diffs)
• trunk/src/xtra1.c (modified) (1 diff)

trunk/src/obj-info.c

@@ -341 +341 @@
-        {
-                int blows = calc_blows(o_ptr);
-
-
+
+
+
+
+
+
-
-                xtra_dam = (p_ptr->to_d * 10);
@@ -367 +371 @@
-
-                /* Calculate damage */
-o_ptr->ds
+(o_ptr->ds + 1)
-                if (object_known_p(o_ptr)) xtra_dam += (o_ptr->to_d * 10);
-                if (object_known_p(j_ptr)) xtra_dam += (j_ptr->to_d * 10);
@@ -434 +438 @@
-
-        /* Work out radius */
-)     
+ && is_lite)
-        else if (is_lite)  rad = 2;
-        if (f3 & TR3_LITE) rad++;
@@ -442 +446 @@
-        text_out_c(TERM_L_GREEN, format("%d", rad));
-        if (no_fuel && !artifact)
-.
+
-        else if (is_lite && o_ptr->sval == SV_LITE_TORCH)
-                text_out(" light, reduced when running of out fuel");
+        else
+                text_out (" light");
-        text_out(".");
-

trunk/src/xtra1.c

@@ -564 +564 @@
-{
-        int blows;
-, dex_index
+1, str_index2, dex_index1, dex_index2
-        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->stat_ind[A_STR];
+                dex_index1 = p_ptr->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->stat_use[A_STR];
+                int new_dex = p_ptr->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 */
- = (adj_str_blow[p_ptr->stat_ind[A_STR]
+2 = (adj_str_blow[str_index1
-
-        /* Maximal value */
- > 11) str_index
+2 > 11) str_index2
-
-        /* Index by dexterity */
- = MIN(adj_dex_blow[p_ptr->stat_ind[A_DEX]
+2 = MIN(adj_dex_blow[dex_index1
-
-        /* Use the blows table */
-][dex_index
+2][dex_index2
-
-        /* Require at least one blow */