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

Fix merge

Browse Source
This commit is contained in:
Zenny
2025-09-26 14:13:13 -07:00
parent 9107b8c570
commit 9f26b5fda7
8 changed files with 64 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Zennysoft.Game.Ma/src/map/Map.tscn
View File

@@ -2,21 +2,6 @@
[ext_resource type="Script" uid="uid://14e8mu48ed4" path="res://src/map/Map.cs" id="1_bw70o"]
[sub_resource type="Animation" id="Animation_g6eui"]
resource_name = "fade_in"
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("ColorRect:color")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 1),
"transitions": PackedFloat32Array(1, 1),
"update": 0,
"values": [Color(0, 0, 0, 1), Color(0, 0, 0, 0)]
}
[sub_resource type="Animation" id="Animation_00xd7"]
length = 0.001
tracks/0/type = "value"
@@ -32,6 +17,21 @@ tracks/0/keys = {
"values": [Color(0, 0, 0, 1)]
}
[sub_resource type="Animation" id="Animation_g6eui"]
resource_name = "fade_in"
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("ColorRect:color")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 1),
"transitions": PackedFloat32Array(1, 1),
"update": 0,
"values": [Color(0, 0, 0, 1), Color(0, 0, 0, 0)]
}
[sub_resource type="Animation" id="Animation_v14r0"]
resource_name = "fade_out"
tracks/0/type = "value"

2
Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/04. Tree Antechamber.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=20 format=3 uid="uid://i781lbf2wb22"]
[gd_scene load_steps=20 format=3 uid="uid://tpgwccr6v43e"]
[ext_resource type="Script" uid="uid://dhollu4j3pynq" path="res://src/map/dungeon/code/MonsterRoom.cs" id="1_58osi"]
[ext_resource type="Texture2D" uid="uid://b3sg8oamch2i1" path="res://src/map/dungeon/models/Outdated/Set A/04. Antechamber B/TREE_ROOM_VER2_STONE_PANEL_2png.png" id="2_q760f"]

2
Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/07. CornerBlock Antechamber.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=16 format=3 uid="uid://vdhl32je6hq2"]
[gd_scene load_steps=16 format=3 uid="uid://ce0cjm6v7ct6c"]
[ext_resource type="Script" uid="uid://dhollu4j3pynq" path="res://src/map/dungeon/code/MonsterRoom.cs" id="2_6xco5"]
[ext_resource type="PackedScene" uid="uid://dpdd01hhma37w" path="res://src/map/dungeon/models/Version 4/Area 1/Corner Block/A1-CornerBlockRoom.glb" id="2_tcq83"]

