From e95f081cfffc6459bcb8c308e1b41ee794663df6 Mon Sep 17 00:00:00 2001
From: Eneko Nieto <eneko@eneko.ovh>
Date: Tue, 7 Feb 2023 23:18:45 +0100
Subject: [PATCH] go

---
 game/start_game.esc                      |  2 +-
 gymkhana/characters/mark/mark.tscn       | 34 ++++++++++++++++++++++--
 gymkhana/characters/mark/mark_talk.tscn  |  5 ++++
 gymkhana/characters/mark/mark_think.tscn |  4 +--
 gymkhana/rooms/home/room01.tscn          | 16 +++++------
 gymkhana/start_game.esc                  | 10 +++++++
 project.godot                            |  4 +--
 7 files changed, 60 insertions(+), 15 deletions(-)
 create mode 100644 gymkhana/start_game.esc

diff --git a/game/start_game.esc b/game/start_game.esc
index e1b5bd43..aeab5ad2 100644
--- a/game/start_game.esc
+++ b/game/start_game.esc
@@ -1,6 +1,6 @@
 :init
 # Play Escoria logo cutscene
-change_scene res://game/rooms/sarrera/intro_room.tscn false
+change_scene res://game/rooms/intro/intro_room.tscn false
 
 # When control is passed back after the logo, start the music
 play_snd res://game/sfx/Game-Menu_Looping.mp3 _music
diff --git a/gymkhana/characters/mark/mark.tscn b/gymkhana/characters/mark/mark.tscn
index faac755c..6162dcf5 100644
--- a/gymkhana/characters/mark/mark.tscn
+++ b/gymkhana/characters/mark/mark.tscn
@@ -7,10 +7,11 @@
 [ext_resource path="res://game/characters/mark/png/mark_talk_down_right.png" type="Texture" id=5]
 [ext_resource path="res://game/characters/mark/png/mark_talk_up.png" type="Texture" id=6]
 [ext_resource path="res://game/characters/mark/png/mark_talk_right.png" type="Texture" id=7]
-[ext_resource path="res://game/characters/mark/mark_animations.tres" type="Resource" id=8]
+[ext_resource path="res://gymkhana/characters/mark/mark_animations.tres" type="Resource" id=8]
 [ext_resource path="res://game/characters/mark/png/markjester_talk.png" type="Texture" id=9]
 
 [sub_resource type="AtlasTexture" id=18]
+flags = 4
 atlas = ExtResource( 4 )
 region = Rect2( 0, 0, 24, 70 )
 
@@ -20,6 +21,7 @@ atlas = ExtResource( 3 )
 region = Rect2( 0, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=4]
+flags = 4
 atlas = ExtResource( 4 )
 region = Rect2( 120, 0, 24, 70 )
 
@@ -29,6 +31,7 @@ atlas = ExtResource( 3 )
 region = Rect2( 120, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=11]
+flags = 4
 atlas = ExtResource( 4 )
 region = Rect2( 24, 0, 24, 70 )
 
@@ -38,6 +41,7 @@ atlas = ExtResource( 3 )
 region = Rect2( 24, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=17]
+flags = 4
 atlas = ExtResource( 4 )
 region = Rect2( 96, 0, 24, 70 )
 
@@ -47,6 +51,7 @@ atlas = ExtResource( 3 )
 region = Rect2( 96, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=27]
+flags = 4
 atlas = ExtResource( 4 )
 region = Rect2( 48, 0, 24, 70 )
 
@@ -56,6 +61,7 @@ atlas = ExtResource( 3 )
 region = Rect2( 48, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=5]
+flags = 4
 atlas = ExtResource( 4 )
 region = Rect2( 72, 0, 24, 70 )
 
@@ -65,14 +71,17 @@ atlas = ExtResource( 3 )
 region = Rect2( 72, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=1]
+flags = 4
 atlas = ExtResource( 2 )
 region = Rect2( 0, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=2]
+flags = 4
 atlas = ExtResource( 2 )
 region = Rect2( 24, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=3]
+flags = 4
 atlas = ExtResource( 2 )
 region = Rect2( 48, 0, 24, 70 )
 
@@ -107,14 +116,17 @@ atlas = ExtResource( 9 )
 region = Rect2( 480, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=28]
+flags = 4
 atlas = ExtResource( 5 )
 region = Rect2( 0, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=29]
+flags = 4
 atlas = ExtResource( 5 )
 region = Rect2( 24, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=30]
+flags = 4
 atlas = ExtResource( 5 )
 region = Rect2( 48, 0, 24, 70 )
 
@@ -159,22 +171,27 @@ atlas = ExtResource( 9 )
 region = Rect2( 408, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=6]
