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

Pop tweaks #389

Merged
merged 56 commits into from
Jul 6, 2023
Merged

Pop tweaks #389

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
a4a20b7
feat: investors now mirror qualification favored paths of landlords, …
Jul 2, 2023
55b52fe
fix: deleted starting wealth effect (more realistic anyway as there w…
Jul 2, 2023
5ccd5b1
fix: this makes pops more demanding, not less
Jul 2, 2023
75e80bc
fix: no immortal pops from healthcare, max reduction (institution and…
Jul 2, 2023
141fe9f
fix: bunch of typos in ideology law scoring
Jul 3, 2023
5963c57
fix: presence of double space shouldn't hurt anything, but fixed it i…
Jul 3, 2023
a453b4e
Merge branch 'dev' into qualification-tweak
Jul 3, 2023
edc4d71
chore: put back original start_quality_of_life - they only affect ini…
Jul 3, 2023
e11cf24
chore: this file would increase wages in addition to what is in pops …
Jul 3, 2023
3d6cc47
chore: added back wealth overrides which differentiate wages across w…
Jul 3, 2023
7170078
fix: cold war start date in comment
Jul 3, 2023
347864a
feat: pop wealth fix?
DZappala Jul 3, 2023
bb461b3
fix: replaced nonexistant pop type
Jul 3, 2023
f474644
Merge branch 'dev' into qualification-tweak
JackEPepper Jul 3, 2023
eaa590f
revert tech
Jul 3, 2023
ef31747
replaced professionals with farmers in landlord pop
Jul 3, 2023
66180b4
feat: removed bouvet island
JackEPepper Jul 5, 2023
7d03bb0
feat: removed south georgia
JackEPepper Jul 5, 2023
9b3e4f0
feat: merged ascension and tristan da cunha into saint helena
JackEPepper Jul 5, 2023
3e10f29
chore: fix error spam
JackEPepper Jul 5, 2023
c740bbe
feat: merged northern canadian states
JackEPepper Jul 5, 2023
9aaa1d0
feat: merged indian ocean islands and micronesia
JackEPepper Jul 5, 2023
b2e7492
feat: merged micronesia
JackEPepper Jul 5, 2023
71a3427
feat: merged polynesia
JackEPepper Jul 5, 2023
21639d0
chore: fix indian ocean missing provinces
JackEPepper Jul 5, 2023
a36e5a1
feat: merged melanesia
JackEPepper Jul 5, 2023
8a0cb3d
feat: unfucked ar rutba
JackEPepper Jul 5, 2023
c7c731b
feat: removed the pope
JackEPepper Jul 5, 2023
23f409d
feat: merged acre
JackEPepper Jul 5, 2023
55fbeb2
feat: removed hedjaz split state
JackEPepper Jul 5, 2023
23df2a6
chore: error fixing
JackEPepper Jul 5, 2023
a2e02d8
fix: errors when rus and usa dont exist
JackEPepper Jul 5, 2023
e750248
feat: remove useless desert states
JackEPepper Jul 5, 2023
69d015f
Merge branch 'dev' into revenge-of-the-performance-ig
JackEPepper Jul 5, 2023
f2d5fda
Merge branch 'dev' into revenge-of-the-performance-ig
JackEPepper Jul 5, 2023
e9029a4
chore: re-saved everything
Max200012 Jul 5, 2023
6462c44
Merge branch 'dev' into qualification-tweak
Jul 5, 2023
f21310c
Merge branch 'revenge-of-the-performance-ig' into qualification-tweak
Jul 5, 2023
6c8e284
chore: comments in wealth effects file
Jul 5, 2023
e6a45b5
fix: main wealth initialization value is now in increments of 5 as it…
Jul 5, 2023
2ad6ea6
fix: pops were already stratified by starting quality of life, so red…
Jul 5, 2023
5997eaf
Merge branch 'dev' into qualification-tweak
Jul 5, 2023
15f35f3
fix: two state errors
Jul 5, 2023
212a2ae
fix: missing hub name
Jul 5, 2023
25a130c
fix: missing country locs
Jul 5, 2023
d98e03e
feat: removed mexican american
JackEPepper Jul 5, 2023
12be33d
feat: removed cajun
JackEPepper Jul 5, 2023
2dc379b
Merge branch 'dev' into revenge-of-the-performance-ig
JackEPepper Jul 6, 2023
d64a523
Merge branch 'dev' into qualification-tweak
JackEPepper Jul 6, 2023
573d976
chore: someone broke the locators, again
Max200012 Jul 6, 2023
fc6f774
chore: yeah i love fixing map shit
Max200012 Jul 6, 2023
58d808a
chore: something something "game generated stuff pls copy" error fix
Jul 6, 2023
2447f46
Revert "chore: something something "game generated stuff pls copy" er…
Max200012 Jul 6, 2023
0176c41
Merge branch 'revenge-of-the-performance-ig' into qualification-tweak
Jul 6, 2023
3e8df60
chore: empty wealth effects
Jul 6, 2023
01c1047
fix: reset country wealth effects
Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions common/ideologies/cwp_00_leader_communist_ideologies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ ideology_technocratic_socialist = {
lawgroup_nationalization = {
law_total_nationalization = strongly_approve
law_heavy_industry_nationalization = approve
law_military_industry_nationalization = neutral
law_military_industry_nationalization = neutral
law_resource_extraction_nationalization = neutral
law_public_utility_companies = disapprove
law_no_nationalization = strongly_disapprove
Expand Down Expand Up @@ -507,13 +507,13 @@ ideology_libermanist = {
lawgroup_nationalization = {
law_total_nationalization = strongly_disapprove
law_heavy_industry_nationalization = disapprove
law_military_industry_nationalization = approve
law_military_industry_nationalization = approve
law_resource_extraction_nationalization = neutral
law_public_utility_companies = disapprove
law_no_nationalization = strongly_disapprove
}
lawgroup_economic_system = {
law_socialization = strongly_approve
law_socialization = strongly_approve
law_interventionism = neutral
law_free_market = disapprove
law_anti_industrialization = strongly_disapprove
Expand Down
10 changes: 5 additions & 5 deletions common/ideologies/cwp_00_leader_issue_ideologies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ ideology_atheist = {
law_council_elective = neutral
law_executive = neutral
law_parliamentary = neutral
law_theocratic = strongly_oppose
law_theocratic = strongly_disapprove
law_hereditary = neutral
law_administrative = oppose
law_administrative = disapprove
}
lawgroup_church_and_state = {
law_state_atheism = strongly_approve
Expand Down Expand Up @@ -514,9 +514,9 @@ ideology_anarchist = {
law_council_elective = strongly_approve
law_executive = neutral
law_parliamentary = approve
law_theocratic = strongly_oppose
law_hereditary = oppose
law_administrative = oppose
law_theocratic = strongly_disapprove
law_hereditary = disapprove
law_administrative = disapprove
}
lawgroup_nationalization = {
law_total_nationalization = strongly_disapprove
Expand Down
12 changes: 6 additions & 6 deletions common/ideologies/cwp_00_leader_liberal_ideologies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,17 +371,17 @@ ideology_market_liberal = {
icon = "gfx/interface/icons/ideology_icons/ideology_leader/unused/ideology_leader_laissez_faire.dds"
character_ideology = yes
lawgroup_economic_system = {
law_socialization = strongly_disapprove
law_socialization = strongly_disapprove
law_interventionism = neutral
law_free_market = strongly_approve
law_anti_industrialization = strongly_disapprove
law_decentralization = disapprove
}
lawgroup_trade_policy = {
law_isolationism = strongly_disapprove
law_isolationism = strongly_disapprove
law_import_substitution = approve
law_protectionism = neutral
law_export_orientation = disapprove
law_export_orientation = disapprove
law_free_trade = strongly_approve
}
lawgroup_nationalization = {
Expand Down Expand Up @@ -442,17 +442,17 @@ ideology_state_interventionist = {
law_no_nationalization = strongly_disapprove
}
lawgroup_economic_system = {
law_socialization = disapprove
law_socialization = disapprove
law_interventionism = strongly_approve
law_free_market = neutral
law_anti_industrialization = strongly_disapprove
law_decentralization = strongly_disapprove
}
lawgroup_trade_policy = {
law_isolationism = strongly_disapprove
law_isolationism = strongly_disapprove
law_import_substitution = approve
law_protectionism = strongly_approve
law_export_orientation = neutral
law_export_orientation = neutral
law_free_trade = disapprove
}
possible = {
Expand Down
2 changes: 1 addition & 1 deletion common/ideologies/cwp_00_leader_socialist_ideologies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ ideology_democratic_socialist = {
law_administrative = neutral
}
lawgroup_economic_system = {
law_socialization = strongly_approve
law_socialization = strongly_approve
law_interventionism = approve
law_free_market = disapprove
law_anti_industrialization = strongly_disapprove
Expand Down
2 changes: 1 addition & 1 deletion common/ideologies/cwp_capitalists_ideologies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ ideology_laissez_faire = {
law_export_orientation = approve
law_import_substitution = neutral
law_protectionism = disapprove
law_free_trade = Strongly_approve
law_free_trade = strongly_approve
law_isolationism = strongly_disapprove
}
lawgroup_childrens_rights = {
Expand Down
4 changes: 2 additions & 2 deletions common/ideologies/cwp_moralists_ideologies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ ideology_hindu = {
ideology_theravada = {
icon = "gfx/interface/icons/ideology_icons/scholar_paternalistic.dds"
lawgroup_church_and_state = {
law_state_atheism = strongly_oppose
law_state_atheism = strongly_disapprove
law_church_disestablishment = disapprove
law_religious_policies = neutral
law_religious_institutions = approve
Expand Down Expand Up @@ -403,7 +403,7 @@ ideology_israelite = {
law_segregationist = neutral
law_integrationist = strongly_disapprove
law_multiculturalist = strongly_disapprove
law_syncretist = strongly_dissaprove
law_syncretist = strongly_disapprove
}
lawgroup_head_of_government = {
law_administrative = neutral
Expand Down
2 changes: 1 addition & 1 deletion common/ideologies/cwp_ruralists_ideologies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ ideology_agrarian = {
law_pollution_ban = disapprove
}
lawgroup_wmds = {
law_first_strike = strongly_dissaprove
law_first_strike = strongly_disapprove
law_deterrence = disapprove
law_civilian_applications = neutral
law_no_wmds = approve
Expand Down
4 changes: 2 additions & 2 deletions common/laws/cwp_15_health_system.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ law_private_health_insurance = {
}
institution = institution_health_system
institution_modifier = {
state_mortality_wealth_mult = -0.0023
state_mortality_wealth_mult = -0.0011
state_political_strength_from_wealth_mult = 0.05
}
pop_support = {
Expand Down Expand Up @@ -151,7 +151,7 @@ law_subsidized_health_insurance = {
institution = institution_health_system
institution_modifier = {
state_mortality_mult = -0.013
state_mortality_wealth_mult = -0.0011
state_mortality_wealth_mult = -0.0005
}
pop_support = {
value = 0
Expand Down
9 changes: 9 additions & 0 deletions common/pop_types/cwp_engineers.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,15 @@
desc = QUALIFICATIONS_FAVORED_TYPE
}
}
if = {
limit = {
is_pop_type = investors
}
multiply = {
value = 3
desc = QUALIFICATIONS_FAVORED_TYPE
}
}
Comment on lines +67 to +75
Copy link
Member

Choose a reason for hiding this comment

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

yeah idk how I feel about investors being a preferred type for engineers. Most of the investors were meant to come from professionals since they represent the gilded class of workers that are more likely to move up a strata.

Copy link
Author

Choose a reason for hiding this comment

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

investors and landlords are meant to be equivalent, why engineers would be more likely to be rural business owners rather than urban ones?

Copy link
Member

Choose a reason for hiding this comment

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

Professionals work in urban buildings, engineers work in industry and rural buildings. I think the distinction makes sense.

Copy link
Author

Choose a reason for hiding this comment

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

So:
Professionals <-> investors
Engineers <-> investors and landlords
Farmers <-> landlords
investors <-> landlords
That would be okay for favored types?

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, that sounds good

if = {
limit = {
is_pop_type = farmers
Expand Down
2 changes: 2 additions & 0 deletions common/pop_types/cwp_investors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
}
if = {
limit = {
is_pop_type = engineers
Copy link
Member

Choose a reason for hiding this comment

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

I agree with professionals here, not so much with engineers for reasons stated above.

Copy link
Author

Choose a reason for hiding this comment

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

Well landlords used to be executives, and investors were meant to be more luxurious version of it.
Now its just rural/urban divide of upper class ownership.
So instead engineers shouldn't be more likely to become investors as well.

is_pop_type = professionals
is_pop_type = landlords
}
multiply = {
Expand Down
2 changes: 1 addition & 1 deletion common/pop_types/cwp_landlords.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
limit = {
or = {
is_pop_type = engineers
is_pop_type = professionals
is_pop_type = farmers
is_pop_type = investors
}
}
Expand Down
1 change: 1 addition & 0 deletions common/pop_types/cwp_professionals.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
is_pop_type = officers
is_pop_type = administrators
is_pop_type = landlords
is_pop_type = investors
}
}
multiply = {
Expand Down
Loading