Merge pull request #32 from Baldrax/release-prep

Merge Release 0.23.0 into master
Baldrax · Aug 6, 2024 · 610b1e2 · 610b1e2
2 parents 16f9c6f + b0cee77
commit 610b1e2
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 2 deletions.
diff --git a/otls/OBJ_TaleSpire_Biome.hdanc b/otls/OBJ_TaleSpire_Biome.hdanc
diff --git a/otls/OBJ_TaleSpire_Object.hdanc b/otls/OBJ_TaleSpire_Object.hdanc
diff --git a/otls/OBJ_TaleSpire_Shared_Data.hdanc b/otls/OBJ_TaleSpire_Shared_Data.hdanc
diff --git a/otls/OBJ_TaleSpire_Terrain.hdanc b/otls/OBJ_TaleSpire_Terrain.hdanc
diff --git a/otls/SOP_TaleSpire_Copy.hdanc b/otls/SOP_TaleSpire_Copy.hdanc
diff --git a/otls/SOP_TaleSpire_Fetch_Water.hdanc b/otls/SOP_TaleSpire_Fetch_Water.hdanc
diff --git a/otls/SOP_TaleSpire_Object_Set.hdanc b/otls/SOP_TaleSpire_Object_Set.hdanc
diff --git a/otls/SOP_TaleSpire_Scatter.hdanc b/otls/SOP_TaleSpire_Scatter.hdanc
diff --git a/otls/SOP_TaleSpire_Set_Water_Level.hdanc b/otls/SOP_TaleSpire_Set_Water_Level.hdanc
diff --git a/otls/SOP_TaleSpire_Tiler.hdanc b/otls/SOP_TaleSpire_Tiler.hdanc
diff --git a/scripts/data/nodes/README.md b/scripts/data/nodes/README.md
@@ -0,0 +1,10 @@
+# Contents.net Files
+The files in this directory are the default contents of
+various sub-networks inside of the TaleSpire nodes. They are
+encrypted as ascii text for ease of storage.
+
+When in Dev Mode on various nodes there will be an option to 
+write out these networks.
+
+When a new node is placed down the contents of these files get
+decrypted and placed in the proper sub-networks.
diff --git a/scripts/python/htg/nodes/OBJ_TaleSpire_Shared_Data.py b/scripts/python/htg/nodes/OBJ_TaleSpire_Shared_Data.py
@@ -98,7 +98,9 @@ def build_ts_database(node):
                         proxy_name = asset_name.replace(' ', '_').replace('/', '_').replace('(', '_').replace(')', '_')
                         proxy_base_path = f'{htg_basedir}/geo/ts_proxies'
 
-                        if is_floor and tag_name in ('1x1', '2x2') and not asset_dict['IsDeprecated'] == 1:
+                        if (is_floor and tag_name in ('1x1', '2x2')
+                                and not asset_dict['IsDeprecated'] == 1
+                                and not "tempwater" in asset_name.lower()):
                             point.setAttribValue('is_floor', 1)
                             point.setAttribValue('proxy_path',
                                                  f'{proxy_base_path}/Standin_floor_{tag_name}.bgeo.sc')

diff --git a/scripts/python/version.py b/scripts/python/version.py
@@ -1,4 +1,4 @@
 # This is the version of the release.
 # Should be updated whenever a push is done.
 # Include branch name on daily pushes. Only upgrade Major and Minor version when Pulling into the master branch.
-version = '0.22.0'
+version = '0.23.0'