summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/src/com/ilotterytea/maxoning/screens/GameScreen.java59
-rw-r--r--core/src/com/ilotterytea/maxoning/screens/MenuScreen.java78
-rw-r--r--core/src/com/ilotterytea/maxoning/screens/MobileMenuScreen.java15
-rw-r--r--core/src/com/ilotterytea/maxoning/screens/SplashScreen.java11
-rw-r--r--core/src/com/ilotterytea/maxoning/ui/InventoryAnimatedItem.java2
-rw-r--r--core/src/com/ilotterytea/maxoning/ui/PurchaseItem.java3
-rw-r--r--core/src/com/ilotterytea/maxoning/ui/SaveGameWidget.java3
7 files changed, 64 insertions, 107 deletions
diff --git a/core/src/com/ilotterytea/maxoning/screens/GameScreen.java b/core/src/com/ilotterytea/maxoning/screens/GameScreen.java
index ff72457..3382456 100644
--- a/core/src/com/ilotterytea/maxoning/screens/GameScreen.java
+++ b/core/src/com/ilotterytea/maxoning/screens/GameScreen.java
@@ -40,17 +40,15 @@ public class GameScreen implements Screen, InputProcessor {
MaxonSavegame player;
Stage stage;
- Skin skin, widgetSkin;
+ Skin skin;
- TextureAtlas widgetAtlas, environmentAtlas;
+ TextureAtlas mainAtlas;
Label pointsLabel, multiplierLabel;
- Image blackBg, inventoryBg, shopBg, pointsBg;
AnimatedImage cat;
AnimatedImageButton maxon;
Table boardTable, quickTable;
- ScrollPane petScroll;
Dialog notEnoughPointsDialog;
@@ -68,11 +66,8 @@ public class GameScreen implements Screen, InputProcessor {
// Initializing the stage and skin:
stage = new Stage(new FillViewport(Gdx.graphics.getWidth(), Gdx.graphics.getHeight()));
- skin = new Skin(Gdx.files.internal("main.skin"));
- widgetSkin = new Skin(Gdx.files.internal("sprites/gui/widgets.skin"));
-
- widgetAtlas = game.assetManager.get("sprites/gui/widgets.atlas", TextureAtlas.class);
- environmentAtlas = game.assetManager.get("sprites/env/environment.atlas", TextureAtlas.class);
+ skin = game.assetManager.get("MainSpritesheet.skin", Skin.class);
+ mainAtlas = game.assetManager.get("MainSpritesheet.atlas", TextureAtlas.class);
items = new ArrayList<>();
@@ -90,15 +85,9 @@ public class GameScreen implements Screen, InputProcessor {
}
}
- // Make the background a little darker:
- blackBg = new Image(environmentAtlas.findRegion("tile"));
- blackBg.setColor(0f, 0f, 0f, 0.5f);
- blackBg.setSize(Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
- stage.addActor(blackBg);
-
// - - - - - - I N F O B O A R D - - - - - - :
- boardTable = new Table(widgetSkin);
- boardTable.setBackground("board_bg");
+ boardTable = new Table(skin);
+ boardTable.setBackground("board");
boardTable.setSize(stage.getWidth(), 86f);
boardTable.setPosition(0, stage.getHeight() - boardTable.getHeight());
boardTable.align(Align.left | Align.center);
@@ -107,7 +96,7 @@ public class GameScreen implements Screen, InputProcessor {
// - - - P O I N T S - - - :
// Icon for points label:
- Image pointsIcon = new Image(widgetAtlas.findRegion("coin"));
+ Image pointsIcon = new Image(mainAtlas.findRegion("points"));
boardTable.add(pointsIcon).size(24f).padLeft(6f).padRight(6f);
// Label for points:
@@ -117,7 +106,7 @@ public class GameScreen implements Screen, InputProcessor {
// - - - M U L T I P L I E R - - - :
// Icon for multiplier label:
- Image multiplierIcon = new Image(widgetAtlas.findRegion("multiplier"));
+ Image multiplierIcon = new Image(mainAtlas.findRegion("multiplier"));
boardTable.add(multiplierIcon).size(24f).padLeft(6f).padRight(6f);
// Label for multiplier:
@@ -126,14 +115,14 @@ public class GameScreen implements Screen, InputProcessor {
boardTable.add(multiplierLabel).row();
// - - - - - - Q U I C K A C T I O N S B O A R D - - - - - - :
- quickTable = new Table(widgetSkin);
- quickTable.setBackground("board_bg");
+ quickTable = new Table(skin);
+ quickTable.setBackground("board");
quickTable.setSize(stage.getWidth(), 64f);
quickTable.setPosition(0, 0);
quickTable.align(Align.center);
// - - - S H O P B U T T O N - - - :
- ImageButton shopButton = new ImageButton(widgetSkin, "shop");
+ ImageButton shopButton = new ImageButton(skin, "shop");
shopButton.addListener(new ClickListener() {
@Override
@@ -148,7 +137,7 @@ public class GameScreen implements Screen, InputProcessor {
quickTable.add(shopButton).size(64f).pad(6f);
// - - - I N V E N T O R Y B U T T O N - - - :
- ImageButton inventoryButton = new ImageButton(widgetSkin, "inventory");
+ ImageButton inventoryButton = new ImageButton(skin, "inventory");
inventoryButton.addListener(new ClickListener() {
@Override
@@ -200,7 +189,7 @@ public class GameScreen implements Screen, InputProcessor {
stage.addActor(debugLabel);
- notEnoughPointsDialog = new Dialog(game.locale.TranslatableText("dialogs.not_enough_points"), widgetSkin, "dialog");
+ notEnoughPointsDialog = new Dialog(game.locale.TranslatableText("dialogs.not_enough_points"), skin, "dialog");
Gdx.input.setInputProcessor(new InputMultiplexer(this, new CrossProcessor(), stage));
}
@@ -250,7 +239,7 @@ public class GameScreen implements Screen, InputProcessor {
Timer.schedule(new Timer.Task() {
@Override
public void run() {
- final ImageButton gift = new ImageButton(widgetSkin, "gift");
+ final ImageButton gift = new ImageButton(skin, "gift");
gift.setPosition(stage.getWidth() + gift.getWidth(), Math.getRandomNumber((int) gift.getHeight(), (int) stage.getHeight() - (int) gift.getHeight()));
gift.addAction(
Actions.repeat(
@@ -391,10 +380,10 @@ public class GameScreen implements Screen, InputProcessor {
}
private void genNewBgTiles(int width, int height) {
- for (int i = 0; i < height / environmentAtlas.findRegion("tile").getRegionHeight() + 1; i++) {
+ for (int i = 0; i < height / mainAtlas.findRegion("tile").getRegionHeight() + 1; i++) {
bgTiles.add(i, new ArrayList<Sprite>());
- for (int j = -1; j < width / environmentAtlas.findRegion("tile").getRegionWidth(); j++) {
- Sprite spr = new Sprite(environmentAtlas.findRegion("tile"));
+ for (int j = -1; j < width / mainAtlas.findRegion("tile").getRegionWidth(); j++) {
+ Sprite spr = new Sprite(mainAtlas.findRegion("tile"));
if ((j + i) % 2 == 0) {
spr.setColor(0.98f, 0.71f, 0.22f, 1f);
@@ -412,8 +401,8 @@ public class GameScreen implements Screen, InputProcessor {
private void showShop() {
// - - - - - - S H O P T A B L E - - - - - - :
- final Table shopTable = new Table(widgetSkin);
- shopTable.setBackground("board_bg");
+ final Table shopTable = new Table(skin);
+ shopTable.setBackground("bg");
shopTable.setSize(stage.getWidth() - 20f, stage.getHeight() - (boardTable.getHeight() + quickTable.getHeight() + 20f));
shopTable.setPosition(10f, quickTable.getHeight() + 10f);
shopTable.align(Align.top | Align.center);
@@ -429,7 +418,7 @@ public class GameScreen implements Screen, InputProcessor {
headShopTable.add(shopTitle).expandX();
// - - - C L O S E B U T T O N - - - :
- TextButton closeButton = new TextButton("X", widgetSkin);
+ TextButton closeButton = new TextButton("X", skin);
closeButton.addListener(new ClickListener() {
@Override
@@ -448,7 +437,6 @@ public class GameScreen implements Screen, InputProcessor {
for (final MaxonItem item : MaxonItemRegister.getItems()) {
PurchaseItem p_item = new PurchaseItem(
skin,
- widgetSkin,
item
);
@@ -491,8 +479,8 @@ public class GameScreen implements Screen, InputProcessor {
private void showInventory() {
// - - - - - - I N V E N T O R Y T A B L E - - - - - - :
- final Table inventoryTable = new Table(widgetSkin);
- inventoryTable.setBackground("board_bg");
+ final Table inventoryTable = new Table(skin);
+ inventoryTable.setBackground("bg");
inventoryTable.setSize(stage.getWidth() - 20f, stage.getHeight() - (boardTable.getHeight() + quickTable.getHeight() + 20f));
inventoryTable.setPosition(10f, quickTable.getHeight() + 10f);
inventoryTable.align(Align.top | Align.center);
@@ -508,7 +496,7 @@ public class GameScreen implements Screen, InputProcessor {
headInventoryTable.add(inventoryTitle).expandX();
// - - - C L O S E B U T T O N - - - :
- TextButton closeButton = new TextButton("X", widgetSkin);
+ TextButton closeButton = new TextButton("X", skin);
closeButton.addListener(new ClickListener() {
@Override
@@ -553,7 +541,6 @@ public class GameScreen implements Screen, InputProcessor {
@Override
public void dispose() {
stage.clear();
- skin.dispose();
}
@Override
diff --git a/core/src/com/ilotterytea/maxoning/screens/MenuScreen.java b/core/src/com/ilotterytea/maxoning/screens/MenuScreen.java
index 5a03cf8..56b21d0 100644
--- a/core/src/com/ilotterytea/maxoning/screens/MenuScreen.java
+++ b/core/src/com/ilotterytea/maxoning/screens/MenuScreen.java
@@ -26,7 +26,6 @@ import com.ilotterytea.maxoning.utils.formatters.NumberFormatter;
import com.ilotterytea.maxoning.utils.serialization.GameDataSystem;
import java.awt.*;
-import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Locale;
@@ -36,9 +35,10 @@ public class MenuScreen implements Screen {
final MaxonGame game;
final Stage stage;
- final Skin skin, widgetSkin, iconSkin;
+ final Skin skin;
+ TextureAtlas brandAtlas;
- Image brandLogo, blackBg;
+ Image brandLogo;
final Music menuMusic;
@@ -47,8 +47,6 @@ public class MenuScreen implements Screen {
TextButton startBtn;
Label savLabel;
- // Atlases:
- TextureAtlas environmentAtlas, brandAtlas, iconAtlas;
MaxonSavegame sav;
@@ -57,37 +55,18 @@ public class MenuScreen implements Screen {
public MenuScreen(final MaxonGame game) {
this.game = game;
- // Environment atlas for leafs, snowflakes and background tiles:
- environmentAtlas = game.assetManager.get("sprites/env/environment.atlas", TextureAtlas.class);
-
- // Brand atlas:
- brandAtlas = game.assetManager.get("sprites/gui/brand.atlas", TextureAtlas.class);
-
- // Icon atlas:
- iconAtlas = game.assetManager.get("sprites/gui/widgeticons.atlas", TextureAtlas.class);
-
// Stage and skin:
this.stage = new Stage(new FillViewport(Gdx.graphics.getWidth(), Gdx.graphics.getHeight()));
- this.skin = new Skin(Gdx.files.internal("main.skin"));
- this.widgetSkin = new Skin(Gdx.files.internal("sprites/gui/widgets.skin"));
- this.iconSkin = new Skin(Gdx.files.internal("sprites/gui/widgeticons.skin"));
+ this.skin = game.assetManager.get("MainSpritesheet.skin", Skin.class);
+ brandAtlas = game.assetManager.get("sprites/gui/brand.atlas", TextureAtlas.class);
sav = GameDataSystem.load("00.maxon");
// Main Menu music:
this.menuMusic = game.assetManager.get("mus/menu/mus_menu_loop.ogg", Music.class);
- // Make the background a little darker:
- brandLogo = new Image(brandAtlas.findRegion("brand"));
- blackBg = new Image(environmentAtlas.findRegion("tile"));
-
- blackBg.setColor(0f, 0f, 0f, 0.25f);
- blackBg.setSize(stage.getWidth(), stage.getHeight());
-
- stage.addActor(blackBg);
-
// // Menu table:
- float iconSize = 48f, iconPad = 6f;
+ float iconSize = 64f, iconPad = 6f;
menuTable = new Table();
menuTable.setSize(stage.getWidth() / 2f, iconSize);
menuTable.setPosition(0, 0);
@@ -95,7 +74,7 @@ public class MenuScreen implements Screen {
menuTable.align(Align.bottomLeft);
// Quit button:
- ImageButton quitBtn = new ImageButton(iconSkin, "quit");
+ ImageButton quitBtn = new ImageButton(skin, "quit");
quitBtn.addListener(new ClickListener() {
@Override
@@ -107,7 +86,7 @@ public class MenuScreen implements Screen {
menuTable.add(quitBtn).size(iconSize).pad(iconPad);
// Options button:
- ImageButton optBtn = new ImageButton(iconSkin, "options");
+ ImageButton optBtn = new ImageButton(skin, "options");
optBtn.addListener(new ClickListener() {
@Override
@@ -121,7 +100,7 @@ public class MenuScreen implements Screen {
stage.addActor(menuTable);
// // Press start:
- startBtn = new TextButton(game.locale.TranslatableText("menu.pressStart"), skin);
+ startBtn = new TextButton(game.locale.TranslatableText("menu.pressStart"), skin, "text");
startBtn.setPosition((stage.getWidth() / 2f) - (startBtn.getWidth() / 2f), 8f);
startBtn.addListener(new ClickListener() {
@@ -203,8 +182,8 @@ public class MenuScreen implements Screen {
1,
stage.getWidth(),
stage.getHeight(),
- widgetSkin.getDrawable("bgTile01"),
- widgetSkin.getDrawable("bgTile02")
+ skin.getDrawable("tile_01"),
+ skin.getDrawable("tile_02")
);
}
@@ -281,8 +260,8 @@ public class MenuScreen implements Screen {
mOptTable.add(optTitle).width(512f).row();
// Options table:
- Table optTable = new Table(widgetSkin);
- optTable.setBackground("plain_down");
+ Table optTable = new Table(skin);
+ optTable.setBackground("bg");
optTable.align(Align.topLeft);
// Scroll panel for options:
@@ -302,7 +281,7 @@ public class MenuScreen implements Screen {
debLabel.setAlignment(Align.left);
genCategory.add(debLabel).width(256f);
- final TextButton debButton = new TextButton((game.prefs.getBoolean("debug", false)) ? "ON" : "OFF", widgetSkin);
+ final TextButton debButton = new TextButton((game.prefs.getBoolean("debug", false)) ? "ON" : "OFF", skin);
debButton.addListener(new ClickListener() {
@Override
@@ -332,7 +311,7 @@ public class MenuScreen implements Screen {
musLabel.setAlignment(Align.left);
audioCategory.add(musLabel).width(256f);
- final TextButton musButton = new TextButton((game.prefs.getBoolean("music", true)) ? "ON" : "OFF", widgetSkin);
+ final TextButton musButton = new TextButton((game.prefs.getBoolean("music", true)) ? "ON" : "OFF", skin);
musButton.addListener(new ClickListener() {
@Override
@@ -358,7 +337,7 @@ public class MenuScreen implements Screen {
sndLabel.setAlignment(Align.left);
audioCategory.add(sndLabel).width(256f);
- final TextButton sndButton = new TextButton((game.prefs.getBoolean("sfx", true)) ? "ON" : "OFF", widgetSkin);
+ final TextButton sndButton = new TextButton((game.prefs.getBoolean("sfx", true)) ? "ON" : "OFF", skin);
sndButton.addListener(new ClickListener() {
@Override
@@ -388,7 +367,7 @@ public class MenuScreen implements Screen {
vscLabel.setAlignment(Align.left);
videoCategory.add(vscLabel).width(256f);
- final TextButton vscButton = new TextButton((game.prefs.getBoolean("vsync", true)) ? "ON" : "OFF", widgetSkin);
+ final TextButton vscButton = new TextButton((game.prefs.getBoolean("vsync", true)) ? "ON" : "OFF", skin);
vscButton.addListener(new ClickListener() {
@Override
@@ -413,7 +392,7 @@ public class MenuScreen implements Screen {
fscLabel.setAlignment(Align.left);
videoCategory.add(fscLabel).width(256f);
- final TextButton fscButton = new TextButton((game.prefs.getBoolean("fullscreen", true)) ? "ON" : "OFF", widgetSkin);
+ final TextButton fscButton = new TextButton((game.prefs.getBoolean("fullscreen", true)) ? "ON" : "OFF", skin);
fscButton.addListener(new ClickListener() {
@Override
@@ -438,7 +417,7 @@ public class MenuScreen implements Screen {
// - - - Switch the language - - -:
String[] fh4Locale = game.locale.getFileHandle().nameWithoutExtension().split("_");
Locale locale = new Locale(fh4Locale[0], fh4Locale[1]);
- final TextButton langButton = new TextButton(game.locale.FormattedText("options.language", locale.getDisplayLanguage(), locale.getDisplayCountry()), widgetSkin);
+ final TextButton langButton = new TextButton(game.locale.FormattedText("options.language", locale.getDisplayLanguage(), locale.getDisplayCountry()), skin);
langButton.addListener(new ClickListener() {
@Override
@@ -470,7 +449,7 @@ public class MenuScreen implements Screen {
optTable.add(langButton).width(512f).row();
// - - - Reset save data - - -:
- TextButton resetButton = new TextButton(game.locale.TranslatableText("options.reset"), widgetSkin);
+ TextButton resetButton = new TextButton(game.locale.TranslatableText("options.reset"), skin);
optTable.add(resetButton).width(512f).row();
// Game info:
@@ -479,13 +458,13 @@ public class MenuScreen implements Screen {
optTable.add(infLabel).maxWidth(512f).row();
// // Action buttons:
- Table actTable = new Table(widgetSkin);
- actTable.setBackground("plain_down");
+ Table actTable = new Table(skin);
+ actTable.setBackground("bg");
actTable.setWidth(512f);
actTable.align(Align.right);
mOptTable.add(actTable).width(512f).maxWidth(512f).pad(5f);
- TextButton closeBtn = new TextButton("Back to main menu", widgetSkin);
+ TextButton closeBtn = new TextButton("Back to main menu", skin);
closeBtn.addListener(new ClickListener() {
@Override
@@ -528,16 +507,16 @@ public class MenuScreen implements Screen {
actTable.add(closeBtn).pad(5f);
- TextButton saveBtn = new TextButton("Apply", widgetSkin);
+ TextButton saveBtn = new TextButton("Apply", skin);
actTable.add(saveBtn).pad(5f);
}
- private void loadSavegamesToTable(Table table) {
+ /*private void loadSavegamesToTable(Table table) {
for (int i = 0; i < 3; i++) {
if (new File(MaxonConstants.GAME_SAVEGAME_FOLDER + String.format("/0%s.maxon", i)).exists()) {
final MaxonSavegame sav = GameDataSystem.load("0" + i + ".maxon");
SaveGameWidget widget = new SaveGameWidget(
- skin, widgetSkin, sav
+ skin, sav
);
final int finalI = i;
widget.addListener(new ClickListener() {
@@ -586,13 +565,12 @@ public class MenuScreen implements Screen {
table.add(widget).width(512f).padBottom(8f).row();
}
}
- }
+ }*/
@Override public void pause() {}
@Override public void resume() {}
@Override public void hide() { dispose(); }
@Override public void dispose() {
- stage.clear();
- skin.dispose();
+ stage.dispose();
}
}
diff --git a/core/src/com/ilotterytea/maxoning/screens/MobileMenuScreen.java b/core/src/com/ilotterytea/maxoning/screens/MobileMenuScreen.java
index 82aeb2d..9bf9365 100644
--- a/core/src/com/ilotterytea/maxoning/screens/MobileMenuScreen.java
+++ b/core/src/com/ilotterytea/maxoning/screens/MobileMenuScreen.java
@@ -37,7 +37,7 @@ public class MobileMenuScreen implements Screen {
private final MaxonGame game;
private Stage stage;
- private Skin skin, widgetSkin;
+ private Skin skin;
private MovingChessBackground bg;
@@ -50,8 +50,7 @@ public class MobileMenuScreen implements Screen {
@Override
public void show() {
stage = new Stage(new FillViewport(Gdx.graphics.getWidth(), Gdx.graphics.getHeight()));
- skin = new Skin(Gdx.files.internal("main.skin"));
- widgetSkin = new Skin(Gdx.files.internal("sprites/gui/widgets.skin"));
+ skin = game.assetManager.get("MainSpritesheet.skin", Skin.class);
TextureAtlas brandAtlas = game.assetManager.get("sprites/gui/brand.atlas", TextureAtlas.class);
@@ -63,8 +62,8 @@ public class MobileMenuScreen implements Screen {
1,
stage.getWidth(),
stage.getHeight(),
- widgetSkin.getDrawable("bgTile01"),
- widgetSkin.getDrawable("bgTile02")
+ skin.getDrawable("tile_01"),
+ skin.getDrawable("tile_02")
);
// Cat:
@@ -137,7 +136,7 @@ public class MobileMenuScreen implements Screen {
(sav == null) ?
game.locale.TranslatableText("menu.playGame") :
game.locale.TranslatableText("menu.continue"),
- widgetSkin
+ skin
);
startBtn.addListener(new ClickListener() {
@@ -164,7 +163,7 @@ public class MobileMenuScreen implements Screen {
// Language button:
String[] fh4Locale = game.locale.getFileHandle().nameWithoutExtension().split("_");
Locale locale = new Locale(fh4Locale[0], fh4Locale[1]);
- final TextButton langBtn = new TextButton(locale.getDisplayLanguage(), widgetSkin);
+ final TextButton langBtn = new TextButton(locale.getDisplayLanguage(), skin);
langBtn.addListener(new ClickListener() {
@Override
@@ -241,7 +240,5 @@ public class MobileMenuScreen implements Screen {
@Override
public void dispose() {
stage.dispose();
- skin.dispose();
- widgetSkin.dispose();
}
}
diff --git a/core/src/com/ilotterytea/maxoning/screens/SplashScreen.java b/core/src/com/ilotterytea/maxoning/screens/SplashScreen.java
index 12a6c39..a25a6bf 100644
--- a/core/src/com/ilotterytea/maxoning/screens/SplashScreen.java
+++ b/core/src/com/ilotterytea/maxoning/screens/SplashScreen.java
@@ -18,9 +18,9 @@ public class SplashScreen implements Screen {
final MaxonGame game;
final Stage stage;
- final Skin skin, widgetSkin;
+ final Skin skin;
- TextureAtlas brandAtlas, envAtlas;
+ TextureAtlas brandAtlas;
Image dev, pub;
ProgressBar bar;
@@ -28,8 +28,7 @@ public class SplashScreen implements Screen {
this.game = game;
this.stage = new Stage(new FillViewport(Gdx.graphics.getWidth(), Gdx.graphics.getHeight()));
- this.skin = new Skin(Gdx.files.internal("main.skin"));
- this.widgetSkin = new Skin(Gdx.files.internal("sprites/gui/widgets.skin"));
+ this.skin = new Skin(Gdx.files.internal("MainSpritesheet.skin"));
Table logoTable = new Table();
@@ -38,7 +37,6 @@ public class SplashScreen implements Screen {
logoTable.align(Align.center);
brandAtlas = new TextureAtlas(Gdx.files.internal("sprites/gui/ilotterytea.atlas"));
- envAtlas = new TextureAtlas(Gdx.files.internal("sprites/env/environment.atlas"));
pub = new Image(brandAtlas.findRegion("org"));
logoTable.add(pub).size(pub.getWidth() * 5f, pub.getHeight() * 5f).pad(16f).row();
@@ -46,7 +44,7 @@ public class SplashScreen implements Screen {
dev = new Image(brandAtlas.findRegion("devOld"));
logoTable.add(dev).size(dev.getWidth() * 5f, dev.getHeight() * 5f).row();
- bar = new ProgressBar(0f, 100f, 1f, false, widgetSkin);
+ bar = new ProgressBar(0f, 100f, 1f, false, skin);
logoTable.add(bar).size(dev.getWidth() * 5f, 24f);
stage.addActor(logoTable);
@@ -92,6 +90,5 @@ public class SplashScreen implements Screen {
@Override public void hide() { dispose(); }
@Override public void dispose() {
brandAtlas.dispose();
- envAtlas.dispose();
}
}
diff --git a/core/src/com/ilotterytea/maxoning/ui/InventoryAnimatedItem.java b/core/src/com/ilotterytea/maxoning/ui/InventoryAnimatedItem.java
index d7db2ad..f6f266f 100644
--- a/core/src/com/ilotterytea/maxoning/ui/InventoryAnimatedItem.java
+++ b/core/src/com/ilotterytea/maxoning/ui/InventoryAnimatedItem.java
@@ -17,7 +17,7 @@ public class InventoryAnimatedItem extends Stack {
TextTooltip.TextTooltipStyle style = new TextTooltip.TextTooltipStyle();
style.label = new Label.LabelStyle();
- style.label.font = skin.getFont("default_lidl");
+ style.label.font = skin.getFont("small");
style.label.fontColor = skin.getColor("white");
super.add(table);
diff --git a/core/src/com/ilotterytea/maxoning/ui/PurchaseItem.java b/core/src/com/ilotterytea/maxoning/ui/PurchaseItem.java
index 7b13ec1..3393288 100644
--- a/core/src/com/ilotterytea/maxoning/ui/PurchaseItem.java
+++ b/core/src/com/ilotterytea/maxoning/ui/PurchaseItem.java
@@ -8,10 +8,9 @@ import com.ilotterytea.maxoning.player.MaxonItem;
public class PurchaseItem extends Table {
public PurchaseItem(
Skin skin,
- Skin widgetSkin,
MaxonItem item
) {
- super(widgetSkin);
+ super(skin);
super.setBackground("up");
super.align(Align.left | Align.center);
diff --git a/core/src/com/ilotterytea/maxoning/ui/SaveGameWidget.java b/core/src/com/ilotterytea/maxoning/ui/SaveGameWidget.java
index 2bb4a81..e52d1a3 100644
--- a/core/src/com/ilotterytea/maxoning/ui/SaveGameWidget.java
+++ b/core/src/com/ilotterytea/maxoning/ui/SaveGameWidget.java
@@ -11,11 +11,10 @@ import com.ilotterytea.maxoning.utils.formatters.NumberFormatter;
public class SaveGameWidget extends Button {
public SaveGameWidget(
Skin skin,
- Skin widgetSkin,
@Null MaxonSavegame sav
) {
// Setting the stack:
- super(widgetSkin, "slot");
+ super(skin, "slot");
// // // Save slot data:
// // Info row: