From a1bb39eaeb7ab85b27c1ec2f5cf650e32782d293 Mon Sep 17 00:00:00 2001 From: Fabio Date: Sun, 18 Aug 2024 16:29:21 +0200 Subject: [PATCH] fix problems with the shrinking --- gmtk_2024/levels/level_1.tscn | 8 ++++++-- gmtk_2024/scripts/player_movement.gd | 1 + gmtk_2024/scripts/ui_actions.gd | 9 +++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/gmtk_2024/levels/level_1.tscn b/gmtk_2024/levels/level_1.tscn index 133e143..4e472e7 100644 --- a/gmtk_2024/levels/level_1.tscn +++ b/gmtk_2024/levels/level_1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=4 uid="uid://ctc0arg3efa5k"] +[gd_scene load_steps=13 format=4 uid="uid://ctc0arg3efa5k"] [ext_resource type="PackedScene" uid="uid://ba6afuig8bqrg" path="res://levels/LevelBase.tscn" id="1_87xn7"] [ext_resource type="Texture2D" uid="uid://c3m4os8kteaix" path="res://textures/level01-spritesheet.png" id="2_wqskp"] @@ -8,6 +8,7 @@ [ext_resource type="PackedScene" path="res://objects/MirrorOrb.tscn" id="7_dyi0e"] [ext_resource type="PackedScene" uid="uid://vtwswrkfkgas" path="res://objects/EnemyMover.tscn" id="8_16072"] [ext_resource type="PackedScene" uid="uid://br6fngf5208j0" path="res://objects/ResizableBlock.tscn" id="8_ec71m"] +[ext_resource type="PackedScene" uid="uid://dii1q3f5dj72y" path="res://objects/CRT.tscn" id="9_cc6eq"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_e817v"] texture = ExtResource("2_wqskp") @@ -130,8 +131,9 @@ shader_parameter/scroll_speed = 0.02 position = Vector2(-542, 331) scale = Vector2(2, 2) -[node name="UI" parent="UILayer" index="0"] +[node name="UI" parent="UILayer" index="0" node_paths=PackedStringArray("player")] mouse_filter = 2 +player = NodePath("../../Player") [node name="HBoxContainer" parent="UILayer/UI" index="0"] mouse_filter = 0 @@ -180,3 +182,5 @@ position = Vector2(-132, 311) position = Vector2(162, 124) collision_layer = 1 ui_actions = NodePath("../UILayer/UI") + +[node name="CanvasLayer2" parent="." index="12" instance=ExtResource("9_cc6eq")] diff --git a/gmtk_2024/scripts/player_movement.gd b/gmtk_2024/scripts/player_movement.gd index 21d2316..0e7c4f1 100644 --- a/gmtk_2024/scripts/player_movement.gd +++ b/gmtk_2024/scripts/player_movement.gd @@ -10,6 +10,7 @@ var coyote_timer : float = 0.2 var input_direction = 0 @export var max_link_distance: float = 200.0 var data_link: Line2D +var target_scale func _ready(): data_link = $data_link diff --git a/gmtk_2024/scripts/ui_actions.gd b/gmtk_2024/scripts/ui_actions.gd index 61d8005..76c4b84 100644 --- a/gmtk_2024/scripts/ui_actions.gd +++ b/gmtk_2024/scripts/ui_actions.gd @@ -3,6 +3,7 @@ extends Node @export var player : CharacterBody2D @export var scale_duration: float = 0.5 var current_selected = "none" +var target_scale_player: Vector2 = Vector2(1, 1) func _unhandled_input(event: InputEvent) -> void: if event.is_action_pressed("click"): @@ -28,12 +29,12 @@ func start_scaling(target_node: Node2D, scale_value: Vector2): tween.tween_property(target_node, "scale", scale_value, scale_duration) func scale_up_player(): - player.target_scale = Vector2(2.0, 2.0) - player.start_scaling() + target_scale_player = Vector2(0.5, 0.5) + start_scaling(player, target_scale_player) func scale_down_player(): - player.target_scale = Vector2(0.5, 0.5) - player.start_scaling() + target_scale_player = Vector2(2.0, 2.0) + start_scaling(player, target_scale_player) func mirror(): pass # Mirror-Funktionalität hier einfügen