oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: Huge cleanup (#420)

Browse Source 
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
This commit is contained in:
Dennis Ploeger
2021-10-25 08:59:07 +02:00
committed by GitHub
parent 3de06adcf9
commit 94d86d24d5
101 changed files with 1091 additions and 67952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
game/rooms/room01/esc/wall_item_popupdialog.esc
View File

@@ -1,13 +1,13 @@
:look
> [eq dialog_popup_advance 0]
say player ROOM1_look_wall_item_1:"I don't know what that stuff is." dialog_box_inset
say player ROOM1_look_wall_item_1:"I don't know what that stuff is." avatar_dialog_player
set_global dialog_popup_advance 1
stop
> [eq dialog_popup_advance 1]
say player ROOM1_look_wall_item_2:"I REALLY don't know what that stuff is." dialog_box_inset
say player ROOM1_look_wall_item_2:"I REALLY don't know what that stuff is." avatar_dialog_player
set_global dialog_popup_advance 2
stop
> [eq dialog_popup_advance 2]
say player ROOM1_look_wall_item_3:"No, SERIOUSLY, I have no idea what that is!" dialog_box_inset
say player ROOM1_look_wall_item_4:"Please stop asking me that!" dialog_box_inset
say player ROOM1_look_wall_item_3:"No, SERIOUSLY, I have no idea what that is!" avatar_dialog_player
say player ROOM1_look_wall_item_4:"Please stop asking me that!" avatar_dialog_player
stop

4
game/rooms/room01/room01.tscn
View File

@@ -2,7 +2,7 @@
[ext_resource path="res://game/rooms/room01/walkable_area.tscn" type="PackedScene" id=1]
[ext_resource path="res://game/rooms/room01/background.tscn" type="PackedScene" id=2]
[ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=3]
[ext_resource path="res://game/fonts/caslonantique.tres" type="DynamicFont" id=3]
[ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=4]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=6]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=7]
@@ -23,6 +23,8 @@ editor_debug_mode = 1
[node name="background" parent="." instance=ExtResource( 2 )]
[node name="advice" type="Label" parent="background"]
anchor_right = 0.023274
anchor_bottom = 0.018018
margin_left = 90.2752
margin_top = 120.824
margin_right = 270.275

2
game/rooms/room02/room02.tscn
View File

@@ -2,7 +2,7 @@
[ext_resource path="res://game/rooms/room02/walkable_area.tscn" type="PackedScene" id=1]
[ext_resource path="res://game/rooms/room02/background.tscn" type="PackedScene" id=2]
[ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=3]
[ext_resource path="res://game/fonts/caslonantique.tres" type="DynamicFont" id=3]
[ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=4]
[ext_resource path="res://game/rooms/room02/button/button.tscn" type="PackedScene" id=5]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=6]

2
game/rooms/room03/room03.tscn
View File

@@ -2,7 +2,7 @@
[ext_resource path="res://game/rooms/room03/walkable_area.tscn" type="PackedScene" id=1]
[ext_resource path="res://game/rooms/room03/background.tscn" type="PackedScene" id=2]
[ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=3]
[ext_resource path="res://game/fonts/caslonantique.tres" type="DynamicFont" id=3]
[ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=4]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=5]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=6]

2
game/rooms/room04/room04.tscn
View File

@@ -2,7 +2,7 @@
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=1]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=2]
[ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=3]
[ext_resource path="res://game/fonts/caslonantique.tres" type="DynamicFont" id=3]
[ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=4]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=5]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=6]

2
game/rooms/room05/room05.tscn
View File

@@ -2,7 +2,7 @@
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=1]
[ext_resource path="res://game/rooms/room05/background.tscn" type="PackedScene" id=2]
[ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=3]
[ext_resource path="res://game/fonts/caslonantique.tres" type="DynamicFont" id=3]
[ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=4]
[ext_resource path="res://game/rooms/room05/item_wall/item_wall.tscn" type="PackedScene" id=5]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=6]

2
game/rooms/room06/room06.tscn
View File

