diff --git a/Title/Loading.tscn b/Title/Loading.tscn new file mode 100644 index 0000000..1900998 --- /dev/null +++ b/Title/Loading.tscn @@ -0,0 +1,25 @@ +[gd_scene load_steps=6 format=2] + +[ext_resource path="res://art/Paralax_loading_screen.png" type="Texture" id=1] +[ext_resource path="res://art/Loading.png" type="Texture" id=2] +[ext_resource path="res://art/Loading 2.png" type="Texture" id=3] +[ext_resource path="res://art/Loading 3.png" type="Texture" id=4] + +[sub_resource type="SpriteFrames" id=1] +animations = [ { +"frames": [ ExtResource( 2 ), ExtResource( 3 ), ExtResource( 4 ) ], +"loop": true, +"name": "Loading", +"speed": 3.0 +} ] + +[node name="Sprite" type="Sprite"] +position = Vector2( 2, 0 ) +texture = ExtResource( 1 ) +centered = false + +[node name="AnimatedSprite" type="AnimatedSprite" parent="."] +position = Vector2( 160, 90 ) +frames = SubResource( 1 ) +animation = "Loading" +playing = true diff --git a/art/Loading 2.png b/art/Loading 2.png new file mode 100644 index 0000000..047f820 Binary files /dev/null and b/art/Loading 2.png differ diff --git a/art/Loading 2.png.import b/art/Loading 2.png.import new file mode 100644 index 0000000..fecb880 --- /dev/null +++ b/art/Loading 2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Loading 2.png-82ddd2b9dd72018ad3b2cdf76c27b233.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/Loading 2.png" +dest_files=[ "res://.import/Loading 2.png-82ddd2b9dd72018ad3b2cdf76c27b233.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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/art/Loading 3.png b/art/Loading 3.png new file mode 100644 index 0000000..0f1c343 Binary files /dev/null and b/art/Loading 3.png differ diff --git a/art/Loading 3.png.import b/art/Loading 3.png.import new file mode 100644 index 0000000..b0a287e --- /dev/null +++ b/art/Loading 3.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Loading 3.png-92823adafeb3c8bb605e4fcab5185aae.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/Loading 3.png" +dest_files=[ "res://.import/Loading 3.png-92823adafeb3c8bb605e4fcab5185aae.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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/art/Loading Wheel.png b/art/Loading Wheel.png new file mode 100644 index 0000000..b71596c Binary files /dev/null and b/art/Loading Wheel.png differ diff --git a/art/Loading Wheel.png.import b/art/Loading Wheel.png.import new file mode 100644 index 0000000..66b7bc5 --- /dev/null +++ b/art/Loading Wheel.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Loading Wheel.png-f7762351a3f31fdad0fa48dfe17d3059.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/Loading Wheel.png" +dest_files=[ "res://.import/Loading Wheel.png-f7762351a3f31fdad0fa48dfe17d3059.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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/art/Loading.png b/art/Loading.png new file mode 100644 index 0000000..f9ef8f9 Binary files /dev/null and b/art/Loading.png differ diff --git a/art/Loading.png.import b/art/Loading.png.import new file mode 100644 index 0000000..4d21fa8 --- /dev/null +++ b/art/Loading.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Loading.png-01af2a6a02dbe402511fd26fca3a4f22.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/Loading.png" +dest_files=[ "res://.import/Loading.png-01af2a6a02dbe402511fd26fca3a4f22.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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/art/Paralax_loading_screen.png b/art/Paralax_loading_screen.png new file mode 100644 index 0000000..ae3864d Binary files /dev/null and b/art/Paralax_loading_screen.png differ diff --git a/art/Paralax_loading_screen.png.import b/art/Paralax_loading_screen.png.import new file mode 100644 index 0000000..cb2274d --- /dev/null +++ b/art/Paralax_loading_screen.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Paralax_loading_screen.png-831d029ee68676d5b6c4c247fc519c04.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/Paralax_loading_screen.png" +dest_files=[ "res://.import/Paralax_loading_screen.png-831d029ee68676d5b6c4c247fc519c04.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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/levels/World.tscn b/levels/World.tscn index fbd6076..25c41ff 100644 --- a/levels/World.tscn +++ b/levels/World.tscn @@ -329,6 +329,21 @@ __meta__ = { "_edit_use_anchors_": false } +[node name="sample_text8" type="Label" parent="text/Text6"] +anchor_top = -0.000655535 +anchor_bottom = -0.000655535 +margin_left = 1974.39 +margin_top = 135.74 +margin_right = 2196.39 +margin_bottom = 284.74 +rect_scale = Vector2( 0.45, 0.45 ) +custom_fonts/font = SubResource( 2 ) +text = "Press 'F' to open" +autowrap = true +__meta__ = { +"_edit_use_anchors_": false +} + [node name="sample_text7" type="Label" parent="text/Text6"] anchor_top = -0.000655535 anchor_bottom = -0.000655535 diff --git a/levels/test.tscn b/levels/test.tscn index 47c77dd..6afe608 100644 --- a/levels/test.tscn +++ b/levels/test.tscn @@ -1,16 +1,20 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=5 format=2] [ext_resource path="res://characters/Player.tscn" type="PackedScene" id=1] [ext_resource path="res://meta/DungeonTilemap.tscn" type="PackedScene" id=2] -[ext_resource path="res://ai/Skeleton Enemy.tscn" type="PackedScene" id=4] +[ext_resource path="res://ai/ogre.tscn" type="PackedScene" id=3] +[ext_resource path="res://Items/ChargeWandPickup.tscn" type="PackedScene" id=4] [node name="Node2D" type="Node2D"] [node name="Player" parent="." instance=ExtResource( 1 )] position = Vector2( 60, 176 ) -[node name="Skeleton Enemy" parent="." instance=ExtResource( 4 )] -position = Vector2( 274, 164 ) +[node name="TileMap" parent="." instance=ExtResource( 2 )] +tile_data = PoolIntArray( 65536, 0, 8, 65537, 0, 10, 65538, 0, 10, 65539, 0, 10, 65540, 0, 10, 65541, 0, 10, 65542, 0, 10, 65543, 0, 10, 65544, 0, 10, 65545, 0, 10, 65546, 0, 10, 65547, 0, 10, 65548, 0, 10, 65549, 0, 10, 65550, 0, 10, 65551, 0, 10, 65552, 0, 10, 65553, 0, 10, 65554, 0, 10, 65555, 0, 10, 65556, 0, 11, 131072, 0, 65544, 131073, 0, 131078, 131074, 0, 196617, 131075, 0, 196617, 131076, 0, 196617, 131077, 0, 196617, 131078, 0, 196617, 131079, 0, 196617, 131080, 0, 196617, 131081, 0, 196617, 131082, 0, 196617, 131083, 0, 196617, 131084, 0, 196617, 131085, 0, 196617, 131086, 0, 196617, 131087, 0, 196617, 131088, 0, 196617, 131089, 0, 196617, 131090, 0, 196617, 131091, 0, 131077, 131092, 0, 131083, 196608, 0, 65544, 196609, 0, 131083, 196627, 0, 65544, 196628, 0, 131083, 262144, 0, 65544, 262145, 0, 131083, 262163, 0, 65544, 262164, 0, 131083, 327680, 0, 65544, 327681, 0, 131083, 327699, 0, 65544, 327700, 0, 131083, 393216, 0, 65544, 393217, 0, 131083, 393235, 0, 65544, 393236, 0, 131083, 458752, 0, 65544, 458753, 0, 131083, 458771, 0, 65544, 458772, 0, 131083, 524288, 0, 65544, 524289, 0, 131083, 524307, 0, 65544, 524308, 0, 131083, 589824, 0, 65544, 589825, 0, 131083, 589843, 0, 65544, 589844, 0, 131083, 655360, 0, 65544, 655361, 0, 131083, 655379, 0, 65544, 655380, 0, 131083, 720896, 0, 65544, 720897, 0, 65542, 720898, 0, 10, 720899, 0, 10, 720900, 0, 10, 720901, 0, 10, 720902, 0, 10, 720903, 0, 10, 720904, 0, 10, 720905, 0, 10, 720906, 0, 10, 720907, 0, 10, 720908, 0, 10, 720909, 0, 10, 720910, 0, 10, 720911, 0, 10, 720912, 0, 10, 720913, 0, 10, 720914, 0, 10, 720915, 0, 65541, 720916, 0, 131083, 786432, 0, 196616, 786433, 0, 196617, 786434, 0, 196617, 786435, 0, 196617, 786436, 0, 196617, 786437, 0, 196617, 786438, 0, 196617, 786439, 0, 196617, 786440, 0, 196617, 786441, 0, 196617, 786442, 0, 196617, 786443, 0, 196617, 786444, 0, 196617, 786445, 0, 196617, 786446, 0, 196617, 786447, 0, 196617, 786448, 0, 196617, 786449, 0, 196617, 786450, 0, 196617, 786451, 0, 196617, 786452, 0, 196619 ) + +[node name="Ogre" parent="." instance=ExtResource( 3 )] +position = Vector2( 293.533, 176.48 ) [node name="Ogre2" parent="." instance=ExtResource( 3 )] position = Vector2( 267.723, 176.127 ) diff --git a/project.godot b/project.godot index 81d1bdd..eb2a0ef 100644 --- a/project.godot +++ b/project.godot @@ -112,15 +112,6 @@ ui_accept={ , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":70,"unicode":0,"echo":false,"script":null) ] } -ui_end={ -"deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777222,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":0,"pressure":0.0,"pressed":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":70,"unicode":0,"echo":false,"script":null) - ] -} ui_up={ "deadzone": 0.5, "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null)