+flags = 4
 atlas = ExtResource( 7 )
 region = Rect2( 0, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=7]
+flags = 4
 atlas = ExtResource( 7 )
 region = Rect2( 24, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=8]
+flags = 4
 atlas = ExtResource( 7 )
 region = Rect2( 48, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=9]
+flags = 4
 atlas = ExtResource( 7 )
 region = Rect2( 72, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=10]
+flags = 4
 atlas = ExtResource( 7 )
 region = Rect2( 96, 0, 24, 70 )
 
@@ -204,10 +221,12 @@ atlas = ExtResource( 9 )
 region = Rect2( 240, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=12]
+flags = 4
 atlas = ExtResource( 6 )
 region = Rect2( 0, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=13]
+flags = 4
 atlas = ExtResource( 6 )
 region = Rect2( 24, 0, 24, 70 )
 
@@ -222,14 +241,17 @@ atlas = ExtResource( 9 )
 region = Rect2( 288, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=19]
+flags = 4
 atlas = ExtResource( 4 )
 region = Rect2( 144, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=20]
+flags = 4
 atlas = ExtResource( 4 )
 region = Rect2( 168, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=21]
+flags = 4
 atlas = ExtResource( 4 )
 region = Rect2( 192, 0, 24, 70 )
 
@@ -274,22 +296,27 @@ atlas = ExtResource( 3 )
 region = Rect2( 504, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=22]
+flags = 4
 atlas = ExtResource( 4 )
 region = Rect2( 216, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=23]
+flags = 4
 atlas = ExtResource( 4 )
 region = Rect2( 240, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=24]
+flags = 4
 atlas = ExtResource( 4 )
 region = Rect2( 264, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=25]
+flags = 4
 atlas = ExtResource( 4 )
 region = Rect2( 288, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=26]
+flags = 4
 atlas = ExtResource( 4 )
 region = Rect2( 312, 0, 24, 70 )
 
@@ -319,14 +346,17 @@ atlas = ExtResource( 3 )
 region = Rect2( 312, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=14]
+flags = 4
 atlas = ExtResource( 4 )
 region = Rect2( 336, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=15]
+flags = 4
 atlas = ExtResource( 4 )
 region = Rect2( 360, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=16]
+flags = 4
 atlas = ExtResource( 4 )
 region = Rect2( 384, 0, 24, 70 )
 
@@ -501,7 +531,7 @@ height = 217.78
 pause_mode = 1
 script = ExtResource( 1 )
 global_id = "player"
-esc_script = "res://game/characters/mark/mark.esc"
+esc_script = "res://gymkhana/characters/mark/mark.esc"
 is_movable = true
 default_action = "look"
 combine_when_selected_action_is_in = [  ]
diff --git a/gymkhana/characters/mark/mark_talk.tscn b/gymkhana/characters/mark/mark_talk.tscn
index 6f37c920..60465e05 100644
--- a/gymkhana/characters/mark/mark_talk.tscn
+++ b/gymkhana/characters/mark/mark_talk.tscn
@@ -3,22 +3,27 @@
 [ext_resource path="res://game/characters/mark/png/mark_talk_right.png" type="Texture" id=1]
 
 [sub_resource type="AtlasTexture" id=1]
+flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 0, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=2]
+flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 24, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=3]
+flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 48, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=4]
+flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 72, 0, 24, 70 )
 
 [sub_resource type="AtlasTexture" id=5]
+flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 96, 0, 24, 70 )
 
diff --git a/gymkhana/characters/mark/mark_think.tscn b/gymkhana/characters/mark/mark_think.tscn
index c80159d4..be63cd98 100644
--- a/gymkhana/characters/mark/mark_think.tscn
+++ b/gymkhana/characters/mark/mark_think.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=12 format=2]
 
-[ext_resource path="res://game/characters/mark/png/mark_thinking_question.png" type="Texture" id=1]
-[ext_resource path="res://game/characters/mark/png/mark_thinking.png" type="Texture" id=2]
+[ext_resource path="res://gymkhana/characters/mark/png/mark_thinking_question.png" type="Texture" id=1]
+[ext_resource path="res://gymkhana/characters/mark/png/mark_thinking.png" type="Texture" id=2]
 
 [sub_resource type="AtlasTexture" id=1]
 atlas = ExtResource( 1 )