32
Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/15. Boss Floor A.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=277 format=4 uid="uid://5ja3qxn8h7iw"]
[gd_scene load_steps=276 format=4 uid="uid://5ja3qxn8h7iw"]
[ext_resource type="Script" uid="uid://tqyybt313web" path="res://src/map/dungeon/code/BossRoomA.cs" id="1_0h3lb"]
[ext_resource type="Texture2D" uid="uid://vjbe1lg810gh" path="res://src/map/dungeon/models/Boss Floor A/15_A1_BOSS FLOOR A_VER_swirled_column.png" id="2_06eum"]
@@ -32,7 +32,6 @@
[ext_resource type="Texture2D" uid="uid://ben3q8gpume4y" path="res://src/map/dungeon/models/Boss Floor A/Boss Floor 1 Ver_HAND_CYCLE_MOTIF.png" id="26_r8vfg"]
[ext_resource type="Texture2D" uid="uid://bfcb0mknmw5a7" path="res://src/map/dungeon/models/Boss Floor A/Boss Floor 1 Ver_FLOOR1.jpg" id="27_16vso"]
[ext_resource type="PackedScene" uid="uid://6dnsw37d1uw4" path="res://src/enemy/enemy_types/15. ox_face/OxFace.tscn" id="27_g6y6v"]
[ext_resource type="Shader" uid="uid://bbn3f2r51dy27" path="res://src/map/map shaders/Boss Floor 1 Sky.gdshader" id="28_4xaw3"]
[ext_resource type="Texture2D" uid="uid://dklna8mnv237w" path="res://src/map/dungeon/models/Boss Floor A/Boss Floor 1 Ver_lower_corridor_lower.png" id="28_q4tlp"]
[ext_resource type="Texture2D" uid="uid://dr4o3a7q08q0k" path="res://src/map/dungeon/models/Boss Floor A/Boss Floor 1 Ver_brick3.png" id="29_mx0fb"]
[ext_resource type="Texture2D" uid="uid://8fkhcvod75sl" path="res://src/map/dungeon/models/Boss Floor A/Boss Floor 1 Ver_WALL TILE 1.jpg" id="30_2rm47"]
@@ -4229,35 +4228,6 @@ size = Vector3(6.25977, 15.6429, 37.6357)
size = Vector3(12.4734, 10.2039, 7.09571)
[sub_resource type="ShaderMaterial" id="ShaderMaterial_lmjp4"]
shader = ExtResource("28_4xaw3")
shader_parameter/day_top_color = Color(0.889883, 0.32524, 0.146136, 1)
shader_parameter/day_bottom_color = Color(1, 0.655043, 0.431942, 1)
shader_parameter/sunset_top_color = Color(1, 0.578907, 0.310707, 1)
shader_parameter/sunset_bottom_color = Color(0.98, 0.718667, 0, 1)
shader_parameter/night_top_color = Color(0.765828, 0.522898, 0, 1)
shader_parameter/night_bottom_color = Color(0.810332, 0.190734, 0, 1)
shader_parameter/horizon_color = Color(0.769157, 0.0558909, 0.13594, 1)
shader_parameter/horizon_blur = 0.06
shader_parameter/sun_color = Color(0.851632, 0.352778, 0.119876, 1)
shader_parameter/sun_sunset_color = Color(0.912055, 0.906693, 0.905404, 1)
shader_parameter/sun_size = 0.196
shader_parameter/sun_blur = 0.702
shader_parameter/moon_color = Color(1, 0.95, 0.7, 1)
shader_parameter/moon_size = 0.06
shader_parameter/moon_blur = 0.1
shader_parameter/clouds_edge_color = Color(0.62793, 0.164986, 0.197414, 1)
shader_parameter/clouds_top_color = Color(0.83699, 0.835395, 0.867768, 1)
shader_parameter/clouds_middle_color = Color(0.812584, 0.478296, 0.208116, 1)
shader_parameter/clouds_bottom_color = Color(0.83, 0.83, 0.94, 1)
shader_parameter/clouds_speed = 8.08
shader_parameter/clouds_direction = 0.2
shader_parameter/clouds_scale = 1.63
shader_parameter/clouds_cutoff = 0.32
shader_parameter/clouds_fuzziness = 0.58
shader_parameter/clouds_weight = 0.0
shader_parameter/clouds_blur = 0.13
shader_parameter/stars_speed = 1.0
shader_parameter/overwritten_time = 0.0
[sub_resource type="Sky" id="Sky_lmjp4"]
sky_material = SubResource("ShaderMaterial_lmjp4")

2
Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/23. Fountain Antechamber.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=14 format=3 uid="uid://utaqo4hl68yw"]
[gd_scene load_steps=14 format=3 uid="uid://d1uldtsv8u8vw"]
[ext_resource type="PackedScene" uid="uid://82gby88dqm0l" path="res://src/map/dungeon/models/Version 4/Area 2/Fountain/A2-Fountain.glb" id="2_0wmhg"]
[ext_resource type="Script" uid="uid://dhollu4j3pynq" path="res://src/map/dungeon/code/MonsterRoom.cs" id="2_dp1b6"]

64
Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/27. Water Room B.tscn
View File

