Merge pull request #10563 from whinis/ObeliskFix

Fixes Obelisk not attacking again after a forced attack command
This commit is contained in:
abcdefg30
2016-01-23 17:47:15 +01:00
2 changed files with 2 additions and 3 deletions

View File

@@ -95,8 +95,7 @@ NAOBEL:
LocalOffset: 1400,210,800 LocalOffset: 1400,210,800
AttackCharge: AttackCharge:
ChargeAudio: obelpowr.aud ChargeAudio: obelpowr.aud
ReloadTime: 50 InitialChargeDelay: 120
InitialChargeDelay: 50
WithChargeOverlay: WithChargeOverlay:
Sequence: active Sequence: active
Palette: player Palette: player

View File

@@ -171,7 +171,7 @@ Proton:
ValidImpactTypes: Water ValidImpactTypes: Water
ObeliskLaserFire: ObeliskLaserFire:
ReloadDelay: 120 ReloadDelay: 1
Range: 10c512 Range: 10c512
Charges: true Charges: true
Report: obelray1.aud Report: obelray1.aud