diff --git a/.import/sprite.png-47670afd3973d4fa790c81eafb1f2efc.md5 b/.import/sprite.png-47670afd3973d4fa790c81eafb1f2efc.md5 index f99db62..698d6c1 100644 --- a/.import/sprite.png-47670afd3973d4fa790c81eafb1f2efc.md5 +++ b/.import/sprite.png-47670afd3973d4fa790c81eafb1f2efc.md5 @@ -1,3 +1,3 @@ -source_md5="0fd73d34c38c2953010e67c2f53cff29" -dest_md5="c4205ef0929ad0afb67c64638051fb1a" +source_md5="3b62c139863db33dff26c7c6a431912a" +dest_md5="725173346b1d0638eda0eb3bb8a29992" diff --git a/.import/sprite.png-47670afd3973d4fa790c81eafb1f2efc.stex b/.import/sprite.png-47670afd3973d4fa790c81eafb1f2efc.stex index cdd0168..2d815c3 100644 Binary files a/.import/sprite.png-47670afd3973d4fa790c81eafb1f2efc.stex and b/.import/sprite.png-47670afd3973d4fa790c81eafb1f2efc.stex differ diff --git a/.import/sprite.png-62f265594fea3dd41e7320085f395a38.md5 b/.import/sprite.png-62f265594fea3dd41e7320085f395a38.md5 index 01d3351..2398669 100644 --- a/.import/sprite.png-62f265594fea3dd41e7320085f395a38.md5 +++ b/.import/sprite.png-62f265594fea3dd41e7320085f395a38.md5 @@ -1,3 +1,3 @@ -source_md5="fb63f7316fa0307c945564ee0a913803" -dest_md5="981e0c30318b856cd0d813040b1bbc65" +source_md5="41845decf08dcab95d58052126552087" +dest_md5="4ab96230486a269295260db949c0b788" diff --git a/.import/sprite.png-62f265594fea3dd41e7320085f395a38.stex b/.import/sprite.png-62f265594fea3dd41e7320085f395a38.stex index 4c2be1f..5676288 100644 Binary files a/.import/sprite.png-62f265594fea3dd41e7320085f395a38.stex and b/.import/sprite.png-62f265594fea3dd41e7320085f395a38.stex differ diff --git a/.import/sprite.png-8fb3e3b3a426f9203ac467425d12a2d3.md5 b/.import/sprite.png-8fb3e3b3a426f9203ac467425d12a2d3.md5 index c5291ef..a0adc9e 100644 --- a/.import/sprite.png-8fb3e3b3a426f9203ac467425d12a2d3.md5 +++ b/.import/sprite.png-8fb3e3b3a426f9203ac467425d12a2d3.md5 @@ -1,3 +1,3 @@ -source_md5="280d988a2ed7f4b656d8b74f3c287a9a" -dest_md5="a076b6c6c9e9c94f7669b96c9f9e7e3c" +source_md5="69a918c8f87c7dc71b5dc6e856b09275" +dest_md5="cd6868a1081d86518587459b5e95f579" diff --git a/.import/sprite.png-8fb3e3b3a426f9203ac467425d12a2d3.stex b/.import/sprite.png-8fb3e3b3a426f9203ac467425d12a2d3.stex index 684286d..e37c683 100644 Binary files a/.import/sprite.png-8fb3e3b3a426f9203ac467425d12a2d3.stex and b/.import/sprite.png-8fb3e3b3a426f9203ac467425d12a2d3.stex differ diff --git a/.import/sprite.png-d3e6c66ac9fab05b086e1f377b2b0b14.md5 b/.import/sprite.png-d3e6c66ac9fab05b086e1f377b2b0b14.md5 index a03dd5a..b692936 100644 --- a/.import/sprite.png-d3e6c66ac9fab05b086e1f377b2b0b14.md5 +++ b/.import/sprite.png-d3e6c66ac9fab05b086e1f377b2b0b14.md5 @@ -1,3 +1,3 @@ -source_md5="69a7d8cc93429e080502ee8b8900b3f4" -dest_md5="daf6d74ce3f32aa29872a2bf065638fa" +source_md5="dc0024fcdc792040e22907ff17a13f7f" +dest_md5="631fe4922a179d5882c2ff4cf294b533" diff --git a/.import/sprite.png-d3e6c66ac9fab05b086e1f377b2b0b14.stex b/.import/sprite.png-d3e6c66ac9fab05b086e1f377b2b0b14.stex index 7ff328c..071ec7a 100644 Binary files a/.import/sprite.png-d3e6c66ac9fab05b086e1f377b2b0b14.stex and b/.import/sprite.png-d3e6c66ac9fab05b086e1f377b2b0b14.stex differ diff --git a/.import/sprite.png-ecdb256869b0f955b86b845c103c3e46.md5 b/.import/sprite.png-ecdb256869b0f955b86b845c103c3e46.md5 index b472c98..5d1b239 100644 --- a/.import/sprite.png-ecdb256869b0f955b86b845c103c3e46.md5 +++ b/.import/sprite.png-ecdb256869b0f955b86b845c103c3e46.md5 @@ -1,3 +1,3 @@ -source_md5="f110528f4d7135fd1dcfb5a23b622b9f" -dest_md5="fc60cf68e7aa539b3581a93888e08fa3" +source_md5="9d5246483521ed2339154334f5b22299" +dest_md5="ae083abbfc52fa816334094ee9b133a5" diff --git a/.import/sprite.png-ecdb256869b0f955b86b845c103c3e46.stex b/.import/sprite.png-ecdb256869b0f955b86b845c103c3e46.stex index 14b9f85..bb1f78b 100644 Binary files a/.import/sprite.png-ecdb256869b0f955b86b845c103c3e46.stex and b/.import/sprite.png-ecdb256869b0f955b86b845c103c3e46.stex differ diff --git a/levels/ui/pause.tscn b/levels/ui/pause.tscn index 0e367bb..8656339 100644 --- a/levels/ui/pause.tscn +++ b/levels/ui/pause.tscn @@ -1,5 +1,176 @@ -[gd_scene format=2] +[gd_scene load_steps=8 format=2] + +[ext_resource path="res://fonts/hud.tres" type="DynamicFont" id=1] +[ext_resource path="res://fonts/start.tres" type="DynamicFont" id=2] +[ext_resource path="res://levels/bottomhud.tscn" type="PackedScene" id=3] +[ext_resource path="res://levels/ui/pause.gd" type="Script" id=4] + +[sub_resource type="StyleBoxFlat" id=3] +bg_color = Color( 0, 0.8, 0, 1 ) + +[sub_resource type="StyleBoxFlat" id=4] +bg_color = Color( 0, 0.8, 0, 1 ) + +[sub_resource type="StyleBoxFlat" id=5] +bg_color = Color( 0, 0.8, 0, 1 ) [node name="Pause" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 +script = ExtResource( 4 ) + +[node name="CanvasLayer" type="CanvasLayer" parent="."] + +[node name="ColorRect" type="ColorRect" parent="CanvasLayer"] +margin_right = 1280.0 +margin_bottom = 720.0 +color = Color( 0, 0, 0, 1 ) + +[node name="Bottomhud" parent="CanvasLayer" instance=ExtResource( 3 )] + +[node name="HBoxContainer" type="HBoxContainer" parent="CanvasLayer"] +margin_left = 843.0 +margin_right = 1280.0 +margin_bottom = 116.0 + +[node name="TextureRect" type="TextureRect" parent="CanvasLayer/HBoxContainer"] +margin_right = 116.0 +margin_bottom = 116.0 +rect_min_size = Vector2( 116, 116 ) + +[node name="VBoxContainer" type="VBoxContainer" parent="CanvasLayer/HBoxContainer"] +margin_left = 120.0 +margin_right = 421.0 +margin_bottom = 116.0 + +[node name="Cname" type="Label" parent="CanvasLayer/HBoxContainer/VBoxContainer"] +margin_right = 301.0 +margin_bottom = 22.0 +rect_min_size = Vector2( 174, 0 ) +custom_fonts/font = ExtResource( 1 ) +text = "Name" + +[node name="HBoxContainer" type="HBoxContainer" parent="CanvasLayer/HBoxContainer/VBoxContainer"] +margin_top = 26.0 +margin_right = 301.0 +margin_bottom = 48.0 + +[node name="Label" type="Label" parent="CanvasLayer/HBoxContainer/VBoxContainer/HBoxContainer"] +margin_right = 178.0 +margin_bottom = 22.0 +rect_min_size = Vector2( 178, 0 ) +custom_fonts/font = ExtResource( 1 ) +text = "Health" + +[node name="Label2" type="Label" parent="CanvasLayer/HBoxContainer/VBoxContainer/HBoxContainer"] +margin_left = 182.0 +margin_right = 301.0 +margin_bottom = 22.0 +rect_min_size = Vector2( 119, 0 ) +custom_fonts/font = ExtResource( 1 ) +text = "100/100" +align = 2 + +[node name="HBoxContainer2" type="HBoxContainer" parent="CanvasLayer/HBoxContainer/VBoxContainer"] +margin_top = 52.0 +margin_right = 301.0 +margin_bottom = 74.0 + +[node name="Label" type="Label" parent="CanvasLayer/HBoxContainer/VBoxContainer/HBoxContainer2"] +margin_right = 178.0 +margin_bottom = 22.0 +rect_min_size = Vector2( 178, 0 ) +custom_fonts/font = ExtResource( 1 ) +text = "Level" + +[node name="Label2" type="Label" parent="CanvasLayer/HBoxContainer/VBoxContainer/HBoxContainer2"] +margin_left = 182.0 +margin_right = 301.0 +margin_bottom = 22.0 +rect_min_size = Vector2( 119, 0 ) +custom_fonts/font = ExtResource( 1 ) +text = "100/100" +align = 2 + +[node name="HBoxContainer2" type="HBoxContainer" parent="CanvasLayer"] +margin_left = 105.0 +margin_top = 265.0 +margin_right = 1183.0 +margin_bottom = 493.0 + +[node name="VBoxContainer" type="VBoxContainer" parent="CanvasLayer/HBoxContainer2"] +margin_right = 539.0 +margin_bottom = 228.0 +rect_min_size = Vector2( 539, 0 ) + +[node name="Character" type="Button" parent="CanvasLayer/HBoxContainer2/VBoxContainer"] +visible = false +margin_right = 539.0 +margin_bottom = 54.0 +custom_fonts/font = ExtResource( 2 ) +custom_styles/focus = SubResource( 3 ) +text = "MENU_CHARACTER" + +[node name="Team" type="Button" parent="CanvasLayer/HBoxContainer2/VBoxContainer"] +visible = false +margin_right = 539.0 +margin_bottom = 54.0 +custom_fonts/font = ExtResource( 2 ) +custom_styles/focus = SubResource( 4 ) +text = "MENU_TEAM" + +[node name="Warp" type="Button" parent="CanvasLayer/HBoxContainer2/VBoxContainer"] +visible = false +margin_right = 539.0 +margin_bottom = 54.0 +custom_fonts/font = ExtResource( 2 ) +custom_styles/focus = SubResource( 4 ) +text = "MENU_MAP" + +[node name="Settings" type="Button" parent="CanvasLayer/HBoxContainer2/VBoxContainer"] +visible = false +margin_right = 539.0 +margin_bottom = 54.0 +custom_fonts/font = ExtResource( 2 ) +custom_styles/focus = SubResource( 4 ) +text = "MENU_SETTINGS" + +[node name="VBoxContainer2" type="VBoxContainer" parent="CanvasLayer/HBoxContainer2"] +margin_left = 543.0 +margin_right = 1082.0 +margin_bottom = 228.0 +rect_min_size = Vector2( 539, 0 ) + +[node name="Journal" type="Button" parent="CanvasLayer/HBoxContainer2/VBoxContainer2"] +visible = false +margin_right = 539.0 +margin_bottom = 54.0 +custom_fonts/font = ExtResource( 2 ) +custom_styles/focus = SubResource( 5 ) +text = "MENU_BOUKEN" + +[node name="Challenges" type="Button" parent="CanvasLayer/HBoxContainer2/VBoxContainer2"] +visible = false +margin_right = 539.0 +margin_bottom = 54.0 +custom_fonts/font = ExtResource( 2 ) +custom_styles/focus = SubResource( 5 ) +text = "MENU_CHALLENGES" + +[node name="Backpack" type="Button" parent="CanvasLayer/HBoxContainer2/VBoxContainer2"] +visible = false +margin_right = 539.0 +margin_bottom = 54.0 +custom_fonts/font = ExtResource( 2 ) +custom_styles/focus = SubResource( 5 ) +text = "MENU_BACKPACK" + +[node name="Exit" type="Button" parent="CanvasLayer/HBoxContainer2/VBoxContainer2"] +margin_right = 539.0 +margin_bottom = 54.0 +custom_fonts/font = ExtResource( 2 ) +custom_styles/focus = SubResource( 5 ) +text = "MENU_EXIT" + +[connection signal="pressed" from="CanvasLayer/HBoxContainer2/VBoxContainer/Warp" to="." method="_on_warp_pressed"] +[connection signal="pressed" from="CanvasLayer/HBoxContainer2/VBoxContainer2/Exit" to="." method="_on_exit_pressed"] diff --git a/sprites/common/bullet/X11.tscn b/sprites/common/bullet/X11.tscn index 2ab72d8..722883e 100644 --- a/sprites/common/bullet/X11.tscn +++ b/sprites/common/bullet/X11.tscn @@ -1,26 +1,28 @@ -[gd_scene load_steps=4 format=3 uid="uid://dnufhjr63cddd"] +[gd_scene load_steps=4 format=2] -[ext_resource type="Script" path="res://sprites/common/bullet/X11.gd" id="1_sd1jl"] -[ext_resource type="Texture2D" uid="uid://dr52x3yif0wtw" path="res://sprites/common/bullet/X11.svg" id="2_nkqom"] +[ext_resource path="res://sprites/common/bullet/X11.svg" type="Texture" id=1] +[ext_resource path="res://sprites/common/bullet/X11.gd" type="Script" id=2] -[sub_resource type="RectangleShape2D" id="RectangleShape2D_g125y"] +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 40, 40 ) [node name="X11" type="Area2D"] -script = ExtResource("1_sd1jl") +script = ExtResource( 2 ) -[node name="Sprite2D" type="Sprite2D" parent="."] -scale = Vector2(0.1, 0.1) -texture = ExtResource("2_nkqom") +[node name="ColorRect" type="ColorRect" parent="."] +margin_left = -79.0 +margin_top = -65.0 +margin_right = 87.0 +margin_bottom = 74.0 + +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( 0, 9.53674e-07 ) +scale = Vector2( 0.294545, 0.290909 ) +texture = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -shape = SubResource("RectangleShape2D_g125y") +shape = SubResource( 1 ) -[node name="VisibleOnScreenEnabler2D" type="VisibleOnScreenEnabler2D" parent="."] - -[node name="Timer" type="Timer" parent="."] -wait_time = 0.3 -autostart = true - -[connection signal="area_entered" from="." to="." method="_on_area_entered"] -[connection signal="body_entered" from="." to="." method="_on_body_entered"] -[connection signal="timeout" from="Timer" to="." method="_on_timer_timeout"] +[node name="VisibleOnScreenNotifier2D" type="VisibilityNotifier2D" parent="."] +position = Vector2( 2.41399e-06, 0.25 ) +scale = Vector2( 4, 3.975 ) diff --git a/sprites/common/bullet/aero.gd b/sprites/common/bullet/aero.gd index b53892b..068db22 100644 --- a/sprites/common/bullet/aero.gd +++ b/sprites/common/bullet/aero.gd @@ -27,7 +27,7 @@ func _process(delta): func _physics_process(delta): rotation -= angular_speed * delta print(rotation) - if rotation+deg_to_rad(180) < origangle: + if rotation+deg2rad(180) < origangle: queue_free() func _on_body_entered(body): diff --git a/sprites/common/bullet/aero.tscn b/sprites/common/bullet/aero.tscn index 0790ec6..7387e8a 100644 --- a/sprites/common/bullet/aero.tscn +++ b/sprites/common/bullet/aero.tscn @@ -1,28 +1,23 @@ -[gd_scene load_steps=4 format=3 uid="uid://bex0xeqbq5uci"] +[gd_scene load_steps=4 format=2] -[ext_resource type="Script" path="res://sprites/common/bullet/aero.gd" id="1_rovd1"] -[ext_resource type="Texture2D" uid="uid://ca17ddf0kokpv" path="res://sprites/common/bullet/aero.png" id="2_omcs8"] +[ext_resource path="res://sprites/common/bullet/aero.gd" type="Script" id=1] +[ext_resource path="res://sprites/common/bullet/aero.png" type="Texture" id=2] -[sub_resource type="RectangleShape2D" id="RectangleShape2D_g125y"] -size = Vector2(128, 28) +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 14, 63.5 ) [node name="Aero" type="Area2D"] -script = ExtResource("1_rovd1") +script = ExtResource( 1 ) -[node name="Sprite2D" type="Sprite2D" parent="."] -position = Vector2(0, 64) +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( 0, 64 ) rotation = 1.5708 -texture = ExtResource("2_omcs8") +texture = ExtResource( 2 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2(0, 64) -rotation = 1.5708 -shape = SubResource("RectangleShape2D_g125y") +position = Vector2( -1, 63.5 ) +shape = SubResource( 1 ) -[node name="VisibleOnScreenNotifier2D" type="VisibleOnScreenNotifier2D" parent="."] -position = Vector2(0, 64) -rotation = 1.5708 -scale = Vector2(6.4, 1.4) - -[connection signal="area_entered" from="." to="." method="_on_area_entered"] -[connection signal="body_entered" from="." to="." method="_on_body_entered"] +[node name="VisibleOnScreenNotifier2D" type="VisibilityNotifier2D" parent="."] +position = Vector2( -1, 63.5 ) +scale = Vector2( 1.4, 6.35 ) diff --git a/sprites/common/bullet/arrow.tscn b/sprites/common/bullet/arrow.tscn index ad1847c..291802d 100644 --- a/sprites/common/bullet/arrow.tscn +++ b/sprites/common/bullet/arrow.tscn @@ -1,25 +1,23 @@ -[gd_scene load_steps=4 format=3 uid="uid://batibvdy0i2b4"] +[gd_scene load_steps=4 format=2] -[ext_resource type="Script" path="res://sprites/common/bullet/arrow.gd" id="1_xh7h3"] -[ext_resource type="Texture2D" uid="uid://bxbokpmpq22mg" path="res://sprites/common/bullet/arrow.png" id="2_1l581"] +[ext_resource path="res://sprites/common/bullet/arrow.png" type="Texture" id=1] +[ext_resource path="res://sprites/common/bullet/arrow.gd" type="Script" id=2] -[sub_resource type="RectangleShape2D" id="RectangleShape2D_g125y"] -size = Vector2(129, 20) +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 65, 10 ) [node name="Arrow" type="Area2D"] -script = ExtResource("1_xh7h3") +script = ExtResource( 2 ) -[node name="Sprite2D" type="Sprite2D" parent="."] +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( 1, 1 ) rotation = 3.14159 -texture = ExtResource("2_1l581") +texture = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2(0.5, 0) -shape = SubResource("RectangleShape2D_g125y") +position = Vector2( 1, 1 ) +shape = SubResource( 1 ) -[node name="VisibleOnScreenNotifier2D" type="VisibleOnScreenNotifier2D" parent="."] -position = Vector2(0.5, 0) -scale = Vector2(6.45, 1) - -[connection signal="area_entered" from="." to="." method="_on_area_entered"] -[connection signal="body_entered" from="." to="." method="_on_body_entered"] +[node name="VisibleOnScreenNotifier2D" type="VisibilityNotifier2D" parent="."] +position = Vector2( 0.874994, 0.906251 ) +scale = Vector2( 6.5125, 1.00937 ) diff --git a/sprites/common/bullet/snowflake.tscn b/sprites/common/bullet/snowflake.tscn index 9f7af42..bf6da97 100644 --- a/sprites/common/bullet/snowflake.tscn +++ b/sprites/common/bullet/snowflake.tscn @@ -1,23 +1,22 @@ -[gd_scene load_steps=4 format=3 uid="uid://cexo7mwqpmw4b"] +[gd_scene load_steps=4 format=2] -[ext_resource type="Script" path="res://sprites/common/bullet/snowflake.gd" id="1_w4m7a"] -[ext_resource type="Texture2D" uid="uid://nvayru3j13ts" path="res://sprites/common/bullet/snowflake.png" id="2_0alhu"] +[ext_resource path="res://sprites/common/bullet/snowflake.png" type="Texture" id=1] +[ext_resource path="res://sprites/common/bullet/snowflake.gd" type="Script" id=2] -[sub_resource type="RectangleShape2D" id="RectangleShape2D_g125y"] -size = Vector2(60, 60) +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 32, 32.5 ) [node name="Snowflake" type="Area2D"] -script = ExtResource("1_w4m7a") +script = ExtResource( 2 ) -[node name="Sprite2D" type="Sprite2D" parent="."] -texture = ExtResource("2_0alhu") +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( 1, 1 ) +texture = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -shape = SubResource("RectangleShape2D_g125y") +position = Vector2( 1, 0.5 ) +shape = SubResource( 1 ) -[node name="VisibleOnScreenNotifier2D" type="VisibleOnScreenNotifier2D" parent="."] -position = Vector2(-7.15256e-07, -1.43051e-06) -scale = Vector2(3, 3) - -[connection signal="area_entered" from="." to="." method="_on_area_entered"] -[connection signal="body_entered" from="." to="." method="_on_body_entered"] +[node name="VisibleOnScreenNotifier2D" type="VisibilityNotifier2D" parent="."] +position = Vector2( 1, 0.499995 ) +scale = Vector2( 3.2, 3.25 ) diff --git a/sprites/common/bullet/tnt.tscn b/sprites/common/bullet/tnt.tscn index 01ef729..819945b 100644 --- a/sprites/common/bullet/tnt.tscn +++ b/sprites/common/bullet/tnt.tscn @@ -1,25 +1,22 @@ -[gd_scene load_steps=4 format=3 uid="uid://bii2vgqrqw754"] +[gd_scene load_steps=4 format=2] -[ext_resource type="Script" path="res://sprites/common/bullet/tnt.gd" id="1_eqk30"] -[ext_resource type="Texture2D" uid="uid://cjbt01ulncdgj" path="res://sprites/common/bullet/tnt.png" id="2_ha8c6"] +[ext_resource path="res://sprites/common/bullet/tnt.png" type="Texture" id=1] +[ext_resource path="res://sprites/common/bullet/tnt.gd" type="Script" id=2] -[sub_resource type="RectangleShape2D" id="RectangleShape2D_g125y"] -size = Vector2(18, 65) +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 17, 32.5 ) [node name="Tnt" type="Area2D"] -script = ExtResource("1_eqk30") +script = ExtResource( 2 ) -[node name="Sprite2D" type="Sprite2D" parent="."] -position = Vector2(-9, 0) -texture = ExtResource("2_ha8c6") +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( -11, 1 ) +texture = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2(1, 0.5) -shape = SubResource("RectangleShape2D_g125y") +position = Vector2( -11, 0.5 ) +shape = SubResource( 1 ) -[node name="VisibleOnScreenNotifier2D" type="VisibleOnScreenNotifier2D" parent="."] -position = Vector2(0.999999, -1.78814e-07) -scale = Vector2(0.9, 3.2) - -[connection signal="area_entered" from="." to="." method="_on_area_entered"] -[connection signal="body_entered" from="." to="." method="_on_body_entered"] +[node name="VisibleOnScreenNotifier2D" type="VisibilityNotifier2D" parent="."] +position = Vector2( -11, 0.499998 ) +scale = Vector2( 1.7, 3.25 ) diff --git a/sprites/common/elysium/sprite.png b/sprites/common/elysium/sprite.png index 0883959..bb69353 100644 Binary files a/sprites/common/elysium/sprite.png and b/sprites/common/elysium/sprite.png differ diff --git a/sprites/common/elysium/sprite.xcf b/sprites/common/elysium/sprite.xcf index 0e095c4..394acfa 100644 Binary files a/sprites/common/elysium/sprite.xcf and b/sprites/common/elysium/sprite.xcf differ diff --git a/sprites/common/kimberly/kimberly.gd b/sprites/common/kimberly/kimberly.gd index 72f3f62..339999d 100644 --- a/sprites/common/kimberly/kimberly.gd +++ b/sprites/common/kimberly/kimberly.gd @@ -1,7 +1,7 @@ -extends CharacterBody2D +extends KinematicBody2D var theta: float = 0.0 -@export_range(0,2*PI) var alpha: float = 1.5 +export(float,6.2831853) var alpha: float = 1.5 var bullet = load("res://sprites/common/bullet/arrow.tscn") const SPEED = 300.0 @@ -13,7 +13,7 @@ var movex = 0 var movey = 0 var attack = 59 var crit = 5 - +var velocity func _ready(): @@ -29,7 +29,7 @@ func get_vector(angle): # Get the gravity from the project settings to be synced with RigidBody nodes. var gravity = ProjectSettings.get_setting("physics/2d/default_gravity") -@onready var anim := $AnimationPlayer +onready var anim := $AnimationPlayer func _physics_process(delta): if Global.live == 1: @@ -87,7 +87,7 @@ func _physics_process(delta): anim.play("sidle") #move_and_slide() func shoot(angle): - var new_bullet = bullet.instantiate() + var new_bullet = bullet.instance() new_bullet.position = Vector2(position.x, position.y) new_bullet.direction = get_vector(angle) new_bullet.btype = "boss" diff --git a/sprites/common/kimberly/kimberly.tscn b/sprites/common/kimberly/kimberly.tscn index c198568..99afc54 100644 --- a/sprites/common/kimberly/kimberly.tscn +++ b/sprites/common/kimberly/kimberly.tscn @@ -1,182 +1,182 @@ -[gd_scene load_steps=14 format=3 uid="uid://wo77i5ql2esb"] +[gd_scene load_steps=13 format=2] -[ext_resource type="Script" path="res://sprites/common/kimberly/kimberly.gd" id="1_g5qsa"] -[ext_resource type="Texture2D" uid="uid://by7git27p1fp6" path="res://sprites/common/kimberly/sprite.png" id="2_hhs4a"] +[ext_resource path="res://sprites/common/midori/sprite.png" type="Texture" id=1] +[ext_resource path="res://sprites/common/kimberly/kimberly.gd" type="Script" id=2] -[sub_resource type="RectangleShape2D" id="RectangleShape2D_mcaff"] -size = Vector2(86, 256) +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 45, 128 ) -[sub_resource type="Animation" id="Animation_i5rhc"] +[sub_resource type="Animation" id=2] length = 0.001 tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), "update": 1, -"values": [0] +"values": [ 8 ] } -[sub_resource type="Animation" id="Animation_8my4d"] +[sub_resource type="Animation" id=3] resource_name = "eidle" +loop = true tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), "update": 1, -"values": [6] +"values": [ 8 ] } -[sub_resource type="Animation" id="Animation_op07l"] +[sub_resource type="Animation" id=4] resource_name = "ewalk" length = 0.3 -loop_mode = 1 +loop = true +step = 0.033 tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2), -"transitions": PackedFloat32Array(1, 1, 1), +"times": PoolRealArray( 0, 0.099, 0.198 ), +"transitions": PoolRealArray( 1, 1, 1 ), "update": 1, -"values": [7, 6, 8] +"values": [ 9, 8, 10 ] } -[sub_resource type="Animation" id="Animation_cajcr"] +[sub_resource type="Animation" id=5] resource_name = "nidle" +loop = true tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array(0.2), -"transitions": PackedFloat32Array(1), +"times": PoolRealArray( 0.1 ), +"transitions": PoolRealArray( 1 ), "update": 1, -"values": [3] +"values": [ 4 ] } -[sub_resource type="Animation" id="Animation_7lhgw"] +[sub_resource type="Animation" id=6] resource_name = "nwalk" length = 0.3 -loop_mode = 1 +loop = true tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2), -"transitions": PackedFloat32Array(1, 1, 1), +"times": PoolRealArray( 0, 0.1, 0.2 ), +"transitions": PoolRealArray( 1, 1, 1 ), "update": 1, -"values": [4, 3, 5] +"values": [ 5, 4, 6 ] } -[sub_resource type="Animation" id="Animation_w3ius"] +[sub_resource type="Animation" id=7] resource_name = "sidle" +loop = true tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), +"times": PoolRealArray( 0.5 ), +"transitions": PoolRealArray( 1 ), "update": 1, -"values": [0] +"values": [ 0 ] } -[sub_resource type="Animation" id="Animation_u56r5"] +[sub_resource type="Animation" id=8] resource_name = "swalk" length = 0.3 -loop_mode = 1 +loop = true tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2), -"transitions": PackedFloat32Array(1, 1, 1), +"times": PoolRealArray( 0, 0.1, 0.2 ), +"transitions": PoolRealArray( 1, 1, 1 ), "update": 1, -"values": [1, 0, 2] +"values": [ 1, 0, 2 ] } -[sub_resource type="Animation" id="Animation_isodq"] +[sub_resource type="Animation" id=9] resource_name = "widle" +length = 0.3 +loop = true tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array(0.2), -"transitions": PackedFloat32Array(1), +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), "update": 1, -"values": [9] +"values": [ 12 ] } -[sub_resource type="Animation" id="Animation_letwb"] +[sub_resource type="Animation" id=10] resource_name = "wwalk" length = 0.3 -loop_mode = 1 +loop = true tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2), -"transitions": PackedFloat32Array(1, 1, 1), +"times": PoolRealArray( 0, 0.1, 0.2 ), +"transitions": PoolRealArray( 1, 1, 1 ), "update": 1, -"values": [10, 9, 11] +"values": [ 13, 12, 14 ] } -[sub_resource type="AnimationLibrary" id="AnimationLibrary_mh65y"] -_data = { -"RESET": SubResource("Animation_i5rhc"), -"eidle": SubResource("Animation_8my4d"), -"ewalk": SubResource("Animation_op07l"), -"nidle": SubResource("Animation_cajcr"), -"nwalk": SubResource("Animation_7lhgw"), -"sidle": SubResource("Animation_w3ius"), -"swalk": SubResource("Animation_u56r5"), -"widle": SubResource("Animation_isodq"), -"wwalk": SubResource("Animation_letwb") -} +[node name="Kimberly" type="KinematicBody2D"] +script = ExtResource( 2 ) -[node name="Kimberly" type="CharacterBody2D"] -script = ExtResource("1_g5qsa") - -[node name="Sprite2D" type="Sprite2D" parent="."] -texture = ExtResource("2_hhs4a") -hframes = 3 +[node name="Sprite" type="Sprite" parent="."] +texture = ExtResource( 1 ) +hframes = 4 vframes = 4 +frame = 8 [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -shape = SubResource("RectangleShape2D_mcaff") +shape = SubResource( 1 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="."] -libraries = { -"": SubResource("AnimationLibrary_mh65y") -} +anims/RESET = SubResource( 2 ) +anims/eidle = SubResource( 3 ) +anims/ewalk = SubResource( 4 ) +anims/nidle = SubResource( 5 ) +anims/nwalk = SubResource( 6 ) +anims/sidle = SubResource( 7 ) +anims/swalk = SubResource( 8 ) +anims/widle = SubResource( 9 ) +anims/wwalk = SubResource( 10 ) [node name="Speed" type="Timer" parent="."] wait_time = 0.1 diff --git a/sprites/common/kimberly/sprite.png b/sprites/common/kimberly/sprite.png index e4eff0a..7e1517c 100644 Binary files a/sprites/common/kimberly/sprite.png and b/sprites/common/kimberly/sprite.png differ diff --git a/sprites/common/kimberly/sprite.xcf b/sprites/common/kimberly/sprite.xcf index e8683c2..deb037a 100644 Binary files a/sprites/common/kimberly/sprite.xcf and b/sprites/common/kimberly/sprite.xcf differ diff --git a/sprites/common/layla/sprite.png b/sprites/common/layla/sprite.png index 0910f66..59ed9e4 100644 Binary files a/sprites/common/layla/sprite.png and b/sprites/common/layla/sprite.png differ diff --git a/sprites/common/layla/sprite.xcf b/sprites/common/layla/sprite.xcf index 560db38..5762eea 100644 Binary files a/sprites/common/layla/sprite.xcf and b/sprites/common/layla/sprite.xcf differ diff --git a/sprites/common/midori/lily.gd b/sprites/common/midori/lily.gd index ea4fbae..261cfa0 100644 --- a/sprites/common/midori/lily.gd +++ b/sprites/common/midori/lily.gd @@ -1,15 +1,16 @@ -extends CharacterBody2D +extends KinematicBody2D const SPEED = 300.0 const JUMP_VELOCITY = -400.0 var angle = 2 var weakness = 0 +var velocity # Get the gravity from the project settings to be synced with RigidBody nodes. var gravity = ProjectSettings.get_setting("physics/2d/default_gravity") -@onready var anim := $AnimationPlayer +onready var anim := $AnimationPlayer func _physics_process(delta): velocity.x = 0 diff --git a/sprites/common/midori/lily.tscn b/sprites/common/midori/lily.tscn index 2a5ddbc..45c362c 100644 --- a/sprites/common/midori/lily.tscn +++ b/sprites/common/midori/lily.tscn @@ -1,179 +1,179 @@ -[gd_scene load_steps=14 format=3 uid="uid://ba1erruilgjxo"] +[gd_scene load_steps=13 format=2] -[ext_resource type="Script" path="res://sprites/common/midori/lily.gd" id="1_0lf8i"] -[ext_resource type="Texture2D" uid="uid://cbiin6eb1jqsh" path="res://sprites/common/midori/sprite.png" id="2_lcff3"] +[ext_resource path="res://sprites/common/midori/sprite.png" type="Texture" id=1] +[ext_resource path="res://sprites/common/midori/lily.gd" type="Script" id=2] -[sub_resource type="RectangleShape2D" id="RectangleShape2D_dj8gt"] -size = Vector2(86, 256) +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 45, 128 ) -[sub_resource type="Animation" id="Animation_i5rhc"] +[sub_resource type="Animation" id=2] length = 0.001 tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), "update": 1, -"values": [0] +"values": [ 8 ] } -[sub_resource type="Animation" id="Animation_8my4d"] +[sub_resource type="Animation" id=3] resource_name = "eidle" +loop = true tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), "update": 1, -"values": [6] +"values": [ 8 ] } -[sub_resource type="Animation" id="Animation_op07l"] +[sub_resource type="Animation" id=4] resource_name = "ewalk" length = 0.3 -loop_mode = 1 +loop = true +step = 0.033 tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2), -"transitions": PackedFloat32Array(1, 1, 1), +"times": PoolRealArray( 0, 0.099, 0.198 ), +"transitions": PoolRealArray( 1, 1, 1 ), "update": 1, -"values": [7, 6, 8] +"values": [ 9, 8, 10 ] } -[sub_resource type="Animation" id="Animation_cajcr"] +[sub_resource type="Animation" id=5] resource_name = "nidle" +loop = true tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array(0.2), -"transitions": PackedFloat32Array(1), +"times": PoolRealArray( 0.1 ), +"transitions": PoolRealArray( 1 ), "update": 1, -"values": [3] +"values": [ 4 ] } -[sub_resource type="Animation" id="Animation_7lhgw"] +[sub_resource type="Animation" id=6] resource_name = "nwalk" length = 0.3 -loop_mode = 1 +loop = true tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2), -"transitions": PackedFloat32Array(1, 1, 1), +"times": PoolRealArray( 0, 0.1, 0.2 ), +"transitions": PoolRealArray( 1, 1, 1 ), "update": 1, -"values": [4, 3, 5] +"values": [ 5, 4, 6 ] } -[sub_resource type="Animation" id="Animation_w3ius"] +[sub_resource type="Animation" id=7] resource_name = "sidle" +loop = true tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), +"times": PoolRealArray( 0.5 ), +"transitions": PoolRealArray( 1 ), "update": 1, -"values": [0] +"values": [ 0 ] } -[sub_resource type="Animation" id="Animation_u56r5"] +[sub_resource type="Animation" id=8] resource_name = "swalk" length = 0.3 -loop_mode = 1 +loop = true tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2), -"transitions": PackedFloat32Array(1, 1, 1), +"times": PoolRealArray( 0, 0.1, 0.2 ), +"transitions": PoolRealArray( 1, 1, 1 ), "update": 1, -"values": [1, 0, 2] +"values": [ 1, 0, 2 ] } -[sub_resource type="Animation" id="Animation_isodq"] +[sub_resource type="Animation" id=9] resource_name = "widle" +length = 0.3 +loop = true tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array(0.2), -"transitions": PackedFloat32Array(1), +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), "update": 1, -"values": [9] +"values": [ 12 ] } -[sub_resource type="Animation" id="Animation_letwb"] +[sub_resource type="Animation" id=10] resource_name = "wwalk" length = 0.3 -loop_mode = 1 +loop = true tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2), -"transitions": PackedFloat32Array(1, 1, 1), +"times": PoolRealArray( 0, 0.1, 0.2 ), +"transitions": PoolRealArray( 1, 1, 1 ), "update": 1, -"values": [10, 9, 11] +"values": [ 13, 12, 14 ] } -[sub_resource type="AnimationLibrary" id="AnimationLibrary_mh65y"] -_data = { -"RESET": SubResource("Animation_i5rhc"), -"eidle": SubResource("Animation_8my4d"), -"ewalk": SubResource("Animation_op07l"), -"nidle": SubResource("Animation_cajcr"), -"nwalk": SubResource("Animation_7lhgw"), -"sidle": SubResource("Animation_w3ius"), -"swalk": SubResource("Animation_u56r5"), -"widle": SubResource("Animation_isodq"), -"wwalk": SubResource("Animation_letwb") -} +[node name="Lily" type="KinematicBody2D"] +script = ExtResource( 2 ) -[node name="Lily" type="CharacterBody2D"] -script = ExtResource("1_0lf8i") - -[node name="Sprite2D" type="Sprite2D" parent="."] -texture = ExtResource("2_lcff3") -hframes = 3 +[node name="Sprite" type="Sprite" parent="."] +texture = ExtResource( 1 ) +hframes = 4 vframes = 4 +frame = 8 [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -shape = SubResource("RectangleShape2D_dj8gt") +shape = SubResource( 1 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="."] -libraries = { -"": SubResource("AnimationLibrary_mh65y") -} +anims/RESET = SubResource( 2 ) +anims/eidle = SubResource( 3 ) +anims/ewalk = SubResource( 4 ) +anims/nidle = SubResource( 5 ) +anims/nwalk = SubResource( 6 ) +anims/sidle = SubResource( 7 ) +anims/swalk = SubResource( 8 ) +anims/widle = SubResource( 9 ) +anims/wwalk = SubResource( 10 ) diff --git a/sprites/common/natasha/natasha.gd b/sprites/common/natasha/natasha.gd index d7ce09f..693672c 100644 --- a/sprites/common/natasha/natasha.gd +++ b/sprites/common/natasha/natasha.gd @@ -1,7 +1,7 @@ -extends CharacterBody2D +extends KinematicBody2D var theta: float = 0.0 -@export_range(0,2*PI) var alpha: float = 1.5 +export(float,6.2831853) var alpha: float = 1.5 var bullet = load("res://sprites/common/bullet/snowflake.tscn") const SPEED = 300.0 @@ -14,7 +14,7 @@ var movex = 0 var movey = 0 var attack = 87 var crit = 7 - +var velocity func _ready(): if Global.isboss: @@ -30,7 +30,7 @@ func get_vector(angle): # Get the gravity from the project settings to be synced with RigidBody nodes. var gravity = ProjectSettings.get_setting("physics/2d/default_gravity") -@onready var anim := $AnimationPlayer +onready var anim := $AnimationPlayer func _physics_process(delta): if Global.live == 1: diff --git a/sprites/common/natasha/natasha.tscn b/sprites/common/natasha/natasha.tscn index 21050a0..24a2268 100644 --- a/sprites/common/natasha/natasha.tscn +++ b/sprites/common/natasha/natasha.tscn @@ -1,183 +1,182 @@ -[gd_scene load_steps=14 format=3 uid="uid://dpudp1d2wpryc"] +[gd_scene load_steps=13 format=2] -[ext_resource type="Script" path="res://sprites/common/natasha/natasha.gd" id="1_kycyt"] -[ext_resource type="Texture2D" uid="uid://7pw16o08gyuk" path="res://sprites/common/natasha/sprite.png" id="2_grplw"] +[ext_resource path="res://sprites/common/midori/sprite.png" type="Texture" id=1] +[ext_resource path="res://sprites/common/natasha/natasha.gd" type="Script" id=2] -[sub_resource type="RectangleShape2D" id="RectangleShape2D_4u51x"] -size = Vector2(86, 256) +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 45, 128 ) -[sub_resource type="Animation" id="Animation_i5rhc"] +[sub_resource type="Animation" id=2] length = 0.001 tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), "update": 1, -"values": [0] +"values": [ 8 ] } -[sub_resource type="Animation" id="Animation_8my4d"] +[sub_resource type="Animation" id=3] resource_name = "eidle" +loop = true tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), "update": 1, -"values": [6] +"values": [ 8 ] } -[sub_resource type="Animation" id="Animation_op07l"] +[sub_resource type="Animation" id=4] resource_name = "ewalk" length = 0.3 -loop_mode = 1 +loop = true +step = 0.033 tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2), -"transitions": PackedFloat32Array(1, 1, 1), +"times": PoolRealArray( 0, 0.099, 0.198 ), +"transitions": PoolRealArray( 1, 1, 1 ), "update": 1, -"values": [7, 6, 8] +"values": [ 9, 8, 10 ] } -[sub_resource type="Animation" id="Animation_cajcr"] +[sub_resource type="Animation" id=5] resource_name = "nidle" +loop = true tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array(0.2), -"transitions": PackedFloat32Array(1), +"times": PoolRealArray( 0.1 ), +"transitions": PoolRealArray( 1 ), "update": 1, -"values": [3] +"values": [ 4 ] } -[sub_resource type="Animation" id="Animation_7lhgw"] +[sub_resource type="Animation" id=6] resource_name = "nwalk" length = 0.3 -loop_mode = 1 +loop = true tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2), -"transitions": PackedFloat32Array(1, 1, 1), +"times": PoolRealArray( 0, 0.1, 0.2 ), +"transitions": PoolRealArray( 1, 1, 1 ), "update": 1, -"values": [4, 3, 5] +"values": [ 5, 4, 6 ] } -[sub_resource type="Animation" id="Animation_w3ius"] +[sub_resource type="Animation" id=7] resource_name = "sidle" +loop = true tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), +"times": PoolRealArray( 0.5 ), +"transitions": PoolRealArray( 1 ), "update": 1, -"values": [0] +"values": [ 0 ] } -[sub_resource type="Animation" id="Animation_u56r5"] +[sub_resource type="Animation" id=8] resource_name = "swalk" length = 0.3 -loop_mode = 1 +loop = true tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2), -"transitions": PackedFloat32Array(1, 1, 1), +"times": PoolRealArray( 0, 0.1, 0.2 ), +"transitions": PoolRealArray( 1, 1, 1 ), "update": 1, -"values": [1, 0, 2] +"values": [ 1, 0, 2 ] } -[sub_resource type="Animation" id="Animation_isodq"] +[sub_resource type="Animation" id=9] resource_name = "widle" +length = 0.3 +loop = true tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array(0.2), -"transitions": PackedFloat32Array(1), +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), "update": 1, -"values": [9] +"values": [ 12 ] } -[sub_resource type="Animation" id="Animation_letwb"] +[sub_resource type="Animation" id=10] resource_name = "wwalk" length = 0.3 -loop_mode = 1 +loop = true tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/path = NodePath("Sprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2), -"transitions": PackedFloat32Array(1, 1, 1), +"times": PoolRealArray( 0, 0.1, 0.2 ), +"transitions": PoolRealArray( 1, 1, 1 ), "update": 1, -"values": [10, 9, 11] +"values": [ 13, 12, 14 ] } -[sub_resource type="AnimationLibrary" id="AnimationLibrary_mh65y"] -_data = { -"RESET": SubResource("Animation_i5rhc"), -"eidle": SubResource("Animation_8my4d"), -"ewalk": SubResource("Animation_op07l"), -"nidle": SubResource("Animation_cajcr"), -"nwalk": SubResource("Animation_7lhgw"), -"sidle": SubResource("Animation_w3ius"), -"swalk": SubResource("Animation_u56r5"), -"widle": SubResource("Animation_isodq"), -"wwalk": SubResource("Animation_letwb") -} +[node name="Natasha" type="KinematicBody2D"] +script = ExtResource( 2 ) -[node name="Natasha" type="CharacterBody2D"] -script = ExtResource("1_kycyt") -alpha = 1.699 - -[node name="Sprite2D" type="Sprite2D" parent="."] -texture = ExtResource("2_grplw") -hframes = 3 +[node name="Sprite" type="Sprite" parent="."] +texture = ExtResource( 1 ) +hframes = 4 vframes = 4 +frame = 8 [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -shape = SubResource("RectangleShape2D_4u51x") +shape = SubResource( 1 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="."] -libraries = { -"": SubResource("AnimationLibrary_mh65y") -} +anims/RESET = SubResource( 2 ) +anims/eidle = SubResource( 3 ) +anims/ewalk = SubResource( 4 ) +anims/nidle = SubResource( 5 ) +anims/nwalk = SubResource( 6 ) +anims/sidle = SubResource( 7 ) +anims/swalk = SubResource( 8 ) +anims/widle = SubResource( 9 ) +anims/wwalk = SubResource( 10 ) [node name="Speed" type="Timer" parent="."] wait_time = 0.1 diff --git a/sprites/common/natasha/sprite.png b/sprites/common/natasha/sprite.png index 21dee09..d841864 100644 Binary files a/sprites/common/natasha/sprite.png and b/sprites/common/natasha/sprite.png differ diff --git a/sprites/common/natasha/sprite.xcf b/sprites/common/natasha/sprite.xcf index 1e30274..681fe4f 100644 Binary files a/sprites/common/natasha/sprite.xcf and b/sprites/common/natasha/sprite.xcf differ diff --git a/sprites/common/tuna/sprite.png b/sprites/common/tuna/sprite.png index 40f23d9..6c22bcd 100644 Binary files a/sprites/common/tuna/sprite.png and b/sprites/common/tuna/sprite.png differ diff --git a/sprites/common/tuna/sprite.xcf b/sprites/common/tuna/sprite.xcf index 5e504ba..99fec30 100644 Binary files a/sprites/common/tuna/sprite.xcf and b/sprites/common/tuna/sprite.xcf differ diff --git a/title.tscn b/title.tscn index 93d1f44..d22ef6c 100644 --- a/title.tscn +++ b/title.tscn @@ -30,7 +30,7 @@ align = 1 valign = 1 script = ExtResource( 5 ) -[node name="start" type="Label" parent="."] +[node name="exit" type="Label" parent="."] margin_left = 364.0 margin_top = 602.0 margin_right = 834.0 @@ -40,7 +40,7 @@ text = "TEXT_EXIT" align = 1 script = ExtResource( 6 ) -[node name="exit" type="Label" parent="."] +[node name="start" type="Label" parent="."] margin_left = 446.0 margin_top = 92.0 margin_right = 893.0