From 0693bd91d373543f3027ee5907576f30132bfbb9 Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Fri, 8 Sep 2023 15:39:13 -0400 Subject: [PATCH] started work on lab --- graphics/enemy/rolling_fiend.png | Bin 2009 -> 1986 bytes graphics/tiles/laboratory.png | Bin 5921 -> 3023 bytes maps/lab.tscn | 185 ++++++++++++++++-- maps/test_room.tscn | 157 +-------------- menus/results.tscn | 58 ++++++ objects/enemy/enemy_arrow.tscn | 1 + objects/enemy/roboturret_proj.tscn | 1 - .../electric_tiles/electric_tiles.tscn | 185 ++++++++++++++++++ objects/player/player.tscn | 6 +- tilesets/t_laboratory.tres | 11 +- 10 files changed, 430 insertions(+), 174 deletions(-) create mode 100644 menus/results.tscn create mode 100644 objects/environment/electric_tiles/electric_tiles.tscn diff --git a/graphics/enemy/rolling_fiend.png b/graphics/enemy/rolling_fiend.png index e0d0cd5f6b001f7970263a8d5d82998cd75a095e..7b5316e869df025ba10d9a863fb0819cefae4e6c 100644 GIT binary patch delta 148 zcmV;F0Bir*55fZDA000iZ0XPLyB(w7YQw4lyNkl6AG6CL%J_f5?t{gT1@+>f4 zXUeXd6|VY7ZDB000ia0czHX3A6J7Qw4v1NklCGvJAlnp=i7O}bj%u1g#meaT!ZJQD#CsfNsS8KnSaRQCLZ270|$N*c)e)%75? a)&mrn3I=8VhXRrS0000L}8^L}23%rKrrsO4FoR1(jM>JXrnVU6PPudE4%e-lYlB8$Mi=*t%ikwQGmM1X$!1 zwwZ->nJGQrFRtj=@!-%V`OVgc-|4WNs=Qnz-F|RWw_ldcy0i7?&So!6cWUXp(6VfH zUZToOpMdh3JC_z*n;kdx=zq8Ds+*<@9fjr0xcvevJSz(JMg;89mN6}^iuw_<2w zuKU_|SA6JxwB|hHRLRn1!HW+CChA5XcH^CGd0a?Npl_*e^e5)cqJG-<0&<>SKQq62 zmH0ND+s46O({G-%5cZkmQhzw1SM-y}%c)nzj;gBu{%G}&@BVy|>5A(_eF}RvcD26y z9a#TiceMHC`{ABhoz9mhKi^yGm?6E-Yu@+D7nSku0yQn%yI;lY9=@>q#nM$`)(zWy zEq1TTI>t9A-|@GzV|htD*D0P9qYqU|_f6O*W@p5$`0{P@`H!+b-r=3vH*UArzgv@{ zf3327$F}YE=YRYa{LkjoTQvRXq#gahc+m~;3308fo3wY|?e*(V&6>Ss`HDjpW{&?a zI;ExM#l@xRByRs|>{L)t>E-29UfvAU(far8XCTF2666>B9|bU6xie!SP>Qp_BeIx* zK~D*U8CS7Cx;u%1fqli~D@^{3ypxrgU6^^f6eeddJFx(1g~_X# ztK^fJS6ZPo`46koWJNY{ZH1I%D>tA-Vu`I%W^Q77s(wLUx{^XkW?Gt+e^F*?UP)p} zW`3TnlA+S%95$KB-E6v(ceCl(f?NawHWj%AzP?r-nZ+gfMU{3iVW31&N}5%0Y9W#k zR4^xV@lN{YbToB#aTkeHmETB4Ae2MoL-C40LIt_2amqNDz`r;B4qg!|j6xs#g} zcv_Y=T`>Ru|NP#&s@wQ<-P3NJ`+C?m?E1q=rY!u+uX8HOI8A6{ey0)?_xeX{^b3P# z-{>C=n&*V`R=hpi=Z2R%BM6V3=r>vDwtlM8f|d({8p5(OGIwdt=Q@ zC3++zmrN0xP;`zp{oHDedL`L@KIW(DOFkdy|0#L$G!u8bp1zsIFtB%~tht|#tU%6nn*MpN6h4Ufg@uP@Ex z+MiGutFxy6XsKkKxX!xM)w51KeWmxf!Ca!|Z*{_NH*xOQ!RHpu*p}eVWq71R)1&fe zWw2CC(Y}~OhTMY|v&@fovR$w|*5Uuo*D~&0&yvOugD`E@?1GEa-zs&?<{b!L{^S{j+_*KuV%V87q|a9Z2d zG}a5#b}fzN6k1W{0`MbU=Pt7x5MGI@}U35b9YZ3yxZw1`e76C5EAl7R$8MQU3S z+lp7kTB{;$eN>B9z*4bd0kIXKSe2Hml*+1DAB798R6)6C0wUgat-D;e?Jp%9VK=5n@wg3TmOlUk0IqL*>Pl&VN*22jN4dNeak4$2cCJfR36 zBB&5U{4qqz5lAqh6cdOc2k7<9PLLOP<~|s#J&)}Lw}aR3HLdx~V=s_@l?o1yR0aog zOlG5wN+BW0wsTdUBD`{zclDC!dATv(O+i&Y!D*l5ZjfG{?pZK<|8tAdkg{J~cRat@ zb9~t8l9rYl&85@T3*(&Pg4}zd)U?znI&Vy0zUQJUo9W8i*6zvHcBmjWX~(5}2hmlD z<(=YqzmM1d5Vy`FXr#}2^w`FQ%CEk#W?uEJXgu*^eP>{I+w+n0#<3l^sT;gLRFy}_ zPf`Ro0~L`R$Fx zr$TtIC5RDoEy13kZ5;j3>C}mmul_kUF-qjNF44P<@N{l>xbtCa<_j|;dK{et*l{Zw zPc=B`0+hz|k}416Q@4Z!tC$@9=@r)NyGDMuW%0D|Xutfm-NO4Ha@|i1yB~M58S9a* zf;un8-W@KLI-Z%n<>d9QpTmvDzFj~4(#?MPO>=%n^+!1n(AOTx43^ZL{mlshrz@(#xz>N<$`t2Bm49wm1+>)U>S%4hzH+>oA?4A!q@BhL!YqF zq3Hl*z@R^T!V;5VBKc9I#h7L$$k24sK>H4bV9IO|fpIB`(wpo~f#5x%OiK*PnbOQD zb{Q?fCsRm00JQ-71W(A*lP7SsWL>t zW$eYYMuO5}b`l{70g0eG7)Nme7Rhi8EJgjbu!hiyg)&qp6cXqVD5b$d;|79cpa3|J z0yw0U)S$Rn1fybqDJ;?u8Wx^c-g8MRMNV7d& zh@tdkG>tPs6G)^|sYoi3i6sK53>7{WT0ojDAmJEHdmpv0XbEf%K*T}fP_vg$M869b zJe}0q?F3l;OT;qVkVJy+F_5m0_|zYyf=nk75n`PT779@bERt%(utp|EVX;<%f&>#G zT48@G45C|%I@*ex$)F?T}Cq70|Evk0vHv=uU}7P-L(kG4nzg$FP1i&)^hRXgv z7jc1DqtS^8SRxeaU=f1IV2uzbVO%C42%He2QZ4ysxhRBD;GzT*h`?`@fwcb{cF`Z~ zn}EP|u$B}EU=ax#piD!OFlcyMp;Vw1Yqb51=1)jee;ASecV!Q_DCaYW+oRHy^M6;o z{Q^TyLy+M8JaEc_Lz_Q%Y7b;Su=lUL2AalSse;3KrsS#O`z&0~!u3=Ucq-v%+4U@3 zPZfcu5`LCle_FU)9>4dK2Jmy;3f}6yvNsli{{)6>=7oho`=I^M7w?3|odlc_rtpOp z2;%uNgJt_5FdZBSeuB&7m1pO7T*%$D zYsZ>BH5(%JYB+JxriUE3OynM~udb?0oGV|q@cX*D+lHB2C!NncLMMHG{$H!w&zIlZ zexRhd_)3ktFB?+tR&>w&EN~5Hjl~f#E|1}6I zl{C)ZxxF*T`2FHy^($+grm1)5W^Zh}bIe*>yY1^+X$=AT*P6rbCGd)V$!|KITyn5F z5e>NRn7HVp*u#E_B`SUN8%er(1$%PFm|`P)B)h#H`WD(Qm5vi<@w4e~H@LhQcqq0B z^K2Oj&6pv-n>+TUm{wv`y470Im06H`^X+Q~9$aL*cl%(OH}69J=k-cA(X>_)f;;>06hd zo!`_b$IjfmHe$heH3V6IZa!0)D~9J}O=^>8MP8;(H0*yR(;WzY-z67KNXwP=c3!2I zI^J-YS(j1Y)thTP7BIoFIU}!f;`nU=to7#AE30Qq-rbt$c@bZso^<_A@^esLmvT82 zc$*ZjRSkpL?muQGxV5yE@1Fuy^gI~br}^|~pX33F)Md;sCF{PK7RigdpW>CN@ON7r z7NToA*Opatnf)+N9f#I7vb-*AtCYO%Jq2PuE3yoElP2E|?L4^WZpjGfYNw`WG@AI_ z#nm_WUYYSKcH8-bH!s!?qh~E|bHK)(zF0SG<0u5HxRF)x4a@7h<_D2KWi>RsGP|?4 zcjWx?>DyP8)}1goy%n8xE8W2oduC>Y&)4;vwgk$*?I~pMIA7#9&Z+CrRRg~Ip+}Z* zz3s>BsYld(PCs-kg9-BKCIcC+Vw;es#v3KLtA4?{&l(y^ZZy!%B zFZIppyCF^7^6UHMlDUy-5q)tJxs9$KBek<2yp{Kg>{<)4O$5|hIvSfkNvN*># z?cPC!>c^ZM z|L+-vdtVx%*5C78dL+!h;_O-5jlyX~F3q3cN{<9der$GoX!*fWdrA)#AFrM|wf!9u vQEj)dE>m^GYRj@3SaY17pM(wGFU|fBmIN+v diff --git a/maps/lab.tscn b/maps/lab.tscn index 6e9c3d4..35974ae 100644 --- a/maps/lab.tscn +++ b/maps/lab.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=17 format=2] +[gd_scene load_steps=33 format=2] [ext_resource path="res://graphics/backgrounds/factory.png" type="Texture" id=1] [ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=2] @@ -6,15 +6,33 @@ [ext_resource path="res://tilesets/t_laboratory.tres" type="TileSet" id=4] [ext_resource path="res://objects/enemy/super_slime.tscn" type="PackedScene" id=5] [ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=6] +[ext_resource path="res://objects/enemy/snake.tscn" type="PackedScene" id=7] +[ext_resource path="res://objects/enemy/bat.tscn" type="PackedScene" id=8] [ext_resource path="res://tilesets/t_death.tres" type="TileSet" id=9] +[ext_resource path="res://objects/enemy/spider.tscn" type="PackedScene" id=10] +[ext_resource path="res://objects/enemy/rolling_fiend.tscn" type="PackedScene" id=11] +[ext_resource path="res://objects/enemy/snail.tscn" type="PackedScene" id=12] +[ext_resource path="res://objects/enemy/jumping_spider.tscn" type="PackedScene" id=13] +[ext_resource path="res://objects/environment/falling_block/falling_block_graveyard.tscn" type="PackedScene" id=14] +[ext_resource path="res://objects/enemy/artificial_soul.tscn" type="PackedScene" id=15] +[ext_resource path="res://objects/enemy/roboturret.tscn" type="PackedScene" id=16] +[ext_resource path="res://objects/enemy/cop.tscn" type="PackedScene" id=17] [ext_resource path="res://scripts/delete_on_game_running.gd" type="Script" id=18] [ext_resource path="res://maps/map.gd" type="Script" id=19] +[ext_resource path="res://objects/enemy/tin.tscn" type="PackedScene" id=20] [ext_resource path="res://tilesets/t_ladders.tres" type="TileSet" id=21] [ext_resource path="res://objects/lore/hills/bioslime.tscn" type="PackedScene" id=22] [ext_resource path="res://objects/lore/hills/catbat.tscn" type="PackedScene" id=23] [ext_resource path="res://objects/lore/hills/eviscerator.tscn" type="PackedScene" id=24] [ext_resource path="res://objects/lore/hills/verdant_hills.tscn" type="PackedScene" id=25] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=26] +[ext_resource path="res://objects/environment/moving_platform/moving_platform.tscn" type="PackedScene" id=27] +[ext_resource path="res://objects/environment/electric_tiles/electric_tiles.tscn" type="PackedScene" id=28] +[ext_resource path="res://objects/collectibles/key.tscn" type="PackedScene" id=29] +[ext_resource path="res://objects/collectibles/star.tscn" type="PackedScene" id=30] + +[sub_resource type="RectangleShape2D" id=2] +extents = Vector2( 20.1613, 4.03226 ) [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 8, 128 ) @@ -43,20 +61,36 @@ __meta__ = { tile_set = ExtResource( 4 ) cell_size = Vector2( 8, 8 ) format = 1 -tile_data = PoolIntArray( 1048586, 2, 196609, 1048587, 2, 196610, 1048588, 2, 196610, 1048589, 2, 196610, 1048590, 2, 196610, 1048591, 2, 196610, 1048592, 2, 196610, 1048593, 2, 196610, 1048594, 2, 196610, 1048595, 2, 196611, 1245207, 2, 1, 1245208, 2, 2, 1245209, 2, 2, 1245210, 2, 3, 1310742, 2, 1, 1310743, 2, 65538, 1310744, 2, 65538, 1310745, 2, 65538, 1310746, 2, 65539, 1376277, 2, 1, 1376278, 2, 65538, 1376279, 2, 65538, 1376280, 2, 65538, 1376281, 2, 65538, 1376282, 2, 65539, 1441792, 2, 1, 1441793, 2, 2, 1441794, 2, 2, 1441795, 2, 2, 1441796, 2, 2, 1441797, 2, 2, 1441798, 2, 2, 1441799, 2, 2, 1441800, 2, 2, 1441801, 2, 2, 1441802, 2, 2, 1441803, 2, 2, 1441804, 2, 2, 1441805, 2, 2, 1441806, 2, 2, 1441807, 2, 2, 1441808, 2, 2, 1441809, 2, 2, 1441810, 2, 2, 1441811, 2, 2, 1441812, 2, 2, 1441813, 2, 65538, 1441814, 2, 65538, 1441815, 2, 65538, 1441816, 2, 65538, 1441817, 2, 65538, 1441818, 2, 65538, 1441819, 2, 2, 1441820, 2, 2, 1441821, 2, 2, 1441822, 2, 2, 1441823, 2, 3, 1507328, 2, 131073, 1507329, 2, 131074, 1507330, 2, 131074, 1507331, 2, 131074, 1507332, 2, 131074, 1507333, 2, 131074, 1507334, 2, 131074, 1507335, 2, 131074, 1507336, 2, 131074, 1507337, 2, 131074, 1507338, 2, 131074, 1507339, 2, 131074, 1507340, 2, 131074, 1507341, 2, 131074, 1507342, 2, 131074, 1507343, 2, 131074, 1507344, 2, 131074, 1507345, 2, 131074, 1507346, 2, 131074, 1507347, 2, 131074, 1507348, 2, 131074, 1507349, 2, 131074, 1507350, 2, 131074, 1507351, 2, 131074, 1507352, 2, 131074, 1507353, 2, 131074, 1507354, 2, 131074, 1507355, 2, 131074, 1507356, 2, 131074, 1507357, 2, 131074, 1507358, 2, 131074, 1507359, 2, 131075 ) +tile_data = PoolIntArray( 393220, 1, 196609, 393221, 1, 196610, 393222, 1, 196610, 393223, 1, 196610, 393224, 1, 196610, 393225, 1, 3, 393233, 1, 1, 393234, 1, 196610, 393235, 1, 196610, 393236, 1, 196610, 393237, 1, 196610, 393238, 1, 196610, 393239, 1, 196610, 393240, 1, 196610, 393241, 1, 196610, 393242, 1, 196610, 393243, 1, 196610, 393244, 1, 196610, 393245, 1, 196610, 393246, 1, 196610, 393247, 1, 196610, 393248, 1, 196610, 393249, 1, 196610, 393250, 1, 3, 458761, 1, 131073, 458762, 1, 196610, 458763, 1, 196610, 458764, 1, 196610, 458765, 1, 196610, 458766, 1, 196610, 458767, 1, 196610, 458768, 1, 196610, 458769, 1, 131075, 458786, 1, 65536, 524322, 1, 65536, 589858, 1, 65536, 655390, 1, 196609, 655391, 1, 196610, 655392, 1, 196611, 655394, 1, 65536, 720916, 1, 0, 720920, 1, 196608, 720930, 1, 65536, 786436, 1, 196609, 786437, 1, 196610, 786438, 1, 196610, 786439, 1, 196610, 786440, 1, 196610, 786441, 1, 196611, 786444, 1, 196609, 786445, 1, 196610, 786446, 1, 196610, 786447, 1, 196610, 786448, 1, 196610, 786449, 1, 196610, 786450, 1, 196611, 786452, 1, 131072, 786466, 1, 65536, 851998, 1, 196609, 851999, 1, 196610, 852000, 1, 196610, 852001, 1, 196610, 852002, 1, 131075, 1048579, 1, 1, 1048580, 1, 3, 1048586, 1, 196609, 1048587, 1, 196611, 1048594, 1, 196609, 1048595, 1, 196611, 1114112, 1, 196609, 1114113, 1, 196610, 1114114, 1, 196610, 1114115, 1, 131074, 1114116, 1, 131074, 1114117, 1, 3, 1114140, 1, 196609, 1114141, 1, 196610, 1114142, 1, 196610, 1114143, 1, 196611, 1179653, 1, 131073, 1179654, 1, 2, 1179655, 1, 3, 1179662, 1, 0, 1245190, 1, 131073, 1245191, 1, 131074, 1245192, 1, 196610, 1245193, 1, 196610, 1245194, 1, 196610, 1245195, 1, 196610, 1245196, 1, 196610, 1245197, 1, 196610, 1245198, 1, 131074, 1245199, 1, 196610, 1245200, 1, 196610, 1245201, 1, 196611, 1245207, 2, 1, 1245208, 2, 2, 1245209, 2, 2, 1245210, 2, 3, 1310742, 2, 1, 1310743, 2, 65538, 1310744, 2, 65538, 1310745, 2, 65538, 1310746, 2, 65539, 1376277, 2, 196609, 1376278, 2, 131074, 1376279, 2, 131074, 1376280, 2, 131074, 1376281, 2, 131074, 1376282, 2, 131075, 1441792, 0, 1, 1441793, 0, 2, 1441794, 0, 2, 1441795, 0, 2, 1441796, 0, 2, 1441797, 0, 2, 1441798, 0, 2, 1441799, 0, 2, 1441800, 0, 2, 1441801, 0, 2, 1441802, 0, 2, 1441803, 0, 2, 1441804, 0, 2, 1441805, 0, 2, 1441806, 0, 2, 1441807, 0, 2, 1441808, 0, 2, 1441809, 0, 2, 1441810, 0, 2, 1441811, 0, 2, 1441812, 0, 2, 1441813, 0, 2, 1441814, 0, 2, 1441815, 0, 2, 1441816, 0, 2, 1441817, 0, 2, 1441818, 0, 2, 1441819, 0, 2, 1441820, 0, 2, 1441821, 0, 2, 1441822, 0, 2, 1441823, 0, 3, 1507328, 1, 196609, 1507329, 1, 196610, 1507330, 1, 196610, 1507331, 1, 196610, 1507332, 1, 196610, 1507333, 1, 196610, 1507334, 1, 196610, 1507335, 1, 196610, 1507336, 1, 196610, 1507337, 1, 196610, 1507338, 1, 196610, 1507339, 1, 196610, 1507340, 1, 196610, 1507341, 1, 196610, 1507342, 1, 196610, 1507343, 1, 196610, 1507344, 1, 196610, 1507345, 1, 196610, 1507346, 1, 196610, 1507347, 1, 196610, 1507348, 1, 196610, 1507349, 1, 196610, 1507350, 1, 196610, 1507351, 1, 196610, 1507352, 1, 196610, 1507353, 1, 196610, 1507354, 1, 196610, 1507355, 1, 196610, 1507356, 1, 196610, 1507357, 1, 196610, 1507358, 1, 196610, 1507359, 1, 196611 ) + +[node name="ElectricTiles" parent="." instance=ExtResource( 28 )] +position = Vector2( -152, 16 ) +tile_data = PoolIntArray( 786436, 2, 196609, 786437, 2, 196610, 786438, 2, 196610, 786439, 2, 196610, 786440, 2, 196610, 786441, 2, 196611, 1048586, 2, 196609, 1048587, 2, 196611 ) + +[node name="CollisionShape2D" parent="ElectricTiles/DeathTile" index="0"] +position = Vector2( -31.4516, -28.2258 ) +scale = Vector2( 1, 1 ) + +[node name="CollisionShape2D2" type="CollisionShape2D" parent="ElectricTiles/DeathTile" index="1"] +position = Vector2( -57.2581, -54.0323 ) +scale = Vector2( 1, 1 ) +shape = SubResource( 2 ) [node name="Player" parent="." instance=ExtResource( 26 )] position = Vector2( 32, 176 ) -[node name="Death" type="TileMap" parent="."] +[node name="Death" type="TileMap" parent="." groups=["death"]] tile_set = ExtResource( 9 ) cell_size = Vector2( 8, 8 ) +collision_layer = 32 format = 1 +tile_data = PoolIntArray( 655384, 1, 0, 720902, 1, 0, 720905, 1, 0, 720913, 1, 0, 2031608, 9, 0, 2031609, 6, 0, 2031610, 9, 0, 2031611, 6, 0, 2031612, 9, 0, 2097144, 6, 0, 2097145, 9, 0, 2097146, 6, 0, 2097147, 9, 0, 2097148, 6, 0, 2162680, 9, 0, 2162681, 6, 0, 2162682, 9, 0, 2162683, 6, 0, 2162684, 9, 0, 2228216, 6, 0, 2228217, 9, 0, 2228218, 6, 0, 2228219, 9, 0, 2228220, 6, 0, 2293752, 9, 0, 2293753, 6, 0, 2293754, 9, 0, 2293755, 6, 0, 2293756, 9, 0 ) [node name="Ladder" type="TileMap" parent="."] tile_set = ExtResource( 21 ) cell_size = Vector2( 8, 8 ) format = 1 +tile_data = PoolIntArray( 327680, 536870912, 196609, 393216, 536870912, 196609, 458752, 536870912, 196609, 524288, 536870912, 196609, 589824, 536870912, 196609, 655360, 536870912, 196609, 720896, 536870912, 196609, 786432, 536870912, 196609, 851968, 536870912, 196609, 917504, 536870912, 196609, 983040, 536870912, 196609, 1048576, 536870912, 196609 ) [node name="StaticBody2D" type="StaticBody2D" parent="."] @@ -71,25 +105,92 @@ shape = SubResource( 1 ) [node name="Platforms" type="Node2D" parent="."] [node name="Ladder" parent="Platforms" instance=ExtResource( 3 )] -position = Vector2( -40, 112 ) -scale = Vector2( 1, 3 ) +position = Vector2( 0, 40 ) +scale = Vector2( 1, 12 ) + +[node name="MovingPlatform" parent="Platforms" instance=ExtResource( 27 )] +position = Vector2( 176, 88 ) +scale = Vector2( 2, 1 ) +speed = 100 +right_down_boundary = 6.0 + +[node name="FallingBlock" parent="Platforms" instance=ExtResource( 14 )] +position = Vector2( 216, 80 ) [node name="Collectibles" type="Node2D" parent="."] +[node name="Key" parent="Collectibles" instance=ExtResource( 29 )] +position = Vector2( 48, 168 ) + +[node name="Key2" parent="Collectibles" instance=ExtResource( 29 )] +position = Vector2( 80, 168 ) + +[node name="Key3" parent="Collectibles" instance=ExtResource( 29 )] +position = Vector2( 112, 168 ) + +[node name="Key4" parent="Collectibles" instance=ExtResource( 29 )] +position = Vector2( 144, 168 ) + +[node name="Key5" parent="Collectibles" instance=ExtResource( 29 )] +position = Vector2( 136, 144 ) + +[node name="Key6" parent="Collectibles" instance=ExtResource( 29 )] +position = Vector2( 112, 136 ) + +[node name="Key7" parent="Collectibles" instance=ExtResource( 29 )] +position = Vector2( 56, 136 ) + +[node name="Key8" parent="Collectibles" instance=ExtResource( 29 )] +position = Vector2( 40, 128 ) + +[node name="Key9" parent="Collectibles" instance=ExtResource( 29 )] +position = Vector2( 24, 120 ) + +[node name="Key10" parent="Collectibles" instance=ExtResource( 29 )] +position = Vector2( 32, 88 ) + +[node name="Key11" parent="Collectibles" instance=ExtResource( 29 )] +position = Vector2( 120, 88 ) + +[node name="Key12" parent="Collectibles" instance=ExtResource( 29 )] +position = Vector2( 160, 80 ) + [node name="Enemies" type="Node2D" parent="."] -[node name="SuperSlime" parent="Enemies" instance=ExtResource( 5 )] -position = Vector2( 96, 168 ) -left_boundary = 2.0 -right_boundary = 7.0 -jump_distance = 3.0 +[node name="ArtificialSoul" parent="Enemies" instance=ExtResource( 15 )] +position = Vector2( 88, 160 ) +__meta__ = { +"_edit_group_": true +} +radius = 3.0 +speed = 5.0 -[node name="SuperSlime2" parent="Enemies" instance=ExtResource( 5 )] -position = Vector2( 128, 144 ) -rotation = 3.14159 -left_boundary = 4.0 -right_boundary = 5.0 -jump_distance = 3.0 +[node name="ArtificialSoul2" parent="Enemies/ArtificialSoul" instance=ExtResource( 15 )] +radius = 3.0 +initial_angle = 1.0 +speed = 5.0 + +[node name="ArtificialSoul3" parent="Enemies/ArtificialSoul" instance=ExtResource( 15 )] +radius = 3.0 +initial_angle = 2.0 +speed = 5.0 + +[node name="ArtificialSoul4" parent="Enemies/ArtificialSoul" instance=ExtResource( 15 )] +radius = 3.0 +initial_angle = 3.0 +speed = 5.0 + +[node name="ArtificialSoul5" parent="Enemies/ArtificialSoul" instance=ExtResource( 15 )] +radius = 3.0 +initial_angle = 4.0 +speed = 5.0 + +[node name="Bat" parent="Enemies" instance=ExtResource( 8 )] +position = Vector2( 8, 136 ) +left_up_boundary = 5.0 + +[node name="Cop" parent="Enemies" instance=ExtResource( 17 )] +position = Vector2( 104, 248 ) [node name="ColorRect2" type="ColorRect" parent="."] margin_left = 512.0 @@ -101,11 +202,61 @@ __meta__ = { "_edit_lock_": true } +[node name="ColorRect4" type="ColorRect" parent="."] +margin_left = 256.0 +margin_right = 512.0 +margin_bottom = 192.0 +color = Color( 0, 0.0627451, 1, 0.0901961 ) +script = ExtResource( 18 ) +__meta__ = { +"_edit_lock_": true +} + [node name="ColorRect3" type="ColorRect" parent="."] -visible = false margin_right = 256.0 margin_bottom = 8.0 color = Color( 0, 0, 0, 1 ) [node name="HUD" parent="." instance=ExtResource( 2 )] song_name = "♫Rumble" + +[node name="JumpingSpider" parent="." instance=ExtResource( 13 )] +position = Vector2( 64, 276 ) + +[node name="Roboturret" parent="." instance=ExtResource( 16 )] +position = Vector2( 96, 280 ) + +[node name="Roboturret2" parent="." instance=ExtResource( 16 )] +position = Vector2( 144, 120 ) +shoot_time = 0.75 + +[node name="Roboturret3" parent="." instance=ExtResource( 16 )] +position = Vector2( 112, 88 ) +arrow_speed = 100.0 + +[node name="RollingFiend" parent="." instance=ExtResource( 11 )] +position = Vector2( 136, 272 ) + +[node name="Snail" parent="." instance=ExtResource( 12 )] +position = Vector2( 112, 296 ) + +[node name="Spider" parent="." instance=ExtResource( 10 )] +position = Vector2( 64, 304 ) + +[node name="Snake" parent="." instance=ExtResource( 7 )] +position = Vector2( 40, 304 ) + +[node name="SuperSlime" parent="." instance=ExtResource( 5 )] +position = Vector2( 88, 320 ) + +[node name="Tin" parent="." instance=ExtResource( 20 )] +position = Vector2( 120, 320 ) + +[node name="Star" parent="." instance=ExtResource( 30 )] +position = Vector2( 152, 120 ) + +[node name="Star2" parent="." instance=ExtResource( 30 )] +position = Vector2( 88, 144 ) + +[editable path="ElectricTiles"] +[editable path="ElectricTiles/DeathTile"] diff --git a/maps/test_room.tscn b/maps/test_room.tscn index 68171ea..8b7cbfe 100644 --- a/maps/test_room.tscn +++ b/maps/test_room.tscn @@ -1,20 +1,18 @@ -[gd_scene load_steps=33 format=2] +[gd_scene load_steps=28 format=2] [ext_resource path="res://objects/enemy/super_slime.tscn" type="PackedScene" id=1] [ext_resource path="res://tilesets/t_cave.tres" type="TileSet" id=2] [ext_resource path="res://tilesets/t_mountain.tres" type="TileSet" id=3] [ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=4] -[ext_resource path="res://tilesets/t_death.tres" type="TileSet" id=5] +[ext_resource path="res://objects/environment/electric_tiles/electric_tiles.tscn" type="PackedScene" id=5] [ext_resource path="res://objects/environment/moving_platform/moving_platform.tscn" type="PackedScene" id=6] [ext_resource path="res://graphics/backgrounds/canopy.png" type="Texture" id=7] [ext_resource path="res://objects/environment/collapse_block/collapse_block.tscn" type="PackedScene" id=8] -[ext_resource path="res://tilesets/t_laboratory.tres" type="TileSet" id=9] [ext_resource path="res://objects/enemy/slime.tscn" type="PackedScene" id=10] [ext_resource path="res://maps/map.gd" type="Script" id=11] [ext_resource path="res://objects/environment/turniwood/turning_platform.tscn" type="PackedScene" id=12] [ext_resource path="res://objects/collectibles/arrow.tscn" type="PackedScene" id=13] [ext_resource path="res://objects/environment/hatch/hatch.tscn" type="PackedScene" id=14] -[ext_resource path="res://shaders/electricity.gdshader" type="Shader" id=15] [ext_resource path="res://objects/respawn_point.tscn" type="PackedScene" id=16] [ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=17] [ext_resource path="res://objects/environment/switches/button.tscn" type="PackedScene" id=19] @@ -47,133 +45,6 @@ animations = [ { "speed": 20.0 } ] -[sub_resource type="ShaderMaterial" id=10] -shader = ExtResource( 15 ) -shader_param/arc_speed = 4.0 -shader_param/arc_fps = 10.0 -shader_param/arc_scale = 8.0 -shader_param/arc_threshold = 0.15 -shader_param/arc_color = Color( 1, 0.93, 0, 1 ) -shader_param/gamma = 2.0 -shader_param/flash_rate = 20.0 -shader_param/flash_intensity = 0.2 - -[sub_resource type="Animation" id=64] -length = 0.001 -tracks/0/type = "value" -tracks/0/path = NodePath(".:material:shader_param/arc_color") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ Color( 1, 0.93, 0, 1 ) ] -} -tracks/1/type = "value" -tracks/1/path = NodePath(".:material:shader_param/arc_speed") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ 4.0 ] -} -tracks/2/type = "value" -tracks/2/path = NodePath(".:material:shader_param/gamma") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ 2.0 ] -} -tracks/3/type = "value" -tracks/3/path = NodePath(".:material:shader_param/flash_intensity") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ 0.2 ] -} -tracks/4/type = "value" -tracks/4/path = NodePath(".:collision_layer") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ 32 ] -} - -[sub_resource type="Animation" id=65] -resource_name = "electricity" -length = 10.0 -loop = true -tracks/0/type = "value" -tracks/0/path = NodePath(".:material:shader_param/arc_color") -tracks/0/interp = 2 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PoolRealArray( 0, 4.8, 5, 9.8 ), -"transitions": PoolRealArray( 1, 1, 1, 1 ), -"update": 0, -"values": [ Color( 1, 0.929412, 0, 0 ), Color( 1, 0.929412, 0, 0 ), Color( 1, 0.93, 0, 1 ), Color( 1, 0.93, 0, 1 ) ] -} -tracks/1/type = "value" -tracks/1/path = NodePath(".:material:shader_param/gamma") -tracks/1/interp = 2 -tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/keys = { -"times": PoolRealArray( 0, 4.6, 4.8, 9.8 ), -"transitions": PoolRealArray( 1, 1, 1, 1 ), -"update": 0, -"values": [ 1.0, 1.0, 2.0, 2.0 ] -} -tracks/2/type = "value" -tracks/2/path = NodePath(".:material:shader_param/flash_intensity") -tracks/2/interp = 2 -tracks/2/loop_wrap = true -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/keys = { -"times": PoolRealArray( 0, 4.6, 4.8, 9.8 ), -"transitions": PoolRealArray( 1, 1, 1, 1 ), -"update": 0, -"values": [ 0.0, 0.0, 0.2, 0.2 ] -} -tracks/3/type = "value" -tracks/3/path = NodePath(".:collision_layer") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/keys = { -"times": PoolRealArray( 0, 4.8, 5, 9.8 ), -"transitions": PoolRealArray( 1, 1, 1, 1 ), -"update": 1, -"values": [ 1, 1, 33, 1 ] -} - [node name="Map2" type="Node2D" groups=["map"]] pause_mode = 1 script = ExtResource( 11 ) @@ -211,11 +82,7 @@ collision_layer = 9 format = 1 tile_data = PoolIntArray( 1114117, 0, 196610, 1179653, 0, 196608, 1245189, 0, 196608, 1310725, 0, 196608, 1376261, 0, 196609 ) -[node name="Death" type="TileMap" parent="."] -visible = false -tile_set = ExtResource( 5 ) -cell_size = Vector2( 8, 8 ) -format = 1 +[node name="ElectricTiles" parent="." instance=ExtResource( 5 )] [node name="Turniwood5" parent="." instance=ExtResource( 12 )] position = Vector2( 80, 120 ) @@ -255,6 +122,7 @@ position = Vector2( 48, 120 ) [node name="AnimatedSprite" parent="RollingFiend" index="0"] visible = false +frame = 1 [node name="SawTest2" type="AnimatedSprite" parent="RollingFiend"] material = SubResource( 4 ) @@ -282,23 +150,8 @@ turn_time = inf [node name="TurretBullet" parent="." instance=ExtResource( 26 )] position = Vector2( 152, 72 ) -[node name="LabTiles" type="TileMap" parent="." groups=["death"]] -material = SubResource( 10 ) -tile_set = ExtResource( 9 ) -cell_size = Vector2( 8, 8 ) -collision_layer = 32 -collision_mask = 0 -format = 1 -tile_data = PoolIntArray( 196623, 1, 1, 196624, 1, 2, 196625, 1, 2, 196626, 1, 3, 262159, 1, 65537, 262160, 1, 65538, 262161, 1, 65538, 262162, 1, 65539, 327695, 1, 131073, 327696, 1, 131074, 327697, 1, 131074, 327698, 1, 131075, 393237, 0, 1, 393238, 0, 2, 393239, 0, 2, 393240, 0, 2, 393241, 0, 3, 458775, 0, 1, 458776, 0, 2, 458777, 0, 2, 458778, 0, 2, 458779, 0, 3, 524308, 0, 1, 524309, 0, 2, 524310, 0, 2, 524311, 0, 2, 524312, 0, 2, 524313, 0, 2, 524314, 0, 2, 524315, 0, 3, 589838, 2, 1, 589839, 2, 2, 589840, 2, 2, 589841, 2, 2, 589842, 2, 3, 655374, 2, 65537, 655375, 2, 65538, 655376, 2, 65538, 655377, 2, 65538, 655378, 2, 65539, 720910, 2, 65537, 720911, 2, 65538, 720912, 2, 65538, 720913, 2, 65538, 720914, 2, 65539, 786446, 2, 131073, 786447, 2, 131074, 786448, 2, 131074, 786449, 2, 131074, 786450, 2, 131075 ) - -[node name="AnimationPlayer" type="AnimationPlayer" parent="LabTiles"] -autoplay = "electricity" -playback_process_mode = 0 -anims/RESET = SubResource( 64 ) -anims/electricity = SubResource( 65 ) - [node name="Player2" parent="." instance=ExtResource( 27 )] -position = Vector2( 112, 176 ) +position = Vector2( 80, 168 ) [node name="MovingPlatform" parent="." instance=ExtResource( 6 )] position = Vector2( 96, 144 ) diff --git a/menus/results.tscn b/menus/results.tscn new file mode 100644 index 0000000..03bc01c --- /dev/null +++ b/menus/results.tscn @@ -0,0 +1,58 @@ +[gd_scene load_steps=8 format=2] + +[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=1] +[ext_resource path="res://objects/player/player_death_particles.tscn" type="PackedScene" id=2] +[ext_resource path="res://graphics/collectibles/shard.png" type="Texture" id=3] +[ext_resource path="res://graphics/player/sg_idle_color.png" type="Texture" id=4] + +[sub_resource type="ShaderMaterial" id=1] +shader = ExtResource( 1 ) +shader_param/border_color = Color( 0, 0, 0, 1 ) +shader_param/border_corners = false + +[sub_resource type="Gradient" id=2] +interpolation_mode = 2 +offsets = PoolRealArray( 0, 0.734694, 1 ) +colors = PoolColorArray( 0.576471, 0.980392, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0 ) + +[sub_resource type="Animation" id=3] +resource_name = "New Anim" +length = 2.0 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("DeathSplatter:emitting") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 1, +"values": [ true ] +} + +[node name="Results" type="Node2D"] + +[node name="Sprite" type="Sprite" parent="."] +material = SubResource( 1 ) +position = Vector2( 47, 39 ) +texture = ExtResource( 3 ) + +[node name="DeathSplatter" parent="." instance=ExtResource( 2 )] +position = Vector2( 95, 64 ) +emitting = true +amount = 64 +lifetime = 1.0 +one_shot = false +explosiveness = 1.0 +texture = ExtResource( 4 ) +gravity = Vector2( 0, 150 ) +initial_velocity = 250.0 +scale_amount = 1.0 +scale_amount_curve = null +color_ramp = SubResource( 2 ) + +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +autoplay = "New Anim" +"anims/New Anim" = SubResource( 3 ) diff --git a/objects/enemy/enemy_arrow.tscn b/objects/enemy/enemy_arrow.tscn index 398b4ba..37ef8ec 100644 --- a/objects/enemy/enemy_arrow.tscn +++ b/objects/enemy/enemy_arrow.tscn @@ -47,6 +47,7 @@ scale_amount_random = 0.25 scale_amount_curve = SubResource( 3 ) [node name="Hitbox" type="Area2D" parent="." groups=["arrow"]] +collision_layer = 4 collision_mask = 5 [node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"] diff --git a/objects/enemy/roboturret_proj.tscn b/objects/enemy/roboturret_proj.tscn index 4d7c3a8..bcd8fa0 100644 --- a/objects/enemy/roboturret_proj.tscn +++ b/objects/enemy/roboturret_proj.tscn @@ -17,7 +17,6 @@ position = Vector2( -2, 0 ) amount = 8 [node name="Hitbox" parent="." index="2"] -collision_layer = 4 collision_mask = 1 [node name="CollisionShape2D" parent="Hitbox" index="0"] diff --git a/objects/environment/electric_tiles/electric_tiles.tscn b/objects/environment/electric_tiles/electric_tiles.tscn new file mode 100644 index 0000000..478e93c --- /dev/null +++ b/objects/environment/electric_tiles/electric_tiles.tscn @@ -0,0 +1,185 @@ +[gd_scene load_steps=7 format=2] + +[ext_resource path="res://objects/environment/death tile/death_tile.tscn" type="PackedScene" id=1] +[ext_resource path="res://tilesets/t_laboratory.tres" type="TileSet" id=3] +[ext_resource path="res://shaders/electricity.gdshader" type="Shader" id=4] + +[sub_resource type="ShaderMaterial" id=10] +shader = ExtResource( 4 ) +shader_param/arc_speed = 4.0 +shader_param/arc_fps = 10.0 +shader_param/arc_scale = 8.0 +shader_param/arc_threshold = 0.15 +shader_param/arc_color = Color( 1, 0.93, 0, 1 ) +shader_param/gamma = 2.0 +shader_param/flash_rate = 20.0 +shader_param/flash_intensity = 0.2 + +[sub_resource type="Animation" id=66] +length = 0.001 +tracks/0/type = "value" +tracks/0/path = NodePath(".:material:shader_param/arc_color") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ Color( 1, 0.93, 0, 1 ) ] +} +tracks/1/type = "value" +tracks/1/path = NodePath(".:material:shader_param/arc_speed") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ 4.0 ] +} +tracks/2/type = "value" +tracks/2/path = NodePath(".:material:shader_param/gamma") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ 2.0 ] +} +tracks/3/type = "value" +tracks/3/path = NodePath(".:material:shader_param/flash_intensity") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ 0.2 ] +} +tracks/4/type = "value" +tracks/4/path = NodePath(".:collision_layer") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ 1 ] +} +tracks/5/type = "value" +tracks/5/path = NodePath("DeathTile:monitoring") +tracks/5/interp = 1 +tracks/5/loop_wrap = true +tracks/5/imported = false +tracks/5/enabled = true +tracks/5/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 1, +"values": [ true ] +} + +[sub_resource type="Animation" id=67] +resource_name = "electricity" +length = 5.4 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath(".:material:shader_param/arc_color") +tracks/0/interp = 2 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 4.2, 4.4, 5, 5.4 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1 ), +"update": 0, +"values": [ Color( 1, 0.929412, 0, 0 ), Color( 1, 0.929412, 0, 0 ), Color( 1, 0.93, 0, 1 ), Color( 1, 0.93, 0, 1 ), Color( 1, 0.929412, 0, 0 ) ] +} +tracks/1/type = "value" +tracks/1/path = NodePath(".:material:shader_param/gamma") +tracks/1/interp = 2 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0, 4, 4.2, 5, 5.4 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1 ), +"update": 0, +"values": [ 1.0, 1.0, 2.0, 2.0, 1.0 ] +} +tracks/2/type = "value" +tracks/2/path = NodePath(".:material:shader_param/flash_intensity") +tracks/2/interp = 2 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0, 4, 4.2, 5, 5.4 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1 ), +"update": 0, +"values": [ 0.0, 0.0, 0.2, 0.2, 0.0 ] +} +tracks/3/type = "value" +tracks/3/path = NodePath(".:collision_layer") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/keys = { +"times": PoolRealArray( 0, 4.2, 4.4, 5, 5.4 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1 ), +"update": 1, +"values": [ 1, 1, 33, 1, 1 ] +} +tracks/4/type = "value" +tracks/4/path = NodePath(".:collision_layer") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/keys = { +"times": PoolRealArray( 0, 4.4, 5.4 ), +"transitions": PoolRealArray( 1, 1, 1 ), +"update": 1, +"values": [ 1, 1, 1 ] +} +tracks/5/type = "value" +tracks/5/path = NodePath("DeathTile:monitoring") +tracks/5/interp = 1 +tracks/5/loop_wrap = true +tracks/5/imported = false +tracks/5/enabled = true +tracks/5/keys = { +"times": PoolRealArray( 0, 4.4, 5.4 ), +"transitions": PoolRealArray( 1, 1, 1 ), +"update": 1, +"values": [ false, true, false ] +} + +[node name="ElectricTiles" type="TileMap" groups=["death"]] +material = SubResource( 10 ) +tile_set = ExtResource( 3 ) +cell_size = Vector2( 8, 8 ) +format = 1 +tile_data = PoolIntArray( 1376272, 1, 0 ) + +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +autoplay = "electricity" +playback_process_mode = 0 +anims/RESET = SubResource( 66 ) +anims/electricity = SubResource( 67 ) + +[node name="DeathTile" parent="." instance=ExtResource( 1 )] +position = Vector2( 127, 167 ) +scale = Vector2( 1.24, 1.24 ) diff --git a/objects/player/player.tscn b/objects/player/player.tscn index 1c4cf2b..82d98ff 100644 --- a/objects/player/player.tscn +++ b/objects/player/player.tscn @@ -1541,8 +1541,8 @@ align = 1 [connection signal="state_physics_processing" from="StateChart/Root/Movement" to="." method="_process_movement"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded" to="." method="_on_Grounded_state_entered"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded" to="." method="_process_grounded"] -[connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_can_walk"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_horizontal_movement_grounded"] +[connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_can_walk"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Still" to="." method="_on_Still_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Walking" to="." method="_on_Walking_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Blinking" to="." method="_on_Blinking_state_entered"] @@ -1553,8 +1553,8 @@ align = 1 [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/Shooting" to="." method="_on_Shooting_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/Pushing" to="." method="_on_Pushing_state_entered"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/Pushing" to="." method="_process_pushing"] -[connection signal="state_entered" from="StateChart/Root/Movement/Airborne" to="." method="reset_fall_speed"] [connection signal="state_entered" from="StateChart/Root/Movement/Airborne" to="." method="_on_Airborne_state_entered"] +[connection signal="state_entered" from="StateChart/Root/Movement/Airborne" to="." method="reset_fall_speed"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Airborne" to="." method="_process_gravity"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Airborne/Jump" to="." method="_process_horizontal_movement"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Airborne/Jump" to="." method="_process_jump"] @@ -1566,8 +1566,8 @@ align = 1 [connection signal="state_entered" from="StateChart/Root/Movement/Airborne/Falling/NormalFalling" to="." method="_on_NormalFalling_state_entered"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Airborne/Falling/NormalFalling" to="." method="_process_horizontal_movement"] [connection signal="state_entered" from="StateChart/Root/Movement/Airborne/Falling/ScaredFalling" to="." method="_on_ScaredFalling_state_entered"] -[connection signal="state_entered" from="StateChart/Root/Movement/Airborne/DoubleJump" to="." method="reset_fall_speed"] [connection signal="state_entered" from="StateChart/Root/Movement/Airborne/DoubleJump" to="." method="_on_DoubleJump_state_entered"] +[connection signal="state_entered" from="StateChart/Root/Movement/Airborne/DoubleJump" to="." method="reset_fall_speed"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Airborne/DoubleJump" to="." method="_process_horizontal_movement"] [connection signal="state_entered" from="StateChart/Root/Movement/Airborne/AirShooting" to="." method="_on_AirShooting_state_entered"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Airborne/AirShooting" to="." method="_process_horizontal_movement"] diff --git a/tilesets/t_laboratory.tres b/tilesets/t_laboratory.tres index 677075d..0b052b3 100644 --- a/tilesets/t_laboratory.tres +++ b/tilesets/t_laboratory.tres @@ -1,4 +1,4 @@ -[gd_resource type="TileSet" load_steps=39 format=2] +[gd_resource type="TileSet" load_steps=40 format=2] [ext_resource path="res://graphics/tiles/laboratory.png" type="Texture" id=1] @@ -113,6 +113,9 @@ points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 ) [sub_resource type="ConvexPolygonShape2D" id=63] points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 ) +[sub_resource type="ConvexPolygonShape2D" id=64] +points = PoolVector2Array( 8, 2, 0, 2, 0, 2, 8, 2 ) + [resource] 0/name = "beam" 0/texture = ExtResource( 1 ) @@ -451,5 +454,11 @@ points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 ) "one_way_margin": 1.0, "shape": SubResource( 63 ), "shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 0, 1 ), +"one_way": true, +"one_way_margin": 1.0, +"shape": SubResource( 64 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) } ] 4/z_index = 0