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

Minor fixes, upgrade to 4.4.0-dev4

Browse Source
This commit is contained in:
Zenny
2024-11-20 20:36:58 -08:00
parent 8d4177f8b1
commit 8ddfe86750
31 changed files with 972 additions and 1029 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
GameJamDungeon.csproj
View File

@@ -1,4 +1,4 @@
<Project Sdk="Godot.NET.Sdk/4.4.0-dev.1"> <Project Sdk="Godot.NET.Sdk/4.4.0-dev.4">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<TargetFramework Condition=" '$(GodotTargetPlatform)' == 'android' ">net8.0</TargetFramework> <TargetFramework Condition=" '$(GodotTargetPlatform)' == 'android' ">net8.0</TargetFramework>

37
GameJamDungeon.csproj.old.3 Normal file
View File

@@ -0,0 +1,37 @@
<Project Sdk="Godot.NET.Sdk/4.4.0-dev.1">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework Condition=" '$(GodotTargetPlatform)' == 'android' ">net8.0</TargetFramework>
<TargetFramework Condition=" '$(GodotTargetPlatform)' == 'ios' ">net8.0</TargetFramework>
<EnableDynamicLoading>true</EnableDynamicLoading>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Chickensoft.AutoInject" Version="2.3.0" />
<PackageReference Include="Chickensoft.GodotNodeInterfaces" Version="2.2.23" />
<PackageReference Include="Chickensoft.Introspection.Generator" Version="1.7.0" />
<PackageReference Include="Chickensoft.LogicBlocks" Version="5.6.0" />
<PackageReference Include="Chickensoft.LogicBlocks.DiagramGenerator" Version="5.6.0" />
<PackageReference Include="Chickensoft.SaveFileBuilder" Version="1.1.0" />
<PackageReference Include="GodotSharp.SourceGenerators" Version="2.4.0" />
<PackageReference Include="SSH.NET" Version="2024.1.0" />
<PackageReference Include="System.IO.Abstractions" Version="21.0.29" />
<PackageReference Include="Zeroconf" Version="3.6.11" />
</ItemGroup>
<ItemGroup>
<Folder Include="src\items\weapons\models\" />
<Folder Include="src\map\dungeon\corridor\" />
<Folder Include="src\ui\dialogue\" />
</ItemGroup>
<ItemGroup>
<None Include=".editorconfig" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="Godot.SourceGenerators" Version="4.4.0-dev.2" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="GodotSharp" Version="4.4.0-dev.2" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="GodotSharpEditor" Version="4.4.0-dev.2" />
</ItemGroup>
</Project>

72
project.godot
View File

@@ -63,9 +63,9 @@ texture={
ui_accept={ ui_accept={
"deadzone": 0.5, "deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":32,"physical_keycode":0,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null) "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":32,"physical_keycode":0,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":0,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-3,"button_index":0,"pressure":0.0,"pressed":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":3,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-3,"button_index":3,"pressure":0.0,"pressed":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":101,"location":0,"echo":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-3,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":101,"location":0,"echo":false,"script":null)
] ]
} }
ui_select={ ui_select={
@@ -75,111 +75,111 @@ ui_select={
ui_cancel={ ui_cancel={
"deadzone": 0.5, "deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194305,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194305,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194309,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-3,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194309,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":1,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-3,"button_index":1,"pressure":0.0,"pressed":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":70,"key_label":0,"unicode":102,"location":0,"echo":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-3,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":70,"key_label":0,"unicode":102,"location":0,"echo":false,"script":null)
] ]
} }
ui_left={ ui_left={
"deadzone": 0.5, "deadzone": 0.5,
"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null) "events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"location":0,"echo":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-3,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"location":0,"echo":false,"script":null)
] ]
} }
ui_right={ ui_right={
"deadzone": 0.5, "deadzone": 0.5,
"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":14,"pressure":0.0,"pressed":false,"script":null) "events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":14,"pressure":0.0,"pressed":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"location":0,"echo":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-3,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"location":0,"echo":false,"script":null)
] ]
} }
ui_up={ ui_up={
"deadzone": 0.5, "deadzone": 0.5,
"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":11,"pressure":0.0,"pressed":false,"script":null) "events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":11,"pressure":0.0,"pressed":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-3,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null)
] ]
} }
ui_down={ ui_down={
"deadzone": 0.5, "deadzone": 0.5,
"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null) "events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"location":0,"echo":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-3,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"location":0,"echo":false,"script":null)
] ]
} }
MoveUp={ MoveUp={
"deadzone": 0.5, "deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null) "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-3,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":11,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-3,"button_index":11,"pressure":0.0,"pressed":false,"script":null)
] ]
} }
MoveLeft={ MoveLeft={
"deadzone": 0.5, "deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"location":0,"echo":false,"script":null) "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-3,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"location":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":13,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-3,"button_index":13,"pressure":0.0,"pressed":false,"script":null)
] ]
} }
MoveRight={ MoveRight={
"deadzone": 0.5, "deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"location":0,"echo":false,"script":null) "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-3,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"location":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":14,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-3,"button_index":14,"pressure":0.0,"pressed":false,"script":null)
] ]
} }
MoveDown={ MoveDown={
"deadzone": 0.5, "deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"location":0,"echo":false,"script":null) "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-3,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"location":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":12,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-3,"button_index":12,"pressure":0.0,"pressed":false,"script":null)
] ]
} }
Attack={ Attack={
"deadzone": 0.5, "deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null) "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-3,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":0,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-3,"button_index":0,"pressure":0.0,"pressed":false,"script":null)
] ]
} }
Sprint={ Sprint={
"deadzone": 0.5, "deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194325,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-3,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194325,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":7,"pressure":0.0,"pressed":true,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-3,"button_index":7,"pressure":0.0,"pressed":true,"script":null)
] ]
} }
MiniMap={ MiniMap={
"deadzone": 0.5, "deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194306,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-3,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194306,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":2,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-3,"button_index":2,"pressure":0.0,"pressed":false,"script":null)
] ]
} }
Inventory={ Inventory={
"deadzone": 0.5, "deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":101,"location":0,"echo":false,"script":null) "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-3,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":101,"location":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":3,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-3,"button_index":3,"pressure":0.0,"pressed":false,"script":null)
] ]
} }
StrafeLeft={ StrafeLeft={
"deadzone": 0.5, "deadzone": 0.5,
"events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":4,"axis_value":1.0,"script":null) "events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-3,"axis":4,"axis_value":1.0,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":81,"key_label":0,"unicode":113,"location":0,"echo":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-3,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":81,"key_label":0,"unicode":113,"location":0,"echo":false,"script":null)
] ]
} }
StrafeRight={ StrafeRight={
"deadzone": 0.5, "deadzone": 0.5,
"events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":5,"axis_value":1.0,"script":null) "events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-3,"axis":5,"axis_value":1.0,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":82,"key_label":0,"unicode":114,"location":0,"echo":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-3,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":82,"key_label":0,"unicode":114,"location":0,"echo":false,"script":null)
] ]
} }
Pause={ Pause={
"deadzone": 0.5, "deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194305,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-3,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194305,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":6,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-3,"button_index":6,"pressure":0.0,"pressed":false,"script":null)
] ]
} }
InventorySort={ InventorySort={
"deadzone": 0.5, "deadzone": 0.5,
"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":2,"pressure":0.0,"pressed":false,"script":null) "events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-3,"button_index":2,"pressure":0.0,"pressed":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":84,"key_label":0,"unicode":116,"location":0,"echo":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-3,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":84,"key_label":0,"unicode":116,"location":0,"echo":false,"script":null)
] ]
} }
Interact={ Interact={
"deadzone": 0.5, "deadzone": 0.5,
"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":1,"pressure":0.0,"pressed":false,"script":null) "events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-3,"button_index":1,"pressure":0.0,"pressed":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":70,"key_label":0,"unicode":102,"location":0,"echo":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-3,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":70,"key_label":0,"unicode":102,"location":0,"echo":false,"script":null)
] ]
} }

1076
src/enemy/enemy_types/horse_head/HorseFace.tscn
View File

File diff suppressed because it is too large Load Diff

16
src/enemy/enemy_types/michael/Michael.tscn
View File

@@ -102,7 +102,7 @@ radius = 1.0
size = Vector3(1, 0.565, 2) size = Vector3(1, 0.565, 2)
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_0h5s2"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_0h5s2"]
radius = 1.0 radius = 0.193181
[sub_resource type="ViewportTexture" id="ViewportTexture_57rcc"] [sub_resource type="ViewportTexture" id="ViewportTexture_57rcc"]
viewport_path = NodePath("Sprite/SubViewport") viewport_path = NodePath("Sprite/SubViewport")
@@ -506,11 +506,11 @@ tracks/1/keys = {
[sub_resource type="AnimationLibrary" id="AnimationLibrary_346xs"] [sub_resource type="AnimationLibrary" id="AnimationLibrary_346xs"]
_data = { _data = {
"RESET": SubResource("Animation_41ppy"), &"RESET": SubResource("Animation_41ppy"),
"attack": SubResource("Animation_0k3e8"), &"attack": SubResource("Animation_0k3e8"),
"idle_back_walk": SubResource("Animation_ppbeh"), &"idle_back_walk": SubResource("Animation_ppbeh"),
"idle_front_walk": SubResource("Animation_3dffb"), &"idle_front_walk": SubResource("Animation_3dffb"),
"idle_left_walk": SubResource("Animation_0qxqf") &"idle_left_walk": SubResource("Animation_0qxqf")
} }
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_erbrx"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_erbrx"]
@@ -625,7 +625,7 @@ target_position = Vector3(0, 0, -5)
collision_mask = 3 collision_mask = 3
[node name="CollisionShape3D" type="CollisionShape3D" parent="."] [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0) transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -0.0824751, 0.212459, 0)
shape = SubResource("CapsuleShape3D_0h5s2") shape = SubResource("CapsuleShape3D_0h5s2")
[node name="NavAgent" type="NavigationAgent3D" parent="."] [node name="NavAgent" type="NavigationAgent3D" parent="."]
@@ -662,7 +662,7 @@ offset = Vector2(45, 45)
[node name="AnimationPlayer" type="AnimationPlayer" parent="."] [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
unique_name_in_owner = true unique_name_in_owner = true
libraries = { libraries = {
"": SubResource("AnimationLibrary_346xs") &"": SubResource("AnimationLibrary_346xs")
} }
[node name="AnimationTree" type="AnimationTree" parent="."] [node name="AnimationTree" type="AnimationTree" parent="."]

15
src/enemy/enemy_types/sproingy/Sproingy.tscn
View File

@@ -81,7 +81,8 @@ FerrumDamageBonus = 0.0
DropsSoulGemChance = 0.9 DropsSoulGemChance = 0.9
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_cwfph"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_cwfph"]
radius = 1.0 radius = 0.226425
height = 2.02807
[sub_resource type="CylinderShape3D" id="CylinderShape3D_jbgmx"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_jbgmx"]
height = 5.0 height = 5.0
@@ -454,11 +455,11 @@ tracks/1/keys = {
[sub_resource type="AnimationLibrary" id="AnimationLibrary_6tj5r"] [sub_resource type="AnimationLibrary" id="AnimationLibrary_6tj5r"]
_data = { _data = {
"RESET": SubResource("Animation_ch8ic"), &"RESET": SubResource("Animation_ch8ic"),
"attack": SubResource("Animation_ruc6s"), &"attack": SubResource("Animation_ruc6s"),
"idle_back_walk": SubResource("Animation_1tda5"), &"idle_back_walk": SubResource("Animation_1tda5"),
"idle_front_walk": SubResource("Animation_31nry"), &"idle_front_walk": SubResource("Animation_31nry"),
"idle_left_walk": SubResource("Animation_1870e") &"idle_left_walk": SubResource("Animation_1870e")
} }
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_erbrx"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_erbrx"]
@@ -611,7 +612,7 @@ animation = &"idle_left_walk"
[node name="AnimationPlayer" type="AnimationPlayer" parent="."] [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
unique_name_in_owner = true unique_name_in_owner = true
libraries = { libraries = {
"": SubResource("AnimationLibrary_6tj5r") &"": SubResource("AnimationLibrary_6tj5r")
} }
[node name="AnimationTree" type="AnimationTree" parent="."] [node name="AnimationTree" type="AnimationTree" parent="."]

12
src/game/Game.cs
View File

@@ -261,10 +261,10 @@ public partial class Game : Node3D, IGame
} }
} }
public void HealHP(int amountToRaise) public void HealHP(int amountToRestore)
{ {
GameRepo.PlayerData.SetCurrentHP(GameRepo.PlayerData.CurrentHP.Value + amountToRaise); GameRepo.PlayerData.SetCurrentHP(GameRepo.PlayerData.CurrentHP.Value + amountToRestore);
var raiseString = amountToRaise == 1000 ? "MAX" : $"{amountToRaise}"; var raiseString = amountToRestore == 1000 ? "MAX" : $"{amountToRestore}";
EmitSignal(SignalName.StatRaisedAlert, $"{raiseString}HP Restored."); EmitSignal(SignalName.StatRaisedAlert, $"{raiseString}HP Restored.");
} }
@@ -278,10 +278,10 @@ public partial class Game : Node3D, IGame
} }
} }
public void HealVT(int amountToRaise) public void HealVT(int amountToRestore)
{ {
GameRepo.PlayerData.SetCurrentVT(GameRepo.PlayerData.CurrentVT.Value + amountToRaise); GameRepo.PlayerData.SetCurrentVT(GameRepo.PlayerData.CurrentVT.Value + amountToRestore);
var raiseString = amountToRaise == 1000 ? "MAX" : $"{amountToRaise}"; var raiseString = amountToRestore == 1000 ? "MAX" : $"{amountToRestore}";
EmitSignal(SignalName.StatRaisedAlert, $"{raiseString}VT Restored."); EmitSignal(SignalName.StatRaisedAlert, $"{raiseString}VT Restored.");
} }

55
src/game/Game.tscn
View File

@@ -1,14 +1,11 @@
[gd_scene load_steps=19 format=3 uid="uid://33ek675mfb5n"] [gd_scene load_steps=13 format=3 uid="uid://33ek675mfb5n"]
[ext_resource type="Script" path="res://src/game/Game.cs" id="1_ytcii"] [ext_resource type="Script" path="res://src/game/Game.cs" id="1_ytcii"]
[ext_resource type="Shader" path="res://src/app/App.gdshader" id="2_6ifxs"] [ext_resource type="Shader" path="res://src/app/App.gdshader" id="2_6ifxs"]
[ext_resource type="PackedScene" uid="uid://by67pn7fdsg1m" path="res://src/map/Map.tscn" id="3_d8awv"] [ext_resource type="PackedScene" uid="uid://by67pn7fdsg1m" path="res://src/map/Map.tscn" id="3_d8awv"]
[ext_resource type="PackedScene" uid="uid://cfecvvav8kkp6" path="res://src/player/Player.tscn" id="3_kk6ly"] [ext_resource type="PackedScene" uid="uid://cfecvvav8kkp6" path="res://src/player/Player.tscn" id="3_kk6ly"]
[ext_resource type="Script" path="res://src/items/throwable/ThrowableItem.cs" id="5_2h2uw"]
[ext_resource type="PackedScene" uid="uid://b1muxus5qdbeu" path="res://src/ui/in_game_ui/InGameUI.tscn" id="5_lxtnp"] [ext_resource type="PackedScene" uid="uid://b1muxus5qdbeu" path="res://src/ui/in_game_ui/InGameUI.tscn" id="5_lxtnp"]
[ext_resource type="Texture2D" uid="uid://dhfn51smm818x" path="res://src/items/throwable/textures/spell sign - luck.PNG" id="6_3qv3u"]
[ext_resource type="PackedScene" uid="uid://b16ejcwanod72" path="res://src/audio/InGameAudio.tscn" id="6_qc71l"] [ext_resource type="PackedScene" uid="uid://b16ejcwanod72" path="res://src/audio/InGameAudio.tscn" id="6_qc71l"]
[ext_resource type="Script" path="res://src/items/throwable/ThrowableItemStats.cs" id="7_1lafu"]
[ext_resource type="Script" path="res://src/game/DialogueController.cs" id="10_58pbt"] [ext_resource type="Script" path="res://src/game/DialogueController.cs" id="10_58pbt"]
[ext_resource type="Script" path="res://src/ui/pause_menu/PauseMenu.cs" id="11_5ng8c"] [ext_resource type="Script" path="res://src/ui/pause_menu/PauseMenu.cs" id="11_5ng8c"]
[ext_resource type="PackedScene" uid="uid://pu6gp8de3ck4" path="res://src/ui/floor_clear/FloorClearMenu.tscn" id="11_rya1n"] [ext_resource type="PackedScene" uid="uid://pu6gp8de3ck4" path="res://src/ui/floor_clear/FloorClearMenu.tscn" id="11_rya1n"]
@@ -24,24 +21,6 @@ shader_parameter/scale_resolution = false
shader_parameter/target_resolution_scale = 4 shader_parameter/target_resolution_scale = 4
shader_parameter/enable_recolor = false shader_parameter/enable_recolor = false
[sub_resource type="Resource" id="Resource_qjdoa"]
script = ExtResource("7_1lafu")
ThrowableItemTags = []
Name = "Test Item"
Description = ""
Texture = ExtResource("6_3qv3u")
SpawnRate = 0.5
ThrowSpeed = 12.0
HealHPAmount = 0
HealVTAmount = 0
ThrowDamage = 5
[sub_resource type="BoxShape3D" id="BoxShape3D_qkug6"]
size = Vector3(0.371643, 0.289612, 0.286743)
[sub_resource type="BoxShape3D" id="BoxShape3D_1clvs"]
size = Vector3(0.778381, 0.929947, 0.731567)
[node name="Game" type="Node3D"] [node name="Game" type="Node3D"]
process_mode = 3 process_mode = 3
script = ExtResource("1_ytcii") script = ExtResource("1_ytcii")
@@ -75,38 +54,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2.74459, 1.22144)
unique_name_in_owner = true unique_name_in_owner = true
process_mode = 1 process_mode = 1
[node name="ThrowableItem" type="Node3D" parent="SubViewportContainer/SubViewport/PauseContainer"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.52777, 3.48107, 3.48636)
script = ExtResource("5_2h2uw")
ThrowableItemInfo = SubResource("Resource_qjdoa")
[node name="Hitbox" type="RigidBody3D" parent="SubViewportContainer/SubViewport/PauseContainer/ThrowableItem"]
unique_name_in_owner = true
collision_layer = 0
collision_mask = 17
[node name="Sprite" type="Sprite3D" parent="SubViewportContainer/SubViewport/PauseContainer/ThrowableItem/Hitbox"]
unique_name_in_owner = true
pixel_size = 0.001
billboard = 1
shaded = true
double_sided = false
texture_filter = 0
render_priority = 100
texture = ExtResource("6_3qv3u")
[node name="CollisionShape3D" type="CollisionShape3D" parent="SubViewportContainer/SubViewport/PauseContainer/ThrowableItem/Hitbox"]
shape = SubResource("BoxShape3D_qkug6")
[node name="Pickup" type="Area3D" parent="SubViewportContainer/SubViewport/PauseContainer/ThrowableItem/Hitbox"]
unique_name_in_owner = true
collision_layer = 0
collision_mask = 4
[node name="CollisionShape3D" type="CollisionShape3D" parent="SubViewportContainer/SubViewport/PauseContainer/ThrowableItem/Hitbox/Pickup"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0600509, 0.26725, 0.180481)
shape = SubResource("BoxShape3D_1clvs")
[node name="InGameUI" parent="." instance=ExtResource("5_lxtnp")] [node name="InGameUI" parent="." instance=ExtResource("5_lxtnp")]
unique_name_in_owner = true unique_name_in_owner = true

