Skip to content

Commit

Permalink
2/10/2018 balance patch by Apofenas
Browse files Browse the repository at this point in the history 
Merge pull request #334 from FAForever/balance-staging
  • Loading branch information
@CookieNoob
CookieNoob authored Oct 27, 2018
2 parents 062be04 + beaa229 commit 2345500
Show file tree
Hide file tree
Showing 24 changed files with 305 additions and 607 deletions.
23 changes: 22 additions & 1 deletion projectiles/NTacticalMissile1_HighArc/NTacticalMissile1_HighArc_Script.lua
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,26 @@
local ArcingTacticalMissile = import('/lua/nomadsprojectiles.lua').ArcingTacticalMissile

NTacticalMissile1_HighArc = Class(ArcingTacticalMissile) {}
NTacticalMissile1_HighArc = Class(ArcingTacticalMissile) {
OnCreate = function(self, inWater)
ArcingTacticalMissile.OnCreate(self, inWater)

self:SetTurnRate(0)
self:ChangeMaxZigZag(0)
self:ChangeZigZagFrequency(0)
self:ForkThread(self.StageThread)
end,

StageThread = function(self)
WaitSeconds(1.1)
local bp = self:GetBlueprint().Physics
self:SetTurnRate(bp.TurnRate)
self:ChangeMaxZigZag(bp.MaxZigZag)
self:ChangeZigZagFrequency(bp.ZigZagFrequency)
WaitSeconds(1.3)
self:ChangeMaxZigZag(0)
self:ChangeZigZagFrequency(0)
end,

}

TypeClass = NTacticalMissile1_HighArc
14 changes: 8 additions & 6 deletions projectiles/NTacticalMissile1_HighArc/NTacticalMissile1_HighArc_proj.bp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ ProjectileBlueprint {
UniformScale = 0.11,
},
General = {
Category = 'Direct Fire',
Category = 'Missile',
EntityCategory = {
'NOMADS',
'PROJECTILE',
'INDIRECTFIRE',
'TACTICAL',
'MISSILE',
'ARTILLERY',
},
Faction = 'Nomads',
Weapon = 'NTacticalMissile1_HighArc',
Expand All @@ -64,10 +64,12 @@ ProjectileBlueprint {
DestroyOnWaterAfterExitingWater = true,
InitialSpeed = 35,
MaxSpeed = 50,
MaxZigZag = 0,
TrackTarget = false,
TurnRate = 360,
MaxZigZag = 25,
TurnRate = 100,
TrackTarget = true,
TrackTargetGround = true,
UseGravity = false,
VelocityAlign = true,
ZigZagFrequency = 0,
ZigZagFrequency = 5,
},
}
4 changes: 0 additions & 4 deletions units/INA1003/INA1003_Script.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@ local RocketWeapon1Bomber = import('/lua/nomadsweapons.lua').RocketWeapon1Bomber
INA1003 = Class(NAirUnit) {
Weapons = {
Rocket1 = Class(RocketWeapon1Bomber) {},
Rocket2 = Class(RocketWeapon1Bomber) {},
Rocket3 = Class(RocketWeapon1Bomber) {},
Rocket4 = Class(RocketWeapon1Bomber) {},
},
}

TypeClass = INA1003

