Changeset 402

Timestamp:

07/28/07 17:56:48 (1 year ago)

Author:

takkaria

Message:

On object inspection screen: (#214)

• Show breakage chance for arrows
  
• Write "you are too weak to use this weapon effectively!" when it is so
  
• Fix damage calculations
  

Files:

• trunk/src/attack.c (modified) (1 diff)
• trunk/src/externs.h (modified) (1 diff)
• trunk/src/obj-info.c (modified) (6 diffs)
• trunk/src/xtra1.c (modified) (1 diff)

trunk/src/attack.c

@@ -24 +24 @@
- * Note that artifacts never break, see the "drop_near()" function.
- */
-static 
+
-{
-        /* Examine the item type */

trunk/src/externs.h

@@ -262 +262 @@
-
-/* attack.c */
+extern int breakage_chance(const object_type *o_ptr);
-extern void py_attack(int y, int x);
-extern void do_cmd_fire(void);

trunk/src/obj-info.c

@@ -189 +189 @@
-        cptr desc[15];
-        int mult[15];
-
+, xtra_dam
-        object_type *j_ptr = &inventory[INVEN_BOW];
-
@@ -199 +199 @@
-        if (!weapon && !ammo) return FALSE;
-
+
+
-        if (weapon)
-        {
@@ -204 +206 @@
-
-                dam = (o_ptr->ds * o_ptr->dd * 5);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-            p_text_out("Using this weapon, in your current condition, you are able to score ");
-            text_out_c(TERM_L_GREEN, format("%d ", blows));
@@ -219 +231 @@
-
-                /* Calculate damage */
+                xtra_dam = 0;
-                dam = (o_ptr->ds * o_ptr->dd * 5);
-                if (object_known_p(o_ptr)) dam += (o_ptr->to_d * 10);
@@ -237 +250 @@
-                for (i = 0; i < cnt; i++)
-                {
-dam * mult[i]
+(dam * mult[i]) + xtra_dam
-                        text_out(" against %s, ", desc[i]);
-                }
@@ -250 +263 @@
-
-        text_out(" against normal creatures.  ");
+
+        /* Add breakage chance */
+        if (ammo)
+        {
+                text_out("It has a ");
+                text_out_c(TERM_L_GREEN, "%d%%", breakage_chance(o_ptr));
+                text_out(" chance of breaking upon contact.");
+        }
-
-        /* You always have something to say... */

trunk/src/xtra1.c

@@ -2377 +2377 @@
-        {
-                /* Calculate number of blows */
-;
+
-
-                /* Boost digging skill by weapon weight */