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

Jump to bottom

fixed check for develop with negative construction points #581

Merged
merged 4 commits into from
Aug 27, 2023
Merged

fixed check for develop with negative construction points #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1ac237a
fixed check for devlop with negative construction points
JackEPepper Aug 25, 2023
7b31af3
fixed bretton woods invalidating prematurely
JackEPepper Aug 25, 2023
9ff341b
invalid state if USA doesn't exist for bretton woods
JackEPepper Aug 25, 2023
82e07ec
Merge branch 'dev' into develop-fix
DZappala Aug 27, 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
14 changes: 3 additions & 11 deletions common/diplomatic_actions/30_cwp_develop.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,12 @@
has_diplomatic_relevance = scope:target_country
is_revolutionary = no
in_default = no
aroai_construction_points_current > {
modifier:country_construction_add > {
value = scope:target_country.gold_reserves_limit
divide = 100000
round = yes
}
OR = {
construction_queue_num_queued_levels = 0
construction_queue_duration > 0
}
modifier:country_construction_add >= 0
}
pact = {
cost = 10
Expand Down Expand Up @@ -76,12 +73,7 @@
is_about_to_auto_break = {
}
should_auto_break = {
AND = {
NOT = {
construction_queue_num_queued_levels = 0
}
construction_queue_duration <= 0
}
modifier:country_construction_add < 0
}
should_invalidate = {
OR = {
Expand Down
26 changes: 3 additions & 23 deletions common/journal_entries/CWP_MONETARY.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,30 +166,10 @@ je_maintain_pegged_currency = {

je_bretton_woods_agreement = {
icon = "gfx/interface/icons/cwp_icons/central_bank.dds"
should_be_pinned_by_default = yes
possible = {
this = {
has_law = law_type:law_pegged_currency
custom_tooltip = {
text = pegged_currency_tt
has_variable = pegged_currency
}
custom_tooltip = {
text = pegging_tt #:flushed:
has_variable = peg_target_set
}
}
}
should_be_pinned_by_default = no
invalid = {
nor = {
custom_tooltip = {
text = no_pegged_currency_tt
has_variable = pegged_currency
}
custom_tooltip = {
text = no_pegging_tt #:flushed:
has_variable = peg_target_set
}
NOT = {
exists = c:USA
}
}
immediate = {
Expand Down