Changes:

1. harpy's gun fire effect add
2. change Centurion and loaded buggy gunfire effect
3. fully set up Orca Interceptor

mods/sp/languages/rules/en.ftl

@@ -1770,9 +1770,9 @@ predator-desc =  GDI's main battle tank armed with an anti-tank cannon and missi
      - Railgun Barrels
 
 orcai-name = Orca Interceptor
-orcai-desc = Fast interceptor with missile.
+orcai-desc = Fast anti-air aircraft with missile and machine gun.
 
-    Good vs: Vehicles, Aircraft
+    Good vs: Aircraft, Vehicles
 
     Special:
      - Can attack air
@@ -1782,7 +1782,6 @@ orcai-desc = Fast interceptor with missile.
     Upgrades:
      - Ceramic Plating
 
-
 mujeep-name = Technical
 mujeep-desc = Infantry transport.
 
@@ -2696,7 +2695,7 @@ nanos-name = Small Nano Swarm
 
 ## Upgrades
 ap_ammunition-name = AP Ammunition
-ap_ammunition-desc = Increases the damage of the following assets by 50%:
+ap_ammunition-desc = Increases the bullet damage of the following assets by 50%:
     - Vulcan Tower
     - Marine
     - Wolverine

mods/sp/rules/aircraft.yaml

@@ -140,6 +140,7 @@ ORCAB:
 		TakeOffOnResupply: false #To fix a bug in non VTOL aircraft that still go to former target location after resupply
 	Health:
 		HP: 25000
+	-RangeMultiplier@rank-heroic:
 	Armament@primary:
 		Weapon: OBBombFrontal
 		PauseOnCondition: !ammo
@@ -367,6 +368,8 @@ APACHE:
 		CasingSpawnLocalOffset: 600,0,0
 		CasingTargetOffset: 700,0,0
 		CasingHitGroundLevel: false
+		MuzzleSequence: muzzle
+		MuzzlePalette: apyel
 		PauseOnCondition: !ammo
 	Armament@AA:
 		Weapon: HarpyClawAA
@@ -375,7 +378,10 @@ APACHE:
 		CasingSpawnLocalOffset: 600,0,0
 		CasingTargetOffset: 700,0,0
 		CasingHitGroundLevel: false
+		MuzzleSequence: muzzle
+		MuzzlePalette: apyel
 		PauseOnCondition: !ammo
+	WithMuzzleOverlay:
 	AttackAircraft:
 		AttackType: Hover
 		FacingTolerance: 512

mods/sp/rules/campaignstuff.yaml

@@ -527,10 +527,11 @@ GHUMV: #Humvee
 		OrderChance: 100
 		OrderInterval: 45
 
-ORCAI:
+ORCAI: #Orca Interceptor
 	Inherits: ^CombatPlane
 	Inherits@AMMO: ^UsesAmmunition
 	Inherits@AUTOTARGET: ^AutoTargetAllAssaultMoveWithBerserkable
+	Inherits@APAMMO: ^AffectedByAPAmmunition
 	Inherits@CERAMICS: ^AffectedByCeramicPlating
 	Inherits@DETECTION: ^BasicStealthDetectionAir
 	Inherits@EXPERIENCE: ^GainsExperience
@@ -574,20 +575,50 @@ ORCAI:
 		InitialStanceAI: AttackAnything
 	Health:
 		HP: 15000
+	-FirepowerMultiplier@APAMMUNITION:
 	Armament:
 		Weapon: InterceptorHellfire
-		LocalOffset: 300,0,60, 300,0,60
+		LocalOffset: 300,300,60, 300,-300,60
 		LocalYaw: -90, 90
 		MuzzleSequence: muzzle
 		MuzzlePalette: gensmkexploj
 		PauseOnCondition: !ammo
 	Armament@AA:
 		Weapon: InterceptorHellfireAA
-		LocalOffset: 300,0,60, 300,0,60
+		LocalOffset: 300,300,60, 300,-300,60
 		LocalYaw: -90, 90
-		MuzzleSequence: muzzle
+		MuzzleSequence: muzzle3
 		MuzzlePalette: gensmkexploj
 		PauseOnCondition: !ammo
+	Armament@gun:
+		Weapon: InterceptorGun
+		LocalOffset: 800,0,-100
+		AmmoUsage: 0
+		CasingWeapon: BuggyBullet3Spawner
+		CasingHitGroundLevel: false
+		CasingSpawnLocalOffset: 800,0,-100
+		CasingTargetOffset: 799,0,-100
+		MuzzleSequence: muzzle
+		MuzzlePalette: apyel
+		PauseOnCondition: !attack
+		RequiresCondition: !apammo
+	Armament@gunAP:
+		Weapon: InterceptorGunAP
+		LocalOffset: 800,0,-100
+		AmmoUsage: 0
+		CasingWeapon: BuggyBullet3Spawner
+		CasingHitGroundLevel: false
+		CasingSpawnLocalOffset: 800,0,-100
+		CasingTargetOffset: 799,0,-100
+		MuzzleSequence: muzzle
+		MuzzlePalette: apyel
+		PauseOnCondition: !attack
+		RequiresCondition: apammo
+	## HACK: only after missile fire, the gun can fire.
+	## so we can use one weapon for both air and ground, range won't be an issue
+	GrantConditionOnAttack: 
+		Condition: attack
+		RevokeDelay: 1
 	WithMuzzleOverlay:
 	AttackAircraft:
 		FacingTolerance: 40
@@ -631,12 +662,13 @@ ORCAI:
 	WithAmmoPipsDecoration:
 		Position: BottomLeft
 		RequiresSelection: true
-		PipCount: 5
+		PipCount: 2
 		FullSequence: pip-missile
 		EmptySequence: pip-missileempty
 		Palette: pips
 	ActorStatValues:
 		Damage: 40
+		Upgrades: upgrade.ap_ammunition, upgrade.ceramic_plating
 		Stats: Armor, Sight, Speed, Damage, ReloadDelay, MinRange, None, MaxRange
 	ActorStatOverride@CeramicPlating:
 		Health: 18750

mods/sp/rules/vehicles.yaml

@@ -876,7 +876,7 @@ BGGY:
 		Weapon: BuggyCannonLoaded
 		Damage: 40
 		LocalOffset: 250,0,125
-		CasingWeapon: BuggyBullet3Spawner
+		CasingWeapon: BuggyBullet2Spawner
 		CasingSpawnLocalOffset: 140,0,125
 		CasingTargetOffset: 150,0,125
 		CasingHitGroundLevel: false
@@ -2791,10 +2791,10 @@ CENTURION:
 	WithMuzzleOverlay:
 	Armament:
 		Weapon: CenturionVulcan
-		LocalOffset: 900,550,1200, 900,-550,1200
+		LocalOffset: 800,550,1200, 800,-550,1200
 		CasingWeapon: CasingDebris
-		CasingSpawnLocalOffset: 900,550,1200, 900,-550,1200
-		CasingTargetOffset: 900,1280,1200, 900,-1280,1200
+		CasingSpawnLocalOffset: 800,550,1200, 800,-550,1200
+		CasingTargetOffset: 800,1280,1200, 800,-1280,1200
 		PauseOnCondition: empdisable
 		MuzzleSequence: muzzle
 	AutoTarget:

mods/sp/sequences/cabseq.yaml

@@ -552,6 +552,7 @@ cyc2:
 
 centurion:
 	Inherits: ^EmpOverlay
+	Inherits@2: ^BuggyMuzzle
 	Defaults:
 		Filename: centurion.shp
 	stand:

mods/sp/sequences/gdiseq.yaml

@@ -1037,7 +1037,6 @@ orcab:
 
 orcai:
 	Inherits@1: ^SpriteVehicle
-	Inherits@2: ^MissileMuzzle
 	Defaults:
 		Filename: orcai.shp
 	idle:
@@ -1059,6 +1058,14 @@ orcai:
 		Tick: 20
 	stand:
 		ZRamp: 1
+	muzzle:
+		Frames: 2, 1, 0, 1, 2
+		Alpha: 1, 0.5, 0.4, 1, 0.3
+	muzzle3:
+		Filename: japmuzzleb.shp
+		Scale: 0.5
+		Length: *
+		IgnoreWorldTint: true
 	icon:
 		Filename: orcaiicon.shp
 

mods/sp/sequences/nodseq.yaml

@@ -2158,6 +2158,9 @@ apache:
 		Filename: apache.shp
 	icon:
 		Filename: apchicon.shp
+	muzzle:
+		Frames: 0, 2, 1, 0, 1
+		Alpha: 0.5, 1, 0.5, 0.4, 1
 	rotor:
 		Filename: tsrotor.shp
 		Start: 32

mods/sp/weapons/campaignweapons.yaml

@@ -426,6 +426,75 @@ MEMPulse:
 		Delay: 20
 	-Warhead@Reveal:
 
