Makrura and Gilblin traits

common/culture/cultures/wc_amphibian.txt

@@ -53,36 +53,6 @@ gorloc = {
 	clothing_gfx = { creature_gorloc_gfx african_clothing_gfx }
 	unit_gfx = { sub_sahran_unit_gfx }
 
-	ethnicities = {
-		5 = caucasian_blond
-		30 = caucasian_ginger
-		35 = caucasian_brown_hair
-		30 = caucasian_dark_hair
-	}
-}
-
-makrura = {
-	color = rgb { 228 77 34 }
-
-	ethos = ethos_bellicose
-	heritage = heritage_amphibian
-	language = language_nerglish
-	martial_custom = martial_custom_equal
-	traditions = {
-		tradition_wetlanders
-		tradition_fishermen
-		tradition_tribe_unity
-		tradition_female_only_inheritance
-		tradition_storytellers
-	}
-
-	name_list = name_list_makrura
-
-	coa_gfx = { west_african_group_coa_gfx western_coa_gfx }
-	building_gfx = { indian_building_gfx }
-	clothing_gfx = { creature_murloc_gfx african_clothing_gfx }
-	unit_gfx = { sub_sahran_unit_gfx }
-
 	ethnicities = {
 		5 = caucasian_blond
 		30 = caucasian_ginger

common/culture/cultures/wc_crustacean.txt

@@ -0,0 +1,29 @@
+makrura = {
+	color = rgb { 228 77 34 }
+
+	ethos = ethos_bellicose
+	heritage = heritage_crustacean
+	language = language_nerglish
+	martial_custom = martial_custom_equal
+	traditions = {
+		tradition_wetlanders
+		tradition_fishermen
+		tradition_tribe_unity
+		tradition_female_only_inheritance
+		tradition_storytellers
+	}
+
+	name_list = name_list_makrura
+
+	coa_gfx = { west_african_group_coa_gfx western_coa_gfx }
+	building_gfx = { indian_building_gfx }
+	clothing_gfx = { creature_murloc_gfx african_clothing_gfx }
+	unit_gfx = { sub_sahran_unit_gfx }
+
+	ethnicities = {
+		5 = caucasian_blond
+		30 = caucasian_ginger
+		35 = caucasian_brown_hair
+		30 = caucasian_dark_hair
+	}
+}

common/culture/name_lists/wc_amphibian.txt

@@ -145,44 +145,4 @@ name_list_gorlish = {
 		{ name = "mercenary_company_peacemakers" }
 		{ name = "mercenary_company_big_tongues" }
 	}
-}
-
-name_list_makrura = {
-
-	cadet_dynasty_names = {
-		Angler Behemoth Clacker Clamcrusher Eyeless Head Pincer Scrabbler Shellhide Siltwalker Snapclaw Snapper Softshell Razorclaw
-	}
-
-	dynasty_names = {
-		Angler Behemoth Clacker Clamcrusher Eyeless Head Pincer Scrabbler Shellhide Siltwalker Snapclaw Snapper Softshell Razorclaw
-	}
-
-	male_names = {
-		Akkalar Akkalou Angler Clackclaw Clamstok Claximus Damlak Diamond Kishak Kliklak Kraklaa Kril'mandar Odd'nirok Oma'kil Unu
-	}
-	female_names = {
-		Akkalar Akkalou Angler Clackclaw Clamstok Claximus Damlak Diamond Kishak Kliklak Kraklaa Kril'mandar Odd'nirok Oma'kil Unu
-	}
-	dynasty_of_location_prefix = ""
-
-	##grammar_transform = french
-	##patronym_prefix_male = "dynnpat_pre_fils"
-
-	# Chance of male children being named after their paternal or maternal grandfather, or their father. Sum must not exceed 100.
-	pat_grf_name_chance = 10
-	mat_grf_name_chance = 30
-	father_name_chance = 25
-
-	# Chance of female children being named after their paternal or maternal grandmother, or their mother. Sum must not exceed 100.
-	pat_grm_name_chance = 15
-	mat_grm_name_chance = 40
-	mother_name_chance = 10
-
-
-
-	mercenary_names = {
-		{ name = "mercenary_company_finned_warriors" }
-		{ name = "mercenary_company_furl_mmmurloks" }
-		{ name = "mercenary_company_uuua_n_skrs" }
-	}
 }

common/culture/name_lists/wc_crustacean.txt

@@ -0,0 +1,39 @@
+name_list_makrura = {
+
+	cadet_dynasty_names = {
+		Angler Behemoth Clacker Clamcrusher Eyeless Head Pincer Scrabbler Shellhide Siltwalker Snapclaw Snapper Softshell Razorclaw
+	}
+
+	dynasty_names = {
+		Angler Behemoth Clacker Clamcrusher Eyeless Head Pincer Scrabbler Shellhide Siltwalker Snapclaw Snapper Softshell Razorclaw
+	}
+
+	male_names = {
+		Akkalar Akkalou Angler Clackclaw Clamstok Claximus Damlak Diamond Kishak Kliklak Kraklaa Kril'mandar Odd'nirok Oma'kil Unu
+	}
+	female_names = {
+		Akkalar Akkalou Angler Clackclaw Clamstok Claximus Damlak Diamond Kishak Kliklak Kraklaa Kril'mandar Odd'nirok Oma'kil Unu
+	}
+	dynasty_of_location_prefix = ""
+
+	##grammar_transform = french
+	##patronym_prefix_male = "dynnpat_pre_fils"
+
+	# Chance of male children being named after their paternal or maternal grandfather, or their father. Sum must not exceed 100.
+	pat_grf_name_chance = 10
+	mat_grf_name_chance = 30
+	father_name_chance = 25
+
+	# Chance of female children being named after their paternal or maternal grandmother, or their mother. Sum must not exceed 100.
+	pat_grm_name_chance = 15
+	mat_grm_name_chance = 40
+	mother_name_chance = 10
+
+
+
+	mercenary_names = {
+		{ name = "mercenary_company_finned_warriors" }
+		{ name = "mercenary_company_furl_mmmurloks" }
+		{ name = "mercenary_company_uuua_n_skrs" }
+	}
+}

common/culture/pillars/wc_heritage.txt

@@ -1,4 +1,4 @@
-### Humans Heritages ###
+### Human Heritages ###
 heritage_northern = {
 	type = heritage
 }
@@ -15,7 +15,7 @@ heritage_southern = {
 	type = heritage
 }
 
-### Orcs Heritages ###
+### Orc Heritages ###
 heritage_orcish = {
 	type = heritage
 }
@@ -67,7 +67,7 @@ heritage_hozen = {
 	type = heritage
 }
 
-### Trolls Heritages ###
+### Troll Heritages ###
 heritage_zulite = {
 	type = heritage
 }
@@ -92,12 +92,12 @@ heritage_gilblin = {
 	}
 }
 