@@ -7,7 +7,7 @@
[ext_resource path="res://game/rooms/room06/r_door.tscn" type="PackedScene" id=5]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=6]
[ext_resource path="res://game/characters/worker/worker.tscn" type="PackedScene" id=7]
[ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=8]
[ext_resource path="res://game/fonts/caslonantique.tres" type="DynamicFont" id=8]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=9]
[sub_resource type="NavigationPolygon" id=1]

2
game/rooms/room07/room07.tscn
View File

@@ -4,7 +4,7 @@
[ext_resource path="res://game/rooms/room07/background.tscn" type="PackedScene" id=2]
[ext_resource path="res://game/items/escitems/button.tscn" type="PackedScene" id=3]
[ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=4]
[ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=5]
[ext_resource path="res://game/fonts/caslonantique.tres" type="DynamicFont" id=5]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=6]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=7]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=8]

41
game/rooms/room08/puzzle/10_buttons_puzzle.tscn
View File

@@ -1,20 +1,7 @@
[gd_scene load_steps=7 format=2]
[gd_scene load_steps=3 format=2]
[ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=1]
[ext_resource path="res://game/fonts/caslonantique.tres" type="DynamicFont" id=1]
[ext_resource path="res://game/rooms/room08/puzzle/10_buttons_puzzle.gd" type="Script" id=2]
[ext_resource path="res://addons/escoria-core/game/assets/fonts/efmi/efmi.TTF" type="DynamicFontData" id=3]
[sub_resource type="DynamicFont" id=1]
size = 50
font_data = ExtResource( 3 )
[sub_resource type="DynamicFont" id=2]
size = 50
font_data = ExtResource( 3 )
[sub_resource type="DynamicFont" id=3]
size = 50
font_data = ExtResource( 3 )
[node name="10_buttons_puzzle" type="Panel"]
anchor_right = 1.0
@@ -29,7 +16,7 @@ margin_left = 174.813
margin_top = 79.6769
margin_right = 899.813
margin_bottom = 126.677
custom_fonts/font = SubResource( 1 )
custom_fonts/font = ExtResource( 1 )
text = "Click the buttons in the increasing order"
__meta__ = {
"_edit_use_anchors_": false
@@ -40,7 +27,7 @@ margin_left = 558.177
margin_top = 674.983
margin_right = 719.177
margin_bottom = 721.983
custom_fonts/font = SubResource( 2 )
custom_fonts/font = ExtResource( 1 )
text = "Well done!"
__meta__ = {
"_edit_use_anchors_": false
@@ -61,7 +48,7 @@ margin_right = 191.0
margin_bottom = 214.0
size_flags_horizontal = 3
size_flags_vertical = 3
custom_fonts/font = SubResource( 3 )
custom_fonts/font = ExtResource( 1 )
toggle_mode = true
[node name="Button2" type="Button" parent="GridContainer"]
@@ -70,7 +57,7 @@ margin_right = 386.0
margin_bottom = 214.0
size_flags_horizontal = 3
size_flags_vertical = 3
custom_fonts/font = SubResource( 3 )
custom_fonts/font = ExtResource( 1 )
toggle_mode = true
[node name="Button3" type="Button" parent="GridContainer"]
@@ -79,7 +66,7 @@ margin_right = 581.0
margin_bottom = 214.0
size_flags_horizontal = 3
size_flags_vertical = 3
custom_fonts/font = SubResource( 3 )
custom_fonts/font = ExtResource( 1 )
toggle_mode = true
[node name="Button4" type="Button" parent="GridContainer"]
@@ -88,7 +75,7 @@ margin_right = 776.0
margin_bottom = 214.0
size_flags_horizontal = 3
size_flags_vertical = 3
custom_fonts/font = SubResource( 3 )
custom_fonts/font = ExtResource( 1 )
toggle_mode = true
[node name="Button5" type="Button" parent="GridContainer"]
@@ -97,7 +84,7 @@ margin_right = 971.0
margin_bottom = 214.0
size_flags_horizontal = 3
size_flags_vertical = 3
custom_fonts/font = SubResource( 3 )
custom_fonts/font = ExtResource( 1 )
toggle_mode = true
[node name="Button6" type="Button" parent="GridContainer"]
@@ -106,7 +93,7 @@ margin_right = 191.0
margin_bottom = 432.0
size_flags_horizontal = 3
size_flags_vertical = 3
custom_fonts/font = SubResource( 3 )
custom_fonts/font = ExtResource( 1 )
toggle_mode = true
[node name="Button7" type="Button" parent="GridContainer"]
@@ -116,7 +103,7 @@ margin_right = 386.0
margin_bottom = 432.0
size_flags_horizontal = 3
size_flags_vertical = 3
custom_fonts/font = SubResource( 3 )
custom_fonts/font = ExtResource( 1 )
toggle_mode = true
[node name="Button8" type="Button" parent="GridContainer"]
@@ -126,7 +113,7 @@ margin_right = 581.0
margin_bottom = 432.0
size_flags_horizontal = 3
size_flags_vertical = 3
custom_fonts/font = SubResource( 3 )
custom_fonts/font = ExtResource( 1 )
toggle_mode = true
[node name="Button9" type="Button" parent="GridContainer"]
@@ -136,7 +123,7 @@ margin_right = 776.0
margin_bottom = 432.0
size_flags_horizontal = 3
size_flags_vertical = 3
custom_fonts/font = SubResource( 3 )
custom_fonts/font = ExtResource( 1 )
toggle_mode = true
[node name="Button10" type="Button" parent="GridContainer"]
@@ -146,7 +133,7 @@ margin_right = 971.0
margin_bottom = 432.0
size_flags_horizontal = 3
size_flags_vertical = 3
custom_fonts/font = SubResource( 3 )
custom_fonts/font = ExtResource( 1 )
toggle_mode = true
[node name="quit" type="Button" parent="."]

2
game/rooms/room08/room08.tscn
View File

@@ -2,7 +2,7 @@
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=1]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=2]
[ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=3]
[ext_resource path="res://game/fonts/caslonantique.tres" type="DynamicFont" id=3]
[ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=4]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=5]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=6]

