Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Strat idea #6639

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
+57 −33
Open

Strat idea #6639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6c7106
Post-process deployment
FAForeverBot Jan 23, 2025
fa6955d
Change Strats
Spikey84 Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lua/shared/components/DebugComponent.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ DebugComponent = ClassSimple {
EnabledLogging = true,
EnabledWarnings = true,
EnabledErrors = true,
EnabledDrawing = true,
EnabledDrawing = false,

--#endregion
}
16 changes: 16 additions & 0 deletions lua/sim/weapons/DefaultProjectileWeapon.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,6 +982,9 @@ DefaultProjectileWeapon = ClassWeapon(Weapon) {
local notExclusive = bp.NotExclusive
local rackBones = bp.RackBones

local usesFuelToFire = bp.UsesFuelToFire
local fuelUsedToFire = bp.FuelUsedToFire

local numRackFiring = self.CurrentRackSalvoNumber
--This is done to make sure that when racks should fire together, they do
if bp.RackFireTogether then
Expand Down Expand Up @@ -1056,6 +1059,19 @@ DefaultProjectileWeapon = ClassWeapon(Weapon) {

local proj = self:CreateProjectileAtMuzzle(muzzle)


if usesFuelToFire then
local fuel = unit:GetFuelRatio()
if fuel > fuelUsedToFire then
unit:SetFuelRatio(fuel-fuelUsedToFire)
elseif fuel == 0 then
proj:Destroy()
else
unit:SetFuelRatio(0)
unit:OnRunOutOfFuel()
end
end

-- Decrement the ammo if they are a counted projectile
if proj and not proj:BeenDestroyed() and countedProjectile then
if bp.NukeWeapon then
Expand Down
4 changes: 2 additions & 2 deletions lua/version.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
-- - https://github.com/FAForever/fa/blob/develop/.github/workflows/deploy-fafbeta.yaml
-- - https://github.com/FAForever/fa/blob/develop/.github/workflows/deploy-fafdevelop.yaml

local GameType = 'unknown' -- The use of `'` instead of `"` is **intentional**
local GameType = "FAF Develop" -- The use of `'` instead of `"` is **intentional**

local Commit = 'unknown' -- The use of `'` instead of `"` is **intentional**
local Commit = "fb0457f9d0d1b0334d844ad70b6b152a640ab797" -- The use of `'` instead of `"` is **intentional**

--#endregion

Expand Down
16 changes: 9 additions & 7 deletions units/UAA0304/UAA0304_unit.bp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ UnitBlueprint{
AutoLandTime = 1,
BankFactor = 2.5,
BankForward = false,
BreakOffDistance = 60,
BreakOffDistance = 50,
BreakOffIfNearNewTarget = true,
BreakOffTrigger = 30,
CanFly = true,
CombatTurnSpeed = 0.8,
CombatTurnSpeed = 0.9,
EngageDistance = 50,
KLift = 3,
KLiftDamping = 2.5,
Expand All @@ -20,12 +20,12 @@ UnitBlueprint{
KTurn = 0.8,
KTurnDamping = 1,
LiftFactor = 7,
MaxAirspeed = 17,
MinAirspeed = 15,
MaxAirspeed = 18,
MinAirspeed = 14,
PredictAheadForBombDrop = 3,
StartTurnDistance = 5,
TightTurnMultiplier = 0,
TurnSpeed = 0.8,
TurnSpeed = 0.9,
Winged = true,
},
Audio = {
Expand Down Expand Up @@ -207,7 +207,7 @@ UnitBlueprint{
CollideFriendly = false,
Damage = 3000,
DamageFriendly = true,
DamageRadius = 5.25,
DamageRadius = 7,
DamageType = "Normal",
Display = "Quark Bomb",
DisplayName = "Quark Bomb",
Expand Down Expand Up @@ -239,7 +239,7 @@ UnitBlueprint{
RackSalvoReloadTime = 0,
RackSalvoSize = 1,
RackSlavedToTurret = false,
RateOfFire = 10/80, --10/integer interval in ticks
RateOfFire = 10/55, --10/integer interval in ticks
TargetPriorities = {
"TECH4",
"TECH3 STRUCTURE",
Expand All @@ -249,6 +249,8 @@ UnitBlueprint{
},
TargetRestrictDisallow = "UNTARGETABLE",
WeaponCategory = "Bomb",
UsesFuelToFire = true,
FuelUsedToFire = 0.33,
},
{
AboveWaterTargetsOnly = true,
Expand Down
18 changes: 10 additions & 8 deletions units/UEA0304/UEA0304_unit.bp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ UnitBlueprint{
AutoLandTime = 1,
BankFactor = 2.5,
BankForward = false,
BreakOffDistance = 60,
BreakOffDistance = 50,
BreakOffIfNearNewTarget = true,
BreakOffTrigger = 30,
CanFly = true,
CombatTurnSpeed = 0.8,
CombatTurnSpeed = 0.9,
EngageDistance = 50,
KLift = 3,
KLiftDamping = 2.5,
Expand All @@ -20,12 +20,12 @@ UnitBlueprint{
KTurn = 0.8,
KTurnDamping = 1,
LiftFactor = 7,
MaxAirspeed = 17,
MinAirspeed = 15,
MaxAirspeed = 18,
MinAirspeed = 14,
PredictAheadForBombDrop = 3,
StartTurnDistance = 5,
TightTurnMultiplier = 0,
TurnSpeed = 0.8,
TurnSpeed = 0.9,
Winged = true,
},
Audio = {
Expand Down Expand Up @@ -232,9 +232,9 @@ UnitBlueprint{
BallisticArc = "RULEUBA_None",
BombDropThreshold = 3.5,
CollideFriendly = false,
Damage = 3100,
Damage = 3500,
DamageFriendly = true,
DamageRadius = 5.5,
DamageRadius = 7,
DamageType = "Normal",
DisplayName = "Small Yield Nuclear Bomb",
EffectiveRadius = 25,
Expand Down Expand Up @@ -266,7 +266,7 @@ UnitBlueprint{
RackSalvoReloadTime = 0,
RackSalvoSize = 1,
RackSlavedToTurret = false,
RateOfFire = 10/80, --10/integer interval in ticks
RateOfFire = 10/55, --10/integer interval in ticks
TargetPriorities = {
"TECH4",
"TECH3 STRUCTURE",
Expand All @@ -280,6 +280,8 @@ UnitBlueprint{
WeaponCategory = "Bomb",
WeaponRepackTimeout = 0,
WeaponUnpacks = false,
UsesFuelToFire = true,
FuelUsedToFire = 0.5,
},
{
Audio = {
Expand Down
18 changes: 10 additions & 8 deletions units/URA0304/URA0304_unit.bp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ UnitBlueprint{
AutoLandTime = 1,
BankFactor = 2.5,
BankForward = false,
BreakOffDistance = 60,
BreakOffDistance = 50,
BreakOffIfNearNewTarget = true,
BreakOffTrigger = 30,
CanFly = true,
CombatTurnSpeed = 0.8,
CombatTurnSpeed = 0.9,
EngageDistance = 50,
KLift = 3,
KLiftDamping = 2.5,
Expand All @@ -20,12 +20,12 @@ UnitBlueprint{
KTurn = 0.8,
KTurnDamping = 1,
LiftFactor = 7,
MaxAirspeed = 17,
MinAirspeed = 15,
MaxAirspeed = 18,
MinAirspeed = 14,
PredictAheadForBombDrop = 3,
StartTurnDistance = 5,
TightTurnMultiplier = 0,
TurnSpeed = 0.8,
TurnSpeed = 0.9,
Winged = true,
},
Audio = {
Expand Down Expand Up @@ -224,9 +224,9 @@ UnitBlueprint{
BallisticArc = "RULEUBA_None",
BombDropThreshold = 3.5,
CollideFriendly = false,
Damage = 2750,
Damage = 3100,
DamageFriendly = true,
DamageRadius = 6.5,
DamageRadius = 8,
DamageType = "Normal",
DisplayName = "Neutron Bomb",
EffectiveRadius = 25,
Expand Down Expand Up @@ -258,7 +258,7 @@ UnitBlueprint{
RackSalvoReloadTime = 0,
RackSalvoSize = 1,
RackSlavedToTurret = false,
RateOfFire = 10/80, --10/integer interval in ticks
RateOfFire = 10/55, --10/integer interval in ticks
TargetPriorities = {
"TECH4",
"TECH3 STRUCTURE",
Expand All @@ -269,6 +269,8 @@ UnitBlueprint{
TargetRestrictDisallow = "UNTARGETABLE",
Turreted = false,
WeaponCategory = "Bomb",
UsesFuelToFire = true,
FuelUsedToFire = 0.5,
},
{
Audio = {
Expand Down
16 changes: 9 additions & 7 deletions units/XSA0304/XSA0304_unit.bp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ UnitBlueprint{
AutoLandTime = 1,
BankFactor = 2.5,
BankForward = false,
BreakOffDistance = 60,
BreakOffDistance = 50,
BreakOffIfNearNewTarget = true,
BreakOffTrigger = 30,
CanFly = true,
CombatTurnSpeed = 0.8,
CombatTurnSpeed = 0.9,
EngageDistance = 50,
KLift = 3,
KLiftDamping = 2.5,
Expand All @@ -20,12 +20,12 @@ UnitBlueprint{
KTurn = 0.8,
KTurnDamping = 1,
LiftFactor = 7,
MaxAirspeed = 17,
MinAirspeed = 15,
MaxAirspeed = 18,
MinAirspeed = 14,
PredictAheadForBombDrop = 3,
StartTurnDistance = 5,
TightTurnMultiplier = 0,
TurnSpeed = 0.8,
TurnSpeed = 0.9,
Winged = true,
},
Audio = {
Expand Down Expand Up @@ -216,7 +216,7 @@ UnitBlueprint{
CollideFriendly = false,
Damage = 3000,
DamageFriendly = true,
DamageRadius = 6,
DamageRadius = 7,
DamageType = "Normal",
DisplayName = "Zhanasee Strategic Bomb",
EffectiveRadius = 25,
Expand Down Expand Up @@ -247,7 +247,7 @@ UnitBlueprint{
RackSalvoReloadTime = 0,
RackSalvoSize = 1,
RackSlavedToTurret = false,
RateOfFire = 10/80, --10/integer interval in ticks
RateOfFire = 10/55, --10/integer interval in ticks
TargetPriorities = {
"TECH4",
"TECH3 STRUCTURE",
Expand All @@ -268,6 +268,8 @@ UnitBlueprint{
FiringTolerance = 2,
Label = "DeathImpact",
WeaponCategory = "Death",
UsesFuelToFire = true,
FuelUsedToFire = 0.33,
},
},
Wreckage = {
Expand Down
Loading