-### Dwarfs Heritages ###
+### Dwarf Heritages ###
 heritage_dwarven = {
 	type = heritage
 }
 
-### Gnomes Heritages ###
+### Gnome Heritages ###
 heritage_gnomish = {
 	type = heritage
 }
@@ -167,7 +167,7 @@ heritage_uldamanic = {
 	type = heritage
 }
 
-### Taurens Heritages ###
+### Tauren Heritages ###
 heritage_yaungolic = {
 	type = heritage
 }
@@ -189,12 +189,12 @@ heritage_vulpine = {
 	type = heritage
 }
 
-### Gnolls Heritages ###
+### Gnoll Heritages ###
 heritage_hyenaic = {
 	type = heritage
 }
 
-### Wolvars Heritages ###
+### Wolvar Heritages ###
 heritage_lupine = {
 	type = heritage
 }
@@ -209,12 +209,12 @@ heritage_chelonian = {
 	type = heritage
 }
 
-### Quilboars Heritages ###
+### Quilboar Heritages ###
 heritage_agamagganic = {
 	type = heritage
 }
 
-### Furbolgs Heritages ###
+### Furbolg Heritages ###
 heritage_jalgaric = {
 	type = heritage
 }
@@ -229,7 +229,7 @@ heritage_avianic = {
 	type = heritage
 }
 
-### Murlocs Heritages ###
+### Murloc Heritages ###
 heritage_amphibian = {
 	type = heritage
 	# If change, update heritage_gives_sea_raiding_trigger
@@ -246,6 +246,23 @@ heritage_amphibian = {
 	}
 }
 
+### Makrura Heritage ###
+heritage_crustacean = {
+	type = heritage
+	# If change, update heritage_gives_sea_raiding_trigger
+	parameters = {
+		can_travel_along_rivers = yes
+		culture_can_raid_at_sea_even_if_feudal = yes
+	}
+	character_modifier = {
+		embarkation_cost_mult = -1
+		no_water_crossing_penalty = yes
+		movement_speed = -0.15
+		supply_duration = -0.25
+		naval_movement_speed_mult = 0.5
+	}
+}
+
 ### Kobold Heritages ###
 heritage_murine = {
 	type = heritage

common/dynasties/2000_orc.txt

@@ -3061,3 +3061,7 @@ cowl = {
 	name = "Cowl"
 	culture = stormreaver
 }
+snarl = {
+	name = "Snarl"
+	culture = blackrock
+}

common/dynasties/28000_goblin.txt

@@ -38,6 +38,7 @@
 28033 = {name = "dynn_Razdunk" culture = goblin}
 28034 = {name = "dynn_Dampwick" culture = goblin}
 28035 = {name = "dynn_Bilgewater" culture = goblin}
+grapplehammer = {name = "Grapplehammer" culture = goblin}
 
 28036 = {name = "dynn_Grappleblaster" culture = goblin} #Gazlowe's dynasty
 28037 = {name = "dynn_Moneyblaster" culture = goblin} #Generated
@@ -139,6 +140,6 @@ noggenfogger = {name = "Noggenfogger" culture = goblin}
 # 28130 = {name = "dynn_Megahead" culture = goblin}
 28131 = { name = "dynn_Powell" culture = goblin }
 
-######Gilgoblin###
+###Gilblin###
 
 28900 = { name = "dynn_Peddlefin" culture = gilblin }

common/game_concepts/wc_racial_game_concepts.txt

@@ -53,4 +53,9 @@ wc_murloc_family = {
 	parent = wc_race_family
 	alias = { wc_murloc_wo_family }
 	texture = "gfx/interface/icons/traits/creature_murloc.dds"
+}
+wc_goblin_family = {
+	parent = wc_race_family
+	alias = { wc_goblin_wo_family }
+	texture = "gfx/interface/icons/traits/creature_goblin.dds"
 }

common/genes/wc_genes_morph.txt

@@ -97,6 +97,8 @@ morph_genes = {
 		creature_trogg = { 					index = 76 	male = {} female = male boy = male girl = male }
 		creature_faldorei = { 			    index = 77 	male = {} female = male boy = male girl = male }
 		creature_sea_giant = {				index = 78  male = {} female = male boy = male girl = male }
+		creature_makrura = {				index = 79  male = {} female = male boy = male girl = male }
+		creature_gilblin = {				index = 80  male = {} female = male boy = male girl = male }
 	}
 	gene_being = {
 		no_being = { 					index = 0  	male = {} female = male boy = male girl = male }

common/scripted_effects/wc_race_effects.txt

@@ -453,6 +453,14 @@ try_to_set_race_effect = {
 		limit = { is_race_no_gene_trigger = { RACE = creature_sea_giant } }
 		set_race_effect = { RACE = creature_sea_giant }
 	}
+	else_if = {
+		limit = { is_race_no_gene_trigger = { RACE = creature_makrura } }
+		set_race_effect = { RACE = creature_makrura }
+	}
+	else_if = {
+		limit = { is_race_no_gene_trigger = { RACE = creature_gilblin } }
+		set_race_effect = { RACE = creature_gilblin }
+	}
 	else = {
 		debug_log = "(IMPORTANT) Couldn't get race trait."
 		debug_log_scopes = yes
@@ -582,6 +590,8 @@ remove_racial_traits_effect = {
 	if = { limit = { has_trait = creature_drogbar				} remove_trait = creature_drogbar				}
 
 	if = { limit = { has_trait = creature_trogg				} remove_trait = creature_trogg				}
+
+	if = { limit = { has_trait = creature_makrura				} remove_trait = creature_makrura				}
 
 	# # Race-related traits
 	# if = { limit = { has_trait = twoheaded 									} remove_trait = twoheaded									}
@@ -732,6 +742,7 @@ set_race_effect = {
 			scope:temp_race = flag:creature_jinyu
 			scope:temp_race = flag:creature_saurok
 			scope:temp_race = flag:creature_goblin
+			scope:temp_race = flag:creature_gilblin
 			scope:temp_race = flag:creature_annihilan
 			scope:temp_race = flag:creature_highborne
 			scope:temp_race = flag:creature_mechagnome
@@ -759,6 +770,7 @@ set_race_effect = {
 			scope:temp_race = flag:creature_ancient_lore
 			scope:temp_race = flag:creature_blue_dragon
 			scope:temp_race = flag:creature_sea_giant
+			scope:temp_race = flag:creature_makrura
 		}
 	}
 }
@@ -881,6 +893,8 @@ copy_race_effect = {
 	else_if = { limit = { $CHARACTER$ = { has_trait = creature_drogbar				} } set_race_effect = { RACE = creature_drogbar		} }
 	else_if = { limit = { $CHARACTER$ = { has_trait = creature_trogg				} } set_race_effect = { RACE = creature_trogg		} }
 	else_if = { limit = { $CHARACTER$ = { has_trait = creature_sea_giant			} } set_race_effect = { RACE = creature_sea_giant		} }
+	else_if = { limit = { $CHARACTER$ = { has_trait = creature_makrura			} } set_race_effect = { RACE = creature_makrura		} }
+	else_if = { limit = { $CHARACTER$ = { has_trait = creature_gilblin			} } set_race_effect = { RACE = creature_gilblin		} }
 
 }
 

common/scripted_triggers/wc_cultural_triggers.txt

@@ -402,6 +402,7 @@ heritage_gives_sea_raiding_trigger = {
 		has_cultural_pillar = heritage_azsharic
 		has_cultural_pillar = heritage_amphibian
 		has_cultural_pillar = heritage_aquatic
+		has_cultural_pillar = heritage_crustacean
 	}
 }