From 0c7cf6f4fd4940f3ce477037c0f07fe94a259abb Mon Sep 17 00:00:00 2001 From: saverio Date: Sun, 8 May 2022 23:21:55 +0200 Subject: [PATCH 1/3] Add explanation for skip tp --- assets/data/npc/magician_intro.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/data/npc/magician_intro.json b/assets/data/npc/magician_intro.json index da4c9a3a..4bb959cb 100644 --- a/assets/data/npc/magician_intro.json +++ b/assets/data/npc/magician_intro.json @@ -9,6 +9,7 @@ "Appuie sur 'A' pour continuer", "HE OH", "reveil toi chakal", - "Attention tu rentre dans un flashback" + "Attention tu rentre dans un flashback", + "si ça prend trop longtemps,\nAppui sur 'entrer'" ] } From 4d8f05120d7cf4cee64d5fcfbc504e907e45b071 Mon Sep 17 00:00:00 2001 From: guillaumeAbel Date: Sun, 8 May 2022 23:23:05 +0200 Subject: [PATCH 2/3] Add good spawn stage 0 --- assets/data/story_mode/stage_0.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/data/story_mode/stage_0.json b/assets/data/story_mode/stage_0.json index 216c189b..8e7c26ed 100644 --- a/assets/data/story_mode/stage_0.json +++ b/assets/data/story_mode/stage_0.json @@ -223,5 +223,5 @@ } } }, - "spawn": [75, 85] + "spawn": [45, 115] } From 3804a04e03d9c83aadf4d01c023f2c1256b9e9ee Mon Sep 17 00:00:00 2001 From: Romain Date: Sun, 8 May 2022 23:26:31 +0200 Subject: [PATCH 3/3] Fix warnings & message --- assets/data/npc/magician_intro.json | 2 +- src/player/stat_upgrade/stats_component.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/assets/data/npc/magician_intro.json b/assets/data/npc/magician_intro.json index 4bb959cb..b6f3088b 100644 --- a/assets/data/npc/magician_intro.json +++ b/assets/data/npc/magician_intro.json @@ -10,6 +10,6 @@ "HE OH", "reveil toi chakal", "Attention tu rentre dans un flashback", - "si ça prend trop longtemps,\nAppui sur 'entrer'" + "si ca prend trop longtemps,\nAppui sur 'entrer'" ] } diff --git a/src/player/stat_upgrade/stats_component.c b/src/player/stat_upgrade/stats_component.c index 43b57d9c..8d485483 100644 --- a/src/player/stat_upgrade/stats_component.c +++ b/src/player/stat_upgrade/stats_component.c @@ -5,9 +5,10 @@ ** stats_component */ -#include "my_rpg.h" #include "my_bgs_button_generator.h" #include "my_bgs.h" +#include "my_rpg.h" +#include "main_menu.h" #include "macro.h" static const char STATS_UPGRADE[] = "./assets/data/player/stats_upgrade.json";