From 0305b4e8bc571392276dc481cad5f862addbf217 Mon Sep 17 00:00:00 2001 From: Brendan Hansen Date: Mon, 28 Feb 2022 15:08:48 -0600 Subject: [PATCH] created key texture --- docs/credits.md | 10 +++ run_tree/assets/images/keg.png | Bin 0 -> 1921 bytes run_tree/scenes/quick_save_new.scene | 88 ++++++++++++++++++++++++--- src/entity/schematics/tap.onyx | 12 ++-- src/game.onyx | 1 + 5 files changed, 96 insertions(+), 15 deletions(-) create mode 100644 docs/credits.md create mode 100644 run_tree/assets/images/keg.png diff --git a/docs/credits.md b/docs/credits.md new file mode 100644 index 0000000..cda937c --- /dev/null +++ b/docs/credits.md @@ -0,0 +1,10 @@ + + +# Programmers +Brendan Hansen +Collin Rumpca + +# Artists +Chris Loutche +Brendan Hansen +Collin Rumpca \ No newline at end of file diff --git a/run_tree/assets/images/keg.png b/run_tree/assets/images/keg.png new file mode 100644 index 0000000000000000000000000000000000000000..d68b662cb20c80b6080428f12dfd00dea99623f2 GIT binary patch literal 1921 zcmV-{2Y&d8P)EX>4Tx04R}tkv&MmKpe$iQ$>-AgBeshWT;Lph>AFB6^c+H)C#RSm|Xe=O&XFG z7e~Rh;NZt%)xpJCR|i)?5c~jfbaGO3krMxx6k5c1aNLh~_a1le0HIN4y4^Jn=tk8_ zCE`*hyDIg(LO>WIh7nbmZO+MZ629Z>9s$1I#dwzgxj#q0ma`cUkcelQX;q0gh^IHJ zCg*)(krfq<_?$Ru(FKVgxvqNr#<}3Kz%xZFoth^WiKRjZs~yaWmQFlH9MN=x@`a4Y z8s{y}db!40_v9}O<&2eOuG0)7fkiAqh6EKglu$+$F*3>=Vat9cCG8Id4r65fqp9kL0=$o>@;4RR%=JnRv$LRx*rmm7Vz`-Ff zR-o*4pLh3m_V(|YR)0U3f^xPyp(rW<000JJOGiWiF90|IMBy7U3jhEB32;bRa{vG? zBLDy{BLR4&KXw2B00(qQO+^Rh0vr_t6bPM}ng9R*8FWQhbVF}#ZDnqB07G(RVRU6= zAa`kWXdp*PO;A^X4i^9b1zJf&K~z}7t(VPj9aj~=f9IS#@7aYFSs*8|{cJa40aB5W zXvCJHwD}O5Hf*2*wY8h_2Ov~+g(@W2LM@jF!2+oY3KF=kx~Y&@q(ViAEhKq<&y5wg z*&^zhx%VCxcN`@ZevV(c($kw6&D?YD`S_i4V2WjC4&48#>cRD~S2)(oA$W|D?>&{s z8NPC61tsyX@d#7c*iz3q1IYhd0T&T|{M}Os&d%K(R3K&O^#Z}b9e%pD2%@}p^+Ru( z=8+URQUMY1=f71f><-z5n7|ZLO6<2r&d@|~cks*$=NeRC{cZJ}^F$@|QI4N8WCv9+ z6HGw`f&rdOTi5um)3H_dsv*TT0eslS6Jhk!ETzk!&An4Ky>%1%a@*K6dQ`19}y`jwRI zIIauYw&f#z7E|R!^A=gay3qdhy9b+YKlIJ(t5CNs!Qf1Fo!iZ2Zq?6WcAb>cG(o65 zIrly{#~=q%a=fi>^IP_3JFD=l%X=`<%@+6Z)`#cf!AL$7WCTmBn$>Wf9ozUKAq`R(6r@Q zFBJ3!6Jl~q1;qB0-1R{sWK{$$lP1AssQl|=t@c80@m>dDrgp@L> z#&BmyOwbFCssK*R)05Bv)-F)kZ^F{)0jh-yDLZD0sgP31j+h~+FxuTFCa8k4zUf^? z`|&vtLckr&;LPGuv4A`7xfG&05o3lXMC$xEe{w*-XI-EfRZyxRh#J|w6D9|y z#vLACTtejNK1mO!uru2)*L9ot_a_n4BBU}wrTE>m)2{@<$=L}(N)Zy_Keb>+mmO22 zVciM{^eRIH+L*}>bIHan z3s%pA2rMrwv)?2>zBlHLO`)nPy7rqNep^^PIUr>i?T%1!Hnx;27c;;7)8VovlCU3O z?IQg4y*?ts?%t3)cXwEtU*>18tkAY?sd}qR%+C$DIUY0K-KH{UeG}HsXPP)U4Iim_ zuIrkOEl3H1Ik(0`ZjNr<$LyWE+w6V3O=X#x9{l2u9mXk@b5ct-(FIp7!TRPy?>fMh zi-i$0eJ5u@)xm}Jw>jXxJXp*&wm5ze@^A{vgZ~@v+@Ards?fQ@aF6n-!+9_;v*}v0 z!x-}5xYf2Tz(J~gdWt5dG_fT+Y9O6@>^_()&Fo;G|GEAPd^@@L;QpCV00000NkvXX Hu0mjfv^s(V literal 0 HcmV?d00001 diff --git a/run_tree/scenes/quick_save_new.scene b/run_tree/scenes/quick_save_new.scene index 6f015f2..7f967bc 100644 --- a/run_tree/scenes/quick_save_new.scene +++ b/run_tree/scenes/quick_save_new.scene @@ -29,8 +29,8 @@ color.a = 1.0000 [Player] id = 12 flags = 2 -pos.x = 170.8592 -pos.y = 40.2234 +pos.x = 245.8789 +pos.y = 48.7460 size.x = 32.0000 size.y = 32.0000 :MovementComponent @@ -40,7 +40,7 @@ controls.left = 65 controls.right = 68 controls.interact = 70 controls.pick_up = 71 -facing = 3 +facing = 4 :PlayerComponent holding = 0 :RenderComponent @@ -68,11 +68,62 @@ color.g = 1.0000 color.b = 1.0000 color.a = 1.0000 +[Tap] +id = 18 +flags = 3 +pos.x = 208.0000 +pos.y = 16.0000 +size.x = 32.0000 +size.y = 32.0000 +:RenderComponent +layer = 0 +color.r = 1.0000 +color.g = 1.0000 +color.b = 1.0000 +color.a = 1.0000 +:DispenserComponent +item = "beer" +max_timeout = 2.0000 + +[Tap] +id = 19 +flags = 3 +pos.x = 176.0000 +pos.y = 16.0000 +size.x = 32.0000 +size.y = 32.0000 +:RenderComponent +layer = 0 +color.r = 1.0000 +color.g = 1.0000 +color.b = 1.0000 +color.a = 1.0000 +:DispenserComponent +item = "beer" +max_timeout = 2.0000 + +[Tap] +id = 20 +flags = 3 +pos.x = 144.0000 +pos.y = 16.0000 +size.x = 32.0000 +size.y = 32.0000 +:RenderComponent +layer = 0 +color.r = 1.0000 +color.g = 1.0000 +color.b = 1.0000 +color.a = 1.0000 +:DispenserComponent +item = "beer" +max_timeout = 2.0000 + [Patreon] -id = 15 +id = 22 flags = 1 -pos.x = 397.0000 -pos.y = 59.0000 +pos.x = 417.0000 +pos.y = 142.0000 size.x = 32.0000 size.y = 32.0000 :RenderComponent @@ -82,24 +133,41 @@ color.g = 0.0000 color.b = 0.0000 color.a = 1.0000 :PatreonComponent -state = 1 +state = 0 order_item = "beer" holding = 0 +consume_timeout = 0.0000 [Tap] id = 14 flags = 3 -pos.x = 32.0000 +pos.x = 240.0000 pos.y = 16.0000 size.x = 32.0000 size.y = 32.0000 :RenderComponent layer = 1 -color.r = 0.2000 -color.g = 0.2000 +color.r = 1.0000 +color.g = 1.0000 color.b = 1.0000 color.a = 1.0000 :DispenserComponent item = "beer" max_timeout = 2.0000 +[Item_Entity] +id = 21 +flags = 4 +pos.x = 190.2672 +pos.y = 91.6549 +size.x = 16.0000 +size.y = 16.0000 +:RenderComponent +layer = 10 +color.r = 1.0000 +color.g = 1.0000 +color.b = 1.0000 +color.a = 1.0000 +:ItemComponent +item = "beer" + diff --git a/src/entity/schematics/tap.onyx b/src/entity/schematics/tap.onyx index 98a9907..e30f842 100644 --- a/src/entity/schematics/tap.onyx +++ b/src/entity/schematics/tap.onyx @@ -25,11 +25,13 @@ Tap :: struct { render :: (use this: ^Entity) { rect := this->get_rect(); - immediate_rectangle(rect.x, rect.y, rect.w, rect.h); + // immediate_rectangle(rect.x, rect.y, rect.w, rect.h); + immediate_image(^Tap.assets.texture, rect.x, rect.y, rect.w, rect.h); + } + + #persist assets: struct { + #tag "./assets/images/keg.png" + texture: Texture; } } -tap_assets: struct { - #tag "./assets/" - texture: Texture; -} \ No newline at end of file diff --git a/src/game.onyx b/src/game.onyx index 05d080b..7eeeacf 100644 --- a/src/game.onyx +++ b/src/game.onyx @@ -19,6 +19,7 @@ game_init :: () { // This process of queueing the asset bucket should // be made automatic somehow... queue_assets(^Player.assets); + queue_assets(^Tap.assets); load_assets(); -- 2.25.1