v0.88

note: create stations disabled note: all banking clan objects destroyed bug fixes
archenovalis · Jan 3, 2025 · 29f6ba6 · 29f6ba6
1 parent 1a8a47d
commit 29f6ba6
Show file tree

Hide file tree

Showing 10 changed files with 446 additions and 401 deletions.
diff --git a/...ic_Bank/assets/structures/connectionmodules/macros/struct_vault_imp_foodrations_macro.xml b/...ic_Bank/assets/structures/connectionmodules/macros/struct_vault_imp_foodrations_macro.xml
@@ -3,10 +3,11 @@
   <macro name="struct_vault_imp_foodrations_macro" class="connectionmodule">
     <component ref="prod_ter_mre" />
     <properties>
-      <identification name="'Vault Connection'" shortname="'Vault Connection'" makerrace="bankingclan" description="'Vault Connection'" />
+      <identification name="'Vault Tower Connection'" shortname="'Vault Tower Connection'" description="'Vault Tower Connection'" />
       <build>
         <sets>
-          <set ref="vault" />
+          <set ref="mainvault" />
+          <set ref="branchvault" />
         </sets>
       </build>
       <explosiondamage value="1000" shield="5000" />

diff --git a/Galactic_Bank/assets/structures/storage/macros/storage_vault_large_macro.xml b/Galactic_Bank/assets/structures/storage/macros/storage_vault_large_macro.xml
@@ -3,11 +3,12 @@
   <macro name="storage_vault_large_macro" class="storage">
     <component ref="storage_par_l_solid_01" />
     <properties>
-      <identification name="{20777,1013} {20777, 1004}" shortname="{20777,1013} {20777, 1004}" makerrace="bankingclan" size="large" description="{20777,1015}" />
+      <identification name="{20777,1013} {20777, 1004}" shortname="{20777,1013} {20777, 1004}" size="large" description="{20777,1015}" />
       <cargo max="29000" tags="container" />
       <build>
         <sets>
-          <set ref="vault" />
+          <set ref="mainvault" />
+          <set ref="branchvault" />
         </sets>
       </build>
       <explosiondamage value="0" shield="0" />

diff --git a/Galactic_Bank/assets/structures/storage/macros/storage_vault_small_macro.xml b/Galactic_Bank/assets/structures/storage/macros/storage_vault_small_macro.xml
@@ -3,11 +3,12 @@
   <macro name="storage_vault_small_macro" class="storage">
     <component ref="storage_par_s_solid_01" />
     <properties>
-      <identification name="{20777,1014} {20777, 1004}" shortname="{20777,1014} {20777, 1004}" makerrace="bankingclan" size="small" description="{20777,1016}" />
+      <identification name="{20777,1014} {20777, 1004}" shortname="{20777,1014} {20777, 1004}" size="small" description="{20777,1016}" />
       <cargo max="7250" tags="container" />
       <build>
         <sets>
-          <set ref="vault" />
+          <set ref="mainvault" />
+          <set ref="branchvault" />
         </sets>
       </build>
       <explosiondamage value="0" shield="0" />

diff --git a/Galactic_Bank/content.xml b/Galactic_Bank/content.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <content id="intergalactic_bank"
 	name="InterGalactic Bank" description="Invest with the InterGalactic Banking Clan"
-	version="87"
-	date="2025-1-2"
+	version="88"
+	date="2025-1-3"
 	save="0" enabled="1"
 	author="Archie">
 

diff --git a/Galactic_Bank/extensions/starwarsmod_m1/md/sw_reactivemain.xml b/Galactic_Bank/extensions/starwarsmod_m1/md/sw_reactivemain.xml
diff --git a/Galactic_Bank/libraries/modulesets.xml b/Galactic_Bank/libraries/modulesets.xml
@@ -4,7 +4,7 @@
 <diff xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:noNamespaceSchemaLocation="../../xsd/diff.xsd">
   <add sel="/modulesets">
