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

Feature/bug fixes #14

Merged
merged 7 commits into from Jan 31, 2022
+307 −149
Merged

Feature/bug fixes #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1f7e2d0
overhauled slave_move. updated war exhaustion
x3igh7 Jan 31, 2022
12284d0
fixed some distinctions bugs
x3igh7 Jan 31, 2022
2b55f6c
updating inventions event
x3igh7 Jan 31, 2022
e195784
updating invention event again
x3igh7 Jan 31, 2022
56dfd62
okay inventions event works now. slave movement is also working but m…
x3igh7 Jan 31, 2022
fce5df1
added short circuit for slave move if no slaves can be found
x3igh7 Jan 31, 2022
513b692
new and improved slave move!
x3igh7 Jan 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion common/character_interactions/offer_player_vassalage.txt
View file
Open in desktop
Expand Up @@ -21,13 +21,14 @@
is_alive = yes
is_mercenary = no
is_ruler = yes
is_ai = no

employer = {
NOR = {
tag = PIR
tag = REB
tag = BAR
}
is_ai = no
}
NOT = {
this = scope:actor.current_ruler
Expand Down
90 changes: 90 additions & 0 deletions common/modifier_icons/00_hmo_modifier_icons.txt
View file
Open in desktop
@@ -0,0 +1,90 @@
### HMO Modifiers

onekman_cost_modifier = {
positive = "gfx/interface/icons/modifiers/local_manpower.dds"
}
fivekman_cost_modifier = {
positive = "gfx/interface/icons/modifiers/local_manpower.dds"
}
tenkman_cost_modifier = {
positive = "gfx/interface/icons/modifiers/local_manpower.dds"
}
fiftykman_cost_modifier = {
positive = "gfx/interface/icons/modifiers/local_manpower.dds"
}
tributary_terrain_combat_bonus = {
positive = "gfx/interface/icons/modifiers/riverine_terrain_combat_bonus.dds"
}
slave_move_yes = {
positive = "gfx/interface/icons/modifiers/slaves_move_cost_modifier.dds"
}
slave_move_no = {
positive = "gfx/interface/icons/modifiers/slave_workpower.dds"
}



### not having these causes errors
archers_tributary_terrain_combat_bonus = {
positive = "gfx/interface/icons/modifiers/riverine_terrain_combat_bonus.dds"
}
camels_tributary_terrain_combat_bonus = {
positive = "gfx/interface/icons/modifiers/riverine_terrain_combat_bonus.dds"
}
engineer_cohort_tributary_terrain_combat_bonus = {
positive = "gfx/interface/icons/modifiers/riverine_terrain_combat_bonus.dds"
}
heavy_cavalry_tributary_terrain_combat_bonus = {
positive = "gfx/interface/icons/modifiers/riverine_terrain_combat_bonus.dds"
}
heavy_infantry_tributary_terrain_combat_bonus = {
positive = "gfx/interface/icons/modifiers/riverine_terrain_combat_bonus.dds"
}
horse_archers_tributary_terrain_combat_bonus = {
positive = "gfx/interface/icons/modifiers/riverine_terrain_combat_bonus.dds"
}
light_cavalry_tributary_terrain_combat_bonus = {
positive = "gfx/interface/icons/modifiers/riverine_terrain_combat_bonus.dds"
}
light_infantry_tributary_terrain_combat_bonus = {
positive = "gfx/interface/icons/modifiers/riverine_terrain_combat_bonus.dds"
}
marines_tributary_terrain_combat_bonus = {
positive = "gfx/interface/icons/modifiers/riverine_terrain_combat_bonus.dds"
}
supply_train_tributary_terrain_combat_bonus = {
positive = "gfx/interface/icons/modifiers/riverine_terrain_combat_bonus.dds"
}
warelephant_tributary_terrain_combat_bonus = {
positive = "gfx/interface/icons/modifiers/riverine_terrain_combat_bonus.dds"
}
large_town_building_cost = {
positive = "gfx/interface/icons/modifiers/build_cost.dds"
}
Market_Town_Building_cost = {
positive = "gfx/interface/icons/modifiers/build_cost.dds"
}
Farming_Town_building_cost = {
positive = "gfx/interface/icons/modifiers/build_cost.dds"
}
Mining_Town_Building_cost = {
positive = "gfx/interface/icons/modifiers/build_cost.dds"
}
Horse_Ranch_building_cost = {
positive = "gfx/interface/icons/modifiers/build_cost.dds"
}
Steppe_Horse_Ranch_building_cost = {
positive = "gfx/interface/icons/modifiers/build_cost.dds"
}
Elephant_Ranch_building_cost = {
positive = "gfx/interface/icons/modifiers/build_cost.dds"
}
camel_ranch_building_cost = {
positive = "gfx/interface/icons/modifiers/build_cost.dds"
}
Vineyard_building_cost = {
positive = "gfx/interface/icons/modifiers/build_cost.dds"
}
Industry_Town_building_cost = {
positive = "gfx/interface/icons/modifiers/build_cost.dds"
}
80 changes: 0 additions & 80 deletions common/modifier_icons/MP_modifier_icons.txt
View file
Open in desktop
Expand Up @@ -81,84 +81,4 @@ marines_riverine_terrain_combat_bonus = {

marines_impassable_terrain_combat_bonus = {
positive = "gfx/interface/icons/modifiers/marines_hills_combat_bonus.dds"
}


onekman_cost_modifier = {
positive = "gfx/interface/icons/modifiers/local_manpower.dds"
}
fivekman_cost_modifier = {
positive = "gfx/interface/icons/modifiers/local_manpower.dds"
}
tenkman_cost_modifier = {
positive = "gfx/interface/icons/modifiers/local_manpower.dds"
}
fiftykman_cost_modifier = {
positive = "gfx/interface/icons/modifiers/local_manpower.dds"
}
tributary_terrain_combat_bonus = {
positive = "gfx/interface/icons/modifiers/riverine_terrain_combat_bonus.dds"
}
archers_tributary_terrain_combat_bonus = {
positive = "gfx/interface/icons/modifiers/riverine_terrain_combat_bonus.dds"
}
camels_tributary_terrain_combat_bonus = {
positive = "gfx/interface/icons/modifiers/riverine_terrain_combat_bonus.dds"
}
engineer_cohort_tributary_terrain_combat_bonus = {
positive = "gfx/interface/icons/modifiers/riverine_terrain_combat_bonus.dds"
}
heavy_cavalry_tributary_terrain_combat_bonus = {
positive = "gfx/interface/icons/modifiers/riverine_terrain_combat_bonus.dds"
}
heavy_infantry_tributary_terrain_combat_bonus = {
positive = "gfx/interface/icons/modifiers/riverine_terrain_combat_bonus.dds"
}
horse_archers_tributary_terrain_combat_bonus = {
positive = "gfx/interface/icons/modifiers/riverine_terrain_combat_bonus.dds"
}
light_cavalry_tributary_terrain_combat_bonus = {
positive = "gfx/interface/icons/modifiers/riverine_terrain_combat_bonus.dds"
}
light_infantry_tributary_terrain_combat_bonus = {
positive = "gfx/interface/icons/modifiers/riverine_terrain_combat_bonus.dds"
}
marines_tributary_terrain_combat_bonus = {
positive = "gfx/interface/icons/modifiers/riverine_terrain_combat_bonus.dds"
}
supply_train_tributary_terrain_combat_bonus = {
positive = "gfx/interface/icons/modifiers/riverine_terrain_combat_bonus.dds"
}
warelephant_tributary_terrain_combat_bonus = {
positive = "gfx/interface/icons/modifiers/riverine_terrain_combat_bonus.dds"
}
large_town_building_cost = {
positive = "gfx/interface/icons/modifiers/build_cost.dds"
}
Market_Town_Building_cost = {
positive = "gfx/interface/icons/modifiers/build_cost.dds"
}
Farming_Town_building_cost = {
positive = "gfx/interface/icons/modifiers/build_cost.dds"
}
Mining_Town_Building_cost = {
positive = "gfx/interface/icons/modifiers/build_cost.dds"
}
Horse_Ranch_building_cost = {
positive = "gfx/interface/icons/modifiers/build_cost.dds"
}
Steppe_Horse_Ranch_building_cost = {
positive = "gfx/interface/icons/modifiers/build_cost.dds"
}
Elephant_Ranch_building_cost = {
positive = "gfx/interface/icons/modifiers/build_cost.dds"
}
camel_ranch_building_cost = {
positive = "gfx/interface/icons/modifiers/build_cost.dds"
}
Vineyard_building_cost = {
positive = "gfx/interface/icons/modifiers/build_cost.dds"
}
Industry_Town_building_cost = {
positive = "gfx/interface/icons/modifiers/build_cost.dds"
}
3 changes: 0 additions & 3 deletions common/modifiers/00_hardcoded_HMO.txt
View file
Open in desktop
Expand Up @@ -21,9 +21,6 @@ number_of_prisoners_abroad = {
corruption = {
local_monthly_state_loyalty = -0.25
monthly_local_governor_wage = 0.5
local_manpower_modifier = -1.5
local_tax_modifier = -1.5
#local_output_modifier = -1
}

##########################################################################
Expand Down
6 changes: 6 additions & 0 deletions common/modifiers/00_slave_move.txt
View file
Open in desktop
@@ -0,0 +1,6 @@
slave_move_yes = {

}
slave_move_no = {

}
6 changes: 0 additions & 6 deletions common/modifiers/TTC.txt → common/modifiers/00_special_towns.txt
View file
Open in desktop
Expand Up @@ -24,10 +24,4 @@ MarketPort = {
local_citizen_output = 0.15
local_freemen_output = 0.03
local_base_trade_routes_modifier = 0.050
}
slave_move_yes = {

}
no_slave_move = {

}
1 change: 0 additions & 1 deletion common/modifiers/regency_modifiers_ck2_0.txt
View file
Open in desktop
Expand Up @@ -6,7 +6,6 @@ commander_king = {
monthly_character_popularity = 0.25
}


family_reorganisation = {
monthly_character_popularity = 0.1
}
Expand Down
1 change: 1 addition & 0 deletions common/on_action/00_on_invention.txt
View file
Open in desktop
@@ -1,5 +1,6 @@
on_invention = {
events = {
invention.1
invention.2
}
}
17 changes: 12 additions & 5 deletions common/scripted_guis/slave_movement.txt
View file
Open in desktop
@@ -1,8 +1,10 @@
slave_movement = {
allow_slave_movement = {
scope = province

ai_is_valid = {
always = no
}

is_valid = {
NOT = {
total_population >= population_cap
Expand All @@ -16,6 +18,7 @@
value = yes
}
}

if = {
limit = {
has_province_modifier = slave_move_yes
Expand All @@ -30,21 +33,25 @@
}
}
}
no_slave_movement = {

forbid_slave_movement = {
scope = province

ai_is_valid = {
always = no
}

effect = {
if = {
limit = {
has_province_modifier = no_slave_move
has_province_modifier = slave_move_no
}
remove_province_modifier = no_slave_move

remove_province_modifier = slave_move_no
}
else = {
add_province_modifier = {
name = no_slave_move
name = slave_move_no
duration = -1
}
}
Expand Down
2 changes: 1 addition & 1 deletion common/unit_abilities/disband_levy.txt
View file
Open in desktop
Expand Up @@ -86,7 +86,7 @@
}
}

debug_log = "levy [THIS.Var('country_levy_start_xp').GetValue]"
# debug_log = "levy [THIS.Var('country_levy_start_xp').GetValue]"

scope:levy_unit.unit_owner = {
add_military_experience = {
Expand Down
1 change: 1 addition & 0 deletions events/distinctions.txt
View file
Open in desktop
Expand Up @@ -19,6 +19,7 @@ distinction.7 = { # Primigenia
ordered_legion_unit = {
order_by = unit_size
save_scope_as = primagena_legion_leader
save_scope_as = actor
}
add_distinction = distinction_legio_primagena
ROOT = {
Expand Down
58 changes: 29 additions & 29 deletions events/inventions.txt
View file
Open in desktop
Expand Up @@ -5,14 +5,11 @@ invention.1 = {
hidden = yes

trigger = {
OR = {
NOT = {
has_variable = inv_check
}
var:inv_check <= 4
NOT = {
has_variable = inv_check
}

OR = {
military_tech = 0
mil_tech_check = 0
ora_tech_check = 0
civ_tech_check = 0
Expand All @@ -24,39 +21,42 @@ invention.1 = {
if = {
limit = {
OR = {
NOT = { has_variable = inv_check }
military_tech = 0
OR = {
military_tech >= 5
oratory_tech >= 5
civic_tech >= 5
religious_tech >= 5
}
}
}

#debug_log = "add inventions"

add_innovation = 4
}

if = {
limit = {
has_variable = inv_check
}
change_variable = {
name = inv_check
add = 1
}
}
else = {
set_variable = {
name = inv_check
value = 1
}
}

if = {
limit = {
var:inv_check = 4
mil_tech_check >= 1
ora_tech_check >= 1
civ_tech_check >= 1
rel_tech_check >= 1
}
}
}

remove_variable = inv_check
}
invention.2 = {
type = country_event
hidden = yes

trigger = {
has_variable = inv_check
mil_tech_check > 0
ora_tech_check > 0
civ_tech_check > 0
rel_tech_check > 0
}

immediate = {
#debug_log = "remove inventions"
remove_variable = inv_check
}
}