4
src/items/consumable/ConsumableItem.cs
View File

@@ -34,9 +34,9 @@ public partial class ConsumableItem : Node3D, IUsableItem
if (ConsumableItemInfo.RaiseVTAmount > 0) if (ConsumableItemInfo.RaiseVTAmount > 0)
Game.RaiseVT(ConsumableItemInfo.RaiseVTAmount); Game.RaiseVT(ConsumableItemInfo.RaiseVTAmount);
if (ConsumableItemInfo.HealHPAmount > 0) if (ConsumableItemInfo.HealHPAmount > 0 && GameRepo.PlayerData.CurrentHP.Value != GameRepo.PlayerData.MaximumHP.Value)
Game.HealHP(ConsumableItemInfo.HealHPAmount); Game.HealHP(ConsumableItemInfo.HealHPAmount);
if (ConsumableItemInfo.HealVTAmount > 0) if (ConsumableItemInfo.HealVTAmount > 0 && GameRepo.PlayerData.CurrentVT.Value != GameRepo.PlayerData.MaximumVT.Value)
Game.HealVT(ConsumableItemInfo.HealVTAmount); Game.HealVT(ConsumableItemInfo.HealVTAmount);
} }

18
src/map/Map.tscn
View File

@@ -18,8 +18,6 @@ script = ExtResource("1_bw70o")
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.77792, 1.78656, -5.13176) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.77792, 1.78656, -5.13176)
script = ExtResource("3_n0f1p") script = ExtResource("3_n0f1p")
[node name="Floor11" parent="." instance=ExtResource("3_niasb")]
[node name="Floor1" parent="." instance=ExtResource("2_merfv")] [node name="Floor1" parent="." instance=ExtResource("2_merfv")]
unique_name_in_owner = true unique_name_in_owner = true
@@ -27,6 +25,22 @@ unique_name_in_owner = true
[node name="Floor3" parent="." instance=ExtResource("5_uag72")] [node name="Floor3" parent="." instance=ExtResource("5_uag72")]
[node name="Floor4" parent="." instance=ExtResource("5_uag72")]
[node name="Floor5" parent="." instance=ExtResource("5_uag72")]
[node name="Floor6" parent="." instance=ExtResource("5_uag72")]
[node name="Floor7" parent="." instance=ExtResource("5_uag72")]
[node name="Floor8" parent="." instance=ExtResource("5_uag72")]
[node name="Floor9" parent="." instance=ExtResource("5_uag72")]
[node name="Floor10" parent="." instance=ExtResource("5_uag72")]
[node name="Floor11" parent="." instance=ExtResource("3_niasb")]
[node name="Teleport" parent="." instance=ExtResource("5_jiohg")] [node name="Teleport" parent="." instance=ExtResource("5_jiohg")]
unique_name_in_owner = true unique_name_in_owner = true
process_mode = 3 process_mode = 3

3
src/map/dungeon/code/DungeonFloor.cs
View File

@@ -21,6 +21,8 @@ public partial class DungeonFloor : Node3D, IDungeonFloor
[Node] public GodotObject DungeonGenerator { get; set; } = default!; [Node] public GodotObject DungeonGenerator { get; set; } = default!;
[Node] public NavigationRegion3D NavigationRegion3D { get; set; } = default!;
private Transform3D _playerSpawnPoint; private Transform3D _playerSpawnPoint;
private Vector3 _teleportSpawnPoint; private Vector3 _teleportSpawnPoint;
@@ -31,6 +33,7 @@ public partial class DungeonFloor : Node3D, IDungeonFloor
{ {
Rooms = new List<IDungeonRoom>(); Rooms = new List<IDungeonRoom>();
DungeonGenerator.Call("generate"); DungeonGenerator.Call("generate");
NavigationRegion3D.BakeNavigationMesh();
Rooms = FindAllDungeonRooms([.. GetChildren()], Rooms); Rooms = FindAllDungeonRooms([.. GetChildren()], Rooms);
_playerSpawnPoint = RandomizePlayerSpawnPoint(); _playerSpawnPoint = RandomizePlayerSpawnPoint();
_teleportSpawnPoint = RandomizeTeleportSpawnPointAwayFromPosition(_playerSpawnPoint.Origin); _teleportSpawnPoint = RandomizeTeleportSpawnPointAwayFromPosition(_playerSpawnPoint.Origin);

21
src/map/dungeon/corridor/Corridor.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=10 format=3 uid="uid://bn4gslp2gk8ds"] [gd_scene load_steps=9 format=3 uid="uid://bn4gslp2gk8ds"]
[ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonRoom3D.gd" id="1_y0rqi"] [ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonRoom3D.gd" id="1_y0rqi"]
[ext_resource type="Script" path="res://src/map/dungeon/corridor/remove_unused_doors.gd" id="3_8i1ij"] [ext_resource type="Script" path="res://src/map/dungeon/corridor/remove_unused_doors.gd" id="3_8i1ij"]
@@ -11,12 +11,6 @@ albedo_texture = ExtResource("3_opvgc")
uv1_scale = Vector3(1.52, 1.52, 1.52) uv1_scale = Vector3(1.52, 1.52, 1.52)
uv1_triplanar = true uv1_triplanar = true
[sub_resource type="NavigationMesh" id="NavigationMesh_ybnkq"]
vertices = PackedVector3Array(-1.75, -1.83949, -1.75, -1.75, -1.83949, 1.75, 1.75, -1.83949, 1.75, 1.75, -1.83949, -1.75)
polygons = [PackedInt32Array(3, 2, 0), PackedInt32Array(0, 2, 1)]
agent_radius = 0.25
region_min_size = 1.0
[sub_resource type="PlaneMesh" id="PlaneMesh_xt554"] [sub_resource type="PlaneMesh" id="PlaneMesh_xt554"]
material = ExtResource("4_yo35n") material = ExtResource("4_yo35n")
size = Vector2(4, 4) size = Vector2(4, 4)
@@ -61,22 +55,19 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0689777, -0.00256348, 1.948
operation = 2 operation = 2
size = Vector3(3.82893, 3.79468, 0.105042) size = Vector3(3.82893, 3.79468, 0.105042)
[node name="NavigationRegion3D" type="NavigationRegion3D" parent="CSGBox3D"] [node name="Area3D" type="Area3D" parent="CSGBox3D"]
navigation_mesh = SubResource("NavigationMesh_ybnkq") transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, -5.68248e-07, 0, 0)
[node name="Area3D" type="Area3D" parent="CSGBox3D/NavigationRegion3D"]
transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, -5.68248e-07, 0, -4.96778e-14)
collision_layer = 512 collision_layer = 512
collision_mask = 512 collision_mask = 512
script = ExtResource("4_na28n") script = ExtResource("4_na28n")
[node name="Minimap" type="MeshInstance3D" parent="CSGBox3D/NavigationRegion3D/Area3D"] [node name="Minimap" type="MeshInstance3D" parent="CSGBox3D/Area3D"]
unique_name_in_owner = true unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2.33949, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2.33949, 0)
visible = false visible = false
layers = 2 layers = 2
mesh = SubResource("PlaneMesh_xt554") mesh = SubResource("PlaneMesh_xt554")
skeleton = NodePath("../../../..") skeleton = NodePath("../../..")
[node name="CollisionShape3D" type="CollisionShape3D" parent="CSGBox3D/NavigationRegion3D/Area3D"] [node name="CollisionShape3D" type="CollisionShape3D" parent="CSGBox3D/Area3D"]
shape = SubResource("BoxShape3D_5u3wq") shape = SubResource("BoxShape3D_5u3wq")

