Orgrimmar Character View (#1119)

* Orgrimmar Character View - Added a custom character view and environment for characters in Orgrimmar. * Alternative Character View - Changed background art and environment. I'll let others vote on which one they prefer. * Higher Quality BG - Found a higher resolution version of the background. * Oilify Filter - Applied Oilify filter to the background to make it look less photorealistic. - Adjusted lighting environment slightly. * Orc gatekeeping * Timekeeping * Remove incorrect trigger --------- Co-authored-by: Chomski <[email protected]> Co-authored-by: Robmart <[email protected]>
Warcraft-GoA-Development-Team · Oct 24, 2024 · f995d4d · f995d4d
1 parent b69ae87
commit f995d4d
Show file tree

Hide file tree

Showing 7 changed files with 166 additions and 16 deletions.
diff --git a/common/culture/cultures/wc_orcish.txt b/common/culture/cultures/wc_orcish.txt
@@ -26,7 +26,7 @@
 	name_list = name_list_warsong
 
 	coa_gfx = { warsong_coa_gfx orcish_coa_gfx }
-	building_gfx = { western_building_gfx }
+	building_gfx = { orcish_building_gfx western_building_gfx }
 	clothing_gfx = { creature_orc_gfx orcish_clothing_gfx orcish_hairstyles_gfx orcish_beards_gfx }
 	unit_gfx = { northern_unit_gfx }
 
@@ -64,7 +64,7 @@ shadowmoon = {
 	name_list = name_list_shadowmoon
 
 	coa_gfx = { shadowmoon_coa_gfx orcish_coa_gfx }
-	building_gfx = { western_building_gfx }
+	building_gfx = { orcish_building_gfx western_building_gfx }
 	clothing_gfx = { creature_orc_gfx orcish_clothing_gfx orcish_hairstyles_gfx orcish_beards_gfx }
 	unit_gfx = { northern_unit_gfx }
 
@@ -108,7 +108,7 @@ bleeding_hollow = {
 	name_list = name_list_bleeding_hollow
 
 	coa_gfx = { bleeding_hollow_coa_gfx orcish_coa_gfx }
-	building_gfx = { western_building_gfx }
+	building_gfx = { orcish_building_gfx western_building_gfx }
 	clothing_gfx = { creature_orc_gfx orcish_clothing_gfx orcish_hairstyles_gfx orcish_beards_gfx }
 	unit_gfx = { northern_unit_gfx }
 
@@ -147,7 +147,7 @@ blackrock = {
 	name_list = name_list_blackrock
 
 	coa_gfx = { blackrock_coa_gfx orcish_coa_gfx }
-	building_gfx = { western_building_gfx }
+	building_gfx = { orcish_building_gfx western_building_gfx }
 	clothing_gfx = { creature_orc_gfx orcish_clothing_gfx orcish_hairstyles_gfx orcish_beards_gfx }
 	unit_gfx = { northern_unit_gfx }
 
@@ -186,7 +186,7 @@ burning_blade = {
 	name_list = name_list_burning_blade
 
 	coa_gfx = { burning_blade_coa_gfx orcish_coa_gfx }
-	building_gfx = { western_building_gfx }
+	building_gfx = { orcish_building_gfx western_building_gfx }
 	clothing_gfx = { creature_orc_gfx orcish_clothing_gfx orcish_hairstyles_gfx orcish_beards_gfx }
 	unit_gfx = { northern_unit_gfx }
 
@@ -222,7 +222,7 @@ stormreaver = {
 	name_list = name_list_stormreaver
 
 	coa_gfx = { stormreaver_coa_gfx orcish_coa_gfx }
-	building_gfx = { western_building_gfx }
+	building_gfx = { orcish_building_gfx western_building_gfx }
 	clothing_gfx = { creature_orc_gfx orcish_clothing_gfx orcish_hairstyles_gfx orcish_beards_gfx }
 	unit_gfx = { northern_unit_gfx }
 
@@ -254,7 +254,7 @@ thunderlord = {
 	name_list = name_list_thunderlord
 
 	coa_gfx = { orcish_coa_gfx }
-	building_gfx = { western_building_gfx }
+	building_gfx = { orcish_building_gfx western_building_gfx }
 	clothing_gfx = { creature_orc_gfx orcish_clothing_gfx orcish_hairstyles_gfx orcish_beards_gfx }
 	unit_gfx = { northern_unit_gfx }
 
@@ -293,7 +293,7 @@ bonechewer = {
 	name_list = name_list_bonechewer
 
 	coa_gfx = { orcish_coa_gfx }
-	building_gfx = { western_building_gfx }
+	building_gfx = { orcish_building_gfx western_building_gfx }
 	clothing_gfx = { creature_orc_gfx orcish_clothing_gfx orcish_hairstyles_gfx orcish_beards_gfx }
 	unit_gfx = { northern_unit_gfx }
 
@@ -326,7 +326,7 @@ laughing_skull = {
 	name_list = name_list_laughing_skull
 
 	coa_gfx = { laughing_skull_coa_gfx orcish_coa_gfx }
-	building_gfx = { western_building_gfx }
+	building_gfx = { orcish_building_gfx western_building_gfx }
 	clothing_gfx = { creature_orc_gfx orcish_clothing_gfx orcish_hairstyles_gfx orcish_beards_gfx }
 	unit_gfx = { northern_unit_gfx }
 
@@ -359,7 +359,7 @@ shattered_hand = {
 	name_list = name_list_shattered_hand
 
 	coa_gfx = { shattered_hand_coa_gfx orcish_coa_gfx }
-	building_gfx = { western_building_gfx }
+	building_gfx = { orcish_building_gfx western_building_gfx }
 	clothing_gfx = { creature_orc_gfx orcish_clothing_gfx orcish_hairstyles_gfx orcish_beards_gfx }
 	unit_gfx = { northern_unit_gfx }
 
@@ -394,7 +394,7 @@ frostwolf = {
 	name_list = name_list_frostwolf
 
 	coa_gfx = { frostwolf_coa_gfx orcish_coa_gfx }
-	building_gfx = { western_building_gfx }
+	building_gfx = { orcish_building_gfx western_building_gfx }
 	clothing_gfx = { creature_orc_gfx orcish_clothing_gfx orcish_hairstyles_gfx orcish_beards_gfx }
 	unit_gfx = { northern_unit_gfx }
 
@@ -433,7 +433,7 @@ twilights_hammer = {
 	name_list = name_list_twilights_hammer
 
 	coa_gfx = { twilights_hammer_coa_gfx orcish_coa_gfx }
-	building_gfx = { western_building_gfx }
+	building_gfx = { orcish_building_gfx western_building_gfx }
 	clothing_gfx = { orcish_clothing_gfx creature_orc_gfx no_hair_gfx no_beard_gfx }
 	unit_gfx = { northern_unit_gfx }
 
@@ -476,7 +476,7 @@ dragonmaw = {
 	name_list = name_list_dragonmaw
 
 	coa_gfx = { dragonmaw_coa_gfx orcish_coa_gfx }
-	building_gfx = { western_building_gfx }
+	building_gfx = { orcish_building_gfx western_building_gfx }
 	clothing_gfx = { creature_orc_gfx orcish_clothing_gfx orcish_hairstyles_gfx orcish_beards_gfx }
 	unit_gfx = { northern_unit_gfx }
 
@@ -517,7 +517,7 @@ durotaric = {
 	name_list = name_list_durotaric
 
 	coa_gfx = { orcish_coa_gfx }
-	building_gfx = { western_building_gfx }
+	building_gfx = { orcish_building_gfx western_building_gfx }
 	clothing_gfx = { creature_orc_gfx orcish_clothing_gfx orcish_hairstyles_gfx orcish_beards_gfx }
 	unit_gfx = { northern_unit_gfx }
 
@@ -546,7 +546,7 @@ maghar = {
 	name_list = name_list_maghar
 
 	coa_gfx = { orcish_coa_gfx }
-	building_gfx = { western_building_gfx }
+	building_gfx = { orcish_building_gfx western_building_gfx }
 	clothing_gfx = { creature_orc_gfx orcish_clothing_gfx orcish_hairstyles_gfx orcish_beards_gfx }
 	unit_gfx = { northern_unit_gfx }
 
@@ -574,7 +574,7 @@ moknathal = {
 	name_list = name_list_moknathal
 
 	coa_gfx = { orcish_coa_gfx }
-	building_gfx = { western_building_gfx }
+	building_gfx = { orcish_building_gfx western_building_gfx }
 	clothing_gfx = { moknathal_hairstyles_gfx creature_orc_gfx orcish_clothing_gfx moknathal_beards_gfx }
 	unit_gfx = { northern_unit_gfx }
 

diff --git a/common/event_backgrounds/01_event_backgrounds.txt b/common/event_backgrounds/01_event_backgrounds.txt
@@ -3536,6 +3536,15 @@ throne_room = {
 		environment = "environment_event_fp2_throneroom"
 		ambience = "event:/DLC/FP2/SFX/Events/throneroom" 
 	}
+	# Orgrimmar
+	background = {
+		trigger = {
+			has_orgrimmar_illustration_trigger = yes
+		}
+		reference = "gfx/interface/illustrations/character_view/orgrimmar.dds"
+		environment = "environment_character_orgrimmar"
+		ambience = "event:/SFX/Events/Backgrounds/throneroom_western"
+	}
 
 	background = { #FP1 Tribal
 		trigger = {
@@ -3679,6 +3688,15 @@ throne_room_scope = {
 		environment = "environment_exodar_throne_room"
 		ambience = "event:/SFX/Events/Backgrounds/temple_generic"
 	}
+	# Orgrimmar
+	background = {
+		trigger = {
+			scope:background_throne_room_scope = { has_orgrimmar_illustration_trigger = yes }
+		}
+		reference = "gfx/interface/illustrations/character_view/orgrimmar.dds"
+		environment = "environment_character_orgrimmar"
+		ambience = "event:/SFX/Events/Backgrounds/throneroom_western"
+	}
 
 	background = { #FP1 Tribal
 		trigger = {

diff --git a/common/scripted_triggers/wc_illustration_triggers.txt b/common/scripted_triggers/wc_illustration_triggers.txt
@@ -154,6 +154,47 @@ has_kaldorei_illustration_trigger = {
 		liege.culture = { has_building_gfx = night_elven_building_gfx }
 	}
 }
+has_orgrimmar_illustration_trigger = {
+	trigger_if = {
+		limit = { is_alive = no }
+		culture = { has_building_gfx = orcish_building_gfx }
+		capital_province = { has_holding_type = castle_holding }
+		current_year >= 603
+		OR = {
+			primary_title = title:k_durotan
+			primary_title = title:d_orgrimmar
+			primary_title = title:c_orgrimmar
+		}
+	}
+	trigger_else_if = {
+		limit = { is_ruler = yes }
+		exists = capital_province
+		culture = { has_building_gfx = orcish_building_gfx }
+		capital_province = { has_holding_type = castle_holding }
+		capital_province = title:c_orgrimmar.title_province
+		current_year >= 603
+	}
+	trigger_else_if = {
+		limit = { exists = host }
+		host = {
+			exists = capital_province
+			culture = { has_building_gfx = orcish_building_gfx }
+			capital_province = { has_holding_type = castle_holding }
+			capital_province = title:c_orgrimmar.title_province
+			current_year >= 603
+		}
+	}
+	trigger_else = {
+		exists = liege
+		liege = {
+			exists = capital_province
+			culture = { has_building_gfx = orcish_building_gfx }
+			capital_province = { has_holding_type = castle_holding }
+			capital_province = title:c_orgrimmar.title_province
+			current_year >= 603
+		}
+	}
+}
 has_kaldorei_illustration_with_location_trigger = {
 	# Not sure about these changes, so keep old stuff just in case
 	location.culture ?= { has_building_gfx = night_elven_building_gfx }

diff --git a/gfx/interface/illustrations/character_view/orgrimmar.dds b/gfx/interface/illustrations/character_view/orgrimmar.dds
diff --git a/gfx/interface/illustrations/scripted_illustrations/ingame.txt b/gfx/interface/illustrations/scripted_illustrations/ingame.txt
@@ -448,6 +448,39 @@ character_view_bg = {
 		}
 	}
 
+	# Orgrimmar
+	texture = {
+		reference = "character_view/orgrimmar.dds"
+
+		trigger = {
+			has_orgrimmar_illustration_trigger = yes
+		}
+	}
+	environment = {
+		reference = "environment_character_orgrimmar"
+
+		trigger = {
+			has_orgrimmar_illustration_trigger = yes
+			is_character_window_main_character = yes
+		}
+	}
+	environment = {
+		reference = "environment_character_orgrimmar"
+		trigger = {
+			OR = {
+				AND = {
+					exists = primary_spouse
+					primary_spouse = { has_orgrimmar_illustration_trigger = yes }
+				}
+				AND = {
+					exists = betrothed
+					betrothed = { has_orgrimmar_illustration_trigger = yes }
+				}
+			}
+			is_character_window_main_character = no
+		}
+	}
+
 	######################################
 
 	# Dead

diff --git a/gfx/portraits/environments/wc_portrait_environments.txt b/gfx/portraits/environments/wc_portrait_environments.txt
@@ -1233,6 +1233,62 @@ environment_exodar_throne_room = {
 			default = camera_torso_look_at
 		}
 
+		fov = 75
+		camera_near_far = { 10 650 }
+	}
+}
+
+environment_character_orgrimmar = {
+	cubemap = "gfx/portraits/environments/castle_interior_01_fire.dds"
+	cubemap_intensity = 1
+
+	lights = {
+		# Ambient face light (greenish white)
+		0 = {
+			type = "spot_light"	# Valid types are "spot_light", "point_light", and "directional_light"
+			affected_by_shadow = yes
+
+			color = hsv{ 0.67 0.1 0.75 }	# Hue, saturation, value. Increase value for more intense lights
+			position = cylindrical{ @main_light_height 	@main_light_height -500 }	# Radius, height, angle
+
+			# For spot lights and directional lights
+			look_at = { 0 0 0 }
+			look_at_node = camera_torso_look_at
+
+			# For spot lights and point lights
+			radius = 1000
+			falloff = 10
+
+			# For point lights
+			outer_cone_angle = 75
+			inner_cone_angle = 0
+		}
+		# Ambient face light (dome light)
+		1 = {
+			type = "spot_light"	# Valid types are "spot_light", "point_light", and "directional_light"
+			affected_by_shadow = yes
+
+			color = hsv{ 0.075 0.9 3 }	# Hue, saturation, value. Increase value for more intense lights
+			position = cylindrical{ @sun_light_radius  @sun_light_height 65 }	# Radius, height, angle
+
+			# For spot lights and directional lights
+			look_at = { 0 0 0 }
+			look_at_node = camera_torso_look_at
+
+			# For spot lights and point lights
+			radius = 500
+			falloff = 10
+
+			# For point lights
+			outer_cone_angle = 75
+			inner_cone_angle = 0
+		}
+	}
+
+	shadow_camera = {
+		position = cylindrical{ @main_light_height @main_light_height 0 }
+		look_at = { 0 0 0 }
+		look_at_node = camera_torso_look_at
 		fov = 75
 		camera_near_far = { 10 650 }
 	}

diff --git a/localization/english/culture/wc_culture_gfx_l_english.yml b/localization/english/culture/wc_culture_gfx_l_english.yml
@@ -216,3 +216,5 @@
  night_elven_building_gfx:0 "$night_elf$"
  no_lowborn_headgear_gfx:0 "$no_headgear_gfx$"
  trogg_clothing_gfx:0 "$Troggish$"
+
+ orcish_building_gfx:0 "$orcish$"