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

Recover latest changes from 1.04+ (Jundiyy) #213

Closed
wants to merge 2 commits into from

Conversation

xezon
Copy link
Collaborator

@xezon xezon commented Sep 5, 2021

Jundiyy sent a file with the name Beta 3 Alpha 2 and asked to add it to GitHub. I compared it with Beta 3 and it revealed this diff. I transferred it to our code by hand. Please check.

@xezon xezon added the Design Is a matter of game design label Sep 5, 2021
@xezon xezon requested a review from commy2 September 5, 2021 09:34
@xezon xezon self-assigned this Sep 5, 2021
ButtonImage = SUToxAmbsh2
ButtonBorderType = UPGRADE ; Identifier for the User as to what kind of button this is
End

CommandButton Chem_Command_PurchaseScienceRebelAmbush3
Command = PURCHASE_SCIENCE
Science = SCIENCE_RebelAmbush3
Science = Chem_SCIENCE_RebelAmbush3
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This interferes with the AI's ability to use Ambush.

@commy2
Copy link
Collaborator

commy2 commented Sep 5, 2021

This PR should be split into independent parts, depending on what they actually change. Easier to review. Some of the changes here conflict with other PR's, partly because they do the same or similar things. As for the changes, most seem reasonable as they are either trivial cameo changes, or reverts of changes in 1.04+ that fell out of favour.

@@ -20971,7 +20971,7 @@ Object Chem_GLAInfantryRebel

UpgradeCameo1 = Chem_Upgrade_GLAAnthraxGamma
UpgradeCameo2 = Upgrade_InfantryCaptureBuilding
UpgradeCameo3 = Upgrade_GLACamouflage
;UpgradeCameo3 = Upgrade_GLACamouflage ; Patch104p @bugfix 05/09/2021 Removed cameo
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not clear to me that this cameo should be removed. The Toxin Rebel actually benefits from the Camouflage upgrade, despite the fact that the Tox faction cannot purchase it using their own buildings.

@@ -4845,7 +4845,7 @@ Object Demo_GLATunnelNetwork
; Patch104p @bugfix commy2 03/09/2021 Fix missing Demolitions upgrade icon on Base defense.

UpgradeCameo1 = Demo_Upgrade_SuicideBomb
;UpgradeCameo2 = NONE
;UpgradeCameo2 = Upgrade_GLACamoNetting
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't see the purpose of this line. The building has no Camo Netting for the Demolutions General.

@@ -5450,7 +5450,7 @@ Object Demo_GLAStingerSite

UpgradeCameo1 = Upgrade_GLAAPRockets
UpgradeCameo2 = Demo_Upgrade_SuicideBomb
;UpgradeCameo3 = NONE
;UpgradeCameo3 = Upgrade_GLACamoNetting
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above.

@@ -25,7 +25,8 @@ Object MultiplayerBeacon
; *** ENGINEERING parameters ***
; Patch104p: Add STRUCTURE to avoid game crash where beacon is selected together with units.
; Patch104p: Add IMMOBILE to satisfiy Game Engine expectation that structure is immobile.
KindOf = UNATTACKABLE SELECTABLE NO_COLLIDE ALWAYS_VISIBLE ALWAYS_SELECTABLE STRUCTURE IMMOBILE
; Patch104p: Add IMMUNE_TO_CAPTURE
KindOf = UNATTACKABLE SELECTABLE NO_COLLIDE ALWAYS_VISIBLE ALWAYS_SELECTABLE STRUCTURE IMMOBILE IMMUNE_TO_CAPTURE
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is still debate on this change. See #202

@@ -947,7 +947,7 @@ Object Infa_ChinaInfantryTankHunter
SelectPortrait = SNTankHunter_L
ButtonImage = SNTankHunter

UpgradeCameo1 = UPGRADE:Fanaticism
UpgradeCameo1 = Upgrade_Fanaticism ; Patch104p @bugfix 05/09/2021 Fixed cameo typos
Copy link
Collaborator

@commy2 commy2 Sep 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd argue the unit should sport Nationalism and Fanatism as upgrade icon (even though they share the same art), as it benefits from both, independently. Same for Minigunner.

@xezon
Copy link
Collaborator Author

xezon commented Sep 5, 2021

I would prefer if Jundiyy can take over from here. I am not confident that I will not make mistake here.

@xezon xezon removed their assignment Sep 5, 2021
@commy2
Copy link
Collaborator

commy2 commented Sep 5, 2021

Parts:

  • Demo Rebel Ambush fix
  • Tox Rebel Ambush fix
  • Revert Composite tweak for
  • AirF_AmericaTankMicrowave
  • AmericaTankCrusader (2)
  • AmericaTankPaladin
  • AmericaTankMicrowave
  • Lazr_AmericaTankCrusader (2)
  • SupW_AmericaTankMicrowave
  • Demo Rebel Booby trap
  • Fix Demo_GLAInfantryTerrorist 1.04+ bug
  • Fix SupW_AmericaAirfield cost
  • Fanatisicm upgrade icon
  • SCUD Launcher AP Rockets upgrade icon
  • Paladin $1000

@commy2
Copy link
Collaborator

commy2 commented Sep 5, 2021

Scud Launcher AP Rockets upgrade icon was already fixed in #207

@Jundiyy
Copy link
Collaborator

Jundiyy commented Sep 5, 2021

All good, just need the Paladin Tank change.

@xezon xezon added Invalid Invalid and removed Design Is a matter of game design labels Sep 6, 2021
@commy2
Copy link
Collaborator

commy2 commented Sep 6, 2021

Close because all done in separate PR's - except Ambush, which is on my task list.

@commy2 commy2 closed this Sep 6, 2021
@xezon xezon removed the OngoingDiscussion Requires further discussion label Sep 6, 2021
@xezon xezon deleted the recover-104p-latest-balance branch September 8, 2021 18:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Invalid Invalid
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants