-
Notifications
You must be signed in to change notification settings - Fork 6
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
Allow realms to restore abandoned subrealms #6
Open
Zanaras
wants to merge
100
commits into
tvogt:master
Choose a base branch
from
Zanaras:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oh god this is nasty looking, and I have no idea if it'll work.
A quick and dirty explanation from Delvin_Anaris later and this should actually not kill anything now.
Figuring this out has been fun. Lets see how badly I completely screw this all up. WHEE!
Initial draft of the translation file for the new realm revival page.
Removing a translation variable that wasn't needed, and fixing what would've been a bug in the process.
Adding translation for the realm restoration event.
This is restoring a realm, not reviving one. Trying to keep everything consistent.
Adding function findDeadInferiors that builds off the work function findInferiors does to generate a list of all the dead subrealms of a given realm.
Actually, no, having this check for ALL inferiors really complicates things. If we need that function later, we can add it then.
This is as unfinished as it gets, but I'll come back and finish it when I've more time.
Added fail translations for not meeting the requirements to restore a realm.
Adding realm restore success translation.
the restoreAction method has been created that will generate the form and pass that data to the restoreSubRealm method in the RealmManager.
Added public function diplomacyRestoreTest to check that you are actually able to restore a realm. This will make sure you're a player, that your realm has inferiors, that at least 1 inferior is dead, and that you are the ruler. Not sure if that last line should be true or false though...
I'm not even going to go into how many hours and dozens of tabs I had to open in my browser to figure this all out.
Syncing
Realm revive
Merging game master into local fork.
Removing an extra period.
Updating for consistency of terms. Originally this began as "revive" but I later moved towards "restore", as revival will be a later action for recreating realms altogether.
Removed requirement to have a character selected to view realm pages.
Making it so that it doesn't give you the option to view relations if you've not selected a character, avoiding an error page.
Because otherwise i: and item: WILL break conversations.
AKA, how to tell I'm actually setting up a test server. Blah.
Commenting out items in wikilink maker
Table standardization
It is now possible to leave a settlement without moving. AMAZING.
Plural form of armoured archer has been made plural.
M&F now Twig 2.3 compliant.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is... 4 completely new methods, 1 new form, 1 new html twig, and 3 updated translation files.
And this is also why I'd like to have a test server, so I could try out more interesting things than this without accidentally, catastrophically breaking something.
This will allow rulers to restore any abandoned direct subrealm. I thought about allowing ANY subrealm of their realm, but that can 1) step on the toes of subrulers, and is 2) needless work because they can just recreate the chain from their realm down to whatever barony makes them happy.
Assuming this is all good, it also lays the groundwork for how you'd allow realms to be recreated, as well.