Skip to content

Commit ccf29db

Browse files
committed
Moar fixes
1 parent ae2b5a2 commit ccf29db

21 files changed

Lines changed: 3468 additions & 63 deletions

‎ChangeLog.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ Upto but not including scripted_triggers
1313
FUTURE: Update GHW regions, yi, bai, shatuo culture histories
1414

1515
TODOs:
16+
- Map:
17+
- Hide Asia et al with clouds
18+
- GUI:
19+
- Fix nake priests symbol not showing correctly
1620
- Files:
1721
- 000_BP_game_start.txt - 1145-1151
1822
- common/great_projects/types/00_natural_disaters.txt - Change innovation discounts slightly

‎WtWSMS/common/culture/pillars/00_language.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7035,7 +7035,7 @@ language_vietnamese = {
70357035
multiply = same_language_choice_factor
70367036
}
70377037
else_if = {
7038-
limit = { has_cultural_parameter = language_branch_khasic }
7038+
limit = { has_cultural_parameter = language_branch_mon_khmer }
70397039
multiply = same_language_branch_choice_factor
70407040
}
70417041
else_if = {

‎WtWSMS/common/culture/traditions/00_societal_traditions_BP_overwrite.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ tradition_music_theory = {
697697
if = {
698698
limit = { # AI should avoid stacking traditions for court positions
699699
OR = {
700-
culture_tradition:tradition_lifestyle_poetry = { is_in_list = traits }
700+
culture_tradition:tradition_poetry = { is_in_list = traits }
701701
culture_tradition:tradition_tgp_ephemeral_grace = { is_in_list = traits }
702702
}
703703
}
@@ -707,7 +707,7 @@ tradition_music_theory = {
707707
}
708708

709709
##### Changed from Vanilla: Made transitively unselectable with new traditions
710-
tradition_lifestyle_poetry = {
710+
tradition_poetry = {
711711
category = societal
712712

713713
layers = {
@@ -740,10 +740,10 @@ tradition_lifestyle_poetry = {
740740
##### Changed from Vanilla ^^^^^
741741

742742
parameters = {
743-
lifestyle_poet_trait_gives_bonuses = yes
744-
lifestyle_poet_trait_more_common = yes
745-
characters_are_better_court_lifestyle_poets = yes
746-
better_court_lifestyle_poets = yes
743+
poet_trait_gives_bonuses = yes
744+
poet_trait_more_common = yes
745+
characters_are_better_court_poets = yes
746+
better_court_poets = yes
747747
}
748748

749749
character_modifier = {

‎WtWSMS/common/culture/traditions/01_fp1_traditions_BP_overwrite.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,8 @@ tradition_fp1_northern_stories = {
289289
NOT = { culture_tradition:tradition_runestones = { is_in_list = traits } }
290290
}
291291
custom_tooltip = {
292-
text = cannot_have_tradition_lifestyle_poetry
293-
NOT = { culture_tradition:tradition_lifestyle_poetry = { is_in_list = traits } }
292+
text = cannot_have_tradition_poetry
293+
NOT = { culture_tradition:tradition_poetry = { is_in_list = traits } }
294294
}
295295
custom_tooltip = {
296296
text = cannot_have_tradition_storytellers

‎WtWSMS/common/culture/traditions/dharmachakra_traditions.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ tradition_tamil_thai = {# Tamil Mother language
2121
NOT = { culture_tradition:tradition_music_theory = { is_in_list = traits } }
2222
}
2323
custom_tooltip = {
24-
text = cannot_have_tradition_lifestyle_poetry
25-
NOT = { culture_tradition:tradition_lifestyle_poetry = { is_in_list = traits } }
24+
text = cannot_have_tradition_poetry
25+
NOT = { culture_tradition:tradition_poetry = { is_in_list = traits } }
2626
}
2727
}
2828
##### Changed from Vanilla ^^^^^
@@ -77,7 +77,7 @@ tradition_tamil_thai = {# Tamil Mother language
7777
value = 100
7878
if = {
7979
limit = { # Avoid stacking similar traditions
80-
culture_tradition:tradition_lifestyle_poetry = { is_in_list = traits }
80+
culture_tradition:tradition_poetry = { is_in_list = traits }
8181
}
8282
multiply = 0.25
8383
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+


‎WtWSMS/common/governments/zzzzz_primitive_government_types.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
may_elevate_co_monarch
4444
# Use flags instead of has_government for moddability if possible (i.e., wherever not visible to the player).
4545
government_is_tribal
46+
government_is_tribal_excluding_wanua
4647
government_is_settled
4748
government_uses_high_tribal_organization
4849
can_hold_castles_and_tribes #Just informative
@@ -101,6 +102,7 @@ tribal_government = {
101102
may_elevate_co_monarch
102103
# Use flags instead of has_government for moddability if possible (i.e., wherever not visible to the player).
103104
government_is_tribal
105+
government_is_tribal_excluding_wanua
104106
government_is_settled
105107
government_can_migrate
106108
cannot_advance_beyond_tribal_era #Just informative

‎WtWSMS/common/great_projects/types/00_natural_disasters_BP_overwrite.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ great_project_earthquake = {
595595
}
596596
# Innovation-based cost discounts
597597
if = {
598-
limit = { culture = { has_innovation = innovation_development_01 } }
598+
limit = { culture = { has_innovation = innovation_development_bp_00 } }
599599
multiply = {
600600
add = 0.9
601601
desc = great_project_contribution_cost_innovation_development_01

‎WtWSMS/common/landed_titles/BP_e_tibet.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3451,7 +3451,7 @@ e_tibet = {
34513451

34523452
k_xia = { # Minya/Minyak
34533453
color = { 110 90 230 }
3454-
capital = c_xingqing
3454+
capital = c_zhenfan
34553455

34563456
cultural_names = {
34573457
name_list_tangut = cn_mjinjaa

‎WtWSMS/common/on_action/BP_error_suppression.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ orphaned_events = {
157157
1 = tgp_japan_general.8800
158158
1 = tgp_japan_general.9550
159159
1 = tgp_silk_road_events.0010
160-
1 = tutorial.0001
161160
}
162161
}
163162

0 commit comments

Comments
 (0)