From f7705a6d572782dd59bb580452935be95d05ec2c Mon Sep 17 00:00:00 2001 From: Minimata Date: Sat, 17 Jan 2026 17:58:23 +0100 Subject: [PATCH] moving files around --- maps/GYMs/enemies.tscn | 12 ++++---- .../{ => first_enemy}/EnemyInitInputs.cs | 0 .../{ => first_enemy}/EnemyInitInputs.cs.uid | 0 .../enemies/{ => first_enemy}/FirstEnemy.cs | 0 .../{ => first_enemy}/FirstEnemy.cs.uid | 0 .../{ => first_enemy}/first_enemy.tscn | 4 +-- .../{ => first_enemy}/first_enemy_damage.tres | 0 .../{ => first_enemy}/first_enemy_health.tres | 0 .../enemies/{ => flying_enemy}/FlyingEnemy.cs | 0 .../{ => flying_enemy}/FlyingEnemy.cs.uid | 0 .../{ => flying_enemy}/FlyingEnemyInputs.cs | 0 .../FlyingEnemyInputs.cs.uid | 0 .../{ => flying_enemy}/flying_enemy.tscn | 28 ++----------------- .../flying_enemy_damage.tres | 0 .../flying_enemy_health.tres | 0 scenes/spawners/spawner.tscn | 2 +- 16 files changed, 12 insertions(+), 34 deletions(-) rename scenes/enemies/{ => first_enemy}/EnemyInitInputs.cs (100%) rename scenes/enemies/{ => first_enemy}/EnemyInitInputs.cs.uid (100%) rename scenes/enemies/{ => first_enemy}/FirstEnemy.cs (100%) rename scenes/enemies/{ => first_enemy}/FirstEnemy.cs.uid (100%) rename scenes/enemies/{ => first_enemy}/first_enemy.tscn (97%) rename scenes/enemies/{ => first_enemy}/first_enemy_damage.tres (100%) rename scenes/enemies/{ => first_enemy}/first_enemy_health.tres (100%) rename scenes/enemies/{ => flying_enemy}/FlyingEnemy.cs (100%) rename scenes/enemies/{ => flying_enemy}/FlyingEnemy.cs.uid (100%) rename scenes/enemies/{ => flying_enemy}/FlyingEnemyInputs.cs (100%) rename scenes/enemies/{ => flying_enemy}/FlyingEnemyInputs.cs.uid (100%) rename scenes/enemies/{ => flying_enemy}/flying_enemy.tscn (81%) rename scenes/enemies/{ => flying_enemy}/flying_enemy_damage.tres (100%) rename scenes/enemies/{ => flying_enemy}/flying_enemy_health.tres (100%) diff --git a/maps/GYMs/enemies.tscn b/maps/GYMs/enemies.tscn index b60db4ec..889def5e 100644 --- a/maps/GYMs/enemies.tscn +++ b/maps/GYMs/enemies.tscn @@ -3,12 +3,12 @@ [ext_resource type="PackedScene" uid="uid://bei4nhkf8lwdo" path="res://player_controller/PlayerController.tscn" id="1_62kkh"] [ext_resource type="Material" uid="uid://31aulub2nqov" path="res://assets/greybox/m_greybox.tres" id="2_3uydm"] [ext_resource type="Script" uid="uid://jitubgv6judn" path="res://resource_definitions/RDamage.cs" id="2_sysok"] -[ext_resource type="PackedScene" uid="uid://dxt0e2ugmttqq" path="res://scenes/enemies/first_enemy.tscn" id="3_3uydm"] -[ext_resource type="Script" uid="uid://b2vdwkiqauhk3" path="res://scenes/enemies/EnemyInitInputs.cs" id="4_nd7vd"] -[ext_resource type="PackedScene" uid="uid://cmlud1hwkd6sv" path="res://scenes/enemies/flying_enemy.tscn" id="5_8fd2t"] -[ext_resource type="Script" uid="uid://do0dic4r3ri0s" path="res://scenes/enemies/FlyingEnemyInputs.cs" id="6_7m3bq"] -[ext_resource type="Resource" uid="uid://otfc2snh8umc" path="res://scenes/enemies/first_enemy_damage.tres" id="6_dmw1t"] -[ext_resource type="Resource" uid="uid://dgo65k2ceqfvy" path="res://scenes/enemies/flying_enemy_damage.tres" id="9_gp7s3"] +[ext_resource type="PackedScene" uid="uid://dxt0e2ugmttqq" path="res://scenes/enemies/first_enemy/first_enemy.tscn" id="3_3uydm"] +[ext_resource type="Script" uid="uid://b2vdwkiqauhk3" path="res://scenes/enemies/first_enemy/EnemyInitInputs.cs" id="4_nd7vd"] +[ext_resource type="PackedScene" uid="uid://cmlud1hwkd6sv" path="res://scenes/enemies/flying_enemy/flying_enemy.tscn" id="5_8fd2t"] +[ext_resource type="Script" uid="uid://do0dic4r3ri0s" path="res://scenes/enemies/flying_enemy/FlyingEnemyInputs.cs" id="6_7m3bq"] +[ext_resource type="Resource" uid="uid://otfc2snh8umc" path="res://scenes/enemies/first_enemy/first_enemy_damage.tres" id="6_dmw1t"] +[ext_resource type="Resource" uid="uid://dgo65k2ceqfvy" path="res://scenes/enemies/flying_enemy/flying_enemy_damage.tres" id="9_gp7s3"] [sub_resource type="Resource" id="Resource_gp7s3"] script = ExtResource("2_sysok") diff --git a/scenes/enemies/EnemyInitInputs.cs b/scenes/enemies/first_enemy/EnemyInitInputs.cs similarity index 100% rename from scenes/enemies/EnemyInitInputs.cs rename to scenes/enemies/first_enemy/EnemyInitInputs.cs diff --git a/scenes/enemies/EnemyInitInputs.cs.uid b/scenes/enemies/first_enemy/EnemyInitInputs.cs.uid similarity index 100% rename from scenes/enemies/EnemyInitInputs.cs.uid rename to scenes/enemies/first_enemy/EnemyInitInputs.cs.uid diff --git a/scenes/enemies/FirstEnemy.cs b/scenes/enemies/first_enemy/FirstEnemy.cs similarity index 100% rename from scenes/enemies/FirstEnemy.cs rename to scenes/enemies/first_enemy/FirstEnemy.cs diff --git a/scenes/enemies/FirstEnemy.cs.uid b/scenes/enemies/first_enemy/FirstEnemy.cs.uid similarity index 100% rename from scenes/enemies/FirstEnemy.cs.uid rename to scenes/enemies/first_enemy/FirstEnemy.cs.uid diff --git a/scenes/enemies/first_enemy.tscn b/scenes/enemies/first_enemy/first_enemy.tscn similarity index 97% rename from scenes/enemies/first_enemy.tscn rename to scenes/enemies/first_enemy/first_enemy.tscn index d539e12f..98a40af1 100644 --- a/scenes/enemies/first_enemy.tscn +++ b/scenes/enemies/first_enemy/first_enemy.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=19 format=3 uid="uid://dxt0e2ugmttqq"] -[ext_resource type="Script" uid="uid://bn7sc6id7n166" path="res://scenes/enemies/FirstEnemy.cs" id="1_4yfjf"] -[ext_resource type="Script" uid="uid://b2vdwkiqauhk3" path="res://scenes/enemies/EnemyInitInputs.cs" id="2_42xu3"] +[ext_resource type="Script" uid="uid://bn7sc6id7n166" path="res://scenes/enemies/first_enemy/FirstEnemy.cs" id="1_4yfjf"] +[ext_resource type="Script" uid="uid://b2vdwkiqauhk3" path="res://scenes/enemies/first_enemy/EnemyInitInputs.cs" id="2_42xu3"] [ext_resource type="Script" uid="uid://bjwrpv3jpsc1e" path="res://scenes/health/CHealth.cs" id="2_gsmti"] [ext_resource type="Script" uid="uid://b6y3ugfydvch0" path="res://resource_definitions/RDamageModifier.cs" id="2_r3cnf"] [ext_resource type="Script" uid="uid://jitubgv6judn" path="res://resource_definitions/RDamage.cs" id="3_1tw73"] diff --git a/scenes/enemies/first_enemy_damage.tres b/scenes/enemies/first_enemy/first_enemy_damage.tres similarity index 100% rename from scenes/enemies/first_enemy_damage.tres rename to scenes/enemies/first_enemy/first_enemy_damage.tres diff --git a/scenes/enemies/first_enemy_health.tres b/scenes/enemies/first_enemy/first_enemy_health.tres similarity index 100% rename from scenes/enemies/first_enemy_health.tres rename to scenes/enemies/first_enemy/first_enemy_health.tres diff --git a/scenes/enemies/FlyingEnemy.cs b/scenes/enemies/flying_enemy/FlyingEnemy.cs similarity index 100% rename from scenes/enemies/FlyingEnemy.cs rename to scenes/enemies/flying_enemy/FlyingEnemy.cs diff --git a/scenes/enemies/FlyingEnemy.cs.uid b/scenes/enemies/flying_enemy/FlyingEnemy.cs.uid similarity index 100% rename from scenes/enemies/FlyingEnemy.cs.uid rename to scenes/enemies/flying_enemy/FlyingEnemy.cs.uid diff --git a/scenes/enemies/FlyingEnemyInputs.cs b/scenes/enemies/flying_enemy/FlyingEnemyInputs.cs similarity index 100% rename from scenes/enemies/FlyingEnemyInputs.cs rename to scenes/enemies/flying_enemy/FlyingEnemyInputs.cs diff --git a/scenes/enemies/FlyingEnemyInputs.cs.uid b/scenes/enemies/flying_enemy/FlyingEnemyInputs.cs.uid similarity index 100% rename from scenes/enemies/FlyingEnemyInputs.cs.uid rename to scenes/enemies/flying_enemy/FlyingEnemyInputs.cs.uid diff --git a/scenes/enemies/flying_enemy.tscn b/scenes/enemies/flying_enemy/flying_enemy.tscn similarity index 81% rename from scenes/enemies/flying_enemy.tscn rename to scenes/enemies/flying_enemy/flying_enemy.tscn index 0d22f126..ff32d7fe 100644 --- a/scenes/enemies/flying_enemy.tscn +++ b/scenes/enemies/flying_enemy/flying_enemy.tscn @@ -1,8 +1,8 @@ -[gd_scene load_steps=24 format=3 uid="uid://cmlud1hwkd6sv"] +[gd_scene load_steps=20 format=3 uid="uid://cmlud1hwkd6sv"] -[ext_resource type="Script" uid="uid://cmvep0qi7qlvf" path="res://scenes/enemies/FlyingEnemy.cs" id="1_b46rq"] +[ext_resource type="Script" uid="uid://cmvep0qi7qlvf" path="res://scenes/enemies/flying_enemy/FlyingEnemy.cs" id="1_b46rq"] [ext_resource type="Script" uid="uid://b6y3ugfydvch0" path="res://resource_definitions/RDamageModifier.cs" id="2_1bsgx"] -[ext_resource type="Script" uid="uid://do0dic4r3ri0s" path="res://scenes/enemies/FlyingEnemyInputs.cs" id="2_aarbi"] +[ext_resource type="Script" uid="uid://do0dic4r3ri0s" path="res://scenes/enemies/flying_enemy/FlyingEnemyInputs.cs" id="2_aarbi"] [ext_resource type="Script" uid="uid://jitubgv6judn" path="res://resource_definitions/RDamage.cs" id="2_irbqc"] [ext_resource type="Script" uid="uid://b4cwruitopcee" path="res://resource_definitions/RDeathEffect.cs" id="4_12h4s"] [ext_resource type="Script" uid="uid://bjwrpv3jpsc1e" path="res://scenes/health/CHealth.cs" id="4_ys4jv"] @@ -21,27 +21,6 @@ DamageDealt = 2.0 DamageType = 2 metadata/_custom_type_script = "uid://jitubgv6judn" -[sub_resource type="Resource" id="Resource_2pnje"] -script = ExtResource("2_1bsgx") -metadata/_custom_type_script = "uid://b6y3ugfydvch0" - -[sub_resource type="Resource" id="Resource_1bsgx"] -script = ExtResource("2_1bsgx") -DamageType = 1 -Modifier = 2.0 -metadata/_custom_type_script = "uid://b6y3ugfydvch0" - -[sub_resource type="Resource" id="Resource_irbqc"] -script = ExtResource("2_1bsgx") -DamageType = 2 -Modifier = 0.5 -metadata/_custom_type_script = "uid://b6y3ugfydvch0" - -[sub_resource type="Resource" id="Resource_uotso"] -script = ExtResource("2_1bsgx") -DamageType = 3 -metadata/_custom_type_script = "uid://b6y3ugfydvch0" - [sub_resource type="Resource" id="Resource_ys4jv"] script = ExtResource("4_12h4s") metadata/_custom_type_script = "uid://b4cwruitopcee" @@ -83,7 +62,6 @@ motion_mode = 1 script = ExtResource("1_b46rq") Inputs = SubResource("Resource_7nxyi") GetDamageDealt = SubResource("Resource_o3msb") -DamageModifiers = Array[Object]([SubResource("Resource_2pnje"), SubResource("Resource_1bsgx"), SubResource("Resource_irbqc"), SubResource("Resource_uotso")]) CHealth = NodePath("CHealth") CDamage = NodePath("CDamageable") DeathEffects = Array[Object]([SubResource("Resource_ys4jv")]) diff --git a/scenes/enemies/flying_enemy_damage.tres b/scenes/enemies/flying_enemy/flying_enemy_damage.tres similarity index 100% rename from scenes/enemies/flying_enemy_damage.tres rename to scenes/enemies/flying_enemy/flying_enemy_damage.tres diff --git a/scenes/enemies/flying_enemy_health.tres b/scenes/enemies/flying_enemy/flying_enemy_health.tres similarity index 100% rename from scenes/enemies/flying_enemy_health.tres rename to scenes/enemies/flying_enemy/flying_enemy_health.tres diff --git a/scenes/spawners/spawner.tscn b/scenes/spawners/spawner.tscn index d2a84b89..fef8b3eb 100644 --- a/scenes/spawners/spawner.tscn +++ b/scenes/spawners/spawner.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://c305mfrtumcyq"] [ext_resource type="Script" uid="uid://djyspwixi01j5" path="res://scenes/spawners/Spawner.cs" id="1_2otbo"] -[ext_resource type="PackedScene" uid="uid://dxt0e2ugmttqq" path="res://scenes/enemies/first_enemy.tscn" id="2_2otbo"] +[ext_resource type="PackedScene" uid="uid://dxt0e2ugmttqq" path="res://scenes/enemies/first_enemy/first_enemy.tscn" id="2_2otbo"] [node name="Spawner" type="Node3D"] script = ExtResource("1_2otbo")