Skip to content

Commit 2bf9d21

Browse files
authored
Merge pull request #217 from xirsoi/develop
v0.46.2 Kamutef
2 parents a36ff3e + 3ddb476 commit 2bf9d21

23 files changed

+7096
-559
lines changed

ACR_Changelog.md

Lines changed: 493 additions & 453 deletions
Large diffs are not rendered by default.

AncientReligions/common/artifacts/ACR_celtic_artifacts.txt

Lines changed: 156 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,4 +332,159 @@ silver_torque = {
332332
picture = GFX_silver_torque
333333

334334
slot = neck
335-
}
335+
}
336+
337+
# heads
338+
339+
immortal_skull = { # skull of an immortal, which gives you advice!
340+
quality = 5
341+
combat_rating = 10
342+
martial = 1
343+
diplomacy = 1
344+
stewardship = 1
345+
intrigue = 1
346+
learning = 1
347+
stacking = no
348+
allowed_gift = {
349+
always = no
350+
}
351+
indestructible = yes
352+
flags = { trophy skull }
353+
picture = GFX_immortal_skull
354+
}
355+
356+
alexanders_skull = { # reborn alexander the great
357+
quality = 5
358+
monthly_character_prestige = 0.5
359+
hellenic_pagan_opinion = -10
360+
hellenic_pagan_reformed_opinion = -10
361+
vassal_opinion = 15
362+
stacking = no
363+
allowed_gift = {
364+
always = no
365+
}
366+
indestructible = yes
367+
flags = { trophy skull unique }
368+
picture = GFX_saintly_skull
369+
}
370+
371+
karl_skull2 = { # emperor charlemagne
372+
quality = 4
373+
monthly_character_prestige = 0.30
374+
vassal_opinion = 10
375+
stacking = no
376+
allowed_gift = {
377+
always = no
378+
}
379+
indestructible = yes
380+
flags = { trophy skull unique }
381+
picture = GFX_saintly_skull
382+
}
383+
384+
karl_skull1 = { # king karl
385+
quality = 3
386+
monthly_character_prestige = 0.20
387+
stacking = no
388+
allowed_gift = {
389+
always = no
390+
}
391+
indestructible = yes
392+
flags = { trophy skull unique }
393+
picture = GFX_saintly_skull
394+
}
395+
396+
great_priest_skull = { # "pope" head
397+
quality = 4
398+
monthly_character_piety = 0.25
399+
monthly_character_prestige = 0.25
400+
stacking = no
401+
allowed_gift = {
402+
always = no
403+
}
404+
flags = { trophy skull }
405+
picture = GFX_saintly_skull
406+
}
407+
408+
true_roman_skull = { # head of the true roman emperor
409+
quality = 4
410+
monthly_character_prestige = 0.30
411+
general_opinion = 10
412+
413+
stacking = no
414+
allowed_gift = {
415+
always = no
416+
}
417+
flags = { trophy skull }
418+
picture = GFX_roman_skull
419+
}
420+
421+
roman_pretender_skull = { # head of a roman sucessor (e.g. hremperor, eremperor)
422+
quality = 3
423+
monthly_character_prestige = 0.25
424+
feudal_opinion = 10
425+
stacking = no
426+
allowed_gift = {
427+
always = no
428+
}
429+
flags = { trophy skull }
430+
picture = GFX_saintly_skull
431+
}
432+
433+
williams_skull = { # william the conqueror
434+
quality = 3
435+
monthly_character_prestige = 0.25
436+
feudal_opinion = 5
437+
combat_rating = 5
438+
stacking = no
439+
allowed_gift = {
440+
always = no
441+
}
442+
flags = { trophy skull unique }
443+
picture = GFX_skull
444+
}
445+
446+
purple_skull = { # born in the purple character
447+
quality = 3
448+
monthly_character_prestige = 0.05
449+
vassal_opinion = 5
450+
sex_appeal_opinion = 5
451+
stacking = no
452+
allowed_gift = {
453+
always = no
454+
}
455+
flags = { trophy skull }
456+
picture = GFX_purple_skull
457+
}
458+
459+
prestige_skull2 = { # 2000+ prestige
460+
quality = 3
461+
monthly_character_prestige = 0.15
462+
feudal_opinion = 5
463+
tribal_opinion = 5
464+
allowed_gift = {
465+
always = no
466+
}
467+
flags = { trophy skull }
468+
picture = GFX_saintly_skull
469+
}
470+
471+
prestige_skull1 = { # 1000+ prestige
472+
quality = 2
473+
monthly_character_prestige = 0.10
474+
tribal_opinion = 5
475+
allowed_gift = {
476+
always = no
477+
}
478+
flags = { trophy skull }
479+
picture = GFX_skull
480+
}
481+
482+
schmuck_skull = { # a nobody
483+
quality = 1
484+
monthly_character_prestige = 0.05
485+
allowed_gift = {
486+
always = no
487+
}
488+
flags = { trophy skull }
489+
picture = GFX_skull
490+
}

