zenayi/GameJamDungeon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fixes, EX-stage visual tighten up

Browse Source
This commit is contained in:
Pal
2026-05-01 17:43:11 -07:00
parent b66d631bc5
commit 9e7678ce2a
93 changed files with 3689 additions and 1397 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/00. Altar.tscn
+980 -5
View File
File diff suppressed because one or more lines are too long
Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Cellular.cs
+6 -6
View File
@@ -16,21 +16,21 @@ public partial class Cellular : SpecialFloor
public void OnResolved()
{
Show();
Exit.AreaEntered += Exit_AreaEntered;
FloorIsLoaded = true;
Show();
Exit.AreaEntered += Exit_AreaEntered;
FloorIsLoaded = true;
}
private void Exit_AreaEntered(Area3D area)
{
if (area.GetOwner() is IPlayer)
ExitReached();
if (area.GetOwner() is IPlayer)
ExitReached();
}
public void ExitReached() => Game.FloorExitReached();
public void OnExitTree()
{
Exit.AreaEntered -= Exit_AreaEntered;
Exit.AreaEntered -= Exit_AreaEntered;
}
}
Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Cellular.tscn
+155 -87
View File
File diff suppressed because one or more lines are too long
Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Grassland.cs
+6 -6
View File
@@ -15,21 +15,21 @@ public partial class Grassland : SpecialFloor
public void OnResolved()
{
Show();
Exit.AreaEntered += Exit_AreaEntered;
FloorIsLoaded = true;
Show();
Exit.AreaEntered += Exit_AreaEntered;
FloorIsLoaded = true;
}
private void Exit_AreaEntered(Area3D area)
{
if (area.GetOwner() is IPlayer)
ExitReached();
if (area.GetOwner() is IPlayer)
ExitReached();
}
public void ExitReached() => Game.FloorExitReached();
public void OnExitTree()
{
Exit.AreaEntered -= Exit_AreaEntered;
Exit.AreaEntered -= Exit_AreaEntered;
}
}
Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Grassland.tscn
+161 -20
View File
File diff suppressed because one or more lines are too long
Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Overworld.tscn
+1161 -1160
View File
File diff suppressed because one or more lines are too long
Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Platform.cs
+6 -6
View File
@@ -15,21 +15,21 @@ public partial class Platform : SpecialFloor
public void OnResolved()
{
Show();
Exit.AreaEntered += Exit_AreaEntered;
FloorIsLoaded = true;
Show();
Exit.AreaEntered += Exit_AreaEntered;
FloorIsLoaded = true;
}
private void Exit_AreaEntered(Area3D area)
{
if (area.GetOwner() is IPlayer)
ExitReached();
if (area.GetOwner() is IPlayer)
ExitReached();
}
public void ExitReached() => Game.FloorExitReached();
public void OnExitTree()
{
Exit.AreaEntered -= Exit_AreaEntered;
Exit.AreaEntered -= Exit_AreaEntered;
}
}
Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Platform.tscn
+22 -3
View File
@@ -1,8 +1,9 @@
[gd_scene load_steps=44 format=4 uid="uid://cj0o4t20jdk02"]
[gd_scene load_steps=47 format=4 uid="uid://cj0o4t20jdk02"]
[ext_resource type="Script" uid="uid://dd8dyuud0f74g" path="res://src/map/dungeon/floors/Special Floors/Platform.cs" id="1_mkwqq"]
[ext_resource type="Texture2D" uid="uid://h4hyjwy3q1h3" path="res://src/map/assets/EX Assetts/1.png" id="2_tstta"]
[ext_resource type="Texture2D" uid="uid://cbpw07ft33je5" path="res://src/map/assets/EX Assetts/MOON.png" id="3_x55gx"]
[ext_resource type="Shader" uid="uid://bpkmgenx50vof" path="res://src/map/map shaders/VOID PORTAL.gdshader" id="4_tstta"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_4ro7o"]
resource_name = "Material.004"
@@ -696,6 +697,18 @@ size = Vector3(144.201, 37.2499, 211.44)
[sub_resource type="BoxShape3D" id="BoxShape3D_8t70y"]
size = Vector3(21.7796, 9.29993, 3.79205)
[sub_resource type="ShaderMaterial" id="ShaderMaterial_x55gx"]
render_priority = 0
shader = ExtResource("4_tstta")
shader_parameter/strength = 0.369
shader_parameter/speed = 0.12
shader_parameter/screen_resolution = Vector2(1280, 720)
[sub_resource type="QuadMesh" id="QuadMesh_voxte"]
size = Vector2(3.785, 6.145)
subdivide_width = 2
subdivide_depth = 2
[node name="Platform" type="Node3D"]
script = ExtResource("1_mkwqq")
@@ -835,7 +848,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -4.45244, 0)
[node name="PlayerSpawnPoint" type="Marker3D" parent="Spawn Points"]
unique_name_in_owner = true
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 52.5204, 4.77196, 21.373)
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -56.421, 4.77196, -31.6885)
[node name="Room" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -3.84712, 0)
@@ -857,5 +870,11 @@ collision_layer = 256
collision_mask = 256
[node name="CollisionShape3D" type="CollisionShape3D" parent="Room/Exit"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -13.1039, -2.66624, -22.5489)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -13.1039, -0.78056, 164.654)
shape = SubResource("BoxShape3D_8t70y")
[node name="webway" type="MeshInstance3D" parent="."]
transform = Transform3D(0.765, 0, 0, 0, 0.765, 0, 0, 0, 0.765, -0.364896, 2.90441, 103.648)
material_override = SubResource("ShaderMaterial_x55gx")
mesh = SubResource("QuadMesh_voxte")
skeleton = NodePath("../..")
Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/River.cs
+6 -6
View File
@@ -17,21 +17,21 @@ public partial class River : SpecialFloor
public void OnResolved()
{
Show();
Exit.AreaEntered += Exit_AreaEntered;
FloorIsLoaded = true;
Show();
Exit.AreaEntered += Exit_AreaEntered;
FloorIsLoaded = true;
}
private void Exit_AreaEntered(Area3D area)
{
if (area.GetOwner() is IPlayer)
ExitReached();
if (area.GetOwner() is IPlayer)
ExitReached();
}
public void ExitReached() => Game.FloorExitReached();
public void OnExitTree()
{
Exit.AreaEntered -= Exit_AreaEntered;
Exit.AreaEntered -= Exit_AreaEntered;
}
}
Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/River.tscn
+24 -5
View File
@@ -1,4 +1,4 @@
[gd_scene load_steps=50 format=4 uid="uid://bfel23t0brfgb"]
[gd_scene load_steps=53 format=4 uid="uid://bfel23t0brfgb"]
[ext_resource type="Script" uid="uid://4yx8q5wp3acp" path="res://src/map/dungeon/floors/Special Floors/River.cs" id="1_0q5xi"]
[ext_resource type="Shader" uid="uid://buj0rfyawbmuu" path="res://src/map/dungeon/models/Special Floors & Rooms/EX-Grassy/Grassland.gdshader" id="2_poprr"]
@@ -17,6 +17,7 @@
[ext_resource type="Texture2D" uid="uid://biqkhlywidr7x" path="res://src/map/dungeon/models/Special Floors & Rooms/EX-River/River_ground_0007_roughness_1k.png" id="15_23sxr"]
[ext_resource type="Texture2D" uid="uid://cbpw07ft33je5" path="res://src/map/assets/EX Assetts/MOON.png" id="16_relpx"]
[ext_resource type="PackedScene" uid="uid://d6pjtdg6wh38" path="res://src/map/Placeables/Stele F.tscn" id="17_5tdbj"]
[ext_resource type="Shader" uid="uid://bpkmgenx50vof" path="res://src/map/map shaders/VOID PORTAL.gdshader" id="18_poprr"]
[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_fsavp"]
@@ -452,7 +453,19 @@ dof_blur_amount = 0.02
size = Vector3(122.191, 37.2499, 160.67)
[sub_resource type="BoxShape3D" id="BoxShape3D_poprr"]
size = Vector3(10.2297, 7.80759, 10.2677)
size = Vector3(1.63453, 7.80759, 1.06392)
[sub_resource type="ShaderMaterial" id="ShaderMaterial_bnmex"]
render_priority = 0
shader = ExtResource("18_poprr")
shader_parameter/strength = 0.369
shader_parameter/speed = 0.12
shader_parameter/screen_resolution = Vector2(1280, 720)
[sub_resource type="QuadMesh" id="QuadMesh_5xa56"]
size = Vector2(3.785, 6.145)
subdivide_width = 2
subdivide_depth = 2
[node name="River" type="Node3D"]
script = ExtResource("1_0q5xi")
@@ -461,7 +474,6 @@ script = ExtResource("1_0q5xi")
[node name="River" type="Node3D" parent="Model"]
transform = Transform3D(21.52, 0, 0, 0, 21.52, 0, 0, 0, 21.52, 4.3771, 2.9638, 3.15186)
visible = false
[node name="RIVER" type="MeshInstance3D" parent="Model/River"]
visible = false
@@ -469,6 +481,7 @@ mesh = SubResource("ArrayMesh_kmo3x")
skeleton = NodePath("")
[node name="TOP" type="MeshInstance3D" parent="Model/River"]
visible = false
mesh = SubResource("ArrayMesh_rp2ek")
skeleton = NodePath("")
@@ -559,7 +572,7 @@ collision_layer = 256
collision_mask = 256
[node name="CollisionShape3D" type="CollisionShape3D" parent="Room/Exit"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 114.678, -2.10891, -92.1095)
transform = Transform3D(0.825803, 0, 0.563959, 0, 1, 0, -0.563959, 0, 0.825803, 113.027, -3.71033, -95.7205)
shape = SubResource("BoxShape3D_poprr")
[node name="Spawn Points" type="Node3D" parent="."]
@@ -567,4 +580,10 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.70806, 0)
[node name="PlayerSpawnPoint" type="Marker3D" parent="Spawn Points"]
unique_name_in_owner = true
transform = Transform3D(0.949404, 0, 0.314059, 0, 1, 0, -0.314059, 0, 0.949404, 3.90301, -2.74016, 13.7071)
transform = Transform3D(0.960659, 0, 0.277734, 0, 1, 0, -0.277734, 0, 0.960659, 2.08994, -3.4838, 6.50655)
[node name="webway" type="MeshInstance3D" parent="."]
transform = Transform3D(0.409344, 0, 0.269328, 0, 0.49, 0, -0.269328, 0, 0.409344, 113.037, 0.930257, -95.666)
material_override = SubResource("ShaderMaterial_bnmex")
mesh = SubResource("QuadMesh_5xa56")
skeleton = NodePath("../..")
Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Server.cs
+6 -6
View File
@@ -15,21 +15,21 @@ public partial class Server : SpecialFloor
public void OnResolved()
{
Show();
Exit.AreaEntered += Exit_AreaEntered;
FloorIsLoaded = true;
Show();
Exit.AreaEntered += Exit_AreaEntered;
FloorIsLoaded = true;
}
private void Exit_AreaEntered(Area3D area)
{
if (area.GetOwner() is IPlayer)
ExitReached();
if (area.GetOwner() is IPlayer)
ExitReached();
}
public void ExitReached() => Game.FloorExitReached();
public void OnExitTree()
{
Exit.AreaEntered -= Exit_AreaEntered;
Exit.AreaEntered -= Exit_AreaEntered;
}
}
Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Server.tscn
+23 -3
View File
@@ -1,4 +1,4 @@
[gd_scene load_steps=63 format=4 uid="uid://cnlw4fistem53"]
[gd_scene load_steps=66 format=4 uid="uid://cnlw4fistem53"]
[ext_resource type="Script" uid="uid://bc56uwauby3eh" path="res://src/map/dungeon/floors/Special Floors/Server.cs" id="1_138ti"]
[ext_resource type="Texture2D" uid="uid://dlku6x3aq0pns" path="res://src/map/dungeon/models/Special Floors & Rooms/EX-Server/EXserver_WIRE.jpg" id="2_pw0lq"]
@@ -13,6 +13,7 @@
[ext_resource type="Texture2D" uid="uid://3cwvemmb1pc3" path="res://src/map/dungeon/models/Special Floors & Rooms/EX-Server/EXserver_rust07L.jpg" id="11_lucqj"]
[ext_resource type="Texture2D" uid="uid://swoxwtgtik0j" path="res://src/map/dungeon/models/Special Floors & Rooms/EX-Server/EXserver_Panels 2_1024.png" id="12_rkqxc"]
[ext_resource type="PackedScene" uid="uid://d6pjtdg6wh38" path="res://src/map/Placeables/Stele F.tscn" id="13_5o7ke"]
[ext_resource type="Shader" uid="uid://bpkmgenx50vof" path="res://src/map/map shaders/VOID PORTAL.gdshader" id="14_pw0lq"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_f4kri"]
resource_name = "Material.001"
@@ -1007,6 +1008,18 @@ size = Vector3(128.504, 37.2499, 164.505)
[sub_resource type="BoxShape3D" id="BoxShape3D_4yya2"]
size = Vector3(1.90881, 4.51166, 6.00504)
[sub_resource type="ShaderMaterial" id="ShaderMaterial_bfmrj"]
render_priority = 0
shader = ExtResource("14_pw0lq")
shader_parameter/strength = 0.369
shader_parameter/speed = 0.12
shader_parameter/screen_resolution = Vector2(1280, 720)
[sub_resource type="QuadMesh" id="QuadMesh_ps4y4"]
size = Vector2(3.785, 6.145)
subdivide_width = 2
subdivide_depth = 2
[node name="EX-SERVER" type="Node3D"]
script = ExtResource("1_138ti")
@@ -1121,7 +1134,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.70806, 0)
[node name="PlayerSpawnPoint" type="Marker3D" parent="Spawn Points"]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.581077, -1.88017, 32.9043)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 49.584, 0, 15.539)
[node name="Room" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4.31338, 0)
@@ -1138,11 +1151,12 @@ shape = SubResource("BoxShape3D_8cgur")
[node name="Exit" type="Area3D" parent="Room"]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -33.6023, 0, 33.2291)
collision_layer = 256
collision_mask = 256
[node name="CollisionShape3D" type="CollisionShape3D" parent="Room/Exit"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 33.583, -0.46095, -0.0630896)
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 34.1529, -0.46095, -0.0630913)
shape = SubResource("BoxShape3D_4yya2")
[node name="NPCs" type="Node3D" parent="."]
@@ -1155,3 +1169,9 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -32.4542, 0.622075, 5.49706)
[node name="SteleF3" parent="NPCs" instance=ExtResource("13_5o7ke")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -32.4542, 0.622075, -4.79838)
[node name="webway" type="MeshInstance3D" parent="."]
transform = Transform3D(0.765, 0, 0, 0, 0.765, 0, 0, 0, 0.765, 0.637109, 3.4635, 33.5474)
material_override = SubResource("ShaderMaterial_bfmrj")
mesh = SubResource("QuadMesh_ps4y4")
skeleton = NodePath("../..")