Fixes #6

v1.18.1.11 - Blood Salvos Fixed - Using the latest JecsTools update (v1.0.8.9), Vampires now properly cast Blood Salvo (Issue came from friendly fire code in JT) - Blood Salvo now refunds blood points if it fails to cast when targets at not present.
Rim-Of-Madness-Team · Feb 5, 2018 · 38cd9ff · 38cd9ff
1 parent 51de3b7
commit 38cd9ff
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/About/About.xml b/About/About.xml
@@ -4,7 +4,7 @@
 	<name>Rim of Madness - Vampires</name>
 	<author>Jecrell</author>
 	<targetVersion>0.18.1722</targetVersion>
-	<description>V1.18.1.10
+	<description>V1.18.1.11
     Adds vampires to RimWorld.
 
 		Heavily inspired by Vampire the Masquerade, this mod introduces a disease known as vampirism.

diff --git a/Assemblies/Vampire.dll b/Assemblies/Vampire.dll
diff --git a/Defs/AbilityDefs/ROMV_Thaumaturgy.xml b/Defs/AbilityDefs/ROMV_Thaumaturgy.xml
@@ -128,6 +128,7 @@
       <muzzleFlashScale>20</muzzleFlashScale>
       <isPrimary>false</isPrimary>
       <AbilityTargetCategory>TargetAoE</AbilityTargetCategory>
+	  <mustHaveTarget>true</mustHaveTarget>
       <TargetAoEProperties>
         <targetClass>Pawn</targetClass>
         <showRangeOnSelect>true</showRangeOnSelect>

diff --git a/Source/Vampires/VampAbility.cs b/Source/Vampires/VampAbility.cs
@@ -76,6 +76,18 @@ public override bool ShouldShowGizmo()
             return false;
         }
 
+        public override void Notify_AbilityFailed(bool refund)
+        {
+            base.Notify_AbilityFailed(refund);
+            if (refund)
+            {
+                if (Pawn.IsGhoul())
+                    Pawn.BloodNeed().CurGhoulVitaePoints += AbilityDef.bloodCost;
+                else
+                    Pawn.BloodNeed().AdjustBlood(AbilityDef.bloodCost);
+            }
+        }
+
         public bool PassesAbilitySpecialCases()
         {
             if (this.AbilityDef == null)