@@ -1,8 +1,7 @@
[gd_scene load_steps=69 format=4 uid="uid://cypdcaqeylnwl"]
[gd_scene load_steps=68 format=4 uid="uid://cypdcaqeylnwl"]
[ext_resource type="Script" uid="uid://dhollu4j3pynq" path="res://src/map/dungeon/code/MonsterRoom.cs" id="1_h7qp4"]
[ext_resource type="Texture2D" uid="uid://c2vcstahhon0o" path="res://src/map/dungeon/models/Outdated/Set B/27. Water Room B/27_A2_WATER_ROOM_B_flowers-in-water.png" id="3_nwdhf"]
[ext_resource type="Texture2D" uid="uid://c3hcmpwhns38f" path="res://src/map/dungeon/models/Outdated/Set B/27. Water Room B/27_A2_WATER_ROOM_B_AREA_2_MAIN_STON2E.png" id="4_h7qp4"]
[ext_resource type="Texture2D" uid="uid://cphyqhrudnton" path="res://src/map/dungeon/models/Outdated/Set B/27. Water Room B/27_A2_WATER_ROOM_B_area_2_big_tile.png" id="5_vsl56"]
[ext_resource type="Texture2D" uid="uid://cqd1qqc28psh8" path="res://src/map/dungeon/models/Outdated/Set B/27. Water Room B/27_A2_WATER_ROOM_B_lime_hand_relief.png" id="6_pku0v"]
[ext_resource type="Texture2D" uid="uid://cseobmoqboh4x" path="res://src/map/dungeon/models/Outdated/Set B/27. Water Room B/27_A2_WATER_ROOM_B_STONE_PANEL_AREA2png.png" id="7_6kmoo"]
@@ -65,7 +64,6 @@ shadow_mesh = SubResource("ArrayMesh_ml72x")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_1sadb"]
resource_name = "AREA 2 DARKER"
transparency = 4
albedo_texture = ExtResource("4_h7qp4")
texture_filter = 2
[sub_resource type="ArrayMesh" id="ArrayMesh_6o2uv"]
@@ -411,23 +409,49 @@ shadow_mesh = SubResource("ArrayMesh_tthqj")
[sub_resource type="ShaderMaterial" id="ShaderMaterial_nwdhf"]
render_priority = 0
shader = ExtResource("14_h7qp4")
shader_parameter/surfacecolour = Color(0, 0, 0, 1)
shader_parameter/volumecolour = Color(0, 0, 0, 1)
shader_parameter/AirIOR = 1.0
shader_parameter/IOR = 1.33
shader_parameter/sampler1speed = Vector2(0.02, 0)
shader_parameter/sampler2speed = Vector2(0, 0.02)
shader_parameter/samplermix = 0.5
shader_parameter/samplerscale = Vector2(0.1, 0.1)
shader_parameter/normalstrength = 1.0
shader_parameter/heightstrength = 0.12
shader_parameter/refrationamount = 0.0
shader_parameter/fog_underwater = false
shader_parameter/edge_size = 0.1
shader_parameter/foam_or_fade = false
shader_parameter/far_clip = 50.0
shader_parameter/steps = 512
shader_parameter/ssr_screen_fade = 0.05
shader_parameter/wave_1 = Vector4(0.3, 4, 0.2, 0.6)
shader_parameter/wave_2 = Vector4(-0.26, -0.19, 0.01, 0.47)
shader_parameter/wave_3 = Vector4(-7.67, 5.63, 0.1, 0.38)
shader_parameter/wave_4 = Vector4(-0.42, -1.63, 0.1, 0.28)
shader_parameter/wave_5 = Vector4(1.66, 0.07, 0.15, 1.81)
shader_parameter/wave_6 = Vector4(1.2, 1.14, 0.01, 0.33)
shader_parameter/wave_7 = Vector4(-1.6, 7.3, 0.11, 0.73)
shader_parameter/wave_8 = Vector4(-0.42, -1.63, 0.15, 1.52)
shader_parameter/time_factor = 2.5
shader_parameter/noise_zoom = 2.0
shader_parameter/noise_amp = 1.0
shader_parameter/base_water_color = Color(0, 0, 0, 1)
shader_parameter/fresnel_water_color = Color(0, 0, 0, 1)
shader_parameter/deep_water_color = Color(0, 0, 0, 1)
shader_parameter/shallow_water_color = Color(0, 0, 0, 1)
shader_parameter/beers_law = 0.5
shader_parameter/depth_offset = -1.2
shader_parameter/near = 7.0
shader_parameter/far = 10000.0
shader_parameter/edge_texture_scale = 3.5
shader_parameter/edge_texture_offset = 1.0
shader_parameter/edge_texture_speed = 0.1
shader_parameter/edge_foam_intensity = 2.0
shader_parameter/edge_fade_start = -3.0
shader_parameter/edge_fade_end = 6.6
shader_parameter/peak_height_threshold = 1.0
shader_parameter/peak_color = Vector3(1, 1, 1)
shader_parameter/peak_intensity = 1.0
shader_parameter/foam_intensity = 1.0
shader_parameter/foam_scale = 1.0
shader_parameter/metallic = 0.6
shader_parameter/roughness = 0.045
shader_parameter/uv_scale_text_a = 0.1
shader_parameter/uv_speed_text_a = Vector2(0.42, 0.3)
shader_parameter/uv_scale_text_b = 0.6
shader_parameter/uv_speed_text_b = Vector2(0.15, 0.1)
shader_parameter/normal_strength = 1.0
shader_parameter/uv_sampler_scale = 0.3
shader_parameter/blend_factor = 0.28
shader_parameter/perturbation_strength = 1.0
shader_parameter/perturbation_time = 0.3
shader_parameter/num_caustic_layers = 16.0
shader_parameter/caustic_distortion_strength = 0.001
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_b8mbh"]
resource_name = "Material.002"

