Commit 9f2e77bd authored by Lukas Marik's avatar Lukas Marik

#945 set sk protocol descriptors, some changes

parent ab689bc0
......@@ -250,12 +250,13 @@ game_protocol_descriptor_giraffe = žirafy
game_protocol_bonus_mask = mask
game_protocol_bonus_kimono = kimon
game_protocol_bonus_letter = dopis
game_protocol_descriptor_in_packages = v balíčku
game_protocol_descriptor_lion = lva
game_protocol_descriptor_with_shells = s mušlemi
game_protocol_bonus_stack = stoh
game_protocol_descriptor_of_books = knih
game_protocol_bonus_stand = stojan
game_protocol_descriptor_with_posters = s plakáty
game_protocol_bonus_table = stolek
game_protocol_descriptor_with_maps = s mapami
game_protocol_bonus_compass = kompas
game_protocol_bonus_hat = klobouk
......
......@@ -144,6 +144,7 @@ game_protocol_medium_umbrella = Schirm
game_protocol_medium_watch = Uhr
game_protocol_hard_box = Schachtel
game_protocol_hard_box_s = Schachtel
game_protocol_hard_flask = Phiole
game_protocol_hard_ingredient = Zutat
game_protocol_hard_liquid = Flüssigkeit
......@@ -167,10 +168,10 @@ game_protocol_bonus_kimono = [DE]kimon[DE]
game_protocol_bonus_letter = [DE]dopis[DE]
game_protocol_descriptor_lion = [DE]lva[DE]
game_protocol_descriptor_with_shells = [DE]s mušlemi[DE]
game_protocol_bonus_stack = [DE]stoh[DE]
game_protocol_descriptor_of_books = [DE]knih[DE]
game_protocol_bonus_stand = [DE]stojan[DE]
game_protocol_descriptor_with_posters = [DE]s plakáty[DE]
game_protocol_bonus_table = [DE]stolek[DE]
game_protocol_descriptor_with_maps = [DE]s mapami[DE]
game_protocol_bonus_compass = [DE]kompas[DE]
game_protocol_bonus_hat = [DE]klobouk[DE]
......@@ -199,7 +200,7 @@ game_protocol_descriptor_green = grün
game_protocol_descriptor_orange = orangefarben
game_protocol_descriptor_white = weiß
game_protocol_descriptor_yellow = gelb
game_protocol_decsriptor_brown = [DE]hněd[DE]
game_protocol_descriptor_brown = [DE]hněd[DE]
game_protocol_descriptor_big = groß
......
......@@ -273,7 +273,8 @@ game_protocol_medium_umbrella = dáždnik
game_protocol_medium_watch = hodink
game_protocol_medium_watch_g = hodiniek
game_protocol_hard_box = krabičk
game_protocol_hard_box = krabic
game_protocol_hard_box_s = krabičk
game_protocol_hard_flask = bank
game_protocol_hard_ingredient = prísad
game_protocol_hard_liquid = tekutin
......@@ -291,22 +292,23 @@ game_protocol_hard_pen = per
game_protocol_hard_pile = hromad
game_protocol_descriptor_of_boxes = krabíc
game_protocol_bonus_bag = [SK]brašn[SK]
game_protocol_bonus_globe = [SK]glóbus[SK]
game_protocol_descriptor_elephant = [SK]slona[SK]
game_protocol_descriptor_giraffe = [SK]žirafy[SK]
game_protocol_bonus_mask = [SK]mask[SK]
game_protocol_bonus_kimono = [SK]kimon[SK]
game_protocol_bonus_letter = [SK]dopis[SK]
game_protocol_descriptor_lion = [SK]lva[SK]
game_protocol_descriptor_with_shells = [SK]s mušlemi[SK]
game_protocol_bonus_stack = [SK]stoh[SK]
game_protocol_descriptor_of_books = [SK]knih[SK]
game_protocol_bonus_stand = [SK]stojan[SK]
game_protocol_descriptor_with_posters = [SK]s plakáty[SK]
game_protocol_descriptor_with_maps = [SK]s mapami[SK]
game_protocol_bonus_compass = [SK]kompas[SK]
game_protocol_bonus_hat = [SK]klobouk[SK]
game_protocol_bonus_bag = tašk
game_protocol_bonus_globe = glóbus
game_protocol_descriptor_elephant = slona
game_protocol_descriptor_giraffe = žirafy
game_protocol_bonus_mask = mask
game_protocol_bonus_kimono = kimon
game_protocol_bonus_letter = list
game_protocol_descriptor_in_packages = v balíčku
game_protocol_descriptor_lion = lva
game_protocol_descriptor_with_shells = mušličiek
game_protocol_descriptor_of_books = kníh
game_protocol_bonus_stand = stojan
game_protocol_descriptor_with_posters = na plagáty
game_protocol_bonus_table = stolík
game_protocol_descriptor_with_maps = s mapami
game_protocol_bonus_compass = kompas
game_protocol_bonus_hat = klobúk
game_protocol_wall = stene
......@@ -332,7 +334,7 @@ game_protocol_descriptor_green = zelen
game_protocol_descriptor_orange = oranžov
game_protocol_descriptor_white = biel
game_protocol_descriptor_yellow = žlt
game_protocol_decsriptor_brown = [SK]hněd[SK]
game_protocol_descriptor_brown = hned
game_protocol_descriptor_big = veľk
game_protocol_descriptor_small = mal
......@@ -358,10 +360,10 @@ game_protocol_descriptor_tin = cínov
game_protocol_descriptor_light = horiac
game_protocol_descriptor_light_off = zhasnut
game_protocol_descriptor_open = otvoren
game_protocol_descriptor_kabuki = [SK]kabuki[SK]
game_protocol_descriptor_africa = [SK]africk[SK]
game_protocol_descriptor_chinese = [SK]čínsk[SK]
game_protocol_descriptor_travel = [SK]cestovatelsk[SK]
game_protocol_descriptor_kabuki = kabuki
game_protocol_descriptor_africa = africk
game_protocol_descriptor_chinese = čínsk
game_protocol_descriptor_travel = cestovateľsk
#vzor pekny - singular
......
......@@ -390,6 +390,7 @@ public final class ProtocolAssets {
//////////////////////////// TEXT
public static final String BOX_TEXT = "game_protocol_hard_box";
public static final String BOX_S_TEXT = "game_protocol_hard_box_s";
public static final String FLASK_TEXT = "game_protocol_hard_flask";
public static final String INGREDIENT_TEXT = "game_protocol_hard_ingredient";
public static final String LIQUID_TEXT = "game_protocol_hard_liquid";
......@@ -441,7 +442,7 @@ public final class ProtocolAssets {
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 PILE_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";
public static final String CHINESE_VASE_CARD = CARDS_PATH + "chinese_vase";
......@@ -465,7 +466,7 @@ public final class ProtocolAssets {
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 PILE_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";
public static final String CHINESE_VASE_OBJECT = OBJECTS_PATH + "chinese_vase";
......@@ -479,10 +480,10 @@ public final class ProtocolAssets {
public static final String MASK_TEXT = "game_protocol_bonus_mask";
public static final String LETTER_TEXT = "game_protocol_bonus_letter";
public static final String KIMONO_TEXT = "game_protocol_bonus_kimono";
public static final String STACK_TEXT = "game_protocol_bonus_stack";
public static final String STAND_TEXT = "game_protocol_bonus_stand";
public static final String COMPASS_TEXT = "game_protocol_bonus_compass";
public static final String HAT_TEXT = "game_protocol_bonus_hat";
public static final String TABLE_B_TEXT = "game_protocol_bonus_table";
//////////////////////////// OBJECT DESCRIPTION
......@@ -493,4 +494,5 @@ public final class ProtocolAssets {
public static final String OF_BOOKS = "game_protocol_descriptor_of_books";
public static final String WITH_POSTERS = "game_protocol_descriptor_with_posters";
public static final String WITH_MAPS = "game_protocol_descriptor_with_maps";
public static final String IN_PACKAGES = "game_protocol_descriptor_in_packages";
}
......@@ -110,7 +110,7 @@ public enum GameObjectType implements TypeObjectDescriptor {
PEN (ProtocolAssets.PEN_CARD, ProtocolAssets.PEN_OBJECT, ProtocolAssets.PEN_TEXT, new float[]{0.4f,0.16f}, new float[]{0.5f, 0.5f}, null, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
PILE_OF_BOXES (ProtocolAssets.PILE_OF_BOXES_CARD, ProtocolAssets.PILE_OF_BOXES_OBJECT, ProtocolAssets.PILE_TEXT, new float[]{0.44f,0.047f}, null, null, new RoomPosition[]{RoomPosition.FLOOR}),
ROUND_FLASK (ProtocolAssets.ROUND_FLASK_CARD, ProtocolAssets.ROUND_FLASK_OBJECT, ProtocolAssets.FLASK_TEXT, new float[]{0.58f,0.136f}, new float[]{0.5f, 0.13f}, null, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
SMALL_BOX (ProtocolAssets.SMALL_BOX_CARD, ProtocolAssets.SMALL_BOX_OBJECT, ProtocolAssets.BOX_TEXT, new float[]{0.54f,0.17f}, new float[]{0.5f, 0.42f}, null, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
SMALL_BOX (ProtocolAssets.SMALL_BOX_CARD, ProtocolAssets.SMALL_BOX_OBJECT, ProtocolAssets.BOX_S_TEXT, new float[]{0.54f,0.17f}, new float[]{0.5f, 0.42f}, null, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
SMOKE_TUBE (ProtocolAssets.SMOKE_TUBE_CARD, ProtocolAssets.SMOKE_TUBE_OBJECT, ProtocolAssets.TUBE_TEXT, new float[]{0.358f,0.089f}, new float[]{0.358f,0.089f}, null, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
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}),
......@@ -132,9 +132,9 @@ public enum GameObjectType implements TypeObjectDescriptor {
SHELLS (ProtocolAssets.SHELLS_CARD, ProtocolAssets.SHELLS_OBJECT, ProtocolAssets.BOX_TEXT, new float[]{0.42f, 0.07f}, new float[]{0.5f, 0.5f}, null, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
SMALL_BOOK (ProtocolAssets.SMALL_BOOK_CARD, ProtocolAssets.SMALL_BOOK_OBJECT, ProtocolAssets.BOOK_TEXT, new float[]{0.57f, 0.1f}, new float[]{0.5f, 0.5f}, null, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
SMALL_GLOBE (ProtocolAssets.SMALL_GLOBE_CARD, ProtocolAssets.SMALL_GLOBE_OBJECT, ProtocolAssets.GLOBE_TEXT, new float[]{0.58f, 0.1f}, new float[]{0.56f, 0.12f}, null, 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.47f, 0.08f}, new float[]{0.45f, 0.3f}, null, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
PILE_OF_BOOKS (ProtocolAssets.PILE_OF_BOOKS_CARD, ProtocolAssets.PILE_OF_BOOKS_OBJECT, ProtocolAssets.PILE_TEXT, new float[]{0.47f, 0.08f}, new float[]{0.45f, 0.3f}, null, 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.54f, 0.04f}, new float[]{0.52f, 0.08f}, null, 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, 0.04f}, null, null, new RoomPosition[]{RoomPosition.FLOOR}),
TABLE_WITH_MAPS (ProtocolAssets.TABLE_WITH_MAPS_CARD, ProtocolAssets.TABLE_WITH_MAPS_OBJECT, ProtocolAssets.TABLE_B_TEXT, new float[]{0.5f, 0.04f}, null, null, new RoomPosition[]{RoomPosition.FLOOR}),
CHINESE_VASE (ProtocolAssets.CHINESE_VASE_CARD, ProtocolAssets.CHINESE_VASE_OBJECT, ProtocolAssets.VASE_TEXT, new float[]{0.5f, 0.06f}, new float[]{0.5f, 0.08f}, null, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
COMPASS (ProtocolAssets.COMPASS_CARD, ProtocolAssets.COMPASS_OBJECT, ProtocolAssets.COMPASS_TEXT, new float[]{0.5f, 0.1f}, new float[]{0.48f, 0.48f}, null, new RoomPosition[]{RoomPosition.FLOOR, RoomPosition.FURNITURE}),
TRAVEL_HAT (ProtocolAssets.TRAVEL_HAT_CARD, ProtocolAssets.TRAVEL_HAT_OBJECT, ProtocolAssets.HAT_TEXT, new float[]{0.62f, 0.41f}, null, new float[]{0.62f, 0.41f}, new RoomPosition[]{RoomPosition.WALL});
......
......@@ -244,7 +244,7 @@ public class LevelDefinition {
GameObjectType.SHELLS,
GameObjectType.SMALL_BOOK,
GameObjectType.SMALL_GLOBE,
GameObjectType.STACK_OF_BOOKS,
GameObjectType.PILE_OF_BOOKS,
GameObjectType.STAND_FOR_POSTER,
GameObjectType.TABLE_WITH_MAPS,
GameObjectType.CHINESE_VASE,
......
......@@ -122,7 +122,7 @@ public class CZProtocolGenerator extends ProtocolGenerator {
PEN (new CZObjectDescriptor(AbstractObjectDescriptor.Voice.N, AbstractObjectDescriptor.NounType.SINGULAR, null, null, CZObjectDescriptor.InflectionType.MESTO,null)),
PILE_OF_BOXES (new CZObjectDescriptor(AbstractObjectDescriptor.Voice.F, AbstractObjectDescriptor.NounType.SINGULAR, null, null, CZObjectDescriptor.InflectionType.ZENA, ProtocolAssets.OF_BOXES)),
ROUND_FLASK (new CZObjectDescriptor(AbstractObjectDescriptor.Voice.F, AbstractObjectDescriptor.NounType.SINGULAR, new AbstractObjectDescriptor.Adjective[]{AbstractObjectDescriptor.Adjective.ROUND}, CZObjectDescriptor.AdjectiveInflection.FM, CZObjectDescriptor.InflectionType.ZENA, null)),
SMALL_BOX (new CZObjectDescriptor(AbstractObjectDescriptor.Voice.F, AbstractObjectDescriptor.NounType.SINGULAR, new AbstractObjectDescriptor.Adjective[]{AbstractObjectDescriptor.Adjective.SMALL}, CZObjectDescriptor.AdjectiveInflection.FM, CZObjectDescriptor.InflectionType.RUZE, null)),
SMALL_BOX (new CZObjectDescriptor(AbstractObjectDescriptor.Voice.F, AbstractObjectDescriptor.NounType.SINGULAR, new AbstractObjectDescriptor.Adjective[]{AbstractObjectDescriptor.Adjective.SMALL}, CZObjectDescriptor.AdjectiveInflection.FM, CZObjectDescriptor.InflectionType.ZENA, null)),
SMOKE_TUBE (new CZObjectDescriptor(AbstractObjectDescriptor.Voice.F, AbstractObjectDescriptor.NounType.SINGULAR, new AbstractObjectDescriptor.Adjective[]{AbstractObjectDescriptor.Adjective.SMOKE}, CZObjectDescriptor.AdjectiveInflection.FJ, CZObjectDescriptor.InflectionType.ZENA, null)),
TUBE (new CZObjectDescriptor(AbstractObjectDescriptor.Voice.F, AbstractObjectDescriptor.NounType.SINGULAR, null, null, CZObjectDescriptor.InflectionType.ZENA, null)),
TUBES_IN_STAND (new CZObjectDescriptor(AbstractObjectDescriptor.Voice.F, AbstractObjectDescriptor.NounType.PLURAL, null, null, CZObjectDescriptor.InflectionType.ZENA, ProtocolAssets.IN_STAND)),
......@@ -138,13 +138,13 @@ public class CZProtocolGenerator extends ProtocolGenerator {
GRAY_BOOK (new CZObjectDescriptor(AbstractObjectDescriptor.Voice.F, AbstractObjectDescriptor.NounType.SINGULAR, new AbstractObjectDescriptor.Adjective[]{AbstractObjectDescriptor.Adjective.GRAY}, CZObjectDescriptor.AdjectiveInflection.FM, CZObjectDescriptor.InflectionType.ZENA, null)),
KABUKI (new CZObjectDescriptor(AbstractObjectDescriptor.Voice.F, AbstractObjectDescriptor.NounType.SINGULAR, new AbstractObjectDescriptor.Adjective[]{AbstractObjectDescriptor.Adjective.KABUKI}, CZObjectDescriptor.AdjectiveInflection.FM, CZObjectDescriptor.InflectionType.ZENA, null)),
KIMONO (new CZObjectDescriptor(AbstractObjectDescriptor.Voice.N, AbstractObjectDescriptor.NounType.SINGULAR, null, null, CZObjectDescriptor.InflectionType.MESTO,null)),
LETTERS (new CZObjectDescriptor(AbstractObjectDescriptor.Voice.M, AbstractObjectDescriptor.NounType.PLURAL, null, null, CZObjectDescriptor.InflectionType.HRAD, null)),
LETTERS (new CZObjectDescriptor(AbstractObjectDescriptor.Voice.M, AbstractObjectDescriptor.NounType.PLURAL, null, null, CZObjectDescriptor.InflectionType.HRAD, ProtocolAssets.IN_PACKAGES)),
LION (new CZObjectDescriptor(AbstractObjectDescriptor.Voice.F, AbstractObjectDescriptor.NounType.SINGULAR, null, null, CZObjectDescriptor.InflectionType.ZENA, ProtocolAssets.LION)),
MASK_AFRICA (new CZObjectDescriptor(AbstractObjectDescriptor.Voice.F, AbstractObjectDescriptor.NounType.SINGULAR, new AbstractObjectDescriptor.Adjective[]{AbstractObjectDescriptor.Adjective.AFRICA}, CZObjectDescriptor.AdjectiveInflection.FM, CZObjectDescriptor.InflectionType.ZENA, null)),
SHELLS (new CZObjectDescriptor(AbstractObjectDescriptor.Voice.F, AbstractObjectDescriptor.NounType.SINGULAR, null, null, CZObjectDescriptor.InflectionType.RUZE, ProtocolAssets.WITH_SHELLS)),
SMALL_BOOK (new CZObjectDescriptor(AbstractObjectDescriptor.Voice.F, AbstractObjectDescriptor.NounType.SINGULAR, new AbstractObjectDescriptor.Adjective[]{AbstractObjectDescriptor.Adjective.SMALL}, CZObjectDescriptor.AdjectiveInflection.FM, CZObjectDescriptor.InflectionType.ZENA, null)),
SMALL_GLOBE (new CZObjectDescriptor(AbstractObjectDescriptor.Voice.M, AbstractObjectDescriptor.NounType.SINGULAR, new AbstractObjectDescriptor.Adjective[]{AbstractObjectDescriptor.Adjective.SMALL}, CZObjectDescriptor.AdjectiveInflection.MM, CZObjectDescriptor.InflectionType.HRAD, null)),
STACK_OF_BOOKS (new CZObjectDescriptor(AbstractObjectDescriptor.Voice.M, AbstractObjectDescriptor.NounType.SINGULAR, null, null, CZObjectDescriptor.InflectionType.HRAD, ProtocolAssets.OF_BOOKS)),
PILE_OF_BOOKS (new CZObjectDescriptor(AbstractObjectDescriptor.Voice.F, AbstractObjectDescriptor.NounType.SINGULAR, null, null, CZObjectDescriptor.InflectionType.ZENA, ProtocolAssets.OF_BOOKS)),
STAND_FOR_POSTER (new CZObjectDescriptor(AbstractObjectDescriptor.Voice.M, AbstractObjectDescriptor.NounType.SINGULAR, null, null, CZObjectDescriptor.InflectionType.HRAD, ProtocolAssets.WITH_POSTERS)),
TABLE_WITH_MAPS (new CZObjectDescriptor(AbstractObjectDescriptor.Voice.M, AbstractObjectDescriptor.NounType.SINGULAR, null, null, CZObjectDescriptor.InflectionType.HRAD, ProtocolAssets.WITH_MAPS)),
CHINESE_VASE (new CZObjectDescriptor(AbstractObjectDescriptor.Voice.F, AbstractObjectDescriptor.NounType.SINGULAR, new AbstractObjectDescriptor.Adjective[]{AbstractObjectDescriptor.Adjective.CHINESE}, CZObjectDescriptor.AdjectiveInflection.FM, CZObjectDescriptor.InflectionType.ZENA, null)),
......
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