Merge pull request 'feature/find-object-in-scene' (#34) from feature/find-object-in-scene into dev

Reviewed-on: Athena/game-source#34

assets/props/dagger/textures/dagger_BC.tga.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/dagger_BC.tga-8c56f407df61bdb7c529101388df0d01.s3tc.stex"
+path.etc2="res://.import/dagger_BC.tga-8c56f407df61bdb7c529101388df0d01.etc2.stex"
+path.etc="res://.import/dagger_BC.tga-8c56f407df61bdb7c529101388df0d01.etc.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2", "etc" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://assets/props/dagger/textures/dagger_BC.tga"
+dest_files=[ "res://.import/dagger_BC.tga-8c56f407df61bdb7c529101388df0d01.s3tc.stex", "res://.import/dagger_BC.tga-8c56f407df61bdb7c529101388df0d01.etc2.stex", "res://.import/dagger_BC.tga-8c56f407df61bdb7c529101388df0d01.etc.stex" ]
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=true
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=1
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

assets/props/dagger/textures/dagger_NM.tga.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/dagger_NM.tga-02457e4299815720542e6c6827c3099f.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/props/dagger/textures/dagger_NM.tga"
+dest_files=[ "res://.import/dagger_NM.tga-02457e4299815720542e6c6827c3099f.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

assets/props/dagger/textures/dagger_ORM.tga.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/dagger_ORM.tga-e70732208e6213759f9b467913b86699.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/props/dagger/textures/dagger_ORM.tga"
+dest_files=[ "res://.import/dagger_ORM.tga-e70732208e6213759f9b467913b86699.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

developers/jeremy/Dagger.gd

@@ -0,0 +1,54 @@
+extends Spatial
+
+const time_max = 3000 # msec
+
+onready var meshes = {
+	"dagger": {
+		"mesh": $dagger,
+		"value": 0.0,
+		"label": "Dagger",
+		"lock": false,
+		"tick_reference": null
+	},
+	"coin": {
+		"mesh": $coin,
+		"value": 0.0,
+		"label": "Coin",
+		"lock": false,
+		"tick_reference": null
+	},
+	"book": {
+		"mesh": $book,
+		"value": 0.0,
+		"label": "Book",
+		"lock": false,
+		"tick_reference": null
+	}
+}
+
+func _on_Dagger_Area_input_event(_camera, event, _click_position, _click_normal, _shape_idx):
+	_initialize_mesh_ref("dagger", event)
+
+func _on_Coin_Area_input_event(_camera, event, _click_position, _click_normal, _shape_idx):
+	_initialize_mesh_ref("coin", event)
+
+func _on_Book_Area_input_event(_camera, event, _click_position, _click_normal, _shape_idx):
+	_initialize_mesh_ref("book", event)
+
+func _initialize_mesh_ref(meshInstance, event):
+	if meshes[meshInstance]["lock"] == false and (event is InputEventMouseButton or event is InputEventScreenTouch):
+		meshes[meshInstance]["lock"] = true
+
+func _process(_delta):
+	for mesh in meshes:
+		if meshes[mesh]["lock"] == true and meshes[mesh]["mesh"] != null:
+			
+			if meshes[mesh]["tick_reference"] == null:
+				meshes[mesh]["tick_reference"] = OS.get_ticks_msec()
+			
+			if OS.get_ticks_msec() < meshes[mesh]["tick_reference"] + time_max:
+				meshes[mesh]["value"] += 0.01
+				meshes[mesh]["mesh"].get_surface_material(0).set("shader_param/dissolve_amount", meshes[mesh]["value"])
+			else:
+				meshes[mesh]["mesh"].call_deferred("free")
+				meshes[mesh]["mesh"] = null

project.godot

@@ -20,6 +20,11 @@ config/quit_on_go_back=false
 Global="*res://scenes/Global.gd"
 Loading="*res://scenes/UI/Loading.tscn"
 
+[debug]
+
+settings/stdout/print_fps=true
+settings/stdout/verbose_stdout=true
+
 [display]
 
 window/handheld/orientation="sensor_landscape"
@@ -63,3 +68,4 @@ quality/shading/force_vertex_shading.mobile=false
 quality/lightmapping/use_bicubic_sampling.mobile=true
 quality/depth/hdr.mobile=true
 environment/default_environment="res://default_env.tres"
+quality/dynamic_fonts/use_oversampling=false

scenes/UI/ChooseScene.gd

@@ -2,7 +2,7 @@ extends Control
 
 # Load scene warcraft
 func _on_WarCraft_pressed():
-	Global.goto_scene("res://scenes/levels/WarCraft.tscn")
+	Global.goto_scene("res://scenes/levels/warcraft/WarCraft.tscn")
 
 
 func _on_Lightmap_pressed():

scenes/levels/WarCraft.gd

@@ -1,23 +0,0 @@
-extends Spatial
-
-func _process(_delta):
-	# Event key "escape" and "godot event" ui_end
-	if Input.is_action_just_pressed("ui_end"):
-		_confirm_before_quit()
-
-func _notification(what):
-	# Notification for android back action
-	if what == MainLoop.NOTIFICATION_WM_GO_BACK_REQUEST:
-		_confirm_before_quit()
-
-func _confirm_before_quit():
-	var confirm = ConfirmationDialog.new()
-	confirm.set_title("Quit ?")
-	confirm.set_text("Voulez vous vraiment quitté ?")
-	add_child(confirm)
-	confirm.connect("confirmed", self, "_quit_to_menu")
-	confirm.popup()
-
-# Back to main scene
-func _quit_to_menu():
-	Global.goto_scene("res://scenes/main.tscn")

scenes/levels/warcraft/WarCraft.exr.import

@@ -2,15 +2,15 @@
 
 importer="texture_array"
 type="TextureArray"
-path="res://.import/WarCraft.exr-af2db52774b35ccf3d083333732e937f.texarr"
+path="res://.import/WarCraft.exr-fa3141c8d5045461fb0582db300e740a.texarr"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://scenes/levels/WarCraft.exr"
+source_file="res://scenes/levels/warcraft/WarCraft.exr"
-dest_files=[ "res://.import/WarCraft.exr-af2db52774b35ccf3d083333732e937f.texarr" ]
+dest_files=[ "res://.import/WarCraft.exr-fa3141c8d5045461fb0582db300e740a.texarr" ]
 
 [params]
 

scenes/levels/warcraft/WarCraft.gd

@@ -0,0 +1,58 @@
+extends Spatial
+
+const time_max = 3000 # msec
+
+onready var meshes = {
+	"dagger": {
+		"mesh": $"Main Scene Props/dagger",
+		"value": 0.0,
+		"label": "Dagger",
+		"lock": false,
+		"tick_reference": null
+	}
+}
+
+func _ready():
+	$Dialog/ConfirmEscape.set_title("Quit ?")
+	$Dialog/ConfirmEscape.set_text("Voulez vous vraiment quitté ?")
+
+func _process(_delta):
+	# Event key "escape" and "godot event" ui_end
+	if Input.is_action_just_pressed("ui_end"):
+		_confirm_before_quit()
+	
+	# Event dissolve in object searched by gamer
+	for mesh in meshes:
+		if meshes[mesh]["lock"] == true and meshes[mesh]["mesh"] != null:
+			if meshes[mesh]["tick_reference"] == null:
+				meshes[mesh]["tick_reference"] = OS.get_ticks_msec()
+			
+			if OS.get_ticks_msec() < meshes[mesh]["tick_reference"] + time_max:
+				meshes[mesh]["value"] += 0.01
+				meshes[mesh]["mesh"].get_surface_material(0).set("shader_param/dissolve_amount", meshes[mesh]["value"])
+			else:
+				meshes[mesh]["mesh"].call_deferred("free")
+				meshes[mesh]["mesh"] = null
+
+func _notification(what):
+	# Notification for android back action
+	if what == MainLoop.NOTIFICATION_WM_GO_BACK_REQUEST:
+		_confirm_before_quit()
+
+func _confirm_before_quit():
+	$Dialog/ConfirmEscape.popup()
+
+# Back to main scene
+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
+
+func _on_ConfirmEscape_confirmed():
+	_quit_to_menu()

scenes/levels/warcraft/WarCraft.tscn

@@ -1,27 +1,28 @@
-[gd_scene load_steps=23 format=2]
+[gd_scene load_steps=25 format=2]
 
-[ext_resource path="res://assets/props/rock floor/ground_library.tres" type="MeshLibrary" id=1]
+[ext_resource path="res://assets/props/candle/sm_candle_top.mesh" type="ArrayMesh" id=1]
-[ext_resource path="res://assets/props/growler/sm_growler.mesh" type="ArrayMesh" id=2]
+[ext_resource path="res://scenes/levels/warcraft/WarCraft.gd" type="Script" id=2]
-[ext_resource path="res://assets/props/stool b/sm_stool_b.mesh" type="ArrayMesh" id=3]
+[ext_resource path="res://assets/props/godet/sm_godet.mesh" type="ArrayMesh" id=3]
-[ext_resource path="res://assets/hdri/tx_night_place.hdr" type="Texture" id=4]
+[ext_resource path="res://assets/props/candle/sm_candlestick.mesh" type="ArrayMesh" id=4]
-[ext_resource path="res://assets/props/table/sm_table.mesh" type="ArrayMesh" id=5]
+[ext_resource path="res://assets/props/rock floor/materials/rock_floor.material" type="Material" id=5]
-[ext_resource path="res://scenes/levels/WarCraft.gd" type="Script" id=6]
+[ext_resource path="res://assets/props/stool b/sm_stool_b.mesh" type="ArrayMesh" id=6]
-[ext_resource path="res://assets/props/dagger/dagger.mesh" type="ArrayMesh" id=7]
+[ext_resource path="res://assets/props/parchment/sm_paper_parcment.mesh" type="ArrayMesh" id=7]
-[ext_resource path="res://assets/props/godet/sm_godet.mesh" type="ArrayMesh" id=8]
+[ext_resource path="res://assets/materials/gray.tres" type="Material" id=8]
-[ext_resource path="res://assets/props/candle/sm_candle_top.mesh" type="ArrayMesh" id=9]
+[ext_resource path="res://assets/props/candle/sm_candle_b.mesh" type="ArrayMesh" id=9]
-[ext_resource path="res://assets/props/candle/sm_candlestick.mesh" type="ArrayMesh" id=10]
+[ext_resource path="res://assets/props/growler/sm_growler.mesh" type="ArrayMesh" id=10]
-[ext_resource path="res://assets/props/parchment/sm_wood_parchment.mesh" type="ArrayMesh" id=11]
+[ext_resource path="res://assets/hdri/tx_night_place.hdr" type="Texture" id=11]
-[ext_resource path="res://assets/materials/gray.tres" type="Material" id=12]
+[ext_resource path="res://assets/props/table/sm_table.mesh" type="ArrayMesh" id=12]
-[ext_resource path="res://assets/props/parchment/sm_paper_parcment.mesh" type="ArrayMesh" id=13]
+[ext_resource path="res://assets/props/parchment/sm_wood_parchment.mesh" type="ArrayMesh" id=13]
-[ext_resource path="res://assets/props/candle/sm_candle_b.mesh" type="ArrayMesh" id=14]
+[ext_resource path="res://assets/props/dagger/dagger.mesh" type="ArrayMesh" id=14]
-[ext_resource path="res://assets/props/candle/sm_candle_d.mesh" type="ArrayMesh" id=15]
+[ext_resource path="res://assets/props/rock floor/ground_library.tres" type="MeshLibrary" id=15]
-[ext_resource path="res://assets/props/rock floor/materials/rock_floor.material" type="Material" id=16]
+[ext_resource path="res://scenes/levels/warcraft/WarCraft.lmbake" type="BakedLightmapData" id=16]
-[ext_resource path="res://assets/props/book/sm_book.mesh" type="ArrayMesh" id=17]
+[ext_resource path="res://assets/props/candle/sm_candle_d.mesh" type="ArrayMesh" id=17]
-[ext_resource path="res://scenes/levels/WarCraft.lmbake" type="BakedLightmapData" id=18]
+[ext_resource path="res://assets/props/book/sm_book.mesh" type="ArrayMesh" id=18]
+[ext_resource path="res://assets/props/dagger/materials/MA_dagger.material" type="Material" id=19]
 
 [sub_resource type="CubeMesh" id=1]
 
-[sub_resource type="ArrayMesh" id=4]
+[sub_resource type="ArrayMesh" id=2]
 lightmap_size_hint = Vector2( 318, 322 )
 surfaces/0 = {
 "aabb": AABB( -10, -0.00836658, -5, 12, 0.0792593, 10 ),
@@ -30,18 +31,20 @@ surfaces/0 = {
 "blend_shape_data": [  ],
 "format": 97591,
 "index_count": 259740,
-"material": ExtResource( 16 ),
+"material": ExtResource( 5 ),
 "primitive": 4,
 "skeleton_aabb": [  ],
 "vertex_count": 66436
 }
 
-[sub_resource type="PanoramaSky" id=2]
+[sub_resource type="CapsuleShape" id=5]
-panorama = ExtResource( 4 )
 
-[sub_resource type="Environment" id=3]
+[sub_resource type="PanoramaSky" id=3]
+panorama = ExtResource( 11 )
+
+[sub_resource type="Environment" id=4]
 background_mode = 3
-background_sky = SubResource( 2 )
+background_sky = SubResource( 3 )
 background_color = Color( 0.188235, 0.133333, 0.133333, 1 )
 background_energy = 0.6
 ambient_light_color = Color( 0.694118, 0.168627, 0.67451, 1 )
@@ -62,7 +65,7 @@ dof_blur_far_distance = 2.0
 glow_enabled = true
 
 [node name="Warcraft" type="Spatial"]
-script = ExtResource( 6 )
+script = ExtResource( 2 )
 
 [node name="BakedLightmap" type="BakedLightmap" parent="."]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -3.058, 2.35676, -0.241652 )
@@ -70,7 +73,7 @@ extents = Vector3( 6.50885, 3.63237, 10 )
 quality = 3
 bounces = 5
 environment_mode = 1
-light_data = ExtResource( 18 )
+light_data = ExtResource( 16 )
 
 [node name="Main Camera" type="Camera" parent="."]
 transform = Transform( 0.160708, -0.339306, 0.926846, 0, 0.939052, 0.343774, -0.987002, -0.0552473, 0.150913, 1.62519, 1.61928, 0.658554 )
@@ -83,34 +86,34 @@ far = 60.0
 transform = Transform( 5.45383, 0, 0, 0, 2.05553, 0, 0, 0, 0.347932, -3.43965, 1.54814, 5.1384 )
 use_in_baked_light = true
 mesh = SubResource( 1 )
-material/0 = ExtResource( 12 )
+material/0 = ExtResource( 8 )
 
 [node name="MeshInstance4" type="MeshInstance" parent="Building"]
 transform = Transform( 5.45383, 0, 0, 0, -8.98502e-08, 0.347932, 0, -5.54994, -4.10632e-08, -3.44218, 3.54814, 0.156369 )
 use_in_baked_light = true
 mesh = SubResource( 1 )
-material/0 = ExtResource( 12 )
+material/0 = ExtResource( 8 )
 
 [node name="MeshInstance2" type="MeshInstance" parent="Building"]
 transform = Transform( 5.45383, 0, 0, 0, 2.05553, 0, 0, 0, 0.347932, -3.44218, 1.54814, -4.11673 )
 use_in_baked_light = true
 mesh = SubResource( 1 )
-material/0 = ExtResource( 12 )
+material/0 = ExtResource( 8 )
 
 [node name="MeshInstance3" type="MeshInstance" parent="Building"]
 transform = Transform( -2.38394e-07, 0, -0.347932, 0, 2.05553, 0, 5.45383, 0, -1.52086e-08, -8.4425, 1.54516, 0.872685 )
 use_in_baked_light = true
 mesh = SubResource( 1 )
-material/0 = ExtResource( 12 )
+material/0 = ExtResource( 8 )
 
 [node name="GridMapFloor" type="GridMap" parent="Building"]
-mesh_library = ExtResource( 1 )
+mesh_library = ExtResource( 15 )
 use_in_baked_light = true
 cell_center_y = false
 cell_center_z = false
-baked_meshes = [ SubResource( 4 ) ]
+baked_meshes = [ SubResource( 2 ) ]
 data = {
-"cells": PoolIntArray( 0, 0, 3, 65531, 0, 536870915, 65532, 0, 3, 65533, 0, -536870909, 65534, 0, 3, 65535, 0, 3, 0, 1, 3, 65531, 1, 3, 65532, 1, 3, 65533, 1, 3, 65534, 1, 3, 65535, 1, 3, 0, 2, -1610612733, 65531, 2, 3, 65532, 2, 3, 65533, 2, 3, 65534, 2, -1073741821, 65535, 2, -1610612733, 0, 65534, 3, 65531, 65534, 3, 65532, 65534, -1610612733, 65533, 65534, -536870909, 65534, 65534, 536870915, 65535, 65534, 3, 0, 65535, -1610612733, 65531, 65535, -1610612733, 65532, 65535, 3, 65533, 65535, -536870909, 65534, 65535, 3, 65535, 65535, 3 )
+"cells": PoolIntArray( 0, 0, 3, 65531, 0, 3, 65532, 0, 536870915, 65533, 0, 3, 65534, 0, 3, 65535, 0, 3, 0, 1, 3, 65531, 1, 3, 65532, 1, 3, 65533, 1, 3, 65534, 1, -536870909, 65535, 1, 3, 0, 2, -1610612733, 65531, 2, 3, 65532, 2, 3, 65533, 2, 3, 65534, 2, 3, 65535, 2, 3, 0, 65534, 3, 65531, 65534, -1073741821, 65532, 65534, -1610612733, 65533, 65534, 3, 65534, 65534, 3, 65535, 65534, -1610612733, 0, 65535, 3, 65531, 65535, 3, 65532, 65535, -1610612733, 65533, 65535, 3, 65534, 65535, 536870915, 65535, 65535, 3 )
 }
 __meta__ = {
 "_editor_clip_": 0,
@@ -120,49 +123,49 @@ __meta__ = {
 [node name="sm_table2" type="MeshInstance" parent="."]
 transform = Transform( 0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, -2.04193, 0.815994, -1.9022 )
 use_in_baked_light = true
-mesh = ExtResource( 5 )
+mesh = ExtResource( 12 )
 material/0 = null
 
 [node name="sm_growler2" type="MeshInstance" parent="sm_table2"]
 transform = Transform( 0.428226, 0, -0.903672, 0, 1, 0, 0.903672, 0, 0.428226, 0.0848827, 0.0842252, 0.24329 )
 use_in_baked_light = true
-mesh = ExtResource( 2 )
+mesh = ExtResource( 10 )
 material/0 = null
 
 [node name="sm_godet3" type="MeshInstance" parent="sm_table2"]
 transform = Transform( 0.869771, 0, 0.493456, 0, 1, 0, -0.493456, 0, 0.869771, -0.0515881, 0.0691012, -0.0287701 )
 use_in_baked_light = true
-mesh = ExtResource( 8 )
+mesh = ExtResource( 3 )
 material/0 = null
 
 [node name="sm_godet2" type="MeshInstance" parent="sm_table2"]
 transform = Transform( -0.236782, -0.0445638, 0.970541, -0.0267146, 0.998868, 0.039347, -0.971196, -0.0166109, -0.237705, 0.115576, 0.0776632, -0.00375021 )
 use_in_baked_light = true
-mesh = ExtResource( 8 )
+mesh = ExtResource( 3 )
 material/0 = null
 
 [node name="sm_table3" type="MeshInstance" parent="."]
 transform = Transform( -0.958482, 0, -0.285153, 0, 1, 0, 0.285153, 0, -0.958482, -2.7741, 0.826797, 2.21009 )
 use_in_baked_light = true
-mesh = ExtResource( 5 )
+mesh = ExtResource( 12 )
 material/0 = null
 
 [node name="sm_growler2" type="MeshInstance" parent="sm_table3"]
 transform = Transform( -0.958482, 0, 0.285153, 0, 1, 0, -0.285153, 0, -0.958482, 0, 0.0658306, 0 )
 use_in_baked_light = true
-mesh = ExtResource( 2 )
+mesh = ExtResource( 10 )
 material/0 = null
 
 [node name="sm_godet2" type="MeshInstance" parent="sm_table3"]
 transform = Transform( -0.958482, 0.0116327, 0.284916, 0, 0.999168, -0.0407945, -0.285153, -0.0391008, -0.957684, -0.17328, 0.0729555, 0.189056 )
 use_in_baked_light = true
-mesh = ExtResource( 8 )
+mesh = ExtResource( 3 )
 material/0 = null
 
 [node name="sm_godet3" type="MeshInstance" parent="sm_table3"]
 transform = Transform( -0.958482, -0.0136413, 0.284827, 0, 0.998855, 0.0478387, -0.285153, 0.0458525, -0.957385, -0.0769451, 0.0599785, -0.25378 )
 use_in_baked_light = true
-mesh = ExtResource( 8 )
+mesh = ExtResource( 3 )
 material/0 = null
 
 [node name="Main Scene Props" type="Spatial" parent="."]
@@ -170,31 +173,31 @@ material/0 = null
 [node name="Book" type="MeshInstance" parent="Main Scene Props"]
 transform = Transform( 0.259561, 0, 0.965727, 0.0582327, 0.99818, -0.0156514, -0.963969, 0.0602995, 0.259089, 0.13025, 0.92072, -0.458817 )
 use_in_baked_light = true
-mesh = ExtResource( 17 )
+mesh = ExtResource( 18 )
 material/0 = null
 
 [node name="Book" type="MeshInstance" parent="Main Scene Props/Book"]
 transform = Transform( 0.0229641, -0.00339183, -0.999731, 0.0393653, 0.999223, -0.00248598, 0.998961, -0.0392976, 0.0230803, 0.00279957, 0.066205, -0.000443451 )
 use_in_baked_light = true
-mesh = ExtResource( 17 )
+mesh = ExtResource( 18 )
 material/0 = null
 
 [node name="Book2" type="MeshInstance" parent="Main Scene Props/Book/Book"]
 transform = Transform( 0.86032, -0.0497817, -0.507318, 0.0471006, 0.998725, -0.0181282, 0.507573, -0.00829895, 0.861568, 0.00110056, 0.070618, -0.00503534 )
 use_in_baked_light = true
-mesh = ExtResource( 17 )
+mesh = ExtResource( 18 )
 material/0 = null
 
 [node name="sm_candlestick2" type="MeshInstance" parent="Main Scene Props/Book/Book/Book2"]
 transform = Transform( 1.0543, -0.0109484, 1.03432, -0.0329634, 1.4758, 0.0492217, -1.03385, -0.0582193, 1.05321, 0.0299356, 0.0326171, -0.0690778 )
 use_in_baked_light = true
-mesh = ExtResource( 10 )
+mesh = ExtResource( 4 )
 material/0 = null
 
 [node name="sm_candle_top2" type="MeshInstance" parent="Main Scene Props/Book/Book/Book2/sm_candlestick2"]
 transform = Transform( 1.16981, 7.45037e-09, -2.27374e-13, 7.45058e-09, 1.63542, -1.42109e-14, 3.55271e-15, -2.84217e-14, 1.16981, 0.00268283, 0.168278, -5.96046e-08 )
 use_in_baked_light = true
-mesh = ExtResource( 9 )
+mesh = ExtResource( 1 )
 material/0 = null
 
 [node name="OmniLight" type="OmniLight" parent="Main Scene Props/Book/Book/Book2/sm_candlestick2/sm_candle_top2"]
@@ -206,138 +209,144 @@ omni_range = 0.6
 [node name="sm_table2" type="MeshInstance" parent="Main Scene Props"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.26978, 0.829484, 0.290515 )
 use_in_baked_light = true
-mesh = ExtResource( 5 )
+mesh = ExtResource( 12 )
 material/0 = null
 
 [node name="dagger" type="MeshInstance" parent="Main Scene Props"]
 transform = Transform( -0.242904, -0.97005, -4.24022e-08, 0, -4.37114e-08, 1, -0.97005, 0.242904, 1.06177e-08, 0.441892, 0.938817, 0.531178 )
-mesh = ExtResource( 7 )
+mesh = ExtResource( 14 )
-material/0 = null
+material/0 = ExtResource( 19 )
+
+[node name="Area" type="Area" parent="Main Scene Props/dagger"]
+
+[node name="CollisionShape" type="CollisionShape" parent="Main Scene Props/dagger/Area"]
+shape = SubResource( 5 )
 
 [node name="sm_stool_b2" type="MeshInstance" parent="Main Scene Props"]
 transform = Transform( -0.232037, 0, -0.972707, 0, 1, 0, 0.972707, 0, -0.232037, -2.91873, 0.0130518, 0.702275 )
 use_in_baked_light = true
-mesh = ExtResource( 3 )
+mesh = ExtResource( 6 )
 material/0 = null
 
 [node name="sm_stool_b3" type="MeshInstance" parent="Main Scene Props"]
 transform = Transform( 0.770013, 0, -0.638029, 0, 1, 0, 0.638029, 0, 0.770013, -4.33166, 0.013052, 1.08363 )
 use_in_baked_light = true
-mesh = ExtResource( 3 )
+mesh = ExtResource( 6 )
 material/0 = null
 
 [node name="sm_stool_b4" type="MeshInstance" parent="Main Scene Props"]
 transform = Transform( 0.656257, 0, 0.754538, 0, 1, 0, -0.754538, 0, 0.656257, -0.888955, 0.0130518, 1.64328 )
 use_in_baked_light = true
-mesh = ExtResource( 3 )
+mesh = ExtResource( 6 )
 material/0 = null
 
 [node name="sm_stool_b5" type="MeshInstance" parent="Main Scene Props"]
 transform = Transform( 0.892389, 0, -0.451267, 0, 1, 0, 0.451267, 0, 0.892389, 1.35966, 0.013052, 1.23435 )
 use_in_baked_light = true
-mesh = ExtResource( 3 )
+mesh = ExtResource( 6 )
 material/0 = null
 
 [node name="sm_stool_b6" type="MeshInstance" parent="Main Scene Props"]
 transform = Transform( 0.839193, 0, 0.543834, 0, 1, 0, -0.543834, 0, 0.839193, 0.474083, 0.013052, -1.39025 )
 use_in_baked_light = true
-mesh = ExtResource( 3 )
+mesh = ExtResource( 6 )
 material/0 = null
 
 [node name="Book3" type="MeshInstance" parent="Main Scene Props"]
 transform = Transform( 0.5, 0, 0.866025, 0, 1, 0, -0.866025, 0, 0.5, 0.0106606, 0.961322, 0.981535 )
 use_in_baked_light = true
-mesh = ExtResource( 17 )
+mesh = ExtResource( 18 )
 material/0 = null
 
 [node name="Book" type="MeshInstance" parent="Main Scene Props/Book3"]
 transform = Transform( 0.992026, 0, 0.592682, 0, 1.15559, 0, -0.592682, 0, 0.992026, -0.000832438, 0.0791223, -0.012241 )
 use_in_baked_light = true
-mesh = ExtResource( 17 )
+mesh = ExtResource( 18 )
 material/0 = null
 
 [node name="Book2" type="MeshInstance" parent="Main Scene Props"]
 transform = Transform( 0.122577, 0.0288089, -0.992041, -0.0361233, 0.999045, 0.0245489, 0.991801, 0.0328267, 0.1235, 0.493033, 0.936805, -0.0856308 )
 use_in_baked_light = true
-mesh = ExtResource( 17 )
+mesh = ExtResource( 18 )
 material/0 = null
 
 [node name="sm_godet2" type="MeshInstance" parent="Main Scene Props"]
 transform = Transform( 0.875311, 0.480987, 0.0498184, 0.0206958, 0.0656668, -0.997627, -0.483117, 0.874265, 0.0475244, -0.191043, 0.95253, 0.11484 )
 use_in_baked_light = true
-mesh = ExtResource( 8 )
+mesh = ExtResource( 3 )
 material/0 = null
 
 [node name="sm_godet6" type="MeshInstance" parent="Main Scene Props"]
 transform = Transform( 0.706057, 0, -0.708155, 0, 1, 0, 0.708155, 0, 0.706057, -0.112722, 0.901657, 0.00149509 )
 use_in_baked_light = true
-mesh = ExtResource( 8 )
+mesh = ExtResource( 3 )
 material/0 = null
 
 [node name="sm_godet5" type="MeshInstance" parent="Main Scene Props"]
 transform = Transform( 0.757895, 0, 0.652376, 0, 1, 0, -0.652376, 0, 0.757895, -0.28474, 0.905096, 0.78228 )
 use_in_baked_light = true
-mesh = ExtResource( 8 )
+mesh = ExtResource( 3 )
 material/0 = null
 
 [node name="sm_godet4" type="MeshInstance" parent="Main Scene Props"]
 transform = Transform( 0.886172, -0.463214, 0.0114893, -0.0309068, -0.0343508, 0.998932, -0.462324, -0.885581, -0.0447572, -0.0863596, 0.96815, 0.743407 )
 use_in_baked_light = true
-mesh = ExtResource( 8 )
+mesh = ExtResource( 3 )
 material/0 = null
 
 [node name="sm_godet3" type="MeshInstance" parent="Main Scene Props"]
 transform = Transform( 0.690251, 0, 0.72357, 0, 1, 0, -0.72357, 0, 0.690251, -0.333186, 0.901657, 0.177792 )
 use_in_baked_light = true
-mesh = ExtResource( 8 )
+mesh = ExtResource( 3 )
 material/0 = null
 
 [node name="sm_growler2" type="MeshInstance" parent="Main Scene Props"]
 transform = Transform( 0.0876426, 0, -0.996152, 0, 1, 0, 0.996152, 0, 0.0876426, -0.316595, 0.905106, -0.0726386 )
 use_in_baked_light = true
-mesh = ExtResource( 2 )
+mesh = ExtResource( 10 )
 material/0 = null
 
 [node name="sm_wood_parchment2" type="MeshInstance" parent="Main Scene Props"]
 transform = Transform( 0.796076, 0.00917861, -0.605127, 0, 0.999885, 0.0151663, 0.605197, -0.0120736, 0.795984, 0.543255, 0.957499, 0.755328 )
 use_in_baked_light = true
-mesh = ExtResource( 11 )
+mesh = ExtResource( 13 )
 material/0 = null
 
 [node name="sm_paper_parcment" type="MeshInstance" parent="Main Scene Props/sm_wood_parchment2"]
 transform = Transform( 1, 1.44355e-08, -5.36442e-07, -9.77889e-09, 1, 9.31323e-09, 0, 1.39698e-08, 1, -0.259292, -0.0429049, 0.0230856 )
 use_in_baked_light = true
-mesh = ExtResource( 13 )
+mesh = ExtResource( 7 )
 material/0 = null
 
 [node name="sm_wood_parchment3" type="MeshInstance" parent="Main Scene Props"]
 transform = Transform( -0.596381, 0.0184557, 0.802489, 0.0225364, 0.999726, -0.00624354, -0.802385, 0.0143617, -0.596634, 0.281044, 0.958449, -0.253034 )
 use_in_baked_light = true
-mesh = ExtResource( 11 )
+mesh = ExtResource( 13 )
 material/0 = null
 
 [node name="sm_candle_d2" type="MeshInstance" parent="Main Scene Props"]
 transform = Transform( -0.927966, 1.10978e-07, -0.372664, 6.91459e-08, 1, 1.25617e-07, 0.372664, 9.08001e-08, -0.927966, 0.457262, 1.00485, -0.058084 )
 use_in_baked_light = true
-mesh = ExtResource( 15 )
+mesh = ExtResource( 17 )
 material/0 = null
 
 [node name="sm_candle_top2" type="MeshInstance" parent="Main Scene Props"]
 transform = Transform( 2.94906, 0, 0, 0, 2.85, 0, 0, 0, 2.94906, 0.347704, 1.00342, 1.16015 )
 use_in_baked_light = true
-mesh = ExtResource( 9 )
+mesh = ExtResource( 1 )
 material/0 = null
 
 [node name="sm_candle_b" type="MeshInstance" parent="Main Scene Props/sm_candle_top2"]
 transform = Transform( 0.553417, 0, 0, 0, 0.553417, 0, 0, 0, 0.553417, 0.0504003, -0.0129334, 0.00162044 )
 use_in_baked_light = true
-mesh = ExtResource( 14 )
+mesh = ExtResource( 9 )
 material/0 = null
 
 [node name="Lighting" type="Spatial" parent="."]
 
 [node name="Red Color Left" type="SpotLight" parent="Lighting"]
 transform = Transform( 0.885702, -0.222818, 0.407289, 0, 0.877297, 0.479948, -0.464255, -0.425091, 0.777023, 0.848516, 1.5034, 2.26553 )
+visible = false
 light_color = Color( 1, 0, 0.0862745, 1 )
 light_energy = 2.0
 light_bake_mode = 2
@@ -346,11 +355,13 @@ shadow_contact = 1.0
 
 [node name="Blue Color Right" type="SpotLight" parent="Lighting"]
 transform = Transform( -0.728997, 0.597286, -0.334384, 0.0537007, 0.536893, 0.84194, 0.682407, 0.595815, -0.423468, -0.540161, 1.80711, -0.561909 )
+visible = false
 light_color = Color( 0.8, 0.835294, 1, 1 )
 light_bake_mode = 2
 
 [node name="Blue Color Right2" type="SpotLight" parent="Lighting"]
 transform = Transform( -0.721569, 0.418156, -0.5518, -0.680158, -0.577006, 0.452161, -0.129319, 0.701576, 0.700762, -6.73766, 1.80711, 4.06785 )
+visible = false
 light_color = Color( 0.905882, 0.862745, 0.72549, 1 )
 light_specular = 0.23
 light_bake_mode = 2
@@ -359,6 +370,7 @@ spot_angle = 55.8
 
 [node name="Blue Color Right3" type="SpotLight" parent="Lighting"]
 transform = Transform( 0.0552331, -0.60583, -0.793675, -0.717326, -0.577006, 0.390522, -0.694545, 0.547754, -0.466447, -6.73826, 1.80435, -3.64354 )
+visible = false
 light_color = Color( 0.905882, 0.862745, 0.72549, 1 )
 light_specular = 0.64
 light_bake_mode = 2
@@ -367,6 +379,7 @@ spot_angle = 55.8
 
 [node name="Sun" type="DirectionalLight" parent="Lighting"]
 transform = Transform( -0.777664, -0.348191, 0.523451, 0.0166148, 0.820946, 0.570764, -0.62846, 0.45256, -0.632636, 0, 1.62188, 0 )
+visible = false
 light_color = Color( 0.501961, 0.67451, 1, 1 )
 light_energy = 2.0
 light_bake_mode = 2
@@ -374,4 +387,23 @@ shadow_enabled = true
 shadow_contact = 0.3
 
 [node name="WorldEnvironment" type="WorldEnvironment" parent="Lighting"]
-environment = SubResource( 3 )
+environment = SubResource( 4 )
+
+[node name="Dialog" type="Control" parent="."]
+margin_right = 40.0
+margin_bottom = 40.0
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="ConfirmEscape" type="ConfirmationDialog" parent="Dialog"]
+visible = true
+margin_right = 200.0
+margin_bottom = 70.0
+window_title = "Veuillez confirmer…"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[connection signal="input_event" from="Main Scene Props/dagger/Area" to="." method="_on_dagger_input_event"]
+[connection signal="confirmed" from="Dialog/ConfirmEscape" to="." method="_on_ConfirmEscape_confirmed"]