From e09ddca8be6f08fb592dd02f9ca9d0d848f55810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Latner?= <matyas.latner@nic.cz> Date: Mon, 2 Feb 2015 13:11:13 +0100 Subject: [PATCH] #5 Game Robbery package refactor --- core/src/cz/nic/tablexia/TablexiaLibGDX.java | 15 +++--- .../{ => game}/common/RandomAccess.java | 2 +- .../{ => game}/difficulty/GameDifficulty.java | 2 +- .../robbery/RoberryGameDataManager.java} | 27 +++++----- .../robbery}/creature/CreatureDescriptor.java | 8 +-- .../robbery}/creature/CreatureFactory.java | 8 +-- .../robbery}/creature/CreatureRoot.java | 22 ++++---- .../creature/attribute/Attribute.java | 17 +++---- .../attribute}/AttributeDescription.java | 11 ++-- .../attribute/clothing/ClothingAttribute.java | 16 +++--- .../accessories/AccessoriesAttribute.java | 10 ++-- .../clothing/accessories/FBeadsAttribute.java | 6 +-- .../clothing/accessories/FScarfAttribute.java | 6 +-- .../clothing/accessories/MScarfAttribute.java | 6 +-- .../clothing/accessories/MTieAttribute.java | 6 +-- .../clothing/bottom/BottomAttribute.java | 10 ++-- .../clothing/bottom/FPantsAttribute.java | 6 +-- .../clothing/bottom/FSkirtAttribute.java | 6 +-- .../clothing/bottom/MPantsAttribute.java | 6 +-- .../clothing/bottom/MShortsAttribute.java | 6 +-- .../clothing/headgear/FHatAttribute.java | 6 +-- .../clothing/headgear/HeadgearAttribute.java | 10 ++-- .../clothing/headgear/MHatAttribute.java | 6 +-- .../clothing/top/FCoatAttribute.java | 6 +-- .../clothing/top/FShirtAttribute.java | 6 +-- .../clothing/top/FSweaterAttribute.java | 6 +-- .../clothing/top/FVestAttribute.java | 6 +-- .../clothing/top/MCoatAttribute.java | 6 +-- .../clothing/top/MShirtAttribute.java | 6 +-- .../clothing/top/MSweaterAttribute.java | 6 +-- .../clothing/top/MVestAttribute.java | 6 +-- .../attribute/clothing/top/TopAttribute.java | 10 ++-- .../attribute/glasses/FGlassesAttribute.java | 6 +-- .../attribute/glasses/GlassesAttribute.java | 8 +-- .../attribute/glasses/MGlassesAttribute.java | 6 +-- .../attribute/hair/FBraidhairAttribute.java | 6 +-- .../attribute/hair/FLonghairAttribute.java | 6 +-- .../attribute/hair/HairAttribute.java | 8 +-- .../attribute/hair/MHairAttribute.java | 6 +-- .../attribute/head/FHead1Attribute.java | 6 +-- .../attribute/head/FHead2Attribute.java | 6 +-- .../attribute/head/HeadAttribute.java | 8 +-- .../attribute/head/MHead1Attribute.java | 6 +-- .../attribute/head/MHead2Attribute.java | 6 +-- .../{ => game/robbery}/rules/GameRule.java | 20 ++++---- .../robbery}/rules/GameRuleUtility.java | 10 ++-- .../robbery}/rules/GameRulesDefinition.java | 50 +++++++++---------- .../robbery}/rules/easy/BC_1_BCRule.java | 20 ++++---- .../robbery}/rules/easy/Bb_0_BbRule.java | 8 +-- .../robbery}/rules/easy/Bt_0_BtRule.java | 20 ++++---- .../robbery}/rules/easy/CACARule.java | 14 +++--- .../robbery}/rules/easy/CACCRule.java | 16 +++--- .../robbery}/rules/easy/CA_0_CC_0_TRule.java | 20 ++++---- .../robbery}/rules/easy/CCCCRule.java | 16 +++--- .../robbery}/rules/easy/CC_0_CC_0_TRule.java | 12 ++--- .../robbery}/rules/easy/CC_0_notCCRule.java | 16 +++--- .../robbery}/rules/hard/Bb_1_BbRule.java | 8 +-- .../robbery}/rules/hard/Bt_1_BtRule.java | 8 +-- .../robbery}/rules/hard/CCCCnotCCRule.java | 18 +++---- .../robbery}/rules/hard/CC_0_CC_0_CCRule.java | 14 +++--- .../rules/hard/CC_0_notCA_0_TRule.java | 16 +++--- .../rules/hard/CC_0_notCC_0_TRule.java | 16 +++--- .../robbery}/rules/hard/CC_2_CCRule.java | 8 +-- .../robbery}/rules/medium/BC_2_BCRule.java | 8 +-- .../robbery}/rules/medium/CA_1_CCRule.java | 16 +++--- .../robbery}/rules/medium/CCCCCCRule.java | 18 +++---- .../robbery}/rules/medium/CC_1_CCRule.java | 16 +++--- .../robbery}/rules/medium/CC_1_notCARule.java | 18 +++---- .../robbery}/rules/medium/CC_1_notCCRule.java | 8 +-- .../robbery}/screen/DebugScreen.java | 9 ++-- .../{ => game/robbery}/screen/GameScreen.java | 9 ++-- .../{ => game/robbery}/screen/RuleScreen.java | 7 +-- .../CreatureDescriptiorTest.java | 36 ++++++------- 73 files changed, 406 insertions(+), 403 deletions(-) rename core/src/cz/nic/tablexia/{ => game}/common/RandomAccess.java (97%) rename core/src/cz/nic/tablexia/{ => game}/difficulty/GameDifficulty.java (98%) rename core/src/cz/nic/tablexia/{BankRoberryGameDataManager.java => game/robbery/RoberryGameDataManager.java} (51%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/CreatureDescriptor.java (98%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/CreatureFactory.java (96%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/CreatureRoot.java (93%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/Attribute.java (96%) rename core/src/cz/nic/tablexia/{ => game/robbery/creature/attribute}/AttributeDescription.java (94%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/clothing/ClothingAttribute.java (77%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/clothing/accessories/AccessoriesAttribute.java (86%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/clothing/accessories/FBeadsAttribute.java (90%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/clothing/accessories/FScarfAttribute.java (90%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/clothing/accessories/MScarfAttribute.java (90%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/clothing/accessories/MTieAttribute.java (89%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/clothing/bottom/BottomAttribute.java (86%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/clothing/bottom/FPantsAttribute.java (92%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/clothing/bottom/FSkirtAttribute.java (91%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/clothing/bottom/MPantsAttribute.java (91%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/clothing/bottom/MShortsAttribute.java (91%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/clothing/headgear/FHatAttribute.java (91%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/clothing/headgear/HeadgearAttribute.java (85%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/clothing/headgear/MHatAttribute.java (91%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/clothing/top/FCoatAttribute.java (90%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/clothing/top/FShirtAttribute.java (92%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/clothing/top/FSweaterAttribute.java (92%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/clothing/top/FVestAttribute.java (92%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/clothing/top/MCoatAttribute.java (90%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/clothing/top/MShirtAttribute.java (92%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/clothing/top/MSweaterAttribute.java (92%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/clothing/top/MVestAttribute.java (92%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/clothing/top/TopAttribute.java (87%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/glasses/FGlassesAttribute.java (88%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/glasses/GlassesAttribute.java (88%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/glasses/MGlassesAttribute.java (89%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/hair/FBraidhairAttribute.java (90%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/hair/FLonghairAttribute.java (90%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/hair/HairAttribute.java (88%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/hair/MHairAttribute.java (90%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/head/FHead1Attribute.java (89%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/head/FHead2Attribute.java (89%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/head/HeadAttribute.java (89%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/head/MHead1Attribute.java (89%) rename core/src/cz/nic/tablexia/{ => game/robbery}/creature/attribute/head/MHead2Attribute.java (89%) rename core/src/cz/nic/tablexia/{ => game/robbery}/rules/GameRule.java (96%) rename core/src/cz/nic/tablexia/{ => game/robbery}/rules/GameRuleUtility.java (95%) rename core/src/cz/nic/tablexia/{ => game/robbery}/rules/GameRulesDefinition.java (83%) rename core/src/cz/nic/tablexia/{ => game/robbery}/rules/easy/BC_1_BCRule.java (89%) rename core/src/cz/nic/tablexia/{ => game/robbery}/rules/easy/Bb_0_BbRule.java (85%) rename core/src/cz/nic/tablexia/{ => game/robbery}/rules/easy/Bt_0_BtRule.java (89%) rename core/src/cz/nic/tablexia/{ => game/robbery}/rules/easy/CACARule.java (84%) rename core/src/cz/nic/tablexia/{ => game/robbery}/rules/easy/CACCRule.java (85%) rename core/src/cz/nic/tablexia/{ => game/robbery}/rules/easy/CA_0_CC_0_TRule.java (88%) rename core/src/cz/nic/tablexia/{ => game/robbery}/rules/easy/CCCCRule.java (89%) rename core/src/cz/nic/tablexia/{ => game/robbery}/rules/easy/CC_0_CC_0_TRule.java (88%) rename core/src/cz/nic/tablexia/{ => game/robbery}/rules/easy/CC_0_notCCRule.java (93%) rename core/src/cz/nic/tablexia/{ => game/robbery}/rules/hard/Bb_1_BbRule.java (85%) rename core/src/cz/nic/tablexia/{ => game/robbery}/rules/hard/Bt_1_BtRule.java (86%) rename core/src/cz/nic/tablexia/{ => game/robbery}/rules/hard/CCCCnotCCRule.java (91%) rename core/src/cz/nic/tablexia/{ => game/robbery}/rules/hard/CC_0_CC_0_CCRule.java (93%) rename core/src/cz/nic/tablexia/{ => game/robbery}/rules/hard/CC_0_notCA_0_TRule.java (86%) rename core/src/cz/nic/tablexia/{ => game/robbery}/rules/hard/CC_0_notCC_0_TRule.java (92%) rename core/src/cz/nic/tablexia/{ => game/robbery}/rules/hard/CC_2_CCRule.java (86%) rename core/src/cz/nic/tablexia/{ => game/robbery}/rules/medium/BC_2_BCRule.java (86%) rename core/src/cz/nic/tablexia/{ => game/robbery}/rules/medium/CA_1_CCRule.java (82%) rename core/src/cz/nic/tablexia/{ => game/robbery}/rules/medium/CCCCCCRule.java (90%) rename core/src/cz/nic/tablexia/{ => game/robbery}/rules/medium/CC_1_CCRule.java (91%) rename core/src/cz/nic/tablexia/{ => game/robbery}/rules/medium/CC_1_notCARule.java (84%) rename core/src/cz/nic/tablexia/{ => game/robbery}/rules/medium/CC_1_notCCRule.java (86%) rename core/src/cz/nic/tablexia/{ => game/robbery}/screen/DebugScreen.java (89%) rename core/src/cz/nic/tablexia/{ => game/robbery}/screen/GameScreen.java (98%) rename core/src/cz/nic/tablexia/{ => game/robbery}/screen/RuleScreen.java (93%) diff --git a/core/src/cz/nic/tablexia/TablexiaLibGDX.java b/core/src/cz/nic/tablexia/TablexiaLibGDX.java index 6d9d9b87b..bd35ce926 100644 --- a/core/src/cz/nic/tablexia/TablexiaLibGDX.java +++ b/core/src/cz/nic/tablexia/TablexiaLibGDX.java @@ -6,9 +6,10 @@ import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.GL20; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.difficulty.GameDifficulty; -import cz.nic.tablexia.screen.RuleScreen; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.difficulty.GameDifficulty; +import cz.nic.tablexia.game.robbery.RoberryGameDataManager; +import cz.nic.tablexia.game.robbery.screen.GameScreen; import cz.nic.tablexia.screen.TablexiaScreen; import cz.nic.tablexia.util.Log; import cz.nic.tablexia.util.Log.TablexiaLogLevel; @@ -24,12 +25,12 @@ public class TablexiaLibGDX extends TablexiaGame { super.create(); Log.setLoglevel(TablexiaLogLevel.DEBUG); - screen = new RuleScreen(); + screen = new GameScreen(); BankRoberryAssetManager.getInstance().load(); BankRoberryFontAssetManager.getInstance().load(); BankRoberryTextResourcesManager.getInstance().load("text/robbery", new Locale("cs", "CZ")); - BankRoberryGameDataManager.getInstance().load(GameDifficulty.EASY, new RandomAccess()); + RoberryGameDataManager.getInstance().load(GameDifficulty.EASY, new RandomAccess()); } @Override @@ -42,7 +43,7 @@ public class TablexiaLibGDX extends TablexiaGame { if (!BankRoberryAssetManager.getInstance().update()) return; if (!BankRoberryFontAssetManager.getInstance().update()) return; if (!BankRoberryTextResourcesManager.getInstance().update()) return; - if (!BankRoberryGameDataManager.getInstance().update()) return; + if (!RoberryGameDataManager.getInstance().update()) return; if (getScreen() != screen) { setScreen(screen, ScreenTransaction.FADE); @@ -52,7 +53,7 @@ public class TablexiaLibGDX extends TablexiaGame { @Override public void dispose() { BankRoberryAssetManager.getInstance().dispose(); - BankRoberryGameDataManager.getInstance().dispose(); + RoberryGameDataManager.getInstance().dispose(); BankRoberryFontAssetManager.getInstance().dispose(); BankRoberryTextResourcesManager.getInstance().dispose(); } diff --git a/core/src/cz/nic/tablexia/common/RandomAccess.java b/core/src/cz/nic/tablexia/game/common/RandomAccess.java similarity index 97% rename from core/src/cz/nic/tablexia/common/RandomAccess.java rename to core/src/cz/nic/tablexia/game/common/RandomAccess.java index 248d55205..df6d4b280 100644 --- a/core/src/cz/nic/tablexia/common/RandomAccess.java +++ b/core/src/cz/nic/tablexia/game/common/RandomAccess.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.common; +package cz.nic.tablexia.game.common; import java.util.Random; diff --git a/core/src/cz/nic/tablexia/difficulty/GameDifficulty.java b/core/src/cz/nic/tablexia/game/difficulty/GameDifficulty.java similarity index 98% rename from core/src/cz/nic/tablexia/difficulty/GameDifficulty.java rename to core/src/cz/nic/tablexia/game/difficulty/GameDifficulty.java index 5c8b74259..519a29359 100644 --- a/core/src/cz/nic/tablexia/difficulty/GameDifficulty.java +++ b/core/src/cz/nic/tablexia/game/difficulty/GameDifficulty.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.difficulty; +package cz.nic.tablexia.game.difficulty; /** diff --git a/core/src/cz/nic/tablexia/BankRoberryGameDataManager.java b/core/src/cz/nic/tablexia/game/robbery/RoberryGameDataManager.java similarity index 51% rename from core/src/cz/nic/tablexia/BankRoberryGameDataManager.java rename to core/src/cz/nic/tablexia/game/robbery/RoberryGameDataManager.java index 359a653f9..2d630f6e4 100644 --- a/core/src/cz/nic/tablexia/BankRoberryGameDataManager.java +++ b/core/src/cz/nic/tablexia/game/robbery/RoberryGameDataManager.java @@ -1,23 +1,24 @@ -package cz.nic.tablexia; +package cz.nic.tablexia.game.robbery; import com.badlogic.gdx.utils.async.AsyncTask; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.difficulty.GameDifficulty; -import cz.nic.tablexia.rules.GameRule; -import cz.nic.tablexia.rules.GameRulesDefinition; +import cz.nic.tablexia.TablexiaGameDataManager; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.difficulty.GameDifficulty; +import cz.nic.tablexia.game.robbery.rules.GameRule; +import cz.nic.tablexia.game.robbery.rules.GameRulesDefinition; -public class BankRoberryGameDataManager extends TablexiaGameDataManager<GameRule> { +public class RoberryGameDataManager extends TablexiaGameDataManager<GameRule> { private static int CREATURES_COUNT = 50; private static int THIEVES_COUNT = 8; - private static class BankRoberryRuleLoader implements AsyncTask<GameRule> { + private static class RoberryRuleLoader implements AsyncTask<GameRule> { private RandomAccess randomAccess; private GameDifficulty gameDifficulty; - public BankRoberryRuleLoader(GameDifficulty gameDifficulty, RandomAccess randomAccess) { + public RoberryRuleLoader(GameDifficulty gameDifficulty, RandomAccess randomAccess) { this.gameDifficulty = gameDifficulty; this.randomAccess = randomAccess; } @@ -31,19 +32,19 @@ public class BankRoberryGameDataManager extends TablexiaGameDataManager<GameRule } } - private static BankRoberryGameDataManager instance; + private static RoberryGameDataManager instance; - private BankRoberryGameDataManager() {} + private RoberryGameDataManager() {} - public static BankRoberryGameDataManager getInstance() { + public static RoberryGameDataManager getInstance() { if (instance == null) { - instance = new BankRoberryGameDataManager(); + instance = new RoberryGameDataManager(); } return instance; } public void load(GameDifficulty gameDifficulty, RandomAccess randomAccess) { - setAsyncTask(new BankRoberryRuleLoader(gameDifficulty, randomAccess)); + setAsyncTask(new RoberryRuleLoader(gameDifficulty, randomAccess)); } public void dispose() { diff --git a/core/src/cz/nic/tablexia/creature/CreatureDescriptor.java b/core/src/cz/nic/tablexia/game/robbery/creature/CreatureDescriptor.java similarity index 98% rename from core/src/cz/nic/tablexia/creature/CreatureDescriptor.java rename to core/src/cz/nic/tablexia/game/robbery/creature/CreatureDescriptor.java index a8a5a1329..48ebeb4af 100644 --- a/core/src/cz/nic/tablexia/creature/CreatureDescriptor.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/CreatureDescriptor.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature; +package cz.nic.tablexia.game.robbery.creature; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; -import cz.nic.tablexia.creature.attribute.Attribute; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; /** * Description of creature. Contains list of creature attributes and creature gender. diff --git a/core/src/cz/nic/tablexia/creature/CreatureFactory.java b/core/src/cz/nic/tablexia/game/robbery/creature/CreatureFactory.java similarity index 96% rename from core/src/cz/nic/tablexia/creature/CreatureFactory.java rename to core/src/cz/nic/tablexia/game/robbery/creature/CreatureFactory.java index de1018aa4..6d83fffa9 100644 --- a/core/src/cz/nic/tablexia/creature/CreatureFactory.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/CreatureFactory.java @@ -16,11 +16,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature; +package cz.nic.tablexia.game.robbery.creature; -import cz.nic.tablexia.AttributeDescription; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; /** * Factory for creating creatures diff --git a/core/src/cz/nic/tablexia/creature/CreatureRoot.java b/core/src/cz/nic/tablexia/game/robbery/creature/CreatureRoot.java similarity index 93% rename from core/src/cz/nic/tablexia/creature/CreatureRoot.java rename to core/src/cz/nic/tablexia/game/robbery/creature/CreatureRoot.java index 07fbe3ec0..466216302 100644 --- a/core/src/cz/nic/tablexia/creature/CreatureRoot.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/CreatureRoot.java @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature; +package cz.nic.tablexia.game.robbery.creature; import java.util.ArrayList; import java.util.List; @@ -29,17 +29,17 @@ import com.badlogic.gdx.graphics.Texture.TextureFilter; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.scenes.scene2d.Actor; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.creature.attribute.Attribute; -import cz.nic.tablexia.creature.attribute.Attribute.AttributeColor; -import cz.nic.tablexia.creature.attribute.clothing.accessories.AccessoriesAttribute; -import cz.nic.tablexia.creature.attribute.clothing.bottom.BottomAttribute; -import cz.nic.tablexia.creature.attribute.clothing.headgear.HeadgearAttribute; -import cz.nic.tablexia.creature.attribute.clothing.top.TopAttribute; -import cz.nic.tablexia.creature.attribute.glasses.GlassesAttribute; -import cz.nic.tablexia.creature.attribute.hair.HairAttribute; -import cz.nic.tablexia.creature.attribute.head.HeadAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute.AttributeColor; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.accessories.AccessoriesAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.bottom.BottomAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.headgear.HeadgearAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.top.TopAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.glasses.GlassesAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.hair.HairAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.head.HeadAttribute; /** * Root of creature, defines creature gender diff --git a/core/src/cz/nic/tablexia/creature/attribute/Attribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/Attribute.java similarity index 96% rename from core/src/cz/nic/tablexia/creature/attribute/Attribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/Attribute.java index 8e04390a4..4c17d4b35 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/Attribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/Attribute.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute; +package cz.nic.tablexia.game.robbery.creature.attribute; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -30,15 +30,14 @@ import java.util.Random; import com.badlogic.gdx.utils.I18NBundle; import com.badlogic.gdx.utils.reflect.ClassReflection; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryTextResourcesManager; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.creature.CreatureDescriptor; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; -import cz.nic.tablexia.creature.attribute.clothing.ClothingAttribute; -import cz.nic.tablexia.creature.attribute.glasses.GlassesAttribute; -import cz.nic.tablexia.creature.attribute.hair.HairAttribute; -import cz.nic.tablexia.creature.attribute.head.HeadAttribute; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.robbery.creature.CreatureDescriptor; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.ClothingAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.glasses.GlassesAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.hair.HairAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.head.HeadAttribute; import cz.nic.tablexia.util.Log; /** diff --git a/core/src/cz/nic/tablexia/AttributeDescription.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/AttributeDescription.java similarity index 94% rename from core/src/cz/nic/tablexia/AttributeDescription.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/AttributeDescription.java index 5214baf0f..93abf3d80 100644 --- a/core/src/cz/nic/tablexia/AttributeDescription.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/AttributeDescription.java @@ -1,12 +1,11 @@ -package cz.nic.tablexia; +package cz.nic.tablexia.game.robbery.creature.attribute; import com.badlogic.gdx.utils.reflect.ClassReflection; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; -import cz.nic.tablexia.creature.attribute.Attribute; -import cz.nic.tablexia.creature.attribute.Attribute.AttributeColor; -import cz.nic.tablexia.creature.attribute.Attribute.CreatureGenericType; -import cz.nic.tablexia.creature.attribute.Attribute.CreatureSuperGenericType; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute.AttributeColor; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute.CreatureGenericType; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute.CreatureSuperGenericType; /** * Attribute description object for description of specific attribute to force or ban. diff --git a/core/src/cz/nic/tablexia/creature/attribute/clothing/ClothingAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/ClothingAttribute.java similarity index 77% rename from core/src/cz/nic/tablexia/creature/attribute/clothing/ClothingAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/ClothingAttribute.java index 209b31d53..2e9d48af7 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/clothing/ClothingAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/ClothingAttribute.java @@ -16,18 +16,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.clothing; +package cz.nic.tablexia.game.robbery.creature.attribute.clothing; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; -import cz.nic.tablexia.creature.attribute.Attribute; -import cz.nic.tablexia.creature.attribute.Attribute.CreatureSuperGenericType; -import cz.nic.tablexia.creature.attribute.clothing.accessories.AccessoriesAttribute; -import cz.nic.tablexia.creature.attribute.clothing.bottom.BottomAttribute; -import cz.nic.tablexia.creature.attribute.clothing.headgear.HeadgearAttribute; -import cz.nic.tablexia.creature.attribute.clothing.top.TopAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute.CreatureSuperGenericType; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.accessories.AccessoriesAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.bottom.BottomAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.headgear.HeadgearAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.top.TopAttribute; @CreatureSuperGenericType(isGeneric = true) public abstract class ClothingAttribute extends Attribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/clothing/accessories/AccessoriesAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/accessories/AccessoriesAttribute.java similarity index 86% rename from core/src/cz/nic/tablexia/creature/attribute/clothing/accessories/AccessoriesAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/accessories/AccessoriesAttribute.java index a642a2d8a..c7ca36b31 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/clothing/accessories/AccessoriesAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/accessories/AccessoriesAttribute.java @@ -16,15 +16,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.clothing.accessories; +package cz.nic.tablexia.game.robbery.creature.attribute.clothing.accessories; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; -import cz.nic.tablexia.creature.attribute.Attribute; -import cz.nic.tablexia.creature.attribute.Attribute.CreatureGenericType; -import cz.nic.tablexia.creature.attribute.clothing.ClothingAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute.CreatureGenericType; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.ClothingAttribute; @CreatureGenericType(isGeneric = true) public abstract class AccessoriesAttribute extends ClothingAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/clothing/accessories/FBeadsAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/accessories/FBeadsAttribute.java similarity index 90% rename from core/src/cz/nic/tablexia/creature/attribute/clothing/accessories/FBeadsAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/accessories/FBeadsAttribute.java index 656385795..82d5228e3 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/clothing/accessories/FBeadsAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/accessories/FBeadsAttribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.clothing.accessories; +package cz.nic.tablexia.game.robbery.creature.attribute.clothing.accessories; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; public class FBeadsAttribute extends AccessoriesAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/clothing/accessories/FScarfAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/accessories/FScarfAttribute.java similarity index 90% rename from core/src/cz/nic/tablexia/creature/attribute/clothing/accessories/FScarfAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/accessories/FScarfAttribute.java index 113343606..498e0c4a1 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/clothing/accessories/FScarfAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/accessories/FScarfAttribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.clothing.accessories; +package cz.nic.tablexia.game.robbery.creature.attribute.clothing.accessories; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; public class FScarfAttribute extends AccessoriesAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/clothing/accessories/MScarfAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/accessories/MScarfAttribute.java similarity index 90% rename from core/src/cz/nic/tablexia/creature/attribute/clothing/accessories/MScarfAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/accessories/MScarfAttribute.java index 3821fefcf..3a04c288f 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/clothing/accessories/MScarfAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/accessories/MScarfAttribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.clothing.accessories; +package cz.nic.tablexia.game.robbery.creature.attribute.clothing.accessories; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; public class MScarfAttribute extends AccessoriesAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/clothing/accessories/MTieAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/accessories/MTieAttribute.java similarity index 89% rename from core/src/cz/nic/tablexia/creature/attribute/clothing/accessories/MTieAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/accessories/MTieAttribute.java index 69b787f5f..7952739f0 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/clothing/accessories/MTieAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/accessories/MTieAttribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.clothing.accessories; +package cz.nic.tablexia.game.robbery.creature.attribute.clothing.accessories; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; public class MTieAttribute extends AccessoriesAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/clothing/bottom/BottomAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/bottom/BottomAttribute.java similarity index 86% rename from core/src/cz/nic/tablexia/creature/attribute/clothing/bottom/BottomAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/bottom/BottomAttribute.java index 0fd4e59f4..10533dce9 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/clothing/bottom/BottomAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/bottom/BottomAttribute.java @@ -16,15 +16,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.clothing.bottom; +package cz.nic.tablexia.game.robbery.creature.attribute.clothing.bottom; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; -import cz.nic.tablexia.creature.attribute.Attribute; -import cz.nic.tablexia.creature.attribute.Attribute.CreatureGenericType; -import cz.nic.tablexia.creature.attribute.clothing.ClothingAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute.CreatureGenericType; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.ClothingAttribute; @CreatureGenericType(isGeneric = true) public abstract class BottomAttribute extends ClothingAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/clothing/bottom/FPantsAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/bottom/FPantsAttribute.java similarity index 92% rename from core/src/cz/nic/tablexia/creature/attribute/clothing/bottom/FPantsAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/bottom/FPantsAttribute.java index 4b4b44ed8..541e2418c 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/clothing/bottom/FPantsAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/bottom/FPantsAttribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.clothing.bottom; +package cz.nic.tablexia.game.robbery.creature.attribute.clothing.bottom; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; public class FPantsAttribute extends BottomAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/clothing/bottom/FSkirtAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/bottom/FSkirtAttribute.java similarity index 91% rename from core/src/cz/nic/tablexia/creature/attribute/clothing/bottom/FSkirtAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/bottom/FSkirtAttribute.java index 0bb9efa18..295b0fe27 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/clothing/bottom/FSkirtAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/bottom/FSkirtAttribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.clothing.bottom; +package cz.nic.tablexia.game.robbery.creature.attribute.clothing.bottom; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; public class FSkirtAttribute extends BottomAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/clothing/bottom/MPantsAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/bottom/MPantsAttribute.java similarity index 91% rename from core/src/cz/nic/tablexia/creature/attribute/clothing/bottom/MPantsAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/bottom/MPantsAttribute.java index 0175c3349..99c3cc1b4 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/clothing/bottom/MPantsAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/bottom/MPantsAttribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.clothing.bottom; +package cz.nic.tablexia.game.robbery.creature.attribute.clothing.bottom; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; public class MPantsAttribute extends BottomAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/clothing/bottom/MShortsAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/bottom/MShortsAttribute.java similarity index 91% rename from core/src/cz/nic/tablexia/creature/attribute/clothing/bottom/MShortsAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/bottom/MShortsAttribute.java index 0589d77c4..43a9ff5bb 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/clothing/bottom/MShortsAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/bottom/MShortsAttribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.clothing.bottom; +package cz.nic.tablexia.game.robbery.creature.attribute.clothing.bottom; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; public class MShortsAttribute extends BottomAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/clothing/headgear/FHatAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/headgear/FHatAttribute.java similarity index 91% rename from core/src/cz/nic/tablexia/creature/attribute/clothing/headgear/FHatAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/headgear/FHatAttribute.java index 9debfba60..424c39741 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/clothing/headgear/FHatAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/headgear/FHatAttribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.clothing.headgear; +package cz.nic.tablexia.game.robbery.creature.attribute.clothing.headgear; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; public class FHatAttribute extends HeadgearAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/clothing/headgear/HeadgearAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/headgear/HeadgearAttribute.java similarity index 85% rename from core/src/cz/nic/tablexia/creature/attribute/clothing/headgear/HeadgearAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/headgear/HeadgearAttribute.java index b6a4fc0f4..6d956c3a2 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/clothing/headgear/HeadgearAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/headgear/HeadgearAttribute.java @@ -16,15 +16,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.clothing.headgear; +package cz.nic.tablexia.game.robbery.creature.attribute.clothing.headgear; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; -import cz.nic.tablexia.creature.attribute.Attribute; -import cz.nic.tablexia.creature.attribute.Attribute.CreatureGenericType; -import cz.nic.tablexia.creature.attribute.clothing.ClothingAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute.CreatureGenericType; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.ClothingAttribute; @CreatureGenericType(isGeneric = true) public abstract class HeadgearAttribute extends ClothingAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/clothing/headgear/MHatAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/headgear/MHatAttribute.java similarity index 91% rename from core/src/cz/nic/tablexia/creature/attribute/clothing/headgear/MHatAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/headgear/MHatAttribute.java index 3a7265df9..929650d6e 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/clothing/headgear/MHatAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/headgear/MHatAttribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.clothing.headgear; +package cz.nic.tablexia.game.robbery.creature.attribute.clothing.headgear; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; public class MHatAttribute extends HeadgearAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/clothing/top/FCoatAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/top/FCoatAttribute.java similarity index 90% rename from core/src/cz/nic/tablexia/creature/attribute/clothing/top/FCoatAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/top/FCoatAttribute.java index f1e777538..a07e2ef83 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/clothing/top/FCoatAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/top/FCoatAttribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.clothing.top; +package cz.nic.tablexia.game.robbery.creature.attribute.clothing.top; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; public class FCoatAttribute extends TopAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/clothing/top/FShirtAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/top/FShirtAttribute.java similarity index 92% rename from core/src/cz/nic/tablexia/creature/attribute/clothing/top/FShirtAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/top/FShirtAttribute.java index 17e254cdb..7eb1352b2 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/clothing/top/FShirtAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/top/FShirtAttribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.clothing.top; +package cz.nic.tablexia.game.robbery.creature.attribute.clothing.top; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; public class FShirtAttribute extends TopAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/clothing/top/FSweaterAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/top/FSweaterAttribute.java similarity index 92% rename from core/src/cz/nic/tablexia/creature/attribute/clothing/top/FSweaterAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/top/FSweaterAttribute.java index 8dc8a8c76..febd44b10 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/clothing/top/FSweaterAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/top/FSweaterAttribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.clothing.top; +package cz.nic.tablexia.game.robbery.creature.attribute.clothing.top; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; public class FSweaterAttribute extends TopAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/clothing/top/FVestAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/top/FVestAttribute.java similarity index 92% rename from core/src/cz/nic/tablexia/creature/attribute/clothing/top/FVestAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/top/FVestAttribute.java index a1edf0b75..7e39832a2 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/clothing/top/FVestAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/top/FVestAttribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.clothing.top; +package cz.nic.tablexia.game.robbery.creature.attribute.clothing.top; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; public class FVestAttribute extends TopAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/clothing/top/MCoatAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/top/MCoatAttribute.java similarity index 90% rename from core/src/cz/nic/tablexia/creature/attribute/clothing/top/MCoatAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/top/MCoatAttribute.java index 903a0a051..e11a92f71 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/clothing/top/MCoatAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/top/MCoatAttribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.clothing.top; +package cz.nic.tablexia.game.robbery.creature.attribute.clothing.top; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; public class MCoatAttribute extends TopAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/clothing/top/MShirtAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/top/MShirtAttribute.java similarity index 92% rename from core/src/cz/nic/tablexia/creature/attribute/clothing/top/MShirtAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/top/MShirtAttribute.java index 59a69aa2f..f3041e0c8 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/clothing/top/MShirtAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/top/MShirtAttribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.clothing.top; +package cz.nic.tablexia.game.robbery.creature.attribute.clothing.top; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; public class MShirtAttribute extends TopAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/clothing/top/MSweaterAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/top/MSweaterAttribute.java similarity index 92% rename from core/src/cz/nic/tablexia/creature/attribute/clothing/top/MSweaterAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/top/MSweaterAttribute.java index 47f050d57..bc8a503ce 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/clothing/top/MSweaterAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/top/MSweaterAttribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.clothing.top; +package cz.nic.tablexia.game.robbery.creature.attribute.clothing.top; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; public class MSweaterAttribute extends TopAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/clothing/top/MVestAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/top/MVestAttribute.java similarity index 92% rename from core/src/cz/nic/tablexia/creature/attribute/clothing/top/MVestAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/top/MVestAttribute.java index f1f15b10c..27cd181e7 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/clothing/top/MVestAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/top/MVestAttribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.clothing.top; +package cz.nic.tablexia.game.robbery.creature.attribute.clothing.top; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; public class MVestAttribute extends TopAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/clothing/top/TopAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/top/TopAttribute.java similarity index 87% rename from core/src/cz/nic/tablexia/creature/attribute/clothing/top/TopAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/top/TopAttribute.java index c5a1b79ca..04ef7a879 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/clothing/top/TopAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/clothing/top/TopAttribute.java @@ -16,15 +16,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.clothing.top; +package cz.nic.tablexia.game.robbery.creature.attribute.clothing.top; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; -import cz.nic.tablexia.creature.attribute.Attribute; -import cz.nic.tablexia.creature.attribute.Attribute.CreatureGenericType; -import cz.nic.tablexia.creature.attribute.clothing.ClothingAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute.CreatureGenericType; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.ClothingAttribute; @CreatureGenericType(isGeneric = true) public abstract class TopAttribute extends ClothingAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/glasses/FGlassesAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/glasses/FGlassesAttribute.java similarity index 88% rename from core/src/cz/nic/tablexia/creature/attribute/glasses/FGlassesAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/glasses/FGlassesAttribute.java index 13a75e5ed..36cb4cb67 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/glasses/FGlassesAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/glasses/FGlassesAttribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.glasses; +package cz.nic.tablexia.game.robbery.creature.attribute.glasses; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; public class FGlassesAttribute extends GlassesAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/glasses/GlassesAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/glasses/GlassesAttribute.java similarity index 88% rename from core/src/cz/nic/tablexia/creature/attribute/glasses/GlassesAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/glasses/GlassesAttribute.java index 9d2338804..be57d3048 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/glasses/GlassesAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/glasses/GlassesAttribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.glasses; +package cz.nic.tablexia.game.robbery.creature.attribute.glasses; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; -import cz.nic.tablexia.creature.attribute.Attribute; -import cz.nic.tablexia.creature.attribute.Attribute.CreatureGenericType; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute.CreatureGenericType; @CreatureGenericType(isGeneric = true) public abstract class GlassesAttribute extends Attribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/glasses/MGlassesAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/glasses/MGlassesAttribute.java similarity index 89% rename from core/src/cz/nic/tablexia/creature/attribute/glasses/MGlassesAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/glasses/MGlassesAttribute.java index 6258a0251..dccd90209 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/glasses/MGlassesAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/glasses/MGlassesAttribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.glasses; +package cz.nic.tablexia.game.robbery.creature.attribute.glasses; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; public class MGlassesAttribute extends GlassesAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/hair/FBraidhairAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/hair/FBraidhairAttribute.java similarity index 90% rename from core/src/cz/nic/tablexia/creature/attribute/hair/FBraidhairAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/hair/FBraidhairAttribute.java index 17fb55983..9f833b710 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/hair/FBraidhairAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/hair/FBraidhairAttribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.hair; +package cz.nic.tablexia.game.robbery.creature.attribute.hair; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; public class FBraidhairAttribute extends HairAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/hair/FLonghairAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/hair/FLonghairAttribute.java similarity index 90% rename from core/src/cz/nic/tablexia/creature/attribute/hair/FLonghairAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/hair/FLonghairAttribute.java index c29b89070..47e107702 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/hair/FLonghairAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/hair/FLonghairAttribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.hair; +package cz.nic.tablexia.game.robbery.creature.attribute.hair; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; public class FLonghairAttribute extends HairAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/hair/HairAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/hair/HairAttribute.java similarity index 88% rename from core/src/cz/nic/tablexia/creature/attribute/hair/HairAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/hair/HairAttribute.java index 681635522..c609bb15b 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/hair/HairAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/hair/HairAttribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.hair; +package cz.nic.tablexia.game.robbery.creature.attribute.hair; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; -import cz.nic.tablexia.creature.attribute.Attribute; -import cz.nic.tablexia.creature.attribute.Attribute.CreatureGenericType; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute.CreatureGenericType; @CreatureGenericType(isGeneric = true) public abstract class HairAttribute extends Attribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/hair/MHairAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/hair/MHairAttribute.java similarity index 90% rename from core/src/cz/nic/tablexia/creature/attribute/hair/MHairAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/hair/MHairAttribute.java index 0e6e18cbe..d90554bd5 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/hair/MHairAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/hair/MHairAttribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.hair; +package cz.nic.tablexia.game.robbery.creature.attribute.hair; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; public class MHairAttribute extends HairAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/head/FHead1Attribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/head/FHead1Attribute.java similarity index 89% rename from core/src/cz/nic/tablexia/creature/attribute/head/FHead1Attribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/head/FHead1Attribute.java index 2451bde02..1ade6538d 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/head/FHead1Attribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/head/FHead1Attribute.java @@ -17,14 +17,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.head; +package cz.nic.tablexia.game.robbery.creature.attribute.head; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; public class FHead1Attribute extends HeadAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/head/FHead2Attribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/head/FHead2Attribute.java similarity index 89% rename from core/src/cz/nic/tablexia/creature/attribute/head/FHead2Attribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/head/FHead2Attribute.java index 2abf811b2..1c671ccd1 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/head/FHead2Attribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/head/FHead2Attribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.head; +package cz.nic.tablexia.game.robbery.creature.attribute.head; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; public class FHead2Attribute extends HeadAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/head/HeadAttribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/head/HeadAttribute.java similarity index 89% rename from core/src/cz/nic/tablexia/creature/attribute/head/HeadAttribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/head/HeadAttribute.java index 281634adf..f1fea427e 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/head/HeadAttribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/head/HeadAttribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.head; +package cz.nic.tablexia.game.robbery.creature.attribute.head; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; -import cz.nic.tablexia.creature.attribute.Attribute; -import cz.nic.tablexia.creature.attribute.Attribute.CreatureGenericType; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute.CreatureGenericType; @CreatureGenericType(isGeneric = true) public abstract class HeadAttribute extends Attribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/head/MHead1Attribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/head/MHead1Attribute.java similarity index 89% rename from core/src/cz/nic/tablexia/creature/attribute/head/MHead1Attribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/head/MHead1Attribute.java index e17083235..7d5239cd9 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/head/MHead1Attribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/head/MHead1Attribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.head; +package cz.nic.tablexia.game.robbery.creature.attribute.head; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; public class MHead1Attribute extends HeadAttribute { diff --git a/core/src/cz/nic/tablexia/creature/attribute/head/MHead2Attribute.java b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/head/MHead2Attribute.java similarity index 89% rename from core/src/cz/nic/tablexia/creature/attribute/head/MHead2Attribute.java rename to core/src/cz/nic/tablexia/game/robbery/creature/attribute/head/MHead2Attribute.java index 200541bc7..8c611c384 100644 --- a/core/src/cz/nic/tablexia/creature/attribute/head/MHead2Attribute.java +++ b/core/src/cz/nic/tablexia/game/robbery/creature/attribute/head/MHead2Attribute.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.creature.attribute.head; +package cz.nic.tablexia.game.robbery.creature.attribute.head; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; public class MHead2Attribute extends HeadAttribute { diff --git a/core/src/cz/nic/tablexia/rules/GameRule.java b/core/src/cz/nic/tablexia/game/robbery/rules/GameRule.java similarity index 96% rename from core/src/cz/nic/tablexia/rules/GameRule.java rename to core/src/cz/nic/tablexia/game/robbery/rules/GameRule.java index 5030da5ff..651066979 100644 --- a/core/src/cz/nic/tablexia/rules/GameRule.java +++ b/core/src/cz/nic/tablexia/game/robbery/rules/GameRule.java @@ -16,22 +16,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.rules; +package cz.nic.tablexia.game.robbery.rules; import java.util.HashMap; import java.util.List; import java.util.Map; -import cz.nic.tablexia.AttributeDescription; import cz.nic.tablexia.BankRoberryTextResourcesManager; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.creature.CreatureDescriptor; -import cz.nic.tablexia.creature.CreatureFactory; -import cz.nic.tablexia.creature.CreatureRoot; -import cz.nic.tablexia.creature.attribute.Attribute; -import cz.nic.tablexia.creature.attribute.Attribute.AttributeColor; -import cz.nic.tablexia.creature.attribute.hair.HairAttribute; -import cz.nic.tablexia.creature.attribute.head.HeadAttribute; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.robbery.creature.CreatureDescriptor; +import cz.nic.tablexia.game.robbery.creature.CreatureFactory; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute.AttributeColor; +import cz.nic.tablexia.game.robbery.creature.attribute.hair.HairAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.head.HeadAttribute; import cz.nic.tablexia.util.Log; /** diff --git a/core/src/cz/nic/tablexia/rules/GameRuleUtility.java b/core/src/cz/nic/tablexia/game/robbery/rules/GameRuleUtility.java similarity index 95% rename from core/src/cz/nic/tablexia/rules/GameRuleUtility.java rename to core/src/cz/nic/tablexia/game/robbery/rules/GameRuleUtility.java index 2da7c97ff..ca8b643e4 100644 --- a/core/src/cz/nic/tablexia/rules/GameRuleUtility.java +++ b/core/src/cz/nic/tablexia/game/robbery/rules/GameRuleUtility.java @@ -16,17 +16,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.rules; +package cz.nic.tablexia.game.robbery.rules; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import cz.nic.tablexia.AttributeDescription; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.creature.CreatureDescriptor; -import cz.nic.tablexia.creature.CreatureRoot; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.robbery.creature.CreatureDescriptor; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; /** * Abstract game rule class. Contains common functions for all game rules. diff --git a/core/src/cz/nic/tablexia/rules/GameRulesDefinition.java b/core/src/cz/nic/tablexia/game/robbery/rules/GameRulesDefinition.java similarity index 83% rename from core/src/cz/nic/tablexia/rules/GameRulesDefinition.java rename to core/src/cz/nic/tablexia/game/robbery/rules/GameRulesDefinition.java index f1be6bd81..7edc98c41 100644 --- a/core/src/cz/nic/tablexia/rules/GameRulesDefinition.java +++ b/core/src/cz/nic/tablexia/game/robbery/rules/GameRulesDefinition.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.rules; +package cz.nic.tablexia.game.robbery.rules; import java.util.ArrayList; import java.util.List; @@ -24,30 +24,30 @@ import java.util.Random; import com.badlogic.gdx.utils.reflect.ClassReflection; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.difficulty.GameDifficulty; -import cz.nic.tablexia.rules.easy.BC_1_BCRule; -import cz.nic.tablexia.rules.easy.Bb_0_BbRule; -import cz.nic.tablexia.rules.easy.Bt_0_BtRule; -import cz.nic.tablexia.rules.easy.CACARule; -import cz.nic.tablexia.rules.easy.CACCRule; -import cz.nic.tablexia.rules.easy.CA_0_CC_0_TRule; -import cz.nic.tablexia.rules.easy.CCCCRule; -import cz.nic.tablexia.rules.easy.CC_0_CC_0_TRule; -import cz.nic.tablexia.rules.easy.CC_0_notCCRule; -import cz.nic.tablexia.rules.hard.Bb_1_BbRule; -import cz.nic.tablexia.rules.hard.Bt_1_BtRule; -import cz.nic.tablexia.rules.hard.CCCCnotCCRule; -import cz.nic.tablexia.rules.hard.CC_0_CC_0_CCRule; -import cz.nic.tablexia.rules.hard.CC_0_notCA_0_TRule; -import cz.nic.tablexia.rules.hard.CC_0_notCC_0_TRule; -import cz.nic.tablexia.rules.hard.CC_2_CCRule; -import cz.nic.tablexia.rules.medium.BC_2_BCRule; -import cz.nic.tablexia.rules.medium.CA_1_CCRule; -import cz.nic.tablexia.rules.medium.CCCCCCRule; -import cz.nic.tablexia.rules.medium.CC_1_CCRule; -import cz.nic.tablexia.rules.medium.CC_1_notCARule; -import cz.nic.tablexia.rules.medium.CC_1_notCCRule; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.difficulty.GameDifficulty; +import cz.nic.tablexia.game.robbery.rules.easy.BC_1_BCRule; +import cz.nic.tablexia.game.robbery.rules.easy.Bb_0_BbRule; +import cz.nic.tablexia.game.robbery.rules.easy.Bt_0_BtRule; +import cz.nic.tablexia.game.robbery.rules.easy.CACARule; +import cz.nic.tablexia.game.robbery.rules.easy.CACCRule; +import cz.nic.tablexia.game.robbery.rules.easy.CA_0_CC_0_TRule; +import cz.nic.tablexia.game.robbery.rules.easy.CCCCRule; +import cz.nic.tablexia.game.robbery.rules.easy.CC_0_CC_0_TRule; +import cz.nic.tablexia.game.robbery.rules.easy.CC_0_notCCRule; +import cz.nic.tablexia.game.robbery.rules.hard.Bb_1_BbRule; +import cz.nic.tablexia.game.robbery.rules.hard.Bt_1_BtRule; +import cz.nic.tablexia.game.robbery.rules.hard.CCCCnotCCRule; +import cz.nic.tablexia.game.robbery.rules.hard.CC_0_CC_0_CCRule; +import cz.nic.tablexia.game.robbery.rules.hard.CC_0_notCA_0_TRule; +import cz.nic.tablexia.game.robbery.rules.hard.CC_0_notCC_0_TRule; +import cz.nic.tablexia.game.robbery.rules.hard.CC_2_CCRule; +import cz.nic.tablexia.game.robbery.rules.medium.BC_2_BCRule; +import cz.nic.tablexia.game.robbery.rules.medium.CA_1_CCRule; +import cz.nic.tablexia.game.robbery.rules.medium.CCCCCCRule; +import cz.nic.tablexia.game.robbery.rules.medium.CC_1_CCRule; +import cz.nic.tablexia.game.robbery.rules.medium.CC_1_notCARule; +import cz.nic.tablexia.game.robbery.rules.medium.CC_1_notCCRule; import cz.nic.tablexia.util.Log; diff --git a/core/src/cz/nic/tablexia/rules/easy/BC_1_BCRule.java b/core/src/cz/nic/tablexia/game/robbery/rules/easy/BC_1_BCRule.java similarity index 89% rename from core/src/cz/nic/tablexia/rules/easy/BC_1_BCRule.java rename to core/src/cz/nic/tablexia/game/robbery/rules/easy/BC_1_BCRule.java index 8e0725a9f..346dd203f 100644 --- a/core/src/cz/nic/tablexia/rules/easy/BC_1_BCRule.java +++ b/core/src/cz/nic/tablexia/game/robbery/rules/easy/BC_1_BCRule.java @@ -16,20 +16,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.rules.easy; +package cz.nic.tablexia.game.robbery.rules.easy; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.creature.CreatureDescriptor; -import cz.nic.tablexia.creature.CreatureFactory; -import cz.nic.tablexia.creature.CreatureRoot; -import cz.nic.tablexia.creature.attribute.Attribute; -import cz.nic.tablexia.creature.attribute.Attribute.AttributeColor; -import cz.nic.tablexia.rules.GameRuleUtility; -import cz.nic.tablexia.rules.GameRulesDefinition; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.robbery.creature.CreatureDescriptor; +import cz.nic.tablexia.game.robbery.creature.CreatureFactory; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute.AttributeColor; +import cz.nic.tablexia.game.robbery.rules.GameRuleUtility; +import cz.nic.tablexia.game.robbery.rules.GameRulesDefinition; /** * diff --git a/core/src/cz/nic/tablexia/rules/easy/Bb_0_BbRule.java b/core/src/cz/nic/tablexia/game/robbery/rules/easy/Bb_0_BbRule.java similarity index 85% rename from core/src/cz/nic/tablexia/rules/easy/Bb_0_BbRule.java rename to core/src/cz/nic/tablexia/game/robbery/rules/easy/Bb_0_BbRule.java index a77800735..5b1fe6d5e 100644 --- a/core/src/cz/nic/tablexia/rules/easy/Bb_0_BbRule.java +++ b/core/src/cz/nic/tablexia/game/robbery/rules/easy/Bb_0_BbRule.java @@ -16,11 +16,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.rules.easy; +package cz.nic.tablexia.game.robbery.rules.easy; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.creature.attribute.clothing.bottom.BottomAttribute; -import cz.nic.tablexia.rules.GameRulesDefinition; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.bottom.BottomAttribute; +import cz.nic.tablexia.game.robbery.rules.GameRulesDefinition; /** * diff --git a/core/src/cz/nic/tablexia/rules/easy/Bt_0_BtRule.java b/core/src/cz/nic/tablexia/game/robbery/rules/easy/Bt_0_BtRule.java similarity index 89% rename from core/src/cz/nic/tablexia/rules/easy/Bt_0_BtRule.java rename to core/src/cz/nic/tablexia/game/robbery/rules/easy/Bt_0_BtRule.java index 82282a323..ab8eb0d4b 100644 --- a/core/src/cz/nic/tablexia/rules/easy/Bt_0_BtRule.java +++ b/core/src/cz/nic/tablexia/game/robbery/rules/easy/Bt_0_BtRule.java @@ -16,20 +16,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.rules.easy; +package cz.nic.tablexia.game.robbery.rules.easy; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.creature.CreatureDescriptor; -import cz.nic.tablexia.creature.CreatureFactory; -import cz.nic.tablexia.creature.CreatureRoot; -import cz.nic.tablexia.creature.attribute.Attribute; -import cz.nic.tablexia.creature.attribute.clothing.top.TopAttribute; -import cz.nic.tablexia.rules.GameRuleUtility; -import cz.nic.tablexia.rules.GameRulesDefinition; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.robbery.creature.CreatureDescriptor; +import cz.nic.tablexia.game.robbery.creature.CreatureFactory; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.top.TopAttribute; +import cz.nic.tablexia.game.robbery.rules.GameRuleUtility; +import cz.nic.tablexia.game.robbery.rules.GameRulesDefinition; /** * diff --git a/core/src/cz/nic/tablexia/rules/easy/CACARule.java b/core/src/cz/nic/tablexia/game/robbery/rules/easy/CACARule.java similarity index 84% rename from core/src/cz/nic/tablexia/rules/easy/CACARule.java rename to core/src/cz/nic/tablexia/game/robbery/rules/easy/CACARule.java index 96ea262e8..6030699be 100644 --- a/core/src/cz/nic/tablexia/rules/easy/CACARule.java +++ b/core/src/cz/nic/tablexia/game/robbery/rules/easy/CACARule.java @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.rules.easy; +package cz.nic.tablexia.game.robbery.rules.easy; -import cz.nic.tablexia.AttributeDescription; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.creature.CreatureDescriptor; -import cz.nic.tablexia.creature.attribute.Attribute.AttributeColor; -import cz.nic.tablexia.creature.attribute.clothing.ClothingAttribute; -import cz.nic.tablexia.rules.GameRulesDefinition; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.robbery.creature.CreatureDescriptor; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute.AttributeColor; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.ClothingAttribute; +import cz.nic.tablexia.game.robbery.rules.GameRulesDefinition; /** * diff --git a/core/src/cz/nic/tablexia/rules/easy/CACCRule.java b/core/src/cz/nic/tablexia/game/robbery/rules/easy/CACCRule.java similarity index 85% rename from core/src/cz/nic/tablexia/rules/easy/CACCRule.java rename to core/src/cz/nic/tablexia/game/robbery/rules/easy/CACCRule.java index ec0be4d4a..023f6ac11 100644 --- a/core/src/cz/nic/tablexia/rules/easy/CACCRule.java +++ b/core/src/cz/nic/tablexia/game/robbery/rules/easy/CACCRule.java @@ -16,15 +16,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.rules.easy; +package cz.nic.tablexia.game.robbery.rules.easy; -import cz.nic.tablexia.AttributeDescription; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.creature.CreatureDescriptor; -import cz.nic.tablexia.creature.CreatureFactory; -import cz.nic.tablexia.creature.attribute.Attribute.AttributeColor; -import cz.nic.tablexia.creature.attribute.clothing.ClothingAttribute; -import cz.nic.tablexia.rules.GameRulesDefinition; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.robbery.creature.CreatureDescriptor; +import cz.nic.tablexia.game.robbery.creature.CreatureFactory; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute.AttributeColor; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.ClothingAttribute; +import cz.nic.tablexia.game.robbery.rules.GameRulesDefinition; /** * diff --git a/core/src/cz/nic/tablexia/rules/easy/CA_0_CC_0_TRule.java b/core/src/cz/nic/tablexia/game/robbery/rules/easy/CA_0_CC_0_TRule.java similarity index 88% rename from core/src/cz/nic/tablexia/rules/easy/CA_0_CC_0_TRule.java rename to core/src/cz/nic/tablexia/game/robbery/rules/easy/CA_0_CC_0_TRule.java index 56225cad0..128d96a24 100644 --- a/core/src/cz/nic/tablexia/rules/easy/CA_0_CC_0_TRule.java +++ b/core/src/cz/nic/tablexia/game/robbery/rules/easy/CA_0_CC_0_TRule.java @@ -16,20 +16,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.rules.easy; +package cz.nic.tablexia.game.robbery.rules.easy; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.creature.CreatureDescriptor; -import cz.nic.tablexia.creature.CreatureFactory; -import cz.nic.tablexia.creature.CreatureRoot; -import cz.nic.tablexia.creature.attribute.Attribute.AttributeColor; -import cz.nic.tablexia.creature.attribute.clothing.ClothingAttribute; -import cz.nic.tablexia.rules.GameRuleUtility; -import cz.nic.tablexia.rules.GameRulesDefinition; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.robbery.creature.CreatureDescriptor; +import cz.nic.tablexia.game.robbery.creature.CreatureFactory; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute.AttributeColor; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.ClothingAttribute; +import cz.nic.tablexia.game.robbery.rules.GameRuleUtility; +import cz.nic.tablexia.game.robbery.rules.GameRulesDefinition; /** * diff --git a/core/src/cz/nic/tablexia/rules/easy/CCCCRule.java b/core/src/cz/nic/tablexia/game/robbery/rules/easy/CCCCRule.java similarity index 89% rename from core/src/cz/nic/tablexia/rules/easy/CCCCRule.java rename to core/src/cz/nic/tablexia/game/robbery/rules/easy/CCCCRule.java index 41dbc2a16..274ded260 100644 --- a/core/src/cz/nic/tablexia/rules/easy/CCCCRule.java +++ b/core/src/cz/nic/tablexia/game/robbery/rules/easy/CCCCRule.java @@ -16,18 +16,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.rules.easy; +package cz.nic.tablexia.game.robbery.rules.easy; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.creature.CreatureDescriptor; -import cz.nic.tablexia.creature.CreatureFactory; -import cz.nic.tablexia.creature.CreatureRoot; -import cz.nic.tablexia.rules.GameRuleUtility; -import cz.nic.tablexia.rules.GameRulesDefinition; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.robbery.creature.CreatureDescriptor; +import cz.nic.tablexia.game.robbery.creature.CreatureFactory; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; +import cz.nic.tablexia.game.robbery.rules.GameRuleUtility; +import cz.nic.tablexia.game.robbery.rules.GameRulesDefinition; /** * diff --git a/core/src/cz/nic/tablexia/rules/easy/CC_0_CC_0_TRule.java b/core/src/cz/nic/tablexia/game/robbery/rules/easy/CC_0_CC_0_TRule.java similarity index 88% rename from core/src/cz/nic/tablexia/rules/easy/CC_0_CC_0_TRule.java rename to core/src/cz/nic/tablexia/game/robbery/rules/easy/CC_0_CC_0_TRule.java index 5c59dec35..0d7df7a14 100644 --- a/core/src/cz/nic/tablexia/rules/easy/CC_0_CC_0_TRule.java +++ b/core/src/cz/nic/tablexia/game/robbery/rules/easy/CC_0_CC_0_TRule.java @@ -16,13 +16,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.rules.easy; +package cz.nic.tablexia.game.robbery.rules.easy; -import cz.nic.tablexia.AttributeDescription; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.creature.CreatureDescriptor; -import cz.nic.tablexia.creature.CreatureFactory; -import cz.nic.tablexia.rules.GameRulesDefinition; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.robbery.creature.CreatureDescriptor; +import cz.nic.tablexia.game.robbery.creature.CreatureFactory; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; +import cz.nic.tablexia.game.robbery.rules.GameRulesDefinition; /** * diff --git a/core/src/cz/nic/tablexia/rules/easy/CC_0_notCCRule.java b/core/src/cz/nic/tablexia/game/robbery/rules/easy/CC_0_notCCRule.java similarity index 93% rename from core/src/cz/nic/tablexia/rules/easy/CC_0_notCCRule.java rename to core/src/cz/nic/tablexia/game/robbery/rules/easy/CC_0_notCCRule.java index dc356e622..365a56089 100644 --- a/core/src/cz/nic/tablexia/rules/easy/CC_0_notCCRule.java +++ b/core/src/cz/nic/tablexia/game/robbery/rules/easy/CC_0_notCCRule.java @@ -16,18 +16,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.rules.easy; +package cz.nic.tablexia.game.robbery.rules.easy; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.creature.CreatureDescriptor; -import cz.nic.tablexia.creature.CreatureFactory; -import cz.nic.tablexia.creature.CreatureRoot; -import cz.nic.tablexia.rules.GameRuleUtility; -import cz.nic.tablexia.rules.GameRulesDefinition; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.robbery.creature.CreatureDescriptor; +import cz.nic.tablexia.game.robbery.creature.CreatureFactory; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; +import cz.nic.tablexia.game.robbery.rules.GameRuleUtility; +import cz.nic.tablexia.game.robbery.rules.GameRulesDefinition; /** * diff --git a/core/src/cz/nic/tablexia/rules/hard/Bb_1_BbRule.java b/core/src/cz/nic/tablexia/game/robbery/rules/hard/Bb_1_BbRule.java similarity index 85% rename from core/src/cz/nic/tablexia/rules/hard/Bb_1_BbRule.java rename to core/src/cz/nic/tablexia/game/robbery/rules/hard/Bb_1_BbRule.java index a658deed8..aa2de1b64 100644 --- a/core/src/cz/nic/tablexia/rules/hard/Bb_1_BbRule.java +++ b/core/src/cz/nic/tablexia/game/robbery/rules/hard/Bb_1_BbRule.java @@ -16,11 +16,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.rules.hard; +package cz.nic.tablexia.game.robbery.rules.hard; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.creature.attribute.clothing.bottom.BottomAttribute; -import cz.nic.tablexia.rules.GameRulesDefinition; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.bottom.BottomAttribute; +import cz.nic.tablexia.game.robbery.rules.GameRulesDefinition; /** * diff --git a/core/src/cz/nic/tablexia/rules/hard/Bt_1_BtRule.java b/core/src/cz/nic/tablexia/game/robbery/rules/hard/Bt_1_BtRule.java similarity index 86% rename from core/src/cz/nic/tablexia/rules/hard/Bt_1_BtRule.java rename to core/src/cz/nic/tablexia/game/robbery/rules/hard/Bt_1_BtRule.java index d8c3f680f..b66bca0f5 100644 --- a/core/src/cz/nic/tablexia/rules/hard/Bt_1_BtRule.java +++ b/core/src/cz/nic/tablexia/game/robbery/rules/hard/Bt_1_BtRule.java @@ -16,11 +16,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.rules.hard; +package cz.nic.tablexia.game.robbery.rules.hard; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.rules.GameRulesDefinition; -import cz.nic.tablexia.rules.easy.Bt_0_BtRule; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.robbery.rules.GameRulesDefinition; +import cz.nic.tablexia.game.robbery.rules.easy.Bt_0_BtRule; /** * diff --git a/core/src/cz/nic/tablexia/rules/hard/CCCCnotCCRule.java b/core/src/cz/nic/tablexia/game/robbery/rules/hard/CCCCnotCCRule.java similarity index 91% rename from core/src/cz/nic/tablexia/rules/hard/CCCCnotCCRule.java rename to core/src/cz/nic/tablexia/game/robbery/rules/hard/CCCCnotCCRule.java index 47d64f774..321159093 100644 --- a/core/src/cz/nic/tablexia/rules/hard/CCCCnotCCRule.java +++ b/core/src/cz/nic/tablexia/game/robbery/rules/hard/CCCCnotCCRule.java @@ -16,19 +16,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.rules.hard; +package cz.nic.tablexia.game.robbery.rules.hard; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.creature.CreatureDescriptor; -import cz.nic.tablexia.creature.CreatureFactory; -import cz.nic.tablexia.creature.CreatureRoot; -import cz.nic.tablexia.creature.attribute.clothing.headgear.HeadgearAttribute; -import cz.nic.tablexia.rules.GameRuleUtility; -import cz.nic.tablexia.rules.GameRulesDefinition; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.robbery.creature.CreatureDescriptor; +import cz.nic.tablexia.game.robbery.creature.CreatureFactory; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.headgear.HeadgearAttribute; +import cz.nic.tablexia.game.robbery.rules.GameRuleUtility; +import cz.nic.tablexia.game.robbery.rules.GameRulesDefinition; /** * diff --git a/core/src/cz/nic/tablexia/rules/hard/CC_0_CC_0_CCRule.java b/core/src/cz/nic/tablexia/game/robbery/rules/hard/CC_0_CC_0_CCRule.java similarity index 93% rename from core/src/cz/nic/tablexia/rules/hard/CC_0_CC_0_CCRule.java rename to core/src/cz/nic/tablexia/game/robbery/rules/hard/CC_0_CC_0_CCRule.java index c28d8abc7..b0ca6f2ad 100644 --- a/core/src/cz/nic/tablexia/rules/hard/CC_0_CC_0_CCRule.java +++ b/core/src/cz/nic/tablexia/game/robbery/rules/hard/CC_0_CC_0_CCRule.java @@ -16,17 +16,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.rules.hard; +package cz.nic.tablexia.game.robbery.rules.hard; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.creature.CreatureDescriptor; -import cz.nic.tablexia.creature.CreatureFactory; -import cz.nic.tablexia.creature.CreatureRoot; -import cz.nic.tablexia.rules.GameRuleUtility; -import cz.nic.tablexia.rules.GameRulesDefinition; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.robbery.creature.CreatureDescriptor; +import cz.nic.tablexia.game.robbery.creature.CreatureFactory; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot; +import cz.nic.tablexia.game.robbery.rules.GameRuleUtility; +import cz.nic.tablexia.game.robbery.rules.GameRulesDefinition; /** * diff --git a/core/src/cz/nic/tablexia/rules/hard/CC_0_notCA_0_TRule.java b/core/src/cz/nic/tablexia/game/robbery/rules/hard/CC_0_notCA_0_TRule.java similarity index 86% rename from core/src/cz/nic/tablexia/rules/hard/CC_0_notCA_0_TRule.java rename to core/src/cz/nic/tablexia/game/robbery/rules/hard/CC_0_notCA_0_TRule.java index 222590408..6a8ac96b2 100644 --- a/core/src/cz/nic/tablexia/rules/hard/CC_0_notCA_0_TRule.java +++ b/core/src/cz/nic/tablexia/game/robbery/rules/hard/CC_0_notCA_0_TRule.java @@ -16,15 +16,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.rules.hard; +package cz.nic.tablexia.game.robbery.rules.hard; -import cz.nic.tablexia.AttributeDescription; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.creature.CreatureDescriptor; -import cz.nic.tablexia.creature.CreatureFactory; -import cz.nic.tablexia.creature.attribute.Attribute.AttributeColor; -import cz.nic.tablexia.creature.attribute.clothing.ClothingAttribute; -import cz.nic.tablexia.rules.GameRulesDefinition; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.robbery.creature.CreatureDescriptor; +import cz.nic.tablexia.game.robbery.creature.CreatureFactory; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute.AttributeColor; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.ClothingAttribute; +import cz.nic.tablexia.game.robbery.rules.GameRulesDefinition; /** * diff --git a/core/src/cz/nic/tablexia/rules/hard/CC_0_notCC_0_TRule.java b/core/src/cz/nic/tablexia/game/robbery/rules/hard/CC_0_notCC_0_TRule.java similarity index 92% rename from core/src/cz/nic/tablexia/rules/hard/CC_0_notCC_0_TRule.java rename to core/src/cz/nic/tablexia/game/robbery/rules/hard/CC_0_notCC_0_TRule.java index 5f5dc9668..9da691af1 100644 --- a/core/src/cz/nic/tablexia/rules/hard/CC_0_notCC_0_TRule.java +++ b/core/src/cz/nic/tablexia/game/robbery/rules/hard/CC_0_notCC_0_TRule.java @@ -16,18 +16,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.rules.hard; +package cz.nic.tablexia.game.robbery.rules.hard; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.creature.CreatureDescriptor; -import cz.nic.tablexia.creature.CreatureFactory; -import cz.nic.tablexia.creature.CreatureRoot; -import cz.nic.tablexia.rules.GameRuleUtility; -import cz.nic.tablexia.rules.GameRulesDefinition; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.robbery.creature.CreatureDescriptor; +import cz.nic.tablexia.game.robbery.creature.CreatureFactory; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; +import cz.nic.tablexia.game.robbery.rules.GameRuleUtility; +import cz.nic.tablexia.game.robbery.rules.GameRulesDefinition; /** * diff --git a/core/src/cz/nic/tablexia/rules/hard/CC_2_CCRule.java b/core/src/cz/nic/tablexia/game/robbery/rules/hard/CC_2_CCRule.java similarity index 86% rename from core/src/cz/nic/tablexia/rules/hard/CC_2_CCRule.java rename to core/src/cz/nic/tablexia/game/robbery/rules/hard/CC_2_CCRule.java index 867c2f62b..2cc9c6d07 100644 --- a/core/src/cz/nic/tablexia/rules/hard/CC_2_CCRule.java +++ b/core/src/cz/nic/tablexia/game/robbery/rules/hard/CC_2_CCRule.java @@ -16,11 +16,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.rules.hard; +package cz.nic.tablexia.game.robbery.rules.hard; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.rules.GameRulesDefinition; -import cz.nic.tablexia.rules.medium.CC_1_CCRule; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.robbery.rules.GameRulesDefinition; +import cz.nic.tablexia.game.robbery.rules.medium.CC_1_CCRule; /** * diff --git a/core/src/cz/nic/tablexia/rules/medium/BC_2_BCRule.java b/core/src/cz/nic/tablexia/game/robbery/rules/medium/BC_2_BCRule.java similarity index 86% rename from core/src/cz/nic/tablexia/rules/medium/BC_2_BCRule.java rename to core/src/cz/nic/tablexia/game/robbery/rules/medium/BC_2_BCRule.java index 82d3ee91e..81da72509 100644 --- a/core/src/cz/nic/tablexia/rules/medium/BC_2_BCRule.java +++ b/core/src/cz/nic/tablexia/game/robbery/rules/medium/BC_2_BCRule.java @@ -16,11 +16,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.rules.medium; +package cz.nic.tablexia.game.robbery.rules.medium; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.rules.GameRulesDefinition; -import cz.nic.tablexia.rules.easy.BC_1_BCRule; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.robbery.rules.GameRulesDefinition; +import cz.nic.tablexia.game.robbery.rules.easy.BC_1_BCRule; /** * diff --git a/core/src/cz/nic/tablexia/rules/medium/CA_1_CCRule.java b/core/src/cz/nic/tablexia/game/robbery/rules/medium/CA_1_CCRule.java similarity index 82% rename from core/src/cz/nic/tablexia/rules/medium/CA_1_CCRule.java rename to core/src/cz/nic/tablexia/game/robbery/rules/medium/CA_1_CCRule.java index 1c0d37815..390132a58 100644 --- a/core/src/cz/nic/tablexia/rules/medium/CA_1_CCRule.java +++ b/core/src/cz/nic/tablexia/game/robbery/rules/medium/CA_1_CCRule.java @@ -16,15 +16,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.rules.medium; +package cz.nic.tablexia.game.robbery.rules.medium; -import cz.nic.tablexia.AttributeDescription; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.creature.CreatureDescriptor; -import cz.nic.tablexia.creature.CreatureFactory; -import cz.nic.tablexia.creature.attribute.Attribute.AttributeColor; -import cz.nic.tablexia.creature.attribute.clothing.ClothingAttribute; -import cz.nic.tablexia.rules.GameRulesDefinition; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.robbery.creature.CreatureDescriptor; +import cz.nic.tablexia.game.robbery.creature.CreatureFactory; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute.AttributeColor; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.ClothingAttribute; +import cz.nic.tablexia.game.robbery.rules.GameRulesDefinition; /** * diff --git a/core/src/cz/nic/tablexia/rules/medium/CCCCCCRule.java b/core/src/cz/nic/tablexia/game/robbery/rules/medium/CCCCCCRule.java similarity index 90% rename from core/src/cz/nic/tablexia/rules/medium/CCCCCCRule.java rename to core/src/cz/nic/tablexia/game/robbery/rules/medium/CCCCCCRule.java index 15b044120..5a9e5543e 100644 --- a/core/src/cz/nic/tablexia/rules/medium/CCCCCCRule.java +++ b/core/src/cz/nic/tablexia/game/robbery/rules/medium/CCCCCCRule.java @@ -16,19 +16,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.rules.medium; +package cz.nic.tablexia.game.robbery.rules.medium; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.creature.CreatureDescriptor; -import cz.nic.tablexia.creature.CreatureFactory; -import cz.nic.tablexia.creature.CreatureRoot; -import cz.nic.tablexia.creature.attribute.clothing.headgear.HeadgearAttribute; -import cz.nic.tablexia.rules.GameRuleUtility; -import cz.nic.tablexia.rules.GameRulesDefinition; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.robbery.creature.CreatureDescriptor; +import cz.nic.tablexia.game.robbery.creature.CreatureFactory; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.headgear.HeadgearAttribute; +import cz.nic.tablexia.game.robbery.rules.GameRuleUtility; +import cz.nic.tablexia.game.robbery.rules.GameRulesDefinition; /** * diff --git a/core/src/cz/nic/tablexia/rules/medium/CC_1_CCRule.java b/core/src/cz/nic/tablexia/game/robbery/rules/medium/CC_1_CCRule.java similarity index 91% rename from core/src/cz/nic/tablexia/rules/medium/CC_1_CCRule.java rename to core/src/cz/nic/tablexia/game/robbery/rules/medium/CC_1_CCRule.java index 7aa6c6da6..4587354c3 100644 --- a/core/src/cz/nic/tablexia/rules/medium/CC_1_CCRule.java +++ b/core/src/cz/nic/tablexia/game/robbery/rules/medium/CC_1_CCRule.java @@ -16,18 +16,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.rules.medium; +package cz.nic.tablexia.game.robbery.rules.medium; import java.util.ArrayList; import java.util.List; -import cz.nic.tablexia.AttributeDescription; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.creature.CreatureDescriptor; -import cz.nic.tablexia.creature.CreatureFactory; -import cz.nic.tablexia.creature.CreatureRoot; -import cz.nic.tablexia.rules.GameRuleUtility; -import cz.nic.tablexia.rules.GameRulesDefinition; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.robbery.creature.CreatureDescriptor; +import cz.nic.tablexia.game.robbery.creature.CreatureFactory; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; +import cz.nic.tablexia.game.robbery.rules.GameRuleUtility; +import cz.nic.tablexia.game.robbery.rules.GameRulesDefinition; /** * diff --git a/core/src/cz/nic/tablexia/rules/medium/CC_1_notCARule.java b/core/src/cz/nic/tablexia/game/robbery/rules/medium/CC_1_notCARule.java similarity index 84% rename from core/src/cz/nic/tablexia/rules/medium/CC_1_notCARule.java rename to core/src/cz/nic/tablexia/game/robbery/rules/medium/CC_1_notCARule.java index cd982cf3a..da88380a7 100644 --- a/core/src/cz/nic/tablexia/rules/medium/CC_1_notCARule.java +++ b/core/src/cz/nic/tablexia/game/robbery/rules/medium/CC_1_notCARule.java @@ -16,16 +16,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.rules.medium; +package cz.nic.tablexia.game.robbery.rules.medium; -import cz.nic.tablexia.AttributeDescription; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.creature.CreatureDescriptor; -import cz.nic.tablexia.creature.CreatureFactory; -import cz.nic.tablexia.creature.attribute.Attribute.AttributeColor; -import cz.nic.tablexia.creature.attribute.clothing.ClothingAttribute; -import cz.nic.tablexia.rules.GameRulesDefinition; -import cz.nic.tablexia.rules.easy.CC_0_notCCRule; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.robbery.creature.CreatureDescriptor; +import cz.nic.tablexia.game.robbery.creature.CreatureFactory; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute.AttributeColor; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.ClothingAttribute; +import cz.nic.tablexia.game.robbery.rules.GameRulesDefinition; +import cz.nic.tablexia.game.robbery.rules.easy.CC_0_notCCRule; /** * diff --git a/core/src/cz/nic/tablexia/rules/medium/CC_1_notCCRule.java b/core/src/cz/nic/tablexia/game/robbery/rules/medium/CC_1_notCCRule.java similarity index 86% rename from core/src/cz/nic/tablexia/rules/medium/CC_1_notCCRule.java rename to core/src/cz/nic/tablexia/game/robbery/rules/medium/CC_1_notCCRule.java index dd0264170..92d03c708 100644 --- a/core/src/cz/nic/tablexia/rules/medium/CC_1_notCCRule.java +++ b/core/src/cz/nic/tablexia/game/robbery/rules/medium/CC_1_notCCRule.java @@ -16,11 +16,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. ******************************************************************************/ -package cz.nic.tablexia.rules.medium; +package cz.nic.tablexia.game.robbery.rules.medium; -import cz.nic.tablexia.common.RandomAccess; -import cz.nic.tablexia.rules.GameRulesDefinition; -import cz.nic.tablexia.rules.easy.CC_0_notCCRule; +import cz.nic.tablexia.game.common.RandomAccess; +import cz.nic.tablexia.game.robbery.rules.GameRulesDefinition; +import cz.nic.tablexia.game.robbery.rules.easy.CC_0_notCCRule; /** * diff --git a/core/src/cz/nic/tablexia/screen/DebugScreen.java b/core/src/cz/nic/tablexia/game/robbery/screen/DebugScreen.java similarity index 89% rename from core/src/cz/nic/tablexia/screen/DebugScreen.java rename to core/src/cz/nic/tablexia/game/robbery/screen/DebugScreen.java index 66ac0704f..eb53fca01 100644 --- a/core/src/cz/nic/tablexia/screen/DebugScreen.java +++ b/core/src/cz/nic/tablexia/game/robbery/screen/DebugScreen.java @@ -1,4 +1,4 @@ -package cz.nic.tablexia.screen; +package cz.nic.tablexia.game.robbery.screen; import java.util.List; @@ -8,8 +8,9 @@ import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.scenes.scene2d.Stage; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.BankRoberryGameDataManager; -import cz.nic.tablexia.creature.CreatureRoot; +import cz.nic.tablexia.game.robbery.RoberryGameDataManager; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot; +import cz.nic.tablexia.screen.TablexiaScreen; import cz.nic.tablexia.util.Log; public class DebugScreen extends TablexiaScreen { @@ -41,7 +42,7 @@ public class DebugScreen extends TablexiaScreen { @Override public void show() { super.show(); - displayAllCreatures(BankRoberryGameDataManager.getInstance().getResult().getCreatures(), getStage()); + displayAllCreatures(RoberryGameDataManager.getInstance().getResult().getCreatures(), getStage()); } private void displayAllCreatures(List<CreatureRoot> creatures, Stage stage) { diff --git a/core/src/cz/nic/tablexia/screen/GameScreen.java b/core/src/cz/nic/tablexia/game/robbery/screen/GameScreen.java similarity index 98% rename from core/src/cz/nic/tablexia/screen/GameScreen.java rename to core/src/cz/nic/tablexia/game/robbery/screen/GameScreen.java index c4b9d7b50..361fa4a8f 100644 --- a/core/src/cz/nic/tablexia/screen/GameScreen.java +++ b/core/src/cz/nic/tablexia/game/robbery/screen/GameScreen.java @@ -1,4 +1,4 @@ -package cz.nic.tablexia.screen; +package cz.nic.tablexia.game.robbery.screen; import static com.badlogic.gdx.scenes.scene2d.actions.Actions.alpha; import static com.badlogic.gdx.scenes.scene2d.actions.Actions.fadeIn; @@ -24,8 +24,9 @@ import com.badlogic.gdx.scenes.scene2d.InputListener; import com.badlogic.gdx.scenes.scene2d.utils.Align; import cz.nic.tablexia.BankRoberryAssetManager; -import cz.nic.tablexia.BankRoberryGameDataManager; -import cz.nic.tablexia.creature.CreatureRoot; +import cz.nic.tablexia.game.robbery.RoberryGameDataManager; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot; +import cz.nic.tablexia.screen.TablexiaScreen; public class GameScreen extends TablexiaScreen { @@ -260,7 +261,7 @@ public class GameScreen extends TablexiaScreen { InfoItem.init(infoItemLayer, colorInfoLayer); prepareCreaturePositions(getStage().getViewport().getWorldWidth(), getStage().getViewport().getWorldHeight()); - showNextCreature(BankRoberryGameDataManager.getInstance().getResult().getCreatures()); + showNextCreature(RoberryGameDataManager.getInstance().getResult().getCreatures()); } @Override diff --git a/core/src/cz/nic/tablexia/screen/RuleScreen.java b/core/src/cz/nic/tablexia/game/robbery/screen/RuleScreen.java similarity index 93% rename from core/src/cz/nic/tablexia/screen/RuleScreen.java rename to core/src/cz/nic/tablexia/game/robbery/screen/RuleScreen.java index 80fa8234d..7d94fa365 100644 --- a/core/src/cz/nic/tablexia/screen/RuleScreen.java +++ b/core/src/cz/nic/tablexia/game/robbery/screen/RuleScreen.java @@ -1,4 +1,4 @@ -package cz.nic.tablexia.screen; +package cz.nic.tablexia.game.robbery.screen; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.Color; @@ -12,7 +12,8 @@ import com.badlogic.gdx.scenes.scene2d.ui.Label.LabelStyle; import cz.nic.tablexia.BankRoberryAssetManager; import cz.nic.tablexia.BankRoberryFontAssetManager; -import cz.nic.tablexia.BankRoberryGameDataManager; +import cz.nic.tablexia.game.robbery.RoberryGameDataManager; +import cz.nic.tablexia.screen.TablexiaScreen; public class RuleScreen extends TablexiaScreen { @@ -78,7 +79,7 @@ public class RuleScreen extends TablexiaScreen { background = new RuleBackground(); paper = new RulePaper(); BitmapFont font = BankRoberryFontAssetManager.getInstance().<BitmapFont>get(BankRoberryFontAssetManager.FONT_ROBOTO_REGULAR); - label = new Label(BankRoberryGameDataManager.getInstance().getResult().getRuleMessageText(), + label = new Label(RoberryGameDataManager.getInstance().getResult().getRuleMessageText(), new LabelStyle(font, TEXT_COLOR)); label.setWrap(true); diff --git a/core/test/cz/nic/tablexia/test/games/bankovniloupez/CreatureDescriptiorTest.java b/core/test/cz/nic/tablexia/test/games/bankovniloupez/CreatureDescriptiorTest.java index 1ba22c1ce..b3e8527d3 100644 --- a/core/test/cz/nic/tablexia/test/games/bankovniloupez/CreatureDescriptiorTest.java +++ b/core/test/cz/nic/tablexia/test/games/bankovniloupez/CreatureDescriptiorTest.java @@ -27,24 +27,24 @@ import java.util.List; import org.junit.Test; -import cz.nic.tablexia.AttributeDescription; -import cz.nic.tablexia.creature.CreatureDescriptor; -import cz.nic.tablexia.creature.CreatureRoot.AttributeGender; -import cz.nic.tablexia.creature.attribute.Attribute.AttributeColor; -import cz.nic.tablexia.creature.attribute.clothing.ClothingAttribute; -import cz.nic.tablexia.creature.attribute.clothing.accessories.MTieAttribute; -import cz.nic.tablexia.creature.attribute.clothing.bottom.BottomAttribute; -import cz.nic.tablexia.creature.attribute.clothing.bottom.FSkirtAttribute; -import cz.nic.tablexia.creature.attribute.clothing.bottom.MPantsAttribute; -import cz.nic.tablexia.creature.attribute.clothing.headgear.FHatAttribute; -import cz.nic.tablexia.creature.attribute.clothing.headgear.HeadgearAttribute; -import cz.nic.tablexia.creature.attribute.clothing.headgear.MHatAttribute; -import cz.nic.tablexia.creature.attribute.clothing.top.FShirtAttribute; -import cz.nic.tablexia.creature.attribute.clothing.top.MShirtAttribute; -import cz.nic.tablexia.creature.attribute.clothing.top.MSweaterAttribute; -import cz.nic.tablexia.creature.attribute.clothing.top.TopAttribute; -import cz.nic.tablexia.creature.attribute.glasses.GlassesAttribute; -import cz.nic.tablexia.creature.attribute.glasses.MGlassesAttribute; +import cz.nic.tablexia.game.robbery.creature.CreatureDescriptor; +import cz.nic.tablexia.game.robbery.creature.CreatureRoot.AttributeGender; +import cz.nic.tablexia.game.robbery.creature.attribute.AttributeDescription; +import cz.nic.tablexia.game.robbery.creature.attribute.Attribute.AttributeColor; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.ClothingAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.accessories.MTieAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.bottom.BottomAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.bottom.FSkirtAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.bottom.MPantsAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.headgear.FHatAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.headgear.HeadgearAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.headgear.MHatAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.top.FShirtAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.top.MShirtAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.top.MSweaterAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.clothing.top.TopAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.glasses.GlassesAttribute; +import cz.nic.tablexia.game.robbery.creature.attribute.glasses.MGlassesAttribute; public class CreatureDescriptiorTest { -- GitLab