From 8720e7f88f52c9ff22786e3cce6e91168f64c855 Mon Sep 17 00:00:00 2001
From: Alan O'Cull <masteralan2001@gmail.com>
Date: Sun, 28 Jan 2024 18:42:16 -0500
Subject: [PATCH] Update readme + export presets

---
 export_presets.cfg |  40 ++++++++++++
 main.gd            |   7 +-
 main.tscn          | 156 ++++++++++++++++++++++-----------------------
 readme.md          |  11 ++--
 4 files changed, 127 insertions(+), 87 deletions(-)

diff --git a/export_presets.cfg b/export_presets.cfg
index c1a1cee..6a99a8d 100644
--- a/export_presets.cfg
+++ b/export_presets.cfg
@@ -60,3 +60,43 @@ Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorActi
 ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue
 Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue
 Remove-Item -Recurse -Force '{temp_dir}'"
+
+[preset.1]
+
+name="Linux/X11"
+platform="Linux/X11"
+runnable=true
+dedicated_server=false
+custom_features=""
+export_filter="all_resources"
+include_filter=""
+exclude_filter=""
+export_path="../../GodotExports/Armazon.x86_64"
+encryption_include_filters=""
+encryption_exclude_filters=""
+encrypt_pck=false
+encrypt_directory=false
+
+[preset.1.options]
+
+custom_template/debug=""
+custom_template/release=""
+debug/export_console_wrapper=1
+binary_format/embed_pck=true
+texture_format/bptc=true
+texture_format/s3tc=true
+texture_format/etc=false
+texture_format/etc2=false
+binary_format/architecture="x86_64"
+ssh_remote_deploy/enabled=false
+ssh_remote_deploy/host="user@host_ip"
+ssh_remote_deploy/port="22"
+ssh_remote_deploy/extra_args_ssh=""
+ssh_remote_deploy/extra_args_scp=""
+ssh_remote_deploy/run_script="#!/usr/bin/env bash
+export DISPLAY=:0
+unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\"
+\"{temp_dir}/{exe_name}\" {cmd_args}"
+ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash
+kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\")
+rm -rf \"{temp_dir}\""
diff --git a/main.gd b/main.gd
index 41167cf..aa49a9b 100644
--- a/main.gd
+++ b/main.gd
@@ -174,8 +174,8 @@ func do_bonus():
 
 func do_penalty():
 	wage -= wage_penalty
-	if wage < 0:
-		get_tree().quit()
+	#if wage < 0:
+	#	get_tree().quit()
 	emit_signal("penalty")
 
 func _on_trash(body_rid: RID, body: Node3D, body_shape_index: int, local_shape_index: int) -> void:
@@ -214,7 +214,8 @@ func quicktime_check():
 	prop.touched.emit()
 	
 	if dodge_timer > 0:
-		print("successfull dodge")
+		#print("successfull dodge")
+		pass
 	else:
 		$audio/oof.play()
 		stun_timer = stun_timer_max
diff --git a/main.tscn b/main.tscn
index 7f6257c..a16e213 100644
--- a/main.tscn
+++ b/main.tscn
@@ -5351,31 +5351,31 @@ bones/2/scale = Vector3(1.01115, 1.01115, 1.01115)
 bones/3/rotation = Quaternion(0.52569, 0.289474, 0.105462, 0.792927)
 bones/3/scale = Vector3(0.731301, 0.731302, 0.731301)
 bones/4/rotation = Quaternion(0.0791671, 0.591145, 0.0117835, 0.802584)
-bones/5/rotation = Quaternion(-0.140568, 0.028206, 0.0558963, 0.98809)
-bones/6/rotation = Quaternion(0.0160361, -0.0220404, -0.0103973, 0.999574)
-bones/7/rotation = Quaternion(-0.0341219, 0.00674374, -0.000978206, 0.999395)
-bones/8/rotation = Quaternion(0.0102562, 0.830883, 0.551392, 0.0741336)
+bones/5/rotation = Quaternion(-0.0912604, 0.0309506, 0.0544245, 0.993857)
+bones/6/rotation = Quaternion(0.0490755, -0.0223719, -0.00966258, 0.998498)
+bones/7/rotation = Quaternion(-0.00105998, 0.00670768, -0.00120126, 0.999976)
+bones/8/rotation = Quaternion(0.0104679, 0.83236, 0.549135, 0.0742798)
 bones/8/scale = Vector3(1, 1, 1)
