Skip to content
Snippets Groups Projects
Commit e09ddca8 authored by Matyáš Latner's avatar Matyáš Latner
Browse files

#5 Game Robbery package refactor

parent 0bbe4ebf
No related branches found
No related tags found
No related merge requests found
Showing
with 98 additions and 98 deletions
......@@ -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();
}
......
......@@ -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;
......
......@@ -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;
/**
......
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() {
......
......@@ -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.
......
......@@ -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
......
......@@ -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
......
......@@ -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;
/**
......
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.
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment