Clean up merge

src/game/Game.cs

@@ -57,9 +57,6 @@ public partial class Game : Node3D, IGame
   [Node] public InGameAudio InGameAudio { get; set; } = default!;
   #endregion
 
-  public const string SECOND_FLOOR_PATH = "res://src/map/dungeon/floors/SecondFloor.tscn";
-  public const string THIRD_FLOOR_PATH = "res://src/map/dungeon/floors/ThirdFloor.tscn";
-
   public void Setup()
   {
     GameRepo = new GameRepo();

src/map/Overworld.tscn

@@ -1,35 +0,0 @@
-[gd_scene load_steps=4 format=3 uid="uid://sv0suc4tjk8h"]
-
-[ext_resource type="Script" path="res://src/map/Overworld.cs" id="1_wvnkp"]
-
-[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_4myig"]
-transparency = 1
-albedo_color = Color(0.101961, 1, 1, 0.545098)
-
-[sub_resource type="CylinderShape3D" id="CylinderShape3D_hvri2"]
-height = 5.0
-radius = 2.0
-
-[node name="Overworld" type="Node3D"]
-script = ExtResource("1_wvnkp")
-
-[node name="CSGBox3D2" type="CSGBox3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 9.40436, 0)
-use_collision = true
-flip_faces = true
-size = Vector3(50, 20, 50)
-
-[node name="CSGCylinder3D" type="CSGCylinder3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12.6388, 0, 0)
-flip_faces = true
-radius = 2.0
-height = 5.0
-material = SubResource("StandardMaterial3D_4myig")
-
-[node name="Teleport" type="Area3D" parent="CSGCylinder3D"]
-unique_name_in_owner = true
-collision_layer = 2
-collision_mask = 2
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="CSGCylinder3D/Teleport"]
-shape = SubResource("CylinderShape3D_hvri2")

src/map/dungeon/floors/FirstFloor.tscn

@@ -1,12 +0,0 @@
-[gd_scene load_steps=5 format=3 uid="uid://dkde8r4dgftxm"]
-
-[ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonGenerator3D.gd" id="1_qnl2f"]
-[ext_resource type="PackedScene" uid="uid://dhpwwqow1ahrc" path="res://src/map/dungeon/rooms/Room1.tscn" id="2_ncsxh"]
-[ext_resource type="PackedScene" uid="uid://bbwgmqy3evhh2" path="res://src/map/dungeon/rooms/Room2.tscn" id="3_hwomd"]
-[ext_resource type="PackedScene" uid="uid://bn4gslp2gk8ds" path="res://src/map/dungeon/corridor/Corridor.tscn" id="4_os8ha"]
-
-[node name="FirstFloor" type="Node3D"]
-script = ExtResource("1_qnl2f")
-room_scenes = Array[PackedScene]([ExtResource("2_ncsxh"), ExtResource("3_hwomd")])
-corridor_room_scene = ExtResource("4_os8ha")
-dungeon_size = Vector3i(10, 1, 10)

src/map/dungeon/floors/SecondFloor.tscn

@@ -1,6 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://gp50n7sdgic8"]
-
-[ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonGenerator3D.gd" id="1_dmj3t"]
-
-[node name="SecondFloor" type="Node3D"]
-script = ExtResource("1_dmj3t")

src/map/dungeon/floors/ThirdFloor.tscn

@@ -1,6 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://3glnn50mftqk"]
-
-[ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonGenerator3D.gd" id="1_hi3c5"]
-
-[node name="ThirdFloor" type="Node3D"]
-script = ExtResource("1_hi3c5")

src/vfx/Weapon Strikes/._NON ELEMENTAL SLASH.png.import

@@ -1,30 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://511pf2hkejjy"
-valid=false
-
-[deps]
-
-source_file="res://src/vfx/Weapon Strikes/._NON ELEMENTAL SLASH.png"
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-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=0