diff --git a/components/Characters/Bear.tscn b/components/Characters/Bear.tscn index 0d42760..ae61c2d 100644 --- a/components/Characters/Bear.tscn +++ b/components/Characters/Bear.tscn @@ -1,38 +1,32 @@ [gd_scene load_steps=30 format=3 uid="uid://m60bwhdpbem8"] [ext_resource type="PackedScene" uid="uid://cvogxi7mktumf" path="res://components/Abstracts/EntityBase.tscn" id="1_3ves7"] -[ext_resource type="Script" path="res://scripts/Contents/Characters/Bear.gd" id="2_kh2af"] +[ext_resource type="Script" uid="uid://cgmnlpa2w6n72" path="res://scripts/Contents/Characters/Bear.gd" id="2_kh2af"] [ext_resource type="AudioStream" uid="uid://dqhrycmnkwojq" path="res://resources/sounds/bossAttack/Bear/Arrow7.ogg" id="3_n5dji"] [ext_resource type="AudioStream" uid="uid://bxks728nvv83c" path="res://resources/sounds/bossAttack/Bear/SunDance.ogg" id="4_meklc"] [ext_resource type="AudioStream" uid="uid://dhcm3pjj82xhg" path="res://resources/sounds/bossAttack/Bear/ForeverRainbow.ogg" id="5_vej16"] [ext_resource type="AudioStream" uid="uid://cqh2yvwcy83gg" path="res://resources/sounds/bossAttack/Bear/Sprint.ogg" id="6_x3jmu"] [ext_resource type="AudioStream" uid="uid://ce8xjsh68momv" path="res://resources/sounds/bossAttack/Bear/Arrow7-2.ogg" id="7_0r2df"] [ext_resource type="AudioStream" uid="uid://dd18jfva1knwm" path="res://resources/sounds/bossAttack/Bear/LightGun.ogg" id="8_qagkm"] -[ext_resource type="Texture2D" uid="uid://cgngjuc21l4xq" path="res://resources/characters/bear/FurryR.png" id="9_av1u2"] -[ext_resource type="Shader" path="res://shaders/RedTemprature.gdshader" id="12_j8sas"] -[ext_resource type="Texture2D" uid="uid://df6ly7iydtcwx" path="res://resources/characters/bear/FurryR-mask.png" id="13_v2sdb"] +[ext_resource type="Texture2D" uid="uid://c0mfcs7x1r6jn" path="res://resources/characters/bear/bear.png" id="9_p5kxp"] +[ext_resource type="Texture2D" uid="uid://c3pa0vooogyqx" path="res://resources/characters/bear/bear-mask.png" id="11_gg3xf"] +[ext_resource type="Shader" uid="uid://6upc63ouwf6q" path="res://shaders/RedTemprature.gdshader" id="12_j8sas"] [sub_resource type="SpriteFrames" id="SpriteFrames_6tgxs"] animations = [{ -"frames": [{ -"duration": 1.0, -"texture": ExtResource("9_av1u2") -}], +"frames": [], "loop": true, "name": &"idle", "speed": 5.0 }, { -"frames": [{ -"duration": 1.0, -"texture": ExtResource("9_av1u2") -}], +"frames": [], "loop": true, "name": &"walk", "speed": 5.0 }] [sub_resource type="RectangleShape2D" id="RectangleShape2D_akdh6"] -size = Vector2(100, 100) +size = Vector2(237, 198) [sub_resource type="Animation" id="Animation_sxh2u"] length = 0.001 @@ -81,12 +75,12 @@ tracks/0/keys = { [sub_resource type="AnimationLibrary" id="AnimationLibrary_dwflo"] _data = { -"RESET": SubResource("Animation_sxh2u"), -"left": SubResource("Animation_vxanw"), -"right": SubResource("Animation_nuh11") +&"RESET": SubResource("Animation_sxh2u"), +&"left": SubResource("Animation_vxanw"), +&"right": SubResource("Animation_nuh11") } -[sub_resource type="ShaderMaterial" id="ShaderMaterial_6h05p"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_gg3xf"] shader = ExtResource("12_j8sas") [sub_resource type="Curve" id="Curve_bm78d"] @@ -132,7 +126,7 @@ angle_max = 360.0 angle_curve = SubResource("CurveTexture_u5n7f") spread = 180.0 initial_velocity_min = 100.0 -initial_velocity_max = 200.0 +initial_velocity_max = 500.0 gravity = Vector3(0, 0, 0) scale_curve = SubResource("CurveTexture_g2o7h") color = Color(10, 10, 10, 1) @@ -147,9 +141,6 @@ drops = Array[int]([0, 1]) dropCounts = Array[Vector2]([Vector2(50, 100), Vector2(70, 140)]) metadata/_edit_vertical_guides_ = [-50.0] -[node name="attack0" parent="sounds" index="5"] -stream = ExtResource("3_n5dji") - [node name="attack1" type="AudioStreamPlayer2D" parent="sounds" index="6"] stream = ExtResource("4_meklc") @@ -168,34 +159,45 @@ stream = ExtResource("8_qagkm") [node name="attack6" type="AudioStreamPlayer2D" parent="sounds" index="11"] stream = ExtResource("8_qagkm") -[node name="texture" parent="." index="2"] +[node name="attack0" parent="sounds" index="12"] +stream = ExtResource("3_n5dji") + +[node name="texture" parent="." index="3"] sprite_frames = SubResource("SpriteFrames_6tgxs") +[node name="staticBackground" parent="texture" index="0"] +position = Vector2(0, -48) +scale = Vector2(0.58843344, 0.5364395) +texture = ExtResource("9_p5kxp") + [node name="hitbox" parent="texture/hurtbox" index="0"] +position = Vector2(0.5, -49) shape = SubResource("RectangleShape2D_akdh6") -[node name="animator" parent="texture" index="1"] +[node name="animator" parent="texture" index="3"] libraries = { -"": SubResource("AnimationLibrary_dwflo") +&"": SubResource("AnimationLibrary_dwflo") } [node name="normal" type="Node2D" parent="texture/weapons" index="0"] [node name="mask" type="Sprite2D" parent="texture" index="7"] unique_name_in_owner = true -material = SubResource("ShaderMaterial_6h05p") -texture = ExtResource("13_v2sdb") +material = SubResource("ShaderMaterial_gg3xf") +position = Vector2(81, -79) +scale = Vector2(0.588, 0.536) +texture = ExtResource("11_gg3xf") [node name="sprintParticle" type="GPUParticles2D" parent="texture" index="8"] unique_name_in_owner = true z_index = -1 emitting = false amount = 50 +texture = ExtResource("11_gg3xf") process_material = SubResource("ParticleProcessMaterial_nv4nf") -texture = ExtResource("13_v2sdb") -[node name="statebar" parent="." index="3"] -position = Vector2(0, -114) +[node name="statebar" parent="." index="4"] +position = Vector2(0, -209) -[node name="movebox" parent="." index="4"] +[node name="movebox" parent="." index="5"] disabled = true diff --git a/components/Characters/KukeMC.tscn b/components/Characters/KukeMC.tscn index 1413642..516ada9 100644 --- a/components/Characters/KukeMC.tscn +++ b/components/Characters/KukeMC.tscn @@ -1,30 +1,24 @@ [gd_scene load_steps=6 format=3 uid="uid://d4lfjwy0hkidu"] [ext_resource type="PackedScene" uid="uid://cvogxi7mktumf" path="res://components/Abstracts/EntityBase.tscn" id="1_r4q7y"] -[ext_resource type="Texture2D" uid="uid://c1jhrutky8pya" path="res://resources/characters/kukemc/avatar.webp" id="2_422pv"] -[ext_resource type="Script" path="res://scripts/Contents/Characters/KukeMC.gd" id="2_s2dg5"] +[ext_resource type="Script" uid="uid://cekuqnfohprpb" path="res://scripts/Contents/Characters/KukeMC.gd" id="2_s2dg5"] +[ext_resource type="Texture2D" uid="uid://c6thlmj566h82" path="res://resources/characters/kukemc/cy.png" id="3_wafrb"] -[sub_resource type="SpriteFrames" id="SpriteFrames_1c0ui"] +[sub_resource type="SpriteFrames" id="SpriteFrames_x576j"] animations = [{ -"frames": [{ -"duration": 1.0, -"texture": ExtResource("2_422pv") -}], +"frames": [], "loop": true, "name": &"idle", "speed": 5.0 }, { -"frames": [{ -"duration": 1.0, -"texture": ExtResource("2_422pv") -}], +"frames": [], "loop": true, "name": &"walk", "speed": 5.0 }] [sub_resource type="RectangleShape2D" id="RectangleShape2D_farlp"] -size = Vector2(150, 150) +size = Vector2(221, 150) [node name="KukeMC" instance=ExtResource("1_r4q7y")] script = ExtResource("2_s2dg5") @@ -36,15 +30,20 @@ metadata/_edit_vertical_guides_ = [76.0] [node name="collect" parent="sounds" index="4"] stream = null -[node name="texture" parent="." index="2"] -sprite_frames = SubResource("SpriteFrames_1c0ui") -animation = &"walk" +[node name="texture" parent="." index="3"] +sprite_frames = SubResource("SpriteFrames_x576j") + +[node name="staticBackground" parent="texture" index="0"] +position = Vector2(0, -19.999998) +scale = Vector2(0.61562973, 0.61562973) +texture = ExtResource("3_wafrb") [node name="hitbox" parent="texture/hurtbox" index="0"] +position = Vector2(70, -25) shape = SubResource("RectangleShape2D_farlp") [node name="normal" type="Node2D" parent="texture/weapons" index="0"] position = Vector2(-22, 18) -[node name="statebar" parent="." index="3"] -position = Vector2(0, -140) +[node name="statebar" parent="." index="4"] +position = Vector2(75, -169) diff --git a/resources/characters/bear/bear-mask.png b/resources/characters/bear/bear-mask.png new file mode 100644 index 0000000..1072a1e Binary files /dev/null and b/resources/characters/bear/bear-mask.png differ diff --git a/resources/characters/bear/bear-mask.png.import b/resources/characters/bear/bear-mask.png.import new file mode 100644 index 0000000..c6a44d1 --- /dev/null +++ b/resources/characters/bear/bear-mask.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c3pa0vooogyqx" +path="res://.godot/imported/bear-mask.png-0b1f31d6cb7bd33b76d07b6928cf07e6.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resources/characters/bear/bear-mask.png" +dest_files=["res://.godot/imported/bear-mask.png-0b1f31d6cb7bd33b76d07b6928cf07e6.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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 diff --git a/resources/characters/bear/bear.png b/resources/characters/bear/bear.png new file mode 100644 index 0000000..e9f3fe3 Binary files /dev/null and b/resources/characters/bear/bear.png differ diff --git a/resources/characters/bear/bear.png.import b/resources/characters/bear/bear.png.import new file mode 100644 index 0000000..f2b4df2 --- /dev/null +++ b/resources/characters/bear/bear.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c0mfcs7x1r6jn" +path="res://.godot/imported/bear.png-3f0df0186dc45a4382925f859fe0d8a2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resources/characters/bear/bear.png" +dest_files=["res://.godot/imported/bear.png-3f0df0186dc45a4382925f859fe0d8a2.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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 diff --git a/scripts/Contents/Wave.gd b/scripts/Contents/Wave.gd index 70a7c25..bdc3563 100644 --- a/scripts/Contents/Wave.gd +++ b/scripts/Contents/Wave.gd @@ -46,7 +46,7 @@ static var WAVE_TESTBOSS_CHICK = [ Wave.create("Chick", 0, 0, true, 0, INF, 10), ] static var WAVE_EMPTY = [] -static var data = WAVE_NORMAL +static var data = WAVE_TESTBOSS_BEAR static func create( entity_: String, diff --git a/shaders/RedTemprature.gdshader b/shaders/RedTemprature.gdshader index 090f990..6ebfefb 100644 --- a/shaders/RedTemprature.gdshader +++ b/shaders/RedTemprature.gdshader @@ -1,5 +1,5 @@ shader_type canvas_item; void fragment() { COLOR.r=1.0; - COLOR.a*=0.5; + COLOR.a*=0.7; } \ No newline at end of file