From: Brendan Hansen <brendan.f.hansen@gmail.com>
Date: Mon, 28 Feb 2022 22:05:10 +0000 (-0600)
Subject: random improvements to default level
X-Git-Url: https://git.brendanfh.com/?a=commitdiff_plain;h=510c0a0405a89eed11e32b49ee7f043b3e602985;p=bar-game.git

random improvements to default level
---

diff --git a/run_tree/assets/images/keg.png b/run_tree/assets/images/keg.png
index d68b662..81350e9 100644
Binary files a/run_tree/assets/images/keg.png and b/run_tree/assets/images/keg.png differ
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);
     }