adding some unimplemented feats, sorting of feats in the code, and so…

…me minor bug fixes git-svn-id: svn+ssh://50.28.74.132/home/luminari/svn/luminari/myproject/trunk@2193 dda7f814-ccd3-4591-a6d7-1bd23e5e64af
LuminariMUD · Apr 14, 2015 · 63d3a37 · 63d3a37
1 parent 60480f6
commit 63d3a37
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/act.item.c b/act.item.c
@@ -182,13 +182,31 @@ void display_item_object_values(struct char_data *ch, struct obj_data *item) {
 
       /* values defined by weapon type */
       int weapon_val = GET_OBJ_VAL(item, 0);
+      int crit_multi = 0;
+      switch (weapon_list[weapon_val].critMult) {
+        case CRIT_X2:
+          crit_multi = 2;
+          break;
+        case CRIT_X3:
+          crit_multi = 3;
+          break;
+        case CRIT_X4:
+          crit_multi = 4;
+          break;
+        case CRIT_X5:
+          crit_multi = 5;
+          break;
+        case CRIT_X6:
+          crit_multi = 6;
+          break;
+      }
       send_to_char(ch, "Values defined by weapon type:\r\n");
       sprintbit(weapon_list[weapon_val].weaponFlags, weapon_flags, buf, sizeof (buf));
       send_to_char(ch, "%s, Damage: %dD%d, Threat: %d, Crit. Multi: %d, Weapon Flags: %s\r\n",
                    weapon_list[weapon_val].name,
                    weapon_list[weapon_val].numDice,weapon_list[weapon_val].diceSize,
                    (20 - weapon_list[weapon_val].critRange),
-                   weapon_list[weapon_val].critMult, buf);
+                   crit_multi, buf);
       sprintbit(weapon_list[weapon_val].damageTypes, weapon_damage_types, buf2, sizeof (buf2));
       send_to_char(ch, "Sugg. Cost: %d, Damage-Types: %s, Sugg. Weight: %d\r\n",
                    weapon_list[weapon_val].cost, buf2, weapon_list[weapon_val].weight);

diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
@@ -123,6 +123,7 @@
       <in>improved-edit.h</in>
       <in>interpreter.c</in>
       <in>interpreter.h</in>
+      <in>item.h</in>
       <in>kdtree.c</in>
       <in>kdtree.h</in>
       <in>limits.c</in>

diff --git a/treasure.h b/treasure.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * File:   treasure.h
  * Author: Zusuk (ported from d20mud)
  *
@@ -82,7 +82,7 @@ extern const char *head_types[];
 #define PLATE_BODY            3119  //0
 #define HALFPLATE_BODY        3143
 #define SPLINT_BODY           3144
-#define BREASTPLATE_BODY      3145
+#define BREASTPLATE_BODY      3145 /*piecemail armor*/
 #define CHAIN_BODY            3146
 #define STUD_LEATHER_BODY     3147  //5
 #define LEATHER_BODY          3148
@@ -129,7 +129,7 @@ extern const char *head_types[];
 #define DAGGER                3212  //0
 #define MACE                  3213
 #define SICKLE                3214
-/* one handed */            
+/* one handed */
 #define CLUB                  3215
 #define MORNINGSTAR           3216
 /* two handed */
@@ -215,7 +215,7 @@ void award_misc_magic_item(struct char_data *ch, int grade, int moblevel);
 int random_bonus_value(int apply_value, int level, int mod);
 
 /* Procedures for loading mobs with items, rather than simply handing them out
- * automaticalyl after death.  Used with random treasure load resets. 
+ * automaticalyl after death.  Used with random treasure load resets.
  *
  * The gear loaded will be based on the mob data passed in, and the level of the
  * items should not surpass the level of the mob.