-bones/9/rotation = Quaternion(-0.0171632, -0.0177454, -0.00381589, 0.999688)
-bones/10/rotation = Quaternion(-0.219821, -0.000924869, -0.0161965, 0.975405)
+bones/9/rotation = Quaternion(-0.0229002, -0.0181954, -0.003928, 0.999565)
+bones/10/rotation = Quaternion(-0.225417, -0.000831856, -0.0162014, 0.974127)
 bones/10/scale = Vector3(1, 1, 1)
 bones/11/rotation = Quaternion(0.00106178, 0.584364, -0.0154954, 0.811343)
-bones/12/rotation = Quaternion(-0.0942879, 0.017192, 0.0277407, 0.99501)
-bones/13/rotation = Quaternion(-0.0303839, -0.0385864, 0.0334129, 0.998234)
+bones/12/rotation = Quaternion(-0.0192736, 0.0192274, 0.0263709, 0.999281)
+bones/13/rotation = Quaternion(0.0181715, -0.0369166, 0.0352487, 0.998531)
 bones/13/scale = Vector3(1, 1, 1)
-bones/14/rotation = Quaternion(-0.0769593, -0.00563889, -0.0118231, 0.996948)
+bones/14/rotation = Quaternion(-0.0284116, -0.00620675, -0.0115343, 0.999511)
 bones/15/rotation = Quaternion(-0.0611887, 0.573124, -0.0421539, 0.816093)
-bones/16/rotation = Quaternion(-0.0796485, -0.0249293, 0.0317059, 0.996007)
+bones/16/rotation = Quaternion(0.0268615, -0.0214114, 0.0341806, 0.998825)
 bones/16/scale = Vector3(1, 1, 1)
-bones/17/rotation = Quaternion(-0.0233405, -0.00748164, 0.0303106, 0.99924)
+bones/17/rotation = Quaternion(0.0452917, -0.00538364, 0.0307525, 0.998486)
 bones/17/scale = Vector3(1, 1, 1)
-bones/18/rotation = Quaternion(-0.0522263, -0.0309193, 0.0224629, 0.997904)
+bones/18/rotation = Quaternion(0.0163825, -0.029305, 0.0245309, 0.999135)
 bones/18/scale = Vector3(1, 1, 1)
 bones/19/rotation = Quaternion(-0.15484, 0.544614, -0.0238322, 0.823925)
-bones/20/rotation = Quaternion(0.0116856, -0.0136135, 0.0170321, 0.999694)
-bones/21/rotation = Quaternion(-0.0317931, 0.00286118, -0.0267733, 0.999132)
+bones/20/rotation = Quaternion(0.133498, -0.011435, 0.0185648, 0.990809)
+bones/21/rotation = Quaternion(0.0507491, 0.000642768, -0.0269178, 0.998348)
 bones/21/scale = Vector3(1, 1, 1)
-bones/22/rotation = Quaternion(-0.0295654, -0.0197514, 0.0687585, 0.997)
+bones/22/rotation = Quaternion(0.0527924, -0.0140116, 0.0701538, 0.99604)
 bones/22/scale = Vector3(1, 1, 1)
 
 [node name="Main_Body" parent="world/Armondo/rig/Skeleton3D" index="0"]
@@ -5690,99 +5690,99 @@ bones/28/scale = Vector3(1.00001, 0.999972, 1.00001)
 bones/29/rotation = Quaternion(0.137653, 0.129111, 0.0826848, 0.978542)
 bones/29/scale = Vector3(0.979536, 1.0413, 0.981311)
 bones/30/rotation = Quaternion(0.024349, 0.587802, 0.0762459, 0.805036)
