From 510c0a0405a89eed11e32b49ee7f043b3e602985 Mon Sep 17 00:00:00 2001 From: Brendan Hansen Date: Mon, 28 Feb 2022 16:05:10 -0600 Subject: [PATCH] random improvements to default level --- run_tree/assets/images/keg.png | Bin 1921 -> 8233 bytes run_tree/scenes/quick_save_new.scene | 92 +++++++++++++++++++++------ src/build.onyx | 2 +- src/entity/schematics/patreon.onyx | 1 + src/entity/schematics/tap.onyx | 1 - 5 files changed, 76 insertions(+), 20 deletions(-) diff --git a/run_tree/assets/images/keg.png b/run_tree/assets/images/keg.png index d68b662cb20c80b6080428f12dfd00dea99623f2..81350e93a821d782bf8f55a99e6c8c187c6db087 100644 GIT binary patch literal 8233 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 b|GEAPd^@@L;QpCV00000NkvXXu0mjf^l)EZ diff --git a/run_tree/scenes/quick_save_new.scene b/run_tree/scenes/quick_save_new.scene index 7f967bc..e67ba6b 100644 --- a/run_tree/scenes/quick_save_new.scene +++ b/run_tree/scenes/quick_save_new.scene @@ -1,8 +1,8 @@ [Wall] id = 10 flags = 2 -pos.x = 176.0000 -pos.y = 88.0000 +pos.x = 192.0000 +pos.y = 104.0000 size.x = 352.0000 size.y = 16.0000 :RenderComponent @@ -15,8 +15,8 @@ color.a = 1.0000 [Wall] id = 11 flags = 3 -pos.x = 440.0000 -pos.y = 48.0000 +pos.x = 456.0000 +pos.y = 64.0000 size.x = 16.0000 size.y = 96.0000 :RenderComponent @@ -29,8 +29,8 @@ color.a = 1.0000 [Player] id = 12 flags = 2 -pos.x = 245.8789 -pos.y = 48.7460 +pos.x = 379.7975 +pos.y = 175.1558 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 = 4 +facing = 3 :PlayerComponent holding = 0 :RenderComponent @@ -53,8 +53,8 @@ color.a = 1.0000 [Door] id = 13 flags = 3 -pos.x = 352.0000 -pos.y = 88.0000 +pos.x = 368.0000 +pos.y = 104.0000 size.x = 160.0000 size.y = 16.0000 :DoorComponent @@ -72,7 +72,7 @@ color.a = 1.0000 id = 18 flags = 3 pos.x = 208.0000 -pos.y = 16.0000 +pos.y = 32.0000 size.x = 32.0000 size.y = 32.0000 :RenderComponent @@ -89,7 +89,7 @@ max_timeout = 2.0000 id = 19 flags = 3 pos.x = 176.0000 -pos.y = 16.0000 +pos.y = 32.0000 size.x = 32.0000 size.y = 32.0000 :RenderComponent @@ -106,7 +106,7 @@ max_timeout = 2.0000 id = 20 flags = 3 pos.x = 144.0000 -pos.y = 16.0000 +pos.y = 32.0000 size.x = 32.0000 size.y = 32.0000 :RenderComponent @@ -121,9 +121,9 @@ max_timeout = 2.0000 [Patreon] id = 22 -flags = 1 -pos.x = 417.0000 -pos.y = 142.0000 +flags = 3 +pos.x = 385.0000 +pos.y = 248.0000 size.x = 32.0000 size.y = 32.0000 :RenderComponent @@ -138,11 +138,67 @@ order_item = "beer" holding = 0 consume_timeout = 0.0000 +[Wall] +id = 25 +flags = 2 +pos.x = 408.0000 +pos.y = 8.0000 +size.x = 816.0000 +size.y = 16.0000 +:RenderComponent +layer = 0 +color.r = 1.0000 +color.g = 1.0000 +color.b = 1.0000 +color.a = 1.0000 + +[Wall] +id = 26 +flags = 2 +pos.x = 424.0000 +pos.y = 592.0000 +size.x = 816.0000 +size.y = 32.0000 +:RenderComponent +layer = 0 +color.r = 1.0000 +color.g = 1.0000 +color.b = 1.0000 +color.a = 1.0000 + +[Wall] +id = 27 +flags = 2 +pos.x = 8.0000 +pos.y = 312.0000 +size.x = 16.0000 +size.y = 592.0000 +:RenderComponent +layer = 0 +color.r = 1.0000 +color.g = 1.0000 +color.b = 1.0000 +color.a = 1.0000 + +[Wall] +id = 28 +flags = 2 +pos.x = 800.0000 +pos.y = 296.0000 +size.x = 32.0000 +size.y = 560.0000 +:RenderComponent +layer = 0 +color.r = 1.0000 +color.g = 1.0000 +color.b = 1.0000 +color.a = 1.0000 + [Tap] id = 14 flags = 3 pos.x = 240.0000 -pos.y = 16.0000 +pos.y = 32.0000 size.x = 32.0000 size.y = 32.0000 :RenderComponent @@ -158,8 +214,8 @@ max_timeout = 2.0000 [Item_Entity] id = 21 flags = 4 -pos.x = 190.2672 -pos.y = 91.6549 +pos.x = 187.7317 +pos.y = 106.9191 size.x = 16.0000 size.y = 16.0000 :RenderComponent diff --git a/src/build.onyx b/src/build.onyx index 4adc9a1..6264c36 100644 --- a/src/build.onyx +++ b/src/build.onyx @@ -4,7 +4,7 @@ package runtime.vars MAJOR_VERSION :: 0 MINOR_VERSION :: 1 -DEBUG :: false +// DEBUG :: false #load_path ONYX_PATH diff --git a/src/entity/schematics/patreon.onyx b/src/entity/schematics/patreon.onyx index 6e10261..6175952 100644 --- a/src/entity/schematics/patreon.onyx +++ b/src/entity/schematics/patreon.onyx @@ -10,6 +10,7 @@ Patreon :: struct { this := scene->make(); this.pos = pos; this.size = .{32, 32}; + this.flags |= .Solid; scene->create_and_add(this, RenderComponent) { comp.func = render; diff --git a/src/entity/schematics/tap.onyx b/src/entity/schematics/tap.onyx index e30f842..9c5f965 100644 --- a/src/entity/schematics/tap.onyx +++ b/src/entity/schematics/tap.onyx @@ -25,7 +25,6 @@ Tap :: struct { render :: (use this: ^Entity) { rect := this->get_rect(); - // immediate_rectangle(rect.x, rect.y, rect.w, rect.h); immediate_image(^Tap.assets.texture, rect.x, rect.y, rect.w, rect.h); } -- 2.25.1