From e0a43e69a0eb63b49136f967ae214e227d29c275 Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Fri, 24 Nov 2023 18:09:04 -0500 Subject: [PATCH] more credits stuff --- cutscenes/ending_future1.tscn | 68 --------------------- graphics/pong/pong.png | Bin 217 -> 0 bytes graphics/pong/pong.png.import | 35 ----------- maps/hills.tscn | 2 +- maps/hills_scholar.tscn | 5 +- menus/credits.tscn | 107 +++++++++++++++++++--------------- objects/lore/hills/pong.tscn | 26 --------- 7 files changed, 63 insertions(+), 180 deletions(-) delete mode 100644 cutscenes/ending_future1.tscn delete mode 100644 graphics/pong/pong.png delete mode 100644 graphics/pong/pong.png.import delete mode 100644 objects/lore/hills/pong.tscn diff --git a/cutscenes/ending_future1.tscn b/cutscenes/ending_future1.tscn deleted file mode 100644 index 9483c77..0000000 --- a/cutscenes/ending_future1.tscn +++ /dev/null @@ -1,68 +0,0 @@ -[gd_scene load_steps=15 format=2] - -[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=1] -[ext_resource path="res://tilesets/t_grass.tres" type="TileSet" id=2] -[ext_resource path="res://graphics/pong/pong.png" type="Texture" id=3] -[ext_resource path="res://maps/boss/boss2_arena.gd" type="Script" id=4] -[ext_resource path="res://graphics/backgrounds/hills.png" type="Texture" id=5] -[ext_resource path="res://graphics/npc/msx_future.png" type="Texture" id=6] -[ext_resource path="res://graphics/npc/speccy_future.png" type="Texture" id=7] -[ext_resource path="res://graphics/npc/sg_future.png" type="Texture" id=8] -[ext_resource path="res://graphics/ending/picnic_table.png" type="Texture" id=9] -[ext_resource path="res://graphics/npc/sms.png" type="Texture" id=10] -[ext_resource path="res://objects/lore/boss/2600.tscn" type="PackedScene" id=11] -[ext_resource path="res://objects/lore/boss/dr_intelli.tscn" type="PackedScene" id=12] -[ext_resource path="res://audio/music/klystron_vip.ogg" type="AudioStream" id=13] - -[sub_resource type="ShaderMaterial" id=1] -shader = ExtResource( 1 ) -shader_param/border_color = Color( 0, 0, 0, 1 ) -shader_param/border_corners = true - -[node name="Map" type="Node2D" groups=["map"]] -pause_mode = 1 -script = ExtResource( 4 ) -music = ExtResource( 13 ) -lore_entries = [ ExtResource( 11 ), ExtResource( 12 ) ] - -[node name="Sprite" type="Sprite" parent="."] -position = Vector2( 128, 96 ) -z_index = -2 -texture = ExtResource( 5 ) -__meta__ = { -"_edit_lock_": true -} - -[node name="TileMap" type="TileMap" parent="."] -tile_set = ExtResource( 2 ) -cell_size = Vector2( 8, 8 ) -format = 1 -tile_data = PoolIntArray( 1507327, 3, 1, 1441792, 3, 2, 1441793, 3, 2, 1441794, 3, 2, 1441795, 3, 2, 1441796, 3, 2, 1441797, 3, 2, 1441798, 3, 2, 1441799, 3, 2, 1441800, 3, 2, 1441801, 3, 2, 1441802, 3, 2, 1441803, 3, 2, 1441804, 3, 2, 1441805, 3, 2, 1441806, 3, 2, 1441807, 3, 2, 1441808, 3, 2, 1441809, 3, 2, 1441810, 3, 2, 1441811, 3, 2, 1441812, 3, 2, 1441813, 3, 2, 1441814, 3, 2, 1441815, 3, 2, 1441816, 3, 2, 1441817, 3, 2, 1441818, 3, 2, 1441819, 3, 2, 1441820, 3, 2, 1441821, 3, 2, 1441822, 3, 2, 1441823, 3, 2, 1441824, 3, 3, 1572863, 3, 65537, 1507328, 3, 65538, 1507329, 3, 65538, 1507330, 3, 65538, 1507331, 3, 65538, 1507332, 3, 65538, 1507333, 3, 65538, 1507334, 3, 65538, 1507335, 3, 65538, 1507336, 3, 65538, 1507337, 3, 65538, 1507338, 3, 65538, 1507339, 3, 65538, 1507340, 3, 65538, 1507341, 3, 65538, 1507342, 3, 65538, 1507343, 3, 65538, 1507344, 3, 65538, 1507345, 3, 65538, 1507346, 3, 65538, 1507347, 3, 65538, 1507348, 3, 65538, 1507349, 3, 65538, 1507350, 3, 65538, 1507351, 3, 65538, 1507352, 3, 65538, 1507353, 3, 65538, 1507354, 3, 65538, 1507355, 3, 65538, 1507356, 3, 65538, 1507357, 3, 65538, 1507358, 3, 65538, 1507359, 3, 65538, 1507360, 3, 65539, 1638399, 3, 131073, 1572864, 3, 131074, 1572865, 3, 131074, 1572866, 3, 131074, 1572867, 3, 131074, 1572868, 3, 131074, 1572869, 3, 131074, 1572870, 3, 131074, 1572871, 3, 131074, 1572872, 3, 131074, 1572873, 3, 131074, 1572874, 3, 131074, 1572875, 3, 131074, 1572876, 3, 131074, 1572877, 3, 131074, 1572878, 3, 131074, 1572879, 3, 131074, 1572880, 3, 131074, 1572881, 3, 131074, 1572882, 3, 131074, 1572883, 3, 131074, 1572884, 3, 131074, 1572885, 3, 131074, 1572886, 3, 131074, 1572887, 3, 131074, 1572888, 3, 131074, 1572889, 3, 131074, 1572890, 3, 131074, 1572891, 3, 131074, 1572892, 3, 131074, 1572893, 3, 131074, 1572894, 3, 131074, 1572895, 3, 131074, 1572896, 3, 131075 ) - -[node name="SgFuture" type="Sprite" parent="."] -position = Vector2( 96, 166 ) -texture = ExtResource( 8 ) - -[node name="MsxFuture" type="Sprite" parent="."] -position = Vector2( 161, 166 ) -scale = Vector2( -1, 1 ) -texture = ExtResource( 6 ) - -[node name="SpeccyFuture" type="Sprite" parent="."] -position = Vector2( 176, 164 ) -scale = Vector2( -1, 1 ) -texture = ExtResource( 7 ) - -[node name="Sms" type="Sprite" parent="."] -position = Vector2( 80, 164 ) -texture = ExtResource( 10 ) - -[node name="Pong" type="Sprite" parent="."] -material = SubResource( 1 ) -position = Vector2( 64, 170 ) -scale = Vector2( -1, 1 ) -texture = ExtResource( 3 ) - -[node name="PicnicTable" type="Sprite" parent="."] -position = Vector2( 128, 167 ) -texture = ExtResource( 9 ) diff --git a/graphics/pong/pong.png b/graphics/pong/pong.png deleted file mode 100644 index d707d6be6ded0376864b5c3e4ce02d1d96e416d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^f*>{rGmxxUUaA447>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}z{s)4bwEq{K_V3>h6zfeE%>`1dB|(0{ASs65+xUWk0-OaNk;M!Q ze1}1p@p%4<6riA!r;B5VM0o7!Mm`1w7M2U#|No!03@kF+x}ACULWMF_7H1i&pRCi) zFMf66?MF|KZdKOw6EihR9&UH3%@hv!@_NgRTm>Vh>{}M9NkG#WJYD@<);T3K0RZJ; BNDTl0 diff --git a/graphics/pong/pong.png.import b/graphics/pong/pong.png.import deleted file mode 100644 index e3f3763..0000000 --- a/graphics/pong/pong.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/pong.png-90b130469b1c692dceb5d305e72a3fa2.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/pong/pong.png" -dest_files=[ "res://.import/pong.png-90b130469b1c692dceb5d305e72a3fa2.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/maps/hills.tscn b/maps/hills.tscn index eb07897..247e7d5 100644 --- a/maps/hills.tscn +++ b/maps/hills.tscn @@ -37,7 +37,7 @@ script = ExtResource( 19 ) target_time_any = 70 target_time_100 = 180 music = ExtResource( 3 ) -lore_entries = [ ExtResource( 25 ), ExtResource( 24 ), ExtResource( 22 ), ExtResource( 23 ), ExtResource( 27 ), ExtResource( 20 ), ExtResource( 20 ) ] +lore_entries = [ ExtResource( 25 ), ExtResource( 24 ), ExtResource( 22 ), ExtResource( 23 ), ExtResource( 27 ), ExtResource( 20 ) ] [node name="CanvasLayer" type="CanvasLayer" parent="."] layer = -2 diff --git a/maps/hills_scholar.tscn b/maps/hills_scholar.tscn index d8524bd..81a92d4 100644 --- a/maps/hills_scholar.tscn +++ b/maps/hills_scholar.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=32 format=2] +[gd_scene load_steps=31 format=2] [ext_resource path="res://objects/environment/ladder/ladder.tscn" type="PackedScene" id=1] [ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=2] @@ -30,7 +30,6 @@ [ext_resource path="res://scripts/has_splash.gd" type="Script" id=28] [ext_resource path="res://objects/lore/hills/speccy.tscn" type="PackedScene" id=29] [ext_resource path="res://objects/lore/hills/sg.tscn" type="PackedScene" id=30] -[ext_resource path="res://objects/lore/hills/pong.tscn" type="PackedScene" id=31] [node name="Map" type="Node2D" groups=["map"]] pause_mode = 1 @@ -38,7 +37,7 @@ script = ExtResource( 19 ) target_time_any = 70 target_time_100 = 180 music = ExtResource( 3 ) -lore_entries = [ ExtResource( 25 ), ExtResource( 24 ), ExtResource( 22 ), ExtResource( 23 ), ExtResource( 30 ), ExtResource( 29 ), ExtResource( 31 ) ] +lore_entries = [ ExtResource( 25 ), ExtResource( 24 ), ExtResource( 22 ), ExtResource( 23 ), ExtResource( 30 ), ExtResource( 29 ) ] [node name="CanvasLayer" type="CanvasLayer" parent="."] layer = -2 diff --git a/menus/credits.tscn b/menus/credits.tscn index be5d765..4ccb3c2 100644 --- a/menus/credits.tscn +++ b/menus/credits.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=136 format=2] +[gd_scene load_steps=134 format=2] [ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=1] [ext_resource path="res://shaders/ska_plane.gdshader" type="Shader" id=2] @@ -13,7 +13,6 @@ [ext_resource path="res://graphics/hud/roll_call.png" type="Texture" id=11] [ext_resource path="res://graphics/npc/intelli_idle.png" type="Texture" id=12] [ext_resource path="res://graphics/npc/speccy.png" type="Texture" id=13] -[ext_resource path="res://graphics/pong/pong.png" type="Texture" id=14] [ext_resource path="res://graphics/enemy/snake.png" type="Texture" id=15] [ext_resource path="res://scripts/sg_palette.gd" type="Script" id=16] [ext_resource path="res://graphics/player/sg_stim.png" type="Texture" id=17] @@ -186,11 +185,6 @@ animations = [ { "speed": 5.0 } ] -[sub_resource type="ShaderMaterial" id=9] -shader = ExtResource( 1 ) -shader_param/border_color = Color( 0, 0, 0, 1 ) -shader_param/border_corners = true - [sub_resource type="ShaderMaterial" id=8] shader = ExtResource( 1 ) shader_param/border_color = Color( 0, 0, 0, 1 ) @@ -672,7 +666,7 @@ text = "-Haze \"Rolling fiend\" Weathers- Lead Programmer graphics sound effects -Voice +voice of \"narrator\" Story" align = 1 valign = 1 @@ -697,21 +691,18 @@ margin_right = 1536.0 margin_bottom = 192.0 theme = ExtResource( 6 ) text = "-Dog \"the scrump\" jelly- -designer of \"the scrump\" -designer of \"famira\" -Box art" +designer of \"the scrump\"" align = 1 valign = 1 -[node name="WilyBeast" type="Label" parent="Control"] +[node name="GasStationCoffee" type="Label" parent="Control"] material = ExtResource( 4 ) margin_left = 1536.0 margin_right = 1792.0 margin_bottom = 192.0 theme = ExtResource( 6 ) -text = "-Wily \"pong\" Beast- -creator of \"pong\" -lore help" +text = "-Gas Station \"fami\" coffee- +voice of \"fami\"" align = 1 valign = 1 @@ -749,7 +740,10 @@ Haze Weathers Ivy scarlet DogJelly Wolfboy -Wily Beast" +Rhidianruckus +Wily Beast +Maddy +" align = 1 valign = 1 @@ -767,18 +761,48 @@ haze weathers" align = 1 valign = 1 +[node name="SpecialThanks" type="Label" parent="Control"] +material = ExtResource( 4 ) +margin_left = 2816.0 +margin_right = 3072.0 +margin_bottom = 192.0 +theme = ExtResource( 6 ) +text = "-Special thanks- +Wolfboy +wily beast" +align = 1 +valign = 1 + +[node name="WonderingNow3" type="Label" parent="Control"] +material = ExtResource( 4 ) +margin_left = 3072.0 +margin_right = 3328.0 +margin_bottom = 192.0 +theme = ExtResource( 6 ) +text = "-people who inspired us- +Yuji Naka +Hideo kojima +Shigesato itoi +Shigeru miyamoto +Akira Toriyama +Davio +Quazi" +align = 1 +valign = 1 + [node name="RollCall" type="Sprite" parent="Control"] material = SubResource( 6 ) -position = Vector2( 2944, 88 ) +position = Vector2( 3456, 88 ) texture = ExtResource( 11 ) [node name="RollCall1" type="Node2D" parent="Control"] -position = Vector2( 3072, 0 ) +position = Vector2( 3584, 0 ) [node name="SG" type="AnimatedSprite" parent="Control/RollCall1"] material = SubResource( 7 ) -position = Vector2( 58, 61 ) +position = Vector2( 74, 69 ) frames = SubResource( 12 ) +frame = 1 playing = true script = ExtResource( 16 ) @@ -792,7 +816,7 @@ theme = ExtResource( 6 ) text = "SG" [node name="Speccy" type="Sprite" parent="Control/RollCall1"] -position = Vector2( 139, 60 ) +position = Vector2( 155, 68 ) texture = ExtResource( 13 ) [node name="Label" type="Label" parent="Control/RollCall1/Speccy"] @@ -805,26 +829,11 @@ theme = ExtResource( 6 ) text = "Speccy" align = 1 -[node name="Pong" type="Sprite" parent="Control/RollCall1"] -material = SubResource( 9 ) -position = Vector2( 186, 65 ) -texture = ExtResource( 14 ) - -[node name="Label" type="Label" parent="Control/RollCall1/Pong"] -material = ExtResource( 4 ) -margin_left = -32.0 -margin_top = 7.0 -margin_right = 32.0 -margin_bottom = 21.0 -theme = ExtResource( 6 ) -text = "pong" -align = 1 - [node name="MsX" type="AnimatedSprite" parent="Control/RollCall1"] material = SubResource( 8 ) -position = Vector2( 90, 61 ) +position = Vector2( 106, 69 ) frames = SubResource( 18 ) -frame = 3 +frame = 2 playing = true [node name="Label" type="Label" parent="Control/RollCall1/MsX"] @@ -888,12 +897,13 @@ text = "Vile Villians" align = 1 [node name="RollCall2" type="Node2D" parent="Control"] -position = Vector2( 512, 0 ) +position = Vector2( 1024, 0 ) [node name="Eviscerator" type="AnimatedSprite" parent="Control/RollCall2"] material = SubResource( 13 ) position = Vector2( 2880, 24 ) frames = SubResource( 21 ) +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/Eviscerator"] @@ -910,7 +920,6 @@ align = 1 material = SubResource( 13 ) position = Vector2( 2952, 24 ) frames = SubResource( 24 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/Catbat"] @@ -926,7 +935,6 @@ align = 1 [node name="TheScrump" type="AnimatedSprite" parent="Control/RollCall2"] position = Vector2( 2992, 128 ) frames = SubResource( 27 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/TheScrump"] @@ -943,6 +951,7 @@ align = 1 material = SubResource( 13 ) position = Vector2( 2880, 102 ) frames = SubResource( 30 ) +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/RollingFiend"] @@ -958,6 +967,7 @@ align = 1 [node name="ChipIt" type="AnimatedSprite" parent="Control/RollCall2"] position = Vector2( 2960, 62 ) frames = SubResource( 33 ) +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/ChipIt"] @@ -974,7 +984,7 @@ align = 1 material = SubResource( 34 ) position = Vector2( 3024, 62 ) frames = SubResource( 43 ) -frame = 7 +frame = 6 playing = true [node name="Label" type="Label" parent="Control/RollCall2/Skelarcher"] @@ -990,6 +1000,7 @@ align = 1 [node name="SabreSpighter" type="AnimatedSprite" parent="Control/RollCall2"] position = Vector2( 2880, 62 ) frames = SubResource( 46 ) +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/SabreSpighter"] @@ -1006,7 +1017,6 @@ align = 1 material = SubResource( 47 ) position = Vector2( 3016, 24 ) frames = SubResource( 50 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/BioSlime"] @@ -1032,11 +1042,12 @@ Poachers" align = 1 [node name="RollCall3" type="Node2D" parent="Control"] -position = Vector2( 3584, 0 ) +position = Vector2( 4096, 0 ) [node name="Shedge" type="AnimatedSprite" parent="Control/RollCall3"] position = Vector2( 60, 25 ) frames = SubResource( 54 ) +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall3/Shedge"] @@ -1052,7 +1063,6 @@ align = 1 [node name="TheScrumpsTongue" type="AnimatedSprite" parent="Control/RollCall3"] position = Vector2( 156, 20 ) frames = SubResource( 57 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall3/TheScrumpsTongue"] @@ -1082,7 +1092,6 @@ align = 1 [node name="Squig" type="AnimatedSprite" parent="Control/RollCall3"] position = Vector2( 200, 64 ) frames = SubResource( 65 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall3/Squig"] @@ -1099,6 +1108,7 @@ align = 1 material = SubResource( 71 ) position = Vector2( 72, 152 ) frames = SubResource( 80 ) +frame = 7 playing = true [node name="Label" type="Label" parent="Control/RollCall3/Hellarcher"] @@ -1144,6 +1154,7 @@ position = Vector2( 4, 0 ) z_index = 1 frames = SubResource( 61 ) animation = "chomp" +frame = 1 playing = true [node name="Border" type="AnimatedSprite" parent="Control/RollCall3/Beel/Head/Sprite"] @@ -1151,6 +1162,7 @@ material = SubResource( 62 ) z_index = -1 frames = SubResource( 61 ) animation = "chomp" +frame = 1 playing = true [node name="ShapeTransform" type="RemoteTransform2D" parent="Control/RollCall3/Beel/Head"] @@ -1243,7 +1255,7 @@ experiments" align = 1 [node name="RollCall4" type="Node2D" parent="Control"] -position = Vector2( 512, 0 ) +position = Vector2( 1024, 0 ) [node name="2600" parent="Control/RollCall4" instance=ExtResource( 37 )] position = Vector2( 3464, -8 ) @@ -1301,6 +1313,7 @@ align = 1 material = SubResource( 82 ) position = Vector2( 3362, 122.5 ) frames = SubResource( 87 ) +frame = 3 playing = true [node name="Label" type="Label" parent="Control/RollCall4/Famicop"] @@ -1342,7 +1355,7 @@ text = "Tin" align = 1 [node name="RollCall5" type="Node2D" parent="Control"] -position = Vector2( 4096, 0 ) +position = Vector2( 4608, 0 ) [node name="Haze" type="Sprite" parent="Control/RollCall5"] position = Vector2( 80, 136 ) diff --git a/objects/lore/hills/pong.tscn b/objects/lore/hills/pong.tscn deleted file mode 100644 index 41bbbd5..0000000 --- a/objects/lore/hills/pong.tscn +++ /dev/null @@ -1,26 +0,0 @@ -[gd_scene load_steps=5 format=2] - -[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=1] -[ext_resource path="res://objects/lore/lore.tscn" type="PackedScene" id=2] -[ext_resource path="res://graphics/pong/pong.png" type="Texture" id=3] - -[sub_resource type="ShaderMaterial" id=1] -shader = ExtResource( 1 ) -shader_param/border_color = Color( 0, 0, 0, 1 ) -shader_param/border_corners = true - -[node name="Lore" instance=ExtResource( 2 )] - -[node name="TextureRect" parent="Panel" index="0"] -material = SubResource( 1 ) -texture = ExtResource( 3 ) - -[node name="Control" parent="." index="1"] -margin_top = 55.0 -margin_bottom = 136.0 - -[node name="Label" parent="Control" index="0"] -margin_top = 3.0 -margin_bottom = 78.0 -text = "Pong: -Sg's Pet cat... or maybe they're a dog? no ones really sure what they are, they just showed up at sg's house one day."