mkey sound and level design adjustments
This commit is contained in:
parent
3cfcc4eef7
commit
624739a970
8 changed files with 29 additions and 11 deletions
BIN
audio/sounds/mkey.ogg
Normal file
BIN
audio/sounds/mkey.ogg
Normal file
Binary file not shown.
15
audio/sounds/mkey.ogg.import
Normal file
15
audio/sounds/mkey.ogg.import
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
[remap]
|
||||||
|
|
||||||
|
importer="ogg_vorbis"
|
||||||
|
type="AudioStreamOGGVorbis"
|
||||||
|
path="res://.import/mkey.ogg-7944854b21b3d16eba279472b4dd6c34.oggstr"
|
||||||
|
|
||||||
|
[deps]
|
||||||
|
|
||||||
|
source_file="res://audio/sounds/mkey.ogg"
|
||||||
|
dest_files=[ "res://.import/mkey.ogg-7944854b21b3d16eba279472b4dd6c34.oggstr" ]
|
||||||
|
|
||||||
|
[params]
|
||||||
|
|
||||||
|
loop=false
|
||||||
|
loop_offset=0
|
|
@ -43,6 +43,7 @@ const a_fail_shard = preload("res://audio/sounds/fail_shard.ogg")
|
||||||
const a_final_score = preload("res://audio/sounds/final_score.ogg")
|
const a_final_score = preload("res://audio/sounds/final_score.ogg")
|
||||||
const a_land = preload("res://audio/sounds/land.ogg")
|
const a_land = preload("res://audio/sounds/land.ogg")
|
||||||
const a_teleport = preload("res://audio/sounds/teleport.ogg")
|
const a_teleport = preload("res://audio/sounds/teleport.ogg")
|
||||||
|
const a_mkey = preload("res://audio/sounds/mkey.ogg")
|
||||||
|
|
||||||
var loop_section = null
|
var loop_section = null
|
||||||
var has_looped = false
|
var has_looped = false
|
||||||
|
|
|
@ -34,6 +34,8 @@ func _physics_process(delta):
|
||||||
#DEBUG
|
#DEBUG
|
||||||
if debug == true && !entry && !entry_index > 0:
|
if debug == true && !entry && !entry_index > 0:
|
||||||
#Move player to mouse
|
#Move player to mouse
|
||||||
|
if Input.is_action_just_pressed("debug_move_player"):
|
||||||
|
Audio.play_sound(Audio.a_mkey,Audio.ac_jump)
|
||||||
if Input.is_action_pressed("debug_move_player"):
|
if Input.is_action_pressed("debug_move_player"):
|
||||||
var nodes = get_tree().get_nodes_in_group("player")
|
var nodes = get_tree().get_nodes_in_group("player")
|
||||||
if not nodes.empty():
|
if not nodes.empty():
|
||||||
|
|
|
@ -32,6 +32,9 @@ __meta__ = {
|
||||||
"_edit_lock_": true
|
"_edit_lock_": true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[node name="2600" parent="." instance=ExtResource( 15 )]
|
||||||
|
position = Vector2( 152, 8 )
|
||||||
|
|
||||||
[node name="Ground" type="Node2D" parent="."]
|
[node name="Ground" type="Node2D" parent="."]
|
||||||
|
|
||||||
[node name="TileMap" type="TileMap" parent="Ground" groups=["can_stain"]]
|
[node name="TileMap" type="TileMap" parent="Ground" groups=["can_stain"]]
|
||||||
|
@ -40,7 +43,7 @@ material = ExtResource( 9 )
|
||||||
tile_set = ExtResource( 1 )
|
tile_set = ExtResource( 1 )
|
||||||
cell_size = Vector2( 8, 8 )
|
cell_size = Vector2( 8, 8 )
|
||||||
format = 1
|
format = 1
|
||||||
tile_data = PoolIntArray( 65535, 0, 0, 131071, 0, 0, 196607, 0, 0, 262143, 0, 0, 327679, 0, 0, 393215, 0, 0, 327692, 0, 0, 327693, 0, 0, 327694, 0, 0, 327695, 0, 0, 458751, 0, 0, 524287, 0, 0, 458763, 0, 131074, 458764, 0, 131074, 458765, 0, 131074, 458766, 0, 131074, 589823, 0, 0, 524298, 0, 131074, 524299, 0, 131074, 524300, 0, 131074, 524301, 0, 131074, 524302, 0, 131074, 655359, 0, 0, 589829, 0, 0, 589830, 0, 0, 589833, 0, 0, 589839, 0, 131074, 589840, 0, 131074, 720895, 0, 0, 655376, 0, 131074, 786431, 0, 0, 720909, 0, 131074, 720910, 0, 131074, 720911, 0, 131074, 720912, 0, 131074, 851967, 0, 0, 786447, 0, 131074, 917503, 0, 0, 851971, 0, 0, 851972, 0, 0, 851973, 0, 0, 851974, 0, 0, 851977, 0, 0, 851978, 0, 0, 851979, 0, 0, 983039, 0, 0, 1048575, 0, 0, 983040, 0, 0, 1114111, 0, 0, 1048576, 0, 0, 1048577, 0, 0, 1048583, 0, 131074, 1179647, 0, 0, 1114112, 0, 0, 1114113, 0, 0, 1114114, 0, 0, 1114119, 0, 131074, 1245183, 0, 0, 1179650, 0, 0, 1179651, 0, 0, 1179652, 0, 0, 1179653, 0, 0, 1179654, 0, 0, 1179655, 0, 0, 1179656, 0, 0, 1179657, 0, 0, 1310719, 0, 0, 1376255, 0, 0, 1310734, 0, 0, 1310735, 0, 0, 1441791, 0, 0, 1507327, 0, 0, 1441792, 0, 1, 1441793, 0, 2, 1441794, 0, 2, 1441795, 0, 2, 1441796, 0, 2, 1441797, 0, 2, 1441798, 0, 2, 1441799, 0, 2, 1441800, 0, 2, 1441801, 0, 2, 1441802, 0, 2, 1441803, 0, 2, 1441804, 0, 2, 1441805, 0, 2, 1441806, 0, 2, 1441807, 0, 2, 1441808, 0, 2, 1441809, 0, 2, 1441810, 0, 2, 1441811, 0, 2, 1441812, 0, 2, 1441813, 0, 2, 1441814, 0, 2, 1441815, 0, 2, 1441816, 0, 2, 1441817, 0, 2, 1441818, 0, 2, 1441819, 0, 2, 1441820, 0, 2, 1441821, 0, 2, 1441822, 0, 2, 1441823, 0, 3, 1572863, 0, 0, 1507328, 0, 65536, 1507329, 0, 0, 1507330, 0, 65536, 1507331, 0, 0, 1507332, 0, 65536, 1507333, 0, 0, 1507334, 0, 65536, 1507335, 0, 0, 1507336, 0, 65536, 1507337, 0, 0, 1507338, 0, 65536, 1507339, 0, 0, 1507340, 0, 65536, 1507341, 0, 0, 1507342, 0, 65536, 1507343, 0, 0, 1507344, 0, 65536, 1507345, 0, 0, 1507346, 0, 65536, 1507347, 0, 0, 1507348, 0, 65536, 1507349, 0, 0, 1507350, 0, 65536, 1507351, 0, 0, 1507352, 0, 65536, 1507353, 0, 0, 1507354, 0, 65536, 1507355, 0, 0, 1507356, 0, 65536, 1507357, 0, 0, 1507358, 0, 65536, 1507359, 0, 0 )
|
tile_data = PoolIntArray( 65535, 0, 0, 131071, 0, 0, 196607, 0, 0, 262143, 0, 0, 327679, 0, 0, 393215, 0, 0, 458751, 0, 0, 393228, 0, 0, 393229, 0, 0, 393230, 0, 0, 393231, 0, 0, 524287, 0, 0, 458763, 0, 131074, 458764, 0, 131074, 458765, 0, 131074, 458766, 0, 131074, 589823, 0, 0, 524298, 0, 131074, 524299, 0, 131074, 524300, 0, 131074, 524301, 0, 131074, 524302, 0, 131074, 655359, 0, 0, 589829, 0, 0, 589830, 0, 0, 589833, 0, 0, 589839, 0, 131074, 589840, 0, 131074, 720895, 0, 0, 655376, 0, 131074, 786431, 0, 0, 720909, 0, 131074, 720910, 0, 131074, 720911, 0, 131074, 720912, 0, 131074, 851967, 0, 0, 786447, 0, 131074, 917503, 0, 0, 851971, 0, 0, 851972, 0, 0, 851973, 0, 0, 851974, 0, 0, 851977, 0, 0, 851978, 0, 0, 851979, 0, 0, 983039, 0, 0, 1048575, 0, 0, 983040, 0, 0, 1114111, 0, 0, 1048576, 0, 0, 1048577, 0, 0, 1048583, 0, 131074, 1179647, 0, 0, 1114112, 0, 0, 1114113, 0, 0, 1114114, 0, 0, 1114119, 0, 131074, 1245183, 0, 0, 1179650, 0, 0, 1179651, 0, 0, 1179652, 0, 0, 1179653, 0, 0, 1179654, 0, 0, 1179655, 0, 0, 1179656, 0, 0, 1179657, 0, 0, 1310719, 0, 0, 1376255, 0, 0, 1310734, 0, 0, 1310735, 0, 0, 1441791, 0, 0, 1507327, 0, 0, 1441792, 0, 1, 1441793, 0, 2, 1441794, 0, 2, 1441795, 0, 2, 1441796, 0, 2, 1441797, 0, 2, 1441798, 0, 2, 1441799, 0, 2, 1441800, 0, 2, 1441801, 0, 2, 1441802, 0, 2, 1441803, 0, 2, 1441804, 0, 2, 1441805, 0, 2, 1441806, 0, 2, 1441807, 0, 2, 1441808, 0, 2, 1441809, 0, 2, 1441810, 0, 2, 1441811, 0, 2, 1441812, 0, 2, 1441813, 0, 2, 1441814, 0, 2, 1441815, 0, 2, 1441816, 0, 2, 1441817, 0, 2, 1441818, 0, 2, 1441819, 0, 2, 1441820, 0, 2, 1441821, 0, 2, 1441822, 0, 2, 1441823, 0, 3, 1572863, 0, 0, 1507328, 0, 65536, 1507329, 0, 0, 1507330, 0, 65536, 1507331, 0, 0, 1507332, 0, 65536, 1507333, 0, 0, 1507334, 0, 65536, 1507335, 0, 0, 1507336, 0, 65536, 1507337, 0, 0, 1507338, 0, 65536, 1507339, 0, 0, 1507340, 0, 65536, 1507341, 0, 0, 1507342, 0, 65536, 1507343, 0, 0, 1507344, 0, 65536, 1507345, 0, 0, 1507346, 0, 65536, 1507347, 0, 0, 1507348, 0, 65536, 1507349, 0, 0, 1507350, 0, 65536, 1507351, 0, 0, 1507352, 0, 65536, 1507353, 0, 0, 1507354, 0, 65536, 1507355, 0, 0, 1507356, 0, 65536, 1507357, 0, 0, 1507358, 0, 65536, 1507359, 0, 0 )
|
||||||
|
|
||||||
[node name="Collapse" type="TileMap" parent="Ground" groups=["can_stain", "delete_on_collapse"]]
|
[node name="Collapse" type="TileMap" parent="Ground" groups=["can_stain", "delete_on_collapse"]]
|
||||||
light_mask = 2
|
light_mask = 2
|
||||||
|
@ -112,9 +115,6 @@ scale = Vector2( 32, 1 )
|
||||||
wait_time = 5.0
|
wait_time = 5.0
|
||||||
one_shot = true
|
one_shot = true
|
||||||
|
|
||||||
[node name="2600" parent="." instance=ExtResource( 15 )]
|
|
||||||
position = Vector2( 152, 8 )
|
|
||||||
|
|
||||||
[node name="Enemies" type="Node2D" parent="."]
|
[node name="Enemies" type="Node2D" parent="."]
|
||||||
|
|
||||||
[node name="ColorRect" type="ColorRect" parent="."]
|
[node name="ColorRect" type="ColorRect" parent="."]
|
||||||
|
@ -140,5 +140,5 @@ margin_top = 59.0
|
||||||
margin_right = 152.0
|
margin_right = 152.0
|
||||||
margin_bottom = 67.0
|
margin_bottom = 67.0
|
||||||
|
|
||||||
[connection signal="timeout" from="ExitTimer" to="." method="_on_ExitTimer_timeout"]
|
|
||||||
[connection signal="entered_phase" from="2600" to="." method="_on_2600_entered_phase"]
|
[connection signal="entered_phase" from="2600" to="." method="_on_2600_entered_phase"]
|
||||||
|
[connection signal="timeout" from="ExitTimer" to="." method="_on_ExitTimer_timeout"]
|
||||||
|
|
|
@ -435,10 +435,10 @@ position = Vector2( 128, 24 )
|
||||||
position = Vector2( 160, 24 )
|
position = Vector2( 160, 24 )
|
||||||
|
|
||||||
[node name="Gold16" parent="Collectibles" instance=ExtResource( 14 )]
|
[node name="Gold16" parent="Collectibles" instance=ExtResource( 14 )]
|
||||||
position = Vector2( 16, 80 )
|
position = Vector2( 40, 32 )
|
||||||
|
|
||||||
[node name="Gold17" parent="Collectibles" instance=ExtResource( 14 )]
|
[node name="Gold17" parent="Collectibles" instance=ExtResource( 14 )]
|
||||||
position = Vector2( 32, 80 )
|
position = Vector2( 56, 32 )
|
||||||
|
|
||||||
[node name="Gold14" parent="Collectibles" instance=ExtResource( 14 )]
|
[node name="Gold14" parent="Collectibles" instance=ExtResource( 14 )]
|
||||||
position = Vector2( 40, 56 )
|
position = Vector2( 40, 56 )
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -48,6 +48,6 @@ margin_right = 215.0
|
||||||
margin_bottom = 65.0
|
margin_bottom = 65.0
|
||||||
custom_fonts/font = ExtResource( 2 )
|
custom_fonts/font = ExtResource( 2 )
|
||||||
text = "Squig:
|
text = "Squig:
|
||||||
A disgusting combination of squid and pig. It's ink can cause cancer if ingested. Rich people keep them as pets."
|
A disgusting combination of squid and pig. Its ink can cause cancer if ingested. Rich people keep them as pets."
|
||||||
align = 1
|
align = 1
|
||||||
autowrap = true
|
autowrap = true
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue