OverviewFilesCommitsIssuesDocsReleasesPeers

godot-witchy_world_demo commits / c1bd74b

more updates for masks
c1bd74b27ffaa503df4c48f441026888dbdf318a
by Dresk Spidflisk <dreskspidflisk@gmail.com> · 2022-04-22T17:22:56.000Z

Changed files (8) +27 -12

assets/maps/map_witch_island/map_witch_island.tscn +18 -11
……@@ -180,6 +180,7 @@ shader_params/u_colormap_opacity_per_texture = Plane( 1, 1, 1, 1 )
180180
181181[node name="HTerrainDetailLayer" type="Spatial" parent="HTerrain"]
182182transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -11.6564, 4.60907, 20.7092 )
183visible = false
183184script = ExtResource( 9 )
184185texture = ExtResource( 25 )
185186view_distance = 61.622
……@@ -241,6 +242,7 @@ __meta__ = {
241242
242243[node name="Scatter" type="Path" parent="."]
243244transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 2.181, 10.0446, 1.706 )
245visible = false
244246curve = SubResource( 7 )
245247script = ExtResource( 2 )
246248use_instancing = false
……@@ -625,7 +627,7 @@ transform = Transform( 0.161576, 0.0119116, 0.391825, -0.0378244, 0.4223, 0.0027
625627transform = Transform( -0.287873, -0.000350514, 0.311296, 0.0213296, 0.422981, 0.0202009, -0.310565, 0.0293752, -0.287163, 344.636, -3.82398, 386.534 )
626628
627629[node name="pine_tree_low_poly121" parent="Scatter/ScatterItem/Duplicates" instance=ExtResource( 6 )]
628transform = Transform( 0.359816, -0.0219618, 0.223218, 0.0408281, 0.421326, -0.0243596, -0.220548, 0.0421664, 0.359661, 125.911, -4.70231, 79.4263 )
630transform = Transform( 0.359816, -0.0219618, 0.223218, 0.0408281, 0.421326, -0.0243596, -0.220549, 0.0421664, 0.359661, 125.911, -4.70231, 79.4263 )
629631
630632[node name="pine_tree_low_poly122" parent="Scatter/ScatterItem/Duplicates" instance=ExtResource( 6 )]
631633transform = Transform( 0.0679337, 0.00548298, -0.418487, -0.0049291, 0.423945, 0.00475435, 0.418493, 0.00410326, 0.0679886, 189.258, -0.314874, 162.346 )
……@@ -731,6 +733,7 @@ transform = Transform( 0.305692, 0.0152203, -0.293422, -0.0316868, 0.422669, -0.
731733
732734[node name="Scatter3" type="Path" parent="."]
733735transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 2.181, 45.5965, 1.706 )
736visible = false
734737curve = SubResource( 12 )
735738script = ExtResource( 2 )
736739use_instancing = false
……@@ -872,7 +875,7 @@ transform = Transform( -0.0128577, -0.000675714, 0.423804, -0.00710339, 0.42394,
872875transform = Transform( 0.101922, 0.00612874, -0.411522, -0.0169522, 0.423656, 0.00211088, 0.411218, 0.0159459, 0.102084, 294.577, -2.41509, 444.945 )
873876
874877[node name="pine_tree_low_poly40" parent="Scatter3/ScatterItem/Duplicates" instance=ExtResource( 6 )]
875transform = Transform( 0.0308392, -0.000460159, -0.422877, 0.0383376, 0.422257, 0.00233637, 0.421136, -0.038406, 0.030754, 320.715, -4.06546, 374.833 )
878transform = Transform( 0.0308392, -0.000460162, -0.422877, 0.0383376, 0.422257, 0.00233637, 0.421136, -0.038406, 0.030754, 320.715, -4.06546, 374.833 )
876879
877880[node name="pine_tree_low_poly41" parent="Scatter3/ScatterItem/Duplicates" instance=ExtResource( 6 )]
878881transform = Transform( 0.0532052, 0.0038319, -0.420631, -0.0092953, 0.42389, 0.00268582, 0.420546, 0.00888442, 0.0532754, 131.894, -5.76264, 238.649 )
……@@ -914,7 +917,7 @@ transform = Transform( -0.31824, -0.00402851, 0.280148, -0.0212566, 0.423081, -0
914917transform = Transform( 0.42263, -0.0283138, 0.0189172, 0.0276952, 0.422857, 0.0141605, -0.0198118, -0.0128791, 0.423341, 152.328, -0.110828, 335.982 )
915918
916919[node name="pine_tree_low_poly54" parent="Scatter3/ScatterItem/Duplicates" instance=ExtResource( 6 )]
917transform = Transform( 0.419564, -0.0294815, -0.0536032, 0.0324807, 0.422179, 0.022037, 0.0518407, -0.0259127, 0.42002, 159.635, 1.23309, 325.687 )
920transform = Transform( 0.419564, -0.0294815, -0.0536031, 0.0324807, 0.422179, 0.022037, 0.0518407, -0.0259127, 0.42002, 159.635, 1.23309, 325.687 )
918921
919922[node name="pine_tree_low_poly55" parent="Scatter3/ScatterItem/Duplicates" instance=ExtResource( 6 )]
920923transform = Transform( 0.16747, 0.0142112, 0.389266, -0.0490875, 0.42111, 0.00574471, -0.38642, -0.0473353, 0.167974, 99.3361, 0.809784, 336.627 )
……@@ -989,7 +992,7 @@ transform = Transform( 0.0407202, 0.0022665, 0.422034, -0.0490658, 0.421144, 0.0
989992transform = Transform( -0.280312, -0.00707842, -0.318042, -0.0284789, 0.422751, 0.0156916, 0.316844, 0.0317359, -0.279962, 176.5, -10.7221, 371.458 )
990993
991994[node name="pine_tree_low_poly79" parent="Scatter3/ScatterItem/Duplicates" instance=ExtResource( 6 )]
992transform = Transform( -0.198251, -0.00821753, 0.374707, -0.0315729, 0.422757, -0.00743338, -0.373464, -0.0313779, -0.198282, 179.917, -3.31704, 357.657 )
995transform = Transform( -0.198251, -0.00821753, 0.374707, -0.0315729, 0.422757, -0.00743337, -0.373464, -0.0313779, -0.198282, 179.917, -3.31704, 357.657 )
993996
994997[node name="pine_tree_low_poly80" parent="Scatter3/ScatterItem/Duplicates" instance=ExtResource( 6 )]
995998transform = Transform( 0.362607, 0.00652282, -0.219658, -0.00224475, 0.423901, 0.0088823, 0.219743, -0.00643327, 0.362557, 130.226, -6.67784, 321.284 )
……@@ -1496,7 +1499,7 @@ transform = Transform( -0.406948, 0.0157089, -0.117995, 0.01645, 0.423681, -0.00
14961499transform = Transform( 0.258635, 0.0217903, -0.335274, -0.0459698, 0.421423, -0.00807246, 0.332822, 0.0412743, 0.259426, 130.401, -1.37271, 175.259 )
14971500
14981501[node name="pine_tree_low_poly248" parent="Scatter3/ScatterItem/Duplicates" instance=ExtResource( 6 )]
1499transform = Transform( 0.413032, 0.0169847, -0.0942975, -0.0205545, 0.423277, -0.0137908, 0.0935842, 0.0180054, 0.413151, 93.4774, -7.87867, 179.069 )
1502transform = Transform( 0.413032, 0.0169847, -0.0942974, -0.0205545, 0.423277, -0.0137908, 0.0935842, 0.0180054, 0.413151, 93.4774, -7.87867, 179.069 )
15001503
15011504[node name="pine_tree_low_poly249" parent="Scatter3/ScatterItem/Duplicates" instance=ExtResource( 6 )]
15021505transform = Transform( 0.344939, 0.0221212, 0.245568, -0.0338739, 0.422538, 0.00951836, -0.244224, -0.0273623, 0.345517, 171.709, -2.45223, 349.399 )
……@@ -1841,7 +1844,7 @@ transform = Transform( 0.155085, 0.00148407, -0.394617, 0.0267339, 0.422983, 0.0
18411844transform = Transform( 0.104658, -0.0062503, 0.410833, 0.00224353, 0.423953, 0.00587839, -0.410874, 0.000722867, 0.104679, 115.827, -9.24745, 361.874 )
18421845
18431846[node name="pine_tree_low_poly363" parent="Scatter3/ScatterItem/Duplicates" instance=ExtResource( 6 )]
1844transform = Transform( 0.0894423, 0.000952111, 0.414458, -0.0348381, 0.422516, 0.00654764, -0.412992, -0.0354352, 0.0892074, 104.389, -2.74653, 135.018 )
1847transform = Transform( 0.0894423, 0.000952111, 0.414458, -0.0348381, 0.422516, 0.00654763, -0.412992, -0.0354352, 0.0892074, 104.389, -2.74653, 135.018 )
18451848
18461849[node name="pine_tree_low_poly364" parent="Scatter3/ScatterItem/Duplicates" instance=ExtResource( 6 )]
18471850transform = Transform( 0.317883, -0.0144399, -0.280211, 0.0053234, 0.423672, -0.0157937, 0.280532, 0.00832285, 0.317818, 99.1205, -7.09511, 116.711 )
……@@ -2076,6 +2079,7 @@ transform = Transform( 0.345936, -0.00990223, 0.244961, -0.00642973, 0.423142, 0
20762079
20772080[node name="Scatter2" type="Path" parent="."]
20782081transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 27.987, 1.642 )
2082visible = false
20792083curve = SubResource( 14 )
20802084script = ExtResource( 2 )
20812085use_instancing = false
……@@ -3039,7 +3043,7 @@ transform = Transform( 0.259654, -0.00912148, 0.335071, 0.0255009, 0.423152, -0.
30393043transform = Transform( 0.394032, -0.0343085, -0.152767, 0.0293415, 0.422547, -0.0192153, 0.153799, 0.00728538, 0.395056, 322.658, 3.5054, 351.991 )
30403044
30413045[node name="pine_tree_low_poly314" parent="Scatter2/ScatterItem/Duplicates" instance=ExtResource( 6 )]
3042transform = Transform( 0.413032, 0.0169847, -0.0942975, -0.0205545, 0.423277, -0.0137908, 0.0935842, 0.0180054, 0.413151, 187.971, -2.95747, 296.78 )
3046transform = Transform( 0.413032, 0.0169847, -0.0942974, -0.0205545, 0.423277, -0.0137908, 0.0935842, 0.0180054, 0.413151, 187.971, -2.95747, 296.78 )
30433047
30443048[node name="pine_tree_low_poly315" parent="Scatter2/ScatterItem/Duplicates" instance=ExtResource( 6 )]
30453049transform = Transform( 0.119565, -0.0081744, 0.40671, 0.00488836, 0.423913, 0.00708306, -0.406763, 0.00269165, 0.119635, 157.401, -2.14618, 239.921 )
……@@ -3216,7 +3220,7 @@ transform = Transform( 0.273425, -0.0216927, -0.323333, 0.0565535, 0.419751, 0.0
32163220transform = Transform( -0.253425, -0.00450058, -0.339899, -0.00707384, 0.423941, -0.000339198, 0.339856, 0.005468, -0.253465, 163.194, 1.42666, 264.972 )
32173221
32183222[node name="pine_tree_low_poly373" parent="Scatter2/ScatterItem/Duplicates" instance=ExtResource( 6 )]
3219transform = Transform( 0.288715, 0.0194376, -0.309907, -0.0203345, 0.423444, 0.00761475, 0.309849, 0.0096776, 0.289268, 185.287, 0.515503, 384.348 )
3223transform = Transform( 0.288714, 0.0194376, -0.309907, -0.0203345, 0.423444, 0.00761475, 0.309849, 0.0096776, 0.289268, 185.287, 0.515503, 384.348 )
32203224
32213225[node name="pine_tree_low_poly374" parent="Scatter2/ScatterItem/Duplicates" instance=ExtResource( 6 )]
32223226transform = Transform( -0.250189, -0.00254164, -0.342308, -0.0281088, 0.422709, 0.0174058, 0.341162, 0.0329637, -0.249596, 69.9587, -1.82635, 150.099 )
……@@ -3327,7 +3331,7 @@ transform = Transform( 0.420386, 0.00279187, -0.0551691, -0.00422862, 0.423842,
33273331transform = Transform( 0.360477, 0.0252092, 0.221804, -0.0423825, 0.421354, 0.0209911, -0.219171, -0.0400174, 0.360747, 319.557, 3.02456, 346.85 )
33283332
33293333[node name="pine_tree_low_poly410" parent="Scatter2/ScatterItem/Duplicates" instance=ExtResource( 6 )]
3330transform = Transform( 0.402002, 0.0298418, 0.131454, -0.0325189, 0.422737, 0.00347995, -0.130817, -0.0133813, 0.403093, 125.854, 1.61266, 142.481 )
3334transform = Transform( 0.402002, 0.0298418, 0.131454, -0.0325189, 0.422737, 0.00347994, -0.130817, -0.0133813, 0.403093, 125.854, 1.61266, 142.481 )
33313335
33323336[node name="pine_tree_low_poly411" parent="Scatter2/ScatterItem/Duplicates" instance=ExtResource( 6 )]
33333337transform = Transform( 0.421728, 0.012996, 0.0418639, -0.0127194, 0.423795, -0.00342806, -0.0419488, 0.00215383, 0.421914, 329.213, -0.608349, 342.824 )
……@@ -3600,7 +3604,7 @@ transform = Transform( -0.401771, -0.0203674, -0.133946, -0.0277066, 0.422674, 0
36003604transform = Transform( -0.0199023, 0.000512618, 0.423532, 0.0177659, 0.423628, 0.000322109, -0.42316, 0.0177615, -0.0199063, 84.2958, -3.49413, 121.361 )
36013605
36023606[node name="pine_tree_low_poly501" parent="Scatter2/ScatterItem/Duplicates" instance=ExtResource( 6 )]
3603transform = Transform( -0.312774, -0.00292363, -0.286252, -0.0242028, 0.42273, 0.0221277, 0.285241, 0.0326628, -0.312004, 335.343, -2.43354, 455.105 )
3607transform = Transform( -0.312774, -0.00292363, -0.286251, -0.0242028, 0.42273, 0.0221277, 0.285241, 0.0326628, -0.312004, 335.343, -2.43354, 455.105 )
36043608
36053609[node name="pine_tree_low_poly502" parent="Scatter2/ScatterItem/Duplicates" instance=ExtResource( 6 )]
36063610transform = Transform( -0.111726, -0.00330196, -0.409002, 0.0218789, 0.423331, -0.00939421, 0.40843, -0.0235803, -0.111379, 147.875, -1.23943, 243.103 )
……@@ -3918,6 +3922,7 @@ __meta__ = {
39183922
39193923[node name="Scatter4" type="Path" parent="."]
39203924transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 23.579, 0 )
3925visible = false
39213926curve = SubResource( 21 )
39223927script = ExtResource( 2 )
39233928use_instancing = false
……@@ -4337,7 +4342,7 @@ __meta__ = {
43374342}
43384343
43394344[node name="light_post13" type="Spatial" parent="Scatter4/ScatterItem/Duplicates"]
4340transform = Transform( -0.4109, 0.0335895, -0.911061, 0, 0.999321, 0.0368435, 0.91168, 0.015139, -0.410621, 223.582, -2.18549, 276.812 )
4345transform = Transform( -0.4109, 0.0335895, -0.911061, 0, 0.999321, 0.0368435, 0.91168, 0.015139, -0.410621, 223.582, -2.18549, 276.813 )
43414346
43424347[node name="Cube" type="MeshInstance" parent="Scatter4/ScatterItem/Duplicates/light_post13"]
43434348mesh = SubResource( 17 )
……@@ -4639,6 +4644,7 @@ script = ExtResource( 1 )
46394644
46404645[node name="Scatter6" type="Path" parent="."]
46414646transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 23.579, 0 )
4647visible = false
46424648curve = SubResource( 24 )
46434649script = ExtResource( 2 )
46444650use_instancing = false
……@@ -5162,6 +5168,7 @@ script = ExtResource( 1 )
51625168
51635169[node name="Scatter5" type="Path" parent="."]
51645170transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 23.579, 0 )
5171visible = false
51655172curve = SubResource( 23 )
51665173script = ExtResource( 2 )
51675174use_instancing = false
assets/masks/asset_laughing_goblin.tscn +1 -0
……@@ -14,3 +14,4 @@ radius = 0.05
1414[node name="CollisionShape" type="CollisionShape" parent="laughgoblin/StaticBody"]
1515transform = Transform( 8, 0, 0, 0, 8.9737, 0, 0, 0, 8, 0, 0.441673, -0.00598833 )
1616shape = SubResource( 1 )
17disabled = true
assets/masks/asset_skull.tscn +1 -0
……@@ -15,3 +15,4 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.0384328, 0 )
1515[node name="CollisionShape" type="CollisionShape" parent="skull/StaticBody"]
1616transform = Transform( 6.91679, 0, 0, 0, 6.44877, 0, 0, 0, 9.56146, 0, 0.0420572, 0 )
1717shape = SubResource( 1 )
18disabled = true
assets/models/night_ghost/night_ghost.scn +0 -0
(no content changes — binary or rename)
game/maps/map_witch_island/map_witch_island.scn +0 -0
(no content changes — binary or rename)
game/player/masks/mask_world_script.gd +2 -1
……@@ -35,7 +35,8 @@ func getMaskName() -> String:
3535 return self.name.substr(4, -1)
3636
3737func DisableCollisionShape():
38 collisionShape.disabled = true
38 #collisionShape.disabled = true
39 pass
3940
4041
4142# Called every frame. 'delta' is the elapsed time since the previous frame.
game/player/player_core.gd +4 -0
……@@ -391,3 +391,7 @@ func playerCoreNetworkDataUpdate_Types(_translation : Vector3, _currentDirection
391391 self.translation = _translation
392392 self.currentDirection = _currentDirection
393393 self.kinematicVelocity = _kinematicVelocity
394
395
396func _on_Input_player_remove_mask():
397 pass # Replace with function body.
game/player/player_core_local.tscn +1 -0
……@@ -34,5 +34,6 @@ far = 8192.0
3434[connection signal="player_jump" from="Input" to="." method="_on_Input_player_jump"]
3535[connection signal="player_mousemotion_event" from="Input" to="." method="_on_Input_player_mousemotion_event"]
3636[connection signal="player_move" from="Input" to="." method="_on_Input_player_move"]
37[connection signal="player_remove_mask" from="Input" to="." method="_on_Input_player_remove_mask"]
3738[connection signal="player_restore_origin" from="Input" to="." method="_on_Input_player_restore_origin"]
3839[connection signal="player_toggle_light" from="Input" to="." method="_on_Input_player_toggle_light"]