- Removed MOBprograms, fixed trg/index a few typos and some bleeding, added ALL_PERMISSIONS, --Rumble

src/constants.c

@@ -10,7 +10,6 @@
 
 #include "conf.h"
 #include "sysdep.h"
-
 #include "structs.h"
 #include "interpreter.h"	/* alias_data */
 
@@ -24,11 +23,8 @@ cpp_extern const char *ascii_pfiles_version =
 	"ASCII Player Files 3.0.1";
 
 /* strings corresponding to ordinals/bitvectors in structs.h */
-
-
 /* (Note: strings for class definitions in class.c instead of here) */
 
-
 /* cardinal directions */
 const char *dirs[] =
 {
@@ -41,7 +37,6 @@ const char *dirs[] =
   "\n"
 };
 
-
 /* ROOM_x */
 const char *room_bits[] = {
   "DARK",
@@ -63,7 +58,6 @@ const char *room_bits[] = {
   "\n"
 };
 
-
 /* EX_x */
 const char *exit_bits[] = {
   "DOOR",
@@ -73,7 +67,6 @@ const char *exit_bits[] = {
   "\n"
 };
 
-
 /* SECT_ */
 const char *sector_types[] = {
   "Inside",
@@ -89,7 +82,6 @@ const char *sector_types[] = {
   "\n"
 };
 
-
 /*
  * SEX_x
  * Not used in sprinttype() so no \n.
@@ -102,7 +94,6 @@ const char *genders[] =
   "\n"
 };
 
-
 /* POS_x */
 const char *position_types[] = {
   "Dead",
@@ -117,7 +108,6 @@ const char *position_types[] = {
   "\n"
 };
 
-
 /* PLR_x */
 const char *player_bits[] = {
   "KILLER",
@@ -145,7 +135,6 @@ const char *player_bits[] = {
   "\n"
 };
 
-
 /* MOB_x */
 const char *action_bits[] = {
   "SPEC",
@@ -170,7 +159,6 @@ const char *action_bits[] = {
   "\n"
 };
 
-
 /* PRF_x */
 const char *preference_bits[] = {
   "BRIEF",
@@ -207,7 +195,6 @@ const char *preference_bits[] = {
   "\n"
 };
 
-
 /* AFF_x */
 const char *affected_bits[] =
 {
@@ -236,7 +223,6 @@ const char *affected_bits[] =
   "\n"
 };
 
-
 /* CON_x */
 const char *connected_types[] = {
   "Playing",
@@ -295,7 +281,6 @@ const char *wear_where[] = {
   "<held>               "
 };
 
-
 /* WEAR_x - for stat */
 const char *equipment_types[] = {
   "Used as light",
@@ -319,7 +304,6 @@ const char *equipment_types[] = {
   "\n"
 };
 
-
 /* ITEM_x (ordinal object types) */
 const char *item_types[] = {
   "UNDEFINED",
@@ -349,7 +333,6 @@ const char *item_types[] = {
   "\n"
 };
 
-
 /* ITEM_WEAR_ (wear bitvector) */
 const char *wear_bits[] = {
   "TAKE",
@@ -370,7 +353,6 @@ const char *wear_bits[] = {
   "\n"
 };
 
-
 /* ITEM_x (extra bits) */
 const char *extra_bits[] = {
   "GLOW",
@@ -393,7 +375,6 @@ const char *extra_bits[] = {
   "\n"
 };
 
-
 /* APPLY_x */
 const char *apply_types[] = {
   "NONE",
@@ -424,7 +405,6 @@ const char *apply_types[] = {
   "\n"
 };
 
-
 /* CONT_x */
 const char *container_bits[] = {
   "CLOSEABLE",
@@ -434,7 +414,6 @@ const char *container_bits[] = {
   "\n",
 };
 
-
 /* LIQ_x */
 const char *drinks[] =
 {
@@ -457,10 +436,7 @@ const char *drinks[] =
   "\n"
 };
 
-
 /* other constants for liquids ******************************************/
-
-
 /* one-word alias for each drink */
 const char *drinknames[] =
 {
@@ -483,7 +459,6 @@ const char *drinknames[] =
   "\n"
 };
 
-
 /* effect of drinks on hunger, thirst, and drunkenness -- see values.doc */
 int drink_aff[][3] = {
   {0, 1, 10},
@@ -504,7 +479,6 @@ int drink_aff[][3] = {
   {0, 0, 13}
 };
 
-
 /* color of the various drinks */
 const char *color_liquid[] =
 {
@@ -527,7 +501,6 @@ const char *color_liquid[] =
   "\n"
 };
 
-
 /*
  * level of fullness for drink containers
  * Not used in sprinttype() so no \n.
@@ -540,10 +513,7 @@ const char *fullness[] =
   ""
 };
 
-
 /* str, int, wis, dex, con applies **************************************/
-
-
 /* [ch] strength apply (all) */
 cpp_extern const struct str_app_type str_app[] = {
   {-5, -4, 0, 0},	/* str = 0 */
@@ -579,8 +549,6 @@ cpp_extern const struct str_app_type str_app[] = {
   {3, 6, 480, 30}	/* str = 18/100 */
 };
 
-
-
 /* [dex] skill apply (thieves only) */
 cpp_extern const struct dex_skill_type dex_app_skill[] = {
   {-99, -99, -90, -99, -60},	/* dex = 0 */
@@ -611,8 +579,6 @@ cpp_extern const struct dex_skill_type dex_app_skill[] = {
   {25, 30, 15, 25, 25}		/* dex = 25 */
 };
 
-
-
 /* [dex] apply (all) */
 cpp_extern const struct dex_app_type dex_app[] = {
   {-7, -7, 6},		/* dex = 0 */
@@ -643,8 +609,6 @@ cpp_extern const struct dex_app_type dex_app[] = {
   {5, 5, -6}		/* dex = 25 */
 };
 
-
-
 /* [con] apply (all) */
 cpp_extern const struct con_app_type con_app[] = {
   {-4, 20},		/* con = 0 */
@@ -675,8 +639,6 @@ cpp_extern const struct con_app_type con_app[] = {
   {6, 99}		/* con = 25 */
 };
 
-
-
 /* [int] apply (all) */
 cpp_extern const struct int_app_type int_app[] = {
   {3},		/* int = 0 */
@@ -707,7 +669,6 @@ cpp_extern const struct int_app_type int_app[] = {
   {60}		/* int = 25 */
 };
 
-
 /* [wis] apply (all) */
 cpp_extern const struct wis_app_type wis_app[] = {
   {0},	/* wis = 0 */
@@ -738,14 +699,12 @@ cpp_extern const struct wis_app_type wis_app[] = {
   {7}  /* wis = 25 */
 };
 
-
 const char *npc_class_types[] = {
   "Normal",
   "Undead",
   "\n"
 };
 
-
 int rev_dir[] =
 {
   2,
@@ -756,7 +715,6 @@ int rev_dir[] =
   4
 };
 
-
 int movement_loss[] =
 {
   1,	/* Inside     */
@@ -782,7 +740,6 @@ const char *weekdays[] = {
   "the Day of the Sun"
 };
 
-
 /* Not used in sprinttype(). */
 const char *month_name[] = {
   "Month of Winter",		/* 0 */
@@ -829,7 +786,6 @@ const char *trig_types[] = {
   "\n"
 };
 
-
 /* obj trigger types */
 const char *otrig_types[] = {
   "Global",
@@ -855,7 +811,6 @@ const char *otrig_types[] = {
   "\n"
 };
 
-
 /* wld trigger types */
 const char *wtrig_types[] = {
   "Global",
@@ -881,27 +836,6 @@ const char *wtrig_types[] = {
   "\n"
 };
 
-#if defined(CONFIG_OASIS_MPROG)
-/*
- * Definitions necessary for MobProg support in OasisOLC
- */
-const char *mobprog_types[] = {
-  "INFILE",
-  "ACT",
-  "SPEECH",
-  "RAND",
-  "FIGHT",
-  "DEATH",
-  "HITPRCNT",
-  "ENTRY",
-  "GREET",
-  "ALL_GREET",
-  "GIVE",
-  "BRIBE",
-  "\n"
-};
-#endif
-
 /* --- End of constants arrays. --- */
 
 /*