Small Tweaks

This commit is contained in:
Bobby Lucero 2025-04-25 21:53:24 -04:00
parent 932e59001c
commit 8432ffa70a
7 changed files with 25 additions and 21 deletions

View File

@ -5,6 +5,7 @@
<RootNamespace>DungeonRPG</RootNamespace> <RootNamespace>DungeonRPG</RootNamespace>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Folder Include="Scenes\Characters\Player\" />
<Folder Include="Scripts\Characters\" /> <Folder Include="Scripts\Characters\" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -7,5 +7,6 @@ public partial class Rotator : Node3D
public override void _PhysicsProcess(double delta) public override void _PhysicsProcess(double delta)
{ {
RotateX((float)double.DegreesToRadians(DegreesPerSecond * delta)); RotateX((float)double.DegreesToRadians(DegreesPerSecond * delta));
RotateY((float)double.DegreesToRadians(-DegreesPerSecond * delta));
} }
} }

View File

@ -1,4 +1,4 @@
[gd_scene load_steps=3 format=3 uid="uid://r4qmbacdajgn"] [gd_scene load_steps=3 format=3 uid="uid://2xh50i250cem"]
[ext_resource type="ArrayMesh" uid="uid://dbdbtphrsi40l" path="res://Scenes/Characters/Player/Meshes/Bodies/body_mesh1.tres" id="1_jboy5"] [ext_resource type="ArrayMesh" uid="uid://dbdbtphrsi40l" path="res://Scenes/Characters/Player/Meshes/Bodies/body_mesh1.tres" id="1_jboy5"]

View File

@ -4,9 +4,9 @@
[ext_resource type="Script" uid="uid://ub5yibhvkvll" path="res://Scripts/Characters/Player3D/Player3DIdleState.cs" id="3_oibqp"] [ext_resource type="Script" uid="uid://ub5yibhvkvll" path="res://Scripts/Characters/Player3D/Player3DIdleState.cs" id="3_oibqp"]
[ext_resource type="Script" uid="uid://urie4d0uetce" path="res://Scripts/Characters/Player3D/Player3DMoveState.cs" id="4_wc5rv"] [ext_resource type="Script" uid="uid://urie4d0uetce" path="res://Scripts/Characters/Player3D/Player3DMoveState.cs" id="4_wc5rv"]
[ext_resource type="Script" uid="uid://cb0c8vuiammcv" path="res://Scripts/Characters/Player3D/Player3DDashState.cs" id="5_b2nck"] [ext_resource type="Script" uid="uid://cb0c8vuiammcv" path="res://Scripts/Characters/Player3D/Player3DDashState.cs" id="5_b2nck"]
[ext_resource type="Script" uid="uid://l5rtu2vhg130" path="res://Scenes/Characters/Player/CharacterMeshSwapper.cs" id="6_b2nck"] [ext_resource type="PackedScene" uid="uid://2xh50i250cem" path="res://Scenes/Characters/Player/Meshes/Bodies/body_mesh1.tscn" id="7_lkoro"]
[ext_resource type="PackedScene" uid="uid://r4qmbacdajgn" path="res://Scenes/Characters/Player/Meshes/Bodies/body_mesh1.tscn" id="7_lkoro"]
[ext_resource type="PackedScene" uid="uid://cik28hgcmhrw" path="res://Scenes/Characters/Player/Meshes/Heads/head_mesh1.tscn" id="8_8hk78"] [ext_resource type="PackedScene" uid="uid://cik28hgcmhrw" path="res://Scenes/Characters/Player/Meshes/Heads/head_mesh1.tscn" id="8_8hk78"]
[ext_resource type="Script" uid="uid://l5rtu2vhg130" path="res://Scripts/Characters/Player/CharacterMeshSwapper.cs" id="8_b2nck"]
[ext_resource type="ArrayMesh" uid="uid://dbdbtphrsi40l" path="res://Scenes/Characters/Player/Meshes/Bodies/body_mesh1.tres" id="9_yrqmf"] [ext_resource type="ArrayMesh" uid="uid://dbdbtphrsi40l" path="res://Scenes/Characters/Player/Meshes/Bodies/body_mesh1.tres" id="9_yrqmf"]
[ext_resource type="ArrayMesh" uid="uid://dw2nrysuy6jk1" path="res://Scenes/Characters/Player/Meshes/Bodies/body_mesh2.tres" id="10_co62p"] [ext_resource type="ArrayMesh" uid="uid://dw2nrysuy6jk1" path="res://Scenes/Characters/Player/Meshes/Bodies/body_mesh2.tres" id="10_co62p"]
[ext_resource type="ArrayMesh" uid="uid://bj18tfmf3t6xp" path="res://Scenes/Characters/Player/Meshes/Heads/head_mesh2.tres" id="10_w60ra"] [ext_resource type="ArrayMesh" uid="uid://bj18tfmf3t6xp" path="res://Scenes/Characters/Player/Meshes/Heads/head_mesh2.tres" id="10_w60ra"]
@ -2657,7 +2657,7 @@ script = ExtResource("1_oibqp")
AnimationPlayer = NodePath("character-male-b2/AnimationPlayer") AnimationPlayer = NodePath("character-male-b2/AnimationPlayer")
PlayerBody = NodePath("character-male-b2") PlayerBody = NodePath("character-male-b2")
StateMachine = NodePath("StateMachine") StateMachine = NodePath("StateMachine")
MeshSwapper = NodePath("character-male-b2/character-male-b/MeshHandler") MeshSwapper = NodePath("MeshHandler")
[node name="StateMachine" type="Node" parent="." node_paths=PackedStringArray("currentState", "states")] [node name="StateMachine" type="Node" parent="." node_paths=PackedStringArray("currentState", "states")]
script = ExtResource("38_jbp7m") script = ExtResource("38_jbp7m")
@ -2738,14 +2738,14 @@ bones/6/scale = Vector3(1, 1, 1)
[node name="head-mesh" parent="character-male-b2/character-male-b/Skeleton3D" instance=ExtResource("8_8hk78")] [node name="head-mesh" parent="character-male-b2/character-male-b/Skeleton3D" instance=ExtResource("8_8hk78")]
[node name="MeshHandler" type="MeshInstance3D" parent="character-male-b2/character-male-b" node_paths=PackedStringArray("_currentHead", "_currentBody")]
script = ExtResource("6_b2nck")
_availableHeads = Array[ArrayMesh]([ExtResource("15_co62p"), ExtResource("10_w60ra"), ExtResource("11_lbkw5"), ExtResource("12_mnp53"), ExtResource("13_sreio"), ExtResource("14_054jv")])
_availableBodies = Array[ArrayMesh]([ExtResource("9_yrqmf"), ExtResource("10_co62p"), ExtResource("11_foox8"), ExtResource("12_hp3ne"), ExtResource("13_e4hnl"), ExtResource("14_sxgxv")])
_currentHead = NodePath("../Skeleton3D/head-mesh")
_currentBody = NodePath("../Skeleton3D/body-mesh")
[node name="AnimationPlayer" type="AnimationPlayer" parent="character-male-b2"] [node name="AnimationPlayer" type="AnimationPlayer" parent="character-male-b2"]
libraries = { libraries = {
&"": SubResource("AnimationLibrary_2dobl") &"": SubResource("AnimationLibrary_2dobl")
} }
[node name="MeshHandler" type="Node3D" parent="." node_paths=PackedStringArray("_currentHead", "_currentBody")]
script = ExtResource("8_b2nck")
_availableHeads = Array[ArrayMesh]([ExtResource("15_co62p"), ExtResource("10_w60ra"), ExtResource("11_lbkw5"), ExtResource("12_mnp53"), ExtResource("13_sreio"), ExtResource("14_054jv")])
_availableBodies = Array[ArrayMesh]([ExtResource("9_yrqmf"), ExtResource("10_co62p"), ExtResource("11_foox8"), ExtResource("12_hp3ne"), ExtResource("13_e4hnl"), ExtResource("14_sxgxv")])
_currentHead = NodePath("../character-male-b2/character-male-b/Skeleton3D/head-mesh")
_currentBody = NodePath("../character-male-b2/character-male-b/Skeleton3D/body-mesh")

