Merge branch 'main' of https://gamejam.fachschaft.info/Florian/The_Dark_Side_of_Earth

active_item.gd

@@ -0,0 +1,7 @@
+class_name ActiveItem extends Item
+
+func collect() -> bool:
+	if (player.active_item == null):
+		player.active_item = self
+		return true
+	return false

active_item.gd.uid

@@ -0,0 +1 @@
+uid://dyu8r5dt6qk8k

buildings/Building 1x2 fixed.png.import

@@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Building 1x2 fixed.png-e90afc0d25a8919ada5700
 compress/mode=0
 compress/high_quality=false
 compress/lossy_quality=0.7
-compress/uastc_level=0
-compress/rdo_quality_loss=0.0
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
@@ -27,10 +25,6 @@ mipmaps/generate=false
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""
-process/channel_remap/red=0
-process/channel_remap/green=1
-process/channel_remap/blue=2
-process/channel_remap/alpha=3
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/normal_map_invert_y=false

buildings/Building 2x1 downside.png.import

@@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Building 2x1 downside.png-4b432eb4152bab7dd59
 compress/mode=0
 compress/high_quality=false
 compress/lossy_quality=0.7
-compress/uastc_level=0
-compress/rdo_quality_loss=0.0
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
@@ -27,10 +25,6 @@ mipmaps/generate=false
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""
-process/channel_remap/red=0
-process/channel_remap/green=1
-process/channel_remap/blue=2
-process/channel_remap/alpha=3
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/normal_map_invert_y=false

buildings/Building 2x1 fixed.png.import

@@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Building 2x1 fixed.png-b02748fa52aebae62f987c
 compress/mode=0
 compress/high_quality=false
 compress/lossy_quality=0.7
-compress/uastc_level=0
-compress/rdo_quality_loss=0.0
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
@@ -27,10 +25,6 @@ mipmaps/generate=false
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""
-process/channel_remap/red=0
-process/channel_remap/green=1
-process/channel_remap/blue=2
-process/channel_remap/alpha=3
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/normal_map_invert_y=false

buildings/building.gdshader

@@ -14,7 +14,7 @@ void vertex()
 	location = ivec2(128. * COLOR.xy);
 	dimension = ivec2(128. * COLOR.zw);
 
-	vec2 myloc = vec2(location) + UV * (vec2(dimension) + vec2(0., .7)) - vec2(0, .2);
+	vec2 myloc = vec2(location) + UV * (vec2(dimension) + vec2(0., .5));
 	float angle = float(myloc.x) * TAU / 60.;
 	float height = float(myloc.y) * cell_height + ground_height;
 	VERTEX = vec2(cos(angle), sin(angle)) * height;

items/heal_item.gd

@@ -1,6 +1,8 @@
 extends Item
 @export var heal_amount = 1
 
-func collect():
+func collect() -> bool:
 	if(player.current_hp < player.max_hp):
 		player.current_hp += heal_amount
+		return true
+	return false

items/item.gd

@@ -6,12 +6,11 @@ func _ready() -> void:
 
 func _on_body_entered(body: Node2D):
 	if(body.name == "Player"):
-		set_deferred("monitoring", false)
+		if(self.has_method("collect") and collect()):
-		set_deferred("monitorable", false)
+			set_deferred("monitoring", false)
-		call_deferred("reparent", player)
+			set_deferred("monitorable", false)
-		collect_animation()
+			call_deferred("reparent", player)
-		if(self.has_method("collect")):
+			collect_animation()
-			collect()
 
 func collect_animation():
 	self.visible = false

main.tscn

@@ -7,7 +7,7 @@
 [ext_resource type="PackedScene" uid="uid://cjsrtswk4vgf2" path="res://healthbar/healthbar.tscn" id="6_7mycd"]
 [ext_resource type="PackedScene" uid="uid://dpdn2php3ydsv" path="res://death_screen/death_screen.tscn" id="7_5vw27"]
 [ext_resource type="PackedScene" uid="uid://4l3elvxpghw8" path="res://platform.tscn" id="7_272bh"]
