Further armor and weapon tweaks + bugfix

Hadn't hooked up the effect, further changes to try and rebalance lasers and reactive armor and all that stuff.
DaloLorn · Jul 8, 2016 · a5874b0 · a5874b0
1 parent 1c4795c
commit a5874b0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/Rising Stars/data/effects/CapDamageExceptEnergy.txt b/Rising Stars/data/effects/CapDamageExceptEnergy.txt
@@ -0,0 +1,5 @@
+Effect: CapDamageExceptEnergy
+	Value: MaxDamage
+	Value: MinimumPercent
+
+	Damage: ABEMCombat::CapDamageExceptEnergy
diff --git a/Rising Stars/data/subsystems/flagships/armor/ReactiveArmor.txt b/Rising Stars/data/subsystems/flagships/armor/ReactiveArmor.txt
@@ -10,7 +10,7 @@ Subsystem: ReactiveArmor
 	Hull: Flagship, Station
 
 	Size := HexSize * Hexes
-	ImpactLevel := 27 * HexSize
+	ImpactLevel := 27 * ShipSize/128
 	MinPct := 1/6
 
 	Hex.Resistance := 0.55

diff --git a/Rising Stars/data/subsystems/flagships/weapons/Laser.txt b/Rising Stars/data/subsystems/flagships/weapons/Laser.txt
@@ -12,7 +12,7 @@ Subsystem: Laser
 	Hull: Flagship, Station
 
 	Size := HexSize * Hexes
-	BeamDPS := 2 * Size
+	BeamDPS := 2.2 * Size
 	Duration := 10
 	Cooldown := 0.01
 	Range := Size + 450

diff --git a/Rising Stars/data/subsystems/supports/armor/SupportReactiveArmor.txt b/Rising Stars/data/subsystems/supports/armor/SupportReactiveArmor.txt
@@ -10,7 +10,7 @@ Subsystem: SupportReactiveArmor
 	Hull: Support, Satellite
 
 	Size := HexSize * Hexes
-	ImpactLevel := 27 * HexSize
+	ImpactLevel := 29 * ShipSize/128
 	MinPct := 1/4
 
 	Hex.Resistance := 0.55

diff --git a/Rising Stars/scripts/server/ABEMCombat.as b/Rising Stars/scripts/server/ABEMCombat.as
@@ -88,10 +88,8 @@ void ABEMControlDestroyed(Event& evt) {
 DamageEventStatus CapDamageExceptEnergy(DamageEvent& evt, const vec2u& position,
 	double maxDamage, double MinimumPercent)
 {
-	if((evt.flags & typeMask) == DT_Energy) {
-		print("Energy hit a CapDamageExceptEnergy");
+	if((evt.flags & typeMask) == DT_Energy)
 		return DE_Continue;
-	}
 	if(evt.flags & DF_IgnoreDR != 0)
 		return DE_Continue;
 	if(evt.flags & DF_FullDR != 0)