Merge pull request Civ13#2754 from savethetreez/master

Triple Nations conversion
savethetreez · Apr 19, 2024 · 4a68cac · 4a68cac
2 parents 7cf4c8c + 27103e9
commit 4a68cac
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 64 deletions.
diff --git a/code/game/mob/living/carbon/human/nomads_spawn.dm b/code/game/mob/living/carbon/human/nomads_spawn.dm
@@ -1209,32 +1209,28 @@
 		var/list/possible_h_list = list("Black")
 		var/list/possible_e_list = list("Black")
 		var/list/possible_s_list = list(-10,-60)
-		spawn(5)
+		spawn(3)
 			//west
 			if (original_job_title == "Civilization A Citizen")
-				add_language("Latin",TRUE)
-				remove_language("English")
-				remove_note("Known Languages","English")
-				for (var/datum/language/latin/A in languages)
+				for (var/datum/language/english/A in languages)
 					default_language = A
-				name = species.get_random_roman_name(gender)
+				name = species.get_random_english_name(gender)
 				real_name = name
-				add_note("Known Languages", "Latin")
-				possible_h_list = list("Light Brown","Dark Brown","Black","Brown")
-				possible_e_list = list("Green","Brown","Black")
-				possible_s_list = list(-35,-60)
+				possible_h_list = list("Orange","Light Brown","Red","Brown")
+				possible_e_list = list("Green","Blue","Brown")
+				possible_s_list = list(-15,-30)
 			//east
 			else if (original_job_title == "Civilization B Citizen")
-				add_language("Gaelic",TRUE)
+				add_language("French",TRUE)
 				remove_language("English")
 				remove_note("Known Languages","English")
-				for (var/datum/language/gaelic/A in languages)
+				for (var/datum/language/french/A in languages)
 					default_language = A
-				name = species.get_random_gaelic_name(gender)
+				name = species.get_random_french_name(gender)
 				real_name = name
-				add_note("Known Languages", "Gaelic")
-				possible_h_list = list("Orange","Light Brown","Red","Brown")
-				possible_e_list = list("Green","Blue")
+				add_note("Known Languages", "French")
+				possible_h_list = list("Light Brown","Dark Brown","Black","Brown")
+				possible_e_list = list("Green","Brown","Black","Blue")
 				possible_s_list = list(-15,-30)
 			else if (original_job_title == "Civilization C Citizen")
 				add_language("German",TRUE)
@@ -1368,18 +1364,24 @@
 		var/list/possible_h_list = list("Black")
 		var/list/possible_e_list = list("Black")
 		var/list/possible_s_list = list(-10,-60)
-		spawn(5)
-			//west English
+		spawn(3)
+			//west American
 			if (original_job_title == "Civilization A Citizen")
 				add_language("English",TRUE)
 				for (var/datum/language/english/A in languages)
 					default_language = A
-				name = species.get_random_english_name(gender)
-				real_name = name
 				add_note("Known Languages", "English")
-				possible_h_list = list("Dark Brown","Light Brown","Dirty Blond")
-				possible_e_list = list("Blue","Green","Brown")
-				possible_s_list = list(-25,-38)
+				if(prob(80))
+					name = species.get_random_english_name(gender)
+					possible_h_list = list("Dark Brown","Light Brown","Dirty Blond","Black","Red","Orange")
+					possible_e_list = list("Blue","Green","Brown","Black")
+					possible_s_list = list(-25,-45)
+				else
+					name = species.get_random_afro_american_name(gender)
+					possible_h_list = list("Black")
+					possible_e_list = list("Black")
+					possible_s_list = list(-90,-150)
+				real_name = name
 			//east Russian
 			else if (original_job_title == "Civilization B Citizen")
 				add_language("Russian",TRUE)
@@ -1392,7 +1394,7 @@
 				add_note("Known Languages", "Russian")
 				possible_h_list = list("Red","Orange","Light Blond","Blond","Dirty Blond")
 				possible_e_list = list("Blue","Green")
-				possible_s_list = list(-10,-28)
+				possible_s_list = list(-10,-30)
 			new_hair = pick(possible_h_list)
 			new_eyes = pick(possible_e_list)
 			s_tone = rand(possible_s_list[1],possible_s_list[2])

diff --git a/code/game/objects/map_metadata/nationsrp.dm b/code/game/objects/map_metadata/nationsrp.dm
@@ -202,7 +202,7 @@
 	ID = MAP_NATIONSRP_TRIPLE
 	title = "Triple Nations RP"
 	availablefactions = list("Civilization A Citizen", "Civilization B Citizen", "Civilization C Citizen")
-	mission_start_message = "<big>Three nations rule this land. The grace wall will end in <b>30 minutes</b>. This is an RP focused map, people of all three nations start friendly by default.</big><br><b>Wiki Guide: http://civ13.github.io/civ13-wiki/Civilizations_and_Nomads</b>"
+	mission_start_message = "<big>Three nations rule this land. The grace wall will end in <b>30 minutes</b>. This is a RP focused map, people of all three nations start friendly by default.</big><br><b>Wiki Guide: http://civ13.github.io/civ13-wiki/Civilizations_and_Nomads</b>"
 	default_research = 145
 	ordinal_age = 4
 	age1_done = TRUE
@@ -216,12 +216,12 @@
 
 /obj/map_metadata/nationsrp/triple/New()
 	..()
-	civname_a = "Latin Nation"
-	civname_b = "Gaelic Nation"
+	civname_a = "British Nation"
+	civname_b = "French Nation"
 	civname_c = "German Nation"
-	var/newnamea = list("Latin Nation" = list(default_research,default_research,default_research,null,0,"cross","#D4AF37","#660000"))
-	var/newnameb = list("Gaelic Nation" = list(default_research,default_research,default_research,null,0,"saltire","#C0C0C0","#006600"))
-	var/newnamec = list("German Nation" = list(default_research,default_research,default_research,null,0,"saltire","#0B5394","#B45F06"))
+	var/newnamea = list("British Nation" = list(default_research,default_research,default_research,null,0,"bigcross","#800101","#C0C0C0"))
+	var/newnameb = list("French Nation" = list(default_research,default_research,default_research,null,0,"saltire","#193798","#C0C0C0"))
+	var/newnamec = list("German Nation" = list(default_research,default_research,default_research,null,0,"cross","#FFCC1E","#111111"))
 	custom_civs += newnamea
 	custom_civs += newnameb
 	custom_civs += newnamec