OverviewFilesCommitsIssuesDocsReleasesPeers

godot-witchy_world_demo commits / 4e0ed7f

fixing mask issue
4e0ed7f35113c185644f528268c63f5478d12b98
by plankatron <fleeky@gmail.com> · 2022-04-27T00:19:10.000Z

Changed files (10) +97 -21

assets/maps/map_witch_island/map_witch_island.tscn +1 -17
……@@ -1,4 +1,4 @@
1[gd_scene load_steps=49 format=2]
1[gd_scene load_steps=45 format=2]
22
33[ext_resource path="res://addons/scatter/src/core/scatter_exclude_path.gd" type="Script" id=1]
44[ext_resource path="res://addons/scatter/src/core/scatter.gd" type="Script" id=2]
……@@ -9,10 +9,6 @@
99[ext_resource path="res://assets/stem.material" type="Material" id=7]
1010[ext_resource path="res://addons/zylann.hterrain/hterrain_texture_set.gd" type="Script" id=8]
1111[ext_resource path="res://addons/zylann.hterrain/hterrain_detail_layer.gd" type="Script" id=9]
12[ext_resource path="res://assets/masks/asset_laughing_goblin.tscn" type="PackedScene" id=10]
13[ext_resource path="res://assets/masks/asset_animal_mask.tscn" type="PackedScene" id=11]
14[ext_resource path="res://assets/masks/asset_ratface.tscn" type="PackedScene" id=12]
15[ext_resource path="res://assets/masks/asset_skull.tscn" type="PackedScene" id=13]
1612[ext_resource path="res://assets/emit_blue.material" type="Material" id=14]
1713[ext_resource path="res://addons/zylann.hterrain_demo/terrain_data/data.hterrain" type="Resource" id=15]
1814[ext_resource path="res://assets/skull.tscn" type="PackedScene" id=16]
……@@ -5279,18 +5275,6 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 198.682, 22.4978, 283.284 )
52795275[node name="pedestal2" parent="." instance=ExtResource( 28 )]
52805276transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 217.473, 22.4978, 282.737 )
52815277
5282[node name="asset_laughing_goblin" parent="." instance=ExtResource( 10 )]
5283transform = Transform( 0.909447, 0, 0.415821, 0, 1, 0, -0.415821, 0, 0.909447, 207.304, 24.9699, 274.073 )
5284
5285[node name="asset_animal_mask" parent="." instance=ExtResource( 11 )]
5286transform = Transform( 0.99986, 0, 0.0167372, 0, 1, 0, -0.0167372, 0, 0.99986, 217.54, 24.6245, 282.759 )
5287
5288[node name="asset_ratface" parent="." instance=ExtResource( 12 )]
5289transform = Transform( 0.966165, 0, -0.257925, 0, 1, 0, 0.257925, 0, 0.966165, 198.87, 24.5303, 282.999 )
5290
5291[node name="asset_skull" parent="." instance=ExtResource( 13 )]
5292transform = Transform( 0.985682, 0, -0.16861, 0, 1, 0, 0.16861, 0, 0.985682, 215.262, 25.1858, 289.518 )
5293
52945278[node name="Fire" parent="." instance=ExtResource( 29 )]
52955279transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 217.482, 26.7895, 282.505 )
52965280
game/map_decorations/map_mask_animal.tscn +21 -0
……@@ -0,0 +1,21 @@
1[gd_scene load_steps=4 format=2]
2
3[ext_resource path="res://game/player/masks/mask_world_script.gd" type="Script" id=1]
4[ext_resource path="res://assets/masks/asset_animal_mask.tscn" type="PackedScene" id=2]
5
6[sub_resource type="SphereShape" id=1]
7radius = 0.05
8
9[node name="mask_animal" type="Spatial"]
10script = ExtResource( 1 )
11
12[node name="asset_animal_mask" parent="." instance=ExtResource( 2 )]
13transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -0.024631, 0, 1.07666e-09 )
14
15[node name="Area" type="Area" parent="."]
16
17[node name="CollisionShape" type="CollisionShape" parent="Area"]
18transform = Transform( -8.48619, 0, -8.74228e-07, 0, 8.12711, 0, 7.41886e-07, 0, -10, 0, 0.41426, -1.07666e-09 )
19shape = SubResource( 1 )
20
21[connection signal="body_entered" from="Area" to="." method="_on_Area_body_entered"]
game/map_decorations/map_mask_laughing_goblin.tscn +21 -0
……@@ -0,0 +1,21 @@
1[gd_scene load_steps=4 format=2]
2
3[ext_resource path="res://assets/masks/asset_laughing_goblin.tscn" type="PackedScene" id=1]
4[ext_resource path="res://game/player/masks/mask_world_script.gd" type="Script" id=2]
5
6[sub_resource type="SphereShape" id=1]
7radius = 0.05
8
9[node name="mask_laughing_goblin" type="Spatial"]
10script = ExtResource( 2 )
11
12[node name="asset_laughing_goblin" parent="." instance=ExtResource( 1 )]
13transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -2.61758e-10, 0, -0.00598833 )
14
15[node name="Area" type="Area" parent="."]
16
17[node name="CollisionShape" type="CollisionShape" parent="Area"]
18transform = Transform( -8, 0, -6.99382e-07, 0, 8.9737, 0, 6.99382e-07, 0, -8, 2.61758e-10, 0.441673, 0 )
19shape = SubResource( 1 )
20
21[connection signal="body_entered" from="Area" to="." method="_on_Area_body_entered"]
game/map_decorations/map_mask_ratface.tscn +21 -0
……@@ -0,0 +1,21 @@
1[gd_scene load_steps=4 format=2]
2
3[ext_resource path="res://assets/masks/asset_ratface.tscn" type="PackedScene" id=1]
4[ext_resource path="res://game/player/masks/mask_world_script.gd" type="Script" id=2]
5
6[sub_resource type="SphereShape" id=1]
7radius = 0.05
8
9[node name="mask_ratface" type="Spatial"]
10script = ExtResource( 2 )
11
12[node name="asset_ratface" parent="." instance=ExtResource( 1 )]
13transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 2.69032e-10, 0, 0.00615473 )
14
15[node name="Area" type="Area" parent="."]
16
17[node name="CollisionShape" type="CollisionShape" parent="Area"]
18transform = Transform( -0.702435, 0, -8.74228e-08, 0, 1, 0, 6.14088e-08, 0, -1, -2.69032e-10, 0.0282457, 0 )
19shape = SubResource( 1 )
20
21[connection signal="body_entered" from="Area" to="." method="_on_Area_body_entered"]
game/map_decorations/map_mask_skull.tscn +21 -0
……@@ -0,0 +1,21 @@
1[gd_scene load_steps=4 format=2]
2
3[ext_resource path="res://game/player/masks/mask_world_script.gd" type="Script" id=1]
4[ext_resource path="res://assets/masks/asset_skull.tscn" type="PackedScene" id=2]
5
6[sub_resource type="SphereShape" id=1]
7radius = 0.05
8
9[node name="mask_skull" type="Spatial"]
10script = ExtResource( 1 )
11
12[node name="asset_skull" parent="." instance=ExtResource( 2 )]
13transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0 )
14
15[node name="Area" type="Area" parent="."]
16
17[node name="CollisionShape" type="CollisionShape" parent="Area"]
18transform = Transform( -6.91679, 0, -8.35889e-07, 0, 6.44877, 0, 6.04685e-07, 0, -9.56146, 0, 0.0420572, 0 )
19shape = SubResource( 1 )
20
21[connection signal="body_entered" from="Area" to="." method="_on_Area_body_entered"]
game/maps/map_witch_island/map_witch_island.scn +0 -0
(no content changes — binary or rename)
game/player/masks/mask_animal.tscn +3 -1
……@@ -10,11 +10,13 @@ radius = 0.05
1010script = ExtResource( 2 )
1111
1212[node name="asset_animal_mask" parent="." instance=ExtResource( 1 )]
13transform = Transform( -0.182, 0, -2.74812e-08, -6.8984e-09, 0.176173, 0.045686, 2.66013e-08, 0.045686, -0.176173, 0.000179345, -0.0357624, 0.0657877 )
1314
1415[node name="Area" type="Area" parent="."]
16transform = Transform( 0.182, 0, 0, 0, 0.176173, -0.045686, 0, 0.045686, 0.176173, 0.0248103, -0.0357624, 0.0657877 )
1517
1618[node name="CollisionShape" type="CollisionShape" parent="Area"]
17transform = Transform( 8.48619, 0, 0, 0, 8.12711, 0, 0, 0, 10, -0.024631, 0.41426, 0 )
19transform = Transform( -0.182, 0, -2.74812e-08, 0, 0.182, 0, 2.74812e-08, 0, -0.182, 0, 0.41426, -1.07666e-09 )
1820shape = SubResource( 1 )
1921
2022[connection signal="body_entered" from="Area" to="." method="_on_Area_body_entered"]
game/player/masks/mask_laughing_goblin.tscn +3 -1
……@@ -10,11 +10,13 @@ radius = 0.05
1010script = ExtResource( 2 )
1111
1212[node name="asset_laughing_goblin" parent="." instance=ExtResource( 1 )]
13transform = Transform( -0.182, 0, -2.74812e-08, -8.87578e-09, 0.172246, 0.0587816, 2.60084e-08, 0.0587816, -0.172246, -2.61758e-10, -0.0733041, 0.0521224 )
1314
1415[node name="Area" type="Area" parent="."]
16transform = Transform( 0.182, 0, 0, 0, 0.172246, -0.0587816, 0, 0.0587816, 0.172246, 0, -0.0752382, 0.0577898 )
1517
1618[node name="CollisionShape" type="CollisionShape" parent="Area"]
17transform = Transform( 8, 0, 0, 0, 8.9737, 0, 0, 0, 8, 0, 0.441673, -0.00598833 )
19transform = Transform( -0.182, 0, -2.74812e-08, 0, 0.182, 0, 2.74812e-08, 0, -0.182, 2.61758e-10, 0.441673, 0 )
1820shape = SubResource( 1 )
1921
2022[connection signal="body_entered" from="Area" to="." method="_on_Area_body_entered"]
game/player/masks/mask_ratface.tscn +3 -1
……@@ -10,11 +10,13 @@ radius = 0.05
1010script = ExtResource( 2 )
1111
1212[node name="asset_ratface" parent="." instance=ExtResource( 1 )]
13transform = Transform( -0.182, 0, -2.74812e-08, -8.03198e-09, 0.174053, 0.0531934, 2.62813e-08, 0.0531934, -0.174053, 2.69032e-10, 0.0118691, 0.0606859 )
1314
1415[node name="Area" type="Area" parent="."]
16transform = Transform( 0.182, 0, 0, 0, 0.174053, -0.0531934, 0, 0.0531934, 0.174053, 0, 0.0136679, 0.0547999 )
1517
1618[node name="CollisionShape" type="CollisionShape" parent="Area"]
17transform = Transform( 0.702435, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0282457, 0.00615473 )
19transform = Transform( -0.182, 0, -2.74812e-08, 0, 0.182, 0, 2.74812e-08, 0, -0.182, -2.69032e-10, 0.0282457, 0 )
1820shape = SubResource( 1 )
1921
2022[connection signal="body_entered" from="Area" to="." method="_on_Area_body_entered"]
game/player/masks/mask_skull.tscn +3 -1
……@@ -10,11 +10,13 @@ radius = 0.05
1010script = ExtResource( 2 )
1111
1212[node name="asset_skull" parent="." instance=ExtResource( 1 )]
13transform = Transform( -0.182, 0, -2.74812e-08, -1.03191e-08, 0.168682, 0.0683404, 2.54703e-08, 0.0683404, -0.168682, 0, 0.0515466, 0.0346236 )
1314
1415[node name="Area" type="Area" parent="."]
16transform = Transform( 0.182, 0, 0, 0, 0.168682, -0.0683404, 0, 0.0683404, 0.168682, 0, 0.0515466, 0.0346236 )
1517
1618[node name="CollisionShape" type="CollisionShape" parent="Area"]
17transform = Transform( 6.91679, 0, 0, 0, 6.44877, 0, 0, 0, 9.56146, 0, 0.0420572, 0 )
19transform = Transform( -0.182, 0, -2.74812e-08, 0, 0.182, 0, 2.74812e-08, 0, -0.182, 0, 0.0420572, 0 )
1820shape = SubResource( 1 )
1921
2022[connection signal="body_entered" from="Area" to="." method="_on_Area_body_entered"]