Added the Ottomans! #703

android/assets/jsons/Nations.json

@@ -469,6 +469,45 @@
 			"Recklinghausen","Gצttingen","Wolfsburg","Koblenz","Hildesheim","Erlangen"]
 	},
 	
+	
+	{
+		name:"The Ottomans",
+		leaderName:"Suleiman I",
+		adjective:["Ottoman"],
+		startBias:["Coast"],
+		preferredVictoryType:"Domination",
+		
+		startIntroPart1: "Blessings of God be upon you, oh Great Emperor Suleiman! Your power, wealth and generosity awe the world! Truly, are you called 'Magnificent!' Your empire began in Bithynia, a small country in Eastern Anatolia in 12th century. Taking advantage in the decline of the great Selkuj Sultanate of Rum, King Osman I of Bithynia expanded west into Anatolia. Over the next century, your subjects brought down the empire of Byzantium, taking its holdings in Turkey and then the Balkans. In the mid 15th century, the Ottomans captured ancient Constantinople, gaining control of the strategic link between Europe and the Middle East. Your people's empire would continue to expand for centuries governing much of North Africa, the Middle East and Eastern Europe at its height."
+		startIntroPart2: "Mighty Sultan, heed the call of your people! Bring your empire back to the height of its power and glory and once again the world will look upon your greatness with awe and admiration! Will you accept the challenge, great emperor? Will you build an empire that will stand the test of time?"
+		
+		declaringWar:"Your continued insolence and failure to recognize and preeminence leads us to war."
+		attacked:"Good. The world shall witness the incontestable might of my armies and the glory of the Empire."
+		defeated:"Ruin! Ruin! Istanbul becomes Iram of the Pillars, remembered only by the melancholy poets."
+		introduction:"From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm Suleiman, Kayser-I Rum, and I bestow upon you my welcome!"
+		
+		neutralHello:"Greetings!"
+		neutralLetsHearIt:["I'm listening.","Go on."]
+		neutralNo:["No.","Of course not!","We decline."]
+		neutralYes:["Very good.","Fine.","We accept!"]
+
+		hateHello:"What do you want?"
+		hateLetsHearIt:["So you say!","Go on!"]
+		hateNo:["Excuse me?","This is unacceptable!","You can't be serious!"]
+		hateYes:["Ah, very good!","Very good.","I assume we must come to an agreement."]
+		
+		afterPeace:"Congratulations on your victory! I hope that peace between us will last forever!"
+		tradeRequest:"Let us do business! Would you be interested?"
+				
+		mainColor:[18,84,30],
+		secondaryColor:[245,248,185],
+		uniqueName:"Barbary Corsairs"
+		unique:"Pay only one third the usual cost for naval unit maintenance. All melee naval units have the Prize Ships promotion, allowing them to capture defeated ships.",
+		cities:["Istanbul","Edirne","Ankara","Bursa","Konya","Samsun","Gaziantep","Diyabakir","Izmir","Kayseri","Malatya",
+			"Marsin","Antalya","Zonguldak","Denizli","Ordu","Mugia","Eskishehir","Inebolu","Sinop","Adana","Artuin",
+			"Bodrum","Eregli","Silifke","Sivas","Amasya","Marmaris","Trabzon","Erzurum","Urfa","Izmit","Afyonkarhisar",
+			"Bitlis","Yalova"]
+	},
+	
 	/*
 	{   // REQUIRES RIVERS
 		name:"Aztecs",
@@ -767,43 +806,6 @@
 			"Nan","Tak","Suphanburi","Hongsawadee","Thawaii","Ayutthuya","Taphan Hin","Uthai Thani","Lap Buri","Ratchasima",
 			"Ban Phai","Loci","Khan Kaen","Surin"]
 	},
-	{
-		name:"Ottoman",
-		leaderName:"Suleiman I",
-		adjective:["Ottoman"],
-		startBias:["Coast"],
-		preferredVictoryType:"Domination",
-		
-		startIntroPart1: "Blessings of God be upon you, oh Great Emperor Suleiman! Your power, wealth and generosity awe the world! Truly, are you called "Magnificent!" Your empire began in Bithynia, a small country in Eastern Anatolia in 12th century. Taking advantage in the decline of the great Selkuj Sultanate of Rum, King Osman I of Bithynia expanded west into Anatolia. Over the next century, your subjects brought down the empire of Byzantium, taking its holdings in Turkey and then the Balkans. In the mid 15th century, the Ottomans captured ancient Constantinople, gaining control of the strategic link between Europe and the Middle East. Your people's empire would continue to expand for centuries governing much of North Africa, the Middle East and Eastern Europe at its height."
-		startIntroPart2: "Mighty Sultan, heed the call of your people! Bring your empire back to the height of its power and glory and once again the world will look upon your greatness with awe and admiration! Will you accept the challenge, great emperor? Will you build an empire that will stand the test of time?"
-		
-		declaringWar:"Your continued insolence and failure to recognize and preeminence leads us to war."
-		attacked:"Good. The world shall witness the incontestable might of my armies and the glory of the Empire."
-		defeated:"Ruin! Ruin! Istanbul becomes Iram of the Pillars, remembered only by the melancholy poets."
-		introduction:"From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm Suleiman, Kayser-I Rum, and I bestow upon you my welcome!"
-		
-		neutralHello:"Greetings!"
-		neutralLetsHearIt:["I'm listening.","Go on."]
-		neutralNo:["No.","Of course not!","We decline."]
-		neutralYes:["Very good.","Fine.","We accept!"]
-
-		hateHello:"What do you want?"
-		hateLetsHearIt:["So you say!","Go on!"]
-		hateNo:["Excuse me?","This is unacceptable!","You can't be serious!"]
-		hateYes:["Ah, very good!","Very good.","I assume we must come to an agreement."]
-		
-		afterPeace:"Congratulations on your victory! I hope that peace between us will last forever!"
-		tradeRequest:"Let us do business! Would you be interested?"
-				
-		mainColor:[204,255,229],
-		secondaryColor:[0,102,0],
-		uniqueName:"Barbary Corsairs"
-		unique:"Pay only one third the usual cost for naval unit maintenance. All melee naval units have the Prize Ships promotion, allowing them to capture defeated ships.",
-		cities:["Istanbul","Edirne","Ankara","Bursa","Konya","Samsun","Gaziantep","Diyabakir","Izmir","Kayseri","Malatya",
-			"Marsin","Antalya","Zonguldak","Denizli","Ordu","Mugia","Eskishehir","Inebolu","Sinop","Adana","Artuin",
-			"Bodrum","Eregli","Silifke","Sivas","Amasya","Marmaris","Trabzon","Erzurum","Urfa","Izmit","Afyonkarhisar",
-			"Bitlis","Yalova"]
-	},
 	{
 		name:"Iroquois",
 		leaderName:"Hiawatha",

android/assets/jsons/Translations/Notifications.json

@@ -445,7 +445,7 @@
         "[unit] has no work to do.": {
             Italian:"[unit] è ora inattivo."
             German:"[unit] hat keine Arbeit mehr."
-	    French:"[unit] n'a rien à faire"
+			French:"[unit] n'a rien à faire"
         }
 
 		"You're losing control of [name].":{ //When you're about to lose your friendship with a City-State

android/assets/jsons/Translations/Units,Promotions.json

@@ -330,7 +330,7 @@
 		French:"Infanterie"
 		Romanian:"Lăncier"
 		Spanish:"Lancero"
-        	Simplified_Chinese:"枪兵"
+		Simplified_Chinese:"枪兵"
 		Portuguese:"Lanceiro"
 		German:"Speerkrieger"
 	}
@@ -672,8 +672,14 @@
 		Russian:"Мушкетёр"
 		German:"Musketier"
 	} 
+	
+	"Janissary":{ // Ottoman unique
+	}
+	
+	"Heals [amountHealed] damage if it kills a unit":{
+	}
 
-	"Minuteman":{
+	"Minuteman":{ // american unique
 		Italian:"Minuteman" //same in Italian
 		Romanian:"Rezervist"
 		Spanish:"Milicia Revolucionaria"
@@ -681,7 +687,7 @@
 		Russian:"Минитмэн"
 		//same in German
 		//same in French
-	} // American unique
+	}
 
 	"Frigate":{
 		Spanish:"Fragata"
@@ -715,6 +721,11 @@
 		German:"Lanzer"
 	}
 	
+	"Sipahi":{}
+	
+	"No movement cost to pillage":{
+	}
+	
 	"Bonus vs Mounted 33%":{
 		Italian:"+33% Bonus contro unità a cavallo"
 		Simplified_Chinese:"对战骑乘单位时+33%战斗力"
@@ -942,10 +953,10 @@
 		French:"Sous-marin"
 	}
 
-	"Bonus as Attacker 75%":{
-		Italian:"75% Bonus in attacco"
+	"Bonus as Attacker [amount]%":{
+		Italian:"[amount]% Bonus in attacco"
 		Simplified_Chinese:"主动攻击时+75%战斗力"
-		French:"Bonus en tant qu'attaquant +75%"
+		French:"Bonus en tant qu'attaquant +[amount]%"
 	}
 
 	"Invisible to others":{
@@ -1717,11 +1728,6 @@
 		Simplified_Chinese:"狼群I级"
 	}
 
-	"Bonus as Attacker 25%":{
-		Italian:"+25% Bonus come attaccante"
-		Simplified_Chinese:"主动攻击时+25%战斗力"
-		French:"Bonus en attaquant +25%"
-	}
 
 	"Wolfpack II":{
 		Italian:"Attacco in massa II"

android/assets/jsons/UnitPromotions.json

@@ -264,19 +264,19 @@
 	}
 	{
 		name:"Wolfpack I",
-		effect:"Bonus as Attacker 25%",
+		effect:"Bonus as Attacker [25]%",
 		unitTypes:["WaterSubmarine"]
 	}
 	{
 		name:"Wolfpack II",
 		prerequisites:["Wolfpack I"],
-		effect:"Bonus as Attacker 25%",
+		effect:"Bonus as Attacker [25]%",
 		unitTypes:["WaterSubmarine"]
 	}
 	{
 		name:"Wolfpack III",
 		prerequisites:["Wolfpack II"],
-		effect:"Bonus as Attacker 25%",
+		effect:"Bonus as Attacker [25]%",
 		unitTypes:["WaterSubmarine"]
 	}
 	{

android/assets/jsons/Units.json

@@ -716,12 +716,11 @@
 		hurryCostModifier:20,
 		attackSound:"shot"
 	},
-	/*
 	{
-		name:"Jannissary",
+		name:"Janissary",
 		unitType:"Melee",
 		replaces:"Musketman",
-		uniqueTo:"Ottoman",
+		uniqueTo:"The Ottomans",
 		movement:2,
 		strength:24,
 		cost: 150,
@@ -729,11 +728,9 @@
 		upgradesTo:"Rifleman"
 		obsoleteTech:"Rifling",
 		hurryCostModifier:20,
-		uniques:["Heal 50 if it kills an Unit","Combat bonus when attacking 25%"],
+		uniques:["Heals [50] damage if it kills a unit", "Bonus as Attacker [25]%"],
 		attackSound:"shot"
-		//Ottoman unique unit, slightly weaker than Musketman, but heals 50 HP when it kills an units, and +25% Strenght when attacking
 	},
-	*/
 	{
 		name:"Minuteman",
 		unitType:"Melee",
@@ -788,30 +785,30 @@
 		requiredTech:"Metallurgy",
 		requiredResource:"Horses",
 		hurryCostModifier:20,
-		uniques:["Can move after attacking","No defensive terrain bonus","Penalty vs City 33%","Bonus vs Mounted 33%"],
+		uniques:["Can move after attacking","No defensive terrain bonus","Penalty vs City 33%"],
+		promotions:["Formation I"],
 		upgradesTo:"Anti-Tank Gun",
 		obsoleteTech:"Combined Arms",
 		attackSound:"horse"
 	},
-	/*
 	{
 		name:"Sipahi",
 		unitType:"Mounted",
 		replaces:"Lancer",
-		uniqueTo:"Ottoman",
+		uniqueTo:"The Ottomans",
 		movement:5,
 		strength:25,
 		cost: 185,
 		requiredTech:"Metallurgy",
 		requiredResource:"Horses",
 		hurryCostModifier:20,
-		uniques:["Can move after attacking","No defensive terrain bonus","Penalty vs City 33%","Bonus vs Mounted 33%","Formation I","+1 Visibility"],
+		uniques:["Can move after attacking","No defensive terrain bonus","Penalty vs City 33%",
+			"+1 Visibility Range", "No movement cost to pillage"],
+		promotions:["Formation I"],
 		upgradesTo:"Anti-Tank Gun",
 		obsoleteTech:"Combined Arms",
 		attackSound:"horse"
-		//Another Ottoman unique attack.
 	},
-	*/
 	
 	// Industrial Era
 	
@@ -960,7 +957,7 @@
 		rangedStrength: 60,
 		cost: 325,
 		requiredTech:"Refrigeration",
-		uniques:["Bonus as Attacker 75%", "Invisible to others", "Can only attack water", "Can attack submarines"],
+		uniques:["Bonus as Attacker [75]%", "Invisible to others", "Can only attack water", "Can attack submarines"],
 		hurryCostModifier:20
 	},
 	{