4
Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/34. Boss Floor B.tscn
View File

@@ -1,9 +1,8 @@
[gd_scene load_steps=135 format=4 uid="uid://ceo7ph483io44"]
[gd_scene load_steps=134 format=4 uid="uid://ceo7ph483io44"]
[ext_resource type="Script" uid="uid://cvj30id0i8ska" path="res://src/map/dungeon/code/BossRoomB.cs" id="1_bxvob"]
[ext_resource type="Texture2D" uid="uid://cp8si6xqd3g51" path="res://src/map/dungeon/models/Version 4/Area 2/Demon Wall Floor/DEMON WALL_FLOOR_COLUMN_WHITE.png" id="2_58rvo"]
[ext_resource type="Texture2D" uid="uid://j6f0ekgijqg" path="res://src/map/dungeon/models/Version 4/Area 2/Demon Wall Floor/DEMON WALL_FLOOR_AREA_2_MAIN_STONE.png" id="3_cowus"]
[ext_resource type="Texture2D" uid="uid://b0du8q7jl6jg3" path="res://src/map/dungeon/models/Version 4/Area 2/Demon Wall Floor/DEMON WALL_FLOOR_WHITE_layer_brick1.png" id="4_yu47a"]
[ext_resource type="Texture2D" uid="uid://i4o342ohocfg" path="res://src/map/dungeon/models/Version 4/Area 2/Demon Wall Floor/DEMON WALL_FLOOR_imgonline-com-ua-TextureSeamless-WI4C0zx4dE76nh60.jpg" id="5_nlpir"]
[ext_resource type="Texture2D" uid="uid://bybim0vwvrnta" path="res://src/map/dungeon/models/Version 4/Area 2/Demon Wall Floor/DEMON WALL_FLOOR_Area2Alt_Brick.png" id="6_ykaaj"]
[ext_resource type="Texture2D" uid="uid://6i6geywrql7m" path="res://src/map/dungeon/models/Version 4/Area 2/Demon Wall Floor/DEMON WALL_FLOOR_AREA_2_MAIN_STON2E.png" id="7_xwamj"]
@@ -78,7 +77,6 @@ albedo_texture = ExtResource("3_cowus")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_pm4ja"]
resource_name = "WHITE BRICK"
cull_mode = 2
albedo_texture = ExtResource("4_yu47a")
roughness = 0.5
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_2hxh5"]

17
Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/35. Goddess of Guidance's Room.tscn
View File

