add oxygen timer

objects/enemy/turtle.tscn

@@ -1,8 +1,14 @@
-[gd_scene load_steps=8 format=2]
+[gd_scene load_steps=10 format=2]
 
 [ext_resource path="res://graphics/enemy/turtle.png" type="Texture" id=1]
 [ext_resource path="res://objects/enemy/turtle.gd" type="Script" id=2]
 [ext_resource path="res://objects/enemy/death_particles.tscn" type="PackedScene" id=3]
+[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=4]
+
+[sub_resource type="ShaderMaterial" id=6]
+shader = ExtResource( 4 )
+shader_param/border_color = Color( 0, 0, 0, 1 )
+shader_param/border_corners = false
 
 [sub_resource type="Animation" id=1]
 length = 0.001
@@ -53,6 +59,7 @@ position = Vector2( 8.5, 4 )
 
 [node name="Sprite" type="Sprite" parent="ToFlip"]
 unique_name_in_owner = true
+material = SubResource( 6 )
 position = Vector2( -9.5, -9 )
 texture = ExtResource( 1 )
 centered = false

objects/environment/bubble/bubble.gd

@@ -15,8 +15,10 @@ func _physics_process(delta):
 		sprite.position.x = sin(lifetime * 4.0) * 4.0
 	position.y -= speed * delta
 
-func _on_area_entered(area):
-	if area.is_in_group("player_hitbox") or area.is_in_group("arrow"):
-		sprite.frame_coords.y = 1
-		speed = 0.0
-		get_tree().create_timer(0.5, false).connect("timeout", self, "queue_free")
+func _on_Bubble_body_entered(body):
+	sprite.frame_coords.y = 1
+	speed = 0.0
+	get_tree().create_timer(0.5, false).connect("timeout", self, "queue_free")
+	if body.is_in_group("player"):
+		body.oxygen_timer.start()
+		Audio.play_sound(Audio.a_bubble,Audio.ac_die)

objects/environment/bubble/bubble.tscn

@@ -4,7 +4,7 @@
 [ext_resource path="res://objects/environment/bubble/bubble.gd" type="Script" id=2]
 
 [sub_resource type="RectangleShape2D" id=1]
-extents = Vector2( 2, 2 )
+extents = Vector2( 5, 5 )
 
 [node name="Bubble" type="Area2D"]
 script = ExtResource( 2 )
@@ -18,3 +18,4 @@ vframes = 2
 shape = SubResource( 1 )
 
 [connection signal="area_entered" from="." to="." method="_on_area_entered"]
+[connection signal="body_entered" from="." to="." method="_on_Bubble_body_entered"]

objects/hud/hud.gd

@@ -12,6 +12,8 @@ onready var arrow_counter = $ArrowCounter
 onready var lives_counter = $LivesCounter
 onready var high_counter = $HighCounter
 onready var time_counter = $TimeCounter
+onready var oxygen = $Oxygen
+onready var oxygen_meter = $Oxygen/OxygenMeter
 
 export var song_name = "♫Music"
 export (Color) var bonus_color
@@ -31,6 +33,9 @@ func _ready():
 	tween.tween_property(music, "rect_position:x", 254.0 - music.rect_size.x, 1.0)
 	tween.tween_interval(3.0)
 	tween.tween_property(music, "rect_position:x", 256.0, 1.0)
+	#Show oxygen meter when underwater
+	var player = get_tree().get_nodes_in_group("player").pop_back()
+	if player.underwater == true: oxygen.visible = true
 
 func shard_popup(shard_number):
 	#Change text to song name
@@ -79,3 +84,7 @@ func _physics_process(delta):
 		time_counter.modulate = bonus_color
 	else:
 		time_counter.modulate = Color.white
+	#Oxygen meter
+	var player = get_tree().get_nodes_in_group("player").pop_back()
+	oxygen_meter.scale.x = player.oxygen_timer.time_left
+	#if oxygen_meter.scale.x > 15: oxygen_meter.scale.x = 15

objects/hud/hud.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=14 format=2]
+[gd_scene load_steps=16 format=2]
 
 [ext_resource path="res://graphics/hud/stars_hud.png" type="Texture" id=1]
 [ext_resource path="res://graphics/hud/lives_head.png" type="Texture" id=2]
@@ -10,6 +10,8 @@
 [ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=8]
 [ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=9]
 [ext_resource path="res://ui/theme.tres" type="Theme" id=10]
+[ext_resource path="res://graphics/hud/oxygen.png" type="Texture" id=11]
+[ext_resource path="res://graphics/hud/oxygen_meter.png" type="Texture" id=12]
 
 [sub_resource type="ShaderMaterial" id=1]
 
@@ -173,3 +175,15 @@ margin_bottom = 192.0
 theme = ExtResource( 10 )
 text = "§time bonus"
 align = 2
+
+[node name="Oxygen" type="Sprite" parent="."]
+visible = false
+position = Vector2( 16, 18 )
+texture = ExtResource( 11 )
+
+[node name="OxygenMeter" type="Sprite" parent="Oxygen"]
+position = Vector2( -2, -1 )
+rotation = 3.14159
+scale = Vector2( 15, 1 )
+texture = ExtResource( 12 )
+flip_v = true

objects/player/player.gd

@@ -28,7 +28,8 @@ export var jump_force: float = 150.0
 export var jump_release_force: float = 0.25
 ## impulse added when double jumping
 export var double_jump_force: float = 122.0
-
+## if on turn on oxygentimer to kill player
+export var underwater = false
 
 # velocity
 var velocity: Vector2 = Vector2.ZERO