View File

@ -867,10 +867,13 @@ _surfaces = [{
}] }]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_xk6uj"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_xk6uj"]
albedo_color = Color(1, 0.29, 0.29, 1) albedo_color = Color(0, 0.664391, 0.697567, 1)
metallic = 0.78 metallic = 0.78
metallic_specular = 0.0 metallic_specular = 0.0
roughness = 0.29 roughness = 0.32
emission_enabled = true
emission = Color(0.421682, 0.702952, 0.462485, 1)
emission_energy_multiplier = 8.76
[sub_resource type="TorusMesh" id="TorusMesh_jcv0k"] [sub_resource type="TorusMesh" id="TorusMesh_jcv0k"]
material = SubResource("StandardMaterial3D_xk6uj") material = SubResource("StandardMaterial3D_xk6uj")
@ -1362,16 +1365,16 @@ texel_scale = 2.0
generate_probes_subdiv = 3 generate_probes_subdiv = 3
light_data = ExtResource("49_46rbj") light_data = ExtResource("49_46rbj")
[node name="Player3D" parent="." instance=ExtResource("50_xk6uj")]
transform = Transform3D(2.49511, 0, 0, 0, 2.49511, 0, 0, 0, 2.49511, -3.9163, 1.05283, 3.60179)
[node name="Camera3D" type="Camera3D" parent="Player3D"]
transform = Transform3D(0.400784, 0, 0, 0, 0.374249, 0.143406, 0, -0.143406, 0.374249, 0.0480828, 1.31404, 1.77274)
[node name="Node3D" type="Node3D" parent="."] [node name="Node3D" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 0.671837, -0.740699, 0, 0.740699, 0.671837, -5.44154, 2.73406, 0) transform = Transform3D(1.06859, 0, 0, 0, 0.71792, -0.791505, 0, 0.791505, 0.71792, -10.5758, 3.77494, 3.60179)
script = ExtResource("50_xe80s") script = ExtResource("50_xe80s")
DegreesPerSecond = 180.0 DegreesPerSecond = 180.0
[node name="MeshInstance3D" type="MeshInstance3D" parent="Node3D"] [node name="MeshInstance3D" type="MeshInstance3D" parent="Node3D"]
mesh = SubResource("TorusMesh_jcv0k") mesh = SubResource("TorusMesh_jcv0k")
[node name="Player3D" parent="." instance=ExtResource("50_xk6uj")]
transform = Transform3D(2.49511, 0, 0, 0, 2.49511, 0, 0, 0, 2.49511, -3.9163, 1.21749, 3.60179)
[node name="Camera3D" type="Camera3D" parent="Player3D"]
transform = Transform3D(0.400784, 0, 0, 0, 0.374249, 0.143406, 0, -0.143406, 0.374249, 0.0480828, 1.31404, 1.77274)

View File

@ -42,7 +42,6 @@ public partial class CharacterMeshSwapper : Node3D
bodyIndex = 0; bodyIndex = 0;
} }
} }
GD.Print("Switching bodies to: " + bodyIndex);
_currentBody.Mesh = _availableBodies[bodyIndex]; _currentBody.Mesh = _availableBodies[bodyIndex];
} }
} }