| summaryrefslogtreecommitdiff | 
diff options
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/struct/inventory/shr_armor.erl.m4 | 2 | ||||
| -rw-r--r-- | src/shared/struct/shr_omnimods.erl | 29 | 
2 files changed, 29 insertions, 2 deletions
| diff --git a/src/shared/struct/inventory/shr_armor.erl.m4 b/src/shared/struct/inventory/shr_armor.erl.m4 index 0594577..bdcd249 100644 --- a/src/shared/struct/inventory/shr_armor.erl.m4 +++ b/src/shared/struct/inventory/shr_armor.erl.m4 @@ -61,7 +61,7 @@ get_omnimods (Ar) -> Ar#armor.omnimods.  -spec from_id (id()) -> type().  m4_include(__MAKEFILE_DATA_DIR/armor/global.m4.conf)m4_dnl -m4_include(__MAKEFILE_DATA_DIR/armor/basic.m4d)m4_dnl +m4_include(__MAKEFILE_DATA_DIR/armor/20_20_20.m4d)m4_dnl  from_id(_) ->     default(). diff --git a/src/shared/struct/shr_omnimods.erl b/src/shared/struct/shr_omnimods.erl index ae8ba44..f452e34 100644 --- a/src/shared/struct/shr_omnimods.erl +++ b/src/shared/struct/shr_omnimods.erl @@ -80,7 +80,8 @@  -export  (     [ -      encode/1 +      encode/1, +      export/1     ]  ). @@ -114,6 +115,22 @@ encode_mods (Mods) ->        dict:to_list(Mods)     ). +-spec mod_list_to_string_list (mods()) -> list(). +mod_list_to_string_list (Mods) -> +   ( +      "__MOD_LIST(" +      ++ +      lists:map +      ( +         fun ({Name, Value}) -> +            io_lib:format("__MOD_~p(~p),", [Name, Value]) +         end, +         Mods +      ) +      ++ +      ")" +   ). +  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  %% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -351,3 +368,13 @@ encode (Omnimods) ->           {<<"defm">>, encode_mods(Omnimods#omnimods.defmods)}        ]     }. + +-spec export (type()) -> list(). +export (Omnimods) -> +   ( +      mod_list_to_string_list(dict:to_list(Omnimods#omnimods.attmods)) +      ++ "\n" +      ++ mod_list_to_string_list(dict:to_list(Omnimods#omnimods.atkmods)) +      ++ "\n" +      ++ mod_list_to_string_list(dict:to_list(Omnimods#omnimods.defmods)) +   ). | 