-[ext_resource type="PackedScene" uid="uid://b00185vygcka1" path="res://items/heal_item.tscn" id="8_5vw27"]
+[ext_resource type="PackedScene" uid="uid://ennu3lalstdr" path="res://updash.tscn" id="9_4c57u"]
 [ext_resource type="PackedScene" uid="uid://chu67ci7sl488" path="res://enemies/ghost.tscn" id="9_kek77"]
 
 [node name="main" type="Node2D"]
@@ -49,12 +49,12 @@ visible = false
 position = Vector2(900, -3000)
 scale = Vector2(5, 3.1)
 
-[node name="HealItem" parent="." instance=ExtResource("8_5vw27")]
-position = Vector2(0, -3150)
-
 [node name="Ghost" parent="." instance=ExtResource("9_kek77")]
 position = Vector2(0, -3000)
 
+[node name="Updash" parent="." instance=ExtResource("9_4c57u")]
+position = Vector2(0, -3100)
+
 [connection signal="health_changed" from="Player" to="CanvasLayer/Healthbar" method="_on_player_health_changed"]
 [connection signal="player_died" from="Player" to="CanvasLayer/DeathScreen" method="_on_player_player_died"]
 [connection signal="timeout" from="Building Generator/Timer" to="Building Generator" method="_on_timer_timeout"]

player/Player_Walk/Walk 1.png.import

@@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Walk 1.png-47c623e9d3540b4a00d2bddf52ae0b2a.c
 compress/mode=0
 compress/high_quality=false
 compress/lossy_quality=0.7
-compress/uastc_level=0
-compress/rdo_quality_loss=0.0
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
@@ -27,10 +25,6 @@ mipmaps/generate=false
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""
-process/channel_remap/red=0
-process/channel_remap/green=1
-process/channel_remap/blue=2
-process/channel_remap/alpha=3
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/normal_map_invert_y=false

player/Player_Walk/Walk 2.png.import

@@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Walk 2.png-5dea4fdec55fa43e26680e08090fd654.c
 compress/mode=0
 compress/high_quality=false
 compress/lossy_quality=0.7
-compress/uastc_level=0
-compress/rdo_quality_loss=0.0
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
@@ -27,10 +25,6 @@ mipmaps/generate=false
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""
-process/channel_remap/red=0
-process/channel_remap/green=1
-process/channel_remap/blue=2
-process/channel_remap/alpha=3
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/normal_map_invert_y=false

player/Player_Walk/Walk 3.png.import

@@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Walk 3.png-27890c0cb512383b8ecbd848c73efee1.c
 compress/mode=0
 compress/high_quality=false
 compress/lossy_quality=0.7
-compress/uastc_level=0
-compress/rdo_quality_loss=0.0
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
@@ -27,10 +25,6 @@ mipmaps/generate=false
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""
-process/channel_remap/red=0
-process/channel_remap/green=1
-process/channel_remap/blue=2
-process/channel_remap/alpha=3
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/normal_map_invert_y=false

player/Player_Walk/Walk 4.png.import

@@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Walk 4.png-232b1eae2acf3ad82130431014262cde.c
 compress/mode=0
 compress/high_quality=false
 compress/lossy_quality=0.7
-compress/uastc_level=0
-compress/rdo_quality_loss=0.0
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
@@ -27,10 +25,6 @@ mipmaps/generate=false
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""
-process/channel_remap/red=0
-process/channel_remap/green=1
-process/channel_remap/blue=2
-process/channel_remap/alpha=3
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/normal_map_invert_y=false

player/Player_Walk/Walk 5.png.import

@@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Walk 5.png-cfb8eb15ace876127c083283fe74cdc0.c
 compress/mode=0
 compress/high_quality=false
 compress/lossy_quality=0.7