246 changes: 15 additions & 231 deletions units/INA1003/INA1003_unit.bp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,105 +287,37 @@ UnitBlueprint {
AutoInitiateAttackCommand = true,
BallisticArc = 'RULEUBA_LowArc',
CollideFriendly = false,
Damage = 70,
Damage = 30,
DamageFriendly = true,
DamageRadius = 2.6,
DamageRadius = 2,
DamageType = 'Normal',
DisplayName = 'Rocket',
FireTargetLayerCapsTable = {
Air = 'Land|Water|Seabed',
Land = 'Land|Water|Seabed',
},
FiringRandomness = 1,
FiringRandomness = 2,
FiringTolerance = 3,
Label = 'Rocket1',
LeadTarget = true,
MaxRadius = 28,
MinRadius = 8,
MuzzleSalvoDelay = 0,
MuzzleSalvoSize = 1,
MuzzleVelocity = 15,
ProjectileId = '/projectiles/NRocketProj2/NRocketProj2_proj.bp',
MuzzleSalvoDelay = 0.05,
MuzzleSalvoSize = 5,
MuzzleVelocity = 10,
ProjectileId = '/projectiles/NRocketProj3/NRocketProj3_proj.bp',
ProjectileLifetimeUsesMultiplier = 1.25,
ProjectilesPerOnFire = 4,
ProjectilesPerOnFire = 2,
RackBones = {
{
MuzzleBones = {
'muzzle.001',
},
RackBone = 'muzzle.001',
},
},
RackFireTogether = true,
RackRecoilDistance = 0,
RackReloadTimeout = 0,
RackSalvoChargeTime = 0,
RackSalvoReloadTime = 0,
RackSalvoSize = 1,
RackSlavedToTurret = false,
RangeCategory = 'UWRC_DirectFire',
RateOfFire = 0.2,
TargetCheckInterval = 1,
TargetPriorities = {
'SPECIALHIGHPRI',
'LAND MOBILE TECH1',
'LAND MOBILE',
'SPECIALLOWPRI',
'ALLUNITS',
},
TargetRestrictDisallow = 'UNTARGETABLE',
TrackingRadius = 1.15,
TurretBoneMuzzle = 'muzzle.001',
TurretBonePitch = 'muzzle.001',
TurretBoneYaw = 'muzzle.001',
TurretDualManipulators = false,
TurretPitch = -45,
TurretPitchRange = 45,
TurretPitchSpeed = 360,
TurretYaw = 0,
TurretYawRange = 20,
TurretYawSpeed = 360,
Turreted = true,
WeaponCategory = 'Direct Fire',
},
{
AboveWaterTargetsOnly = true,
Audio = {
Fire = Sound {
Bank = 'NomadsWeapons',
Cue = 'Rocket1_Muzzle',
LodCutoff = 'Weapon_LodCutoff',
},
},
AutoInitiateAttackCommand = true,
BallisticArc = 'RULEUBA_LowArc',
CollideFriendly = false,
Damage = 70,
DamageFriendly = true,
DamageRadius = 2.6,
DamageType = 'Normal',
DisplayName = 'Rocket',
FireTargetLayerCapsTable = {
Air = 'Land|Seabed|Water',
Land = 'Land|Seabed|Water',
},
FiringRandomness = 1,
FiringTolerance = 3,
Label = 'Rocket2',
LeadTarget = true,
MaxRadius = 28,
MinRadius = 8,
MuzzleSalvoDelay = 0,
MuzzleSalvoSize = 1,
MuzzleVelocity = 15,
PrefersPrimaryWeaponTarget = true,
ProjectileId = '/projectiles/NRocketProj2/NRocketProj2_proj.bp',
ProjectileLifetimeUsesMultiplier = 1.25,
ProjectilesPerOnFire = 4,
RackBones = {
{
{
MuzzleBones = {
'muzzle.002',
'muzzle.001',
},
RackBone = 'muzzle.002',
},
Expand All @@ -395,10 +327,10 @@ UnitBlueprint {
RackReloadTimeout = 0,
RackSalvoChargeTime = 0,
RackSalvoReloadTime = 0,
RackSalvoSize = 1,
RackSalvoSize = 5,
RackSlavedToTurret = false,
RangeCategory = 'UWRC_DirectFire',
RateOfFire = 0.2,
RateOfFire = 0.25,
TargetCheckInterval = 1,
TargetPriorities = {
'SPECIALHIGHPRI',
Expand All @@ -409,157 +341,9 @@ UnitBlueprint {
},
TargetRestrictDisallow = 'UNTARGETABLE',
TrackingRadius = 1.15,
TurretBoneMuzzle = 'muzzle.002',
TurretBonePitch = 'muzzle.002',
TurretBoneYaw = 'muzzle.002',
TurretDualManipulators = false,
TurretPitch = -45,
TurretPitchRange = 45,
TurretPitchSpeed = 360,
TurretYaw = 0,
TurretYawRange = 20,
TurretYawSpeed = 360,
Turreted = true,
WeaponCategory = 'Direct Fire',
},
{
AboveWaterTargetsOnly = true,
Audio = {
Fire = Sound {
Bank = 'NomadsWeapons',
Cue = 'Rocket1_Muzzle',
LodCutoff = 'Weapon_LodCutoff',
},
},
AutoInitiateAttackCommand = true,
BallisticArc = 'RULEUBA_LowArc',
CollideFriendly = false,
Damage = 70,
DamageFriendly = true,
DamageRadius = 2.6,
DamageType = 'Normal',
DisplayName = 'Rocket',
FireTargetLayerCapsTable = {
Air = 'Land|Seabed|Water',
Land = 'Land|Seabed|Water',
},
FiringRandomness = 1,
FiringTolerance = 3,
Label = 'Rocket3',
LeadTarget = true,
MaxRadius = 28,
MinRadius = 10,
MuzzleSalvoDelay = 0,
MuzzleSalvoSize = 1,
MuzzleVelocity = 15,
PrefersPrimaryWeaponTarget = true,
ProjectileId = '/projectiles/NRocketProj2/NRocketProj2_proj.bp',
ProjectileLifetimeUsesMultiplier = 1.25,
ProjectilesPerOnFire = 4,
RackBones = {
{
MuzzleBones = {
'muzzle.003',
},
RackBone = 'muzzle.003',
},
},
RackFireTogether = true,
RackRecoilDistance = 0,
RackReloadTimeout = 0,
RackSalvoChargeTime = 0,
RackSalvoReloadTime = 0,
RackSalvoSize = 1,
RackSlavedToTurret = false,
RangeCategory = 'UWRC_DirectFire',
RateOfFire = 0.2,
TargetCheckInterval = 1,
TargetPriorities = {
'SPECIALHIGHPRI',
'LAND MOBILE TECH1',
'LAND MOBILE',
'SPECIALLOWPRI',
'ALLUNITS',
},
TargetRestrictDisallow = 'UNTARGETABLE',
TrackingRadius = 1.15,
TurretBoneMuzzle = 'muzzle.003',
TurretBonePitch = 'muzzle.003',
TurretBoneYaw = 'muzzle.003',
TurretDualManipulators = false,
TurretPitch = -45,
TurretPitchRange = 45,
TurretPitchSpeed = 360,
TurretYaw = 0,
TurretYawRange = 20,
TurretYawSpeed = 360,
Turreted = true,
WeaponCategory = 'Direct Fire',
},
{
AboveWaterTargetsOnly = true,
Audio = {
Fire = Sound {
Bank = 'NomadsWeapons',
Cue = 'Rocket1_Muzzle',
LodCutoff = 'Weapon_LodCutoff',
},
},
AutoInitiateAttackCommand = true,
BallisticArc = 'RULEUBA_LowArc',
CollideFriendly = false,
Damage = 70,
DamageFriendly = true,
DamageRadius = 2.6,
DamageType = 'Normal',
DisplayName = 'Rocket',
FireTargetLayerCapsTable = {
Air = 'Land|Seabed|Water',
Land = 'Land|Seabed|Water',
},
FiringRandomness = 1,
FiringTolerance = 3,
Label = 'Rocket4',
LeadTarget = true,
MaxRadius = 28,
MinRadius = 10,
MuzzleSalvoDelay = 0,
MuzzleSalvoSize = 1,
MuzzleVelocity = 15,
PrefersPrimaryWeaponTarget = true,
ProjectileId = '/projectiles/NRocketProj2/NRocketProj2_proj.bp',
ProjectileLifetimeUsesMultiplier = 1.25,
ProjectilesPerOnFire = 4,
RackBones = {
{
MuzzleBones = {
'muzzle.004',
},
RackBone = 'muzzle.004',
},
},
RackFireTogether = true,
RackRecoilDistance = 0,
RackReloadTimeout = 0,
RackSalvoChargeTime = 0,
RackSalvoReloadTime = 0,
RackSalvoSize = 1,
RackSlavedToTurret = false,
RangeCategory = 'UWRC_DirectFire',
RateOfFire = 0.2,
TargetCheckInterval = 1,
TargetPriorities = {
'SPECIALHIGHPRI',
'LAND MOBILE TECH1',
'LAND MOBILE',
'SPECIALLOWPRI',
'ALLUNITS',
},
TargetRestrictDisallow = 'UNTARGETABLE',
TrackingRadius = 1.15,
TurretBoneMuzzle = 'muzzle.004',
TurretBonePitch = 'muzzle.004',
TurretBoneYaw = 'muzzle.004',
TurretBoneMuzzle = 'muzzle.001',
TurretBonePitch = 'muzzle.001',
TurretBoneYaw = 'muzzle.001',
TurretDualManipulators = false,
TurretPitch = -45,
TurretPitchRange = 45,
Expand Down
3 changes: 1 addition & 2 deletions units/INA2002/INA2002_Script.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ INA2002 = Class(NAirUnit) {
ConcussionBombWeapon.OnLostTarget(self)
end,
},
AGRockets = Class(RocketWeapon1) {},
AARockets = Class(RocketWeapon1) {},
},
ChangeSpeedFor = function(self, reason)
Expand Down Expand Up @@ -70,4 +69,4 @@ INA2002 = Class(NAirUnit) {

}

TypeClass = INA2002
TypeClass = INA2002
Loading

0 comments on commit 2345500

Please sign in to comment.