Compare commits

...

2 commits

5 changed files with 116 additions and 7 deletions

BIN
Hiro/Hiro_Nude_Idle_Blink_Sprites.png (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dnodianjpsek4"
path="res://.godot/imported/Hiro_Nude_Idle_Blink_Sprites.png-1f4012ab4906a6b9362106876dde9efc.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Hiro/Hiro_Nude_Idle_Blink_Sprites.png"
dest_files=["res://.godot/imported/Hiro_Nude_Idle_Blink_Sprites.png-1f4012ab4906a6b9362106876dde9efc.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

View file

@ -1,4 +1,4 @@
[gd_resource type="AnimationLibrary" load_steps=36 format=3 uid="uid://dincs5x4qucal"]
[gd_resource type="AnimationLibrary" load_steps=38 format=3 uid="uid://dincs5x4qucal"]
[ext_resource type="Texture2D" uid="uid://cm7tgomrcvq30" path="res://Hiro/Hiro Walk Sprite Cycle Line Up.png" id="1_hc7kj"]
[ext_resource type="Texture2D" uid="uid://rcidedgcjqg6" path="res://Hiro/Hiro Hurt Sprites.png" id="2_2k6ad"]
@ -6,6 +6,7 @@
[ext_resource type="Texture2D" uid="uid://c4iwqijfp013h" path="res://Hiro/Hiro_Idle_Blink_Sprites.png" id="4_86osg"]
[ext_resource type="Texture2D" uid="uid://06a1bf8kjte6" path="res://Hiro/Hiro Defeated Sprites nb.png" id="4_fugxd"]
[ext_resource type="Texture2D" uid="uid://byc7mqu65fb4a" path="res://Hiro/Hiro Defeated Nude Sprites Line.png" id="5_0f03l"]
[ext_resource type="Texture2D" uid="uid://dnodianjpsek4" path="res://Hiro/Hiro_Nude_Idle_Blink_Sprites.png" id="7_ya3jl"]
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_m3ug4"]
height = 20.0
@ -2096,10 +2097,76 @@ tracks/3/keys = {
"values": [16, 17, 18, 19]
}
[sub_resource type="Animation" id="Animation_gj0my"]
resource_name = "ai_defeated_end"
length = 5.0
loop_mode = 1
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Sprite2D:texture")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [ExtResource("7_ya3jl")]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("Sprite2D:hframes")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [2]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("Sprite2D:vframes")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [1]
}
tracks/3/type = "value"
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/path = NodePath("Sprite2D:frame")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/keys = {
"times": PackedFloat32Array(0, 4.7),
"transitions": PackedFloat32Array(1, 1),
"update": 1,
"values": [0, 1]
}
tracks/4/type = "value"
tracks/4/imported = false
tracks/4/enabled = true
tracks/4/path = NodePath("Sprite2D:material:shader_parameter/FlashColor")
tracks/4/interp = 1
tracks/4/loop_wrap = true
tracks/4/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Color(1, 0, 0, 0)]
}
[resource]
_data = {
"RESET": SubResource("Animation_04piu"),
"ai_defeated": SubResource("Animation_ry0wg"),
"ai_defeated_end": SubResource("Animation_gj0my"),
"ai_defeated_start": SubResource("Animation_d06fy"),
"hurt_east": SubResource("Animation_kvnht"),
"hurt_north": SubResource("Animation_fytkh"),

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=58 format=3 uid="uid://di21xheryhp0k"]
[gd_scene load_steps=59 format=3 uid="uid://di21xheryhp0k"]
[ext_resource type="Script" path="res://Scripts/hiro_player.gd" id="1_dtymi"]
[ext_resource type="Texture2D" uid="uid://cm7tgomrcvq30" path="res://Hiro/Hiro Walk Sprite Cycle Line Up.png" id="1_ukwcc"]
@ -163,6 +163,9 @@ blend_mode = 1
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_ulfn1"]
animation = &"ai_defeated"
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_rw06u"]
animation = &"ai_defeated_end"
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_sudhw"]
animation = &"ai_defeated_start"
@ -220,13 +223,13 @@ advance_mode = 2
switch_mode = 2
advance_mode = 2
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_vxker"]
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_e6135"]
switch_mode = 2
advance_mode = 2
[sub_resource type="AnimationNodeStateMachine" id="AnimationNodeStateMachine_b2867"]
allow_transition_to_self = true
states/End/position = Vector2(928, 102)
states/End/position = Vector2(1121, 97)
states/Start/position = Vector2(197, 108)
states/cut_walk/node = SubResource("AnimationNodeBlendSpace2D_napge")
states/cut_walk/position = Vector2(581, 289.354)
@ -240,12 +243,14 @@ states/melee/node = SubResource("AnimationNodeBlendSpace1D_dc3kp")
states/melee/position = Vector2(329, 224)
states/nsfw_defeated/node = SubResource("AnimationNodeAnimation_ulfn1")
states/nsfw_defeated/position = Vector2(823, 176.354)
states/nsfw_defeated_end/node = SubResource("AnimationNodeAnimation_rw06u")
states/nsfw_defeated_end/position = Vector2(1013, 176.354)
states/nsfw_defeated_start/node = SubResource("AnimationNodeAnimation_sudhw")
states/nsfw_defeated_start/position = Vector2(646, 176.354)
states/walk/node = SubResource("AnimationNodeBlendSpace2D_vunsg")
states/walk/position = Vector2(520, 108)
transitions = ["Start", "idle", SubResource("AnimationNodeStateMachineTransition_akmuq"), "idle", "walk", SubResource("AnimationNodeStateMachineTransition_sn1tm"), "walk", "idle", SubResource("AnimationNodeStateMachineTransition_5i3fu"), "idle", "melee", SubResource("AnimationNodeStateMachineTransition_y8p74"), "melee", "idle", SubResource("AnimationNodeStateMachineTransition_l17k0"), "hurt", "idle", SubResource("AnimationNodeStateMachineTransition_ln3pc"), "defeated", "End", SubResource("AnimationNodeStateMachineTransition_ouche"), "nsfw_defeated_start", "nsfw_defeated", SubResource("AnimationNodeStateMachineTransition_aa2bq"), "nsfw_defeated", "End", SubResource("AnimationNodeStateMachineTransition_vxker")]
graph_offset = Vector2(-63, 40.3541)
transitions = ["Start", "idle", SubResource("AnimationNodeStateMachineTransition_akmuq"), "idle", "walk", SubResource("AnimationNodeStateMachineTransition_sn1tm"), "walk", "idle", SubResource("AnimationNodeStateMachineTransition_5i3fu"), "idle", "melee", SubResource("AnimationNodeStateMachineTransition_y8p74"), "melee", "idle", SubResource("AnimationNodeStateMachineTransition_l17k0"), "hurt", "idle", SubResource("AnimationNodeStateMachineTransition_ln3pc"), "defeated", "End", SubResource("AnimationNodeStateMachineTransition_ouche"), "nsfw_defeated_start", "nsfw_defeated", SubResource("AnimationNodeStateMachineTransition_aa2bq"), "nsfw_defeated", "nsfw_defeated_end", SubResource("AnimationNodeStateMachineTransition_e6135")]
graph_offset = Vector2(130, 6.3541)
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_vm050"]
radius = 9.0

View file

@ -292,7 +292,7 @@ func _on_victory_state_entered():
state_machine.set_expression_property("melee_stage", 0)
velocity = Vector2.ZERO
func _on_player_been_defeated():
func _on_player_been_defeated(_by_what: Util.AttackType):
state_machine.send_event("has_won")
func _on_align_for_range_state_entered():