12
src/map/dungeon/floors/Floor01.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=12 format=3 uid="uid://bc1sp6xwe0j65"] [gd_scene load_steps=13 format=3 uid="uid://bc1sp6xwe0j65"]
[ext_resource type="Script" path="res://src/map/dungeon/code/DungeonFloor.cs" id="1_0ecnn"] [ext_resource type="Script" path="res://src/map/dungeon/code/DungeonFloor.cs" id="1_0ecnn"]
[ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonGenerator3D.gd" id="2_cxmwa"] [ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonGenerator3D.gd" id="2_cxmwa"]
@@ -12,10 +12,18 @@
[ext_resource type="PackedScene" uid="uid://cam640h4euewx" path="res://src/map/dungeon/scenes/PitRoom2.tscn" id="10_4qi15"] [ext_resource type="PackedScene" uid="uid://cam640h4euewx" path="res://src/map/dungeon/scenes/PitRoom2.tscn" id="10_4qi15"]
[ext_resource type="PackedScene" uid="uid://i781lbf2wb22" path="res://src/map/dungeon/scenes/TreeRoom.tscn" id="10_kwn4p"] [ext_resource type="PackedScene" uid="uid://i781lbf2wb22" path="res://src/map/dungeon/scenes/TreeRoom.tscn" id="10_kwn4p"]
[sub_resource type="NavigationMesh" id="NavigationMesh_4d8mx"]
sample_partition_type = 2
geometry_parsed_geometry_type = 0
[node name="Floor1" type="Node3D"] [node name="Floor1" type="Node3D"]
script = ExtResource("1_0ecnn") script = ExtResource("1_0ecnn")
[node name="DungeonGenerator" type="Node3D" parent="."] [node name="NavigationRegion3D" type="NavigationRegion3D" parent="."]
unique_name_in_owner = true
navigation_mesh = SubResource("NavigationMesh_4d8mx")
[node name="DungeonGenerator" type="Node3D" parent="NavigationRegion3D"]
unique_name_in_owner = true unique_name_in_owner = true
script = ExtResource("2_cxmwa") script = ExtResource("2_cxmwa")
room_scenes = Array[PackedScene]([ExtResource("3_tsw3y"), ExtResource("4_b2rkl"), ExtResource("5_v15cv"), ExtResource("6_gy758"), ExtResource("8_8qebi"), ExtResource("9_icfo6"), ExtResource("10_kwn4p"), ExtResource("10_4qi15")]) room_scenes = Array[PackedScene]([ExtResource("3_tsw3y"), ExtResource("4_b2rkl"), ExtResource("5_v15cv"), ExtResource("6_gy758"), ExtResource("8_8qebi"), ExtResource("9_icfo6"), ExtResource("10_kwn4p"), ExtResource("10_4qi15")])

7
src/map/dungeon/models/antechamber_2/ANTECHAMBER_TYPE2_VER3_CEILING_1.jpg.import
View File

@@ -2,14 +2,11 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://cn8uaj0m5b3h1" uid="uid://s47vv7sjxl"
path="res://.godot/imported/ANTECHAMBER_TYPE2_VER3_CEILING_1.jpg-97e87a73564e74ddeb83ca2ca4330a65.ctex" path="res://.godot/imported/ANTECHAMBER_TYPE2_VER3_CEILING_1.jpg-97e87a73564e74ddeb83ca2ca4330a65.ctex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
generator_parameters={
"md5": "3d6e3a1f727e4ba346b1f8bd49a76e28"
}
[deps] [deps]
@@ -24,7 +21,7 @@ compress/lossy_quality=0.7
compress/hdr_compression=1 compress/hdr_compression=1
compress/normal_map=0 compress/normal_map=0
compress/channel_pack=0 compress/channel_pack=0
mipmaps/generate=true mipmaps/generate=false
mipmaps/limit=-1 mipmaps/limit=-1
roughness/mode=0 roughness/mode=0
roughness/src_normal="" roughness/src_normal=""

7
src/map/dungeon/models/boss/FLOOR 11 (BOSS FLOOR)_CHAIN_TEX.png.import
View File

@@ -2,14 +2,11 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://yafip7ghyqfo" uid="uid://bjfbp5m35ikcn"
path="res://.godot/imported/FLOOR 11 (BOSS FLOOR)_CHAIN_TEX.png-ec9bddc06a90ff94c2ffb01273771fb1.ctex" path="res://.godot/imported/FLOOR 11 (BOSS FLOOR)_CHAIN_TEX.png-ec9bddc06a90ff94c2ffb01273771fb1.ctex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
generator_parameters={
"md5": "23d9d131e0ad9c97741d45e74e39c3e2"
}
[deps] [deps]
@@ -24,7 +21,7 @@ compress/lossy_quality=0.7
compress/hdr_compression=1 compress/hdr_compression=1
compress/normal_map=0 compress/normal_map=0
compress/channel_pack=0 compress/channel_pack=0
mipmaps/generate=true mipmaps/generate=false
mipmaps/limit=-1 mipmaps/limit=-1
roughness/mode=0 roughness/mode=0
roughness/src_normal="" roughness/src_normal=""

7
src/map/dungeon/models/inner_balcony/INNER_BALCONY_ROOM_VER2_COLUM2N.png.import
View File

@@ -2,14 +2,11 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://b7klxn86s6vgj" uid="uid://ckludwybrs7bj"
path="res://.godot/imported/INNER_BALCONY_ROOM_VER2_COLUM2N.png-7680dc172ff029acc271351c396eabc6.ctex" path="res://.godot/imported/INNER_BALCONY_ROOM_VER2_COLUM2N.png-7680dc172ff029acc271351c396eabc6.ctex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
generator_parameters={
"md5": "aa07ab7f59f9440053a56b318be20581"
}
[deps] [deps]
@@ -24,7 +21,7 @@ compress/lossy_quality=0.7
compress/hdr_compression=1 compress/hdr_compression=1
compress/normal_map=0 compress/normal_map=0
compress/channel_pack=0 compress/channel_pack=0
mipmaps/generate=true mipmaps/generate=false
mipmaps/limit=-1 mipmaps/limit=-1
roughness/mode=0 roughness/mode=0
roughness/src_normal="" roughness/src_normal=""

7
src/map/dungeon/models/pit_room/PIT_ROOM_VER2_CHAIN_TEX.png.import
View File

@@ -2,14 +2,11 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://0vdsgc7jeeta" uid="uid://b4l5c4ywq3v1a"
path="res://.godot/imported/PIT_ROOM_VER2_CHAIN_TEX.png-117333bed6d8bf643fb9e85a24197a94.ctex" path="res://.godot/imported/PIT_ROOM_VER2_CHAIN_TEX.png-117333bed6d8bf643fb9e85a24197a94.ctex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
generator_parameters={
"md5": "23d9d131e0ad9c97741d45e74e39c3e2"
}
[deps] [deps]
@@ -24,7 +21,7 @@ compress/lossy_quality=0.7
compress/hdr_compression=1 compress/hdr_compression=1
compress/normal_map=0 compress/normal_map=0
compress/channel_pack=0 compress/channel_pack=0
mipmaps/generate=true mipmaps/generate=false
mipmaps/limit=-1 mipmaps/limit=-1
roughness/mode=0 roughness/mode=0
roughness/src_normal="" roughness/src_normal=""

7
src/map/dungeon/models/pit_room/PIT_ROOM_VER2_brick3.png.import
View File

@@ -2,14 +2,11 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://mryx604xru21" uid="uid://cggiuui6g45pu"
path="res://.godot/imported/PIT_ROOM_VER2_brick3.png-4f5c0e82477842b1c18daba86039ab35.ctex" path="res://.godot/imported/PIT_ROOM_VER2_brick3.png-4f5c0e82477842b1c18daba86039ab35.ctex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
generator_parameters={
"md5": "4e53f276338db9090e7f2fdc2c90feb2"
}
[deps] [deps]
@@ -24,7 +21,7 @@ compress/lossy_quality=0.7
compress/hdr_compression=1 compress/hdr_compression=1
compress/normal_map=0 compress/normal_map=0
compress/channel_pack=0 compress/channel_pack=0
mipmaps/generate=true mipmaps/generate=false
mipmaps/limit=-1 mipmaps/limit=-1
roughness/mode=0 roughness/mode=0
roughness/src_normal="" roughness/src_normal=""

7
src/map/dungeon/models/tree_room/TREE_ROOM_VER2_hand-tiile.png.import
View File

@@ -2,14 +2,11 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://bgm0o7s4hddq7" uid="uid://y71ptco1agnh"
path="res://.godot/imported/TREE_ROOM_VER2_hand-tiile.png-1506a5825e07dba9a0260fb7b0646dfb.ctex" path="res://.godot/imported/TREE_ROOM_VER2_hand-tiile.png-1506a5825e07dba9a0260fb7b0646dfb.ctex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
generator_parameters={
"md5": "d3ae9d17bf47107d7c4fdd341980bd5a"
}
[deps] [deps]
@@ -24,7 +21,7 @@ compress/lossy_quality=0.7
compress/hdr_compression=1 compress/hdr_compression=1
compress/normal_map=0 compress/normal_map=0
compress/channel_pack=0 compress/channel_pack=0
mipmaps/generate=true mipmaps/generate=false
mipmaps/limit=-1 mipmaps/limit=-1
roughness/mode=0 roughness/mode=0
roughness/src_normal="" roughness/src_normal=""

21
src/map/dungeon/scenes/Antechamber.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=60 format=4 uid="uid://dpec2lbt83dhe"] [gd_scene load_steps=59 format=4 uid="uid://dpec2lbt83dhe"]
[ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonRoom3D.gd" id="1_ho6e8"] [ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonRoom3D.gd" id="1_ho6e8"]
[ext_resource type="Script" path="res://src/map/dungeon/code/DungeonRoom.cs" id="2_iwuh7"] [ext_resource type="Script" path="res://src/map/dungeon/code/DungeonRoom.cs" id="2_iwuh7"]
@@ -638,10 +638,6 @@ albedo_texture = ExtResource("19_06gih")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_x3ul8"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_x3ul8"]
albedo_texture = ExtResource("19_06gih") albedo_texture = ExtResource("19_06gih")
[sub_resource type="NavigationMesh" id="NavigationMesh_qd4u7"]
vertices = PackedVector3Array(-9.5, -3.53725, -7.5, -9.5, -3.53725, 7.5, 9.5, -3.53725, 7.5, 9.5, -3.53725, -7.5)
polygons = [PackedInt32Array(3, 2, 0), PackedInt32Array(0, 2, 1)]
[sub_resource type="PlaneMesh" id="PlaneMesh_s0txx"] [sub_resource type="PlaneMesh" id="PlaneMesh_s0txx"]
material = ExtResource("21_8vpi3") material = ExtResource("21_8vpi3")
size = Vector2(20, 16) size = Vector2(20, 16)
@@ -787,29 +783,26 @@ transform = Transform3D(-0.866024, -0.433016, 0.250001, 0, 0.499998, 0.866026, -
light_energy = 0.0 light_energy = 0.0
shadow_enabled = true shadow_enabled = true
[node name="NavigationRegion3D" type="NavigationRegion3D" parent="."] [node name="Minimap Manager" type="Area3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.00123, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.00123, 0)
navigation_mesh = SubResource("NavigationMesh_qd4u7")
[node name="Minimap Manager" type="Area3D" parent="NavigationRegion3D"]
collision_layer = 512 collision_layer = 512
collision_mask = 512 collision_mask = 512
script = ExtResource("21_h0ti6") script = ExtResource("21_h0ti6")
[node name="Minimap" type="MeshInstance3D" parent="NavigationRegion3D/Minimap Manager"] [node name="Minimap" type="MeshInstance3D" parent="Minimap Manager"]
unique_name_in_owner = true unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -4.03725, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -4.03725, 0)
visible = false visible = false
layers = 2 layers = 2
mesh = SubResource("PlaneMesh_s0txx") mesh = SubResource("PlaneMesh_s0txx")
skeleton = NodePath("../../..") skeleton = NodePath("../..")
[node name="Minimap2" type="MeshInstance3D" parent="NavigationRegion3D/Minimap Manager"] [node name="Minimap2" type="MeshInstance3D" parent="Minimap Manager"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -3.98417, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -3.98417, 0)
layers = 4 layers = 4
mesh = SubResource("PlaneMesh_s0txx") mesh = SubResource("PlaneMesh_s0txx")
skeleton = NodePath("../../..") skeleton = NodePath("../..")
[node name="CollisionShape3D" type="CollisionShape3D" parent="NavigationRegion3D/Minimap Manager"] [node name="CollisionShape3D" type="CollisionShape3D" parent="Minimap Manager"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.94617, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.94617, 0)
shape = SubResource("BoxShape3D_24rcp") shape = SubResource("BoxShape3D_24rcp")

21
src/map/dungeon/scenes/Antechamber_2.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=90 format=4 uid="uid://vdhl32je6hq2"] [gd_scene load_steps=89 format=4 uid="uid://vdhl32je6hq2"]
[ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonRoom3D.gd" id="1_j1kxr"] [ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonRoom3D.gd" id="1_j1kxr"]
[ext_resource type="Script" path="res://src/map/dungeon/code/DungeonRoom.cs" id="2_6qgti"] [ext_resource type="Script" path="res://src/map/dungeon/code/DungeonRoom.cs" id="2_6qgti"]
@@ -1654,10 +1654,6 @@ albedo_texture = ExtResource("22_3r6v3")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_a7x8v"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_a7x8v"]
albedo_texture = ExtResource("22_3r6v3") albedo_texture = ExtResource("22_3r6v3")
[sub_resource type="NavigationMesh" id="NavigationMesh_7g6qr"]
vertices = PackedVector3Array(-8.57721, -0.682471, -7.35039, -8.57721, -0.682471, 7.64961, 6.42279, -0.682471, 7.64961, 6.42279, -0.682471, -7.35039)
polygons = [PackedInt32Array(3, 2, 0), PackedInt32Array(0, 2, 1)]
[sub_resource type="PlaneMesh" id="PlaneMesh_qxc34"] [sub_resource type="PlaneMesh" id="PlaneMesh_qxc34"]
material = ExtResource("27_mgor6") material = ExtResource("27_mgor6")
size = Vector2(16, 16) size = Vector2(16, 16)
@@ -1824,29 +1820,26 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.74798, -1.55568, 2.8662)
[node name="RemoveUnusedDoors" type="Node" parent="."] [node name="RemoveUnusedDoors" type="Node" parent="."]
script = ExtResource("25_8521a") script = ExtResource("25_8521a")
[node name="NavigationRegion3D" type="NavigationRegion3D" parent="."] [node name="Minimap Manager" type="Area3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.524475, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.524475, 0)
navigation_mesh = SubResource("NavigationMesh_7g6qr")
[node name="Minimap Manager" type="Area3D" parent="NavigationRegion3D"]
collision_layer = 512 collision_layer = 512
collision_mask = 512 collision_mask = 512
script = ExtResource("26_tvm82") script = ExtResource("26_tvm82")
[node name="Minimap" type="MeshInstance3D" parent="NavigationRegion3D/Minimap Manager"] [node name="Minimap" type="MeshInstance3D" parent="Minimap Manager"]
unique_name_in_owner = true unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.07721, -1.68247, 0.149613) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.07721, -1.68247, 0.149613)
visible = false visible = false
layers = 2 layers = 2
mesh = SubResource("PlaneMesh_qxc34") mesh = SubResource("PlaneMesh_qxc34")
skeleton = NodePath("../../../Antechamber2") skeleton = NodePath("../../Antechamber2")
[node name="Minimap2" type="MeshInstance3D" parent="NavigationRegion3D/Minimap Manager"] [node name="Minimap2" type="MeshInstance3D" parent="Minimap Manager"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.07721, -1.07301, 0.149613) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.07721, -1.07301, 0.149613)
layers = 4 layers = 4
mesh = SubResource("PlaneMesh_qxc34") mesh = SubResource("PlaneMesh_qxc34")
skeleton = NodePath("../../../Antechamber2") skeleton = NodePath("../../Antechamber2")
[node name="CollisionShape3D" type="CollisionShape3D" parent="NavigationRegion3D/Minimap Manager"] [node name="CollisionShape3D" type="CollisionShape3D" parent="Minimap Manager"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.03888, 0.0590906, 995.718) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.03888, 0.0590906, 995.718)
shape = SubResource("BoxShape3D_grw58") shape = SubResource("BoxShape3D_grw58")

