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.

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

Change bombers, remove Hard from Evacuation #21244

Merged
merged 1 commit into from
Dec 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion mods/ra/languages/lua/en.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ keep-einstein-alive-at-all-costs = Keep Einstein alive at all costs.
find-einstein-crashed-helicopter = Find Einstein's crashed helicopter.
destroy-sam-sites = Destroy the SAM sites.
hold-position-protect-base = Hold your position and protect the base.
keep-civilians-alive = Do not lose more than { $units } units.
do-not-lose-more-than = Do not lose more than { $units } units.
take-out-the-soviet-power-grid = Take out the Soviet power grid.

## exodus
Expand Down
7 changes: 3 additions & 4 deletions mods/ra/maps/evacuation/evacuation.lua
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,7 @@ end

SendParabombs = function()
local proxy = Actor.Create("powerproxy.parabombs", false, { Owner = Soviets })
proxy.TargetAirstrike(ParabombPoint1.CenterPosition, (BadgerEntryPoint2.CenterPosition - ParabombPoint1.CenterPosition).Facing)
proxy.TargetAirstrike(ParabombPoint2.CenterPosition, (Map.CenterOfCell(BadgerEntryPoint2.Location + CVec.New(0, 3)) - ParabombPoint2.CenterPosition).Facing)
proxy.TargetAirstrike(ParabombPoint1.CenterPosition, (ParabombPoint1.CenterPosition - BadgerEntryPoint2.CenterPosition).Facing)
proxy.Destroy()
end

Expand Down Expand Up @@ -296,7 +295,7 @@ SpawnTanya = function()

if Difficulty ~= "easy" and Allies1.IsLocalPlayer then
Trigger.AfterDelay(DateTime.Seconds(2), function()
Media.DisplayMessage(UserInterface.Translate("tanya-rules-of-engagement"), UserInterface.Translate("tanya"))
Media.DisplayMessageToPlayer(Allies1, UserInterface.Translate("tanya-rules-of-engagement"), UserInterface.Translate("tanya"))
end)
end
end
Expand Down Expand Up @@ -348,7 +347,7 @@ WorldLoaded = function()
DestroySamSitesObjective = AddPrimaryObjective(Allies1, "destroy-sam-sites")

HoldPositionObjective = AddPrimaryObjective(Allies2, "hold-position-protect-base")
local dontLoseMoreThan = UserInterface.Translate("keep-civilians-alive", { ["units"] = DeathThreshold[Difficulty] })
local dontLoseMoreThan = UserInterface.Translate("do-not-lose-more-than", { ["units"] = DeathThreshold[Difficulty] })
LimitLossesObjective = AddSecondaryObjective(Allies2, dontLoseMoreThan)
CutSovietPowerObjective = AddSecondaryObjective(Allies2, "take-out-the-soviet-power-grid")

Expand Down
2 changes: 1 addition & 1 deletion mods/ra/maps/evacuation/map.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1600,7 +1600,7 @@ Actors:
Location: 26,100
Owner: Neutral
ParabombPoint1: waypoint
Location: 39,105
Location: 42,106
Owner: Neutral
ParabombPoint2: waypoint
Location: 39,108
Expand Down
1 change: 0 additions & 1 deletion mods/ra/maps/evacuation/rules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ World:
Values:
easy: options-difficulty.easy
normal: options-difficulty.normal
hard: options-difficulty.hard
Default: normal
TimeLimitManager:
TimeLimitLocked: True
Expand Down