1.1.28.1028

SphereII · Oct 28, 2024 · 59e6ce3 · 59e6ce3
1 parent 5a67110
commit 59e6ce3
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 5 deletions.
diff --git a/Mods/0-SCore/Config/items.xml b/Mods/0-SCore/Config/items.xml
@@ -1,4 +1,4 @@
-<configs>
+ <configs>
   <append xpath="/items">
     <item name="BanditFactionSchematic">
       <property name="Extends" value="schematicMaster" />

diff --git a/Mods/0-SCore/Features/Farming/Scripts/Blocks/BlockPlantGrowingSDX.cs b/Mods/0-SCore/Features/Farming/Scripts/Blocks/BlockPlantGrowingSDX.cs
@@ -12,6 +12,18 @@ public class BlockPlantGrowingSDX : BlockPlantGrowing
     private int waterRange = 5;
     private bool willWilt = false;
 
+
+    public int GetWaterRange() {
+        return waterRange;
+    }
+
+    public bool RequireWater() {
+        return requireWater;
+    }
+
+    public bool WillWilt() {
+        return willWilt;
+    }
     protected BlockValue wiltedPlant = BlockValue.Air;
     public override void LateInit()
     {

diff --git a/Mods/0-SCore/Features/Farming/Scripts/Blocks/Water Blocks/BlockWaterSourceSDX.cs b/Mods/0-SCore/Features/Farming/Scripts/Blocks/Water Blocks/BlockWaterSourceSDX.cs
@@ -5,7 +5,7 @@ public class BlockWaterSourceSDX : BlockBaseWaterSystem
     private float WaterRange = 5f;
     private string waterType = "Limited";
     private static readonly int IsSprinklerOn = Animator.StringToHash("isSprinklerOn");
-
+    private bool _muteSprinklerSound = false;
     public override void LateInit()
     {
         base.LateInit();
@@ -14,6 +14,9 @@ public override void LateInit()
 
         if (Properties.Values.ContainsKey("WaterType"))
             waterType = Properties.Values["WaterType"];
+
+        if (this.Properties.Values.ContainsKey("MuteSound"))
+            _muteSprinklerSound = StringParsers.ParseBool(this.Properties.Values["MuteSound"]);
     }
 
     public bool IsWaterSourceUnlimited() {
@@ -104,6 +107,8 @@ public void ToggleSprinkler(Vector3i _blockPos, bool enabled = true) {
             animator.SetBool(IsSprinklerOn, false);
             StopSprinklerSound(_blockPos);
         }
+        if ( _muteSprinklerSound)
+            StopSprinklerSound(_blockPos);
     }
 
     private bool IsConnectedToWaterPipe(Vector3i _blockPos)

diff --git a/Mods/0-SCore/ModInfo.xml b/Mods/0-SCore/ModInfo.xml
@@ -5,5 +5,5 @@
   <Description value="SCore Mod" />
   <DisplayName value="0-SCore" />
   <Website value="" />
-  <Version value="1.1.22.1530" />
+  <Version value="1.1.28.1028" />
 </xml>
diff --git a/Mods/0-SCore/Properties/AssemblyInfo.cs b/Mods/0-SCore/Properties/AssemblyInfo.cs
@@ -38,5 +38,5 @@
 // [assembly: AssemblyVersion("1.0.*")]
 //[assembly: AssemblyVersion("20.0.*")]
 
-[assembly: AssemblyVersion("1.1.22.1530")]
-[assembly: AssemblyFileVersion("1.1.22.1530")]
+[assembly: AssemblyVersion("1.1.28.1028")]
+[assembly: AssemblyFileVersion("1.1.28.1028")]
diff --git a/Mods/0-SCore/ReadMe.md b/Mods/0-SCore/ReadMe.md
@@ -20,6 +20,15 @@ Direct Download to the 0-SCore.zip available on gitlab mirror: https://github.co
 ### Change Logs
 
 [ Change Log ]
+Version: 1.1.28.1028
+	[ Farming ]
+		- Added "MuteSound" to the BlockWaterSourceSDX to turn off sprinkler sound.
+			<property name="MuteSound" value="true" />
+		- Default is false, the sound is not muted.
+
+		- Added GetWaterRange(), RequireWater(), and WillWilt() public methods as part of the BlockPlantGrowingSDX
+			- No functionality change, just makes it easier for others to read values through code.
+
 Version: 1.1.22.1530
 	[ Challenges ]
 		- Added a description_override attribute to completely over-ride the Localization key to the following Challenges:

diff --git a/Mods/0-SCore/SCore.dll b/Mods/0-SCore/SCore.dll
diff --git a/Mods/0-SCore/SCore.pdb b/Mods/0-SCore/SCore.pdb
diff --git a/Mods/Blooms Family Farming/Config/blocks.xml b/Mods/Blooms Family Farming/Config/blocks.xml
@@ -68,6 +68,33 @@
 			<property name="DescriptionKey" value="torchGroupDesc"/>
 			<property name="FilterTags" value="fdecor,felectrical"/>
 			<property name="SortOrder1" value="70a0"/>
+
+			<property name="WaterRange" value="5" />
+			<property name="MuteSound" value="true" />
+		</block>
+
+		<block name="gupSprinklerBlockLarge">
+			<property name="Material" value="Mmetal"/>
+			<property name="Class" value="WaterSourceSDX, SCore" />
+
+			<property name="IsTerrainDecoration" value="true"/>
+			<property name="Shape" value="ModelEntity"/>
+			<property name="Model" value="#@modfolder:Resources/gupSprinklerBlock.unity3d?gupLargeSprinkler.prefab"/>
+			<property name="Place" value="TowardsPlacerInverted"/>
+			<property name="OnlySimpleRotations" value="true"/>
+			<property name="MultiBlockDim" value="1,7,1" />
+			<property name="Collide" value="movement,melee,bullet,arrow,rocket"/>
+			<property name="CustomIcon" value="VMRotateSign" />
+			<property name="Stabilitysupport" value="true"/>
+			<property name="CreativeMode" value="Player"/>
+			<property name="Stacknumber" value="10"/>
+			<property name="Group" value="Basics,Building"/>
+			<property name="DescriptionKey" value="torchGroupDesc"/>
+			<property name="FilterTags" value="fdecor,felectrical"/>
+			<property name="SortOrder1" value="70a0"/>
+
+			<property name="WaterRange" value="25" />
+			<property name="MuteSound" value="true" />
 		</block>
 	</append>
 </configs>