diff --git a/gymkhana/rooms/home/room01.tscn b/gymkhana/rooms/home/room01.tscn
index 4d663941..edb5d5f5 100644
--- a/gymkhana/rooms/home/room01.tscn
+++ b/gymkhana/rooms/home/room01.tscn
@@ -7,9 +7,9 @@
 [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]
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=7]
-[ext_resource path="res://game/rooms/room01/room1background.png" type="Texture" id=8]
-[ext_resource path="res://game/rooms/room01/art2.png" type="Texture" id=9]
-[ext_resource path="res://game/rooms/room01/art1.png" type="Texture" id=10]
+[ext_resource path="res://gymkhana/rooms/home/room1background.png" type="Texture" id=8]
+[ext_resource path="res://gymkhana/rooms/home/art2.png" type="Texture" id=9]
+[ext_resource path="res://gymkhana/rooms/home/art1.png" type="Texture" id=10]
 
 [sub_resource type="NavigationPolygon" id=1]
 vertices = PoolVector2Array( 125, 357, 1170, 355, 1277, 417, 1279, 550, -1, 548, 0, 449 )
@@ -22,7 +22,7 @@ __meta__ = {
 "_edit_vertical_guides_": [  ]
 }
 global_id = "room1"
-esc_script = "res://game/rooms/room01/esc/room01.esc"
+esc_script = "res://gymkhana/rooms/home/esc/room01.esc"
 player_scene = ExtResource( 4 )
 camera_limits = [ Rect2( 0, 0, 1280, 550 ) ]
 editor_debug_mode = 1
@@ -89,7 +89,7 @@ navpoly = SubResource( 1 )
 pause_mode = 1
 script = ExtResource( 5 )
 global_id = "r1_r_exit"
-esc_script = "res://game/rooms/room01/esc/right_exit.esc"
+esc_script = "res://gymkhana/rooms/home/esc/right_exit.esc"
 is_exit = true
 tooltip_name = "Exit to room 2"
 default_action = "walk"
@@ -108,7 +108,7 @@ script = ExtResource( 7 )
 pause_mode = 1
 script = ExtResource( 5 )
 global_id = "r1_wall_item1"
-esc_script = "res://game/rooms/room01/esc/wall_item.esc"
+esc_script = "res://gymkhana/rooms/home/esc/wall_item.esc"
 tooltip_name = "Artwork"
 default_action = "look"
 combine_when_selected_action_is_in = [  ]
@@ -145,7 +145,7 @@ __meta__ = {
 pause_mode = 1
 script = ExtResource( 5 )
 global_id = "r1_wall_item2"
-esc_script = "res://game/rooms/room01/esc/wall_item_popupdialog.esc"
+esc_script = "res://gymkhana/rooms/home/esc/wall_item_popupdialog.esc"
 tooltip_name = "Artwork 2"
 default_action = "look"
 combine_when_selected_action_is_in = [  ]
@@ -182,7 +182,7 @@ __meta__ = {
 pause_mode = 1
 script = ExtResource( 5 )
 global_id = "trigger_talk"
-esc_script = "res://game/rooms/room01/esc/trigger.esc"
+esc_script = "res://gymkhana/rooms/home/esc/trigger.esc"
 is_trigger = true
 player_orients_on_arrival = false
 combine_when_selected_action_is_in = [  ]
diff --git a/gymkhana/start_game.esc b/gymkhana/start_game.esc
new file mode 100644
index 00000000..0d6cf112
--- /dev/null
+++ b/gymkhana/start_game.esc
@@ -0,0 +1,10 @@
+:init
+# Play Escoria logo cutscene
+change_scene res://gymkhana/rooms/intro/intro_room.tscn false
+
+# When control is passed back after the logo, start the music
+play_snd res://game/sfx/Game-Menu_Looping.mp3 _music
+
+:newgame
+# 1/ Simple scene
+change_scene res://gymkhana/rooms/home/room01.tscn
diff --git a/project.godot b/project.godot
index ae5185d8..8615ef46 100644
--- a/project.godot
+++ b/project.godot
@@ -854,12 +854,12 @@ search_in_file_extensions=PoolStringArray( "gd", "shader", "esc" )
 
 [editor_plugins]
 
-enabled=PoolStringArray( "res://addons/escoria-core/plugin.cfg", "res://addons/escoria-dialog-simple/plugin.cfg", "res://addons/escoria-ui-simplemouse/plugin.cfg" )
+enabled=PoolStringArray( "res://addons/escoria-core/plugin.cfg", "res://addons/escoria-dialog-simple/plugin.cfg", "res://addons/escoria-ui-simplemouse/plugin.cfg", "res://addons/escoria-wizard/plugin.cfg" )
 
 [escoria]
 
 main/game_version="0.1.0"
-main/game_start_script="res://game/start_game.esc"
+main/game_start_script="res://gymkhana/start_game.esc"
 main/force_quit=true
 main/command_directories=[ "res://addons/escoria-core/game/core-scripts/esc/commands" ]
 main/text_lang="fr_FR"