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.

Sign up for GitHub

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

Jump to bottom

Magic trees new doctrines adaptation #787

Merged
merged 104 commits into from
Mar 8, 2023
Merged

Magic trees new doctrines adaptation #787

merged 104 commits into from
Mar 8, 2023

Conversation

MemeWizard
Copy link
Contributor

@MemeWizard MemeWizard commented Dec 3, 2021 •
edited by Cade17
Loading

Changelog:

  • Added new spirit/neutral/decay set of elemental mage traits and a system to change which one character has
  • Idolised elemental doctrines also change character's piety when character's relationship with elements happens

Developer changelog:

  • Adapted focuses and lifestyles triggers, updated values
  • Merged some files
  • Deleted magical perks on_actions because they have delay and its breaks character traits and mana on gamestart
  • Refactored trait removing when you reset perks

Tests:

  • There are no errors in wc files in Documents\Paradox Interactive\Crusader Kings III\logs\error.log except portrait_decals.cpp:101
  • The mod takes less than 5.5 GB in the Task Manager (Windows)

How to test:

  • Check that in-game tooltips provide enough info about the new mechanic
  • Check that the new mechanic works
    • Use new character debug interaction to change character's relationship with elements

@MemeWizard
Merge branch 'magic_trees' into magic-trees-new-doctrines
de48b0c 
# Conflicts:
#	localization/english/religion/wc_magic_doctrines_l_english.yml
@MemeWizard
Merge branch 'changed-elemental-doctrines' into magic-trees-new-doctr…
c6143fc 
…ines-adaptation

# Conflicts:
#	localization/english/religion/wc_magic_doctrines_l_english.yml
@MemeWizard
Update wc_magic_doctrines_l_english.yml
7642c3e 
GDC
@MemeWizard
Merge branch 'auto_selection_weight-fix' into magic-trees-new-doctrin…
835dfa9 
…es-adaptation
@MemeWizard
Merge branch 'auto_selection_weight-fix' into magic-trees-new-doctrin…
bcd31ac 
…es-adaptation
@MemeWizard
Update wc_lifestyle_traits.txt
860c381 
GDC
@MemeWizard
Update wc_lifestyle_traits.txt
1f04b2a 
GDC
@MemeWizard
Update wc_lifestyle_traits.txt
87390a3 
GDC
@MemeWizard
Update wc_lifestyle_traits.txt
88b40cb 
GDC
@MemeWizard
dds for new traits
7893e75 
GDC
@MemeWizard
Update wc_lifestyle_traits_effects.txt
a8983c1 
GDC
@MemeWizard
Revert "Update wc_lifestyle_traits.txt"
984599f 
This reverts commit 88b40cb.
GDC
@MemeWizard
Fixed a few errors
0b78e99 
GDC
@MemeWizard
Merge branch 'history_adding_perks' into magic-trees-new-doctrines-ad…
9ace48e 
…aptation
@MemeWizard
Merge branch 'knowledge-overflow-magic-adaptation' into magic-trees-n…
9c97a69 
…ew-doctrines-adaptation
@MemeWizard
Update hud.gui
5968432 
Fixed observer error spam
GDC
@MemeWizard
Merge branch 'knowledge-overflow-magic-adaptation' into magic-trees-n…
43e6d46 
…ew-doctrines-adaptation
@MemeWizard
Merge branch 'auto_selection_weight-fix' into magic-trees-new-doctrin…
d53b9b6 
…es-adaptation
@MemeWizard
fixed an error related to focus values
286f398 
GDC
@MemeWizard
fixed traits not appearing and mana not being full on the first day
50880ab 
GDC
@MemeWizard
changed doctrines in history
10da014 
GDC
@MemeWizard
changes to focus and lifestyles triggers
90785fb 
GDC
@MemeWizard
elemental variables and effects
c9bccbf 
GDC
@MemeWizard
changed tooltip localization
407507c 
GDC
@MemeWizard
Update window_character_lifestyle.gui
716c574 
GDC
@MemeWizard
Update wc_mana_effects.txt
e701454 
GDC
@MemeWizard
ranamed gui file
5005632 
GDC
@MemeWizard
Create wc_elemental_progressbars.gui
7b46237 
GDC
@MemeWizard
Custom loc updated
3ca47c5 
GDC
@MemeWizard
Merge branch 'changed-elemental-doctrines' into magic-trees-new-doctr…
37d41e3 
…ines-adaptation

