diff --git a/modules/going/player_states.h b/modules/going/player_states.h index adae9a9b..f987bb6c 100644 --- a/modules/going/player_states.h +++ b/modules/going/player_states.h @@ -114,12 +114,7 @@ void PlayerStateMachine::add_state() { template void PlayerStateMachine::force_state() { - PlayerState::StateID next{TState::get_class_static()}; - if(next != this->current_state->get_class()) { - this->current_state->state_exited(); - this->current_state = this->states[TState::get_class_static()]; - this->current_state->state_entered(); - } + this->states[TState::get_class_static()]; } #endif // !PLAYER_STATES_H diff --git a/project/models/terrains/level.blend b/project/models/terrains/level.blend index c0c940b0..9cf7c8c0 100644 Binary files a/project/models/terrains/level.blend and b/project/models/terrains/level.blend differ diff --git a/project/models/terrains/level.blend1 b/project/models/terrains/level.blend1 index 0ea119ef..c1adf6df 100644 Binary files a/project/models/terrains/level.blend1 and b/project/models/terrains/level.blend1 differ diff --git a/project/scenes/valley.tscn b/project/scenes/valley.tscn index 0d21ef2a..6c9063f2 100644 --- a/project/scenes/valley.tscn +++ b/project/scenes/valley.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=3 uid="uid://sofv1apr4467"] +[gd_scene load_steps=11 format=3 uid="uid://sofv1apr4467"] [ext_resource type="PackedScene" uid="uid://5cfl3xu1861l" path="res://models/terrains/level.blend" id="1_ch7jd"] [ext_resource type="PackedScene" uid="uid://dcgsrdacswacl" path="res://objects/player.tscn" id="2_pvuhy"] @@ -6,7 +6,6 @@ [ext_resource type="PackedScene" uid="uid://dqjurq1nq1fle" path="res://objects/tre.tscn" id="3_lj5yw"] [ext_resource type="PackedScene" uid="uid://bjln17owwexi" path="res://objects/jump_pickup.tscn" id="6_xecee"] [ext_resource type="PackedScene" uid="uid://8q5ql5fydib" path="res://models/props/grass.blend" id="7_xecee"] -[ext_resource type="PackedScene" uid="uid://dp48t6earfkm4" path="res://objects/evertre.tscn" id="8_l73gk"] [ext_resource type="PackedScene" uid="uid://boouyu1o7q48k" path="res://models/props/great_tree.blend" id="8_m3qr3"] [sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_m3qr3"] @@ -228,15 +227,6 @@ transform = Transform3D(-0.0664105, -0.0490172, 0.996587, -0.0483816, 0.997776, [node name="Node3D188" parent="level" instance=ExtResource("3_lj5yw")] transform = Transform3D(-0.0664105, -0.0490172, 0.996587, -0.0483816, 0.997776, 0.0458516, -0.996618, -0.0451715, -0.0686344, 53.0513, 13.6898, 219.067) -[node name="Node3D198" parent="level" instance=ExtResource("3_lj5yw")] -transform = Transform3D(-0.0664105, -0.0490172, 0.996587, -0.0483816, 0.997776, 0.0458516, -0.996618, -0.0451715, -0.0686344, 20.7789, 12.7956, 234.335) - -[node name="Node3D210" parent="level" instance=ExtResource("3_lj5yw")] -transform = Transform3D(-0.0664105, -0.0490172, 0.996587, -0.0483816, 0.997776, 0.0458516, -0.996618, -0.0451715, -0.0686344, 24.3835, 11.9201, 211.085) - -[node name="Node3D212" parent="level" instance=ExtResource("3_lj5yw")] -transform = Transform3D(-0.0664105, -0.0490172, 0.996587, -0.0483816, 0.997776, 0.0458516, -0.996618, -0.0451715, -0.0686344, 45.9363, 14.2212, 238.525) - [node name="Node3D189" parent="level" instance=ExtResource("3_lj5yw")] transform = Transform3D(-0.0664105, -0.0490172, 0.996587, -0.0483816, 0.997776, 0.0458516, -0.996618, -0.0451715, -0.0686344, 28.9577, 12.0186, 159.84) @@ -1359,102 +1349,6 @@ transform = Transform3D(-0.172479, 0, -0.985013, 0, 1, 0, 0.985013, 0, -0.172479 [node name="Tree17" parent="level" instance=ExtResource("3_lj5yw")] transform = Transform3D(-0.613031, 0, 0.790059, 0, 1, 0, -0.790059, 0, -0.613031, -171.501, 10.3697, 419.993) -[node name="Evertre" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.05744, 19.4195, 360.975) - -[node name="Evertre2" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(0.0847561, 0, 0.996402, 0, 1, 0, -0.996402, 0, 0.0847561, -21.9483, 18.4091, 382.003) - -[node name="Evertre14" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(0.0847561, 0, 0.996402, 0, 1, 0, -0.996402, 0, 0.0847561, -3.38254, 18.4091, 399.123) - -[node name="Evertre28" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(0.0847561, 0, 0.996402, 0, 1, 0, -0.996402, 0, 0.0847561, -19.7205, 18.4091, 397.907) - -[node name="Evertre15" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(0.0847561, 0, 0.996402, 0, 1, 0, -0.996402, 0, 0.0847561, 14.1286, 18.4091, 396.71) - -[node name="Evertre16" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(0.0847561, 0, 0.996402, 0, 1, 0, -0.996402, 0, 0.0847561, 47.2788, 22.0449, 373.655) - -[node name="Evertre17" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(-0.97437, 0, -0.224951, 0, 1, 0, 0.224951, 0, -0.97437, 14.5444, 21.2625, 353.69) - -[node name="Evertre18" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(-0.97437, 0, -0.224951, 0, 1, 0, 0.224951, 0, -0.97437, 33.4848, 23.1258, 360.728) - -[node name="Evertre23" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(-0.97437, 0, -0.224951, 0, 1, 0, 0.224951, 0, -0.97437, 7.60347, 23.1258, 337.075) - -[node name="Evertre24" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(-0.97437, 0, -0.224951, 0, 1, 0, 0.224951, 0, -0.97437, 21.5213, 23.1258, 347.809) - -[node name="Evertre19" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(-0.97437, 0, -0.224951, 0, 1, 0, 0.224951, 0, -0.97437, 23.1441, 19.1559, 374.383) - -[node name="Evertre20" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(-0.97437, 0, -0.224951, 0, 1, 0, 0.224951, 0, -0.97437, 36.293, 18.3293, 383.023) - -[node name="Evertre25" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(-0.97437, 0, -0.224951, 0, 1, 0, 0.224951, 0, -0.97437, 23.3889, 18.3293, 391.823) - -[node name="Evertre3" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(0.0847561, 0, 0.996402, 0, 1, 0, -0.996402, 0, 0.0847561, -37.868, 17.7738, 390.773) - -[node name="Evertre4" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(0.0847561, 0, 0.996402, 0, 1, 0, -0.996402, 0, 0.0847561, -30.3011, 17.7738, 372.256) - -[node name="Evertre29" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(0.0847561, 0, 0.996402, 0, 1, 0, -0.996402, 0, 0.0847561, -47.735, 17.7738, 381.423) - -[node name="Evertre5" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(0.0847561, 0, 0.996402, 0, 1, 0, -0.996402, 0, 0.0847561, -44.16, 17.7738, 365.144) - -[node name="Evertre6" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(0.0847561, 0, 0.996402, 0, 1, 0, -0.996402, 0, 0.0847561, -74.6247, 17.7738, 366.728) - -[node name="Evertre7" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(0.0847561, 0, 0.996402, 0, 1, 0, -0.996402, 0, 0.0847561, -73.3665, 17.7738, 386.276) - -[node name="Evertre30" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(0.0847561, 0, 0.996402, 0, 1, 0, -0.996402, 0, 0.0847561, -57.711, 17.7738, 367.998) - -[node name="Evertre31" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(0.0847561, 0, 0.996402, 0, 1, 0, -0.996402, 0, 0.0847561, -66.8566, 17.7738, 381.852) - -[node name="Evertre32" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(0.0847561, 0, 0.996402, 0, 1, 0, -0.996402, 0, 0.0847561, -94.1317, 17.7738, 387.852) - -[node name="Evertre8" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(0.0847561, 0, 0.996402, 0, 1, 0, -0.996402, 0, 0.0847561, -92.02, 17.7738, 363.894) - -[node name="Evertre9" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(0.0847561, 0, 0.996402, 0, 1, 0, -0.996402, 0, 0.0847561, -104.486, 17.7738, 380.12) - -[node name="Evertre10" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(0.0847561, 0, 0.996402, 0, 1, 0, -0.996402, 0, 0.0847561, -86.3817, 17.7738, 379.653) - -[node name="Evertre11" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(0.310378, 0, -0.950613, 0, 1, 0, 0.950613, 0, 0.310378, -62.7212, 17.7738, 396.465) - -[node name="Evertre12" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(-0.991477, 0, -0.130284, 0, 1, 0, 0.130284, 0, -0.991477, -31.3588, 17.7738, 403.905) - -[node name="Evertre26" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(-0.991477, 0, -0.130284, 0, 1, 0, 0.130284, 0, -0.991477, -49.8786, 17.7738, 401.366) - -[node name="Evertre27" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(-0.991477, 0, -0.130284, 0, 1, 0, 0.130284, 0, -0.991477, -49.8786, 17.7738, 401.366) - -[node name="Evertre13" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(0.0847561, 0, 0.996402, 0, 1, 0, -0.996402, 0, 0.0847561, -8.15594, 17.7738, 371.378) - -[node name="Evertre21" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(0.0847561, 0, 0.996402, 0, 1, 0, -0.996402, 0, 0.0847561, 8.51658, 18.8553, 383.398) - -[node name="Evertre22" parent="level" instance=ExtResource("8_l73gk")] -transform = Transform3D(0.0847561, 0, 0.996402, 0, 1, 0, -0.996402, 0, 0.0847561, -6.30876, 18.3767, 386.711) - [node name="grass" parent="." instance=ExtResource("7_xecee")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -167.88, 12.5673, 403.753)