diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2015-06-30 06:21:50 +0200 | 
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2015-06-30 06:21:50 +0200 | 
| commit | d74bcf9bf390418df35d94b54d59df0170033f65 (patch) | |
| tree | 2ceae1bd287c42b4f109c47d2360199d6076a156 /core/src | |
| parent | 06868b70f82ed30e46ea3fd012a0befc8380bbad (diff) | |
| download | RustAndDust-d74bcf9bf390418df35d94b54d59df0170033f65.zip RustAndDust-d74bcf9bf390418df35d94b54d59df0170033f65.tar.gz | |
TankOnTank -> CreepingArmor
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/TankOnTank.gwt.xml | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/CreepingArmor.java (renamed from core/src/ch/asynk/tankontank/TankOnTank.java) | 32 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/Attack.java (renamed from core/src/ch/asynk/tankontank/engine/Attack.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/Board.java (renamed from core/src/ch/asynk/tankontank/engine/Board.java) | 10 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/Faction.java (renamed from core/src/ch/asynk/tankontank/engine/Faction.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/HeadedPawn.java (renamed from core/src/ch/asynk/tankontank/engine/HeadedPawn.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/Meteorology.java (renamed from core/src/ch/asynk/tankontank/engine/Meteorology.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/Move.java (renamed from core/src/ch/asynk/tankontank/engine/Move.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/Objective.java (renamed from core/src/ch/asynk/tankontank/engine/Objective.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/ObjectiveSet.java (renamed from core/src/ch/asynk/tankontank/engine/ObjectiveSet.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/Order.java (renamed from core/src/ch/asynk/tankontank/engine/Order.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/OrderList.java (renamed from core/src/ch/asynk/tankontank/engine/OrderList.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/Orientation.java (renamed from core/src/ch/asynk/tankontank/engine/Orientation.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/Path.java (renamed from core/src/ch/asynk/tankontank/engine/Path.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/PathBuilder.java (renamed from core/src/ch/asynk/tankontank/engine/PathBuilder.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/PathIterator.java (renamed from core/src/ch/asynk/tankontank/engine/PathIterator.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/Pawn.java (renamed from core/src/ch/asynk/tankontank/engine/Pawn.java) | 12 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/SearchBoard.java (renamed from core/src/ch/asynk/tankontank/engine/SearchBoard.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/SelectedTile.java (renamed from core/src/ch/asynk/tankontank/engine/SelectedTile.java) | 8 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/Tile.java (renamed from core/src/ch/asynk/tankontank/engine/Tile.java) | 8 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/gfx/Animation.java (renamed from core/src/ch/asynk/tankontank/engine/gfx/Animation.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/gfx/Drawable.java (renamed from core/src/ch/asynk/tankontank/engine/gfx/Drawable.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/gfx/Moveable.java (renamed from core/src/ch/asynk/tankontank/engine/gfx/Moveable.java) | 4 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/gfx/StackedImages.java (renamed from core/src/ch/asynk/tankontank/engine/gfx/StackedImages.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/gfx/animations/AnimationSequence.java (renamed from core/src/ch/asynk/tankontank/engine/gfx/animations/AnimationSequence.java) | 4 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/gfx/animations/DestroyAnimation.java (renamed from core/src/ch/asynk/tankontank/engine/gfx/animations/DestroyAnimation.java) | 6 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/gfx/animations/DiceAnimation.java (renamed from core/src/ch/asynk/tankontank/engine/gfx/animations/DiceAnimation.java) | 6 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/gfx/animations/FireAnimation.java (renamed from core/src/ch/asynk/tankontank/engine/gfx/animations/FireAnimation.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/gfx/animations/InfantryFireAnimation.java (renamed from core/src/ch/asynk/tankontank/engine/gfx/animations/InfantryFireAnimation.java) | 6 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/gfx/animations/MoveToAnimation.java (renamed from core/src/ch/asynk/tankontank/engine/gfx/animations/MoveToAnimation.java) | 4 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/gfx/animations/PromoteAnimation.java (renamed from core/src/ch/asynk/tankontank/engine/gfx/animations/PromoteAnimation.java) | 6 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/gfx/animations/RunnableAnimation.java (renamed from core/src/ch/asynk/tankontank/engine/gfx/animations/RunnableAnimation.java) | 6 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/gfx/animations/SoundAnimation.java (renamed from core/src/ch/asynk/tankontank/engine/gfx/animations/SoundAnimation.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/gfx/animations/SpriteAnimation.java (renamed from core/src/ch/asynk/tankontank/engine/gfx/animations/SpriteAnimation.java) | 6 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/gfx/animations/Sprites.java (renamed from core/src/ch/asynk/tankontank/engine/gfx/animations/Sprites.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/gfx/animations/TankFireAnimation.java (renamed from core/src/ch/asynk/tankontank/engine/gfx/animations/TankFireAnimation.java) | 6 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/engine/gfx/animations/TimedAnimation.java (renamed from core/src/ch/asynk/tankontank/engine/gfx/animations/TimedAnimation.java) | 4 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/Army.java (renamed from core/src/ch/asynk/tankontank/game/Army.java) | 4 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/Battle.java (renamed from core/src/ch/asynk/tankontank/game/Battle.java) | 12 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/Command.java (renamed from core/src/ch/asynk/tankontank/game/Command.java) | 10 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/Config.java (renamed from core/src/ch/asynk/tankontank/game/Config.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/Ctrl.java (renamed from core/src/ch/asynk/tankontank/game/Ctrl.java) | 36 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/Engagement.java (renamed from core/src/ch/asynk/tankontank/game/Engagement.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/Hex.java (renamed from core/src/ch/asynk/tankontank/game/Hex.java) | 12 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/HexSet.java (renamed from core/src/ch/asynk/tankontank/game/HexSet.java) | 4 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/Hud.java (renamed from core/src/ch/asynk/tankontank/game/Hud.java) | 28 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/Map.java (renamed from core/src/ch/asynk/tankontank/game/Map.java) | 66 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/Player.java (renamed from core/src/ch/asynk/tankontank/game/Player.java) | 8 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/State.java (renamed from core/src/ch/asynk/tankontank/game/State.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/Unit.java (renamed from core/src/ch/asynk/tankontank/game/Unit.java) | 16 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/UnitList.java (renamed from core/src/ch/asynk/tankontank/game/UnitList.java) | 4 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/Zone.java (renamed from core/src/ch/asynk/tankontank/game/Zone.java) | 4 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/battles/BattleCommon.java (renamed from core/src/ch/asynk/tankontank/game/battles/BattleCommon.java) | 24 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/battles/BattleCounterAttack.java (renamed from core/src/ch/asynk/tankontank/game/battles/BattleCounterAttack.java) | 22 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/battles/BattleFrontalAssault.java (renamed from core/src/ch/asynk/tankontank/game/battles/BattleFrontalAssault.java) | 24 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/battles/BattleHeadToHead.java (renamed from core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java) | 24 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/battles/BattleLastStand.java (renamed from core/src/ch/asynk/tankontank/game/battles/BattleLastStand.java) | 24 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/battles/BattleNightAction.java (renamed from core/src/ch/asynk/tankontank/game/battles/BattleNightAction.java) | 26 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/battles/BattleStabToTheFlank.java (renamed from core/src/ch/asynk/tankontank/game/battles/BattleStabToTheFlank.java) | 26 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/battles/BattleTest.java (renamed from core/src/ch/asynk/tankontank/game/battles/BattleTest.java) | 26 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/battles/Factory.java (renamed from core/src/ch/asynk/tankontank/game/battles/Factory.java) | 40 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/battles/MapA.java (renamed from core/src/ch/asynk/tankontank/game/battles/MapA.java) | 14 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/battles/MapB.java (renamed from core/src/ch/asynk/tankontank/game/battles/MapB.java) | 14 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/hud/ActionButtons.java (renamed from core/src/ch/asynk/tankontank/game/hud/ActionButtons.java) | 12 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/hud/EngagementPanel.java (renamed from core/src/ch/asynk/tankontank/game/hud/EngagementPanel.java) | 18 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/hud/PlayerInfo.java (renamed from core/src/ch/asynk/tankontank/game/hud/PlayerInfo.java) | 24 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/hud/StatisticsPanel.java (renamed from core/src/ch/asynk/tankontank/game/hud/StatisticsPanel.java) | 12 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/hud/UnitDock.java (renamed from core/src/ch/asynk/tankontank/game/hud/UnitDock.java) | 16 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/states/StateAnimation.java (renamed from core/src/ch/asynk/tankontank/game/states/StateAnimation.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/states/StateBreak.java (renamed from core/src/ch/asynk/tankontank/game/states/StateBreak.java) | 12 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/states/StateCommon.java (renamed from core/src/ch/asynk/tankontank/game/states/StateCommon.java) | 14 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/states/StateDeployment.java (renamed from core/src/ch/asynk/tankontank/game/states/StateDeployment.java) | 16 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/states/StateEngage.java (renamed from core/src/ch/asynk/tankontank/game/states/StateEngage.java) | 10 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/states/StateMove.java (renamed from core/src/ch/asynk/tankontank/game/states/StateMove.java) | 10 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/states/StatePromote.java (renamed from core/src/ch/asynk/tankontank/game/states/StatePromote.java) | 4 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/states/StateReinforcement.java (renamed from core/src/ch/asynk/tankontank/game/states/StateReinforcement.java) | 10 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/states/StateRotate.java (renamed from core/src/ch/asynk/tankontank/game/states/StateRotate.java) | 10 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/states/StateSelect.java (renamed from core/src/ch/asynk/tankontank/game/states/StateSelect.java) | 16 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/game/states/StateWithdraw.java (renamed from core/src/ch/asynk/tankontank/game/states/StateWithdraw.java) | 8 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/loading/LoadingBar.java (renamed from core/src/ch/asynk/tankontank/loading/LoadingBar.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/menu/MainMenu.java (renamed from core/src/ch/asynk/tankontank/menu/MainMenu.java) | 4 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/menu/OptionsMenu.java (renamed from core/src/ch/asynk/tankontank/menu/OptionsMenu.java) | 16 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/menu/ScenariosMenu.java (renamed from core/src/ch/asynk/tankontank/menu/ScenariosMenu.java) | 16 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/menu/TutorialsMenu.java (renamed from core/src/ch/asynk/tankontank/menu/TutorialsMenu.java) | 14 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/screens/GameCamera.java (renamed from core/src/ch/asynk/tankontank/screens/GameCamera.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/screens/GameScreen.java (renamed from core/src/ch/asynk/tankontank/screens/GameScreen.java) | 22 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/screens/MenuCamera.java (renamed from core/src/ch/asynk/tankontank/screens/MenuCamera.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/screens/MenuScreen.java (renamed from core/src/ch/asynk/tankontank/screens/MenuScreen.java) | 26 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/ui/Bg.java (renamed from core/src/ch/asynk/tankontank/ui/Bg.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/ui/Label.java (renamed from core/src/ch/asynk/tankontank/ui/Label.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/ui/LabelImage.java (renamed from core/src/ch/asynk/tankontank/ui/LabelImage.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/ui/LabelStack.java (renamed from core/src/ch/asynk/tankontank/ui/LabelStack.java) | 4 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/ui/Menu.java (renamed from core/src/ch/asynk/tankontank/ui/Menu.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/ui/Msg.java (renamed from core/src/ch/asynk/tankontank/ui/Msg.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/ui/OkCancel.java (renamed from core/src/ch/asynk/tankontank/ui/OkCancel.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/ui/Patch.java (renamed from core/src/ch/asynk/tankontank/ui/Patch.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/ui/Position.java (renamed from core/src/ch/asynk/tankontank/ui/Position.java) | 4 | ||||
| -rw-r--r-- | core/src/ch/asynk/creepingarmor/ui/Widget.java (renamed from core/src/ch/asynk/tankontank/ui/Widget.java) | 4 | 
98 files changed, 484 insertions, 484 deletions
| diff --git a/core/src/TankOnTank.gwt.xml b/core/src/TankOnTank.gwt.xml index d27ee0e..622ea41 100644 --- a/core/src/TankOnTank.gwt.xml +++ b/core/src/TankOnTank.gwt.xml @@ -1,5 +1,5 @@  <?xml version="1.0" encoding="UTF-8"?>  <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit trunk//EN" "http://google-web-toolkit.googlecode.com/svn/trunk/distro-source/core/src/gwt-module.dtd">  <module> -	<source path="ch/asynk/tankontank" /> +	<source path="ch/asynk/creepingarmor" />  </module>
\ No newline at end of file diff --git a/core/src/ch/asynk/tankontank/TankOnTank.java b/core/src/ch/asynk/creepingarmor/CreepingArmor.java index 390fca2..7e7e4db 100644 --- a/core/src/ch/asynk/tankontank/TankOnTank.java +++ b/core/src/ch/asynk/creepingarmor/CreepingArmor.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank; +package ch.asynk.creepingarmor;  import com.badlogic.gdx.Gdx;  import com.badlogic.gdx.Game; @@ -8,13 +8,13 @@ import com.badlogic.gdx.graphics.Texture;  import com.badlogic.gdx.graphics.g2d.BitmapFont;  import com.badlogic.gdx.graphics.g2d.TextureAtlas; -import ch.asynk.tankontank.screens.MenuScreen; -import ch.asynk.tankontank.screens.GameScreen; -import ch.asynk.tankontank.game.Ctrl; -import ch.asynk.tankontank.game.Config; -import ch.asynk.tankontank.game.battles.Factory; +import ch.asynk.creepingarmor.screens.MenuScreen; +import ch.asynk.creepingarmor.screens.GameScreen; +import ch.asynk.creepingarmor.game.Ctrl; +import ch.asynk.creepingarmor.game.Config; +import ch.asynk.creepingarmor.game.battles.Factory; -public class TankOnTank extends Game +public class CreepingArmor extends Game  {      public AssetManager manager;      public Factory factory; @@ -50,7 +50,7 @@ public class TankOnTank extends Game      {          Gdx.app.setLogLevel(Gdx.app.LOG_DEBUG);          this.hudCorrection = ((int) (125 * Gdx.graphics.getDensity()) - 75); -        debug("TankOnTank", "create() [" + Gdx.graphics.getWidth() + ";" + Gdx.graphics.getHeight() + "] " + Gdx.graphics.getDensity() + " -> " + hudCorrection); +        debug("CreepingArmor", "create() [" + Gdx.graphics.getWidth() + ";" + Gdx.graphics.getHeight() + "] " + Gdx.graphics.getDensity() + " -> " + hudCorrection);          manager = new AssetManager();          factory = new Factory(this); @@ -109,7 +109,7 @@ public class TankOnTank extends Game          manager.load("sounds/explosion_short.mp3", Sound.class);          manager.load("sounds/promote_us.mp3", Sound.class);          manager.load("sounds/promote_ge.mp3", Sound.class); -        debug("TankOnTank", "  assets loaded : " + (Gdx.app.getJavaHeap()/1024.0f) + "KB"); +        debug("CreepingArmor", "  assets loaded : " + (Gdx.app.getJavaHeap()/1024.0f) + "KB");      }      private void unloadGameAssets() @@ -138,7 +138,7 @@ public class TankOnTank extends Game          manager.unload("sounds/explosion_short.mp3");          manager.unload("sounds/promote_us.mp3");          manager.unload("sounds/promote_ge.mp3"); -        debug("TankOnTank", "  assets unloaded : " + (Gdx.app.getJavaHeap()/1024.0f) + "KB"); +        debug("CreepingArmor", "  assets unloaded : " + (Gdx.app.getJavaHeap()/1024.0f) + "KB");      }      private void loadUiAssets() @@ -182,15 +182,15 @@ public class TankOnTank extends Game      // @Override      // public void resize(int width, int height)      // { -    //     debug("TankOnTank", "resize(" + width + ", " + height + ")"); +    //     debug("CreepingArmor", "resize(" + width + ", " + height + ")");      //     super.resize(width, height);      // }      @Override      public void dispose()      { -        debug("TankOnTank", "dispose()"); -        debug("TankOnTank", "diagnostics:\n" + manager.getDiagnostics() ); +        debug("CreepingArmor", "dispose()"); +        debug("CreepingArmor", "diagnostics:\n" + manager.getDiagnostics() );          getScreen().dispose();          unloadUiAssets();          switch(state) { @@ -203,7 +203,7 @@ public class TankOnTank extends Game                  ctrl.dispose();                  break;          } -        debug("TankOnTank", "diagnostics:\n" + manager.getDiagnostics() ); +        debug("CreepingArmor", "diagnostics:\n" + manager.getDiagnostics() );          manager.clear();          manager.dispose();      } @@ -211,12 +211,12 @@ public class TankOnTank extends Game      // @Override      // public void pause()      // { -    //     debug("TankOnTank", "pause()"); +    //     debug("CreepingArmor", "pause()");      // }      // @Override      // public void resume()      // { -    //     debug("TankOnTank", "resume()"); +    //     debug("CreepingArmor", "resume()");      // }  } diff --git a/core/src/ch/asynk/tankontank/engine/Attack.java b/core/src/ch/asynk/creepingarmor/engine/Attack.java index bc99b67..e4fa678 100644 --- a/core/src/ch/asynk/tankontank/engine/Attack.java +++ b/core/src/ch/asynk/creepingarmor/engine/Attack.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine; +package ch.asynk.creepingarmor.engine;  public class Attack  { diff --git a/core/src/ch/asynk/tankontank/engine/Board.java b/core/src/ch/asynk/creepingarmor/engine/Board.java index b11eae4..4c42003 100644 --- a/core/src/ch/asynk/tankontank/engine/Board.java +++ b/core/src/ch/asynk/creepingarmor/engine/Board.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine; +package ch.asynk.creepingarmor.engine;  import java.util.Iterator;  import java.util.Collection; @@ -16,10 +16,10 @@ import com.badlogic.gdx.graphics.glutils.ShapeRenderer;  import com.badlogic.gdx.math.Matrix4; -import ch.asynk.tankontank.engine.gfx.Animation; -import ch.asynk.tankontank.engine.gfx.animations.AnimationSequence; -import ch.asynk.tankontank.engine.gfx.animations.RunnableAnimation; -import ch.asynk.tankontank.engine.gfx.animations.MoveToAnimation.MoveToAnimationCb; +import ch.asynk.creepingarmor.engine.gfx.Animation; +import ch.asynk.creepingarmor.engine.gfx.animations.AnimationSequence; +import ch.asynk.creepingarmor.engine.gfx.animations.RunnableAnimation; +import ch.asynk.creepingarmor.engine.gfx.animations.MoveToAnimation.MoveToAnimationCb;  public abstract class Board implements Disposable, Animation  { diff --git a/core/src/ch/asynk/tankontank/engine/Faction.java b/core/src/ch/asynk/creepingarmor/engine/Faction.java index c697894..b45f351 100644 --- a/core/src/ch/asynk/tankontank/engine/Faction.java +++ b/core/src/ch/asynk/creepingarmor/engine/Faction.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine; +package ch.asynk.creepingarmor.engine;  public interface Faction  { diff --git a/core/src/ch/asynk/tankontank/engine/HeadedPawn.java b/core/src/ch/asynk/creepingarmor/engine/HeadedPawn.java index 7da5b8b..3b78cd5 100644 --- a/core/src/ch/asynk/tankontank/engine/HeadedPawn.java +++ b/core/src/ch/asynk/creepingarmor/engine/HeadedPawn.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine; +package ch.asynk.creepingarmor.engine;  import com.badlogic.gdx.graphics.g2d.Batch;  import com.badlogic.gdx.graphics.g2d.Sprite; diff --git a/core/src/ch/asynk/tankontank/engine/Meteorology.java b/core/src/ch/asynk/creepingarmor/engine/Meteorology.java index 4ece6ce..6d5319e 100644 --- a/core/src/ch/asynk/tankontank/engine/Meteorology.java +++ b/core/src/ch/asynk/creepingarmor/engine/Meteorology.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine; +package ch.asynk.creepingarmor.engine;  public class Meteorology  { diff --git a/core/src/ch/asynk/tankontank/engine/Move.java b/core/src/ch/asynk/creepingarmor/engine/Move.java index 06035c3..2f33982 100644 --- a/core/src/ch/asynk/tankontank/engine/Move.java +++ b/core/src/ch/asynk/creepingarmor/engine/Move.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine; +package ch.asynk.creepingarmor.engine;  import java.util.Iterator; diff --git a/core/src/ch/asynk/tankontank/engine/Objective.java b/core/src/ch/asynk/creepingarmor/engine/Objective.java index 1686122..c923cdd 100644 --- a/core/src/ch/asynk/tankontank/engine/Objective.java +++ b/core/src/ch/asynk/creepingarmor/engine/Objective.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine; +package ch.asynk.creepingarmor.engine;  public class Objective  { diff --git a/core/src/ch/asynk/tankontank/engine/ObjectiveSet.java b/core/src/ch/asynk/creepingarmor/engine/ObjectiveSet.java index 2effb6b..be1b0bb 100644 --- a/core/src/ch/asynk/tankontank/engine/ObjectiveSet.java +++ b/core/src/ch/asynk/creepingarmor/engine/ObjectiveSet.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine; +package ch.asynk.creepingarmor.engine;  import java.util.Collection;  import java.util.HashMap; diff --git a/core/src/ch/asynk/tankontank/engine/Order.java b/core/src/ch/asynk/creepingarmor/engine/Order.java index 47269d2..51fa8b0 100644 --- a/core/src/ch/asynk/tankontank/engine/Order.java +++ b/core/src/ch/asynk/creepingarmor/engine/Order.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine; +package ch.asynk.creepingarmor.engine;  import java.lang.Comparable; diff --git a/core/src/ch/asynk/tankontank/engine/OrderList.java b/core/src/ch/asynk/creepingarmor/engine/OrderList.java index 17836da..c5d7037 100644 --- a/core/src/ch/asynk/tankontank/engine/OrderList.java +++ b/core/src/ch/asynk/creepingarmor/engine/OrderList.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine; +package ch.asynk.creepingarmor.engine;  import java.util.LinkedList;  import java.util.Iterator; diff --git a/core/src/ch/asynk/tankontank/engine/Orientation.java b/core/src/ch/asynk/creepingarmor/engine/Orientation.java index 550bb9f..a061d05 100644 --- a/core/src/ch/asynk/tankontank/engine/Orientation.java +++ b/core/src/ch/asynk/creepingarmor/engine/Orientation.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine; +package ch.asynk.creepingarmor.engine;  public enum Orientation  { diff --git a/core/src/ch/asynk/tankontank/engine/Path.java b/core/src/ch/asynk/creepingarmor/engine/Path.java index 8ed7f8d..20da213 100644 --- a/core/src/ch/asynk/tankontank/engine/Path.java +++ b/core/src/ch/asynk/creepingarmor/engine/Path.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine; +package ch.asynk.creepingarmor.engine;  import java.util.ArrayList; diff --git a/core/src/ch/asynk/tankontank/engine/PathBuilder.java b/core/src/ch/asynk/creepingarmor/engine/PathBuilder.java index d63b0b0..bad14e8 100644 --- a/core/src/ch/asynk/tankontank/engine/PathBuilder.java +++ b/core/src/ch/asynk/creepingarmor/engine/PathBuilder.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine; +package ch.asynk.creepingarmor.engine;  import java.util.ArrayList;  import java.util.List; diff --git a/core/src/ch/asynk/tankontank/engine/PathIterator.java b/core/src/ch/asynk/creepingarmor/engine/PathIterator.java index 083f9c2..ca74ed4 100644 --- a/core/src/ch/asynk/tankontank/engine/PathIterator.java +++ b/core/src/ch/asynk/creepingarmor/engine/PathIterator.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine; +package ch.asynk.creepingarmor.engine;  import java.util.List;  import java.util.Iterator; diff --git a/core/src/ch/asynk/tankontank/engine/Pawn.java b/core/src/ch/asynk/creepingarmor/engine/Pawn.java index 3209cc1..7f82f1c 100644 --- a/core/src/ch/asynk/tankontank/engine/Pawn.java +++ b/core/src/ch/asynk/creepingarmor/engine/Pawn.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine; +package ch.asynk.creepingarmor.engine;  import java.util.Iterator; @@ -13,11 +13,11 @@ import com.badlogic.gdx.graphics.glutils.ShapeRenderer;  import com.badlogic.gdx.math.Vector2;  import com.badlogic.gdx.math.Vector3; -import ch.asynk.tankontank.engine.gfx.Moveable; -import ch.asynk.tankontank.engine.gfx.StackedImages; -import ch.asynk.tankontank.engine.gfx.animations.MoveToAnimation; -import ch.asynk.tankontank.engine.gfx.animations.RunnableAnimation; -import ch.asynk.tankontank.engine.gfx.animations.AnimationSequence; +import ch.asynk.creepingarmor.engine.gfx.Moveable; +import ch.asynk.creepingarmor.engine.gfx.StackedImages; +import ch.asynk.creepingarmor.engine.gfx.animations.MoveToAnimation; +import ch.asynk.creepingarmor.engine.gfx.animations.RunnableAnimation; +import ch.asynk.creepingarmor.engine.gfx.animations.AnimationSequence;  public abstract class Pawn implements Moveable, Disposable  { diff --git a/core/src/ch/asynk/tankontank/engine/SearchBoard.java b/core/src/ch/asynk/creepingarmor/engine/SearchBoard.java index 199a7a7..2a7db3e 100644 --- a/core/src/ch/asynk/tankontank/engine/SearchBoard.java +++ b/core/src/ch/asynk/creepingarmor/engine/SearchBoard.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine; +package ch.asynk.creepingarmor.engine;  import java.util.List;  import java.util.ArrayList; diff --git a/core/src/ch/asynk/tankontank/engine/SelectedTile.java b/core/src/ch/asynk/creepingarmor/engine/SelectedTile.java index 2c44ac9..4157f4c 100644 --- a/core/src/ch/asynk/tankontank/engine/SelectedTile.java +++ b/core/src/ch/asynk/creepingarmor/engine/SelectedTile.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine; +package ch.asynk.creepingarmor.engine;  import com.badlogic.gdx.utils.Disposable; @@ -6,9 +6,9 @@ import com.badlogic.gdx.graphics.Texture;  import com.badlogic.gdx.graphics.g2d.Batch;  import com.badlogic.gdx.graphics.glutils.ShapeRenderer; -import ch.asynk.tankontank.engine.gfx.Drawable; -import ch.asynk.tankontank.engine.gfx.Animation; -import ch.asynk.tankontank.engine.gfx.animations.Sprites; +import ch.asynk.creepingarmor.engine.gfx.Drawable; +import ch.asynk.creepingarmor.engine.gfx.Animation; +import ch.asynk.creepingarmor.engine.gfx.animations.Sprites;  public class SelectedTile implements Disposable, Drawable, Animation  { diff --git a/core/src/ch/asynk/tankontank/engine/Tile.java b/core/src/ch/asynk/creepingarmor/engine/Tile.java index 5f10fb1..bd4138a 100644 --- a/core/src/ch/asynk/tankontank/engine/Tile.java +++ b/core/src/ch/asynk/creepingarmor/engine/Tile.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine; +package ch.asynk.creepingarmor.engine;  import java.util.List;  import java.util.Iterator; @@ -11,9 +11,9 @@ import com.badlogic.gdx.graphics.g2d.TextureAtlas;  import com.badlogic.gdx.graphics.glutils.ShapeRenderer;  import com.badlogic.gdx.math.Vector2; -import ch.asynk.tankontank.engine.Board; -import ch.asynk.tankontank.engine.gfx.Drawable; -import ch.asynk.tankontank.engine.gfx.StackedImages; +import ch.asynk.creepingarmor.engine.Board; +import ch.asynk.creepingarmor.engine.gfx.Drawable; +import ch.asynk.creepingarmor.engine.gfx.StackedImages;  public abstract class Tile implements Drawable, Disposable, Iterable<Pawn>  { diff --git a/core/src/ch/asynk/tankontank/engine/gfx/Animation.java b/core/src/ch/asynk/creepingarmor/engine/gfx/Animation.java index 595c0da..ab82ea5 100644 --- a/core/src/ch/asynk/tankontank/engine/gfx/Animation.java +++ b/core/src/ch/asynk/creepingarmor/engine/gfx/Animation.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine.gfx; +package ch.asynk.creepingarmor.engine.gfx;  import com.badlogic.gdx.utils.Disposable; diff --git a/core/src/ch/asynk/tankontank/engine/gfx/Drawable.java b/core/src/ch/asynk/creepingarmor/engine/gfx/Drawable.java index 433a019..5f5117a 100644 --- a/core/src/ch/asynk/tankontank/engine/gfx/Drawable.java +++ b/core/src/ch/asynk/creepingarmor/engine/gfx/Drawable.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine.gfx; +package ch.asynk.creepingarmor.engine.gfx;  import com.badlogic.gdx.graphics.g2d.Batch;  import com.badlogic.gdx.graphics.glutils.ShapeRenderer; diff --git a/core/src/ch/asynk/tankontank/engine/gfx/Moveable.java b/core/src/ch/asynk/creepingarmor/engine/gfx/Moveable.java index 0f57595..a20810d 100644 --- a/core/src/ch/asynk/tankontank/engine/gfx/Moveable.java +++ b/core/src/ch/asynk/creepingarmor/engine/gfx/Moveable.java @@ -1,6 +1,6 @@ -package ch.asynk.tankontank.engine.gfx; +package ch.asynk.creepingarmor.engine.gfx; -import ch.asynk.tankontank.engine.Faction; +import ch.asynk.creepingarmor.engine.Faction;  public interface Moveable extends Drawable  { diff --git a/core/src/ch/asynk/tankontank/engine/gfx/StackedImages.java b/core/src/ch/asynk/creepingarmor/engine/gfx/StackedImages.java index cb91016..60d4a42 100644 --- a/core/src/ch/asynk/tankontank/engine/gfx/StackedImages.java +++ b/core/src/ch/asynk/creepingarmor/engine/gfx/StackedImages.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine.gfx; +package ch.asynk.creepingarmor.engine.gfx;  import com.badlogic.gdx.utils.Disposable; diff --git a/core/src/ch/asynk/tankontank/engine/gfx/animations/AnimationSequence.java b/core/src/ch/asynk/creepingarmor/engine/gfx/animations/AnimationSequence.java index 4a111f3..7ac9eb1 100644 --- a/core/src/ch/asynk/tankontank/engine/gfx/animations/AnimationSequence.java +++ b/core/src/ch/asynk/creepingarmor/engine/gfx/animations/AnimationSequence.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine.gfx.animations; +package ch.asynk.creepingarmor.engine.gfx.animations;  import java.util.ArrayList; @@ -6,7 +6,7 @@ import com.badlogic.gdx.utils.Pool;  import com.badlogic.gdx.graphics.g2d.Batch;  import com.badlogic.gdx.graphics.glutils.ShapeRenderer; -import ch.asynk.tankontank.engine.gfx.Animation; +import ch.asynk.creepingarmor.engine.gfx.Animation;  public class AnimationSequence implements Animation, Pool.Poolable  { diff --git a/core/src/ch/asynk/tankontank/engine/gfx/animations/DestroyAnimation.java b/core/src/ch/asynk/creepingarmor/engine/gfx/animations/DestroyAnimation.java index da05d1a..16d84b0 100644 --- a/core/src/ch/asynk/tankontank/engine/gfx/animations/DestroyAnimation.java +++ b/core/src/ch/asynk/creepingarmor/engine/gfx/animations/DestroyAnimation.java @@ -1,11 +1,11 @@ -package ch.asynk.tankontank.engine.gfx.animations; +package ch.asynk.creepingarmor.engine.gfx.animations;  import com.badlogic.gdx.utils.Disposable;  import com.badlogic.gdx.graphics.g2d.Batch;  import com.badlogic.gdx.graphics.glutils.ShapeRenderer; -import ch.asynk.tankontank.engine.gfx.Moveable; -import ch.asynk.tankontank.engine.gfx.Animation; +import ch.asynk.creepingarmor.engine.gfx.Moveable; +import ch.asynk.creepingarmor.engine.gfx.Animation;  public class DestroyAnimation implements Disposable, Animation  { diff --git a/core/src/ch/asynk/tankontank/engine/gfx/animations/DiceAnimation.java b/core/src/ch/asynk/creepingarmor/engine/gfx/animations/DiceAnimation.java index fbedea6..4d2ca67 100644 --- a/core/src/ch/asynk/tankontank/engine/gfx/animations/DiceAnimation.java +++ b/core/src/ch/asynk/creepingarmor/engine/gfx/animations/DiceAnimation.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine.gfx.animations; +package ch.asynk.creepingarmor.engine.gfx.animations;  import java.util.Random; @@ -8,8 +8,8 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion;  import com.badlogic.gdx.graphics.g2d.Batch;  import com.badlogic.gdx.graphics.glutils.ShapeRenderer; -import ch.asynk.tankontank.engine.gfx.Drawable; -import ch.asynk.tankontank.engine.gfx.Animation; +import ch.asynk.creepingarmor.engine.gfx.Drawable; +import ch.asynk.creepingarmor.engine.gfx.Animation;  public class DiceAnimation implements Animation, Drawable  { diff --git a/core/src/ch/asynk/tankontank/engine/gfx/animations/FireAnimation.java b/core/src/ch/asynk/creepingarmor/engine/gfx/animations/FireAnimation.java index a13c234..c221460 100644 --- a/core/src/ch/asynk/tankontank/engine/gfx/animations/FireAnimation.java +++ b/core/src/ch/asynk/creepingarmor/engine/gfx/animations/FireAnimation.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine.gfx.animations; +package ch.asynk.creepingarmor.engine.gfx.animations;  import java.util.Random; diff --git a/core/src/ch/asynk/tankontank/engine/gfx/animations/InfantryFireAnimation.java b/core/src/ch/asynk/creepingarmor/engine/gfx/animations/InfantryFireAnimation.java index 81c8713..b478a2b 100644 --- a/core/src/ch/asynk/tankontank/engine/gfx/animations/InfantryFireAnimation.java +++ b/core/src/ch/asynk/creepingarmor/engine/gfx/animations/InfantryFireAnimation.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine.gfx.animations; +package ch.asynk.creepingarmor.engine.gfx.animations;  import java.util.Random; @@ -11,8 +11,8 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion;  import com.badlogic.gdx.graphics.g2d.Batch;  import com.badlogic.gdx.graphics.glutils.ShapeRenderer; -import ch.asynk.tankontank.engine.gfx.Drawable; -import ch.asynk.tankontank.engine.gfx.Animation; +import ch.asynk.creepingarmor.engine.gfx.Drawable; +import ch.asynk.creepingarmor.engine.gfx.Animation;  public class InfantryFireAnimation implements Disposable, Animation, Pool.Poolable  { diff --git a/core/src/ch/asynk/tankontank/engine/gfx/animations/MoveToAnimation.java b/core/src/ch/asynk/creepingarmor/engine/gfx/animations/MoveToAnimation.java index ac09367..a1d548c 100644 --- a/core/src/ch/asynk/tankontank/engine/gfx/animations/MoveToAnimation.java +++ b/core/src/ch/asynk/creepingarmor/engine/gfx/animations/MoveToAnimation.java @@ -1,11 +1,11 @@ -package ch.asynk.tankontank.engine.gfx.animations; +package ch.asynk.creepingarmor.engine.gfx.animations;  import com.badlogic.gdx.math.Vector3;  import com.badlogic.gdx.utils.Pool;  import com.badlogic.gdx.graphics.g2d.Batch;  import com.badlogic.gdx.graphics.glutils.ShapeRenderer; -import ch.asynk.tankontank.engine.gfx.Moveable; +import ch.asynk.creepingarmor.engine.gfx.Moveable;  public class MoveToAnimation extends TimedAnimation  { diff --git a/core/src/ch/asynk/tankontank/engine/gfx/animations/PromoteAnimation.java b/core/src/ch/asynk/creepingarmor/engine/gfx/animations/PromoteAnimation.java index d9f84d9..1d8d98e 100644 --- a/core/src/ch/asynk/tankontank/engine/gfx/animations/PromoteAnimation.java +++ b/core/src/ch/asynk/creepingarmor/engine/gfx/animations/PromoteAnimation.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine.gfx.animations; +package ch.asynk.creepingarmor.engine.gfx.animations;  import java.lang.Math; @@ -8,8 +8,8 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion;  import com.badlogic.gdx.graphics.g2d.Batch;  import com.badlogic.gdx.graphics.glutils.ShapeRenderer; -import ch.asynk.tankontank.engine.gfx.Drawable; -import ch.asynk.tankontank.engine.gfx.Animation; +import ch.asynk.creepingarmor.engine.gfx.Drawable; +import ch.asynk.creepingarmor.engine.gfx.Animation;  public class PromoteAnimation implements Animation, Drawable  { diff --git a/core/src/ch/asynk/tankontank/engine/gfx/animations/RunnableAnimation.java b/core/src/ch/asynk/creepingarmor/engine/gfx/animations/RunnableAnimation.java index 4f81f33..6c09904 100644 --- a/core/src/ch/asynk/tankontank/engine/gfx/animations/RunnableAnimation.java +++ b/core/src/ch/asynk/creepingarmor/engine/gfx/animations/RunnableAnimation.java @@ -1,11 +1,11 @@ -package ch.asynk.tankontank.engine.gfx.animations; +package ch.asynk.creepingarmor.engine.gfx.animations;  import com.badlogic.gdx.utils.Pool;  import com.badlogic.gdx.graphics.g2d.Batch;  import com.badlogic.gdx.graphics.glutils.ShapeRenderer; -import ch.asynk.tankontank.engine.gfx.Moveable; -import ch.asynk.tankontank.engine.gfx.Animation; +import ch.asynk.creepingarmor.engine.gfx.Moveable; +import ch.asynk.creepingarmor.engine.gfx.Animation;  public class RunnableAnimation implements Animation, Pool.Poolable  { diff --git a/core/src/ch/asynk/tankontank/engine/gfx/animations/SoundAnimation.java b/core/src/ch/asynk/creepingarmor/engine/gfx/animations/SoundAnimation.java index 797b09b..9c6a289 100644 --- a/core/src/ch/asynk/tankontank/engine/gfx/animations/SoundAnimation.java +++ b/core/src/ch/asynk/creepingarmor/engine/gfx/animations/SoundAnimation.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine.gfx.animations; +package ch.asynk.creepingarmor.engine.gfx.animations;  import com.badlogic.gdx.utils.Pool;  import com.badlogic.gdx.audio.Sound; diff --git a/core/src/ch/asynk/tankontank/engine/gfx/animations/SpriteAnimation.java b/core/src/ch/asynk/creepingarmor/engine/gfx/animations/SpriteAnimation.java index 7a94810..377cf6b 100644 --- a/core/src/ch/asynk/tankontank/engine/gfx/animations/SpriteAnimation.java +++ b/core/src/ch/asynk/creepingarmor/engine/gfx/animations/SpriteAnimation.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine.gfx.animations; +package ch.asynk.creepingarmor.engine.gfx.animations;  import java.util.Random; @@ -9,8 +9,8 @@ import com.badlogic.gdx.graphics.g2d.Batch;  import com.badlogic.gdx.graphics.g2d.TextureRegion;  import com.badlogic.gdx.graphics.glutils.ShapeRenderer; -import ch.asynk.tankontank.engine.gfx.Drawable; -import ch.asynk.tankontank.engine.gfx.Animation; +import ch.asynk.creepingarmor.engine.gfx.Drawable; +import ch.asynk.creepingarmor.engine.gfx.Animation;  public class SpriteAnimation implements Disposable, Animation  { diff --git a/core/src/ch/asynk/tankontank/engine/gfx/animations/Sprites.java b/core/src/ch/asynk/creepingarmor/engine/gfx/animations/Sprites.java index a3bf2a4..407b8a5 100644 --- a/core/src/ch/asynk/tankontank/engine/gfx/animations/Sprites.java +++ b/core/src/ch/asynk/creepingarmor/engine/gfx/animations/Sprites.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine.gfx.animations; +package ch.asynk.creepingarmor.engine.gfx.animations;  import com.badlogic.gdx.utils.Disposable;  import com.badlogic.gdx.graphics.Texture; diff --git a/core/src/ch/asynk/tankontank/engine/gfx/animations/TankFireAnimation.java b/core/src/ch/asynk/creepingarmor/engine/gfx/animations/TankFireAnimation.java index 8411bac..55ee435 100644 --- a/core/src/ch/asynk/tankontank/engine/gfx/animations/TankFireAnimation.java +++ b/core/src/ch/asynk/creepingarmor/engine/gfx/animations/TankFireAnimation.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.engine.gfx.animations; +package ch.asynk.creepingarmor.engine.gfx.animations;  import java.util.Random; @@ -9,8 +9,8 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion;  import com.badlogic.gdx.graphics.g2d.Batch;  import com.badlogic.gdx.graphics.glutils.ShapeRenderer; -import ch.asynk.tankontank.engine.gfx.Drawable; -import ch.asynk.tankontank.engine.gfx.Animation; +import ch.asynk.creepingarmor.engine.gfx.Drawable; +import ch.asynk.creepingarmor.engine.gfx.Animation;  public class TankFireAnimation implements Disposable, Animation, Pool.Poolable  { diff --git a/core/src/ch/asynk/tankontank/engine/gfx/animations/TimedAnimation.java b/core/src/ch/asynk/creepingarmor/engine/gfx/animations/TimedAnimation.java index 96eed32..376b03e 100644 --- a/core/src/ch/asynk/tankontank/engine/gfx/animations/TimedAnimation.java +++ b/core/src/ch/asynk/creepingarmor/engine/gfx/animations/TimedAnimation.java @@ -1,8 +1,8 @@ -package ch.asynk.tankontank.engine.gfx.animations; +package ch.asynk.creepingarmor.engine.gfx.animations;  import com.badlogic.gdx.utils.Pool; -import ch.asynk.tankontank.engine.gfx.Animation; +import ch.asynk.creepingarmor.engine.gfx.Animation;  public abstract class TimedAnimation implements Animation, Pool.Poolable  { diff --git a/core/src/ch/asynk/tankontank/game/Army.java b/core/src/ch/asynk/creepingarmor/game/Army.java index 7a5454e..dbf5656 100644 --- a/core/src/ch/asynk/tankontank/game/Army.java +++ b/core/src/ch/asynk/creepingarmor/game/Army.java @@ -1,6 +1,6 @@ -package ch.asynk.tankontank.game; +package ch.asynk.creepingarmor.game; -import ch.asynk.tankontank.engine.Faction; +import ch.asynk.creepingarmor.engine.Faction;  public enum Army implements Faction  { diff --git a/core/src/ch/asynk/tankontank/game/Battle.java b/core/src/ch/asynk/creepingarmor/game/Battle.java index 8625dd4..9a4a0c3 100644 --- a/core/src/ch/asynk/tankontank/game/Battle.java +++ b/core/src/ch/asynk/creepingarmor/game/Battle.java @@ -1,10 +1,10 @@ -package ch.asynk.tankontank.game; +package ch.asynk.creepingarmor.game; -import ch.asynk.tankontank.game.Zone; -import ch.asynk.tankontank.game.Unit; -import ch.asynk.tankontank.game.Player; -import ch.asynk.tankontank.game.battles.Factory.MapType; -import ch.asynk.tankontank.ui.Position; +import ch.asynk.creepingarmor.game.Zone; +import ch.asynk.creepingarmor.game.Unit; +import ch.asynk.creepingarmor.game.Player; +import ch.asynk.creepingarmor.game.battles.Factory.MapType; +import ch.asynk.creepingarmor.ui.Position;  public interface Battle  { diff --git a/core/src/ch/asynk/tankontank/game/Command.java b/core/src/ch/asynk/creepingarmor/game/Command.java index 7416713..34af71b 100644 --- a/core/src/ch/asynk/tankontank/game/Command.java +++ b/core/src/ch/asynk/creepingarmor/game/Command.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.game; +package ch.asynk.creepingarmor.game;  import java.util.List; @@ -6,10 +6,10 @@ import com.badlogic.gdx.utils.Pool;  import com.badlogic.gdx.utils.Json;  import com.badlogic.gdx.utils.JsonValue; -import ch.asynk.tankontank.engine.Order; -import ch.asynk.tankontank.engine.Move; -import ch.asynk.tankontank.engine.Pawn; -import ch.asynk.tankontank.engine.Tile; +import ch.asynk.creepingarmor.engine.Order; +import ch.asynk.creepingarmor.engine.Move; +import ch.asynk.creepingarmor.engine.Pawn; +import ch.asynk.creepingarmor.engine.Tile;  public  class Command extends Order  { diff --git a/core/src/ch/asynk/tankontank/game/Config.java b/core/src/ch/asynk/creepingarmor/game/Config.java index aa0084a..88a7fe2 100644 --- a/core/src/ch/asynk/tankontank/game/Config.java +++ b/core/src/ch/asynk/creepingarmor/game/Config.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.game; +package ch.asynk.creepingarmor.game;  public class Config  { diff --git a/core/src/ch/asynk/tankontank/game/Ctrl.java b/core/src/ch/asynk/creepingarmor/game/Ctrl.java index b410651..f4696f1 100644 --- a/core/src/ch/asynk/tankontank/game/Ctrl.java +++ b/core/src/ch/asynk/creepingarmor/game/Ctrl.java @@ -1,26 +1,26 @@ -package ch.asynk.tankontank.game; +package ch.asynk.creepingarmor.game;  import com.badlogic.gdx.utils.Disposable;  import com.badlogic.gdx.math.Vector3; -import ch.asynk.tankontank.TankOnTank; -import ch.asynk.tankontank.ui.Position; -import ch.asynk.tankontank.game.State.StateType; -import ch.asynk.tankontank.game.states.StateSelect; -import ch.asynk.tankontank.game.states.StateMove; -import ch.asynk.tankontank.game.states.StateRotate; -import ch.asynk.tankontank.game.states.StatePromote; -import ch.asynk.tankontank.game.states.StateEngage; -import ch.asynk.tankontank.game.states.StateBreak; -import ch.asynk.tankontank.game.states.StateAnimation; -import ch.asynk.tankontank.game.states.StateReinforcement; -import ch.asynk.tankontank.game.states.StateDeployment; -import ch.asynk.tankontank.game.states.StateWithdraw; +import ch.asynk.creepingarmor.CreepingArmor; +import ch.asynk.creepingarmor.ui.Position; +import ch.asynk.creepingarmor.game.State.StateType; +import ch.asynk.creepingarmor.game.states.StateSelect; +import ch.asynk.creepingarmor.game.states.StateMove; +import ch.asynk.creepingarmor.game.states.StateRotate; +import ch.asynk.creepingarmor.game.states.StatePromote; +import ch.asynk.creepingarmor.game.states.StateEngage; +import ch.asynk.creepingarmor.game.states.StateBreak; +import ch.asynk.creepingarmor.game.states.StateAnimation; +import ch.asynk.creepingarmor.game.states.StateReinforcement; +import ch.asynk.creepingarmor.game.states.StateDeployment; +import ch.asynk.creepingarmor.game.states.StateWithdraw;  public class Ctrl implements Disposable  { -    private final TankOnTank game; +    private final CreepingArmor game;      public final Battle battle;      public Map map; @@ -51,7 +51,7 @@ public class Ctrl implements Disposable      private StateType stateType;      private StateType stateAfterAnimation; -    public Ctrl(final TankOnTank game, final Battle battle) +    public Ctrl(final CreepingArmor game, final Battle battle)      {          this.game = game;          this.battle = battle; @@ -166,7 +166,7 @@ public class Ctrl implements Disposable          if (nextState == StateType.DONE) {              map.actionDone();              if (map.activatedUnits.size() > 0) { -                TankOnTank.debug("Ctrl", "burn down 1AP"); +                CreepingArmor.debug("Ctrl", "burn down 1AP");                  hud.notify("1 Action Point burnt", 0.6f, Position.BOTTOM_CENTER, false);                  player.burnDownOneAp();                  hud.update(); @@ -205,7 +205,7 @@ public class Ctrl implements Disposable          this.state.leave(nextState); -        TankOnTank.debug("Ctrl", String.format("  %s -> %s : %s", stateType, nextState, player)); +        CreepingArmor.debug("Ctrl", String.format("  %s -> %s : %s", stateType, nextState, player));          switch(nextState) {              case SELECT: diff --git a/core/src/ch/asynk/tankontank/game/Engagement.java b/core/src/ch/asynk/creepingarmor/game/Engagement.java index 1dc7ce6..1468181 100644 --- a/core/src/ch/asynk/tankontank/game/Engagement.java +++ b/core/src/ch/asynk/creepingarmor/game/Engagement.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.game; +package ch.asynk.creepingarmor.game;  import java.util.List;  import java.util.LinkedList; diff --git a/core/src/ch/asynk/tankontank/game/Hex.java b/core/src/ch/asynk/creepingarmor/game/Hex.java index e86612d..cca4fad 100644 --- a/core/src/ch/asynk/tankontank/game/Hex.java +++ b/core/src/ch/asynk/creepingarmor/game/Hex.java @@ -1,15 +1,15 @@ -package ch.asynk.tankontank.game; +package ch.asynk.creepingarmor.game;  import java.util.List;  import java.util.Iterator;  import com.badlogic.gdx.graphics.g2d.TextureAtlas; -import ch.asynk.tankontank.engine.Board; -import ch.asynk.tankontank.engine.Pawn; -import ch.asynk.tankontank.engine.Tile; -import ch.asynk.tankontank.engine.Orientation; -import ch.asynk.tankontank.game.Unit.UnitType; +import ch.asynk.creepingarmor.engine.Board; +import ch.asynk.creepingarmor.engine.Pawn; +import ch.asynk.creepingarmor.engine.Tile; +import ch.asynk.creepingarmor.engine.Orientation; +import ch.asynk.creepingarmor.game.Unit.UnitType;  public class Hex extends Tile  { diff --git a/core/src/ch/asynk/tankontank/game/HexSet.java b/core/src/ch/asynk/creepingarmor/game/HexSet.java index 2f78a89..bcbfa2d 100644 --- a/core/src/ch/asynk/tankontank/game/HexSet.java +++ b/core/src/ch/asynk/creepingarmor/game/HexSet.java @@ -1,9 +1,9 @@ -package ch.asynk.tankontank.game; +package ch.asynk.creepingarmor.game;  import java.util.Collection;  import java.util.LinkedHashSet; -import ch.asynk.tankontank.engine.Tile; +import ch.asynk.creepingarmor.engine.Tile;  public class HexSet extends LinkedHashSet<Hex>  { diff --git a/core/src/ch/asynk/tankontank/game/Hud.java b/core/src/ch/asynk/creepingarmor/game/Hud.java index 204dcb5..1220a2d 100644 --- a/core/src/ch/asynk/tankontank/game/Hud.java +++ b/core/src/ch/asynk/creepingarmor/game/Hud.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.game; +package ch.asynk.creepingarmor.game;  import java.util.LinkedList; @@ -11,25 +11,25 @@ import com.badlogic.gdx.graphics.g2d.TextureAtlas;  import com.badlogic.gdx.graphics.g2d.BitmapFont;  import com.badlogic.gdx.graphics.glutils.ShapeRenderer; -import ch.asynk.tankontank.engine.gfx.Animation; -import ch.asynk.tankontank.game.State.StateType; -import ch.asynk.tankontank.ui.Position; -import ch.asynk.tankontank.ui.Msg; -import ch.asynk.tankontank.ui.OkCancel; -import ch.asynk.tankontank.ui.Widget; -import ch.asynk.tankontank.game.hud.PlayerInfo; -import ch.asynk.tankontank.game.hud.ActionButtons; -import ch.asynk.tankontank.game.hud.StatisticsPanel; -import ch.asynk.tankontank.game.hud.EngagementPanel; +import ch.asynk.creepingarmor.engine.gfx.Animation; +import ch.asynk.creepingarmor.game.State.StateType; +import ch.asynk.creepingarmor.ui.Position; +import ch.asynk.creepingarmor.ui.Msg; +import ch.asynk.creepingarmor.ui.OkCancel; +import ch.asynk.creepingarmor.ui.Widget; +import ch.asynk.creepingarmor.game.hud.PlayerInfo; +import ch.asynk.creepingarmor.game.hud.ActionButtons; +import ch.asynk.creepingarmor.game.hud.StatisticsPanel; +import ch.asynk.creepingarmor.game.hud.EngagementPanel; -import ch.asynk.tankontank.TankOnTank; +import ch.asynk.creepingarmor.CreepingArmor;  public class Hud implements Disposable, Animation  {      public static final float OFFSET = 10f;      public static final float NOTIFY_DURATION = 2f; -    private final TankOnTank game; +    private final CreepingArmor game;      private final Ctrl ctrl;      private Object hit; @@ -52,7 +52,7 @@ public class Hud implements Disposable, Animation      }      private OkCancelAction okCancelAction; -    public Hud(final Ctrl ctrl, final TankOnTank game) +    public Hud(final Ctrl ctrl, final CreepingArmor game)      {          this.game = game;          this.ctrl = ctrl; diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/creepingarmor/game/Map.java index a924f29..00d720b 100644 --- a/core/src/ch/asynk/tankontank/game/Map.java +++ b/core/src/ch/asynk/creepingarmor/game/Map.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.game; +package ch.asynk.creepingarmor.game;  import com.badlogic.gdx.audio.Sound;  import com.badlogic.gdx.assets.AssetManager; @@ -6,32 +6,32 @@ import com.badlogic.gdx.graphics.Texture;  import com.badlogic.gdx.graphics.g2d.TextureAtlas;  import com.badlogic.gdx.graphics.glutils.ShapeRenderer; -import ch.asynk.tankontank.TankOnTank; -import ch.asynk.tankontank.engine.Pawn; -import ch.asynk.tankontank.engine.Board; -import ch.asynk.tankontank.engine.Tile; -import ch.asynk.tankontank.engine.Faction; -import ch.asynk.tankontank.engine.Move; -import ch.asynk.tankontank.engine.SelectedTile; -import ch.asynk.tankontank.engine.ObjectiveSet; -import ch.asynk.tankontank.engine.OrderList; -import ch.asynk.tankontank.engine.Orientation; -import ch.asynk.tankontank.engine.Meteorology; -import ch.asynk.tankontank.engine.PathBuilder; -import ch.asynk.tankontank.engine.gfx.Moveable; -import ch.asynk.tankontank.engine.gfx.Animation; -import ch.asynk.tankontank.engine.gfx.animations.AnimationSequence; -import ch.asynk.tankontank.engine.gfx.animations.DiceAnimation; -import ch.asynk.tankontank.engine.gfx.animations.FireAnimation; -import ch.asynk.tankontank.engine.gfx.animations.TankFireAnimation; -import ch.asynk.tankontank.engine.gfx.animations.InfantryFireAnimation; -import ch.asynk.tankontank.engine.gfx.animations.PromoteAnimation; -import ch.asynk.tankontank.engine.gfx.animations.DestroyAnimation; -import ch.asynk.tankontank.engine.gfx.animations.SoundAnimation; -import ch.asynk.tankontank.engine.gfx.animations.RunnableAnimation; -import ch.asynk.tankontank.engine.gfx.animations.MoveToAnimation.MoveToAnimationCb; - -import ch.asynk.tankontank.ui.Position; +import ch.asynk.creepingarmor.CreepingArmor; +import ch.asynk.creepingarmor.engine.Pawn; +import ch.asynk.creepingarmor.engine.Board; +import ch.asynk.creepingarmor.engine.Tile; +import ch.asynk.creepingarmor.engine.Faction; +import ch.asynk.creepingarmor.engine.Move; +import ch.asynk.creepingarmor.engine.SelectedTile; +import ch.asynk.creepingarmor.engine.ObjectiveSet; +import ch.asynk.creepingarmor.engine.OrderList; +import ch.asynk.creepingarmor.engine.Orientation; +import ch.asynk.creepingarmor.engine.Meteorology; +import ch.asynk.creepingarmor.engine.PathBuilder; +import ch.asynk.creepingarmor.engine.gfx.Moveable; +import ch.asynk.creepingarmor.engine.gfx.Animation; +import ch.asynk.creepingarmor.engine.gfx.animations.AnimationSequence; +import ch.asynk.creepingarmor.engine.gfx.animations.DiceAnimation; +import ch.asynk.creepingarmor.engine.gfx.animations.FireAnimation; +import ch.asynk.creepingarmor.engine.gfx.animations.TankFireAnimation; +import ch.asynk.creepingarmor.engine.gfx.animations.InfantryFireAnimation; +import ch.asynk.creepingarmor.engine.gfx.animations.PromoteAnimation; +import ch.asynk.creepingarmor.engine.gfx.animations.DestroyAnimation; +import ch.asynk.creepingarmor.engine.gfx.animations.SoundAnimation; +import ch.asynk.creepingarmor.engine.gfx.animations.RunnableAnimation; +import ch.asynk.creepingarmor.engine.gfx.animations.MoveToAnimation.MoveToAnimationCb; + +import ch.asynk.creepingarmor.ui.Position;  public abstract class Map extends Board implements MoveToAnimationCb, ObjectiveSet.ObjectiveCb  { @@ -59,7 +59,7 @@ public abstract class Map extends Board implements MoveToAnimationCb, ObjectiveS      protected abstract void setup(); -    public Map(final TankOnTank game, Board.Config cfg, String textureName) +    public Map(final CreepingArmor game, Board.Config cfg, String textureName)      {          super(game.factory, cfg, game.manager.get(textureName, Texture.class),                  new SelectedTile(game.manager.get("data/hex.png", Texture.class), new float[] {.2f, .1f, .1f, .1f, .2f, .1f} )); @@ -254,7 +254,7 @@ public abstract class Map extends Board implements MoveToAnimationCb, ObjectiveS      private int process(Unit unit, Move move)      { -        TankOnTank.debug("  Move", String.format("%s %s", move.type, move.toString())); +        CreepingArmor.debug("  Move", String.format("%s %s", move.type, move.toString()));          int r = 1; @@ -308,7 +308,7 @@ public abstract class Map extends Board implements MoveToAnimationCb, ObjectiveS      private int process(Command cmd)      { -        TankOnTank.debug("Command", cmd.toString()); +        CreepingArmor.debug("Command", cmd.toString());          int r = 1; @@ -344,7 +344,7 @@ public abstract class Map extends Board implements MoveToAnimationCb, ObjectiveS      public void turnDone()      { -        TankOnTank.debug("TurnDone", String.format(" Processed Commands : %d", commands.size())); +        CreepingArmor.debug("TurnDone", String.format(" Processed Commands : %d", commands.size()));          if (objectives.modifiedCount() > 0)              throw new RuntimeException("objectives not cleared"); @@ -393,7 +393,7 @@ public abstract class Map extends Board implements MoveToAnimationCb, ObjectiveS      public void revertMoves()      {          for (Unit unit: activatedUnits) { -            TankOnTank.debug("    revertMove() " + unit); +            CreepingArmor.debug("    revertMove() " + unit);              revertLastPawnMove(unit);              commands.dispose(unit, Command.CommandType.MOVE);          } @@ -403,7 +403,7 @@ public abstract class Map extends Board implements MoveToAnimationCb, ObjectiveS      public void revertEnter(final Unit unit)      { -        TankOnTank.debug("    revertEnter() "+ unit); +        CreepingArmor.debug("    revertEnter() "+ unit);          removePawn(unit);          objectives.revert(this);          ctrl.player.revertUnitEntry(unit); diff --git a/core/src/ch/asynk/tankontank/game/Player.java b/core/src/ch/asynk/creepingarmor/game/Player.java index d9048bf..020118a 100644 --- a/core/src/ch/asynk/tankontank/game/Player.java +++ b/core/src/ch/asynk/creepingarmor/game/Player.java @@ -1,9 +1,9 @@ -package ch.asynk.tankontank.game; +package ch.asynk.creepingarmor.game;  import java.util.Random;  import java.util.List; -import ch.asynk.tankontank.TankOnTank; +import ch.asynk.creepingarmor.CreepingArmor;  public class Player  { @@ -26,7 +26,7 @@ public class Player      public int lostEngagementCount;      public int wonEngagementCount; -    public Player(final TankOnTank game, Army army, int n) +    public Player(final CreepingArmor game, Army army, int n)      {          this.army = army;          this.units = new UnitList(n); @@ -155,7 +155,7 @@ public class Player      {          apSpent += 1;          actionCount += 1; -        if (apSpent > actionPoints) TankOnTank.debug("ERROR: spent too much AP, please report"); +        if (apSpent > actionPoints) CreepingArmor.debug("ERROR: spent too much AP, please report");      }      public void turnEnd() diff --git a/core/src/ch/asynk/tankontank/game/State.java b/core/src/ch/asynk/creepingarmor/game/State.java index efbf7f9..a0af2e2 100644 --- a/core/src/ch/asynk/tankontank/game/State.java +++ b/core/src/ch/asynk/creepingarmor/game/State.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.game; +package ch.asynk.creepingarmor.game;  public interface State  { diff --git a/core/src/ch/asynk/tankontank/game/Unit.java b/core/src/ch/asynk/creepingarmor/game/Unit.java index dcca201..f209ea2 100644 --- a/core/src/ch/asynk/tankontank/game/Unit.java +++ b/core/src/ch/asynk/creepingarmor/game/Unit.java @@ -1,15 +1,15 @@ -package ch.asynk.tankontank.game; +package ch.asynk.creepingarmor.game;  import com.badlogic.gdx.graphics.g2d.TextureRegion;  import com.badlogic.gdx.graphics.g2d.TextureAtlas; -import ch.asynk.tankontank.engine.Pawn; -import ch.asynk.tankontank.engine.Tile; -import ch.asynk.tankontank.engine.HeadedPawn; -import ch.asynk.tankontank.engine.Orientation; -import ch.asynk.tankontank.game.Hex.Terrain; +import ch.asynk.creepingarmor.engine.Pawn; +import ch.asynk.creepingarmor.engine.Tile; +import ch.asynk.creepingarmor.engine.HeadedPawn; +import ch.asynk.creepingarmor.engine.Orientation; +import ch.asynk.creepingarmor.game.Hex.Terrain; -import ch.asynk.tankontank.TankOnTank; +import ch.asynk.creepingarmor.CreepingArmor;  public class Unit extends HeadedPawn  { @@ -304,7 +304,7 @@ public class Unit extends HeadedPawn              cost -= getRoadMarchBonus();          if (cost > mpLeft) -            TankOnTank.debug("ERROR: Movement point exceeded: " + cost + "/" + mpLeft + " please report"); +            CreepingArmor.debug("ERROR: Movement point exceeded: " + cost + "/" + mpLeft + " please report");          if (move.isFinal())              setMoved(); diff --git a/core/src/ch/asynk/tankontank/game/UnitList.java b/core/src/ch/asynk/creepingarmor/game/UnitList.java index 4019add..2e4ee27 100644 --- a/core/src/ch/asynk/tankontank/game/UnitList.java +++ b/core/src/ch/asynk/creepingarmor/game/UnitList.java @@ -1,9 +1,9 @@ -package ch.asynk.tankontank.game; +package ch.asynk.creepingarmor.game;  import java.util.Collection;  import java.util.ArrayList; -import ch.asynk.tankontank.engine.Pawn; +import ch.asynk.creepingarmor.engine.Pawn;  public class UnitList extends ArrayList<Unit>  { diff --git a/core/src/ch/asynk/tankontank/game/Zone.java b/core/src/ch/asynk/creepingarmor/game/Zone.java index de3a0d9..f7c0a82 100644 --- a/core/src/ch/asynk/tankontank/game/Zone.java +++ b/core/src/ch/asynk/creepingarmor/game/Zone.java @@ -1,6 +1,6 @@ -package ch.asynk.tankontank.game; +package ch.asynk.creepingarmor.game; -import ch.asynk.tankontank.engine.Orientation; +import ch.asynk.creepingarmor.engine.Orientation;  public class Zone extends HexSet  { diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleCommon.java b/core/src/ch/asynk/creepingarmor/game/battles/BattleCommon.java index 413b8ab..fb1ab53 100644 --- a/core/src/ch/asynk/tankontank/game/battles/BattleCommon.java +++ b/core/src/ch/asynk/creepingarmor/game/battles/BattleCommon.java @@ -1,20 +1,20 @@ -package ch.asynk.tankontank.game.battles; +package ch.asynk.creepingarmor.game.battles;  import java.util.Random;  import java.util.HashMap;  import java.util.ArrayList; -import ch.asynk.tankontank.game.Army; -import ch.asynk.tankontank.game.Battle; -import ch.asynk.tankontank.game.Player; -import ch.asynk.tankontank.game.Ctrl; -import ch.asynk.tankontank.game.Map; -import ch.asynk.tankontank.game.Zone; -import ch.asynk.tankontank.game.Hex; -import ch.asynk.tankontank.game.HexSet; -import ch.asynk.tankontank.game.Unit; -import ch.asynk.tankontank.game.Unit.UnitId; -import ch.asynk.tankontank.game.State.StateType; +import ch.asynk.creepingarmor.game.Army; +import ch.asynk.creepingarmor.game.Battle; +import ch.asynk.creepingarmor.game.Player; +import ch.asynk.creepingarmor.game.Ctrl; +import ch.asynk.creepingarmor.game.Map; +import ch.asynk.creepingarmor.game.Zone; +import ch.asynk.creepingarmor.game.Hex; +import ch.asynk.creepingarmor.game.HexSet; +import ch.asynk.creepingarmor.game.Unit; +import ch.asynk.creepingarmor.game.Unit.UnitId; +import ch.asynk.creepingarmor.game.State.StateType;  public abstract class BattleCommon implements Battle  { diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleCounterAttack.java b/core/src/ch/asynk/creepingarmor/game/battles/BattleCounterAttack.java index bcc08f2..a06d7cd 100644 --- a/core/src/ch/asynk/tankontank/game/battles/BattleCounterAttack.java +++ b/core/src/ch/asynk/creepingarmor/game/battles/BattleCounterAttack.java @@ -1,14 +1,14 @@ -package ch.asynk.tankontank.game.battles; - -import ch.asynk.tankontank.game.Army; -import ch.asynk.tankontank.game.Player; -import ch.asynk.tankontank.game.Ctrl; -import ch.asynk.tankontank.game.Map; -import ch.asynk.tankontank.game.Zone; -import ch.asynk.tankontank.game.Unit; -import ch.asynk.tankontank.game.Unit.UnitId; -import ch.asynk.tankontank.ui.Position; -import ch.asynk.tankontank.engine.Orientation; +package ch.asynk.creepingarmor.game.battles; + +import ch.asynk.creepingarmor.game.Army; +import ch.asynk.creepingarmor.game.Player; +import ch.asynk.creepingarmor.game.Ctrl; +import ch.asynk.creepingarmor.game.Map; +import ch.asynk.creepingarmor.game.Zone; +import ch.asynk.creepingarmor.game.Unit; +import ch.asynk.creepingarmor.game.Unit.UnitId; +import ch.asynk.creepingarmor.ui.Position; +import ch.asynk.creepingarmor.engine.Orientation;  public class BattleCounterAttack extends BattleCommon  { diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleFrontalAssault.java b/core/src/ch/asynk/creepingarmor/game/battles/BattleFrontalAssault.java index e3436cf..a7f5726 100644 --- a/core/src/ch/asynk/tankontank/game/battles/BattleFrontalAssault.java +++ b/core/src/ch/asynk/creepingarmor/game/battles/BattleFrontalAssault.java @@ -1,16 +1,16 @@ -package ch.asynk.tankontank.game.battles; +package ch.asynk.creepingarmor.game.battles; -import ch.asynk.tankontank.game.Army; -import ch.asynk.tankontank.game.Player; -import ch.asynk.tankontank.game.Ctrl; -import ch.asynk.tankontank.game.Map; -import ch.asynk.tankontank.game.Hex; -import ch.asynk.tankontank.game.HexSet; -import ch.asynk.tankontank.game.Zone; -import ch.asynk.tankontank.game.Unit; -import ch.asynk.tankontank.game.Unit.UnitId; -import ch.asynk.tankontank.ui.Position; -import ch.asynk.tankontank.engine.Orientation; +import ch.asynk.creepingarmor.game.Army; +import ch.asynk.creepingarmor.game.Player; +import ch.asynk.creepingarmor.game.Ctrl; +import ch.asynk.creepingarmor.game.Map; +import ch.asynk.creepingarmor.game.Hex; +import ch.asynk.creepingarmor.game.HexSet; +import ch.asynk.creepingarmor.game.Zone; +import ch.asynk.creepingarmor.game.Unit; +import ch.asynk.creepingarmor.game.Unit.UnitId; +import ch.asynk.creepingarmor.ui.Position; +import ch.asynk.creepingarmor.engine.Orientation;  public class BattleFrontalAssault extends BattleCommon  { diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java b/core/src/ch/asynk/creepingarmor/game/battles/BattleHeadToHead.java index 0bb6e7e..26d2b1d 100644 --- a/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java +++ b/core/src/ch/asynk/creepingarmor/game/battles/BattleHeadToHead.java @@ -1,16 +1,16 @@ -package ch.asynk.tankontank.game.battles; +package ch.asynk.creepingarmor.game.battles; -import ch.asynk.tankontank.game.Zone; -import ch.asynk.tankontank.game.Army; -import ch.asynk.tankontank.game.Player; -import ch.asynk.tankontank.game.Ctrl; -import ch.asynk.tankontank.game.Map; -import ch.asynk.tankontank.game.Hex; -import ch.asynk.tankontank.game.HexSet; -import ch.asynk.tankontank.game.Unit; -import ch.asynk.tankontank.game.Unit.UnitId; -import ch.asynk.tankontank.ui.Position; -import ch.asynk.tankontank.engine.Orientation; +import ch.asynk.creepingarmor.game.Zone; +import ch.asynk.creepingarmor.game.Army; +import ch.asynk.creepingarmor.game.Player; +import ch.asynk.creepingarmor.game.Ctrl; +import ch.asynk.creepingarmor.game.Map; +import ch.asynk.creepingarmor.game.Hex; +import ch.asynk.creepingarmor.game.HexSet; +import ch.asynk.creepingarmor.game.Unit; +import ch.asynk.creepingarmor.game.Unit.UnitId; +import ch.asynk.creepingarmor.ui.Position; +import ch.asynk.creepingarmor.engine.Orientation;  public class BattleHeadToHead extends BattleCommon  { diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleLastStand.java b/core/src/ch/asynk/creepingarmor/game/battles/BattleLastStand.java index a8b1952..6d7e035 100644 --- a/core/src/ch/asynk/tankontank/game/battles/BattleLastStand.java +++ b/core/src/ch/asynk/creepingarmor/game/battles/BattleLastStand.java @@ -1,16 +1,16 @@ -package ch.asynk.tankontank.game.battles; +package ch.asynk.creepingarmor.game.battles; -import ch.asynk.tankontank.game.Zone; -import ch.asynk.tankontank.game.Army; -import ch.asynk.tankontank.game.Player; -import ch.asynk.tankontank.game.Ctrl; -import ch.asynk.tankontank.game.Map; -import ch.asynk.tankontank.game.Hex; -import ch.asynk.tankontank.game.HexSet; -import ch.asynk.tankontank.game.Unit; -import ch.asynk.tankontank.game.Unit.UnitId; -import ch.asynk.tankontank.ui.Position; -import ch.asynk.tankontank.engine.Orientation; +import ch.asynk.creepingarmor.game.Zone; +import ch.asynk.creepingarmor.game.Army; +import ch.asynk.creepingarmor.game.Player; +import ch.asynk.creepingarmor.game.Ctrl; +import ch.asynk.creepingarmor.game.Map; +import ch.asynk.creepingarmor.game.Hex; +import ch.asynk.creepingarmor.game.HexSet; +import ch.asynk.creepingarmor.game.Unit; +import ch.asynk.creepingarmor.game.Unit.UnitId; +import ch.asynk.creepingarmor.ui.Position; +import ch.asynk.creepingarmor.engine.Orientation;  public class BattleLastStand extends BattleCommon  { diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleNightAction.java b/core/src/ch/asynk/creepingarmor/game/battles/BattleNightAction.java index ddcb9ae..965327a 100644 --- a/core/src/ch/asynk/tankontank/game/battles/BattleNightAction.java +++ b/core/src/ch/asynk/creepingarmor/game/battles/BattleNightAction.java @@ -1,17 +1,17 @@ -package ch.asynk.tankontank.game.battles; +package ch.asynk.creepingarmor.game.battles; -import ch.asynk.tankontank.game.Zone; -import ch.asynk.tankontank.game.Army; -import ch.asynk.tankontank.game.Player; -import ch.asynk.tankontank.game.Ctrl; -import ch.asynk.tankontank.game.Map; -import ch.asynk.tankontank.game.Hex; -import ch.asynk.tankontank.game.HexSet; -import ch.asynk.tankontank.game.Unit; -import ch.asynk.tankontank.game.Unit.UnitId; -import ch.asynk.tankontank.ui.Position; -import ch.asynk.tankontank.engine.Orientation; -import ch.asynk.tankontank.engine.Meteorology; +import ch.asynk.creepingarmor.game.Zone; +import ch.asynk.creepingarmor.game.Army; +import ch.asynk.creepingarmor.game.Player; +import ch.asynk.creepingarmor.game.Ctrl; +import ch.asynk.creepingarmor.game.Map; +import ch.asynk.creepingarmor.game.Hex; +import ch.asynk.creepingarmor.game.HexSet; +import ch.asynk.creepingarmor.game.Unit; +import ch.asynk.creepingarmor.game.Unit.UnitId; +import ch.asynk.creepingarmor.ui.Position; +import ch.asynk.creepingarmor.engine.Orientation; +import ch.asynk.creepingarmor.engine.Meteorology;  public class BattleNightAction extends BattleCommon  { diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleStabToTheFlank.java b/core/src/ch/asynk/creepingarmor/game/battles/BattleStabToTheFlank.java index 5e910d4..d2d1457 100644 --- a/core/src/ch/asynk/tankontank/game/battles/BattleStabToTheFlank.java +++ b/core/src/ch/asynk/creepingarmor/game/battles/BattleStabToTheFlank.java @@ -1,16 +1,16 @@ -package ch.asynk.tankontank.game.battles; - -import ch.asynk.tankontank.game.Zone; -import ch.asynk.tankontank.game.Army; -import ch.asynk.tankontank.game.Player; -import ch.asynk.tankontank.game.Ctrl; -import ch.asynk.tankontank.game.Map; -import ch.asynk.tankontank.game.Hex; -import ch.asynk.tankontank.game.HexSet; -import ch.asynk.tankontank.game.Unit; -import ch.asynk.tankontank.game.Unit.UnitId; -import ch.asynk.tankontank.ui.Position; -import ch.asynk.tankontank.engine.Orientation; +package ch.asynk.creepingarmor.game.battles; + +import ch.asynk.creepingarmor.game.Zone; +import ch.asynk.creepingarmor.game.Army; +import ch.asynk.creepingarmor.game.Player; +import ch.asynk.creepingarmor.game.Ctrl; +import ch.asynk.creepingarmor.game.Map; +import ch.asynk.creepingarmor.game.Hex; +import ch.asynk.creepingarmor.game.HexSet; +import ch.asynk.creepingarmor.game.Unit; +import ch.asynk.creepingarmor.game.Unit.UnitId; +import ch.asynk.creepingarmor.ui.Position; +import ch.asynk.creepingarmor.engine.Orientation;  public class BattleStabToTheFlank extends BattleCommon  { diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleTest.java b/core/src/ch/asynk/creepingarmor/game/battles/BattleTest.java index e844d15..6c1d6c1 100644 --- a/core/src/ch/asynk/tankontank/game/battles/BattleTest.java +++ b/core/src/ch/asynk/creepingarmor/game/battles/BattleTest.java @@ -1,16 +1,16 @@ -package ch.asynk.tankontank.game.battles; - -import ch.asynk.tankontank.game.Army; -import ch.asynk.tankontank.game.Player; -import ch.asynk.tankontank.game.Ctrl; -import ch.asynk.tankontank.game.Map; -import ch.asynk.tankontank.game.Hex; -import ch.asynk.tankontank.game.HexSet; -import ch.asynk.tankontank.game.Zone; -import ch.asynk.tankontank.game.Unit; -import ch.asynk.tankontank.game.Unit.UnitId; -import ch.asynk.tankontank.ui.Position; -import ch.asynk.tankontank.engine.Orientation; +package ch.asynk.creepingarmor.game.battles; + +import ch.asynk.creepingarmor.game.Army; +import ch.asynk.creepingarmor.game.Player; +import ch.asynk.creepingarmor.game.Ctrl; +import ch.asynk.creepingarmor.game.Map; +import ch.asynk.creepingarmor.game.Hex; +import ch.asynk.creepingarmor.game.HexSet; +import ch.asynk.creepingarmor.game.Zone; +import ch.asynk.creepingarmor.game.Unit; +import ch.asynk.creepingarmor.game.Unit.UnitId; +import ch.asynk.creepingarmor.ui.Position; +import ch.asynk.creepingarmor.engine.Orientation;  public class BattleTest extends BattleCommon  { diff --git a/core/src/ch/asynk/tankontank/game/battles/Factory.java b/core/src/ch/asynk/creepingarmor/game/battles/Factory.java index 7002e43..4af2536 100644 --- a/core/src/ch/asynk/tankontank/game/battles/Factory.java +++ b/core/src/ch/asynk/creepingarmor/game/battles/Factory.java @@ -1,25 +1,25 @@ -package ch.asynk.tankontank.game.battles; +package ch.asynk.creepingarmor.game.battles;  import com.badlogic.gdx.utils.Disposable;  import com.badlogic.gdx.graphics.g2d.TextureAtlas; -import ch.asynk.tankontank.TankOnTank; -import ch.asynk.tankontank.engine.Board; -import ch.asynk.tankontank.game.Player; -import ch.asynk.tankontank.game.Map; -import ch.asynk.tankontank.game.Hex; -import ch.asynk.tankontank.game.Army; -import ch.asynk.tankontank.game.Unit; -import ch.asynk.tankontank.game.Unit.UnitId; -import ch.asynk.tankontank.game.Unit.UnitType; -import ch.asynk.tankontank.game.Battle; -import ch.asynk.tankontank.game.battles.BattleHeadToHead; -import ch.asynk.tankontank.game.battles.BattleFrontalAssault; -import ch.asynk.tankontank.game.battles.BattleLastStand; -import ch.asynk.tankontank.game.battles.BattleCounterAttack; -import ch.asynk.tankontank.game.battles.BattleStabToTheFlank; -import ch.asynk.tankontank.game.battles.BattleNightAction; -import ch.asynk.tankontank.game.battles.BattleTest; +import ch.asynk.creepingarmor.CreepingArmor; +import ch.asynk.creepingarmor.engine.Board; +import ch.asynk.creepingarmor.game.Player; +import ch.asynk.creepingarmor.game.Map; +import ch.asynk.creepingarmor.game.Hex; +import ch.asynk.creepingarmor.game.Army; +import ch.asynk.creepingarmor.game.Unit; +import ch.asynk.creepingarmor.game.Unit.UnitId; +import ch.asynk.creepingarmor.game.Unit.UnitType; +import ch.asynk.creepingarmor.game.Battle; +import ch.asynk.creepingarmor.game.battles.BattleHeadToHead; +import ch.asynk.creepingarmor.game.battles.BattleFrontalAssault; +import ch.asynk.creepingarmor.game.battles.BattleLastStand; +import ch.asynk.creepingarmor.game.battles.BattleCounterAttack; +import ch.asynk.creepingarmor.game.battles.BattleStabToTheFlank; +import ch.asynk.creepingarmor.game.battles.BattleNightAction; +import ch.asynk.creepingarmor.game.battles.BattleTest;  public class Factory implements Board.TileBuilder, Disposable  { @@ -40,9 +40,9 @@ public class Factory implements Board.TileBuilder, Disposable      public TextureAtlas pawnOverlaysAtlas;      public TextureAtlas tileOverlaysAtlas;      public Battle battles[]; -    private final TankOnTank game; +    private final CreepingArmor game; -    public Factory(final TankOnTank game) +    public Factory(final CreepingArmor game)      {          this.game = game;          this.assetsLoaded = false; diff --git a/core/src/ch/asynk/tankontank/game/battles/MapA.java b/core/src/ch/asynk/creepingarmor/game/battles/MapA.java index 3f18e39..11c2ddd 100644 --- a/core/src/ch/asynk/tankontank/game/battles/MapA.java +++ b/core/src/ch/asynk/creepingarmor/game/battles/MapA.java @@ -1,14 +1,14 @@ -package ch.asynk.tankontank.game.battles; +package ch.asynk.creepingarmor.game.battles; -import ch.asynk.tankontank.TankOnTank; -import ch.asynk.tankontank.engine.Board; -import ch.asynk.tankontank.engine.Orientation; -import ch.asynk.tankontank.game.Map; -import ch.asynk.tankontank.game.Hex; +import ch.asynk.creepingarmor.CreepingArmor; +import ch.asynk.creepingarmor.engine.Board; +import ch.asynk.creepingarmor.engine.Orientation; +import ch.asynk.creepingarmor.game.Map; +import ch.asynk.creepingarmor.game.Hex;  public class MapA extends Map  { -    public MapA(final TankOnTank game, Board.Config cfg, String textureName) +    public MapA(final CreepingArmor game, Board.Config cfg, String textureName)      {          super(game, cfg, textureName);      } diff --git a/core/src/ch/asynk/tankontank/game/battles/MapB.java b/core/src/ch/asynk/creepingarmor/game/battles/MapB.java index c0f23a2..1248cea 100644 --- a/core/src/ch/asynk/tankontank/game/battles/MapB.java +++ b/core/src/ch/asynk/creepingarmor/game/battles/MapB.java @@ -1,14 +1,14 @@ -package ch.asynk.tankontank.game.battles; +package ch.asynk.creepingarmor.game.battles; -import ch.asynk.tankontank.TankOnTank; -import ch.asynk.tankontank.engine.Board; -import ch.asynk.tankontank.engine.Orientation; -import ch.asynk.tankontank.game.Map; -import ch.asynk.tankontank.game.Hex; +import ch.asynk.creepingarmor.CreepingArmor; +import ch.asynk.creepingarmor.engine.Board; +import ch.asynk.creepingarmor.engine.Orientation; +import ch.asynk.creepingarmor.game.Map; +import ch.asynk.creepingarmor.game.Hex;  public class MapB extends Map  { -    public MapB(final TankOnTank game, Board.Config cfg, String textureName) +    public MapB(final CreepingArmor game, Board.Config cfg, String textureName)      {          super(game, cfg, textureName);      } diff --git a/core/src/ch/asynk/tankontank/game/hud/ActionButtons.java b/core/src/ch/asynk/creepingarmor/game/hud/ActionButtons.java index a2dcf12..1e85a5e 100644 --- a/core/src/ch/asynk/tankontank/game/hud/ActionButtons.java +++ b/core/src/ch/asynk/creepingarmor/game/hud/ActionButtons.java @@ -1,15 +1,15 @@ -package ch.asynk.tankontank.game.hud; +package ch.asynk.creepingarmor.game.hud;  import com.badlogic.gdx.graphics.g2d.Sprite;  import com.badlogic.gdx.graphics.g2d.Batch;  import com.badlogic.gdx.graphics.g2d.TextureAtlas;  import com.badlogic.gdx.graphics.glutils.ShapeRenderer; -import ch.asynk.tankontank.game.Ctrl; -import ch.asynk.tankontank.game.State.StateType; -import ch.asynk.tankontank.ui.Widget; -import ch.asynk.tankontank.ui.Bg; -import ch.asynk.tankontank.ui.Position; +import ch.asynk.creepingarmor.game.Ctrl; +import ch.asynk.creepingarmor.game.State.StateType; +import ch.asynk.creepingarmor.ui.Widget; +import ch.asynk.creepingarmor.ui.Bg; +import ch.asynk.creepingarmor.ui.Position;  public class ActionButtons extends Widget  { diff --git a/core/src/ch/asynk/tankontank/game/hud/EngagementPanel.java b/core/src/ch/asynk/creepingarmor/game/hud/EngagementPanel.java index 9e9df1c..5471dfb 100644 --- a/core/src/ch/asynk/tankontank/game/hud/EngagementPanel.java +++ b/core/src/ch/asynk/creepingarmor/game/hud/EngagementPanel.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.game.hud; +package ch.asynk.creepingarmor.game.hud;  import com.badlogic.gdx.graphics.g2d.Batch;  import com.badlogic.gdx.graphics.g2d.Sprite; @@ -6,14 +6,14 @@ import com.badlogic.gdx.graphics.g2d.BitmapFont;  import com.badlogic.gdx.graphics.g2d.TextureAtlas;  import com.badlogic.gdx.graphics.glutils.ShapeRenderer; -import ch.asynk.tankontank.game.Engagement; -import ch.asynk.tankontank.game.Army; -import ch.asynk.tankontank.engine.gfx.Animation; -import ch.asynk.tankontank.engine.gfx.animations.DiceAnimation; -import ch.asynk.tankontank.ui.Bg; -import ch.asynk.tankontank.ui.Label; -import ch.asynk.tankontank.ui.Patch; -import ch.asynk.tankontank.ui.Position; +import ch.asynk.creepingarmor.game.Engagement; +import ch.asynk.creepingarmor.game.Army; +import ch.asynk.creepingarmor.engine.gfx.Animation; +import ch.asynk.creepingarmor.engine.gfx.animations.DiceAnimation; +import ch.asynk.creepingarmor.ui.Bg; +import ch.asynk.creepingarmor.ui.Label; +import ch.asynk.creepingarmor.ui.Patch; +import ch.asynk.creepingarmor.ui.Position;  public class EngagementPanel extends Patch implements Animation  { diff --git a/core/src/ch/asynk/tankontank/game/hud/PlayerInfo.java b/core/src/ch/asynk/creepingarmor/game/hud/PlayerInfo.java index 45ee5dc..fbd843b 100644 --- a/core/src/ch/asynk/tankontank/game/hud/PlayerInfo.java +++ b/core/src/ch/asynk/creepingarmor/game/hud/PlayerInfo.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.game.hud; +package ch.asynk.creepingarmor.game.hud;  import com.badlogic.gdx.utils.Disposable; @@ -8,17 +8,17 @@ import com.badlogic.gdx.graphics.g2d.TextureAtlas;  import com.badlogic.gdx.graphics.g2d.BitmapFont;  import com.badlogic.gdx.graphics.glutils.ShapeRenderer; -import ch.asynk.tankontank.engine.gfx.Animation; -import ch.asynk.tankontank.engine.gfx.Drawable; - -import ch.asynk.tankontank.game.State.StateType; -import ch.asynk.tankontank.game.Ctrl; -import ch.asynk.tankontank.game.Hud; -import ch.asynk.tankontank.game.Army; -import ch.asynk.tankontank.game.Unit; -import ch.asynk.tankontank.game.Player; -import ch.asynk.tankontank.ui.LabelImage; -import ch.asynk.tankontank.ui.Position; +import ch.asynk.creepingarmor.engine.gfx.Animation; +import ch.asynk.creepingarmor.engine.gfx.Drawable; + +import ch.asynk.creepingarmor.game.State.StateType; +import ch.asynk.creepingarmor.game.Ctrl; +import ch.asynk.creepingarmor.game.Hud; +import ch.asynk.creepingarmor.game.Army; +import ch.asynk.creepingarmor.game.Unit; +import ch.asynk.creepingarmor.game.Player; +import ch.asynk.creepingarmor.ui.LabelImage; +import ch.asynk.creepingarmor.ui.Position;  public class PlayerInfo implements Disposable, Drawable, Animation  { diff --git a/core/src/ch/asynk/tankontank/game/hud/StatisticsPanel.java b/core/src/ch/asynk/creepingarmor/game/hud/StatisticsPanel.java index 9ad75a6..e4a70ce 100644 --- a/core/src/ch/asynk/tankontank/game/hud/StatisticsPanel.java +++ b/core/src/ch/asynk/creepingarmor/game/hud/StatisticsPanel.java @@ -1,15 +1,15 @@ -package ch.asynk.tankontank.game.hud; +package ch.asynk.creepingarmor.game.hud;  import com.badlogic.gdx.graphics.g2d.Batch;  import com.badlogic.gdx.graphics.g2d.BitmapFont;  import com.badlogic.gdx.graphics.g2d.TextureAtlas;  import com.badlogic.gdx.graphics.glutils.ShapeRenderer; -import ch.asynk.tankontank.game.Player; -import ch.asynk.tankontank.ui.Bg; -import ch.asynk.tankontank.ui.Label; -import ch.asynk.tankontank.ui.Patch; -import ch.asynk.tankontank.ui.Position; +import ch.asynk.creepingarmor.game.Player; +import ch.asynk.creepingarmor.ui.Bg; +import ch.asynk.creepingarmor.ui.Label; +import ch.asynk.creepingarmor.ui.Patch; +import ch.asynk.creepingarmor.ui.Position;  public class StatisticsPanel extends Patch  { diff --git a/core/src/ch/asynk/tankontank/game/hud/UnitDock.java b/core/src/ch/asynk/creepingarmor/game/hud/UnitDock.java index 05824e0..b4a2f6f 100644 --- a/core/src/ch/asynk/tankontank/game/hud/UnitDock.java +++ b/core/src/ch/asynk/creepingarmor/game/hud/UnitDock.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.game.hud; +package ch.asynk.creepingarmor.game.hud;  import com.badlogic.gdx.graphics.g2d.Batch;  import com.badlogic.gdx.graphics.g2d.TextureRegion; @@ -8,13 +8,13 @@ import com.badlogic.gdx.math.Vector3;  import com.badlogic.gdx.math.Matrix4;  import com.badlogic.gdx.math.Rectangle; -import ch.asynk.tankontank.engine.gfx.Animation; -import ch.asynk.tankontank.engine.Orientation; -import ch.asynk.tankontank.game.Ctrl; -import ch.asynk.tankontank.game.Unit; -import ch.asynk.tankontank.game.UnitList; -import ch.asynk.tankontank.ui.Bg; -import ch.asynk.tankontank.ui.Position; +import ch.asynk.creepingarmor.engine.gfx.Animation; +import ch.asynk.creepingarmor.engine.Orientation; +import ch.asynk.creepingarmor.game.Ctrl; +import ch.asynk.creepingarmor.game.Unit; +import ch.asynk.creepingarmor.game.UnitList; +import ch.asynk.creepingarmor.ui.Bg; +import ch.asynk.creepingarmor.ui.Position;  public class UnitDock extends Bg implements Animation  { diff --git a/core/src/ch/asynk/tankontank/game/states/StateAnimation.java b/core/src/ch/asynk/creepingarmor/game/states/StateAnimation.java index 2e115a9..512169a 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateAnimation.java +++ b/core/src/ch/asynk/creepingarmor/game/states/StateAnimation.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.game.states; +package ch.asynk.creepingarmor.game.states;  public class StateAnimation extends StateCommon  { diff --git a/core/src/ch/asynk/tankontank/game/states/StateBreak.java b/core/src/ch/asynk/creepingarmor/game/states/StateBreak.java index 9b87c23..3b474a5 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateBreak.java +++ b/core/src/ch/asynk/creepingarmor/game/states/StateBreak.java @@ -1,10 +1,10 @@ -package ch.asynk.tankontank.game.states; +package ch.asynk.creepingarmor.game.states; -import ch.asynk.tankontank.engine.Orientation; -import ch.asynk.tankontank.game.Unit; -import ch.asynk.tankontank.game.hud.ActionButtons.Buttons; +import ch.asynk.creepingarmor.engine.Orientation; +import ch.asynk.creepingarmor.game.Unit; +import ch.asynk.creepingarmor.game.hud.ActionButtons.Buttons; -import ch.asynk.tankontank.TankOnTank; +import ch.asynk.creepingarmor.CreepingArmor;  public class StateBreak extends StateCommon  { @@ -85,6 +85,6 @@ public class StateBreak extends StateCommon              map.moveUnit(activeUnit);              ctrl.setAfterAnimationState(StateType.DONE);          } else -            TankOnTank.debug("That's very wrong there should be only one path"); +            CreepingArmor.debug("That's very wrong there should be only one path");      }  } diff --git a/core/src/ch/asynk/tankontank/game/states/StateCommon.java b/core/src/ch/asynk/creepingarmor/game/states/StateCommon.java index a5cc875..8ac4ab7 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateCommon.java +++ b/core/src/ch/asynk/creepingarmor/game/states/StateCommon.java @@ -1,12 +1,12 @@ -package ch.asynk.tankontank.game.states; +package ch.asynk.creepingarmor.game.states; -import ch.asynk.tankontank.game.Map; -import ch.asynk.tankontank.game.Hex; -import ch.asynk.tankontank.game.Unit; -import ch.asynk.tankontank.game.Ctrl; -import ch.asynk.tankontank.game.State; +import ch.asynk.creepingarmor.game.Map; +import ch.asynk.creepingarmor.game.Hex; +import ch.asynk.creepingarmor.game.Unit; +import ch.asynk.creepingarmor.game.Ctrl; +import ch.asynk.creepingarmor.game.State; -import ch.asynk.tankontank.TankOnTank; +import ch.asynk.creepingarmor.CreepingArmor;  public abstract class StateCommon implements State  { diff --git a/core/src/ch/asynk/tankontank/game/states/StateDeployment.java b/core/src/ch/asynk/creepingarmor/game/states/StateDeployment.java index 91b5bd5..891156f 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateDeployment.java +++ b/core/src/ch/asynk/creepingarmor/game/states/StateDeployment.java @@ -1,13 +1,13 @@ -package ch.asynk.tankontank.game.states; +package ch.asynk.creepingarmor.game.states; -import ch.asynk.tankontank.engine.Orientation; -import ch.asynk.tankontank.game.Hex; -import ch.asynk.tankontank.game.Zone; -import ch.asynk.tankontank.game.Unit; -import ch.asynk.tankontank.game.UnitList; -import ch.asynk.tankontank.game.hud.ActionButtons.Buttons; +import ch.asynk.creepingarmor.engine.Orientation; +import ch.asynk.creepingarmor.game.Hex; +import ch.asynk.creepingarmor.game.Zone; +import ch.asynk.creepingarmor.game.Unit; +import ch.asynk.creepingarmor.game.UnitList; +import ch.asynk.creepingarmor.game.hud.ActionButtons.Buttons; -import ch.asynk.tankontank.TankOnTank; +import ch.asynk.creepingarmor.CreepingArmor;  public class StateDeployment extends StateCommon  { diff --git a/core/src/ch/asynk/tankontank/game/states/StateEngage.java b/core/src/ch/asynk/creepingarmor/game/states/StateEngage.java index 865907e..a9dc074 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateEngage.java +++ b/core/src/ch/asynk/creepingarmor/game/states/StateEngage.java @@ -1,9 +1,9 @@ -package ch.asynk.tankontank.game.states; +package ch.asynk.creepingarmor.game.states; -import ch.asynk.tankontank.game.Unit; -import ch.asynk.tankontank.game.hud.ActionButtons.Buttons; +import ch.asynk.creepingarmor.game.Unit; +import ch.asynk.creepingarmor.game.hud.ActionButtons.Buttons; -import ch.asynk.tankontank.TankOnTank; +import ch.asynk.creepingarmor.CreepingArmor;  public class StateEngage extends StateCommon  { @@ -28,7 +28,7 @@ public class StateEngage extends StateCommon              selectedUnit.showAttack();              map.selectHex(selectedHex);          } else -            TankOnTank.debug("should not happen"); +            CreepingArmor.debug("should not happen");      }      @Override diff --git a/core/src/ch/asynk/tankontank/game/states/StateMove.java b/core/src/ch/asynk/creepingarmor/game/states/StateMove.java index 9a8195d..9a586e3 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateMove.java +++ b/core/src/ch/asynk/creepingarmor/game/states/StateMove.java @@ -1,9 +1,9 @@ -package ch.asynk.tankontank.game.states; +package ch.asynk.creepingarmor.game.states; -import ch.asynk.tankontank.game.Hex; -import ch.asynk.tankontank.game.Unit; -import ch.asynk.tankontank.game.Zone; -import ch.asynk.tankontank.game.hud.ActionButtons.Buttons; +import ch.asynk.creepingarmor.game.Hex; +import ch.asynk.creepingarmor.game.Unit; +import ch.asynk.creepingarmor.game.Zone; +import ch.asynk.creepingarmor.game.hud.ActionButtons.Buttons;  public class StateMove extends StateCommon  { diff --git a/core/src/ch/asynk/tankontank/game/states/StatePromote.java b/core/src/ch/asynk/creepingarmor/game/states/StatePromote.java index 9f327e7..92a0d7b 100644 --- a/core/src/ch/asynk/tankontank/game/states/StatePromote.java +++ b/core/src/ch/asynk/creepingarmor/game/states/StatePromote.java @@ -1,6 +1,6 @@ -package ch.asynk.tankontank.game.states; +package ch.asynk.creepingarmor.game.states; -import ch.asynk.tankontank.game.Unit; +import ch.asynk.creepingarmor.game.Unit;  public class StatePromote extends StateCommon  { diff --git a/core/src/ch/asynk/tankontank/game/states/StateReinforcement.java b/core/src/ch/asynk/creepingarmor/game/states/StateReinforcement.java index 3ac5c95..4d0cce4 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateReinforcement.java +++ b/core/src/ch/asynk/creepingarmor/game/states/StateReinforcement.java @@ -1,9 +1,9 @@ -package ch.asynk.tankontank.game.states; +package ch.asynk.creepingarmor.game.states; -import ch.asynk.tankontank.game.Hex; -import ch.asynk.tankontank.game.Zone; -import ch.asynk.tankontank.game.Unit; -import ch.asynk.tankontank.game.hud.ActionButtons.Buttons; +import ch.asynk.creepingarmor.game.Hex; +import ch.asynk.creepingarmor.game.Zone; +import ch.asynk.creepingarmor.game.Unit; +import ch.asynk.creepingarmor.game.hud.ActionButtons.Buttons;  public class StateReinforcement extends StateCommon  { diff --git a/core/src/ch/asynk/tankontank/game/states/StateRotate.java b/core/src/ch/asynk/creepingarmor/game/states/StateRotate.java index d297840..4f8cf39 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateRotate.java +++ b/core/src/ch/asynk/creepingarmor/game/states/StateRotate.java @@ -1,9 +1,9 @@ -package ch.asynk.tankontank.game.states; +package ch.asynk.creepingarmor.game.states; -import ch.asynk.tankontank.engine.Orientation; -import ch.asynk.tankontank.game.hud.ActionButtons.Buttons; +import ch.asynk.creepingarmor.engine.Orientation; +import ch.asynk.creepingarmor.game.hud.ActionButtons.Buttons; -import ch.asynk.tankontank.TankOnTank; +import ch.asynk.creepingarmor.CreepingArmor;  public class StateRotate extends StateCommon  { @@ -26,7 +26,7 @@ public class StateRotate extends StateCommon          }          if (map.pathBuilder.size() != 1) -            TankOnTank.debug("ERROR: pathBuilder.size() == " + map.pathBuilder.size()); +            CreepingArmor.debug("ERROR: pathBuilder.size() == " + map.pathBuilder.size());          rotateOnly = (to == activeUnit.getHex()); diff --git a/core/src/ch/asynk/tankontank/game/states/StateSelect.java b/core/src/ch/asynk/creepingarmor/game/states/StateSelect.java index 387fbb0..a0863e1 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateSelect.java +++ b/core/src/ch/asynk/creepingarmor/game/states/StateSelect.java @@ -1,12 +1,12 @@ -package ch.asynk.tankontank.game.states; +package ch.asynk.creepingarmor.game.states; -import ch.asynk.tankontank.game.Map; -import ch.asynk.tankontank.game.Hex; -import ch.asynk.tankontank.game.Unit; -import ch.asynk.tankontank.game.Ctrl; -import ch.asynk.tankontank.game.hud.ActionButtons.Buttons; +import ch.asynk.creepingarmor.game.Map; +import ch.asynk.creepingarmor.game.Hex; +import ch.asynk.creepingarmor.game.Unit; +import ch.asynk.creepingarmor.game.Ctrl; +import ch.asynk.creepingarmor.game.hud.ActionButtons.Buttons; -import ch.asynk.tankontank.TankOnTank; +import ch.asynk.creepingarmor.CreepingArmor;  public class StateSelect extends StateCommon  { @@ -127,6 +127,6 @@ public class StateSelect extends StateCommon          }          ctrl.hud.actionButtons.show((ctrl.player.canPromote(selectedUnit)) ? Buttons.PROMOTE.b : 0 ); -        TankOnTank.debug("Select", selectedHex.toString() + " " + selectedUnit + (isEnemy ? " enemy " : " friend ")); +        CreepingArmor.debug("Select", selectedHex.toString() + " " + selectedUnit + (isEnemy ? " enemy " : " friend "));      }  } diff --git a/core/src/ch/asynk/tankontank/game/states/StateWithdraw.java b/core/src/ch/asynk/creepingarmor/game/states/StateWithdraw.java index 87c33b8..3d0dfdd 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateWithdraw.java +++ b/core/src/ch/asynk/creepingarmor/game/states/StateWithdraw.java @@ -1,8 +1,8 @@ -package ch.asynk.tankontank.game.states; +package ch.asynk.creepingarmor.game.states; -import ch.asynk.tankontank.game.Zone; -import ch.asynk.tankontank.game.Hex; -import ch.asynk.tankontank.game.Unit; +import ch.asynk.creepingarmor.game.Zone; +import ch.asynk.creepingarmor.game.Hex; +import ch.asynk.creepingarmor.game.Unit;  public class StateWithdraw extends StateCommon  { diff --git a/core/src/ch/asynk/tankontank/loading/LoadingBar.java b/core/src/ch/asynk/creepingarmor/loading/LoadingBar.java index 2b14713..61de99a 100644 --- a/core/src/ch/asynk/tankontank/loading/LoadingBar.java +++ b/core/src/ch/asynk/creepingarmor/loading/LoadingBar.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.loading; +package ch.asynk.creepingarmor.loading;  import com.badlogic.gdx.graphics.g2d.Animation;  import com.badlogic.gdx.graphics.g2d.Batch; diff --git a/core/src/ch/asynk/tankontank/menu/MainMenu.java b/core/src/ch/asynk/creepingarmor/menu/MainMenu.java index 8147f46..1c1a9f9 100644 --- a/core/src/ch/asynk/tankontank/menu/MainMenu.java +++ b/core/src/ch/asynk/creepingarmor/menu/MainMenu.java @@ -1,10 +1,10 @@ -package ch.asynk.tankontank.menu; +package ch.asynk.creepingarmor.menu;  import com.badlogic.gdx.Gdx;  import com.badlogic.gdx.graphics.g2d.BitmapFont;  import com.badlogic.gdx.graphics.g2d.TextureAtlas; -import ch.asynk.tankontank.ui.Menu; +import ch.asynk.creepingarmor.ui.Menu;  public class MainMenu extends Menu  { diff --git a/core/src/ch/asynk/tankontank/menu/OptionsMenu.java b/core/src/ch/asynk/creepingarmor/menu/OptionsMenu.java index c866d30..c933df3 100644 --- a/core/src/ch/asynk/tankontank/menu/OptionsMenu.java +++ b/core/src/ch/asynk/creepingarmor/menu/OptionsMenu.java @@ -1,16 +1,16 @@ -package ch.asynk.tankontank.menu; +package ch.asynk.creepingarmor.menu;  import com.badlogic.gdx.graphics.g2d.Batch;  import com.badlogic.gdx.graphics.g2d.BitmapFont;  import com.badlogic.gdx.graphics.g2d.GlyphLayout;  import com.badlogic.gdx.graphics.g2d.TextureAtlas; -import ch.asynk.tankontank.ui.Label; -import ch.asynk.tankontank.ui.Bg; -import ch.asynk.tankontank.ui.Patch; -import ch.asynk.tankontank.ui.OkCancel; +import ch.asynk.creepingarmor.ui.Label; +import ch.asynk.creepingarmor.ui.Bg; +import ch.asynk.creepingarmor.ui.Patch; +import ch.asynk.creepingarmor.ui.OkCancel; -import ch.asynk.tankontank.TankOnTank; +import ch.asynk.creepingarmor.CreepingArmor;  public class OptionsMenu extends Patch  { @@ -21,7 +21,7 @@ public class OptionsMenu extends Patch      public static int HSPACING = 30;      public static String CHECK = "#"; -    private final TankOnTank game; +    private final CreepingArmor game;      private final BitmapFont font;      private String [] checkStrings = { @@ -48,7 +48,7 @@ public class OptionsMenu extends Patch      private OkCancel okCancel;      protected Bg okBtn; -    public OptionsMenu(TankOnTank game, BitmapFont font, TextureAtlas atlas) +    public OptionsMenu(CreepingArmor game, BitmapFont font, TextureAtlas atlas)      {          super(atlas.createPatch("typewriter"));          this.game = game; diff --git a/core/src/ch/asynk/tankontank/menu/ScenariosMenu.java b/core/src/ch/asynk/creepingarmor/menu/ScenariosMenu.java index 7cd6499..ad71500 100644 --- a/core/src/ch/asynk/tankontank/menu/ScenariosMenu.java +++ b/core/src/ch/asynk/creepingarmor/menu/ScenariosMenu.java @@ -1,15 +1,15 @@ -package ch.asynk.tankontank.menu; +package ch.asynk.creepingarmor.menu;  import com.badlogic.gdx.graphics.g2d.Batch;  import com.badlogic.gdx.graphics.g2d.BitmapFont;  import com.badlogic.gdx.graphics.g2d.GlyphLayout;  import com.badlogic.gdx.graphics.g2d.TextureAtlas; -import ch.asynk.tankontank.ui.Label; -import ch.asynk.tankontank.ui.Bg; -import ch.asynk.tankontank.ui.Patch; -import ch.asynk.tankontank.TankOnTank; -import ch.asynk.tankontank.game.Battle; +import ch.asynk.creepingarmor.ui.Label; +import ch.asynk.creepingarmor.ui.Bg; +import ch.asynk.creepingarmor.ui.Patch; +import ch.asynk.creepingarmor.CreepingArmor; +import ch.asynk.creepingarmor.game.Battle;  public class ScenariosMenu extends Patch  { @@ -20,7 +20,7 @@ public class ScenariosMenu extends Patch      public static int HSPACING = 30;      public static String CHECK = "#"; -    private final TankOnTank game; +    private final CreepingArmor game;      private final BitmapFont font;      private float checkDy; @@ -31,7 +31,7 @@ public class ScenariosMenu extends Patch      public boolean launch; -    public ScenariosMenu(TankOnTank game, BitmapFont font, TextureAtlas atlas) +    public ScenariosMenu(CreepingArmor game, BitmapFont font, TextureAtlas atlas)      {          super(atlas.createPatch("typewriter"));          this.game = game; diff --git a/core/src/ch/asynk/tankontank/menu/TutorialsMenu.java b/core/src/ch/asynk/creepingarmor/menu/TutorialsMenu.java index 28f7276..44431e2 100644 --- a/core/src/ch/asynk/tankontank/menu/TutorialsMenu.java +++ b/core/src/ch/asynk/creepingarmor/menu/TutorialsMenu.java @@ -1,13 +1,13 @@ -package ch.asynk.tankontank.menu; +package ch.asynk.creepingarmor.menu;  import com.badlogic.gdx.graphics.g2d.Batch;  import com.badlogic.gdx.graphics.g2d.BitmapFont;  import com.badlogic.gdx.graphics.g2d.TextureAtlas; -import ch.asynk.tankontank.ui.Label; -import ch.asynk.tankontank.ui.Bg; -import ch.asynk.tankontank.ui.Patch; -import ch.asynk.tankontank.TankOnTank; +import ch.asynk.creepingarmor.ui.Label; +import ch.asynk.creepingarmor.ui.Bg; +import ch.asynk.creepingarmor.ui.Patch; +import ch.asynk.creepingarmor.CreepingArmor;  public class TutorialsMenu extends Patch  { @@ -16,14 +16,14 @@ public class TutorialsMenu extends Patch      public static int TITLE_PADDING = 30;      public static int VSPACING = 20; -    private final TankOnTank game; +    private final CreepingArmor game;      private final BitmapFont font;      private Label title;      private Label msg;      protected Bg okBtn; -    public TutorialsMenu(TankOnTank game, BitmapFont font, TextureAtlas atlas) +    public TutorialsMenu(CreepingArmor game, BitmapFont font, TextureAtlas atlas)      {          super(atlas.createPatch("typewriter"));          this.game = game; diff --git a/core/src/ch/asynk/tankontank/screens/GameCamera.java b/core/src/ch/asynk/creepingarmor/screens/GameCamera.java index 52ef271..475ac1f 100644 --- a/core/src/ch/asynk/tankontank/screens/GameCamera.java +++ b/core/src/ch/asynk/creepingarmor/screens/GameCamera.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.screens; +package ch.asynk.creepingarmor.screens;  import com.badlogic.gdx.Gdx; diff --git a/core/src/ch/asynk/tankontank/screens/GameScreen.java b/core/src/ch/asynk/creepingarmor/screens/GameScreen.java index d5fa401..52b5139 100644 --- a/core/src/ch/asynk/tankontank/screens/GameScreen.java +++ b/core/src/ch/asynk/creepingarmor/screens/GameScreen.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.screens; +package ch.asynk.creepingarmor.screens;  import com.badlogic.gdx.Gdx; @@ -15,9 +15,9 @@ import com.badlogic.gdx.graphics.glutils.ShapeRenderer;  import com.badlogic.gdx.math.Vector2; -import ch.asynk.tankontank.TankOnTank; +import ch.asynk.creepingarmor.CreepingArmor; -import ch.asynk.tankontank.game.Ctrl; +import ch.asynk.creepingarmor.game.Ctrl;  public class GameScreen implements Screen  { @@ -36,7 +36,7 @@ public class GameScreen implements Screen      private final SpriteBatch batch;      private ShapeRenderer debugShapes = null; -    private final TankOnTank game; +    private final CreepingArmor game;      private Ctrl ctrl;      private int dragged; @@ -44,7 +44,7 @@ public class GameScreen implements Screen      private float inputDelay = 0f;      private Vector2 dragPos = new Vector2(); -    public GameScreen(final TankOnTank game) +    public GameScreen(final CreepingArmor game)      {          DEBUG = game.config.debug; @@ -177,7 +177,7 @@ public class GameScreen implements Screen      @Override      public void resize(int width, int height)      { -        // TankOnTank.debug("GameScreen", "resize (" + width + "," + height + ")"); +        // CreepingArmor.debug("GameScreen", "resize (" + width + "," + height + ")");          cam.updateViewport(width, height);          ctrl.hud.resize(cam.getHudLeft(), cam.getHudBottom(), cam.getHudWidth(), cam.getHudHeight());      } @@ -185,7 +185,7 @@ public class GameScreen implements Screen      @Override      public void dispose()      { -        // TankOnTank.debug("GameScreen", "dispose()"); +        // CreepingArmor.debug("GameScreen", "dispose()");          batch.dispose();          ctrl.dispose();          if (DEBUG) debugShapes.dispose(); @@ -194,24 +194,24 @@ public class GameScreen implements Screen      @Override      public void show()      { -        // TankOnTank.debug("GameScreen", "show()"); +        // CreepingArmor.debug("GameScreen", "show()");      }      @Override      public void hide()      { -        // TankOnTank.debug("GameScreen", "hide()"); +        // CreepingArmor.debug("GameScreen", "hide()");      }      @Override      public void pause()      { -        // TankOnTank.debug("GameScreen", "pause()"); +        // CreepingArmor.debug("GameScreen", "pause()");      }      @Override      public void resume()      { -        // TankOnTank.debug("GameScreen", "resume()"); +        // CreepingArmor.debug("GameScreen", "resume()");      }  } diff --git a/core/src/ch/asynk/tankontank/screens/MenuCamera.java b/core/src/ch/asynk/creepingarmor/screens/MenuCamera.java index 9e27f16..40b09d4 100644 --- a/core/src/ch/asynk/tankontank/screens/MenuCamera.java +++ b/core/src/ch/asynk/creepingarmor/screens/MenuCamera.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.screens; +package ch.asynk.creepingarmor.screens;  import com.badlogic.gdx.Gdx;  import com.badlogic.gdx.graphics.OrthographicCamera; diff --git a/core/src/ch/asynk/tankontank/screens/MenuScreen.java b/core/src/ch/asynk/creepingarmor/screens/MenuScreen.java index 9486413..536b72f 100644 --- a/core/src/ch/asynk/tankontank/screens/MenuScreen.java +++ b/core/src/ch/asynk/creepingarmor/screens/MenuScreen.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.screens; +package ch.asynk.creepingarmor.screens;  import com.badlogic.gdx.Gdx;  import com.badlogic.gdx.Screen; @@ -12,16 +12,16 @@ import com.badlogic.gdx.graphics.g2d.Sprite;  import com.badlogic.gdx.math.Vector3;  import com.badlogic.gdx.math.Interpolation; -import ch.asynk.tankontank.TankOnTank; -import ch.asynk.tankontank.ui.Position; -import ch.asynk.tankontank.menu.MainMenu; -import ch.asynk.tankontank.menu.OptionsMenu; -import ch.asynk.tankontank.menu.ScenariosMenu; -import ch.asynk.tankontank.menu.TutorialsMenu; +import ch.asynk.creepingarmor.CreepingArmor; +import ch.asynk.creepingarmor.ui.Position; +import ch.asynk.creepingarmor.menu.MainMenu; +import ch.asynk.creepingarmor.menu.OptionsMenu; +import ch.asynk.creepingarmor.menu.ScenariosMenu; +import ch.asynk.creepingarmor.menu.TutorialsMenu;  public class MenuScreen implements Screen  { -    private final TankOnTank game; +    private final CreepingArmor game;      private final int OFFSET = 20;      private final int V_WIDTH = 1600; @@ -59,7 +59,7 @@ public class MenuScreen implements Screen      private final SpriteBatch batch;      private Vector3 touch = new Vector3(); -    public MenuScreen(final TankOnTank game) +    public MenuScreen(final CreepingArmor game)      {          this.game = game;          this.batch = new SpriteBatch(); @@ -145,7 +145,7 @@ public class MenuScreen implements Screen      private void gameAssetsLoadingCompleted()      { -        TankOnTank.debug("LoadScreen", "assets ready : " + (Gdx.app.getJavaHeap()/1024.0f) + "KB"); +        CreepingArmor.debug("LoadScreen", "assets ready : " + (Gdx.app.getJavaHeap()/1024.0f) + "KB");          game.switchToGame();          dispose();      } @@ -247,18 +247,18 @@ public class MenuScreen implements Screen      @Override      public void hide()      { -        // TankOnTank.debug("MenuScreen", "hide()"); +        // CreepingArmor.debug("MenuScreen", "hide()");      }      @Override      public void pause()      { -        // TankOnTank.debug("MenuScreen", "pause()"); +        // CreepingArmor.debug("MenuScreen", "pause()");      }      @Override      public void resume()      { -        // TankOnTank.debug("MenuScreen", "resume()"); +        // CreepingArmor.debug("MenuScreen", "resume()");      }  } diff --git a/core/src/ch/asynk/tankontank/ui/Bg.java b/core/src/ch/asynk/creepingarmor/ui/Bg.java index 7a87c26..fbacbf0 100644 --- a/core/src/ch/asynk/tankontank/ui/Bg.java +++ b/core/src/ch/asynk/creepingarmor/ui/Bg.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.ui; +package ch.asynk.creepingarmor.ui;  import com.badlogic.gdx.graphics.g2d.Batch;  import com.badlogic.gdx.graphics.g2d.TextureRegion; diff --git a/core/src/ch/asynk/tankontank/ui/Label.java b/core/src/ch/asynk/creepingarmor/ui/Label.java index 041f44d..3137976 100644 --- a/core/src/ch/asynk/tankontank/ui/Label.java +++ b/core/src/ch/asynk/creepingarmor/ui/Label.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.ui; +package ch.asynk.creepingarmor.ui;  import com.badlogic.gdx.graphics.g2d.Batch;  import com.badlogic.gdx.graphics.g2d.BitmapFont; diff --git a/core/src/ch/asynk/tankontank/ui/LabelImage.java b/core/src/ch/asynk/creepingarmor/ui/LabelImage.java index 4f28924..a4c9d44 100644 --- a/core/src/ch/asynk/tankontank/ui/LabelImage.java +++ b/core/src/ch/asynk/creepingarmor/ui/LabelImage.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.ui; +package ch.asynk.creepingarmor.ui;  import com.badlogic.gdx.graphics.g2d.Batch;  import com.badlogic.gdx.graphics.g2d.BitmapFont; diff --git a/core/src/ch/asynk/tankontank/ui/LabelStack.java b/core/src/ch/asynk/creepingarmor/ui/LabelStack.java index f730d0d..03e4b2e 100644 --- a/core/src/ch/asynk/tankontank/ui/LabelStack.java +++ b/core/src/ch/asynk/creepingarmor/ui/LabelStack.java @@ -1,11 +1,11 @@ -package ch.asynk.tankontank.ui; +package ch.asynk.creepingarmor.ui;  import java.util.ArrayDeque;  import com.badlogic.gdx.graphics.g2d.Batch;  import com.badlogic.gdx.graphics.g2d.BitmapFont; -import ch.asynk.tankontank.engine.gfx.Animation; +import ch.asynk.creepingarmor.engine.gfx.Animation;  public class LabelStack extends Label implements Animation  { diff --git a/core/src/ch/asynk/tankontank/ui/Menu.java b/core/src/ch/asynk/creepingarmor/ui/Menu.java index 1cd61ca..1744e93 100644 --- a/core/src/ch/asynk/tankontank/ui/Menu.java +++ b/core/src/ch/asynk/creepingarmor/ui/Menu.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.ui; +package ch.asynk.creepingarmor.ui;  import com.badlogic.gdx.graphics.g2d.Batch;  import com.badlogic.gdx.graphics.g2d.BitmapFont; diff --git a/core/src/ch/asynk/tankontank/ui/Msg.java b/core/src/ch/asynk/creepingarmor/ui/Msg.java index c2069b7..f91c653 100644 --- a/core/src/ch/asynk/tankontank/ui/Msg.java +++ b/core/src/ch/asynk/creepingarmor/ui/Msg.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.ui; +package ch.asynk.creepingarmor.ui;  import com.badlogic.gdx.graphics.g2d.Batch;  import com.badlogic.gdx.graphics.g2d.BitmapFont; diff --git a/core/src/ch/asynk/tankontank/ui/OkCancel.java b/core/src/ch/asynk/creepingarmor/ui/OkCancel.java index ba61642..298c765 100644 --- a/core/src/ch/asynk/tankontank/ui/OkCancel.java +++ b/core/src/ch/asynk/creepingarmor/ui/OkCancel.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.ui; +package ch.asynk.creepingarmor.ui;  import com.badlogic.gdx.graphics.g2d.Batch;  import com.badlogic.gdx.graphics.g2d.BitmapFont; diff --git a/core/src/ch/asynk/tankontank/ui/Patch.java b/core/src/ch/asynk/creepingarmor/ui/Patch.java index 4056a3c..ec68c20 100644 --- a/core/src/ch/asynk/tankontank/ui/Patch.java +++ b/core/src/ch/asynk/creepingarmor/ui/Patch.java @@ -1,4 +1,4 @@ -package ch.asynk.tankontank.ui; +package ch.asynk.creepingarmor.ui;  import com.badlogic.gdx.graphics.g2d.Batch;  import com.badlogic.gdx.graphics.g2d.NinePatch; diff --git a/core/src/ch/asynk/tankontank/ui/Position.java b/core/src/ch/asynk/creepingarmor/ui/Position.java index 1257cb6..f15c14a 100644 --- a/core/src/ch/asynk/tankontank/ui/Position.java +++ b/core/src/ch/asynk/creepingarmor/ui/Position.java @@ -1,7 +1,7 @@ -package ch.asynk.tankontank.ui; +package ch.asynk.creepingarmor.ui;  import com.badlogic.gdx.Gdx; -import ch.asynk.tankontank.game.Hud; +import ch.asynk.creepingarmor.game.Hud;  public enum Position  { diff --git a/core/src/ch/asynk/tankontank/ui/Widget.java b/core/src/ch/asynk/creepingarmor/ui/Widget.java index e49833a..1acd63e 100644 --- a/core/src/ch/asynk/tankontank/ui/Widget.java +++ b/core/src/ch/asynk/creepingarmor/ui/Widget.java @@ -1,10 +1,10 @@ -package ch.asynk.tankontank.ui; +package ch.asynk.creepingarmor.ui;  import com.badlogic.gdx.utils.Disposable;  import com.badlogic.gdx.math.Rectangle;  import com.badlogic.gdx.graphics.glutils.ShapeRenderer; -import ch.asynk.tankontank.engine.gfx.Drawable; +import ch.asynk.creepingarmor.engine.gfx.Drawable;  public abstract class Widget implements Disposable, Drawable  { | 
