Barblan added (no DNA)

merrygin · Jan 6, 2024 · bf39160 · bf39160
1 parent 77835b2
commit bf39160
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 3 deletions.
diff --git a/common/character_templates/elgar_composer.txt b/common/character_templates/elgar_composer.txt
@@ -100,6 +100,9 @@
 ###Sweden###
 #Andrée, Elfrida
 
+###Switzerland###
+#Otto Barblan
+
 ###USA###
 #Copland, Aaron
 #Gershwin, George
@@ -1372,6 +1375,25 @@ mr_swe_andree_elfrida_character_template = {
 	}
 }
 
+###Switzerland###
+#Otto Barblan
+mr_swi_barblan_otto_character_template = {
+	dna = mr_swi_barblan_otto
+	first_name = mr_otto
+	last_name = mr_barblan
+	culture = cu:rumantsch
+	female = no
+	ig_leader = no
+	interest_group = ig_intelligentsia
+	birth_date = 1860.3.22
+	historical = yes
+	traits = {
+		elgar_composer
+		meticulous
+		erudite
+	}
+}
+
 ###USA###
 #Copland, Aaron
 mr_usa_copland_aaron_character_template = {

diff --git a/common/cultures/dufour_swiss_cultures.txt b/common/cultures/dufour_swiss_cultures.txt
@@ -43,7 +43,7 @@
 		mr_therese
 		mr_verena
 	}	
-	noble_last_names = { # mostly patrician families of Bern
+	noble_last_names = {
 		mr_a_marca mr_ab_yberg mr_abis mr_achermann_ab_ennerberg mr_am_rhyn mr_am_stad mr_aregger_von_wildensteg mr_arnold_von_spiringen mr_aspermont mr_auf_der_maur
 		mr_bavier mr_beeli mr_belmont mr_bernoulli mr_besenwal mr_bessler mr_blosch mr_bodmer mr_bonstetten mr_brugger mr_bruegger mr_brun mr_brumsi mr_burckhardt mr_burkli mr_bueler mr_buol von_Bonstetten von_BU_ren von_Bergmann
 		mr_cabalzar mr_capol mr_caprez mr_castelberg mr_castelmur mr_caviezel mr_chiffelle mr_crivelli mr_cron
@@ -385,7 +385,7 @@ united_swiss={
 		mr_therese
 		mr_verena
 	}	
-	noble_last_names = { # mostly patrician families of Bern
+	noble_last_names = {
 		mr_a_marca mr_ab_yberg mr_abis mr_achermann_ab_ennerberg mr_am_rhyn mr_am_stad mr_aregger_von_wildensteg mr_arnold_von_spiringen mr_aspermont mr_auf_der_maur
 		mr_bavier mr_beeli mr_belmont mr_bernoulli mr_besenwal mr_bessler mr_blosch mr_bodmer mr_bonstetten mr_brugger mr_bruegger mr_brun mr_brumsi mr_burckhardt mr_burkli mr_bueler mr_buol von_Bonstetten von_BU_ren von_Bergmann
 		mr_cabalzar mr_capol mr_caprez mr_castelberg mr_castelmur mr_caviezel mr_chiffelle mr_crivelli mr_cron

diff --git a/common/scripted_effects/artists_scripted_effects.txt b/common/scripted_effects/artists_scripted_effects.txt
@@ -366,7 +366,36 @@ create_new_composer_effect = {
 
 			set_global_variable = elgar_andree_created_global_var
 		}
-		3 = { #Teresa Carreño
+		4 = { #Otto Barblan, Switzerland
+			trigger = {
+				NOT = { has_global_variable = elgar_barblan_created_global_var }
+				has_state_in_state_region = STATE_EAST_SWITZERLAND
+				NOT = {
+					cu:rumantsch = {
+						culture_is_discriminated_in = root
+					}
+				}
+				game_date < 1915.3.22 #Age 55
+				year >= 1885 #Really started composing work
+			}
+			create_character = {
+				template = mr_swi_barblan_otto_character_template
+				save_scope_as = elgar_new_composer_scope
+			}
+			scope:elgar_new_composer_scope = {
+				set_variable = mr_is_composer_var
+				composer_experience_set_up_effect = yes
+				place_character_in_void = 1200
+			}
+
+			set_variable = {
+				name = elgar_new_composer_var
+				value = scope:elgar_new_composer_scope
+			}
+
+			set_global_variable = elgar_barblan_created_global_var
+		}
+		3 = { #Teresa Carreño, Venezuela
 			trigger = {
 				NOT = { has_global_variable = elgar_carreno_created_global_var }
 				has_state_in_state_region = STATE_MIRANDA

diff --git a/common/scripted_triggers/mr_clothing_triggers.txt b/common/scripted_triggers/mr_clothing_triggers.txt
@@ -298,6 +298,7 @@ mr_glasses_famous_people_trigger = {
 				has_template = mr_rus_rimsky_nikolai_character_template
 				has_template = mr_rus_stravinsky_igor_character_template
 				has_template = mr_spa_albeniz_isaac_character_template
+				has_template = mr_swi_barblan_otto_character_template
 				has_template = mr_usa_copland_aaron_character_template
 				has_template = mr_usa_sousa_john_philip_character_template
 			}
@@ -467,6 +468,7 @@ mr_no_hat_historic_person_trigger = {
 				has_template = mr_rus_rimsky_nikolai_character_template
 				has_template = mr_rus_stravinsky_igor_character_template
 				has_template = mr_spa_albeniz_isaac_character_template
+				has_template = mr_swi_barblan_otto_character_template
 				has_template = mr_usa_copland_aaron_character_template
 			}
 		}

diff --git a/localization/english/mr_character_names_l_english.yml b/localization/english/mr_character_names_l_english.yml
@@ -1100,6 +1100,7 @@
  #Common Last Names 
  mr_barandur: "Barandur" #NT!
  mr_barbeisch: "Barbeisch" #NT!
+ mr_barblan: "Barblan"
  mr_battalaua: "Battalaua" #NT!
  mr_bellvatsch: "Bellvatsch" #NT!
  mr_caderas: "Caderas" #NT!