From f1c66dcb92de67679a9eb4be9c9fd97aa334f2fb Mon Sep 17 00:00:00 2001
From: Spencer Killen <sjkillen@ualberta.ca>
Date: Sun, 12 Nov 2023 16:59:56 -0700
Subject: [PATCH] a

---
 godot/export_presets.cfg                      | 41 +++++++++++++++++++
 godot/physics/billiard.gd                     |  3 +-
 .../control_scheme/test_basic_controls.tscn   |  4 +-
 3 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 godot/export_presets.cfg

diff --git a/godot/export_presets.cfg b/godot/export_presets.cfg
new file mode 100644
index 0000000..ff4d014
--- /dev/null
+++ b/godot/export_presets.cfg
@@ -0,0 +1,41 @@
+[preset.0]
+
+name="Linux/X11"
+platform="Linux/X11"
+runnable=true
+dedicated_server=false
+custom_features=""
+export_filter="all_resources"
+include_filter=""
+exclude_filter=""
+export_path="../../Downloads/igloo/igloo.x86_64"
+encryption_include_filters=""
+encryption_exclude_filters=""
+encrypt_pck=false
+encrypt_directory=false
+
+[preset.0.options]
+
+custom_template/debug=""
+custom_template/release=""
+debug/export_console_wrapper=1
+binary_format/embed_pck=false
+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}\""
+dotnet/include_scripts_content=false
+dotnet/include_debug_symbols=true
diff --git a/godot/physics/billiard.gd b/godot/physics/billiard.gd
index dc6f406..5af448d 100644
--- a/godot/physics/billiard.gd
+++ b/godot/physics/billiard.gd
@@ -22,7 +22,8 @@ func frame_inc(frame: int):
 	can_hit_history[frame] = can_hit
 
 func frames_change(_start: int, end: int):
-	can_hit = can_hit_history[end]
+	if can_hit_history.has(end):
+		can_hit = can_hit_history[end]
 	
 func frames_reset():
 	can_hit_history = Dictionary()
diff --git a/godot/tests/control_scheme/test_basic_controls.tscn b/godot/tests/control_scheme/test_basic_controls.tscn
index 3185e3d..c6d3c42 100644
--- a/godot/tests/control_scheme/test_basic_controls.tscn
+++ b/godot/tests/control_scheme/test_basic_controls.tscn
@@ -4,14 +4,14 @@
 [ext_resource type="PackedScene" uid="uid://drmb4sitb74fx" path="res://control_scheme/controller.tscn" id="2_dcvuq"]
 [ext_resource type="PackedScene" uid="uid://c43pr474qofhl" path="res://physics/grape.tscn" id="3_gijly"]
 [ext_resource type="PackedScene" uid="uid://b1uf31ed6h0ir" path="res://UI/TAS UI/TAS UI.tscn" id="4_8yatx"]
-[ext_resource type="PackedScene" path="res://cake.tscn" id="5_udc7s"]
+[ext_resource type="PackedScene" uid="uid://cx4ohbn84hmc3" path="res://cake.tscn" id="5_udc7s"]
 [ext_resource type="PackedScene" uid="uid://cfpiau12q3fut" path="res://Objects/child/child.tscn" id="6_52mue"]
 [ext_resource type="PackedScene" uid="uid://dfkyytk42ecwk" path="res://Objects/igloo/igloo.tscn" id="7_ifsxo"]
 [ext_resource type="Script" path="res://tests/control_scheme/screen_shader.gd" id="8_crgih"]
 [ext_resource type="Shader" path="res://tests/control_scheme/screen_shader.gdshader" id="8_w6ylu"]
 [ext_resource type="AudioStream" uid="uid://dw06bektw4j8m" path="res://audio/TricksterGhostNew.mp3" id="10_4mw33"]
 [ext_resource type="PackedScene" uid="uid://b7qky0n2ea40e" path="res://Objects/domino/domino2.tscn" id="11_2c1js"]
-[ext_resource type="PackedScene" path="res://Objects/balloon/balloon2.tscn" id="12_f4vmr"]
+[ext_resource type="PackedScene" uid="uid://db3h7pscfif84" path="res://Objects/balloon/balloon2.tscn" id="12_f4vmr"]
 [ext_resource type="PackedScene" uid="uid://y0mo5gxmd08q" path="res://Objects/present/present.tscn" id="13_g3ygw"]
 
 [sub_resource type="Gradient" id="Gradient_iyif7"]