@@ -50,7 +51,8 @@ onready var airborne_shape: CollisionShape2D = $"%AirborneShape"
 onready var ladder_detector: RayCast2D = $"%LadderDetector"
 onready var death_splatter_position: Position2D = $"%DeathSplatterPosition"
 onready var pushable_detector: RayCast2D = $"%PushableDetector"
-
+onready var oxygen_timer = $OxygenTimer
+onready var oxygen_origin = oxygen_timer.wait_time
 
 # OVERRIDES #
 func _ready() -> void:
@@ -238,6 +240,8 @@ func _on_Dead_state_entered() -> void:
 	# fade into the ether
 	graphics.visible = false
 	state_chart.send_event("respawn")
+	#refill oxygen
+	oxygen_timer.start()
 
 func _on_Respawn_state_entered() -> void:
 	global_position = Game.respawn_point
@@ -378,3 +382,7 @@ func _on_Hitbox_body_entered(body: Node) -> void:
 func _on_Ducking_event_received(event):
 	if event == "jump":
 		position.y -= 1
+
+
+func _on_OxygenTimer_timeout():
+	if underwater: die()

objects/player/player.tscn

@@ -1,7 +1,7 @@
-[gd_scene load_steps=44 format=2]
+[gd_scene load_steps=47 format=2]
 
 [ext_resource path="res://objects/player/player.gd" type="Script" id=1]
-[ext_resource path="res://graphics/player/sg_duck.png" type="Texture" id=2]
+[ext_resource path="res://graphics/player/palettes/default.png" type="Texture" id=2]
 [ext_resource path="res://shaders/recolor_border.shader" type="Shader" id=3]
 [ext_resource path="res://graphics/player/sg_idle.png" type="Texture" id=4]
 [ext_resource path="res://addons/godot_state_charts/parallel_state.gd" type="Script" id=5]
@@ -23,11 +23,14 @@
 [ext_resource path="res://graphics/player/sg_push.png" type="Texture" id=21]
 [ext_resource path="res://graphics/player/sg_blink.png" type="Texture" id=22]
 [ext_resource path="res://graphics/player/sg_stim.png" type="Texture" id=23]
+[ext_resource path="res://graphics/player/sg_duck.png" type="Texture" id=24]
+[ext_resource path="res://graphics/player/sg_jump_megaman.png" type="Texture" id=25]
 
 [sub_resource type="ShaderMaterial" id=1]
 shader = ExtResource( 3 )
 shader_param/border_color = Color( 0, 0, 0, 1 )
 shader_param/border_corners = true
+shader_param/palette = ExtResource( 2 )
 
 [sub_resource type="Curve" id=13]
 _data = [ Vector2( 0, 1 ), 0.0, -0.0636948, 0, 0, Vector2( 1, 0 ), -3.43886, 0.0, 0, 0 ]
@@ -265,7 +268,7 @@ tracks/0/keys = {
 "times": PoolRealArray( 0 ),
 "transitions": PoolRealArray( 1 ),
 "update": 1,
-"values": [ ExtResource( 2 ) ]
+"values": [ ExtResource( 24 ) ]
 }
 tracks/1/type = "value"
 tracks/1/path = NodePath("Graphics/Sprite:hframes")
@@ -513,6 +516,58 @@ tracks/3/keys = {
 "values": [ 0.0 ]
 }
 
+[sub_resource type="Animation" id=21]
+resource_name = "jump2"
+length = 0.001
+tracks/0/type = "value"
+tracks/0/path = NodePath("Graphics/Sprite:texture")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ ExtResource( 25 ) ]
+}
+tracks/1/type = "value"
+tracks/1/path = NodePath("Graphics/Sprite:hframes")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ 1 ]
+}
+tracks/2/type = "value"
+tracks/2/path = NodePath("Graphics/Sprite:frame")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ 0 ]
+}
+tracks/3/type = "value"
+tracks/3/path = NodePath("Graphics/Sprite:rotation_degrees")
+tracks/3/interp = 1
+tracks/3/loop_wrap = true
+tracks/3/imported = false
+tracks/3/enabled = true
+tracks/3/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 0,
+"values": [ 0.0 ]
+}
+
 [sub_resource type="Animation" id=17]
 resource_name = "push"
 length = 0.8
@@ -908,6 +963,7 @@ anims/fall = SubResource( 15 )
 anims/fall_scared = SubResource( 14 )
 anims/idle = SubResource( 6 )
 anims/jump = SubResource( 8 )
+anims/jump2 = SubResource( 21 )
 anims/push = SubResource( 17 )
 anims/shoot_airborne = SubResource( 11 )
 anims/shoot_grounded = SubResource( 10 )
@@ -1254,6 +1310,10 @@ theme = ExtResource( 7 )
 custom_styles/bg = SubResource( 4 )
 script = ExtResource( 8 )
 
+[node name="OxygenTimer" type="Timer" parent="."]
+wait_time = 20.0
+autostart = true
+
 [connection signal="body_entered" from="Hitbox" to="." method="_on_Hitbox_body_entered"]
 [connection signal="state_physics_processing" from="StateChart/Root/Movement" to="." method="_process_movement"]
 [connection signal="state_entered" from="StateChart/Root/Movement/Grounded" to="." method="_on_Grounded_state_entered"]
@@ -1289,3 +1349,4 @@ script = ExtResource( 8 )
 [connection signal="state_physics_processing" from="StateChart/Root/Movement/Climbing" to="." method="_process_climbing"]
 [connection signal="state_entered" from="StateChart/Root/Health/Respawn" to="." method="_on_Respawn_state_entered"]
 [connection signal="state_entered" from="StateChart/Root/Health/Dead" to="." method="_on_Dead_state_entered"]
+[connection signal="timeout" from="OxygenTimer" to="." method="_on_OxygenTimer_timeout"]