a20 fixes

fixed many issues with old property names and made backpack working again aswell as forge with 3 inputs
z4lab · Aug 24, 2022 · 358dffa · 358dffa
1 parent 187f5fc
commit 358dffa
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 35 deletions.
diff --git a/dark-modlet/Config/XUi/windows.xml b/dark-modlet/Config/XUi/windows.xml
@@ -1,4 +1,4 @@
-<xooGHOSToox>
+<configs>
 	<append xpath="/windows">
 		<window name="BigwindowForgeInput" width="228" height="279" panel="Right"
 			controller="WorkstationMaterialInputWindow" materials_accepted="iron,brass,lead,glass,stone,clay" valid_materials_color="[green]" invalid_materials_color="[red]" cursor_area="true" >
@@ -25,4 +25,4 @@
 			</rect>
 		</window>
 	</append>
-</xooGHOSToox>
+</configs>
diff --git a/dark-modlet/Config/XUi/xui.xml b/dark-modlet/Config/XUi/xui.xml
@@ -1,8 +1,7 @@
  <configs>
- 	<xooGHOSToox>
+
 	<set xpath="/xui/ruleset[@name='default']/window_group[@name='workstation_forge']/window[@name='windowForgeInput']/@name">BigwindowForgeInput</set>
-</xooGHOSToox>
-
+
 	<!-- Wall Oven -->
 	<append xpath="/xui/ruleset">
 		<window_group name="workstation_Wall Oven" controller="XUiC_WorkstationWindowGroup">

diff --git a/dark-modlet/Config/blocks.xml b/dark-modlet/Config/blocks.xml
@@ -1,7 +1,6 @@
 <configs>
 	<!-- dont take fall damage on hay bales -->
 	<set xpath="/blocks/block[@name='hayBaleSquare']/property[@name='FallDamage']/@value">0.0</set>
-	<set xpath="/blocks/block[@name='hayBaleRound']/property[@name='FallDamage']/@value">0.0</set>
 	<!-- change movement speed on wood ladders -->
 	<append xpath="/blocks/block[@name='ladderWood']">
 		<property name="MovementFactor" value="1.4"/>
@@ -14,23 +13,25 @@
 	<append xpath="/blocks/block[@name='ladderSteel']">
 		<property name="MovementFactor" value="1.6"/>
 	</append>
-<block name="Wall Oven">
-	<property name="Class" value="Campfire"/>
-	<property name="Material" value="Mmetal"/>
-	<property name="Texture" value="346,345,341,345,262,345"/>
-	<property name="IsTerrainDecoration" value="true" />
-	<property name="ParticleName" value="campfire" />
-	<property name="ParticleOffset" value="0.7,0,0.7" />
-	<property name="Stacknumber" value="1" />
-	<property name="HeatMapStrength" value="2"/>
-	<property name="HeatMapTime" value="1200"/>
-	<property name="HeatMapFrequency" value="25"/>
-	<property name="BuffsWhenWalkedOn" value="blockBurn3Trigger"/>
-	<property name="ActiveRadiusEffects" value="+heatSource(3)"/>
-	<property class="Workstation">
-	<property name="CraftingAreaRecipes" value="campfire"/>
-	<property name="Modules" value="tools,output,fuel,input"/>
-	<property name="Collide" value="melee,bullet,arrow,rocket" />
+
+<append xpath="/blocks">
+	<block name="Wall Oven">
+		<property name="Class" value="Campfire"/>
+		<property name="Material" value="Mmetal"/>
+		<property name="Texture" value="346,345,341,345,262,345"/>
+		<property name="IsTerrainDecoration" value="true" />
+		<property name="ParticleName" value="campfire" />
+		<property name="ParticleOffset" value="0.7,0,0.7" />
+		<property name="Stacknumber" value="1" />
+		<property name="HeatMapStrength" value="2"/>
+		<property name="HeatMapTime" value="1200"/>
+		<property name="HeatMapFrequency" value="25"/>
+		<property name="BuffsWhenWalkedOn" value="blockBurn3Trigger"/>
+		<property name="ActiveRadiusEffects" value="+heatSource(3)"/>
+		<property class="Workstation">
+		<property name="CraftingAreaRecipes" value="campfire"/>
+		<property name="Modules" value="tools,output,fuel,input"/>
+		<property name="Collide" value="melee,bullet,arrow,rocket" />
 	</property>
 	<property class="RepairItems"> 
 		<property name="mechanicalParts" value="1" /> 
@@ -136,4 +137,5 @@
 	<property name="SortOrder1" value="7060"/>
 	<property name="SortOrder2" value="0051"/> <!-- SortDoors -->
 </block>
+</append>
 </configs>
diff --git a/dark-modlet/Config/entityclasses.xml b/dark-modlet/Config/entityclasses.xml
@@ -1,5 +1,5 @@
 <configs>
-	<!-- Bag mod -->
+	<!-- Backpack Mod-->
 	<set xpath="/entity_classes/entity_class[@name='playerMale']/effect_group/passive_effect[@name='CarryCapacity']/@value">60</set>
 	<set xpath="/entity_classes/entity_class[@name='playerMale']/effect_group/passive_effect[@name='BagSize']/@value">60</set>
 	<!-- Jump over 2 blocks high -->

diff --git a/dark-modlet/Config/items.xml b/dark-modlet/Config/items.xml
@@ -4,15 +4,22 @@
 	<set xpath="/items/item[@name='meleeToolRepairT1ClawHammer']/property[@class='Action1']/property[@name='Delay']/@value">0.42</set>
 	<!-- stack size changes -->
 	<set xpath="/items/item/property[@name='Stacknumber' and @value='20000']/@value">22222</set>
-	<set xpath="/items/item/property[@name='Stacknumber' and @value='6000']/@value">12345</set>
-	<set xpath="/items/item/property[@name='Stacknumber' and @value='1200']/@value">4242</set>
-	<set xpath="/items/item/property[@name='Stacknumber' and @value='1000']/@value">4242</set>
-	<set xpath="/items/item/property[@name='Stacknumber' and @value='500']/@value">4242</set>
+	<set xpath="/items/item/property[@name='Stacknumber' and @value='10000']/@value">22222</set>
+	<set xpath="/items/item/property[@name='Stacknumber' and @value='6000']/@value">12222</set>
+	<set xpath="/items/item/property[@name='Stacknumber' and @value='1200']/@value">4444</set>
+	<set xpath="/items/item/property[@name='Stacknumber' and @value='1000']/@value">2222</set>
+	<set xpath="/items/item/property[@name='Stacknumber' and @value='500']/@value">1555</set>
+	<set xpath="/items/item/property[@name='Stacknumber' and @value='300']/@value">555</set>
 	<set xpath="/items/item/property[@name='Stacknumber' and @value='250']/@value">555</set>
 	<set xpath="/items/item/property[@name='Stacknumber' and @value='150']/@value">555</set>
-	<set xpath="/items/item/property[@name='Stacknumber' and @value='100']/@value">252</set>
-	<set xpath="/items/item/property[@name='Stacknumber' and @value='40']/@value">252</set>
-	<set xpath="/items/item/property[@name='Stacknumber' and @value='15']/@value">101</set>
-	<set xpath="/items/item/property[@name='Stacknumber' and @value='10']/@value">101</set>
-	<set xpath="/items/item/property[@name='Stacknumber' and @value='5']/@value">101</set>
+	<set xpath="/items/item/property[@name='Stacknumber' and @value='125']/@value">555</set>
+	<set xpath="/items/item/property[@name='Stacknumber' and @value='100']/@value">555</set>
+	<set xpath="/items/item/property[@name='Stacknumber' and @value='75']/@value">255</set>
+	<set xpath="/items/item/property[@name='Stacknumber' and @value='50']/@value">255</set>
+	<set xpath="/items/item/property[@name='Stacknumber' and @value='40']/@value">255</set>
+	<set xpath="/items/item/property[@name='Stacknumber' and @value='25']/@value">155</set>
+	<set xpath="/items/item/property[@name='Stacknumber' and @value='20']/@value">155</set>
+	<set xpath="/items/item/property[@name='Stacknumber' and @value='15']/@value">155</set>
+	<set xpath="/items/item/property[@name='Stacknumber' and @value='10']/@value">155</set>
+	<set xpath="/items/item/property[@name='Stacknumber' and @value='5']/@value">155</set>
 </configs>
diff --git a/dark-modlet/Config/progression.xml b/dark-modlet/Config/progression.xml
@@ -1,6 +1,6 @@
 <configs>
 <!-- reduced points scaling for level requirements, default 1.14 -->
-<set xpath="/progression/attributes/@cost_multiplier_per_level">1.1</set>
+<!-- <set xpath="/progression/attributes/@cost_multiplier_per_level">1.14</set> -->
 <!-- removed Pack Mule perk -->
 	<remove xpath="/progression/perks/perk[@name='perkPackMule']" />
 	<remove xpath="/progression/perks/perk[@name='perkParkour']" />

diff --git a/dark-modlet/Config/styles.xml b/dark-modlet/Config/styles.xml
@@ -1,5 +1,5 @@
 <configs>
 	<!-- Make the icon select area a bit smaller so there's no overlap -->	
     <set xpath="/styles/style[@name='itemStack']/style_entry[@name='width']/@value">50</set>
-    <set xpath="/styles/style[@name='itemStack']/style_entry[@name='height']/@value">50</set>	
+    <set xpath="/styles/style[@name='itemStack']/style_entry[@name='height']/@value">50</set>
 </configs>