Commit 07e2a062 authored by Lukas Marik's avatar Lukas Marik

#945 add objects

parent 00f4a8fd
......@@ -427,8 +427,46 @@ public final class ProtocolAssets {
//////////////////////////// CARDS
public static final String BAG_CARD = CARDS_PATH + "bag";
public static final String BIG_BOOK_CARD = CARDS_PATH + "big_book";
public static final String BIG_GLOBE_CARD = CARDS_PATH + "big_globe";
public static final String BROWN_BOOK_CARD = CARDS_PATH + "brown_book";
public static final String ELEPHANT_CARD = CARDS_PATH + "elephant";
public static final String GIRAFFE_CARD = CARDS_PATH + "giraffe";
public static final String GRAY_BOOK_CARD = CARDS_PATH + "gray_book";
public static final String KABUKI_CARD = CARDS_PATH + "kabuki";
public static final String KIMONO_CARD = CARDS_PATH + "kimono";
public static final String LETTERS_CARD = CARDS_PATH + "letters";
public static final String LION_CARD = CARDS_PATH + "lion";
public static final String MASK_AFRICA_CARD = CARDS_PATH + "mask_africa";
public static final String SHELLS_CARD = CARDS_PATH + "shells";
public static final String SMALL_BOOK_CARD = CARDS_PATH + "small_book";
public static final String SMALL_GLOBE_CARD = CARDS_PATH + "small_globe";
public static final String STACK_OF_BOOKS_CARD = CARDS_PATH + "stack_of_books";
public static final String STAND_FOR_POSTER_CARD = CARDS_PATH + "stand_for_poster";
public static final String TABLE_WITH_MAPS_CARD = CARDS_PATH + "table_with_maps";
//////////////////////////// OBJECTS
public static final String BAG_OBJECT = OBJECTS_PATH + "bag";
public static final String BIG_BOOK_OBJECT = OBJECTS_PATH + "big_book";
public static final String BIG_GLOBE_OBJECT = OBJECTS_PATH + "big_globe";
public static final String BROWN_BOOK_OBJECT = OBJECTS_PATH + "brown_book";
public static final String ELEPHANT_OBJECT = OBJECTS_PATH + "elephant";
public static final String GIRAFFE_OBJECT = OBJECTS_PATH + "giraffe";
public static final String GRAY_BOOK_OBJECT = OBJECTS_PATH + "gray_book";
public static final String KABUKI_OBJECT = OBJECTS_PATH + "kabuki";
public static final String KIMONO_OBJECT = OBJECTS_PATH + "kimono";
public static final String LETTERS_OBJECT = OBJECTS_PATH + "letters";
public static final String LION_OBJECT = OBJECTS_PATH + "lion";
public static final String MASK_AFRICA_OBJECT = OBJECTS_PATH + "mask_africa";
public static final String SHELLS_OBJECT = OBJECTS_PATH + "shells";
public static final String SMALL_BOOK_OBJECT = OBJECTS_PATH + "small_book";
public static final String SMALL_GLOBE_OBJECT = OBJECTS_PATH + "small_globe";
public static final String STACK_OF_BOOKS_OBJECT = OBJECTS_PATH + "stack_of_books";
public static final String STAND_FOR_POSTER_OBJECT = OBJECTS_PATH + "stand_for_poster";
public static final String TABLE_WITH_MAPS_OBJECT = OBJECTS_PATH + "table_with_maps";
//////////////////////////// TEXT
......
......@@ -115,7 +115,27 @@ public enum GameObjectType implements TypeObjectDescriptor {
TUBE (ProtocolAssets.TUBE_CARD, ProtocolAssets.TUBE_OBJECT, ProtocolAssets.TUBE_TEXT, new float[]{0.42f,0.12f}, new float[]{0.42f,0.12f}, null, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
TUBES_IN_STAND (ProtocolAssets.TUBES_IN_STAND_CARD, ProtocolAssets.TUBES_IN_STAND_OBJECT, ProtocolAssets.TUBES_TEXT, new float[]{0.44f,0.07f}, new float[]{0.52f, 0.23f}, null, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
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});
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, null, null,null, null, new RoomPosition[]{}),
BIG_BOOK (ProtocolAssets.BIG_BOOK_CARD, ProtocolAssets.BIG_BOOK_OBJECT, null, null,null, null, new RoomPosition[]{}),
BIG_GLOBE (ProtocolAssets.BIG_GLOBE_CARD, ProtocolAssets.BIG_GLOBE_OBJECT, null, null,null, null, new RoomPosition[]{}),
BROWN_GLOBE (ProtocolAssets.BROWN_BOOK_CARD, ProtocolAssets.BROWN_BOOK_OBJECT, null, null,null, null, new RoomPosition[]{}),
ELEPHANT (ProtocolAssets.ELEPHANT_CARD, ProtocolAssets.ELEPHANT_OBJECT, null, null,null, null, new RoomPosition[]{}),
GIRAFFE (ProtocolAssets.GIRAFFE_CARD, ProtocolAssets.GIRAFFE_OBJECT, null, null,null, null, new RoomPosition[]{}),
GRAY_BOOK (ProtocolAssets.GRAY_BOOK_CARD, ProtocolAssets.GRAY_BOOK_OBJECT, null, null,null, null, new RoomPosition[]{}),
KABUKI (ProtocolAssets.KABUKI_CARD, ProtocolAssets.KABUKI_OBJECT, null, null,null, null, new RoomPosition[]{}),
KIMONO (ProtocolAssets.KIMONO_CARD, ProtocolAssets.KIMONO_OBJECT, null, null,null, null, new RoomPosition[]{}),
LETTERS (ProtocolAssets.LETTERS_CARD, ProtocolAssets.LETTERS_OBJECT, null, null,null, null, new RoomPosition[]{}),
LION (ProtocolAssets.LION_CARD, ProtocolAssets.LION_OBJECT, null, null,null, null, new RoomPosition[]{}),
MASK_AFRICA (ProtocolAssets.MASK_AFRICA_CARD, ProtocolAssets.MASK_AFRICA_OBJECT, null, null,null, null, new RoomPosition[]{}),
SHELLS (ProtocolAssets.SHELLS_CARD, ProtocolAssets.SHELLS_OBJECT, null, null,null, null, new RoomPosition[]{}),
SMALL_BOOK (ProtocolAssets.SMALL_BOOK_CARD, ProtocolAssets.SMALL_BOOK_OBJECT, null, null,null, null, new RoomPosition[]{}),
SMALL_GLOBE (ProtocolAssets.SMALL_GLOBE_CARD, ProtocolAssets.SMALL_GLOBE_OBJECT, null, null,null, null, new RoomPosition[]{}),
STACK_OF_BOOKS (ProtocolAssets.STACK_OF_BOOKS_CARD, ProtocolAssets.STACK_OF_BOOKS_OBJECT, null, null,null, null, new RoomPosition[]{}),
STAND_FOR_POSTER (ProtocolAssets.STAND_FOR_POSTER_CARD, ProtocolAssets.STAND_FOR_POSTER_OBJECT, null, null,null, null, new RoomPosition[]{}),
TABLE_WITH_MAPS (ProtocolAssets.TABLE_WITH_MAPS_CARD, ProtocolAssets.TABLE_WITH_MAPS_OBJECT, null, null,null, null, new RoomPosition[]{});
private String cardTexturePath;
private String objectTexturePath;
......
......@@ -224,6 +224,30 @@ public class LevelDefinition {
GameObjectType.YELLOW_LIQUID
));
//BONUS
levels.put(Level.TRAVELER_ROOM, Arrays.asList(
GameObjectType.BAG,
GameObjectType.BIG_BOOK,
GameObjectType.BIG_GLOBE,
GameObjectType.BROWN_GLOBE,
GameObjectType.CHESS_TABLE,
GameObjectType.ELEPHANT,
GameObjectType.GIRAFFE,
GameObjectType.GRAY_BOOK,
GameObjectType.KABUKI,
GameObjectType.KIMONO,
GameObjectType.LETTERS,
GameObjectType.LION,
GameObjectType.MASK_AFRICA,
GameObjectType.OPEN_BOOK,
GameObjectType.SHELLS,
GameObjectType.SMALL_BOOK,
GameObjectType.SMALL_GLOBE,
GameObjectType.STACK_OF_BOOKS,
GameObjectType.STAND_FOR_POSTER,
GameObjectType.TABLE_WITH_MAPS
));
}
static List<GameObjectType> getObjectsByDifficulty(GameDifficulty difficulty){
......
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