-moved ui positions from code to json

-added separate ui for portrait mode
-removed add to deck/sideboad in shop in inventory view
-moved skin to ttf font
This commit is contained in:
Grimm
2022-04-14 21:00:27 +02:00
parent 80c51f4ef5
commit 0a7d5c334a
68 changed files with 1154 additions and 12260 deletions

View File

@@ -1,29 +1,8 @@
package forge.app;
import java.awt.Desktop;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import javax.imageio.ImageIO;
import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Window;
import com.badlogic.gdx.backends.lwjgl3.Lwjgl3WindowListener;
import com.badlogic.gdx.graphics.glutils.HdpiMode;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application;
import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration;
import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Clipboard;
import com.badlogic.gdx.backends.lwjgl3.*;
import com.badlogic.gdx.graphics.glutils.HdpiMode;
import forge.Forge;
import forge.assets.AssetsDownloader;
import forge.interfaces.IDeviceAdapter;
@@ -33,6 +12,15 @@ import forge.util.FileUtil;
import forge.util.OperatingSystem;
import forge.util.RestartUtil;
import forge.util.Utils;
import org.apache.commons.cli.*;
import javax.imageio.ImageIO;
import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
public class Main {
public static void main(String[] args) {

View File

@@ -119,6 +119,7 @@ public class Forge implements ApplicationListener {
public static InputProcessor inputProcessor;
private static Cursor cursor0, cursor1, cursor2, cursorA0, cursorA1, cursorA2;
public static boolean forcedEnglishonCJKMissing = false;
public static boolean adventureLoaded = false;
private static Localizer localizer;
static Map<Integer, Texture> misc = new HashMap<>();
@@ -330,8 +331,12 @@ public class Forge implements ApplicationListener {
//pixl cursor for adventure
setCursor(null, "0");
try {
for (SceneType sceneType : SceneType.values()) {
sceneType.instance.resLoaded();
if(!adventureLoaded)
{
for (SceneType sceneType : SceneType.values()) {
sceneType.instance.resLoaded();
}
adventureLoaded=true;
}
switchScene(SceneType.StartScene.instance);
} catch (Exception e) {

View File

@@ -28,7 +28,7 @@ public class PointOfInterest implements SaveFileContent {
oldMapId="";
Array<Sprite> textureAtlas = Config.instance().getAtlas(this.data.spriteAtlas).createSprites(this.data.sprite);
sprite = textureAtlas.get(spriteIndex);
sprite = textureAtlas.get(spriteIndex%textureAtlas.size);
}
@Override

View File

@@ -616,19 +616,9 @@ import java.util.Map;
@Override
protected void buildMenu(final FDropDownMenu menu, final PaperCard card) {
if (!needsCommander() && !canOnlyBePartnerCommander(card)) {
addItem(menu, Forge.getLocalizer().getMessage("lblAdd"), Forge.getLocalizer().getMessage("lblTo") + " " + parentScreen.getMainDeckPage().cardManager.getCaption(), parentScreen.getMainDeckPage().getIcon(), true, true, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == null || result <= 0) { return; }
if (!cardManager.isInfinite()) {
removeCard(card, result);
}
parentScreen.getMainDeckPage().addCard(card, result);
}
});
if (parentScreen.getSideboardPage() != null) {
addItem(menu, Forge.getLocalizer().getMessage("lblAdd"), Forge.getLocalizer().getMessage("lbltosideboard"), parentScreen.getSideboardPage().getIcon(), true, true, new Callback<Integer>() {
if(!parentScreen.isShop)
{
addItem(menu, Forge.getLocalizer().getMessage("lblAdd"), Forge.getLocalizer().getMessage("lblTo") + " " + parentScreen.getMainDeckPage().cardManager.getCaption(), parentScreen.getMainDeckPage().getIcon(), true, true, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == null || result <= 0) { return; }
@@ -636,9 +626,22 @@ import java.util.Map;
if (!cardManager.isInfinite()) {
removeCard(card, result);
}
parentScreen.getSideboardPage().addCard(card, result);
parentScreen.getMainDeckPage().addCard(card, result);
}
});
if (parentScreen.getSideboardPage() != null) {
addItem(menu, Forge.getLocalizer().getMessage("lblAdd"), Forge.getLocalizer().getMessage("lbltosideboard"), parentScreen.getSideboardPage().getIcon(), true, true, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == null || result <= 0) { return; }
if (!cardManager.isInfinite()) {
removeCard(card, result);
}
parentScreen.getSideboardPage().addCard(card, result);
}
});
}
}
if(parentScreen.isShop)
{

View File

@@ -26,10 +26,9 @@ public class DeckSelectScene extends UIScene {
Label header;
TextButton back, edit, rename;
int currentSlot = 0;
boolean init;
public DeckSelectScene() {
super(Forge.isLandscapeMode() ? "ui/deck_selector_mobile.json" : "ui/deck_selector.json");
super(Forge.isLandscapeMode() ? "ui/deck_selector.json" : "ui/deck_selector_portrait.json");
}
private TextButton addDeckSlot(String name, int i) {
@@ -95,7 +94,6 @@ public class DeckSelectScene extends UIScene {
@Override
public void resLoaded() {
super.resLoaded();
if(!this.init) {
layout = new Table();
stage.addActor(layout);
@@ -107,43 +105,24 @@ public class DeckSelectScene extends UIScene {
dialog = Controls.newDialog(Forge.getLocalizer().getMessage("lblSave"));
textInput = Controls.newTextField("");
if (!Forge.isLandscapeMode()) {
dialog.getButtonTable().add(Controls.newLabel(Forge.getLocalizer().getMessage("lblNameYourSaveFile"))).colspan(2).pad(2, 15, 2, 15);
dialog.getButtonTable().row();
dialog.getButtonTable().add(Controls.newLabel(Forge.getLocalizer().getMessage("lblName")+": ")).align(Align.left).pad(2, 15, 2, 2);
dialog.getButtonTable().add(textInput).fillX().expandX().padRight(15);
dialog.getButtonTable().row();
dialog.getButtonTable().add(Controls.newTextButton(Forge.getLocalizer().getMessage("lblRename"), new Runnable() {
@Override
public void run() {
DeckSelectScene.this.rename();
}
})).align(Align.left).padLeft(15);
dialog.getButtonTable().add(Controls.newTextButton(Forge.getLocalizer().getMessage("lblAbort"), new Runnable() {
@Override
public void run() {
dialog.hide();
}
})).align(Align.right).padRight(15);
} else {
dialog.getButtonTable().add(Controls.newLabel(Forge.getLocalizer().getMessage("lblNameYourSaveFile"))).colspan(2);
dialog.getButtonTable().row();
dialog.getButtonTable().add(Controls.newLabel(Forge.getLocalizer().getMessage("lblName")+": ")).align(Align.left);
dialog.getButtonTable().add(textInput).fillX().expandX();
dialog.getButtonTable().row();
dialog.getButtonTable().add(Controls.newTextButton(Forge.getLocalizer().getMessage("lblRename"), new Runnable() {
@Override
public void run() {
DeckSelectScene.this.rename();
}
})).align(Align.left);
dialog.getButtonTable().add(Controls.newTextButton(Forge.getLocalizer().getMessage("lblAbort"), new Runnable() {
@Override
public void run() {
dialog.hide();
}
})).align(Align.left);
}
dialog.getButtonTable().add(Controls.newLabel(Forge.getLocalizer().getMessage("lblNameYourSaveFile"))).colspan(2);
dialog.getButtonTable().row();
dialog.getButtonTable().add(Controls.newLabel(Forge.getLocalizer().getMessage("lblName")+": ")).align(Align.left);
dialog.getButtonTable().add(textInput).fillX().expandX();
dialog.getButtonTable().row();
dialog.getButtonTable().add(Controls.newTextButton(Forge.getLocalizer().getMessage("lblRename"), new Runnable() {
@Override
public void run() {
DeckSelectScene.this.rename();
}
})).align(Align.left);
dialog.getButtonTable().add(Controls.newTextButton(Forge.getLocalizer().getMessage("lblAbort"), new Runnable() {
@Override
public void run() {
dialog.hide();
}
})).align(Align.left);
back = ui.findActor("return");
back.getLabel().setText(Forge.getLocalizer().getMessage("lblBack"));
edit = ui.findActor("edit");
@@ -174,29 +153,7 @@ public class DeckSelectScene extends UIScene {
ScrollPane scrollPane = ui.findActor("deckSlots");
scrollPane.setActor(layout);
if (!Forge.isLandscapeMode()) {
float w = Scene.GetIntendedWidth();
float sW = w - 20;
float oX = w/2 - sW/2;
float h = Scene.GetIntendedHeight();
float sH = (h - 10)/12;
scrollPane.setWidth(sW);
scrollPane.setHeight(sH*11);
scrollPane.setX(oX);
float rW = (w - 20)/3;
float rX = w/2 - rW/2;
rename.setWidth(rW);
rename.setHeight(20);
rename.setX(rX);
back.setWidth(rW);
back.setHeight(20);
back.setX(rename.getX()-rW);
edit.setWidth(rW);
edit.setHeight(20);
edit.setX(rename.getRight());
}
this.init = true;
}
}
private void rename() {

View File

@@ -2,7 +2,6 @@ package forge.adventure.scene;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.OrthographicCamera;
import forge.Forge;
import forge.adventure.stage.WorldStage;
@@ -12,7 +11,6 @@ import forge.adventure.stage.WorldStage;
*/
public class GameScene extends HudScene {
private float cameraWidth = 0f, cameraHeight = 0f;
boolean init;
public GameScene() {
super(WorldStage.getInstance());
}
@@ -36,26 +34,17 @@ public class GameScene extends HudScene {
@Override
public void resLoaded() {
if (!this.init) {
//set initial camera width and height
if (cameraWidth == 0f)
cameraWidth = stage.getCamera().viewportWidth;
if (cameraHeight == 0f)
cameraHeight = stage.getCamera().viewportHeight;
this.init = true;
}
//set initial camera width and height
if (cameraWidth == 0f)
cameraWidth = stage.getCamera().viewportWidth;
if (cameraHeight == 0f)
cameraHeight = stage.getCamera().viewportHeight;
}
@Override
public void enter() {
Forge.clearTransitionScreen();
Forge.clearCurrentScreen();
if (!Forge.isLandscapeMode()) {
//Trick: switch the camera viewport width and height so it looks normal since we shrink the width for portrait mode for WorldStage
stage.getCamera().viewportHeight = cameraWidth;
stage.getCamera().viewportWidth = cameraHeight;
((OrthographicCamera)stage.getCamera()).zoom = 0.85f;
}
super.enter();
}

View File

@@ -13,10 +13,9 @@ import forge.adventure.util.Current;
public class InnScene extends UIScene {
TextButton heal, sell, leave;
Image healIcon, sellIcon, leaveIcon;
boolean init;
public InnScene() {
super("ui/inn.json");
super(Forge.isLandscapeMode() ? "ui/inn.json" : "ui/inn_portrait.json");
}
public void done() {
@@ -36,7 +35,6 @@ public class InnScene extends UIScene {
@Override
public void resLoaded() {
super.resLoaded();
if (!this.init) {
ui.onButtonPress("done", new Runnable() {
@Override
public void run() {
@@ -65,13 +63,7 @@ public class InnScene extends UIScene {
leaveIcon = ui.findActor("leaveIcon");
healIcon = ui.findActor("healIcon");
sellIcon = ui.findActor("sellIcon");
if (!Forge.isLandscapeMode()) {
sellIcon.setHeight(70);
healIcon.setHeight(70);
leaveIcon.setHeight(70);
}
this.init = true;
}
}
private void sell() {

View File

@@ -30,10 +30,9 @@ public class InventoryScene extends UIScene {
Button selected;
Button deleteButton;
Texture equipOverlay;
boolean init;
int columns=0;
public InventoryScene() {
super("ui/inventory.json");
super(Forge.isLandscapeMode() ? "ui/inventory.json" : "ui/inventory_portrait.json");
}
public void done() {
@@ -64,7 +63,6 @@ public class InventoryScene extends UIScene {
@Override
public void resLoaded() {
super.resLoaded();
if (!this.init) {
equipOverlay = new Texture(Config.instance().getFile(Paths.ITEMS_EQUIP));
ui.onButtonPress("return", () -> done());
leave = ui.findActor("return");
@@ -150,21 +148,6 @@ public class InventoryScene extends UIScene {
itemDescription.setWrap(true);
//makes confirm dialog hidden immediately when you open inventory first time..
confirm.getColor().a = 0;
float bw = scrollPane.getWidth() / 3;
deleteButton.setX(scrollPane.getX());
deleteButton.setWidth(bw);
equipButton.setX(scrollPane.getX()+bw);
equipButton.setWidth(bw);
leave.setX(equipButton.getX()+bw);
leave.setWidth(bw);
if (!Forge.isLandscapeMode()) {
confirm.getTitleLabel().setFontScaleX(2);
itemDescription.setFontScaleX(2);
}
this.init = true;
}
}
private void setSelected(Button actor) {

View File

@@ -43,10 +43,9 @@ public class NewGameScene extends UIScene {
private Label titleL, avatarL, nameL, raceL, genderL, difficultyL, deckL;
private ImageButton leftArrow, rightArrow;
private TextButton backButton, startButton;
boolean init;
public NewGameScene() {
super(Forge.isLandscapeMode() ? "ui/new_game_mobile.json" : "ui/new_game.json");
super(Forge.isLandscapeMode() ? "ui/new_game.json" : "ui/new_game_portrait.json");
}
public boolean start() {
@@ -80,7 +79,6 @@ public class NewGameScene extends UIScene {
@Override
public void resLoaded() {
super.resLoaded();
if (!this.init) {
selectedName = ui.findActor("nameField");
selectedName.setText(NameGenerator.getRandomName("Any", "Any", ""));
avatarImage = ui.findActor("avatarPreview");
@@ -176,68 +174,7 @@ public class NewGameScene extends UIScene {
backButton.getLabel().setText(Forge.getLocalizer().getMessage("lblBack"));
startButton = ui.findActor("start");
startButton.getLabel().setText(Forge.getLocalizer().getMessage("lblStart"));
if (!Forge.isLandscapeMode()) {
float w = Scene.GetIntendedWidth();
float sW = w - 20;
float oX = w/2 - sW/2;
float h = Scene.GetIntendedHeight();
float sH = (h - 10)/12;
selectedName.setWidth(280);
selectedName.setX(w/2- selectedName.getWidth()/2);
nameL.setFontScaleX(2);
titleL.setScale(4, 2);
titleL.setFontScale(4, 2);
titleL.setX(scrollPane.getX() + 20);
avatarImage.setScaleX(2);
avatarImage.setX(w/2-avatarImage.getWidth());
leftArrow.getImage().setScaleX(2);
leftArrow.setX(selectedName.getX());
rightArrow.getImage().setScaleX(2);
rightArrow.setX(selectedName.getRight()-(rightArrow.getWidth()*2));
avatarL.setFontScaleX(2);
race.setScaleX(2);
race.setWidth(140);
race.setX(selectedName.getX());
raceL.setFontScaleX(2);
gender.setScaleX(2);
gender.setWidth(140);
gender.setX(selectedName.getX());
genderL.setFontScaleX(2);
difficulty.setScaleX(2);
difficulty.setWidth(140);
difficulty.setX(selectedName.getX());
difficultyL.setFontScaleX(2);
deck.setScaleX(2);
deck.setWidth(140);
deck.setX(selectedName.getX());
deckL.setFontScaleX(2);
scrollPane.setWidth(sW);
scrollPane.setHeight(sH*11);
scrollPane.setX(oX);
float bW = w - 165;
float bX = w/2 - bW/2;
backButton.setWidth(bW/2);
backButton.setHeight(20);
backButton.setX(bX);
startButton.setWidth(bW/2);
startButton.setHeight(20);
startButton.setX(backButton.getRight());
}
this.init = true;
}
updateAvatar();
}
private void rightAvatar() {
@@ -263,6 +200,7 @@ public class NewGameScene extends UIScene {
@Override
public void enter() {
updateAvatar();
Gdx.input.setInputProcessor(stage); //Start taking input from the ui
}

View File

@@ -31,10 +31,9 @@ public class PlayerStatisticScene extends UIScene {
Label playerName;
TextButton back;
private Table enemiesGroup;
boolean init;
public PlayerStatisticScene() {
super("ui/statistic.json");
super(Forge.isLandscapeMode() ? "ui/statistic.json" : "ui/statistic_portrait.json");
}
@@ -107,8 +106,6 @@ public class PlayerStatisticScene extends UIScene {
Image enemyImage = new Image();
enemyImage.setDrawable(new TextureRegionDrawable(new EnemySprite(data).getAvatar()));
enemyImage.setSize(8, 8);
if (!Forge.isLandscapeMode())
enemyImage.setScaleX(2);
enemiesGroup.add(enemyImage).align(Align.center).space(3, 10, 3, 10);
enemiesGroup.add((data.name)).fillX().align(Align.center).fillX().space(3, 10, 3, 10);
@@ -118,60 +115,12 @@ public class PlayerStatisticScene extends UIScene {
enemiesGroup.row().space(8);
}
if (!Forge.isLandscapeMode()) {
float w = Scene.GetIntendedWidth();
back.setHeight(20);
back.setX(w / 2 - back.getWidth() / 2);
back.setY(0);
ScrollPane enemies = ui.findActor("enemies");
enemies.setWidth(w - 20);
enemies.setX(w / 2 - enemies.getWidth() / 2);
enemies.setHeight(150);
enemies.setY(21);
ScrollPane stats = ui.findActor("stats");
stats.setWidth(w - 20);
stats.setX(w / 2 - enemies.getWidth() / 2);
stats.setHeight(90);
stats.setY(enemies.getY() + 153);
avatar.setScaleX(2);
avatar.setX(40);
avatar.setY(stats.getY() + 15);
avatarBorder.setScaleX(2);
avatarBorder.setX(40);
avatarBorder.setY(stats.getY() + 15);
playerName.setX(avatar.getRight() + 105);
playerName.getStyle().font.getData().setScale(2, 1);
playerName.setY(avatar.getY() + 45);
wins.setY(avatar.getY() + 30);
wins.setX(avatar.getRight() + 105);
totalWins.setY(wins.getY());
totalWins.setX(wins.getRight() + 85);
loss.setY(avatar.getY() + 15);
loss.setX(avatar.getRight() + 105);
totalLoss.setX(loss.getRight() + 85);
totalLoss.setY(loss.getY());
winloss.setY(avatar.getY());
winloss.setX(avatar.getRight() + 105);
lossWinRatio.setY(winloss.getY());
lossWinRatio.setX(winloss.getRight() + 85);
lifeIcon.setScaleX(2);
lifeIcon.setY(stats.getY() + 5);
lifeIcon.setX(wins.getX()-35);
life.setX(lifeIcon.getX() + 35);
life.setY(lifeIcon.getY());
goldIcon.setScaleX(2);
goldIcon.setY(stats.getY() + 5);
goldIcon.setX(totalWins.getX()-35);
money.setY(goldIcon.getY());
money.setX(goldIcon.getX() + 35);
}
}
@Override
public void resLoaded() {
super.resLoaded();
if (!this.init) {
enemiesGroup = new Table(Controls.GetSkin());
enemiesGroup.row();
ui.onButtonPress("return", new Runnable() {
@@ -200,8 +149,6 @@ public class PlayerStatisticScene extends UIScene {
back.getLabel().setText(Forge.getLocalizer().getMessage("lblBack"));
ScrollPane scrollPane = ui.findActor("enemies");
scrollPane.setActor(enemiesGroup);
this.init = true;
}
}
@Override

View File

@@ -28,7 +28,6 @@ import forge.sound.SoundSystem;
public class RewardScene extends UIScene {
private TextButton doneButton;
private Label goldLabel;
boolean init;
public enum Type {
Shop,
Loot
@@ -36,12 +35,12 @@ public class RewardScene extends UIScene {
Type type;
Array<Actor> generated = new Array<>();
static public final float CARD_WIDTH = Forge.isLandscapeMode() ? 550f : 200f;
static public final float CARD_HEIGHT = Forge.isLandscapeMode() ? 400f : 300f;
static public final float CARD_WIDTH =550f ;
static public final float CARD_HEIGHT = 400f;
static public final float CARD_WIDTH_TO_HEIGHT = CARD_WIDTH / CARD_HEIGHT;
public RewardScene() {
super(Forge.isLandscapeMode() ? "ui/items_mobile.json" : "ui/items.json");
super(Forge.isLandscapeMode() ? "ui/items.json" : "ui/items_portrait.json");
}
boolean doneClicked = false;
@@ -95,7 +94,6 @@ public class RewardScene extends UIScene {
@Override
public void resLoaded() {
super.resLoaded();
if(!this.init) {
goldLabel=ui.findActor("gold");
ui.onButtonPress("done", new Runnable() {
@Override
@@ -104,8 +102,6 @@ public class RewardScene extends UIScene {
}
});
doneButton = ui.findActor("done");
this.init = true;
}
}
@Override
@@ -135,10 +131,16 @@ public class RewardScene extends UIScene {
if(type==Type.Shop)
{
goldLabel.setText("Gold:"+Current.player().getGold());
Actor background = ui.findActor("market_background");
if(background!=null)
background.setVisible(true);
}
else
{
goldLabel.setText("");
Actor background = ui.findActor("market_background");
if(background!=null)
background.setVisible(false);
}
// card.setDrawable(new TextureRegionDrawable(new Texture(Res.CurrentRes.GetFile("ui/transition.png"))));
@@ -160,13 +162,6 @@ public class RewardScene extends UIScene {
case Shop:
doneButton.setText(Forge.getLocalizer().getMessage("lblLeave"));
goldLabel.setText("Gold:"+Current.player().getGold());
float w = 480 - (goldLabel.getPrefWidth() + 10);
goldLabel.setPosition(w, 250);
if (!Forge.isLandscapeMode()) {
goldLabel.setFontScaleX(2);
w = 480/2 - goldLabel.getPrefWidth();
goldLabel.setPosition(w, 250);
}
break;
case Loot:
goldLabel.setText("");
@@ -192,7 +187,7 @@ public class RewardScene extends UIScene {
}
}
cardHeight = Forge.isLandscapeMode() ? bestCardHeight * 0.90f : bestCardHeight * 0.65f;
cardHeight = bestCardHeight * 0.90f ;
cardWidth = bestCardHeight / CARD_WIDTH_TO_HEIGHT;
yOff += (targetHeight - (cardHeight * numberOfRows)) / 2f;

View File

@@ -10,6 +10,7 @@ import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
import com.badlogic.gdx.utils.Align;
import com.badlogic.gdx.utils.GdxRuntimeException;
import com.badlogic.gdx.utils.IntMap;
import com.badlogic.gdx.utils.Scaling;
import forge.Forge;
import forge.adventure.util.Controls;
import forge.adventure.util.Current;
@@ -43,10 +44,9 @@ public class SaveLoadScene extends UIScene {
TextButton saveLoadButton, back;
TextButton quickSave;
TextButton autoSave;
boolean init;
public SaveLoadScene() {
super(Forge.isLandscapeMode() ? "ui/save_load_mobile.json" : "ui/save_load.json");
super(Forge.isLandscapeMode() ? "ui/save_load.json" : "ui/save_load_portrait.json");
}
@@ -83,6 +83,7 @@ public class SaveLoadScene extends UIScene {
WorldSaveHeader header = previews.get(slot);
if (header.preview != null) {
previewImage.setDrawable(new TextureRegionDrawable(new Texture(header.preview)));
previewImage.setScaling(Scaling.fit);
previewImage.layout();
previewImage.setVisible(true);
previewDate.setVisible(true);
@@ -251,48 +252,28 @@ public class SaveLoadScene extends UIScene {
@Override
public void resLoaded() {
super.resLoaded();
if (!this.init) {
layout = new Table();
stage.addActor(layout);
dialog = Controls.newDialog(Forge.getLocalizer().getMessage("lblSave"));
textInput = Controls.newTextField("");
if (!Forge.isLandscapeMode()) {
dialog.getButtonTable().add(Controls.newLabel(Forge.getLocalizer().getMessage("lblNameYourSaveFile"))).colspan(2).pad(2, 15, 2, 15);
dialog.getButtonTable().row();
dialog.getButtonTable().add(Controls.newLabel(Forge.getLocalizer().getMessage("lblName")+": ")).align(Align.left).pad(2, 15, 2, 2);
dialog.getButtonTable().add(textInput).fillX().expandX().padRight(15);
dialog.getButtonTable().row();
dialog.getButtonTable().add(Controls.newTextButton(Forge.getLocalizer().getMessage("lblSave"), new Runnable() {
@Override
public void run() {
SaveLoadScene.this.save();
}
})).align(Align.left).padLeft(15);
dialog.getButtonTable().add(Controls.newTextButton(Forge.getLocalizer().getMessage("lblAbort"), new Runnable() {
@Override
public void run() {
SaveLoadScene.this.saveAbort();
}
})).align(Align.right).padRight(15);
} else {
dialog.getButtonTable().add(Controls.newLabel(Forge.getLocalizer().getMessage("lblNameYourSaveFile"))).colspan(2);
dialog.getButtonTable().row();
dialog.getButtonTable().add(Controls.newLabel(Forge.getLocalizer().getMessage("lblName")+": ")).align(Align.left);
dialog.getButtonTable().add(textInput).fillX().expandX();
dialog.getButtonTable().row();
dialog.getButtonTable().add(Controls.newTextButton(Forge.getLocalizer().getMessage("lblSave"), new Runnable() {
@Override
public void run() {
SaveLoadScene.this.save();
}
})).align(Align.left);
dialog.getButtonTable().add(Controls.newTextButton(Forge.getLocalizer().getMessage("lblAbort"), new Runnable() {
@Override
public void run() {
SaveLoadScene.this.saveAbort();
}
})).align(Align.right);
dialog.getButtonTable().add(Controls.newLabel(Forge.getLocalizer().getMessage("lblNameYourSaveFile"))).colspan(2).pad(2, 15, 2, 15);
dialog.getButtonTable().row();
dialog.getButtonTable().add(Controls.newLabel(Forge.getLocalizer().getMessage("lblName")+": ")).align(Align.left).pad(2, 15, 2, 2);
dialog.getButtonTable().add(textInput).fillX().expandX().padRight(15);
dialog.getButtonTable().row();
dialog.getButtonTable().add(Controls.newTextButton(Forge.getLocalizer().getMessage("lblSave"), new Runnable() {
@Override
public void run() {
SaveLoadScene.this.save();
}
})).align(Align.left).padLeft(15);
dialog.getButtonTable().add(Controls.newTextButton(Forge.getLocalizer().getMessage("lblAbort"), new Runnable() {
@Override
public void run() {
SaveLoadScene.this.saveAbort();
}
})).align(Align.right).padRight(15);
//makes dialog hidden immediately when you open saveload scene..
dialog.getColor().a = 0;
previewImage = ui.findActor("preview");
@@ -328,34 +309,5 @@ public class SaveLoadScene extends UIScene {
ScrollPane scrollPane = ui.findActor("saveSlots");
scrollPane.setActor(layout);
if (!Forge.isLandscapeMode()) {
float w = Scene.GetIntendedWidth();
float sW = w - 20;
float oX = w/2 - sW/2;
float h = Scene.GetIntendedHeight();
float sH = (h - 10)/12;
scrollPane.setWidth(sW);
scrollPane.setHeight(sH*11);
scrollPane.setX(oX);
previewImage.setScale(1, 1.2f);
previewImage.setX(scrollPane.getRight()-105);
previewImage.setY(scrollPane.getTop()-71);
float bW = w - 165;
float bX = w/2 - bW/2;
back.setWidth(bW/2);
back.setHeight(20);
back.setX(bX);
saveLoadButton.setWidth(bW/2);
saveLoadButton.setHeight(20);
saveLoadButton.setX(back.getRight());
previewDate.setFontScaleX(2);
previewDate.setX(previewImage.getX()-10);
previewDate.setY(previewImage.getY()-15);
} else {
previewDate.setX(previewImage.getX()+5);
previewDate.setY(previewImage.getY()-10);
}
this.init = true;
}
}
}

View File

@@ -4,6 +4,7 @@ import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
import com.badlogic.gdx.utils.Disposable;
import forge.Forge;
import forge.adventure.util.Config;
/**
@@ -15,12 +16,12 @@ public abstract class Scene implements Disposable {
}
public static int GetIntendedWidth() {
return Config.instance().getConfigData().screenWidth;
public static int getIntendedWidth() {
return Forge.isLandscapeMode()? Config.instance().getConfigData().screenWidth:Config.instance().getConfigData().screenHeight;
}
public static int GetIntendedHeight() {
return Config.instance().getConfigData().screenHeight;
public static int getIntendedHeight() {
return Forge.isLandscapeMode()? Config.instance().getConfigData().screenHeight:Config.instance().getConfigData().screenWidth;
}
public abstract void act(float delta);

View File

@@ -6,17 +6,9 @@ import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.scenes.scene2d.Actor;
import com.badlogic.gdx.scenes.scene2d.Stage;
import com.badlogic.gdx.scenes.scene2d.ui.CheckBox;
import com.badlogic.gdx.scenes.scene2d.ui.Label;
import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane;
import com.badlogic.gdx.scenes.scene2d.ui.SelectBox;
import com.badlogic.gdx.scenes.scene2d.ui.Slider;
import com.badlogic.gdx.scenes.scene2d.ui.Table;
import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
import com.badlogic.gdx.scenes.scene2d.ui.TextField;
import com.badlogic.gdx.scenes.scene2d.ui.*;
import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
import com.badlogic.gdx.utils.Align;
import com.badlogic.gdx.utils.Scaling;
import forge.Forge;
import forge.adventure.util.Config;
import forge.adventure.util.Controls;
@@ -35,10 +27,9 @@ public class SettingsScene extends UIScene {
Texture Background;
private Table settingGroup;
TextButton back;
boolean init;
public SettingsScene() {
super(Forge.isLandscapeMode() ? "ui/settings_mobile.json" : "ui/settings.json");
super(Forge.isLandscapeMode() ? "ui/settings.json" : "ui/settings_portrait.json");
}
@@ -53,7 +44,7 @@ public class SettingsScene extends UIScene {
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
stage.getBatch().begin();
stage.getBatch().disableBlending();
stage.getBatch().draw(Background, 0, 0, GetIntendedWidth(), GetIntendedHeight());
stage.getBatch().draw(Background, 0, 0, getIntendedWidth(), getIntendedHeight());
stage.getBatch().enableBlending();
stage.getBatch().end();
stage.act(delta);
@@ -90,12 +81,6 @@ public class SettingsScene extends UIScene {
private void addCheckBox(String name, ForgePreferences.FPref pref) {
CheckBox box = Controls.newCheckBox("");
if (GuiBase.isAndroid()||!Forge.isLandscapeMode()) {
box.getImage().setScaling(Scaling.stretch);
float width = !Forge.isLandscapeMode() ? 24 : 12;
box.getImageCell().size(width, 12);
box.getImageCell().pad(2, 2, 2, 10);
}
box.setChecked(Preference.getPrefBoolean(pref));
box.addListener(new ChangeListener() {
@Override
@@ -125,12 +110,6 @@ public class SettingsScene extends UIScene {
private void addSettingField(String name, boolean value, ChangeListener change) {
CheckBox box = Controls.newCheckBox("");
if (GuiBase.isAndroid()||!Forge.isLandscapeMode()) {
box.getImage().setScaling(Scaling.stretch);
float width = !Forge.isLandscapeMode() ? 24 : 12;
box.getImageCell().size(width, 12);
box.getImageCell().pad(2, 2, 2, 10);
}
box.setChecked(value);
box.addListener(change);
addLabel(name);
@@ -151,11 +130,8 @@ public class SettingsScene extends UIScene {
}
void addLabel(String name) {
Label label = new Label(name, Controls.GetSkin().get("white", Label.LabelStyle.class));
Label label = Controls.newLabel(name);
label.setWrap(true);
if (!Forge.isLandscapeMode()) {
label.setFontScaleX(2);
}
settingGroup.row().space(5);
settingGroup.add(label).align(Align.left).pad(2, 2, 2, 5).expand();
}
@@ -163,123 +139,108 @@ public class SettingsScene extends UIScene {
@Override
public void resLoaded() {
super.resLoaded();
if(!this.init) {
settingGroup = new Table();
if (Preference == null) {
Preference = new ForgePreferences();
}
settingGroup = new Table();
if (Preference == null) {
Preference = new ForgePreferences();
}
SelectBox plane = Controls.newComboBox(Config.instance().getAllAdventures(), Config.instance().getSettingData().plane, new Function<Object, Void>() {
SelectBox plane = Controls.newComboBox(Config.instance().getAllAdventures(), Config.instance().getSettingData().plane, new Function<Object, Void>() {
@Override
public Void apply(Object o) {
Config.instance().getSettingData().plane = (String) o;
Config.instance().saveSettings();
return null;
}
});
addLabel(Forge.getLocalizer().getMessage("lblWorld"));
settingGroup.add(plane).align(Align.right).pad(2);
if (!GuiBase.isAndroid()) {
SelectBox videomode = Controls.newComboBox(new String[]{"720p", "768p", "900p", "1080p"}, Config.instance().getSettingData().videomode, new Function<Object, Void>() {
@Override
public Void apply(Object o) {
Config.instance().getSettingData().plane = (String) o;
String mode = (String) o;
if (mode == null)
mode = "720p";
Config.instance().getSettingData().videomode = mode;
if (mode.equalsIgnoreCase("768p")) {
Config.instance().getSettingData().width = 1366;
Config.instance().getSettingData().height = 768;
} else if (mode.equalsIgnoreCase("900p")) {
Config.instance().getSettingData().width = 1600;
Config.instance().getSettingData().height = 900;
} else if (mode.equalsIgnoreCase("1080p")) {
Config.instance().getSettingData().width = 1920;
Config.instance().getSettingData().height = 1080;
} else {
Config.instance().getSettingData().width = 1280;
Config.instance().getSettingData().height = 720;
}
Config.instance().saveSettings();
//update preference for classic mode if needed
if (FModel.getPreferences().getPref(ForgePreferences.FPref.UI_VIDEO_MODE) != mode) {
FModel.getPreferences().setPref(ForgePreferences.FPref.UI_VIDEO_MODE, mode);
FModel.getPreferences().save();
}
return null;
}
});
addLabel(Forge.getLocalizer().getMessage("lblWorld"));
if (!Forge.isLandscapeMode()) {
plane.getStyle().listStyle.font.getData().setScale(2, 1);
}
settingGroup.add(plane).align(Align.right).pad(2);
if (!GuiBase.isAndroid()) {
SelectBox videomode = Controls.newComboBox(new String[]{"720p", "768p", "900p", "1080p"}, Config.instance().getSettingData().videomode, new Function<Object, Void>() {
@Override
public Void apply(Object o) {
String mode = (String) o;
if (mode == null)
mode = "720p";
Config.instance().getSettingData().videomode = mode;
if (mode.equalsIgnoreCase("768p")) {
Config.instance().getSettingData().width = 1366;
Config.instance().getSettingData().height = 768;
} else if (mode.equalsIgnoreCase("900p")) {
Config.instance().getSettingData().width = 1600;
Config.instance().getSettingData().height = 900;
} else if (mode.equalsIgnoreCase("1080p")) {
Config.instance().getSettingData().width = 1920;
Config.instance().getSettingData().height = 1080;
} else {
Config.instance().getSettingData().width = 1280;
Config.instance().getSettingData().height = 720;
}
Config.instance().saveSettings();
//update preference for classic mode if needed
if (FModel.getPreferences().getPref(ForgePreferences.FPref.UI_VIDEO_MODE) != mode) {
FModel.getPreferences().setPref(ForgePreferences.FPref.UI_VIDEO_MODE, mode);
FModel.getPreferences().save();
}
return null;
}
});
addLabel(Forge.getLocalizer().getMessage("lblVideoMode"));
settingGroup.add(videomode).align(Align.right).pad(2);
addSettingField(Forge.getLocalizer().getMessage("lblFullScreen"), Config.instance().getSettingData().fullScreen, new ChangeListener() {
@Override
public void changed(ChangeEvent event, Actor actor) {
boolean value = ((CheckBox) actor).isChecked();
Config.instance().getSettingData().fullScreen = value;
Config.instance().saveSettings();
//update
if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_FULLSCREEN_MODE) != value) {
FModel.getPreferences().setPref(ForgePreferences.FPref.UI_LANDSCAPE_MODE, value);
FModel.getPreferences().save();
}
}
});
}
addCheckBox(Forge.getLocalizer().getMessage("lblCardName"), ForgePreferences.FPref.UI_OVERLAY_CARD_NAME);
addSettingSlider(Forge.getLocalizer().getMessage("cbAdjustMusicVolume"), ForgePreferences.FPref.UI_VOL_MUSIC, 0, 100);
addSettingSlider(Forge.getLocalizer().getMessage("cbAdjustSoundsVolume"), ForgePreferences.FPref.UI_VOL_SOUNDS, 0, 100);
addCheckBox(Forge.getLocalizer().getMessage("lblManaCost"), ForgePreferences.FPref.UI_OVERLAY_CARD_MANA_COST);
addCheckBox(Forge.getLocalizer().getMessage("lblPowerOrToughness"), ForgePreferences.FPref.UI_OVERLAY_CARD_POWER);
addCheckBox(Forge.getLocalizer().getMessage("lblCardID"), ForgePreferences.FPref.UI_OVERLAY_CARD_ID);
addCheckBox(Forge.getLocalizer().getMessage("lblAbilityIcon"), ForgePreferences.FPref.UI_OVERLAY_ABILITY_ICONS);
addCheckBox(Forge.getLocalizer().getMessage("cbImageFetcher"), ForgePreferences.FPref.UI_ENABLE_ONLINE_IMAGE_FETCHER);
if (!GuiBase.isAndroid()) {
addCheckBox(Forge.getLocalizer().getMessage("lblBattlefieldTextureFiltering"), ForgePreferences.FPref.UI_LIBGDX_TEXTURE_FILTERING);
addCheckBox(Forge.getLocalizer().getMessage("lblAltZoneTabs"), ForgePreferences.FPref.UI_ALT_PLAYERZONETABS);
}
addCheckBox(Forge.getLocalizer().getMessage("lblAnimatedCardTapUntap"), ForgePreferences.FPref.UI_ANIMATED_CARD_TAPUNTAP);
if (!GuiBase.isAndroid()) {
addCheckBox(Forge.getLocalizer().getMessage("lblBorderMaskOption"), ForgePreferences.FPref.UI_ENABLE_BORDER_MASKING);
addCheckBox(Forge.getLocalizer().getMessage("lblPreloadExtendedArtCards"), ForgePreferences.FPref.UI_ENABLE_PRELOAD_EXTENDED_ART);
addCheckBox(Forge.getLocalizer().getMessage("lblAutoCacheSize"), ForgePreferences.FPref.UI_AUTO_CACHE_SIZE);
addCheckBox(Forge.getLocalizer().getMessage("lblDisposeTextures"), ForgePreferences.FPref.UI_ENABLE_DISPOSE_TEXTURES);
//addInputField(Forge.getLocalizer().getMessage("lblDisposeTextures"), ForgePreferences.FPref.UI_LANGUAGE);
}
settingGroup.row();
back = ui.findActor("return");
back.getLabel().setText(Forge.getLocalizer().getMessage("lblBack"));
ui.onButtonPress("return", new Runnable() {
addLabel(Forge.getLocalizer().getMessage("lblVideoMode"));
settingGroup.add(videomode).align(Align.right).pad(2);
addSettingField(Forge.getLocalizer().getMessage("lblFullScreen"), Config.instance().getSettingData().fullScreen, new ChangeListener() {
@Override
public void run() {
SettingsScene.this.back();
public void changed(ChangeEvent event, Actor actor) {
boolean value = ((CheckBox) actor).isChecked();
Config.instance().getSettingData().fullScreen = value;
Config.instance().saveSettings();
//update
if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_FULLSCREEN_MODE) != value) {
FModel.getPreferences().setPref(ForgePreferences.FPref.UI_LANDSCAPE_MODE, value);
FModel.getPreferences().save();
}
}
});
ScrollPane scrollPane = ui.findActor("settings");
scrollPane.setActor(settingGroup);
if (!Forge.isLandscapeMode()) {
float w = Scene.GetIntendedWidth();
float bW = w/2;
float oX = w/2 - bW/2;
back.getLabel().setFontScaleX(2);
back.setWidth(bW);
back.setHeight(20);
float bH = back.getHeight();
back.setX(oX);
scrollPane.setX(w/2-scrollPane.getWidth()/2);
}
this.init = true;
}
addCheckBox(Forge.getLocalizer().getMessage("lblCardName"), ForgePreferences.FPref.UI_OVERLAY_CARD_NAME);
addSettingSlider(Forge.getLocalizer().getMessage("cbAdjustMusicVolume"), ForgePreferences.FPref.UI_VOL_MUSIC, 0, 100);
addSettingSlider(Forge.getLocalizer().getMessage("cbAdjustSoundsVolume"), ForgePreferences.FPref.UI_VOL_SOUNDS, 0, 100);
addCheckBox(Forge.getLocalizer().getMessage("lblManaCost"), ForgePreferences.FPref.UI_OVERLAY_CARD_MANA_COST);
addCheckBox(Forge.getLocalizer().getMessage("lblPowerOrToughness"), ForgePreferences.FPref.UI_OVERLAY_CARD_POWER);
addCheckBox(Forge.getLocalizer().getMessage("lblCardID"), ForgePreferences.FPref.UI_OVERLAY_CARD_ID);
addCheckBox(Forge.getLocalizer().getMessage("lblAbilityIcon"), ForgePreferences.FPref.UI_OVERLAY_ABILITY_ICONS);
addCheckBox(Forge.getLocalizer().getMessage("cbImageFetcher"), ForgePreferences.FPref.UI_ENABLE_ONLINE_IMAGE_FETCHER);
if (!GuiBase.isAndroid()) {
addCheckBox(Forge.getLocalizer().getMessage("lblBattlefieldTextureFiltering"), ForgePreferences.FPref.UI_LIBGDX_TEXTURE_FILTERING);
addCheckBox(Forge.getLocalizer().getMessage("lblAltZoneTabs"), ForgePreferences.FPref.UI_ALT_PLAYERZONETABS);
}
addCheckBox("Stretch", ForgePreferences.FPref.UI_STRETCH);//todo localize
addCheckBox(Forge.getLocalizer().getMessage("lblLandscapeMode"), ForgePreferences.FPref.UI_LANDSCAPE_MODE);
addCheckBox(Forge.getLocalizer().getMessage("lblAnimatedCardTapUntap"), ForgePreferences.FPref.UI_ANIMATED_CARD_TAPUNTAP);
if (!GuiBase.isAndroid()) {
addCheckBox(Forge.getLocalizer().getMessage("lblBorderMaskOption"), ForgePreferences.FPref.UI_ENABLE_BORDER_MASKING);
addCheckBox(Forge.getLocalizer().getMessage("lblPreloadExtendedArtCards"), ForgePreferences.FPref.UI_ENABLE_PRELOAD_EXTENDED_ART);
addCheckBox(Forge.getLocalizer().getMessage("lblAutoCacheSize"), ForgePreferences.FPref.UI_AUTO_CACHE_SIZE);
addCheckBox(Forge.getLocalizer().getMessage("lblDisposeTextures"), ForgePreferences.FPref.UI_ENABLE_DISPOSE_TEXTURES);
//addInputField(Forge.getLocalizer().getMessage("lblDisposeTextures"), ForgePreferences.FPref.UI_LANGUAGE);
}
settingGroup.row();
back = ui.findActor("return");
back.getLabel().setText(Forge.getLocalizer().getMessage("lblBack"));
ui.onButtonPress("return", new Runnable() {
@Override
public void run() {
SettingsScene.this.back();
}
});
ScrollPane scrollPane = ui.findActor("settings");
scrollPane.setActor(settingGroup);
}
@Override

View File

@@ -13,10 +13,9 @@ import forge.adventure.world.WorldSave;
*/
public class StartScene extends UIScene {
TextButton saveButton, resumeButton, newGameButton, newGameButtonPlus, loadButton, settingsButton, exitButton, switchButton;
boolean init;
public StartScene() {
super("ui/start_menu_mobile.json");
super(Forge.isLandscapeMode()?"ui/start_menu.json":"ui/start_menu_portrait.json");
}
@@ -83,44 +82,15 @@ public class StartScene extends UIScene {
@Override
public void resLoaded() {
super.resLoaded();
if (!this.init) {
ui.onButtonPress("Start", new Runnable() {
@Override
public void run() {
StartScene.this.NewGame();
}
});
ui.onButtonPress("Start", () -> StartScene.this.NewGame());
ui.onButtonPress("Start+", () -> NewGamePlus());
ui.onButtonPress("Load", new Runnable() {
@Override
public void run() {
StartScene.this.Load();
}
});
ui.onButtonPress("Save", new Runnable() {
@Override
public void run() {
StartScene.this.Save();
}
});
ui.onButtonPress("Resume", new Runnable() {
@Override
public void run() {
StartScene.this.Resume();
}
});
ui.onButtonPress("Settings", new Runnable() {
@Override
public void run() {
StartScene.this.settings();
}
});
ui.onButtonPress("Exit", new Runnable() {
@Override
public void run() {
StartScene.this.Exit();
}
});
ui.onButtonPress("Load", () -> StartScene.this.Load());
ui.onButtonPress("Save", () -> StartScene.this.Save());
ui.onButtonPress("Resume", () -> StartScene.this.Resume());
ui.onButtonPress("Settings", () -> StartScene.this.settings());
ui.onButtonPress("Exit", () -> StartScene.this.Exit());
ui.onButtonPress("Switch", () -> Forge.switchToClassic());
newGameButton = ui.findActor("Start");
newGameButton.getLabel().setText(Forge.getLocalizer().getMessage("lblNewGame"));
newGameButtonPlus = ui.findActor("Start+");
@@ -137,45 +107,9 @@ public class StartScene extends UIScene {
exitButton.getLabel().setText(Forge.getLocalizer().getMessage("lblExit"));
switchButton = ui.findActor("Switch");
switchButton.getLabel().setText(Forge.getLocalizer().getMessage("lblClassic"));
if (!Forge.isLandscapeMode()) {
float w = Scene.GetIntendedWidth();
float bW = w - 165;
float oX = w / 2 - bW / 2;
newGameButton.setWidth(bW/2);
newGameButton.setX(oX);
newGameButton.getLabel().setFontScaleX(2);
newGameButtonPlus.setWidth(bW/2);
newGameButtonPlus.setX(newGameButton.getX()+bW/2);
newGameButtonPlus.getLabel().setFontScaleX(2);
loadButton.setWidth(bW);
loadButton.setX(oX);
loadButton.getLabel().setFontScaleX(2);
saveButton.setWidth(bW);
saveButton.setX(oX);
saveButton.getLabel().setFontScaleX(2);
resumeButton.setWidth(bW);
resumeButton.setX(oX);
resumeButton.getLabel().setFontScaleX(2);
settingsButton.setWidth(bW);
settingsButton.setX(oX);
settingsButton.getLabel().setFontScaleX(2);
exitButton.setWidth(bW / 2);
exitButton.setX(w / 2 - exitButton.getWidth());
exitButton.getLabel().setFontScaleX(2);
switchButton.setWidth(bW / 2);
switchButton.setX(w / 2);
switchButton.getLabel().setFontScaleX(2);
}
ui.onButtonPress("Switch", new Runnable() {
@Override
public void run() {
Forge.switchToClassic();
}
});
saveButton.setVisible(false);
resumeButton.setVisible(false);
this.init = true;
}
}
private void NewGamePlus() {

View File

@@ -2,7 +2,6 @@ package forge.adventure.scene;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.maps.tiled.TiledMap;
import forge.Forge;
import forge.adventure.pointofintrest.PointOfInterest;
@@ -21,7 +20,6 @@ public class TileMapScene extends HudScene {
PointOfInterestMapRenderer tiledMapRenderer;
private String nextMap;
private float cameraWidth = 0f, cameraHeight = 0f;
boolean init;
public TileMapScene() {
super(MapStage.getInstance());
@@ -57,7 +55,7 @@ public class TileMapScene extends HudScene {
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
Gdx.gl.glBlendFunc(GL20.GL_SRC_ALPHA, GL20.GL_ONE_MINUS_SRC_ALPHA);
tiledMapRenderer.setView(stage.getCamera().combined, stage.getCamera().position.x - Scene.GetIntendedWidth() / 2.0f, stage.getCamera().position.y - Scene.GetIntendedHeight() / 2.0f, Scene.GetIntendedWidth(), Scene.GetIntendedHeight());
tiledMapRenderer.setView(stage.getCamera().combined, stage.getCamera().position.x - Scene.getIntendedWidth() / 2.0f, stage.getCamera().position.y - Scene.getIntendedHeight() / 2.0f, Scene.getIntendedWidth(), Scene.getIntendedHeight());
if (!Forge.isLandscapeMode()) {
stage.getCamera().position.x = stage.GetPlayer().pos().x;
@@ -68,27 +66,18 @@ public class TileMapScene extends HudScene {
@Override
public void resLoaded() {
if (!this.init) {
MapStage.getInstance().resLoaded();
//set initial camera width and height
if (cameraWidth == 0f)
cameraWidth = stage.getCamera().viewportWidth;
if (cameraHeight == 0f)
cameraHeight = stage.getCamera().viewportHeight;
MapStage.getInstance().setDialogStage(hud);
this.init = true;
}
MapStage.getInstance().resLoaded();
//set initial camera width and height
if (cameraWidth == 0f)
cameraWidth = stage.getCamera().viewportWidth;
if (cameraHeight == 0f)
cameraHeight = stage.getCamera().viewportHeight;
MapStage.getInstance().setDialogStage(hud);
super.resLoaded();
}
@Override
public void enter() {
if (!Forge.isLandscapeMode()) {
//Trick for Map Stage
stage.getCamera().viewportWidth = cameraHeight;
stage.getCamera().viewportHeight = cameraWidth;
((OrthographicCamera) stage.getCamera()).zoom = 0.55f;
}
super.enter();
}

View File

@@ -10,9 +10,10 @@ import com.badlogic.gdx.scenes.scene2d.ui.Image;
import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
import com.badlogic.gdx.utils.Scaling;
import com.badlogic.gdx.utils.viewport.ScalingViewport;
import forge.Forge;
import forge.adventure.util.Config;
import forge.adventure.util.UIActor;
import forge.localinstance.properties.ForgePreferences;
import forge.model.FModel;
/**
* Base class for an GUI scene where the elements are loaded from a json file
@@ -20,7 +21,6 @@ import forge.adventure.util.UIActor;
public class UIScene extends Scene {
protected UIActor ui;
Stage stage;
boolean initialze;
String uiFile;
@@ -42,7 +42,7 @@ public class UIScene extends Scene {
@Override
public void render() {
Gdx.gl.glClearColor(0, 0, 1, 1);
Gdx.gl.glClearColor(0, 0, 0, 1);
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
stage.draw();
}
@@ -57,8 +57,7 @@ public class UIScene extends Scene {
@Override
public void resLoaded() {
if (!this.initialze) {
stage = new Stage(new ScalingViewport(Scaling.stretch, GetIntendedWidth(), GetIntendedHeight())) {
stage = new Stage(new ScalingViewport(FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_STRETCH)?Scaling.stretch:Scaling.fit, getIntendedWidth(), getIntendedHeight())) {
@Override
public boolean keyUp(int keycode) {
@@ -68,8 +67,6 @@ public class UIScene extends Scene {
ui = new UIActor(Config.instance().getFile(uiFile));
screenImage = ui.findActor("lastScreen");
stage.addActor(ui);
this.initialze = true;
}
}
Image screenImage;
@@ -78,38 +75,7 @@ public class UIScene extends Scene {
@Override
public void enter() {
if (this instanceof RewardScene) { //backdrop for rewardscene - Shop
if (RewardScene.Type.Shop.equals(((RewardScene)this).type)) {
if (market == null) {
market = new TextureRegion(new Texture(Config.instance().getFile("ui/market.png")));
if (!Forge.isLandscapeMode()) {
float ar = 1.78f;
int w = (int) (market.getRegionHeight() / ar);
int x = (int) ((market.getRegionWidth() - w) / ar);
market.setRegion(x, 0, w, market.getRegionHeight());
}
}
screenImage.setDrawable(new TextureRegionDrawable(market));
Gdx.input.setInputProcessor(stage); //Start taking input from the ui
super.enter();
return;
}
}
if (this instanceof InnScene) { //backdrop for Inn
if (tavern == null) {
tavern = new TextureRegion(new Texture(Config.instance().getFile("ui/tavern.png")));
if (!Forge.isLandscapeMode()) {
float ar = 1.78f;
int w = (int) (tavern.getRegionHeight() / ar);
int x = (int) ((tavern.getRegionWidth() - w) / ar);
tavern.setRegion(x, 0, w, tavern.getRegionHeight());
}
}
screenImage.setDrawable(new TextureRegionDrawable(tavern));
Gdx.input.setInputProcessor(stage); //Start taking input from the ui
super.enter();
return;
}
if (screenImage != null) {
if (backgroundTexture != null)
backgroundTexture.getTexture().dispose();

View File

@@ -28,6 +28,8 @@ import forge.adventure.util.Current;
import forge.adventure.util.UIActor;
import forge.adventure.world.WorldSave;
import forge.gui.GuiBase;
import forge.localinstance.properties.ForgePreferences;
import forge.model.FModel;
/**
* Stage to handle everything rendered in the HUD
@@ -56,11 +58,11 @@ public class GameHUD extends Stage {
float TOUCHPAD_KNOB_MIN_WIDTH = 40f;
private GameHUD(GameStage gameStage) {
super(new ScalingViewport(Scaling.stretch, Scene.GetIntendedWidth(), Scene.GetIntendedHeight()), gameStage.getBatch());
super(new ScalingViewport(FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_STRETCH)?Scaling.stretch:Scaling.fit, Scene.getIntendedWidth(), Scene.getIntendedHeight()), gameStage.getBatch());
instance = this;
this.gameStage = gameStage;
ui = new UIActor(Config.instance().getFile("ui/hud_mobile.json"));
ui = new UIActor(Config.instance().getFile(Forge.isLandscapeMode()?"ui/hud.json":"ui/hud_portrait.json"));
blank = ui.findActor("blank");
miniMap = ui.findActor("map");
@@ -92,8 +94,6 @@ public class GameHUD extends Stage {
//create touchpad
touchpad = new Touchpad(10, touchpadStyle);
touchpad.setBounds(15, 15, TOUCHPAD_SCALE, TOUCHPAD_SCALE);
if (!Forge.isLandscapeMode())
touchpad.getColor().a = 0.01f; //can't scale image on portrait..
touchpad.addListener(new ChangeListener() {
@Override
public void changed(ChangeEvent changeEvent, Actor actor) {
@@ -129,47 +129,6 @@ public class GameHUD extends Stage {
money.setText(String.valueOf(AdventurePlayer.current().getGold()));
}
}) ;
if (!Forge.isLandscapeMode()) {
miniMap.setWidth(160);
mapborder.setWidth(160);
miniMapPlayer.setWidth(10);
miniMap.setHeight(70);
mapborder.setHeight(70);
miniMapPlayer.setHeight(4);
gamehud.setVisible(false);
blank.setScaleX(2);
blank.setX(388);
blank.setHeight(70);
blank.setY(miniMap.getY());
avatar.setScaleX(2);
avatar.setX(388);
avatar.setHeight(36);
avatarborder.setX(388);
avatarborder.setY(miniMap.getY());
avatarborder.setScaleX(2);
avatarborder.setHeight(70);
money.setX(418);
money.setFontScaleX(2);
lifePoints.setX(418);
lifePoints.setY(avatar.getY()-15);
lifePoints.setFontScaleX(2);
money.setY(avatar.getY()-25);
menuActor.setHeight(20);
menuActor.setWidth(80);
menuActor.setX(400);
statsActor.setHeight(20);
statsActor.setWidth(80);
statsActor.setX(400);
statsActor.setY(menuActor.getY() + 35);
inventoryActor.setHeight(20);
inventoryActor.setWidth(80);
inventoryActor.setX(400);
inventoryActor.setY(statsActor.getY() + 35);
deckActor.setHeight(20);
deckActor.setWidth(80);
deckActor.setX(400);
deckActor.setY(inventoryActor.getY() + 35);
}
addActor(ui);
addActor(miniMapPlayer);
WorldSave.getCurrentSave().onLoad(new Runnable() {
@@ -415,8 +374,5 @@ public class GameHUD extends Stage {
statsActor.getColor().a = 0.5f;
inventoryActor.getColor().a = 0.5f;
}
if (!Forge.isLandscapeMode()) {
gamehud.setVisible(false);
}
}
}

View File

@@ -18,6 +18,8 @@ import forge.adventure.scene.TileMapScene;
import forge.adventure.util.Current;
import forge.adventure.world.WorldSave;
import forge.gui.GuiBase;
import forge.localinstance.properties.ForgePreferences;
import forge.model.FModel;
/**
* Base class to render a player sprite on a map
@@ -50,7 +52,7 @@ public abstract class GameStage extends Stage {
}
public GameStage() {
super(new ScalingViewport(Scaling.stretch, Scene.GetIntendedWidth(), Scene.GetIntendedHeight(), new OrthographicCamera()));
super(new ScalingViewport(FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_STRETCH)?Scaling.stretch:Scaling.fit, Scene.getIntendedWidth(), Scene.getIntendedHeight(), new OrthographicCamera()));
WorldSave.getCurrentSave().onLoad(new Runnable() {
@Override
public void run() {
@@ -137,8 +139,8 @@ public abstract class GameStage extends Stage {
else
player.setMoveModifier(1);*/
camera.position.x = Math.min(Math.max(Scene.GetIntendedWidth() / 2f, player.pos().x), getViewport().getWorldWidth() - Scene.GetIntendedWidth() / 2f);
camera.position.y = Math.min(Math.max(Scene.GetIntendedHeight() / 2f, player.pos().y), getViewport().getWorldHeight() - Scene.GetIntendedHeight() / 2f);
camera.position.x = Math.min(Math.max(Scene.getIntendedWidth() / 2f, player.pos().x), getViewport().getWorldWidth() - Scene.getIntendedWidth() / 2f);
camera.position.y = Math.min(Math.max(Scene.getIntendedHeight() / 2f, player.pos().y), getViewport().getWorldHeight() - Scene.getIntendedHeight() / 2f);
onActing(delta);
@@ -223,10 +225,10 @@ public abstract class GameStage extends Stage {
if (isPaused())
return true;
camera.zoom += (amountY * 0.03);
if (camera.zoom < 0.2f)
camera.zoom = 0.2f;
if (camera.zoom > 1.5f)
camera.zoom = 1.5f;
if (camera.zoom < 0.3f)
camera.zoom = 0.3f;
if (camera.zoom > 1f)
camera.zoom = 1f;
return super.scrolled(amountX, amountY);
}

View File

@@ -220,7 +220,7 @@ public class WorldStage extends GameStage implements SaveFileContent {
return;
}
EnemySprite sprite = new EnemySprite(enemyData);
float unit = Scene.GetIntendedHeight() / 6f;
float unit = Scene.getIntendedHeight() / 6f;
Vector2 spawnPos = new Vector2(1, 1);
spawnPos.setLength(unit + (unit * 3) * rand.nextFloat());
spawnPos.setAngleDeg(360 * rand.nextFloat());

View File

@@ -1,22 +1,17 @@
package forge.adventure.util;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.TextureAtlas;
import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator;
import com.badlogic.gdx.scenes.scene2d.Actor;
import com.badlogic.gdx.scenes.scene2d.InputEvent;
import com.badlogic.gdx.scenes.scene2d.ui.CheckBox;
import com.badlogic.gdx.scenes.scene2d.ui.Dialog;
import com.badlogic.gdx.scenes.scene2d.ui.Label;
import com.badlogic.gdx.scenes.scene2d.ui.SelectBox;
import com.badlogic.gdx.scenes.scene2d.ui.Skin;
import com.badlogic.gdx.scenes.scene2d.ui.Slider;
import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
import com.badlogic.gdx.scenes.scene2d.ui.TextField;
import com.badlogic.gdx.scenes.scene2d.ui.*;
import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
import com.badlogic.gdx.utils.Align;
import forge.Forge;
import java.util.function.Function;
@@ -25,7 +20,7 @@ import java.util.function.Function;
*/
public class Controls {
private static Skin SelectedSkin = null;
private static BitmapFont defaultfont, bigfont, miKrollFantasy;
private static BitmapFont defaultfont, bigfont;
static public TextButton newTextButton(String text) {
@@ -103,8 +98,6 @@ public class Controls {
static public BitmapFont getBitmapFont(String fontName) {
switch (fontName) {
case "MiKrollFantasyBig":
return miKrollFantasy;
case "blackbig":
case "big":
return bigfont;
@@ -122,32 +115,39 @@ public class Controls {
FileHandle skinFile = Config.instance().getFile(Paths.SKIN);
FileHandle atlasFile = skinFile.sibling(skinFile.nameWithoutExtension() + ".atlas");
TextureAtlas atlas = new TextureAtlas(atlasFile);
SelectedSkin.addRegions(atlas);
SelectedSkin.load(skinFile);
//font
defaultfont = new BitmapFont(Config.instance().getFile(Paths.SKIN).sibling("LanaPixelCJK.fnt"));
miKrollFantasy = new BitmapFont(Config.instance().getFile(Paths.SKIN).sibling("MiKrollFantasyBig.fnt"));
bigfont = new BitmapFont(Config.instance().getFile(Paths.SKIN).sibling("LanaPixelCJK.fnt"));
bigfont.getData().setScale(2, 2);
FreeTypeFontGenerator generateFonts=new FreeTypeFontGenerator(Config.instance().getFile(Paths.SKIN_FONT));
FreeTypeFontGenerator.FreeTypeFontParameter parameter = new FreeTypeFontGenerator.FreeTypeFontParameter();
parameter.borderWidth=0;
parameter.incremental = true;
parameter.mono=true;
parameter.size=11;
parameter.minFilter = Texture.TextureFilter.Nearest;
parameter.magFilter = Texture.TextureFilter.Nearest;
parameter.color= Color.WHITE;
defaultfont = generateFonts.generateFont(parameter);
parameter.size=22;
parameter.color= Color.WHITE;
bigfont = generateFonts.generateFont(parameter);
SelectedSkin.add("default",defaultfont);
SelectedSkin.add("big",bigfont);
SelectedSkin.addRegions(atlas);
SelectedSkin.load(skinFile);
}
return SelectedSkin;
}
public static Label newLabel(String name) {
Label ret = new Label(name, GetSkin());
if (!Forge.isLandscapeMode()) {
ret.setFontScaleX(2);
}
return ret;
}
public static Dialog newDialog(String title) {
Dialog ret = new Dialog(title, GetSkin());
ret.setMovable(false);
if (!Forge.isLandscapeMode()) {
ret.getTitleLabel().setFontScaleX(2);
}
return ret;
}

View File

@@ -11,6 +11,7 @@ public class Paths {
public static final String POINTS_OF_INTEREST = "world/points_of_interest.json";
public static final String ITEMS = "world/items.json";
public static final String SKIN = "skin/ui_skin.json";
public static final String SKIN_FONT = "skin/LanaPixel.ttf";
public static final String ITEMS_EQUIP = "skin/equip.png";
public static final String ITEMS_ATLAS = "sprites/items.atlas";

View File

@@ -182,8 +182,10 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb
if (Forge.isTextureFilteringEnabled())
image.setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear);
TextureRegionDrawable drawable = new TextureRegionDrawable(ImageCache.croppedBorderImage(image));
drawable.setMinSize((Scene.GetIntendedHeight() / RewardScene.CARD_WIDTH_TO_HEIGHT) * 0.95f, Scene.GetIntendedHeight() * 0.95f);
toolTipImage = new Image(drawable);
if(Forge.isLandscapeMode())
drawable.setMinSize((Scene.getIntendedHeight() / RewardScene.CARD_WIDTH_TO_HEIGHT) * 0.95f, Scene.getIntendedHeight() * 0.95f);
else
drawable.setMinSize(Scene.getIntendedWidth() * 0.95f, Scene.getIntendedWidth()* RewardScene.CARD_WIDTH_TO_HEIGHT * 0.95f); toolTipImage = new Image(drawable);
tooltip = new Tooltip<Image>(toolTipImage);
holdTooltip = new HoldTooltip(new Image(drawable));
tooltip.setInstant(true);
@@ -242,7 +244,10 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb
//Rendering code ends here.
TextureRegionDrawable drawable = new TextureRegionDrawable(result);
drawable.setMinSize((Scene.GetIntendedHeight() / RewardScene.CARD_WIDTH_TO_HEIGHT) * 0.95f, Scene.GetIntendedHeight() * 0.95f);
if(Forge.isLandscapeMode())
drawable.setMinSize((Scene.getIntendedHeight() / RewardScene.CARD_WIDTH_TO_HEIGHT) * 0.95f, Scene.getIntendedHeight() * 0.95f);
else
drawable.setMinSize(Scene.getIntendedWidth() * 0.95f, Scene.getIntendedWidth()* RewardScene.CARD_WIDTH_TO_HEIGHT * 0.95f);
toolTipImage = new Image(drawable);
tooltip = new Tooltip<Image>(toolTipImage);
holdTooltip = new HoldTooltip(new Image(drawable));
@@ -367,19 +372,19 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb
final Vector3 direction = new Vector3(0, 0, -1);
final Vector3 up = new Vector3(0, 1, 0);
//final Vector3 position = new Vector3( getX()+getWidth()/2 , getY()+getHeight()/2, 0);
final Vector3 position = new Vector3(Scene.GetIntendedWidth() / 2f, Scene.GetIntendedHeight() / 2f, 0);
final Vector3 position = new Vector3(Scene.getIntendedWidth() / 2f, Scene.getIntendedHeight() / 2f, 0);
float fov = 67;
Matrix4 projection = new Matrix4();
Matrix4 view = new Matrix4();
float hy = Scene.GetIntendedHeight() / 2f;
float hy = Scene.getIntendedHeight() / 2f;
float a = (float) ((hy) / Math.sin(MathUtils.degreesToRadians * (fov / 2f)));
float height = (float) Math.sqrt((a * a) - (hy * hy));
position.z = height * 1f;
float far = height * 2f;
float near = height * 0.8f;
float aspect = (float) Scene.GetIntendedWidth() / (float) Scene.GetIntendedHeight();
float aspect = (float) Scene.getIntendedWidth() / (float) Scene.getIntendedHeight();
projection.setToProjection(Math.abs(near), Math.abs(far), fov, aspect);
view.setToLookAt(position, position.cpy().add(direction), up);
Matrix4.mul(projection.val, view.val);

View File

@@ -14,7 +14,6 @@ import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.Json;
import com.badlogic.gdx.utils.ObjectMap;
import com.badlogic.gdx.utils.OrderedMap;
import forge.Forge;
import forge.adventure.data.UIData;
/**
@@ -22,6 +21,7 @@ import forge.adventure.data.UIData;
*/
public class UIActor extends Group {
UIData data;
Actor lastActor=null;
public UIActor(FileHandle handle) {
data = (new Json()).fromJson(UIData.class, handle);
@@ -95,11 +95,28 @@ public class UIActor extends Group {
yValue = (Float) property.value;
newActor.setY(data.yDown ? data.height - yValue - newActor.getHeight() : yValue);
break;
case "yOffset":
if(data.yDown)
{
yValue = (Float)property.value+((lastActor!=null?(data.height-lastActor.getY()):0f));
newActor.setY( data.height - yValue - newActor.getHeight() );
}
else
{
yValue = (Float)property.value+((lastActor!=null?(lastActor.getY()):0f));
newActor.setY(yValue);
}
break;
case "xOffset":
newActor.setX((Float)property.value+((lastActor!=null?lastActor.getX():0f)));
break;
case "name":
newActor.setName((String) property.value);
break;
}
}
lastActor=newActor;
addActor(newActor);
}
}
@@ -149,13 +166,13 @@ public class UIActor extends Group {
}
private void readLabelProperties(Label newActor, ObjectMap.Entries<String, String> entries) {
Label.LabelStyle style = new Label.LabelStyle(newActor.getStyle());
for (ObjectMap.Entry property : entries) {
switch (property.key.toString()) {
case "text":
newActor.setText(property.value.toString());
break;
case "font":
Label.LabelStyle style = new Label.LabelStyle(newActor.getStyle());
case "font"://legacy
style.font = Controls.getBitmapFont(property.value.toString());
if (property.value.toString().contains("black"))
style.fontColor = Color.BLACK;
@@ -163,6 +180,16 @@ public class UIActor extends Group {
newActor.setFontScale(2, 2);
newActor.setStyle(style);
break;
case "fontSize":
newActor.setFontScale((Float)property.value, (Float)property.value);
break;
case "fontName":
style.font = Controls.getBitmapFont(property.value.toString());
newActor.setStyle(style);
break;
case "fontColor":
newActor.setColor(new Color(Integer.decode(property.value.toString()) ));
break;
}
}
}
@@ -200,12 +227,6 @@ public class UIActor extends Group {
case "image":
Texture t = new Texture(Config.instance().getFile(property.value.toString()));
TextureRegion tr = new TextureRegion(t);
if (!Forge.isLandscapeMode() && t.toString().contains("title_bg")) {
float ar = 1.78f;
int w = (int) (tr.getRegionHeight() / ar);
int x = (int) ((tr.getRegionWidth() - w) / ar);
tr.setRegion(x, 0, w, tr.getRegionHeight());
}
newActor.setDrawable(new TextureRegionDrawable(tr));
break;
}

View File

@@ -553,7 +553,7 @@ public class World implements Disposable, SaveFileContent {
}
public int getChunkSize() {
return Scene.GetIntendedWidth() / data.tileSize;
return Scene.getIntendedWidth() / data.tileSize;
}
public void dispose() {

View File

@@ -42,7 +42,7 @@ public class WorldSaveHeader implements java.io.Serializable, Disposable {
public void createPreview() {
Pixmap pixmap = Pixmap.createFromFrameBuffer(0, 0, Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
Pixmap scaled = new Pixmap(WorldSaveHeader.previewImageWidth, (int) (WorldSaveHeader.previewImageWidth / (Scene.GetIntendedWidth() / (float) Scene.GetIntendedHeight())), Pixmap.Format.RGBA8888);
Pixmap scaled = new Pixmap(WorldSaveHeader.previewImageWidth, (int) (WorldSaveHeader.previewImageWidth / (Scene.getIntendedWidth() / (float) Scene.getIntendedHeight())), Pixmap.Format.RGBA8888);
scaled.drawPixmap(pixmap,
0, 0, pixmap.getWidth(), pixmap.getHeight(),
0, 0, scaled.getWidth(), scaled.getHeight());

Binary file not shown.

Before

Width:  |  Height:  |  Size: 331 KiB

After

Width:  |  Height:  |  Size: 483 KiB

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 151 KiB

View File

@@ -1,102 +0,0 @@
info face="MiKrollFantasy(1)" size=12 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=2 padding=1,1,1,1 spacing=0,0
common lineHeight=28 base=21 scaleW=506 scaleH=39 pages=1 packed=0 alphaChnl=0 redChnl=0 greenChnl=0 blueChnl=0
page id=0 file="MiKrollFantasy(1).png"
chars count=97
char id=0 x=2 y=2 width=9 height=22 xoffset=0 yoffset=-1 xadvance=12 page=0 chnl=0
char id=32 x=0 y=0 width=0 height=0 xoffset=-1 yoffset=-1 xadvance=10 page=0 chnl=0
char id=33 x=289 y=2 width=2 height=12 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=34 x=332 y=26 width=6 height=4 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=0
char id=35 x=124 y=26 width=10 height=10 xoffset=-1 yoffset=11 xadvance=12 page=0 chnl=0
char id=36 x=129 y=2 width=8 height=12 xoffset=-1 yoffset=11 xadvance=10 page=0 chnl=0
char id=37 x=278 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=38 x=136 y=26 width=10 height=10 xoffset=-1 yoffset=11 xadvance=12 page=0 chnl=0
char id=39 x=344 y=26 width=2 height=4 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=40 x=37 y=2 width=4 height=14 xoffset=-1 yoffset=7 xadvance=6 page=0 chnl=0
char id=41 x=43 y=2 width=4 height=14 xoffset=-1 yoffset=7 xadvance=6 page=0 chnl=0
char id=42 x=288 y=26 width=6 height=6 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=0
char id=43 x=296 y=26 width=6 height=6 xoffset=-1 yoffset=13 xadvance=8 page=0 chnl=0
char id=44 x=340 y=26 width=2 height=4 xoffset=-1 yoffset=19 xadvance=4 page=0 chnl=0
char id=45 x=366 y=26 width=4 height=2 xoffset=-1 yoffset=15 xadvance=6 page=0 chnl=0
char id=46 x=362 y=26 width=2 height=2 xoffset=-1 yoffset=19 xadvance=4 page=0 chnl=0
char id=47 x=77 y=2 width=6 height=14 xoffset=-1 yoffset=7 xadvance=8 page=0 chnl=0
char id=48 x=303 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=49 x=395 y=2 width=6 height=12 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=0
char id=50 x=385 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=51 x=375 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=52 x=363 y=2 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=53 x=353 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=54 x=343 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=55 x=333 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=56 x=323 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=57 x=313 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=58 x=221 y=2 width=2 height=12 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=59 x=33 y=2 width=2 height=14 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=60 x=112 y=26 width=10 height=10 xoffset=-1 yoffset=11 xadvance=12 page=0 chnl=0
char id=61 x=304 y=26 width=6 height=6 xoffset=-1 yoffset=13 xadvance=8 page=0 chnl=0
char id=62 x=98 y=26 width=12 height=10 xoffset=-1 yoffset=11 xadvance=14 page=0 chnl=0
char id=63 x=267 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=64 x=85 y=2 width=14 height=14 xoffset=-1 yoffset=7 xadvance=16 page=0 chnl=0
char id=65 x=109 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=66 x=119 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=67 x=143 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=68 x=153 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=69 x=163 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=70 x=173 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=71 x=183 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=72 x=193 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=73 x=203 y=2 width=6 height=12 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=0
char id=74 x=211 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=75 x=225 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=76 x=235 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=77 x=245 y=2 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=78 x=257 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=79 x=277 y=2 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=80 x=293 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=81 x=21 y=2 width=10 height=14 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=82 x=403 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=83 x=423 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=84 x=433 y=2 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=85 x=445 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=86 x=455 y=2 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=87 x=473 y=2 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=88 x=485 y=2 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=89 x=10 y=26 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=90 x=22 y=26 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=91 x=49 y=2 width=4 height=14 xoffset=-1 yoffset=7 xadvance=6 page=0 chnl=0
char id=92 x=101 y=2 width=6 height=14 xoffset=-1 yoffset=7 xadvance=8 page=0 chnl=0
char id=93 x=55 y=2 width=4 height=14 xoffset=-1 yoffset=7 xadvance=6 page=0 chnl=0
char id=94 x=324 y=26 width=6 height=4 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=0
char id=95 x=352 y=26 width=8 height=2 xoffset=-1 yoffset=19 xadvance=10 page=0 chnl=0
char id=96 x=348 y=26 width=2 height=4 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=97 x=250 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=98 x=32 y=26 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=99 x=270 y=26 width=6 height=8 xoffset=-1 yoffset=13 xadvance=8 page=0 chnl=0
char id=100 x=56 y=26 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=101 x=148 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=102 x=90 y=26 width=6 height=12 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=0
char id=103 x=80 y=26 width=8 height=12 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=104 x=70 y=26 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=105 x=66 y=26 width=2 height=12 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=106 x=13 y=2 width=6 height=16 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=0
char id=107 x=46 y=26 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=108 x=42 y=26 width=2 height=12 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=109 x=158 y=26 width=10 height=8 xoffset=-1 yoffset=13 xadvance=12 page=0 chnl=0
char id=110 x=170 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=111 x=180 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=112 x=0 y=26 width=8 height=12 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=113 x=497 y=2 width=8 height=12 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=114 x=190 y=26 width=6 height=8 xoffset=-1 yoffset=13 xadvance=8 page=0 chnl=0
char id=115 x=198 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=116 x=467 y=2 width=4 height=12 xoffset=-1 yoffset=9 xadvance=6 page=0 chnl=0
char id=117 x=208 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=118 x=218 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=119 x=228 y=26 width=10 height=8 xoffset=-1 yoffset=13 xadvance=12 page=0 chnl=0
char id=120 x=240 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=121 x=413 y=2 width=8 height=12 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=122 x=260 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=123 x=61 y=2 width=6 height=14 xoffset=-1 yoffset=7 xadvance=8 page=0 chnl=0
char id=124 x=139 y=2 width=2 height=12 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=125 x=69 y=2 width=6 height=14 xoffset=-1 yoffset=7 xadvance=8 page=0 chnl=0
char id=126 x=312 y=26 width=10 height=6 xoffset=-1 yoffset=13 xadvance=12 page=0 chnl=0
char id=160 x=0 y=0 width=0 height=0 xoffset=-1 yoffset=21 xadvance=10 page=0 chnl=0
kernings count=0

View File

@@ -1,102 +0,0 @@
info face="MiKrollFantasy(2)" size=12 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=2 padding=1,1,1,1 spacing=0,0
common lineHeight=14 base=10 scaleW=506 scaleH=18 pages=1 packed=0 alphaChnl=0 redChnl=0 greenChnl=0 blueChnl=0
page id=0 file="MiKrollFantasy(2).png"
chars count=97
char id=0 x=2 y=2 width=5 height=11 xoffset=-1 yoffset=-1 xadvance=6 page=0 chnl=0
char id=32 x=0 y=0 width=0 height=0 xoffset=-1 yoffset=-1 xadvance=5 page=0 chnl=0
char id=33 x=178 y=2 width=1 height=6 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=34 x=5 y=15 width=3 height=2 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
char id=35 x=384 y=2 width=5 height=5 xoffset=-1 yoffset=5 xadvance=6 page=0 chnl=0
char id=36 x=81 y=2 width=4 height=6 xoffset=-1 yoffset=5 xadvance=5 page=0 chnl=0
char id=37 x=476 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=38 x=391 y=2 width=5 height=5 xoffset=-1 yoffset=5 xadvance=6 page=0 chnl=0
char id=39 x=10 y=15 width=1 height=2 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=40 x=24 y=2 width=2 height=7 xoffset=-1 yoffset=3 xadvance=3 page=0 chnl=0
char id=41 x=28 y=2 width=2 height=7 xoffset=-1 yoffset=3 xadvance=3 page=0 chnl=0
char id=42 x=482 y=2 width=3 height=3 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
char id=43 x=487 y=2 width=3 height=3 xoffset=-1 yoffset=6 xadvance=4 page=0 chnl=0
char id=44 x=504 y=2 width=1 height=2 xoffset=-1 yoffset=9 xadvance=2 page=0 chnl=0
char id=45 x=25 y=15 width=2 height=1 xoffset=-1 yoffset=7 xadvance=3 page=0 chnl=0
char id=46 x=22 y=15 width=1 height=1 xoffset=-1 yoffset=9 xadvance=2 page=0 chnl=0
char id=47 x=50 y=2 width=3 height=7 xoffset=-1 yoffset=3 xadvance=4 page=0 chnl=0
char id=48 x=187 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=49 x=242 y=2 width=3 height=6 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
char id=50 x=236 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=51 x=230 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=52 x=223 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=53 x=217 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=54 x=211 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=55 x=205 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=56 x=199 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=57 x=193 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=58 x=137 y=2 width=1 height=6 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=59 x=21 y=2 width=1 height=7 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=60 x=377 y=2 width=5 height=5 xoffset=-1 yoffset=5 xadvance=6 page=0 chnl=0
char id=61 x=492 y=2 width=3 height=3 xoffset=-1 yoffset=6 xadvance=4 page=0 chnl=0
char id=62 x=369 y=2 width=6 height=5 xoffset=-1 yoffset=5 xadvance=7 page=0 chnl=0
char id=63 x=165 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=64 x=55 y=2 width=7 height=7 xoffset=-1 yoffset=3 xadvance=8 page=0 chnl=0
char id=65 x=69 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=66 x=75 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=67 x=90 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=68 x=96 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=69 x=102 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=70 x=108 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=71 x=114 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=72 x=120 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=73 x=126 y=2 width=3 height=6 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
char id=74 x=131 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=75 x=140 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=76 x=146 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=77 x=152 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=78 x=159 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=79 x=171 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=80 x=181 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=81 x=14 y=2 width=5 height=7 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=82 x=247 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=83 x=259 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=84 x=265 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=85 x=272 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=86 x=278 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=87 x=289 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=88 x=296 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=89 x=315 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=90 x=322 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=91 x=32 y=2 width=2 height=7 xoffset=-1 yoffset=3 xadvance=3 page=0 chnl=0
char id=92 x=64 y=2 width=3 height=7 xoffset=-1 yoffset=3 xadvance=4 page=0 chnl=0
char id=93 x=36 y=2 width=2 height=7 xoffset=-1 yoffset=3 xadvance=3 page=0 chnl=0
char id=94 x=0 y=15 width=3 height=2 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
char id=95 x=16 y=15 width=4 height=1 xoffset=-1 yoffset=9 xadvance=5 page=0 chnl=0
char id=96 x=13 y=15 width=1 height=2 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=97 x=459 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=98 x=328 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=99 x=471 y=2 width=3 height=4 xoffset=-1 yoffset=6 xadvance=4 page=0 chnl=0
char id=100 x=343 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=101 x=398 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=102 x=364 y=2 width=3 height=6 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
char id=103 x=358 y=2 width=4 height=6 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=104 x=352 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=105 x=349 y=2 width=1 height=6 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=106 x=9 y=2 width=3 height=8 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
char id=107 x=337 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=108 x=334 y=2 width=1 height=6 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=109 x=404 y=2 width=5 height=4 xoffset=-1 yoffset=6 xadvance=6 page=0 chnl=0
char id=110 x=411 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=111 x=417 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=112 x=309 y=2 width=4 height=6 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=113 x=303 y=2 width=4 height=6 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=114 x=423 y=2 width=3 height=4 xoffset=-1 yoffset=6 xadvance=4 page=0 chnl=0
char id=115 x=428 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=116 x=285 y=2 width=2 height=6 xoffset=-1 yoffset=4 xadvance=3 page=0 chnl=0
char id=117 x=434 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=118 x=440 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=119 x=446 y=2 width=5 height=4 xoffset=-1 yoffset=6 xadvance=6 page=0 chnl=0
char id=120 x=453 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=121 x=253 y=2 width=4 height=6 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=122 x=465 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=123 x=40 y=2 width=3 height=7 xoffset=-1 yoffset=3 xadvance=4 page=0 chnl=0
char id=124 x=87 y=2 width=1 height=6 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=125 x=45 y=2 width=3 height=7 xoffset=-1 yoffset=3 xadvance=4 page=0 chnl=0
char id=126 x=497 y=2 width=5 height=3 xoffset=-1 yoffset=6 xadvance=6 page=0 chnl=0
char id=160 x=0 y=0 width=0 height=0 xoffset=-1 yoffset=10 xadvance=5 page=0 chnl=0
kernings count=0

View File

@@ -1,102 +0,0 @@
info face="MiKrollFantasy(3)" size=12 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=2 padding=1,1,1,1 spacing=0,0
common lineHeight=28 base=21 scaleW=506 scaleH=39 pages=1 packed=0 alphaChnl=0 redChnl=0 greenChnl=0 blueChnl=0
page id=0 file="MiKrollFantasy(3).png"
chars count=97
char id=0 x=2 y=2 width=9 height=22 xoffset=0 yoffset=-1 xadvance=12 page=0 chnl=0
char id=32 x=0 y=0 width=0 height=0 xoffset=-1 yoffset=-1 xadvance=10 page=0 chnl=0
char id=33 x=289 y=2 width=2 height=12 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=34 x=332 y=26 width=6 height=4 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=0
char id=35 x=124 y=26 width=10 height=10 xoffset=-1 yoffset=11 xadvance=12 page=0 chnl=0
char id=36 x=129 y=2 width=8 height=12 xoffset=-1 yoffset=11 xadvance=10 page=0 chnl=0
char id=37 x=278 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=38 x=136 y=26 width=10 height=10 xoffset=-1 yoffset=11 xadvance=12 page=0 chnl=0
char id=39 x=344 y=26 width=2 height=4 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=40 x=37 y=2 width=4 height=14 xoffset=-1 yoffset=7 xadvance=6 page=0 chnl=0
char id=41 x=43 y=2 width=4 height=14 xoffset=-1 yoffset=7 xadvance=6 page=0 chnl=0
char id=42 x=288 y=26 width=6 height=6 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=0
char id=43 x=296 y=26 width=6 height=6 xoffset=-1 yoffset=13 xadvance=8 page=0 chnl=0
char id=44 x=340 y=26 width=2 height=4 xoffset=-1 yoffset=19 xadvance=4 page=0 chnl=0
char id=45 x=366 y=26 width=4 height=2 xoffset=-1 yoffset=15 xadvance=6 page=0 chnl=0
char id=46 x=362 y=26 width=2 height=2 xoffset=-1 yoffset=19 xadvance=4 page=0 chnl=0
char id=47 x=77 y=2 width=6 height=14 xoffset=-1 yoffset=7 xadvance=8 page=0 chnl=0
char id=48 x=303 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=49 x=395 y=2 width=6 height=12 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=0
char id=50 x=385 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=51 x=375 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=52 x=363 y=2 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=53 x=353 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=54 x=343 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=55 x=333 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=56 x=323 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=57 x=313 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=58 x=221 y=2 width=2 height=12 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=59 x=33 y=2 width=2 height=14 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=60 x=112 y=26 width=10 height=10 xoffset=-1 yoffset=11 xadvance=12 page=0 chnl=0
char id=61 x=304 y=26 width=6 height=6 xoffset=-1 yoffset=13 xadvance=8 page=0 chnl=0
char id=62 x=98 y=26 width=12 height=10 xoffset=-1 yoffset=11 xadvance=14 page=0 chnl=0
char id=63 x=267 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=64 x=85 y=2 width=14 height=14 xoffset=-1 yoffset=7 xadvance=16 page=0 chnl=0
char id=65 x=109 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=66 x=119 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=67 x=143 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=68 x=153 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=69 x=163 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=70 x=173 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=71 x=183 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=72 x=193 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=73 x=203 y=2 width=6 height=12 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=0
char id=74 x=211 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=75 x=225 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=76 x=235 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=77 x=245 y=2 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=78 x=257 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=79 x=277 y=2 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=80 x=293 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=81 x=21 y=2 width=10 height=14 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=82 x=403 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=83 x=423 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=84 x=433 y=2 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=85 x=445 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=86 x=455 y=2 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=87 x=473 y=2 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=88 x=485 y=2 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=89 x=10 y=26 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=90 x=22 y=26 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=91 x=49 y=2 width=4 height=14 xoffset=-1 yoffset=7 xadvance=6 page=0 chnl=0
char id=92 x=101 y=2 width=6 height=14 xoffset=-1 yoffset=7 xadvance=8 page=0 chnl=0
char id=93 x=55 y=2 width=4 height=14 xoffset=-1 yoffset=7 xadvance=6 page=0 chnl=0
char id=94 x=324 y=26 width=6 height=4 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=0
char id=95 x=352 y=26 width=8 height=2 xoffset=-1 yoffset=19 xadvance=10 page=0 chnl=0
char id=96 x=348 y=26 width=2 height=4 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=97 x=250 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=98 x=32 y=26 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=99 x=270 y=26 width=6 height=8 xoffset=-1 yoffset=13 xadvance=8 page=0 chnl=0
char id=100 x=56 y=26 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=101 x=148 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=102 x=90 y=26 width=6 height=12 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=0
char id=103 x=80 y=26 width=8 height=12 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=104 x=70 y=26 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=105 x=66 y=26 width=2 height=12 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=106 x=13 y=2 width=6 height=16 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=0
char id=107 x=46 y=26 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=108 x=42 y=26 width=2 height=12 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=109 x=158 y=26 width=10 height=8 xoffset=-1 yoffset=13 xadvance=12 page=0 chnl=0
char id=110 x=170 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=111 x=180 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=112 x=0 y=26 width=8 height=12 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=113 x=497 y=2 width=8 height=12 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=114 x=190 y=26 width=6 height=8 xoffset=-1 yoffset=13 xadvance=8 page=0 chnl=0
char id=115 x=198 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=116 x=467 y=2 width=4 height=12 xoffset=-1 yoffset=9 xadvance=6 page=0 chnl=0
char id=117 x=208 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=118 x=218 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=119 x=228 y=26 width=10 height=8 xoffset=-1 yoffset=13 xadvance=12 page=0 chnl=0
char id=120 x=240 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=121 x=413 y=2 width=8 height=12 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=122 x=260 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=123 x=61 y=2 width=6 height=14 xoffset=-1 yoffset=7 xadvance=8 page=0 chnl=0
char id=124 x=139 y=2 width=2 height=12 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=125 x=69 y=2 width=6 height=14 xoffset=-1 yoffset=7 xadvance=8 page=0 chnl=0
char id=126 x=312 y=26 width=10 height=6 xoffset=-1 yoffset=13 xadvance=12 page=0 chnl=0
char id=160 x=0 y=0 width=0 height=0 xoffset=-1 yoffset=21 xadvance=10 page=0 chnl=0
kernings count=0

View File

@@ -1,102 +0,0 @@
info face="MiKrollFantasy" size=12 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=2 padding=1,1,1,1 spacing=0,0
common lineHeight=14 base=10 scaleW=506 scaleH=18 pages=1 packed=0 alphaChnl=0 redChnl=0 greenChnl=0 blueChnl=0
page id=0 file="MiKrollFantasy.png"
chars count=97
char id=0 x=2 y=2 width=5 height=11 xoffset=-1 yoffset=-1 xadvance=6 page=0 chnl=0
char id=32 x=0 y=0 width=0 height=0 xoffset=-1 yoffset=-1 xadvance=5 page=0 chnl=0
char id=33 x=178 y=2 width=1 height=6 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=34 x=5 y=15 width=3 height=2 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
char id=35 x=384 y=2 width=5 height=5 xoffset=-1 yoffset=5 xadvance=6 page=0 chnl=0
char id=36 x=81 y=2 width=4 height=6 xoffset=-1 yoffset=5 xadvance=5 page=0 chnl=0
char id=37 x=476 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=38 x=391 y=2 width=5 height=5 xoffset=-1 yoffset=5 xadvance=6 page=0 chnl=0
char id=39 x=10 y=15 width=1 height=2 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=40 x=24 y=2 width=2 height=7 xoffset=-1 yoffset=3 xadvance=3 page=0 chnl=0
char id=41 x=28 y=2 width=2 height=7 xoffset=-1 yoffset=3 xadvance=3 page=0 chnl=0
char id=42 x=482 y=2 width=3 height=3 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
char id=43 x=487 y=2 width=3 height=3 xoffset=-1 yoffset=6 xadvance=4 page=0 chnl=0
char id=44 x=504 y=2 width=1 height=2 xoffset=-1 yoffset=9 xadvance=2 page=0 chnl=0
char id=45 x=25 y=15 width=2 height=1 xoffset=-1 yoffset=7 xadvance=3 page=0 chnl=0
char id=46 x=22 y=15 width=1 height=1 xoffset=-1 yoffset=9 xadvance=2 page=0 chnl=0
char id=47 x=50 y=2 width=3 height=7 xoffset=-1 yoffset=3 xadvance=4 page=0 chnl=0
char id=48 x=187 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=49 x=242 y=2 width=3 height=6 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
char id=50 x=236 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=51 x=230 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=52 x=223 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=53 x=217 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=54 x=211 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=55 x=205 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=56 x=199 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=57 x=193 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=58 x=137 y=2 width=1 height=6 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=59 x=21 y=2 width=1 height=7 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=60 x=377 y=2 width=5 height=5 xoffset=-1 yoffset=5 xadvance=6 page=0 chnl=0
char id=61 x=492 y=2 width=3 height=3 xoffset=-1 yoffset=6 xadvance=4 page=0 chnl=0
char id=62 x=369 y=2 width=6 height=5 xoffset=-1 yoffset=5 xadvance=7 page=0 chnl=0
char id=63 x=165 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=64 x=55 y=2 width=7 height=7 xoffset=-1 yoffset=3 xadvance=8 page=0 chnl=0
char id=65 x=69 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=66 x=75 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=67 x=90 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=68 x=96 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=69 x=102 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=70 x=108 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=71 x=114 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=72 x=120 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=73 x=126 y=2 width=3 height=6 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
char id=74 x=131 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=75 x=140 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=76 x=146 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=77 x=152 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=78 x=159 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=79 x=171 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=80 x=181 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=81 x=14 y=2 width=5 height=7 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=82 x=247 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=83 x=259 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=84 x=265 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=85 x=272 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=86 x=278 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=87 x=289 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=88 x=296 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=89 x=315 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=90 x=322 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=91 x=32 y=2 width=2 height=7 xoffset=-1 yoffset=3 xadvance=3 page=0 chnl=0
char id=92 x=64 y=2 width=3 height=7 xoffset=-1 yoffset=3 xadvance=4 page=0 chnl=0
char id=93 x=36 y=2 width=2 height=7 xoffset=-1 yoffset=3 xadvance=3 page=0 chnl=0
char id=94 x=0 y=15 width=3 height=2 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
char id=95 x=16 y=15 width=4 height=1 xoffset=-1 yoffset=9 xadvance=5 page=0 chnl=0
char id=96 x=13 y=15 width=1 height=2 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=97 x=459 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=98 x=328 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=99 x=471 y=2 width=3 height=4 xoffset=-1 yoffset=6 xadvance=4 page=0 chnl=0
char id=100 x=343 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=101 x=398 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=102 x=364 y=2 width=3 height=6 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
char id=103 x=358 y=2 width=4 height=6 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=104 x=352 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=105 x=349 y=2 width=1 height=6 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=106 x=9 y=2 width=3 height=8 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
char id=107 x=337 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=108 x=334 y=2 width=1 height=6 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=109 x=404 y=2 width=5 height=4 xoffset=-1 yoffset=6 xadvance=6 page=0 chnl=0
char id=110 x=411 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=111 x=417 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=112 x=309 y=2 width=4 height=6 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=113 x=303 y=2 width=4 height=6 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=114 x=423 y=2 width=3 height=4 xoffset=-1 yoffset=6 xadvance=4 page=0 chnl=0
char id=115 x=428 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=116 x=285 y=2 width=2 height=6 xoffset=-1 yoffset=4 xadvance=3 page=0 chnl=0
char id=117 x=434 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=118 x=440 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=119 x=446 y=2 width=5 height=4 xoffset=-1 yoffset=6 xadvance=6 page=0 chnl=0
char id=120 x=453 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=121 x=253 y=2 width=4 height=6 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=122 x=465 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=123 x=40 y=2 width=3 height=7 xoffset=-1 yoffset=3 xadvance=4 page=0 chnl=0
char id=124 x=87 y=2 width=1 height=6 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=125 x=45 y=2 width=3 height=7 xoffset=-1 yoffset=3 xadvance=4 page=0 chnl=0
char id=126 x=497 y=2 width=5 height=3 xoffset=-1 yoffset=6 xadvance=6 page=0 chnl=0
char id=160 x=0 y=0 width=0 height=0 xoffset=-1 yoffset=10 xadvance=5 page=0 chnl=0
kernings count=0

View File

@@ -1,102 +0,0 @@
info face="MiKrollFantasyBig" size=12 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=2 padding=1,1,1,1 spacing=0,0
common lineHeight=28 base=21 scaleW=506 scaleH=39 pages=1 packed=0 alphaChnl=0 redChnl=0 greenChnl=0 blueChnl=0
page id=0 file="MiKrollFantasyBig.png"
chars count=97
char id=0 x=2 y=2 width=9 height=22 xoffset=0 yoffset=-1 xadvance=12 page=0 chnl=0
char id=32 x=0 y=0 width=0 height=0 xoffset=-1 yoffset=-1 xadvance=10 page=0 chnl=0
char id=33 x=289 y=2 width=2 height=12 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=34 x=332 y=26 width=6 height=4 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=0
char id=35 x=124 y=26 width=10 height=10 xoffset=-1 yoffset=11 xadvance=12 page=0 chnl=0
char id=36 x=129 y=2 width=8 height=12 xoffset=-1 yoffset=11 xadvance=10 page=0 chnl=0
char id=37 x=278 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=38 x=136 y=26 width=10 height=10 xoffset=-1 yoffset=11 xadvance=12 page=0 chnl=0
char id=39 x=344 y=26 width=2 height=4 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=40 x=37 y=2 width=4 height=14 xoffset=-1 yoffset=7 xadvance=6 page=0 chnl=0
char id=41 x=43 y=2 width=4 height=14 xoffset=-1 yoffset=7 xadvance=6 page=0 chnl=0
char id=42 x=288 y=26 width=6 height=6 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=0
char id=43 x=296 y=26 width=6 height=6 xoffset=-1 yoffset=13 xadvance=8 page=0 chnl=0
char id=44 x=340 y=26 width=2 height=4 xoffset=-1 yoffset=19 xadvance=4 page=0 chnl=0
char id=45 x=366 y=26 width=4 height=2 xoffset=-1 yoffset=15 xadvance=6 page=0 chnl=0
char id=46 x=362 y=26 width=2 height=2 xoffset=-1 yoffset=19 xadvance=4 page=0 chnl=0
char id=47 x=77 y=2 width=6 height=14 xoffset=-1 yoffset=7 xadvance=8 page=0 chnl=0
char id=48 x=303 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=49 x=395 y=2 width=6 height=12 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=0
char id=50 x=385 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=51 x=375 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=52 x=363 y=2 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=53 x=353 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=54 x=343 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=55 x=333 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=56 x=323 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=57 x=313 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=58 x=221 y=2 width=2 height=12 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=59 x=33 y=2 width=2 height=14 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=60 x=112 y=26 width=10 height=10 xoffset=-1 yoffset=11 xadvance=12 page=0 chnl=0
char id=61 x=304 y=26 width=6 height=6 xoffset=-1 yoffset=13 xadvance=8 page=0 chnl=0
char id=62 x=98 y=26 width=12 height=10 xoffset=-1 yoffset=11 xadvance=14 page=0 chnl=0
char id=63 x=267 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=64 x=85 y=2 width=14 height=14 xoffset=-1 yoffset=7 xadvance=16 page=0 chnl=0
char id=65 x=109 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=66 x=119 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=67 x=143 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=68 x=153 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=69 x=163 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=70 x=173 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=71 x=183 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=72 x=193 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=73 x=203 y=2 width=6 height=12 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=0
char id=74 x=211 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=75 x=225 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=76 x=235 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=77 x=245 y=2 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=78 x=257 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=79 x=277 y=2 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=80 x=293 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=81 x=21 y=2 width=10 height=14 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=82 x=403 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=83 x=423 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=84 x=433 y=2 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=85 x=445 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=86 x=455 y=2 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=87 x=473 y=2 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=88 x=485 y=2 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=89 x=10 y=26 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=90 x=22 y=26 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=91 x=49 y=2 width=4 height=14 xoffset=-1 yoffset=7 xadvance=6 page=0 chnl=0
char id=92 x=101 y=2 width=6 height=14 xoffset=-1 yoffset=7 xadvance=8 page=0 chnl=0
char id=93 x=55 y=2 width=4 height=14 xoffset=-1 yoffset=7 xadvance=6 page=0 chnl=0
char id=94 x=324 y=26 width=6 height=4 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=0
char id=95 x=352 y=26 width=8 height=2 xoffset=-1 yoffset=19 xadvance=10 page=0 chnl=0
char id=96 x=348 y=26 width=2 height=4 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=97 x=250 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=98 x=32 y=26 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=99 x=270 y=26 width=6 height=8 xoffset=-1 yoffset=13 xadvance=8 page=0 chnl=0
char id=100 x=56 y=26 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=101 x=148 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=102 x=90 y=26 width=6 height=12 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=0
char id=103 x=80 y=26 width=8 height=12 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=104 x=70 y=26 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=105 x=66 y=26 width=2 height=12 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=106 x=13 y=2 width=6 height=16 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=0
char id=107 x=46 y=26 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=108 x=42 y=26 width=2 height=12 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=109 x=158 y=26 width=10 height=8 xoffset=-1 yoffset=13 xadvance=12 page=0 chnl=0
char id=110 x=170 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=111 x=180 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=112 x=0 y=26 width=8 height=12 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=113 x=497 y=2 width=8 height=12 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=114 x=190 y=26 width=6 height=8 xoffset=-1 yoffset=13 xadvance=8 page=0 chnl=0
char id=115 x=198 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=116 x=467 y=2 width=4 height=12 xoffset=-1 yoffset=9 xadvance=6 page=0 chnl=0
char id=117 x=208 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=118 x=218 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=119 x=228 y=26 width=10 height=8 xoffset=-1 yoffset=13 xadvance=12 page=0 chnl=0
char id=120 x=240 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=121 x=413 y=2 width=8 height=12 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=122 x=260 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=123 x=61 y=2 width=6 height=14 xoffset=-1 yoffset=7 xadvance=8 page=0 chnl=0
char id=124 x=139 y=2 width=2 height=12 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=125 x=69 y=2 width=6 height=14 xoffset=-1 yoffset=7 xadvance=8 page=0 chnl=0
char id=126 x=312 y=26 width=10 height=6 xoffset=-1 yoffset=13 xadvance=12 page=0 chnl=0
char id=160 x=0 y=0 width=0 height=0 xoffset=-1 yoffset=21 xadvance=10 page=0 chnl=0
kernings count=0

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

View File

@@ -1,18 +1,4 @@
{
"com.badlogic.gdx.graphics.g2d.BitmapFont": {
"big": {
"file": "LanaPixelCJK.fnt"
},
"black": {
"file": "LanaPixelCJK.fnt"
},
"blackbig": {
"file": "LanaPixelCJK.fnt"
},
"default": {
"file": "LanaPixelCJK.fnt"
}
},
"com.badlogic.gdx.graphics.Color": {
"RGBA_0_0_0_255": {
"r": 0,
@@ -267,7 +253,7 @@
"default": {
"checkboxOn": "check",
"checkboxOff": "uncheck",
"font": "black"
"font": "default"
}
},
"com.badlogic.gdx.scenes.scene2d.ui.ImageButton$ImageButtonStyle": {
@@ -292,22 +278,22 @@
},
"com.badlogic.gdx.scenes.scene2d.ui.ImageTextButton$ImageTextButtonStyle": {
"default": {
"font": "blackbig"
"font": "default"
}
},
"com.badlogic.gdx.scenes.scene2d.ui.Label$LabelStyle": {
"default": {
"font": "black"
"font": "default"
},
"big": {
"parent": "default",
"font": "blackbig"
"font": "default"
},
"white": {
"font": "default"
},
"whiteBig": {
"font": "big"
"font": "default"
}
},
"com.badlogic.gdx.scenes.scene2d.ui.List$ListStyle": {
@@ -344,6 +330,8 @@
"default": {
"font": "default",
"fontColor": "RGBA_0_0_0_255",
"overFontColor": "RGBA_0_216_255_255",
"disabledFontColor": "RGBA_255_255_255_255",
"scrollStyle": "default",
"listStyle": "default"
}
@@ -371,11 +359,18 @@
"parent": "default",
"font": "default",
"fontColor": "RGBA_255_255_255_255",
"downFontColor": "RGBA_255_255_255_255",
"overFontColor": "RGBA_255_255_255_255",
"focusedFontColor": "RGBA_255_255_255_255",
"disabledFontColor": "RGBA_255_255_255_255",
"checkedFontColor": "RGBA_255_255_255_255",
"checkedDownFontColor": "RGBA_255_255_255_255",
"checkedOverFontColor": "RGBA_255_255_255_255",
"checkedFocusedFontColor": "RGBA_255_255_255_255",
"pressedOffsetY": -2
},
"gold": {
"parent": "default",
"font": "default",
"up": "BKey_3_9",
"down": "BKey_3_14",
"over": "BKey_3_9",
@@ -395,6 +390,11 @@
"selection": "select"
}
},
"com.badlogic.gdx.scenes.scene2d.ui.TextTooltip$TextTooltipStyle": {
"default": {
"label": "default"
}
},
"com.badlogic.gdx.scenes.scene2d.ui.Touchpad$TouchpadStyle": {
"default": {
"background": "thinwindow",
@@ -410,16 +410,17 @@
"com.badlogic.gdx.scenes.scene2d.ui.Window$WindowStyle": {
"default": {
"background": "windowMain10Patch",
"titleFont": "black"
"titleFont": "default",
"titleFontColor": "RGBA_255_255_255_255"
},
"paper": {
"parent": "default",
"background": "paper10Patch",
"titleFont": "blackbig"
"titleFont": "default"
},
"gold": {
"background": "TenPatchGold",
"titleFont": "big"
"titleFont": "default"
}
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

View File

@@ -12,37 +12,37 @@
{
"type": "Scroll",
"name": "deckSlots",
"x": 10,
"y": 10,
"width": 344,
"x": 15,
"y": 18,
"width": 330,
"height": 235
},
{
"type": "TextButton",
"name": "return",
"text": "Back",
"width": 96,
"height": 16,
"x": 15,
"y": 250
"width": 100,
"height": 30,
"x": 365,
"y": 60
},
{
"type": "TextButton",
"name": "rename",
"text": "Rename Deck",
"width": 96,
"height": 16,
"x": 115,
"y": 250
"width": 100,
"height": 30,
"x": 365,
"y": 120
},
{
"type": "TextButton",
"name": "edit",
"text": "Edit Deck",
"width": 96,
"height": 16,
"x": 215,
"y": 250
"width": 100,
"height": 30,
"x": 365,
"y": 180
}
]
}

View File

@@ -1,48 +1,48 @@
{
"width": 480,
"height": 270,
"width": 270,
"height": 480,
"yDown": true,
"elements": [
{
"type": "Image",
"image": "ui/title_bg.png",
"width": 480,
"height": 270
"image": "ui/title_bg_portrait.png",
"width": 270,
"height": 480
},
{
"type": "Scroll",
"name": "deckSlots",
"x": 15,
"y": 18,
"width": 330,
"height": 235
"x": 4,
"y": 4,
"width": 262,
"height": 442
},
{
"type": "TextButton",
"name": "return",
"text": "Back",
"width": 100,
"width": 86,
"height": 30,
"x": 365,
"y": 60
"x": 4,
"y": 448
},
{
"type": "TextButton",
"name": "rename",
"text": "Rename Deck",
"width": 100,
"width": 86,
"height": 30,
"x": 365,
"y": 120
"x": 92,
"y": 448
},
{
"type": "TextButton",
"name": "edit",
"text": "Edit Deck",
"width": 100,
"width": 86,
"height": 30,
"x": 365,
"y": 180
"x": 180,
"y": 448
}
]
}

View File

@@ -7,44 +7,53 @@
"type": "Image",
"name": "gamehud",
"width": 64,
"height": 206,
"height": 270,
"image": "ui/hud.png",
"x": 416,
"y": 64
"y": 0
},
{
"type": "Image",
"name": "map",
"width": 64,
"height": 64,
"x": 416,
"width": 80,
"height": 80,
"x": 0,
"y": 0
},
{
"type": "Image",
"name": "mapborder",
"image": "ui/minimap.png",
"width": 64,
"height": 64,
"x": 416,
"width": 80,
"height": 80,
"x": 0,
"y": 0
},
{
"type": "Image",
"name": "blank",
"image": "ui/blank.png",
"width": 46,
"height": 46,
"x": 425,
"y": 10
},
{
"type": "Image",
"name": "avatar",
"width": 32,
"height": 32,
"x": 432,
"y": 80
"width": 46,
"height": 46,
"x": 425,
"y": 10
},
{
"type": "Image",
"name": "avatarborder",
"image": "ui/avatarhud.png",
"width": 32,
"height": 32,
"x": 432,
"y": 80
"width": 46,
"height": 46,
"x": 425,
"y": 10
},
{
"type": "Label",
@@ -52,8 +61,8 @@
"font": "default",
"width": 64,
"height": 16,
"x": 448,
"y": 128
"x": 442,
"y": 64
},
{
"type": "Label",
@@ -61,44 +70,45 @@
"font": "default",
"width": 64,
"height": 16,
"x": 448,
"y": 144
"x": 442,
"y": 82
},
{
"type": "TextButton",
"name": "deck",
"text": "Deck",
"width": 32,
"height": 18,
"x": 432,
"y": 176
},
"width": 40,
"height": 36,
"x": 428,
"y": 106
},
{
"type": "TextButton",
"name": "inventory",
"text": "Inventory",
"width": 32,
"height": 18,
"x": 432,
"y": 198
"width": 40,
"height": 36,
"x": 428,
"y": 146
},
{
"type": "TextButton",
"name": "statistic",
"text": "Status",
"width": 32,
"height": 18,
"x": 432,
"y": 220
"width": 40,
"height": 36,
"x": 428,
"y": 186
},
{
"type": "TextButton",
"name": "menu",
"text": "Menu",
"width": 32,
"height": 18,
"x": 432,
"y": 242
"width": 40,
"height": 36,
"x": 428,
"y": 226
}
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

View File

@@ -1,15 +1,15 @@
{
"width": 480,
"height": 270,
"width": 270,
"height": 480,
"yDown": true,
"elements": [
{
"type": "Image",
"name": "gamehud",
"width": 64,
"height": 270,
"image": "ui/hud_mobile.png",
"x": 416,
"height": 104,
"image": "ui/hud_portrait.png",
"x": 206,
"y": 0
},
{
@@ -35,7 +35,7 @@
"image": "ui/blank.png",
"width": 46,
"height": 46,
"x": 425,
"x": 215,
"y": 10
},
{
@@ -43,7 +43,7 @@
"name": "avatar",
"width": 46,
"height": 46,
"x": 425,
"x": 215,
"y": 10
},
{
@@ -52,43 +52,44 @@
"image": "ui/avatarhud.png",
"width": 46,
"height": 46,
"x": 425,
"x": 215,
"y": 10
},
{
"type": "Label",
"name": "lifePoints",
"font": "default",
"width": 64,
"height": 16,
"x": 442,
"name": "lifePoints",
"width": 48,
"height": 16,
"fontSize": 1,
"x": 234,
"y": 64
},
{
"type": "Label",
"name": "money",
"font": "default",
"width": 64,
"height": 16,
"x": 442,
"y": 82
"width": 48,
"height": 3,
"fontSize": 1,
"x": 234,
"y": 85
},
{
"type": "TextButton",
"name": "deck",
"text": "Deck",
"width": 40,
"height": 36,
"x": 428,
"width": 64,
"height": 32,
"x": 206,
"y": 106
},
{
"type": "TextButton",
"name": "inventory",
"text": "Inventory",
"width": 40,
"height": 36,
"x": 428,
"width": 64,
"height": 32,
"x": 206,
"y": 146
},
@@ -96,18 +97,18 @@
"type": "TextButton",
"name": "statistic",
"text": "Status",
"width": 40,
"height": 36,
"x": 428,
"width": 64,
"height": 32,
"x": 206,
"y": 186
},
{
"type": "TextButton",
"name": "menu",
"text": "Menu",
"width": 40,
"height": 36,
"x": 428,
"width": 64,
"height": 32,
"x": 206,
"y": 226
}
]

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

View File

@@ -5,7 +5,7 @@
"elements": [
{
"type": "Image",
"name": "lastScreen",
"image": "ui/tavern.png",
"width": 480,
"height": 270
},

View File

@@ -0,0 +1,67 @@
{
"width": 270,
"height": 480,
"yDown": true,
"elements": [
{
"type": "Image",
"image": "ui/tavern_portrait.png",
"width": 270,
"height": 480
},
{
"type": "Image",
"name": "healIcon",
"image": "ui/heal.png",
"x": 60,
"y": 85,
"width": 100,
"height": 100
},
{
"type": "TextButton",
"name": "heal",
"text": "Heal",
"width": 100,
"height": 30,
"x": 165,
"y": 105
},
{
"type": "Image",
"name": "sellIcon",
"image": "ui/sell.png",
"x": 60,
"y": 200,
"width": 100,
"height": 100
},
{
"type": "TextButton",
"name": "sell",
"text": "Sell cards",
"width": 100,
"height": 30,
"x": 165,
"y": 220
},
{
"type": "Image",
"name": "leaveIcon",
"image": "ui/leave.png",
"x": 60,
"y": 315,
"width": 100,
"height": 100
},
{
"type": "TextButton",
"name": "done",
"text": "Leave",
"width": 100,
"height": 30,
"x": 165,
"y": 335
}
]
}

View File

@@ -0,0 +1,115 @@
{
"width": 270,
"height": 480,
"yDown": true,
"elements": [
{
"type": "Image",
"image": "ui/title_bg_portrait.png",
"width": 270,
"height": 480
}, {
"type": "Image",
"image": "ui/equipment.png",
"x": 8,
"y": 112,
"width": 129,
"height": 243
},
{
"type": "ImageButton",
"name": "Equipment_Neck",
"style": "item_frame",
"width": 20,
"height": 20,
"x": 62,
"y": 144
} ,
{
"type": "ImageButton",
"name": "Equipment_Body",
"style": "item_frame",
"width": 20,
"height": 20,
"x": 62,
"y": 189
} ,
{
"type": "ImageButton",
"name": "Equipment_Boots",
"style": "item_frame",
"width": 20,
"height": 20,
"x": 62,
"y": 324
} ,
{
"type": "ImageButton",
"name": "Equipment_Left",
"style": "item_frame",
"width": 20,
"height": 20,
"x": 17,
"y": 234
} ,
{
"type": "ImageButton",
"name": "Equipment_Right",
"style": "item_frame",
"width": 20,
"height": 20,
"x": 107,
"y": 234
} ,
{
"type": "Scroll",
"name": "inventory",
"x": 145,
"y": 112,
"width": 117,
"height": 243
},
{
"type": "Window",
"x": 8,
"y": 8,
"width": 254,
"height": 98
} ,
{
"type": "Label",
"name": "item_description",
"x": 16,
"y": 16,
"width": 246,
"height": 90
} ,
{
"type": "TextButton",
"name": "delete",
"text": "Delete",
"width": 80,
"height": 30,
"x": 8,
"y": 363
} ,
{
"type": "TextButton",
"name": "equip",
"text": "Equip",
"width": 80,
"height": 30,
"x": 96,
"y": 363
},
{
"type": "TextButton",
"name": "return",
"text": "Back",
"width": 80,
"height": 30,
"x": 184,
"y": 363
}
]
}

View File

@@ -8,13 +8,20 @@
"name": "lastScreen",
"width": 480,
"height": 270
},
{
"type": "Image",
"name": "market_background",
"image": "ui/market.png",
"width": 480,
"height": 270
},
{
"name": "cards",
"x": 5,
"y": 5,
"width": 405,
"height": 260
"height": 265
},
{
"type": "TextButton",

View File

@@ -1,38 +0,0 @@
{
"width": 480,
"height": 270,
"yDown": true,
"elements": [
{
"type": "Image",
"name": "lastScreen",
"width": 480,
"height": 270
},
{
"name": "cards",
"x": 5,
"y": 5,
"width": 405,
"height": 265
},
{
"type": "TextButton",
"name": "done",
"text": "Take all",
"width": 48,
"height": 30,
"x": 420,
"y": 120
} ,
{
"type": "Label",
"name": "gold",
"text": "$",
"width": 48,
"height": 30,
"x": 420,
"y": 160
}
]
}

View File

@@ -0,0 +1,45 @@
{
"width": 270,
"height": 480,
"yDown": true,
"elements": [
{
"type": "Image",
"name": "lastScreen",
"width": 270,
"height": 480
},
{
"type": "Image",
"name": "market_background",
"image": "ui/market_portrait.png",
"width": 270,
"height": 480
},
{
"name": "cards",
"x": 5,
"y": 5,
"width": 260,
"height": 405
},
{
"type": "TextButton",
"name": "done",
"text": "Take all",
"width": 128,
"height": 32,
"x": 140,
"y": 405
} ,
{
"type": "Label",
"name": "gold",
"text": "$",
"width": 128,
"height": 32,
"x": 16,
"y": 405
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 108 KiB

View File

@@ -13,10 +13,10 @@
"type": "Scroll",
"name" : "scroll",
"style": "paper",
"x": 10,
"x": 56,
"y": 10,
"width": 256,
"height": 236
"height": 250
},
{
"type": "Label",
@@ -24,8 +24,9 @@
"text": "Create a Character",
"width": 128,
"height": 32,
"font": "blackbig",
"x": 16,
"fontSize": 1.5,
"fontColor": "0x000000FF",
"x": 104,
"y": 16
},
{
@@ -35,7 +36,7 @@
"width": 128,
"height": 32,
"font" : "black",
"x": 16,
"x": 75,
"y": 58
},
{
@@ -45,7 +46,7 @@
"width": 128,
"height": 32,
"font" : "black",
"x": 16,
"x": 75,
"y": 90
},
{
@@ -55,7 +56,7 @@
"width": 128,
"height": 32,
"font" : "black",
"x": 16,
"x": 75,
"y": 124
},
{
@@ -65,7 +66,7 @@
"width": 128,
"height": 32,
"font" : "black",
"x": 16,
"x": 75,
"y": 154
},
{
@@ -75,7 +76,7 @@
"width": 128,
"height": 32,
"font" : "black",
"x": 16,
"x": 75,
"y": 186
},
{
@@ -85,7 +86,7 @@
"width": 128,
"height": 32,
"font" : "black",
"x": 16,
"x": 75,
"y": 218
},
{
@@ -94,7 +95,7 @@
"style": "leftarrow",
"width": 16,
"height": 16,
"x": 96,
"x": 164,
"y": 64
},
{
@@ -102,7 +103,7 @@
"name": "avatarPreview",
"width": 48,
"height": 48,
"x": 128,
"x": 196,
"y": 48
},
{
@@ -111,15 +112,16 @@
"style": "rightarrow",
"width": 16,
"height": 16,
"x": 192,
"x": 260,
"y": 64
},
{
"type": "TextField",
"name": "nameField",
"align": 1,
"width": 112,
"height": 16,
"x": 96,
"x": 164,
"y": 96
},
{
@@ -127,7 +129,7 @@
"name": "race",
"width": 112,
"height": 16,
"x": 96,
"x": 164,
"y": 128
},
{
@@ -135,7 +137,7 @@
"name": "gender",
"width": 112,
"height": 16,
"x": 96,
"x": 164,
"y": 160
},
{
@@ -143,7 +145,7 @@
"name": "difficulty",
"width": 112,
"height": 16,
"x": 96,
"x": 164,
"y": 192
},
{
@@ -151,26 +153,26 @@
"name": "deck",
"width": 112,
"height": 16,
"x": 96,
"x": 164,
"y": 224
},
{
"type": "TextButton",
"name": "back",
"text": "Back",
"width": 38,
"height": 16,
"x": 352,
"y": 251
"width": 100,
"height": 30,
"x": 348,
"y": 85
},
{
"type": "TextButton",
"name": "start",
"text": "Start",
"width": 38,
"height": 16,
"x": 416,
"y": 251
"width": 100,
"height": 30,
"x": 348,
"y": 155
}
]
}

View File

@@ -1,22 +1,22 @@
{
"width": 480,
"height": 270,
"width": 270,
"height": 480,
"yDown": true,
"elements": [
{
"type": "Image",
"image": "ui/title_bg.png",
"width": 480,
"height": 270
"image": "ui/title_bg_portrait.png",
"width": 270,
"height": 480
},
{
"type": "Scroll",
"name" : "scroll",
"style": "paper",
"x": 56,
"y": 10,
"x": 10,
"y": 60,
"width": 256,
"height": 250
"height": 318
},
{
"type": "Label",
@@ -24,9 +24,10 @@
"text": "Create a Character",
"width": 128,
"height": 32,
"font": "blackbig",
"x": 104,
"y": 16
"fontSize": 1.5,
"fontColor": "0x000000FF",
"x": 16,
"y": 66
},
{
"type": "Label",
@@ -34,9 +35,9 @@
"text": "Avatar:",
"width": 128,
"height": 32,
"font" : "black",
"x": 75,
"y": 58
"fontColor": "0x000000FF",
"x": 16,
"y": 108
},
{
"type": "Label",
@@ -44,9 +45,9 @@
"text": "Name:",
"width": 128,
"height": 32,
"font" : "black",
"x": 75,
"y": 90
"fontColor": "0x000000FF",
"x": 16,
"y": 140
},
{
"type": "Label",
@@ -54,9 +55,9 @@
"text": "Race:",
"width": 128,
"height": 32,
"font" : "black",
"x": 75,
"y": 124
"fontColor": "0x000000FF",
"x": 16,
"y": 174
},
{
"type": "Label",
@@ -64,9 +65,9 @@
"text": "Gender:",
"width": 128,
"height": 32,
"font" : "black",
"x": 75,
"y": 154
"fontColor": "0x000000FF",
"x": 16,
"y": 204
},
{
"type": "Label",
@@ -74,9 +75,9 @@
"text": "Difficulty:",
"width": 128,
"height": 32,
"font" : "black",
"x": 75,
"y": 186
"fontColor": "0x000000FF",
"x": 16,
"y": 236
},
{
"type": "Label",
@@ -85,93 +86,92 @@
"width": 128,
"height": 32,
"font" : "black",
"x": 75,
"y": 218
"x": 16,
"y": 268
},
{
"type": "ImageButton",
"name": "leftAvatar",
"style": "leftarrow",
"width": 16,
"height": 16,
"x": 164,
"y": 64
"width": 32,
"height": 32,
"x": 116,
"y": 114
},
{
"type": "Image",
"name": "avatarPreview",
"width": 48,
"height": 48,
"x": 196,
"y": 48
"x": 156,
"y": 98
},
{
"type": "ImageButton",
"name": "rightAvatar",
"style": "rightarrow",
"width": 16,
"height": 16,
"x": 260,
"y": 64
"width": 28,
"height": 28,
"x": 212,
"y": 114
},
{
"type": "TextField",
"name": "nameField",
"align": 1,
"width": 112,
"height": 16,
"x": 164,
"y": 96
"width": 165,
"height": 28,
"x": 96,
"y": 146
},
{
"type": "Selector",
"name": "race",
"width": 112,
"height": 16,
"x": 164,
"y": 128
"width": 170,
"height": 28,
"x": 96,
"y": 178
},
{
"type": "Selector",
"name": "gender",
"width": 112,
"height": 16,
"x": 164,
"y": 160
"width": 170,
"height": 28,
"x": 96,
"y": 210
},
{
"type": "Selector",
"name": "difficulty",
"width": 112,
"height": 16,
"x": 164,
"y": 192
"width": 170,
"height": 28,
"x": 96,
"y": 242
},
{
"type": "Selector",
"name": "deck",
"width": 112,
"height": 16,
"x": 164,
"y": 224
"width": 170,
"height": 28,
"x": 96,
"y": 274
},
{
"type": "TextButton",
"name": "back",
"text": "Back",
"width": 100,
"height": 30,
"x": 348,
"y": 85
"width": 64,
"height": 28,
"x": 32,
"y": 320
},
{
"type": "TextButton",
"name": "start",
"text": "Start",
"width": 100,
"height": 30,
"x": 348,
"y": 155
"width": 64,
"height": 32,
"x": 165,
"y": 320
}
]
}

View File

@@ -12,44 +12,65 @@
{
"type": "Scroll",
"name": "saveSlots",
"x": 10,
"y": 10,
"width": 344,
"x": 15,
"y": 18,
"width": 332,
"height": 235
},
{
"type": "Image",
"name": "preview",
"x": 300,
"y": 18,
"image": "ui/blank.png",
"width": 96,
"height": 54
},
"height": 54,
"x": 370,
"y": 30
},
{
"type": "Image",
"name" : "preview_border",
"image": "ui/avatarhud.png",
"width": 96,
"height": 54,
"x": 370,
"y": 30
},
{
"type": "Image",
"name": "preview",
"width": 86,
"height": 48,
"x": 376,
"y": 33
},
{
"type": "Label",
"name": "saveDate",
"x": 300,
"y": 120,
"width": 96,
"height": 16
"x": 376,
"y": 85,
"width": 86,
"height": 32
},
{
"type": "TextButton",
"name": "return",
"text": "Back",
"width": 48,
"height": 16,
"x": 15,
"y": 250
"width": 100,
"height": 30,
"x": 368,
"y": 125
},
{
"type": "TextButton",
"name": "save",
"text": "saveLoad",
"width": 48,
"height": 16,
"x": 115,
"y": 250
}
"width": 100,
"height": 30,
"x": 368,
"y": 195
},
{
"type": "Table",
"font": "default"
}
]
}

View File

@@ -1,76 +0,0 @@
{
"width": 480,
"height": 270,
"yDown": true,
"elements": [
{
"type": "Image",
"image": "ui/title_bg.png",
"width": 480,
"height": 270
},
{
"type": "Scroll",
"name": "saveSlots",
"x": 15,
"y": 18,
"width": 332,
"height": 235
},
{
"type": "Image",
"image": "ui/blank.png",
"width": 96,
"height": 54,
"x": 370,
"y": 30
},
{
"type": "Image",
"name" : "preview_border",
"image": "ui/avatarhud.png",
"width": 96,
"height": 54,
"x": 370,
"y": 30
},
{
"type": "Image",
"name": "preview",
"width": 86,
"height": 48,
"x": 376,
"y": 33
},
{
"type": "Label",
"name": "saveDate",
"x": 376,
"y": 85,
"width": 86,
"height": 32
},
{
"type": "TextButton",
"name": "return",
"text": "Back",
"width": 100,
"height": 30,
"x": 368,
"y": 125
},
{
"type": "TextButton",
"name": "save",
"text": "saveLoad",
"width": 100,
"height": 30,
"x": 368,
"y": 195
},
{
"type": "Table",
"font": "default"
}
]
}

View File

@@ -0,0 +1,63 @@
{
"width": 270,
"height": 480,
"yDown": true,
"elements": [
{
"type": "Image",
"image": "ui/title_bg_portrait.png",
"width": 270,
"height": 480
},
{
"type": "Scroll",
"name": "saveSlots",
"x": 10,
"y": 106,
"width": 250,
"height": 330
},
{
"type": "Image",
"image": "ui/blank.png",
"width": 100,
"height": 100,
"x": 168,
"y": 2
},
{
"type": "Image",
"name": "preview",
"x": 170,
"y": 4,
"width": 96,
"height": 96
},
{
"type": "Label",
"name": "saveDate",
"x": 70,
"y": 4,
"width": 96,
"height": 16
},
{
"type": "TextButton",
"name": "return",
"text": "Back",
"width": 120,
"height": 32,
"x": 10,
"y": 440
},
{
"type": "TextButton",
"name": "save",
"text": "saveLoad",
"width": 120,
"height": 32,
"x": 140,
"y": 440
}
]
}

View File

@@ -12,19 +12,19 @@
{
"type": "Scroll",
"name": "settings",
"x": 10,
"y": 10,
"width": 450,
"x": 15,
"y": 18,
"width": 382,
"height": 235
},
{
"type": "TextButton",
"name": "return",
"text": "Back",
"width": 48,
"height": 16,
"x": 15,
"y": 250
"width": 52,
"height": 30,
"x": 415,
"y": 120
}
]
}

View File

@@ -1,30 +0,0 @@
{
"width": 480,
"height": 270,
"yDown": true,
"elements": [
{
"type": "Image",
"image": "ui/title_bg.png",
"width": 480,
"height": 270
},
{
"type": "Scroll",
"name": "settings",
"x": 15,
"y": 18,
"width": 382,
"height": 235
},
{
"type": "TextButton",
"name": "return",
"text": "Back",
"width": 52,
"height": 30,
"x": 415,
"y": 120
}
]
}

View File

@@ -0,0 +1,30 @@
{
"width": 270,
"height": 480,
"yDown": true,
"elements": [
{
"type": "Image",
"image": "ui/title_bg_portrait.png",
"width": 270,
"height": 480
},
{
"type": "Scroll",
"name": "settings",
"x": 10,
"y": 10,
"width": 250,
"height": 420
},
{
"type": "TextButton",
"name": "return",
"text": "Back",
"width": 250,
"height": 32,
"x": 10,
"y": 432
}
]
}

View File

@@ -13,54 +13,72 @@
"type": "TextButton",
"name": "Start",
"text": "New Game",
"width": 120,
"width": 80,
"height": 30,
"x": 20,
"x": 160,
"y": 20
},
{
"type": "TextButton",
"name": "Start+",
"text": "New Game +",
"width": 80,
"height": 30,
"x": 240,
"y": 20
},
{
"type": "TextButton",
"name": "Load",
"text": "Load",
"width": 120,
"width": 160,
"height": 30,
"x": 20,
"x": 160,
"y": 60
},
{
"type": "TextButton",
"name": "Save",
"text": "Save",
"width": 120,
"width": 160,
"height": 30,
"x": 20,
"x": 160,
"y": 100
},
{
"type": "TextButton",
"name": "Resume",
"text": "Resume",
"width": 120,
"width": 160,
"height": 30,
"x": 20,
"x": 160,
"y": 140
},
{
"type": "TextButton",
"name": "Settings",
"text": "Settings",
"width": 120,
"width": 160,
"height": 30,
"x": 20,
"x": 160,
"y": 180
},
{
"type": "TextButton",
"name": "Exit",
"text": "Exit",
"width": 120,
"width": 75,
"height": 30,
"x": 20,
"x": 160,
"y": 220
},
{
"type": "TextButton",
"name": "Switch",
"text": "Classic",
"width": 75,
"height": 30,
"x": 245,
"y": 220
}
]

View File

@@ -1,85 +1,85 @@
{
"width": 480,
"height": 270,
"width": 270,
"height": 480,
"yDown": true,
"elements": [
{
"type": "Image",
"image": "ui/title_bg.png",
"width": 480,
"height": 270
"image": "ui/title_bg_portrait.png",
"width": 270,
"height": 480
},
{
"type": "TextButton",
"name": "Start",
"text": "New Game",
"width": 80,
"height": 30,
"x": 160,
"y": 20
"width": 238,
"height": 48,
"x": 16,
"y": 16
},
{
"type": "TextButton",
"name": "Start+",
"text": "New Game +",
"width": 80,
"height": 30,
"x": 240,
"y": 20
"width": 238,
"height": 48,
"x": 16,
"yOffset": 8
},
{
"type": "TextButton",
"name": "Load",
"text": "Load",
"width": 160,
"height": 30,
"x": 160,
"y": 60
"width": 238,
"height": 48,
"x": 16,
"yOffset": 8
},
{
"type": "TextButton",
"name": "Save",
"text": "Save",
"width": 160,
"height": 30,
"x": 160,
"y": 100
"width": 238,
"height": 48,
"x": 16,
"yOffset": 8
},
{
"type": "TextButton",
"name": "Resume",
"text": "Resume",
"width": 160,
"height": 30,
"x": 160,
"y": 140
"width": 238,
"height": 48,
"x": 16,
"yOffset": 8
},
{
"type": "TextButton",
"name": "Settings",
"text": "Settings",
"width": 160,
"height": 30,
"x": 160,
"y": 180
},
{
"type": "TextButton",
"name": "Exit",
"text": "Exit",
"width": 75,
"height": 30,
"x": 160,
"y": 220
"width": 238,
"height": 48,
"x": 16,
"yOffset": 8
},
{
"type": "TextButton",
"name": "Switch",
"text": "Classic",
"width": 75,
"height": 30,
"x": 245,
"y": 220
"width": 238,
"height": 48,
"x": 16,
"yOffset": 8
},
{
"type": "TextButton",
"name": "Exit",
"text": "Exit",
"width": 238,
"height": 48,
"x": 16,
"yOffset": 8
}
]
}

View File

@@ -0,0 +1,162 @@
{
"width": 270,
"height": 480,
"yDown": true,
"elements": [
{
"type": "Image",
"image": "ui/title_bg_portrait.png",
"width": 270,
"height": 480
},
{
"type": "Scroll",
"name": "stats",
"style": "paper",
"x": 4,
"y": 4,
"width": 262,
"height": 90
},
{
"type": "Scroll",
"name": "enemies",
"x": 4,
"y": 98,
"width": 262,
"height": 335
},
{
"type": "Image",
"name": "avatar",
"x": 24,
"y": 8,
"width": 64,
"height": 64
},
{
"type": "Image",
"name": "avatarBorder",
"image": "ui/avatarhud.png",
"x": 24,
"y": 8,
"width": 64,
"height": 64
},
{
"type": "Label",
"name": "playerName",
"x": 34,
"y": 70,
"width": 80,
"height": 24,
"font": "black"
},
{
"type": "Label",
"name": "totalWins",
"x": 234,
"y": 14,
"width": 40,
"height": 24,
"font": "black"
},
{
"type": "Label",
"name": "wins",
"text": "Win:",
"x": 170,
"y": 14,
"width": 60,
"height": 24,
"font": "black"
},
{
"type": "Label",
"name": "totalLoss",
"x": 234,
"y": 34,
"width": 40,
"height": 24,
"font": "black"
},
{
"type": "Label",
"name": "loss",
"text": "Loss:",
"x": 170,
"y": 34,
"width": 60,
"height": 24,
"font": "black"
},
{
"type": "Label",
"name": "lossWinRatio",
"x": 234,
"y": 54,
"width": 40,
"height": 24,
"font": "black"
},
{
"type": "Label",
"name": "winloss",
"text": "Win Loss Ratio:",
"x": 170,
"y": 54,
"width": 60,
"height": 24,
"font": "black"
},
{
"type": "TextButton",
"name": "return",
"text": "Back",
"width": 260,
"height": 30,
"x": 5,
"y": 440
},
{
"type": "Image",
"name": "lifeIcon",
"image": "ui/life.png",
"x": 104,
"y": 40,
"width": 16,
"height": 16
},
{
"type": "Image",
"name": "goldIcon",
"image": "ui/money.png",
"x": 104,
"y": 60,
"width": 16,
"height": 16
},
{
"type": "Label",
"name": "lifePoints",
"font": "black",
"width": 64,
"height": 16,
"x": 124,
"y": 40
},
{
"type": "Label",
"name": "money",
"font": "black",
"width": 64,
"height": 16,
"x": 124,
"y": 60
},
{
"type": "Table",
"font": "default"
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 102 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 70 KiB

View File

@@ -1,4 +1,12 @@
[
[
{
"name": "Final Castle",
"count": 1,
"radiusFactor": 0.00,
"spriteAtlas": "maps/tileset/buildings.atlas",
"sprite": "final_castle",
"map": "maps/map/main_story/final_castle.tmx"
},
{
"name": "Colorless Castle",
"count": 1,
@@ -47,14 +55,6 @@
"sprite": "blue_castle",
"map": "maps/map/main_story/blue_castle.tmx"
},
{
"name": "Final Castle",
"count": 1,
"radiusFactor": 0.00,
"spriteAtlas": "maps/tileset/buildings.atlas",
"sprite": "final_castle",
"map": "maps/map/main_story/final_castle.tmx"
},
{
"name": "Waste Town",
"type": "town",

View File

@@ -67,6 +67,7 @@ public class ForgePreferences extends PreferencesStore<ForgePreferences.FPref> {
BRAWL_P6_DECK_STATE(""),
BRAWL_P7_DECK_STATE(""),
BRAWL_P8_DECK_STATE(""),
UI_STRETCH("false"),
UI_LANDSCAPE_MODE ("false"),
UI_MATCHES_PER_GAME("3"),
UI_COMPACT_MAIN_MENU ("false"),