Skip to content

Commit 6b06f11

Browse files
schwarherzschwarherz
authored
Merge pull request #199 from ck2plus/bugfixing
Bugfixing
2 parents 83ee7c4 + e2d3bfa commit 6b06f11

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+5794
-290
lines changed

‎CK2Plus.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@ dependencies = {"CleanSlate"}
66
replace_path = "history/provinces"
77
replace_path = "history/titles"
88
replace_path = "history/wars"
9-
replace_path = "history/technology"
109
replace_path = "common/buildings"
1110
replace_path = "common/trade_routes"

‎CK2Plus/common/dynasties/000_CK2Plus_frankish.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232
culture = "frankish"
3333
}
3434
1000252129 = {
35-
name = "de Piémont"
35+
name = "de Pi�mont"
3636
culture = "frankish"
3737
}

‎CK2Plus/common/landed_titles/01_special.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -650,8 +650,8 @@ e_roman_empire = {
650650
purple_born_heirs = yes
651651
dignity = 100
652652
short_name = yes
653-
title = EMPEROR
654-
title_female = EMPRESS
653+
title = TITLE_EMPEROR
654+
title_female = TITLE_EMPRESS
655655

656656
han = "Dai Qin"
657657

‎CK2Plus/common/landed_titles/01_titular_kingdoms.txt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,18 @@ k_carpathia = {
6464
slavic_pagan_reformed = 5 # Crusade target weight
6565

6666
allow = {
67-
may_create_kingdom_trigger = yes
67+
can_create_kingdom = yes
6868
OR = {
69-
has_holder_trigger = yes
70-
is_not_titular_trigger = yes
69+
FROM = {
70+
OR = {
71+
has_holder = yes
72+
is_titular = no
73+
}
74+
}
75+
7176
ROOT = {
72-
lower_tier_than = king
77+
lower_real_tier_than = KING
78+
7379
OR = {
7480
culture = hungarian
7581
culture = ostrogothic

‎CK2Plus/common/landed_titles/02_CK2Plus_titular_duchies.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,9 +306,9 @@ d_oldenburg = {
306306
}
307307
}
308308

309-
d_pfalz = {
309+
d_pfalz = { # Palatinate
310310
color = { 203 150 143 }
311-
capital = 124
311+
capital = 195 # Worms
312312
culture = franconian
313313
short_name = yes
314314
dignity = 10

‎CK2Plus/common/objectives/000_CK2Plus_ambitions.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4168,7 +4168,7 @@ obj_befriend_relhead = {
41684168

41694169
potential = {
41704170
ai = no
4171-
religion_head = {
4171+
rightful_religious_head_scope = {
41724172
is_alive = yes
41734173
NOR = {
41744174
is_vassal_or_below = ROOT
@@ -4184,7 +4184,7 @@ obj_befriend_relhead = {
41844184
allow = {
41854185
is_adult = yes
41864186
NOT = { trait = incapable }
4187-
religion_head = {
4187+
rightful_religious_head_scope = {
41884188
same_sex = ROOT
41894189
is_adult = yes
41904190
opinion = { who = ROOT value = -25 }
@@ -4200,7 +4200,7 @@ obj_befriend_relhead = {
42004200
}
42014201

42024202
success = {
4203-
religion_head = {
4203+
rightful_religious_head_scope = {
42044204
opinion = {
42054205
who = ROOT
42064206
value = 75
@@ -4210,22 +4210,22 @@ obj_befriend_relhead = {
42104210
abort = {
42114211
OR = {
42124212
trait = incapable
4213-
NOT = { religion_head = { is_alive = yes } }
4214-
religion_head = { war_with = ROOT }
4215-
religion_head = { is_friend = ROOT }
4216-
religion_head = {
4213+
NOT = { rightful_religious_head_scope = { is_alive = yes } }
4214+
rightful_religious_head_scope = { war_with = ROOT }
4215+
rightful_religious_head_scope = { is_friend = ROOT }
4216+
rightful_religious_head_scope = {
42174217
is_liege_of = ROOT
42184218
}
42194219
NOT = {
4220-
religion_head = {
4220+
rightful_religious_head_scope = {
42214221
opinion = {
42224222
who = ROOT
42234223
value = -50
42244224
}
42254225
}
42264226
}
42274227
NOT = {
4228-
religion_head = {
4228+
rightful_religious_head_scope = {
42294229
reverse_opinion = {
42304230
who = ROOT
42314231
value = -50
@@ -4245,7 +4245,7 @@ obj_befriend_relhead = {
42454245
character_event = { id = PlusFaction.200 days = 1 } #recalculate faction moods
42464246
}
42474247
}
4248-
religion_head = {
4248+
rightful_religious_head_scope = {
42494249
add_friend = ROOT
42504250
}
42514251
if = {

‎CK2Plus/common/objectives/00_ambitions.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1778,7 +1778,7 @@ obj_become_exalted = {
17781778
lower_real_tier_than = KING
17791779
num_of_duke_titles < 4
17801780
}
1781-
wealth >= 2000
1781+
prestige >= 2000
17821782
}
17831783
trigger_else_if = {
17841784
limit = {
@@ -1790,10 +1790,10 @@ obj_become_exalted = {
17901790
lower_real_tier_than = EMPEROR
17911791
num_of_king_titles < 4
17921792
}
1793-
wealth >= 3000
1793+
prestige >= 3000
17941794
}
17951795
trigger_else = {
1796-
wealth >= 4000
1796+
prestige >= 4000
17971797
}
17981798
}
17991799

‎CK2Plus/common/objectives/00_focuses.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ focus_seduction = {
211211

212212
allow = {
213213
is_adult = yes
214-
prisoner = yes
214+
prisoner = no
215215
is_incapable = no
216216
is_not_ascetic_trigger = yes
217217

‎CK2Plus/common/on_actions/000_CK2Plus_duel_engine.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
# FROMFROM is the liege of the commander of the opposing side
33
on_combat_pulse = {
44
random_events = {
5-
DuelEngine.500 # Legacy - Disabled in event trigger
5+
10 = DuelEngine.500 # Legacy - Disabled in event trigger
66
}
77
}

‎CK2Plus/common/on_actions/000_CK2Plus_performance_on_actions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ on_yearly_pulse = {
33
# MTTH events that were consuming too much time
44
PerformancePlus.900 # Councillor tries to befriend liege
55
# Performance.941 # Reinforcements Arrive
6-
Performance320.500 # Prosperity Increase
7-
Performance320.502 # Peasant Obstructionism
6+
# Performance320.500 # Prosperity Increase
7+
# Performance320.502 # Peasant Obstructionism
88
PerformancePlus.910 # Duelist tries to befriend liege
99
}
1010
}

‎CK2Plus/common/on_actions/000_CK2Plus_realm_on_actions.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
on_startup = {
44
events = {
55
realmPlus.002 # Mark exceptions to Crown Authority destruction rule
6-
realmPlus.003 # Give crowned to all existing kings and emperors
76
realmPlus.004 # Imperial Decadence setup
87
}
98
}

‎CK2Plus/common/on_actions/99_CK2Plus_on_actions.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ on_startup = {
99
indian_caste_fix_effect = yes
1010
remove_undesireable_claims_effect = yes
1111
# remove_dejure_empires_effect = yes
12-
startup_crown_effect = yes
1312
set_religion_flags_and_variables_effect = yes
1413
}
1514

‎CK2Plus/common/scripted_effects/99_CK2Plus_coronation_effects.txt

Lines changed: 4 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ add_uncrowned_effect = {
22
if = {
33
limit = {
44
higher_real_tier_than = DUKE
5+
is_feudal = yes
6+
independent = yes
7+
has_horde_culture = no
58
is_crowned_trigger = no
9+
is_offmap_trigger = no
610
NOT = { trait = uncrowned }
711
}
812
add_trait = uncrowned
@@ -61,51 +65,6 @@ remove_unworthy_crown_effect = {
6165
}
6266
}
6367

64-
startup_crown_effect = {
65-
if = {
66-
limit = {
67-
is_save_game = no
68-
any_demesne_province = { has_flag = pulse_province }
69-
}
70-
any_playable_ruler = {
71-
limit = {
72-
is_offmap_trigger = no
73-
higher_real_tier_than = DUKE
74-
is_feudal = yes
75-
has_horde_culture = no
76-
is_nomadic = no
77-
primary_title = { is_vice_royalty = no }
78-
is_crowned_trigger = no
79-
NOT = { trait = uncrowned }
80-
}
81-
if = {
82-
limit = {
83-
is_adult = yes
84-
primary_title = { title = e_hre }
85-
}
86-
add_trait = crowned_by_pope
87-
}
88-
else_if = {
89-
limit = {
90-
is_adult = yes
91-
primary_title = { title = e_byzantium }
92-
}
93-
random_list = {
94-
50 = { add_trait = strong_basileus }
95-
50 = { add_trait = weak_basileus }
96-
}
97-
}
98-
else_if = {
99-
limit = { is_adult = yes }
100-
add_trait = crowned
101-
}
102-
else = {
103-
add_trait = uncrowned
104-
}
105-
}
106-
}
107-
}
108-
10968
send_coronation_invitations_effect = {
11069
any_character = {
11170
limit = {

‎CK2Plus/common/scripted_triggers/00_artifact_triggers.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,11 +401,17 @@ looting_artifact_event_religious_artifacts_trigger = {
401401
trigger_else_if = {
402402
limit = { has_artifact_flag = arabic_pagan }
403403
ROOT = {
404-
religion_openly_arab_or_reformed_trigger = no
404+
religion_openly_arabic_or_reformed_trigger = no
405405
}
406406
}
407407
trigger_else_if = {
408408
limit = { has_artifact_flag = berber_pagan }
409+
ROOT = {
410+
religion_openly_berber_pagan_or_reformed_trigger = no
411+
}
412+
}
413+
trigger_else_if = {
414+
limit = { has_artifact_flag = canaan_pagan }
409415
ROOT = {
410416
religion_openly_canaan_pagan_or_reformed_trigger = no
411417
}

‎CK2Plus/common/scripted_triggers/00_religion_triggers.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ true_hellenic_religion_trigger = {
840840
true_religion = hellenic_pagan
841841
true_religion = hellenic_pagan_reformed
842842
true_religion = roman_pagan
843-
true_religion = roman_pagan_reformed
843+
# true_religion = roman_pagan_reformed
844844
}
845845
}
846846

‎CK2Plus/common/scripted_triggers/99_CK2Plus_religion_triggers.txt

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,18 @@ religion_openly_canaan_pagan_or_reformed_trigger = {
101101
}
102102
}
103103

104+
religion_openly_berber_pagan_or_reformed_trigger = {
105+
custom_tooltip = {
106+
text = religion_openly_berber_or_reformed_tooltip
107+
hidden_trigger = {
108+
# OR = {
109+
religion = berber_pagan
110+
# religion = berber_pagan_reformed
111+
# }
112+
}
113+
}
114+
}
115+
104116
religion_openly_egyptian_or_reformed_trigger = {
105117
# Doesn't have a reformed version, just named that way for consistency
106118

@@ -821,14 +833,14 @@ true_celtic_religion_trigger = {
821833
true_arabic_religion_trigger = {
822834
OR = {
823835
true_religion = arabic_pagan
824-
true_religion = arabic_pagan_reformed
836+
# true_religion = arabic_pagan_reformed
825837
}
826838
}
827839

828840
true_egyptian_religion_trigger = {
829841
OR = {
830842
true_religion = egyptian_pagan
831-
true_religion = egyptian_pagan_reformed
843+
# true_religion = egyptian_pagan_reformed
832844
}
833845
}
834846

‎CK2Plus/common/scripted_triggers/99_CK2Plus_war_triggers.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,7 @@ can_use_holy_war_cb = {
145145
limit = { religion_group = pagan_group }
146146
OR = {
147147
is_reformed_religion = yes
148-
any_realm_title = {
149-
is_holy_site = PREV
150-
count = 3
151-
}
148+
num_of_holy_sites >= 3
152149
}
153150
}
154151
trigger_else_if = { # Buddhist and Hindu
@@ -191,6 +188,9 @@ in_command_trigger = {
191188

192189
in_command = yes
193190
}
191+
trigger_else = {
192+
hidden_trigger = { always = no }
193+
}
194194
}
195195

196196
# Scopes from attacker

‎CK2Plus/common/traits/00_leadership_traits.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ flat_terrain_expert = {
6565
terrain = plains
6666
terrain = farmlands
6767
terrain = steppe
68-
terrain = savanna
68+
# terrain = savanna
6969
}
7070
}
7171

‎CK2Plus/decisions/minor_decisions.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ decisions = {
8585
}
8686

8787
war = no
88-
is_not_in_regency_trigger = no
88+
is_not_in_regency_trigger = yes
8989
is_inaccessible_trigger = no
9090
prestige >= 100
9191
}
@@ -204,7 +204,7 @@ decisions = {
204204

205205
war = no
206206
scaled_wealth >= 0.3
207-
is_not_in_regency_trigger = no
207+
is_not_in_regency_trigger = yes
208208
is_inaccessible_trigger = no
209209
}
210210

@@ -336,7 +336,7 @@ decisions = {
336336
war = no
337337
is_ill = no
338338
num_of_symptoms == 0
339-
is_not_in_regency_trigger = no
339+
is_not_in_regency_trigger = yes
340340
is_inaccessible_trigger = no
341341
}
342342

@@ -457,7 +457,7 @@ decisions = {
457457
num_of_symptoms == 0
458458
war = no
459459
is_inaccessible_trigger = no
460-
is_not_in_regency_trigger = no
460+
is_not_in_regency_trigger = yes
461461
}
462462

463463
effect = {

‎CK2Plus/events/000_CK2Plus_maintenance_events.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
namespace = maintPlus
2+
namespace = PlusMaintenance
23

34
#######################################
45
#

0 commit comments

Comments
 (0)