LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.7.5d: corrected highlighting in a few cases

Browse Source
This commit is contained in:
Evan Debenham 2019-10-18 18:21:02 -04:00
parent 71384e46a4
commit da1f953d9d
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/messages/Languages.java
View File

@ -31,7 +31,7 @@ public enum Languages {
GERMAN("deutsch", "de", Status.UNREVIEWED, new String[]{"Dallukas", "KrystalCroft", "Wuzzy", "Zap0", "bernhardreiter", "davedude"}, new String[]{"Abracadabra", "Ceeee", "DarkPixel", "ErichME", "Faquarl", "LenzB", "Sarius", "SirEddi", "Sorpl3x", "ThunfischGott", "Topicranger", "apxwn", "azrdev", "carrageen", "gekko303", "johannes.schobel", "karoshi42", "koryphea", "luciocarreras", "niemand", "oragothen", "spixi"}), GERMAN("deutsch", "de", Status.UNREVIEWED, new String[]{"Dallukas", "KrystalCroft", "Wuzzy", "Zap0", "bernhardreiter", "davedude"}, new String[]{"Abracadabra", "Ceeee", "DarkPixel", "ErichME", "Faquarl", "LenzB", "Sarius", "SirEddi", "Sorpl3x", "ThunfischGott", "Topicranger", "apxwn", "azrdev", "carrageen", "gekko303", "johannes.schobel", "karoshi42", "koryphea", "luciocarreras", "niemand", "oragothen", "spixi"}),
SPANISH("español", "es", Status.REVIEWED, new String[]{"Kiroto", "Kohru", "airman12", "grayscales"}, new String[]{"Alesxanderk", "CorvosUtopy", "Dewstend", "Dyrran", "Fervoreking", "Illyatwo2", "JPCHZ", "STKmonoqui", "alfongad", "benzarr410", "chepe567.jc", "ctrijueque", "dhg121", "javifs", "jonismack1", "tres.14159"}), SPANISH("español", "es", Status.REVIEWED, new String[]{"Kiroto", "Kohru", "airman12", "grayscales"}, new String[]{"Alesxanderk", "CorvosUtopy", "Dewstend", "Dyrran", "Fervoreking", "Illyatwo2", "JPCHZ", "STKmonoqui", "alfongad", "benzarr410", "chepe567.jc", "ctrijueque", "dhg121", "javifs", "jonismack1", "tres.14159"}),
FRENCH("français", "fr", Status.UNREVIEWED, new String[]{"Emether", "Xalofar", "canc42", "kultissim", "minikrob"}, new String[]{"Alsydis", "Axce", "Basttee", "Dekadisk", "Draal", "Neopolitan", "Nyrnx", "RomTheMareep", "SpeagleZNT", "TheKappaDuWeb", "Tronche2Cake", "Ygdrazil", "antoine9298", "go11um", "levilbatard", "linterpreteur", "maeltur70", "marmous", "solthaar", "vavavoum", "speagle"}), FRENCH("français", "fr", Status.UNREVIEWED, new String[]{"Emether", "Xalofar", "canc42", "kultissim", "minikrob"}, new String[]{"Alsydis", "Axce", "Basttee", "Dekadisk", "Draal", "Neopolitan", "Nyrnx", "RomTheMareep", "SpeagleZNT", "TheKappaDuWeb", "Tronche2Cake", "Ygdrazil", "antoine9298", "go11um", "levilbatard", "linterpreteur", "maeltur70", "marmous", "solthaar", "vavavoum", "speagle"}),
CHINESE("中文", "zh", Status.UNREVIEWED, new String[]{"Jinkeloid(zdx00793)"}, new String[]{"931451545", "HoofBumpBlurryface", "Lery", "Lyn-0401", "ShatteredFlameBlast", "endlesssolitude", "hmdzl001", "tempest102"}), CHINESE("中文", "zh", Status.UNREVIEWED, new String[]{"Jinkeloid(zdx00793)"}, new String[]{"931451545", "HoofBumpBlurryface", "Lery", "Lyn_0401", "ShatteredFlameBlast", "endlesssolitude", "hmdzl001", "tempest102"}),
POLISH("polski", "pl", Status.UNREVIEWED, new String[]{"Deksippos", "kuadziw", "szymex73"}, new String[]{"Chasseur", "Darden", "KarixDaii", "MJedi", "MrKukurykpl", "Odiihinia", "Peperos", "Scharnvirk", "VasteelXolotl", "bvader95", "dusakus", "michaub", "ozziezombie", "szczoteczka22", "transportowiec96"}), POLISH("polski", "pl", Status.UNREVIEWED, new String[]{"Deksippos", "kuadziw", "szymex73"}, new String[]{"Chasseur", "Darden", "KarixDaii", "MJedi", "MrKukurykpl", "Odiihinia", "Peperos", "Scharnvirk", "VasteelXolotl", "bvader95", "dusakus", "michaub", "ozziezombie", "szczoteczka22", "transportowiec96"}),
PORTUGUESE("português", "pt", Status.UNREVIEWED, new String[]{"Chacal.Ex", "TDF2001", "matheus208"}, new String[]{"Bigode935", "ChainedFreaK", "Helen0903", "JST", "MadHorus", "Matie", "Tio_P_(Krampus)", "ancientorange", "danypr23", "denis.gnl", "ismael.henriques12", "mfcord", "owenreilly", "rafazago", "try31"}), PORTUGUESE("português", "pt", Status.UNREVIEWED, new String[]{"Chacal.Ex", "TDF2001", "matheus208"}, new String[]{"Bigode935", "ChainedFreaK", "Helen0903", "JST", "MadHorus", "Matie", "Tio_P_(Krampus)", "ancientorange", "danypr23", "denis.gnl", "ismael.henriques12", "mfcord", "owenreilly", "rafazago", "try31"}),
ITALIAN("italiano", "it", Status.REVIEWED, new String[]{"bizzolino", "funnydwarf"}, new String[]{"4est", "DaniMare", "Danzl", "andrearubbino00", "nessunluogo", "righi.a", "umby000"}), ITALIAN("italiano", "it", Status.REVIEWED, new String[]{"bizzolino", "funnydwarf"}, new String[]{"4est", "DaniMare", "Danzl", "andrearubbino00", "nessunluogo", "righi.a", "umby000"}),

1
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/IconTitle.java
View File

@ -76,6 +76,7 @@ public class IconTitle extends Component {
tfLabel = PixelScene.renderTextBlock( (int)FONT_SIZE ); tfLabel = PixelScene.renderTextBlock( (int)FONT_SIZE );
tfLabel.hardlight( Window.TITLE_COLOR ); tfLabel.hardlight( Window.TITLE_COLOR );
tfLabel.setHightlighting(false);
add( tfLabel ); add( tfLabel );
health = new HealthBar(); health = new HealthBar();

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndLangs.java
View File

@ -161,7 +161,7 @@ public class WndLangs extends Window {
int i; int i;
if (reviewers.length > 0){ if (reviewers.length > 0){
creds += "_" + Messages.titleCase(Messages.get(WndLangs.class, "reviewers")) + "_\n"; creds += Messages.titleCase(Messages.get(WndLangs.class, "reviewers")) + "\n";
creds2 += ""; creds2 += "";
for ( i = 0; i < reviewers.length; i++){ for ( i = 0; i < reviewers.length; i++){
if (wide && i % 2 == 1){ if (wide && i % 2 == 1){
@ -176,7 +176,7 @@ public class WndLangs extends Window {
} }
if (reviewers.length > 0 || translators.length > 0){ if (reviewers.length > 0 || translators.length > 0){
creds += "_" + Messages.titleCase(Messages.get(WndLangs.class, "translators")) + "_\n"; creds += Messages.titleCase(Messages.get(WndLangs.class, "translators")) + "\n";
creds2 += "\n"; creds2 += "\n";
//reviewers are also translators //reviewers are also translators
for ( i = 0; i < reviewers.length; i++){ for ( i = 0; i < reviewers.length; i++){
@ -208,12 +208,14 @@ public class WndLangs extends Window {
credits.add(title); credits.add(title);
RenderedTextBlock text = PixelScene.renderTextBlock(5); RenderedTextBlock text = PixelScene.renderTextBlock(5);
text.setHightlighting(false);
text.text(creds, 65); text.text(creds, 65);
text.setPos(0, title.bottom() + 2); text.setPos(0, title.bottom() + 2);
credits.add(text); credits.add(text);
if (wide){ if (wide){
RenderedTextBlock rightColumn = PixelScene.renderTextBlock(5); RenderedTextBlock rightColumn = PixelScene.renderTextBlock(5);
rightColumn.setHightlighting(false);
rightColumn.text(creds2, 65); rightColumn.text(creds2, 65);
rightColumn.setPos(70, title.bottom() + 8.5f); rightColumn.setPos(70, title.bottom() + 8.5f);
credits.add(rightColumn); credits.add(rightColumn);