Added an extra parameter to allow for saving cooldowns in other projects

RimWorld-CCL-Reborn · Jun 5, 2017 · 2d7f72d · 2d7f72d
1 parent 202d7ea
commit 2d7f72d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Assemblies/AbilityUser.dll b/Assemblies/AbilityUser.dll
diff --git a/Source/AllModdingComponents/CompAbilityUser/CompAbilityUser.cs b/Source/AllModdingComponents/CompAbilityUser/CompAbilityUser.cs
@@ -44,10 +44,11 @@ public List<PawnAbility> AllPowers
         }
         public List<Verb_UseAbility> AbilityVerbs = new List<Verb_UseAbility>();
 
-        public void AddPawnAbility(AbilityDef abilityDef, bool activenow = true) => this.AddAbilityInternal(abilityDef, ref this.Powers, activenow); public void AddWeaponAbility(AbilityDef abilityDef, bool activenow = true) => this.AddAbilityInternal(abilityDef, ref this.temporaryWeaponPowers, activenow); public void AddApparelAbility(AbilityDef abilityDef, bool activenow = true) => this.AddAbilityInternal(abilityDef, ref this.temporaryApparelPowers, activenow); private void AddAbilityInternal(AbilityDef abilityDef, ref List<PawnAbility> thelist, bool activenow)
+        public void AddPawnAbility(AbilityDef abilityDef, bool activenow = true, float savedTicks = -1) => this.AddAbilityInternal(abilityDef, ref this.Powers, activenow, savedTicks); public void AddWeaponAbility(AbilityDef abilityDef, bool activenow = true, float savedTicks = -1) => this.AddAbilityInternal(abilityDef, ref this.temporaryWeaponPowers, activenow, savedTicks); public void AddApparelAbility(AbilityDef abilityDef, bool activenow = true, float savedTicks = -1) => this.AddAbilityInternal(abilityDef, ref this.temporaryApparelPowers, activenow, savedTicks); private void AddAbilityInternal(AbilityDef abilityDef, ref List<PawnAbility> thelist, bool activenow, float savedTicks)
         {
             PawnAbility pa = new PawnAbility(this.AbilityUser, abilityDef);
             if (activenow == false) pa.TicksUntilCasting = (int)(pa.powerdef.MainVerb.SecondsToRecharge * GenTicks.TicksPerRealSecond);
+            if (savedTicks != -1) pa.TicksUntilCasting = (int)savedTicks;
             thelist.Add(pa);
             this.UpdateAbilities();
 

diff --git a/Source/AllModdingComponents/CompAbilityUser/JobDriver_CastAbilityVerb.cs b/Source/AllModdingComponents/CompAbilityUser/JobDriver_CastAbilityVerb.cs
@@ -32,7 +32,7 @@ protected override IEnumerable<Toil> MakeNewToils()
                 //PsykerUtility.PsykerShockEvents(CompAbilityUser, CompAbilityUser.curPower.PowerLevel);
                 //}
                 this.CompAbilityUser.PostAbilityAttempt(this.pawn, verb.ability.powerdef);
-                this.CompAbilityUser.ShotFired = true;
+                //this.CompAbilityUser.ShotFired = true;
             });
         }
     }