From c9e8502bea3cfc2a32b9ec697a5116acbb0430e2 Mon Sep 17 00:00:00 2001 From: Fusselkater Date: Mon, 18 Jul 2022 08:51:54 +0200 Subject: [PATCH] level 01 --- .../tiles/assets/{grass.svg => grasland.svg} | 81 +++++++- common/tiles/assets/grasland.svg.import | 35 ++++ common/tiles/{base.tres => grasland.tres} | 80 +++++++- objects/hlift/assets/fire.svg | 110 ++++++++++ objects/hlift/assets/fire.svg.import | 35 ++++ objects/hlift/assets/fire1.svg | 74 +++++++ objects/hlift/assets/fire1.svg.import | 35 ++++ objects/hlift/assets/fire2.svg | 74 +++++++ objects/hlift/assets/fire2.svg.import | 35 ++++ objects/hlift/assets/fire3.svg | 74 +++++++ objects/hlift/assets/fire3.svg.import | 35 ++++ objects/hlift/assets/lift.svg | 188 ++++++++++++++++++ objects/hlift/assets/lift.svg.import | 35 ++++ objects/hlift/hlift.gd | 16 ++ objects/hlift/hlift.tscn | 53 +++++ objects/lift/assets/fire.svg | 110 ++++++++++ objects/lift/assets/fire.svg.import | 35 ++++ objects/lift/assets/fire1.svg | 74 +++++++ .../lift/assets/fire1.svg.import | 6 +- objects/lift/assets/fire2.svg | 74 +++++++ objects/lift/assets/fire2.svg.import | 35 ++++ objects/lift/assets/fire3.svg | 74 +++++++ objects/lift/assets/fire3.svg.import | 35 ++++ objects/lift/assets/lift.svg | 151 ++++++++++++++ objects/lift/assets/lift.svg.import | 35 ++++ objects/lift/lift.tscn | 35 ++-- scenes/levels/01/assets/cave_bg.svg | 88 ++++++++ scenes/levels/01/assets/cave_bg.svg.import | 35 ++++ scenes/levels/01/level_01.tscn | 36 ++-- scenes/levels/01/tilemap.tscn | 2 +- scenes/levels/02/level_02.tscn | 2 +- 31 files changed, 1745 insertions(+), 42 deletions(-) rename common/tiles/assets/{grass.svg => grasland.svg} (90%) create mode 100644 common/tiles/assets/grasland.svg.import rename common/tiles/{base.tres => grasland.tres} (90%) create mode 100644 objects/hlift/assets/fire.svg create mode 100644 objects/hlift/assets/fire.svg.import create mode 100644 objects/hlift/assets/fire1.svg create mode 100644 objects/hlift/assets/fire1.svg.import create mode 100644 objects/hlift/assets/fire2.svg create mode 100644 objects/hlift/assets/fire2.svg.import create mode 100644 objects/hlift/assets/fire3.svg create mode 100644 objects/hlift/assets/fire3.svg.import create mode 100644 objects/hlift/assets/lift.svg create mode 100644 objects/hlift/assets/lift.svg.import create mode 100644 objects/hlift/hlift.gd create mode 100644 objects/hlift/hlift.tscn create mode 100644 objects/lift/assets/fire.svg create mode 100644 objects/lift/assets/fire.svg.import create mode 100644 objects/lift/assets/fire1.svg rename common/tiles/assets/grass.svg.import => objects/lift/assets/fire1.svg.import (72%) create mode 100644 objects/lift/assets/fire2.svg create mode 100644 objects/lift/assets/fire2.svg.import create mode 100644 objects/lift/assets/fire3.svg create mode 100644 objects/lift/assets/fire3.svg.import create mode 100644 objects/lift/assets/lift.svg create mode 100644 objects/lift/assets/lift.svg.import create mode 100644 scenes/levels/01/assets/cave_bg.svg create mode 100644 scenes/levels/01/assets/cave_bg.svg.import diff --git a/common/tiles/assets/grass.svg b/common/tiles/assets/grasland.svg similarity index 90% rename from common/tiles/assets/grass.svg rename to common/tiles/assets/grasland.svg index e3433c0..24a9576 100644 --- a/common/tiles/assets/grass.svg +++ b/common/tiles/assets/grasland.svg @@ -3,12 +3,12 @@ + inkscape:current-layer="layer1"> @@ -789,5 +789,70 @@ d="m 207,526.5 11.65,-11.5 11.7,11.5 11.7,-11.5 11.6,11.5 11.7,-11.5 11.65,11.5 v 15 l -11.65,-11.5 -11.7,11.5 -11.6,-11.5 -11.7,11.5 -11.7,-11.5 -1.45,1.45 -10.15,10.05 H 207 v -15 m 0,30.2 1.8,-1.8 -0.05,-0.05 9.95,-9.85 11.7,11.5 11.7,-11.5 11.6,11.5 11.7,-11.5 9.9,9.8 -0.05,0.05 1.75,1.75 v 1.4 h -70 v -1.3" id="path97-5-7" /> + + + + + + + + + + + + + + + + + diff --git a/common/tiles/assets/grasland.svg.import b/common/tiles/assets/grasland.svg.import new file mode 100644 index 0000000..df0bed2 --- /dev/null +++ b/common/tiles/assets/grasland.svg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/grasland.svg-a0bc7cdb9b73f2828a6a6d0ed6b6dfba.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://common/tiles/assets/grasland.svg" +dest_files=[ "res://.import/grasland.svg-a0bc7cdb9b73f2828a6a6d0ed6b6dfba.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=true +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/common/tiles/base.tres b/common/tiles/grasland.tres similarity index 90% rename from common/tiles/base.tres rename to common/tiles/grasland.tres index 70958a4..fa9458b 100644 --- a/common/tiles/base.tres +++ b/common/tiles/grasland.tres @@ -1,6 +1,6 @@ -[gd_resource type="TileSet" load_steps=37 format=2] +[gd_resource type="TileSet" load_steps=39 format=2] -[ext_resource path="res://common/tiles/assets/grass.svg" type="Texture" id=1] +[ext_resource path="res://common/tiles/assets/grasland.svg" type="Texture" id=1] [ext_resource path="res://common/tiles/assets/liquid.svg" type="Texture" id=2] [ext_resource path="res://common/tiles/assets/decorations.svg" type="Texture" id=3] @@ -67,6 +67,12 @@ points = PoolVector2Array( 0, 0, 70, 0, 70, 70, 0, 70 ) [sub_resource type="ConvexPolygonShape2D" id=10] points = PoolVector2Array( 0, 0, 70, 0, 70, 70, 0, 70 ) +[sub_resource type="ConvexPolygonShape2D" id=34] +points = PoolVector2Array( 0, 0, 70, 0, 70, 40, 0, 40 ) + +[sub_resource type="ConvexPolygonShape2D" id=35] +points = PoolVector2Array( 0, 35, 70, 35, 70, 70, 0, 70 ) + [sub_resource type="ConvexPolygonShape2D" id=11] points = PoolVector2Array( -10, 0, -10, 0, -10, 70, -10, 70 ) @@ -724,3 +730,73 @@ points = PoolVector2Array( 0, 70, 70, 0, 70, 70, 0, 70 ) 24/shape_one_way_margin = 0.0 24/shapes = [ ] 24/z_index = 0 +25/name = "Cave 5" +25/texture = ExtResource( 1 ) +25/tex_offset = Vector2( 0, 0 ) +25/modulate = Color( 1, 1, 1, 1 ) +25/region = Rect2( 0, 560, 70, 70 ) +25/tile_mode = 0 +25/occluder_offset = Vector2( 0, 0 ) +25/navigation_offset = Vector2( 0, 0 ) +25/shape_offset = Vector2( 0, 0 ) +25/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +25/shape = SubResource( 34 ) +25/shape_one_way = false +25/shape_one_way_margin = 1.0 +25/shapes = [ { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 34 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +25/z_index = 0 +26/name = "Cave 6" +26/texture = ExtResource( 1 ) +26/tex_offset = Vector2( 0, 0 ) +26/modulate = Color( 1, 1, 1, 1 ) +26/region = Rect2( 80, 560, 70, 70 ) +26/tile_mode = 0 +26/occluder_offset = Vector2( 0, 0 ) +26/navigation_offset = Vector2( 0, 0 ) +26/shape_offset = Vector2( 0, 0 ) +26/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +26/shape = SubResource( 35 ) +26/shape_one_way = false +26/shape_one_way_margin = 1.0 +26/shapes = [ { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 35 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +26/z_index = 0 +27/name = "Cave 7" +27/texture = ExtResource( 1 ) +27/tex_offset = Vector2( 0, 0 ) +27/modulate = Color( 1, 1, 1, 1 ) +27/region = Rect2( 160, 560, 70, 70 ) +27/tile_mode = 0 +27/occluder_offset = Vector2( 0, 0 ) +27/navigation_offset = Vector2( 0, 0 ) +27/shape_offset = Vector2( 0, 0 ) +27/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +27/shape_one_way = false +27/shape_one_way_margin = 0.0 +27/shapes = [ ] +27/z_index = 0 +28/name = "Cave 8" +28/texture = ExtResource( 1 ) +28/tex_offset = Vector2( 0, 0 ) +28/modulate = Color( 1, 1, 1, 1 ) +28/region = Rect2( 240, 560, 70, 70 ) +28/tile_mode = 0 +28/occluder_offset = Vector2( 0, 0 ) +28/navigation_offset = Vector2( 0, 0 ) +28/shape_offset = Vector2( 0, 0 ) +28/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +28/shape_one_way = false +28/shape_one_way_margin = 0.0 +28/shapes = [ ] +28/z_index = 0 diff --git a/objects/hlift/assets/fire.svg b/objects/hlift/assets/fire.svg new file mode 100644 index 0000000..2cb1d9e --- /dev/null +++ b/objects/hlift/assets/fire.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/objects/hlift/assets/fire.svg.import b/objects/hlift/assets/fire.svg.import new file mode 100644 index 0000000..9dea7bf --- /dev/null +++ b/objects/hlift/assets/fire.svg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/fire.svg-3ad2296850ed20796bbc61f215594a9c.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://objects/hlift/assets/fire.svg" +dest_files=[ "res://.import/fire.svg-3ad2296850ed20796bbc61f215594a9c.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=true +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/objects/hlift/assets/fire1.svg b/objects/hlift/assets/fire1.svg new file mode 100644 index 0000000..3c6825d --- /dev/null +++ b/objects/hlift/assets/fire1.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + diff --git a/objects/hlift/assets/fire1.svg.import b/objects/hlift/assets/fire1.svg.import new file mode 100644 index 0000000..f9ae5c7 --- /dev/null +++ b/objects/hlift/assets/fire1.svg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/fire1.svg-0c8697b6522d88252e8a689102f86a1e.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://objects/hlift/assets/fire1.svg" +dest_files=[ "res://.import/fire1.svg-0c8697b6522d88252e8a689102f86a1e.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=true +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/objects/hlift/assets/fire2.svg b/objects/hlift/assets/fire2.svg new file mode 100644 index 0000000..c79e0a2 --- /dev/null +++ b/objects/hlift/assets/fire2.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + diff --git a/objects/hlift/assets/fire2.svg.import b/objects/hlift/assets/fire2.svg.import new file mode 100644 index 0000000..e26f9eb --- /dev/null +++ b/objects/hlift/assets/fire2.svg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/fire2.svg-fb8c6e042bdfd355b4ba2ab47b60be9c.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://objects/hlift/assets/fire2.svg" +dest_files=[ "res://.import/fire2.svg-fb8c6e042bdfd355b4ba2ab47b60be9c.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=true +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/objects/hlift/assets/fire3.svg b/objects/hlift/assets/fire3.svg new file mode 100644 index 0000000..35c821c --- /dev/null +++ b/objects/hlift/assets/fire3.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + diff --git a/objects/hlift/assets/fire3.svg.import b/objects/hlift/assets/fire3.svg.import new file mode 100644 index 0000000..af424b4 --- /dev/null +++ b/objects/hlift/assets/fire3.svg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/fire3.svg-9242868008bf0d08a06937f3bc698670.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://objects/hlift/assets/fire3.svg" +dest_files=[ "res://.import/fire3.svg-9242868008bf0d08a06937f3bc698670.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=true +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/objects/hlift/assets/lift.svg b/objects/hlift/assets/lift.svg new file mode 100644 index 0000000..41c3b4e --- /dev/null +++ b/objects/hlift/assets/lift.svg @@ -0,0 +1,188 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/objects/hlift/assets/lift.svg.import b/objects/hlift/assets/lift.svg.import new file mode 100644 index 0000000..77ba7ae --- /dev/null +++ b/objects/hlift/assets/lift.svg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/lift.svg-a73d03264eb0ef73b348e52996804ada.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://objects/hlift/assets/lift.svg" +dest_files=[ "res://.import/lift.svg-a73d03264eb0ef73b348e52996804ada.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=true +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/objects/hlift/hlift.gd b/objects/hlift/hlift.gd new file mode 100644 index 0000000..2884777 --- /dev/null +++ b/objects/hlift/hlift.gd @@ -0,0 +1,16 @@ +extends ReferenceRect + +export var speed = 2 + +# Called when the node enters the scene tree for the first time. +func _ready(): + $Lifter.position.x = self.rect_size.x + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _physics_process(delta): + if $Lifter.position.x < 100 or $Lifter.position.x > self.rect_size.x: + speed = -speed + $Lifter.position.x -= speed + $Lifter.constant_linear_velocity.x = -speed + diff --git a/objects/hlift/hlift.tscn b/objects/hlift/hlift.tscn new file mode 100644 index 0000000..4279633 --- /dev/null +++ b/objects/hlift/hlift.tscn @@ -0,0 +1,53 @@ +[gd_scene load_steps=8 format=2] + +[ext_resource path="res://objects/hlift/hlift.gd" type="Script" id=1] +[ext_resource path="res://objects/lift/assets/fire2.svg" type="Texture" id=2] +[ext_resource path="res://objects/lift/assets/fire1.svg" type="Texture" id=3] +[ext_resource path="res://objects/hlift/assets/lift.svg" type="Texture" id=4] +[ext_resource path="res://objects/lift/assets/fire3.svg" type="Texture" id=5] + +[sub_resource type="RectangleShape2D" id=2] +extents = Vector2( 140, 35 ) + +[sub_resource type="SpriteFrames" id=3] +animations = [ { +"frames": [ ExtResource( 3 ), ExtResource( 2 ), ExtResource( 5 ), ExtResource( 2 ) ], +"loop": true, +"name": "default", +"speed": 10.0 +} ] + +[node name="Lift" type="ReferenceRect"] +margin_right = 910.0 +margin_bottom = 105.0 +border_width = 4.0 +script = ExtResource( 1 ) + +[node name="Lifter" type="StaticBody2D" parent="."] +position = Vector2( 175, 210 ) +collision_layer = 4 +collision_mask = 0 + +[node name="Sprite" type="Sprite" parent="Lifter"] +position = Vector2( 55, -164 ) +texture = ExtResource( 4 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Lifter"] +position = Vector2( 55, -164 ) +shape = SubResource( 2 ) + +[node name="FireLeft" type="AnimatedSprite" parent="Lifter"] +position = Vector2( -120, -164 ) +rotation = 1.5708 +frames = SubResource( 3 ) +frame = 3 +playing = true +offset = Vector2( 0, 25 ) + +[node name="FireRight" type="AnimatedSprite" parent="Lifter"] +position = Vector2( 230, -164 ) +rotation = -1.5708 +frames = SubResource( 3 ) +frame = 1 +playing = true +offset = Vector2( 0, 25 ) diff --git a/objects/lift/assets/fire.svg b/objects/lift/assets/fire.svg new file mode 100644 index 0000000..2cb1d9e --- /dev/null +++ b/objects/lift/assets/fire.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/objects/lift/assets/fire.svg.import b/objects/lift/assets/fire.svg.import new file mode 100644 index 0000000..2c047b5 --- /dev/null +++ b/objects/lift/assets/fire.svg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/fire.svg-dce59c65255b9f21ee1e1419df69fa92.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://objects/lift/assets/fire.svg" +dest_files=[ "res://.import/fire.svg-dce59c65255b9f21ee1e1419df69fa92.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=true +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/objects/lift/assets/fire1.svg b/objects/lift/assets/fire1.svg new file mode 100644 index 0000000..3c6825d --- /dev/null +++ b/objects/lift/assets/fire1.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + diff --git a/common/tiles/assets/grass.svg.import b/objects/lift/assets/fire1.svg.import similarity index 72% rename from common/tiles/assets/grass.svg.import rename to objects/lift/assets/fire1.svg.import index 05da665..db266fe 100644 --- a/common/tiles/assets/grass.svg.import +++ b/objects/lift/assets/fire1.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/grass.svg-1ec36997ec5e08723467fe7679d50c14.stex" +path="res://.import/fire1.svg-d087805d0438b445a9dbca9153c5945e.stex" metadata={ "vram_texture": false } [deps] -source_file="res://common/tiles/assets/grass.svg" -dest_files=[ "res://.import/grass.svg-1ec36997ec5e08723467fe7679d50c14.stex" ] +source_file="res://objects/lift/assets/fire1.svg" +dest_files=[ "res://.import/fire1.svg-d087805d0438b445a9dbca9153c5945e.stex" ] [params] diff --git a/objects/lift/assets/fire2.svg b/objects/lift/assets/fire2.svg new file mode 100644 index 0000000..c79e0a2 --- /dev/null +++ b/objects/lift/assets/fire2.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + diff --git a/objects/lift/assets/fire2.svg.import b/objects/lift/assets/fire2.svg.import new file mode 100644 index 0000000..4221176 --- /dev/null +++ b/objects/lift/assets/fire2.svg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/fire2.svg-77e59f038fa966024f21bfe812467b44.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://objects/lift/assets/fire2.svg" +dest_files=[ "res://.import/fire2.svg-77e59f038fa966024f21bfe812467b44.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=true +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/objects/lift/assets/fire3.svg b/objects/lift/assets/fire3.svg new file mode 100644 index 0000000..35c821c --- /dev/null +++ b/objects/lift/assets/fire3.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + diff --git a/objects/lift/assets/fire3.svg.import b/objects/lift/assets/fire3.svg.import new file mode 100644 index 0000000..3916c11 --- /dev/null +++ b/objects/lift/assets/fire3.svg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/fire3.svg-2a7b8e931a4514128afec3f21d2fce51.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://objects/lift/assets/fire3.svg" +dest_files=[ "res://.import/fire3.svg-2a7b8e931a4514128afec3f21d2fce51.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=true +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/objects/lift/assets/lift.svg b/objects/lift/assets/lift.svg new file mode 100644 index 0000000..43c3f5a --- /dev/null +++ b/objects/lift/assets/lift.svg @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/objects/lift/assets/lift.svg.import b/objects/lift/assets/lift.svg.import new file mode 100644 index 0000000..56fa27b --- /dev/null +++ b/objects/lift/assets/lift.svg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/lift.svg-b4758d274eeea73a16386c6d0f0c4c36.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://objects/lift/assets/lift.svg" +dest_files=[ "res://.import/lift.svg-b4758d274eeea73a16386c6d0f0c4c36.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=true +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/objects/lift/lift.tscn b/objects/lift/lift.tscn index 1f6ec1f..23b957f 100644 --- a/objects/lift/lift.tscn +++ b/objects/lift/lift.tscn @@ -1,23 +1,24 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=8 format=2] -[ext_resource path="res://objects/lift/assets/lift_grass_3.png" type="Texture" id=1] -[ext_resource path="res://objects/lift/assets/lift_grass_2.png" type="Texture" id=2] -[ext_resource path="res://objects/lift/assets/lift_grass_1.png" type="Texture" id=3] +[ext_resource path="res://objects/lift/assets/lift.svg" type="Texture" id=1] +[ext_resource path="res://objects/lift/assets/fire2.svg" type="Texture" id=2] +[ext_resource path="res://objects/lift/assets/fire1.svg" type="Texture" id=3] [ext_resource path="res://objects/lift/lift.gd" type="Script" id=4] +[ext_resource path="res://objects/lift/assets/fire3.svg" type="Texture" id=5] -[sub_resource type="SpriteFrames" id=1] +[sub_resource type="RectangleShape2D" id=2] +extents = Vector2( 105, 35 ) + +[sub_resource type="SpriteFrames" id=3] animations = [ { -"frames": [ ExtResource( 3 ), ExtResource( 2 ), ExtResource( 1 ), ExtResource( 2 ) ], +"frames": [ ExtResource( 3 ), ExtResource( 2 ), ExtResource( 5 ), ExtResource( 2 ) ], "loop": true, "name": "default", "speed": 10.0 } ] -[sub_resource type="RectangleShape2D" id=2] -extents = Vector2( 190, 47 ) - [node name="Lift" type="ReferenceRect"] -margin_right = 380.0 +margin_right = 210.0 margin_bottom = 300.0 border_width = 4.0 script = ExtResource( 4 ) @@ -27,10 +28,16 @@ position = Vector2( 190, 199 ) collision_layer = 4 collision_mask = 0 -[node name="Sprite" type="AnimatedSprite" parent="Lifter"] -frames = SubResource( 1 ) -playing = true +[node name="Sprite" type="Sprite" parent="Lifter"] +position = Vector2( -85, -131 ) +texture = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="Lifter"] -position = Vector2( 0, -53 ) +position = Vector2( -85, -166 ) shape = SubResource( 2 ) + +[node name="Fire" type="AnimatedSprite" parent="Lifter"] +position = Vector2( -85, -34 ) +frames = SubResource( 3 ) +frame = 3 +playing = true diff --git a/scenes/levels/01/assets/cave_bg.svg b/scenes/levels/01/assets/cave_bg.svg new file mode 100644 index 0000000..79b984b --- /dev/null +++ b/scenes/levels/01/assets/cave_bg.svg @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + diff --git a/scenes/levels/01/assets/cave_bg.svg.import b/scenes/levels/01/assets/cave_bg.svg.import new file mode 100644 index 0000000..ca48929 --- /dev/null +++ b/scenes/levels/01/assets/cave_bg.svg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/cave_bg.svg-8f9da4cef95066f910bcd5a118ffc06a.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://scenes/levels/01/assets/cave_bg.svg" +dest_files=[ "res://.import/cave_bg.svg-8f9da4cef95066f910bcd5a118ffc06a.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=true +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=10.0 diff --git a/scenes/levels/01/level_01.tscn b/scenes/levels/01/level_01.tscn index e14c937..60ab9a4 100644 --- a/scenes/levels/01/level_01.tscn +++ b/scenes/levels/01/level_01.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://scenes/levels/01/background_01.tscn" type="PackedScene" id=1] [ext_resource path="res://scenes/levels/01/level_01.gd" type="Script" id=2] [ext_resource path="res://objects/characters/flake/flake.tscn" type="PackedScene" id=3] -[ext_resource path="res://common/tiles/base.tres" type="TileSet" id=4] +[ext_resource path="res://common/tiles/grasland.tres" type="TileSet" id=4] [ext_resource path="res://objects/coin/coin.tscn" type="PackedScene" id=5] [ext_resource path="res://objects/characters/monsters/01/monster_01.tscn" type="PackedScene" id=6] [ext_resource path="res://objects/characters/player.tscn" type="PackedScene" id=7] @@ -19,7 +19,7 @@ cell_size = Vector2( 70, 70 ) collision_layer = 4 collision_mask = 0 format = 1 -tile_data = PoolIntArray( 524305, 1, 0, 524306, 1, 1, 524307, 1, 1, 524308, 1, 1, 524309, 1, 2, 589835, 1, 0, 589836, 1, 1, 589837, 1, 1, 589838, 1, 2, 720925, 23, 0, 720926, 22, 0, 786449, 0, 1, 786450, 0, 2, 786451, 0, 3, 786456, 22, 0, 786459, 1, 0, 786460, 4, 0, 786461, 4, 0, 786462, 4, 0, 786463, 4, 0, 786464, 7, 0, 851971, 20, 0, 851973, 23, 0, 851975, 22, 0, 851977, 24, 0, 851979, 20, 0, 851981, 22, 0, 851990, 9, 0, 851991, 4, 0, 851992, 15, 0, 851996, 5, 0, 851997, 5, 0, 851998, 5, 0, 851999, 5, 0, 852000, 8, 0, 852001, 7, 0, 983039, 4, 0, 917504, 4, 0, 917505, 4, 0, 917506, 4, 0, 917507, 4, 0, 917508, 4, 0, 917509, 4, 0, 917510, 4, 0, 917511, 4, 0, 917512, 4, 0, 917513, 4, 0, 917514, 4, 0, 917515, 4, 0, 917516, 4, 0, 917517, 4, 0, 917518, 4, 0, 917519, 7, 0, 917521, 23, 0, 917523, 20, 0, 917525, 9, 0, 917526, 10, 0, 917527, 5, 0, 917528, 5, 0, 917529, 11, 0, 917530, 11, 0, 917531, 11, 0, 917532, 5, 0, 917533, 5, 0, 917534, 5, 0, 917535, 5, 0, 917536, 5, 0, 917537, 8, 0, 917538, 7, 0, 917540, 22, 0, 917542, 20, 0, 1048575, 5, 0, 983040, 5, 0, 983041, 5, 0, 983042, 5, 0, 983043, 5, 0, 983044, 5, 0, 983045, 5, 0, 983046, 5, 0, 983047, 5, 0, 983048, 5, 0, 983049, 5, 0, 983050, 5, 0, 983051, 5, 0, 983052, 5, 0, 983053, 5, 0, 983054, 5, 0, 983055, 8, 0, 983056, 4, 0, 983057, 4, 0, 983058, 4, 0, 983059, 4, 0, 983060, 4, 0, 983061, 10, 0, 983062, 5, 0, 983063, 5, 0, 983064, 5, 0, 983065, 12, 0, 983066, 12, 0, 983067, 12, 0, 983068, 5, 0, 983069, 5, 0, 983070, 5, 0, 983071, 5, 0, 983072, 5, 0, 983073, 5, 0, 983074, 8, 0, 983075, 4, 0, 983076, 4, 0, 983077, 4, 0, 983078, 4, 0, 983079, 4, 0, 983080, 4, 0, 983081, 4, 0 ) +tile_data = PoolIntArray( -393183, 3, 0, -327641, 3, 0, -262100, 3, 0, -262094, 3, 0, 524305, 1, 0, 524306, 1, 1, 524307, 1, 1, 524308, 1, 1, 524309, 1, 2, 524332, 13, 1, 524333, 13, 2, 524334, 13, 2, 524335, 13, 2, 524336, 13, 2, 524337, 13, 2, 524338, 13, 2, 524339, 13, 3, 589835, 1, 0, 589836, 1, 1, 589837, 1, 1, 589838, 1, 2, 589864, 3, 0, 589868, 5, 0, 589869, 5, 0, 589870, 5, 0, 589871, 5, 0, 589872, 5, 0, 589873, 5, 0, 589874, 5, 0, 589875, 5, 0, 655396, 3, 0, 655404, 5, 0, 655405, 5, 0, 655406, 5, 0, 655407, 5, 0, 655408, 5, 0, 655409, 5, 0, 655410, 5, 0, 655411, 5, 0, 720925, 23, 0, 720926, 22, 0, 720940, 5, 0, 720941, 5, 0, 720942, 5, 0, 720943, 5, 0, 720944, 5, 0, 720945, 5, 0, 720946, 5, 0, 720947, 5, 0, 786449, 0, 1, 786450, 0, 2, 786451, 0, 3, 786456, 22, 0, 786459, 1, 0, 786460, 4, 0, 786461, 4, 0, 786462, 4, 0, 786463, 4, 0, 786464, 7, 0, 786476, 5, 0, 786477, 16, 0, 786479, 27, 0, 786480, 27, 0, 786482, 17, 0, 786483, 5, 0, 851971, 20, 0, 851973, 23, 0, 851975, 22, 0, 851977, 24, 0, 851979, 20, 0, 851981, 22, 0, 851990, 9, 0, 851991, 4, 0, 851992, 15, 0, 851996, 5, 0, 851997, 5, 0, 851998, 5, 0, 851999, 5, 0, 852000, 8, 0, 852001, 7, 0, 852012, 25, 0, 852019, 25, 0, 983039, 4, 0, 917504, 4, 0, 917505, 4, 0, 917506, 4, 0, 917507, 4, 0, 917508, 4, 0, 917509, 4, 0, 917510, 4, 0, 917511, 4, 0, 917512, 4, 0, 917513, 4, 0, 917514, 4, 0, 917515, 4, 0, 917516, 4, 0, 917517, 4, 0, 917518, 4, 0, 917519, 7, 0, 917521, 23, 0, 917523, 20, 0, 917525, 9, 0, 917526, 10, 0, 917527, 5, 0, 917528, 5, 0, 917529, 11, 0, 917530, 11, 0, 917531, 11, 0, 917532, 5, 0, 917533, 5, 0, 917534, 5, 0, 917535, 5, 0, 917536, 5, 0, 917537, 8, 0, 917538, 7, 0, 917540, 22, 0, 917542, 20, 0, 1048575, 5, 0, 983040, 5, 0, 983041, 5, 0, 983042, 5, 0, 983043, 5, 0, 983044, 5, 0, 983045, 5, 0, 983046, 5, 0, 983047, 5, 0, 983048, 5, 0, 983049, 5, 0, 983050, 5, 0, 983051, 5, 0, 983052, 5, 0, 983053, 5, 0, 983054, 5, 0, 983055, 8, 0, 983056, 4, 0, 983057, 4, 0, 983058, 4, 0, 983059, 4, 0, 983060, 4, 0, 983061, 10, 0, 983062, 5, 0, 983063, 5, 0, 983064, 5, 0, 983065, 12, 0, 983066, 12, 0, 983067, 12, 0, 983068, 5, 0, 983069, 5, 0, 983070, 5, 0, 983071, 5, 0, 983072, 5, 0, 983073, 5, 0, 983074, 8, 0, 983075, 4, 0, 983076, 4, 0, 983077, 4, 0, 983078, 4, 0, 983079, 4, 0, 983080, 4, 0, 983081, 4, 0, 983082, 4, 0, 983083, 4, 0, 983084, 4, 0, 983085, 4, 0, 983086, 4, 0, 983087, 4, 0, 983088, 4, 0, 983089, 4, 0, 983090, 4, 0, 983091, 4, 0, 983092, 4, 0, 983093, 4, 0, 983094, 4, 0, 983095, 4, 0, 983096, 4, 0 ) [node name="monster_01" parent="." instance=ExtResource( 6 )] position = Vector2( 1015, 945 ) @@ -49,36 +49,46 @@ position = Vector2( 1435, 420 ) type = 2 [node name="Lift" parent="." instance=ExtResource( 8 )] -margin_left = 2491.0 -margin_top = 146.0 -margin_right = 2871.0 -margin_bottom = 971.0 +margin_left = 3815.0 +margin_top = -140.0 +margin_right = 4025.0 +margin_bottom = 685.0 [node name="Coin6" parent="." instance=ExtResource( 5 )] -position = Vector2( 3010, 70 ) +position = Vector2( 3185, 385 ) type = 1 [node name="Coin7" parent="." instance=ExtResource( 5 )] -position = Vector2( 3115, 70 ) +position = Vector2( 3290, 385 ) type = 1 [node name="Coin8" parent="." instance=ExtResource( 5 )] -position = Vector2( 3185, -70 ) +position = Vector2( 3360, 245 ) type = 2 [node name="Coin9" parent="." instance=ExtResource( 5 )] -position = Vector2( 3255, 70 ) +position = Vector2( 3430, 385 ) type = 1 [node name="Coin10" parent="." instance=ExtResource( 5 )] -position = Vector2( 3360, 70 ) +position = Vector2( 3535, 385 ) type = 1 [node name="monster_02" parent="." instance=ExtResource( 6 )] -position = Vector2( 3185, 105 ) +position = Vector2( 3360, 525 ) [node name="Flake" parent="." instance=ExtResource( 3 )] -position = Vector2( 2774, 164 ) +position = Vector2( 5113, 216 ) scale = Vector2( 0.2, 0.2 ) reverse_direction = true flake_scene = "res://scenes/levels/01/interlude_01.tscn" + +[node name="Coin11" parent="." instance=ExtResource( 5 )] +position = Vector2( 3255, 910 ) + +[node name="Coin12" parent="." instance=ExtResource( 5 )] +position = Vector2( 3465, 910 ) + +[node name="Coin13" parent="." instance=ExtResource( 5 )] +position = Vector2( 2065, -560 ) +type = 2 diff --git a/scenes/levels/01/tilemap.tscn b/scenes/levels/01/tilemap.tscn index ca7d9ce..aacddf3 100644 --- a/scenes/levels/01/tilemap.tscn +++ b/scenes/levels/01/tilemap.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://common/tiles/base.tres" type="TileSet" id=1] +[ext_resource path="res://common/tiles/grasland.tres" type="TileSet" id=1] [node name="Tiles" type="TileMap"] tile_set = ExtResource( 1 ) diff --git a/scenes/levels/02/level_02.tscn b/scenes/levels/02/level_02.tscn index 22591a1..4c582b3 100644 --- a/scenes/levels/02/level_02.tscn +++ b/scenes/levels/02/level_02.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=2] [ext_resource path="res://scenes/levels/02/level_02.gd" type="Script" id=1] -[ext_resource path="res://common/tiles/base.tres" type="TileSet" id=2] +[ext_resource path="res://common/tiles/grasland.tres" type="TileSet" id=2] [ext_resource path="res://objects/characters/player.tscn" type="PackedScene" id=3] [ext_resource path="res://scenes/levels/02/background_02.tscn" type="PackedScene" id=4]