21
src/map/dungeon/scenes/BasinRoom.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=67 format=4 uid="uid://b82dx66mgs2d7"] [gd_scene load_steps=66 format=4 uid="uid://b82dx66mgs2d7"]
[ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonRoom3D.gd" id="1_0qew1"] [ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonRoom3D.gd" id="1_0qew1"]
[ext_resource type="Script" path="res://src/map/dungeon/code/DungeonRoom.cs" id="2_dthr7"] [ext_resource type="Script" path="res://src/map/dungeon/code/DungeonRoom.cs" id="2_dthr7"]
@@ -695,10 +695,6 @@ albedo_texture = ExtResource("4_gh4c7")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_jwoo1"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_jwoo1"]
albedo_texture = ExtResource("4_gh4c7") albedo_texture = ExtResource("4_gh4c7")
[sub_resource type="NavigationMesh" id="NavigationMesh_5ldwe"]
vertices = PackedVector3Array(-9.7225, -2.66671, -7.29348, -9.7225, -2.66671, 7.70652, 9.2775, -2.66671, 7.70652, 9.2775, -2.66671, -7.29348)
polygons = [PackedInt32Array(3, 2, 0), PackedInt32Array(0, 2, 1)]
[sub_resource type="PlaneMesh" id="PlaneMesh_g88f5"] [sub_resource type="PlaneMesh" id="PlaneMesh_g88f5"]
material = ExtResource("20_yhlud") material = ExtResource("20_yhlud")
size = Vector2(20, 16) size = Vector2(20, 16)
@@ -844,29 +840,26 @@ operation = 2
size = Vector3(4, 4, 2) size = Vector3(4, 4, 2)
material = SubResource("StandardMaterial3D_jwoo1") material = SubResource("StandardMaterial3D_jwoo1")
[node name="NavigationRegion3D" type="NavigationRegion3D" parent="."] [node name="Area3D" type="Area3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.170427, 1.69136, -0.0999355) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.170427, 1.69136, -0.0999355)
navigation_mesh = SubResource("NavigationMesh_5ldwe")
[node name="Area3D" type="Area3D" parent="NavigationRegion3D"]
collision_layer = 512 collision_layer = 512
collision_mask = 512 collision_mask = 512
script = ExtResource("20_q54wm") script = ExtResource("20_q54wm")
[node name="Minimap" type="MeshInstance3D" parent="NavigationRegion3D/Area3D"] [node name="Minimap" type="MeshInstance3D" parent="Area3D"]
unique_name_in_owner = true unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.222501, -2.94669, 0.206517) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.222501, -2.94669, 0.206517)
visible = false visible = false
layers = 2 layers = 2
mesh = SubResource("PlaneMesh_g88f5") mesh = SubResource("PlaneMesh_g88f5")
skeleton = NodePath("../../../BasinRoom") skeleton = NodePath("../../BasinRoom")
[node name="Minimap2" type="MeshInstance3D" parent="NavigationRegion3D/Area3D"] [node name="Minimap2" type="MeshInstance3D" parent="Area3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.222501, -3.66671, 0.206517) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.222501, -3.66671, 0.206517)
layers = 4 layers = 4
mesh = SubResource("PlaneMesh_g88f5") mesh = SubResource("PlaneMesh_g88f5")
skeleton = NodePath("../../../BasinRoom") skeleton = NodePath("../../BasinRoom")
[node name="CollisionShape3D" type="CollisionShape3D" parent="NavigationRegion3D/Area3D"] [node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"]
transform = Transform3D(1, 0, 0, 0, 0.999142, 0.0414048, 0, -0.0414048, 0.999142, -0.143891, 1.9078, 0.474629) transform = Transform3D(1, 0, 0, 0, 0.999142, 0.0414048, 0, -0.0414048, 0.999142, -0.143891, 1.9078, 0.474629)
shape = SubResource("BoxShape3D_xepai") shape = SubResource("BoxShape3D_xepai")

24
src/map/dungeon/scenes/ColumnRoom.tscn
View File

File diff suppressed because one or more lines are too long

21
src/map/dungeon/scenes/InnerBalcony.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=86 format=4 uid="uid://b7111krf365x0"] [gd_scene load_steps=85 format=4 uid="uid://b7111krf365x0"]
[ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonRoom3D.gd" id="1_jccmw"] [ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonRoom3D.gd" id="1_jccmw"]
[ext_resource type="Script" path="res://src/map/dungeon/code/DungeonRoom.cs" id="2_5p5p8"] [ext_resource type="Script" path="res://src/map/dungeon/code/DungeonRoom.cs" id="2_5p5p8"]
@@ -867,10 +867,6 @@ albedo_texture = ExtResource("14_vh3wx")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_xw1ea"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_xw1ea"]
albedo_texture = ExtResource("14_vh3wx") albedo_texture = ExtResource("14_vh3wx")
[sub_resource type="NavigationMesh" id="NavigationMesh_irfm3"]
vertices = PackedVector3Array(-16.9964, -1.50834, -15.2482, -16.9964, -1.50834, 15.7518, 18.0036, -1.50834, 15.7518, 18.0036, -1.50834, -15.2482)
polygons = [PackedInt32Array(3, 2, 0), PackedInt32Array(0, 2, 1)]
[sub_resource type="BoxShape3D" id="BoxShape3D_suh2k"] [sub_resource type="BoxShape3D" id="BoxShape3D_suh2k"]
size = Vector3(36, 8, 36) size = Vector3(36, 8, 36)
@@ -1258,29 +1254,26 @@ light_indirect_energy = 1.582
light_size = 0.281 light_size = 0.281
omni_range = 3.235 omni_range = 3.235
[node name="NavigationRegion3D" type="NavigationRegion3D" parent="."] [node name="Minimap Manager" type="Area3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.516256, -0.306861, -0.323822) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.516256, -0.306861, -0.323822)
navigation_mesh = SubResource("NavigationMesh_irfm3")
[node name="Minimap Manager" type="Area3D" parent="NavigationRegion3D"]
collision_layer = 512 collision_layer = 512
collision_mask = 512 collision_mask = 512
script = ExtResource("19_gi8bh") script = ExtResource("19_gi8bh")
[node name="CollisionShape3D" type="CollisionShape3D" parent="NavigationRegion3D/Minimap Manager"] [node name="CollisionShape3D" type="CollisionShape3D" parent="Minimap Manager"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.94617, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.94617, 0)
shape = SubResource("BoxShape3D_suh2k") shape = SubResource("BoxShape3D_suh2k")
[node name="Minimap" type="MeshInstance3D" parent="NavigationRegion3D/Minimap Manager"] [node name="Minimap" type="MeshInstance3D" parent="Minimap Manager"]
unique_name_in_owner = true unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.503605, -2.25834, 0.293772) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.503605, -2.25834, 0.293772)
visible = false visible = false
layers = 2 layers = 2
mesh = SubResource("PlaneMesh_fhks4") mesh = SubResource("PlaneMesh_fhks4")
skeleton = NodePath("../../..") skeleton = NodePath("../..")
[node name="Minimap2" type="MeshInstance3D" parent="NavigationRegion3D/Minimap Manager"] [node name="Minimap2" type="MeshInstance3D" parent="Minimap Manager"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.545578, -1.75954, 0.251803) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.545578, -1.75954, 0.251803)
layers = 4 layers = 4
mesh = SubResource("PlaneMesh_fhks4") mesh = SubResource("PlaneMesh_fhks4")
skeleton = NodePath("../../..") skeleton = NodePath("../..")

20
src/map/dungeon/scenes/PitRoom2.tscn
View File

@@ -1101,9 +1101,9 @@ albedo_texture = ExtResource("17_4r724")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_dd0w8"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_dd0w8"]
albedo_texture = ExtResource("17_4r724") albedo_texture = ExtResource("17_4r724")
[sub_resource type="NavigationMesh" id="NavigationMesh_rg1k5"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_4f64f"]
vertices = PackedVector3Array(-17.5, -1.08931, -17.5, -17.5, -1.08931, 17.5, 17.5, -1.08931, 17.5, 17.5, -1.08931, -17.5) transparency = 1
polygons = [PackedInt32Array(3, 2, 0), PackedInt32Array(0, 2, 1)] albedo_color = Color(1, 1, 1, 0)
[sub_resource type="PlaneMesh" id="PlaneMesh_i3uar"] [sub_resource type="PlaneMesh" id="PlaneMesh_i3uar"]
material = ExtResource("23_2yaqs") material = ExtResource("23_2yaqs")
@@ -1319,23 +1319,25 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.76788, -1.76654, -10.184)
[node name="RemoveUnusedDoors" type="Node" parent="."] [node name="RemoveUnusedDoors" type="Node" parent="."]
script = ExtResource("21_5mo1p") script = ExtResource("21_5mo1p")
[node name="NavigationRegion3D" type="NavigationRegion3D" parent="."] [node name="CSGCylinder3D" type="CSGCylinder3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.764877, 4.39249, -0.482112) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.051639, -0.480896, -0.013773)
navigation_mesh = SubResource("NavigationMesh_rg1k5") material_override = SubResource("StandardMaterial3D_4f64f")
radius = 4.55558
[node name="Minimap Manager" type="Area3D" parent="NavigationRegion3D"] [node name="Minimap Manager" type="Area3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.764877, -0.480896, -0.482112)
collision_layer = 512 collision_layer = 512
collision_mask = 512 collision_mask = 512
script = ExtResource("22_h4dhe") script = ExtResource("22_h4dhe")
[node name="Minimap" type="MeshInstance3D" parent="NavigationRegion3D/Minimap Manager"] [node name="Minimap" type="MeshInstance3D" parent="Minimap Manager"]
unique_name_in_owner = true unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.60688, -2.08931, 0.47202) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.60688, -2.08931, 0.47202)
visible = false visible = false
layers = 2 layers = 2
mesh = SubResource("PlaneMesh_i3uar") mesh = SubResource("PlaneMesh_i3uar")
[node name="Minimap2" type="MeshInstance3D" parent="NavigationRegion3D/Minimap Manager"] [node name="Minimap2" type="MeshInstance3D" parent="Minimap Manager"]
unique_name_in_owner = true unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.51272, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.51272, 0)
layers = 4 layers = 4

428
src/map/dungeon/scenes/TreeRoom.tscn
View File

File diff suppressed because one or more lines are too long

35
src/map/dungeon/scenes/WaterRoom.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=90 format=4 uid="uid://dfpyfpnya0f4u"] [gd_scene load_steps=89 format=4 uid="uid://dfpyfpnya0f4u"]
[ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonRoom3D.gd" id="1_ulct7"] [ext_resource type="Script" path="res://addons/SimpleDungeons/DungeonRoom3D.gd" id="1_ulct7"]
[ext_resource type="Script" path="res://src/map/dungeon/code/DungeonRoom.cs" id="2_7yem4"] [ext_resource type="Script" path="res://src/map/dungeon/code/DungeonRoom.cs" id="2_7yem4"]
@@ -1013,10 +1013,6 @@ data = PackedVector3Array(-1, -1, 1, -1, 1, -1, -1, 1, 1, -1, -1, 1, -1, -1, -1,
[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_7ueaq"] [sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_7ueaq"]
data = PackedVector3Array(-1, -1, 1, -1, 1, -1, -1, 1, 1, -1, -1, 1, -1, -1, -1, -1, 1, -1, -1, -1, -1, 1, 1, -1, -1, 1, -1, -1, -1, -1, 1, -1, -1, 1, 1, -1, 1, -1, -1, 1, 1, 1, 1, 1, -1, 1, -1, -1, 1, -1, 1, 1, 1, 1, 1, -1, 1, -1, 1, 1, 1, 1, 1, 1, -1, 1, -1, -1, 1, -1, 1, 1, -1, -1, -1, 1, -1, 1, 1, -1, -1, -1, -1, -1, -1, -1, 1, 1, -1, 1, 1, 1, -1, -1, 1, 1, -1, 1, -1, 1, 1, -1, 1, 1, 1, -1, 1, 1) data = PackedVector3Array(-1, -1, 1, -1, 1, -1, -1, 1, 1, -1, -1, 1, -1, -1, -1, -1, 1, -1, -1, -1, -1, 1, 1, -1, -1, 1, -1, -1, -1, -1, 1, -1, -1, 1, 1, -1, 1, -1, -1, 1, 1, 1, 1, 1, -1, 1, -1, -1, 1, -1, 1, 1, 1, 1, 1, -1, 1, -1, 1, 1, 1, 1, 1, 1, -1, 1, -1, -1, 1, -1, 1, 1, -1, -1, -1, 1, -1, 1, 1, -1, -1, -1, -1, -1, -1, -1, 1, 1, -1, 1, 1, 1, -1, -1, 1, 1, -1, 1, -1, 1, 1, -1, 1, 1, 1, -1, 1, 1)
[sub_resource type="NavigationMesh" id="NavigationMesh_fdmck"]
vertices = PackedVector3Array(9, -1.60156, -16.25, 9.25, -1.60156, -14.5, 13.5, -1.60156, -14.75, 13.5, -1.60156, -23.5, -13.5, -1.60156, -14, -9.5, -1.60156, -14, -9.25, -1.60156, -16.25, -13.5, -1.60156, -23.5, -8.5, 3.14844, -15.25, -8.5, 3.14844, -4.5, 8.25, 3.14844, -4.5, 8.25, 3.14844, -15.25, -8.25, -1.60156, -15, -8.25, -1.60156, -4.75, 8, -1.60156, -4.75, 8, -1.60156, -15, 9.25, -1.60156, -5.25, 13.5, -1.60156, -5, -13.5, -1.60156, -5.75, -9.5, -1.60156, -5.75, 9.5, -1.60156, 3.75, 9.75, -1.60156, 5.5, 13.5, -1.60156, 5.25, 9, -1.60156, -3.5, -8.75, -1.60156, 3.75, -9.25, -1.60156, -3.5, -13.5, -1.60156, 6, -9, -1.60156, 6, -8, 3.14844, 4.75, -8, 3.14844, 15.75, 8.75, 3.14844, 15.75, 8.75, 3.14844, 4.75, -7.75, -1.60156, 5, -7.75, -1.60156, 15.5, 8.5, -1.60156, 15.5, 8.5, -1.60156, 5, 9.75, -1.60156, 15, 13.5, -1.60156, 15.25, -13.5, -1.60156, 14.5, -9, -1.60156, 14.5, 9.5, -1.60156, 16.75, 13.5, -1.60156, 23.5, -8.75, -1.60156, 16.75, -13.5, -1.60156, 23.5)
polygons = [PackedInt32Array(1, 0, 2), PackedInt32Array(2, 0, 3), PackedInt32Array(5, 4, 6), PackedInt32Array(6, 4, 7), PackedInt32Array(6, 7, 0), PackedInt32Array(0, 7, 3), PackedInt32Array(11, 10, 8), PackedInt32Array(8, 10, 9), PackedInt32Array(15, 14, 12), PackedInt32Array(12, 14, 13), PackedInt32Array(1, 2, 16), PackedInt32Array(16, 2, 17), PackedInt32Array(4, 5, 18), PackedInt32Array(18, 5, 19), PackedInt32Array(21, 20, 22), PackedInt32Array(22, 20, 23), PackedInt32Array(22, 23, 16), PackedInt32Array(22, 16, 17), PackedInt32Array(25, 23, 24), PackedInt32Array(24, 23, 20), PackedInt32Array(19, 25, 18), PackedInt32Array(18, 25, 24), PackedInt32Array(18, 24, 27), PackedInt32Array(18, 27, 26), PackedInt32Array(31, 30, 28), PackedInt32Array(28, 30, 29), PackedInt32Array(35, 34, 32), PackedInt32Array(32, 34, 33), PackedInt32Array(21, 22, 36), PackedInt32Array(36, 22, 37), PackedInt32Array(26, 27, 38), PackedInt32Array(38, 27, 39), PackedInt32Array(36, 37, 40), PackedInt32Array(40, 37, 41), PackedInt32Array(39, 42, 38), PackedInt32Array(38, 42, 43), PackedInt32Array(40, 41, 42), PackedInt32Array(42, 41, 43)]
[sub_resource type="PlaneMesh" id="PlaneMesh_7cap0"] [sub_resource type="PlaneMesh" id="PlaneMesh_7cap0"]
material = ExtResource("24_w0ing") material = ExtResource("24_w0ing")
size = Vector2(28, 48) size = Vector2(28, 48)
@@ -1040,8 +1036,6 @@ size_in_voxels = Vector3i(7, 1, 12)
voxel_scale = Vector3(4, 4, 4) voxel_scale = Vector3(4, 4, 4)
min_count = 1 min_count = 1
max_count = 2 max_count = 2
show_debug_in_game = true
show_grid_aabb_with_doors = true
[node name="Water Room" type="Node3D" parent="."] [node name="Water Room" type="Node3D" parent="."]
script = ExtResource("2_7yem4") script = ExtResource("2_7yem4")
@@ -1205,41 +1199,38 @@ unique_name_in_owner = true
unique_name_in_owner = true unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.606, -1.41305, -0.292998) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.606, -1.41305, -0.292998)
[node name="NavigationRegion3D" type="NavigationRegion3D" parent="."] [node name="Minimap Manager" type="Area3D" parent="."]
navigation_mesh = SubResource("NavigationMesh_fdmck")
[node name="Minimap Manager" type="Area3D" parent="NavigationRegion3D"]
collision_layer = 512 collision_layer = 512
collision_mask = 512 collision_mask = 512
script = ExtResource("28_txiha") script = ExtResource("28_txiha")
[node name="Minimap" type="MeshInstance3D" parent="NavigationRegion3D/Minimap Manager"] [node name="Minimap" type="MeshInstance3D" parent="Minimap Manager"]
unique_name_in_owner = true unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.9475, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.9475, 0)
visible = false visible = false
layers = 2 layers = 2
mesh = SubResource("PlaneMesh_7cap0") mesh = SubResource("PlaneMesh_7cap0")
skeleton = NodePath("../../..") skeleton = NodePath("../..")
[node name="Minimap2" type="MeshInstance3D" parent="NavigationRegion3D/Minimap Manager"] [node name="Minimap2" type="MeshInstance3D" parent="Minimap Manager"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.9475, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.9475, 0)
layers = 4 layers = 4
mesh = SubResource("PlaneMesh_7cap0") mesh = SubResource("PlaneMesh_7cap0")
skeleton = NodePath("../../..") skeleton = NodePath("../..")
[node name="CollisionShape3D" type="CollisionShape3D" parent="NavigationRegion3D/Minimap Manager"] [node name="CollisionShape3D" type="CollisionShape3D" parent="Minimap Manager"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.112244, 1.94617, 0.398682) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.112244, 1.94617, 0.398682)
shape = SubResource("BoxShape3D_t77b8") shape = SubResource("BoxShape3D_t77b8")
[node name="CSGBox3D2" type="CSGBox3D" parent="NavigationRegion3D"] [node name="CSGBox3D2" type="CSGBox3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.399957, -0.524414, 10.1981) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.193875, -0.524414, 10.1829)
layers = 4 layers = 4
size = Vector3(17.47, 6.6543, 11.6916) size = Vector3(18.3369, 6.6543, 12.5115)
[node name="CSGBox3D3" type="CSGBox3D" parent="NavigationRegion3D"] [node name="CSGBox3D3" type="CSGBox3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.059001, -0.524414, -9.88196) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0993766, -0.524414, -10.1295)
layers = 4 layers = 4
size = Vector3(17.47, 6.6543, 11.5963) size = Vector3(19.2304, 6.6543, 13.5585)
[node name="RemoveUnusedDoors" type="Node" parent="."] [node name="RemoveUnusedDoors" type="Node" parent="."]
script = ExtResource("26_c86xl") script = ExtResource("26_c86xl")

5
src/player/Player.cs
View File

@@ -179,11 +179,6 @@ namespace GameJamDungeon
if (@event.IsActionPressed(GameInputs.Attack)) if (@event.IsActionPressed(GameInputs.Attack))
PlayerLogic.Input(new PlayerLogic.Input.Attack()); PlayerLogic.Input(new PlayerLogic.Input.Attack());
if (@event.IsActionPressed(GameInputs.Sprint))
Settings.MoveSpeed *= 4;
if (@event.IsActionReleased(GameInputs.Sprint))
Settings.MoveSpeed /= 4;
} }
public void OnPhysicsProcess(double delta) public void OnPhysicsProcess(double delta)

10
src/player/Player.tscn
View File

@@ -11,7 +11,7 @@
[sub_resource type="Resource" id="Resource_btp2w"] [sub_resource type="Resource" id="Resource_btp2w"]
script = ExtResource("2_xq68d") script = ExtResource("2_xq68d")
RotationSpeed = 1.5 RotationSpeed = 1.5
MoveSpeed = 3.0 MoveSpeed = 8.0
Acceleration = 1.0 Acceleration = 1.0
CurrentHP = 100 CurrentHP = 100
MaximumHP = 100 MaximumHP = 100
@@ -99,9 +99,9 @@ step = 0.0833333
[sub_resource type="AnimationLibrary" id="AnimationLibrary_w8l8m"] [sub_resource type="AnimationLibrary" id="AnimationLibrary_w8l8m"]
_data = { _data = {
"RESET": SubResource("Animation_hcjph"), &"RESET": SubResource("Animation_hcjph"),
"attack": SubResource("Animation_0jjwv"), &"attack": SubResource("Animation_0jjwv"),
"explosion": SubResource("Animation_uxo8q") &"explosion": SubResource("Animation_uxo8q")
} }
[sub_resource type="AtlasTexture" id="AtlasTexture_irupf"] [sub_resource type="AtlasTexture" id="AtlasTexture_irupf"]
@@ -387,7 +387,7 @@ omni_attenuation = 0.27
[node name="AnimationPlayer" type="AnimationPlayer" parent="."] [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
unique_name_in_owner = true unique_name_in_owner = true
libraries = { libraries = {
"": SubResource("AnimationLibrary_w8l8m") &"": SubResource("AnimationLibrary_w8l8m")
} }
[node name="HealthTimer" type="Timer" parent="."] [node name="HealthTimer" type="Timer" parent="."]

2
src/player/dont_look_in_here/tendomaya_face20_tex00.png.import
View File

@@ -2,7 +2,7 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://hepeb1q46ybj" uid="uid://brr8uow0xte2o"
path="res://.godot/imported/tendomaya_face20_tex00.png-b681d471a8f5b5fe143eb3e299e00cfc.ctex" path="res://.godot/imported/tendomaya_face20_tex00.png-b681d471a8f5b5fe143eb3e299e00cfc.ctex"
metadata={ metadata={
"vram_texture": false "vram_texture": false

8
src/ui/floor_clear/FloorClearMenu.cs
View File

@@ -51,18 +51,26 @@ public partial class FloorClearMenu : Control, IFloorClearMenu
private void ReturnToHubButton_Pressed() private void ReturnToHubButton_Pressed()
{ {
ContinueButton.Disabled = true;
ReturnToHubButton.Disabled = true;
EmitSignal(SignalName.ReturnToHubWorld); EmitSignal(SignalName.ReturnToHubWorld);
} }
private void ContinueButton_Pressed() private void ContinueButton_Pressed()
{ {
ContinueButton.Disabled = true;
ReturnToHubButton.Disabled = true;
EmitSignal(SignalName.GoToNextFloor); EmitSignal(SignalName.GoToNextFloor);
} }
private void AnimationPlayer_AnimationFinished(StringName animName) private void AnimationPlayer_AnimationFinished(StringName animName)
{ {
if (animName == "fade_in") if (animName == "fade_in")
{
ContinueButton.Disabled = false;
ReturnToHubButton.Disabled = false;
ContinueButton.CallDeferred(MethodName.GrabFocus); ContinueButton.CallDeferred(MethodName.GrabFocus);
}
if (animName == "fade_out") if (animName == "fade_out")
{ {
CallDeferred(MethodName.ReleaseFocus); CallDeferred(MethodName.ReleaseFocus);