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.

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

Merge dev into dev-popswap #412

Open
wants to merge 78 commits into
base: dev-popswap
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
b677d4b
population optimizations
DudeChris33 Mar 16, 2024
9361d32
second go at pop
DudeChris33 Mar 16, 2024
7160d95
should be all set, moving to other projects
DudeChris33 Mar 17, 2024
a14796f
massalia mission tree skeleton, open to suggestions
DudeChris33 Mar 19, 2024
4a85ad4
a
DudeChris33 Mar 21, 2024
38b384a
Merge branch 'dev' of https://github.com/The-Triumvirate/Imperium-Uni…
DudeChris33 Mar 21, 2024
dc25865
massalia MT progress
DudeChris33 Mar 27, 2024
1c39463
Merge branch 'dev' of https://github.com/The-Triumvirate/Imperium-Uni…
DudeChris33 Mar 27, 2024
e25dccd
small massalia MT changes
DudeChris33 Mar 27, 2024
6ddb175
population optimizations 4
DudeChris33 Mar 28, 2024
b2ca9cf
Merge branch 'dev' of https://github.com/The-Triumvirate/Imperium-Uni…
DudeChris33 Mar 28, 2024
25f9551
final optimization before rewrite
DudeChris33 Mar 28, 2024
cf9d728
mass ideas
DudeChris33 Mar 28, 2024
8037dd3
alexandria city formations
DudeChris33 Mar 28, 2024
dd86906
Merge branch 'dev' of https://github.com/The-Triumvirate/Imperium-Uni…
DudeChris33 Apr 3, 2024
40a7d71
PLEASEPLEASEPLEASEPLEASEPLEASE
DudeChris33 Apr 3, 2024
1055195
pop de-abstraction
DudeChris33 Apr 5, 2024
ef61408
Merge branch 'dev' of https://github.com/The-Triumvirate/Imperium-Uni…
DudeChris33 Apr 7, 2024
f78cb85
Merge branch 'dev' of https://github.com/The-Triumvirate/Imperium-Uni…
DudeChris33 Apr 13, 2024
bba73b5
dev in
DudeChris33 May 15, 2024
758aa20
duplicate
DudeChris33 May 15, 2024
292c73b
Merge branch 'dev' of https://github.com/The-Triumvirate/Imperium-Uni…
DudeChris33 May 22, 2024
c6ff238
Merge branch 'dev' of https://github.com/The-Triumvirate/Imperium-Uni…
DudeChris33 May 22, 2024
77f2230
partition buffs/ penalties
NoahsRebels May 23, 2024
1c1ca38
joseon/ ji shi events
NoahsRebels May 23, 2024
61d3c8d
ji shi tweaks
NoahsRebels May 23, 2024
cd5db54
ministers become marquesses, tweaks
NoahsRebels May 23, 2024
a3695b3
back to pop capacity 4
mrkcosta May 23, 2024
143bd64
china flavor, korea tweaks
NoahsRebels May 24, 2024
dda6bcb
partition fixes, cheese prevention
NoahsRebels May 24, 2024
f934d3d
Numidian mission fixes
Hirdmann May 24, 2024
599eed1
some monuments accept lybo-punic culture
Hirdmann May 24, 2024
a05f85f
little gift to raider idea group
Hirdmann May 24, 2024
b3ac8af
small nerf of Antigonid ideas
Hirdmann May 24, 2024
9917d99
minor changes of institutions bonuses
Hirdmann May 24, 2024
1369c2f
fixed wrong pips of diadochi hetairoi
Hirdmann May 24, 2024
fe1995e
edited historical idea sets of diadochi countries
Hirdmann May 24, 2024
606f780
nerfed demeter bonus (15% trade goods op)
Hirdmann May 24, 2024
b6d3efe
432 bookmark starter event WIP
Hirdmann May 24, 2024
609f111
massalia fix
DudeChris33 May 25, 2024
2c3c4b7
massalia MT gone
DudeChris33 May 25, 2024
0ca455f
improved ai chinese religion stuff
NoahsRebels May 25, 2024
414ec87
loc stuff, various china/ korea tweaks
NoahsRebels May 25, 2024
966156c
new qingshi sound
NoahsRebels May 25, 2024
2d9d7f7
zhulou name option
NoahsRebels May 26, 2024
83634e3
event firing tweak
NoahsRebels May 26, 2024
b73467c
lots of chinese history file stuff, minor flavor
NoahsRebels May 27, 2024
9e4847b
force chinese nations to take feudalism when released
NoahsRebels May 27, 2024
2b9513f
general china tweaks
NoahsRebels May 27, 2024
86e891d
less silly roman kings
xaiper010 May 27, 2024
95e5c16
flavor events, tweaks, loc changes
NoahsRebels May 28, 2024
92eb388
forgot some stuff
NoahsRebels May 28, 2024
2e7a22a
flavor, HRE disbands when warring states fire
NoahsRebels May 28, 2024
f9fb2d5
revert testing thing
NoahsRebels May 28, 2024
6fe2044
additions to shu mission tree
NoahsRebels May 29, 2024
2b55471
more shu touchups
NoahsRebels May 29, 2024
da5eee9
partition improvements
NoahsRebels May 30, 2024
7aa1e5a
event/ modifier fixes
NoahsRebels May 30, 2024
c91e54d
admin stress giving too generous warscore reduction
AzZotik May 30, 2024
df1ec75
Add Persian invasion of Lydia to JinChu bookmark
AzZotik Jun 4, 2024
c5cac24
Fix some Persian missions being completed too early
AzZotik Jun 4, 2024
e2b0807
Wrong consul of Rome during foundation
AzZotik Jun 4, 2024
2f0c6f6
New Bookmark: Roman Republic
AzZotik Jun 4, 2024
61dd368
fix Cleisthenes for new bookmark
AzZotik Jun 4, 2024
d5fa4f8
Client State: some requested QoL
AzZotik Jun 4, 2024
d5a9259
event tweaks, better jin loc
NoahsRebels Jun 12, 2024
a8fb78d
Lydia redundant building
AzZotik Jun 15, 2024
5a14410
Kyrene-Egypt-Lybia event chain 1.0
Hirdmann Jun 17, 2024
4ad0acf
Further Client State restrictions
AzZotik Jun 18, 2024
1519d75
minor cultural loc fix
AzZotik Jun 21, 2024
3e720e9
finishing previous events for kyr-egy
Hirdmann Jun 21, 2024
4861056
+5 great projects for numidian-mauri region
Hirdmann Jun 22, 2024
927a232
diadochi wars cb edited
Hirdmann Jun 23, 2024
2974f5f
432 armenia change and conflict
Hirdmann Jun 23, 2024
094f33c
tributary relations for Mithrenes
Hirdmann Jun 23, 2024
d8717ad
a bit more cultures for some numidian GPs
Hirdmann Jun 29, 2024
d8ab5a4
possible fix of duplicate road building by army
Hirdmann Jul 2, 2024
9b451d9
united celt cult.groups, changes to lusatian
Hirdmann Jul 3, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion common/bookmarks/JinChu_peace.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ bookmark = {
country = CHU
country = QIN
country = QII

country = PSE
}
13 changes: 13 additions & 0 deletions common/bookmarks/roman_republic.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
bookmark = {
name = "ROMAN_REPUBLIC_TITLE"
desc = "ROMAN_REPUBLIC_DESC"
date = 245.1.1


country = ROM
country = SAB
country = CAR
country = MAC
country = ATH

}
30 changes: 24 additions & 6 deletions common/cb_types/00_cb_types.txt
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,7 @@ cb_independence_war = {
}
}
NOT = { has_reform = minor_elamite_kingdom }
NOT = { is_subject_of_type = ministerial_clan }
}

