diff --git a/core/assets/common/game/crimescene/common/gfx/actioncards/hard/level3_4/keys_fall.png b/core/assets/common/game/crimescene/common/gfx/actioncards/hard/level3_4/keys.png
similarity index 100%
rename from core/assets/common/game/crimescene/common/gfx/actioncards/hard/level3_4/keys_fall.png
rename to core/assets/common/game/crimescene/common/gfx/actioncards/hard/level3_4/keys.png
diff --git a/core/assets/common/game/crimescene/common/gfx/gameobjects/hard/level3_4/keys_fall.png b/core/assets/common/game/crimescene/common/gfx/gameobjects/hard/level3_4/keys.png
similarity index 100%
rename from core/assets/common/game/crimescene/common/gfx/gameobjects/hard/level3_4/keys_fall.png
rename to core/assets/common/game/crimescene/common/gfx/gameobjects/hard/level3_4/keys.png
diff --git a/core/assets/common/game/crimescene/common/sfx/common/clock_one_three.mp3 b/core/assets/common/game/crimescene/common/sfx/common/clock_one_three.mp3
index ac3d448d13671b3c565c107f0c9aab176af27c72..51564367f519b0512d2f63a832314d602ef9ec36 100644
Binary files a/core/assets/common/game/crimescene/common/sfx/common/clock_one_three.mp3 and b/core/assets/common/game/crimescene/common/sfx/common/clock_one_three.mp3 differ
diff --git a/core/assets/common/game/crimescene/common/sfx/easy/level3/drawer.mp3 b/core/assets/common/game/crimescene/common/sfx/easy/level3/drawer.mp3
index eccc8ab69ea4ac24e971e0d0217084ce6b9a18e2..449a6948da6bc1d05ab298c9c9af7efac24105d6 100644
Binary files a/core/assets/common/game/crimescene/common/sfx/easy/level3/drawer.mp3 and b/core/assets/common/game/crimescene/common/sfx/easy/level3/drawer.mp3 differ
diff --git a/core/assets/common/game/crimescene/common/sfx/easy/level4/tinkle_toy.mp3 b/core/assets/common/game/crimescene/common/sfx/easy/level4/tinkle_toy.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..cefb09d83f9a076c48c479f01b288e12914c5a65
Binary files /dev/null and b/core/assets/common/game/crimescene/common/sfx/easy/level4/tinkle_toy.mp3 differ
diff --git a/core/assets/common/game/crimescene/common/sfx/hard/level1_2/phone_hangup.mp3 b/core/assets/common/game/crimescene/common/sfx/hard/level1_2/phone_hangup.mp3
index 9f32b14e3db79f72f20ffc1001a4be790d447eb8..68a0b24679ea23c1a4dded2312d195bc4d4a02f8 100644
Binary files a/core/assets/common/game/crimescene/common/sfx/hard/level1_2/phone_hangup.mp3 and b/core/assets/common/game/crimescene/common/sfx/hard/level1_2/phone_hangup.mp3 differ
diff --git a/core/assets/common/game/crimescene/common/sfx/hard/level1_2/phone_talk.mp3 b/core/assets/common/game/crimescene/common/sfx/hard/level1_2/phone_talk.mp3
index d8ad060203467297660498baa0848e2f8d8a9ee1..403c1e80a9b930a44cee27c559415f04b3e3ca5a 100644
Binary files a/core/assets/common/game/crimescene/common/sfx/hard/level1_2/phone_talk.mp3 and b/core/assets/common/game/crimescene/common/sfx/hard/level1_2/phone_talk.mp3 differ
diff --git a/core/assets/common/game/crimescene/common/sfx/hard/level1_2/stamp.mp3 b/core/assets/common/game/crimescene/common/sfx/hard/level1_2/stamp.mp3
index 8cd04aae69f19eed756abe43643bd580e7225c46..b4444ee1ef2decbb85d80ee740279478cd9a7438 100644
Binary files a/core/assets/common/game/crimescene/common/sfx/hard/level1_2/stamp.mp3 and b/core/assets/common/game/crimescene/common/sfx/hard/level1_2/stamp.mp3 differ
diff --git a/core/assets/common/game/crimescene/common/sfx/hard/level3_4/key_in_lock.mp3 b/core/assets/common/game/crimescene/common/sfx/hard/level3_4/key_in_lock.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..344aa31a21b6604eef54820d0091da6ec395a547
Binary files /dev/null and b/core/assets/common/game/crimescene/common/sfx/hard/level3_4/key_in_lock.mp3 differ
diff --git a/core/assets/common/game/crimescene/common/sfx/hard/level3_4/keys.mp3 b/core/assets/common/game/crimescene/common/sfx/hard/level3_4/keys.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..c44b23b0ee7f7a6498e6fbbf5a9cd8ea8c394151
Binary files /dev/null and b/core/assets/common/game/crimescene/common/sfx/hard/level3_4/keys.mp3 differ
diff --git a/core/assets/common/game/crimescene/common/sfx/hard/level3_4/rod.mp3 b/core/assets/common/game/crimescene/common/sfx/hard/level3_4/rod.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..a8650ce0cc6e49fb3354f90162d3ca5ad0de856c
Binary files /dev/null and b/core/assets/common/game/crimescene/common/sfx/hard/level3_4/rod.mp3 differ
diff --git a/core/assets/common/game/crimescene/common/sfx/hard/level3_4/safe_close.mp3 b/core/assets/common/game/crimescene/common/sfx/hard/level3_4/safe_close.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..1f088b85f7b37d2d583531fb3fdd0f3c47a38783
Binary files /dev/null and b/core/assets/common/game/crimescene/common/sfx/hard/level3_4/safe_close.mp3 differ
diff --git a/core/assets/common/game/crimescene/common/sfx/medium/level1_2/ball_kick.mp3 b/core/assets/common/game/crimescene/common/sfx/medium/level1_2/ball_kick.mp3
index 5259cd36bedd81776c22bf6eb2b6c1deba8d6730..94a274a4d29a708adeabe3cefd494c2eafb6fdba 100644
Binary files a/core/assets/common/game/crimescene/common/sfx/medium/level1_2/ball_kick.mp3 and b/core/assets/common/game/crimescene/common/sfx/medium/level1_2/ball_kick.mp3 differ
diff --git a/core/src/cz/nic/tablexia/game/games/crime_scene/assets/CrimeSceneAssets.java b/core/src/cz/nic/tablexia/game/games/crime_scene/assets/CrimeSceneAssets.java
index 5a8eaf721f9d1a7bfc1be6aa30033f93b74bf5c5..2b6b27ac2373499e1b153927b1c423a38c7cdfcc 100644
--- a/core/src/cz/nic/tablexia/game/games/crime_scene/assets/CrimeSceneAssets.java
+++ b/core/src/cz/nic/tablexia/game/games/crime_scene/assets/CrimeSceneAssets.java
@@ -96,7 +96,7 @@ public class CrimeSceneAssets {
public static final String CREAK_FLOOR_2_ACTION = GFX_PATH + ACTION_CARDS + EASY_PATH + LEVEL_4 + "creak_floor_two";
public static final String MARBLE_ACTION = GFX_PATH + ACTION_CARDS + EASY_PATH + LEVEL_4 + "marble";
public static final String ROCKING_CHAIR_ACTION = GFX_PATH + ACTION_CARDS + EASY_PATH + LEVEL_4 + "rocking_chair";
-// public static final String TINKLE_TOY_ACTION = GFX_PATH + ACTION_CARDS + EASY_PATH + LEVEL_4 + "tinkle_toy";
+ public static final String TINKLE_TOY_ACTION = GFX_PATH + ACTION_CARDS + EASY_PATH + LEVEL_4 + "tinkle_toy";
public static final String CLOCK_1_ACTION = GFX_PATH + ACTION_CARDS + EASY_PATH + LEVEL_4 + "clock_one";
@@ -160,7 +160,7 @@ public class CrimeSceneAssets {
public static final String CREAK_FLOOR_2_OBJECT = GFX_PATH + GAME_OBJECTS + EASY_PATH + LEVEL_4 + "creak_floor_two";
public static final String MARBLE_OBJECT = GFX_PATH + GAME_OBJECTS + EASY_PATH + LEVEL_4 + "marble";
public static final String ROCKING_CHAIR_OBJECT = GFX_PATH + GAME_OBJECTS + EASY_PATH + LEVEL_4 + "rocking_chair";
-// public static final String TINKLE_TOY_OBJECT = GFX_PATH + GAME_OBJECTS + EASY_PATH + LEVEL_4 + "tinkle_toy";
+ public static final String TINKLE_TOY_OBJECT = GFX_PATH + GAME_OBJECTS + EASY_PATH + LEVEL_4 + "tinkle_toy";
public static final String CLOCK_1_OBJECT = GFX_PATH + GAME_OBJECTS + EASY_PATH + LEVEL_4 + "clock_one";
public static final String CURTAIN_1_OBJECT = GFX_PATH + GAME_OBJECTS + EASY_PATH + COMMON + "curtain_one";
@@ -202,12 +202,10 @@ public class CrimeSceneAssets {
public static final String POURING_RICE_SOUND = COMMON + SFX_PATH + EASY_PATH + LEVEL_2 + "pouring_rice.mp3";
public static final String SIDEBOARD_SOUND = COMMON + SFX_PATH + EASY_PATH + LEVEL_2 + "sideboard.mp3";
-
public static final String DRAWER_SOUND = COMMON + SFX_PATH + EASY_PATH + LEVEL_3 + "drawer.mp3";
public static final String MIRROR_SOUND = COMMON + SFX_PATH + EASY_PATH + LEVEL_3 + "mirror.mp3";
public static final String MUSIC_BOX_SOUND = COMMON + SFX_PATH + EASY_PATH + LEVEL_3 + "music_box.mp3";
-
public static final String PILLOW_SOUND = COMMON + SFX_PATH + EASY_PATH + LEVEL_3 + "pillow.mp3";
public static final String SHOWER_SOUND = COMMON + SFX_PATH + EASY_PATH + LEVEL_3 + "shower.mp3";
public static final String TEETH_SOUND = COMMON + SFX_PATH + EASY_PATH + LEVEL_3 + "teeth.mp3";
@@ -219,7 +217,7 @@ public class CrimeSceneAssets {
public static final String CREAK_FLOOR_2_SOUND = COMMON + SFX_PATH + EASY_PATH + LEVEL_4 + "creak_floor_two.mp3";
public static final String MARBLE_SOUND = COMMON + SFX_PATH + EASY_PATH + LEVEL_4 + "marble.mp3";
public static final String ROCKING_CHAIR_SOUND = COMMON + SFX_PATH + EASY_PATH + LEVEL_4 + "rocking_chair.mp3";
-// public static final String TINKLE_TOY_SOUND = COMMON + SFX_PATH + EASY_PATH + LEVEL_4 + "tinkle_toy.mp3";
+ public static final String TINKLE_TOY_SOUND = COMMON + SFX_PATH + EASY_PATH + LEVEL_4 + "tinkle_toy.mp3";
public static final String STAIRS_1_SOUND = COMMON + SFX_PATH + EASY_PATH + COMMON + "stairs_one.mp3";
public static final String BOOK_FALL_SOUND = COMMON + SFX_PATH + EASY_PATH + COMMON + "book_fall.mp3";
@@ -260,7 +258,6 @@ public class CrimeSceneAssets {
public static final String STONE_ACTION = GFX_PATH + ACTION_CARDS + MEDIUM_PATH + COMMON + "stone";
public static final String TOY_SQUEAKY_ACTION = GFX_PATH + ACTION_CARDS + MEDIUM_PATH + COMMON + "toy_squeaky";
-
//===objects===
public static final String APPLE_1_OBJECT = GFX_PATH + GAME_OBJECTS + MEDIUM_PATH + LEVEL_1_2 + "apple_one";
@@ -309,7 +306,6 @@ public class CrimeSceneAssets {
public static final String ROOSTER_SQUAWK_SOUND = COMMON + SFX_PATH + MEDIUM_PATH + LEVEL_1_2 + "rooster_squawk.mp3";
public static final String SHOVEL_DIGGING_SOUND = COMMON + SFX_PATH + MEDIUM_PATH + LEVEL_1_2 + "shovel_digging.mp3";
public static final String WALK_GRAVEL_SOUND = COMMON + SFX_PATH + MEDIUM_PATH + LEVEL_1_2 + "walk_gravel.mp3";
-// public static final String WALK_SAND_SOUND = COMMON + SFX_PATH + MEDIUM_PATH + LEVEL_1_2 + "walk_sand.mp3";
public static final String WOOD_CHOP_SOUND = COMMON + SFX_PATH + MEDIUM_PATH + LEVEL_1_2 + "wood_chop.mp3";
public static final String DUSTBIN_COVER_SOUND = COMMON + SFX_PATH + MEDIUM_PATH + LEVEL_3_4 + "dustbin_cover.mp3";
@@ -347,7 +343,6 @@ public class CrimeSceneAssets {
public static final String CLOCK_2_ACTION = GFX_PATH + ACTION_CARDS + HARD_PATH + LEVEL_1_2 + "clock_two";
public static final String DOOR_2_ACTION = GFX_PATH + ACTION_CARDS + HARD_PATH + LEVEL_1_2 + "door_two";
-
public static final String BOOKS_ACTION = GFX_PATH + ACTION_CARDS + HARD_PATH + LEVEL_2 + "books";
public static final String CURTAIN_2_ACTION = GFX_PATH + ACTION_CARDS + HARD_PATH + LEVEL_2 + "curtain_two";
public static final String PAPER_2_ACTION = GFX_PATH + ACTION_CARDS + HARD_PATH + LEVEL_2 + "paper_two";
@@ -362,11 +357,11 @@ public class CrimeSceneAssets {
// public static final String BRICK_ACTION = GFX_PATH + ACTION_CARDS + HARD_PATH + LEVEL_3_4 + "brick";
public static final String CREAKING_CHAIR_ACTION = GFX_PATH + ACTION_CARDS + HARD_PATH + LEVEL_3_4 + "creaking_chair";
// public static final String COINS_2_ACTION = GFX_PATH + ACTION_CARDS + HARD_PATH + LEVEL_3_4 + "coins_two";
-// public static final String KEY_IN_LOCK_ACTION = GFX_PATH + ACTION_CARDS + HARD_PATH + LEVEL_3_4 + "key_in_lock";
-// public static final String KEYS_FALL_ACTION = GFX_PATH + ACTION_CARDS + HARD_PATH + LEVEL_3_4 + "keys_fall";
-// public static final String ROD_ACTION = GFX_PATH + ACTION_CARDS + HARD_PATH + LEVEL_3_4 + "rod";
+ public static final String KEY_IN_LOCK_ACTION = GFX_PATH + ACTION_CARDS + HARD_PATH + LEVEL_3_4 + "key_in_lock";
+ public static final String KEYS_ACTION = GFX_PATH + ACTION_CARDS + HARD_PATH + LEVEL_3_4 + "keys";
+ public static final String ROD_ACTION = GFX_PATH + ACTION_CARDS + HARD_PATH + LEVEL_3_4 + "rod";
// public static final String SAFE_CLICK_ACTION = GFX_PATH + ACTION_CARDS + HARD_PATH + LEVEL_3_4 + "safe_click";
-// public static final String SAFE_CLOSE_ACTION = GFX_PATH + ACTION_CARDS + HARD_PATH + LEVEL_3_4 + "safe_close";
+ public static final String SAFE_CLOSE_ACTION = GFX_PATH + ACTION_CARDS + HARD_PATH + LEVEL_3_4 + "safe_close";
// public static final String SAFE_CREAK_ACTION = GFX_PATH + ACTION_CARDS + HARD_PATH + LEVEL_3_4 + "safe_creak";
public static final String STEPS_2_ACTION = GFX_PATH + ACTION_CARDS + HARD_PATH + LEVEL_3_4 + "steps_two";
public static final String CLOCK_3_ACTION = GFX_PATH + ACTION_CARDS + HARD_PATH + LEVEL_3_4 + "clock_three";
@@ -410,11 +405,11 @@ public class CrimeSceneAssets {
// public static final String BRICK_OBJECT = GFX_PATH + GAME_OBJECTS + HARD_PATH + LEVEL_3_4 + "brick";
public static final String CREAKING_CHAIR_OBJECT = GFX_PATH + GAME_OBJECTS + HARD_PATH + LEVEL_3_4 + "creaking_chair";
// public static final String COINS_2_OBJECT = GFX_PATH + GAME_OBJECTS + HARD_PATH + LEVEL_3_4 + "coins_two";
-// public static final String KEY_IN_LOCK_OBJECT = GFX_PATH + GAME_OBJECTS + HARD_PATH + LEVEL_3_4 + "key_in_lock";
-// public static final String KEYS_FALL_OBJECT = GFX_PATH + GAME_OBJECTS + HARD_PATH + LEVEL_3_4 + "keys_fall";
-// public static final String ROD_OBJECT = GFX_PATH + GAME_OBJECTS + HARD_PATH + LEVEL_3_4 + "rod";
+ public static final String KEY_IN_LOCK_OBJECT = GFX_PATH + GAME_OBJECTS + HARD_PATH + LEVEL_3_4 + "key_in_lock";
+ public static final String KEYS_OBJECT = GFX_PATH + GAME_OBJECTS + HARD_PATH + LEVEL_3_4 + "keys";
+ public static final String ROD_OBJECT = GFX_PATH + GAME_OBJECTS + HARD_PATH + LEVEL_3_4 + "rod";
// public static final String SAFE_CLICK_OBJECT = GFX_PATH + GAME_OBJECTS + HARD_PATH + LEVEL_3_4 + "safe_click";
-// public static final String SAFE_CLOSE_OBJECT = GFX_PATH + GAME_OBJECTS + HARD_PATH + LEVEL_3_4 + "safe_close";
+ public static final String SAFE_CLOSE_OBJECT = GFX_PATH + GAME_OBJECTS + HARD_PATH + LEVEL_3_4 + "safe_close";
// public static final String SAFE_CREAK_OBJECT = GFX_PATH + GAME_OBJECTS + HARD_PATH + LEVEL_3_4 + "safe_creak";
public static final String STEPS_2_OBJECT = GFX_PATH + GAME_OBJECTS + HARD_PATH + LEVEL_3_4 + "steps_two";
public static final String CLOCK_3_OBJECT = GFX_PATH + GAME_OBJECTS + HARD_PATH + LEVEL_3_4 + "clock_three";
@@ -426,7 +421,6 @@ public class CrimeSceneAssets {
public static final String STAIRS_2_OBJECT = GFX_PATH + GAME_OBJECTS + HARD_PATH + COMMON + "stairs_two";
-
//===sounds===
public static final String ALARM_SOUND = COMMON + SFX_PATH + HARD_PATH + LEVEL_1 + "alarm.mp3";
@@ -451,11 +445,11 @@ public class CrimeSceneAssets {
public static final String CREAKING_CHAIR_SOUND = COMMON + SFX_PATH + HARD_PATH + LEVEL_3_4 + "creaking_chair.mp3";
// public static final String COINS_2_SOUND = COMMON + SFX_PATH + HARD_PATH + LEVEL_3_4 + "coins_two.mp3";
public static final String COINS_3_SOUND = COMMON + SFX_PATH + HARD_PATH + LEVEL_3_4 + "coins_three.mp3";
-// public static final String KEY_IN_LOCK_SOUND = COMMON + SFX_PATH + HARD_PATH + LEVEL_3_4 + "key_in_lock.mp3";
-// public static final String KEYS_FALL_SOUND = COMMON + SFX_PATH + HARD_PATH + LEVEL_3_4 + "keys_fall.mp3";
-// public static final String ROD_SOUND = COMMON + SFX_PATH + HARD_PATH + LEVEL_3_4 + "rod.mp3";
+ public static final String KEY_IN_LOCK_SOUND = COMMON + SFX_PATH + HARD_PATH + LEVEL_3_4 + "key_in_lock.mp3";
+ public static final String KEYS_SOUND = COMMON + SFX_PATH + HARD_PATH + LEVEL_3_4 + "keys.mp3";
+ public static final String ROD_SOUND = COMMON + SFX_PATH + HARD_PATH + LEVEL_3_4 + "rod.mp3";
// public static final String SAFE_CLICK_SOUND = COMMON + SFX_PATH + HARD_PATH + LEVEL_3_4 + "safe_click.mp3";
-// public static final String SAFE_CLOSE_SOUND = COMMON + SFX_PATH + HARD_PATH + LEVEL_3_4 + "safe_close.mp3";
+ public static final String SAFE_CLOSE_SOUND = COMMON + SFX_PATH + HARD_PATH + LEVEL_3_4 + "safe_close.mp3";
// public static final String SAFE_CREAK_SOUND = COMMON + SFX_PATH + HARD_PATH + LEVEL_3_4 + "safe_creak.mp3";
public static final String DOOR_3_SOUND = COMMON + SFX_PATH + HARD_PATH + LEVEL_3_4 + "door_three.mp3";
@@ -465,7 +459,6 @@ public class CrimeSceneAssets {
public static final String STAIRS_2_SOUND = COMMON + SFX_PATH + HARD_PATH + COMMON + "stairs_two.mp3";
public static final String STEPS_SOUND = COMMON + SFX_PATH + HARD_PATH + COMMON + "steps.mp3";
-
// === COMMON ===
public static final String CAT_HISS_OBJECT = GFX_PATH + GAME_OBJECTS + COMMON + "cat_hiss";
@@ -525,6 +518,4 @@ public class CrimeSceneAssets {
public static final String SCORE_RATING_1 = SFX_PATH + "score_rating_1.mp3";
public static final String SCORE_RATING_2 = SFX_PATH + "score_rating_2.mp3";
public static final String SCORE_RATING_3 = SFX_PATH + "score_rating_3.mp3";
-
-
-}
+}
\ No newline at end of file
diff --git a/core/src/cz/nic/tablexia/game/games/crime_scene/gameobject/GameObjectType.java b/core/src/cz/nic/tablexia/game/games/crime_scene/gameobject/GameObjectType.java
index 251796c41a1f2438d7d97766515798ab35e94fc3..1b1657ee383984b4e18553e81114410470e23f52 100644
--- a/core/src/cz/nic/tablexia/game/games/crime_scene/gameobject/GameObjectType.java
+++ b/core/src/cz/nic/tablexia/game/games/crime_scene/gameobject/GameObjectType.java
@@ -10,8 +10,6 @@ import cz.nic.tablexia.game.games.crime_scene.assets.CrimeSceneAssets;
*/
public enum GameObjectType implements AssetDescription {
- //TODO fix - find places for some items (after new background is done)
-
// ===== EASY ====
BOOK_BROWSE(0, CrimeSceneAssets.BOOK_BROWSE_OBJECT, CrimeSceneAssets.BOOK_BROWSE_ACTION, CrimeSceneAssets.BOOK_BROWSE_SOUND),
BOOK_FALL_1(1, CrimeSceneAssets.BOOK_FALL_1_OBJECT, CrimeSceneAssets.BOOK_FALL_1_ACTION, CrimeSceneAssets.BOOK_FALL_SOUND),
@@ -136,12 +134,18 @@ public enum GameObjectType implements AssetDescription {
CREAKING_CHAIR(114, CrimeSceneAssets.CREAKING_CHAIR_OBJECT, CrimeSceneAssets.CREAKING_CHAIR_ACTION, CrimeSceneAssets.CREAKING_CHAIR_SOUND),
CLOCK_3(115, CrimeSceneAssets.CLOCK_3_OBJECT, CrimeSceneAssets.CLOCK_3_ACTION, CrimeSceneAssets.CLOCK_1_3_SOUND),
DRIPPING_2(116,CrimeSceneAssets.DRIPPING_2_OBJECT,CrimeSceneAssets.DRIPPING_2_ACTION,CrimeSceneAssets.DRIPPING_2_SOUND),
- MOUSE_3(117,CrimeSceneAssets.MOUSE_3_OBJECT,CrimeSceneAssets.MOUSE_1_2_3_ACTION,CrimeSceneAssets.MOUSE_3_SOUND);
+ MOUSE_3(117,CrimeSceneAssets.MOUSE_3_OBJECT,CrimeSceneAssets.MOUSE_1_2_3_ACTION,CrimeSceneAssets.MOUSE_3_SOUND),
+
+ //added later
+ TINKLE_TOY(118, CrimeSceneAssets.TINKLE_TOY_OBJECT, CrimeSceneAssets.TINKLE_TOY_ACTION, CrimeSceneAssets.TINKLE_TOY_SOUND),
+ KEY_IN_LOCK(119, CrimeSceneAssets.KEY_IN_LOCK_OBJECT, CrimeSceneAssets.KEY_IN_LOCK_ACTION, CrimeSceneAssets.KEY_IN_LOCK_SOUND),
+ KEYS(120, CrimeSceneAssets.KEYS_OBJECT, CrimeSceneAssets.KEYS_ACTION, CrimeSceneAssets.KEYS_SOUND),
+ SAFE_CLOSE(121, CrimeSceneAssets.SAFE_CLOSE_OBJECT, CrimeSceneAssets.SAFE_CLOSE_ACTION, CrimeSceneAssets.SAFE_CLOSE_SOUND),
+ ROD(122, CrimeSceneAssets.ROD_OBJECT, CrimeSceneAssets.ROD_ACTION, CrimeSceneAssets.ROD_SOUND);
//TODO add sounds
- // TINKLE_TOY(50, CrimeSceneAssets.TINKLE_TOY_OBJECT, CrimeSceneAssets.TINKLE_TOY_ACTION, CrimeSceneAssets.TINKLE_TOY_SOUND),
// COINS_2(76,CrimeSceneAssets.COINS_2_OBJECT,CrimeSceneAssets.COINS_2_ACTION,CrimeSceneAssets.COINS_2_SOUND),
- // BARS, BENCH, BRICK, KEY_IN_LOCK, KEY_FALLS, SAFE_CLICK, SAFE_CLOSE, SAFE_CREAK
+ // BARS, BENCH, BRICK, SAFE_CLICK, SAFE_CREAK
private int actionNumber;
private String gameObjectTexturePath;
diff --git a/core/src/cz/nic/tablexia/game/games/crime_scene/model/LevelDefinition.java b/core/src/cz/nic/tablexia/game/games/crime_scene/model/LevelDefinition.java
index 526c6df07707e0adc189f8b02ff070d2bd8de192..22912fe93b08bcf1f105a985a8de5e05b6a6015c 100644
--- a/core/src/cz/nic/tablexia/game/games/crime_scene/model/LevelDefinition.java
+++ b/core/src/cz/nic/tablexia/game/games/crime_scene/model/LevelDefinition.java
@@ -159,6 +159,7 @@ public class LevelDefinition {
levelsDefinition[3][GameObjectType.MARBLE.getActionNumber()] = new Position(400,200);
levelsDefinition[3][GameObjectType.MOUSE_1.getActionNumber()] = new Position(50,230);
levelsDefinition[3][GameObjectType.ROCKING_CHAIR.getActionNumber()] = new Position(400,300);
+ levelsDefinition[3][GameObjectType.TINKLE_TOY.getActionNumber()] = new Position(200,250);
//common
levelsDefinition[3][GameObjectType.CAT_HISS.getActionNumber()] = new Position(300,150);
levelsDefinition[3][GameObjectType.CAT_MEOW.getActionNumber()] = new Position(475,150);
@@ -305,31 +306,33 @@ public class LevelDefinition {
levelsDefinition[9][GameObjectType.STAIRS_2.getActionNumber()] = new Position(700,320);
//HARD 3
- levelsDefinition[10][GameObjectType.SMALL_WINDOW.getActionNumber()] = new Position(470,450);
+ levelsDefinition[10][GameObjectType.SMALL_WINDOW.getActionNumber()] = new Position(450,450);
//common 3,4
- levelsDefinition[10][GameObjectType.DOOR_3.getActionNumber()] = new Position(100,270);
+ levelsDefinition[10][GameObjectType.DOOR_3.getActionNumber()] = new Position(150,300);
levelsDefinition[10][GameObjectType.STAIRS_2.getActionNumber()] = new Position(310,297);
levelsDefinition[10][GameObjectType.COINS_3.getActionNumber()] = new Position(600,200);
levelsDefinition[10][GameObjectType.STEPS_2.getActionNumber()] = new Position(450,120);
levelsDefinition[10][GameObjectType.CREAKING_CHAIR.getActionNumber()] = new Position(300,50);
- levelsDefinition[10][GameObjectType.CLOCK_3.getActionNumber()] = new Position(30,390);
- //TODO remove temporary objects
- levelsDefinition[10][GameObjectType.SAFE_1.getActionNumber()] = new Position(470,270);
- levelsDefinition[10][GameObjectType.PEN_2.getActionNumber()] = new Position(380,200);
+ levelsDefinition[10][GameObjectType.CLOCK_3.getActionNumber()] = new Position(530,495);
+ levelsDefinition[10][GameObjectType.KEYS.getActionNumber()] = new Position(400,230);
+ levelsDefinition[10][GameObjectType.KEY_IN_LOCK.getActionNumber()] = new Position(50,330);
+ levelsDefinition[10][GameObjectType.ROD.getActionNumber()] = new Position(200,200);
+ levelsDefinition[10][GameObjectType.SAFE_CLOSE.getActionNumber()] = new Position(437,299);
//HARD 4
levelsDefinition[11][GameObjectType.DRIPPING_2.getActionNumber()] = new Position(200,200);
levelsDefinition[11][GameObjectType.MOUSE_3.getActionNumber()] = new Position(150,225);
//common 3,4
- levelsDefinition[11][GameObjectType.DOOR_3.getActionNumber()] = new Position(100,270);
+ levelsDefinition[11][GameObjectType.DOOR_3.getActionNumber()] = new Position(120,285);
levelsDefinition[11][GameObjectType.STAIRS_2.getActionNumber()] = new Position(290,265);
- levelsDefinition[11][GameObjectType.COINS_3.getActionNumber()] = new Position(600,200);
+ levelsDefinition[11][GameObjectType.COINS_3.getActionNumber()] = new Position(670,200);
levelsDefinition[11][GameObjectType.STEPS_2.getActionNumber()] = new Position(450,120);
levelsDefinition[11][GameObjectType.CREAKING_CHAIR.getActionNumber()] = new Position(300,50);
- levelsDefinition[11][GameObjectType.CLOCK_3.getActionNumber()] = new Position(30,390);
- //TODO remove temporary objects
- levelsDefinition[11][GameObjectType.SAFE_1.getActionNumber()] = new Position(470,270);
- levelsDefinition[11][GameObjectType.PEN_2.getActionNumber()] = new Position(380,200);
+ levelsDefinition[11][GameObjectType.CLOCK_3.getActionNumber()] = new Position(530,500);
+ levelsDefinition[11][GameObjectType.KEYS.getActionNumber()] = new Position(400,210);
+ levelsDefinition[11][GameObjectType.KEY_IN_LOCK.getActionNumber()] = new Position(30,330);
+ levelsDefinition[11][GameObjectType.ROD.getActionNumber()] = new Position(570,250);
+ levelsDefinition[11][GameObjectType.SAFE_CLOSE.getActionNumber()] = new Position(437,298);
}
//TODO optimize