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

v1.2.0: added translations to right click menus

Browse Source
This commit is contained in:
Evan Debenham 2022-03-22 11:37:30 -04:00
parent e5203fb29d
commit 5431025fed
3 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/assets/messages/scenes/scenes.properties
View File

@ -37,6 +37,14 @@ scenes.gamescene.secrets=The atmosphere hints that this floor hides many secrets
scenes.gamescene.choose_examine=Choose Examine scenes.gamescene.choose_examine=Choose Examine
scenes.gamescene.multiple_examine=There are multiple things of interest here, which one do you want to examine? scenes.gamescene.multiple_examine=There are multiple things of interest here, which one do you want to examine?
scenes.gamescene.dont_know=You don't know what is there. scenes.gamescene.dont_know=You don't know what is there.
scenes.gamescene.multiple=Multiple Objects
scenes.gamescene.go_here=Go Here
scenes.gamescene.interact=Interact
scenes.gamescene.attack=Attack
scenes.gamescene.pick_up=Pick Up
scenes.gamescene.purchase=Purchase
scenes.gamescene.trample=Trample
scenes.gamescene.examine=Examine
scenes.heroselectscene.title=Choose Your Hero scenes.heroselectscene.title=Choose Your Hero

24
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
View File

@ -1373,7 +1373,7 @@ public class GameScene extends PixelScene {
title = WndInfoCell.cellName(cell); title = WndInfoCell.cellName(cell);
image = WndInfoCell.cellImage(cell); image = WndInfoCell.cellImage(cell);
} else if (objects.size() > 1){ } else if (objects.size() > 1){
title = "Multiple Objects"; title = Messages.get(GameScene.class, "multiple");
image = Icons.get(Icons.INFO); image = Icons.get(Icons.INFO);
} else if (objects.get(0) instanceof Hero) { } else if (objects.get(0) instanceof Hero) {
title = textLines.remove(0); title = textLines.remove(0);
@ -1394,42 +1394,42 @@ public class GameScene extends PixelScene {
//determine first text line //determine first text line
if (objects.isEmpty()) { if (objects.isEmpty()) {
textLines.add(0, "Go Here"); textLines.add(0, Messages.get(GameScene.class, "go_here"));
} else if (objects.get(0) instanceof Hero) { } else if (objects.get(0) instanceof Hero) {
textLines.add(0, "Go Here"); textLines.add(0, Messages.get(GameScene.class, "go_here"));
} else if (objects.get(0) instanceof Mob) { } else if (objects.get(0) instanceof Mob) {
if (((Mob) objects.get(0)).alignment != Char.Alignment.ENEMY) { if (((Mob) objects.get(0)).alignment != Char.Alignment.ENEMY) {
textLines.add(0, "Interact"); textLines.add(0, Messages.get(GameScene.class, "interact"));
} else { } else {
textLines.add(0, "Attack"); textLines.add(0, Messages.get(GameScene.class, "attack"));
} }
} else if (objects.get(0) instanceof Heap) { } else if (objects.get(0) instanceof Heap) {
switch (((Heap) objects.get(0)).type) { switch (((Heap) objects.get(0)).type) {
case HEAP: case HEAP:
textLines.add(0, "Pick Up"); textLines.add(0, Messages.get(GameScene.class, "pick_up"));
break; break;
case FOR_SALE: case FOR_SALE:
textLines.add(0, "Purchase"); textLines.add(0, Messages.get(GameScene.class, "purchase"));
break; break;
default: default:
textLines.add(0, "Interact"); textLines.add(0, Messages.get(GameScene.class, "interact"));
break; break;
} }
} else if (objects.get(0) instanceof Plant) { } else if (objects.get(0) instanceof Plant) {
textLines.add(0, "Trample"); textLines.add(0, Messages.get(GameScene.class, "trample"));
} else if (objects.get(0) instanceof Trap) { } else if (objects.get(0) instanceof Trap) {
textLines.add(0, "Interact"); textLines.add(0, Messages.get(GameScene.class, "interact"));
} }
//final text formatting //final text formatting
if (objects.size() > 1){ if (objects.size() > 1){
textLines.add(0, "_" + textLines.remove(0) + ":_ " + textLines.get(0)); textLines.add(0, "_" + textLines.remove(0) + ":_ " + textLines.get(0));
for (int i = 1; i < textLines.size(); i++){ for (int i = 1; i < textLines.size(); i++){
textLines.add(i, "_Examine:_ " + textLines.remove(i)); textLines.add(i, "_" + Messages.get(GameScene.class, "examine") + ":_ " + textLines.remove(i));
} }
} else { } else {
textLines.add(0, "_" + textLines.remove(0) + "_"); textLines.add(0, "_" + textLines.remove(0) + "_");
textLines.add(1, "_Examine_"); textLines.add(1, "_" + Messages.get(GameScene.class, "examine") + "_");
} }
RightClickMenu menu = new RightClickMenu(image, RightClickMenu menu = new RightClickMenu(image,

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/RightClickMenu.java
View File

@ -110,9 +110,12 @@ public class RightClickMenu extends Component {
RightClickMenu.this.killAndErase(); RightClickMenu.this.killAndErase();
} }
}; };
if (item != null && options[i].equals(item.defaultAction)){ if (item != null){
if (options[i].equals(item.defaultAction)) {
buttons[i].textColor(Window.TITLE_COLOR); buttons[i].textColor(Window.TITLE_COLOR);
} }
buttons[i].text(item.actionName(options[i], Dungeon.hero));
}
add(buttons[i]); add(buttons[i]);
} }