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.

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

fix: update Japanese localization #627

Closed
wants to merge 44 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
0e35a70
Update 00_coa_triggers.txt
ZRYZJ Oct 29, 2023
cc53439
interface fix
JackEPepper Feb 11, 2024
40253b2
fix gfx errors for invalid unit types
JackEPepper Feb 11, 2024
4d8137b
fix: gfx and localization
Matti-96 Feb 11, 2024
d7adf9f
Merge branch 'hotfix' into 0.5.0-hotfix
JackEPepper Feb 11, 2024
ba7afc4
unused characters
JackEPepper Feb 11, 2024
c6ed1e3
remove old unit types from gfx triggers
JackEPepper Feb 11, 2024
9b786ce
removed duplicate code
JackEPepper Feb 11, 2024
d440bd7
fix: skill traits
Matti-96 Feb 11, 2024
e6a317e
fix: multiple fixes
Matti-96 Feb 11, 2024
6de45c8
fix: forgot to do the light ships gfx
Matti-96 Feb 11, 2024
aff293c
re-BOM file, always watch out for "should be in in utf-8-bom encoding…
Feb 14, 2024
ca1282e
Deleted duplicated content in file - we had severe merge conflict, or…
Feb 14, 2024
641f57b
Input goods mult locs
Feb 14, 2024
87e08ca
Someone is using tool, that de-BOMIifies files automatically it seems…
Feb 14, 2024
bac20f5
fully removed references to deleted building
Feb 14, 2024
1b9070d
IRQ is in GBR market, no need for those trade routes
Feb 14, 2024
a9198f9
Deleted pre-1.5 file that we never modified
Feb 14, 2024
9186ea1
These did exactly nothing
Feb 14, 2024
f1f41ce
fixed most of GUI bugs
Feb 14, 2024
4fd3993
Fixed all unexpected tokens
Feb 14, 2024
b36dc44
Added TODOs to WMD localization so it doesn't log errors
Feb 15, 2024
db0630b
fixed missing icon errors
Feb 15, 2024
0150441
Deleted 1.4 file that wasn't updated to 1.5
Feb 15, 2024
24a63eb
JEs must belong to group, and events must have default option
Feb 15, 2024
ffd90b0
more missing WMD loc
Feb 15, 2024
d0626f6
removed dead defines and stray branckets
Feb 15, 2024
ef52662
Artillery was missing offense in its modifiers, generated vanilla-lik…
Feb 15, 2024
b1e5e52
Missing military PM locs
Feb 15, 2024
9032e96
Added alert setting locs
Feb 15, 2024
afcb30c
fixed minor event errors
Feb 15, 2024
fa7e3d9
more stray brackets
Feb 15, 2024
48b323d
this vanilla wariable is unneeded
Feb 15, 2024
03aaf52
Readded pop and IG GUI icons
Feb 16, 2024
1c95660
Fixed outdated loc, someone would have to check all replaced locs if …
Feb 16, 2024
361ae1d
wtf how this happened
Feb 17, 2024
7b0f040
same typo somewhere else
Feb 17, 2024
bff957e
fixed some UI bugs
Feb 17, 2024
dd866d5
deleted unmodified 1.5 beta file
Feb 17, 2024
0ef544c
initial commit of file with old units
Feb 17, 2024
cabfa11
Used mod combat units, this file probably needs rewrite anyway
Feb 17, 2024
006766c
fix: update Japanese localization
oooFUNooo Feb 18, 2024
5b3d5f2
Merge branch 'master' into master
ZRYZJ Mar 9, 2024
6be69dc
Merge pull request #628 from ZRYZJ/master
JackEPepper May 6, 2024
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
2 changes: 1 addition & 1 deletion common/building_groups/00_building_groups.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# parent_group = parent_group_key If set, this group is considered a child of the specified group. Default no parent.
# parent_group = parent_group_key If set, this group is considered a child of the specified group. Default no parent.
# always_possible = yes/no If yes, building types in this group are always permitted regardless of resources in state. Default no.
# economy_of_scale = yes/no If yes, any non-subsistence buildings in or underneath this group will get an economy of scale throughput modifier for each level > 1. Default no.
# is_subsistence = yes/no If yes, buildings of types in this group are considered subsistence buildings that follow special rules. Default no.
Expand Down
43 changes: 30 additions & 13 deletions common/buildings/14_wmd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,17 @@ building_nuclear_weapons_facility = {
unlocking_technologies = {
atomic_bomb
}
can_build = {
or = {
has_modifier = atomic_capable
has_modifier = thermonuclear_capable
can_build_government = {
owner = {
OR = {
has_modifier = atomic_capable
has_modifier = thermonuclear_capable
}
}
}
can_build_private = {
always = no
}
production_method_groups = {
pmg_base_nuclear_weapons_facility
}
Expand All @@ -28,12 +33,17 @@ building_strategic_airbase = {
unlocking_technologies = {
atomic_bomb
}
can_build = {
or = {
has_modifier = atomic_capable
has_modifier = thermonuclear_capable
can_build_government = {
owner = {
OR = {
has_modifier = atomic_capable
has_modifier = thermonuclear_capable
}
}
}
can_build_private = {
always = no
}
production_method_groups = {
pmg_base_strategic_airbase
}
Expand All @@ -49,12 +59,19 @@ building_nuclear_weapons_silo = {
unlocking_technologies = {
intercontinental_ballistic_missiles
}
can_build = {
or = {
has_modifier = atomic_capable
has_modifier = thermonuclear_capable
can_build_government = {
owner = {
AND = {
OR = {
has_modifier = atomic_capable
has_modifier = thermonuclear_capable
}
has_modifier = icbm_capable
}
}
has_modifier = icbm_capable
}
can_build_private = {
always = no
}
production_method_groups = {
pmg_base_nuclear_weapons_silo
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,6 @@ invite_exile = {

effect = {
transfer_character = scope:actor
set_variable = exile_to_ruler_var
custom_tooltip = invite_exile_start_join_movement_effect
hidden_effect = {
remove_modifier = in_exile_modifier
Expand Down
110 changes: 36 additions & 74 deletions common/character_traits/skill_traits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -154,18 +154,18 @@ basic_artillery_commander = {
texture = gfx/interface/icons/character_trait_icons/basic_artillery_commander.dds

command_modifier = {
unit_combat_unit_type_siege_artillery_offense_mult = 0.05
unit_combat_unit_type_shrapnel_artillery_offense_mult = 0.05
unit_combat_unit_type_light_artillery_mult = 0.05
unit_combat_unit_type_mobile_artillery_mult = 0.05
unit_combat_unit_type_mlrs_artillery_offense_mult = 0.05
unit_combat_unit_type_self_propelled_artillery_offense_mult = 0.05
unit_combat_unit_type_light_artillery_offense_mult = 0.05
unit_combat_unit_type_mobile_artillery_offense_mult = 0.05
character_battle_condition_aggressive_maneuver_mult = 1
character_battle_condition_mud_mult = 0.5
}

possible = {
has_role = general
owner ?= {
has_technology_researched = heavy_artillery
has_technology_researched = towed_artillery
}
NOR = {
has_trait = experienced_artillery_commander
Expand Down Expand Up @@ -219,7 +219,7 @@ basic_artillery_commander = {
this = root
}
formation_army_unit_type_fraction = {
target = unit_type:combat_unit_type_shrapnel_artillery
target = unit_type:combat_unit_type_self_propelled_artillery
value >= 0.20
}
}
Expand All @@ -236,31 +236,14 @@ basic_artillery_commander = {
this = root
}
formation_army_unit_type_fraction = {
target = unit_type:combat_unit_type_siege_artillery
target = unit_type:combat_unit_type_mlrs_artillery
value >= 0.20
}
}
}
}
multiply = 20
}
if = {
limit = {
owner = {
any_military_formation = {
is_army = yes
any_scope_general = {
this = root
}
formation_army_unit_type_fraction = {
target = unit_type:combat_unit_type_heavy_tank
value >= 0.20
}
}
}
}
multiply = 50
}
}

replace = {
Expand All @@ -274,10 +257,10 @@ experienced_artillery_commander = {
texture =gfx/interface/icons/character_trait_icons/experienced_artillery_commander.dds

command_modifier = {
unit_combat_unit_type_siege_artillery_offense_mult = 0.1
unit_combat_unit_type_shrapnel_artillery_offense_mult = 0.1
unit_combat_unit_type_light_artillery_mult = 0.1
unit_combat_unit_type_mobile_artillery_mult = 0.1
unit_combat_unit_type_mlrs_artillery_offense_mult = 0.1
unit_combat_unit_type_self_propelled_artillery_offense_mult = 0.1
unit_combat_unit_type_light_artillery_offense_mult = 0.1
unit_combat_unit_type_mobile_artillery_offense_mult = 0.1
character_battle_condition_aggressive_maneuver_mult = 2
character_battle_condition_mud_mult = 0.5
}
Expand Down Expand Up @@ -315,7 +298,7 @@ experienced_artillery_commander = {
this = root
}
formation_army_unit_type_fraction = {
target = unit_type:combat_unit_type_shrapnel_artillery
target = unit_type:combat_unit_type_self_propelled_artillery
value >= 0.20
}
}
Expand All @@ -332,31 +315,14 @@ experienced_artillery_commander = {
this = root
}
formation_army_unit_type_fraction = {
target = unit_type:combat_unit_type_siege_artillery
target = unit_type:combat_unit_type_mlrs_artillery
value >= 0.20
}
}
}
}
multiply = 20
}
if = {
limit = {
owner = {
any_military_formation = {
is_army = yes
any_scope_general = {
this = root
}
formation_army_unit_type_fraction = {
target = unit_type:combat_unit_type_heavy_tank
value >= 0.20
}
}
}
}
multiply = 50
}
}

replace = {
Expand All @@ -371,10 +337,10 @@ expert_artillery_commander = {
texture =gfx/interface/icons/character_trait_icons/expert_artillery_commander.dds

command_modifier = {
unit_combat_unit_type_siege_artillery_offense_mult = 0.15
unit_combat_unit_type_shrapnel_artillery_offense_mult = 0.15
unit_combat_unit_type_light_artillery_mult = 0.15
unit_combat_unit_type_mobile_artillery_mult = 0.15
unit_combat_unit_type_mlrs_artillery_offense_mult = 0.15
unit_combat_unit_type_self_propelled_artillery_offense_mult = 0.15
unit_combat_unit_type_light_artillery_offense_mult = 0.15
unit_combat_unit_type_mobile_artillery_offense_mult = 0.15
character_battle_condition_aggressive_maneuver_mult = 3
character_battle_condition_mud_mult = 0.5
}
Expand All @@ -395,7 +361,7 @@ expert_artillery_commander = {
this = root
}
formation_army_unit_type_fraction = {
target = unit_type:combat_unit_type_shrapnel_artillery
target = unit_type:combat_unit_type_self_propelled_artillery
value >= 0.20
}
}
Expand All @@ -412,31 +378,14 @@ expert_artillery_commander = {
this = root
}
formation_army_unit_type_fraction = {
target = unit_type:combat_unit_type_siege_artillery
target = unit_type:combat_unit_type_mlrs_artillery
value >= 0.20
}
}
}
}
multiply = 20
}
if = {
limit = {
owner = {
any_military_formation = {
is_army = yes
any_scope_general = {
this = root
}
formation_army_unit_type_fraction = {
target = unit_type:combat_unit_type_heavy_tank
value >= 0.20
}
}
}
}
multiply = 50
}
}

replace = {
Expand Down Expand Up @@ -802,7 +751,10 @@ convoy_raider_commander = {

command_modifier = {
character_convoy_raiding_mult = 0.1
unit_combat_unit_type_submarine_offense_mult = 0.1
unit_combat_unit_type_wartime_submarine_offense_mult = 0.1
unit_combat_unit_type_diesel_attack_submarine_offense_mult = 0.1
unit_combat_unit_type_nuclear_attack_submarine_offense_mult = 0.1
unit_combat_unit_type_cruise_missile_submarine_offense_mult = 0.1
}

possible = {
Expand Down Expand Up @@ -843,7 +795,10 @@ experienced_convoy_raider = {

command_modifier = {
character_convoy_raiding_mult = 0.5
unit_combat_unit_type_submarine_offense_mult = 0.15
unit_combat_unit_type_wartime_submarine_offense_mult = 0.15
unit_combat_unit_type_diesel_attack_submarine_offense_mult = 0.15
unit_combat_unit_type_nuclear_attack_submarine_offense_mult = 0.15
unit_combat_unit_type_cruise_missile_submarine_offense_mult = 0.15
}

possible = {
Expand Down Expand Up @@ -878,7 +833,10 @@ expert_convoy_raider = {

command_modifier = {
character_convoy_raiding_mult = 1.5
unit_combat_unit_type_submarine_offense_mult = 0.25
unit_combat_unit_type_wartime_submarine_offense_mult = 0.25
unit_combat_unit_type_diesel_attack_submarine_offense_mult = 0.25
unit_combat_unit_type_nuclear_attack_submarine_offense_mult = 0.25
unit_combat_unit_type_cruise_missile_submarine_offense_mult = 0.25
}

possible = {
Expand Down Expand Up @@ -913,7 +871,11 @@ traditionalist_commander = {

command_modifier = {
character_command_limit_mult = 0.1
unit_combat_unit_type_carrier_offense_mult = -0.1
unit_combat_unit_type_wartime_aircraft_carrier_offense_mult = -0.1
unit_combat_unit_type_modernised_aircraft_carrier_offense_mult = -0.1
unit_combat_unit_type_supercarrier_offense_mult = -0.1
unit_combat_unit_type_helicopter_carrier_offense_mult = -0.1
unit_combat_unit_type_nuclear_battlecruiser_offense_mult = -0.1
}

# Reminder: this would only come into effect if this Commander is or becomes a Ruler
Expand Down
Loading