-bones/31/rotation = Quaternion(0.0591227, 0.0397743, 0.032781, 0.996919)
-bones/32/rotation = Quaternion(0.016304, -0.0209469, 0.00289119, 0.999644)
+bones/31/rotation = Quaternion(-0.0368222, 0.0364448, 0.0364464, 0.997992)
+bones/32/rotation = Quaternion(-0.0456551, -0.0210859, 0.00158821, 0.998734)
 bones/32/scale = Vector3(1, 1, 1)
-bones/33/rotation = Quaternion(0.0661105, 0.00639023, -0.00839139, 0.997757)
-bones/34/rotation = Quaternion(-0.146933, 0.71602, 0.409794, 0.545705)
-bones/35/rotation = Quaternion(0.0993181, -0.0122795, -0.00950829, 0.994935)
-bones/36/rotation = Quaternion(-0.101817, -0.000120448, 0.0263675, 0.994454)
-bones/37/rotation = Quaternion(0.0591227, 0.0397743, 0.032781, 0.996919)
-bones/38/rotation = Quaternion(0.016304, -0.0209469, 0.00289119, 0.999644)
+bones/33/rotation = Quaternion(0.00417262, 0.00689776, -0.00797983, 0.999936)
+bones/34/rotation = Quaternion(-0.188551, 0.687511, 0.457334, 0.531623)
+bones/35/rotation = Quaternion(-0.00761933, -0.0157986, -0.0107989, 0.999788)
+bones/36/rotation = Quaternion(-0.207599, -0.00294032, 0.0262029, 0.977859)
+bones/37/rotation = Quaternion(-0.0368222, 0.0364448, 0.0364464, 0.997992)
+bones/38/rotation = Quaternion(-0.0456551, -0.0210859, 0.00158821, 0.998734)
 bones/38/scale = Vector3(1, 1, 1)
-bones/39/rotation = Quaternion(0.0661105, 0.00639023, -0.00839139, 0.997757)
-bones/40/rotation = Quaternion(0.059123, 0.0397744, 0.032781, 0.996919)
-bones/40/scale = Vector3(1, 0.968476, 1)
-bones/41/rotation = Quaternion(-0.146933, 0.71602, 0.409794, 0.545705)
-bones/42/rotation = Quaternion(0.0993181, -0.0122795, -0.00950829, 0.994935)
-bones/43/rotation = Quaternion(-0.101817, -0.000120448, 0.0263675, 0.994454)
-bones/44/rotation = Quaternion(-0.141241, 0.708397, 0.411793, 0.555565)
-bones/44/scale = Vector3(1, 1.01195, 1)
-bones/46/rotation = Quaternion(0.0591239, 0.0397731, 0.0327811, 0.996919)
+bones/39/rotation = Quaternion(0.00417262, 0.00689776, -0.00797983, 0.999936)
+bones/40/rotation = Quaternion(-0.036822, 0.0364449, 0.0364467, 0.997992)
+bones/40/scale = Vector3(1, 1.00794, 1)
+bones/41/rotation = Quaternion(-0.188551, 0.687511, 0.457334, 0.531623)
+bones/42/rotation = Quaternion(-0.00761933, -0.0157986, -0.0107989, 0.999788)
+bones/43/rotation = Quaternion(-0.207599, -0.00294032, 0.0262029, 0.977859)
+bones/44/rotation = Quaternion(-0.180078, 0.677585, 0.460736, 0.544218)
+bones/44/scale = Vector3(1, 1.08017, 1)
+bones/46/rotation = Quaternion(-0.0368211, 0.0364436, 0.0364467, 0.997992)
 bones/46/scale = Vector3(1, 1, 1)
-bones/48/rotation = Quaternion(0.0163049, -0.0209484, 0.00289197, 0.999644)
+bones/48/rotation = Quaternion(-0.0456542, -0.0210874, 0.00158867, 0.998734)
 bones/48/scale = Vector3(1, 1, 1)
-bones/50/rotation = Quaternion(0.066109, 0.00639228, -0.00839105, 0.997757)
+bones/50/rotation = Quaternion(0.00417119, 0.00689982, -0.00797894, 0.999936)
 bones/50/scale = Vector3(1, 1, 1)
-bones/52/rotation = Quaternion(-0.0755315, -5.24043e-08, 0.997143, -1.13218e-08)
+bones/52/rotation = Quaternion(-0.0755315, -4.93895e-08, 0.997143, 1.62907e-09)
 bones/52/scale = Vector3(1, 1, 1)
-bones/55/rotation = Quaternion(0.0591227, 0.0397743, 0.032781, 0.996919)
-bones/56/rotation = Quaternion(-0.14124, 0.708396, 0.411793, 0.555565)
-bones/58/rotation = Quaternion(0.0991772, 0.00149479, -0.010873, 0.995009)
+bones/55/rotation = Quaternion(-0.0368222, 0.0364448, 0.0364464, 0.997992)
+bones/56/rotation = Quaternion(-0.180077, 0.677584, 0.460737, 0.544218)
+bones/58/rotation = Quaternion(-0.00781705, 0.00264917, -0.0106507, 0.999909)
 bones/58/scale = Vector3(1, 1, 1)
-bones/60/rotation = Quaternion(-0.101817, -0.000123084, 0.0263689, 0.994454)
+bones/60/rotation = Quaternion(-0.207599, -0.00294277, 0.0262045, 0.977858)
 bones/62/rotation = Quaternion(0.884812, 3.32611e-06, 0.465948, -1.29939e-06)
-bones/65/rotation = Quaternion(-0.146933, 0.71602, 0.409794, 0.545705)
+bones/65/rotation = Quaternion(-0.188551, 0.687511, 0.457334, 0.531623)
 bones/66/rotation = Quaternion(-0.0150627, 0.584674, 0.0037911, 0.811119)
-bones/67/rotation = Quaternion(-0.0225443, 0.019155, 0.0260553, 0.999223)
+bones/67/rotation = Quaternion(-0.0938845, 0.0172443, 0.0273573, 0.995058)
 bones/67/scale = Vector3(1, 1, 1)
-bones/68/rotation = Quaternion(0.0601063, -0.0354327, 0.0236608, 0.997282)
+bones/68/rotation = Quaternion(0.0139078, -0.0364893, 0.021996, 0.998995)
 bones/68/scale = Vector3(1, 1, 1)
-bones/69/rotation = Quaternion(0.0757791, -0.0068807, -0.0436518, 0.996145)
-bones/70/rotation = Quaternion(-0.0225443, 0.019155, 0.0260553, 0.999223)
+bones/69/rotation = Quaternion(0.0296172, -0.00485396, -0.0439236, 0.998584)
+bones/70/rotation = Quaternion(-0.0938845, 0.0172443, 0.0273573, 0.995058)
 bones/70/scale = Vector3(1, 1, 1)
-bones/71/rotation = Quaternion(0.0601063, -0.0354327, 0.0236608, 0.997282)
+bones/71/rotation = Quaternion(0.0139078, -0.0364893, 0.021996, 0.998995)
 bones/71/scale = Vector3(1, 1, 1)
-bones/72/rotation = Quaternion(0.0757791, -0.0068807, -0.0436518, 0.996145)
-bones/73/rotation = Quaternion(-0.0225443, 0.019155, 0.0260553, 0.999223)
-bones/73/scale = Vector3(1, 0.980628, 1)
-bones/75/rotation = Quaternion(-0.0225435, 0.0191541, 0.0260552, 0.999223)
+bones/72/rotation = Quaternion(0.0296172, -0.00485396, -0.0439236, 0.998584)
+bones/73/rotation = Quaternion(-0.093885, 0.0172443, 0.0273574, 0.995058)
+bones/73/scale = Vector3(1, 1.01009, 1)
+bones/75/rotation = Quaternion(-0.0938841, 0.0172434, 0.0273572, 0.995058)
 bones/75/scale = Vector3(1, 1, 1)
-bones/77/rotation = Quaternion(0.0601083, -0.0354348, 0.0236609, 0.997282)
+bones/77/rotation = Quaternion(0.0139103, -0.0364915, 0.0219964, 0.998995)
 bones/77/scale = Vector3(1, 1, 1)
