From f0f15c1132402c3ceaeaf7eca625046fdf315673 Mon Sep 17 00:00:00 2001 From: Josh Maggard Date: Sat, 13 Apr 2024 13:27:43 -0500 Subject: [PATCH] Add coral and portal placeholders --- coral.png | Bin 0 -> 195 bytes coral.png.import | 34 +++++++++++++++++++++++++ main.tscn | 62 +++++++++++++++++++++++++++++++--------------- portal.aseprite | Bin 0 -> 1061 bytes portal.json | 59 +++++++++++++++++++++++++++++++++++++++++++ portal.png | Bin 0 -> 611 bytes portal.png.import | 34 +++++++++++++++++++++++++ portal.tscn | 52 ++++++++++++++++++++++++++++++++++++++ 8 files changed, 221 insertions(+), 20 deletions(-) create mode 100644 coral.png create mode 100644 coral.png.import create mode 100644 portal.aseprite create mode 100644 portal.json create mode 100644 portal.png create mode 100644 portal.png.import create mode 100644 portal.tscn diff --git a/coral.png b/coral.png new file mode 100644 index 0000000000000000000000000000000000000000..d1e241fdcec736ad226827b027d8a66a2e8bed91 GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|YCT;XLo9le z6C_xhW$x&Q{I1_0@YdeWwC9IOeudVl13)04@OPHu#{XhrTYYx$1iaaQR01flpu1of z!!pL1{byZuewZw1W_WqMz&U~89qWwwiChyzl{Q~I%>0h&=)dTm@7$6ffJ*sRb8qlm obi2=Y9&0Sa^vi{=%10R(0)JaOK96pd13HAk)78&qol`;+09a>9t^fc4 literal 0 HcmV?d00001 diff --git a/coral.png.import b/coral.png.import new file mode 100644 index 0000000..5a89821 --- /dev/null +++ b/coral.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b8frlh3w52834" +path="res://.godot/imported/coral.png-e9734a391aa3a93cf1f07d9d911db9d8.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://coral.png" +dest_files=["res://.godot/imported/coral.png-e9734a391aa3a93cf1f07d9d911db9d8.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 diff --git a/main.tscn b/main.tscn index 29a001f..ed8e6c0 100644 --- a/main.tscn +++ b/main.tscn @@ -1,12 +1,14 @@ -[gd_scene load_steps=17 format=3 uid="uid://c1e2254bs6m3e"] +[gd_scene load_steps=19 format=3 uid="uid://c1e2254bs6m3e"] [ext_resource type="PackedScene" uid="uid://mnaxd41w2loc" path="res://player.tscn" id="1_rotku"] [ext_resource type="Script" path="res://Water.gd" id="2_imxiw"] [ext_resource type="PackedScene" uid="uid://cjiok5o0qam3w" path="res://ui.tscn" id="3_0cdyn"] [ext_resource type="Script" path="res://WaterArea.gd" id="3_58cow"] [ext_resource type="PackedScene" uid="uid://b1tw6cgdbe6r7" path="res://biome.tscn" id="5_18gyt"] +[ext_resource type="PackedScene" uid="uid://bpdlhgmmoy15j" path="res://portal.tscn" id="5_ekxwn"] [ext_resource type="Script" path="res://OxygenArea.gd" id="5_ghrk7"] [ext_resource type="PackedScene" uid="uid://s6lkr5v083iq" path="res://placeholder_sprite.tscn" id="6_bw7w6"] +[ext_resource type="Texture2D" uid="uid://b8frlh3w52834" path="res://coral.png" id="8_kvchq"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_as6lo"] size = Vector2(4246, 378) @@ -86,7 +88,6 @@ shape = SubResource("RectangleShape2D_wau00") debug_color = Color(0.666667, 0.933333, 1, 0.419608) [node name="UI" parent="." instance=ExtResource("3_0cdyn")] -visible = false [node name="Water" type="Polygon2D" parent="." node_paths=PackedStringArray("default_biome")] z_index = 1 @@ -111,7 +112,12 @@ position = Vector2(-2963, 131) color = Color(0.203922, 0.317647, 0.34902, 1) polygon = PackedVector2Array(1185, 126, -411, 325, -255, 1751, 1588, 1799, 1921, 892) -[node name="WaterArea" type="Area2D" parent="."] +[node name="Portal" parent="." instance=ExtResource("5_ekxwn")] + +[node name="Areas" type="Node2D" parent="."] +visible = false + +[node name="WaterArea" type="Area2D" parent="Areas"] position = Vector2(0, 7) gravity_space_override = 2 gravity_point_center = Vector2(0, 0) @@ -120,23 +126,23 @@ linear_damp_space_override = 2 linear_damp = 0.5 script = ExtResource("3_58cow") -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="WaterArea"] +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Areas/WaterArea"] visible = false polygon = PackedVector2Array(4050, 0, -2686, 0, -917, 216, -1210, 1808, -2435, 1808, -2077, 3080, 4967, 3000) -[node name="OxygenArea" type="Area2D" parent="."] +[node name="OxygenArea" type="Area2D" parent="Areas"] script = ExtResource("5_ghrk7") -[node name="CollisionShape2D" type="CollisionShape2D" parent="OxygenArea"] +[node name="CollisionShape2D" type="CollisionShape2D" parent="Areas/OxygenArea"] position = Vector2(1494.5, -367.5) shape = SubResource("RectangleShape2D_8xvdo") -[node name="OxygenArea2" type="Area2D" parent="."] +[node name="OxygenArea2" type="Area2D" parent="Areas"] z_index = 3 position = Vector2(-2552, 1939) script = ExtResource("5_ghrk7") -[node name="CollisionShape2D" type="CollisionShape2D" parent="OxygenArea2"] +[node name="CollisionShape2D" type="CollisionShape2D" parent="Areas/OxygenArea2"] position = Vector2(335, -765) shape = SubResource("RectangleShape2D_jdpq8") @@ -195,41 +201,57 @@ position = Vector2(782, 191) [node name="PlaceholderSprite18" parent="Placeholder Sprites" instance=ExtResource("6_bw7w6")] position = Vector2(637, 174) -[node name="StartingIsland" type="StaticBody2D" parent="."] +[node name="World" type="Node2D" parent="."] + +[node name="StartingIsland" type="StaticBody2D" parent="World"] position = Vector2(-110, -8) -[node name="Polygon2D" type="Polygon2D" parent="StartingIsland"] +[node name="Polygon2D" type="Polygon2D" parent="World/StartingIsland"] color = Color(0.321569, 0.192157, 0, 1) polygon = PackedVector2Array(25, 0, 81, 33, 79, 45, 72, 67, 42, 79, -5, 65, -59, 57, -123, 69, -184, 110, -249, 168, -251, 228, -186, 225, -105, 182, -71, 195, -33, 243, -131, 779, -357, 968, -323, 1727, -908, 2114, -786, 5, -695, -463, -372, -460, -288, -73, -262, -36, -192, -2, -110, -4) -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="StartingIsland"] +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="World/StartingIsland"] visible = false polygon = PackedVector2Array(25, 0, 81, 33, 79, 45, 72, 67, 42, 79, -5, 65, -59, 57, -123, 69, -184, 110, -249, 168, -251, 228, -186, 225, -105, 182, -71, 195, -33, 243, -131, 779, -357, 968, -323, 1727, -908, 2114, -786, 5, -695, -463, -372, -460, -288, -73, -262, -36, -192, -2, -110, -4) -[node name="MiddleSeparator" type="StaticBody2D" parent="."] +[node name="MiddleSeparator" type="StaticBody2D" parent="World"] position = Vector2(2240, 2) -[node name="Sprite2D" type="Sprite2D" parent="MiddleSeparator"] +[node name="Sprite2D" type="Sprite2D" parent="World/MiddleSeparator"] texture = SubResource("PlaceholderTexture2D_mk1d2") -[node name="Polygon2D" type="Polygon2D" parent="MiddleSeparator"] +[node name="Polygon2D" type="Polygon2D" parent="World/MiddleSeparator"] color = Color(0.321569, 0.192157, 0, 1) polygon = PackedVector2Array(-677, -104, -783, -1932, -1047, -1962, -1017, -112, -1387, 107, -1349, 560, -1047, 832, -919, 1157, -889, 1504, -972, 1814, -1221, 2108, -1160, 2350, -934, 2463, -405, 2342, 55, 2123, 86, 1610, -88, 1421, -315, 1270, -428, 968, -443, 628, -405, 432, -473, 130) -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="MiddleSeparator"] +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="World/MiddleSeparator"] visible = false polygon = PackedVector2Array(-677, -104, -783, -1932, -1047, -1962, -1017, -112, -1387, 107, -1349, 560, -1047, 832, -919, 1157, -889, 1504, -972, 1814, -1221, 2108, -1160, 2350, -934, 2463, -405, 2342, 55, 2123, 86, 1610, -88, 1421, -315, 1270, -428, 968, -443, 628, -405, 432, -473, 130) -[node name="OOB" type="StaticBody2D" parent="."] +[node name="OOB" type="StaticBody2D" parent="World"] position = Vector2(-1647, 2848) -[node name="Polygon2D" type="Polygon2D" parent="OOB"] +[node name="Polygon2D" type="Polygon2D" parent="World/OOB"] color = Color(0.321569, 0.192157, 0, 1) polygon = PackedVector2Array(808, -4029, 646, -752, -112, -636, -399, -924, 456, -1587, 365, -2017, -70, -2215, -769, -2296, -1374, -2019, -1447, -1203, -855, -1116, -598.32, -912.526, -472, -557, 727, -25, 2729, 11, 6109, -117, 5384, -2715, 6305, -5010, 10941, 170, 5928, 2662, -1246, 2435, -2484, -4436) -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="OOB"] +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="World/OOB"] visible = false polygon = PackedVector2Array(808, -4029, 646, -752, -112, -636, -399, -924, 456, -1587, 365, -2017, -70, -2215, -769, -2296, -1374, -2019, -1447, -1203, -855, -1116, -598.32, -912.526, -472, -557, 727, -25, 2729, 11, 6109, -117, 5384, -2715, 6305, -5010, 10941, 170, 5928, 2662, -1246, 2435, -2484, -4436) -[connection signal="body_entered" from="WaterArea" to="WaterArea" method="_on_body_entered"] -[connection signal="body_exited" from="WaterArea" to="WaterArea" method="_on_body_exited"] +[node name="Coral" type="Sprite2D" parent="."] +position = Vector2(-301, 212) +texture = ExtResource("8_kvchq") + +[node name="Coral2" type="Sprite2D" parent="."] +position = Vector2(-356, 216) +rotation = 1.0472 +texture = ExtResource("8_kvchq") + +[node name="Coral3" type="Sprite2D" parent="."] +position = Vector2(-354, 160) +rotation = 1.89322 +texture = ExtResource("8_kvchq") + +[connection signal="body_entered" from="Areas/WaterArea" to="Areas/WaterArea" method="_on_body_entered"] +[connection signal="body_exited" from="Areas/WaterArea" to="Areas/WaterArea" method="_on_body_exited"] diff --git a/portal.aseprite b/portal.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..50817948755c198cb0ea2df6c8aaba271779bb4e GIT binary patch literal 1061 zcmY#oVPJT$l$AjN3>g_17*c>30TdV*L4phdKu8Nv1~mQGM>epnY(NXdfS6qYY$cL) zSwJ=m15i`}$WT%+an-O%vo!1vv%X)bc5^}6yTh}7e=?i-G$3oAf%%j??@aw5ZxtgO zOMCkggM_B&yobrN|Hq$wa{Bh4|NsBbUc0@eu01m=D>5vo%&BXQkj-g^sa)JWi6wA`T?TJcT1$b9vnr(_~`H)~BJ^kP7tGge}h_TK{ zG&4+lWGp^k_KV4Ek3SU3TT)!JKaza#9~%csF;R{k-Ice^#ZF_hwJc z&1{!)lHMqYw0|*}En@9qTC8wZO?CZ+!#ND0Te+lc}3X2zXco8{7kjV4dpA!}MK!k=m*aaqLf>yl}V p%!y{Isback)t2Wi*z#xDvYSh8IIfz>oM~n_V_q6F!;jfoHUN>?HL?Hz literal 0 HcmV?d00001 diff --git a/portal.json b/portal.json new file mode 100644 index 0000000..5a4fbb1 --- /dev/null +++ b/portal.json @@ -0,0 +1,59 @@ +{ "frames": { + "portal 0.aseprite": { + "frame": { "x": 2, "y": 2, "w": 27, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 23, "h": 29 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "portal 1.aseprite": { + "frame": { "x": 60, "y": 2, "w": 23, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 19, "h": 29 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "portal 2.aseprite": { + "frame": { "x": 31, "y": 37, "w": 23, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 7, "y": 3, "w": 19, "h": 29 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "portal 3.aseprite": { + "frame": { "x": 31, "y": 2, "w": 27, "h": 33 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 3, "w": 23, "h": 29 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "portal 4.aseprite": { + "frame": { "x": 2, "y": 37, "w": 27, "h": 31 }, + "rotated": false, + "trimmed": true, + "spriteSourceSize": { "x": 5, "y": 5, "w": 23, "h": 27 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + } + }, + "meta": { + "app": "https://www.aseprite.org/", + "version": "1.3.6-x64", + "image": "portal.png", + "format": "RGBA8888", + "size": { "w": 85, "h": 72 }, + "scale": "1", + "frameTags": [ + { "name": "idle", "from": 0, "to": 4, "direction": "forward", "color": "#000000ff" } + ], + "layers": [ + { "name": "Layer 1", "opacity": 255, "blendMode": "normal" } + ], + "slices": [ + ] + } +} diff --git a/portal.png b/portal.png new file mode 100644 index 0000000000000000000000000000000000000000..007ca70b866ed6b34d1868006e5b509bb9cae52e GIT binary patch literal 611 zcmV-p0-XJcP)Px%9Z5t%RCt{2oK14WAPj}wP7l;=x4lU(kwfGXzDc*<=0@#`j)wpeSP!Jm`&OBd zAR8V(LbA7w5JHF*FQb3Fecpf4=ll04)#NsFT8gce&5E0qpi%)`_NX)w04uJHmR=jBd(qw> zl?tHSqZ&DdA4M~t&pc<)LZt#2j;3m`j;10axQzP;A=D|=YR`%gLI@$GjLW3o6$!?c zaPtqqm7BW4B}PD{0=S&?yKVRcTuWOspi%*Jhp1a+GY&kwgsodpsQ|i@en%A2n}A!h zH6!q60hJ0MRHNpP;doVUs78%~xcaYHWh1QcEvQrg;TknUf^oP;jeu#08ujQ;G^kVn zCh6&3_lv8bQURExQs!9ArBU~*R4M?IlmEnMdZYGnc*|FdAfZwLxOj!q%uz7|Diy%6 xN44sa@CZ8ru~9t?r)aopu>X>wLI@$mj$bavFzuKM`85Cl002ovPDHLkV1mzK8czTK literal 0 HcmV?d00001 diff --git a/portal.png.import b/portal.png.import new file mode 100644 index 0000000..bced5dd --- /dev/null +++ b/portal.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://jhqp07488shd" +path="res://.godot/imported/portal.png-cac28fad10330d5df5782c260ec8497f.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://portal.png" +dest_files=["res://.godot/imported/portal.png-cac28fad10330d5df5782c260ec8497f.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 diff --git a/portal.tscn b/portal.tscn new file mode 100644 index 0000000..33b599a --- /dev/null +++ b/portal.tscn @@ -0,0 +1,52 @@ +[gd_scene load_steps=4 format=3 uid="uid://bpdlhgmmoy15j"] + +[ext_resource type="Texture2D" uid="uid://jhqp07488shd" path="res://portal.png" id="1_ouc00"] + +[sub_resource type="Animation" id="Animation_tfgl8"] +length = 0.5 +loop_mode = 1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Sprite2D:region_rect") +tracks/0/interp = 0 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1), +"update": 0, +"values": [Rect2(2, 2, 27, 33), Rect2(60, 2, 23, 33), Rect2(31, 37, 23, 33), Rect2(31, 2, 27, 33), Rect2(2, 37, 27, 31)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("Sprite2D:offset") +tracks/1/interp = 0 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1), +"update": 0, +"values": [Vector2(0.5, 1.5), Vector2(0.5, 1.5), Vector2(0.5, 1.5), Vector2(0.5, 1.5), Vector2(0.5, 2.5)] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_83tn8"] +_data = { +"idle": SubResource("Animation_tfgl8") +} + +[node name="Portal" type="Node2D"] +z_index = -1 +position = Vector2(-222, -26) + +[node name="Sprite2D" type="Sprite2D" parent="."] +texture = ExtResource("1_ouc00") +offset = Vector2(0.5, 1.5) +region_enabled = true +region_rect = Rect2(2, 2, 27, 33) + +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +libraries = { +"": SubResource("AnimationLibrary_83tn8") +} +autoplay = "idle"