From ea34015f197f923887c2532f251add627b835613 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sat, 4 Oct 2025 23:46:09 +0200 Subject: [PATCH] oh maybe, oh baby, oh maybe, oh baby Say whoaoh say whoa oh say whoa say yay yay --- growth/Card/{card.gd => BaseCard.gd} | 0 growth/Card/{card.gd.uid => BaseCard.gd.uid} | 0 growth/Card/{base_bard.tscn => BaseCard.tscn} | 4 ++-- growth/Card/card_inner.gd | 10 ---------- growth/Card/card_inner.gd.uid | 1 - growth/Card/test.tscn | 17 ----------------- .../{Card => CardInjects}/DashCardInject.tscn | 0 growth/Cards/{dash_card.tscn => DashCard.tscn} | 4 ++-- growth/card.gd | 1 - growth/card.gd.uid | 1 - growth/hand.gd | 2 +- 11 files changed, 5 insertions(+), 35 deletions(-) rename growth/Card/{card.gd => BaseCard.gd} (100%) rename growth/Card/{card.gd.uid => BaseCard.gd.uid} (100%) rename growth/Card/{base_bard.tscn => BaseCard.tscn} (77%) delete mode 100644 growth/Card/card_inner.gd delete mode 100644 growth/Card/card_inner.gd.uid delete mode 100644 growth/Card/test.tscn rename growth/{Card => CardInjects}/DashCardInject.tscn (100%) rename growth/Cards/{dash_card.tscn => DashCard.tscn} (74%) delete mode 100644 growth/card.gd delete mode 100644 growth/card.gd.uid diff --git a/growth/Card/card.gd b/growth/Card/BaseCard.gd similarity index 100% rename from growth/Card/card.gd rename to growth/Card/BaseCard.gd diff --git a/growth/Card/card.gd.uid b/growth/Card/BaseCard.gd.uid similarity index 100% rename from growth/Card/card.gd.uid rename to growth/Card/BaseCard.gd.uid diff --git a/growth/Card/base_bard.tscn b/growth/Card/BaseCard.tscn similarity index 77% rename from growth/Card/base_bard.tscn rename to growth/Card/BaseCard.tscn index be3c499..6468328 100644 --- a/growth/Card/base_bard.tscn +++ b/growth/Card/BaseCard.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=2 format=3 uid="uid://b0g5wd4n3py3x"] -[ext_resource type="Script" uid="uid://c4x7n1r3ce1bc" path="res://Card/card.gd" id="1_yeifr"] +[ext_resource type="Script" uid="uid://c4x7n1r3ce1bc" path="res://Card/BaseCard.gd" id="1_hoajl"] [node name="Card" type="PanelContainer"] offset_right = 1.0 -script = ExtResource("1_yeifr") +script = ExtResource("1_hoajl") [node name="Behaviors" type="Node" parent="."] diff --git a/growth/Card/card_inner.gd b/growth/Card/card_inner.gd deleted file mode 100644 index cf9f3ac..0000000 --- a/growth/Card/card_inner.gd +++ /dev/null @@ -1,10 +0,0 @@ -extends AspectRatioContainer - -func activate(world, activator, delta): - dash_timer += delta; - const easeFactor = 1; - velocity = move_direction.normalize() * dash_speed * easeFactor; - - if (dash_timer >= dash_end): - dash_on_cooldown = true; - dash_timer = 0; diff --git a/growth/Card/card_inner.gd.uid b/growth/Card/card_inner.gd.uid deleted file mode 100644 index ed15ca3..0000000 --- a/growth/Card/card_inner.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://b1exu0m00vjaw diff --git a/growth/Card/test.tscn b/growth/Card/test.tscn deleted file mode 100644 index 8c47b94..0000000 --- a/growth/Card/test.tscn +++ /dev/null @@ -1,17 +0,0 @@ -[gd_scene load_steps=4 format=3 uid="uid://lqw1rkwsv8xt"] - -[ext_resource type="PackedScene" uid="uid://dg8euc6mh055m" path="res://Card/BaseCard.tscn" id="1_7jxl2"] -[ext_resource type="Script" uid="uid://b1exu0m00vjaw" path="res://Card/card_inner.gd" id="2_2q6qc"] - -[sub_resource type="GDScript" id="GDScript_7jxl2"] -script/source = "extends Node2D - -func _ready(): - $Card.activate() -" - -[node name="Node2D" type="Node2D"] -script = SubResource("GDScript_7jxl2") - -[node name="Card" parent="." instance=ExtResource("1_7jxl2")] -inner_script = ExtResource("2_2q6qc") diff --git a/growth/Card/DashCardInject.tscn b/growth/CardInjects/DashCardInject.tscn similarity index 100% rename from growth/Card/DashCardInject.tscn rename to growth/CardInjects/DashCardInject.tscn diff --git a/growth/Cards/dash_card.tscn b/growth/Cards/DashCard.tscn similarity index 74% rename from growth/Cards/dash_card.tscn rename to growth/Cards/DashCard.tscn index a5803c5..873b516 100644 --- a/growth/Cards/dash_card.tscn +++ b/growth/Cards/DashCard.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://ee0t3qv6gyam"] -[ext_resource type="PackedScene" uid="uid://b0g5wd4n3py3x" path="res://Card/base_bard.tscn" id="1_wwyou"] -[ext_resource type="PackedScene" uid="uid://b3piw7awjaxgj" path="res://Card/DashCardInject.tscn" id="2_2qs8v"] +[ext_resource type="PackedScene" uid="uid://b0g5wd4n3py3x" path="res://Card/BaseCard.tscn" id="1_wwyou"] +[ext_resource type="PackedScene" uid="uid://b3piw7awjaxgj" path="res://CardInjects/DashCardInject.tscn" id="2_2qs8v"] [node name="Card" instance=ExtResource("1_wwyou")] behaviors = [ExtResource("2_2qs8v")] diff --git a/growth/card.gd b/growth/card.gd deleted file mode 100644 index 417e563..0000000 --- a/growth/card.gd +++ /dev/null @@ -1 +0,0 @@ -extends "res://Card/card.gd" diff --git a/growth/card.gd.uid b/growth/card.gd.uid deleted file mode 100644 index a0032e5..0000000 --- a/growth/card.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://dee7xa6183dwg diff --git a/growth/hand.gd b/growth/hand.gd index a7808ee..59fa02e 100644 --- a/growth/hand.gd +++ b/growth/hand.gd @@ -3,7 +3,7 @@ extends Panel @export var player: NodePath @export var world: NodePath -var dash_card_scene = preload("res://Cards/dash_card.tscn") +var dash_card_scene = preload("res://Cards/DashCard.tscn") var active_card_index = 0 func _ready() -> void: