mirror of
https://gitlab.com/MaddoScientisto/cirnogodot.git
synced 2026-06-06 11:46:04 +00:00
Made Cirno float
This commit is contained in:
parent
b720990fe2
commit
98af0dc1ea
12 changed files with 349 additions and 13 deletions
168
Resources/Sprites/player_float.tres
Normal file
168
Resources/Sprites/player_float.tres
Normal file
|
|
@ -0,0 +1,168 @@
|
|||
[gd_resource type="SpriteFrames" load_steps=20 format=3 uid="uid://c6exoa8pxbc6w"]
|
||||
|
||||
[ext_resource type="Texture2D" uid="uid://bvjyivjk530r5" path="res://Sprites/Actors/Cirno_Surprised.png" id="1_h5qtm"]
|
||||
[ext_resource type="Texture2D" uid="uid://calorbo7lwx72" path="res://Sprites/Actors/Cirno_Drowning.png" id="2_3oya7"]
|
||||
[ext_resource type="Texture2D" uid="uid://sgp57e3tsg35" path="res://Sprites/Actors/Cirno_Float.png" id="4_3oya7"]
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_qt0xq"]
|
||||
atlas = ExtResource("1_h5qtm")
|
||||
region = Rect2(0, 0, 16, 16)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_j8jir"]
|
||||
atlas = ExtResource("1_h5qtm")
|
||||
region = Rect2(16, 0, 16, 16)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_6sqmb"]
|
||||
atlas = ExtResource("2_3oya7")
|
||||
region = Rect2(0, 0, 16, 16)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_bl8yu"]
|
||||
atlas = ExtResource("2_3oya7")
|
||||
region = Rect2(16, 0, 16, 16)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_a680j"]
|
||||
atlas = ExtResource("2_3oya7")
|
||||
region = Rect2(32, 0, 16, 16)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_cab7f"]
|
||||
atlas = ExtResource("2_3oya7")
|
||||
region = Rect2(48, 0, 16, 16)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_la2t0"]
|
||||
atlas = ExtResource("2_3oya7")
|
||||
region = Rect2(64, 0, 16, 16)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_eqxxe"]
|
||||
atlas = ExtResource("2_3oya7")
|
||||
region = Rect2(80, 0, 16, 16)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_7j3x3"]
|
||||
atlas = ExtResource("2_3oya7")
|
||||
region = Rect2(96, 0, 16, 16)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_j4qq6"]
|
||||
atlas = ExtResource("2_3oya7")
|
||||
region = Rect2(112, 0, 16, 16)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_34li8"]
|
||||
atlas = ExtResource("2_3oya7")
|
||||
region = Rect2(128, 0, 16, 16)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_h5qtm"]
|
||||
atlas = ExtResource("4_3oya7")
|
||||
region = Rect2(0, 0, 16, 16)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_wmdd2"]
|
||||
atlas = ExtResource("4_3oya7")
|
||||
region = Rect2(0, 0, 16, 16)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_yc63g"]
|
||||
atlas = ExtResource("4_3oya7")
|
||||
region = Rect2(0, 32, 16, 16)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_dkdbe"]
|
||||
atlas = ExtResource("4_3oya7")
|
||||
region = Rect2(0, 48, 16, 16)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_ca0vm"]
|
||||
atlas = ExtResource("4_3oya7")
|
||||
region = Rect2(0, 16, 16, 16)
|
||||
|
||||
[resource]
|
||||
animations = [{
|
||||
"frames": [{
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_qt0xq")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_j8jir")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_qt0xq")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_j8jir")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_qt0xq")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_j8jir")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_6sqmb")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_bl8yu")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_a680j")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_cab7f")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_la2t0")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_eqxxe")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_7j3x3")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_7j3x3")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_j4qq6")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_34li8")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": null
|
||||
}],
|
||||
"loop": false,
|
||||
"name": &"Drowning",
|
||||
"speed": 5.0
|
||||
}, {
|
||||
"frames": [{
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_h5qtm")
|
||||
}],
|
||||
"loop": true,
|
||||
"name": &"idle",
|
||||
"speed": 5.0
|
||||
}, {
|
||||
"frames": [{
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_wmdd2")
|
||||
}],
|
||||
"loop": true,
|
||||
"name": &"walk_down",
|
||||
"speed": 8.0
|
||||
}, {
|
||||
"frames": [{
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_yc63g")
|
||||
}],
|
||||
"loop": true,
|
||||
"name": &"walk_left",
|
||||
"speed": 8.0
|
||||
}, {
|
||||
"frames": [{
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_dkdbe")
|
||||
}],
|
||||
"loop": true,
|
||||
"name": &"walk_right",
|
||||
"speed": 8.0
|
||||
}, {
|
||||
"frames": [{
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_ca0vm")
|
||||
}],
|
||||
"loop": true,
|
||||
"name": &"walk_up",
|
||||
"speed": 8.0
|
||||
}]
|
||||
74
Resources/Sprites/player_float_legs.tres
Normal file
74
Resources/Sprites/player_float_legs.tres
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
[gd_resource type="SpriteFrames" load_steps=7 format=3 uid="uid://byb4cbb23cawf"]
|
||||
|
||||
[ext_resource type="Texture2D" uid="uid://b0yaotgm0622f" path="res://Sprites/Actors/Cirno_Float_Legs.png" id="1_kh0jv"]
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_acxb7"]
|
||||
atlas = ExtResource("1_kh0jv")
|
||||
region = Rect2(0, 0, 16, 16)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_rmmtq"]
|
||||
atlas = ExtResource("1_kh0jv")
|
||||
region = Rect2(0, 0, 16, 16)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_xf58l"]
|
||||
atlas = ExtResource("1_kh0jv")
|
||||
region = Rect2(0, 32, 16, 16)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_1jl6q"]
|
||||
atlas = ExtResource("1_kh0jv")
|
||||
region = Rect2(0, 48, 16, 16)
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_vtgdn"]
|
||||
atlas = ExtResource("1_kh0jv")
|
||||
region = Rect2(0, 16, 16, 16)
|
||||
|
||||
[resource]
|
||||
animations = [{
|
||||
"frames": [{
|
||||
"duration": 1.0,
|
||||
"texture": null
|
||||
}],
|
||||
"loop": false,
|
||||
"name": &"Drowning",
|
||||
"speed": 5.0
|
||||
}, {
|
||||
"frames": [{
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_acxb7")
|
||||
}],
|
||||
"loop": true,
|
||||
"name": &"idle",
|
||||
"speed": 5.0
|
||||
}, {
|
||||
"frames": [{
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_rmmtq")
|
||||
}],
|
||||
"loop": true,
|
||||
"name": &"walk_down",
|
||||
"speed": 8.0
|
||||
}, {
|
||||
"frames": [{
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_xf58l")
|
||||
}],
|
||||
"loop": true,
|
||||
"name": &"walk_left",
|
||||
"speed": 8.0
|
||||
}, {
|
||||
"frames": [{
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_1jl6q")
|
||||
}],
|
||||
"loop": true,
|
||||
"name": &"walk_right",
|
||||
"speed": 8.0
|
||||
}, {
|
||||
"frames": [{
|
||||
"duration": 1.0,
|
||||
"texture": SubResource("AtlasTexture_vtgdn")
|
||||
}],
|
||||
"loop": true,
|
||||
"name": &"walk_up",
|
||||
"speed": 8.0
|
||||
}]
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
[gd_scene load_steps=88 format=3 uid="uid://c4pr2707hbeph"]
|
||||
[gd_scene load_steps=89 format=3 uid="uid://c4pr2707hbeph"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://d2ubk5gucny6s" path="res://Scripts/Components/FSM/PlayerFSMProxy.cs" id="1_g3wua"]
|
||||
[ext_resource type="Script" uid="uid://bw2hakslndaxm" path="res://Scripts/Components/FSM/PlayerStateMachine.cs" id="1_mpmil"]
|
||||
|
|
@ -7,7 +7,6 @@
|
|||
[ext_resource type="Script" uid="uid://bo6xcjnw3yn6s" path="res://Scripts/Components/FSM/Player/Dead.cs" id="4_0pqs8"]
|
||||
[ext_resource type="Material" uid="uid://dnvwgyt2tbqmr" path="res://Resources/Materials/Player_Blink_Teleport_Material.tres" id="4_5qlss"]
|
||||
[ext_resource type="Script" uid="uid://dn2rrgw3e027b" path="res://Scripts/Components/FSM/Player/Cutscene.cs" id="4_22ff8"]
|
||||
[ext_resource type="SpriteFrames" uid="uid://bc7mghjx75qip" path="res://Resources/Sprites/player.tres" id="4_s0ir4"]
|
||||
[ext_resource type="Script" uid="uid://b4nixnxhj5qhw" path="res://Scripts/Components/Actors/PlayerWeaponProvider.cs" id="5_gp3hw"]
|
||||
[ext_resource type="Script" uid="uid://b0khv2fcrgm6t" path="res://Scripts/Components/FSM/Player/Teleporting.cs" id="5_yifvs"]
|
||||
[ext_resource type="Script" uid="uid://br2ev58gwuvu4" path="res://Scripts/Components/FSM/Player/UnTeleporting.cs" id="6_7n10g"]
|
||||
|
|
@ -21,8 +20,10 @@
|
|||
[ext_resource type="Script" uid="uid://3jxrxcqp3ndr" path="res://Scripts/Components/Actors/PlayerHitboxSpriteProvider.cs" id="10_gp3hw"]
|
||||
[ext_resource type="Texture2D" uid="uid://cvngivvogv17l" path="res://Sprites/Actors/Cirno-Shadow.png" id="11_m1iep"]
|
||||
[ext_resource type="Texture2D" uid="uid://bwjrdlnysft15" path="res://Sprites/Actors/Focus_Circle.png" id="12_8dcio"]
|
||||
[ext_resource type="SpriteFrames" uid="uid://c6exoa8pxbc6w" path="res://Resources/Sprites/player_float.tres" id="13_ckpe7"]
|
||||
[ext_resource type="Texture2D" uid="uid://bf37ce6jskdel" path="res://Sprites/SmallHitbox.png" id="13_pmkfo"]
|
||||
[ext_resource type="Script" uid="uid://dkmsw828qwikk" path="res://Scripts/Components/Actors/PlayerDamageReceiver.cs" id="14_igu66"]
|
||||
[ext_resource type="SpriteFrames" uid="uid://byb4cbb23cawf" path="res://Resources/Sprites/player_float_legs.tres" id="14_p5rkw"]
|
||||
[ext_resource type="Script" uid="uid://cqwvssstkrdmw" path="res://Scripts/Components/Actors/ActorResourceProvider.cs" id="15_5qlss"]
|
||||
[ext_resource type="Texture2D" uid="uid://cf2855sd3hqty" path="res://Sprites/Actors/Aiming_Reticule_Small.png" id="19_fnw0c"]
|
||||
[ext_resource type="Texture2D" uid="uid://bc4tp44e00g0d" path="res://Sprites/Actors/Focus_Square.png" id="20_3ho10"]
|
||||
|
|
@ -389,19 +390,25 @@ script = ExtResource("10_es1gk")
|
|||
_animationProvider = NodePath("../../AnimationProvider")
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
|
||||
visible = false
|
||||
shape = SubResource("CircleShape2D_b3hxm")
|
||||
|
||||
[node name="Shadow" type="Sprite2D" parent="."]
|
||||
modulate = Color(1, 1, 1, 0.227451)
|
||||
position = Vector2(0, 2)
|
||||
modulate = Color(1, 1, 1, 0.372549)
|
||||
position = Vector2(0, 4)
|
||||
texture = ExtResource("11_m1iep")
|
||||
|
||||
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
|
||||
material = ExtResource("4_5qlss")
|
||||
sprite_frames = ExtResource("4_s0ir4")
|
||||
animation = &"walk_up"
|
||||
sprite_frames = ExtResource("13_ckpe7")
|
||||
animation = &"idle"
|
||||
autoplay = "idle"
|
||||
|
||||
[node name="Legs" type="AnimatedSprite2D" parent="."]
|
||||
material = ExtResource("4_5qlss")
|
||||
sprite_frames = ExtResource("14_p5rkw")
|
||||
animation = &"idle"
|
||||
autoplay = "idle"
|
||||
frame_progress = 0.405397
|
||||
|
||||
[node name="WeaponProvider" type="Node2D" parent="."]
|
||||
script = ExtResource("5_gp3hw")
|
||||
|
|
@ -421,6 +428,12 @@ lifetime = 0.4
|
|||
one_shot = true
|
||||
process_material = SubResource("ParticleProcessMaterial_0pqs8")
|
||||
|
||||
[node name="LegsAnimationProvider" type="Node2D" parent="." node_paths=PackedStringArray("_animatedSprite", "_shieldParticles")]
|
||||
script = ExtResource("7_pmkfo")
|
||||
_animatedSprite = NodePath("../Legs")
|
||||
_shieldParticles = NodePath("")
|
||||
BlinkMaterial = ExtResource("4_5qlss")
|
||||
|
||||
[node name="InputProvider" type="Node2D" parent="."]
|
||||
script = ExtResource("8_i6wc8")
|
||||
|
||||
|
|
@ -490,6 +503,7 @@ _inputProvider = NodePath("../InputProvider")
|
|||
_errorSound = NodePath("Error")
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="InteractionProvider"]
|
||||
visible = false
|
||||
shape = SubResource("CircleShape2D_7n10g")
|
||||
|
||||
[node name="Error" type="AudioStreamPlayer2D" parent="InteractionProvider"]
|
||||
|
|
@ -540,6 +554,7 @@ collision_mask = 512
|
|||
script = ExtResource("32_4f2wn")
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="ConveyorBeltMover"]
|
||||
visible = false
|
||||
position = Vector2(0, 6.48)
|
||||
shape = SubResource("CircleShape2D_fnw0c")
|
||||
|
||||
|
|
@ -570,6 +585,7 @@ script = ExtResource("42_awrib")
|
|||
Shield = NodePath("../DamageReceiver/ShieldProvider")
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="GrazingModule"]
|
||||
visible = false
|
||||
shape = SubResource("CircleShape2D_awrib")
|
||||
|
||||
[node name="FreezeModule" type="Node2D" parent="." node_paths=PackedStringArray("Shield", "InputProvider")]
|
||||
|
|
|
|||
|
|
@ -185,6 +185,7 @@ public partial class PlayerAnimationProvider : Node2D
|
|||
|
||||
public void PlayShieldAnimation()
|
||||
{
|
||||
if (_shieldParticles is null) return;
|
||||
_shieldParticles.Emitting = true;
|
||||
}
|
||||
|
||||
|
|
|
|||
BIN
Sprites/Actors/Cirno-Shadow.aseprite
(Stored with Git LFS)
BIN
Sprites/Actors/Cirno-Shadow.aseprite
(Stored with Git LFS)
Binary file not shown.
BIN
Sprites/Actors/Cirno-Shadow.png
(Stored with Git LFS)
BIN
Sprites/Actors/Cirno-Shadow.png
(Stored with Git LFS)
Binary file not shown.
BIN
Sprites/Actors/Cirno_Float.aseprite
(Stored with Git LFS)
BIN
Sprites/Actors/Cirno_Float.aseprite
(Stored with Git LFS)
Binary file not shown.
BIN
Sprites/Actors/Cirno_Float.png
(Stored with Git LFS)
Normal file
BIN
Sprites/Actors/Cirno_Float.png
(Stored with Git LFS)
Normal file
Binary file not shown.
34
Sprites/Actors/Cirno_Float.png.import
Normal file
34
Sprites/Actors/Cirno_Float.png.import
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://sgp57e3tsg35"
|
||||
path="res://.godot/imported/Cirno_Float.png-be965ac538ab864e6f9bfe282bf41921.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://Sprites/Actors/Cirno_Float.png"
|
||||
dest_files=["res://.godot/imported/Cirno_Float.png-be965ac538ab864e6f9bfe282bf41921.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
compress/mode=0
|
||||
compress/high_quality=false
|
||||
compress/lossy_quality=0.7
|
||||
compress/hdr_compression=1
|
||||
compress/normal_map=0
|
||||
compress/channel_pack=0
|
||||
mipmaps/generate=false
|
||||
mipmaps/limit=-1
|
||||
roughness/mode=0
|
||||
roughness/src_normal=""
|
||||
process/fix_alpha_border=true
|
||||
process/premult_alpha=false
|
||||
process/normal_map_invert_y=false
|
||||
process/hdr_as_srgb=false
|
||||
process/hdr_clamp_exposure=false
|
||||
process/size_limit=0
|
||||
detect_3d/compress_to=1
|
||||
BIN
Sprites/Actors/Cirno_Float_Legs.aseprite
(Stored with Git LFS)
Normal file
BIN
Sprites/Actors/Cirno_Float_Legs.aseprite
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Sprites/Actors/Cirno_Float_Legs.png
(Stored with Git LFS)
Normal file
BIN
Sprites/Actors/Cirno_Float_Legs.png
(Stored with Git LFS)
Normal file
Binary file not shown.
34
Sprites/Actors/Cirno_Float_Legs.png.import
Normal file
34
Sprites/Actors/Cirno_Float_Legs.png.import
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://b0yaotgm0622f"
|
||||
path="res://.godot/imported/Cirno_Float_Legs.png-b2aa134d7de280e5da666f55cf656c34.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://Sprites/Actors/Cirno_Float_Legs.png"
|
||||
dest_files=["res://.godot/imported/Cirno_Float_Legs.png-b2aa134d7de280e5da666f55cf656c34.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
compress/mode=0
|
||||
compress/high_quality=false
|
||||
compress/lossy_quality=0.7
|
||||
compress/hdr_compression=1
|
||||
compress/normal_map=0
|
||||
compress/channel_pack=0
|
||||
mipmaps/generate=false
|
||||
mipmaps/limit=-1
|
||||
roughness/mode=0
|
||||
roughness/src_normal=""
|
||||
process/fix_alpha_border=true
|
||||
process/premult_alpha=false
|
||||
process/normal_map_invert_y=false
|
||||
process/hdr_as_srgb=false
|
||||
process/hdr_clamp_exposure=false
|
||||
process/size_limit=0
|
||||
detect_3d/compress_to=1
|
||||
Loading…
Add table
Add a link
Reference in a new issue