diff --git a/Entities/Player/player.gd b/Entities/Player/player.gd index 5edc5eb..4cc6790 100644 --- a/Entities/Player/player.gd +++ b/Entities/Player/player.gd @@ -11,13 +11,13 @@ signal move #State Vars const GRAVITY: int = 700 -@export var speed: float = 1000 -@export var maxSpeed: float = 175 -@export var friction: int = 1000 +@export var speed: float = 1300 +@export var maxSpeed: float = 300 +@export var friction: int = 1200 @export var airFriction: int = 250 @export var jumpHight: float = -275 -@export var maxJumpCount: int = 1 -@export var ammo: int = 3 +@export var maxJumpCount: int = 2 +var canDash: bool = true var deathEffect: PackedScene = preload("uid://dm4oirxl6bpnn") var camreaCenterPosition: Vector2 @@ -36,9 +36,12 @@ func _physics_process(delta: float) -> void: #emits move purly for jump state cause that is dependent on exact move and slide in the code move.emit() + if is_on_floor(): + canDash = true + #kills the player when they get too low - if global_position.y > 200: - player_death() + #if global_position.y > 200: + #player_death() #sets the players pos to the spawn pos so the player statrs on the correct door to the level func on_spawn(spawnPosition: Vector2): diff --git a/Entities/Player/player.tscn b/Entities/Player/player.tscn index cd30546..8242676 100644 --- a/Entities/Player/player.tscn +++ b/Entities/Player/player.tscn @@ -1,6 +1,6 @@ -[gd_scene load_steps=126 format=3 uid="uid://ca7jd0ttc0v67"] +[gd_scene load_steps=127 format=3 uid="uid://ca7jd0ttc0v67"] -[ext_resource type="Script" uid="uid://0oxneml3esdx" path="res://entities/player/player.gd" id="1_8soms"] +[ext_resource type="Script" uid="uid://0oxneml3esdx" path="res://Entities/Player/player.gd" id="1_8soms"] [ext_resource type="Shader" uid="uid://cqjsw6d71kkd2" path="res://Entities/Player/player_hit_flash_shader.tres" id="2_3ep63"] [ext_resource type="Texture2D" uid="uid://dravykrek6bsu" path="res://Entities/Player/player_art/the_dude/climbing/player wall slide 48x48.png" id="3_epc1c"] [ext_resource type="Texture2D" uid="uid://blgt31uqia0oh" path="res://Entities/Player/player_art/the_dude/movement/Player Idle 48x48.png" id="3_gh012"] @@ -22,6 +22,7 @@ [ext_resource type="Script" uid="uid://d3t3fweggs161" path="res://Entities/Player/player_state_scripts/ground_movement/grab_state.gd" id="23_kjljb"] [ext_resource type="Script" uid="uid://iu5jv2o1im70" path="res://Entities/Player/player_state_scripts/air_movement/land_state.gd" id="24_bp242"] [ext_resource type="Script" uid="uid://cmtajhnx8xaqt" path="res://Entities/Player/player_state_scripts/ground_movement/crouch_idle.gd" id="24_brh81"] +[ext_resource type="Script" uid="uid://bhyu62hovn1x3" path="res://Entities/Player/player_state_scripts/air_movement/dash.gd" id="25_01ng6"] [ext_resource type="Script" uid="uid://cywssm5t3d5uv" path="res://Entities/Player/player_state_scripts/ground_movement/slide_state.gd" id="26_bp242"] [ext_resource type="Script" uid="uid://c2lag80wot5k" path="res://Entities/Player/player_state_scripts/ground_movement/crouch_walk_state.gd" id="28_y6drd"] @@ -1007,13 +1008,6 @@ _data = { [node name="Player" type="CharacterBody2D" groups=["Player"]] collision_layer = 2 script = ExtResource("1_8soms") -speed = null -maxSpeed = null -friction = null -airFriction = null -jumpHight = null -maxJumpCount = null -ammo = null [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] material = SubResource("ShaderMaterial_rqcxa") @@ -1090,21 +1084,24 @@ script = ExtResource("15_rqcxa") player = NodePath("../..") animatedSprite2D = NodePath("../../AnimatedSprite2D") -[node name="Jump" type="Node" parent="StateMachine" node_paths=PackedStringArray("player", "animatedSprite2D", "wallCheck", "floorCheck", "ledgeGrabBox")] +[node name="Jump" type="Node" parent="StateMachine" node_paths=PackedStringArray("player", "animatedSprite2D", "wallCheck", "floorCheck", "ledgeGrabBox", "fallState")] script = ExtResource("14_kjljb") player = NodePath("../..") animatedSprite2D = NodePath("../../AnimatedSprite2D") wallCheck = NodePath("../../HitBoxes/WallCheck") floorCheck = NodePath("../../HitBoxes/FloorCheck") ledgeGrabBox = NodePath("../../LedgeGrab") +fallState = NodePath("../Fall") -[node name="Fall" type="Node" parent="StateMachine" node_paths=PackedStringArray("player", "animatedSprite2D", "wallCheck", "floorCheck", "ledgeGrabBox")] +[node name="Fall" type="Node" parent="StateMachine" node_paths=PackedStringArray("player", "animatedSprite2D", "wallCheck", "floorCheck", "ledgeGrabBox", "jumpState")] script = ExtResource("14_3ep63") player = NodePath("../..") animatedSprite2D = NodePath("../../AnimatedSprite2D") wallCheck = NodePath("../../HitBoxes/WallCheck") floorCheck = NodePath("../../HitBoxes/FloorCheck") ledgeGrabBox = NodePath("../../LedgeGrab") +jumpState = NodePath("../Jump") +coyoteTime = 0.3 [node name="Land" type="Node" parent="StateMachine" node_paths=PackedStringArray("player", "animatedSprite2D")] script = ExtResource("24_bp242") @@ -1137,6 +1134,11 @@ player = NodePath("../..") animatedSprite2D = NodePath("../../AnimatedSprite2D") collisionShapeMove = NodePath("../../HitBoxes/CollisionShapeMove") +[node name="Dash" type="Node" parent="StateMachine" node_paths=PackedStringArray("player", "animatedSprite2D")] +script = ExtResource("25_01ng6") +player = NodePath("../..") +animatedSprite2D = NodePath("../../AnimatedSprite2D") + [node name="HitAnimationPlayer" type="AnimationPlayer" parent="."] libraries = { &"": SubResource("AnimationLibrary_usp30") diff --git a/Entities/Player/player_state_scripts/air_movement/dash.gd b/Entities/Player/player_state_scripts/air_movement/dash.gd new file mode 100644 index 0000000..649126f --- /dev/null +++ b/Entities/Player/player_state_scripts/air_movement/dash.gd @@ -0,0 +1,50 @@ +extends NodeState + +@export var player: Player +@export var animatedSprite2D: AnimatedSprite2D + +const jumpGravity = player.GRAVITY + +var dashSpeed: float = 500 +var dashTime: float = .3 +var dashDone: bool = false +var canDash: bool = true + +@warning_ignore("unused_parameter") +func on_process(delta: float) -> void: + pass + +@warning_ignore("unused_parameter") +func on_phyisics_process(delta: float) -> void: + + + player.velocity.y += jumpGravity * delta + + var direction = -1 if animatedSprite2D.flip_h else 1 + + if direction: + player.velocity.x =+ dashSpeed * direction + + transition_states() + +func enter() -> void: + player.canDash = false + dashDone = false + animatedSprite2D.play("Fall") + await get_tree().create_timer(dashTime).timeout + dashDone = true + +func exit() -> void: + animatedSprite2D.stop() + +func transition_states() -> void: + + if not dashDone: + return + + if player.is_on_floor(): + transition.emit("idle") + + if not player.is_on_floor(): + transition.emit("fall") + diff --git a/Entities/Player/player_state_scripts/air_movement/dash.gd.uid b/Entities/Player/player_state_scripts/air_movement/dash.gd.uid new file mode 100644 index 0000000..11b74c2 --- /dev/null +++ b/Entities/Player/player_state_scripts/air_movement/dash.gd.uid @@ -0,0 +1 @@ +uid://bhyu62hovn1x3 diff --git a/Entities/Player/player_state_scripts/air_movement/fall_state.gd b/Entities/Player/player_state_scripts/air_movement/fall_state.gd index 637dd2f..9e887dd 100644 --- a/Entities/Player/player_state_scripts/air_movement/fall_state.gd +++ b/Entities/Player/player_state_scripts/air_movement/fall_state.gd @@ -5,6 +5,7 @@ extends NodeState @export var wallCheck: ShapeCast2D @export var floorCheck: RayCast2D @export var ledgeGrabBox: CollisionShape2D +@export var jumpState: NodeState @export_category("Fall State") @@ -16,15 +17,12 @@ const GRAVITY = player.GRAVITY @onready var maxSpeed = player.maxSpeed @onready var friction = player.airFriction -var fallTimeAmount: int = 10 -var fallTime: float @warning_ignore("unused_parameter") func on_process(delta: float) -> void: pass func on_phyisics_process(delta: float) -> void: - fallTime += fallTimeAmount * delta #print(fallTime) if !player.is_on_floor(): get_coyte_time() @@ -52,7 +50,6 @@ func get_coyte_time() -> void: func enter() -> void: animatedSprite2D.play("Fall") - fallTime = 0 ledgeGrabBox.disabled = false if player.is_on_floor(): ledgeGrabBox.disabled = true @@ -60,29 +57,24 @@ func enter() -> void: coyoteJump = true func exit() -> void: - fallTime = 0 ledgeGrabBox.disabled = true animatedSprite2D.stop() func transition_states() -> void: #transitioning state - #idle state - if player.is_on_floor() and fallTime > 5: - transition.emit("Land") - - elif player.is_on_floor() and fallTime <= 5: + if player.is_on_floor(): transition.emit("idle") #jump state if GameInputEvents.jump_input(): transition.emit("jump") - #jump state - if GameInputEvents.jump_input() and coyoteJump: - transition.emit("jump") - if wallCheck.is_colliding() and !floorCheck.is_colliding() and player.velocity.y == 0 and player.is_on_floor(): transition.emit("Grab") + if GameInputEvents.dash_input() and player.canDash: + transition.emit("dash") + + diff --git a/Entities/Player/player_state_scripts/air_movement/jump_state.gd b/Entities/Player/player_state_scripts/air_movement/jump_state.gd index ba626e0..6320646 100644 --- a/Entities/Player/player_state_scripts/air_movement/jump_state.gd +++ b/Entities/Player/player_state_scripts/air_movement/jump_state.gd @@ -5,6 +5,7 @@ extends NodeState @export var wallCheck: ShapeCast2D @export var floorCheck: RayCast2D @export var ledgeGrabBox: CollisionShape2D +@export var fallState: NodeState const jumpGravity = player.GRAVITY @@ -14,13 +15,12 @@ const jumpGravity = player.GRAVITY @onready var maxSpeed = player.maxSpeed @onready var friction = player.friction -var currentJumpCount: int -var coyoteJump: bool +var currentJumpCount: int = 0 @warning_ignore("unused_parameter") func _physics_process(delta: float) -> void: await player.move - if player.is_on_floor() or (player.is_on_wall() and GameInputEvents.wall_cling_input()): + if player.is_on_floor(): currentJumpCount = 0 @warning_ignore("unused_parameter") @@ -32,19 +32,18 @@ func on_phyisics_process(delta: float) -> void: if player.is_on_floor(): currentJumpCount = 0 player.velocity.y = jumpHight - coyoteJump = false + fallState.coyoteJump = false currentJumpCount += 1 - if coyoteJump and currentJumpCount != maxJumpCount: + if fallState.coyoteJump and currentJumpCount <= maxJumpCount: player.velocity.y = jumpHight - coyoteJump = false + fallState.coyoteJump = false currentJumpCount += 1 #multi jumps - if !player.is_on_floor() and GameInputEvents.jump_input() and currentJumpCount != maxJumpCount: - player.velocity.y = jumpHight - currentJumpCount += 1 + multiJump() + #movment shit under here var direction: float = GameInputEvents.movement_input() if direction: @@ -64,11 +63,13 @@ func on_phyisics_process(delta: float) -> void: func enter() -> void: ledgeGrabBox.disabled = false animatedSprite2D.play("Jump") - coyoteJump = true + if not fallState.coyoteJump: + currentJumpCount += 1 + multiJump() func exit() -> void: ledgeGrabBox.disabled = true - coyoteJump = false + fallState.coyoteJump = false animatedSprite2D.stop() func transition_states() -> void: @@ -84,3 +85,12 @@ func transition_states() -> void: if wallCheck.is_colliding() and not floorCheck.is_colliding() and player.velocity.y == 0 and player.is_on_floor(): transition.emit("Grab") + + if GameInputEvents.dash_input() and player.canDash: + transition.emit("dash") + + +func multiJump(): + if !player.is_on_floor() and currentJumpCount <= maxJumpCount and Input.is_action_just_pressed("move_jump"): + player.velocity.y = jumpHight + currentJumpCount += 1 diff --git a/Entities/Player/player_state_scripts/attack_state/attack_state.gd b/Entities/Player/player_state_scripts/attack_state/attack_state.gd deleted file mode 100644 index 14dd1fa..0000000 --- a/Entities/Player/player_state_scripts/attack_state/attack_state.gd +++ /dev/null @@ -1,57 +0,0 @@ -extends NodeState - -@export var player: Player -@export var animatedSprite2D: AnimatedSprite2D -@export var weapons: Weapons - - -@export_category("Shoot State") -@export var stateMachine: NodeStateMachine - -const GRAVITY = player.GRAVITY -@onready var friction = player.friction -@onready var airFriction = player.airFriction -var canAttack: bool = false - -func _ready() -> void: - animatedSprite2D.animation_looped.connect(on_loop) - weapons.on_weapon_change.connect(on_weapon_change) - -@warning_ignore("unused_parameter") -func on_process(delta: float) -> void: - pass - -@warning_ignore("unused_parameter") -func on_phyisics_process(delta: float) -> void: - if player.is_on_floor(): - player.velocity.x = move_toward(player.velocity.x, 0, friction * delta) - elif !player.is_on_floor(): - player.velocity.y += GRAVITY * delta - player.velocity.x = move_toward(player.velocity.x, 0, airFriction * delta) - - if animatedSprite2D.frame == weapons.get_weapon_attack_frame() and canAttack: - weapons.attack() - canAttack = false - -func enter() -> void: - canAttack = true - weapons.on_start_attack() - play_correct_animation() - -func exit() -> void: - animatedSprite2D.stop() - weapons.on_attack_end() - -func on_loop() -> void: - canAttack = true - if GameInputEvents.is_first_attack_held() or GameInputEvents.is_second_attack_held(): - pass - elif stateMachine.currentNodeState == self: - transition.emit("idle") - -func play_correct_animation() -> void: - animatedSprite2D.play(weapons.get_weapon_attack_aninmation_type(), weapons.get_weapon_speed()) - -func on_weapon_change() -> void: - canAttack = true - play_correct_animation() diff --git a/Entities/Player/player_state_scripts/attack_state/attack_state.gd.uid b/Entities/Player/player_state_scripts/attack_state/attack_state.gd.uid deleted file mode 100644 index 2bd3c99..0000000 --- a/Entities/Player/player_state_scripts/attack_state/attack_state.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://b2p1m7vqxyjj7 diff --git a/Entities/Player/player_state_scripts/game_input_events.gd b/Entities/Player/player_state_scripts/game_input_events.gd index d560773..74dce7c 100644 --- a/Entities/Player/player_state_scripts/game_input_events.gd +++ b/Entities/Player/player_state_scripts/game_input_events.gd @@ -18,6 +18,6 @@ static func fall_input() -> bool: var fallInput: bool = Input.is_action_just_pressed("force_fall") return fallInput -static func wall_cling_input() -> bool: - var wallClingInput: bool = Input.is_action_just_pressed("wall_cling") - return wallClingInput +static func dash_input() -> bool: + var dashInput: bool = Input.is_action_just_pressed("dash") + return dashInput diff --git a/Entities/Player/player_state_scripts/ground_movement/run_state.gd b/Entities/Player/player_state_scripts/ground_movement/run_state.gd index 2451852..e03cc06 100644 --- a/Entities/Player/player_state_scripts/ground_movement/run_state.gd +++ b/Entities/Player/player_state_scripts/ground_movement/run_state.gd @@ -17,6 +17,7 @@ func on_phyisics_process(delta: float) -> void: if direction: player.velocity.x += direction * speed * delta player.velocity.x = clamp(player.velocity.x, -maxSpeed, maxSpeed) + #player.velocity.x = move_toward(player.velocity.x, maxSpeed, 100 * delta) if direction != 0: animatedSprite2D.flip_h = false if direction > 0 else true diff --git a/Envoroment/Levels/test_level.tscn b/Envoroment/Levels/test_level.tscn index 8505758..5920c6f 100644 --- a/Envoroment/Levels/test_level.tscn +++ b/Envoroment/Levels/test_level.tscn @@ -15,10 +15,11 @@ sources/0 = SubResource("TileSetAtlasSource_fptpa") [node name="TestLevel" type="Node2D"] [node name="TileMapLayer" type="TileMapLayer" parent="."] -tile_map_data = PackedByteArray("AAAAAPz/AAAAAAAAAAAAAP3/AAAAAAAAAAAAAP7/AAAAAAAAAAAAAP//AAAAAAAAAAABAPz/AAAAAAAAAAABAP3/AAAAAAAAAAABAP7/AAAAAAAAAAABAP//AAAAAAAAAAACAPz/AAAAAAAAAAACAP3/AAAAAAAAAAACAP7/AAAAAAAAAAACAP//AAAAAAAAAAADAPz/AAAAAAAAAAADAP3/AAAAAAAAAAADAP7/AAAAAAAAAAADAP//AAAAAAAAAAAEAPz/AAAAAAAAAAAEAP3/AAAAAAAAAAAEAP7/AAAAAAAAAAAEAP//AAAAAAAAAAAFAPz/AAAAAAAAAAAFAP3/AAAAAAAAAAAFAP7/AAAAAAAAAAAFAP//AAAAAAAAAAAGAPz/AAAAAAAAAAAGAP3/AAAAAAAAAAAGAP7/AAAAAAAAAAAGAP//AAAAAAAAAAAHAPz/AAAAAAAAAAAHAP3/AAAAAAAAAAAHAP7/AAAAAAAAAAAHAP//AAAAAAAAAAAIAPz/AAAAAAAAAAAIAP3/AAAAAAAAAAAIAP7/AAAAAAAAAAAIAP//AAAAAAAAAAAJAPz/AAAAAAAAAAAJAP3/AAAAAAAAAAAJAP7/AAAAAAAAAAAJAP//AAAAAAAAAAAKAPz/AAAAAAAAAAAKAP3/AAAAAAAAAAAKAP7/AAAAAAAAAAAKAP//AAAAAAAAAAALAPz/AAAAAAAAAAALAP3/AAAAAAAAAAALAP7/AAAAAAAAAAALAP//AAAAAAAAAAAMAPz/AAAAAAAAAAAMAP3/AAAAAAAAAAAMAP7/AAAAAAAAAAAMAP//AAAAAAAAAAANAPz/AAAAAAAAAAANAP3/AAAAAAAAAAANAP7/AAAAAAAAAAANAP//AAAAAAAAAAAOAPz/AAAAAAAAAAAOAP3/AAAAAAAAAAAOAP7/AAAAAAAAAAAOAP//AAAAAAAAAAAPAPz/AAAAAAAAAAAPAP3/AAAAAAAAAAAPAP7/AAAAAAAAAAAPAP//AAAAAAAAAAAQAPz/AAAAAAAAAAAQAP3/AAAAAAAAAAAQAP7/AAAAAAAAAAAQAP//AAAAAAAAAAARAPz/AAAAAAAAAAARAP3/AAAAAAAAAAARAP7/AAAAAAAAAAARAP//AAAAAAAAAAASAPz/AAAAAAAAAAASAP3/AAAAAAAAAAASAP7/AAAAAAAAAAASAP//AAAAAAAAAAATAPz/AAAAAAAAAAATAP3/AAAAAAAAAAATAP7/AAAAAAAAAAATAP//AAAAAAAAAAAUAPz/AAAAAAAAAAAUAP3/AAAAAAAAAAAUAP7/AAAAAAAAAAAUAP//AAAAAAAAAAAVAPz/AAAAAAAAAAAVAP3/AAAAAAAAAAAVAP7/AAAAAAAAAAAVAP//AAAAAAAAAAAWAPz/AAAAAAAAAAAWAP3/AAAAAAAAAAAWAP7/AAAAAAAAAAAWAP//AAAAAAAAAAAXAPz/AAAAAAAAAAAXAP3/AAAAAAAAAAAXAP7/AAAAAAAAAAAXAP//AAAAAAAAAAAYAPz/AAAAAAAAAAAYAP3/AAAAAAAAAAAYAP7/AAAAAAAAAAAYAP//AAAAAAAAAAAZAPz/AAAAAAAAAAAZAP3/AAAAAAAAAAAZAP7/AAAAAAAAAAAZAP//AAAAAAAAAAAaAPz/AAAAAAAAAAAaAP3/AAAAAAAAAAAaAP7/AAAAAAAAAAAaAP//AAAAAAAAAAAbAPz/AAAAAAAAAAAbAP3/AAAAAAAAAAAbAP7/AAAAAAAAAAAbAP//AAAAAAAAAAAcAPz/AAAAAAAAAAAcAP3/AAAAAAAAAAAcAP7/AAAAAAAAAAAcAP//AAAAAAAAAAAdAPz/AAAAAAAAAAAdAP3/AAAAAAAAAAAdAP7/AAAAAAAAAAAdAP//AAAAAAAAAAAeAPz/AAAAAAAAAAAeAP3/AAAAAAAAAAAeAP7/AAAAAAAAAAAeAP//AAAAAAAAAAAfAPz/AAAAAAAAAAAfAP3/AAAAAAAAAAAfAP7/AAAAAAAAAAAfAP//AAAAAAAAAAAgAPz/AAAAAAAAAAAgAP3/AAAAAAAAAAAgAP7/AAAAAAAAAAAgAP//AAAAAAAAAAAhAPz/AAAAAAAAAAAhAP3/AAAAAAAAAAAhAP7/AAAAAAAAAAAhAP//AAAAAAAAAAAiAPz/AAAAAAAAAAAiAP3/AAAAAAAAAAAiAP7/AAAAAAAAAAAiAP//AAAAAAAAAAAjAPz/AAAAAAAAAAAjAP3/AAAAAAAAAAAjAP7/AAAAAAAAAAAjAP//AAAAAAAAAAAkAPz/AAAAAAAAAAAkAP3/AAAAAAAAAAAkAP7/AAAAAAAAAAAkAP//AAAAAAAAAAAlAPz/AAAAAAAAAAAlAP3/AAAAAAAAAAAlAP7/AAAAAAAAAAAlAP//AAAAAAAAAAAmAPz/AAAAAAAAAAAmAP3/AAAAAAAAAAAmAP7/AAAAAAAAAAAmAP//AAAAAAAAAAAnAPz/AAAAAAAAAAAnAP3/AAAAAAAAAAAnAP7/AAAAAAAAAAAnAP//AAAAAAAAAAA=") +tile_map_data = PackedByteArray("AAAAAPz/AAAAAAAAAAAAAP3/AAAAAAAAAAAAAP7/AAAAAAAAAAAAAP//AAAAAAAAAAABAPz/AAAAAAAAAAABAP3/AAAAAAAAAAABAP7/AAAAAAAAAAABAP//AAAAAAAAAAACAPz/AAAAAAAAAAACAP3/AAAAAAAAAAACAP7/AAAAAAAAAAACAP//AAAAAAAAAAADAPz/AAAAAAAAAAADAP3/AAAAAAAAAAADAP7/AAAAAAAAAAADAP//AAAAAAAAAAAEAPz/AAAAAAAAAAAEAP3/AAAAAAAAAAAEAP7/AAAAAAAAAAAEAP//AAAAAAAAAAAFAPz/AAAAAAAAAAAFAP3/AAAAAAAAAAAFAP7/AAAAAAAAAAAFAP//AAAAAAAAAAAGAPz/AAAAAAAAAAAGAP3/AAAAAAAAAAAGAP7/AAAAAAAAAAAGAP//AAAAAAAAAAAHAPz/AAAAAAAAAAAHAP3/AAAAAAAAAAAHAP7/AAAAAAAAAAAHAP//AAAAAAAAAAAIAPz/AAAAAAAAAAAIAP3/AAAAAAAAAAAIAP7/AAAAAAAAAAAIAP//AAAAAAAAAAAJAPz/AAAAAAAAAAAJAP3/AAAAAAAAAAAJAP7/AAAAAAAAAAAJAP//AAAAAAAAAAAKAPz/AAAAAAAAAAAKAP3/AAAAAAAAAAAKAP7/AAAAAAAAAAAKAP//AAAAAAAAAAALAPz/AAAAAAAAAAALAP3/AAAAAAAAAAALAP7/AAAAAAAAAAALAP//AAAAAAAAAAAMAPz/AAAAAAAAAAAMAP3/AAAAAAAAAAAMAP7/AAAAAAAAAAAMAP//AAAAAAAAAAANAPz/AAAAAAAAAAANAP3/AAAAAAAAAAANAP7/AAAAAAAAAAANAP//AAAAAAAAAAAOAPz/AAAAAAAAAAAOAP3/AAAAAAAAAAAOAP7/AAAAAAAAAAAOAP//AAAAAAAAAAAPAPz/AAAAAAAAAAAPAP3/AAAAAAAAAAAPAP7/AAAAAAAAAAAPAP//AAAAAAAAAAAQAPz/AAAAAAAAAAAQAP3/AAAAAAAAAAAQAP7/AAAAAAAAAAAQAP//AAAAAAAAAAARAPz/AAAAAAAAAAARAP3/AAAAAAAAAAARAP7/AAAAAAAAAAARAP//AAAAAAAAAAASAPz/AAAAAAAAAAASAP3/AAAAAAAAAAASAP7/AAAAAAAAAAASAP//AAAAAAAAAAATAPz/AAAAAAAAAAATAP3/AAAAAAAAAAATAP7/AAAAAAAAAAATAP//AAAAAAAAAAAUAPz/AAAAAAAAAAAUAP3/AAAAAAAAAAAUAP7/AAAAAAAAAAAUAP//AAAAAAAAAAAVAPz/AAAAAAAAAAAVAP3/AAAAAAAAAAAVAP7/AAAAAAAAAAAVAP//AAAAAAAAAAAWAPz/AAAAAAAAAAAWAP3/AAAAAAAAAAAWAP7/AAAAAAAAAAAWAP//AAAAAAAAAAAXAPz/AAAAAAAAAAAXAP3/AAAAAAAAAAAXAP7/AAAAAAAAAAAXAP//AAAAAAAAAAAYAPz/AAAAAAAAAAAYAP3/AAAAAAAAAAAYAP7/AAAAAAAAAAAYAP//AAAAAAAAAAAZAPz/AAAAAAAAAAAZAP3/AAAAAAAAAAAZAP7/AAAAAAAAAAAZAP//AAAAAAAAAAAaAPz/AAAAAAAAAAAaAP3/AAAAAAAAAAAaAP7/AAAAAAAAAAAaAP//AAAAAAAAAAAbAPz/AAAAAAAAAAAbAP3/AAAAAAAAAAAbAP7/AAAAAAAAAAAbAP//AAAAAAAAAAAcAPz/AAAAAAAAAAAcAP3/AAAAAAAAAAAcAP7/AAAAAAAAAAAcAP//AAAAAAAAAAAdAPz/AAAAAAAAAAAdAP3/AAAAAAAAAAAdAP7/AAAAAAAAAAAdAP//AAAAAAAAAAAeAPz/AAAAAAAAAAAeAP3/AAAAAAAAAAAeAP7/AAAAAAAAAAAeAP//AAAAAAAAAAAfAPz/AAAAAAAAAAAfAP3/AAAAAAAAAAAfAP7/AAAAAAAAAAAfAP//AAAAAAAAAAAgAPz/AAAAAAAAAAAgAP3/AAAAAAAAAAAgAP7/AAAAAAAAAAAgAP//AAAAAAAAAAAhAPz/AAAAAAAAAAAhAP3/AAAAAAAAAAAhAP7/AAAAAAAAAAAhAP//AAAAAAAAAAAiAPz/AAAAAAAAAAAiAP3/AAAAAAAAAAAiAP7/AAAAAAAAAAAiAP//AAAAAAAAAAAjAPz/AAAAAAAAAAAjAP3/AAAAAAAAAAAjAP7/AAAAAAAAAAAjAP//AAAAAAAAAAAkAPz/AAAAAAAAAAAkAP3/AAAAAAAAAAAkAP7/AAAAAAAAAAAkAP//AAAAAAAAAAAlAPz/AAAAAAAAAAAlAP3/AAAAAAAAAAAlAP7/AAAAAAAAAAAlAP//AAAAAAAAAAAmAPz/AAAAAAAAAAAmAP3/AAAAAAAAAAAmAP7/AAAAAAAAAAAmAP//AAAAAAAAAAAnAPz/AAAAAAAAAAAnAP3/AAAAAAAAAAAnAP7/AAAAAAAAAAAnAP//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAkAAAAAAAAAAAAAAAoAAAAAAAAAAAAAAAsAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAA0AAAAAAAAAAAAAAA4AAAAAAAAAAAAAAA8AAAAAAAAAAAAAABAAAAAAAAAAAAAAABEAAAAAAAAAAAAAABIAAAAAAAAAAAAAABMAAAAAAAAAAAAAABQAAAAAAAAAAAAAABUAAAAAAAAAAAABAAAAAAAAAAAAAAABAAEAAAAAAAAAAAABAAIAAAAAAAAAAAABAAMAAAAAAAAAAAABAAQAAAAAAAAAAAABAAUAAAAAAAAAAAABAAYAAAAAAAAAAAABAAcAAAAAAAAAAAABAAgAAAAAAAAAAAABAAkAAAAAAAAAAAABAAoAAAAAAAAAAAABAAsAAAAAAAAAAAABAAwAAAAAAAAAAAABAA0AAAAAAAAAAAABAA4AAAAAAAAAAAABAA8AAAAAAAAAAAABABAAAAAAAAAAAAABABEAAAAAAAAAAAABABIAAAAAAAAAAAABABMAAAAAAAAAAAABABQAAAAAAAAAAAABABUAAAAAAAAAAAACAAAAAAAAAAAAAAACAAEAAAAAAAAAAAACAAIAAAAAAAAAAAACAAMAAAAAAAAAAAACAAQAAAAAAAAAAAACAAUAAAAAAAAAAAACAAYAAAAAAAAAAAACAAcAAAAAAAAAAAACAAgAAAAAAAAAAAACAAkAAAAAAAAAAAACAAoAAAAAAAAAAAACAAsAAAAAAAAAAAACAAwAAAAAAAAAAAACAA0AAAAAAAAAAAACAA4AAAAAAAAAAAACAA8AAAAAAAAAAAACABAAAAAAAAAAAAACABEAAAAAAAAAAAACABIAAAAAAAAAAAACABMAAAAAAAAAAAACABQAAAAAAAAAAAACABUAAAAAAAAAAAADAAAAAAAAAAAAAAADAAEAAAAAAAAAAAADAAIAAAAAAAAAAAADAAMAAAAAAAAAAAADAAQAAAAAAAAAAAADAAUAAAAAAAAAAAADAAYAAAAAAAAAAAADAAcAAAAAAAAAAAADAAgAAAAAAAAAAAADAAkAAAAAAAAAAAADAAoAAAAAAAAAAAADAAsAAAAAAAAAAAADAAwAAAAAAAAAAAADAA0AAAAAAAAAAAADAA4AAAAAAAAAAAADAA8AAAAAAAAAAAADABAAAAAAAAAAAAADABEAAAAAAAAAAAADABIAAAAAAAAAAAADABMAAAAAAAAAAAADABQAAAAAAAAAAAADABUAAAAAAAAAAAAEAAAAAAAAAAAAAAAEAAEAAAAAAAAAAAAEAAIAAAAAAAAAAAAEAAMAAAAAAAAAAAAEAAQAAAAAAAAAAAAEAAUAAAAAAAAAAAAEAAYAAAAAAAAAAAAEAAcAAAAAAAAAAAAEAAgAAAAAAAAAAAAEAAkAAAAAAAAAAAAEAAoAAAAAAAAAAAAEAAsAAAAAAAAAAAAEAAwAAAAAAAAAAAAEAA0AAAAAAAAAAAAEAA4AAAAAAAAAAAAEAA8AAAAAAAAAAAAEABAAAAAAAAAAAAAEABEAAAAAAAAAAAAEABIAAAAAAAAAAAAEABMAAAAAAAAAAAAEABQAAAAAAAAAAAAEABUAAAAAAAAAAAAFAAAAAAAAAAAAAAAFAAEAAAAAAAAAAAAFAAIAAAAAAAAAAAAFAAMAAAAAAAAAAAAFAAQAAAAAAAAAAAAFAAUAAAAAAAAAAAAFAAYAAAAAAAAAAAAFAAcAAAAAAAAAAAAFAAgAAAAAAAAAAAAFAAkAAAAAAAAAAAAFAAoAAAAAAAAAAAAFAAsAAAAAAAAAAAAFAAwAAAAAAAAAAAAFAA0AAAAAAAAAAAAFAA4AAAAAAAAAAAAFAA8AAAAAAAAAAAAFABAAAAAAAAAAAAAFABEAAAAAAAAAAAAFABIAAAAAAAAAAAAFABMAAAAAAAAAAAAFABQAAAAAAAAAAAAFABUAAAAAAAAAAAAGAAAAAAAAAAAAAAAGAAEAAAAAAAAAAAAGAAIAAAAAAAAAAAAGAAMAAAAAAAAAAAAGAAQAAAAAAAAAAAAGAAUAAAAAAAAAAAAGAAYAAAAAAAAAAAAGAAcAAAAAAAAAAAAGAAgAAAAAAAAAAAAGAAkAAAAAAAAAAAAGAAoAAAAAAAAAAAAGAAsAAAAAAAAAAAAGAAwAAAAAAAAAAAAGAA0AAAAAAAAAAAAGAA4AAAAAAAAAAAAGAA8AAAAAAAAAAAAGABAAAAAAAAAAAAAGABEAAAAAAAAAAAAGABIAAAAAAAAAAAAGABMAAAAAAAAAAAAGABQAAAAAAAAAAAAGABUAAAAAAAAAAAAHAAAAAAAAAAAAAAAHAAEAAAAAAAAAAAAHAAIAAAAAAAAAAAAHAAMAAAAAAAAAAAAHAAQAAAAAAAAAAAAHAAUAAAAAAAAAAAAHAAYAAAAAAAAAAAAHAAcAAAAAAAAAAAAHAAgAAAAAAAAAAAAHAAkAAAAAAAAAAAAHAAoAAAAAAAAAAAAHAAsAAAAAAAAAAAAHAAwAAAAAAAAAAAAHAA0AAAAAAAAAAAAHAA4AAAAAAAAAAAAHAA8AAAAAAAAAAAAHABAAAAAAAAAAAAAHABEAAAAAAAAAAAAHABIAAAAAAAAAAAAHABMAAAAAAAAAAAAHABQAAAAAAAAAAAAHABUAAAAAAAAAAAAIAAAAAAAAAAAAAAAIAAEAAAAAAAAAAAAIAAIAAAAAAAAAAAAIAAMAAAAAAAAAAAAIAAQAAAAAAAAAAAAIAAUAAAAAAAAAAAAIAAYAAAAAAAAAAAAIAAcAAAAAAAAAAAAIAAgAAAAAAAAAAAAIAAkAAAAAAAAAAAAIAAoAAAAAAAAAAAAIAAsAAAAAAAAAAAAIAAwAAAAAAAAAAAAIAA0AAAAAAAAAAAAIAA4AAAAAAAAAAAAIAA8AAAAAAAAAAAAIABAAAAAAAAAAAAAIABEAAAAAAAAAAAAIABIAAAAAAAAAAAAIABMAAAAAAAAAAAAIABQAAAAAAAAAAAAIABUAAAAAAAAAAADi/xIAAAAAAAAAAADi/xMAAAAAAAAAAADi/xQAAAAAAAAAAADi/xUAAAAAAAAAAADj/xIAAAAAAAAAAADj/xMAAAAAAAAAAADj/xQAAAAAAAAAAADj/xUAAAAAAAAAAADk/xIAAAAAAAAAAADk/xMAAAAAAAAAAADk/xQAAAAAAAAAAADk/xUAAAAAAAAAAADl/xIAAAAAAAAAAADl/xMAAAAAAAAAAADl/xQAAAAAAAAAAADl/xUAAAAAAAAAAADm/xIAAAAAAAAAAADm/xMAAAAAAAAAAADm/xQAAAAAAAAAAADm/xUAAAAAAAAAAADn/xIAAAAAAAAAAADn/xMAAAAAAAAAAADn/xQAAAAAAAAAAADn/xUAAAAAAAAAAADo/xIAAAAAAAAAAADo/xMAAAAAAAAAAADo/xQAAAAAAAAAAADo/xUAAAAAAAAAAADp/xIAAAAAAAAAAADp/xMAAAAAAAAAAADp/xQAAAAAAAAAAADp/xUAAAAAAAAAAADq/xIAAAAAAAAAAADq/xMAAAAAAAAAAADq/xQAAAAAAAAAAADq/xUAAAAAAAAAAADr/xIAAAAAAAAAAADr/xMAAAAAAAAAAADr/xQAAAAAAAAAAADr/xUAAAAAAAAAAADs/xIAAAAAAAAAAADs/xMAAAAAAAAAAADs/xQAAAAAAAAAAADs/xUAAAAAAAAAAADt/xIAAAAAAAAAAADt/xMAAAAAAAAAAADt/xQAAAAAAAAAAADt/xUAAAAAAAAAAADu/xIAAAAAAAAAAADu/xMAAAAAAAAAAADu/xQAAAAAAAAAAADu/xUAAAAAAAAAAADv/xIAAAAAAAAAAADv/xMAAAAAAAAAAADv/xQAAAAAAAAAAADv/xUAAAAAAAAAAADw/xIAAAAAAAAAAADw/xMAAAAAAAAAAADw/xQAAAAAAAAAAADw/xUAAAAAAAAAAADx/xIAAAAAAAAAAADx/xMAAAAAAAAAAADx/xQAAAAAAAAAAADx/xUAAAAAAAAAAADy/xIAAAAAAAAAAADy/xMAAAAAAAAAAADy/xQAAAAAAAAAAADy/xUAAAAAAAAAAADz/xIAAAAAAAAAAADz/xMAAAAAAAAAAADz/xQAAAAAAAAAAADz/xUAAAAAAAAAAAD0/xIAAAAAAAAAAAD0/xMAAAAAAAAAAAD0/xQAAAAAAAAAAAD0/xUAAAAAAAAAAAD1/xIAAAAAAAAAAAD1/xMAAAAAAAAAAAD1/xQAAAAAAAAAAAD1/xUAAAAAAAAAAAD2/xIAAAAAAAAAAAD2/xMAAAAAAAAAAAD2/xQAAAAAAAAAAAD2/xUAAAAAAAAAAAD3/xIAAAAAAAAAAAD3/xMAAAAAAAAAAAD3/xQAAAAAAAAAAAD3/xUAAAAAAAAAAAD4/xIAAAAAAAAAAAD4/xMAAAAAAAAAAAD4/xQAAAAAAAAAAAD4/xUAAAAAAAAAAAD5/xIAAAAAAAAAAAD5/xMAAAAAAAAAAAD5/xQAAAAAAAAAAAD5/xUAAAAAAAAAAAD6/xIAAAAAAAAAAAD6/xMAAAAAAAAAAAD6/xQAAAAAAAAAAAD6/xUAAAAAAAAAAAD7/xIAAAAAAAAAAAD7/xMAAAAAAAAAAAD7/xQAAAAAAAAAAAD7/xUAAAAAAAAAAAD8/xIAAAAAAAAAAAD8/xMAAAAAAAAAAAD8/xQAAAAAAAAAAAD8/xUAAAAAAAAAAAD9/xIAAAAAAAAAAAD9/xMAAAAAAAAAAAD9/xQAAAAAAAAAAAD9/xUAAAAAAAAAAAD+/xIAAAAAAAAAAAD+/xMAAAAAAAAAAAD+/xQAAAAAAAAAAAD+/xUAAAAAAAAAAAD//xIAAAAAAAAAAAD//xMAAAAAAAAAAAD//xQAAAAAAAAAAAD//xUAAAAAAAAAAAA=") tile_set = SubResource("TileSet_vaegd") [node name="Player" parent="." instance=ExtResource("2_1r4jh")] -position = Vector2(91, -80) +position = Vector2(227, -76) [node name="Camera2D" type="Camera2D" parent="Player"] +position_smoothing_enabled = true diff --git a/project.godot b/project.godot index 052f80d..62727f8 100644 --- a/project.godot +++ b/project.godot @@ -11,7 +11,8 @@ config_version=5 [application] config/name="TSA" -config/features=PackedStringArray("4.5", "C#", "Forward Plus") +run/main_scene="uid://dtkg88hfvln2d" +config/features=PackedStringArray("4.5", "Forward Plus") config/icon="res://icon.svg" [autoload] @@ -24,11 +25,21 @@ window/size/viewport_width=640 window/size/viewport_height=360 window/size/window_width_override=1280 window/size/window_height_override=720 +window/stretch/mode="viewport" [dotnet] project/assembly_name="TSA" +[file_customization] + +folder_colors={ +"res://Entities/": "orange", +"res://Envoroment/": "yellow", +"res://auto_loads/": "red", +"res://utilities/": "green" +} + [input] move_left={ @@ -56,8 +67,16 @@ force_fall={ "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"location":0,"echo":false,"script":null) ] } -wall_cling={ +dash={ "deadzone": 0.2, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":74,"key_label":0,"unicode":106,"location":0,"echo":false,"script":null) ] } + +[physics] + +common/physics_interpolation=true + +[rendering] + +textures/canvas_textures/default_texture_filter=0