arena entrance

Assets/Sprites/Particles/noise-cell-32.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cnbl2513g1aec"
+path.s3tc="res://.godot/imported/noise-cell-32.png-21cb4b59cecdf1f399b2be2e8f3cddb7.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Assets/Sprites/Particles/noise-cell-32.png"
+dest_files=["res://.godot/imported/noise-cell-32.png-21cb4b59cecdf1f399b2be2e8f3cddb7.s3tc.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+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

Assets/Sprites/Particles/noise-cell-8.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://pirjyyj5i0c7"
+path.s3tc="res://.godot/imported/noise-cell-8.png-b2076949125453695ac1d3d0cb5b54d6.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Assets/Sprites/Particles/noise-cell-8.png"
+dest_files=["res://.godot/imported/noise-cell-8.png-b2076949125453695ac1d3d0cb5b54d6.s3tc.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+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

Assets/Sprites/Props/arena-stairs.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://wuvwd5corw3f"
+path="res://.godot/imported/arena-stairs.png-20e8db830b31e52d896ed8fdbf0a21f0.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Sprites/Props/arena-stairs.png"
+dest_files=["res://.godot/imported/arena-stairs.png-20e8db830b31e52d896ed8fdbf0a21f0.ctex"]
+
+[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=1

Assets/Sprites/Props/doc-statue.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://jxrytll5j50n"
+path="res://.godot/imported/doc-statue.png-add5b1e21d3cac27bb2e3c533b3945ac.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Sprites/Props/doc-statue.png"
+dest_files=["res://.godot/imported/doc-statue.png-add5b1e21d3cac27bb2e3c533b3945ac.ctex"]
+
+[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=1

Assets/Sprites/Props/foliage.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://g3ad2ts8cd3k"
+path="res://.godot/imported/foliage.png-819d5342bfbed3c8489d92d11bfcaef2.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Sprites/Props/foliage.png"
+dest_files=["res://.godot/imported/foliage.png-819d5342bfbed3c8489d92d11bfcaef2.ctex"]
+
+[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=1

Assets/Sprites/Props/tree-dark-2.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://jhqfflef5yde"
+path="res://.godot/imported/tree-dark-2.png-dff7d525af2bda2423b42f4abe1e51be.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Sprites/Props/tree-dark-2.png"
+dest_files=["res://.godot/imported/tree-dark-2.png-dff7d525af2bda2423b42f4abe1e51be.ctex"]
+
+[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=1

Assets/Sprites/Props/tree-dark-3.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dcwerlcsr0nj0"
+path="res://.godot/imported/tree-dark-3.png-bd0ad6946c9e4f3f6fa6dba853dbcb7d.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Sprites/Props/tree-dark-3.png"
+dest_files=["res://.godot/imported/tree-dark-3.png-bd0ad6946c9e4f3f6fa6dba853dbcb7d.ctex"]
+
+[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=1

Assets/Sprites/Props/tree-dark-4.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://8rbstele3ckq"
+path="res://.godot/imported/tree-dark-4.png-78769e54f12dccc0f338b3313f3da80f.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Sprites/Props/tree-dark-4.png"
+dest_files=["res://.godot/imported/tree-dark-4.png-78769e54f12dccc0f338b3313f3da80f.ctex"]
+
+[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=1

Assets/Sprites/Props/tree-dark-5.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://ds0xg848g3jid"
+path="res://.godot/imported/tree-dark-5.png-a945061c3c21fcfa1e7716dc97006846.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Sprites/Props/tree-dark-5.png"
+dest_files=["res://.godot/imported/tree-dark-5.png-a945061c3c21fcfa1e7716dc97006846.ctex"]
+
+[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=1

Assets/Sprites/Props/tree-dark.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dl2q3k0w8e4fp"
+path="res://.godot/imported/tree-dark.png-e57740291b1afea2ae94e5e681c0e9dd.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Sprites/Props/tree-dark.png"
+dest_files=["res://.godot/imported/tree-dark.png-e57740291b1afea2ae94e5e681c0e9dd.ctex"]
+
+[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=1

Assets/Sprites/grass-tileset.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://j1ekk1ppenm4"
+path="res://.godot/imported/grass-tileset.png-37f60bf370056c77b8af92bb47508ddf.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Sprites/grass-tileset.png"
+dest_files=["res://.godot/imported/grass-tileset.png-37f60bf370056c77b8af92bb47508ddf.ctex"]
+
+[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=1

Characters/Player.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=57 format=3 uid="uid://b2254pup8k161"]
+[gd_scene load_steps=58 format=3 uid="uid://b2254pup8k161"]
 
 [ext_resource type="Script" path="res://Characters/Player.cs" id="1_flygr"]
 [ext_resource type="Shader" path="res://Shaders/Flash.gdshader" id="2_ngsgt"]
@@ -25,6 +25,7 @@
 [ext_resource type="PackedScene" uid="uid://p7oijq6dbvvk" path="res://Items/Weapons/DocLance.tscn" id="14_bj0lo"]
 [ext_resource type="Texture2D" uid="uid://d1ukste16yq6v" path="res://Assets/Sprites/Particles/player-light.png" id="15_3hahh"]
 [ext_resource type="Script" path="res://Utils/DamageTime.cs" id="15_4xl06"]
+[ext_resource type="PackedScene" uid="uid://g7wfcubs6bdd" path="res://Items/Weapons/Railgun.tscn" id="21_n8w32"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_h78y7"]
 shader = ExtResource("2_ngsgt")
@@ -447,6 +448,9 @@ InventoryMap = {
 [node name="Node2D" parent="Inventory" instance=ExtResource("7_4rxuv")]
 visible = false
 
+[node name="Railgun" parent="Inventory" instance=ExtResource("21_n8w32")]
+UseTime = 0.2
+
 [node name="DocLance" parent="Inventory" instance=ExtResource("14_bj0lo")]
 
 [node name="Hurtbox" parent="." node_paths=PackedStringArray("InvincibilityTimer") instance=ExtResource("9_avyu4")]

Scenes/BaseMap.tscn

@@ -1881,7 +1881,7 @@ Spawners = NodePath("Spawners")
 
 [node name="CanvasModulate" type="CanvasModulate" parent="."]
 
-[node name="Static" type="Node2D" parent="."]
+[node name="Props" type="Node2D" parent="."]
 
 [node name="Entities" type="Node2D" parent="."]
 y_sort_enabled = true

Scenes/Level.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=7 format=3 uid="uid://1pb3mpmrl7lc"]
 
 [ext_resource type="Script" path="res://Utils/World.cs" id="1_1k6ew"]
-[ext_resource type="PackedScene" uid="uid://b2x17su05ou5w" path="res://Scenes/Maps/Arena.tscn" id="2_lddbd"]
+[ext_resource type="PackedScene" uid="uid://c72uqjjtxpi3g" path="res://Scenes/Maps/ArenaExterior.tscn" id="2_pksaj"]
 [ext_resource type="PackedScene" uid="uid://bxo553hblp6nf" path="res://UI/HealthBar.tscn" id="3_5rhge"]
 [ext_resource type="Script" path="res://UI/UIController.cs" id="3_fe62s"]
 [ext_resource type="PackedScene" uid="uid://01d24ij5av1y" path="res://UI/BossBar.tscn" id="5_8njq4"]
@@ -9,7 +9,7 @@
 
 [node name="World" type="Node2D" node_paths=PackedStringArray("UIController", "MusicPlayer", "DialogueBalloon")]
 script = ExtResource("1_1k6ew")
-StartingArea = ExtResource("2_lddbd")
+StartingArea = ExtResource("2_pksaj")
 UIController = NodePath("CanvasLayer/UI")
 MusicPlayer = NodePath("MusicPlayer")
 DialogueBalloon = NodePath("DialogBalloon")

Scenes/Maps/Arena.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=29 format=3 uid="uid://b2x17su05ou5w"]
+[gd_scene load_steps=11 format=3 uid="uid://b2x17su05ou5w"]
 
 [ext_resource type="PackedScene" uid="uid://clwv2owvk6abe" path="res://Scenes/BaseMap.tscn" id="1_ifiic"]
 [ext_resource type="TileSet" uid="uid://l61kbx31ug4p" path="res://Scenes/Maps/ArenaTileset.tres" id="2_x0mh7"]
@@ -8,134 +8,14 @@
 [ext_resource type="PackedScene" uid="uid://ceadk7pam7vab" path="res://Entities/TorchLamp.tscn" id="6_jy3pc"]
 [ext_resource type="Texture2D" uid="uid://d1ukste16yq6v" path="res://Assets/Sprites/Particles/player-light.png" id="7_y7j0e"]
 [ext_resource type="AudioStream" uid="uid://dy4qjflo1k28b" path="res://Assets/Sounds/calm-storm-ambient.mp3" id="8_wox7d"]
-[ext_resource type="PackedScene" uid="uid://ckxelxak8dko7" path="res://Characters/ExampleEnemy2.tscn" id="9_xh7k8"]
 
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_r2j43"]
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_onuc5"]
 resource_local_to_scene = true
 shader = ExtResource("5_h8k5p")
 shader_parameter/color = Quaternion(1, 1, 1, 1)
 shader_parameter/intensity = 0.0
 shader_parameter/alpha_modulate = 1.0
 
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_khdpp"]
-resource_local_to_scene = true
-shader = ExtResource("5_h8k5p")
-shader_parameter/color = Quaternion(1, 1, 1, 1)
-shader_parameter/intensity = 0.0
-shader_parameter/alpha_modulate = 1.0
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_elehk"]
-resource_local_to_scene = true
-shader = ExtResource("5_h8k5p")
-shader_parameter/color = Vector4(1, 1, 1, 1)
-shader_parameter/intensity = 0.0
-shader_parameter/alpha_modulate = 1.0
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_v5id6"]
-resource_local_to_scene = true
-shader = ExtResource("5_h8k5p")
-shader_parameter/color = Vector4(1, 1, 1, 1)
-shader_parameter/intensity = 0.0
-shader_parameter/alpha_modulate = 1.0
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_ssogq"]
-resource_local_to_scene = true
-shader = ExtResource("5_h8k5p")
-shader_parameter/color = Vector4(1, 1, 1, 1)
-shader_parameter/intensity = 0.0
-shader_parameter/alpha_modulate = 1.0
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_s2fv3"]
-resource_local_to_scene = true
-shader = ExtResource("5_h8k5p")
-shader_parameter/color = Vector4(1, 1, 1, 1)
-shader_parameter/intensity = 0.0
-shader_parameter/alpha_modulate = 1.0
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_2qo5u"]
-resource_local_to_scene = true
-shader = ExtResource("5_h8k5p")
-shader_parameter/color = Vector4(1, 1, 1, 1)
-shader_parameter/intensity = 0.0
-shader_parameter/alpha_modulate = 1.0
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_xibdk"]
-resource_local_to_scene = true
-shader = ExtResource("5_h8k5p")
-shader_parameter/color = Vector4(1, 1, 1, 1)
-shader_parameter/intensity = 0.0
-shader_parameter/alpha_modulate = 1.0
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_xqxak"]
-resource_local_to_scene = true
-shader = ExtResource("5_h8k5p")
-shader_parameter/color = Vector4(1, 1, 1, 1)
-shader_parameter/intensity = 0.0
-shader_parameter/alpha_modulate = 1.0
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_8wa4u"]
-resource_local_to_scene = true
-shader = ExtResource("5_h8k5p")
-shader_parameter/color = Vector4(1, 1, 1, 1)
-shader_parameter/intensity = 0.0
-shader_parameter/alpha_modulate = 1.0
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_2ha1r"]
-resource_local_to_scene = true
-shader = ExtResource("5_h8k5p")
-shader_parameter/color = Vector4(1, 1, 1, 1)
-shader_parameter/intensity = 0.0
-shader_parameter/alpha_modulate = 1.0
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_r1dp4"]
-resource_local_to_scene = true
-shader = ExtResource("5_h8k5p")
-shader_parameter/color = Vector4(1, 1, 1, 1)
-shader_parameter/intensity = 0.0
-shader_parameter/alpha_modulate = 1.0
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_w34xi"]
-resource_local_to_scene = true
-shader = ExtResource("5_h8k5p")
-shader_parameter/color = Vector4(1, 1, 1, 1)
-shader_parameter/intensity = 0.0
-shader_parameter/alpha_modulate = 1.0
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_316o8"]
-resource_local_to_scene = true
-shader = ExtResource("5_h8k5p")
-shader_parameter/color = Vector4(1, 1, 1, 1)
-shader_parameter/intensity = 0.0
-shader_parameter/alpha_modulate = 1.0
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_c02am"]
-resource_local_to_scene = true
-shader = ExtResource("5_h8k5p")
-shader_parameter/color = Vector4(1, 1, 1, 1)
-shader_parameter/intensity = 0.0
-shader_parameter/alpha_modulate = 1.0
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_fh67a"]
-resource_local_to_scene = true
-shader = ExtResource("5_h8k5p")
-shader_parameter/color = Vector4(1, 1, 1, 1)
-shader_parameter/intensity = 0.0
-shader_parameter/alpha_modulate = 1.0
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_cl7jx"]
-resource_local_to_scene = true
-shader = ExtResource("5_h8k5p")
-shader_parameter/color = Vector4(1, 1, 1, 1)
-shader_parameter/intensity = 0.0
-shader_parameter/alpha_modulate = 1.0
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_qfnxq"]
-resource_local_to_scene = true
-shader = ExtResource("5_h8k5p")
-shader_parameter/color = Vector4(1, 1, 1, 1)
-shader_parameter/intensity = 0.0
-shader_parameter/alpha_modulate = 1.0
-
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_gwpea"]
 size = Vector2(256, 256)
 
@@ -151,88 +31,85 @@ ClearColor = Color(0.105882, 0.0470588, 0.117647, 1)
 AreaName = "The Arena"
 MapName = "The Arena"
 
-[node name="CanvasModulate" parent="." index="0"]
-color = Color(0.317647, 0.184314, 0.345098, 1)
-
-[node name="TorchLamp" parent="Static" index="0" instance=ExtResource("6_jy3pc")]
+[node name="Static@TorchLamp" parent="." index="0" instance=ExtResource("6_jy3pc")]
 y_sort_enabled = true
 position = Vector2(-96, -120)
 
-[node name="TorchLamp3" parent="Static" index="1" instance=ExtResource("6_jy3pc")]
+[node name="Static@TorchLamp3" parent="." index="1" instance=ExtResource("6_jy3pc")]
 y_sort_enabled = true
 position = Vector2(0, -120)
 
-[node name="TorchLamp5" parent="Static" index="2" instance=ExtResource("6_jy3pc")]
+[node name="Static@TorchLamp5" parent="." index="2" instance=ExtResource("6_jy3pc")]
 y_sort_enabled = true
 position = Vector2(96, -120)
 
-[node name="TorchLamp6" parent="Static" index="3" instance=ExtResource("6_jy3pc")]
+[node name="Static@TorchLamp6" parent="." index="3" instance=ExtResource("6_jy3pc")]
 y_sort_enabled = true
 position = Vector2(-120, -96)
 
-[node name="TorchLamp7" parent="Static" index="4" instance=ExtResource("6_jy3pc")]
+[node name="Static@TorchLamp7" parent="." index="4" instance=ExtResource("6_jy3pc")]
 y_sort_enabled = true
 position = Vector2(120, -96)
 
-[node name="TorchLamp9" parent="Static" index="5" instance=ExtResource("6_jy3pc")]
+[node name="Static@TorchLamp9" parent="." index="5" instance=ExtResource("6_jy3pc")]
 y_sort_enabled = true
 position = Vector2(120, -1)
 
-[node name="TorchLamp11" parent="Static" index="6" instance=ExtResource("6_jy3pc")]
+[node name="Static@TorchLamp11" parent="." index="6" instance=ExtResource("6_jy3pc")]
 y_sort_enabled = true
 position = Vector2(120, 95)
 
-[node name="TorchLamp12" parent="Static" index="7" instance=ExtResource("6_jy3pc")]
+[node name="Static@TorchLamp12" parent="." index="7" instance=ExtResource("6_jy3pc")]
 y_sort_enabled = true
 position = Vector2(97, 120)
 
-[node name="TorchLamp14" parent="Static" index="8" instance=ExtResource("6_jy3pc")]
+[node name="Static@TorchLamp14" parent="." index="8" instance=ExtResource("6_jy3pc")]
 y_sort_enabled = true
 position = Vector2(0, 120)
 
-[node name="TorchLamp16" parent="Static" index="9" instance=ExtResource("6_jy3pc")]
+[node name="Static@TorchLamp16" parent="." index="9" instance=ExtResource("6_jy3pc")]
 y_sort_enabled = true
 position = Vector2(-96, 120)
 
-[node name="TorchLamp17" parent="Static" index="10" instance=ExtResource("6_jy3pc")]
+[node name="Static@TorchLamp17" parent="." index="10" instance=ExtResource("6_jy3pc")]
 y_sort_enabled = true
 position = Vector2(-120, 95)
 
-[node name="TorchLamp19" parent="Static" index="11" instance=ExtResource("6_jy3pc")]
+[node name="Static@TorchLamp19" parent="." index="11" instance=ExtResource("6_jy3pc")]
 y_sort_enabled = true
 position = Vector2(-120, -1)
 
-[node name="Torch" parent="Static" index="12" instance=ExtResource("6_1wwor")]
+[node name="Static@Torch" parent="." index="12" instance=ExtResource("6_1wwor")]
 visible = false
 position = Vector2(-120, -112)
 
-[node name="Torch2" parent="Static" index="13" instance=ExtResource("6_1wwor")]
+[node name="Static@Torch2" parent="." index="13" instance=ExtResource("6_1wwor")]
 visible = false
 position = Vector2(-72, -112)
 
-[node name="Torch3" parent="Static" index="14" instance=ExtResource("6_1wwor")]
+[node name="Static@Torch3" parent="." index="14" instance=ExtResource("6_1wwor")]
 visible = false
 position = Vector2(-24, -113)
 
-[node name="Torch4" parent="Static" index="15" instance=ExtResource("6_1wwor")]
+[node name="Static@Torch4" parent="." index="15" instance=ExtResource("6_1wwor")]
 visible = false
 position = Vector2(24, -112)
 
-[node name="Torch5" parent="Static" index="16" instance=ExtResource("6_1wwor")]
+[node name="Static@Torch5" parent="." index="16" instance=ExtResource("6_1wwor")]
 visible = false
 position = Vector2(72, -112)
 
-[node name="Torch6" parent="Static" index="17" instance=ExtResource("6_1wwor")]
+[node name="Static@Torch6" parent="." index="17" instance=ExtResource("6_1wwor")]
 visible = false
 position = Vector2(120, -112)
 
+[node name="CanvasModulate" parent="." index="18"]
+color = Color(0.317647, 0.184314, 0.345098, 1)
+
 [node name="Doc" parent="Entities" index="0" instance=ExtResource("4_ej0f3")]
-material = SubResource("ShaderMaterial_r2j43")
+material = SubResource("ShaderMaterial_onuc5")
 
-[node name="Doc2" parent="Entities" index="1" instance=ExtResource("4_ej0f3")]
-material = SubResource("ShaderMaterial_khdpp")
-
-[node name="PointLight2D" type="PointLight2D" parent="Entities" index="2"]
+[node name="PointLight2D" type="PointLight2D" parent="Entities" index="1"]
 position = Vector2(168, -42)
 energy = 1.5
 blend_mode = 2
@@ -242,95 +119,15 @@ shadow_color = Color(0.572549, 0.572549, 0.572549, 0)
 texture = ExtResource("7_y7j0e")
 height = 16.0
 
-[node name="CanvasGroup" type="CanvasGroup" parent="Entities" index="3"]
+[node name="CanvasGroup" type="CanvasGroup" parent="Entities" index="2"]
 
-[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="Entities" index="4"]
+[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="Entities" index="3"]
 position = Vector2(19, 23)
 stream = ExtResource("8_wox7d")
 volume_db = -5.0
 autoplay = true
 
-[node name="Enemy" parent="Entities" index="5" instance=ExtResource("9_xh7k8")]
-material = SubResource("ShaderMaterial_elehk")
-position = Vector2(-40, 72)
-Faction = 1
-
-[node name="Enemy2" parent="Entities" index="6" instance=ExtResource("9_xh7k8")]
-material = SubResource("ShaderMaterial_v5id6")
-position = Vector2(64, -88)
-Faction = 1
-
-[node name="Enemy3" parent="Entities" index="7" instance=ExtResource("9_xh7k8")]
-material = SubResource("ShaderMaterial_ssogq")
-position = Vector2(64, -88)
-Faction = 1
-
-[node name="Enemy4" parent="Entities" index="8" instance=ExtResource("9_xh7k8")]
-material = SubResource("ShaderMaterial_s2fv3")
-position = Vector2(64, -48)
-Faction = 1
-
-[node name="Enemy5" parent="Entities" index="9" instance=ExtResource("9_xh7k8")]
-material = SubResource("ShaderMaterial_2qo5u")
-position = Vector2(-48, -88)
-Faction = 1
-
-[node name="Enemy6" parent="Entities" index="10" instance=ExtResource("9_xh7k8")]
-material = SubResource("ShaderMaterial_xibdk")
-position = Vector2(-16, -88)
-Faction = 1
-
-[node name="Enemy7" parent="Entities" index="11" instance=ExtResource("9_xh7k8")]
-material = SubResource("ShaderMaterial_xqxak")
-position = Vector2(-16, 40)
-Faction = 1
-
-[node name="Enemy8" parent="Entities" index="12" instance=ExtResource("9_xh7k8")]
-material = SubResource("ShaderMaterial_8wa4u")
-position = Vector2(-16, 40)
-Faction = 1
-
-[node name="Enemy9" parent="Entities" index="13" instance=ExtResource("9_xh7k8")]
-material = SubResource("ShaderMaterial_2ha1r")
-position = Vector2(-16, 40)
-Faction = 1
-
-[node name="Enemy10" parent="Entities" index="14" instance=ExtResource("9_xh7k8")]
-material = SubResource("ShaderMaterial_r1dp4")
-position = Vector2(-16, 40)
-Faction = 1
-
-[node name="Enemy11" parent="Entities" index="15" instance=ExtResource("9_xh7k8")]
-material = SubResource("ShaderMaterial_w34xi")
-position = Vector2(-16, 40)
-Faction = 1
-
-[node name="Enemy12" parent="Entities" index="16" instance=ExtResource("9_xh7k8")]
-material = SubResource("ShaderMaterial_316o8")
-position = Vector2(-40, -40)
-Faction = 1
-
-[node name="Enemy13" parent="Entities" index="17" instance=ExtResource("9_xh7k8")]
-material = SubResource("ShaderMaterial_c02am")
-position = Vector2(8, 16)
-Faction = 1
-
-[node name="Enemy14" parent="Entities" index="18" instance=ExtResource("9_xh7k8")]
-material = SubResource("ShaderMaterial_fh67a")
-position = Vector2(-16, -64)
-Faction = 1
-
-[node name="Enemy15" parent="Entities" index="19" instance=ExtResource("9_xh7k8")]
-material = SubResource("ShaderMaterial_cl7jx")
-position = Vector2(56, 40)
-Faction = 1
-
-[node name="Enemy16" parent="Entities" index="20" instance=ExtResource("9_xh7k8")]
-material = SubResource("ShaderMaterial_qfnxq")
-position = Vector2(-32, 8)
-Faction = 1
-
-[node name="Areas" parent="." index="3"]
+[node name="Areas" parent="." index="21"]
 visible = false
 
 [node name="Area2D" type="Area2D" parent="Areas" index="0"]

Scenes/Maps/ArenaTileset.tres

@@ -1,6 +1,7 @@
-[gd_resource type="TileSet" load_steps=4 format=3 uid="uid://l61kbx31ug4p"]
+[gd_resource type="TileSet" load_steps=6 format=3 uid="uid://l61kbx31ug4p"]
 
 [ext_resource type="Texture2D" uid="uid://b0yiy7w8nxmas" path="res://Assets/Sprites/arena-tileset.png" id="1_kud44"]
+[ext_resource type="Texture2D" uid="uid://j1ekk1ppenm4" path="res://Assets/Sprites/grass-tileset.png" id="2_lihbs"]
 
 [sub_resource type="CanvasTexture" id="CanvasTexture_3n6aa"]
 diffuse_texture = ExtResource("1_kud44")
@@ -460,6 +461,166 @@ texture = SubResource("CanvasTexture_3n6aa")
 8:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
 8:6/0/physics_layer_0/angular_velocity = 0.0
 8:6/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+12:0/0 = 0
+12:0/0/y_sort_origin = 8
+12:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+12:0/0/physics_layer_0/angular_velocity = 0.0
+12:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, 2, 8, 2, 8, 8, -8, 8)
+13:0/0 = 0
+13:0/0/y_sort_origin = 8
+13:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+13:0/0/physics_layer_0/angular_velocity = 0.0
+13:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, 2, 8, 2, 8, 8, -8, 8)
+
+[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_mdfpe"]
+texture = ExtResource("2_lihbs")
+0:0/0 = 0
+0:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+0:0/0/physics_layer_0/angular_velocity = 0.0
+1:0/0 = 0
+1:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+1:0/0/physics_layer_0/angular_velocity = 0.0
+2:0/0 = 0
+2:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+2:0/0/physics_layer_0/angular_velocity = 0.0
+3:0/0 = 0
+3:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+3:0/0/physics_layer_0/angular_velocity = 0.0
+4:0/0 = 0
+4:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+4:0/0/physics_layer_0/angular_velocity = 0.0
+5:0/0 = 0
+5:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+5:0/0/physics_layer_0/angular_velocity = 0.0
+6:0/0 = 0
+6:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+6:0/0/physics_layer_0/angular_velocity = 0.0
+7:0/0 = 0
+7:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+7:0/0/physics_layer_0/angular_velocity = 0.0
+7:1/0 = 0
+7:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+7:1/0/physics_layer_0/angular_velocity = 0.0
+7:2/0 = 0
+7:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+7:2/0/physics_layer_0/angular_velocity = 0.0
+7:3/0 = 0
+7:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+7:3/0/physics_layer_0/angular_velocity = 0.0
+7:4/0 = 0
+7:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+7:4/0/physics_layer_0/angular_velocity = 0.0
+6:4/0 = 0
+6:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+6:4/0/physics_layer_0/angular_velocity = 0.0
+5:4/0 = 0
+5:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+5:4/0/physics_layer_0/angular_velocity = 0.0
+4:4/0 = 0
+4:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+4:4/0/physics_layer_0/angular_velocity = 0.0
+3:4/0 = 0
+3:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+3:4/0/physics_layer_0/angular_velocity = 0.0
+2:4/0 = 0
+2:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+2:4/0/physics_layer_0/angular_velocity = 0.0
+1:4/0 = 0
+1:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+1:4/0/physics_layer_0/angular_velocity = 0.0
+0:4/0 = 0
+0:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+0:4/0/physics_layer_0/angular_velocity = 0.0
+0:3/0 = 0
+0:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+0:3/0/physics_layer_0/angular_velocity = 0.0
+1:2/0 = 0
+1:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+1:2/0/physics_layer_0/angular_velocity = 0.0
+1:1/0 = 0
+1:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+1:1/0/physics_layer_0/angular_velocity = 0.0
+0:1/0 = 0
+0:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+0:1/0/physics_layer_0/angular_velocity = 0.0
+0:2/0 = 0
+0:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+0:2/0/physics_layer_0/angular_velocity = 0.0
+2:3/0 = 0
+2:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+2:3/0/physics_layer_0/angular_velocity = 0.0
+3:3/0 = 0
+3:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+3:3/0/physics_layer_0/angular_velocity = 0.0
+1:3/0 = 0
+1:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+1:3/0/physics_layer_0/angular_velocity = 0.0
+2:2/0 = 0
+2:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+2:2/0/physics_layer_0/angular_velocity = 0.0
+3:1/0 = 0
+3:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+3:1/0/physics_layer_0/angular_velocity = 0.0
+4:1/0 = 0
+4:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+4:1/0/physics_layer_0/angular_velocity = 0.0
+2:1/0 = 0
+2:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+2:1/0/physics_layer_0/angular_velocity = 0.0
+4:2/0 = 0
+4:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+4:2/0/physics_layer_0/angular_velocity = 0.0
+5:2/0 = 0
+5:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+5:2/0/physics_layer_0/angular_velocity = 0.0
+3:2/0 = 0
+3:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+3:2/0/physics_layer_0/angular_velocity = 0.0
+6:3/0 = 0
+6:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+6:3/0/physics_layer_0/angular_velocity = 0.0
+5:3/0 = 0
+5:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+5:3/0/physics_layer_0/angular_velocity = 0.0
+4:3/0 = 0
+4:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+4:3/0/physics_layer_0/angular_velocity = 0.0
+6:2/0 = 0
+6:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+6:2/0/physics_layer_0/angular_velocity = 0.0
+6:1/0 = 0
+6:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+6:1/0/physics_layer_0/angular_velocity = 0.0
+5:1/0 = 0
+5:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+5:1/0/physics_layer_0/angular_velocity = 0.0
+0:5/0 = 0
+0:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+0:5/0/physics_layer_0/angular_velocity = 0.0
+1:5/0 = 0
+1:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+1:5/0/physics_layer_0/angular_velocity = 0.0
+0:6/0 = 0
+0:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+0:6/0/physics_layer_0/angular_velocity = 0.0
+0:7/0 = 0
+0:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+0:7/0/physics_layer_0/angular_velocity = 0.0
+1:7/0 = 0
+1:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+1:7/0/physics_layer_0/angular_velocity = 0.0
+1:6/0 = 0
+1:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+1:6/0/physics_layer_0/angular_velocity = 0.0
+2:6/0 = 0
+2:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+2:6/0/physics_layer_0/angular_velocity = 0.0
+2:5/0 = 0
+2:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+2:5/0/physics_layer_0/angular_velocity = 0.0
+2:7/0 = 0
+2:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+2:7/0/physics_layer_0/angular_velocity = 0.0
 
 [resource]
 occlusion_layer_0/light_mask = 1
@@ -475,3 +636,4 @@ terrain_set_1/terrain_0/color = Color(0.5, 0.34375, 0.25, 1)
 terrain_set_1/terrain_1/name = "carpet vertical"
 terrain_set_1/terrain_1/color = Color(0.5, 0.4375, 0.25, 1)
 sources/0 = SubResource("TileSetAtlasSource_fcd6d")
+sources/1 = SubResource("TileSetAtlasSource_mdfpe")

Shaders/Water.gdshader

@@ -0,0 +1,20 @@
+shader_type canvas_item;
+
+uniform float level : hint_range(0.0, 1.0) = 0.5; 
+uniform vec4 water_albedo : source_color = vec4(0.26, 0.23, 0.73, 1.0);
+uniform float alpha : hint_range(0.0, 1.0) = 0.75;
+uniform float water_speed = 0.05;
+uniform float wave_distortion = 0.2;
+uniform sampler2D noise_texture : repeat_enable;
+uniform sampler2D noise_texture2 : repeat_enable;
+uniform sampler2D SCREEN_TEXTURE : hint_screen_texture, filter_linear_mipmap;
+
+void fragment() {
+    vec2 scroll1 = vec2(water_speed);
+    vec2 scroll2 = vec2(-water_speed);
+    float depth = texture(noise_texture, UV + scroll1 * TIME).r *
+        texture(noise_texture2, UV + scroll2 * TIME).r;
+    vec4 screen = texture(SCREEN_TEXTURE, SCREEN_UV + wave_distortion * vec2(depth));
+    COLOR = screen;
+    COLOR.a = alpha;
+}

Utils/World.cs

@@ -30,6 +30,8 @@ public partial class World : Node2D
     [Export]
     public Dialogue.Balloon DialogueBalloon { get; set; }
 
+    public State.Global.GlobalState GlobalState { get; set; }
+
     private Dictionary<string, Map> _maps;
 
     private string _currentConnector;
@@ -53,13 +55,13 @@ public partial class World : Node2D
     {
         // check if world already exists
 
-        var globalState = GetNode<State.Global.GlobalState>("/root/GlobalState");
-        if (globalState.World is not null)
+        GlobalState = GetNode<State.Global.GlobalState>("/root/GlobalState");
+        if (GlobalState.World is not null)
         {
             throw new System.InvalidOperationException();
         }
 
-        globalState.World = this;
+        GlobalState.World = this;
 
         Godot.RenderingServer.SetDefaultClearColor(Godot.Colors.Black);
 

project.godot

@@ -111,6 +111,7 @@ locale/translations_pot_files=PackedStringArray("res://Assets/Dialog/doc.dialogu
 [layer_names]
 
 2d_render/layer_4="Godray Occluder"
+2d_render/layer_5="Godray Occluder Secondary"
 2d_physics/layer_1="World"
 2d_physics/layer_2="Character"
 2d_physics/layer_3="Player"