diff --git a/graphics/artificial_soul.png b/graphics/artificial_soul.png deleted file mode 100644 index dc4a8d5..0000000 Binary files a/graphics/artificial_soul.png and /dev/null differ diff --git a/graphics/backgrounds/fami_rooftop.png b/graphics/backgrounds/fami_rooftop.png new file mode 100644 index 0000000..bf89082 Binary files /dev/null and b/graphics/backgrounds/fami_rooftop.png differ diff --git a/graphics/backgrounds/fami_rooftop.png.import b/graphics/backgrounds/fami_rooftop.png.import new file mode 100644 index 0000000..e84fc9e --- /dev/null +++ b/graphics/backgrounds/fami_rooftop.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/fami_rooftop.png-ff77cafa929ebb12585d1acfffe83fe2.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/backgrounds/fami_rooftop.png" +dest_files=[ "res://.import/fami_rooftop.png-ff77cafa929ebb12585d1acfffe83fe2.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/graphics/backgrounds/hills.png b/graphics/backgrounds/hills.png new file mode 100644 index 0000000..8e19ea6 Binary files /dev/null and b/graphics/backgrounds/hills.png differ diff --git a/graphics/artificial_soul.png.import b/graphics/backgrounds/hills.png.import similarity index 69% rename from graphics/artificial_soul.png.import rename to graphics/backgrounds/hills.png.import index 8f3b700..36f3fea 100644 --- a/graphics/artificial_soul.png.import +++ b/graphics/backgrounds/hills.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/artificial_soul.png-0086969ea10773c6a7d1d39e051a2eef.stex" +path="res://.import/hills.png-7dec5898237d30f7e14a64e4fdf326a3.stex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/artificial_soul.png" -dest_files=[ "res://.import/artificial_soul.png-0086969ea10773c6a7d1d39e051a2eef.stex" ] +source_file="res://graphics/backgrounds/hills.png" +dest_files=[ "res://.import/hills.png-7dec5898237d30f7e14a64e4fdf326a3.stex" ] [params] diff --git a/graphics/backgrounds/sun_and_clouds.png b/graphics/backgrounds/sun_and_clouds.png index d45811b..9c87617 100644 Binary files a/graphics/backgrounds/sun_and_clouds.png and b/graphics/backgrounds/sun_and_clouds.png differ diff --git a/graphics/ending/picnic_table.png b/graphics/ending/picnic_table.png new file mode 100644 index 0000000..d561bae Binary files /dev/null and b/graphics/ending/picnic_table.png differ diff --git a/graphics/ending/picnic_table.png.import b/graphics/ending/picnic_table.png.import new file mode 100644 index 0000000..37e63cf --- /dev/null +++ b/graphics/ending/picnic_table.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/picnic_table.png-36237cf92de6d1327e6c724100872052.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/ending/picnic_table.png" +dest_files=[ "res://.import/picnic_table.png-36237cf92de6d1327e6c724100872052.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/graphics/npc/msx_future.png b/graphics/npc/msx_future.png new file mode 100644 index 0000000..8f66309 Binary files /dev/null and b/graphics/npc/msx_future.png differ diff --git a/graphics/npc/msx_future.png.import b/graphics/npc/msx_future.png.import new file mode 100644 index 0000000..ae1e579 --- /dev/null +++ b/graphics/npc/msx_future.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/msx_future.png-f80025a99339fb4cc97772ee4a9ac9d4.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/npc/msx_future.png" +dest_files=[ "res://.import/msx_future.png-f80025a99339fb4cc97772ee4a9ac9d4.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/graphics/npc/sg_future.png b/graphics/npc/sg_future.png new file mode 100644 index 0000000..20c10ec Binary files /dev/null and b/graphics/npc/sg_future.png differ diff --git a/graphics/npc/sg_future.png.import b/graphics/npc/sg_future.png.import new file mode 100644 index 0000000..cf20b60 --- /dev/null +++ b/graphics/npc/sg_future.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/sg_future.png-cdbd7c9b08828f45ce5d3a3faf7f2693.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/npc/sg_future.png" +dest_files=[ "res://.import/sg_future.png-cdbd7c9b08828f45ce5d3a3faf7f2693.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/graphics/npc/sms.png b/graphics/npc/sms.png new file mode 100644 index 0000000..55b24d6 Binary files /dev/null and b/graphics/npc/sms.png differ diff --git a/graphics/npc/sms.png.import b/graphics/npc/sms.png.import new file mode 100644 index 0000000..95dc577 --- /dev/null +++ b/graphics/npc/sms.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/sms.png-d86229f2d402f74a94586086e38351f0.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/npc/sms.png" +dest_files=[ "res://.import/sms.png-d86229f2d402f74a94586086e38351f0.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/graphics/npc/speccy_future.png b/graphics/npc/speccy_future.png new file mode 100644 index 0000000..3e11641 Binary files /dev/null and b/graphics/npc/speccy_future.png differ diff --git a/graphics/npc/speccy_future.png.import b/graphics/npc/speccy_future.png.import new file mode 100644 index 0000000..4048d3b --- /dev/null +++ b/graphics/npc/speccy_future.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/speccy_future.png-1e522d079b6cc689a4fc31f14da4eeae.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/npc/speccy_future.png" +dest_files=[ "res://.import/speccy_future.png-1e522d079b6cc689a4fc31f14da4eeae.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/future.tscn b/maps/future.tscn new file mode 100644 index 0000000..d44f7b2 --- /dev/null +++ b/maps/future.tscn @@ -0,0 +1,68 @@ +[gd_scene load_steps=15 format=2] + +[ext_resource path="res://graphics/backgrounds/hills.png" type="Texture" id=1] +[ext_resource path="res://tilesets/t_grass.tres" type="TileSet" id=2] +[ext_resource path="res://graphics/npc/msx_future.png" type="Texture" id=3] +[ext_resource path="res://graphics/npc/speccy_future.png" type="Texture" id=4] +[ext_resource path="res://maps/boss/boss2_arena.gd" type="Script" id=5] +[ext_resource path="res://graphics/npc/sg_future.png" type="Texture" id=6] +[ext_resource path="res://audio/music/klystron_vip.ogg" type="AudioStream" id=7] +[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=8] +[ext_resource path="res://graphics/pong/pong.png" type="Texture" id=9] +[ext_resource path="res://graphics/npc/sms.png" type="Texture" id=10] +[ext_resource path="res://objects/lore/boss/dr_intelli.tscn" type="PackedScene" id=11] +[ext_resource path="res://graphics/ending/picnic_table.png" type="Texture" id=12] +[ext_resource path="res://objects/lore/boss/2600.tscn" type="PackedScene" id=17] + +[sub_resource type="ShaderMaterial" id=1] +shader = ExtResource( 8 ) +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( 5 ) +music = ExtResource( 7 ) +lore_entries = [ ExtResource( 17 ), ExtResource( 11 ) ] + +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( 128, 96 ) +z_index = -2 +texture = ExtResource( 1 ) +__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( 6 ) + +[node name="MsxFuture" type="Sprite" parent="."] +position = Vector2( 161, 166 ) +scale = Vector2( -1, 1 ) +texture = ExtResource( 3 ) + +[node name="SpeccyFuture" type="Sprite" parent="."] +position = Vector2( 176, 164 ) +scale = Vector2( -1, 1 ) +texture = ExtResource( 4 ) + +[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( 9 ) + +[node name="PicnicTable" type="Sprite" parent="."] +position = Vector2( 128, 167 ) +texture = ExtResource( 12 ) diff --git a/maps/hills_scholar.tscn b/maps/hills_scholar.tscn index e6d5dd1..08a3770 100644 --- a/maps/hills_scholar.tscn +++ b/maps/hills_scholar.tscn @@ -6,7 +6,7 @@ [ext_resource path="res://objects/collectibles/star.tscn" type="PackedScene" id=4] [ext_resource path="res://objects/collectibles/key.tscn" type="PackedScene" id=5] [ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=6] -[ext_resource path="res://graphics/backgrounds/blue_sky.png" type="Texture" id=7] +[ext_resource path="res://graphics/backgrounds/hills.png" type="Texture" id=7] [ext_resource path="res://tilesets/t_grass.tres" type="TileSet" id=8] [ext_resource path="res://tilesets/t_death.tres" type="TileSet" id=9] [ext_resource path="res://shaders/can_stain.tres" type="Material" id=10]