Minor visual and collision fixes. 6Z - MAZE collision got moved drastically seemingly.

This commit is contained in:
Pal
2026-04-11 05:21:31 -07:00
parent 87bb9422fe
commit 87fdc85353
5 changed files with 63 additions and 451 deletions

File diff suppressed because one or more lines are too long

View File

@@ -53,6 +53,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 40.209, -0.146965, 67.371)
transform = Transform3D(-2, 0, -1.78814e-07, 0, 2, 0, 1.78814e-07, 0, -2, 36.432, 0, 117.503) transform = Transform3D(-2, 0, -1.78814e-07, 0, 2, 0, 1.78814e-07, 0, -2, 36.432, 0, 117.503)
[node name="StaticBody3D" type="StaticBody3D" parent="NavigationRegion3D"] [node name="StaticBody3D" type="StaticBody3D" parent="NavigationRegion3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.18237, 0)
[node name="CollisionShape3D3" type="CollisionShape3D" parent="NavigationRegion3D/StaticBody3D"] [node name="CollisionShape3D3" type="CollisionShape3D" parent="NavigationRegion3D/StaticBody3D"]
transform = Transform3D(37.8564, 0, 0, 0, 3.78564, 0, 0, 0, 37.8564, 43.7062, 1.5733, 60.5469) transform = Transform3D(37.8564, 0, 0, 0, 3.78564, 0, 0, 0, 37.8564, 43.7062, 1.5733, 60.5469)

View File

@@ -0,0 +1,37 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://bf12p7n0pheik"
path="res://.godot/imported/Cellular Collision.glb-90644fd0c8d9dae1fc73a3d74d15a58f.scn"
[deps]
source_file="res://src/map/dungeon/models/Special Floors & Rooms/EX-Cell/Cellular Collision.glb"
dest_files=["res://.godot/imported/Cellular Collision.glb-90644fd0c8d9dae1fc73a3d74d15a58f.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
nodes/use_node_type_suffixes=true
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
_subresources={}
gltf/naming_version=1
gltf/embedded_image_handling=1

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=2174 format=3 uid="uid://cfecvvav8kkp6"] [gd_scene load_steps=2112 format=3 uid="uid://cfecvvav8kkp6"]
[ext_resource type="Script" uid="uid://yxmiqy7i0t7r" path="res://src/player/Player.cs" id="1_xcol5"] [ext_resource type="Script" uid="uid://yxmiqy7i0t7r" path="res://src/player/Player.cs" id="1_xcol5"]
[ext_resource type="PackedScene" uid="uid://dqvlemme0iwa" path="res://src/camera/ShakeCamera.tscn" id="2_jtmj1"] [ext_resource type="PackedScene" uid="uid://dqvlemme0iwa" path="res://src/camera/ShakeCamera.tscn" id="2_jtmj1"]
@@ -2548,254 +2548,6 @@ region = Rect2(15360, 1024, 512, 512)
atlas = ExtResource("489_w5dir") atlas = ExtResource("489_w5dir")
region = Rect2(15872, 1024, 512, 512) region = Rect2(15872, 1024, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_q6k75"]
atlas = ExtResource("274_unpnm")
region = Rect2(0, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_bdqse"]
atlas = ExtResource("274_unpnm")
region = Rect2(512, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_482wh"]
atlas = ExtResource("274_unpnm")
region = Rect2(1024, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_xu0x4"]
atlas = ExtResource("274_unpnm")
region = Rect2(1536, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_n0ndj"]
atlas = ExtResource("274_unpnm")
region = Rect2(2048, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_blwf7"]
atlas = ExtResource("274_unpnm")
region = Rect2(2560, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_40liv"]
atlas = ExtResource("274_unpnm")
region = Rect2(3072, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_bpyyx"]
atlas = ExtResource("274_unpnm")
region = Rect2(3584, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_1q4di"]
atlas = ExtResource("274_unpnm")
region = Rect2(4096, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_k4prd"]
atlas = ExtResource("274_unpnm")
region = Rect2(4608, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_1r2vo"]
atlas = ExtResource("274_unpnm")
region = Rect2(5120, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_0nb7q"]
atlas = ExtResource("274_unpnm")
region = Rect2(5632, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_4pi58"]
atlas = ExtResource("274_unpnm")
region = Rect2(6144, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_4g55r"]
atlas = ExtResource("274_unpnm")
region = Rect2(6656, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_isyxq"]
atlas = ExtResource("274_unpnm")
region = Rect2(7168, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_nx8x7"]
atlas = ExtResource("274_unpnm")
region = Rect2(7680, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_mcfc5"]
atlas = ExtResource("274_unpnm")
region = Rect2(8192, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_n318m"]
atlas = ExtResource("274_unpnm")
region = Rect2(8704, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_cvph7"]
atlas = ExtResource("274_unpnm")
region = Rect2(9216, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_qonub"]
atlas = ExtResource("274_unpnm")
region = Rect2(9728, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_47wep"]
atlas = ExtResource("274_unpnm")
region = Rect2(10240, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_wxg7g"]
atlas = ExtResource("274_unpnm")
region = Rect2(10752, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_37a1c"]
atlas = ExtResource("274_unpnm")
region = Rect2(11264, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_a8ke0"]
atlas = ExtResource("274_unpnm")
region = Rect2(11776, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_rt73e"]
atlas = ExtResource("274_unpnm")
region = Rect2(12288, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_nlx4y"]
atlas = ExtResource("274_unpnm")
region = Rect2(12800, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_tqvaa"]
atlas = ExtResource("274_unpnm")
region = Rect2(13312, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_vxts4"]
atlas = ExtResource("274_unpnm")
region = Rect2(13824, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_jkm8c"]
atlas = ExtResource("274_unpnm")
region = Rect2(14336, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_ovlij"]
atlas = ExtResource("274_unpnm")
region = Rect2(14848, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_f634n"]
atlas = ExtResource("274_unpnm")
region = Rect2(15360, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_56jvv"]
atlas = ExtResource("274_unpnm")
region = Rect2(15872, 0, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_tguxe"]
atlas = ExtResource("274_unpnm")
region = Rect2(0, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_8a1br"]
atlas = ExtResource("274_unpnm")
region = Rect2(512, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_treje"]
atlas = ExtResource("274_unpnm")
region = Rect2(1024, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_ucopf"]
atlas = ExtResource("274_unpnm")
region = Rect2(1536, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_06pau"]
atlas = ExtResource("274_unpnm")
region = Rect2(2048, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_yut7s"]
atlas = ExtResource("274_unpnm")
region = Rect2(2560, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_7ct6q"]
atlas = ExtResource("274_unpnm")
region = Rect2(3072, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_apbil"]
atlas = ExtResource("274_unpnm")
region = Rect2(3584, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_g6lek"]
atlas = ExtResource("274_unpnm")
region = Rect2(4096, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_i055y"]
atlas = ExtResource("274_unpnm")
region = Rect2(4608, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_p00oj"]
atlas = ExtResource("274_unpnm")
region = Rect2(5120, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_db7t0"]
atlas = ExtResource("274_unpnm")
region = Rect2(5632, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_p1sai"]
atlas = ExtResource("274_unpnm")
region = Rect2(6144, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_0yuwb"]
atlas = ExtResource("274_unpnm")
region = Rect2(6656, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_wcgn0"]
atlas = ExtResource("274_unpnm")
region = Rect2(7168, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_k5hgl"]
atlas = ExtResource("274_unpnm")
region = Rect2(7680, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_ji08h"]
atlas = ExtResource("274_unpnm")
region = Rect2(8192, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_7lfvv"]
atlas = ExtResource("274_unpnm")
region = Rect2(8704, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_emn3u"]
atlas = ExtResource("274_unpnm")
region = Rect2(9216, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_gr6sd"]
atlas = ExtResource("274_unpnm")
region = Rect2(9728, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_ge6u4"]
atlas = ExtResource("274_unpnm")
region = Rect2(10240, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_xlxqt"]
atlas = ExtResource("274_unpnm")
region = Rect2(10752, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_r2dkq"]
atlas = ExtResource("274_unpnm")
region = Rect2(11264, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_us17c"]
atlas = ExtResource("274_unpnm")
region = Rect2(11776, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_jwjoi"]
atlas = ExtResource("274_unpnm")
region = Rect2(12288, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_ag6w4"]
atlas = ExtResource("274_unpnm")
region = Rect2(12800, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_jprbl"]
atlas = ExtResource("274_unpnm")
region = Rect2(13312, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_x5763"]
atlas = ExtResource("274_unpnm")
region = Rect2(13824, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_6eduo"]
atlas = ExtResource("274_unpnm")
region = Rect2(14336, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_4qkb0"]
atlas = ExtResource("274_unpnm")
region = Rect2(14848, 512, 512, 512)
[sub_resource type="AtlasTexture" id="AtlasTexture_uomo7"] [sub_resource type="AtlasTexture" id="AtlasTexture_uomo7"]
atlas = ExtResource("14_jhq84") atlas = ExtResource("14_jhq84")
region = Rect2(0, 0, 512, 512) region = Rect2(0, 0, 512, 512)
@@ -3348,7 +3100,7 @@ animations = [{
}], }],
"loop": false, "loop": false,
"name": &"Devic Balance", "name": &"Devic Balance",
"speed": 30.0 "speed": 24.0
}, { }, {
"frames": [{ "frames": [{
"duration": 1.0, "duration": 1.0,
@@ -3908,197 +3660,6 @@ animations = [{
}, { }, {
"frames": [{ "frames": [{
"duration": 1.0, "duration": 1.0,
"texture": SubResource("AtlasTexture_q6k75")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_bdqse")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_482wh")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_xu0x4")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_n0ndj")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_blwf7")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_40liv")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_bpyyx")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_1q4di")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_k4prd")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_1r2vo")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_0nb7q")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_4pi58")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_4g55r")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_isyxq")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_nx8x7")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_mcfc5")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_n318m")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_cvph7")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_qonub")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_47wep")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_wxg7g")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_37a1c")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_a8ke0")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_rt73e")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_nlx4y")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_tqvaa")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_vxts4")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_jkm8c")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ovlij")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_f634n")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_56jvv")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_tguxe")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_8a1br")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_treje")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ucopf")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_06pau")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_yut7s")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_7ct6q")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_apbil")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_g6lek")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_i055y")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_p00oj")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_db7t0")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_p1sai")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_0yuwb")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_wcgn0")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_k5hgl")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ji08h")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_7lfvv")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_emn3u")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_gr6sd")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ge6u4")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_xlxqt")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_r2dkq")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_us17c")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_jwjoi")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ag6w4")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_jprbl")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_x5763")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_6eduo")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_4qkb0")
}],
"loop": false,
"name": &"Heart Radial",
"speed": 32.0
}, {
"frames": [{
"duration": 1.0,
"texture": ExtResource("276_na483") "texture": ExtResource("276_na483")
}, { }, {
"duration": 1.0, "duration": 1.0,
@@ -6607,7 +6168,7 @@ animations = [{
"duration": 1.0, "duration": 1.0,
"texture": SubResource("AtlasTexture_nilvr") "texture": SubResource("AtlasTexture_nilvr")
}], }],
"loop": true, "loop": false,
"name": &"G-Reactor Earth", "name": &"G-Reactor Earth",
"speed": 41.0 "speed": 41.0
}, { }, {
@@ -6959,7 +6520,7 @@ animations = [{
"duration": 1.0, "duration": 1.0,
"texture": SubResource("AtlasTexture_28ame") "texture": SubResource("AtlasTexture_28ame")
}], }],
"loop": true, "loop": false,
"name": &"G-Reactor Water", "name": &"G-Reactor Water",
"speed": 41.0 "speed": 41.0
}] }]
@@ -8326,7 +7887,7 @@ animations = [{
"duration": 1.0, "duration": 1.0,
"texture": SubResource("AtlasTexture_ytfw0") "texture": SubResource("AtlasTexture_ytfw0")
}], }],
"loop": true, "loop": false,
"name": &"G-Reactor Water L2", "name": &"G-Reactor Water L2",
"speed": 32.0 "speed": 32.0
}] }]
@@ -13843,7 +13404,7 @@ transform = Transform3D(1.355, 0, 2.84217e-14, 0, 1.355, 0, -2.84217e-14, 0, 1.3
[node name="OmniLight3D" type="OmniLight3D" parent="Camera/Lights"] [node name="OmniLight3D" type="OmniLight3D" parent="Camera/Lights"]
transform = Transform3D(0.999997, 0, 0.00260054, 0, 1, 0, -0.00260054, 0, 0.999997, -0.109951, 1.37487, -0.0100155) transform = Transform3D(0.999997, 0, 0.00260054, 0, 1, 0, -0.00260054, 0, 0.999997, -0.109951, 1.37487, -0.0100155)
light_color = Color(0.845731, 0.82142, 0.80354, 1) light_color = Color(0.839909, 0.829039, 0.76409, 1)
light_energy = 0.2 light_energy = 0.2
light_bake_mode = 1 light_bake_mode = 1
shadow_enabled = true shadow_enabled = true
@@ -13966,14 +13527,16 @@ frame_progress = 1.0
[node name="Geomantic Reactor Layer 1" type="AnimatedSprite2D" parent="ScreenFX"] [node name="Geomantic Reactor Layer 1" type="AnimatedSprite2D" parent="ScreenFX"]
position = Vector2(725, 540) position = Vector2(725, 540)
sprite_frames = SubResource("SpriteFrames_pbcxe") sprite_frames = SubResource("SpriteFrames_pbcxe")
animation = &"G-Reactor Fire L1" animation = &"G-Reactor Water"
frame = 42 frame = 70
frame_progress = 1.0 frame_progress = 1.0
[node name="Geomantic Reactor Layer 2" type="AnimatedSprite2D" parent="ScreenFX"] [node name="Geomantic Reactor Layer 2" type="AnimatedSprite2D" parent="ScreenFX"]
position = Vector2(725, 540) position = Vector2(725, 540)
sprite_frames = SubResource("SpriteFrames_nfb16") sprite_frames = SubResource("SpriteFrames_nfb16")
animation = &"G-Reactor Water L2" animation = &"G-Reactor Water L2"
frame = 111
frame_progress = 1.0
speed_scale = 3.0 speed_scale = 3.0
[node name="ColorRect" type="ColorRect" parent="ScreenFX"] [node name="ColorRect" type="ColorRect" parent="ScreenFX"]