diff --git a/Dungeon RPG.csproj b/Dungeon RPG.csproj
index 36250a3..7d63310 100644
--- a/Dungeon RPG.csproj
+++ b/Dungeon RPG.csproj
@@ -5,6 +5,7 @@
DungeonRPG
+
\ No newline at end of file
diff --git a/Rotator.cs b/Rotator.cs
index aa6b1ec..2c3a02a 100644
--- a/Rotator.cs
+++ b/Rotator.cs
@@ -7,5 +7,6 @@ public partial class Rotator : Node3D
public override void _PhysicsProcess(double delta)
{
RotateX((float)double.DegreesToRadians(DegreesPerSecond * delta));
+ RotateY((float)double.DegreesToRadians(-DegreesPerSecond * delta));
}
}
diff --git a/Scenes/Characters/Player/Meshes/Bodies/body_mesh1.tscn b/Scenes/Characters/Player/Meshes/Bodies/body_mesh1.tscn
index d45c6a5..d4c8049 100644
--- a/Scenes/Characters/Player/Meshes/Bodies/body_mesh1.tscn
+++ b/Scenes/Characters/Player/Meshes/Bodies/body_mesh1.tscn
@@ -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"]
diff --git a/Scenes/Characters/Player/player3d.tscn b/Scenes/Characters/Player/player3d.tscn
index 216ac2d..266113e 100644
--- a/Scenes/Characters/Player/player3d.tscn
+++ b/Scenes/Characters/Player/player3d.tscn
@@ -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://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://l5rtu2vhg130" path="res://Scenes/Characters/Player/CharacterMeshSwapper.cs" id="6_b2nck"]
-[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://2xh50i250cem" 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="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://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"]
@@ -2657,7 +2657,7 @@ script = ExtResource("1_oibqp")
AnimationPlayer = NodePath("character-male-b2/AnimationPlayer")
PlayerBody = NodePath("character-male-b2")
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")]
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="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"]
libraries = {
&"": 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")
diff --git a/Scenes/Levels/main.tscn b/Scenes/Levels/main.tscn
index 52d601b..3d27c07 100644
--- a/Scenes/Levels/main.tscn
+++ b/Scenes/Levels/main.tscn
@@ -867,10 +867,13 @@ _surfaces = [{
}]
[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_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"]
material = SubResource("StandardMaterial3D_xk6uj")
@@ -1362,16 +1365,16 @@ texel_scale = 2.0
generate_probes_subdiv = 3
light_data = ExtResource("49_46rbj")
-[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)
-script = ExtResource("50_xe80s")
-DegreesPerSecond = 180.0
-
-[node name="MeshInstance3D" type="MeshInstance3D" parent="Node3D"]
-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)
+
+[node name="Node3D" type="Node3D" parent="."]
+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")
+DegreesPerSecond = 180.0
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="Node3D"]
+mesh = SubResource("TorusMesh_jcv0k")
diff --git a/Scenes/Characters/Player/CharacterMeshSwapper.cs b/Scripts/Characters/Player/CharacterMeshSwapper.cs
similarity index 95%
rename from Scenes/Characters/Player/CharacterMeshSwapper.cs
rename to Scripts/Characters/Player/CharacterMeshSwapper.cs
index 316ce1d..426bcef 100644
--- a/Scenes/Characters/Player/CharacterMeshSwapper.cs
+++ b/Scripts/Characters/Player/CharacterMeshSwapper.cs
@@ -42,7 +42,6 @@ public partial class CharacterMeshSwapper : Node3D
bodyIndex = 0;
}
}
- GD.Print("Switching bodies to: " + bodyIndex);
_currentBody.Mesh = _availableBodies[bodyIndex];
}
}
\ No newline at end of file
diff --git a/Scenes/Characters/Player/CharacterMeshSwapper.cs.uid b/Scripts/Characters/Player/CharacterMeshSwapper.cs.uid
similarity index 100%
rename from Scenes/Characters/Player/CharacterMeshSwapper.cs.uid
rename to Scripts/Characters/Player/CharacterMeshSwapper.cs.uid