Merge branch 'main' of https://github.com/MarcEricMartel/GameJam-Vanier

Bladder.gd

@@ -9,5 +9,5 @@ func _ready():
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
 func _process(delta):
-	material.set("fill",clamp(fill, 0.0, 1.0))
+	pass
 	

Images/eniv.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://drkbrxdk6s40s"
+path="res://.godot/imported/eniv.png-b581d2ab312dd8182bad8b245285147a.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Images/eniv.png"
+dest_files=["res://.godot/imported/eniv.png-b581d2ab312dd8182bad8b245285147a.ctex"]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/bptc_ldr=0
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

Levels/level.tscn

@@ -244,3 +244,4 @@ position = Vector2(3658, 4777)
 [connection signal="is_killed" from="Mimic_02" to="." method="_on_mimic_02_is_killed"]
 [connection signal="picked" from="pants" to="." method="_on_pants_picked"]
 [connection signal="is_killed" from="Gym_Enemy05" to="." method="_on_gym_enemy_05_is_killed"]
+

Player/player.gd

@@ -7,6 +7,7 @@ extends CharacterBody2D
 
 @onready var raycast = $RayCast2D;
 @onready var sprite = $AnimatedSprite2D;
+@onready var bladderUI = $Bladder;
 
 var animation_count = 0;
 
@@ -47,6 +48,7 @@ func take_damage(damage):
 	if sprite.animation != "damage":
 		HP = HP - damage;
 		sprite.play("damage");
+		bladderUI.material.set("fill",clamp((100.0 - HP) / 100.0, 0.0, 1.0));
 		if HP <= 0:
 			kill();
 
@@ -59,7 +61,7 @@ func pickup(item):
 				return;
 
 func kill():
-	get_tree().reload_current_scene();
+	get_tree().change_scene_to_file("res://game_over.tscn");
 
 func get_input_vector():
 	var input_vector = Vector2.ZERO;
@@ -79,22 +81,6 @@ func apply_friction(input_vector,delta):
 func call_set_player():
 	get_tree().call_group("enemies", "set_player",self);
 
-func _on_area_2d_area_entered(area):
-	$"../School_Snare".volume_db(-6);
-	$"../School_BDClave".volume_db(-6);
-	$"../School_Bass".volume_db(-6);
-	$"../School_Flute".volume_db(-6);
-	$"../School_Brass".volume_db(-6);
-
-
-func _on_area_2d_area_exited(area):
-	$"../School_Snare".volume_db(-80);
-	$"../School_BDClave".volume_db(-80);
-	$"../School_Bass".volume_db(-80);
-	$"../School_Flute".volume_db(-80);
-	$"../School_Brass".volume_db(-80);
-
-
 func _on_animated_sprite_2d_animation_finished():
 	if sprite.animation == "damage":
 		animation_count+=1;

Player/player.tscn

@@ -1,24 +1,17 @@
-[gd_scene load_steps=5 format=3 uid="uid://xev8p1td1icx"]
+[gd_scene load_steps=10 format=3 uid="uid://xev8p1td1icx"]
 
 [ext_resource type="Script" path="res://Player/player.gd" id="1_mbyc2"]
 [ext_resource type="Texture2D" uid="uid://wkeakqjvu3gg" path="res://Sprites/placeholder_player.png" id="2_bqbmq"]
+[ext_resource type="Texture2D" uid="uid://d2nqjxofehkum" path="res://Images/BladderHollow.png" id="3_nm4h4"]
+[ext_resource type="Shader" path="res://hud.gdshader" id="4_4u6cb"]
+[ext_resource type="Texture2D" uid="uid://b25de1d0yyuji" path="res://Images/Bladder.png" id="5_pcbeg"]
+[ext_resource type="Script" path="res://Bladder.gd" id="6_8x3rf"]
 
 [sub_resource type="SpriteFrames" id="SpriteFrames_mqbrd"]
 animations = [{
 "frames": [{
 "duration": 1.0,
 "texture": ExtResource("2_bqbmq")
-}, {
-"duration": 1.0,
-"texture": null
-}],
-"loop": true,
-"name": &"damage",
-"speed": 5.0
-}, {
-"frames": [{
-"duration": 1.0,
-"texture": ExtResource("2_bqbmq")
 }],
 "loop": true,
 "name": &"default",
@@ -28,6 +21,10 @@ animations = [{
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_ng5bv"]
 size = Vector2(40, 64)
 
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_g8k2d"]
+shader = ExtResource("4_4u6cb")
+shader_parameter/fill = 0.0
+
 [node name="Player" type="CharacterBody2D"]
 collision_layer = 3
 collision_mask = 3
@@ -51,4 +48,16 @@ points = PackedVector2Array(0, 0, 2000, 0)
 width = 5.0
 default_color = Color(1, 0, 0, 0.392157)
 
+[node name="Bladder" type="Sprite2D" parent="."]
+material = SubResource("ShaderMaterial_g8k2d")
+position = Vector2(-847, -443)
+scale = Vector2(2, 2)
+texture = ExtResource("5_pcbeg")
+script = ExtResource("6_8x3rf")
+
+[node name="BladderHollow" type="Sprite2D" parent="."]
+position = Vector2(-847, -443)
+scale = Vector2(2, 2)
+texture = ExtResource("3_nm4h4")
+
 [connection signal="animation_finished" from="AnimatedSprite2D" to="." method="_on_animated_sprite_2d_animation_finished"]

hud.tscn

@@ -19,15 +19,16 @@ offset_left = 198.0
 offset_top = 205.0
 offset_right = 198.0
 offset_bottom = 205.0
+grow_horizontal = 2
+grow_vertical = 2
 script = ExtResource("1_jkk58")
 
 [node name="Bladder" type="Sprite2D" parent="."]
 material = SubResource("ShaderMaterial_0gcor")
-scale = Vector2(4, 4)
+scale = Vector2(2, 2)
 texture = ExtResource("2_fa8jy")
 script = ExtResource("3_tb31y")
 
 [node name="BladderHollow" type="Sprite2D" parent="."]
-position = Vector2(-2, 0)
-scale = Vector2(4, 4)
+scale = Vector2(2, 2)
 texture = ExtResource("4_lbxgy")

start.tscn

@@ -1,7 +1,8 @@
-[gd_scene load_steps=3 format=3 uid="uid://d25c4ey6gvduc"]
+[gd_scene load_steps=4 format=3 uid="uid://d25c4ey6gvduc"]
 
 [ext_resource type="Texture2D" uid="uid://cg848qjc4fxi" path="res://Images/Main_menu.png" id="1_65g7h"]
 [ext_resource type="Script" path="res://start.gd" id="1_exncb"]
+[ext_resource type="Texture2D" uid="uid://drkbrxdk6s40s" path="res://Images/eniv.png" id="3_5j2rv"]
 
 [node name="Start" type="Node2D"]
 script = ExtResource("1_exncb")
@@ -23,14 +24,9 @@ theme_override_colors/font_hover_color = Color(0, 0, 0.65098, 1)
 text = "Start Game"
 flat = true
 
-[node name="Label" type="Label" parent="."]
-offset_left = 1318.0
-offset_top = 109.0
-offset_right = 1728.0
-offset_bottom = 310.0
-theme_override_colors/font_color = Color(0, 0, 0, 1)
-theme_override_font_sizes/font_size = 145
-text = "ENVIE
-"
+[node name="Eniv" type="Sprite2D" parent="."]
+position = Vector2(1632, 266)
+scale = Vector2(4, 4)
+texture = ExtResource("3_5j2rv")
 
 [connection signal="pressed" from="Button" to="." method="_on_button_pressed"]