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@2138 dda7f814-ccd3-4591-a6d7-1bd23e5e64af

act.other.c

@@ -41,6 +41,7 @@
 #include "spec_abilities.h"
 #include "actions.h"
 #include "feats.h"
+#include "assign_wpn_armor.h"
 
 /* Local defined utility functions */
 /* do_group utility functions */

act.wizard.c

@@ -43,6 +43,7 @@
 #include "spec_abilities.h"
 #include "wilderness.h"
 #include "feats.h"
+#include "assign_wpn_armor.h"
 
 /* local utility functions with file scope */
 static int perform_set(struct char_data *ch, struct char_data *vict, int mode, char *val_arg);

assign_wpn_armor.h

@@ -0,0 +1,70 @@
+/*
+ * File:   assign_wpn_armor.h
+ * Author: Zusuk
+ */
+
+#ifndef ASSIGN_WPN_ARMOR_H
+#define	ASSIGN_WPN_ARMOR_H
+
+
+struct weapon_table
+{
+  char *name;
+  sbyte numDice;
+  ubyte diceSize;
+  sbyte critRange;
+  sbyte critMult;
+  ush_int weaponFlags;
+  ush_int cost;
+  ush_int damageTypes;
+  ush_int weight;
+  ubyte range;
+  ush_int weaponFamily;
+  byte size;
+  ubyte material;
+  ubyte handle_type;
+  ubyte head_type;
+  ubyte stunNumDice;
+  ubyte stunSizeDice;
+  ubyte availability;
+  ush_int ammo;
+};
+
+struct armor_table
+{
+  char *name;
+  ubyte armorType;
+  ush_int cost;
+  ubyte armorBonus;
+  ubyte dexBonus;
+  byte armorCheck;
+  ubyte spellFail;
+  ubyte thirtyFoot;
+  ubyte twentyFoot;
+  ush_int weight;
+  ubyte material;
+  ubyte availability;
+  ubyte fort_bonus;
+  int wear;
+};
+
+extern struct weapon_table weapon_list[NUM_WEAPON_TYPES];
+extern const char *weapon_type[NUM_WEAPON_TYPES];
+
+extern struct armor_table armor_list[NUM_SPEC_ARMOR_TYPES];
+extern const char *armor_type[NUM_SPEC_ARMOR_TYPES];
+
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+
+
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* ASSIGN_WPN_ARMOR_H */
+

depend

@@ -26,7 +26,8 @@ act.other.o: act.other.c conf.h sysdep.h structs.h protocol.h lists.h \
  utils.h race.h comm.h interpreter.h handler.h db.h spells.h screen.h \
  house.h constants.h dg_scripts.h act.h spec_procs.h class.h fight.h \
  mail.h shop.h quest.h modify.h clan.h mud_event.h dg_event.h craft.h \
- treasure.h mudlim.h spec_abilities.h actions.h feats.h
+ treasure.h mudlim.h spec_abilities.h actions.h feats.h \
+ assign_wpn_armor.h
 act.social.o: act.social.c conf.h sysdep.h structs.h protocol.h lists.h \
  utils.h race.h comm.h interpreter.h handler.h db.h screen.h spells.h \
  act.h
@@ -35,7 +36,8 @@ act.wizard.o: act.wizard.c conf.h sysdep.h structs.h protocol.h lists.h \
  screen.h constants.h oasis.h help.h dg_scripts.h shop.h act.h genzon.h \
  class.h genolc.h genobj.h fight.h modify.h quest.h ban.h mud_event.h \
  dg_event.h clan.h craft.h hlquest.h mudlim.h spec_abilities.h \
- wilderness.h feats.h kdtree.h mysql.h rtree/rTreeIndex.h
+ wilderness.h feats.h assign_wpn_armor.h kdtree.h mysql.h \
+ rtree/rTreeIndex.h
 actionqueues.o: actionqueues.c conf.h sysdep.h structs.h protocol.h \
  lists.h utils.h race.h db.h comm.h interpreter.h actionqueues.h \
  mud_event.h dg_event.h actions.h
@@ -48,6 +50,8 @@ aedit.o: aedit.c conf.h sysdep.h structs.h protocol.h lists.h utils.h \
 asciimap.o: asciimap.c conf.h sysdep.h structs.h protocol.h lists.h \
  utils.h race.h comm.h interpreter.h handler.h db.h spells.h house.h \
  constants.h dg_scripts.h asciimap.h wilderness.h
+assign_wpn_armor.o: assign_wpn_armor.c conf.h sysdep.h structs.h \
+ protocol.h lists.h utils.h race.h assign_wpn_armor.h
 ban.o: ban.c conf.h sysdep.h structs.h protocol.h lists.h utils.h race.h \
  comm.h interpreter.h handler.h db.h ban.h
 boards.o: boards.c conf.h sysdep.h structs.h protocol.h lists.h utils.h \
@@ -128,12 +132,13 @@ dg_wldcmd.o: dg_wldcmd.c conf.h sysdep.h structs.h protocol.h lists.h \
  constants.h genzon.h fight.h
 feats.o: feats.c conf.h sysdep.h structs.h protocol.h lists.h utils.h \
  race.h comm.h spells.h handler.h db.h constants.h interpreter.h \
- dg_scripts.h modify.h feats.h class.h mud_event.h dg_event.h
+ dg_scripts.h modify.h feats.h class.h mud_event.h dg_event.h \
+ assign_wpn_armor.h
 fight.o: fight.c conf.h sysdep.h structs.h protocol.h lists.h utils.h \
  race.h comm.h handler.h interpreter.h db.h spells.h screen.h constants.h \
  dg_scripts.h act.h class.h fight.h shop.h quest.h mud_event.h dg_event.h \
  spec_procs.h clan.h treasure.h mudlim.h spec_abilities.h feats.h \
- actions.h actionqueues.h craft.h
+ actions.h actionqueues.h craft.h assign_wpn_armor.h
 gain.o: gain.c conf.h sysdep.h structs.h protocol.h lists.h utils.h \
  race.h comm.h db.h oasis.h help.h screen.h interpreter.h modify.h \
  spells.h
@@ -245,7 +250,8 @@ objsave.o: objsave.c conf.h sysdep.h structs.h protocol.h lists.h utils.h \
 oedit.o: oedit.c conf.h sysdep.h structs.h protocol.h lists.h utils.h \
  race.h comm.h interpreter.h spells.h db.h boards.h constants.h shop.h \
  genolc.h genobj.h genzon.h oasis.h help.h improved-edit.h dg_olc.h \
- dg_scripts.h fight.h modify.h clan.h craft.h spec_abilities.h feats.h
+ dg_scripts.h fight.h modify.h clan.h craft.h spec_abilities.h feats.h \
+ assign_wpn_armor.h
 perlin.o: perlin.c perlin.h
 players.o: players.c conf.h sysdep.h structs.h protocol.h lists.h utils.h \
  race.h db.h handler.h pfdefaults.h dg_scripts.h comm.h interpreter.h \
@@ -296,7 +302,7 @@ spells.o: spells.c conf.h sysdep.h structs.h protocol.h lists.h utils.h \
  craft.h mudlim.h
 study.o: study.c conf.h sysdep.h structs.h protocol.h lists.h utils.h \
  race.h comm.h db.h oasis.h help.h screen.h interpreter.h modify.h \
- spells.h feats.h class.h constants.h
+ spells.h feats.h class.h constants.h assign_wpn_armor.h
 tedit.o: tedit.c conf.h sysdep.h structs.h protocol.h lists.h utils.h \
  race.h interpreter.h comm.h db.h genolc.h oasis.h help.h improved-edit.h \
  modify.h