Merge pull request 'feature/props-ho' (#37) from feature/props-ho into dev

Reviewed-on: Athena/game-source#37

assets/props/rock floor/ground_library.tres

@@ -1,9 +1,9 @@
 [gd_resource type="MeshLibrary" load_steps=17 format=2]
 
 [ext_resource path="res://assets/materials/gray.tres" type="Material" id=1]
-[ext_resource path="res://assets/props/book/materials/MAT_book.material" type="Material" id=2]
+[ext_resource path="res://assets/props/book/materials/MA_book.material" type="Material" id=2]
-[ext_resource path="res://assets/props/table/materials/table.material" type="Material" id=3]
+[ext_resource path="res://assets/props/table/materials/MA_table.material" type="Material" id=3]
-[ext_resource path="res://assets/props/rock floor/materials/rock_floor.material" type="Material" id=4]
+[ext_resource path="res://assets/props/rock floor/materials/MA_rock_floor.material" type="Material" id=4]
 
 [sub_resource type="CubeMesh" id=1]
 material = ExtResource( 1 )

developers/aurelien/CheckLightmap.tscn

@@ -13,7 +13,7 @@
 [ext_resource path="res://assets/props/candle/sm_candle_top.mesh" type="ArrayMesh" id=12]
 [ext_resource path="res://assets/props/godet/sm_godet.mesh" type="ArrayMesh" id=13]
 [ext_resource path="res://assets/props/growler/sm_growler.mesh" type="ArrayMesh" id=14]
-[ext_resource path="res://assets/props/parchment/sm_paper_parcment.mesh" type="ArrayMesh" id=15]
+[ext_resource path="res://assets/props/parchment/sm_paper_parchment.mesh" type="ArrayMesh" id=15]
 [ext_resource path="res://assets/props/parchment/sm_wood_parchment.mesh" type="ArrayMesh" id=16]
 [ext_resource path="res://assets/props/rock floor/sm_floor.mesh" type="ArrayMesh" id=17]
 [ext_resource path="res://assets/props/stool b/sm_stool_b.mesh" type="ArrayMesh" id=18]

scenes/levels/warcraft/WarCraft.gd

@@ -9,11 +9,102 @@ var gyroscope_value_old = Vector3(0, 0, 0)
 
 onready var meshes = {
 	"dagger": {
-		"mesh": $"Main Scene Props/dagger",
+		"mesh": $"Hidden Objects Items/dagger",
 		"value": 0.0,
 		"label": "Dagger",
 		"lock": false,
 		"tick_reference": null
+	},
+	"fiole1": {
+		"mesh": $"Hidden Objects Items/Fioles x3/sm_fiole1",
+		"value": 0.0,
+		"label": "Fiole",
+		"lock": false,
+		"tick_reference": null
+	},
+	"fiole2": {
+		"mesh": $"Hidden Objects Items/Fioles x3/sm_fiole2",
+		"value": 0.0,
+		"label": "Fiole",
+		"lock": false,
+		"tick_reference": null
+	},
+	"fiole3": {
+		"mesh": $"Hidden Objects Items/Fioles x3/sm_fiole_socle/sm_fiole3",
+		"value": 0.0,
+		"label": "Fiole",
+		"lock": false,
+		"tick_reference": null
+	},
+	"spyglass": {
+		"mesh": $"Hidden Objects Items/sm_spyglass",
+		"value": 0.0,
+		"label": "Spyglass",
+		"lock": false,
+		"tick_reference": null
+	},
+	"coin1": {
+		"mesh": $"Hidden Objects Items/golds/sm_stackgold_1",
+		"value": 0.0,
+		"label": "Coins",
+		"lock": false,
+		"tick_reference": null
+	},
+	"coin2": {
+		"mesh": $"Hidden Objects Items/golds/sm_stackgold_2",
+		"value": 0.0,
+		"label": "Coins",
+		"lock": false,
+		"tick_reference": null
+	},
+	"coin3": {
+		"mesh": $"Hidden Objects Items/golds/sm_stackgold_3",
+		"value": 0.0,
+		"label": "Coins",
+		"lock": false,
+		"tick_reference": null
+	},
+	"weapon": {
+		"mesh": $"Hidden Objects Items/sm_weapon_gun",
+		"value": 0.0,
+		"label": "Weapon Gun",
+		"lock": false,
+		"tick_reference": null
+	},
+	"beer": {
+		"mesh": $"Hidden Objects Items/sm_pinte_beer",
+		"value": 0.0,
+		"label": "Beer Pinte",
+		"lock": false,
+		"tick_reference": null
+	},
+	"apple1": {
+		"mesh": $"Hidden Objects Items/apples/sm_apple_1",
+		"value": 0.0,
+		"label": "Apple",
+		"lock": false,
+		"tick_reference": null
+	},
+	"apple2": {
+		"mesh": $"Hidden Objects Items/apples/sm_apple_2",
+		"value": 0.0,
+		"label": "Apple",
+		"lock": false,
+		"tick_reference": null
+	},
+	"apple3": {
+		"mesh": $"Hidden Objects Items/apples/sm_apple_3",
+		"value": 0.0,
+		"label": "Apple",
+		"lock": false,
+		"tick_reference": null
+	},
+	"apple4": {
+		"mesh": $"Hidden Objects Items/apples/sm_apple_4",
+		"value": 0.0,
+		"label": "Apple",
+		"lock": false,
+		"tick_reference": null
 	}
 }
 
@@ -119,13 +210,52 @@ func _confirm_before_quit():
 func _quit_to_menu():
 	Global.goto_scene("res://scenes/main.tscn")
 
-# Event when user click/touch dagger
-func _on_dagger_input_event(_camera, event, _click_position, _click_normal, _shape_idx):
-	_initialize_mesh_ref("dagger", event)
-
 func _initialize_mesh_ref(meshInstance, event):
 	if meshes[meshInstance]["lock"] == false and (event is InputEventMouseButton or event is InputEventScreenTouch):
 		meshes[meshInstance]["lock"] = true
 		
+# Event when user click/touch dagger
+func _on_dagger_input_event(_camera, event, _click_position, _click_normal, _shape_idx):
+	_initialize_mesh_ref("dagger", event)
+
+func _on_fiole1_input_event(camera, event, click_position, click_normal, shape_idx):
+	_initialize_mesh_ref("fiole1", event)
+
+func _on_fiole2_input_event(camera, event, click_position, click_normal, shape_idx):
+	_initialize_mesh_ref("fiole2", event)
+
+func _on_fiole3_input_event(camera, event, click_position, click_normal, shape_idx):
+	_initialize_mesh_ref("fiole3", event)
+	
+func _on_spyglass_input_event(camera, event, click_position, click_normal, shape_idx):
+	_initialize_mesh_ref("spyglass", event)
+
+func _on_pinte_beer_input_event(camera, event, click_position, click_normal, shape_idx):
+	_initialize_mesh_ref("beer", event)
+
+func _on_weapon_gun_input_event(camera, event, click_position, click_normal, shape_idx):
+	_initialize_mesh_ref("weapon", event)
+
+func _on_apple_1_input_event(camera, event, click_position, click_normal, shape_idx):
+	_initialize_mesh_ref("apple1", event)
+
+func _on_apple_2_input_event(camera, event, click_position, click_normal, shape_idx):
+	_initialize_mesh_ref("apple2", event)
+
+func _on_apple_3_input_event(camera, event, click_position, click_normal, shape_idx):
+	_initialize_mesh_ref("apple3", event)
+
+func _on_apple_4_input_event(camera, event, click_position, click_normal, shape_idx):
+	_initialize_mesh_ref("apple4", event)
+
+func _on_gold_1_input_event(camera, event, click_position, click_normal, shape_idx):
+	_initialize_mesh_ref("coin1", event)
+
+func _on_gold_2_input_event(camera, event, click_position, click_normal, shape_idx):
+	_initialize_mesh_ref("coin2", event)
+
+func _on_gold_3_input_event(camera, event, click_position, click_normal, shape_idx):
+	_initialize_mesh_ref("coin3", event)
+
 func _on_ConfirmEscape_confirmed():
 	_quit_to_menu()