From 28920ef7008bc6bcbb87f51baf2d7f7d870f3a5a Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Wed, 10 May 2023 21:10:09 -0400 Subject: [PATCH] MsX fixes --- objects/npc/msx.gd | 2 +- objects/npc/msx.tscn | 610 ++++--------------------------------------- 2 files changed, 47 insertions(+), 565 deletions(-) diff --git a/objects/npc/msx.gd b/objects/npc/msx.gd index e6d1666..b5cdfc7 100644 --- a/objects/npc/msx.gd +++ b/objects/npc/msx.gd @@ -11,7 +11,7 @@ onready var shard_position = $Position2D const shard = preload("res://objects/collectibles/shard.tscn") func _ready(): - raycast.add_exception($Area2D) + raycast.add_exception($Hitbox) func _physics_process(delta): if is_moving: velocity.x = -50 diff --git a/objects/npc/msx.tscn b/objects/npc/msx.tscn index f256f31..de43564 100644 --- a/objects/npc/msx.tscn +++ b/objects/npc/msx.tscn @@ -1,39 +1,29 @@ -[gd_scene load_steps=29 format=2] +[gd_scene load_steps=16 format=2] [ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=1] -[ext_resource path="res://graphics/npc/msx_give.png" type="Texture" id=2] [ext_resource path="res://graphics/npc/msx_walk.png" type="Texture" id=3] -[ext_resource path="res://graphics/player/sg_shoot_air.png" type="Texture" id=4] -[ext_resource path="res://graphics/player/sg_doublejump.png" type="Texture" id=5] -[ext_resource path="res://graphics/player/sg_climb.png" type="Texture" id=6] -[ext_resource path="res://graphics/player/sg_stab.png" type="Texture" id=7] -[ext_resource path="res://graphics/player/sg_shoot_grounded.png" type="Texture" id=8] -[ext_resource path="res://graphics/player/sword_stab.png" type="Texture" id=9] -[ext_resource path="res://graphics/player/sg_jump.png" type="Texture" id=10] [ext_resource path="res://graphics/npc/msx_idle.png" type="Texture" id=11] [ext_resource path="res://scripts/snap_sprite.gd" type="Script" id=12] [ext_resource path="res://objects/npc/msx.gd" type="Script" id=13] [ext_resource path="res://graphics/particles/blood.png" type="Texture" id=14] +[ext_resource path="res://graphics/npc/msx_give.png" type="Texture" id=15] -[sub_resource type="Animation" id=1] -resource_name = "climb" -length = 0.3 -loop = true -step = 0.15 +[sub_resource type="Animation" id=16] +length = 0.001 tracks/0/type = "value" -tracks/0/path = NodePath("Sprite:region_rect") +tracks/0/path = NodePath("Sprite:texture") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/imported = false tracks/0/enabled = true tracks/0/keys = { -"times": PoolRealArray( 0, 0.15 ), -"transitions": PoolRealArray( 1, 1 ), -"update": 1, -"values": [ Rect2( 0, 0, 20, 20 ), Rect2( 20, 0, 20, 20 ) ] +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ ExtResource( 15 ) ] } tracks/1/type = "value" -tracks/1/path = NodePath("Sprite:texture") +tracks/1/path = NodePath("Sprite:hframes") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/imported = false @@ -41,11 +31,11 @@ tracks/1/enabled = true tracks/1/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ ExtResource( 6 ) ] +"update": 0, +"values": [ 2 ] } tracks/2/type = "value" -tracks/2/path = NodePath("SwordArea/SwordHitBox:disabled") +tracks/2/path = NodePath("Sprite:frame") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/imported = false @@ -53,137 +43,8 @@ tracks/2/enabled = true tracks/2/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ true ] -} -tracks/3/type = "value" -tracks/3/path = NodePath("SwordSprite:texture") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ null ] -} -tracks/4/type = "value" -tracks/4/path = NodePath("Sprite:rotation_degrees") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), "update": 0, -"values": [ 0.0 ] -} - -[sub_resource type="Animation" id=2] -resource_name = "doublejump" -length = 0.3 -loop = true -step = 0.038 -tracks/0/type = "value" -tracks/0/path = NodePath("Sprite:region_rect") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PoolRealArray( 0, 0.038, 0.076, 0.114, 0.152, 0.19, 0.228, 0.266 ), -"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1 ), -"update": 1, -"values": [ Rect2( 0, 0, 20, 20 ), Rect2( 20, 0, 20, 20 ), Rect2( 0, 0, 20, 20 ), Rect2( 20, 0, 20, 20 ), Rect2( 0, 0, 20, 20 ), Rect2( 20, 0, 20, 20 ), Rect2( 0, 0, 20, 20 ), Rect2( 20, 0, 20, 20 ) ] -} -tracks/1/type = "value" -tracks/1/path = NodePath("Sprite:texture") -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": [ ExtResource( 5 ) ] -} -tracks/2/type = "value" -tracks/2/path = NodePath("SwordArea/SwordHitBox:disabled") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ true ] -} -tracks/3/type = "value" -tracks/3/path = NodePath("SwordSprite:texture") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ null ] -} -tracks/4/type = "value" -tracks/4/path = NodePath("Sprite:rotation_degrees") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/keys = { -"times": PoolRealArray( 0, 0.038, 0.076, 0.114, 0.152, 0.19, 0.228, 0.266, 0.3 ), -"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1, 1 ), -"update": 1, -"values": [ 0.0, 0.0, 90.0, 90.0, 180.0, 180.0, 270.0, 270.0, 360.0 ] -} - -[sub_resource type="Animation" id=3] -resource_name = "enter hatch" -tracks/0/type = "value" -tracks/0/path = NodePath("Sprite:offset") -tracks/0/interp = 2 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PoolRealArray( 0, 0.1, 0.3, 0.5 ), -"transitions": PoolRealArray( 1, 1, 1, 1 ), -"update": 0, -"values": [ Vector2( 0, 0 ), Vector2( 0, -6 ), Vector2( 0, 0 ), Vector2( 0, 10 ) ] -} -tracks/1/type = "value" -tracks/1/path = NodePath("Sprite:texture") -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": [ ExtResource( 10 ) ] -} -tracks/2/type = "value" -tracks/2/path = NodePath("Sprite:region_rect") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/keys = { -"times": PoolRealArray( 0, 0.3, 0.5 ), -"transitions": PoolRealArray( 1, 1, 1 ), -"update": 0, -"values": [ Rect2( 1, 0, 20, 20 ), Rect2( 1, 0, 20, 20 ), Rect2( 1, 0, 20, 0 ) ] +"values": [ 0 ] } [sub_resource type="Animation" id=15] @@ -191,19 +52,19 @@ resource_name = "give" length = 0.5 step = 0.06 tracks/0/type = "value" -tracks/0/path = NodePath("Sprite:region_rect") +tracks/0/path = NodePath("Sprite:texture") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/imported = false tracks/0/enabled = true tracks/0/keys = { -"times": PoolRealArray( 0, 0.18, 0.48 ), -"transitions": PoolRealArray( 1, 1, 1 ), +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), "update": 1, -"values": [ Rect2( 0, 0, 20, 20 ), Rect2( 20, 0, 20, 20 ), Rect2( 0, 0, 20, 20 ) ] +"values": [ ExtResource( 15 ) ] } tracks/1/type = "value" -tracks/1/path = NodePath("Sprite:texture") +tracks/1/path = NodePath("Sprite:hframes") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/imported = false @@ -212,52 +73,27 @@ tracks/1/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 1, -"values": [ ExtResource( 2 ) ] +"values": [ 2 ] } tracks/2/type = "value" -tracks/2/path = NodePath("SwordArea/SwordHitBox:disabled") +tracks/2/path = NodePath("Sprite:frame") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/imported = false tracks/2/enabled = true tracks/2/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), +"times": PoolRealArray( 0, 0.18, 0.48 ), +"transitions": PoolRealArray( 1, 1, 1 ), "update": 1, -"values": [ true ] -} -tracks/3/type = "value" -tracks/3/path = NodePath("SwordSprite:texture") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ null ] -} -tracks/4/type = "value" -tracks/4/path = NodePath("Sprite:rotation_degrees") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ 0.0 ] +"values": [ 0, 1, 0 ] } [sub_resource type="Animation" id=4] resource_name = "idle" -length = 0.5 -loop = true +length = 0.001 step = 0.06 tracks/0/type = "value" -tracks/0/path = NodePath("Sprite:region_rect") +tracks/0/path = NodePath("Sprite:texture") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/imported = false @@ -266,76 +102,10 @@ tracks/0/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 1, -"values": [ Rect2( 0, 0, 20, 20 ) ] -} -tracks/1/type = "value" -tracks/1/path = NodePath("Sprite:texture") -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": [ ExtResource( 11 ) ] } -tracks/2/type = "value" -tracks/2/path = NodePath("SwordArea/SwordHitBox:disabled") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ true ] -} -tracks/3/type = "value" -tracks/3/path = NodePath("SwordSprite:texture") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ null ] -} -tracks/4/type = "value" -tracks/4/path = NodePath("Sprite:rotation_degrees") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ 0.0 ] -} - -[sub_resource type="Animation" id=5] -resource_name = "jump" -length = 0.5 -loop = true -step = 0.06 -tracks/0/type = "value" -tracks/0/path = NodePath("Sprite:region_rect") -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": [ Rect2( 1, 0, 20, 20 ) ] -} tracks/1/type = "value" -tracks/1/path = NodePath("Sprite:texture") +tracks/1/path = NodePath("Sprite:hframes") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/imported = false @@ -344,10 +114,10 @@ tracks/1/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 1, -"values": [ ExtResource( 10 ) ] +"values": [ 1 ] } tracks/2/type = "value" -tracks/2/path = NodePath("SwordArea/SwordHitBox:disabled") +tracks/2/path = NodePath("Sprite:frame") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/imported = false @@ -356,266 +126,7 @@ tracks/2/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 1, -"values": [ true ] -} -tracks/3/type = "value" -tracks/3/path = NodePath("SwordSprite:texture") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ null ] -} -tracks/4/type = "value" -tracks/4/path = NodePath("Sprite:rotation_degrees") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ 0.0 ] -} - -[sub_resource type="Animation" id=6] -resource_name = "shoot air" -length = 0.5 -step = 0.06 -tracks/0/type = "value" -tracks/0/path = NodePath("Sprite:region_rect") -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": [ Rect2( 0, 0, 20, 20 ) ] -} -tracks/1/type = "value" -tracks/1/path = NodePath("Sprite:texture") -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": [ ExtResource( 4 ) ] -} -tracks/2/type = "value" -tracks/2/path = NodePath("SwordArea/SwordHitBox:disabled") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ true ] -} -tracks/3/type = "value" -tracks/3/path = NodePath("SwordSprite:texture") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ null ] -} -tracks/4/type = "value" -tracks/4/path = NodePath("Sprite:rotation_degrees") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ 0.0 ] -} -tracks/5/type = "method" -tracks/5/path = NodePath(".") -tracks/5/interp = 1 -tracks/5/loop_wrap = true -tracks/5/imported = false -tracks/5/enabled = true -tracks/5/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"values": [ { -"args": [ ], -"method": "spawn_arrow" -} ] -} - -[sub_resource type="Animation" id=7] -resource_name = "shoot grounded" -length = 0.25 -step = 0.06 -tracks/0/type = "value" -tracks/0/path = NodePath("Sprite:region_rect") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PoolRealArray( 0, 0.03, 0.06, 0.12, 0.15, 0.18 ), -"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1 ), -"update": 1, -"values": [ Rect2( 0, 0, 20, 20 ), Rect2( 20, 0, 20, 20 ), Rect2( 40, 0, 20, 20 ), Rect2( 60, 0, 20, 20 ), Rect2( 80, 0, 20, 20 ), Rect2( 100, 0, 20, 20 ) ] -} -tracks/1/type = "value" -tracks/1/path = NodePath("Sprite:texture") -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": [ ExtResource( 8 ) ] -} -tracks/2/type = "value" -tracks/2/path = NodePath("SwordArea/SwordHitBox:disabled") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ true ] -} -tracks/3/type = "value" -tracks/3/path = NodePath("SwordSprite:texture") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/keys = { -"times": PoolRealArray( ), -"transitions": PoolRealArray( ), -"update": 1, -"values": [ ] -} -tracks/4/type = "value" -tracks/4/path = NodePath("Sprite:rotation_degrees") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ 0.0 ] -} -tracks/5/type = "method" -tracks/5/path = NodePath(".") -tracks/5/interp = 1 -tracks/5/loop_wrap = true -tracks/5/imported = false -tracks/5/enabled = true -tracks/5/keys = { -"times": PoolRealArray( 0.12 ), -"transitions": PoolRealArray( 1 ), -"values": [ { -"args": [ ], -"method": "spawn_arrow" -} ] -} - -[sub_resource type="Animation" id=8] -resource_name = "stab" -length = 0.3 -step = 0.06 -tracks/0/type = "value" -tracks/0/path = NodePath("Sprite:region_rect") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PoolRealArray( 0, 0.06 ), -"transitions": PoolRealArray( 1, 1 ), -"update": 1, -"values": [ Rect2( 0, 0, 32, 32 ), Rect2( 32, 0, 32, 32 ) ] -} -tracks/1/type = "value" -tracks/1/path = NodePath("Sprite:texture") -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": [ ExtResource( 7 ) ] -} -tracks/2/type = "value" -tracks/2/path = NodePath("SwordArea/SwordHitBox:disabled") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/keys = { -"times": PoolRealArray( 0, 0.06 ), -"transitions": PoolRealArray( 1, 1 ), -"update": 1, -"values": [ true, false ] -} -tracks/3/type = "value" -tracks/3/path = NodePath("SwordSprite:texture") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ ExtResource( 9 ) ] -} -tracks/4/type = "value" -tracks/4/path = NodePath("SwordSprite:region_rect") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/keys = { -"times": PoolRealArray( 0, 0.06 ), -"transitions": PoolRealArray( 1, 1 ), -"update": 1, -"values": [ Rect2( 0, 0, 32, 32 ), Rect2( 32, 0, 32, 32 ) ] -} -tracks/5/type = "value" -tracks/5/path = NodePath("Sprite:rotation_degrees") -tracks/5/interp = 1 -tracks/5/loop_wrap = true -tracks/5/imported = false -tracks/5/enabled = true -tracks/5/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ 0.0 ] +"values": [ 0 ] } [sub_resource type="Animation" id=9] @@ -623,19 +134,19 @@ resource_name = "walk" length = 0.4 loop = true tracks/0/type = "value" -tracks/0/path = NodePath("Sprite:region_rect") +tracks/0/path = NodePath("Sprite:texture") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/imported = false tracks/0/enabled = true tracks/0/keys = { -"times": PoolRealArray( 0, 0.1, 0.2, 0.3 ), -"transitions": PoolRealArray( 1, 1, 1, 1 ), +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), "update": 1, -"values": [ Rect2( 0, 0, 20, 20 ), Rect2( 20, 0, 20, 20 ), Rect2( 40, 0, 20, 20 ), Rect2( 60, 0, 20, 20 ) ] +"values": [ ExtResource( 3 ) ] } tracks/1/type = "value" -tracks/1/path = NodePath("Sprite:texture") +tracks/1/path = NodePath("Sprite:hframes") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/imported = false @@ -644,43 +155,19 @@ tracks/1/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 1, -"values": [ ExtResource( 3 ) ] +"values": [ 4 ] } tracks/2/type = "value" -tracks/2/path = NodePath("SwordArea/SwordHitBox:disabled") +tracks/2/path = NodePath("Sprite:frame") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/imported = false tracks/2/enabled = true tracks/2/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), +"times": PoolRealArray( 0, 0.1, 0.2, 0.3 ), +"transitions": PoolRealArray( 1, 1, 1, 1 ), "update": 1, -"values": [ true ] -} -tracks/3/type = "value" -tracks/3/path = NodePath("SwordSprite:texture") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ null ] -} -tracks/4/type = "value" -tracks/4/path = NodePath("Sprite:rotation_degrees") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ 0.0 ] +"values": [ 0, 1, 2, 3 ] } [sub_resource type="ShaderMaterial" id=10] @@ -704,30 +191,24 @@ script = ExtResource( 13 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="."] autoplay = "idle" -anims/climb = SubResource( 1 ) -anims/doublejump = SubResource( 2 ) -"anims/enter hatch" = SubResource( 3 ) +anims/RESET = SubResource( 16 ) anims/give = SubResource( 15 ) anims/idle = SubResource( 4 ) -anims/jump = SubResource( 5 ) -"anims/shoot air" = SubResource( 6 ) -"anims/shoot grounded" = SubResource( 7 ) -anims/stab = SubResource( 8 ) anims/walk = SubResource( 9 ) [node name="Sprite" type="Sprite" parent="."] material = SubResource( 10 ) -texture = ExtResource( 2 ) -region_enabled = true +texture = ExtResource( 15 ) +hframes = 2 region_rect = Rect2( 0, 0, 20, 20 ) script = ExtResource( 12 ) -[node name="Area2D" type="Area2D" parent="." groups=["msx"]] +[node name="Hitbox" type="Area2D" parent="." groups=["msx", "player_hitbox"]] position = Vector2( 0, 3 ) collision_layer = 11 collision_mask = 33 -[node name="CollisionShape2D2" type="CollisionShape2D" parent="Area2D"] +[node name="CollisionShape2D2" type="CollisionShape2D" parent="Hitbox"] position = Vector2( 0.5, 2 ) shape = SubResource( 11 ) @@ -759,6 +240,7 @@ scale_amount_random = 1.0 scale_amount_curve = SubResource( 13 ) [node name="RayCast2D" type="RayCast2D" parent="."] +position = Vector2( 0, 1 ) enabled = true cast_to = Vector2( 32, 0 ) collision_mask = 3