darknight/puzzle-quest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove signal; use ray method

Browse Source
This commit is contained in:
VAILLANT Jeremy
2021-05-14 22:14:38 +02:00
parent 9eddf8b812
commit ca7787d43d
2 changed files with 89 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scenes/levels/warcraft/WarCraft.tscn
+62 -58
View File
@@ -513,186 +513,190 @@ transform = Transform( 0.534795, 0, 0.844982, 0, 1, 0, -0.844982, 0, 0.534795, -
mesh = ExtResource( 20 )
material/0 = ExtResource( 8 )
[node name="Hidden Objects Items" type="Spatial" parent="."]
[node name="Hidden Objects Items" type="RayCast" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.233905, 1.0296, -0.405055 )
collision_mask = 2
collide_with_areas = true
collide_with_bodies = false
[node name="fioles" type="Spatial" parent="Hidden Objects Items"]
[node name="sm_fiole1" type="MeshInstance" parent="Hidden Objects Items/fioles"]
[node name="fiole1" type="MeshInstance" parent="Hidden Objects Items/fioles"]
transform = Transform( -0.210773, -0.635682, 0.742619, 0.949185, -0.314721, 0, 0.233718, 0.704883, 0.669714, 0.0481223, 0, -0.094099 )
mesh = ExtResource( 24 )
material/0 = ExtResource( 26 )
[node name="AreaFiole1" type="Area" parent="Hidden Objects Items/fioles/sm_fiole1"]
[node name="Area" type="Area" parent="Hidden Objects Items/fioles/fiole1"]
collision_mask = 2
[node name="CollisionShape" type="CollisionShape" parent="Hidden Objects Items/fioles/sm_fiole1/AreaFiole1"]
[node name="CollisionShape" type="CollisionShape" parent="Hidden Objects Items/fioles/fiole1/Area"]
transform = Transform( 1, 2.98023e-08, -8.9407e-08, 0, -1.19209e-07, 1, -8.9407e-08, -1, 2.98023e-08, -5.96046e-08, 0.0801149, 0 )
shape = SubResource( 5 )
[node name="sm_fiole2" type="MeshInstance" parent="Hidden Objects Items/fioles"]
[node name="fiole2" type="MeshInstance" parent="Hidden Objects Items/fioles"]
transform = Transform( 0.655275, 0.636944, -0.4061, 0.670978, -0.243833, 0.700239, 0.346993, -0.731333, -0.587153, -4.19531, -0.894133, 2.66915 )
mesh = ExtResource( 24 )
material/0 = ExtResource( 27 )
[node name="AreaFiole2" type="Area" parent="Hidden Objects Items/fioles/sm_fiole2"]
[node name="Area" type="Area" parent="Hidden Objects Items/fioles/fiole2"]
transform = Transform( 1, -2.98023e-08, 0, -2.98023e-08, 1, 0, 1.49012e-08, -1.19209e-07, 1, -2.38419e-07, -0.0202575, 0 )
collision_mask = 2
[node name="CollisionShape" type="CollisionShape" parent="Hidden Objects Items/fioles/sm_fiole2/AreaFiole2"]
[node name="CollisionShape" type="CollisionShape" parent="Hidden Objects Items/fioles/fiole2/Area"]
transform = Transform( 1, 5.96046e-08, -8.9407e-08, 2.98023e-08, -8.9407e-08, 1, -8.9407e-08, -1, 0, 2.38419e-07, 0.0823998, -1.19209e-07 )
shape = SubResource( 6 )
[node name="sm_fiole_socle" type="MeshInstance" parent="Hidden Objects Items/fioles"]
[node name="fiole_socle" type="MeshInstance" parent="Hidden Objects Items/fioles"]
transform = Transform( 0.6773, -1.86265e-09, 0.735707, -0.0293841, 0.999202, 0.0270513, -0.73512, -0.03994, 0.67676, -2.27881, -0.11528, -1.23929 )
mesh = ExtResource( 25 )
material/0 = null
[node name="sm_fiole3" type="MeshInstance" parent="Hidden Objects Items/fioles/sm_fiole_socle"]
[node name="fiole3" type="MeshInstance" parent="Hidden Objects Items/fioles/fiole_socle"]
transform = Transform( 0.919703, -0.349433, -0.179005, 0.316708, 0.929754, -0.187758, 0.232039, 0.115989, 0.965766, -1.19209e-07, 0.1147, 0.00100636 )
mesh = ExtResource( 24 )
material/0 = ExtResource( 28 )
[node name="AreaFiole3" type="Area" parent="Hidden Objects Items/fioles/sm_fiole_socle/sm_fiole3"]
[node name="Area" type="Area" parent="Hidden Objects Items/fioles/fiole_socle/fiole3"]
collision_mask = 2
[node name="CollisionShape" type="CollisionShape" parent="Hidden Objects Items/fioles/sm_fiole_socle/sm_fiole3/AreaFiole3"]
[node name="CollisionShape" type="CollisionShape" parent="Hidden Objects Items/fioles/fiole_socle/fiole3/Area"]
transform = Transform( 1, 2.08616e-07, -7.45058e-08, -5.96046e-08, -1.49012e-07, 1, 5.96046e-08, -1, -1.04308e-07, -1.78814e-07, 0.0560231, 0 )
shape = SubResource( 7 )
[node name="sm_dagger" type="MeshInstance" parent="Hidden Objects Items"]
[node name="dagger" type="MeshInstance" parent="Hidden Objects Items"]
transform = Transform( -0.625025, -0.77987, 0.0338859, 0, 0.0434097, 0.999058, -0.780606, 0.624436, -0.0271321, 0.697412, -0.0996332, 0.822543 )
mesh = ExtResource( 14 )
material/0 = ExtResource( 19 )
[node name="Area" type="Area" parent="Hidden Objects Items/sm_dagger"]
[node name="Area" type="Area" parent="Hidden Objects Items/dagger"]
collision_mask = 2
[node name="CollisionShape" type="CollisionShape" parent="Hidden Objects Items/sm_dagger/Area"]
[node name="CollisionShape" type="CollisionShape" parent="Hidden Objects Items/dagger/Area"]
transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0.0802139, 0 )
shape = SubResource( 8 )
[node name="sm_spyglass" type="MeshInstance" parent="Hidden Objects Items"]
[node name="spyglass" type="MeshInstance" parent="Hidden Objects Items"]
transform = Transform( 0.665919, -0.0332091, 0.63579, 1.34429e-08, 0.920039, 0.0480562, -0.636656, -0.0347355, 0.665013, -2.88265, -0.329537, -0.428369 )
[node name="Area2" type="Area" parent="Hidden Objects Items/sm_spyglass"]
[node name="Area" type="Area" parent="Hidden Objects Items/spyglass"]
collision_mask = 2
[node name="CollisionShape" type="CollisionShape" parent="Hidden Objects Items/sm_spyglass/Area2"]
[node name="CollisionShape" type="CollisionShape" parent="Hidden Objects Items/spyglass/Area"]
transform = Transform( 1, 0, 0, 1.86265e-09, 1, 3.72529e-09, -2.98023e-08, 3.72529e-09, 1, 2.38419e-07, -1.19209e-07, 0.0177534 )
shape = SubResource( 9 )
[node name="sm_pinte_beer" type="MeshInstance" parent="Hidden Objects Items"]
[node name="beer" type="MeshInstance" parent="Hidden Objects Items"]
transform = Transform( 0.996658, -0.053142, 0.0620432, 0.0548108, 0.998171, -0.0255105, -0.060574, 0.0288258, 0.997748, -2.8842, 0.173697, 1.98168 )
mesh = ExtResource( 23 )
material/0 = ExtResource( 33 )
[node name="Area3" type="Area" parent="Hidden Objects Items/sm_pinte_beer"]
[node name="Area" type="Area" parent="Hidden Objects Items/beer"]
transform = Transform( 1, 0, 7.45058e-09, -1.16415e-10, 1, -1.86265e-09, 0, 0, 1, -2.38419e-07, -0.21161, -1.19209e-07 )
collision_mask = 2
[node name="CollisionShapeBeer" type="CollisionShape" parent="Hidden Objects Items/sm_pinte_beer/Area3"]
[node name="CollisionShapeBeer" type="CollisionShape" parent="Hidden Objects Items/beer/Area"]
transform = Transform( 1, 0, -1.61817e-08, 1.83936e-08, -4.28408e-08, 1, 0, -1, -4.65661e-08, 9.53674e-07, 0.0746492, 2.38419e-07 )
shape = SubResource( 10 )
[node name="sm_weapon_gun" type="MeshInstance" parent="Hidden Objects Items"]
[node name="weapon" type="MeshInstance" parent="Hidden Objects Items"]
transform = Transform( 0.540284, -0.813497, 0.215212, -0.009216, 0.250018, 0.968198, -0.841432, -0.525085, 0.127583, -2.7508, -0.359206, 1.19589 )
mesh = ExtResource( 21 )
material/0 = ExtResource( 34 )
[node name="Area4" type="Area" parent="Hidden Objects Items/sm_weapon_gun"]
[node name="Area" type="Area" parent="Hidden Objects Items/weapon"]
collision_mask = 2
[node name="CollisionShapeWeapon" type="CollisionShape" parent="Hidden Objects Items/sm_weapon_gun/Area4"]
[node name="CollisionShapeWeapon" type="CollisionShape" parent="Hidden Objects Items/weapon/Area"]
transform = Transform( -1.49012e-07, 0, 1, -1, -1.49012e-08, 0, 3.72529e-08, -1, -5.21541e-08, 0.0388942, 0.0484145, -8.19564e-08 )
shape = SubResource( 11 )
[node name="apples" type="Spatial" parent="Hidden Objects Items"]
[node name="sm_apple_1" type="MeshInstance" parent="Hidden Objects Items/apples"]
[node name="apple1" type="MeshInstance" parent="Hidden Objects Items/apples"]
transform = Transform( 0.849809, -0.0462348, 0.525058, 0.0744364, 0.996689, -0.0327109, -0.521807, 0.0668814, 0.850438, -2.20275, -0.0779731, 2.45146 )
mesh = ExtResource( 22 )
material/0 = ExtResource( 29 )
[node name="Area5" type="Area" parent="Hidden Objects Items/apples/sm_apple_1"]
[node name="Area" type="Area" parent="Hidden Objects Items/apples/apple1"]
collision_mask = 2
[node name="CollisionShapeApple" type="CollisionShape" parent="Hidden Objects Items/apples/sm_apple_1/Area5"]
[node name="CollisionShapeApple" type="CollisionShape" parent="Hidden Objects Items/apples/apple1/Area"]
transform = Transform( -1.45286e-07, -2.98023e-08, 1, -1, -1.11759e-08, 0, 1.86265e-08, -1, -8.9407e-08, -1.90735e-06, 0.00575864, 0 )
shape = SubResource( 12 )
[node name="sm_apple_2" type="MeshInstance" parent="Hidden Objects Items/apples"]
[node name="apple2" type="MeshInstance" parent="Hidden Objects Items/apples"]
transform = Transform( -0.190449, 0, 0.981697, 0, 1, 0, -0.981697, 0, -0.190449, -1.71166, -0.0869397, -1.29534 )
mesh = ExtResource( 22 )
material/0 = ExtResource( 36 )
[node name="Area6" type="Area" parent="Hidden Objects Items/apples/sm_apple_2"]
[node name="Area" type="Area" parent="Hidden Objects Items/apples/apple2"]
collision_mask = 2
[node name="CollisionShapeApple2" type="CollisionShape" parent="Hidden Objects Items/apples/sm_apple_2/Area6"]
[node name="CollisionShapeApple2" type="CollisionShape" parent="Hidden Objects Items/apples/apple2/Area"]
transform = Transform( -1.49012e-07, 4.47035e-08, 1, -1, -1.49012e-08, 0, 3.72529e-08, -1, -1.49012e-08, -4.76837e-07, -0.00566041, 0 )
shape = SubResource( 13 )
[node name="sm_apple_3" type="MeshInstance" parent="Hidden Objects Items/apples"]
[node name="apple3" type="MeshInstance" parent="Hidden Objects Items/apples"]
transform = Transform( 0.823731, 0.226496, -0.519776, -0.248954, 0.96813, 0.0273319, 0.509401, 0.106886, 0.853865, -0.718663, -0.36046, 1.92043 )
mesh = ExtResource( 22 )
material/0 = ExtResource( 31 )
[node name="Area7" type="Area" parent="Hidden Objects Items/apples/sm_apple_3"]
[node name="Area" type="Area" parent="Hidden Objects Items/apples/apple3"]
collision_mask = 2
[node name="CollisionShapeApple3" type="CollisionShape" parent="Hidden Objects Items/apples/sm_apple_3/Area7"]
[node name="CollisionShapeApple3" type="CollisionShape" parent="Hidden Objects Items/apples/apple3/Area"]
transform = Transform( -1.71363e-07, 0, 1, -1, -3.72529e-08, 1.49012e-08, 2.98023e-08, -1, -1.19209e-07, -3.57628e-07, 0.0142345, 2.38419e-07 )
shape = SubResource( 14 )
[node name="sm_apple_4" type="MeshInstance" parent="Hidden Objects Items/apples"]
[node name="apple4" type="MeshInstance" parent="Hidden Objects Items/apples"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.97752, -0.491035, 0.41055 )
mesh = ExtResource( 22 )
material/0 = ExtResource( 35 )
[node name="Area8" type="Area" parent="Hidden Objects Items/apples/sm_apple_4"]
[node name="Area" type="Area" parent="Hidden Objects Items/apples/apple4"]
collision_mask = 2
[node name="CollisionShapeApple4" type="CollisionShape" parent="Hidden Objects Items/apples/sm_apple_4/Area8"]
[node name="CollisionShapeApple4" type="CollisionShape" parent="Hidden Objects Items/apples/apple4/Area"]
transform = Transform( -1.49012e-07, 0, 1, -1, -1.49012e-08, 0, 3.72529e-08, -1, -5.21541e-08, -4.76837e-07, 0.00115258, -1.17347e-07 )
shape = SubResource( 15 )
[node name="golds" type="Spatial" parent="Hidden Objects Items"]
[node name="sm_stackgold_1" type="MeshInstance" parent="Hidden Objects Items/golds"]
[node name="coin1" type="MeshInstance" parent="Hidden Objects Items/golds"]
transform = Transform( -0.958704, -0.0851446, 0.271362, -0.0825332, 0.996367, 0.0210433, -0.272167, -0.00222202, -0.962248, 0.234182, -0.0596957, 0.546686 )
mesh = ExtResource( 30 )
material/0 = ExtResource( 38 )
[node name="Area9" type="Area" parent="Hidden Objects Items/golds/sm_stackgold_1"]
[node name="Area" type="Area" parent="Hidden Objects Items/golds/coin1"]
collision_mask = 2
[node name="CollisionShapeGold1" type="CollisionShape" parent="Hidden Objects Items/golds/sm_stackgold_1/Area9"]
[node name="CollisionShapeGold1" type="CollisionShape" parent="Hidden Objects Items/golds/coin1/Area"]
transform = Transform( 1, -4.65661e-08, 0, -1.38185e-07, 0.999999, 3.14321e-08, 4.17233e-07, -4.19095e-09, 1, 0.0276761, 0.00212932, 0.0336302 )
shape = SubResource( 16 )
[node name="sm_stackgold_2" type="MeshInstance" parent="Hidden Objects Items/golds"]
[node name="coin2" type="MeshInstance" parent="Hidden Objects Items/golds"]
transform = Transform( 0.250245, 2.79397e-09, -0.968183, 0.0456076, 0.99889, 0.0117882, 0.967108, -0.0471065, 0.249967, 0.752443, -0.0417374, 1.3694 )
layers = 3
mesh = ExtResource( 30 )
material/0 = ExtResource( 37 )
[node name="Area10" type="Area" parent="Hidden Objects Items/golds/sm_stackgold_2"]
[node name="Area" type="Area" parent="Hidden Objects Items/golds/coin2"]
collision_mask = 2
[node name="CollisionShapeGold2" type="CollisionShape" parent="Hidden Objects Items/golds/sm_stackgold_2/Area10"]
[node name="CollisionShapeGold2" type="CollisionShape" parent="Hidden Objects Items/golds/coin2/Area"]
transform = Transform( 1, 0, 2.98023e-08, 7.45058e-09, 1, -9.31323e-10, 5.96046e-08, 0, 1, 0.0499306, 1.19209e-07, 0.0191208 )
shape = SubResource( 17 )
[node name="sm_stackgold_3" type="MeshInstance" parent="Hidden Objects Items/golds"]
[node name="coin3" type="MeshInstance" parent="Hidden Objects Items/golds"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.74641, -0.885448, -0.198129 )
mesh = ExtResource( 30 )
material/0 = ExtResource( 32 )
[node name="Area11" type="Area" parent="Hidden Objects Items/golds/sm_stackgold_3"]
[node name="Area" type="Area" parent="Hidden Objects Items/golds/coin3"]
collision_mask = 2
[node name="CollisionShapeGold3" type="CollisionShape" parent="Hidden Objects Items/golds/sm_stackgold_3/Area11"]
[node name="CollisionShapeGold3" type="CollisionShape" parent="Hidden Objects Items/golds/coin3/Area"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0358186, 0, 0.0109152 )
shape = SubResource( 18 )
[connection signal="confirmed" from="Dialog/ConfirmEscape" to="." method="_on_ConfirmEscape_confirmed"]
[connection signal="input_event" from="Hidden Objects Items/fioles/sm_fiole1/AreaFiole1" to="." method="_on_fiole1_input_event"]
[connection signal="input_event" from="Hidden Objects Items/fioles/sm_fiole2/AreaFiole2" to="." method="_on_fiole2_input_event"]
[connection signal="input_event" from="Hidden Objects Items/fioles/sm_fiole_socle/sm_fiole3/AreaFiole3" to="." method="_on_fiole3_input_event"]
[connection signal="input_event" from="Hidden Objects Items/sm_dagger/Area" to="." method="_on_dagger_input_event"]
[connection signal="input_event" from="Hidden Objects Items/sm_spyglass/Area2" to="." method="_on_spyglass_input_event"]
[connection signal="input_event" from="Hidden Objects Items/sm_pinte_beer/Area3" to="." method="_on_pinte_beer_input_event"]
[connection signal="input_event" from="Hidden Objects Items/sm_weapon_gun/Area4" to="." method="_on_weapon_gun_input_event"]
[connection signal="input_event" from="Hidden Objects Items/apples/sm_apple_1/Area5" to="." method="_on_apple_1_input_event"]
[connection signal="input_event" from="Hidden Objects Items/apples/sm_apple_2/Area6" to="." method="_on_apple_2_input_event"]
[connection signal="input_event" from="Hidden Objects Items/apples/sm_apple_3/Area7" to="." method="_on_apple_3_input_event"]
[connection signal="input_event" from="Hidden Objects Items/apples/sm_apple_4/Area8" to="." method="_on_apple_4_input_event"]
[connection signal="input_event" from="Hidden Objects Items/golds/sm_stackgold_1/Area9" to="." method="_on_gold_1_input_event"]
[connection signal="input_event" from="Hidden Objects Items/golds/sm_stackgold_2/Area10" to="." method="_on_gold_2_input_event"]
[connection signal="input_event" from="Hidden Objects Items/golds/sm_stackgold_3/Area11" to="." method="_on_gold_3_input_event"]