Commit 3e88a757 authored by Matyáš Latner's avatar Matyáš Latner

Merge branch 'feature-crimescenegame-devel' into 'V3.3'

#571 Added new objects, fixed and changed some sounds



See merge request !462
parents ce9eae66 02c8c6a5
......@@ -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;
......
......@@ -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
......
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