1.0.65.1554

SphereII · Aug 29, 2024 · bf5f2bc · bf5f2bc
1 parent 38904f0
commit bf5f2bc
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 10 deletions.
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.0.64.2041" />
+  <Version value="1.0.65.1554" />
 </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.0.64.2041")]
-[assembly: AssemblyFileVersion("1.0.64.2041")]
+[assembly: AssemblyVersion("1.0.65.1554")]
+[assembly: AssemblyFileVersion("1.0.65.1554")]
diff --git a/Mods/0-SCore/ReadMe.md b/Mods/0-SCore/ReadMe.md
@@ -23,6 +23,15 @@ Direct Download to the 0-SCore.zip available on gitlab mirror:
 ### Change Logs
 
 [ Change Log ]
+Version: 1.0.65.1554
+
+	[ No Changes to SCore, only Better Life ]
+
+	[ SphereII A Better Life ]
+		- 1.0.19.1554
+		- Fixed an issue where errors would occur without NPC Core installed, due to factions.
+
+
 Version: 1.0.64.2041
 		[ SCore Options ]
 			- Added toggle for WeaponSway

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/SphereII A Better Life/Config/entityclasses.xml b/Mods/SphereII A Better Life/Config/entityclasses.xml
@@ -84,7 +84,14 @@
 
 		<entity_class name="AggressiveFish"   extends="PassiveFish">
 			<property name="IsEnemyEntity" value="true"/> <!-- Set this if you want this entity to be spawned when user chooses 'enemy entities off' -->
-			<property name="Faction" value="aggressiveanimalssmall"/>
+			<conditional>
+				<if cond="mod_loaded('0-XNPCCore')">
+					<property name="Faction" value="aggressiveanimalssmall"/>
+				</if>
+				<else>
+					<property name="Faction" value="animals"/>
+				</else>
+			</conditional>
 			<property name="Tags" value="entity,animal,notrample"/>
 			<property name="AIGroupCircle" value="0"/>
 			<property name="AITask-1" value="ApproachAndAttackTarget" data="class=EntityPlayer,100"/>
@@ -149,7 +156,14 @@
 			<drop event="Harvest" name="foodRawMeat" count="0" tool_category="Butcher"/>
 			<drop event="Harvest" name="foodRawMeat" tag="butcherHarvest" count="1"/>
 			<property name="Tags" value="entity,animal,notrample"/>
-			<property name="Faction" value="aggressiveanimalssmall"/>
+			<conditional>
+				<if cond="mod_loaded('0-XNPCCore')">
+					<property name="Faction" value="aggressiveanimalssmall"/>
+				</if>
+				<else>
+					<property name="Faction" value="animals"/>
+				</else>
+			</conditional>
 		</entity_class>
 		<entity_class name="fishPerch" extends="PassiveFish" >
 			<property name="Class" value="EntitySwimingSDX, SCore" />
@@ -166,7 +180,14 @@
 			<drop event="Harvest" name="foodRawMeat" count="0" tool_category="Butcher"/>
 			<drop event="Harvest" name="foodRawMeat" tag="butcherHarvest" count="1"/>
 			<property name="Tags" value="entity,animal,notrample"/>
-			<property name="Faction" value="aggressiveanimalssmall"/>
+			<conditional>
+				<if cond="mod_loaded('0-XNPCCore')">
+					<property name="Faction" value="aggressiveanimalssmall"/>
+				</if>
+				<else>
+					<property name="Faction" value="animals"/>
+				</else>
+			</conditional>
 		</entity_class>		
 		<entity_class name="fishBabyShark" extends="AggressiveFish" >
 			<property name="Class" value="EntitySwimingSDX, SCore" />
@@ -175,7 +196,14 @@
 			<drop event="Harvest" name="foodRawMeat" count="0" tool_category="Butcher"/>
 			<drop event="Harvest" name="foodRawMeat" tag="butcherHarvest" count="1"/>
 			<property name="Tags" value="entity,animal,notrample"/>
-			<property name="Faction" value="aggressiveanimalssmall"/>
+			<conditional>
+				<if cond="mod_loaded('0-XNPCCore')">
+					<property name="Faction" value="aggressiveanimalssmall"/>
+				</if>
+				<else>
+					<property name="Faction" value="animals"/>
+				</else>
+			</conditional>
 		</entity_class>	
 
 

diff --git a/Mods/SphereII A Better Life/ModInfo.xml b/Mods/SphereII A Better Life/ModInfo.xml
@@ -5,5 +5,5 @@
     <Description value="SphereII A Better Life, adding fish and birds to the game."/>
     <DisplayName value="A Better Life"/>
     <Website value=""/>
-    <Version value="1.0.0.732"/>
+    <Version value="1.0.19.1554"/>
 </xml>
diff --git a/Mods/SphereII A Better Life/Properties/versionTemplate.cs b/Mods/SphereII A Better Life/Properties/versionTemplate.cs
@@ -5,5 +5,5 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("1.0.0.732")]
-[assembly: AssemblyFileVersion("1.0.0.732")]
+[assembly: AssemblyVersion("1.0.19.1554")]
+[assembly: AssemblyFileVersion("1.0.19.1554")]