Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 59494f9e98 | |||
| 510246c341 | |||
| b184bcdea5 | |||
| cf52af4237 | |||
| e0fc301414 |
@@ -54,27 +54,12 @@ jobs:
|
|||||||
- name: Import resources and build solution
|
- name: Import resources and build solution
|
||||||
run: |
|
run: |
|
||||||
godot --headless --editor --build-solutions --quit --import --path $PWD
|
godot --headless --editor --build-solutions --quit --import --path $PWD
|
||||||
|
|
||||||
- name: Build Windows
|
- name: Build Windows
|
||||||
run: |
|
run: |
|
||||||
mkdir -v -p build/windows
|
mkdir -v -p build/windows
|
||||||
godot --headless --verbose --build-solutions --export-release "Windows Desktop" build/windows/${{ env.GAME_NAME }}.exe
|
godot --headless --verbose --build-solutions --export-release "Windows Desktop" build/windows/${{ env.GAME_NAME }}.exe
|
||||||
zip -r Windows.zip build/windows
|
zip -r Windows.zip build/windows
|
||||||
- name: Build Windows ARM
|
|
||||||
run: |
|
|
||||||
mkdir -v -p build/windowsArm
|
|
||||||
godot --headless --verbose --build-solutions --export-release "Windows ARM" build/windowsArm/${{ env.GAME_NAME }}.exe
|
|
||||||
zip -r WindowsArm.zip build/windowsArm
|
|
||||||
# - name: Linux Build
|
|
||||||
# run: |
|
|
||||||
# mkdir -v -p build/linux
|
|
||||||
# godot --headless --verbose --export-release "Linux/X11" build/linux/${{ env.GAME_NAME }}.x86_64
|
|
||||||
# zip -r Linux.zip build/linux
|
|
||||||
- name: Mac Build
|
|
||||||
run: |
|
|
||||||
mkdir -v -p build/mac
|
|
||||||
godot --headless --verbose --export-release "macOS" build/mac/${{ env.GAME_NAME }}.zip
|
|
||||||
zip -r Mac.zip build/mac
|
|
||||||
|
|
||||||
- name: Upload to Itch
|
- name: Upload to Itch
|
||||||
uses: KikimoraGames/itch-publish@v0.0.3
|
uses: KikimoraGames/itch-publish@v0.0.3
|
||||||
with:
|
with:
|
||||||
@@ -84,6 +69,12 @@ jobs:
|
|||||||
buildNumber: ${{ needs.BumpTag.outputs.tag_name }}
|
buildNumber: ${{ needs.BumpTag.outputs.tag_name }}
|
||||||
gameData: Windows.zip
|
gameData: Windows.zip
|
||||||
buildChannel: windows
|
buildChannel: windows
|
||||||
|
|
||||||
|
- name: Build Windows ARM
|
||||||
|
run: |
|
||||||
|
mkdir -v -p build/windowsArm
|
||||||
|
godot --headless --verbose --build-solutions --export-release "Windows ARM" build/windowsArm/${{ env.GAME_NAME }}.exe
|
||||||
|
zip -r WindowsArm.zip build/windowsArm
|
||||||
- name: Upload to Itch
|
- name: Upload to Itch
|
||||||
uses: KikimoraGames/itch-publish@v0.0.3
|
uses: KikimoraGames/itch-publish@v0.0.3
|
||||||
with:
|
with:
|
||||||
@@ -93,15 +84,27 @@ jobs:
|
|||||||
buildNumber: ${{ needs.BumpTag.outputs.tag_name }}
|
buildNumber: ${{ needs.BumpTag.outputs.tag_name }}
|
||||||
gameData: WindowsArm.zip
|
gameData: WindowsArm.zip
|
||||||
buildChannel: windows-arm
|
buildChannel: windows-arm
|
||||||
# - name: Upload to Itch
|
|
||||||
# uses: KikimoraGames/itch-publish@v0.0.3
|
- name: Linux Build
|
||||||
# with:
|
run: |
|
||||||
# butlerApiKey: ${{ secrets.BUTLER_TOKEN }}
|
mkdir -v -p build/linux
|
||||||
# itchUsername: ${{ env.ITCHIO_USERNAME }}
|
godot --headless --verbose --export-release "Linux/X11" build/linux/${{ env.GAME_NAME }}.x86_64
|
||||||
# itchGameId: ${{ env.ITCHIO_GAMEID }}
|
zip -r Linux.zip build/linux
|
||||||
# buildNumber: ${{ needs.BumpTag.outputs.tag_name }}
|
- name: Upload to Itch
|
||||||
# gameData: Linux.zip
|
uses: KikimoraGames/itch-publish@v0.0.3
|
||||||
# buildChannel: linux
|
with:
|
||||||
|
butlerApiKey: ${{ secrets.BUTLER_TOKEN }}
|
||||||
|
itchUsername: ${{ env.ITCHIO_USERNAME }}
|
||||||
|
itchGameId: ${{ env.ITCHIO_GAMEID }}
|
||||||
|
buildNumber: ${{ needs.BumpTag.outputs.tag_name }}
|
||||||
|
gameData: Linux.zip
|
||||||
|
buildChannel: linux
|
||||||
|
|
||||||
|
- name: Mac Build
|
||||||
|
run: |
|
||||||
|
mkdir -v -p build/mac
|
||||||
|
godot --headless --verbose --export-release "macOS" build/mac/${{ env.GAME_NAME }}.zip
|
||||||
|
zip -r Mac.zip build/mac
|
||||||
- name: Upload to Itch
|
- name: Upload to Itch
|
||||||
uses: KikimoraGames/itch-publish@v0.0.3
|
uses: KikimoraGames/itch-publish@v0.0.3
|
||||||
with:
|
with:
|
||||||
|
|||||||
@@ -139,7 +139,6 @@ theme_override_constants/margin_bottom = 10
|
|||||||
|
|
||||||
[node name="TutoMoveAndLook" type="VBoxContainer" parent="TutorialController/PanelContainer/MarginContainer"]
|
[node name="TutoMoveAndLook" type="VBoxContainer" parent="TutorialController/PanelContainer/MarginContainer"]
|
||||||
unique_name_in_owner = true
|
unique_name_in_owner = true
|
||||||
visible = false
|
|
||||||
layout_mode = 2
|
layout_mode = 2
|
||||||
theme_override_constants/separation = 0
|
theme_override_constants/separation = 0
|
||||||
|
|
||||||
@@ -375,10 +374,9 @@ shadow_opacity = 0.95
|
|||||||
shadow_blur = 2.435
|
shadow_blur = 2.435
|
||||||
|
|
||||||
[node name="Player" parent="." node_paths=PackedStringArray("TutorialWeaponTarget") instance=ExtResource("1_2vsi6")]
|
[node name="Player" parent="." node_paths=PackedStringArray("TutorialWeaponTarget") instance=ExtResource("1_2vsi6")]
|
||||||
transform = Transform3D(0.054514527, 0, -0.9985129, 0, 1, 0, 0.9985129, 0, 0.054514527, -6, 75.5, -13.5)
|
transform = Transform3D(0.054514527, 0, -0.9985129, 0, 1, 0, 0.9985129, 0, 0.054514527, 0, -132.75, 118)
|
||||||
collision_layer = 17
|
collision_layer = 17
|
||||||
TutorialWeaponTarget = NodePath("../PlacedTutorialWeapon/WeaponLocationTarget")
|
TutorialWeaponTarget = NodePath("../PlacedTutorialWeapon/WeaponLocationTarget")
|
||||||
TutorialDone = true
|
|
||||||
AccelerationAir = 1.5
|
AccelerationAir = 1.5
|
||||||
|
|
||||||
[node name="DebugLayer" type="CanvasLayer" parent="."]
|
[node name="DebugLayer" type="CanvasLayer" parent="."]
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
[gd_scene load_steps=47 format=3 uid="uid://bei4nhkf8lwdo"]
|
[gd_scene load_steps=48 format=3 uid="uid://bei4nhkf8lwdo"]
|
||||||
|
|
||||||
[ext_resource type="Script" uid="uid://bbbrf5ckydfna" path="res://player_controller/Scripts/PlayerController.cs" id="1_poq2x"]
|
[ext_resource type="Script" uid="uid://bbbrf5ckydfna" path="res://player_controller/Scripts/PlayerController.cs" id="1_poq2x"]
|
||||||
|
[ext_resource type="PackedScene" uid="uid://cf3rrgr1imvv4" path="res://scenes/path/path.tscn" id="2_6lejt"]
|
||||||
[ext_resource type="Resource" uid="uid://bl5crtu1gkrtr" path="res://systems/inputs/base_mode/base_mode.tres" id="3_cresl"]
|
[ext_resource type="Resource" uid="uid://bl5crtu1gkrtr" path="res://systems/inputs/base_mode/base_mode.tres" id="3_cresl"]
|
||||||
[ext_resource type="Resource" uid="uid://cpdaw41ah5gic" path="res://systems/inputs/base_mode/rotate_y.tres" id="4_rxwoh"]
|
[ext_resource type="Resource" uid="uid://cpdaw41ah5gic" path="res://systems/inputs/base_mode/rotate_y.tres" id="4_rxwoh"]
|
||||||
[ext_resource type="Resource" uid="uid://ccrb5xsnphc8" path="res://systems/inputs/base_mode/rotate_floorplane.tres" id="5_4u7i3"]
|
[ext_resource type="Resource" uid="uid://ccrb5xsnphc8" path="res://systems/inputs/base_mode/rotate_floorplane.tres" id="5_4u7i3"]
|
||||||
@@ -66,6 +67,7 @@ AccelerationAir = 2.0
|
|||||||
DecelerationAir = 0.1
|
DecelerationAir = 0.1
|
||||||
Weight = 5.0
|
Weight = 5.0
|
||||||
MantleTime = 0.2
|
MantleTime = 0.2
|
||||||
|
MantlePath = ExtResource("2_6lejt")
|
||||||
CoyoteTime = 0.3
|
CoyoteTime = 0.3
|
||||||
SimpleJumpStartVelocity = 8.0
|
SimpleJumpStartVelocity = 8.0
|
||||||
SimpleJumpHangTimeInFrames = 1
|
SimpleJumpHangTimeInFrames = 1
|
||||||
@@ -250,6 +252,7 @@ offset_left = 1524.0
|
|||||||
offset_top = 1.0
|
offset_top = 1.0
|
||||||
offset_right = -8.0
|
offset_right = -8.0
|
||||||
offset_bottom = 1.0
|
offset_bottom = 1.0
|
||||||
|
enabled = false
|
||||||
initial_node_to_watch = NodePath("../StateChart")
|
initial_node_to_watch = NodePath("../StateChart")
|
||||||
|
|
||||||
[node name="UI" type="Control" parent="."]
|
[node name="UI" type="Control" parent="."]
|
||||||
@@ -761,6 +764,12 @@ to = NodePath("../../Running")
|
|||||||
event = &"coyote_expired"
|
event = &"coyote_expired"
|
||||||
delay_in_seconds = "0.0"
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
|
[node name="OnLeaveWall" type="Node" parent="StateChart/Root/Movement/OnWall/RunningCoyoteEnabled"]
|
||||||
|
script = ExtResource("28_n7qhm")
|
||||||
|
to = NodePath("../../../Airborne/CoyoteEnabled")
|
||||||
|
event = &"start_falling"
|
||||||
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
[node name="Running" type="Node" parent="StateChart/Root/Movement/OnWall"]
|
[node name="Running" type="Node" parent="StateChart/Root/Movement/OnWall"]
|
||||||
script = ExtResource("27_34snm")
|
script = ExtResource("27_34snm")
|
||||||
|
|
||||||
@@ -770,6 +779,12 @@ to = NodePath("../../../Jump/SimpleJump")
|
|||||||
event = &"jump"
|
event = &"jump"
|
||||||
delay_in_seconds = "0.0"
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
|
[node name="OnLeaveWall" type="Node" parent="StateChart/Root/Movement/OnWall/Running"]
|
||||||
|
script = ExtResource("28_n7qhm")
|
||||||
|
to = NodePath("../../../Airborne/CoyoteEnabled")
|
||||||
|
event = &"start_falling"
|
||||||
|
delay_in_seconds = "0.0"
|
||||||
|
|
||||||
[connection signal="input_aim_canceled" from="InputController" to="." method="OnInputAimCanceled"]
|
[connection signal="input_aim_canceled" from="InputController" to="." method="OnInputAimCanceled"]
|
||||||
[connection signal="input_aim_down" from="InputController" to="." method="OnInputAimDown"]
|
[connection signal="input_aim_down" from="InputController" to="." method="OnInputAimDown"]
|
||||||
[connection signal="input_aim_pressed" from="InputController" to="." method="OnInputAimPressed"]
|
[connection signal="input_aim_pressed" from="InputController" to="." method="OnInputAimPressed"]
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
[Export(PropertyHint.Range, "0,1,0.01,or_greater")]
|
[Export(PropertyHint.Range, "0,1,0.01,or_greater")]
|
||||||
public float MantleTime { get; set; } = 0.1f;
|
public float MantleTime { get; set; } = 0.1f;
|
||||||
[Export]
|
[Export]
|
||||||
public PackedScene MantlePath { get; set; } = GD.Load<PackedScene>("res://scenes/path/Path.tscn");
|
public PackedScene MantlePath { get; set; }
|
||||||
|
|
||||||
// Jump
|
// Jump
|
||||||
[ExportGroup("Jump")]
|
[ExportGroup("Jump")]
|
||||||
@@ -225,10 +225,12 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
private Transition _onJumpFromWall2;
|
private Transition _onJumpFromWall2;
|
||||||
private Transition _onJumpFromWall3;
|
private Transition _onJumpFromWall3;
|
||||||
private Transition _onMegajumpFromWall;
|
private Transition _onMegajumpFromWall;
|
||||||
|
private Transition _onLeaveWallFromRunCoyote;
|
||||||
|
private Transition _onLeaveWallFromRun;
|
||||||
|
|
||||||
private float _playerHeight;
|
private float _playerHeight;
|
||||||
private float _playerRadius;
|
private float _playerRadius;
|
||||||
private bool _isJumpInputPressed = false;
|
private bool _isJumpInputPressed;
|
||||||
|
|
||||||
private float _lookSensitivityMultiplier = 1.0f;
|
private float _lookSensitivityMultiplier = 1.0f;
|
||||||
private float _mouseSensitivityMultiplier = 1.0f;
|
private float _mouseSensitivityMultiplier = 1.0f;
|
||||||
@@ -319,6 +321,8 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
_onWallHanging = StateChartState.Of(GetNode("StateChart/Root/Movement/OnWall/Hanging"));
|
_onWallHanging = StateChartState.Of(GetNode("StateChart/Root/Movement/OnWall/Hanging"));
|
||||||
_onWallRunning = StateChartState.Of(GetNode("StateChart/Root/Movement/OnWall/Running"));
|
_onWallRunning = StateChartState.Of(GetNode("StateChart/Root/Movement/OnWall/Running"));
|
||||||
_onWallRunningCoyoteEnabled = StateChartState.Of(GetNode("StateChart/Root/Movement/OnWall/RunningCoyoteEnabled"));
|
_onWallRunningCoyoteEnabled = StateChartState.Of(GetNode("StateChart/Root/Movement/OnWall/RunningCoyoteEnabled"));
|
||||||
|
_onLeaveWallFromRun = Transition.Of(GetNode("StateChart/Root/Movement/OnWall/Running/OnLeaveWall"));
|
||||||
|
_onLeaveWallFromRunCoyote = Transition.Of(GetNode("StateChart/Root/Movement/OnWall/RunningCoyoteEnabled/OnLeaveWall"));
|
||||||
// State timers
|
// State timers
|
||||||
_powerCooldownTimer = GetNode<Timer>("PowerCooldown");
|
_powerCooldownTimer = GetNode<Timer>("PowerCooldown");
|
||||||
_timeScaleAimInAirTimer = GetNode<Timer>("TimeScaleAimInAir");
|
_timeScaleAimInAirTimer = GetNode<Timer>("TimeScaleAimInAir");
|
||||||
@@ -411,6 +415,8 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
_onJumpFromWall2.Taken += OnJumpFromWall;
|
_onJumpFromWall2.Taken += OnJumpFromWall;
|
||||||
_onJumpFromWall3.Taken += OnJumpFromWall;
|
_onJumpFromWall3.Taken += OnJumpFromWall;
|
||||||
_onMegajumpFromWall.Taken += OnMegajumpFromWall;
|
_onMegajumpFromWall.Taken += OnMegajumpFromWall;
|
||||||
|
_onLeaveWallFromRun.Taken += OnLeaveWallFromRun;
|
||||||
|
_onLeaveWallFromRunCoyote.Taken += OnLeaveWallFromRun;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetAllowedInputsAll()
|
public void SetAllowedInputsAll()
|
||||||
@@ -538,6 +544,7 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
var newWallNormal = WallHugSystem.WallHugNormal.UnwrapOr(Vector3.Up);
|
var newWallNormal = WallHugSystem.WallHugNormal.UnwrapOr(Vector3.Up);
|
||||||
|
if (newWallNormal.AngleTo(_wallHugStartNormal) > Mathf.Pi/4) return;
|
||||||
_wallHugStartNormal = newWallNormal;
|
_wallHugStartNormal = newWallNormal;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -555,6 +562,11 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
public void OnWallStopped()
|
public void OnWallStopped()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void OnLeaveWallFromRun()
|
||||||
|
{
|
||||||
|
SimpleDashInDirection(Velocity.Normalized());
|
||||||
|
}
|
||||||
|
|
||||||
public void HandleWallHugging(float delta)
|
public void HandleWallHugging(float delta)
|
||||||
{
|
{
|
||||||
@@ -746,6 +758,10 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
}
|
}
|
||||||
|
|
||||||
private Path _mantlePath;
|
private Path _mantlePath;
|
||||||
|
private bool _customMantle;
|
||||||
|
private Transform3D _customMantleStartTransform;
|
||||||
|
private Curve3D _customMantleCurve;
|
||||||
|
private Vector3 _mantleStartPosition;
|
||||||
public void OnMantleStarted()
|
public void OnMantleStarted()
|
||||||
{
|
{
|
||||||
HeadSystem.OnMantle();
|
HeadSystem.OnMantle();
|
||||||
@@ -755,10 +771,13 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
{
|
{
|
||||||
GD.PrintErr("Failed to instantiate MantlePath");
|
GD.PrintErr("Failed to instantiate MantlePath");
|
||||||
return;
|
return;
|
||||||
};
|
}
|
||||||
|
|
||||||
|
var transform = _customMantle ? _customMantleStartTransform : MantleSystem.GlobalTransform;
|
||||||
|
var curve = _customMantle ? _customMantleCurve : MantleSystem.MantleCurve;
|
||||||
GetTree().GetRoot().AddChild(_mantlePath);
|
GetTree().GetRoot().AddChild(_mantlePath);
|
||||||
_mantlePath.Setup(MantleSystem.GlobalTransform, MantleSystem.MantleCurve);
|
_mantlePath.Setup(transform, curve);
|
||||||
|
_mantleStartPosition = GlobalPosition;
|
||||||
|
|
||||||
var tween = GetTree().CreateTween();
|
var tween = GetTree().CreateTween();
|
||||||
tween.SetTrans(Tween.TransitionType.Linear);
|
tween.SetTrans(Tween.TransitionType.Linear);
|
||||||
@@ -772,14 +791,29 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
GlobalPosition = _mantlePath.Target.GlobalPosition;
|
GlobalPosition = _mantlePath.Target.GlobalPosition;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void SimpleDashInDirection(Vector3 direction)
|
||||||
|
{
|
||||||
|
SetVelocity(direction * SimpleDashStrength);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SimpleDash()
|
||||||
|
{
|
||||||
|
SimpleDashInDirection(GetInputGlobalHDirection());
|
||||||
|
}
|
||||||
|
|
||||||
public void MantleFinished()
|
public void MantleFinished()
|
||||||
{
|
{
|
||||||
_mantlePath.Teardown();
|
_mantlePath.Teardown();
|
||||||
var direction = GetInputGlobalHDirection();
|
var isThereMovementInput = GetMoveInput().Length() > 0;
|
||||||
if (direction.Length() > 0)
|
if (isThereMovementInput)
|
||||||
{
|
{
|
||||||
SetVelocity(direction * SimpleDashStrength);
|
// If there's a movement input on Mantle, we dash in the direction the mantle took place
|
||||||
|
var positionDifference = GlobalPosition - _mantleStartPosition;
|
||||||
|
var directionHorizontal = new Vector3(positionDifference.X, 0, positionDifference.Z);
|
||||||
|
SimpleDashInDirection(directionHorizontal.Normalized());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_customMantle = false;
|
||||||
_playerState.SendEvent("grounded");
|
_playerState.SendEvent("grounded");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1034,7 +1068,6 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
}
|
}
|
||||||
|
|
||||||
private Vector3 _preDashVelocity = Vector3.Zero;
|
private Vector3 _preDashVelocity = Vector3.Zero;
|
||||||
|
|
||||||
public void OnAimedDashStarted()
|
public void OnAimedDashStarted()
|
||||||
{
|
{
|
||||||
// Adjusting for player height, where the middle of the capsule should get to the dash location instead of the
|
// Adjusting for player height, where the middle of the capsule should get to the dash location instead of the
|
||||||
@@ -1048,9 +1081,10 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
var dashTween = CreatePositionTween(correctedLocation, AimedDashTime);
|
var dashTween = CreatePositionTween(correctedLocation, AimedDashTime);
|
||||||
// dashTween.TweenMethod(Callable.From<float>(AimedDashTweenOngoing), 0.0f, 1.0f, AimedDashTime);
|
// dashTween.TweenMethod(Callable.From<float>(AimedDashTweenOngoing), 0.0f, 1.0f, AimedDashTime);
|
||||||
dashTween.Finished += AimedDashTweenEnded;
|
dashTween.Finished += AimedDashTweenEnded;
|
||||||
|
|
||||||
_shouldMantleOnDashEnded = DashSystem.ShouldMantle;
|
_customMantle = DashSystem.ShouldMantle;
|
||||||
_mantleLocation = DashSystem.PlannedMantleLocation;
|
_customMantleCurve = DashSystem.MantleSystem.MantleCurve;
|
||||||
|
_customMantleStartTransform = DashSystem.MantleSystem.GlobalTransform;
|
||||||
}
|
}
|
||||||
|
|
||||||
Tween CreatePositionTween(Vector3 targetLocation, float tweenTime)
|
Tween CreatePositionTween(Vector3 targetLocation, float tweenTime)
|
||||||
@@ -1069,6 +1103,13 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
_playerState.SendEvent("dash_finished");
|
_playerState.SendEvent("dash_finished");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void OnAimedDashFinished()
|
||||||
|
{
|
||||||
|
var postDashVelocity = _preDashVelocity.Length() > PostDashSpeed ? PostDashSpeed : _preDashVelocity.Length();
|
||||||
|
Velocity = _dashDirection * postDashVelocity;
|
||||||
|
if (_customMantle) _playerState.SendEvent("mantle");
|
||||||
|
}
|
||||||
|
|
||||||
public void PlaceWeaponForTutorial()
|
public void PlaceWeaponForTutorial()
|
||||||
{
|
{
|
||||||
if (TutorialDone)
|
if (TutorialDone)
|
||||||
@@ -1107,29 +1148,12 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
DashSystem.CollisionNormal);
|
DashSystem.CollisionNormal);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OnAimedDashFinished()
|
|
||||||
{
|
|
||||||
var postDashVelocity = _preDashVelocity.Length() > PostDashSpeed ? PostDashSpeed : _preDashVelocity.Length();
|
|
||||||
Velocity = _dashDirection * postDashVelocity;
|
|
||||||
|
|
||||||
if (_shouldMantleOnDashEnded)
|
|
||||||
{
|
|
||||||
// TODO update post dash mantle
|
|
||||||
// MantleToLocation(_mantleLocation);
|
|
||||||
GD.Print("update post dash mantle");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void OnSimpleDashStarted()
|
public void OnSimpleDashStarted()
|
||||||
{
|
{
|
||||||
if (!_canDash)
|
if (!_canDash)
|
||||||
return;
|
return;
|
||||||
_canDash = false;
|
_canDash = false;
|
||||||
|
SimpleDash();
|
||||||
var dashStrength = SimpleDashStrength;
|
|
||||||
|
|
||||||
var direction = GetInputGlobalHDirection();
|
|
||||||
SetVelocity(direction * dashStrength);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void HandleSimpleDash(float delta)
|
public void HandleSimpleDash(float delta)
|
||||||
|
|||||||
@@ -20,10 +20,10 @@ public partial class DashSystem: Node3D
|
|||||||
|
|
||||||
public bool ShouldMantle { get; set; }
|
public bool ShouldMantle { get; set; }
|
||||||
public Vector3 PlannedMantleLocation { get; set; }
|
public Vector3 PlannedMantleLocation { get; set; }
|
||||||
|
public MantleSystem MantleSystem { get; set; }
|
||||||
|
|
||||||
private Node3D _head;
|
private Node3D _head;
|
||||||
private ShapeCast3D _dashCast3D;
|
private ShapeCast3D _dashCast3D;
|
||||||
private ShapeCast3D _playerCast3D;
|
|
||||||
private Camera3D _camera;
|
private Camera3D _camera;
|
||||||
private Vector3 _dashDirection = Vector3.Zero;
|
private Vector3 _dashDirection = Vector3.Zero;
|
||||||
|
|
||||||
@@ -31,7 +31,6 @@ public partial class DashSystem: Node3D
|
|||||||
private MeshInstance3D _dashDropIndicator;
|
private MeshInstance3D _dashDropIndicator;
|
||||||
private MeshInstance3D _dashDropLocationIndicator;
|
private MeshInstance3D _dashDropLocationIndicator;
|
||||||
|
|
||||||
private MantleSystem _mantleSystem;
|
|
||||||
private MeshInstance3D _dashTarget;
|
private MeshInstance3D _dashTarget;
|
||||||
private CpuParticles3D _dashIndicator;
|
private CpuParticles3D _dashIndicator;
|
||||||
private AnimationPlayer _dashIndicatorAnim;
|
private AnimationPlayer _dashIndicatorAnim;
|
||||||
@@ -47,9 +46,6 @@ public partial class DashSystem: Node3D
|
|||||||
public delegate void DashProgressEventHandler(float progress);
|
public delegate void DashProgressEventHandler(float progress);
|
||||||
|
|
||||||
private Vector3 _globalDashPosition = Vector3.Zero;
|
private Vector3 _globalDashPosition = Vector3.Zero;
|
||||||
|
|
||||||
private float _playerHeight;
|
|
||||||
private float _playerRadius;
|
|
||||||
|
|
||||||
public float DashCastRadius { get; set; }
|
public float DashCastRadius { get; set; }
|
||||||
|
|
||||||
@@ -65,16 +61,11 @@ public partial class DashSystem: Node3D
|
|||||||
_dashDropLocationIndicator = GetNode<MeshInstance3D>("DashDropLocationIndicator");
|
_dashDropLocationIndicator = GetNode<MeshInstance3D>("DashDropLocationIndicator");
|
||||||
_dashDropLocationIndicator.Visible = false;
|
_dashDropLocationIndicator.Visible = false;
|
||||||
|
|
||||||
_playerCast3D = GetNode<ShapeCast3D>("PlayerShapeCast3D");
|
|
||||||
var playerShape = _playerCast3D.GetShape() as CapsuleShape3D;
|
|
||||||
_playerHeight = playerShape!.Height;
|
|
||||||
_playerRadius = playerShape!.Radius;
|
|
||||||
|
|
||||||
_head = head;
|
_head = head;
|
||||||
_camera = camera;
|
_camera = camera;
|
||||||
|
|
||||||
_mantleSystem = GetNode<MantleSystem>("MantleSystem");
|
MantleSystem = GetNode<MantleSystem>("MantleSystem");
|
||||||
_mantleSystem.Init();
|
MantleSystem.Init();
|
||||||
|
|
||||||
_dashTarget = GetNode<MeshInstance3D>("DashTarget");
|
_dashTarget = GetNode<MeshInstance3D>("DashTarget");
|
||||||
_dashTarget.SetVisible(false);
|
_dashTarget.SetVisible(false);
|
||||||
@@ -109,14 +100,15 @@ public partial class DashSystem: Node3D
|
|||||||
|
|
||||||
(HasHit, PlannedLocation, CollisionPoint, CollisionNormal) = ComputeDashLocation();
|
(HasHit, PlannedLocation, CollisionPoint, CollisionNormal) = ComputeDashLocation();
|
||||||
|
|
||||||
ShouldMantle = false;
|
// TODO: Position mantle system to planned location, aligned with ground planned and facing the same way as the dash
|
||||||
var mantleLocation = Vector3.Zero;
|
// Then query it being careful when dashing underneath a platform and such
|
||||||
if (HasHit && Mathf.Abs(CollisionNormal.Y) < 0.5f)
|
MantleSystem.SetGlobalPosition(PlannedLocation);
|
||||||
{
|
MantleSystem.SetRotation(new Vector3(
|
||||||
var mantleResult = _mantleSystem.FindMantleLocationAtPoint(PlannedLocation, CollisionNormal);
|
MantleSystem.Rotation.X,
|
||||||
ShouldMantle = mantleResult.IsSome(out mantleLocation);
|
_head.Rotation.Y,
|
||||||
}
|
MantleSystem.Rotation.Z));
|
||||||
PlannedMantleLocation = mantleLocation;
|
MantleSystem.ProcessMantle(false);
|
||||||
|
ShouldMantle = MantleSystem.IsMantlePossible;
|
||||||
|
|
||||||
// Setup dash target
|
// Setup dash target
|
||||||
var targetColor = HasHit ? new Color(1f, 0.2f, 0.2f) : new Color(1f, 1f, 1f);
|
var targetColor = HasHit ? new Color(1f, 0.2f, 0.2f) : new Color(1f, 1f, 1f);
|
||||||
@@ -124,7 +116,7 @@ public partial class DashSystem: Node3D
|
|||||||
var targetMaterial = (StandardMaterial3D) _dashTarget.GetSurfaceOverrideMaterial(0);
|
var targetMaterial = (StandardMaterial3D) _dashTarget.GetSurfaceOverrideMaterial(0);
|
||||||
targetMaterial.SetAlbedo(targetColor);
|
targetMaterial.SetAlbedo(targetColor);
|
||||||
_dashTarget.SetVisible(true);
|
_dashTarget.SetVisible(true);
|
||||||
var targetLocation = ShouldMantle ? PlannedMantleLocation : PlannedLocation;
|
var targetLocation = ShouldMantle ? MantleSystem.FirstMantleProfilePoint : PlannedLocation;
|
||||||
_dashTarget.SetGlobalPosition(targetLocation);
|
_dashTarget.SetGlobalPosition(targetLocation);
|
||||||
|
|
||||||
var shouldShowDropIndicator = !HasHit && !ShouldMantle;
|
var shouldShowDropIndicator = !HasHit && !ShouldMantle;
|
||||||
@@ -160,6 +152,5 @@ public partial class DashSystem: Node3D
|
|||||||
public void StartPreparingDash()
|
public void StartPreparingDash()
|
||||||
{
|
{
|
||||||
_dashTarget.SetVisible(true);
|
_dashTarget.SetVisible(true);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
[gd_scene load_steps=10 format=3 uid="uid://cqduhd4opgwvm"]
|
[gd_scene load_steps=9 format=3 uid="uid://cqduhd4opgwvm"]
|
||||||
|
|
||||||
[ext_resource type="Script" uid="uid://dwoppk8j5fxeg" path="res://systems/dash/DashSystem.cs" id="1_hwig2"]
|
[ext_resource type="Script" uid="uid://dwoppk8j5fxeg" path="res://systems/dash/DashSystem.cs" id="1_hwig2"]
|
||||||
[ext_resource type="Shape3D" uid="uid://keseacdcooot" path="res://player_controller/resources/PlayerShape.tres" id="2_jngg2"]
|
|
||||||
[ext_resource type="PackedScene" uid="uid://wq1okogkhc5l" path="res://systems/mantle/mantle_system.tscn" id="2_pff7b"]
|
[ext_resource type="PackedScene" uid="uid://wq1okogkhc5l" path="res://systems/mantle/mantle_system.tscn" id="2_pff7b"]
|
||||||
[ext_resource type="PackedScene" uid="uid://hd0868f4pb63" path="res://systems/dash/dash_indicator.tscn" id="2_tqt6i"]
|
[ext_resource type="PackedScene" uid="uid://hd0868f4pb63" path="res://systems/dash/dash_indicator.tscn" id="2_tqt6i"]
|
||||||
|
|
||||||
@@ -24,16 +23,8 @@ outer_radius = 0.5
|
|||||||
script = ExtResource("1_hwig2")
|
script = ExtResource("1_hwig2")
|
||||||
DashIndicatorScene = ExtResource("2_tqt6i")
|
DashIndicatorScene = ExtResource("2_tqt6i")
|
||||||
|
|
||||||
[node name="PlayerShapeCast3D" type="ShapeCast3D" parent="."]
|
|
||||||
visible = false
|
|
||||||
shape = ExtResource("2_jngg2")
|
|
||||||
target_position = Vector3(0, 0, 0)
|
|
||||||
collision_mask = 2
|
|
||||||
debug_shape_custom_color = Color(0.863327, 0.636844, 0, 1)
|
|
||||||
|
|
||||||
[node name="DashCast3D" type="ShapeCast3D" parent="."]
|
[node name="DashCast3D" type="ShapeCast3D" parent="."]
|
||||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.6, 0)
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.6, 0)
|
||||||
visible = false
|
|
||||||
shape = SubResource("SphereShape3D_jngg2")
|
shape = SubResource("SphereShape3D_jngg2")
|
||||||
target_position = Vector3(0, 0, -12)
|
target_position = Vector3(0, 0, -12)
|
||||||
max_results = 1
|
max_results = 1
|
||||||
@@ -42,7 +33,6 @@ debug_shape_custom_color = Color(0.911631, 0.11884, 0.656218, 1)
|
|||||||
|
|
||||||
[node name="DashCastDrop" type="ShapeCast3D" parent="."]
|
[node name="DashCastDrop" type="ShapeCast3D" parent="."]
|
||||||
transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, 0, 1.6, 0)
|
transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, 0, 1.6, 0)
|
||||||
visible = false
|
|
||||||
shape = SubResource("SphereShape3D_jngg2")
|
shape = SubResource("SphereShape3D_jngg2")
|
||||||
target_position = Vector3(0, 0, -50)
|
target_position = Vector3(0, 0, -50)
|
||||||
max_results = 1
|
max_results = 1
|
||||||
@@ -54,7 +44,6 @@ mesh = SubResource("SphereMesh_qu4wy")
|
|||||||
surface_material_override/0 = SubResource("StandardMaterial3D_v31n3")
|
surface_material_override/0 = SubResource("StandardMaterial3D_v31n3")
|
||||||
|
|
||||||
[node name="MantleSystem" parent="." instance=ExtResource("2_pff7b")]
|
[node name="MantleSystem" parent="." instance=ExtResource("2_pff7b")]
|
||||||
visible = false
|
|
||||||
MantleEndLocationDistanceFromWall = 0.25
|
MantleEndLocationDistanceFromWall = 0.25
|
||||||
MantleHeightCastStart = 2.0
|
MantleHeightCastStart = 2.0
|
||||||
|
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ public partial class MantleSystem: Node3D
|
|||||||
private ShapeCast3D _inAirWallDetect;
|
private ShapeCast3D _inAirWallDetect;
|
||||||
private ShapeCast3D _groundedWallDetect;
|
private ShapeCast3D _groundedWallDetect;
|
||||||
public Curve3D MantleCurve { get; private set; }
|
public Curve3D MantleCurve { get; private set; }
|
||||||
|
public Vector3 FirstMantleProfilePoint { get; private set; } = Vector3.Zero;
|
||||||
|
|
||||||
public bool IsMantlePossible { get; private set; } = false;
|
public bool IsMantlePossible { get; private set; } = false;
|
||||||
public const int WallProfileCastCount = 7;
|
public const int WallProfileCastCount = 7;
|
||||||
@@ -86,6 +87,7 @@ public partial class MantleSystem: Node3D
|
|||||||
if (isCollisionSameAsTarget || isCollidingWithWall) continue;
|
if (isCollisionSameAsTarget || isCollidingWithWall) continue;
|
||||||
|
|
||||||
// We have a valid collision
|
// We have a valid collision
|
||||||
|
if (!hasFirstProfileHit) FirstMantleProfilePoint = profilePoint;
|
||||||
hasFirstProfileHit = true;
|
hasFirstProfileHit = true;
|
||||||
MantleCurve.AddPoint(ToLocal(profilePoint));
|
MantleCurve.AddPoint(ToLocal(profilePoint));
|
||||||
}
|
}
|
||||||
@@ -93,34 +95,4 @@ public partial class MantleSystem: Node3D
|
|||||||
|
|
||||||
IsMantlePossible = true;
|
IsMantlePossible = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Option<Vector3> FindMantle()
|
|
||||||
{
|
|
||||||
if (!_wallInFrontCast3D.IsColliding())
|
|
||||||
{
|
|
||||||
return Option<Vector3>.None;
|
|
||||||
}
|
|
||||||
if (_wallInFrontCast3D.GetCollisionNormal(0).Y > 0.8f)
|
|
||||||
{
|
|
||||||
return Option<Vector3>.None;
|
|
||||||
}
|
|
||||||
|
|
||||||
var collisionPoint = _wallInFrontCast3D.GetCollisionPoint(0);
|
|
||||||
var collisionNormal = _wallInFrontCast3D.GetCollisionNormal(0);
|
|
||||||
return FindMantleLocationAtPoint(collisionPoint, collisionNormal);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Option<Vector3> FindMantleLocationAtPoint(Vector3 point, Vector3 wallNormal)
|
|
||||||
{
|
|
||||||
var horizontalEndLocation = point - wallNormal * MantleEndLocationDistanceFromWall;
|
|
||||||
var shapeCastStartLocation = horizontalEndLocation + Vector3.Up * MantleHeightCastStart;
|
|
||||||
|
|
||||||
_mantleCast3D.SetGlobalPosition(shapeCastStartLocation);
|
|
||||||
var targetLocation = Vector3.Down * MantleHeightCastStart + Vector3.Up * MaxStepHeight;
|
|
||||||
_mantleCast3D.SetTargetPosition(targetLocation);
|
|
||||||
|
|
||||||
if (_mantleCast3D.IsColliding() && _mantleCast3D.GetCollisionNormal(0).Y >= 0.1f)
|
|
||||||
return Option.Some(_mantleCast3D.GetCollisionPoint(0));
|
|
||||||
return Option<Vector3>.None;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user