From 6946592a6ea4bd22a1db32add57da3b95402af28 Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Wed, 10 May 2023 19:50:01 -0400 Subject: [PATCH] msx is now a stinky catgirl --- graphics/npc/msx_give.png | Bin 0 -> 411 bytes graphics/npc/msx_give.png.import | 35 +++++++++++++ graphics/npc/msx_idle.png | Bin 0 -> 305 bytes graphics/npc/msx_idle.png.import | 35 +++++++++++++ graphics/npc/msx_walk.png | Bin 0 -> 439 bytes graphics/npc/msx_walk.png.import | 35 +++++++++++++ objects/npc/msx.gd | 2 +- objects/npc/msx.tscn | 84 +++++++++++++++++++++++++++---- 8 files changed, 180 insertions(+), 11 deletions(-) create mode 100644 graphics/npc/msx_give.png create mode 100644 graphics/npc/msx_give.png.import create mode 100644 graphics/npc/msx_idle.png create mode 100644 graphics/npc/msx_idle.png.import create mode 100644 graphics/npc/msx_walk.png create mode 100644 graphics/npc/msx_walk.png.import diff --git a/graphics/npc/msx_give.png b/graphics/npc/msx_give.png new file mode 100644 index 0000000000000000000000000000000000000000..49a514cd810093543e8fca2dc3321a4cfc15c6a5 GIT binary patch literal 411 zcmV;M0c8G(P)! zze~eF7>1vU&Q`@y$<(EagR4WkBpI?6`~#v>JNe^}DDCEA$>`?blA$dKf{RNQac~gH zRNUgCxSc~uu%*f6E*9+zA$*tc)3$_4Julvp3T*mb)Lb53Nd-Jh!~P(X zQIt2cg9{Ur~|865Tpd<6kPy-u&$z;N88Rxzi`lV-5jY@|Lv zzPMJ-peiqS1`Wqe{b*i>4sSUPF#TfadkHl3J+1EP@N$ir-JLyJwF)ra1{jY6)3$_; zNfn+HesX#)01o%Jxx9U3wOpp#Y3DXol$V*o7jZBE8B9JgdRuG%REI6K%B0QYYn z06e^WY9A0C-oO7@kanY5ttP=8jYa@OQKa3)-{$?fz5&X{>qINle*FLd002ovPDHLk FV1l`;yrlpD literal 0 HcmV?d00001 diff --git a/graphics/npc/msx_give.png.import b/graphics/npc/msx_give.png.import new file mode 100644 index 0000000..9106f57 --- /dev/null +++ b/graphics/npc/msx_give.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/msx_give.png-ae86958a670c41e2764ea07957b7c651.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/npc/msx_give.png" +dest_files=[ "res://.import/msx_give.png-ae86958a670c41e2764ea07957b7c651.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/graphics/npc/msx_idle.png b/graphics/npc/msx_idle.png new file mode 100644 index 0000000000000000000000000000000000000000..f0d8c69c358a3a5bd4194f78dc302a4ce8c73263 GIT binary patch literal 305 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQajKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikd1AIbU-8|fZ%m-WM{5X5|tfOObN!jV;Q&LjWZnTwMII_IdM$|%uOIur8 zP*4!4EcxL%5XD~-Gh-o8inG8YvY3H^?=T269?xHq0u(Irba4#P2yQ*q z&DWs7!5XmO#lmC%>+>2`ti6-;xbQr~%#a0ZuhqU{lHI2Jt7O&FgPDD^1RA&4mPUtN zs;lD)SZls$v7^Eb^`u&v`3L?z+quvn-}?C72|q2=chpbxn5e|#lU}!Y$&}(b_7Pq? f*X^+G6WYnxaZ#W!MoX9-XghlCsmwr=+B$-DoSjaAbL@ji`kRm$tUH zpr9a7S@OekAd0^v$S?Rm3ShW$XU0OH6lZ})WHAE+-+mBgv|tTZ0Sf-`ba4!^@L$^( zD0EnX!{zF=Z5NOHmfya@qapA2#gpeGo^I6Pe4A95u>V@56VJ(CKfJ>i`0t-CP<+_= z+;*#$Wjo#_Et(;n<|~{j!o2XIy`=eyE<+Wo&F`FeSc4YUY`%E&?YtLr+>TrjdLG?7 zVc8Xfgo4hmD-T#KD5^_z*8A|KP`MYIO#CTz)T^{Q2?BpLW<&tS?|Ihn?}$8GIi#;Ctet`pVY R?F5DagQu&X%Q~loCIGRXyP5z1 literal 0 HcmV?d00001 diff --git a/graphics/npc/msx_walk.png.import b/graphics/npc/msx_walk.png.import new file mode 100644 index 0000000..83fdbd5 --- /dev/null +++ b/graphics/npc/msx_walk.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/msx_walk.png-02e0194c211bff92277c716918f63d22.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/npc/msx_walk.png" +dest_files=[ "res://.import/msx_walk.png-02e0194c211bff92277c716918f63d22.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/objects/npc/msx.gd b/objects/npc/msx.gd index 5d0c4a5..e6d1666 100644 --- a/objects/npc/msx.gd +++ b/objects/npc/msx.gd @@ -26,10 +26,10 @@ func _physics_process(delta): anims.play("walk") #Stop at the end of path and give shard if position.x <= 80: - Console.print(Game.shards_collected) is_moving = false velocity.x = 0 if is_holding_shard: + anims.play("give") var ShardInstance = shard.instance() ShardInstance.global_position = Vector2(shard_position.global_position.x,shard_position.global_position.y) ShardInstance.number = 1 diff --git a/objects/npc/msx.tscn b/objects/npc/msx.tscn index b79e23b..f256f31 100644 --- a/objects/npc/msx.tscn +++ b/objects/npc/msx.tscn @@ -1,8 +1,8 @@ -[gd_scene load_steps=28 format=2] +[gd_scene load_steps=29 format=2] -[ext_resource path="res://graphics/player/sg_walk.png" type="Texture" id=1] -[ext_resource path="res://graphics/player/sg_idle.png" type="Texture" id=2] -[ext_resource path="res://graphics/player/pal_purplearmor.png" type="Texture" id=3] +[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] @@ -10,7 +10,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://shaders/recolor_border.shader" type="Shader" id=11] +[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] @@ -186,6 +186,71 @@ tracks/2/keys = { "values": [ Rect2( 1, 0, 20, 20 ), Rect2( 1, 0, 20, 20 ), Rect2( 1, 0, 20, 0 ) ] } +[sub_resource type="Animation" id=15] +resource_name = "give" +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, 0.18, 0.48 ), +"transitions": PoolRealArray( 1, 1, 1 ), +"update": 1, +"values": [ Rect2( 0, 0, 20, 20 ), Rect2( 20, 0, 20, 20 ), 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( 2 ) ] +} +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=4] resource_name = "idle" length = 0.5 @@ -213,7 +278,7 @@ tracks/1/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 1, -"values": [ ExtResource( 2 ) ] +"values": [ ExtResource( 11 ) ] } tracks/2/type = "value" tracks/2/path = NodePath("SwordArea/SwordHitBox:disabled") @@ -579,7 +644,7 @@ tracks/1/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 1, -"values": [ ExtResource( 1 ) ] +"values": [ ExtResource( 3 ) ] } tracks/2/type = "value" tracks/2/path = NodePath("SwordArea/SwordHitBox:disabled") @@ -620,10 +685,9 @@ tracks/4/keys = { [sub_resource type="ShaderMaterial" id=10] resource_local_to_scene = true -shader = ExtResource( 11 ) +shader = ExtResource( 1 ) shader_param/border_color = Color( 0, 0, 0, 1 ) shader_param/border_corners = true -shader_param/palette = ExtResource( 3 ) [sub_resource type="RectangleShape2D" id=11] extents = Vector2( 2.5, 5 ) @@ -643,6 +707,7 @@ autoplay = "idle" anims/climb = SubResource( 1 ) anims/doublejump = SubResource( 2 ) "anims/enter hatch" = SubResource( 3 ) +anims/give = SubResource( 15 ) anims/idle = SubResource( 4 ) anims/jump = SubResource( 5 ) "anims/shoot air" = SubResource( 6 ) @@ -651,7 +716,6 @@ anims/stab = SubResource( 8 ) anims/walk = SubResource( 9 ) [node name="Sprite" type="Sprite" parent="."] -modulate = Color( 0, 1, 0.298039, 1 ) material = SubResource( 10 ) texture = ExtResource( 2 ) region_enabled = true