Starting to add omnimods to the server.

6 files changed, 50 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index 97a3bf9..fc0a56b 100644
--- a/Makefile
+++ b/Makefile
@@ -71,13 +71,14 @@ M4_EXEC = $(M4) $(M4_OPTS)
 ################################################################################
 ## PREPROCESSOR-VISIBLE MAKEFILE VARIABLES #####################################
 ################################################################################
-
 MAKEFILE_TO_M4 = \
 	--define=__MAKEFILE_DATA_DIR=$(DATA_DIR) \
 	--define=__MAKEFILE_BIN_DIR=$(BIN_DIR) \
 	--define=__MAKEFILE_LOG_DIR=$(LOG_DIR) \
 	--define=__MAKEFILE_WWW_DIR=$(WWW_DIR) \
-	--define=__MAKEFILE_INCLUDE_DIR=$(INCLUDE_DIR)
+	--define=__MAKEFILE_INCLUDE_DIR=$(INCLUDE_DIR) \
+	--define=__CODE_STYLE=erlang
+
 ################################################################################
 ## TARGET RULES ################################################################
 ################################################################################
diff --git a/src/battle/struct/btl_tile.erl.m4 b/src/battle/struct/btl_tile.erl.m4
index eba2c3a..12653b7 100644
--- a/src/battle/struct/btl_tile.erl.m4
+++ b/src/battle/struct/btl_tile.erl.m4
@@ -85,7 +85,6 @@ extract_border_variant_ix (B) -> lists:nth(2, B).
 
 -spec from_class_id (class_id()) -> type().
 m4_include(__MAKEFILE_DATA_DIR/tile/global.m4.conf)m4_dnl
-__TILE_CLASS_USE_PARTIAL_ERLANG_STYLE
 m4_include(__MAKEFILE_DATA_DIR/tile/error.m4d)m4_dnl
 m4_include(__MAKEFILE_DATA_DIR/tile/grassland.m4d)m4_dnl
 m4_include(__MAKEFILE_DATA_DIR/tile/mud.m4d)m4_dnl
diff --git a/src/map/struct/map_tile.erl.m4 b/src/map/struct/map_tile.erl.m4
index 5939736..278e556 100644
--- a/src/map/struct/map_tile.erl.m4
+++ b/src/map/struct/map_tile.erl.m4
@@ -88,7 +88,6 @@ extract_border_variant_ix (B) -> lists:nth(2, B).
 
 -spec from_class_id (class_id()) -> type().
 m4_include(__MAKEFILE_DATA_DIR/tile/global.m4.conf)m4_dnl
-__TILE_CLASS_USE_ERLANG_STYLE
 m4_include(__MAKEFILE_DATA_DIR/tile/error.m4d)m4_dnl
 m4_include(__MAKEFILE_DATA_DIR/tile/grassland.m4d)m4_dnl
 m4_include(__MAKEFILE_DATA_DIR/tile/mud.m4d)m4_dnl
diff --git a/src/shared/struct/shr_armor.erl.m4 b/src/shared/struct/shr_armor.erl.m4
index e72ba47..5db4b36 100644
--- a/src/shared/struct/shr_armor.erl.m4
+++ b/src/shared/struct/shr_armor.erl.m4
@@ -70,7 +70,6 @@ get_category (Ar) -> Ar#armor.category.
 
 -spec from_id (id()) -> type().
 m4_include(__MAKEFILE_DATA_DIR/armor/global.m4.conf)m4_dnl
-__ARMOR_USE_ERLANG_STYLE
 m4_include(__MAKEFILE_DATA_DIR/armor/basic.m4d)m4_dnl
 from_id(_) ->
    from_id(0).
diff --git a/src/shared/struct/shr_omnimods.erl b/src/shared/struct/shr_omnimods.erl
new file mode 100644
index 0000000..b87f2cd
--- /dev/null
+++ b/src/shared/struct/shr_omnimods.erl
@@ -0,0 +1,47 @@
+-module(shr_omnimods).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+-type entry() :: {atom(), integer()}.
+
+-record
+(
+   omnimods,
+   {
+      attmods = list(entry()),
+      stamods = list(entry()),
+      atkmods = list(entry()),
+      defmods = list(entry())
+   }
+).
+
+-opaque type() :: #omnimods{}.
+
+-export_type([type/0, entry/0]).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+-export
+(
+   [
+      new/4
+   ]
+).
+
+%%%% Accessors
+-export
+(
+   [
+   ]
+).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%
diff --git a/src/shared/struct/shr_weapon.erl.m4 b/src/shared/struct/shr_weapon.erl.m4
index 251c308..862edb6 100644
--- a/src/shared/struct/shr_weapon.erl.m4
+++ b/src/shared/struct/shr_weapon.erl.m4
@@ -131,7 +131,6 @@ can_parry (Wp) -> (Wp#weapon.range_type == melee).
 
 -spec from_id (id()) -> type().
 m4_include(__MAKEFILE_DATA_DIR/weapon/global.m4.conf)m4_dnl
-__WEAPON_USE_ERLANG_STYLE
 m4_include(__MAKEFILE_DATA_DIR/weapon/basic.m4d)m4_dnl
 from_id (_) ->
    from_id(0).