unoragnize to merge

2021-11-29 13:05:00 -06:00
parent 6bf3263115
commit 3a3d987ee3
50 changed files with 1072 additions and 46 deletions
--- a/Player/Player.gd
+++ b/Player/Player.gd
@@ -0,0 +1,41 @@
+extends KinematicBody2D
+
+const ACCELERATION = 1000
+const MAX_SPEED = 120
+const FRICTION = 1000
+
+var velocity: Vector2 = Vector2.ZERO
+var isDash = false
+var counter = 0
+
+
+func _physics_process(delta) -> void:
+	var input_vector: Vector2 = Vector2.ZERO
+
+	input_vector.x = Input.get_action_strength('player_right') - Input.get_action_strength('player_left')
+	input_vector.y = Input.get_action_strength('player_down') - Input.get_action_strength('player_up')
+	input_vector = input_vector.normalized()
+
+	if input_vector != Vector2.ZERO:
+		$AnimationTree.set('parameters/Idle/blend_position', input_vector)
+		velocity = velocity.move_toward(input_vector * MAX_SPEED, ACCELERATION * delta)
+	else:
+		velocity = velocity.move_toward(Vector2.ZERO, FRICTION * delta)
+	
+	# if dashing, increase velocity by 4 for one frame	
+	if Input.is_action_just_pressed("player_dash") and input_vector != Vector2.ZERO and isDash == false:
+		velocity = velocity * 4
+		isDash = true
+	
+	# If the dash was previously pressed, start a counter	
+	if isDash:
+		counter += 1
+		
+		# wait time before you can dash again
+		if counter > 60:
+			counter = 0
+			isDash = false
+		
+
+	velocity = move_and_slide(velocity)
+	return
--- a/Player/Player.tscn
+++ b/Player/Player.tscn
@@ -0,0 +1,212 @@
+[gd_scene load_steps=19 format=2]
+
+[ext_resource path="res://Player/Player.gd" type="Script" id=1]
+[ext_resource path="res://Sprites/Player.png" type="Texture" id=2]
+[ext_resource path="res://Sprites/Player_Down.png" type="Texture" id=3]
+[ext_resource path="res://Sprites/Player_Up.png" type="Texture" id=4]
+
+[sub_resource type="SpriteFrames" id=1]
+animations = [ {
+"frames": [ ExtResource( 4 ) ],
+"loop": false,
+"name": "look_up",
+"speed": 5.0
+}, {
+"frames": [ ExtResource( 2 ) ],
+"loop": false,
+"name": "look_right",
+"speed": 5.0
+}, {
+"frames": [ ExtResource( 2 ) ],
+"loop": false,
+"name": "look_left",
+"speed": 5.0
+}, {
+"frames": [ ExtResource( 3 ) ],
+"loop": false,
+"name": "look_down",
+"speed": 5.0
+} ]
+
+[sub_resource type="CapsuleShape2D" id=2]
+radius = 3.0
+height = 5.0
+
+[sub_resource type="CapsuleShape2D" id=3]
+radius = 5.5
+height = 3.75
+
+[sub_resource type="Animation" id=4]
+resource_name = "Look Down"
+length = 0.001
+tracks/0/type = "value"
+tracks/0/path = NodePath("Sprite:animation")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ "look_down" ]
+}
+tracks/1/type = "value"
+tracks/1/path = NodePath("Sprite:flip_h")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ false ]
+}
+
+[sub_resource type="Animation" id=5]
+length = 0.001
+tracks/0/type = "value"
+tracks/0/path = NodePath("Sprite:animation")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ "look_right" ]
+}
+tracks/1/type = "value"
+tracks/1/path = NodePath("Sprite:flip_h")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ true ]
+}
+
+[sub_resource type="Animation" id=6]
+length = 0.001
+tracks/0/type = "value"
+tracks/0/path = NodePath("Sprite:animation")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ "look_right" ]
+}
+tracks/1/type = "value"
+tracks/1/path = NodePath("Sprite:flip_h")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ false ]
+}
+
+[sub_resource type="Animation" id=7]
+resource_name = "Look Up"
+length = 0.001
+tracks/0/type = "value"
+tracks/0/path = NodePath("Sprite:animation")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ "look_up" ]
+}
+tracks/1/type = "value"
+tracks/1/path = NodePath("Sprite:flip_h")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ false ]
+}
+
+[sub_resource type="AnimationNodeAnimation" id=8]
+animation = "Look Left"
+
+[sub_resource type="AnimationNodeAnimation" id=9]
+animation = "Look Down"
+
+[sub_resource type="AnimationNodeAnimation" id=10]
+animation = "Look Right"
+
+[sub_resource type="AnimationNodeAnimation" id=11]
+animation = "Look Up"
+
+[sub_resource type="AnimationNodeBlendSpace2D" id=12]
+blend_point_0/node = SubResource( 8 )
+blend_point_0/pos = Vector2( -1.01, 0 )
+blend_point_1/node = SubResource( 9 )
+blend_point_1/pos = Vector2( 0, 1.1 )
+blend_point_2/node = SubResource( 10 )
+blend_point_2/pos = Vector2( 1, 0 )
+blend_point_3/node = SubResource( 11 )
+blend_point_3/pos = Vector2( 0, -1.1 )
+min_space = Vector2( -1.01, -1.1 )
+max_space = Vector2( 1, 1.1 )
+blend_mode = 1
+
+[sub_resource type="AnimationNodeStateMachine" id=13]
+states/Idle/node = SubResource( 12 )
+states/Idle/position = Vector2( -2901.63, -177 )
+start_node = "Idle"
+graph_offset = Vector2( -3591.37, -302.6 )
+
+[sub_resource type="AnimationNodeStateMachinePlayback" id=14]
+
+[node name="Player" type="KinematicBody2D"]
+script = ExtResource( 1 )
+
+[node name="Sprite" type="AnimatedSprite" parent="."]
+position = Vector2( 0, -5 )
+frames = SubResource( 1 )
+animation = "look_right"
+
+[node name="Collision" type="CollisionShape2D" parent="."]
+visible = false
+rotation = 1.5708
+shape = SubResource( 2 )
+
+[node name="Hitbox" type="CollisionShape2D" parent="."]
+visible = false
+position = Vector2( 0, -5 )
+shape = SubResource( 3 )
+
+[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
+autoplay = "Look Right"
+"anims/Look Down" = SubResource( 4 )
+"anims/Look Left" = SubResource( 5 )
+"anims/Look Right" = SubResource( 6 )
+"anims/Look Up" = SubResource( 7 )
+
+[node name="AnimationTree" type="AnimationTree" parent="."]
+tree_root = SubResource( 13 )
+anim_player = NodePath("../AnimationPlayer")
+active = true
+parameters/playback = SubResource( 14 )
+parameters/Idle/blend_position = Vector2( 0.993787, 0.0189655 )