From 2b53f970e59f6a7083083a332714bc215bee2d4e Mon Sep 17 00:00:00 2001 From: Diego Date: Mon, 20 Jul 2020 23:14:33 -0500 Subject: [PATCH] Loading Screen added --- Title/Loading.tscn | 25 +++++++++++++++++++ art/Loading 2.png | Bin 0 -> 1225 bytes art/Loading 2.png.import | 34 ++++++++++++++++++++++++++ art/Loading 3.png | Bin 0 -> 1248 bytes art/Loading 3.png.import | 34 ++++++++++++++++++++++++++ art/Loading Wheel.png | Bin 0 -> 450 bytes art/Loading Wheel.png.import | 34 ++++++++++++++++++++++++++ art/Loading.png | Bin 0 -> 1209 bytes art/Loading.png.import | 34 ++++++++++++++++++++++++++ art/Paralax_loading_screen.png | Bin 0 -> 937 bytes art/Paralax_loading_screen.png.import | 34 ++++++++++++++++++++++++++ levels/World.tscn | 15 ++++++++++++ levels/test.tscn | 12 ++++++--- project.godot | 9 ------- 14 files changed, 218 insertions(+), 13 deletions(-) create mode 100644 Title/Loading.tscn create mode 100644 art/Loading 2.png create mode 100644 art/Loading 2.png.import create mode 100644 art/Loading 3.png create mode 100644 art/Loading 3.png.import create mode 100644 art/Loading Wheel.png create mode 100644 art/Loading Wheel.png.import create mode 100644 art/Loading.png create mode 100644 art/Loading.png.import create mode 100644 art/Paralax_loading_screen.png create mode 100644 art/Paralax_loading_screen.png.import 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 0000000000000000000000000000000000000000..047f820f8d2fe1018627c24e065e7974b4b94108 GIT binary patch literal 1225 zcmeAS@N?(olHy`uVBq!ia0y~yU~~Yow{Wll$)``g3IZw40*}aI1_o|n5N2eUHAey{ zsF3Ut*jy2s=1zQdFS-&VxK~t;9T}OOw4Bt8x&h4oI2u~ zcFDc>d;Iurrp)QG13Ur?8id;$uEfR7xBvV9)1OnU0xT1L{{H;>+5P?b@9wwoFF(ML z)^KLpO}VrNAY-!elk?_>I*z}zy>|9*^vcJQTr#VZ`@&a!EVh+D!*IE}vbL{SYWbH4 z%VX<){yA=7$HehK#A5o}Snm7vHs_M&TuOc_vHRI)`NKbEFfz?xOcN3BKHvR6{(a1i z^y2ix2f6=B9=EKTZ}zzNSL^NV{?>ir8XxD)IP`JxM}~L5RxIl;*Z*_=TmId)nkT{c z4f$lB->AJc>rm$Xb+uN{N;6;ncqk&VV6EhXeMjH!D>vkcRFN-gcbQ)p^!~EQn_J5j z*L!y#=Qnm}*p}9y9Q64e&jFqdeC6W6Ahux5Yu(Ka3<;o!;yb+=9kTZmgFZEd&fn;*s_r-ElH-oF}{ zY+w8~_~hR=yYH^!wr;n1H{m^c&~C?+U30qO)a*K`+5Iy`wtZAE{4{kFSnoR1%`5r>sRISDgaYsjCP`~NX8^w12WsV)^5jen8;8eKv*Pb8$zn*I~ z+ifk~7x!X*!JLD?w@B;17GIY;pHF7}gh#f4hdwU;#31);#j^f#{Xggb<=_2P^CbAX zVV`XJ3%j>d3vQKX%x~MHXDVwyhl%-$DRWNrop)8@&huSA*_C^gNT$E3)jGJa_SNTI zS1SGhy}KftZN@~)_vaYSFg$FvtOg+ zxx1`SGpcl_{kWK_`CYRm;0~+3vBLo#1M}(6!zb6MACBO@mwVfD=Z1L)mFmQ6?UrSk z=|ylpc+|7=!QT5}msf_IYW=!X{Nwb0b}vt{t~Rn{Wjn(#J*SKH{j%I;F%k2t1@}+; z?kO$4<_rVl8HV4lHb1y?^j*?{7mv&Dz7zRvdDU*|o%4FPZ3_~guh{t8?*H74dOfO^ zahAQ8Q`g+LU%z<=hgmhlZyk&NO0CP!cUwKXaen1D&8Kx`ck?c{&P|pxfAaHvU8Vbe z1GA?ePi4;8wlS$EGWKsd7f*=x5sUXy?`|HweBrXmdZoobDg;+P|E+bU?98^=r5DfN z=Mh*D_OYJL_$sT&t80&IMYC-DZeQIR{J_y)fn|U0lSSwCov-FU*!laRh{S>`k_rt# vL@0})C492E)X2>YOjCbzGcf%B&&=?2>5&ihRh*ZAr4xgvtDnm{r-UW|4JhA$ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b71596cabae51e20fa8de1f45a249c258248f1c0 GIT binary patch literal 450 zcmV;z0X_bSP)200001b5ch_0Itp) z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf5dZ)S5dnW>Uy%R+0ar;xK~y+TWBmXB zKLa*kQ^)ZB(+h@QK&BXo|7sPG5e8y0`~~8-f4LY$u1;WJ28*Bp3`6zO7(N0iMj+M;CA%EuG|s5y{qC9MP`p;?R)49cz`8ti=`XNG^2x>iB}tp7WhgJjFUj8hPs zNW~x*g7m}qDCH?M%aWACpgu$?Q?V7&pc0D-RMO)swK7jL{D)>sj6xb`bpkXTRF$yu sZ)5oX(F?_JkfqGP>f|5x>V$y-0Jh9i)2=v>jsO4v07*qoM6N<$f~YdD;Q#;t literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f9ef8f9a426d87d344106b770de07759a2c7c2e6 GIT binary patch literal 1209 zcmeAS@N?(olHy`uVBq!ia0y~yU~~Yow{Wll$)``g3IZw40*}aI1_o|n5N2eUHAey{ zsF3UtzsmfpN=JpQ zA6~BLnJkbT!*J%Jc{_uE0|O%q#RTOhK%9W)kQptT6>U0yFaQ4IYx?V}Mq6sugd5Jk z@nLg7q4nhLak{cCmh2xMWl68s&!1Iy@6|`&{--7S>(3h=-*{%LYylUK!BK`bfg}#a zD$ZB8Y~~z4d$>~ORM`O@fdvi5?G1P0;^y1`{r~IJF;)SV2`_(te*NzL{`YeCTlkkB zU`T85nRZhytpUhbJo(de>BIw%x5&MI_i^o&k36h>q0=8v&Hl4*9)DWH&%Jx>j%)S? zSFN!-w(jSjb^|*mjt3$;^ndRb+xP#5Ptu%A$zKi2&OWzq`Dn<@V!-?+Fh<8t|6l#y z;)gTt&gE6t|MK0!?|JR5Uh@~??{3)1TEs0pQk}$eyniP9hYRkewR@@`)_<#iJ?+y( z|J>sirE}K(-eTT%d7ty|D^E*jUjBGk)8N3Kw1(qi+i%}HI$@K?yrOoO*@Z>#FH6YW zT0Z4^YTt2wV~2*yvkdG@p52vfkW7$$rw5Gh0xlbIAj8;!!T5k=VfjH1nIC+Ulf>7& zn}4srZ)==x?V4!}eb2;C-DOq2_(fJtb^o2ekFs8OKbgzKJcF@s)^6@&i(hV?aoT-) zA{&Rn9mxk@pZewa*J2fdc@s`G6`u>9IpzJU6&vT*z70P4 zH)r?VW!%=wZPuOse4kbGck9L}k42M3?0~lZKon`F{1} z^qkjMFEyGovuNahsb{-BL{(fH5 zpg~drgcz7OC?Y7*jAT0!6OWTZK8Q0g{Qu9)@U>)x;8o$P#=v5S!PC{xWt~$(69AJJ B!@2+f literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ae3864d02daa035c2307a387a21dd82454cf03c1 GIT binary patch literal 937 zcmeAS@N?(olHy`uVBq!ia0y~yU~~Yow{Wll$)``g3IZv{;vjb?hIQv;UNSH+Cwsa$ zhE&XXd&jWvR)C1ZMV}|EE?!kxQm57^)Lxrqr#<5muc@}DmdYEZ7M_~UYQOYMlm7cL zdtcT5`SI=Vees3`>lfEE9ME9mNa0kNVEXsZ*WXK-?f?IateKs^@8`4rS^3N?n^*)+ z2stQtGc@WjV&%L(Z0oS#6dTwG)dq)aTW-s*`*-lAh5kPG`|o#st(HIgd++~A-}hht zo!j6rje#i=VjEB?HqK6Vj+C2lyJpR+y`NosKKqNU;pemF_x~76D@?$l5$FM^%sWP= zNHe&L&F(YD+`oP6E&uF)_xJi8ul#8H>)wp-)&I3C|8M(#8*USBFBb6&oY(|365{Nw zKjj|mz4ra^8T0!!pWV-HhfCmg)>Ao!390aa%mz9o{QrZJIpX&hzc0W0Yj6LvzxV1- z{=WbEFT&Bd!~71=pd5J6`JUhRe(S#HroZOR`1x#h{=b>L1R@I*jo*P75stIpGp>7| z`}SMA@BjC4%OCIgAy=D!1{h;g_tf7eBgSsk@PCMV{W}rpnteYPKO;SWO@U5XU0+~z zuKWGP@4NH<-gEz4_kRDAzwf`+Asmf6386;*vh@4kqwar}s`Wop157~w&%l!@wzLOL hLe;?Fg@@ys|F#|Rk@5W!4}f`(!PC{xWt~$(697NoV{!lh literal 0 HcmV?d00001 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)