2
game/rooms/room09/room09.tscn
View File

@@ -2,7 +2,7 @@
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=1]
[ext_resource path="res://game/rooms/room09/background.tscn" type="PackedScene" id=2]
[ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=3]
[ext_resource path="res://game/fonts/caslonantique.tres" type="DynamicFont" id=3]
[ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=4]
[ext_resource path="res://game/rooms/room09/closet/magical_closet.tscn" type="PackedScene" id=5]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=6]

2
game/rooms/room10/esc/button_accept_input_test.esc
View File

@@ -6,7 +6,7 @@ say player "Hello. I will now walk a bit and won't listen at what you say!"
accept_input NONE
walk_block player player_start
walk_block player accept_input_location
say player "Ha! Now you can't even skip this text!" dialog_box_inset
say player "Ha! Now you can't even skip this text!" avatar_dialog_player
accept_input SKIP
say player "Okay, you can skip this text, but still not move me until 3 seconds have passed."
wait 3

2
game/rooms/room10/room10.tscn
View File

@@ -2,7 +2,7 @@
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=1]
[ext_resource path="res://game/rooms/room10/background.tscn" type="PackedScene" id=2]
[ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=3]
[ext_resource path="res://game/fonts/caslonantique.tres" type="DynamicFont" id=3]
[ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=4]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=5]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=6]

2
game/rooms/room11/room11.tscn
View File

@@ -2,7 +2,7 @@
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=1]
[ext_resource path="res://game/rooms/room11/background.tscn" type="PackedScene" id=2]
[ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=3]
[ext_resource path="res://game/fonts/caslonantique.tres" type="DynamicFont" id=3]
[ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=4]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=5]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=6]

2
game/rooms/room12/room12.tscn
View File

@@ -2,7 +2,7 @@
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=1]
[ext_resource path="res://game/rooms/room12/background.tscn" type="PackedScene" id=2]
[ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=3]
[ext_resource path="res://game/fonts/caslonantique.tres" type="DynamicFont" id=3]
[ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=4]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=5]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=6]

2
game/rooms/room13/room13.tscn
View File

@@ -2,7 +2,7 @@
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=1]
[ext_resource path="res://game/rooms/room12/background.tscn" type="PackedScene" id=2]
[ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=3]
[ext_resource path="res://game/fonts/caslonantique.tres" type="DynamicFont" id=3]
[ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=4]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=5]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=6]