Skip to content

Integrate 1.12 changes #103

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

Open
BrknRobot wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Integrate 1.12 changes #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions Anti-Trust Patch/common/on_actions/zMoG_ATP_start_cleanout.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ mog_atp_start_cleanout_action = {
# # owner = ROOT
# # is_incorporated = yes
# # any_scope_building = {
# # is_building_type = building_chemical_plants
# # is_building_type = building_chemical_plant
# # level = 1
# # }
# # OR = {
Expand All @@ -53,9 +53,9 @@ mog_atp_start_cleanout_action = {
# # region = sr:region_south_germany
# # }
# # }
# # remove_building = building_chemical_plants
# # remove_building = building_chemical_plant
# # create_building={
# # building="building_chemical_plants"
# # building="building_chemical_plant"
# # add_ownership={
# # company={
# # type=company_IG_Farben
Expand All @@ -69,4 +69,4 @@ mog_atp_start_cleanout_action = {
# ## Repeat this block for x levels as needed.
# #}
# }
# }
# }
4 changes: 2 additions & 2 deletions Industries Rework - Military/common/buildings/11_mog_sec_industry.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ TRY_REPLACE:building_explosives_factory = {
levels_per_mesh = 50

production_method_groups = {
pmg_explosives_building_chemical_plants
pmg_explosives_building_chemical_plant
pmg_automation_building_explosives_factory
}

Expand All @@ -96,4 +96,4 @@ TRY_REPLACE:building_explosives_factory = {
ownership_type = self

background = "gfx/interface/icons/building_icons/backgrounds/building_panel_bg_heavy_industry.dds"
}
}
6 changes: 3 additions & 3 deletions Industries Rework - Military/common/buildings/vmog_ship_industry.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# We use the TTS named PMG with the vanilla pms in it, so that we can overwrite the building using a vanilla PMG that has the TTS name.
# This file must SUPERSEDE "tts_buildings.txt" for the purposes of the military shipyards
#
#building_military_shipyards = {
# building_group = bg_military_shipyards
#building_military_shipyard = {
# building_group = bg_military_industry
# icon = "gfx/interface/icons/building_icons/building_naval_yards.dds"
# city_type = port
#
Expand Down Expand Up @@ -32,4 +32,4 @@
# production_method_groups = {
# pmg_mil_shipyards_shiftwork
# }
#}
#}
6 changes: 3 additions & 3 deletions Industries Rework - Military/common/production_method_groups/mog_mil_pmg.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ REPLACE_OR_CREATE:pmg_automation_building_arms_industry = {
}
# Ref production_methods = { pm_automation_disabled pm_rotary_valve_engine_building_arms_industry pm_assembly_lines_building_arms_industry }

# pmg_base_building_munition_plants = { # Vanilla PMG untouched
# pmg_base_building_munition_plant = { # Vanilla PMG untouched
# Ref production_methods = { pm_percussion_caps pm_explosive_shells }

REPLACE_OR_CREATE:pmg_munitions_explosives_demob = { # Modded PMG
Expand All @@ -79,5 +79,5 @@ REPLACE_OR_CREATE:pmg_munitions_explosives_demob = { # Modded PMG
}
}

# pmg_automation_building_munition_plants = { # Vanilla PMG untouched
# Ref production_methods = { pm_automation_disabled pm_rotary_valve_engine_building_munition_plants pm_assembly_lines_building_munition_plants }
# pmg_automation_building_munition_plant = { # Vanilla PMG untouched
# Ref production_methods = { pm_automation_disabled pm_rotary_valve_engine_building_munition_plant pm_assembly_lines_building_munition_plant }
4 changes: 2 additions & 2 deletions Industries Rework - Military/common/production_method_groups/mog_sec_pmg.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ REPLACE_OR_CREATE:pmg_automation_building_motor_industry = { # Vanilla
}

## Explosives Factory:
REPLACE_OR_CREATE:pmg_explosives_building_chemical_plants = { # Vanilla PMG re-specified
REPLACE_OR_CREATE:pmg_explosives_building_chemical_plant = { # Vanilla PMG re-specified
texture = "gfx/interface/icons/generic_icons/mixed_icon_base.dds"
production_methods = {
pm_leblanc_process
Expand Down Expand Up @@ -81,4 +81,4 @@ REPLACE_OR_CREATE:pmg_automation_building_explosives_factory = { # Modde
# pm_mil_shipyards_triple_shifts
# pm_mil_shipyards_triple_shifts_arc_weld
# }
#}
#}
26 changes: 13 additions & 13 deletions Industries Rework - Military/common/production_methods/amog_ships_pm.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,10 @@
#
# state_modifiers = {
# unscaled = {
# building_military_shipyards_throughput_add = 0.1
# building_military_shipyard_throughput_add = 0.1
# }
# level_scaled = {
# building_military_shipyards_throughput_add = 0.02
# building_military_shipyard_throughput_add = 0.02
# }
# }
#}
Expand Down Expand Up @@ -210,10 +210,10 @@
#
# state_modifiers = {
# unscaled = {
# building_military_shipyards_throughput_add = 0.1
# building_military_shipyard_throughput_add = 0.1
# }
# level_scaled = {
# building_military_shipyards_throughput_add = 0.02
# building_military_shipyard_throughput_add = 0.02
# }
# }
#}
Expand Down Expand Up @@ -251,10 +251,10 @@
#
# state_modifiers = {
# unscaled = {
# building_military_shipyards_throughput_add = 0.1
# building_military_shipyard_throughput_add = 0.1
# }
# level_scaled = {
# building_military_shipyards_throughput_add = 0.02
# building_military_shipyard_throughput_add = 0.02
# }
# }
#
Expand Down Expand Up @@ -312,10 +312,10 @@
#
# state_modifiers = {
# unscaled = {
# building_military_shipyards_throughput_add = 0.2
# building_military_shipyard_throughput_add = 0.2
# }
# level_scaled = {
# building_military_shipyards_throughput_add = 0.04
# building_military_shipyard_throughput_add = 0.04
# }
# }
#
Expand Down Expand Up @@ -358,10 +358,10 @@
#
# state_modifiers = {
# unscaled = {
# building_military_shipyards_throughput_add = 0.2
# building_military_shipyard_throughput_add = 0.2
# }
# level_scaled = {
# building_military_shipyards_throughput_add = 0.04
# building_military_shipyard_throughput_add = 0.04
# }
# }
#
Expand Down Expand Up @@ -401,12 +401,12 @@
#
# state_modifiers = {
# unscaled = {
# building_military_shipyards_throughput_add = 0.2
# building_military_shipyard_throughput_add = 0.2
# }
# level_scaled = {
# building_military_shipyards_throughput_add = 0.04
# building_military_shipyard_throughput_add = 0.04
# }
# }
#
# required_input_goods = electricity
#}
#}
4 changes: 2 additions & 2 deletions Industries Rework - Military/common/production_methods/mog_ammo_pm.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ REPLACE_OR_CREATE:pm_no_self_explosives = {
}

### Automation Replacements ###
REPLACE_OR_CREATE:pm_rotary_valve_engine_building_munition_plants = {
REPLACE_OR_CREATE:pm_rotary_valve_engine_building_munition_plant = {
texture = "gfx/interface/icons/production_method_icons/rotary_valve_engine.dds"

state_modifiers = {
Expand All @@ -410,7 +410,7 @@ REPLACE_OR_CREATE:pm_rotary_valve_engine_building_munition_plants = {
}
}

REPLACE_OR_CREATE:pm_assembly_lines_building_munition_plants = {
REPLACE_OR_CREATE:pm_assembly_lines_building_munition_plant = {
texture = "gfx/interface/icons/production_method_icons/assembly_lines.dds"

state_modifiers = {
Expand Down
30 changes: 15 additions & 15 deletions Industries Rework - Military/common/production_methods/vmog_tts_pm.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,10 @@
#
# state_modifiers = {
# unscaled = {
# building_military_shipyards_throughput_add = 0.1
# building_military_shipyard_throughput_add = 0.1
# }
# level_scaled = {
# building_military_shipyards_throughput_add = 0.02
# building_military_shipyard_throughput_add = 0.02
# }
# }
#}
Expand Down Expand Up @@ -211,10 +211,10 @@
#
# state_modifiers = {
# unscaled = {
# building_military_shipyards_throughput_add = 0.1
# building_military_shipyard_throughput_add = 0.1
# }
# level_scaled = {
# building_military_shipyards_throughput_add = 0.02
# building_military_shipyard_throughput_add = 0.02
# }
# }
#}
Expand Down Expand Up @@ -256,10 +256,10 @@
#
# state_modifiers = {
# unscaled = {
# building_military_shipyards_throughput_add = 0.1
# building_military_shipyard_throughput_add = 0.1
# }
# level_scaled = {
# building_military_shipyards_throughput_add = 0.02
# building_military_shipyard_throughput_add = 0.02
# }
# }
#}
Expand Down Expand Up @@ -299,10 +299,10 @@
#
# state_modifiers = {
# unscaled = {
# building_military_shipyards_throughput_add = 0.1
# building_military_shipyard_throughput_add = 0.1
# }
# level_scaled = {
# building_military_shipyards_throughput_add = 0.02
# building_military_shipyard_throughput_add = 0.02
# }
# }
#}
Expand Down Expand Up @@ -346,10 +346,10 @@
#
# state_modifiers = {
# unscaled = {
# building_military_shipyards_throughput_add = 0.2
# building_military_shipyard_throughput_add = 0.2
# }
# level_scaled = {
# building_military_shipyards_throughput_add = 0.04
# building_military_shipyard_throughput_add = 0.04
# }
# }
#
Expand Down Expand Up @@ -393,10 +393,10 @@
#
# state_modifiers = {
# unscaled = {
# building_military_shipyards_throughput_add = 0.2
# building_military_shipyard_throughput_add = 0.2
# }
# level_scaled = {
# building_military_shipyards_throughput_add = 0.04
# building_military_shipyard_throughput_add = 0.04
# }
# }
#
Expand Down Expand Up @@ -438,12 +438,12 @@
#
# state_modifiers = {
# unscaled = {
# building_military_shipyards_throughput_add = 0.2
# building_military_shipyard_throughput_add = 0.2
# }
# level_scaled = {
# building_military_shipyards_throughput_add = 0.04
# building_military_shipyard_throughput_add = 0.04
# }
# }
#
# required_input_goods = electricity
#}
#}
2 changes: 1 addition & 1 deletion Industries Rework - Ranches/common/company_types/yMoG_RPR_companies_overwrite.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ company_somali_food_chain = {
building_banana_plantation
building_coffee_plantation
building_tea_plantation
building_vineyard_plantation
building_vineyard
}

possible_prestige_goods = {
Expand Down
10 changes: 5 additions & 5 deletions Industries Rework - Ranches/common/production_methods/amog_rpr_subsistence.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### Subsistence Production
TRY_INJECT:default_building_subsistence_farms = {
TRY_INJECT:default_building_subsistence_farm = {
state_modifiers = { # This is inherited from USU, and is not strictly in scope for this mod - but I've seen that it works and people should have access to this feature without USU if they want it.
workforce_scaled = {
state_birth_rate_mult = -0.0045 # For some reason this one gets modifiers but the other doesn't, and the goal is to cancel out when fully employed.
Expand All @@ -10,7 +10,7 @@ TRY_INJECT:default_building_subsistence_farms = {
}
}

TRY_INJECT:default_building_subsistence_orchards = {
TRY_INJECT:default_building_subsistence_orchard = {
state_modifiers = {
workforce_scaled = {
state_birth_rate_mult = -0.0045
Expand All @@ -21,7 +21,7 @@ TRY_INJECT:default_building_subsistence_orchards = {
}
}

TRY_INJECT:default_building_subsistence_pastures = {
TRY_INJECT:default_building_subsistence_pasture = {
state_modifiers = {
workforce_scaled = {
state_birth_rate_mult = -0.0045
Expand All @@ -32,7 +32,7 @@ TRY_INJECT:default_building_subsistence_pastures = {
}
}

TRY_INJECT:default_building_subsistence_fishing_villages = {
TRY_INJECT:default_building_subsistence_fishing_village = {
state_modifiers = {
workforce_scaled = {
state_birth_rate_mult = -0.0045
Expand All @@ -43,7 +43,7 @@ TRY_INJECT:default_building_subsistence_fishing_villages = {
}
}

TRY_INJECT:default_building_subsistence_rice_paddies = {
TRY_INJECT:default_building_subsistence_rice_farm = {
state_modifiers = {
workforce_scaled = {
state_birth_rate_mult = -0.0045
Expand Down
Loading