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

Update mod to release-20230225 #222

Merged
merged 20 commits into from
Jul 4, 2023

Conversation

penev92
Copy link
Member

@penev92 penev92 commented Feb 25, 2023

It is finally time to update the mod to OpenRA's release 20230225.

To make this as simple as possible for everyone involved I tried to follow the commit structure and all the ideas behind OpenRA/ra2#806.

To ease the review as much as possible this uses the latest ModSDK version from OpenRA/OpenRAModSDK#183, the same as TDHD's release-20230225 uses.

This is still WIP, but I'm opening it so hopefully the reviewing process can gradually get going and also so someone else doesn't waste effort doing the same work at the same time.

Supersedes #201.
Closes #212.

@penev92 penev92 marked this pull request as draft February 25, 2023 15:31
penev92 added 4 commits March 21, 2023 02:08
Updated suggested VSCode extensions, added a launch profile and a task for running the Utility.
Plus additionally backported OpenRA ModSDK PR 185.
In order to match the engine project files and target framework/engine version.
@penev92 penev92 force-pushed the updateModTo20230225 branch from f6d60a4 to 0213c5a Compare March 21, 2023 01:40
@penev92 penev92 marked this pull request as ready for review March 21, 2023 01:41
@penev92
Copy link
Member Author

penev92 commented Mar 21, 2023

Added a bunch of fixes, updates and polish. This should now be good to go.

penev92 added 14 commits March 22, 2023 14:49
 - Changed D2.dll assembly location
 - Added VideoFormats and TerrainFormats (OpenRA PRs 18728 and 18773)
 - Updated GameSpeeds definitions (OpenRA PR 19297)
 - Added ingame-observer.yaml (The common one was removed in OpenRA PR 20436, so we need to add our own copy of it.)
 - Added references to new common chrome layout files (settings, chat, notifications, etc.) OpenRA PRs: 18948, 19458, 19460, 19461
 - Updated translation setup (OpenRA PRs 18959 and 19847)
 - Added DefaultOrderGenerator (OpenRA PR 19504)
 - Removed invalid ColorValidator node (??)
The utility didn't add the ControlGroups trait because that is added based on the Selection trait and d2 uses its own D2Selection trait. Courtesy of OpenRA PR 19666.
The tileset should reference a palette reference, not a file name.
The utility removed the ResourceType definitions but didn't add the new ResourceLayer, ResourceRenderer and EditorResourceRenderer configurations. Courtesy of OpenRA PR 19090.
Copied checkbox tick and cross definitions from D2k.
Addressed the code style rule violations that `make check` would error on.
These were all things that produce warnings or errors from the linter. Some of them have not been updated in years, some are as old as the git history in this repository.
@penev92 penev92 force-pushed the updateModTo20230225 branch from 0213c5a to 48a0b10 Compare March 22, 2023 13:26
@penev92
Copy link
Member Author

penev92 commented Mar 22, 2023

Ok, apparently I was wrong - this was not ready. Both make check and make test were going nuts and I hadn't noticed.
So I added a bunch of code and yaml fixes, some fixing issues from many years ago.
It should be good to go now.

@penev92
Copy link
Member Author

penev92 commented Apr 6, 2023

@evgeniysergeev are you able to review? I'm most interested in some things from commit Manual mod updates PART 9, like the Devastator overloading.

@penev92 penev92 requested a review from evgeniysergeev April 6, 2023 10:10
@evgeniysergeev
Copy link
Collaborator

@evgeniysergeev are you able to review? I'm most interested in some things from commit Manual mod updates PART 9, like the Devastator overloading.

Sorry for late answer. I'm trying to review now.

evgeniysergeev added a commit that referenced this pull request Jul 4, 2023
mainmenu-prompts.yaml was commented in d2 mod.
But it is used in latest versions of OpenRA and need to be
uncommented again.
This is also needed for PR #222 (Update mod to release-20230225)
Copy link
Collaborator

@evgeniysergeev evgeniysergeev Jul 4, 2023

Choose a reason for hiding this comment

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

BuildableTerrainOverlay is replaced with https://github.com/OpenRA/d2/blob/master/OpenRA.Mods.D2/Graphics/D2BuildingPlacementRenderable.cs
Screenshot 2023-07-04 225032
Is concfoot.shp
Screenshot 2023-07-04 225355
it still used somewhere?

Copy link
Collaborator

Choose a reason for hiding this comment

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

After the update, spice ends very quickly on maps. In the original game it ends not so fast.

@evgeniysergeev
Copy link
Collaborator

@penev92 , I think this is great PR. All this comments above can be fixed later, and changes can be merged. But if you have a time, can you take a look at comments?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Pips were not used in the original game. Is it important to add them in the update?
Issue #148 was created to remove pips.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Maybe also replace
~^SupportDir|maps/d2/release-20210321: User
with
~^SupportDir|maps/d2/release-20230225: User ?

@evgeniysergeev
Copy link
Collaborator

@evgeniysergeev are you able to review? I'm most interested in some things from commit Manual mod updates PART 9, like the Devastator overloading.

Don't know what should happen when Devastator is overloaded. Is this overloading exists in original game? :-)

Copy link
Collaborator

@evgeniysergeev evgeniysergeev left a comment

Choose a reason for hiding this comment

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

Will fix issues from comments after the merge

@evgeniysergeev evgeniysergeev merged commit 87f3bd5 into OpenRA:master Jul 4, 2023
@penev92 penev92 deleted the updateModTo20230225 branch July 22, 2023 11:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update to use latest OpenRA engine
2 participants