Cleanup
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
@startuml AppLogic
|
||||
state "AppLogic State" as GameJamDungeon_AppLogic_State {
|
||||
state "SetupGameScene" as GameJamDungeon_AppLogic_State_SetupGameScene
|
||||
state "InGame" as GameJamDungeon_AppLogic_State_InGame
|
||||
state "LoadingScreen" as GameJamDungeon_AppLogic_State_LoadingScreen
|
||||
state "InGame" as GameJamDungeon_AppLogic_State_InGame
|
||||
state "MainMenu" as GameJamDungeon_AppLogic_State_MainMenu
|
||||
}
|
||||
|
||||
|
||||
@@ -102,6 +102,7 @@ disabled = true
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="PrimaryHitbox"]
|
||||
transform = Transform3D(0.998663, 0.0516911, -2.25949e-09, 0, -4.37114e-08, -1, -0.0516911, 0.998663, -4.3653e-08, 0.176435, 0, -12.0372)
|
||||
visible = false
|
||||
mesh = SubResource("CylinderMesh_xqm7x")
|
||||
|
||||
[node name="SecondaryHitbox" type="Area3D" parent="."]
|
||||
@@ -118,6 +119,7 @@ disabled = true
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="SecondaryHitbox"]
|
||||
transform = Transform3D(0.991132, -0.132879, 5.80834e-09, 0, -4.37114e-08, -1, 0.132879, 0.991132, -4.33238e-08, -6.30106, 0, -0.622331)
|
||||
visible = false
|
||||
mesh = SubResource("CylinderMesh_nveg0")
|
||||
|
||||
[node name="TertiaryHitbox" type="Area3D" parent="."]
|
||||
@@ -134,13 +136,8 @@ disabled = true
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="TertiaryHitbox"]
|
||||
transform = Transform3D(0.995479, 0.0949771, -4.15158e-09, 0, -4.37114e-08, -1, -0.0949771, 0.995479, -4.35138e-08, 6.95263, 0, -1.22368)
|
||||
visible = false
|
||||
mesh = SubResource("CylinderMesh_nc31c")
|
||||
|
||||
[node name="RayCast3D2" type="RayCast3D" parent="."]
|
||||
target_position = Vector3(3, 1, -1.85)
|
||||
|
||||
[node name="RayCast3D" type="RayCast3D" parent="."]
|
||||
target_position = Vector3(-3, 1, -1.85)
|
||||
|
||||
[node name="Rotation" type="Node3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
|
||||
@@ -23,10 +23,6 @@ public partial class EdenPillar : Enemy, IHasPrimaryAttack, IHasSecondaryAttack,
|
||||
|
||||
[Export] public double TertiaryAttackElementalDamageBonus { get; set; } = 1.15f;
|
||||
|
||||
[Node] private IHitbox _primaryHitbox { get; set; } = default!;
|
||||
[Node] private IHitbox _secondaryHitbox { get; set; } = default!;
|
||||
[Node] private IHitbox _tertiaryHitbox { get; set; } = default!;
|
||||
|
||||
[Node] private Node3D _rotation { get; set; } = default!;
|
||||
|
||||
private float _primaryAngle = 0;
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
@startuml EnemyLogic
|
||||
state "EnemyLogic State" as GameJamDungeon_EnemyLogic_State {
|
||||
state "Alive" as GameJamDungeon_EnemyLogic_State_Alive {
|
||||
state "Idle" as GameJamDungeon_EnemyLogic_State_Idle
|
||||
state "Activated" as GameJamDungeon_EnemyLogic_State_Activated {
|
||||
state "Attacking" as GameJamDungeon_EnemyLogic_State_Attacking
|
||||
state "FollowPlayer" as GameJamDungeon_EnemyLogic_State_FollowPlayer
|
||||
state "Patrolling" as GameJamDungeon_EnemyLogic_State_Patrolling
|
||||
state "Attacking" as GameJamDungeon_EnemyLogic_State_Attacking
|
||||
}
|
||||
state "Idle" as GameJamDungeon_EnemyLogic_State_Idle
|
||||
}
|
||||
state "Defeated" as GameJamDungeon_EnemyLogic_State_Defeated
|
||||
}
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
@startuml GameLogic
|
||||
state "GameLogic State" as GameJamDungeon_GameLogic_State {
|
||||
state "GameStarted" as GameJamDungeon_GameLogic_State_GameStarted
|
||||
state "Playing" as GameJamDungeon_GameLogic_State_Playing {
|
||||
state "AskForTeleport" as GameJamDungeon_GameLogic_State_AskForTeleport
|
||||
state "FloorClearedDecisionState" as GameJamDungeon_GameLogic_State_FloorClearedDecisionState
|
||||
state "InventoryOpened" as GameJamDungeon_GameLogic_State_InventoryOpened
|
||||
state "MinimapOpen" as GameJamDungeon_GameLogic_State_MinimapOpen
|
||||
state "Paused" as GameJamDungeon_GameLogic_State_Paused
|
||||
state "FloorClearedDecisionState" as GameJamDungeon_GameLogic_State_FloorClearedDecisionState
|
||||
state "Resuming" as GameJamDungeon_GameLogic_State_Resuming
|
||||
state "Paused" as GameJamDungeon_GameLogic_State_Paused
|
||||
state "InventoryOpened" as GameJamDungeon_GameLogic_State_InventoryOpened
|
||||
}
|
||||
state "GameStarted" as GameJamDungeon_GameLogic_State_GameStarted
|
||||
state "Quit" as GameJamDungeon_GameLogic_State_Quit
|
||||
}
|
||||
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
@startuml PlayerLogic
|
||||
state "PlayerLogic State" as GameJamDungeon_PlayerLogic_State {
|
||||
state "Alive" as GameJamDungeon_PlayerLogic_State_Alive {
|
||||
state "Attacking" as GameJamDungeon_PlayerLogic_State_Attacking
|
||||
state "Idle" as GameJamDungeon_PlayerLogic_State_Idle
|
||||
}
|
||||
state "Dead" as GameJamDungeon_PlayerLogic_State_Dead
|
||||
state "Disabled" as GameJamDungeon_PlayerLogic_State_Disabled
|
||||
state "Dead" as GameJamDungeon_PlayerLogic_State_Dead
|
||||
state "Alive" as GameJamDungeon_PlayerLogic_State_Alive {
|
||||
state "Idle" as GameJamDungeon_PlayerLogic_State_Idle
|
||||
state "Attacking" as GameJamDungeon_PlayerLogic_State_Attacking
|
||||
}
|
||||
}
|
||||
|
||||
GameJamDungeon_PlayerLogic_State_Alive --> GameJamDungeon_PlayerLogic_State_Alive : PhysicsTick
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
[gd_scene load_steps=5 format=3 uid="uid://010r1fbkbooa"]
|
||||
|
||||
[ext_resource type="PackedScene" uid="uid://cfecvvav8kkp6" path="res://src/player/Player.tscn" id="1_7xhku"]
|
||||
[ext_resource type="PackedScene" uid="uid://bksq62muhk3h5" path="res://src/enemy/enemy_types/01. sproingy/Sproingy.tscn" id="2_3keei"]
|
||||
|
||||
[sub_resource type="NavigationMesh" id="NavigationMesh_3keei"]
|
||||
vertices = PackedVector3Array(-2.96237, 1.33137, -10.8745, -1.71237, 1.33137, -10.8745, -1.71237, 1.33137, -22.6245, -5.46237, 1.33137, -9.12453, -21.7124, 1.33137, -6.12453, -6.46237, 1.33137, -6.12453, -21.7124, 1.33137, -22.6245, 3.03763, 1.33137, -7.62453, 3.28763, 1.33137, -6.12453, 10.0376, 1.33137, -6.12453, 1.53763, 1.33137, -9.87453, -0.462372, 1.33137, -10.8745, 10.0376, 1.33137, -22.6245, -1.71237, 1.33137, 9.37547, -1.71237, 1.33137, -1.37453, -2.71237, 1.33137, -1.37453, -5.46237, 1.33137, -3.12453, -21.7124, 1.33137, 9.37547, 1.53763, 1.33137, -2.37453, -0.462372, 1.33137, -1.37453, 10.0376, 1.33137, 9.37547)
|
||||
polygons = [PackedInt32Array(2, 1, 0), PackedInt32Array(2, 0, 3), PackedInt32Array(3, 5, 2), PackedInt32Array(2, 5, 4), PackedInt32Array(2, 4, 6), PackedInt32Array(9, 8, 7), PackedInt32Array(9, 7, 10), PackedInt32Array(10, 11, 9), PackedInt32Array(9, 11, 2), PackedInt32Array(9, 2, 12), PackedInt32Array(11, 1, 2), PackedInt32Array(15, 14, 13), PackedInt32Array(16, 15, 13), PackedInt32Array(16, 13, 5), PackedInt32Array(5, 13, 4), PackedInt32Array(4, 13, 17), PackedInt32Array(18, 8, 9), PackedInt32Array(13, 14, 19), PackedInt32Array(18, 9, 19), PackedInt32Array(19, 9, 13), PackedInt32Array(13, 9, 20)]
|
||||
cell_height = 0.5
|
||||
agent_radius = 3.0
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_3keei"]
|
||||
height = 4.74658
|
||||
radius = 1.71777
|
||||
|
||||
[node name="Node3D" type="Node3D"]
|
||||
|
||||
[node name="Player" parent="." instance=ExtResource("1_7xhku")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.791832, 0)
|
||||
|
||||
[node name="Sproingy" parent="." instance=ExtResource("2_3keei")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.64783, -11.9575)
|
||||
motion_mode = 1
|
||||
|
||||
[node name="NavigationRegion3D" type="NavigationRegion3D" parent="."]
|
||||
navigation_mesh = SubResource("NavigationMesh_3keei")
|
||||
|
||||
[node name="CSGBox3D" type="CSGBox3D" parent="NavigationRegion3D"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.79317, 0, -6.66189)
|
||||
size = Vector3(37.8384, 1, 37.9253)
|
||||
|
||||
[node name="StaticBody3D" type="StaticBody3D" parent="NavigationRegion3D"]
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="NavigationRegion3D/StaticBody3D"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.61432, 1.20466, -6.13947)
|
||||
shape = SubResource("CylinderShape3D_3keei")
|
||||
Reference in New Issue
Block a user