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

Various Hotbuild fixes #2039

Merged
merged 3 commits into from Jun 5, 2017

Conversation

Projects
None yet
4 participants
@MrNukealizer
Copy link
Collaborator

MrNukealizer commented May 28, 2017

  • Fix the upgrade key not working for engineering stations and mod structures.
  • Fix the key for T3 torp bombers and transports doing nothing because it was trying to upgrade.
  • Add a keybinding for T3 mobile AA.
  • Fix upgrade key label always going on HQ when the key actually upgrades to support factory.
  • Add keybinding entries for support factories.
local bpId = unit:GetBlueprint().BlueprintId
local cmd = upgradeTab[bpId]
local bp = unit:GetBlueprint()
local cmd = bp.General.UpgradesTo

This comment has been minimized.

Copy link
@CookieNoob

CookieNoob May 29, 2017

Member

are you sure this wont break upgrades of factories to support/HQ factories?

Currently a t1 factory upgrades to a support factory as long as there is an HQ factory and directly to an HQ when there is none.

This comment has been minimized.

Copy link
@MrNukealizer

MrNukealizer May 29, 2017

Author Collaborator

Ok, it actually does break that. If that functionality is to be preserved I'll also need to change the hotkey label code. It puts the upgrade key label on the HQ, yet pressing the key builds the support factory.

@MrNukealizer MrNukealizer added the ui label May 29, 2017

@@ -477,6 +478,9 @@ function OnSelectionChanged(oldSelection, newSelection, added, removed)
if not hotkeyLabelsOnSelectionChanged then
hotkeyLabelsOnSelectionChanged = import('/lua/keymap/hotkeylabels.lua').onSelectionChanged
end
if not upgradeTab then
upgradeTab = import('/lua/keymap/upgradeTab.lua').upgradeTab

This comment has been minimized.

Copy link
@TheKeyBlue

TheKeyBlue May 29, 2017

Contributor

What is the goal/point of having it initialize here and not just have it be initialized from the start?
Some kind of efficiency improvement?

This comment has been minimized.

Copy link
@MrNukealizer

MrNukealizer May 29, 2017

Author Collaborator

Many, many files import /lua/ui/game/gamemain.lua. At the moment there's no real need to avoid importing upgradeTab in the main section, but it goes with the other file imported right above it, and circular dependencies are all too common with gamemain.lua.

This comment has been minimized.

Copy link
@TheKeyBlue

TheKeyBlue May 30, 2017

Contributor

ah I see. I guess that makes sense.

@aeoncleanse aeoncleanse changed the base branch from develop to deploy/fafdevelop Jun 5, 2017

@aeoncleanse aeoncleanse merged commit 0d8ff21 into FAForever:deploy/fafdevelop Jun 5, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@MrNukealizer MrNukealizer deleted the MrNukealizer:Hotbuild branch Jun 15, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.