1.0.88.1027

Mods/0-SCore/Config/Localization.txt

@@ -207,4 +207,5 @@ hireNPCsMaleWithItem,"Hire a male NPC with some brass in your hand"
 hireNPCsMaleWithmaterial,"Hire a male NPC with a wood material in your hand."
 onHarvest,"Harvest"
 NPC_title,"Hire NPCs"
-SCore03challenges_key,"Harvests"
+SCore03challenges_key,"Harvests"
+challengeKillZombiesWithItemDesc,"Kill Zombies"

Mods/0-SCore/Features/Challenges/Scripts/ChallengeObjectiveHarvest.cs

@@ -12,7 +12,7 @@ namespace Challenges {
      <objective type="Harvest, SCore" count="20" item="resourceWood" />
      <objective type="Harvest, SCore" count="20" item="resourceWood" biome="burnt_forest" />
      <objective type="Harvest, SCore" count="20" item="resourceWood" item="meleeItem" />
-     <objective type="Harvest, SCore" count="20" item="resourceWood" item_tags="meleetag" />
+     <objective type="Harvest, SCore" count="20" item_tags="woodtag" />
      <objective type="Harvest, SCore" count="20" block_tags="blocktag" />
      */
     public class ChallengeObjectiveHarvest : ChallengeObjectiveSCoreBase {
@@ -49,6 +49,12 @@ private void Current_HarvestItem(ItemValue held, ItemStack stack, BlockValue bv)
                 if (!result) return;
             }
 
+            if (!string.IsNullOrEmpty(itemTag))
+            {
+                var tag = FastTags<TagGroup.Global>.Parse(itemTag);
+                if (!stack.itemValue.ItemClass.HasAnyTags(tag)) return;
+            }
+
             if (!CheckBiome()) return;
             if (!CheckBlocks(bv)) return;
 

Mods/0-SCore/Features/Challenges/Scripts/ChallengeObjectiveKillWithItem.cs

@@ -39,6 +39,7 @@ public class ChallengeObjectiveKillWithItem : ChallengeObjectiveKillByTag {
         public string ItemTag;
         public bool StealthCheck = false;
         public string LocalizationKey = "";
+        public bool GenerateDescription;
 
         public override void Init() {
             if ( string.IsNullOrEmpty(entityTag))
@@ -51,11 +52,7 @@ public override void Init() {
 
         public override string DescriptionText {
             get {
-                if (!string.IsNullOrEmpty(LocalizationKey))
-                    return Localization.Get(LocalizationKey);
-
-                var objectiveDesc = Localization.Get(LocalizationKey);
-                objectiveDesc = objectiveDesc.Replace("[]", MaxCount.ToString());
+                var objectiveDesc = Localization.Get("challengeKillZombiesWithItemDesc");
                 var with = Localization.Get("challengeObjectiveWith");
 
                 if (!string.IsNullOrEmpty(ItemClass))
@@ -71,12 +68,12 @@ public override string DescriptionText {
                         counter++;
                     }
 
-                    return $"{objectiveDesc} {itemDisplay}";
+                    return $"{objectiveDesc} {itemDisplay} :";
                 }
 
-                if (string.IsNullOrEmpty(ItemTag)) return $"{objectiveDesc}";
+                if (string.IsNullOrEmpty(ItemTag)) return $"{objectiveDesc} :";
                 var itemWithTags = Localization.Get("itemWithTags");
-                return $"{objectiveDesc} {with} {itemWithTags} {ItemTag}";
+                return $"{objectiveDesc} {with} {itemWithTags} {ItemTag} :";
 
             }
         }
@@ -130,10 +127,21 @@ public override void ParseElement(XElement e) {
             }
 
             if (e.HasAttribute("description_key"))
-                LocalizationKey =e.GetAttribute("description_key");
-
+                 LocalizationKey =e.GetAttribute("description_key");
+
+            if (e.HasAttribute("generate_description"))
+            {
+                var temp = e.GetAttribute("generate_description");
+                StringParsers.TryParseBool(temp, out GenerateDescription);
+
+            }
+
+            if (e.HasAttribute("target_name_key"))
+                targetName = Localization.Get(e.GetAttribute("target_name_key"));
+
         }
 
+
         public override BaseChallengeObjective Clone() {
             return new ChallengeObjectiveKillWithItem {
                 entityTag = entityTag,

Mods/0-SCore/ModInfo.xml

@@ -5,5 +5,5 @@
   <Description value="SCore Mod" />
   <DisplayName value="0-SCore" />
   <Website value="" />
-  <Version value="1.0.86.1506" />
+  <Version value="1.0.88.1027" />
 </xml>

Mods/0-SCore/Properties/AssemblyInfo.cs

@@ -38,5 +38,5 @@
 // [assembly: AssemblyVersion("1.0.*")]
 //[assembly: AssemblyVersion("20.0.*")]
 
-[assembly: AssemblyVersion("1.0.86.1506")]
-[assembly: AssemblyFileVersion("1.0.86.1506")]
+[assembly: AssemblyVersion("1.0.88.1027")]
+[assembly: AssemblyFileVersion("1.0.88.1027")]

Mods/0-SCore/ReadMe.md

@@ -20,6 +20,20 @@ Direct Download to the 0-SCore.zip available on gitlab mirror: https://github.co
 ### Change Logs
 
 [ Change Log ]
+Version: 1.0.88.1027
+	[ Challenges ]
+		- Added target_name_key parsing to KillWithItem.
+		- Added Localization key for KillWith Item
+			challengeKillZombiesWithItemDesc
+
+		- Added Item_tags to be validated, on the Harvest Objective.
+			- If item="" and item_tags="" are both defined, they both need to pass 
+			
+	[ NPCs ]
+		- merged 2 fixes from  khzmusik 
+			- Fixed a see cache issue
+			- Fixed a faction tracking issue
+
 Version: 1.0.86.1506
 	[ Challenges ]
 		- Another patch to fix challenges being corrupted

Mods/0-SCore/Scripts/Entities/EntityAliveSDX.cs

@@ -18,6 +18,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Runtime.Remoting.Messaging;
 using UAI;
 using UnityEngine;
 using UnityEngine.Serialization;
@@ -39,7 +40,7 @@ public class EntityAliveSDX : EntityTrader, IEntityOrderReceiverSDX {
 
     private string rightHandTransformName;
 
-    private bool canCollideWithLeader = true;
+    public bool canCollideWithLeader = true;
     private float enemyDistanceToTalk = 10f;
 
     /// <inheritdoc/>
@@ -590,6 +591,7 @@ public override bool CanBePushed() {
         return true;
     }
 
+
     public override void InitLocation(Vector3 _pos, Vector3 _rot) {
         base.InitLocation(_pos, _rot);
         // Trader class turns that off.
@@ -880,19 +882,7 @@ public override void UpdateJump() {
 
         this.accumulatedRootMotion.y = 0f;
     }
-
-    public override bool CanCollideWith(Entity _other) {
-        if (canCollideWithLeader) return true;
-
-        var result = base.CanCollideWith(_other);
-        var leader = EntityUtilities.GetLeaderOrOwner(entityId);
-        if (leader && leader.entityId == _other.entityId)
-        {
-            return false;
-        }
-
-        return result;
-    }
+
 
     public override void MoveEntityHeaded(Vector3 _direction, bool _isDirAbsolute) {
         // Check the state to see if the controller IsBusy or not. If it's not, then let it walk.

Mods/SphereII Challenges/Config/challenges-02.xml

@@ -82,6 +82,12 @@
             <objective type="Harvest, SCore" count="20" item="resourceWood" held_tags="axe" biome="burnt_forest" />
             <objective type="Harvest, SCore" count="20" item="resourceWood" held_tags="axe" block_tag="challenge_pallet" />
         </challenge>
+
+        <challenge name="LocalizationTest" title_key="title_key" icon="ui_game_symbol_quest" group="SCore03Group"
+                   short_description_key="short_description_key" description_key="description_key"
+                   reward_text_key="reward_text_key" reward_event="challenge_reward_1000">
+            <objective type="KillWithItem, SCore" count="10" item="gunRifleT0PipeRifle"  />
+        </challenge>
     </append>
 
 </configs>

Mods/SphereII Legacy Distant Terrain/ModInfo.xml

@@ -4,6 +4,6 @@
     <DisplayName value="SphereII Legacy Distant Terrain"/>
     <Description value="Re-enables Legacy Distant Terrain"/>
     <Author value="sphereii"/>
-    <Version value="20.0.981.724"/>
+    <Version value="20.0.994.1027"/>
     <Website value=""/>
 </xml>

Mods/SphereII Legacy Distant Terrain/Properties/versionTemplate.cs

@@ -5,5 +5,5 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("20.0.981.724")]
-[assembly: AssemblyFileVersion("20.0.981.724")]
+[assembly: AssemblyVersion("20.0.994.1027")]
+[assembly: AssemblyFileVersion("20.0.994.1027")]