# Conflicts:
#	common/religion/religions/air_group.txt
#	common/religion/religions/arcane_group.txt
#	common/religion/religions/avian_group.txt
#	common/religion/religions/deathbringer.txt
#	common/religion/religions/doombringer.txt
#	common/religion/religions/earth_group.txt
#	common/religion/religions/fel_group.txt
#	common/religion/religions/fire_group.txt
#	common/religion/religions/light_group.txt
#	common/religion/religions/necromancy_group.txt
#	common/religion/religions/void_group.txt
#	common/religion/religions/water_group.txt
#	localization/english/religion/wc_magic_doctrines_l_english.yml
@MemeWizard
Copy link
Contributor Author

a-d should have been fixed by e32f463

As for others that are not related to changes in this PR - I made #886 #887 #888 issues in order to not forget about these errors

Thanks for review <3

@MemeWizard
Merge branch 'magic_trees' into magic-trees-new-doctrines-adaptation
07de788 
# Conflicts:
#	common/decisions/test_decision.txt
@MemeWizard MemeWizard requested review from a team and zumbak04 and removed request for zumbak04 February 19, 2022 05:07
TheGroxEmpire
TheGroxEmpire reviewed Feb 22, 2022
View reviewed changes
Copy link
Contributor

@TheGroxEmpire TheGroxEmpire left a comment

Choose a reason for hiding this comment

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

  • Is there a way to check the current elemental good will? I can't seem to determine the value without looking at the affected trait.

localization/english/wc_game_concepts_lifestyles_l_english.yml Outdated Show resolved Hide resolved
@TheGroxEmpire
Copy link
Contributor

  • It would be nice if the elemental goodwill bar has this dropdown. Instead of dumping the info just right below it:

image
image

  • Same thing with the trait changes. I think it could be done in tooltip:

image

zumbak04
zumbak04 approved these changes Apr 2, 2022
View reviewed changes
Copy link
Member

@zumbak04 zumbak04 left a comment

Choose a reason for hiding this comment

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

LGTM!

@MemeWizard
Merge branch 'magic_trees' into magic-trees-new-doctrines-adaptation
52dbc9f 
# Conflicts:
#	common/character_interactions/wc_debug_interactions.txt
TheGroxEmpire
TheGroxEmpire approved these changes Apr 15, 2022
View reviewed changes
Copy link
Contributor

@TheGroxEmpire TheGroxEmpire left a comment

Choose a reason for hiding this comment

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

My suggestions have been applied. Everything LGTM!

@MemeWizard
Copy link
Contributor Author

I'm merging it into the main magic branch (#121), since it was approved.
@zumbak04 @TheGroxEmpire @Holt228 Thanks for reviews!

@MemeWizard MemeWizard merged commit 4698a19 into magic_trees Mar 8, 2023
@MemeWizard MemeWizard deleted the magic-trees-new-doctrines-adaptation branch March 8, 2023 02:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zumbak04 zumbak04 zumbak04 approved these changes

@TheGroxEmpire TheGroxEmpire TheGroxEmpire approved these changes

@Holt228 Holt228 Holt228 approved these changes

Assignees

@MemeWizard MemeWizard

Labels
maintenance 🔧 Involves code refactoring that doesn't affect game new feature ⭐ Involves adding new feature that affects game priority high ❗ Shows priority
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@MemeWizard @TheGroxEmpire @zumbak04 @Holt228