Commit 55e039a7 authored by Lukas Marik's avatar Lukas Marik

#945 set furniture position, object type position and repair color map

parent 70b394e5
......@@ -281,7 +281,7 @@ game_protocol_descriptor_green = zelen
game_protocol_descriptor_orange = oranžov
game_protocol_descriptor_white = bíl
game_protocol_descriptor_yellow = žlut
game_protocol_decsriptor_brown = hněd
game_protocol_descriptor_brown = hněd
game_protocol_descriptor_big = velk
game_protocol_descriptor_small = mal
......
......@@ -117,27 +117,27 @@ public enum GameObjectType implements TypeObjectDescriptor {
WHITE_INGREDIENT (ProtocolAssets.WHITE_INGREDIENT_CARD, ProtocolAssets.WHITE_INGREDIENT_OBJECT, ProtocolAssets.INGREDIENT_TEXT, new float[]{0.57f,0.14f}, new float[]{0.52f, 0.14f}, null, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
YELLOW_LIQUID (ProtocolAssets.YELLOW_LIQUID_CARD, ProtocolAssets.YELLOW_LIQUID_OBJECT, ProtocolAssets.LIQUID_TEXT, new float[]{0.55f,0.104f}, new float[]{0.5f, 0.14f}, null, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
//BONUS
BAG (ProtocolAssets.BAG_CARD, ProtocolAssets.BAG_OBJECT, ProtocolAssets.BAG_TEXT, null,null, null, new RoomPosition[]{}),
BIG_BOOK (ProtocolAssets.BIG_BOOK_CARD, ProtocolAssets.BIG_BOOK_OBJECT, ProtocolAssets.BOOK_TEXT, null,null, null, new RoomPosition[]{}),
BIG_GLOBE (ProtocolAssets.BIG_GLOBE_CARD, ProtocolAssets.BIG_GLOBE_OBJECT, ProtocolAssets.GLOBE_TEXT, null,null, null, new RoomPosition[]{}),
BROWN_BOOK (ProtocolAssets.BROWN_BOOK_CARD, ProtocolAssets.BROWN_BOOK_OBJECT, ProtocolAssets.BOOK_TEXT, null,null, null, new RoomPosition[]{}),
ELEPHANT (ProtocolAssets.ELEPHANT_CARD, ProtocolAssets.ELEPHANT_OBJECT, ProtocolAssets.STATUETTE_TEXT, null,null, null, new RoomPosition[]{}),
GIRAFFE (ProtocolAssets.GIRAFFE_CARD, ProtocolAssets.GIRAFFE_OBJECT, ProtocolAssets.STATUETTE_TEXT, null,null, null, new RoomPosition[]{}),
GRAY_BOOK (ProtocolAssets.GRAY_BOOK_CARD, ProtocolAssets.GRAY_BOOK_OBJECT, ProtocolAssets.BOOK_TEXT, null,null, null, new RoomPosition[]{}),
KABUKI (ProtocolAssets.KABUKI_CARD, ProtocolAssets.KABUKI_OBJECT, ProtocolAssets.MASK_TEXT, null,null, null, new RoomPosition[]{}),
KIMONO (ProtocolAssets.KIMONO_CARD, ProtocolAssets.KIMONO_OBJECT, ProtocolAssets.KIMONO_TEXT, null,null, null, new RoomPosition[]{}),
LETTERS (ProtocolAssets.LETTERS_CARD, ProtocolAssets.LETTERS_OBJECT, ProtocolAssets.LETTER_TEXT, null,null, null, new RoomPosition[]{}),
LION (ProtocolAssets.LION_CARD, ProtocolAssets.LION_OBJECT, ProtocolAssets.STATUETTE_TEXT, null,null, null, new RoomPosition[]{}),
MASK_AFRICA (ProtocolAssets.MASK_AFRICA_CARD, ProtocolAssets.MASK_AFRICA_OBJECT, ProtocolAssets.MASK_TEXT, null,null, null, new RoomPosition[]{}),
SHELLS (ProtocolAssets.SHELLS_CARD, ProtocolAssets.SHELLS_OBJECT, ProtocolAssets.BOX_TEXT, null,null, null, new RoomPosition[]{}),
SMALL_BOOK (ProtocolAssets.SMALL_BOOK_CARD, ProtocolAssets.SMALL_BOOK_OBJECT, ProtocolAssets.BOOK_TEXT, null,null, null, new RoomPosition[]{}),
SMALL_GLOBE (ProtocolAssets.SMALL_GLOBE_CARD, ProtocolAssets.SMALL_GLOBE_OBJECT, ProtocolAssets.GLOBE_TEXT, null,null, null, new RoomPosition[]{}),
STACK_OF_BOOKS (ProtocolAssets.STACK_OF_BOOKS_CARD, ProtocolAssets.STACK_OF_BOOKS_OBJECT, ProtocolAssets.STACK_TEXT, null,null, null, new RoomPosition[]{}),
STAND_FOR_POSTER (ProtocolAssets.STAND_FOR_POSTER_CARD, ProtocolAssets.STAND_FOR_POSTER_OBJECT, ProtocolAssets.STAND_TEXT, null,null, null, new RoomPosition[]{}),
TABLE_WITH_MAPS (ProtocolAssets.TABLE_WITH_MAPS_CARD, ProtocolAssets.TABLE_WITH_MAPS_OBJECT, ProtocolAssets.TABLE_TEXT, null,null, null, new RoomPosition[]{}),
CHINESE_VASE (ProtocolAssets.CHINESE_VASE_CARD, ProtocolAssets.CHINESE_VASE_OBJECT, ProtocolAssets.VASE_TEXT, null,null, null, new RoomPosition[]{}),
COMPASS (ProtocolAssets.COMPASS_CARD, ProtocolAssets.COMPASS_OBJECT, ProtocolAssets.COMPASS_TEXT, null,null, null, new RoomPosition[]{}),
TRAVEL_HAT (ProtocolAssets.TRAVEL_HAT_CARD, ProtocolAssets.TRAVEL_HAT_OBJECT, ProtocolAssets.HAT_TEXT, null,null, null, new RoomPosition[]{});
BAG (ProtocolAssets.BAG_CARD, ProtocolAssets.BAG_OBJECT, ProtocolAssets.BAG_TEXT, new float[]{0.5f}, new float[]{0.5f}, new float[]{0.5f}, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
BIG_BOOK (ProtocolAssets.BIG_BOOK_CARD, ProtocolAssets.BIG_BOOK_OBJECT, ProtocolAssets.BOOK_TEXT, new float[]{0.5f}, new float[]{0.5f}, new float[]{0.5f}, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
BIG_GLOBE (ProtocolAssets.BIG_GLOBE_CARD, ProtocolAssets.BIG_GLOBE_OBJECT, ProtocolAssets.GLOBE_TEXT, new float[]{0.5f}, new float[]{0.5f}, new float[]{0.5f}, new RoomPosition[]{RoomPosition.FLOOR}),
BROWN_BOOK (ProtocolAssets.BROWN_BOOK_CARD, ProtocolAssets.BROWN_BOOK_OBJECT, ProtocolAssets.BOOK_TEXT, new float[]{0.5f}, new float[]{0.5f}, new float[]{0.5f}, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
ELEPHANT (ProtocolAssets.ELEPHANT_CARD, ProtocolAssets.ELEPHANT_OBJECT, ProtocolAssets.STATUETTE_TEXT, new float[]{0.5f}, new float[]{0.5f}, new float[]{0.5f}, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
GIRAFFE (ProtocolAssets.GIRAFFE_CARD, ProtocolAssets.GIRAFFE_OBJECT, ProtocolAssets.STATUETTE_TEXT, new float[]{0.5f}, new float[]{0.5f}, new float[]{0.5f}, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
GRAY_BOOK (ProtocolAssets.GRAY_BOOK_CARD, ProtocolAssets.GRAY_BOOK_OBJECT, ProtocolAssets.BOOK_TEXT, new float[]{0.5f}, new float[]{0.5f}, new float[]{0.5f}, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
KABUKI (ProtocolAssets.KABUKI_CARD, ProtocolAssets.KABUKI_OBJECT, ProtocolAssets.MASK_TEXT, new float[]{0.5f}, new float[]{0.5f}, new float[]{0.5f}, new RoomPosition[]{RoomPosition.WALL}),
KIMONO (ProtocolAssets.KIMONO_CARD, ProtocolAssets.KIMONO_OBJECT, ProtocolAssets.KIMONO_TEXT, new float[]{0.5f}, new float[]{0.5f}, new float[]{0.5f}, new RoomPosition[]{RoomPosition.FLOOR}),
LETTERS (ProtocolAssets.LETTERS_CARD, ProtocolAssets.LETTERS_OBJECT, ProtocolAssets.LETTER_TEXT, new float[]{0.5f}, new float[]{0.5f}, new float[]{0.5f}, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
LION (ProtocolAssets.LION_CARD, ProtocolAssets.LION_OBJECT, ProtocolAssets.STATUETTE_TEXT, new float[]{0.5f}, new float[]{0.5f}, new float[]{0.5f}, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
MASK_AFRICA (ProtocolAssets.MASK_AFRICA_CARD, ProtocolAssets.MASK_AFRICA_OBJECT, ProtocolAssets.MASK_TEXT, new float[]{0.5f}, new float[]{0.5f}, new float[]{0.5f}, new RoomPosition[]{RoomPosition.WALL}),
SHELLS (ProtocolAssets.SHELLS_CARD, ProtocolAssets.SHELLS_OBJECT, ProtocolAssets.BOX_TEXT, new float[]{0.5f}, new float[]{0.5f}, new float[]{0.5f}, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
SMALL_BOOK (ProtocolAssets.SMALL_BOOK_CARD, ProtocolAssets.SMALL_BOOK_OBJECT, ProtocolAssets.BOOK_TEXT, new float[]{0.5f}, new float[]{0.5f}, new float[]{0.5f}, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
SMALL_GLOBE (ProtocolAssets.SMALL_GLOBE_CARD, ProtocolAssets.SMALL_GLOBE_OBJECT, ProtocolAssets.GLOBE_TEXT, new float[]{0.5f}, new float[]{0.5f}, new float[]{0.5f}, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
STACK_OF_BOOKS (ProtocolAssets.STACK_OF_BOOKS_CARD, ProtocolAssets.STACK_OF_BOOKS_OBJECT, ProtocolAssets.STACK_TEXT, new float[]{0.5f}, new float[]{0.5f}, new float[]{0.5f}, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
STAND_FOR_POSTER (ProtocolAssets.STAND_FOR_POSTER_CARD, ProtocolAssets.STAND_FOR_POSTER_OBJECT, ProtocolAssets.STAND_TEXT, new float[]{0.5f}, new float[]{0.5f}, new float[]{0.5f}, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
TABLE_WITH_MAPS (ProtocolAssets.TABLE_WITH_MAPS_CARD, ProtocolAssets.TABLE_WITH_MAPS_OBJECT, ProtocolAssets.TABLE_TEXT, new float[]{0.5f}, new float[]{0.5f}, new float[]{0.5f}, new RoomPosition[]{RoomPosition.FLOOR}),
CHINESE_VASE (ProtocolAssets.CHINESE_VASE_CARD, ProtocolAssets.CHINESE_VASE_OBJECT, ProtocolAssets.VASE_TEXT, new float[]{0.5f}, new float[]{0.5f}, new float[]{0.5f}, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
COMPASS (ProtocolAssets.COMPASS_CARD, ProtocolAssets.COMPASS_OBJECT, ProtocolAssets.COMPASS_TEXT, new float[]{0.5f}, new float[]{0.5f}, new float[]{0.5f}, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
TRAVEL_HAT (ProtocolAssets.TRAVEL_HAT_CARD, ProtocolAssets.TRAVEL_HAT_OBJECT, ProtocolAssets.HAT_TEXT, new float[]{0.5f}, new float[]{0.5f}, new float[]{0.5f}, new RoomPosition[]{RoomPosition.WALL});
private String cardTexturePath;
private String objectTexturePath;
......
......@@ -52,17 +52,17 @@ public enum FurnitureType implements TypeObjectDescriptor {
HARD_SMALL_SHELF_RIGHT (ProtocolAssets.SMALL_SHELF_RIGHT, ProtocolAssets.F_SHELF_TEXT, GameDifficulty.HARD, RoomPosition.WALL, WallType.RIGHT_WALL, new float[]{0.841f,0.607f}, new float[]{0.667f,0.097f}, new float[]{0.54f,0.52f}, new Color(0x5c5c8aff)),
HARD_SMALL_TABLE (ProtocolAssets.SMALL_TABLE, ProtocolAssets.F_TABLE_S_TEXT, GameDifficulty.HARD, RoomPosition.FLOOR, null, new float[]{0.5f,0.483f}, new float[]{0.562f,0.065f}, new float[]{0.5f,0.8f}, new Color(0x004466ff)),
//BONUS
BONUS_BIG_SHELF_LEFT (ProtocolAssets.BIG_SHELF_LEFT, ProtocolAssets.F_SHELF_TEXT, GameDifficulty.BONUS, RoomPosition.WALL, WallType.LEFT_WALL, null, null,null,null),
BONUS_BIG_SHELF_RIGHT (ProtocolAssets.BIG_SHELF_RIGHT, ProtocolAssets.F_SHELF_TEXT, GameDifficulty.BONUS, RoomPosition.WALL, WallType.RIGHT_WALL, null, null,null, null),
BONUS_BIG_TABLE (ProtocolAssets.BIG_TABLE, ProtocolAssets.F_TABLE_B_TEXT, GameDifficulty.BONUS, RoomPosition.FLOOR, null, null, null, null, null),
BONUS_CABINET_LEFT (ProtocolAssets.CABINET_LEFT, ProtocolAssets.F_CABINET_TEXT, GameDifficulty.BONUS, RoomPosition.FLOOR, WallType.LEFT_WALL, null, null, null, null),
BONUS_CABINET_RIGHT (ProtocolAssets.CABINET_RIGHT, ProtocolAssets.F_CABINET_TEXT, GameDifficulty.BONUS, RoomPosition.FLOOR, WallType.RIGHT_WALL, null, null, null, null),
BONUS_CHEST_OF_DRAWERS_LEFT (ProtocolAssets.CHEST_OF_DRAWERS_LEFT, ProtocolAssets.F_CHEST_OF_DRAWERS_TEXT, GameDifficulty.BONUS, RoomPosition.FLOOR, WallType.LEFT_WALL, null, null, null, null),
BONUS_CHEST_OF_DRAWERS_RIGHT (ProtocolAssets.CHEST_OF_DRAWERS_RIGHT, ProtocolAssets.F_CHEST_OF_DRAWERS_TEXT, GameDifficulty.BONUS, RoomPosition.FLOOR, WallType.RIGHT_WALL, null, null, null, null),
BONUS_ROUND_TABLE (ProtocolAssets.ROUND_TABLE, ProtocolAssets.F_TABLE_S_TEXT, GameDifficulty.BONUS, RoomPosition.FLOOR, null, null, null, null, null),
BONUS_SMALL_SHELF_LEFT (ProtocolAssets.SMALL_SHELF_LEFT, ProtocolAssets.F_SHELF_TEXT, GameDifficulty.BONUS, RoomPosition.WALL, WallType.LEFT_WALL, null, null, null, null),
BONUS_SMALL_SHELF_RIGHT (ProtocolAssets.SMALL_SHELF_RIGHT, ProtocolAssets.F_SHELF_TEXT, GameDifficulty.BONUS, RoomPosition.WALL, WallType.RIGHT_WALL, null, null, null, null),
BONUS_SMALL_TABLE (ProtocolAssets.SMALL_TABLE, ProtocolAssets.F_TABLE_S_TEXT, GameDifficulty.BONUS, RoomPosition.FLOOR, null, null, null, null, null);
BONUS_BIG_SHELF_LEFT (ProtocolAssets.BIG_SHELF_LEFT, ProtocolAssets.F_SHELF_TEXT, GameDifficulty.BONUS, RoomPosition.WALL, WallType.LEFT_WALL, new float[]{0.2106f, 0.7402f}, new float[]{0.5f, 0.5f}, new float[]{0.5f, 0.5f}, new Color(0x5900b3ff)),
BONUS_BIG_SHELF_RIGHT (ProtocolAssets.BIG_SHELF_RIGHT, ProtocolAssets.F_SHELF_TEXT, GameDifficulty.BONUS, RoomPosition.WALL, WallType.RIGHT_WALL, new float[]{0.5909f,0.7402f}, new float[]{0.5f, 0.5f}, new float[]{0.5f, 0.5f}, new Color(0xff6600ff)),
BONUS_BIG_TABLE (ProtocolAssets.BIG_TABLE, ProtocolAssets.F_TABLE_B_TEXT, GameDifficulty.BONUS, RoomPosition.FLOOR, null, new float[]{0.5258f,0.0268f}, new float[]{0.5f, 0.5f}, new float[]{0.5f, 0.5f}, new Color(0x000080ff)),
BONUS_CABINET_LEFT (ProtocolAssets.CABINET_LEFT, ProtocolAssets.F_CABINET_TEXT, GameDifficulty.BONUS, RoomPosition.FLOOR, WallType.LEFT_WALL, new float[]{0.2636f,0.4784f}, new float[]{0.5f, 0.5f}, new float[]{0.5f, 0.5f}, new Color(0x996600ff)),
BONUS_CABINET_RIGHT (ProtocolAssets.CABINET_RIGHT, ProtocolAssets.F_CABINET_TEXT, GameDifficulty.BONUS, RoomPosition.FLOOR, WallType.RIGHT_WALL, new float[]{0.8576f,0.2887f}, new float[]{0.5f, 0.5f}, new float[]{0.5f, 0.5f}, new Color(0x7f0000ff)),
BONUS_CHEST_OF_DRAWERS_LEFT (ProtocolAssets.CHEST_OF_DRAWERS_LEFT, ProtocolAssets.F_CHEST_OF_DRAWERS_TEXT, GameDifficulty.BONUS, RoomPosition.FLOOR, WallType.LEFT_WALL, new float[]{0.0182f, 0.2619f}, new float[]{0.5f, 0.5f}, new float[]{0.5f, 0.5f}, new Color(0x009965ff)),
BONUS_CHEST_OF_DRAWERS_RIGHT (ProtocolAssets.CHEST_OF_DRAWERS_RIGHT, ProtocolAssets.F_CHEST_OF_DRAWERS_TEXT, GameDifficulty.BONUS, RoomPosition.FLOOR, WallType.RIGHT_WALL, new float[]{0.6909f,0.3278f}, new float[]{0.5f, 0.5f}, new float[]{0.5f, 0.5f}, new Color(0x570061ff)),
BONUS_ROUND_TABLE (ProtocolAssets.ROUND_TABLE, ProtocolAssets.F_TABLE_S_TEXT, GameDifficulty.BONUS, RoomPosition.FLOOR, null, new float[]{0.4394f,0.4845f}, new float[]{0.5f, 0.5f}, new float[]{0.5f, 0.5f}, new Color(0x212022ff)),
BONUS_SMALL_SHELF_LEFT (ProtocolAssets.SMALL_SHELF_LEFT, ProtocolAssets.F_SHELF_TEXT, GameDifficulty.BONUS, RoomPosition.WALL, WallType.LEFT_WALL, new float[]{0.1152f,0.6598f}, new float[]{0.5f, 0.5f}, new float[]{0.5f, 0.5f}, new Color(0x003300ff)),
BONUS_SMALL_SHELF_RIGHT (ProtocolAssets.SMALL_SHELF_RIGHT, ProtocolAssets.F_SHELF_TEXT, GameDifficulty.BONUS, RoomPosition.WALL, WallType.RIGHT_WALL, new float[]{0.8379f,0.6144f}, new float[]{0.5f, 0.5f}, new float[]{0.5f, 0.5f}, new Color(0x5c5c8aff)),
BONUS_SMALL_TABLE (ProtocolAssets.SMALL_TABLE, ProtocolAssets.F_TABLE_S_TEXT, GameDifficulty.BONUS, RoomPosition.FLOOR, null, new float[]{0.1742f,0.2268f}, new float[]{0.5f, 0.5f}, new float[]{0.5f, 0.5f}, new Color(0x004466ff));
private static final int MEDIUM_RANGE_MIN = 0;
private static final int MEDIUM_RANGE_MAX = 6;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment