diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2015-07-19 13:20:33 +0200 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2015-07-19 13:20:33 +0200 |
| commit | de0463bcf0f76ef8b07f2719679c9e0d72745c5d (patch) | |
| tree | 9a33df947ceeea16a3e20b400585b1d3c304e77e /core/src | |
| parent | e66f9f2a61d3dab4545e996046486de0d44e2901 (diff) | |
| download | RustAndDust-de0463bcf0f76ef8b07f2719679c9e0d72745c5d.tar.gz RustAndDust-de0463bcf0f76ef8b07f2719679c9e0d72745c5d.zip | |
welcome RustAndDust
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/TankOnTank.gwt.xml | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/RustAndDust.java (renamed from core/src/ch/asynk/creepingarmor/CreepingArmor.java) | 32 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/Attack.java (renamed from core/src/ch/asynk/creepingarmor/engine/Attack.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/Board.java (renamed from core/src/ch/asynk/creepingarmor/engine/Board.java) | 10 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/Faction.java (renamed from core/src/ch/asynk/creepingarmor/engine/Faction.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/HeadedPawn.java (renamed from core/src/ch/asynk/creepingarmor/engine/HeadedPawn.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/Meteorology.java (renamed from core/src/ch/asynk/creepingarmor/engine/Meteorology.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/Move.java (renamed from core/src/ch/asynk/creepingarmor/engine/Move.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/Objective.java (renamed from core/src/ch/asynk/creepingarmor/engine/Objective.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/ObjectiveSet.java (renamed from core/src/ch/asynk/creepingarmor/engine/ObjectiveSet.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/Order.java (renamed from core/src/ch/asynk/creepingarmor/engine/Order.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/OrderList.java (renamed from core/src/ch/asynk/creepingarmor/engine/OrderList.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/Orientation.java (renamed from core/src/ch/asynk/creepingarmor/engine/Orientation.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/Path.java (renamed from core/src/ch/asynk/creepingarmor/engine/Path.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/PathBuilder.java (renamed from core/src/ch/asynk/creepingarmor/engine/PathBuilder.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/PathIterator.java (renamed from core/src/ch/asynk/creepingarmor/engine/PathIterator.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/Pawn.java (renamed from core/src/ch/asynk/creepingarmor/engine/Pawn.java) | 12 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/SearchBoard.java (renamed from core/src/ch/asynk/creepingarmor/engine/SearchBoard.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/SelectedTile.java (renamed from core/src/ch/asynk/creepingarmor/engine/SelectedTile.java) | 8 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/Tile.java (renamed from core/src/ch/asynk/creepingarmor/engine/Tile.java) | 8 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/gfx/Animation.java (renamed from core/src/ch/asynk/creepingarmor/engine/gfx/Animation.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/gfx/Drawable.java (renamed from core/src/ch/asynk/creepingarmor/engine/gfx/Drawable.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/gfx/Moveable.java (renamed from core/src/ch/asynk/creepingarmor/engine/gfx/Moveable.java) | 4 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/gfx/StackedImages.java (renamed from core/src/ch/asynk/creepingarmor/engine/gfx/StackedImages.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/gfx/animations/AnimationSequence.java (renamed from core/src/ch/asynk/creepingarmor/engine/gfx/animations/AnimationSequence.java) | 4 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/gfx/animations/DestroyAnimation.java (renamed from core/src/ch/asynk/creepingarmor/engine/gfx/animations/DestroyAnimation.java) | 6 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/gfx/animations/DiceAnimation.java (renamed from core/src/ch/asynk/creepingarmor/engine/gfx/animations/DiceAnimation.java) | 6 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/gfx/animations/FireAnimation.java (renamed from core/src/ch/asynk/creepingarmor/engine/gfx/animations/FireAnimation.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/gfx/animations/InfantryFireAnimation.java (renamed from core/src/ch/asynk/creepingarmor/engine/gfx/animations/InfantryFireAnimation.java) | 6 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/gfx/animations/MoveToAnimation.java (renamed from core/src/ch/asynk/creepingarmor/engine/gfx/animations/MoveToAnimation.java) | 4 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/gfx/animations/PromoteAnimation.java (renamed from core/src/ch/asynk/creepingarmor/engine/gfx/animations/PromoteAnimation.java) | 6 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/gfx/animations/RunnableAnimation.java (renamed from core/src/ch/asynk/creepingarmor/engine/gfx/animations/RunnableAnimation.java) | 6 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/gfx/animations/SoundAnimation.java (renamed from core/src/ch/asynk/creepingarmor/engine/gfx/animations/SoundAnimation.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/gfx/animations/SpriteAnimation.java (renamed from core/src/ch/asynk/creepingarmor/engine/gfx/animations/SpriteAnimation.java) | 6 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/gfx/animations/Sprites.java (renamed from core/src/ch/asynk/creepingarmor/engine/gfx/animations/Sprites.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/gfx/animations/TankFireAnimation.java (renamed from core/src/ch/asynk/creepingarmor/engine/gfx/animations/TankFireAnimation.java) | 6 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/engine/gfx/animations/TimedAnimation.java (renamed from core/src/ch/asynk/creepingarmor/engine/gfx/animations/TimedAnimation.java) | 4 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/Army.java (renamed from core/src/ch/asynk/creepingarmor/game/Army.java) | 4 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/Battle.java (renamed from core/src/ch/asynk/creepingarmor/game/Battle.java) | 12 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/Command.java (renamed from core/src/ch/asynk/creepingarmor/game/Command.java) | 10 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/Config.java (renamed from core/src/ch/asynk/creepingarmor/game/Config.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/Ctrl.java (renamed from core/src/ch/asynk/creepingarmor/game/Ctrl.java) | 36 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/Engagement.java (renamed from core/src/ch/asynk/creepingarmor/game/Engagement.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/Hex.java (renamed from core/src/ch/asynk/creepingarmor/game/Hex.java) | 12 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/HexSet.java (renamed from core/src/ch/asynk/creepingarmor/game/HexSet.java) | 4 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/Hud.java (renamed from core/src/ch/asynk/creepingarmor/game/Hud.java) | 28 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/Map.java (renamed from core/src/ch/asynk/creepingarmor/game/Map.java) | 66 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/Player.java (renamed from core/src/ch/asynk/creepingarmor/game/Player.java) | 8 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/State.java (renamed from core/src/ch/asynk/creepingarmor/game/State.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/Unit.java (renamed from core/src/ch/asynk/creepingarmor/game/Unit.java) | 16 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/UnitList.java (renamed from core/src/ch/asynk/creepingarmor/game/UnitList.java) | 4 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/Zone.java (renamed from core/src/ch/asynk/creepingarmor/game/Zone.java) | 4 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java (renamed from core/src/ch/asynk/creepingarmor/game/battles/BattleCommon.java) | 24 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/battles/BattleCounterAttack.java (renamed from core/src/ch/asynk/creepingarmor/game/battles/BattleCounterAttack.java) | 22 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/battles/BattleFrontalAssault.java (renamed from core/src/ch/asynk/creepingarmor/game/battles/BattleFrontalAssault.java) | 24 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/battles/BattleHeadToHead.java (renamed from core/src/ch/asynk/creepingarmor/game/battles/BattleHeadToHead.java) | 24 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/battles/BattleLastStand.java (renamed from core/src/ch/asynk/creepingarmor/game/battles/BattleLastStand.java) | 24 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/battles/BattleNightAction.java (renamed from core/src/ch/asynk/creepingarmor/game/battles/BattleNightAction.java) | 26 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/battles/BattleStabToTheFlank.java (renamed from core/src/ch/asynk/creepingarmor/game/battles/BattleStabToTheFlank.java) | 26 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/battles/BattleTest.java (renamed from core/src/ch/asynk/creepingarmor/game/battles/BattleTest.java) | 26 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/battles/Factory.java (renamed from core/src/ch/asynk/creepingarmor/game/battles/Factory.java) | 40 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/battles/MapA.java (renamed from core/src/ch/asynk/creepingarmor/game/battles/MapA.java) | 14 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/battles/MapB.java (renamed from core/src/ch/asynk/creepingarmor/game/battles/MapB.java) | 14 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/hud/ActionButtons.java (renamed from core/src/ch/asynk/creepingarmor/game/hud/ActionButtons.java) | 12 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java (renamed from core/src/ch/asynk/creepingarmor/game/hud/EngagementPanel.java) | 18 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java (renamed from core/src/ch/asynk/creepingarmor/game/hud/PlayerInfo.java) | 24 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java (renamed from core/src/ch/asynk/creepingarmor/game/hud/StatisticsPanel.java) | 12 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/hud/UnitDock.java (renamed from core/src/ch/asynk/creepingarmor/game/hud/UnitDock.java) | 16 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/states/StateAnimation.java (renamed from core/src/ch/asynk/creepingarmor/game/states/StateAnimation.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/states/StateBreak.java (renamed from core/src/ch/asynk/creepingarmor/game/states/StateBreak.java) | 12 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/states/StateCommon.java (renamed from core/src/ch/asynk/creepingarmor/game/states/StateCommon.java) | 14 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/states/StateDeployment.java (renamed from core/src/ch/asynk/creepingarmor/game/states/StateDeployment.java) | 16 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/states/StateEngage.java (renamed from core/src/ch/asynk/creepingarmor/game/states/StateEngage.java) | 10 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/states/StateMove.java (renamed from core/src/ch/asynk/creepingarmor/game/states/StateMove.java) | 10 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/states/StatePromote.java (renamed from core/src/ch/asynk/creepingarmor/game/states/StatePromote.java) | 4 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/states/StateReinforcement.java (renamed from core/src/ch/asynk/creepingarmor/game/states/StateReinforcement.java) | 10 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/states/StateRotate.java (renamed from core/src/ch/asynk/creepingarmor/game/states/StateRotate.java) | 10 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/states/StateSelect.java (renamed from core/src/ch/asynk/creepingarmor/game/states/StateSelect.java) | 16 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/states/StateWithdraw.java (renamed from core/src/ch/asynk/creepingarmor/game/states/StateWithdraw.java) | 8 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/loading/LoadingBar.java (renamed from core/src/ch/asynk/creepingarmor/loading/LoadingBar.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/menu/MainMenu.java (renamed from core/src/ch/asynk/creepingarmor/menu/MainMenu.java) | 4 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/menu/OptionsMenu.java (renamed from core/src/ch/asynk/creepingarmor/menu/OptionsMenu.java) | 16 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/menu/ScenariosMenu.java (renamed from core/src/ch/asynk/creepingarmor/menu/ScenariosMenu.java) | 16 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java (renamed from core/src/ch/asynk/creepingarmor/menu/TutorialsMenu.java) | 14 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/screens/GameCamera.java (renamed from core/src/ch/asynk/creepingarmor/screens/GameCamera.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/screens/GameScreen.java (renamed from core/src/ch/asynk/creepingarmor/screens/GameScreen.java) | 22 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/screens/MenuCamera.java (renamed from core/src/ch/asynk/creepingarmor/screens/MenuCamera.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/screens/MenuScreen.java (renamed from core/src/ch/asynk/creepingarmor/screens/MenuScreen.java) | 26 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/ui/Bg.java (renamed from core/src/ch/asynk/creepingarmor/ui/Bg.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/ui/Label.java (renamed from core/src/ch/asynk/creepingarmor/ui/Label.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/ui/LabelImage.java (renamed from core/src/ch/asynk/creepingarmor/ui/LabelImage.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/ui/LabelStack.java (renamed from core/src/ch/asynk/creepingarmor/ui/LabelStack.java) | 4 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/ui/Menu.java (renamed from core/src/ch/asynk/creepingarmor/ui/Menu.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/ui/Msg.java (renamed from core/src/ch/asynk/creepingarmor/ui/Msg.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/ui/OkCancel.java (renamed from core/src/ch/asynk/creepingarmor/ui/OkCancel.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/ui/Patch.java (renamed from core/src/ch/asynk/creepingarmor/ui/Patch.java) | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/ui/Position.java (renamed from core/src/ch/asynk/creepingarmor/ui/Position.java) | 4 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/ui/Widget.java (renamed from core/src/ch/asynk/creepingarmor/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 622ea412..84a710be 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/creepingarmor" /> + <source path="ch/asynk/rustanddust" /> </module>
\ No newline at end of file diff --git a/core/src/ch/asynk/creepingarmor/CreepingArmor.java b/core/src/ch/asynk/rustanddust/RustAndDust.java index 7e7e4db7..52732a3e 100644 --- a/core/src/ch/asynk/creepingarmor/CreepingArmor.java +++ b/core/src/ch/asynk/rustanddust/RustAndDust.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor; +package ch.asynk.rustanddust; 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.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; +import ch.asynk.rustanddust.screens.MenuScreen; +import ch.asynk.rustanddust.screens.GameScreen; +import ch.asynk.rustanddust.game.Ctrl; +import ch.asynk.rustanddust.game.Config; +import ch.asynk.rustanddust.game.battles.Factory; -public class CreepingArmor extends Game +public class RustAndDust extends Game { public AssetManager manager; public Factory factory; @@ -50,7 +50,7 @@ public class CreepingArmor extends Game { Gdx.app.setLogLevel(Gdx.app.LOG_DEBUG); this.hudCorrection = ((int) (125 * Gdx.graphics.getDensity()) - 75); - debug("CreepingArmor", "create() [" + Gdx.graphics.getWidth() + ";" + Gdx.graphics.getHeight() + "] " + Gdx.graphics.getDensity() + " -> " + hudCorrection); + debug("RustAndDust", "create() [" + Gdx.graphics.getWidth() + ";" + Gdx.graphics.getHeight() + "] " + Gdx.graphics.getDensity() + " -> " + hudCorrection); manager = new AssetManager(); factory = new Factory(this); @@ -109,7 +109,7 @@ public class CreepingArmor 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("CreepingArmor", " assets loaded : " + (Gdx.app.getJavaHeap()/1024.0f) + "KB"); + debug("RustAndDust", " assets loaded : " + (Gdx.app.getJavaHeap()/1024.0f) + "KB"); } private void unloadGameAssets() @@ -138,7 +138,7 @@ public class CreepingArmor extends Game manager.unload("sounds/explosion_short.mp3"); manager.unload("sounds/promote_us.mp3"); manager.unload("sounds/promote_ge.mp3"); - debug("CreepingArmor", " assets unloaded : " + (Gdx.app.getJavaHeap()/1024.0f) + "KB"); + debug("RustAndDust", " assets unloaded : " + (Gdx.app.getJavaHeap()/1024.0f) + "KB"); } private void loadUiAssets() @@ -182,15 +182,15 @@ public class CreepingArmor extends Game // @Override // public void resize(int width, int height) // { - // debug("CreepingArmor", "resize(" + width + ", " + height + ")"); + // debug("RustAndDust", "resize(" + width + ", " + height + ")"); // super.resize(width, height); // } @Override public void dispose() { - debug("CreepingArmor", "dispose()"); - debug("CreepingArmor", "diagnostics:\n" + manager.getDiagnostics() ); + debug("RustAndDust", "dispose()"); + debug("RustAndDust", "diagnostics:\n" + manager.getDiagnostics() ); getScreen().dispose(); unloadUiAssets(); switch(state) { @@ -203,7 +203,7 @@ public class CreepingArmor extends Game ctrl.dispose(); break; } - debug("CreepingArmor", "diagnostics:\n" + manager.getDiagnostics() ); + debug("RustAndDust", "diagnostics:\n" + manager.getDiagnostics() ); manager.clear(); manager.dispose(); } @@ -211,12 +211,12 @@ public class CreepingArmor extends Game // @Override // public void pause() // { - // debug("CreepingArmor", "pause()"); + // debug("RustAndDust", "pause()"); // } // @Override // public void resume() // { - // debug("CreepingArmor", "resume()"); + // debug("RustAndDust", "resume()"); // } } diff --git a/core/src/ch/asynk/creepingarmor/engine/Attack.java b/core/src/ch/asynk/rustanddust/engine/Attack.java index e4fa6785..e64399a5 100644 --- a/core/src/ch/asynk/creepingarmor/engine/Attack.java +++ b/core/src/ch/asynk/rustanddust/engine/Attack.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine; +package ch.asynk.rustanddust.engine; public class Attack { diff --git a/core/src/ch/asynk/creepingarmor/engine/Board.java b/core/src/ch/asynk/rustanddust/engine/Board.java index 4c420030..e4aba6d0 100644 --- a/core/src/ch/asynk/creepingarmor/engine/Board.java +++ b/core/src/ch/asynk/rustanddust/engine/Board.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine; +package ch.asynk.rustanddust.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.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; +import ch.asynk.rustanddust.engine.gfx.Animation; +import ch.asynk.rustanddust.engine.gfx.animations.AnimationSequence; +import ch.asynk.rustanddust.engine.gfx.animations.RunnableAnimation; +import ch.asynk.rustanddust.engine.gfx.animations.MoveToAnimation.MoveToAnimationCb; public abstract class Board implements Disposable, Animation { diff --git a/core/src/ch/asynk/creepingarmor/engine/Faction.java b/core/src/ch/asynk/rustanddust/engine/Faction.java index b45f3517..e108fc4b 100644 --- a/core/src/ch/asynk/creepingarmor/engine/Faction.java +++ b/core/src/ch/asynk/rustanddust/engine/Faction.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine; +package ch.asynk.rustanddust.engine; public interface Faction { diff --git a/core/src/ch/asynk/creepingarmor/engine/HeadedPawn.java b/core/src/ch/asynk/rustanddust/engine/HeadedPawn.java index 3b78cd59..67e1d440 100644 --- a/core/src/ch/asynk/creepingarmor/engine/HeadedPawn.java +++ b/core/src/ch/asynk/rustanddust/engine/HeadedPawn.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine; +package ch.asynk.rustanddust.engine; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.g2d.Sprite; diff --git a/core/src/ch/asynk/creepingarmor/engine/Meteorology.java b/core/src/ch/asynk/rustanddust/engine/Meteorology.java index 6d5319ee..9addf634 100644 --- a/core/src/ch/asynk/creepingarmor/engine/Meteorology.java +++ b/core/src/ch/asynk/rustanddust/engine/Meteorology.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine; +package ch.asynk.rustanddust.engine; public class Meteorology { diff --git a/core/src/ch/asynk/creepingarmor/engine/Move.java b/core/src/ch/asynk/rustanddust/engine/Move.java index 2f339820..077823f4 100644 --- a/core/src/ch/asynk/creepingarmor/engine/Move.java +++ b/core/src/ch/asynk/rustanddust/engine/Move.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine; +package ch.asynk.rustanddust.engine; import java.util.Iterator; diff --git a/core/src/ch/asynk/creepingarmor/engine/Objective.java b/core/src/ch/asynk/rustanddust/engine/Objective.java index c923cdd5..de1c7d31 100644 --- a/core/src/ch/asynk/creepingarmor/engine/Objective.java +++ b/core/src/ch/asynk/rustanddust/engine/Objective.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine; +package ch.asynk.rustanddust.engine; public class Objective { diff --git a/core/src/ch/asynk/creepingarmor/engine/ObjectiveSet.java b/core/src/ch/asynk/rustanddust/engine/ObjectiveSet.java index be1b0bb3..5618a9dc 100644 --- a/core/src/ch/asynk/creepingarmor/engine/ObjectiveSet.java +++ b/core/src/ch/asynk/rustanddust/engine/ObjectiveSet.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine; +package ch.asynk.rustanddust.engine; import java.util.Collection; import java.util.HashMap; diff --git a/core/src/ch/asynk/creepingarmor/engine/Order.java b/core/src/ch/asynk/rustanddust/engine/Order.java index 51fa8b0e..960b1261 100644 --- a/core/src/ch/asynk/creepingarmor/engine/Order.java +++ b/core/src/ch/asynk/rustanddust/engine/Order.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine; +package ch.asynk.rustanddust.engine; import java.lang.Comparable; diff --git a/core/src/ch/asynk/creepingarmor/engine/OrderList.java b/core/src/ch/asynk/rustanddust/engine/OrderList.java index c5d70376..4488cfee 100644 --- a/core/src/ch/asynk/creepingarmor/engine/OrderList.java +++ b/core/src/ch/asynk/rustanddust/engine/OrderList.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine; +package ch.asynk.rustanddust.engine; import java.util.LinkedList; import java.util.Iterator; diff --git a/core/src/ch/asynk/creepingarmor/engine/Orientation.java b/core/src/ch/asynk/rustanddust/engine/Orientation.java index a061d052..2c3ef58e 100644 --- a/core/src/ch/asynk/creepingarmor/engine/Orientation.java +++ b/core/src/ch/asynk/rustanddust/engine/Orientation.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine; +package ch.asynk.rustanddust.engine; public enum Orientation { diff --git a/core/src/ch/asynk/creepingarmor/engine/Path.java b/core/src/ch/asynk/rustanddust/engine/Path.java index 20da213b..2ddf3e5d 100644 --- a/core/src/ch/asynk/creepingarmor/engine/Path.java +++ b/core/src/ch/asynk/rustanddust/engine/Path.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine; +package ch.asynk.rustanddust.engine; import java.util.ArrayList; diff --git a/core/src/ch/asynk/creepingarmor/engine/PathBuilder.java b/core/src/ch/asynk/rustanddust/engine/PathBuilder.java index bad14e8f..3692a91a 100644 --- a/core/src/ch/asynk/creepingarmor/engine/PathBuilder.java +++ b/core/src/ch/asynk/rustanddust/engine/PathBuilder.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine; +package ch.asynk.rustanddust.engine; import java.util.ArrayList; import java.util.List; diff --git a/core/src/ch/asynk/creepingarmor/engine/PathIterator.java b/core/src/ch/asynk/rustanddust/engine/PathIterator.java index ca74ed40..53f2f828 100644 --- a/core/src/ch/asynk/creepingarmor/engine/PathIterator.java +++ b/core/src/ch/asynk/rustanddust/engine/PathIterator.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine; +package ch.asynk.rustanddust.engine; import java.util.List; import java.util.Iterator; diff --git a/core/src/ch/asynk/creepingarmor/engine/Pawn.java b/core/src/ch/asynk/rustanddust/engine/Pawn.java index 7f82f1c2..f95347fc 100644 --- a/core/src/ch/asynk/creepingarmor/engine/Pawn.java +++ b/core/src/ch/asynk/rustanddust/engine/Pawn.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine; +package ch.asynk.rustanddust.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.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; +import ch.asynk.rustanddust.engine.gfx.Moveable; +import ch.asynk.rustanddust.engine.gfx.StackedImages; +import ch.asynk.rustanddust.engine.gfx.animations.MoveToAnimation; +import ch.asynk.rustanddust.engine.gfx.animations.RunnableAnimation; +import ch.asynk.rustanddust.engine.gfx.animations.AnimationSequence; public abstract class Pawn implements Moveable, Disposable { diff --git a/core/src/ch/asynk/creepingarmor/engine/SearchBoard.java b/core/src/ch/asynk/rustanddust/engine/SearchBoard.java index 2a7db3e7..1d8ed883 100644 --- a/core/src/ch/asynk/creepingarmor/engine/SearchBoard.java +++ b/core/src/ch/asynk/rustanddust/engine/SearchBoard.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine; +package ch.asynk.rustanddust.engine; import java.util.List; import java.util.ArrayList; diff --git a/core/src/ch/asynk/creepingarmor/engine/SelectedTile.java b/core/src/ch/asynk/rustanddust/engine/SelectedTile.java index 4157f4c2..0e1d8aca 100644 --- a/core/src/ch/asynk/creepingarmor/engine/SelectedTile.java +++ b/core/src/ch/asynk/rustanddust/engine/SelectedTile.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine; +package ch.asynk.rustanddust.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.creepingarmor.engine.gfx.Drawable; -import ch.asynk.creepingarmor.engine.gfx.Animation; -import ch.asynk.creepingarmor.engine.gfx.animations.Sprites; +import ch.asynk.rustanddust.engine.gfx.Drawable; +import ch.asynk.rustanddust.engine.gfx.Animation; +import ch.asynk.rustanddust.engine.gfx.animations.Sprites; public class SelectedTile implements Disposable, Drawable, Animation { diff --git a/core/src/ch/asynk/creepingarmor/engine/Tile.java b/core/src/ch/asynk/rustanddust/engine/Tile.java index bd4138aa..f44e763b 100644 --- a/core/src/ch/asynk/creepingarmor/engine/Tile.java +++ b/core/src/ch/asynk/rustanddust/engine/Tile.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine; +package ch.asynk.rustanddust.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.creepingarmor.engine.Board; -import ch.asynk.creepingarmor.engine.gfx.Drawable; -import ch.asynk.creepingarmor.engine.gfx.StackedImages; +import ch.asynk.rustanddust.engine.Board; +import ch.asynk.rustanddust.engine.gfx.Drawable; +import ch.asynk.rustanddust.engine.gfx.StackedImages; public abstract class Tile implements Drawable, Disposable, Iterable<Pawn> { diff --git a/core/src/ch/asynk/creepingarmor/engine/gfx/Animation.java b/core/src/ch/asynk/rustanddust/engine/gfx/Animation.java index ab82ea5d..eb973de4 100644 --- a/core/src/ch/asynk/creepingarmor/engine/gfx/Animation.java +++ b/core/src/ch/asynk/rustanddust/engine/gfx/Animation.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine.gfx; +package ch.asynk.rustanddust.engine.gfx; import com.badlogic.gdx.utils.Disposable; diff --git a/core/src/ch/asynk/creepingarmor/engine/gfx/Drawable.java b/core/src/ch/asynk/rustanddust/engine/gfx/Drawable.java index 5f5117ab..d405faaf 100644 --- a/core/src/ch/asynk/creepingarmor/engine/gfx/Drawable.java +++ b/core/src/ch/asynk/rustanddust/engine/gfx/Drawable.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine.gfx; +package ch.asynk.rustanddust.engine.gfx; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.glutils.ShapeRenderer; diff --git a/core/src/ch/asynk/creepingarmor/engine/gfx/Moveable.java b/core/src/ch/asynk/rustanddust/engine/gfx/Moveable.java index a20810dd..e8790ab5 100644 --- a/core/src/ch/asynk/creepingarmor/engine/gfx/Moveable.java +++ b/core/src/ch/asynk/rustanddust/engine/gfx/Moveable.java @@ -1,6 +1,6 @@ -package ch.asynk.creepingarmor.engine.gfx; +package ch.asynk.rustanddust.engine.gfx; -import ch.asynk.creepingarmor.engine.Faction; +import ch.asynk.rustanddust.engine.Faction; public interface Moveable extends Drawable { diff --git a/core/src/ch/asynk/creepingarmor/engine/gfx/StackedImages.java b/core/src/ch/asynk/rustanddust/engine/gfx/StackedImages.java index 60d4a42c..6d4fd1f0 100644 --- a/core/src/ch/asynk/creepingarmor/engine/gfx/StackedImages.java +++ b/core/src/ch/asynk/rustanddust/engine/gfx/StackedImages.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine.gfx; +package ch.asynk.rustanddust.engine.gfx; import com.badlogic.gdx.utils.Disposable; diff --git a/core/src/ch/asynk/creepingarmor/engine/gfx/animations/AnimationSequence.java b/core/src/ch/asynk/rustanddust/engine/gfx/animations/AnimationSequence.java index 7ac9eb1a..fdd1e80f 100644 --- a/core/src/ch/asynk/creepingarmor/engine/gfx/animations/AnimationSequence.java +++ b/core/src/ch/asynk/rustanddust/engine/gfx/animations/AnimationSequence.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine.gfx.animations; +package ch.asynk.rustanddust.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.creepingarmor.engine.gfx.Animation; +import ch.asynk.rustanddust.engine.gfx.Animation; public class AnimationSequence implements Animation, Pool.Poolable { diff --git a/core/src/ch/asynk/creepingarmor/engine/gfx/animations/DestroyAnimation.java b/core/src/ch/asynk/rustanddust/engine/gfx/animations/DestroyAnimation.java index 16d84b0e..d1fc1bbf 100644 --- a/core/src/ch/asynk/creepingarmor/engine/gfx/animations/DestroyAnimation.java +++ b/core/src/ch/asynk/rustanddust/engine/gfx/animations/DestroyAnimation.java @@ -1,11 +1,11 @@ -package ch.asynk.creepingarmor.engine.gfx.animations; +package ch.asynk.rustanddust.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.creepingarmor.engine.gfx.Moveable; -import ch.asynk.creepingarmor.engine.gfx.Animation; +import ch.asynk.rustanddust.engine.gfx.Moveable; +import ch.asynk.rustanddust.engine.gfx.Animation; public class DestroyAnimation implements Disposable, Animation { diff --git a/core/src/ch/asynk/creepingarmor/engine/gfx/animations/DiceAnimation.java b/core/src/ch/asynk/rustanddust/engine/gfx/animations/DiceAnimation.java index 4d2ca674..1a0a3bbc 100644 --- a/core/src/ch/asynk/creepingarmor/engine/gfx/animations/DiceAnimation.java +++ b/core/src/ch/asynk/rustanddust/engine/gfx/animations/DiceAnimation.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine.gfx.animations; +package ch.asynk.rustanddust.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.creepingarmor.engine.gfx.Drawable; -import ch.asynk.creepingarmor.engine.gfx.Animation; +import ch.asynk.rustanddust.engine.gfx.Drawable; +import ch.asynk.rustanddust.engine.gfx.Animation; public class DiceAnimation implements Animation, Drawable { diff --git a/core/src/ch/asynk/creepingarmor/engine/gfx/animations/FireAnimation.java b/core/src/ch/asynk/rustanddust/engine/gfx/animations/FireAnimation.java index c221460d..58355250 100644 --- a/core/src/ch/asynk/creepingarmor/engine/gfx/animations/FireAnimation.java +++ b/core/src/ch/asynk/rustanddust/engine/gfx/animations/FireAnimation.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine.gfx.animations; +package ch.asynk.rustanddust.engine.gfx.animations; import java.util.Random; diff --git a/core/src/ch/asynk/creepingarmor/engine/gfx/animations/InfantryFireAnimation.java b/core/src/ch/asynk/rustanddust/engine/gfx/animations/InfantryFireAnimation.java index b478a2be..233305a6 100644 --- a/core/src/ch/asynk/creepingarmor/engine/gfx/animations/InfantryFireAnimation.java +++ b/core/src/ch/asynk/rustanddust/engine/gfx/animations/InfantryFireAnimation.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine.gfx.animations; +package ch.asynk.rustanddust.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.creepingarmor.engine.gfx.Drawable; -import ch.asynk.creepingarmor.engine.gfx.Animation; +import ch.asynk.rustanddust.engine.gfx.Drawable; +import ch.asynk.rustanddust.engine.gfx.Animation; public class InfantryFireAnimation implements Disposable, Animation, Pool.Poolable { diff --git a/core/src/ch/asynk/creepingarmor/engine/gfx/animations/MoveToAnimation.java b/core/src/ch/asynk/rustanddust/engine/gfx/animations/MoveToAnimation.java index a1d548cf..f6380bc2 100644 --- a/core/src/ch/asynk/creepingarmor/engine/gfx/animations/MoveToAnimation.java +++ b/core/src/ch/asynk/rustanddust/engine/gfx/animations/MoveToAnimation.java @@ -1,11 +1,11 @@ -package ch.asynk.creepingarmor.engine.gfx.animations; +package ch.asynk.rustanddust.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.creepingarmor.engine.gfx.Moveable; +import ch.asynk.rustanddust.engine.gfx.Moveable; public class MoveToAnimation extends TimedAnimation { diff --git a/core/src/ch/asynk/creepingarmor/engine/gfx/animations/PromoteAnimation.java b/core/src/ch/asynk/rustanddust/engine/gfx/animations/PromoteAnimation.java index 1d8d98e7..24eac184 100644 --- a/core/src/ch/asynk/creepingarmor/engine/gfx/animations/PromoteAnimation.java +++ b/core/src/ch/asynk/rustanddust/engine/gfx/animations/PromoteAnimation.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine.gfx.animations; +package ch.asynk.rustanddust.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.creepingarmor.engine.gfx.Drawable; -import ch.asynk.creepingarmor.engine.gfx.Animation; +import ch.asynk.rustanddust.engine.gfx.Drawable; +import ch.asynk.rustanddust.engine.gfx.Animation; public class PromoteAnimation implements Animation, Drawable { diff --git a/core/src/ch/asynk/creepingarmor/engine/gfx/animations/RunnableAnimation.java b/core/src/ch/asynk/rustanddust/engine/gfx/animations/RunnableAnimation.java index 6c099049..231f8599 100644 --- a/core/src/ch/asynk/creepingarmor/engine/gfx/animations/RunnableAnimation.java +++ b/core/src/ch/asynk/rustanddust/engine/gfx/animations/RunnableAnimation.java @@ -1,11 +1,11 @@ -package ch.asynk.creepingarmor.engine.gfx.animations; +package ch.asynk.rustanddust.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.creepingarmor.engine.gfx.Moveable; -import ch.asynk.creepingarmor.engine.gfx.Animation; +import ch.asynk.rustanddust.engine.gfx.Moveable; +import ch.asynk.rustanddust.engine.gfx.Animation; public class RunnableAnimation implements Animation, Pool.Poolable { diff --git a/core/src/ch/asynk/creepingarmor/engine/gfx/animations/SoundAnimation.java b/core/src/ch/asynk/rustanddust/engine/gfx/animations/SoundAnimation.java index 9c6a2898..7e83f38c 100644 --- a/core/src/ch/asynk/creepingarmor/engine/gfx/animations/SoundAnimation.java +++ b/core/src/ch/asynk/rustanddust/engine/gfx/animations/SoundAnimation.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine.gfx.animations; +package ch.asynk.rustanddust.engine.gfx.animations; import com.badlogic.gdx.utils.Pool; import com.badlogic.gdx.audio.Sound; diff --git a/core/src/ch/asynk/creepingarmor/engine/gfx/animations/SpriteAnimation.java b/core/src/ch/asynk/rustanddust/engine/gfx/animations/SpriteAnimation.java index 377cf6bc..4d10210f 100644 --- a/core/src/ch/asynk/creepingarmor/engine/gfx/animations/SpriteAnimation.java +++ b/core/src/ch/asynk/rustanddust/engine/gfx/animations/SpriteAnimation.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine.gfx.animations; +package ch.asynk.rustanddust.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.creepingarmor.engine.gfx.Drawable; -import ch.asynk.creepingarmor.engine.gfx.Animation; +import ch.asynk.rustanddust.engine.gfx.Drawable; +import ch.asynk.rustanddust.engine.gfx.Animation; public class SpriteAnimation implements Disposable, Animation { diff --git a/core/src/ch/asynk/creepingarmor/engine/gfx/animations/Sprites.java b/core/src/ch/asynk/rustanddust/engine/gfx/animations/Sprites.java index 407b8a58..2d2a0c16 100644 --- a/core/src/ch/asynk/creepingarmor/engine/gfx/animations/Sprites.java +++ b/core/src/ch/asynk/rustanddust/engine/gfx/animations/Sprites.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine.gfx.animations; +package ch.asynk.rustanddust.engine.gfx.animations; import com.badlogic.gdx.utils.Disposable; import com.badlogic.gdx.graphics.Texture; diff --git a/core/src/ch/asynk/creepingarmor/engine/gfx/animations/TankFireAnimation.java b/core/src/ch/asynk/rustanddust/engine/gfx/animations/TankFireAnimation.java index 55ee4351..82a87fd9 100644 --- a/core/src/ch/asynk/creepingarmor/engine/gfx/animations/TankFireAnimation.java +++ b/core/src/ch/asynk/rustanddust/engine/gfx/animations/TankFireAnimation.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.engine.gfx.animations; +package ch.asynk.rustanddust.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.creepingarmor.engine.gfx.Drawable; -import ch.asynk.creepingarmor.engine.gfx.Animation; +import ch.asynk.rustanddust.engine.gfx.Drawable; +import ch.asynk.rustanddust.engine.gfx.Animation; public class TankFireAnimation implements Disposable, Animation, Pool.Poolable { diff --git a/core/src/ch/asynk/creepingarmor/engine/gfx/animations/TimedAnimation.java b/core/src/ch/asynk/rustanddust/engine/gfx/animations/TimedAnimation.java index 376b03ee..0c0d14de 100644 --- a/core/src/ch/asynk/creepingarmor/engine/gfx/animations/TimedAnimation.java +++ b/core/src/ch/asynk/rustanddust/engine/gfx/animations/TimedAnimation.java @@ -1,8 +1,8 @@ -package ch.asynk.creepingarmor.engine.gfx.animations; +package ch.asynk.rustanddust.engine.gfx.animations; import com.badlogic.gdx.utils.Pool; -import ch.asynk.creepingarmor.engine.gfx.Animation; +import ch.asynk.rustanddust.engine.gfx.Animation; public abstract class TimedAnimation implements Animation, Pool.Poolable { diff --git a/core/src/ch/asynk/creepingarmor/game/Army.java b/core/src/ch/asynk/rustanddust/game/Army.java index dbf5656f..21cad9f6 100644 --- a/core/src/ch/asynk/creepingarmor/game/Army.java +++ b/core/src/ch/asynk/rustanddust/game/Army.java @@ -1,6 +1,6 @@ -package ch.asynk.creepingarmor.game; +package ch.asynk.rustanddust.game; -import ch.asynk.creepingarmor.engine.Faction; +import ch.asynk.rustanddust.engine.Faction; public enum Army implements Faction { diff --git a/core/src/ch/asynk/creepingarmor/game/Battle.java b/core/src/ch/asynk/rustanddust/game/Battle.java index 9a4a0c37..242e1475 100644 --- a/core/src/ch/asynk/creepingarmor/game/Battle.java +++ b/core/src/ch/asynk/rustanddust/game/Battle.java @@ -1,10 +1,10 @@ -package ch.asynk.creepingarmor.game; +package ch.asynk.rustanddust.game; -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; +import ch.asynk.rustanddust.game.Zone; +import ch.asynk.rustanddust.game.Unit; +import ch.asynk.rustanddust.game.Player; +import ch.asynk.rustanddust.game.battles.Factory.MapType; +import ch.asynk.rustanddust.ui.Position; public interface Battle { diff --git a/core/src/ch/asynk/creepingarmor/game/Command.java b/core/src/ch/asynk/rustanddust/game/Command.java index 34af71b1..40d467a5 100644 --- a/core/src/ch/asynk/creepingarmor/game/Command.java +++ b/core/src/ch/asynk/rustanddust/game/Command.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.game; +package ch.asynk.rustanddust.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.creepingarmor.engine.Order; -import ch.asynk.creepingarmor.engine.Move; -import ch.asynk.creepingarmor.engine.Pawn; -import ch.asynk.creepingarmor.engine.Tile; +import ch.asynk.rustanddust.engine.Order; +import ch.asynk.rustanddust.engine.Move; +import ch.asynk.rustanddust.engine.Pawn; +import ch.asynk.rustanddust.engine.Tile; public class Command extends Order { diff --git a/core/src/ch/asynk/creepingarmor/game/Config.java b/core/src/ch/asynk/rustanddust/game/Config.java index 88a7fe27..2c27c356 100644 --- a/core/src/ch/asynk/creepingarmor/game/Config.java +++ b/core/src/ch/asynk/rustanddust/game/Config.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.game; +package ch.asynk.rustanddust.game; public class Config { diff --git a/core/src/ch/asynk/creepingarmor/game/Ctrl.java b/core/src/ch/asynk/rustanddust/game/Ctrl.java index f4696f14..3b93ad87 100644 --- a/core/src/ch/asynk/creepingarmor/game/Ctrl.java +++ b/core/src/ch/asynk/rustanddust/game/Ctrl.java @@ -1,26 +1,26 @@ -package ch.asynk.creepingarmor.game; +package ch.asynk.rustanddust.game; import com.badlogic.gdx.utils.Disposable; import com.badlogic.gdx.math.Vector3; -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; +import ch.asynk.rustanddust.RustAndDust; +import ch.asynk.rustanddust.ui.Position; +import ch.asynk.rustanddust.game.State.StateType; +import ch.asynk.rustanddust.game.states.StateSelect; +import ch.asynk.rustanddust.game.states.StateMove; +import ch.asynk.rustanddust.game.states.StateRotate; +import ch.asynk.rustanddust.game.states.StatePromote; +import ch.asynk.rustanddust.game.states.StateEngage; +import ch.asynk.rustanddust.game.states.StateBreak; +import ch.asynk.rustanddust.game.states.StateAnimation; +import ch.asynk.rustanddust.game.states.StateReinforcement; +import ch.asynk.rustanddust.game.states.StateDeployment; +import ch.asynk.rustanddust.game.states.StateWithdraw; public class Ctrl implements Disposable { - private final CreepingArmor game; + private final RustAndDust 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 CreepingArmor game, final Battle battle) + public Ctrl(final RustAndDust 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) { - CreepingArmor.debug("Ctrl", "burn down 1AP"); + RustAndDust.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); - CreepingArmor.debug("Ctrl", String.format(" %s -> %s : %s", stateType, nextState, player)); + RustAndDust.debug("Ctrl", String.format(" %s -> %s : %s", stateType, nextState, player)); switch(nextState) { case SELECT: diff --git a/core/src/ch/asynk/creepingarmor/game/Engagement.java b/core/src/ch/asynk/rustanddust/game/Engagement.java index 14681815..b7630ed5 100644 --- a/core/src/ch/asynk/creepingarmor/game/Engagement.java +++ b/core/src/ch/asynk/rustanddust/game/Engagement.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.game; +package ch.asynk.rustanddust.game; import java.util.List; import java.util.LinkedList; diff --git a/core/src/ch/asynk/creepingarmor/game/Hex.java b/core/src/ch/asynk/rustanddust/game/Hex.java index cca4fada..b805146e 100644 --- a/core/src/ch/asynk/creepingarmor/game/Hex.java +++ b/core/src/ch/asynk/rustanddust/game/Hex.java @@ -1,15 +1,15 @@ -package ch.asynk.creepingarmor.game; +package ch.asynk.rustanddust.game; import java.util.List; import java.util.Iterator; import com.badlogic.gdx.graphics.g2d.TextureAtlas; -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; +import ch.asynk.rustanddust.engine.Board; +import ch.asynk.rustanddust.engine.Pawn; +import ch.asynk.rustanddust.engine.Tile; +import ch.asynk.rustanddust.engine.Orientation; +import ch.asynk.rustanddust.game.Unit.UnitType; public class Hex extends Tile { diff --git a/core/src/ch/asynk/creepingarmor/game/HexSet.java b/core/src/ch/asynk/rustanddust/game/HexSet.java index bcbfa2db..4382fdbb 100644 --- a/core/src/ch/asynk/creepingarmor/game/HexSet.java +++ b/core/src/ch/asynk/rustanddust/game/HexSet.java @@ -1,9 +1,9 @@ -package ch.asynk.creepingarmor.game; +package ch.asynk.rustanddust.game; import java.util.Collection; import java.util.LinkedHashSet; -import ch.asynk.creepingarmor.engine.Tile; +import ch.asynk.rustanddust.engine.Tile; public class HexSet extends LinkedHashSet<Hex> { diff --git a/core/src/ch/asynk/creepingarmor/game/Hud.java b/core/src/ch/asynk/rustanddust/game/Hud.java index 1220a2df..8f9343c3 100644 --- a/core/src/ch/asynk/creepingarmor/game/Hud.java +++ b/core/src/ch/asynk/rustanddust/game/Hud.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.game; +package ch.asynk.rustanddust.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.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.rustanddust.engine.gfx.Animation; +import ch.asynk.rustanddust.game.State.StateType; +import ch.asynk.rustanddust.ui.Position; +import ch.asynk.rustanddust.ui.Msg; +import ch.asynk.rustanddust.ui.OkCancel; +import ch.asynk.rustanddust.ui.Widget; +import ch.asynk.rustanddust.game.hud.PlayerInfo; +import ch.asynk.rustanddust.game.hud.ActionButtons; +import ch.asynk.rustanddust.game.hud.StatisticsPanel; +import ch.asynk.rustanddust.game.hud.EngagementPanel; -import ch.asynk.creepingarmor.CreepingArmor; +import ch.asynk.rustanddust.RustAndDust; public class Hud implements Disposable, Animation { public static final float OFFSET = 10f; public static final float NOTIFY_DURATION = 2f; - private final CreepingArmor game; + private final RustAndDust 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 CreepingArmor game) + public Hud(final Ctrl ctrl, final RustAndDust game) { this.game = game; this.ctrl = ctrl; diff --git a/core/src/ch/asynk/creepingarmor/game/Map.java b/core/src/ch/asynk/rustanddust/game/Map.java index 00d720b7..62f5723a 100644 --- a/core/src/ch/asynk/creepingarmor/game/Map.java +++ b/core/src/ch/asynk/rustanddust/game/Map.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.game; +package ch.asynk.rustanddust.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.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; +import ch.asynk.rustanddust.RustAndDust; +import ch.asynk.rustanddust.engine.Pawn; +import ch.asynk.rustanddust.engine.Board; +import ch.asynk.rustanddust.engine.Tile; +import ch.asynk.rustanddust.engine.Faction; +import ch.asynk.rustanddust.engine.Move; +import ch.asynk.rustanddust.engine.SelectedTile; +import ch.asynk.rustanddust.engine.ObjectiveSet; +import ch.asynk.rustanddust.engine.OrderList; +import ch.asynk.rustanddust.engine.Orientation; +import ch.asynk.rustanddust.engine.Meteorology; +import ch.asynk.rustanddust.engine.PathBuilder; +import ch.asynk.rustanddust.engine.gfx.Moveable; +import ch.asynk.rustanddust.engine.gfx.Animation; +import ch.asynk.rustanddust.engine.gfx.animations.AnimationSequence; +import ch.asynk.rustanddust.engine.gfx.animations.DiceAnimation; +import ch.asynk.rustanddust.engine.gfx.animations.FireAnimation; +import ch.asynk.rustanddust.engine.gfx.animations.TankFireAnimation; +import ch.asynk.rustanddust.engine.gfx.animations.InfantryFireAnimation; +import ch.asynk.rustanddust.engine.gfx.animations.PromoteAnimation; +import ch.asynk.rustanddust.engine.gfx.animations.DestroyAnimation; +import ch.asynk.rustanddust.engine.gfx.animations.SoundAnimation; +import ch.asynk.rustanddust.engine.gfx.animations.RunnableAnimation; +import ch.asynk.rustanddust.engine.gfx.animations.MoveToAnimation.MoveToAnimationCb; + +import ch.asynk.rustanddust.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 CreepingArmor game, Board.Config cfg, String textureName) + public Map(final RustAndDust 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) { - CreepingArmor.debug(" Move", String.format("%s %s", move.type, move.toString())); + RustAndDust.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) { - CreepingArmor.debug("Command", cmd.toString()); + RustAndDust.debug("Command", cmd.toString()); int r = 1; @@ -344,7 +344,7 @@ public abstract class Map extends Board implements MoveToAnimationCb, ObjectiveS public void turnDone() { - CreepingArmor.debug("TurnDone", String.format(" Processed Commands : %d", commands.size())); + RustAndDust.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) { - CreepingArmor.debug(" revertMove() " + unit); + RustAndDust.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) { - CreepingArmor.debug(" revertEnter() "+ unit); + RustAndDust.debug(" revertEnter() "+ unit); removePawn(unit); objectives.revert(this); ctrl.player.revertUnitEntry(unit); diff --git a/core/src/ch/asynk/creepingarmor/game/Player.java b/core/src/ch/asynk/rustanddust/game/Player.java index 020118ab..e3681011 100644 --- a/core/src/ch/asynk/creepingarmor/game/Player.java +++ b/core/src/ch/asynk/rustanddust/game/Player.java @@ -1,9 +1,9 @@ -package ch.asynk.creepingarmor.game; +package ch.asynk.rustanddust.game; import java.util.Random; import java.util.List; -import ch.asynk.creepingarmor.CreepingArmor; +import ch.asynk.rustanddust.RustAndDust; public class Player { @@ -26,7 +26,7 @@ public class Player public int lostEngagementCount; public int wonEngagementCount; - public Player(final CreepingArmor game, Army army, int n) + public Player(final RustAndDust 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) CreepingArmor.debug("ERROR: spent too much AP, please report"); + if (apSpent > actionPoints) RustAndDust.debug("ERROR: spent too much AP, please report"); } public void turnEnd() diff --git a/core/src/ch/asynk/creepingarmor/game/State.java b/core/src/ch/asynk/rustanddust/game/State.java index a0af2e20..db0d6af5 100644 --- a/core/src/ch/asynk/creepingarmor/game/State.java +++ b/core/src/ch/asynk/rustanddust/game/State.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.game; +package ch.asynk.rustanddust.game; public interface State { diff --git a/core/src/ch/asynk/creepingarmor/game/Unit.java b/core/src/ch/asynk/rustanddust/game/Unit.java index f209ea26..472bd201 100644 --- a/core/src/ch/asynk/creepingarmor/game/Unit.java +++ b/core/src/ch/asynk/rustanddust/game/Unit.java @@ -1,15 +1,15 @@ -package ch.asynk.creepingarmor.game; +package ch.asynk.rustanddust.game; import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.g2d.TextureAtlas; -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.rustanddust.engine.Pawn; +import ch.asynk.rustanddust.engine.Tile; +import ch.asynk.rustanddust.engine.HeadedPawn; +import ch.asynk.rustanddust.engine.Orientation; +import ch.asynk.rustanddust.game.Hex.Terrain; -import ch.asynk.creepingarmor.CreepingArmor; +import ch.asynk.rustanddust.RustAndDust; public class Unit extends HeadedPawn { @@ -304,7 +304,7 @@ public class Unit extends HeadedPawn cost -= getRoadMarchBonus(); if (cost > mpLeft) - CreepingArmor.debug("ERROR: Movement point exceeded: " + cost + "/" + mpLeft + " please report"); + RustAndDust.debug("ERROR: Movement point exceeded: " + cost + "/" + mpLeft + " please report"); if (move.isFinal()) setMoved(); diff --git a/core/src/ch/asynk/creepingarmor/game/UnitList.java b/core/src/ch/asynk/rustanddust/game/UnitList.java index 2e4ee273..96370364 100644 --- a/core/src/ch/asynk/creepingarmor/game/UnitList.java +++ b/core/src/ch/asynk/rustanddust/game/UnitList.java @@ -1,9 +1,9 @@ -package ch.asynk.creepingarmor.game; +package ch.asynk.rustanddust.game; import java.util.Collection; import java.util.ArrayList; -import ch.asynk.creepingarmor.engine.Pawn; +import ch.asynk.rustanddust.engine.Pawn; public class UnitList extends ArrayList<Unit> { diff --git a/core/src/ch/asynk/creepingarmor/game/Zone.java b/core/src/ch/asynk/rustanddust/game/Zone.java index f7c0a826..ff152993 100644 --- a/core/src/ch/asynk/creepingarmor/game/Zone.java +++ b/core/src/ch/asynk/rustanddust/game/Zone.java @@ -1,6 +1,6 @@ -package ch.asynk.creepingarmor.game; +package ch.asynk.rustanddust.game; -import ch.asynk.creepingarmor.engine.Orientation; +import ch.asynk.rustanddust.engine.Orientation; public class Zone extends HexSet { diff --git a/core/src/ch/asynk/creepingarmor/game/battles/BattleCommon.java b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java index fb1ab536..731c616f 100644 --- a/core/src/ch/asynk/creepingarmor/game/battles/BattleCommon.java +++ b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java @@ -1,20 +1,20 @@ -package ch.asynk.creepingarmor.game.battles; +package ch.asynk.rustanddust.game.battles; import java.util.Random; import java.util.HashMap; import java.util.ArrayList; -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; +import ch.asynk.rustanddust.game.Army; +import ch.asynk.rustanddust.game.Battle; +import ch.asynk.rustanddust.game.Player; +import ch.asynk.rustanddust.game.Ctrl; +import ch.asynk.rustanddust.game.Map; +import ch.asynk.rustanddust.game.Zone; +import ch.asynk.rustanddust.game.Hex; +import ch.asynk.rustanddust.game.HexSet; +import ch.asynk.rustanddust.game.Unit; +import ch.asynk.rustanddust.game.Unit.UnitId; +import ch.asynk.rustanddust.game.State.StateType; public abstract class BattleCommon implements Battle { diff --git a/core/src/ch/asynk/creepingarmor/game/battles/BattleCounterAttack.java b/core/src/ch/asynk/rustanddust/game/battles/BattleCounterAttack.java index a06d7cd8..cea1d137 100644 --- a/core/src/ch/asynk/creepingarmor/game/battles/BattleCounterAttack.java +++ b/core/src/ch/asynk/rustanddust/game/battles/BattleCounterAttack.java @@ -1,14 +1,14 @@ -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; +package ch.asynk.rustanddust.game.battles; + +import ch.asynk.rustanddust.game.Army; +import ch.asynk.rustanddust.game.Player; +import ch.asynk.rustanddust.game.Ctrl; +import ch.asynk.rustanddust.game.Map; +import ch.asynk.rustanddust.game.Zone; +import ch.asynk.rustanddust.game.Unit; +import ch.asynk.rustanddust.game.Unit.UnitId; +import ch.asynk.rustanddust.ui.Position; +import ch.asynk.rustanddust.engine.Orientation; public class BattleCounterAttack extends BattleCommon { diff --git a/core/src/ch/asynk/creepingarmor/game/battles/BattleFrontalAssault.java b/core/src/ch/asynk/rustanddust/game/battles/BattleFrontalAssault.java index a7f5726c..372e0454 100644 --- a/core/src/ch/asynk/creepingarmor/game/battles/BattleFrontalAssault.java +++ b/core/src/ch/asynk/rustanddust/game/battles/BattleFrontalAssault.java @@ -1,16 +1,16 @@ -package ch.asynk.creepingarmor.game.battles; +package ch.asynk.rustanddust.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; +import ch.asynk.rustanddust.game.Army; +import ch.asynk.rustanddust.game.Player; +import ch.asynk.rustanddust.game.Ctrl; +import ch.asynk.rustanddust.game.Map; +import ch.asynk.rustanddust.game.Hex; +import ch.asynk.rustanddust.game.HexSet; +import ch.asynk.rustanddust.game.Zone; +import ch.asynk.rustanddust.game.Unit; +import ch.asynk.rustanddust.game.Unit.UnitId; +import ch.asynk.rustanddust.ui.Position; +import ch.asynk.rustanddust.engine.Orientation; public class BattleFrontalAssault extends BattleCommon { diff --git a/core/src/ch/asynk/creepingarmor/game/battles/BattleHeadToHead.java b/core/src/ch/asynk/rustanddust/game/battles/BattleHeadToHead.java index 26d2b1de..0d888464 100644 --- a/core/src/ch/asynk/creepingarmor/game/battles/BattleHeadToHead.java +++ b/core/src/ch/asynk/rustanddust/game/battles/BattleHeadToHead.java @@ -1,16 +1,16 @@ -package ch.asynk.creepingarmor.game.battles; +package ch.asynk.rustanddust.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; +import ch.asynk.rustanddust.game.Zone; +import ch.asynk.rustanddust.game.Army; +import ch.asynk.rustanddust.game.Player; +import ch.asynk.rustanddust.game.Ctrl; +import ch.asynk.rustanddust.game.Map; +import ch.asynk.rustanddust.game.Hex; +import ch.asynk.rustanddust.game.HexSet; +import ch.asynk.rustanddust.game.Unit; +import ch.asynk.rustanddust.game.Unit.UnitId; +import ch.asynk.rustanddust.ui.Position; +import ch.asynk.rustanddust.engine.Orientation; public class BattleHeadToHead extends BattleCommon { diff --git a/core/src/ch/asynk/creepingarmor/game/battles/BattleLastStand.java b/core/src/ch/asynk/rustanddust/game/battles/BattleLastStand.java index 6d7e0358..f898ce93 100644 --- a/core/src/ch/asynk/creepingarmor/game/battles/BattleLastStand.java +++ b/core/src/ch/asynk/rustanddust/game/battles/BattleLastStand.java @@ -1,16 +1,16 @@ -package ch.asynk.creepingarmor.game.battles; +package ch.asynk.rustanddust.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; +import ch.asynk.rustanddust.game.Zone; +import ch.asynk.rustanddust.game.Army; +import ch.asynk.rustanddust.game.Player; +import ch.asynk.rustanddust.game.Ctrl; +import ch.asynk.rustanddust.game.Map; +import ch.asynk.rustanddust.game.Hex; +import ch.asynk.rustanddust.game.HexSet; +import ch.asynk.rustanddust.game.Unit; +import ch.asynk.rustanddust.game.Unit.UnitId; +import ch.asynk.rustanddust.ui.Position; +import ch.asynk.rustanddust.engine.Orientation; public class BattleLastStand extends BattleCommon { diff --git a/core/src/ch/asynk/creepingarmor/game/battles/BattleNightAction.java b/core/src/ch/asynk/rustanddust/game/battles/BattleNightAction.java index 965327aa..f9817db6 100644 --- a/core/src/ch/asynk/creepingarmor/game/battles/BattleNightAction.java +++ b/core/src/ch/asynk/rustanddust/game/battles/BattleNightAction.java @@ -1,17 +1,17 @@ -package ch.asynk.creepingarmor.game.battles; +package ch.asynk.rustanddust.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; -import ch.asynk.creepingarmor.engine.Meteorology; +import ch.asynk.rustanddust.game.Zone; +import ch.asynk.rustanddust.game.Army; +import ch.asynk.rustanddust.game.Player; +import ch.asynk.rustanddust.game.Ctrl; +import ch.asynk.rustanddust.game.Map; +import ch.asynk.rustanddust.game.Hex; +import ch.asynk.rustanddust.game.HexSet; +import ch.asynk.rustanddust.game.Unit; +import ch.asynk.rustanddust.game.Unit.UnitId; +import ch.asynk.rustanddust.ui.Position; +import ch.asynk.rustanddust.engine.Orientation; +import ch.asynk.rustanddust.engine.Meteorology; public class BattleNightAction extends BattleCommon { diff --git a/core/src/ch/asynk/creepingarmor/game/battles/BattleStabToTheFlank.java b/core/src/ch/asynk/rustanddust/game/battles/BattleStabToTheFlank.java index d2d14575..c45bac41 100644 --- a/core/src/ch/asynk/creepingarmor/game/battles/BattleStabToTheFlank.java +++ b/core/src/ch/asynk/rustanddust/game/battles/BattleStabToTheFlank.java @@ -1,16 +1,16 @@ -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; +package ch.asynk.rustanddust.game.battles; + +import ch.asynk.rustanddust.game.Zone; +import ch.asynk.rustanddust.game.Army; +import ch.asynk.rustanddust.game.Player; +import ch.asynk.rustanddust.game.Ctrl; +import ch.asynk.rustanddust.game.Map; +import ch.asynk.rustanddust.game.Hex; +import ch.asynk.rustanddust.game.HexSet; +import ch.asynk.rustanddust.game.Unit; +import ch.asynk.rustanddust.game.Unit.UnitId; +import ch.asynk.rustanddust.ui.Position; +import ch.asynk.rustanddust.engine.Orientation; public class BattleStabToTheFlank extends BattleCommon { diff --git a/core/src/ch/asynk/creepingarmor/game/battles/BattleTest.java b/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java index 6c1d6c1e..a237bca2 100644 --- a/core/src/ch/asynk/creepingarmor/game/battles/BattleTest.java +++ b/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java @@ -1,16 +1,16 @@ -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; +package ch.asynk.rustanddust.game.battles; + +import ch.asynk.rustanddust.game.Army; +import ch.asynk.rustanddust.game.Player; +import ch.asynk.rustanddust.game.Ctrl; +import ch.asynk.rustanddust.game.Map; +import ch.asynk.rustanddust.game.Hex; +import ch.asynk.rustanddust.game.HexSet; +import ch.asynk.rustanddust.game.Zone; +import ch.asynk.rustanddust.game.Unit; +import ch.asynk.rustanddust.game.Unit.UnitId; +import ch.asynk.rustanddust.ui.Position; +import ch.asynk.rustanddust.engine.Orientation; public class BattleTest extends BattleCommon { diff --git a/core/src/ch/asynk/creepingarmor/game/battles/Factory.java b/core/src/ch/asynk/rustanddust/game/battles/Factory.java index 4af2536c..43906639 100644 --- a/core/src/ch/asynk/creepingarmor/game/battles/Factory.java +++ b/core/src/ch/asynk/rustanddust/game/battles/Factory.java @@ -1,25 +1,25 @@ -package ch.asynk.creepingarmor.game.battles; +package ch.asynk.rustanddust.game.battles; import com.badlogic.gdx.utils.Disposable; import com.badlogic.gdx.graphics.g2d.TextureAtlas; -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; +import ch.asynk.rustanddust.RustAndDust; +import ch.asynk.rustanddust.engine.Board; +import ch.asynk.rustanddust.game.Player; +import ch.asynk.rustanddust.game.Map; +import ch.asynk.rustanddust.game.Hex; +import ch.asynk.rustanddust.game.Army; +import ch.asynk.rustanddust.game.Unit; +import ch.asynk.rustanddust.game.Unit.UnitId; +import ch.asynk.rustanddust.game.Unit.UnitType; +import ch.asynk.rustanddust.game.Battle; +import ch.asynk.rustanddust.game.battles.BattleHeadToHead; +import ch.asynk.rustanddust.game.battles.BattleFrontalAssault; +import ch.asynk.rustanddust.game.battles.BattleLastStand; +import ch.asynk.rustanddust.game.battles.BattleCounterAttack; +import ch.asynk.rustanddust.game.battles.BattleStabToTheFlank; +import ch.asynk.rustanddust.game.battles.BattleNightAction; +import ch.asynk.rustanddust.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 CreepingArmor game; + private final RustAndDust game; - public Factory(final CreepingArmor game) + public Factory(final RustAndDust game) { this.game = game; this.assetsLoaded = false; diff --git a/core/src/ch/asynk/creepingarmor/game/battles/MapA.java b/core/src/ch/asynk/rustanddust/game/battles/MapA.java index 11c2dddc..491b3706 100644 --- a/core/src/ch/asynk/creepingarmor/game/battles/MapA.java +++ b/core/src/ch/asynk/rustanddust/game/battles/MapA.java @@ -1,14 +1,14 @@ -package ch.asynk.creepingarmor.game.battles; +package ch.asynk.rustanddust.game.battles; -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; +import ch.asynk.rustanddust.RustAndDust; +import ch.asynk.rustanddust.engine.Board; +import ch.asynk.rustanddust.engine.Orientation; +import ch.asynk.rustanddust.game.Map; +import ch.asynk.rustanddust.game.Hex; public class MapA extends Map { - public MapA(final CreepingArmor game, Board.Config cfg, String textureName) + public MapA(final RustAndDust game, Board.Config cfg, String textureName) { super(game, cfg, textureName); } diff --git a/core/src/ch/asynk/creepingarmor/game/battles/MapB.java b/core/src/ch/asynk/rustanddust/game/battles/MapB.java index 1248cea1..8636481b 100644 --- a/core/src/ch/asynk/creepingarmor/game/battles/MapB.java +++ b/core/src/ch/asynk/rustanddust/game/battles/MapB.java @@ -1,14 +1,14 @@ -package ch.asynk.creepingarmor.game.battles; +package ch.asynk.rustanddust.game.battles; -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; +import ch.asynk.rustanddust.RustAndDust; +import ch.asynk.rustanddust.engine.Board; +import ch.asynk.rustanddust.engine.Orientation; +import ch.asynk.rustanddust.game.Map; +import ch.asynk.rustanddust.game.Hex; public class MapB extends Map { - public MapB(final CreepingArmor game, Board.Config cfg, String textureName) + public MapB(final RustAndDust game, Board.Config cfg, String textureName) { super(game, cfg, textureName); } diff --git a/core/src/ch/asynk/creepingarmor/game/hud/ActionButtons.java b/core/src/ch/asynk/rustanddust/game/hud/ActionButtons.java index 1e85a5ee..323767fd 100644 --- a/core/src/ch/asynk/creepingarmor/game/hud/ActionButtons.java +++ b/core/src/ch/asynk/rustanddust/game/hud/ActionButtons.java @@ -1,15 +1,15 @@ -package ch.asynk.creepingarmor.game.hud; +package ch.asynk.rustanddust.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.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; +import ch.asynk.rustanddust.game.Ctrl; +import ch.asynk.rustanddust.game.State.StateType; +import ch.asynk.rustanddust.ui.Widget; +import ch.asynk.rustanddust.ui.Bg; +import ch.asynk.rustanddust.ui.Position; public class ActionButtons extends Widget { diff --git a/core/src/ch/asynk/creepingarmor/game/hud/EngagementPanel.java b/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java index 5471dfb6..790c8b50 100644 --- a/core/src/ch/asynk/creepingarmor/game/hud/EngagementPanel.java +++ b/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.game.hud; +package ch.asynk.rustanddust.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.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; +import ch.asynk.rustanddust.game.Engagement; +import ch.asynk.rustanddust.game.Army; +import ch.asynk.rustanddust.engine.gfx.Animation; +import ch.asynk.rustanddust.engine.gfx.animations.DiceAnimation; +import ch.asynk.rustanddust.ui.Bg; +import ch.asynk.rustanddust.ui.Label; +import ch.asynk.rustanddust.ui.Patch; +import ch.asynk.rustanddust.ui.Position; public class EngagementPanel extends Patch implements Animation { diff --git a/core/src/ch/asynk/creepingarmor/game/hud/PlayerInfo.java b/core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java index fbd843bb..dd77c8e9 100644 --- a/core/src/ch/asynk/creepingarmor/game/hud/PlayerInfo.java +++ b/core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.game.hud; +package ch.asynk.rustanddust.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.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; +import ch.asynk.rustanddust.engine.gfx.Animation; +import ch.asynk.rustanddust.engine.gfx.Drawable; + +import ch.asynk.rustanddust.game.State.StateType; +import ch.asynk.rustanddust.game.Ctrl; +import ch.asynk.rustanddust.game.Hud; +import ch.asynk.rustanddust.game.Army; +import ch.asynk.rustanddust.game.Unit; +import ch.asynk.rustanddust.game.Player; +import ch.asynk.rustanddust.ui.LabelImage; +import ch.asynk.rustanddust.ui.Position; public class PlayerInfo implements Disposable, Drawable, Animation { diff --git a/core/src/ch/asynk/creepingarmor/game/hud/StatisticsPanel.java b/core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java index e4a70ce9..2e6546ba 100644 --- a/core/src/ch/asynk/creepingarmor/game/hud/StatisticsPanel.java +++ b/core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java @@ -1,15 +1,15 @@ -package ch.asynk.creepingarmor.game.hud; +package ch.asynk.rustanddust.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.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; +import ch.asynk.rustanddust.game.Player; +import ch.asynk.rustanddust.ui.Bg; +import ch.asynk.rustanddust.ui.Label; +import ch.asynk.rustanddust.ui.Patch; +import ch.asynk.rustanddust.ui.Position; public class StatisticsPanel extends Patch { diff --git a/core/src/ch/asynk/creepingarmor/game/hud/UnitDock.java b/core/src/ch/asynk/rustanddust/game/hud/UnitDock.java index b4a2f6f3..11895bad 100644 --- a/core/src/ch/asynk/creepingarmor/game/hud/UnitDock.java +++ b/core/src/ch/asynk/rustanddust/game/hud/UnitDock.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.game.hud; +package ch.asynk.rustanddust.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.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; +import ch.asynk.rustanddust.engine.gfx.Animation; +import ch.asynk.rustanddust.engine.Orientation; +import ch.asynk.rustanddust.game.Ctrl; +import ch.asynk.rustanddust.game.Unit; +import ch.asynk.rustanddust.game.UnitList; +import ch.asynk.rustanddust.ui.Bg; +import ch.asynk.rustanddust.ui.Position; public class UnitDock extends Bg implements Animation { diff --git a/core/src/ch/asynk/creepingarmor/game/states/StateAnimation.java b/core/src/ch/asynk/rustanddust/game/states/StateAnimation.java index 512169a4..41831e08 100644 --- a/core/src/ch/asynk/creepingarmor/game/states/StateAnimation.java +++ b/core/src/ch/asynk/rustanddust/game/states/StateAnimation.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.game.states; +package ch.asynk.rustanddust.game.states; public class StateAnimation extends StateCommon { diff --git a/core/src/ch/asynk/creepingarmor/game/states/StateBreak.java b/core/src/ch/asynk/rustanddust/game/states/StateBreak.java index 3b474a58..f1e40f6d 100644 --- a/core/src/ch/asynk/creepingarmor/game/states/StateBreak.java +++ b/core/src/ch/asynk/rustanddust/game/states/StateBreak.java @@ -1,10 +1,10 @@ -package ch.asynk.creepingarmor.game.states; +package ch.asynk.rustanddust.game.states; -import ch.asynk.creepingarmor.engine.Orientation; -import ch.asynk.creepingarmor.game.Unit; -import ch.asynk.creepingarmor.game.hud.ActionButtons.Buttons; +import ch.asynk.rustanddust.engine.Orientation; +import ch.asynk.rustanddust.game.Unit; +import ch.asynk.rustanddust.game.hud.ActionButtons.Buttons; -import ch.asynk.creepingarmor.CreepingArmor; +import ch.asynk.rustanddust.RustAndDust; public class StateBreak extends StateCommon { @@ -85,6 +85,6 @@ public class StateBreak extends StateCommon map.moveUnit(activeUnit); ctrl.setAfterAnimationState(StateType.DONE); } else - CreepingArmor.debug("That's very wrong there should be only one path"); + RustAndDust.debug("That's very wrong there should be only one path"); } } diff --git a/core/src/ch/asynk/creepingarmor/game/states/StateCommon.java b/core/src/ch/asynk/rustanddust/game/states/StateCommon.java index 8ac4ab7c..443182da 100644 --- a/core/src/ch/asynk/creepingarmor/game/states/StateCommon.java +++ b/core/src/ch/asynk/rustanddust/game/states/StateCommon.java @@ -1,12 +1,12 @@ -package ch.asynk.creepingarmor.game.states; +package ch.asynk.rustanddust.game.states; -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.rustanddust.game.Map; +import ch.asynk.rustanddust.game.Hex; +import ch.asynk.rustanddust.game.Unit; +import ch.asynk.rustanddust.game.Ctrl; +import ch.asynk.rustanddust.game.State; -import ch.asynk.creepingarmor.CreepingArmor; +import ch.asynk.rustanddust.RustAndDust; public abstract class StateCommon implements State { diff --git a/core/src/ch/asynk/creepingarmor/game/states/StateDeployment.java b/core/src/ch/asynk/rustanddust/game/states/StateDeployment.java index 891156fd..9528d2a5 100644 --- a/core/src/ch/asynk/creepingarmor/game/states/StateDeployment.java +++ b/core/src/ch/asynk/rustanddust/game/states/StateDeployment.java @@ -1,13 +1,13 @@ -package ch.asynk.creepingarmor.game.states; +package ch.asynk.rustanddust.game.states; -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.rustanddust.engine.Orientation; +import ch.asynk.rustanddust.game.Hex; +import ch.asynk.rustanddust.game.Zone; +import ch.asynk.rustanddust.game.Unit; +import ch.asynk.rustanddust.game.UnitList; +import ch.asynk.rustanddust.game.hud.ActionButtons.Buttons; -import ch.asynk.creepingarmor.CreepingArmor; +import ch.asynk.rustanddust.RustAndDust; public class StateDeployment extends StateCommon { diff --git a/core/src/ch/asynk/creepingarmor/game/states/StateEngage.java b/core/src/ch/asynk/rustanddust/game/states/StateEngage.java index a9dc0745..4588cb2e 100644 --- a/core/src/ch/asynk/creepingarmor/game/states/StateEngage.java +++ b/core/src/ch/asynk/rustanddust/game/states/StateEngage.java @@ -1,9 +1,9 @@ -package ch.asynk.creepingarmor.game.states; +package ch.asynk.rustanddust.game.states; -import ch.asynk.creepingarmor.game.Unit; -import ch.asynk.creepingarmor.game.hud.ActionButtons.Buttons; +import ch.asynk.rustanddust.game.Unit; +import ch.asynk.rustanddust.game.hud.ActionButtons.Buttons; -import ch.asynk.creepingarmor.CreepingArmor; +import ch.asynk.rustanddust.RustAndDust; public class StateEngage extends StateCommon { @@ -28,7 +28,7 @@ public class StateEngage extends StateCommon selectedUnit.showAttack(); map.selectHex(selectedHex); } else - CreepingArmor.debug("should not happen"); + RustAndDust.debug("should not happen"); } @Override diff --git a/core/src/ch/asynk/creepingarmor/game/states/StateMove.java b/core/src/ch/asynk/rustanddust/game/states/StateMove.java index 9a586e3c..b59b133a 100644 --- a/core/src/ch/asynk/creepingarmor/game/states/StateMove.java +++ b/core/src/ch/asynk/rustanddust/game/states/StateMove.java @@ -1,9 +1,9 @@ -package ch.asynk.creepingarmor.game.states; +package ch.asynk.rustanddust.game.states; -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; +import ch.asynk.rustanddust.game.Hex; +import ch.asynk.rustanddust.game.Unit; +import ch.asynk.rustanddust.game.Zone; +import ch.asynk.rustanddust.game.hud.ActionButtons.Buttons; public class StateMove extends StateCommon { diff --git a/core/src/ch/asynk/creepingarmor/game/states/StatePromote.java b/core/src/ch/asynk/rustanddust/game/states/StatePromote.java index 92a0d7b2..8543c894 100644 --- a/core/src/ch/asynk/creepingarmor/game/states/StatePromote.java +++ b/core/src/ch/asynk/rustanddust/game/states/StatePromote.java @@ -1,6 +1,6 @@ -package ch.asynk.creepingarmor.game.states; +package ch.asynk.rustanddust.game.states; -import ch.asynk.creepingarmor.game.Unit; +import ch.asynk.rustanddust.game.Unit; public class StatePromote extends StateCommon { diff --git a/core/src/ch/asynk/creepingarmor/game/states/StateReinforcement.java b/core/src/ch/asynk/rustanddust/game/states/StateReinforcement.java index 4d0cce44..77ff8264 100644 --- a/core/src/ch/asynk/creepingarmor/game/states/StateReinforcement.java +++ b/core/src/ch/asynk/rustanddust/game/states/StateReinforcement.java @@ -1,9 +1,9 @@ -package ch.asynk.creepingarmor.game.states; +package ch.asynk.rustanddust.game.states; -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; +import ch.asynk.rustanddust.game.Hex; +import ch.asynk.rustanddust.game.Zone; +import ch.asynk.rustanddust.game.Unit; +import ch.asynk.rustanddust.game.hud.ActionButtons.Buttons; public class StateReinforcement extends StateCommon { diff --git a/core/src/ch/asynk/creepingarmor/game/states/StateRotate.java b/core/src/ch/asynk/rustanddust/game/states/StateRotate.java index 4f8cf390..4d91740f 100644 --- a/core/src/ch/asynk/creepingarmor/game/states/StateRotate.java +++ b/core/src/ch/asynk/rustanddust/game/states/StateRotate.java @@ -1,9 +1,9 @@ -package ch.asynk.creepingarmor.game.states; +package ch.asynk.rustanddust.game.states; -import ch.asynk.creepingarmor.engine.Orientation; -import ch.asynk.creepingarmor.game.hud.ActionButtons.Buttons; +import ch.asynk.rustanddust.engine.Orientation; +import ch.asynk.rustanddust.game.hud.ActionButtons.Buttons; -import ch.asynk.creepingarmor.CreepingArmor; +import ch.asynk.rustanddust.RustAndDust; public class StateRotate extends StateCommon { @@ -26,7 +26,7 @@ public class StateRotate extends StateCommon } if (map.pathBuilder.size() != 1) - CreepingArmor.debug("ERROR: pathBuilder.size() == " + map.pathBuilder.size()); + RustAndDust.debug("ERROR: pathBuilder.size() == " + map.pathBuilder.size()); rotateOnly = (to == activeUnit.getHex()); diff --git a/core/src/ch/asynk/creepingarmor/game/states/StateSelect.java b/core/src/ch/asynk/rustanddust/game/states/StateSelect.java index a0863e10..9161a6b3 100644 --- a/core/src/ch/asynk/creepingarmor/game/states/StateSelect.java +++ b/core/src/ch/asynk/rustanddust/game/states/StateSelect.java @@ -1,12 +1,12 @@ -package ch.asynk.creepingarmor.game.states; +package ch.asynk.rustanddust.game.states; -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.rustanddust.game.Map; +import ch.asynk.rustanddust.game.Hex; +import ch.asynk.rustanddust.game.Unit; +import ch.asynk.rustanddust.game.Ctrl; +import ch.asynk.rustanddust.game.hud.ActionButtons.Buttons; -import ch.asynk.creepingarmor.CreepingArmor; +import ch.asynk.rustanddust.RustAndDust; 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 ); - CreepingArmor.debug("Select", selectedHex.toString() + " " + selectedUnit + (isEnemy ? " enemy " : " friend ")); + RustAndDust.debug("Select", selectedHex.toString() + " " + selectedUnit + (isEnemy ? " enemy " : " friend ")); } } diff --git a/core/src/ch/asynk/creepingarmor/game/states/StateWithdraw.java b/core/src/ch/asynk/rustanddust/game/states/StateWithdraw.java index 3d0dfdd8..f4f11a68 100644 --- a/core/src/ch/asynk/creepingarmor/game/states/StateWithdraw.java +++ b/core/src/ch/asynk/rustanddust/game/states/StateWithdraw.java @@ -1,8 +1,8 @@ -package ch.asynk.creepingarmor.game.states; +package ch.asynk.rustanddust.game.states; -import ch.asynk.creepingarmor.game.Zone; -import ch.asynk.creepingarmor.game.Hex; -import ch.asynk.creepingarmor.game.Unit; +import ch.asynk.rustanddust.game.Zone; +import ch.asynk.rustanddust.game.Hex; +import ch.asynk.rustanddust.game.Unit; public class StateWithdraw extends StateCommon { diff --git a/core/src/ch/asynk/creepingarmor/loading/LoadingBar.java b/core/src/ch/asynk/rustanddust/loading/LoadingBar.java index 61de99a1..5a6181a7 100644 --- a/core/src/ch/asynk/creepingarmor/loading/LoadingBar.java +++ b/core/src/ch/asynk/rustanddust/loading/LoadingBar.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.loading; +package ch.asynk.rustanddust.loading; import com.badlogic.gdx.graphics.g2d.Animation; import com.badlogic.gdx.graphics.g2d.Batch; diff --git a/core/src/ch/asynk/creepingarmor/menu/MainMenu.java b/core/src/ch/asynk/rustanddust/menu/MainMenu.java index 1c1a9f95..769adb3d 100644 --- a/core/src/ch/asynk/creepingarmor/menu/MainMenu.java +++ b/core/src/ch/asynk/rustanddust/menu/MainMenu.java @@ -1,10 +1,10 @@ -package ch.asynk.creepingarmor.menu; +package ch.asynk.rustanddust.menu; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.graphics.g2d.TextureAtlas; -import ch.asynk.creepingarmor.ui.Menu; +import ch.asynk.rustanddust.ui.Menu; public class MainMenu extends Menu { diff --git a/core/src/ch/asynk/creepingarmor/menu/OptionsMenu.java b/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java index c933df39..9a7c675c 100644 --- a/core/src/ch/asynk/creepingarmor/menu/OptionsMenu.java +++ b/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java @@ -1,16 +1,16 @@ -package ch.asynk.creepingarmor.menu; +package ch.asynk.rustanddust.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.creepingarmor.ui.Label; -import ch.asynk.creepingarmor.ui.Bg; -import ch.asynk.creepingarmor.ui.Patch; -import ch.asynk.creepingarmor.ui.OkCancel; +import ch.asynk.rustanddust.ui.Label; +import ch.asynk.rustanddust.ui.Bg; +import ch.asynk.rustanddust.ui.Patch; +import ch.asynk.rustanddust.ui.OkCancel; -import ch.asynk.creepingarmor.CreepingArmor; +import ch.asynk.rustanddust.RustAndDust; 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 CreepingArmor game; + private final RustAndDust 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(CreepingArmor game, BitmapFont font, TextureAtlas atlas) + public OptionsMenu(RustAndDust game, BitmapFont font, TextureAtlas atlas) { super(atlas.createPatch("typewriter")); this.game = game; diff --git a/core/src/ch/asynk/creepingarmor/menu/ScenariosMenu.java b/core/src/ch/asynk/rustanddust/menu/ScenariosMenu.java index ad71500e..d5b99ede 100644 --- a/core/src/ch/asynk/creepingarmor/menu/ScenariosMenu.java +++ b/core/src/ch/asynk/rustanddust/menu/ScenariosMenu.java @@ -1,15 +1,15 @@ -package ch.asynk.creepingarmor.menu; +package ch.asynk.rustanddust.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.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; +import ch.asynk.rustanddust.ui.Label; +import ch.asynk.rustanddust.ui.Bg; +import ch.asynk.rustanddust.ui.Patch; +import ch.asynk.rustanddust.RustAndDust; +import ch.asynk.rustanddust.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 CreepingArmor game; + private final RustAndDust game; private final BitmapFont font; private float checkDy; @@ -31,7 +31,7 @@ public class ScenariosMenu extends Patch public boolean launch; - public ScenariosMenu(CreepingArmor game, BitmapFont font, TextureAtlas atlas) + public ScenariosMenu(RustAndDust game, BitmapFont font, TextureAtlas atlas) { super(atlas.createPatch("typewriter")); this.game = game; diff --git a/core/src/ch/asynk/creepingarmor/menu/TutorialsMenu.java b/core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java index 44431e21..7f54aad4 100644 --- a/core/src/ch/asynk/creepingarmor/menu/TutorialsMenu.java +++ b/core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java @@ -1,13 +1,13 @@ -package ch.asynk.creepingarmor.menu; +package ch.asynk.rustanddust.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.creepingarmor.ui.Label; -import ch.asynk.creepingarmor.ui.Bg; -import ch.asynk.creepingarmor.ui.Patch; -import ch.asynk.creepingarmor.CreepingArmor; +import ch.asynk.rustanddust.ui.Label; +import ch.asynk.rustanddust.ui.Bg; +import ch.asynk.rustanddust.ui.Patch; +import ch.asynk.rustanddust.RustAndDust; 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 CreepingArmor game; + private final RustAndDust game; private final BitmapFont font; private Label title; private Label msg; protected Bg okBtn; - public TutorialsMenu(CreepingArmor game, BitmapFont font, TextureAtlas atlas) + public TutorialsMenu(RustAndDust game, BitmapFont font, TextureAtlas atlas) { super(atlas.createPatch("typewriter")); this.game = game; diff --git a/core/src/ch/asynk/creepingarmor/screens/GameCamera.java b/core/src/ch/asynk/rustanddust/screens/GameCamera.java index 9fa123f8..0dbcb500 100644 --- a/core/src/ch/asynk/creepingarmor/screens/GameCamera.java +++ b/core/src/ch/asynk/rustanddust/screens/GameCamera.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.screens; +package ch.asynk.rustanddust.screens; import com.badlogic.gdx.Gdx; diff --git a/core/src/ch/asynk/creepingarmor/screens/GameScreen.java b/core/src/ch/asynk/rustanddust/screens/GameScreen.java index 45e8560f..c3699898 100644 --- a/core/src/ch/asynk/creepingarmor/screens/GameScreen.java +++ b/core/src/ch/asynk/rustanddust/screens/GameScreen.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.screens; +package ch.asynk.rustanddust.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.creepingarmor.CreepingArmor; +import ch.asynk.rustanddust.RustAndDust; -import ch.asynk.creepingarmor.game.Ctrl; +import ch.asynk.rustanddust.game.Ctrl; public class GameScreen implements Screen { @@ -37,7 +37,7 @@ public class GameScreen implements Screen private final SpriteBatch batch; private ShapeRenderer debugShapes = null; - private final CreepingArmor game; + private final RustAndDust game; private Ctrl ctrl; private int dragged; @@ -45,7 +45,7 @@ public class GameScreen implements Screen private float inputDelay = 0f; private Vector2 dragPos = new Vector2(); - public GameScreen(final CreepingArmor game) + public GameScreen(final RustAndDust game) { DEBUG = game.config.debug; @@ -181,7 +181,7 @@ public class GameScreen implements Screen @Override public void resize(int width, int height) { - // CreepingArmor.debug("GameScreen", "resize (" + width + "," + height + ")"); + // RustAndDust.debug("GameScreen", "resize (" + width + "," + height + ")"); cam.updateViewport(width, height); ctrl.hud.resize(cam.getHudLeft(), cam.getHudBottom(), cam.getHudWidth(), cam.getHudHeight()); } @@ -189,7 +189,7 @@ public class GameScreen implements Screen @Override public void dispose() { - // CreepingArmor.debug("GameScreen", "dispose()"); + // RustAndDust.debug("GameScreen", "dispose()"); batch.dispose(); ctrl.dispose(); if (DEBUG) debugShapes.dispose(); @@ -198,24 +198,24 @@ public class GameScreen implements Screen @Override public void show() { - // CreepingArmor.debug("GameScreen", "show()"); + // RustAndDust.debug("GameScreen", "show()"); } @Override public void hide() { - // CreepingArmor.debug("GameScreen", "hide()"); + // RustAndDust.debug("GameScreen", "hide()"); } @Override public void pause() { - // CreepingArmor.debug("GameScreen", "pause()"); + // RustAndDust.debug("GameScreen", "pause()"); } @Override public void resume() { - // CreepingArmor.debug("GameScreen", "resume()"); + // RustAndDust.debug("GameScreen", "resume()"); } } diff --git a/core/src/ch/asynk/creepingarmor/screens/MenuCamera.java b/core/src/ch/asynk/rustanddust/screens/MenuCamera.java index 4bd05b34..be8341ab 100644 --- a/core/src/ch/asynk/creepingarmor/screens/MenuCamera.java +++ b/core/src/ch/asynk/rustanddust/screens/MenuCamera.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.screens; +package ch.asynk.rustanddust.screens; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.OrthographicCamera; diff --git a/core/src/ch/asynk/creepingarmor/screens/MenuScreen.java b/core/src/ch/asynk/rustanddust/screens/MenuScreen.java index 92d4ba9c..0ca8a631 100644 --- a/core/src/ch/asynk/creepingarmor/screens/MenuScreen.java +++ b/core/src/ch/asynk/rustanddust/screens/MenuScreen.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.screens; +package ch.asynk.rustanddust.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.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; +import ch.asynk.rustanddust.RustAndDust; +import ch.asynk.rustanddust.ui.Position; +import ch.asynk.rustanddust.menu.MainMenu; +import ch.asynk.rustanddust.menu.OptionsMenu; +import ch.asynk.rustanddust.menu.ScenariosMenu; +import ch.asynk.rustanddust.menu.TutorialsMenu; public class MenuScreen implements Screen { - private final CreepingArmor game; + private final RustAndDust game; private final int OFFSET = 20; private final int V_WIDTH = 1600; @@ -57,7 +57,7 @@ public class MenuScreen implements Screen private final SpriteBatch batch; private Vector3 touch = new Vector3(); - public MenuScreen(final CreepingArmor game) + public MenuScreen(final RustAndDust game) { this.game = game; this.batch = new SpriteBatch(); @@ -141,7 +141,7 @@ public class MenuScreen implements Screen private void gameAssetsLoadingCompleted() { - CreepingArmor.debug("LoadScreen", "assets ready : " + (Gdx.app.getJavaHeap()/1024.0f) + "KB"); + RustAndDust.debug("LoadScreen", "assets ready : " + (Gdx.app.getJavaHeap()/1024.0f) + "KB"); game.switchToGame(); dispose(); } @@ -241,18 +241,18 @@ public class MenuScreen implements Screen @Override public void hide() { - // CreepingArmor.debug("MenuScreen", "hide()"); + // RustAndDust.debug("MenuScreen", "hide()"); } @Override public void pause() { - // CreepingArmor.debug("MenuScreen", "pause()"); + // RustAndDust.debug("MenuScreen", "pause()"); } @Override public void resume() { - // CreepingArmor.debug("MenuScreen", "resume()"); + // RustAndDust.debug("MenuScreen", "resume()"); } } diff --git a/core/src/ch/asynk/creepingarmor/ui/Bg.java b/core/src/ch/asynk/rustanddust/ui/Bg.java index fbacbf0d..cac3ddcc 100644 --- a/core/src/ch/asynk/creepingarmor/ui/Bg.java +++ b/core/src/ch/asynk/rustanddust/ui/Bg.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.ui; +package ch.asynk.rustanddust.ui; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.g2d.TextureRegion; diff --git a/core/src/ch/asynk/creepingarmor/ui/Label.java b/core/src/ch/asynk/rustanddust/ui/Label.java index 31379766..6a6d809f 100644 --- a/core/src/ch/asynk/creepingarmor/ui/Label.java +++ b/core/src/ch/asynk/rustanddust/ui/Label.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.ui; +package ch.asynk.rustanddust.ui; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.g2d.BitmapFont; diff --git a/core/src/ch/asynk/creepingarmor/ui/LabelImage.java b/core/src/ch/asynk/rustanddust/ui/LabelImage.java index a4c9d448..0fb6ecbf 100644 --- a/core/src/ch/asynk/creepingarmor/ui/LabelImage.java +++ b/core/src/ch/asynk/rustanddust/ui/LabelImage.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.ui; +package ch.asynk.rustanddust.ui; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.g2d.BitmapFont; diff --git a/core/src/ch/asynk/creepingarmor/ui/LabelStack.java b/core/src/ch/asynk/rustanddust/ui/LabelStack.java index 03e4b2e6..92933e34 100644 --- a/core/src/ch/asynk/creepingarmor/ui/LabelStack.java +++ b/core/src/ch/asynk/rustanddust/ui/LabelStack.java @@ -1,11 +1,11 @@ -package ch.asynk.creepingarmor.ui; +package ch.asynk.rustanddust.ui; import java.util.ArrayDeque; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.g2d.BitmapFont; -import ch.asynk.creepingarmor.engine.gfx.Animation; +import ch.asynk.rustanddust.engine.gfx.Animation; public class LabelStack extends Label implements Animation { diff --git a/core/src/ch/asynk/creepingarmor/ui/Menu.java b/core/src/ch/asynk/rustanddust/ui/Menu.java index 1744e93a..2fe93a7e 100644 --- a/core/src/ch/asynk/creepingarmor/ui/Menu.java +++ b/core/src/ch/asynk/rustanddust/ui/Menu.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.ui; +package ch.asynk.rustanddust.ui; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.g2d.BitmapFont; diff --git a/core/src/ch/asynk/creepingarmor/ui/Msg.java b/core/src/ch/asynk/rustanddust/ui/Msg.java index f91c6534..e1e7c130 100644 --- a/core/src/ch/asynk/creepingarmor/ui/Msg.java +++ b/core/src/ch/asynk/rustanddust/ui/Msg.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.ui; +package ch.asynk.rustanddust.ui; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.g2d.BitmapFont; diff --git a/core/src/ch/asynk/creepingarmor/ui/OkCancel.java b/core/src/ch/asynk/rustanddust/ui/OkCancel.java index 298c7652..f30a65ba 100644 --- a/core/src/ch/asynk/creepingarmor/ui/OkCancel.java +++ b/core/src/ch/asynk/rustanddust/ui/OkCancel.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.ui; +package ch.asynk.rustanddust.ui; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.g2d.BitmapFont; diff --git a/core/src/ch/asynk/creepingarmor/ui/Patch.java b/core/src/ch/asynk/rustanddust/ui/Patch.java index ec68c201..acff791a 100644 --- a/core/src/ch/asynk/creepingarmor/ui/Patch.java +++ b/core/src/ch/asynk/rustanddust/ui/Patch.java @@ -1,4 +1,4 @@ -package ch.asynk.creepingarmor.ui; +package ch.asynk.rustanddust.ui; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.g2d.NinePatch; diff --git a/core/src/ch/asynk/creepingarmor/ui/Position.java b/core/src/ch/asynk/rustanddust/ui/Position.java index f15c14a6..d8c60966 100644 --- a/core/src/ch/asynk/creepingarmor/ui/Position.java +++ b/core/src/ch/asynk/rustanddust/ui/Position.java @@ -1,7 +1,7 @@ -package ch.asynk.creepingarmor.ui; +package ch.asynk.rustanddust.ui; import com.badlogic.gdx.Gdx; -import ch.asynk.creepingarmor.game.Hud; +import ch.asynk.rustanddust.game.Hud; public enum Position { diff --git a/core/src/ch/asynk/creepingarmor/ui/Widget.java b/core/src/ch/asynk/rustanddust/ui/Widget.java index 1acd63e7..4ae8afd9 100644 --- a/core/src/ch/asynk/creepingarmor/ui/Widget.java +++ b/core/src/ch/asynk/rustanddust/ui/Widget.java @@ -1,10 +1,10 @@ -package ch.asynk.creepingarmor.ui; +package ch.asynk.rustanddust.ui; import com.badlogic.gdx.utils.Disposable; import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.graphics.glutils.ShapeRenderer; -import ch.asynk.creepingarmor.engine.gfx.Drawable; +import ch.asynk.rustanddust.engine.gfx.Drawable; public abstract class Widget implements Disposable, Drawable { |