prerequisites = {
Expand Down Expand Up @@ -1379,24 +1380,41 @@ cb_greek_unification = {
#Diadochi

cb_invasion_diadochi = {
valid_for_subject = no
valid_for_subject = yes

prerequisites_self = {
has_reform = satrap_diadochi_reform
OR = {
has_reform = satrap_diadochi_reform
has_reform = macedonian_regency_reform
tag = ATR
tag = PRT
tag = KSH
}
}
prerequisites = {
has_reform = satrap_diadochi_reform
FROM = {
OR = {
has_reform = satrap_diadochi_reform
is_neighbor_of = ROOT
has_reform = macedonian_regency_reform
tag = ATR
tag = PRT
tag = KSH
}
FROM = {
OR = {
has_reform = satrap_diadochi_reform
has_reform = macedonian_regency_reform
tag = ATR
tag = PRT
tag = KSH
}
}
}

attacker_disabled_po = {
po_become_tributary_state
}

war_goal = take_capital_invasion_diadochi
war_goal = take_capital_diadochi_invasion
}

#########################################################################
Expand Down
12 changes: 7 additions & 5 deletions common/countries/AlexanderEmpire.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ color = { 73 118 150 }

historical_idea_groups = {
syncretism_ideas
infantry_ideas
academy_ideas
leadership_ideas
diplomatic_ideas
domestic_government_ideas
administrative_ideas
infantry_ideas
royal_court_ideas
imperial_ideas
mercenary_ideas
financial_ideas
expansion_ideas
academy_ideas
caravan_trade_ideas
}

historical_units = {
Expand Down
12 changes: 7 additions & 5 deletions common/countries/Antigenes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ color = { 80 63 127 }

historical_idea_groups = {
syncretism_ideas
infantry_ideas
academy_ideas
leadership_ideas
diplomatic_ideas
domestic_government_ideas
royal_court_ideas
infantry_ideas
administrative_ideas
imperial_ideas
mercenary_ideas
financial_ideas
expansion_ideas
academy_ideas
caravan_trade_ideas
}

historical_units = {
Expand Down
12 changes: 7 additions & 5 deletions common/countries/Arcesilaus.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ color = { 169 175 96 }

historical_idea_groups = {
syncretism_ideas
infantry_ideas
academy_ideas
leadership_ideas
diplomatic_ideas
domestic_government_ideas
agraculture_ideas
infantry_ideas
royal_court_ideas
imperial_ideas
mercenary_ideas
financial_ideas
expansion_ideas
academy_ideas
caravan_trade_ideas
}

historical_units = {
Expand Down
14 changes: 8 additions & 6 deletions common/countries/Asandros.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@ graphical_culture = hellenicgfx
color = { 127 198 154 }

historical_idea_groups = {
royal_court_ideas
leadership_ideas
expansion_ideas
agraculture_ideas
infantry_ideas
imperial_ideas
cavalry_ideas
syncretism_ideas
maritime_ideas
administrative_ideas
naval_ideas
syncretism_ideas
infantry_ideas
expansion_ideas
academy_ideas
caravan_trade_ideas
}

historical_units = {
Expand Down
2 changes: 2 additions & 0 deletions common/countries/Chu.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ graphical_culture = asiangfx

color = { 193 27 15 }

preferred_religion = taoism

historical_idea_groups = {
royal_court_ideas
cerimonial_ideas
Expand Down
12 changes: 7 additions & 5 deletions common/countries/Eudemus.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ color = { 188 176 115 }

historical_idea_groups = {
syncretism_ideas
infantry_ideas
academy_ideas
leadership_ideas
diplomatic_ideas
domestic_government_ideas
administrative_ideas
cavalry_ideas
royal_court_ideas
imperial_ideas
mercenary_ideas
financial_ideas
expansion_ideas
academy_ideas
caravan_trade_ideas
}

historical_units = {
Expand Down
10 changes: 6 additions & 4 deletions common/countries/Eumenes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ color = { 206 137 170 }

historical_idea_groups = {
syncretism_ideas
leadership_ideas
administrative_ideas
infantry_ideas
royal_court_ideas
imperial_ideas
academy_ideas
leadership_ideas
diplomatic_ideas
domestic_government_ideas
mercenary_ideas
financial_ideas
expansion_ideas
naval_ideas
}

historical_units = {
Expand Down
10 changes: 6 additions & 4 deletions common/countries/Hestieotis.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@ graphical_culture = hellenicgfx
color = { 124 33 56 }

historical_idea_groups = {
infantry_ideas
cavalry_ideas
agraculture_ideas
oligarchic_ideas
diplomatic_ideas
leadership_ideas
domestic_government_ideas
caravan_trade_ideas
mercenary_ideas
domestic_government_ideas
leadership_ideas
academy_ideas
caravan_trade_ideas
assimilation_ideas
}

historical_units = {
Expand Down
9 changes: 5 additions & 4 deletions common/countries/Laomedon.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@ color = { 84 158 166 }


historical_idea_groups = {
maritime_trade_ideas
administrative_ideas
leadership_ideas
syncretism_ideas
infantry_ideas
academy_ideas
leadership_ideas
diplomatic_ideas
domestic_government_ideas
caravan_trade_ideas
mercenary_ideas
financial_ideas
diplomatic_ideas
}

historical_units = {
Expand Down
12 changes: 7 additions & 5 deletions common/countries/Leonnatos.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@ graphical_culture = hellenicgfx
color = { 116 139 159 }

historical_idea_groups = {
royal_court_ideas
leadership_ideas
expansion_ideas
agraculture_ideas
administrative_ideas
infantry_ideas
imperial_ideas
cavalry_ideas
maritime_ideas
syncretism_ideas
administrative_ideas
mercenary_ideas
expansion_ideas
academy_ideas
caravan_trade_ideas
}

historical_units = {
Expand Down
2 changes: 2 additions & 0 deletions common/countries/Lu.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ color = { 193 171 8 }

historical_idea_groups = {}

preferred_religion = confucianism

historical_units = {}

monarch_names = {
Expand Down
10 changes: 6 additions & 4 deletions common/countries/Magnesia.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@ graphical_culture = hellenicgfx
color = { 128 128 255 }

historical_idea_groups = {
infantry_ideas
cavalry_ideas
agraculture_ideas
oligarchic_ideas
diplomatic_ideas
leadership_ideas
domestic_government_ideas
caravan_trade_ideas
mercenary_ideas
domestic_government_ideas
leadership_ideas
academy_ideas
caravan_trade_ideas
assimilation_ideas
}

historical_units = {
Expand Down
14 changes: 8 additions & 6 deletions common/countries/Menander.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@ graphical_culture = hellenicgfx
color = { 216 180 0 }

historical_idea_groups = {
royal_court_ideas
leadership_ideas
expansion_ideas
agraculture_ideas
infantry_ideas
imperial_ideas
cavalry_ideas
syncretism_ideas
maritime_ideas
administrative_ideas
naval_ideas
syncretism_ideas
infantry_ideas
expansion_ideas
academy_ideas
caravan_trade_ideas
}

historical_units = {
Expand Down
14 changes: 8 additions & 6 deletions common/countries/Peithon.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@ color = { 143 196 196 }


historical_idea_groups = {
syncretism_ideas
infantry_ideas
academy_ideas
expansion_ideas
leadership_ideas
diplomatic_ideas
domestic_government_ideas
royal_court_ideas
infantry_ideas
administrative_ideas
imperial_ideas
mercenary_ideas
financial_ideas
expansion_ideas
academy_ideas
caravan_trade_ideas
}

historical_units = {
Expand Down
10 changes: 6 additions & 4 deletions common/countries/Perrhaebia.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@ graphical_culture = hellenicgfx
color = { 187 211 182 }

historical_idea_groups = {
infantry_ideas
cavalry_ideas
agraculture_ideas
oligarchic_ideas
diplomatic_ideas
leadership_ideas
domestic_government_ideas
caravan_trade_ideas
mercenary_ideas
domestic_government_ideas
leadership_ideas
academy_ideas
caravan_trade_ideas
assimilation_ideas
}

historical_units = {
Expand Down
12 changes: 7 additions & 5 deletions common/countries/Peucestas.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ color = { 158 83 124 }

historical_idea_groups = {
syncretism_ideas
infantry_ideas
academy_ideas
leadership_ideas
diplomatic_ideas
domestic_government_ideas
administrative_ideas
cavalry_ideas
royal_court_ideas
imperial_ideas
mercenary_ideas
financial_ideas
expansion_ideas
academy_ideas
caravan_trade_ideas
}

historical_units = {
Expand Down
Loading