-    <set id="mainvault" name="'{20777,2003} {20777,2004}'" type="factory" macro="station_arg_tradestation_base_01" player="true" constructionvesselrequired="true" />
-    <set id="branchvault" name="'{20777,2006} {20777,2004}'" type="factory" macro="station_arg_tradestation_base_01" player="true" constructionvesselrequired="true" />
+    <set id="mainvault" name="'{20777,2003} {20777,2004}'" type="factory" macro="station_arg_tradestation_base_01_macro" player="true" constructionvesselrequired="true" />
+    <set id="branchvault" name="'{20777,2006} {20777,2004}'" type="factory" macro="station_arg_tradestation_base_01_macro" player="true" constructionvesselrequired="true" />
   </add>
 </diff>
diff --git a/Galactic_Bank/libraries/wares.xml b/Galactic_Bank/libraries/wares.xml
@@ -20,8 +20,8 @@
       <price min="1" average="1" max="1" />
       <icon active="ware_swi_credit" />
     </ware>
-    
-    <ware id="vault_large" name="{20777,1013} {20777, 1004}" description="{20777,1013} {20777, 1004}" transport="container" volume="1" tags="module">
+
+    <ware id="module_storage_vault_large" name="{20777,1013} {20777, 1004}" description="{20777,1013} {20777, 1004}" transport="container" volume="1" tags="module">
       <price min="625503" average="735886" max="846269" />
       <production time="582" amount="1" method="default" name="{20206,101}">
         <primary>
@@ -30,11 +30,11 @@
           <ware ware="hullparts" amount="700" />
         </primary>
       </production>
-      <component ref="vault_large_macro" amount="1" />
+      <component ref="storage_vault_large_macro" amount="1" />
       <restriction licence="station_gen_advanced" />
       <owner faction="bankingclan" />
     </ware>
-    <ware id="vault_small" name="{20777,1014} {20777, 1004}" description="{20777,1014} {20777, 1004}" transport="container" volume="1" tags="module">
+    <ware id="module_storage_vault_small" name="{20777,1014} {20777, 1004}" description="{20777,1014} {20777, 1004}" transport="container" volume="1" tags="module">
       <price min="225475" average="264088" max="302701" />
       <production time="414" amount="1" method="default" name="{20206,101}">
         <primary>
@@ -43,7 +43,20 @@
           <ware ware="hullparts" amount="248" />
         </primary>
       </production>
-      <component ref="vault_small_macro" amount="1" />
+      <component ref="storage_vault_small_macro" amount="1" />
+      <restriction licence="station_gen_intermediate" />
+      <owner faction="bankingclan" />
+    </ware>
+    <ware id="module_struct_vault_imp_foodrations" name="'Vault Tower Connection'" description="'Vault Tower Connection'" transport="container" volume="1" tags="module">
+      <price min="54125" average="63676" max="73227" />
+      <production time="38" amount="1" method="default" name="{20206,101}">
+        <primary>
+          <ware ware="claytronics" amount="10" />
+          <ware ware="energycells" amount="20" />
+          <ware ware="hullparts" amount="36" />
+        </primary>
+      </production>
+      <component ref="struct_vault_imp_foodrations_macro" amount="1" />
       <restriction licence="station_gen_intermediate" />
       <owner faction="bankingclan" />
     </ware>

diff --git a/Galactic_Bank/md/factionlogic_stations.xml b/Galactic_Bank/md/factionlogic_stations.xml
@@ -34,7 +34,7 @@
         <set_value name="$factionlist"
           exact="[faction.galempire, faction.ascendancy, faction.newrepublic, faction.commerceguild, faction.corporate, faction.huttcartel, faction.anoat, faction.mandodw]" />
         <do_all exact="$stations.count" counter="$i">
-          <remove_from_list name="$factionlist" exact="stations.{$i}.sector.owner" />
+          <remove_from_list name="$factionlist" exact="$stations.{$i}.sector.owner" />
         </do_all>
         <do_if value="$factionlist.count gt 0">
           <set_value name="$set" exact="'branchvault'" />
@@ -97,7 +97,7 @@
           space="player.galaxy" />
       </do_else>
 
-      <do_if value="not $set == null">
+      <do_if value="not ($set == null)">
         <get_module_set_macro set="$set" result="$ModuleSetMacro" />
         <do_if value="$ModuleSetMacro">
           <get_construction_plan result="$ConstructionPlan"