AncientReligions/common/artifacts/ACR_hellenic_artifacts.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ aethons_feather = {
7878
speed = 0.10
7979
retreat = 0.10
8080
}
81+
promethean_pagan_opinion = -10
8182
active = {
8283
OR = {
8384
religion_openly_hellenic_or_reformed_trigger = yes

AncientReligions/common/cb_types/ACR_new_cbs.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ promethean_expansion = {
551551
vassalize_or_take_under_title_destroy_duchies = {
552552
title = PREV
553553
enemy = FROM
554-
is_crusade = yes # Even if the title holder is not participating in the war, gain holdings occupied by all Crusade participants
554+
is_crusade = no # Even if the title holder is not participating in the war, gain holdings occupied by all Crusade participants
555555
type = invasion
556556
}
557557
}
@@ -686,13 +686,14 @@ egyptian_reconquest = {
686686
sort_priority = 1900
687687

688688
can_use_gui = {
689-
check_if_crusader_trigger = yes
689+
ROOT = {
690+
has_landed_title = e_greater_egypt
691+
religion_openly_in_egyptian_subgroup_trigger = yes
692+
}
690693
}
691694

692695
can_use = {
693696
ROOT = {
694-
has_landed_title = e_greater_egypt
695-
independent = yes
696697
religion_openly_in_egyptian_subgroup_trigger = yes
697698
NOT = { same_realm = FROM }
698699
mercenary = no

AncientReligions/common/event_modifiers/ACR_druidic_modifiers.txt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,4 +353,15 @@ holding_imbolg = {
353353
monthly_character_prestige = 0.05
354354
}
355355

356-
imbolg_timer = { icon = 1 }
356+
imbolg_timer = { icon = 1 }
357+
358+
ancrel_friend_at_court = {
359+
icon = 14
360+
is_visible = {
361+
FORM = {
362+
character = ROOT
363+
}
364+
}
365+
366+
plot_power_modifier = 1.1
367+
}

AncientReligions/common/laws/succession_laws.txt

Lines changed: 0 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -2,81 +2,6 @@
22

33
succession_laws = {
44

5-
# succ_my_test_law = {
6-
# child_opinion = 15
7-
# dynasty_opinion = 5
8-
#
9-
# potential = {
10-
# holder_scope = {
11-
# is_nomadic = no
12-
# OR = {
13-
# independent = yes
14-
# NOT = {
15-
# any_liege = {
16-
# holy_order = yes
17-
# }
18-
# }
19-
# }
20-
# NOT = { religion_group = muslim }
21-
# is_merchant_republic = no
22-
# is_patrician = no
23-
# OR = {
24-
# independent = yes
25-
# NOT = {
26-
# any_demesne_title = {
27-
# is_vice_royalty = yes
28-
# }
29-
# }
30-
# }
31-
# }
32-
# OR = {
33-
# is_landless_type_title = no
34-
# is_tribal_type_title = yes
35-
# temporary = yes
36-
# }
37-
#
38-
# rebel = no
39-
#
40-
# OR = {
41-
# holder_scope = { is_feudal = yes }
42-
# holder_scope = { is_tribal = yes }
43-
# }
44-
# is_primary_type_title = no
45-
# NOT = { holder_scope = { government = confucian_bureaucracy } }
46-
# NOT = { holder_scope = { government = chinese_imperial_government } }
47-
# }
48-
# allow = {
49-
# conditional_tooltip = {
50-
# trigger = {
51-
# has_dlc = "Conclave"
52-
# }
53-
# custom_tooltip = {
54-
# text = forced_elective_tt
55-
# hidden_tooltip = {
56-
# NAND = {
57-
# has_law = succession_voting_power_1
58-
# has_law = succ_feudal_elective
59-
# }
60-
# }
61-
# }
62-
# }
63-
# holder_scope = {
64-
# show_scope_change = no
65-
# in_revolt = no
66-
# }
67-
# }
68-
# effect = {
69-
# succession = {
70-
# base_type = feudal_elective
71-
# voting_rules = my_test_law #Definded in common/00_succession_voting
72-
# }
73-
# elective_voting_rules = my_test_law
74-
# }
75-
# revoke_allowed = {
76-
# always = no
77-
# }
78-
# }
79-
805
succ_gavelkind = {
816
oldest_child_opinion = -5
827
child_opinion = 15

AncientReligions/common/minor_titles/ACR_druidic_minor_titles.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,18 +165,23 @@ title_headsman = {
165165
allowed_to_grant = {
166166
OR = {
167167
independent = yes
168-
higher_tier_than = duke
168+
higher_tier_than = count
169169
}
170170
religion_openly_celtic_or_reformed_trigger = yes
171171
OR = {
172172
is_feudal = yes
173173
is_tribal = yes
174174
}
175+
NOT = {
176+
has_religion_feature = religion_peaceful
177+
}
175178
}
176179

177180
gain_effect = {
178181
}
179182
lose_effect = {
183+
clr_character_flag = ancrel_good_headsman_admin
184+
clr_character_flag = ancrel_bad_headsman_admin
180185
}
181186

182187
message = yes

AncientReligions/common/modifier_definitions.txt/ACR_modifier_definitions.txt renamed to AncientReligions/common/modifier_definitions/ACR_modifier_definitions.txt

File renamed without changes.

AncientReligions/common/modifier_definitions/acr_modifiers.txt

Lines changed: 0 additions & 16 deletions
This file was deleted.

AncientReligions/common/on_actions/ACR_on_actions.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,14 @@ on_yearly_pulse = {
9292
2000 = hellenic.597 # Ask Artemis about death
9393
1000 = hellenic.615 # Someone has sex in Artemis' temple
9494
1000 = hellenic.617 # Yo Artemis if you hate sex why are you hanging out with me?
95+
96+
#Minor Title Events
97+
100 = celtic.2200 # costs are less then expected
98+
100 = celtic.2202 # headsman did a good job, maybe reward them?
99+
100 = celtic.2206 # unexpected problems increase costs
100+
100 = celtic.2210 # an excellent worker at the office
101+
100 = celtic.2211 # making friends at the office!
102+
100 = celtic.2212 # making a rival at the office!
95103
}
96104
}
97105
}

0 commit comments

Comments
 (0)