From 327e02d00b53bd8395f0649ea0d2f0257dd3d017 Mon Sep 17 00:00:00 2001 From: Dustin Date: Fri, 30 May 2025 21:56:45 -0700 Subject: [PATCH] More modifier rooms --- lib/classes/movement_parameters.gd | 2 +- src/Interactables/modifiers/icy_surface.tres | 4 +- src/Interactables/modifiers/left_wind.tres | 2 +- src/actors/players/playerE/PlayerE.gd | 1 + src/levels/TC_01.tscn | 19 +++-- src/levels/TC_02.tscn | 84 +++++++++++++++++++ src/levels/TC_03.tscn | 85 ++++++++++++++++++++ 7 files changed, 185 insertions(+), 12 deletions(-) create mode 100644 src/levels/TC_02.tscn create mode 100644 src/levels/TC_03.tscn diff --git a/lib/classes/movement_parameters.gd b/lib/classes/movement_parameters.gd index f0ab1e0..29e9734 100644 --- a/lib/classes/movement_parameters.gd +++ b/lib/classes/movement_parameters.gd @@ -72,7 +72,7 @@ func apply_state_modifier(_modifier :StateModifierMovement, _movement_direction _modifier.min_acceleration, _modifier.max_acceleration ) - match _modifier.modifier_type: + match _modifier.processing_mode: StateModifierMovement.SUB_TYPE.NEGATIVE_CONSTRAINT: var speed :Vector2 = get_speed_start(_modifier.direction) diff --git a/src/Interactables/modifiers/icy_surface.tres b/src/Interactables/modifiers/icy_surface.tres index 5d6edb4..b294db5 100644 --- a/src/Interactables/modifiers/icy_surface.tres +++ b/src/Interactables/modifiers/icy_surface.tres @@ -10,11 +10,11 @@ modifier_type = 0 name = "ice_or_something" timeout_seconds = 0.0 direction = 0 -speed_start = Vector2( 0, 0 ) +speed_start = Vector2( -100, 1.36422e-12 ) speed_end = Vector2( 0, 0 ) min_acceleration = Vector2( 5, 1.36422e-12 ) acceleration = Vector2( -250, 1.36422e-12 ) max_acceleration = Vector2( 0, 0 ) gravity = 0 only_grounded = true -processing_mode = 0 +processing_mode = 1 diff --git a/src/Interactables/modifiers/left_wind.tres b/src/Interactables/modifiers/left_wind.tres index 1e3c836..11b9239 100644 --- a/src/Interactables/modifiers/left_wind.tres +++ b/src/Interactables/modifiers/left_wind.tres @@ -9,7 +9,7 @@ script = ExtResource( 1 ) modifier_type = 0 name = "wind_left" timeout_seconds = 0.0 -direction = -1 +direction = 1 speed_start = Vector2( 30, 1.36422e-12 ) speed_end = Vector2( 30, 1.36422e-12 ) min_acceleration = Vector2( 0, 0 ) diff --git a/src/actors/players/playerE/PlayerE.gd b/src/actors/players/playerE/PlayerE.gd index 8771456..53e25d6 100644 --- a/src/actors/players/playerE/PlayerE.gd +++ b/src/actors/players/playerE/PlayerE.gd @@ -72,6 +72,7 @@ func _ready(): tired_debuff_modifier.setup('so_tired', StateModifierMovement.SUB_TYPE.NEGATIVE_CONSTRAINT) tired_debuff_modifier.speed_start = Vector2(-40,0) + tired_debuff_modifier.processing_mode = StateModifierMovement.SUB_TYPE.NEGATIVE_CONSTRAINT #tired_debuff_modifier.horizontal_speed = -40 tired_debuff_modifier.only_grounded = true movement_state_machine.push_state_modifier(tired_debuff_modifier) diff --git a/src/levels/TC_01.tscn b/src/levels/TC_01.tscn index adcd2b7..0081626 100644 --- a/src/levels/TC_01.tscn +++ b/src/levels/TC_01.tscn @@ -33,10 +33,13 @@ position = Vector2( 50, 131 ) [node name="EnterLeft" type="Position2D" parent="." index="4"] position = Vector2( -12, 61 ) -[node name="LevelTransition" parent="." index="5" instance=ExtResource( 4 )] +[node name="EnterRight" type="Position2D" parent="." index="5"] +position = Vector2( 332, 61 ) + +[node name="LevelTransition" parent="." index="6" instance=ExtResource( 4 )] position = Vector2( -11, 64 ) _transition_type = "door_left" -_destination_level = "res://src/levels/TestBox.tscn" +_destination_level = "res://src/levels/CloneBox.tscn" _destination_position_name = "EnterRight" [node name="CollisionShape2D" type="CollisionShape2D" parent="LevelTransition" index="0"] @@ -46,10 +49,10 @@ __meta__ = { "_edit_lock_": true } -[node name="LevelTransition2" parent="." index="6" instance=ExtResource( 4 )] +[node name="LevelTransition2" parent="." index="7" instance=ExtResource( 4 )] position = Vector2( 333, 64 ) -_destination_level = "res://src/levels/TestBox.tscn" -_destination_position_name = "EnterRight" +_destination_level = "res://src/levels/TC_02.tscn" +_destination_position_name = "EnterLeft" [node name="CollisionShape2D" type="CollisionShape2D" parent="LevelTransition2" index="0"] modulate = Color( 1, 0, 1, 1 ) @@ -58,10 +61,10 @@ __meta__ = { "_edit_lock_": true } -[node name="Camera Bounds" parent="." index="7"] +[node name="Camera Bounds" parent="." index="8"] tile_data = PoolIntArray( -65536, 0, 0, -65521, 0, 0, 65535, 0, 0, 16, 0, 0, 524287, 0, 0, 458768, 0, 0, 589824, 0, 0, 589839, 0, 0 ) -[node name="Modifier_Component" parent="." index="8" instance=ExtResource( 6 )] +[node name="Modifier_Component" parent="." index="9" instance=ExtResource( 6 )] position = Vector2( 162, 141 ) modifier = ExtResource( 5 ) @@ -69,7 +72,7 @@ modifier = ExtResource( 5 ) modulate = Color( 0, 0, 1, 1 ) shape = SubResource( 3 ) -[node name="Label" type="Label" parent="." index="9"] +[node name="Label" type="Label" parent="." index="10"] margin_left = 78.0 margin_top = 9.0 margin_right = 244.0 diff --git a/src/levels/TC_02.tscn b/src/levels/TC_02.tscn new file mode 100644 index 0000000..5bb1a14 --- /dev/null +++ b/src/levels/TC_02.tscn @@ -0,0 +1,84 @@ +[gd_scene load_steps=9 format=2] + +[ext_resource path="res://src/templates/level_templates/LevelTemplate.tscn" type="PackedScene" id=1] +[ext_resource path="res://assets/levels/LegacyFantasy-High_Forest/tileset.tres" type="TileSet" id=2] +[ext_resource path="res://src/Interactables/modifiers/left_conveyor.tres" type="Resource" id=3] +[ext_resource path="res://src/Interactables/LevelTransition.tscn" type="PackedScene" id=4] +[ext_resource path="res://lib/components/Modifier_Component.tscn" type="PackedScene" id=6] +[ext_resource path="res://assets/Fonts/default_font.tres" type="Theme" id=7] + +[sub_resource type="RectangleShape2D" id=2] + +[sub_resource type="RectangleShape2D" id=3] +extents = Vector2( 149, 3 ) + +[node name="TC_02" groups=["world"] instance=ExtResource( 1 )] + +[node name="TileMap Background" parent="." index="0"] +z_index = -2 + +[node name="TileMap Collision" parent="." index="1"] +tile_set = ExtResource( 2 ) +tile_data = PoolIntArray( -262145, 4, 0, -327661, 4, 0, -196609, 4, 0, -262125, 4, 0, -131073, 4, 0, -196589, 4, 0, -65537, 4, 0, -131053, 4, 65536, -1, 4, 0, -65517, 4, 65536, 65535, 4, 0, 19, 4, 65536, 131069, 4, 0, 131070, 4, 0, 131071, 4, 0, 65555, 4, 0, 65556, 4, 65536, 65557, 4, 65536, 65558, 4, 65536, 196605, 4, 0, 131094, 4, 65536, 262141, 4, 0, 196630, 4, 65536, 327677, 4, 0, 262145, 2, 1, 262146, 2, 2, 262161, 2, 0, 262162, 2, 1, 262166, 4, 65536, 393213, 4, 0, 393214, 4, 0, 393215, 4, 0, 327680, 4, 65536, 327681, 2, 65537, 327682, 2, 65538, 327697, 2, 65536, 327698, 2, 65537, 327699, 4, 65536, 327700, 4, 65536, 327701, 4, 65536, 327702, 4, 65536, 393216, 4, 0, 393235, 4, 0, 458752, 4, 65536, 458771, 4, 65536, 589823, 0, 1, 524288, 4, 131072, 524289, 0, 3, 524290, 0, 1, 524291, 0, 2, 524292, 0, 3, 524293, 0, 1, 524294, 0, 2, 524295, 0, 3, 524296, 0, 1, 524297, 0, 2, 524298, 0, 3, 524299, 0, 1, 524300, 0, 2, 524301, 0, 3, 524302, 0, 1, 524303, 0, 2, 524304, 0, 3, 524305, 0, 1, 524306, 0, 2, 524307, 4, 0, 524308, 0, 1, 524309, 0, 2, 524310, 0, 3, 655359, 0, 65537, 589824, 0, 65538, 589825, 0, 65539, 589826, 0, 65537, 589827, 0, 65538, 589828, 0, 65539, 589829, 0, 65537, 589830, 0, 65538, 589831, 0, 65539, 589832, 0, 65537, 589833, 0, 65538, 589834, 0, 65539, 589835, 0, 65537, 589836, 0, 65538, 589837, 0, 65539, 589838, 0, 65537, 589839, 0, 65538, 589840, 0, 65539, 589841, 0, 65537, 589842, 0, 65538, 589843, 0, 65539, 589844, 0, 65537, 589845, 0, 65538, 589846, 0, 65539, 720895, 0, 131073, 655360, 0, 131074, 655361, 0, 131075, 655362, 0, 131073, 655363, 0, 131074, 655364, 0, 131075, 655365, 0, 131073, 655366, 0, 131074, 655367, 0, 131075, 655368, 0, 131073, 655369, 0, 131074, 655370, 0, 131075, 655371, 0, 131073, 655372, 0, 131074, 655373, 0, 131075, 655374, 0, 131073, 655375, 0, 131074, 655376, 0, 131075, 655377, 0, 131073, 655378, 0, 131074, 655379, 0, 131075, 655380, 0, 131073, 655381, 0, 131074, 655382, 0, 131075, 786431, 0, 196609, 720896, 0, 196610, 720897, 0, 196611, 720898, 0, 196609, 720899, 0, 196610, 720900, 0, 196611, 720901, 0, 196609, 720902, 0, 196610, 720903, 0, 196611, 720904, 0, 196609, 720905, 0, 196610, 720906, 0, 196611, 720907, 0, 196609, 720908, 0, 196610, 720909, 0, 196611, 720910, 0, 196609, 720911, 0, 196610, 720912, 0, 196611, 720913, 0, 196609, 720914, 0, 196610, 720915, 0, 196611, 720916, 0, 196609, 720917, 0, 196610, 720918, 0, 196611, 851967, 0, 262145, 786432, 0, 262146, 786433, 0, 262147, 786434, 0, 262145, 786435, 0, 262146, 786436, 0, 262147, 786437, 0, 262145, 786438, 0, 262146, 786439, 0, 262147, 786440, 0, 262145, 786441, 0, 262146, 786442, 0, 262147, 786443, 0, 262145, 786444, 0, 262146, 786445, 0, 262147, 786446, 0, 262145, 786447, 0, 262146, 786448, 0, 262147, 786449, 0, 262145, 786450, 0, 262146, 786451, 0, 262147, 786452, 0, 262145, 786453, 0, 262146, 786454, 0, 262147 ) + +[node name="TileMap Foreground" parent="." index="2"] +tile_set = ExtResource( 2 ) +collision_layer = 0 +collision_mask = 0 +tile_data = PoolIntArray( 524288, 0, 2, 524307, 0, 3 ) + +[node name="PlayerStart" parent="." index="3"] +position = Vector2( 50, 131 ) + +[node name="EnterLeft" type="Position2D" parent="." index="4"] +position = Vector2( -12, 61 ) + +[node name="EnterRight" type="Position2D" parent="." index="5"] +position = Vector2( 332, 61 ) + +[node name="LevelTransition" parent="." index="6" instance=ExtResource( 4 )] +position = Vector2( -11, 64 ) +_transition_type = "door_left" +_destination_level = "res://src/levels/TC_01.tscn" +_destination_position_name = "EnterRight" + +[node name="CollisionShape2D" type="CollisionShape2D" parent="LevelTransition" index="0"] +modulate = Color( 1, 0, 1, 1 ) +shape = SubResource( 2 ) +__meta__ = { +"_edit_lock_": true +} + +[node name="LevelTransition2" parent="." index="7" instance=ExtResource( 4 )] +position = Vector2( 333, 64 ) +_destination_level = "res://src/levels/TC_03.tscn" +_destination_position_name = "EnterLeft" + +[node name="CollisionShape2D" type="CollisionShape2D" parent="LevelTransition2" index="0"] +modulate = Color( 1, 0, 1, 1 ) +shape = SubResource( 2 ) +__meta__ = { +"_edit_lock_": true +} + +[node name="Camera Bounds" parent="." index="8"] +tile_data = PoolIntArray( -65536, 0, 0, -65521, 0, 0, 65535, 0, 0, 16, 0, 0, 524287, 0, 0, 458768, 0, 0, 589824, 0, 0, 589839, 0, 0 ) + +[node name="Modifier_Component" parent="." index="9" instance=ExtResource( 6 )] +position = Vector2( 162, 141 ) +modifier = ExtResource( 3 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Modifier_Component" index="0"] +modulate = Color( 0, 0, 1, 1 ) +shape = SubResource( 3 ) + +[node name="Label" type="Label" parent="." index="10"] +margin_left = 78.0 +margin_top = 9.0 +margin_right = 244.0 +margin_bottom = 41.0 +theme = ExtResource( 7 ) +text = "Test chamber 02: +The floor moves You" +align = 1 +valign = 1 diff --git a/src/levels/TC_03.tscn b/src/levels/TC_03.tscn new file mode 100644 index 0000000..10946dd --- /dev/null +++ b/src/levels/TC_03.tscn @@ -0,0 +1,85 @@ +[gd_scene load_steps=9 format=2] + +[ext_resource path="res://src/templates/level_templates/LevelTemplate.tscn" type="PackedScene" id=1] +[ext_resource path="res://assets/levels/LegacyFantasy-High_Forest/tileset.tres" type="TileSet" id=2] +[ext_resource path="res://src/Interactables/modifiers/left_wind.tres" type="Resource" id=3] +[ext_resource path="res://src/Interactables/LevelTransition.tscn" type="PackedScene" id=4] +[ext_resource path="res://lib/components/Modifier_Component.tscn" type="PackedScene" id=6] +[ext_resource path="res://assets/Fonts/default_font.tres" type="Theme" id=7] + +[sub_resource type="RectangleShape2D" id=2] + +[sub_resource type="RectangleShape2D" id=3] +extents = Vector2( 162, 71.5 ) + +[node name="TC_03" groups=["world"] instance=ExtResource( 1 )] + +[node name="TileMap Background" parent="." index="0"] +z_index = -2 + +[node name="TileMap Collision" parent="." index="1"] +tile_set = ExtResource( 2 ) +tile_data = PoolIntArray( -262145, 4, 0, -327661, 4, 0, -196609, 4, 0, -262125, 4, 0, -131073, 4, 0, -196589, 4, 0, -65537, 4, 0, -131053, 4, 65536, -1, 4, 0, -65517, 4, 65536, 65535, 4, 0, 19, 4, 65536, 131069, 4, 0, 131070, 4, 0, 131071, 4, 0, 65555, 4, 0, 65556, 4, 65536, 65557, 4, 65536, 65558, 4, 65536, 196605, 4, 0, 131094, 4, 65536, 262141, 4, 0, 196630, 4, 65536, 327677, 4, 0, 262145, 2, 1, 262146, 2, 2, 262161, 2, 0, 262162, 2, 1, 262166, 4, 65536, 393213, 4, 0, 393214, 4, 0, 393215, 4, 0, 327680, 4, 65536, 327681, 2, 65537, 327682, 2, 65538, 327697, 2, 65536, 327698, 2, 65537, 327699, 4, 65536, 327700, 4, 65536, 327701, 4, 65536, 327702, 4, 65536, 393216, 4, 0, 393235, 4, 0, 458752, 4, 65536, 458771, 4, 65536, 589823, 0, 1, 524288, 4, 131072, 524289, 0, 3, 524290, 0, 1, 524291, 0, 2, 524292, 0, 3, 524293, 0, 1, 524294, 0, 2, 524295, 0, 3, 524296, 0, 1, 524297, 0, 2, 524298, 0, 3, 524299, 0, 1, 524300, 0, 2, 524301, 0, 3, 524302, 0, 1, 524303, 0, 2, 524304, 0, 3, 524305, 0, 1, 524306, 0, 2, 524307, 4, 0, 524308, 0, 1, 524309, 0, 2, 524310, 0, 3, 655359, 0, 65537, 589824, 0, 65538, 589825, 0, 65539, 589826, 0, 65537, 589827, 0, 65538, 589828, 0, 65539, 589829, 0, 65537, 589830, 0, 65538, 589831, 0, 65539, 589832, 0, 65537, 589833, 0, 65538, 589834, 0, 65539, 589835, 0, 65537, 589836, 0, 65538, 589837, 0, 65539, 589838, 0, 65537, 589839, 0, 65538, 589840, 0, 65539, 589841, 0, 65537, 589842, 0, 65538, 589843, 0, 65539, 589844, 0, 65537, 589845, 0, 65538, 589846, 0, 65539, 720895, 0, 131073, 655360, 0, 131074, 655361, 0, 131075, 655362, 0, 131073, 655363, 0, 131074, 655364, 0, 131075, 655365, 0, 131073, 655366, 0, 131074, 655367, 0, 131075, 655368, 0, 131073, 655369, 0, 131074, 655370, 0, 131075, 655371, 0, 131073, 655372, 0, 131074, 655373, 0, 131075, 655374, 0, 131073, 655375, 0, 131074, 655376, 0, 131075, 655377, 0, 131073, 655378, 0, 131074, 655379, 0, 131075, 655380, 0, 131073, 655381, 0, 131074, 655382, 0, 131075, 786431, 0, 196609, 720896, 0, 196610, 720897, 0, 196611, 720898, 0, 196609, 720899, 0, 196610, 720900, 0, 196611, 720901, 0, 196609, 720902, 0, 196610, 720903, 0, 196611, 720904, 0, 196609, 720905, 0, 196610, 720906, 0, 196611, 720907, 0, 196609, 720908, 0, 196610, 720909, 0, 196611, 720910, 0, 196609, 720911, 0, 196610, 720912, 0, 196611, 720913, 0, 196609, 720914, 0, 196610, 720915, 0, 196611, 720916, 0, 196609, 720917, 0, 196610, 720918, 0, 196611, 851967, 0, 262145, 786432, 0, 262146, 786433, 0, 262147, 786434, 0, 262145, 786435, 0, 262146, 786436, 0, 262147, 786437, 0, 262145, 786438, 0, 262146, 786439, 0, 262147, 786440, 0, 262145, 786441, 0, 262146, 786442, 0, 262147, 786443, 0, 262145, 786444, 0, 262146, 786445, 0, 262147, 786446, 0, 262145, 786447, 0, 262146, 786448, 0, 262147, 786449, 0, 262145, 786450, 0, 262146, 786451, 0, 262147, 786452, 0, 262145, 786453, 0, 262146, 786454, 0, 262147 ) + +[node name="TileMap Foreground" parent="." index="2"] +tile_set = ExtResource( 2 ) +collision_layer = 0 +collision_mask = 0 +tile_data = PoolIntArray( 524288, 0, 2, 524307, 0, 3 ) + +[node name="PlayerStart" parent="." index="3"] +position = Vector2( 50, 131 ) + +[node name="EnterLeft" type="Position2D" parent="." index="4"] +position = Vector2( -12, 61 ) + +[node name="EnterRight" type="Position2D" parent="." index="5"] +position = Vector2( 332, 61 ) + +[node name="LevelTransition" parent="." index="6" instance=ExtResource( 4 )] +position = Vector2( -11, 64 ) +_transition_type = "door_left" +_destination_level = "res://src/levels/TC_02.tscn" +_destination_position_name = "EnterRight" + +[node name="CollisionShape2D" type="CollisionShape2D" parent="LevelTransition" index="0"] +modulate = Color( 1, 0, 1, 1 ) +shape = SubResource( 2 ) +__meta__ = { +"_edit_lock_": true +} + +[node name="LevelTransition2" parent="." index="7" instance=ExtResource( 4 )] +position = Vector2( 333, 64 ) +_destination_level = "res://src/levels/CloneBox.tscn" +_destination_position_name = "EnterLeft" + +[node name="CollisionShape2D" type="CollisionShape2D" parent="LevelTransition2" index="0"] +modulate = Color( 1, 0, 1, 1 ) +shape = SubResource( 2 ) +__meta__ = { +"_edit_lock_": true +} + +[node name="Camera Bounds" parent="." index="8"] +tile_data = PoolIntArray( -65536, 0, 0, -65521, 0, 0, 65535, 0, 0, 16, 0, 0, 524287, 0, 0, 458768, 0, 0, 589824, 0, 0, 589839, 0, 0 ) + +[node name="Modifier_Component" parent="." index="9" instance=ExtResource( 6 )] +position = Vector2( 162, 141 ) +modifier = ExtResource( 3 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Modifier_Component" index="0"] +modulate = Color( 0, 0, 1, 1 ) +position = Vector2( -2, -68.5 ) +shape = SubResource( 3 ) + +[node name="Label" type="Label" parent="." index="10"] +margin_left = 78.0 +margin_top = 9.0 +margin_right = 244.0 +margin_bottom = 41.0 +theme = ExtResource( 7 ) +text = "Test chamber 03: +It's Windy" +align = 1 +valign = 1