-bones/79/rotation = Quaternion(0.0757821, -0.00688392, -0.0436528, 0.996145)
+bones/79/rotation = Quaternion(0.02962, -0.00485721, -0.0439245, 0.998584)
 bones/80/rotation = Quaternion(-3.08873e-06, 3.24659e-06, 8.01869e-07, 1)
-bones/81/rotation = Quaternion(0.028989, -5.79878e-11, 0.99958, -1.72915e-10)
+bones/81/rotation = Quaternion(0.028989, -2.44904e-09, 0.99958, -1.00893e-08)
 bones/81/scale = Vector3(1, 1, 1)
-bones/84/rotation = Quaternion(-0.0225443, 0.019155, 0.0260553, 0.999223)
+bones/84/rotation = Quaternion(-0.0938845, 0.0172443, 0.0273573, 0.995058)
 bones/84/scale = Vector3(1, 1, 1)
 bones/85/rotation = Quaternion(-0.0536367, 0.572428, -0.051421, 0.816581)
 bones/85/scale = Vector3(1, 1, 1)
-bones/86/rotation = Quaternion(-0.0508219, -0.0240102, 0.0325248, 0.997889)
-bones/87/rotation = Quaternion(0.0399255, -0.00524935, 0.0154765, 0.999069)
-bones/88/rotation = Quaternion(0.057582, -0.026926, -0.0112584, 0.997914)
-bones/89/rotation = Quaternion(-0.0508219, -0.0240102, 0.0325248, 0.997889)
-bones/90/rotation = Quaternion(0.0399255, -0.00524935, 0.0154765, 0.999069)
-bones/91/rotation = Quaternion(0.057582, -0.026926, -0.0112584, 0.997914)
-bones/92/rotation = Quaternion(-0.050822, -0.0240103, 0.0325249, 0.997889)
-bones/92/scale = Vector3(1, 0.993602, 1)
-bones/94/rotation = Quaternion(-0.0508217, -0.0240106, 0.0325252, 0.997889)
+bones/86/rotation = Quaternion(-0.0914051, -0.0253145, 0.0315204, 0.994993)
+bones/87/rotation = Quaternion(0.0134918, -0.00565684, 0.0153322, 0.999775)
+bones/88/rotation = Quaternion(0.0311727, -0.0266189, -0.0119666, 0.999088)
+bones/89/rotation = Quaternion(-0.0914051, -0.0253145, 0.0315204, 0.994993)
+bones/90/rotation = Quaternion(0.0134918, -0.00565684, 0.0153322, 0.999775)
+bones/91/rotation = Quaternion(0.0311727, -0.0266189, -0.0119666, 0.999088)
+bones/92/rotation = Quaternion(-0.0914051, -0.0253145, 0.0315204, 0.994993)
+bones/92/scale = Vector3(1, 1.01044, 1)
+bones/94/rotation = Quaternion(-0.0914048, -0.0253148, 0.0315207, 0.994993)
 bones/95/rotation = Quaternion(-2.952e-07, 2.49594e-07, -2.64961e-07, 1)
-bones/96/rotation = Quaternion(0.0399264, -0.00525021, 0.0154759, 0.999069)
-bones/98/rotation = Quaternion(0.0575792, -0.026923, -0.0112573, 0.997914)
+bones/96/rotation = Quaternion(0.0134927, -0.0056576, 0.0153317, 0.999775)
+bones/98/rotation = Quaternion(0.0311698, -0.0266159, -0.0119653, 0.999088)
 bones/98/scale = Vector3(1, 1, 1)
-bones/100/rotation = Quaternion(0.135625, -7.54651e-08, 0.99076, 7.06448e-09)
-bones/103/rotation = Quaternion(-0.0508219, -0.0240102, 0.0325248, 0.997889)
+bones/100/rotation = Quaternion(0.135625, -7.12668e-08, 0.99076, 7.80658e-09)
+bones/103/rotation = Quaternion(-0.0914051, -0.0253145, 0.0315204, 0.994993)
 bones/104/rotation = Quaternion(-0.0646238, 0.533247, -0.142714, 0.831327)
 bones/104/scale = Vector3(1, 1, 1)
