fix stuff

DanielElisenberg · Apr 15, 2024 · c5c6bbd · c5c6bbd
1 parent 62c5753
commit c5c6bbd
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 16 deletions.
diff --git a/export_presets.cfg b/export_presets.cfg
@@ -0,0 +1,37 @@
+[preset.0]
+
+name="Web"
+platform="Web"
+runnable=true
+dedicated_server=false
+custom_features=""
+export_filter="all_resources"
+include_filter=""
+exclude_filter=""
+export_path="export/web/trial_by_combat.html"
+encryption_include_filters=""
+encryption_exclude_filters=""
+encrypt_pck=false
+encrypt_directory=false
+
+[preset.0.options]
+
+custom_template/debug=""
+custom_template/release=""
+variant/extensions_support=false
+vram_texture_compression/for_desktop=true
+vram_texture_compression/for_mobile=false
+html/export_icon=true
+html/custom_html_shell=""
+html/head_include=""
+html/canvas_resize_policy=2
+html/focus_canvas_on_start=true
+html/experimental_virtual_keyboard=false
+progressive_web_app/enabled=false
+progressive_web_app/offline_page=""
+progressive_web_app/display=1
+progressive_web_app/orientation=0
+progressive_web_app/icon_144x144=""
+progressive_web_app/icon_180x180=""
+progressive_web_app/icon_512x512=""
+progressive_web_app/background_color=Color(0, 0, 0, 1)
diff --git a/project.godot b/project.godot
@@ -87,6 +87,12 @@ escape={
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194305,"key_label":0,"unicode":0,"echo":false,"script":null)
 ]
 }
+up={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"echo":false,"script":null)
+]
+}
 
 [physics]
 

diff --git a/scenes/arena.tscn b/scenes/arena.tscn
@@ -15,7 +15,7 @@
 [ext_resource type="AudioStream" uid="uid://r2x0xl547ogc" path="res://sounds/sfx/round_one.mp3" id="13_x5p41"]
 [ext_resource type="AudioStream" uid="uid://dfux6ifjmwjxp" path="res://sounds/sfx/round_two.mp3" id="14_2xykl"]
 [ext_resource type="AudioStream" uid="uid://cj2thne38xtrf" path="res://sounds/sfx/final_round.mp3" id="15_p2c5a"]
-[ext_resource type="PackedScene" uid="uid://tijbokynigwu" path="res://scenes/versus.tscn" id="16_t2jnb"]
+[ext_resource type="PackedScene" path="res://scenes/versus.tscn" id="16_t2jnb"]
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_mq1db"]
 size = Vector2(39.5, 872.5)

diff --git a/scenes/arena_ceo.tscn b/scenes/arena_ceo.tscn
@@ -15,7 +15,7 @@
 [ext_resource type="AudioStream" uid="uid://r2x0xl547ogc" path="res://sounds/sfx/round_one.mp3" id="13_rw1l0"]
 [ext_resource type="AudioStream" uid="uid://dfux6ifjmwjxp" path="res://sounds/sfx/round_two.mp3" id="14_l4h36"]
 [ext_resource type="AudioStream" uid="uid://cj2thne38xtrf" path="res://sounds/sfx/final_round.mp3" id="15_qm0yf"]
-[ext_resource type="PackedScene" uid="uid://tijbokynigwu" path="res://scenes/versus.tscn" id="16_lv3og"]
+[ext_resource type="PackedScene" path="res://scenes/versus.tscn" id="16_lv3og"]
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_mq1db"]
 size = Vector2(39.5, 872.5)

diff --git a/scenes/arena_devon.tscn b/scenes/arena_devon.tscn
@@ -2,7 +2,7 @@
 
 [ext_resource type="Script" path="res://scripts/arena.gd" id="1_msr1w"]
 [ext_resource type="Texture2D" uid="uid://slnivve5revd" path="res://sprites/backgrounds/fight_bg.png" id="2_8160l"]
-[ext_resource type="PackedScene" uid="uid://tijbokynigwu" path="res://scenes/versus.tscn" id="2_nhcav"]
+[ext_resource type="PackedScene" path="res://scenes/versus.tscn" id="2_nhcav"]
 [ext_resource type="PackedScene" uid="uid://dpgss5cyimvpn" path="res://scenes/player_character.tscn" id="3_uyqvy"]
 [ext_resource type="PackedScene" uid="uid://r5peab67hacc" path="res://scenes/health_bar.tscn" id="4_a4rr8"]
 [ext_resource type="FontFile" uid="uid://cldenxc5p1221" path="res://fonts/Pixelify_Sans/static/PixelifySans-Medium.ttf" id="5_pqqgj"]

diff --git a/scenes/control_screen.tscn b/scenes/control_screen.tscn
@@ -54,6 +54,7 @@ Jab + Jab + Jab
 Left + Down + Right + Down + Jab"
 
 [node name="Instructions" type="Label" parent="Instructions"]
+layout_mode = 0
 offset_left = -517.0
 offset_top = -136.0
 offset_right = 1019.0

diff --git a/scenes/courtroom_ceo.tscn b/scenes/courtroom_ceo.tscn
@@ -2,11 +2,11 @@
 
 [ext_resource type="Script" path="res://scripts/courtroom_ceo.gd" id="1_ajp4y"]
 [ext_resource type="Texture2D" uid="uid://ba6fhck0lsywo" path="res://sprites/backgrounds/courtroom.png" id="2_xr87f"]
