Skip to content

Commit 1a9fa44

Browse files
authored
MIR - Fix Tiger warnings (#59)
* MIR - Fix Tiger warnings * MIR - Remove CMF triggers * MIR - Update PMG names to match vanilla * MIR - Use appropriate vanilla PM names * MIR - Remove AWR base files Original mod is depreciated, so there's little reason to keep these around * MIR - Use tiger annotations for mod compatibility filters
1 parent 9ac3afc commit 1a9fa44

34 files changed

+153
-456
lines changed

Industries Rework - Military/common/alert_types/MoG_MIR_alert_types.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ MIR_war_demob_planes = {
205205
}
206206
any_scope_state = {
207207
OR = {
208-
is_production_method_active = { building_type = building_automotive_industry production_method = pm_no_aeroplanes }
208+
is_production_method_active = { building_type = building_automotive_industry production_method = pm_no_aeroplane_production }
209209
is_production_method_active = { building_type = building_automotive_industry production_method = pm_limited_aeroplanes }
210210
}
211211
}
@@ -254,7 +254,7 @@ MIR_war_demob_tanks = {
254254
}
255255
any_scope_state = {
256256
OR = {
257-
is_production_method_active = { building_type = building_automotive_industry production_method = pm_no_tanks }
257+
is_production_method_active = { building_type = building_automotive_industry production_method = pm_no_tank_production }
258258
is_production_method_active = { building_type = building_automotive_industry production_method = pm_limited_tanks }
259259
}
260260
}

Industries Rework - Military/common/buildings/11_mog_awr_industry.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ building_automotive_industry = {
1212
}
1313

1414
production_method_groups = {
15-
pmg_base_building_automotive_industry
15+
pmg_automobile_production
1616
pmg_automotive_shiftwork
17-
pmg_automotive_aeroplanes
18-
pmg_automotive_tanks
17+
pmg_aeroplanes
18+
pmg_tanks
19+
#pmg_automation_building_automotive_industry
1920
}
2021

2122
required_construction = construction_cost_very_high

Industries Rework - Military/common/production_method_groups/mog_awr_pmg.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# This file is the automotive industry with tank and plane demobilisation PM's
22
# Credit to indexo4
33

4-
pmg_base_building_automotive_industry = { # Modded PMG
4+
pmg_automobile_production = { # Modded PMG
55
texture = "gfx/interface/icons/generic_icons/mixed_icon_base.dds"
66
production_methods = {
77
pm_gear_transmissions
8-
pm_automobiles
8+
pm_automobile_production
99
pm_pneumatic_tyres
1010
}
1111
}
@@ -21,10 +21,10 @@ pmg_automotive_shiftwork = { # Modded PMG
2121
}
2222
}
2323

24-
pmg_automotive_aeroplanes = { # Modded PMG
24+
pmg_aeroplanes = { # Modded PMG
2525
texture = "gfx/interface/icons/generic_icons/mixed_icon_refining.dds"
2626
production_methods = {
27-
pm_no_aeroplanes
27+
pm_no_aeroplane_production
2828
pm_limited_aeroplanes
2929
pm_limited_aeroplanes_double
3030
pm_limited_aeroplanes_triple
@@ -35,10 +35,10 @@ pmg_automotive_aeroplanes = { # Modded PMG
3535
}
3636
}
3737

38-
pmg_automotive_tanks = { # Modded PMG
38+
pmg_tanks = { # Modded PMG
3939
texture = "gfx/interface/icons/generic_icons/mixed_icon_refining.dds"
4040
production_methods = {
41-
pm_no_tanks
41+
pm_no_tank_production
4242
pm_limited_tanks
4343
pm_limited_tanks_double
4444
pm_limited_tanks_triple

Industries Rework - Military/common/production_method_groups/mog_sec_pmg.txt

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,14 @@ pmg_automation_building_explosives_factory = { # Modded PMG
7171

7272
## Military Shipyards
7373

74-
pmg_mil_shipyards_shiftwork = { # Modded PMG
75-
texture = "gfx/interface/icons/generic_icons/mixed_icon_automation.dds"
76-
production_methods = {
77-
pm_single_shift_days
78-
pm_mil_shipyards_double_shifts
79-
pm_mil_shipyards_double_shifts_arc_weld
80-
pm_mil_shipyards_triple_shifts
81-
pm_mil_shipyards_triple_shifts_arc_weld
82-
}
83-
}
74+
# Overwritten by "tmog_tts_pmg.txt"
75+
#pmg_mil_shipyards_shiftwork = { # Modded PMG
76+
# texture = "gfx/interface/icons/generic_icons/mixed_icon_automation.dds"
77+
# production_methods = {
78+
# pm_single_shift_days
79+
# pm_mil_shipyards_double_shifts
80+
# pm_mil_shipyards_double_shifts_arc_weld
81+
# pm_mil_shipyards_triple_shifts
82+
# pm_mil_shipyards_triple_shifts_arc_weld
83+
# }
84+
#}

Industries Rework - Military/common/production_methods/amog_ships_pm.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
# Base PM's
44

5+
#tiger-ignore(key=duplicate-item) # Overwritten by TTS
56
pm_military_shipbuilding_wooden = {
67
texture = "gfx/interface/icons/production_method_icons/military_shipbuilding_wooden.dds"
78

@@ -26,6 +27,7 @@ pm_military_shipbuilding_wooden = {
2627
}
2728
}
2829

30+
#tiger-ignore(key=duplicate-item) # Overwritten by TTS
2931
pm_military_shipbuilding_wooden_2 = {
3032
texture = "gfx/interface/icons/production_method_icons/military_shipbuilding_wooden_2.dds"
3133

Industries Rework - Military/common/production_methods/awr_pm.txt

Lines changed: 0 additions & 100 deletions
This file was deleted.

Industries Rework - Military/common/production_methods/mog_awr_pm.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
}
2222
}
2323

24-
pm_automobiles = {
24+
pm_automobile_production = {
2525
texture = "gfx/interface/icons/production_method_icons/automobiles_primary.dds"
2626
ai_value = 50000
2727

@@ -84,7 +84,7 @@ pm_automotive_double_shifts = {
8484
shift_work
8585
}
8686
unlocking_production_methods = {
87-
pm_automobiles
87+
pm_automobile_production
8888
pm_pneumatic_tyres
8989
}
9090

@@ -145,7 +145,7 @@ pm_automotive_triple_shifts = {
145145
conveyors
146146
}
147147
unlocking_production_methods = {
148-
pm_automobiles
148+
pm_automobile_production
149149
pm_pneumatic_tyres
150150
}
151151

@@ -201,7 +201,7 @@ pm_automotive_triple_shifts_pneumatic = {
201201
required_input_goods = electricity
202202
}
203203

204-
pm_no_aeroplanes = {
204+
pm_no_aeroplane_production = {
205205
texture = "gfx/interface/icons/production_method_icons/no_aeroplanes.dds"
206206
}
207207

@@ -380,7 +380,7 @@ pm_ui_safety_c = {
380380
}
381381
}
382382

383-
pm_no_tanks = {
383+
pm_no_tank_production = {
384384
texture = "gfx/interface/icons/production_method_icons/no_tanks_secondary.dds"
385385
}
386386

Industries Rework - Military/common/script_values/zmog_MR_vikelas_script_value.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ vikelas_automobile_industry_score = {
1111
limit = {
1212
is_building_type = building_automotive_industry # building_motor_industry
1313
OR = { # has_active_production_method = pm_automobile_production
14-
has_active_production_method = pm_automobiles
14+
has_active_production_method = pm_automobile_production
1515
has_active_production_method = pm_pneumatic_tyres
1616
}
1717
}

Industries Rework - Military/common/scripted_guis/zmog_MR_autoracing_sguis.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#Morgenrote compatibility with MIR
44

55
#MR_AUTORACING_FOUND_TEAM_BUTTON
6-
mr_autoracing_found_team_button = {
6+
mr_autoracing_found_team_button_sgui = {
77
scope = country
88
is_shown = {
99
NOT = {
@@ -19,14 +19,14 @@ mr_autoracing_found_team_button = {
1919
}
2020
custom_tooltip = {
2121
text = MR_HAS_ENGINEER_TT
22-
gaudi_has_engineer = yes
22+
tesla_has_engineer = yes
2323
}
2424
custom_tooltip = {
2525
text = MR_AUTORACING_FOUND_TEAM_BUTTON_TRIGGER_TT
2626
any_scope_building = {
27-
is_building_type = building_automotive_industry # building_motor_industry
27+
is_building_type = building_automotive_industry
2828
OR = { # has_active_production_method = pm_automobile_production
29-
has_active_production_method = pm_automobiles
29+
has_active_production_method = pm_automobile_production
3030
has_active_production_method = pm_pneumatic_tyres
3131
}
3232
level >= 2

0 commit comments

Comments
 (0)