-bones/105/rotation = Quaternion(-0.120429, -0.0174181, 0.0577614, 0.990887)
-bones/106/rotation = Quaternion(0.000224427, 0.00205479, -0.0382853, 0.999265)
+bones/105/rotation = Quaternion(-0.142018, -0.0186741, 0.0573678, 0.988024)
+bones/106/rotation = Quaternion(-0.0139695, 0.00259837, -0.0382522, 0.999167)
 bones/106/scale = Vector3(1, 1, 1)
-bones/107/rotation = Quaternion(0.0635575, -0.0107124, 0.0324532, 0.997393)
-bones/108/rotation = Quaternion(-0.120429, -0.0174181, 0.0577614, 0.990887)
-bones/109/rotation = Quaternion(0.000224427, 0.00205479, -0.0382853, 0.999265)
+bones/107/rotation = Quaternion(0.049384, -0.0111722, 0.0322972, 0.998195)
+bones/108/rotation = Quaternion(-0.142018, -0.0186741, 0.0573678, 0.988024)
+bones/109/rotation = Quaternion(-0.0139695, 0.00259837, -0.0382522, 0.999167)
 bones/109/scale = Vector3(1, 1, 1)
-bones/110/rotation = Quaternion(0.0635575, -0.0107124, 0.0324532, 0.997393)
-bones/111/rotation = Quaternion(-0.120429, -0.017418, 0.0577615, 0.990887)
-bones/111/scale = Vector3(1, 1.0014, 1)
+bones/110/rotation = Quaternion(0.049384, -0.0111722, 0.0322972, 0.998195)
+bones/111/rotation = Quaternion(-0.142019, -0.0186741, 0.0573678, 0.988024)
+bones/111/scale = Vector3(1, 1.00991, 1)
 bones/112/rotation = Quaternion(2.7474e-08, 3.72529e-09, -1.86265e-09, 1)
-bones/113/rotation = Quaternion(-0.120428, -0.0174184, 0.0577614, 0.990887)
+bones/113/rotation = Quaternion(-0.142018, -0.0186745, 0.0573677, 0.988024)
 bones/113/scale = Vector3(1, 1, 1)
-bones/115/rotation = Quaternion(0.000227124, 0.00205233, -0.0382864, 0.999265)
-bones/117/rotation = Quaternion(0.0635539, -0.0107094, 0.0324524, 0.997393)
+bones/115/rotation = Quaternion(-0.0139667, 0.00259596, -0.0382534, 0.999167)
+bones/117/rotation = Quaternion(0.0493803, -0.0111693, 0.0322969, 0.998195)
 bones/118/rotation = Quaternion(3.45754e-06, -3.00538e-06, 5.0338e-07, 1)
 bones/119/rotation = Quaternion(0.164736, 2.91293e-07, 0.986338, 7.60808e-07)
-bones/122/rotation = Quaternion(-0.120429, -0.0174181, 0.0577614, 0.990887)
+bones/122/rotation = Quaternion(-0.142018, -0.0186741, 0.0573678, 0.988024)
 bones/123/rotation = Quaternion(-0.0646238, 0.533247, -0.142714, 0.831327)
 bones/123/scale = Vector3(1, 1, 1)
 bones/124/rotation = Quaternion(0.707107, 0, 0, 0.707107)
diff --git a/readme.md b/readme.md
index 80daca2..a7660c6 100644
--- a/readme.md
+++ b/readme.md
@@ -3,9 +3,8 @@ As a Nile packaging employee, ensuring customer satisfaction is key. Box custome
 
 Made in a joint effort between Blake Edwards, Matt Schuler, and Alan O'Cull for the 2024 Global Game Jam.
 
-## TODO
-Props to rescale:
-- Fish
-- Bread
-- Lead Pipe
-- Ball Character
+## Controls
+- Left click and drag to move props
+- Spacebar to dodge
+- Escape to exit
+- F11 for fullscreen