-[ext_resource type="PackedScene" uid="uid://cnbl6ra6bh6mc" path="res://scenes/warlock.tscn" id="3_ekk7o"]
-[ext_resource type="PackedScene" uid="uid://okqnfgow3d3a" path="res://scenes/summoning_ring.tscn" id="4_s1u30"]
-[ext_resource type="PackedScene" uid="uid://byshmomdcx3dv" path="res://scenes/text_box.tscn" id="5_saxum"]
+[ext_resource type="PackedScene" path="res://scenes/warlock.tscn" id="3_ekk7o"]
+[ext_resource type="PackedScene" path="res://scenes/summoning_ring.tscn" id="4_s1u30"]
+[ext_resource type="PackedScene" path="res://scenes/text_box.tscn" id="5_saxum"]
 [ext_resource type="AudioStream" uid="uid://bgnd3ptkli7ew" path="res://sounds/a_courtroom_somewhere.mp3" id="6_6tynu"]
-[ext_resource type="PackedScene" uid="uid://tijbokynigwu" path="res://scenes/versus.tscn" id="7_sq88j"]
+[ext_resource type="PackedScene" path="res://scenes/versus.tscn" id="7_sq88j"]
 
 [node name="courtroom_ceo" type="Node2D"]
 position = Vector2(750, 2.08165e-12)

diff --git a/scenes/courtroom_devin.tscn b/scenes/courtroom_devin.tscn
@@ -2,11 +2,11 @@
 
 [ext_resource type="Texture2D" uid="uid://ba6fhck0lsywo" path="res://sprites/backgrounds/courtroom.png" id="1_j6pui"]
 [ext_resource type="Script" path="res://scripts/courtroom_devin.gd" id="1_j78rv"]
-[ext_resource type="PackedScene" uid="uid://cnbl6ra6bh6mc" path="res://scenes/warlock.tscn" id="2_53ydx"]
-[ext_resource type="PackedScene" uid="uid://okqnfgow3d3a" path="res://scenes/summoning_ring.tscn" id="3_x87h7"]
-[ext_resource type="PackedScene" uid="uid://byshmomdcx3dv" path="res://scenes/text_box.tscn" id="4_noygb"]
+[ext_resource type="PackedScene" path="res://scenes/warlock.tscn" id="2_53ydx"]
+[ext_resource type="PackedScene" path="res://scenes/summoning_ring.tscn" id="3_x87h7"]
+[ext_resource type="PackedScene" path="res://scenes/text_box.tscn" id="4_noygb"]
 [ext_resource type="AudioStream" uid="uid://bgnd3ptkli7ew" path="res://sounds/a_courtroom_somewhere.mp3" id="6_0krxw"]
-[ext_resource type="PackedScene" uid="uid://tijbokynigwu" path="res://scenes/versus.tscn" id="6_qcd74"]
+[ext_resource type="PackedScene" path="res://scenes/versus.tscn" id="6_qcd74"]
 
 [node name="courtroom_devin" type="Node2D"]
 position = Vector2(750, 2.08165e-12)

diff --git a/scenes/courtroom_satan.tscn b/scenes/courtroom_satan.tscn
@@ -2,11 +2,11 @@
 
 [ext_resource type="Texture2D" uid="uid://ba6fhck0lsywo" path="res://sprites/backgrounds/courtroom.png" id="1_c22x3"]
 [ext_resource type="Script" path="res://scenes/courtroom_satan.gd" id="1_sme03"]
-[ext_resource type="PackedScene" uid="uid://cnbl6ra6bh6mc" path="res://scenes/warlock.tscn" id="2_1kldv"]
-[ext_resource type="PackedScene" uid="uid://okqnfgow3d3a" path="res://scenes/summoning_ring.tscn" id="3_l4cpl"]
-[ext_resource type="PackedScene" uid="uid://byshmomdcx3dv" path="res://scenes/text_box.tscn" id="5_r4gwd"]
+[ext_resource type="PackedScene" path="res://scenes/warlock.tscn" id="2_1kldv"]
+[ext_resource type="PackedScene" path="res://scenes/summoning_ring.tscn" id="3_l4cpl"]
+[ext_resource type="PackedScene" path="res://scenes/text_box.tscn" id="5_r4gwd"]
 [ext_resource type="AudioStream" uid="uid://bgnd3ptkli7ew" path="res://sounds/a_courtroom_somewhere.mp3" id="6_cjq4g"]
-[ext_resource type="PackedScene" uid="uid://tijbokynigwu" path="res://scenes/versus.tscn" id="7_nda3f"]
+[ext_resource type="PackedScene" path="res://scenes/versus.tscn" id="7_nda3f"]
 
 [node name="CourtroomSatan" type="Node2D"]
 position = Vector2(750, 2.08165e-12)

diff --git a/scripts/title_menu.gd b/scripts/title_menu.gd
@@ -14,7 +14,7 @@ func _process(delta):
 		if Input.is_action_just_pressed("down"):
 			choice = "controls"
 			selector.position = controls_position
-		elif Input.is_action_just_pressed("ui_up"):
+		elif Input.is_action_just_pressed("up"):
 			choice = "play"
 			selector.position = play_position
 		elif Input.is_action_just_pressed("ui_accept"):