-compress/uastc_level=0
-compress/rdo_quality_loss=0.0
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
@@ -27,10 +25,6 @@ mipmaps/generate=false
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""
-process/channel_remap/red=0
-process/channel_remap/green=1
-process/channel_remap/blue=2
-process/channel_remap/alpha=3
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/normal_map_invert_y=false

player/Player_Walk/Walk 6.png.import

@@ -18,8 +18,6 @@ dest_files=["res://.godot/imported/Walk 6.png-f243f98e182be67eb8681a11d34ee554.c
 compress/mode=0
 compress/high_quality=false
 compress/lossy_quality=0.7
-compress/uastc_level=0
-compress/rdo_quality_loss=0.0
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
@@ -27,10 +25,6 @@ mipmaps/generate=false
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""
-process/channel_remap/red=0
-process/channel_remap/green=1
-process/channel_remap/blue=2
-process/channel_remap/alpha=3
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/normal_map_invert_y=false

player/player.gd

@@ -42,9 +42,14 @@ var damage_knockup = 500
 var atk_cooldown = 0.5
 var atk_timer = 0
 
+# Active Item
+var active_item = null
+var item_cooldown = 0
+
 func _physics_process(delta: float) -> void:
 	manage_iframes(delta)
 	manage_movement_options()
+	manage_active(delta)
 	manage_animation()
 	manage_attack(delta)
 	manage_velocity(delta)
@@ -61,6 +66,11 @@ func manage_attack(delta : float):
 			sword.swing()
 			atk_timer = atk_cooldown
 
+func manage_active(delta : float):
+	item_cooldown = max(item_cooldown - delta, 0)
+	if(active_item != null and Input.is_action_just_pressed("item") and item_cooldown <= 0):
+		active_item.activate()
+
 func manage_movement_options() -> void:
 	if(is_on_floor()):
 		air_jumps_current = air_jumps_max

project.godot

@@ -12,7 +12,7 @@ config_version=5
 
 config/name="The Dark Side of Earth"
 run/main_scene="uid://cxo6bq26huau7"
-config/features=PackedStringArray("4.5", "Forward Plus")
+config/features=PackedStringArray("4.4", "Forward Plus")
 config/icon="res://icon.svg"
 
 [display]
@@ -48,6 +48,11 @@ drop={
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
 ]
 }
+item={
+"deadzone": 0.2,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":88,"key_label":0,"unicode":120,"location":0,"echo":false,"script":null)
+]
+}
 
 [layer_names]
 

updash.gd

@@ -0,0 +1,9 @@
+extends ActiveItem
+var cooldown = 10
+
+
+func activate():
+	player.item_cooldown = cooldown
+	player.reset_to_velocity = Vector2(0,1)
+	await get_tree().create_timer(0.1).timeout
+	player.reset_to_velocity = Vector2(0, -2400)

updash.gd.uid

@@ -0,0 +1 @@
+uid://bbwsc2a2hd0ow

updash.tscn

@@ -0,0 +1,18 @@
+[gd_scene load_steps=4 format=3 uid="uid://ennu3lalstdr"]
+
+[ext_resource type="Script" uid="uid://bbwsc2a2hd0ow" path="res://updash.gd" id="1_ghbl6"]
+[ext_resource type="Texture2D" uid="uid://cy70quh6k3s1j" path="res://icon.svg" id="1_ptc3l"]
+
+[sub_resource type="CircleShape2D" id="CircleShape2D_ghbl6"]
+
+[node name="Updash" type="Area2D"]
+script = ExtResource("1_ghbl6")
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+scale = Vector2(3, 3)
+shape = SubResource("CircleShape2D_ghbl6")
+
+[node name="Sprite2D" type="Sprite2D" parent="."]
+modulate = Color(1, 0, 1, 1)
+scale = Vector2(0.45, 0.45)
+texture = ExtResource("1_ptc3l")