+InterceptorHellfire:
+	Inherits: ^RocketWeapon
+	Inherits@2: ^Small_Clsn
+	ReloadDelay: 50
+	Range: 5c0
+	MinRange: 0c100
+	Report: orcamis1.aud
+	SoundVolume: 2
+	Burst: 2
+	BurstDelays: 0
+	ValidTargets: Ground, Water, Vehicle, Building, Infantry
+	Projectile: MissileTA
+		Speed: 650
+		#Arm: 0 ##When cannot reach Arm, missle will also explode but just disappear
+		Blockable: false
+		TrailImage: explosion
+		TrailSequences: jgcmuzzlemini
+		TrailPalette: gensmkexploj
+		TrailInterval: 0
+		RangeLimit: 40c0
+		CruiseAltitude: 1000
+	Warhead@1Dam: SpreadDamage
+		Damage: 5000
+		ValidTargets: Ground, Water, Vehicle, Building, Infantry
+		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
+
+InterceptorHellfireAA:
+	Inherits: InterceptorHellfire
+	Inherits@1: ^AARocketWeaponOverride
+	ValidTargets: Air
+	Range: 6c512
+	Projectile: MissileTA
+		Speed: 650
+		RangeLimit: 15c0
+		CruiseAltitude: 3000
+	Warhead@1Dam: SpreadDamage
+		Damage: 5000
+		ValidTargets: Air
+		NoUnintendedFriendlyFire: All
+
+InterceptorGun:
+	Inherits: ^VulcanWeapon
+	Inherits@2: ^Piffs
+	ReloadDelay: 30
+	Range: 6c512
+	Report: tsgun4.aud
+	ValidTargets: Ground, Air, Water
+	SoundVolume: 1.5
+	Projectile: InstantHitWithFakeBullets
+		FakeBulletNumber: 3
+		FakeBulletSpawnInterval: 3
+		FakeBulletInaccuracy: 0c512
+		ContrailStartWidth: 30
+	Warhead@1Dam: SpreadDamage
+		Damage: 4000
+		ValidTargets: Ground, Air, Water
+		DamageTypes: Prone70Percent, TriggerProne, BulletDeath
+
+InterceptorGunAP:
+	Inherits: InterceptorGun
+	Inherits@2: ^PiffsCyan
+	Projectile: InstantHitWithFakeBullets
+		ContrailStartColor: 44FFFF
+		ContrailEndColor: FFAA00
+	Warhead@1Dam: SpreadDamage
+		Damage: 6000
+		ValidTargets: Ground, Air, Water
+		DamageTypes: Prone70Percent, TriggerProne, BulletDeath
+
 Sniper:
 	Inherits: ^RifleWeapon
 	Inherits@2: ^Piffs

mods/sp/weapons/gdiweapons.yaml

@@ -786,8 +786,6 @@ FighterHellfireAA:
 	Inherits: FighterHellfire
 	Inherits@1: ^AARocketWeaponOverride
 	ValidTargets: Air
-	Burst: 2
-	ReloadDelay: 35
 	Range: 6c512
 	Projectile: MissileTA
 		Speed: 650
@@ -797,44 +795,6 @@ FighterHellfireAA:
 		ValidTargets: Air
 		NoUnintendedFriendlyFire: All
 
-InterceptorHellfire:
-	Inherits: ^RocketWeapon
-	Inherits@2: ^Small_Clsn
-	ReloadDelay: 50
-	Range: 5c0
-	MinRange: 0c100
-	Report: orcamis1.aud
-	SoundVolume: 2
-	Burst: 4
-	ValidTargets: Ground, Water, Vehicle, Building, Infantry
-	Projectile: MissileTA
-		Speed: 650
-		#Arm: 0 ##When cannot reach Arm, missle will also explode but just disappear
-		Blockable: false
-		TrailImage: explosion
-		TrailSequences: jgcmuzzlemini
-		TrailPalette: gensmkexploj
-		TrailInterval: 0
-		RangeLimit: 40c0
-		CruiseAltitude: 2000
-	Warhead@1Dam: SpreadDamage
-		Damage: 5000
-		ValidTargets: Ground, Water, Vehicle, Building, Infantry
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-
-InterceptorHellfireAA:
-	Inherits: InterceptorHellfire
-	Inherits@1: ^AARocketWeaponOverride
-	ValidTargets: Air
-	Range: 6c512
-	Projectile: MissileTA
-		Speed: 650
-		RangeLimit: 15c0
-	Warhead@1Dam: SpreadDamage
-		Damage: 5000
-		ValidTargets: Air
-		NoUnintendedFriendlyFire: All
-
 OBBombFrontal:
 	Inherits: ^BombDamage
 	Inherits@2: ^Large_Explosion

mods/sp/weapons/nodweapons.yaml

@@ -186,9 +186,6 @@ BuggyBullet3Spawner:
 BuggyCannonLoaded:
 	Inherits: BuggyCannon
 	Range: 6c0
-	Projectile: InstantHitWithFakeBullets
-		FakeBulletNumber: 3
-		FakeBulletSpawnInterval: 2
 
 BuggyCrusaderBazooka:
 	Inherits: CrusaderBazooka