Fixes Rim-Of-Madness-Team/Rim-of-Madness---Vampire#6

+Fixed issue with friendly fire false settings ending up to attack friendly fire targets. +Adds XML options for refunding of cooldowns and points for special failures of abilities.
RimWorld-CCL-Reborn · Feb 5, 2018 · 557ebf1 · 557ebf1
1 parent 73e8832
commit 557ebf1
Show file tree

Hide file tree

Showing 10 changed files with 632 additions and 426 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -5,7 +5,7 @@
   <url></url>
   <targetVersion>0.18.0</targetVersion>
   <description>
-[1.0.8.8] Adds modding components to RimWorld: vehicles, spell casting, weapon slots, oversized weapons, and more!
+[1.0.8.9] Adds modding components to RimWorld: vehicles, spell casting, weapon slots, oversized weapons, and more!
 
 Note to players: This mod will not change your game, but rather it lets modders do more, so you can have an even more amazing RimWorld experience.
 

diff --git a/Assemblies/0JecsTools.dll b/Assemblies/0JecsTools.dll
diff --git a/Assemblies/AbilityUser.dll b/Assemblies/AbilityUser.dll
diff --git a/Assemblies/AbilityUserAI.dll b/Assemblies/AbilityUserAI.dll
diff --git a/Languages/English/Keyed/AbilityUser.xml b/Languages/English/Keyed/AbilityUser.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <LanguageData>
 
+<AU_NoTargets>No targets available.</AU_NoTargets>
+
 <AU_DISABLED>DISABLED</AU_DISABLED>
 
 <AU_Type>Type: </AU_Type>

diff --git a/Source/.idea/.idea.JecsTools/.idea/workspace.xml b/Source/.idea/.idea.JecsTools/.idea/workspace.xml
diff --git a/Source/AllModdingComponents/CompAbilityUser/Controller/JobDriver_CastAbilityVerb.cs b/Source/AllModdingComponents/CompAbilityUser/Controller/JobDriver_CastAbilityVerb.cs
@@ -9,20 +9,6 @@ public class JobDriver_CastAbilityVerb : JobDriver
     {
         public AbilityContext Context => job.count == 1 ? AbilityContext.Player : AbilityContext.AI;
 
-
-        private List<CompAbilityUser> CompAbilityUsers
-        {
-            get
-            {
-                var results = new List<CompAbilityUser>();
-                var allCompAbilityUsers = pawn.GetComps<CompAbilityUser>();
-                if (allCompAbilityUsers.TryRandomElement(out var comp))
-                    foreach (var compy in allCompAbilityUsers)
-                        results.Add(compy);
-                return results;
-            }
-        }
-
         public override bool TryMakePreToilReservations()
         {
             return true;

diff --git a/Source/AllModdingComponents/CompAbilityUser/Controller/PawnAbility.cs b/Source/AllModdingComponents/CompAbilityUser/Controller/PawnAbility.cs
@@ -86,6 +86,12 @@ public int CooldownTicksLeft
             set => TicksUntilCasting = value;
         } //Log.Message(value.ToString()); } }
 
+        public virtual void Notify_AbilityFailed(bool refund)
+        {
+            if (refund)
+                CooldownTicksLeft = -1;
+        }
+
         public int MaxCastingTicks => (int) (powerdef.MainVerb.SecondsToRecharge * GenTicks.TicksPerRealSecond);
 
         public Verb_UseAbility Verb

diff --git a/Source/AllModdingComponents/CompAbilityUser/Controller/Verb_UseAbility.cs b/Source/AllModdingComponents/CompAbilityUser/Controller/Verb_UseAbility.cs
@@ -52,7 +52,7 @@ protected virtual void UpdateTargets()
                     targets = caster.Map.listerThings.AllThings.Where(x =>
                         x.Position.InHorDistOf(aoeStartPosition, UseAbilityProps.TargetAoEProperties.range) &&
                         UseAbilityProps.TargetAoEProperties.targetClass.IsAssignableFrom(x.GetType()) &&
-                        !x.Faction.HostileTo(Faction.OfPlayer)).ToList();
+                        x.Faction.HostileTo(Faction.OfPlayer)).ToList();
                 }
                 else if (UseAbilityProps.TargetAoEProperties.targetClass == typeof(Plant) ||
                          UseAbilityProps.TargetAoEProperties.targetClass == typeof(Building))
@@ -106,6 +106,12 @@ protected override bool TryCastShot()
             var burstShots = ShotsPerBurst;
             if (UseAbilityProps.AbilityTargetCategory != AbilityTargetCategory.TargetAoE && TargetsAoE.Count > 1)
                 TargetsAoE.RemoveRange(0, TargetsAoE.Count - 1);
+            if (UseAbilityProps.mustHaveTarget && TargetsAoE.Count == 0)
+            {
+                Messages.Message("AU_NoTargets".Translate(), MessageTypeDefOf.RejectInput);
+                Ability.Notify_AbilityFailed(true);
+                return false;
+            }
             for (var i = 0; i < TargetsAoE.Count; i++)
             {
                 //                for (int j = 0; j < burstshots; j++)
@@ -126,6 +132,10 @@ protected override bool TryCastShot()
             //{
             //}
             PostCastShot(result, out result);
+            if (result == false)
+            {
+                Ability.Notify_AbilityFailed(UseAbilityProps.refundsPointsAfterFailing);
+            }
             return result;
             //bool result = false;
             //this.TargetsAoE.Clear();

diff --git a/Source/AllModdingComponents/CompAbilityUser/Model/VerbProperties_Ability.cs b/Source/AllModdingComponents/CompAbilityUser/Model/VerbProperties_Ability.cs
@@ -12,6 +12,9 @@ public class VerbProperties_Ability : VerbProperties
 
         public bool AlwaysHits = true;
 
+        public bool mustHaveTarget = false;
+        public bool refundsPointsAfterFailing = false;
+
         public bool canCastInMelee = true;
 
         public List<ExtraDamage> extraDamages = null;