@@ -1,7 +1,6 @@
[gd_scene load_steps=102 format=4 uid="uid://bo20ffw2ygbks"]
[ext_resource type="Script" uid="uid://xd6tx3lifebl" path="res://src/map/dungeon/code/SpecialFloor.cs" id="1_j4ho3"]
<<<<<<< HEAD
[ext_resource type="Texture2D" uid="uid://ddrvsy7psmwig" path="res://src/map/dungeon/models/Outdated/Set B/35. Goddess of Guidance's Floor/GoG Room mirrored_DARKER_STONE_AREA_2.png" id="2_jbyuo"]
[ext_resource type="Texture2D" uid="uid://dk2cj5rcnkxnf" path="res://src/map/dungeon/models/Outdated/Set B/35. Goddess of Guidance's Floor/GoG Room mirrored_CEILING_AREA2.jpg" id="3_nadnf"]
[ext_resource type="Texture2D" uid="uid://bfr26em2xh1r1" path="res://src/map/dungeon/models/Outdated/Set B/35. Goddess of Guidance's Floor/GoG Room mirrored_STONE_PANEL_AREA2png.png" id="4_bb3ot"]
@@ -16,22 +15,6 @@
[ext_resource type="Texture2D" uid="uid://dd1jvmfs1cbbg" path="res://src/map/dungeon/models/Outdated/Set B/35. Goddess of Guidance's Floor/GoG Room mirrored_floral_single_tile.jpg" id="13_aytwf"]
[ext_resource type="Texture2D" uid="uid://nvg6i8gbgqjv" path="res://src/map/dungeon/models/Outdated/Set B/35. Goddess of Guidance's Floor/GoG Room mirrored_angkor_mural.jpg" id="14_tf4w3"]
[ext_resource type="Texture2D" uid="uid://3w1ac5fvks5v" path="res://src/map/dungeon/models/Outdated/Set B/35. Goddess of Guidance's Floor/GoG Room mirrored_area_2_big_tile.png" id="15_nduur"]
=======
[ext_resource type="Texture2D" uid="uid://ddrvsy7psmwig" path="res://src/map/dungeon/models/Set B/35. Goddess of Guidance's Floor/GoG Room mirrored_DARKER_STONE_AREA_2.png" id="2_jbyuo"]
[ext_resource type="Texture2D" uid="uid://dk2cj5rcnkxnf" path="res://src/map/dungeon/models/Set B/35. Goddess of Guidance's Floor/GoG Room mirrored_CEILING_AREA2.jpg" id="3_nadnf"]
[ext_resource type="Texture2D" uid="uid://bfr26em2xh1r1" path="res://src/map/dungeon/models/Set B/35. Goddess of Guidance's Floor/GoG Room mirrored_STONE_PANEL_AREA2png.png" id="4_bb3ot"]
[ext_resource type="Texture2D" uid="uid://bq8mvoumy8jmk" path="res://src/map/dungeon/models/Set B/35. Goddess of Guidance's Floor/GoG Room mirrored_swirled_column _AREA2.png" id="5_f7fde"]
[ext_resource type="Texture2D" uid="uid://i1x50ruj46r4" path="res://src/map/dungeon/models/Set B/35. Goddess of Guidance's Floor/GoG Room mirrored_asdasd.png" id="6_j4ho3"]
[ext_resource type="Texture2D" uid="uid://dmr6lrd2vv11p" path="res://src/map/dungeon/models/Set B/35. Goddess of Guidance's Floor/GoG Room mirrored_HAND-CYCLE-FLOOR.png" id="7_qt11j"]
[ext_resource type="Texture2D" uid="uid://000xg7ey7p71" path="res://src/map/dungeon/models/Set B/35. Goddess of Guidance's Floor/GoG Room mirrored_AREA_2_MAIN_STON2E.png" id="8_tkf4r"]
[ext_resource type="Texture2D" uid="uid://c7yaqdtmf0w4o" path="res://src/map/dungeon/models/Set B/35. Goddess of Guidance's Floor/GoG Room mirrored_swirled_column _AREA222.png" id="9_fs8fd"]
[ext_resource type="Texture2D" uid="uid://d2np2n5rkhhes" path="res://src/map/dungeon/models/Set B/35. Goddess of Guidance's Floor/GoG Room mirrored_WHITE METAL 2E.png" id="10_rfnlw"]
[ext_resource type="Texture2D" uid="uid://dti0ir01a1s87" path="res://src/map/dungeon/models/Set B/35. Goddess of Guidance's Floor/GoG Room mirrored_WHITE_layer_brick1.png" id="11_6bh8x"]
[ext_resource type="Texture2D" uid="uid://bxf4worc2uvfp" path="res://src/map/dungeon/models/Set B/35. Goddess of Guidance's Floor/GoG Room mirrored_burned-thing.png" id="12_itdxh"]
[ext_resource type="Texture2D" uid="uid://dd1jvmfs1cbbg" path="res://src/map/dungeon/models/Set B/35. Goddess of Guidance's Floor/GoG Room mirrored_floral_single_tile.jpg" id="13_aytwf"]
[ext_resource type="Texture2D" uid="uid://nvg6i8gbgqjv" path="res://src/map/dungeon/models/Set B/35. Goddess of Guidance's Floor/GoG Room mirrored_angkor_mural.jpg" id="14_tf4w3"]
[ext_resource type="Texture2D" uid="uid://3w1ac5fvks5v" path="res://src/map/dungeon/models/Set B/35. Goddess of Guidance's Floor/GoG Room mirrored_area_2_big_tile.png" id="15_nduur"]
>>>>>>> 7e9114bfd1f6c5dd447c4c4e54a2e8ccb9f38e24
[ext_resource type="Shader" uid="uid://beg8sp6kw66w8" path="res://src/map/map shaders/GOGROOM Water.gdshader" id="16_q4do2"]
[ext_resource type="PackedScene" uid="uid://dbvr8ewajja6a" path="res://src/enemy/EnemyDatabase.tscn" id="17_j4ho3"]
[ext_resource type="PackedScene" uid="uid://bs56ccgosmu47" path="res://src/enemy/enemy_types/01. sproingy/Sproingy.tscn" id="18_qt11j"]