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

RushOrders 1.6 update #411

Open
wants to merge 11 commits into
base: develop
Choose a base branch
from
Open

Conversation

Vindeflei
Copy link

I updated RushOrders for 1.6, tested it on my machine, and it appears to be working. Asking to merge back so others can use it too!

Adds new method to replace removed Farm.getBuildingUnderConstruction and replaces all calls to the removed method with the new one.
Since the copper pan can now be upgraded.
Used the new Building.getData to replace removed BluePrint when calculating building rush price.
There is no longer a method in Utilities for getting upgrade prices, so prices have been hardcoded in.
Fixing the level-price key-value stuff
@Vindeflei
Copy link
Author

Oh, also, when I updated the packages for RushOrders it automatically updated those packages for the other mods that used them, it looked like. That's why so many other csproj files are changed.

@Vindeflei
Copy link
Author

Oop, I figured out how to make the price values not hardcoded, one moment!!

@Scott-mods
Copy link

You might want to rebase & squash some of those commits ^^

@Vindeflei
Copy link
Author

Oh, also, I couldn't find a way to make Clint say the dialogue, since all DrawDialogue methods required a path to a file in the Content folder, so the dialogue is "said" by the narrator now, similar to the "You got a thing!" dialogues

@Vindeflei
Copy link
Author

And each of my commits is titled to address the individual parts of the code I changed, which are all different. If I squashed them, they'd be more confusing, in my opinion, because I couldn't think of concise ways to communicate the wide variety of things they address.

@Scott-mods
Copy link

Yeah but 2 weeks from now, are people going to care that there were 20 partial fixes to 20 parts of RushOrders, or 1 commit that made it compatible with 1.6 ?

@Khitiara
Copy link

you can just squash during the merge. no real reason to squash here.

@spacechase0
Copy link
Owner

Well, there is the problem of all those extra project files in the PR...

@Vindeflei
Copy link
Author

Hmm. I'll see if I can fix that, one moment.

@Vindeflei
Copy link
Author

Did that fix it? Or is the changed solution file also a problem?

@spacechase0
Copy link
Owner

Yeah, if you don't mind could you take that out of the PR too?

@Vindeflei
Copy link
Author

Had to eat dinner first, but now it's done.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants