diff --git a/core/assets/sprites/Icon_128.png b/core/assets/sprites/Icon_128.png new file mode 100644 index 0000000..c0d5bfd Binary files /dev/null and b/core/assets/sprites/Icon_128.png differ diff --git a/core/assets/sprites/icon_16.png b/core/assets/sprites/icon_16.png new file mode 100644 index 0000000..47c8aa2 Binary files /dev/null and b/core/assets/sprites/icon_16.png differ diff --git a/core/assets/sprites/icon_32.png b/core/assets/sprites/icon_32.png new file mode 100644 index 0000000..bac5ff1 Binary files /dev/null and b/core/assets/sprites/icon_32.png differ diff --git a/core/src/com/saltosion/gladiator/listeners/ai/BerserkerAI.java b/core/src/com/saltosion/gladiator/listeners/ai/BerserkerAI.java index c0e9048..a65fcb1 100644 --- a/core/src/com/saltosion/gladiator/listeners/ai/BerserkerAI.java +++ b/core/src/com/saltosion/gladiator/listeners/ai/BerserkerAI.java @@ -83,10 +83,8 @@ public class BerserkerAI implements AIListener { c0.inputs.put(Direction.LEFT, true); } if (p0.getPosition().y < p1.getPosition().y) { - Log.info("asd"); c0.inputs.put(Direction.UP, true); } else if (p0.getPosition().y > p1.getPosition().y) { - Log.info("asd"); c0.inputs.put(Direction.DOWN, true); } } diff --git a/core/src/com/saltosion/gladiator/listeners/ai/RelentlessAI.java b/core/src/com/saltosion/gladiator/listeners/ai/RelentlessAI.java index e0ef52a..f47e68e 100644 --- a/core/src/com/saltosion/gladiator/listeners/ai/RelentlessAI.java +++ b/core/src/com/saltosion/gladiator/listeners/ai/RelentlessAI.java @@ -66,10 +66,8 @@ public class RelentlessAI implements AIListener { c0.inputs.put(Direction.LEFT, true); } if (p0.getPosition().y < p1.getPosition().y) { - Log.info("asd"); c0.inputs.put(Direction.UP, true); } else if (p0.getPosition().y > p1.getPosition().y) { - Log.info("asd"); c0.inputs.put(Direction.DOWN, true); } } diff --git a/core/src/com/saltosion/gladiator/util/Global.java b/core/src/com/saltosion/gladiator/util/Global.java index c0a57f6..5726398 100644 --- a/core/src/com/saltosion/gladiator/util/Global.java +++ b/core/src/com/saltosion/gladiator/util/Global.java @@ -22,8 +22,6 @@ public class Global { public static final String STATICPLAYER = "STATICPLAYER"; public static final String PLAYERIMG = "PLAYERIMG"; - public static final String GAME_NAME = "Gladiator Brawl"; - public static final float SPRITE_SCALE = 1 / 16f; public static final int FLAG_ALIVE = 1; diff --git a/core/src/com/saltosion/gladiator/util/Name.java b/core/src/com/saltosion/gladiator/util/Name.java index 38d2990..f1fe422 100644 --- a/core/src/com/saltosion/gladiator/util/Name.java +++ b/core/src/com/saltosion/gladiator/util/Name.java @@ -19,8 +19,7 @@ package com.saltosion.gladiator.util; public class Name { - public static final String GAME_NAME = "Gladiator Brawl"; - public static final String DEBUG = "DEBUG"; + public static final String GAME_NAME = "Simply Gladiators"; public static final String SPLASH_SALTOSION = "SPLASH_SALTOSION"; public static final String SPLASH_LIBGDX = "SPLASH_LIBGDX"; @@ -52,6 +51,7 @@ public class Name { public static final String SWING_UP = "SWING_UP"; public static final String SWING_DOWN = "SWING_DOWN"; public static final String SKIP_INTRO = "SKIP_INTRO"; + public static final String DEBUG = "DEBUG"; public static final String MUSIC_THEME = "MUSIC_THEME"; public static final String MUSIC_BATTLE = "MUSIC_BATTLE"; diff --git a/desktop/src/com/saltosion/gladiator/desktop/DesktopLauncher.java b/desktop/src/com/saltosion/gladiator/desktop/DesktopLauncher.java index f8f7e08..3b35b3e 100644 --- a/desktop/src/com/saltosion/gladiator/desktop/DesktopLauncher.java +++ b/desktop/src/com/saltosion/gladiator/desktop/DesktopLauncher.java @@ -1,5 +1,6 @@ package com.saltosion.gladiator.desktop; +import com.badlogic.gdx.Files; import com.badlogic.gdx.backends.lwjgl.LwjglApplication; import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration; import com.saltosion.gladiator.GladiatorBrawler; @@ -14,6 +15,9 @@ public class DesktopLauncher { config.height = 720; config.vSyncEnabled = true; // Change this to false for performance testing config.foregroundFPS = 0; + config.addIcon("sprites/icon_16.png", Files.FileType.Internal); + config.addIcon("sprites/icon_32.png", Files.FileType.Internal); + config.addIcon("sprites/icon_128.png", Files.FileType.Internal); LwjglApplication app = new LwjglApplication(new GladiatorBrawler(), config); } }