Skip to content

Commit

Permalink
Merge branch 'master' into feature/rajas-of-asia-support
Browse files Browse the repository at this point in the history
  • Loading branch information
IhateTrains committed Nov 5, 2024
2 parents 2859172 + 6f93fda commit 8a8fdba
Show file tree
Hide file tree
Showing 6 changed files with 141 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Fronter.NET
1 change: 1 addition & 0 deletions ImperatorToCK3/CK3/World.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1098,6 +1098,7 @@ private void DetermineCK3Dlcs(Configuration config) {
{"dlc012.dlc", "north_african_attire"},
{"dlc013.dlc", "couture_of_capets"},
{"dlc014.dlc", "roads_to_power"},
{"dlc015.dlc", "wandering_nobles"},
};

var dlcFiles = Directory.GetFiles(dlcFolderPath, "*.dlc", SearchOption.AllDirectories);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Last updated: CK3 patch 1.13.0
# Last updated: CK3 patch 1.14.0.1
MountedWarriorTerm = {
type = character

Expand Down Expand Up @@ -709,6 +709,69 @@ TerrainTypeProvince = {
}
}

TerrainTypeProvincePrefix = {
type = province

text = {
trigger = {
OR = {
terrain = plains
terrain = farmlands
terrain = oasis
}
}
localization_key = prefix_verdant
}

text = {
trigger = { terrain = hills }
localization_key = prefix_rolling
}

text = {
trigger = {
OR = {
terrain = mountains
terrain = desert_mountains
terrain = jungle
}
}
localization_key = prefix_mighty
}

text = {
trigger = {
OR = {
terrain = desert
terrain = steppe
terrain = taiga
}
}
localization_key = prefix_endless
}

text = {
trigger = {
OR = {
terrain = jungle
terrain = forest
}
}
localization_key = prefix_lush
}

text = {
trigger = {
OR = {
terrain = floodplains
terrain = drylands
terrain = wetlands
}
}
localization_key = prefix_rich
}
}

Abortifacient = {
type = character

Expand Down Expand Up @@ -2824,6 +2887,77 @@ RegionalFerociousAnimal = {
}
}

RegionalOnlyFerociousAnimal = {
type = character
random_valid = yes

#Bear
text = {
trigger = {
location = { geographical_region = hunt_animal_bear_region }
}
localization_key = animal_type_bear
}
#Wolf
text = {
trigger = {
NOT = {
location = { geographical_region = world_africa_west }
}
}
localization_key = animal_type_wolf
fallback = yes
}
# Hyena
text = {
trigger = {
location = {
OR = {
geographical_region = world_africa
geographical_region = world_middle_east
geographical_region = world_india
}
}
}
localization_key = animal_type_hyena
}
#Boar
text = {
trigger = {
location = { geographical_region = hunt_animal_boar_region }
}
localization_key = animal_type_boar
}
#Tiger
text = {
trigger = {
location = { hunt_animal_tiger_trigger = yes }
}
localization_key = animal_type_tiger
}
#Leopard
text = {
trigger = {
location = { hunt_animal_leopard_trigger = yes }
}
localization_key = animal_type_leopard
}
#Lion
text = {
trigger = {
location = { hunt_animal_lion_trigger = yes }
}
localization_key = animal_type_lion
}
#Gorilla
text = {
trigger = {
location = { geographical_region = world_africa_east }
}
localization_key = animal_type_gorilla
}
}

#this is used with the select_local_farm_animal_effect effect
RegionalFarmAnimal = {
type = character
Expand Down Expand Up @@ -3395,3 +3529,4 @@ GetKnightErrantAnimal = {
fallback = yes
}
}

6 changes: 3 additions & 3 deletions ImperatorToCK3/Data_Files/configurables/version.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Version info

name = "Nerva"
name = "Trajan"
source = "Imperator"
minSource = "2.0"
maxSource = "2.0"
target = "CK3"
minTarget = "1.13"
maxTarget = "1.13"
minTarget = "1.14"
maxTarget = "1.14"
Binary file modified ImperatorToCK3/Resources/images/LatestReleaseBanner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ImperatorToCK3/Resources/images/LatestReleaseBanner.xcf
Binary file not shown.

0 comments on commit 8a8fdba

Please sign in to comment.