diff --git a/1.6/1.6/Assemblies/WulaFallenEmpire.dll b/1.6/1.6/Assemblies/WulaFallenEmpire.dll
index f4f0a45e..3a570728 100644
Binary files a/1.6/1.6/Assemblies/WulaFallenEmpire.dll and b/1.6/1.6/Assemblies/WulaFallenEmpire.dll differ
diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Ionic_Weapons.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Ionic_Weapons.xml
index ef1fe01e..5420b06d 100644
--- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Ionic_Weapons.xml
+++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Ionic_Weapons.xml
@@ -60,7 +60,7 @@
25.9
1.5
10
- 50
+ 12
ChargeLance_Fire
GunTail_Heavy
@@ -72,7 +72,7 @@
0.4
3
true
- 1
+ 2.5
Vaporize
50
0.3
diff --git a/Source/WulaFallenEmpire/Verb/Verb_Excalibur.cs b/Source/WulaFallenEmpire/Verb/Verb_Excalibur.cs
index ad82489d..e9ecb4f0 100644
--- a/Source/WulaFallenEmpire/Verb/Verb_Excalibur.cs
+++ b/Source/WulaFallenEmpire/Verb/Verb_Excalibur.cs
@@ -99,18 +99,6 @@ namespace WulaFallenEmpire
protected override bool TryCastShot()
{
- // Temporarily commented out CompWeaponCharge related code
- /*
- bool flag = this.compCharge != null && !this.compCharge.CanBeUsed;
- if (!flag)
- {
- CompWeaponCharge compCharge = this.compCharge;
- if (compCharge != null)
- {
- compCharge.UsedOnce();
- }
- */
-
// Calculate all affected cells once
List allAffectedCells = this.AffectedCells(this.currentTarget);
@@ -123,18 +111,14 @@ namespace WulaFallenEmpire
beam.pathWidth = this.ExcaliburProps.pathWidth;
beam.weaponDef = this.CasterPawn.equipment.Primary.def;
beam.damageDef = this.ExcaliburProps.damageDef;
- beam.StartStrike(allAffectedCells, this.BurstShotsLeft, this.BurstShotCount);
+ beam.StartStrike(allAffectedCells, this.verbProps.burstShotCount, this.verbProps.burstShotCount);
return true;
- /*
- }
- return false;
- */
}
public override void DrawHighlight(LocalTargetInfo target)
{
- GenDraw.DrawFieldEdges(this.AffectedCells(target), 2900);
+ GenDraw.DrawFieldEdges(this.AffectedCells(target), SimpleColor.Red);
}
private List AffectedCells(LocalTargetInfo target)
@@ -188,9 +172,10 @@ namespace WulaFallenEmpire
{
return currentCell; // Hit an impassable wall
}
+ }
return (position.ToVector3() + direction * maxRange).ToIntVec3(); // Reached max range
}
-
+
private bool CanUseCell(IntVec3 c)
{
return c.InBounds(this.CasterPawn.Map) && c != this.CasterPawn.Position;