diff --git a/1.6/1.6/Assemblies/WulaFallenEmpire.dll b/1.6/1.6/Assemblies/WulaFallenEmpire.dll index b4c43eff..2287f044 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_FE_Materialist_Weapon.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Materialist_Weapon.xml index 0d011f3f..7237d1fe 100644 --- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Materialist_Weapon.xml +++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Materialist_Weapon.xml @@ -45,6 +45,7 @@ Bomb 450 2 + ExcaliburBeam diff --git a/Source/WulaFallenEmpire/Verb/VerbProperties_Excalibur.cs b/Source/WulaFallenEmpire/Verb/VerbProperties_Excalibur.cs index fd14cbdb..112dc31a 100644 --- a/Source/WulaFallenEmpire/Verb/VerbProperties_Excalibur.cs +++ b/Source/WulaFallenEmpire/Verb/VerbProperties_Excalibur.cs @@ -10,5 +10,6 @@ namespace WulaFallenEmpire public float damageAmount = -1f; // Custom damage amount public float armorPenetration = -1f; // Custom armor penetration public float maxRange = 1000f; // Default max range for beams + public string beamDefName = "ExcaliburBeam"; // Default beam def name } } \ No newline at end of file diff --git a/Source/WulaFallenEmpire/Verb/Verb_Excalibur.cs b/Source/WulaFallenEmpire/Verb/Verb_Excalibur.cs index d0d68111..8d4af5cc 100644 --- a/Source/WulaFallenEmpire/Verb/Verb_Excalibur.cs +++ b/Source/WulaFallenEmpire/Verb/Verb_Excalibur.cs @@ -95,7 +95,7 @@ namespace WulaFallenEmpire List allAffectedCells = this.AffectedCells(this.currentTarget); // Create a beam for this specific burst - Thing_ExcaliburBeam beam = (Thing_ExcaliburBeam)GenSpawn.Spawn(DefDatabase.GetNamed("ExcaliburBeam", true), this.CasterPawn.Position, this.CasterPawn.Map); + Thing_ExcaliburBeam beam = (Thing_ExcaliburBeam)GenSpawn.Spawn(DefDatabase.GetNamed(this.ExcaliburProps.beamDefName, true), this.CasterPawn.Position, this.CasterPawn.Map); beam.caster = this.CasterPawn; beam.targetCell = this.currentTarget.Cell; beam.damageAmount = this.damageAmount;