AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 06:16:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #770 - City-states now colored as per original civ, with black primary color

Browse Source
This commit is contained in:
Yair Morgenstern 2019-05-20 22:03:43 +03:00
parent f905fa8068
commit f46baec89f
1 changed files with 11 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
android/assets/jsons/Nations.json
View File

@ -765,24 +765,10 @@
//TO DO : better dialogs //TO DO : better dialogs
declaringWar:"Declare war.", declaringWar:"Declare war.",
attacked:"Let's fight.", attacked:"Let's fight.",
defeated:"GoodBye.",
introduction:"Hi.",
neutralHello:"Greetings.",
neutralLetsHearIt:["I'm listening.","What do you want?"],
neutralNo:["No!","Certainly not.","Unacceptable!"],
neutralYes:["Completed!","Yes!","Agreed!"],
hateHello:"What do YOU want?!",
hateLetsHearIt:["I'm certainly listening.","I'm listening!"],
hateNo:["No!","Certainly not!","Unacceptable!"],
hateYes:["Yes!"],
afterPeace:"Peace then.", afterPeace:"Peace then.",
tradeRequest:"Trade?",
mainColor:[0, 0, 0],
mainColor:[0,100,0], secondaryColor:[185,132,66],
secondaryColor:[213,249,255],
cities:["Milan"] cities:["Milan"]
}, },
{ {
@ -794,24 +780,10 @@
//TO DO : better dialogs //TO DO : better dialogs
declaringWar:"Declare war.", declaringWar:"Declare war.",
attacked:"Let's fight.", attacked:"Let's fight.",
defeated:"GoodBye.",
introduction:"Hi.",
neutralHello:"Greetings.",
neutralLetsHearIt:["I'm listening.","What do you want?"],
neutralNo:["No!","Certainly not.","Unacceptable!"],
neutralYes:["Completed!","Yes!","Agreed!"],
hateHello:"What do YOU want?!",
hateLetsHearIt:["I'm certainly listening.","I'm listening!"],
hateNo:["No!","Certainly not!","Unacceptable!"],
hateYes:["Yes!"],
afterPeace:"Peace then.", afterPeace:"Peace then.",
tradeRequest:"Trade?",
mainColor:[0, 0, 0],
mainColor:[255, 250, 240], secondaryColor:[62,197,252],
secondaryColor:[238, 44, 44],
cities:["Florence"] cities:["Florence"]
}, },
{ {
@ -823,24 +795,10 @@
//TO DO : better dialogs //TO DO : better dialogs
declaringWar:"Declare war.", declaringWar:"Declare war.",
attacked:"Let's fight.", attacked:"Let's fight.",
defeated:"GoodBye.",
introduction:"Hi.",
neutralHello:"Greetings.",
neutralLetsHearIt:["I'm listening.","What do you want?"],
neutralNo:["No!","Certainly not.","Unacceptable!"],
neutralYes:["Completed!","Yes!","Agreed!"],
hateHello:"What do YOU want?!",
hateLetsHearIt:["I'm certainly listening.","I'm listening!"],
hateNo:["No!","Certainly not!","Unacceptable!"],
hateYes:["Yes!"],
afterPeace:"Peace then.", afterPeace:"Peace then.",
tradeRequest:"Trade?",
mainColor:[32, 178, 170], mainColor:[0, 0, 0],
secondaryColor:[255, 255, 224], secondaryColor:[211, 220, 103],
cities:["Rio de Janeiro"] cities:["Rio de Janeiro"]
}, },
{ {
@ -851,24 +809,10 @@
//TO DO : better dialogs //TO DO : better dialogs
declaringWar:"Declare war.", declaringWar:"Declare war.",
attacked:"Let's fight.", attacked:"Let's fight.",
defeated:"GoodBye.",
introduction:"Hi.",
neutralHello:"Greetings.",
neutralLetsHearIt:["I'm listening.","What do you want?"],
neutralNo:["No!","Certainly not.","Unacceptable!"],
neutralYes:["Completed!","Yes!","Agreed!"],
hateHello:"What do YOU want?!",
hateLetsHearIt:["I'm certainly listening.","I'm listening!"],
hateNo:["No!","Certainly not!","Unacceptable!"],
hateYes:["Yes!"],
afterPeace:"Peace then.", afterPeace:"Peace then.",
tradeRequest:"Trade?",
mainColor:[0, 0, 0],
mainColor:[250, 250, 210], secondaryColor:[194,97,255],
secondaryColor:[250, 128, 114],
cities:["Rio de Janeiro"] cities:["Rio de Janeiro"]
}, },