healed error.log

Warcraft-GoA-Development-Team · Nov 25, 2023 · cdc1c4e · cdc1c4e
1 parent 17be5b4
commit cdc1c4e
Show file tree

Hide file tree

Showing 8 changed files with 886 additions and 889 deletions.
diff --git a/common/culture/cultures/wc_crustacean.txt b/common/culture/cultures/wc_crustacean.txt
@@ -17,7 +17,7 @@
 
 	coa_gfx = { west_african_group_coa_gfx western_coa_gfx }
 	building_gfx = { indian_building_gfx }
-	clothing_gfx = { creature_murloc_gfx african_clothing_gfx }
+	clothing_gfx = { creature_makrura_gfx creature_murloc_gfx african_clothing_gfx }
 	unit_gfx = { sub_sahran_unit_gfx }
 
 	ethnicities = {

diff --git a/common/culture/cultures/wc_goblin.txt b/common/culture/cultures/wc_goblin.txt
@@ -78,7 +78,7 @@ gilblin = {
 
 	coa_gfx = { tirassian_coa_gfx western_coa_gfx }
 	building_gfx = { mena_building_gfx }
-	clothing_gfx = { creature_goblin_gfx goblin_clothing_gfx goblin_hairstyles_gfx no_beard_gfx }
+	clothing_gfx = { creature_gilblin_gfx creature_goblin_gfx goblin_clothing_gfx goblin_hairstyles_gfx no_beard_gfx }
 	unit_gfx = { western_unit_gfx }
 
 	ethnicities = {

diff --git a/common/traits/wc_race_traits.txt b/common/traits/wc_race_traits.txt
@@ -400,29 +400,6 @@ creature_goblin = {
 	inherit_chance = @race_inherit_chance
 	both_parent_has_trait_inherit_chance = @both_parent_race_inherit_chance
 }
-creature_gilblin = {
-	desc = {
-		first_valid = {
-			triggered_desc = {
-				trigger = {
-					NOT = { exists = this }
-				}
-				desc = trait_creature_gilblin_desc
-			}
-			desc = trait_creature_gilblin_character_desc
-		}
-	}
-	shown_in_ruler_designer = no
-
-	group = race
-	level = 16
-
-	flag = goblin_family
-	flag = amphibious_class
-
-	inherit_chance = @race_inherit_chance
-	both_parent_has_trait_inherit_chance = @both_parent_race_inherit_chance
-}
 creature_pygmy = {
 	desc = {
 		first_valid = {
@@ -2074,11 +2051,35 @@ creature_makrura = {
 	shown_in_ruler_designer = no
 
 	group = race
-	level = 5
+	level = 80
 
 	#flag = static_race
 	flag = amphibious_class
 
+	inherit_chance = @race_inherit_chance
+	both_parent_has_trait_inherit_chance = @both_parent_race_inherit_chance
+}
+
+creature_gilblin = {
+	desc = {
+		first_valid = {
+			triggered_desc = {
+				trigger = {
+					NOT = { exists = this }
+				}
+				desc = trait_creature_gilblin_desc
+			}
+			desc = trait_creature_gilblin_character_desc
+		}
+	}
+	shown_in_ruler_designer = no
+
+	group = race
+	level = 81
+
+	flag = goblin_family
+	flag = amphibious_class
+
 	inherit_chance = @race_inherit_chance
 	both_parent_has_trait_inherit_chance = @both_parent_race_inherit_chance
 }
diff --git a/history/characters/75000_old_dwarven.txt b/history/characters/75000_old_dwarven.txt
@@ -178,7 +178,7 @@ baleog_the_fierce={
 	mother=lost_dwarf_parent2
 	trait = creature_dwarf
 	trait = education_martial_3 trait=education_martial_prowess_2
-	trait=wrathful trait=eccentric trait=arrogantc trait=ambitious
+	trait=wrathful trait=eccentric trait=arrogant trait=ambitious
 	509.1.1={ birth=yes }
 	526.1.1={
 		effect={

diff --git a/localization/english/00_mapfiller_cultural_titles_l_english.yml b/localization/english/00_mapfiller_cultural_titles_l_english.yml