From 88bafaec3f64dd3afe2d025920ef332161be50f3 Mon Sep 17 00:00:00 2001
From: sigonasr2 <sigonasr2@gmail.com>
Date: Tue, 28 Nov 2023 19:12:31 -0600
Subject: [PATCH] Text navigation for visual novel added.

---
 Crawler/Version.h                         |   2 +-
 Crawler/VisualNovel.cpp                   |  37 +++++++++++++++++++---
 Crawler/VisualNovel.h                     |  23 ++++++++++++++
 Crawler/assets/backgrounds/rest.png       | Bin 0 -> 5502 bytes
 Crawler/assets/config/story/Chapter 1.txt |   2 +-
 5 files changed, 58 insertions(+), 6 deletions(-)
 create mode 100644 Crawler/assets/backgrounds/rest.png

diff --git a/Crawler/Version.h b/Crawler/Version.h
index a89c6e83..97ffe9fc 100644
--- a/Crawler/Version.h
+++ b/Crawler/Version.h
@@ -35,7 +35,7 @@ SUCH DAMAGE.
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 2
 #define VERSION_PATCH 1
-#define VERSION_BUILD 3212
+#define VERSION_BUILD 3225
 
 #define stringify(a) stringify_(a)
 #define stringify_(a) #a
diff --git a/Crawler/VisualNovel.cpp b/Crawler/VisualNovel.cpp
index a2e246c4..5ea17963 100644
--- a/Crawler/VisualNovel.cpp
+++ b/Crawler/VisualNovel.cpp
@@ -38,6 +38,7 @@ SUCH DAMAGE.
 #include "DEFINES.h"
 #include "Unlock.h"
 #include "Menu.h"
+#include "util.h"
 
 INCLUDE_game
 INCLUDE_GFX
@@ -177,6 +178,7 @@ void VisualNovel::LoadVisualNovel(std::string storyLevelName){
 }
 void VisualNovel::Update(){
 	if(game->KEY_CONFIRM.Pressed()){
+		activeText="";
 		novel.ExecuteNextCommand();
 	}
 	locationDisplayTime=std::max(0.f,locationDisplayTime-game->GetElapsedTime());
@@ -204,8 +206,14 @@ void VisualNovel::Draw(){
 		game->DrawShadowStringPropDecal(game->GetScreenSize()/2-textSize/2,locationDisplayText,WHITE,VERY_DARK_BLUE,{2.f,2.f});
 	}
 	if(activeText.length()>0){
-		Menu::DrawThemedWindow({24.f,game->GetScreenSize().y-60.f},{48.f,-12.f});
-		Menu::DrawThemedWindow({24.f,game->GetScreenSize().y-48.f},{game->GetScreenSize().x-48.f,20.f});
+		vf2d nameDisplayPos={24.f,game->GetScreenSize().y-60.f};
+		vf2d nameDisplayWindowSize={48.f,-12.f};
+		Menu::DrawThemedWindow(nameDisplayPos,nameDisplayWindowSize);
+		vf2d dialogDisplayPos={24.f,game->GetScreenSize().y-48.f};
+		Menu::DrawThemedWindow(dialogDisplayPos,{game->GetScreenSize().x-48.f,20.f});
+		vf2d speakerTextSize=game->GetTextSizeProp(speakerDisplayName);
+		game->DrawShadowStringPropDecal(nameDisplayPos-vf2d{10,8}+(nameDisplayWindowSize+vf2d{24,0})/2-speakerTextSize/2,speakerDisplayName);
+		game->DrawShadowStringPropDecal(dialogDisplayPos-vf2d{10,10},activeText);
 	}
 }
 
@@ -220,6 +228,7 @@ void LocationCommand::Execute(VisualNovel&vn){
 }
 LocationCommand::LocationCommand(std::string location)
 :location(location){}
+CommandType::CommandType LocationCommand::GetType(){return CommandType::LOCATION;}
 
 void BackgroundCommand::Execute(VisualNovel&vn){
 	vn.backgroundFilename=backgroundFilename;
@@ -227,6 +236,7 @@ void BackgroundCommand::Execute(VisualNovel&vn){
 }
 BackgroundCommand::BackgroundCommand(std::string backgroundFilename)
 :backgroundFilename(backgroundFilename){}
+CommandType::CommandType BackgroundCommand::GetType(){return CommandType::BACKGROUND;}
 
 void LeftCommand::Execute(VisualNovel&vn){
 	vn.leftCharacters=characters;
@@ -234,6 +244,7 @@ void LeftCommand::Execute(VisualNovel&vn){
 }
 LeftCommand::LeftCommand(std::vector<std::string>characters)
 :characters(characters){}
+CommandType::CommandType LeftCommand::GetType(){return CommandType::LEFT;}
 
 void RightCommand::Execute(VisualNovel&vn){
 	vn.rightCharacters=characters;
@@ -241,6 +252,7 @@ void RightCommand::Execute(VisualNovel&vn){
 }
 RightCommand::RightCommand(std::vector<std::string>characters)
 :characters(characters){}
+CommandType::CommandType RightCommand::GetType(){return CommandType::RIGHT;}
 
 void SpeakerCommand::Execute(VisualNovel&vn){
 	vn.speakerDisplayName=displayedName;
@@ -251,12 +263,29 @@ SpeakerCommand::SpeakerCommand(std::string speaker)
 :displayedName(speaker),actualSpeakerName(speaker){}
 SpeakerCommand::SpeakerCommand(std::string displayedName,std::string speaker)
 :displayedName(displayedName),actualSpeakerName(speaker){}
+CommandType::CommandType SpeakerCommand::GetType(){return CommandType::SPEAKER;}
 
 void DialogCommand::Execute(VisualNovel&vn){
-	vn.activeText=dialog;
+	bool mustDisplay=vn.activeText.length()==0;
+	std::string newText=util::WrapText(game,vn.activeText+(vn.activeText.length()>0?" ":"")+dialog,game->GetScreenSize().x-48,true,{1,1});
+	if(game->GetTextSizeProp(newText).y>40){//Hit the maximum of 3 lines.
+		if(!mustDisplay){
+			vn.commandIndex--;
+		}
+	}else{
+		vn.activeText=newText;
+		if(vn.commandIndex<vn.commands.size()){
+			CommandType::CommandType nextCommandType=vn.commands[vn.commandIndex]->GetType();
+			if(nextCommandType==CommandType::DIALOG){ //Only add to dialog when the next command type is a dialog as well.
+				vn.ExecuteNextCommand();	
+			}
+		}
+	}
 }
 DialogCommand::DialogCommand(std::string dialog)
 :dialog(dialog){}
+CommandType::CommandType DialogCommand::GetType(){return CommandType::DIALOG;}
 
 void PauseCommand::Execute(VisualNovel&vn){}
-PauseCommand::PauseCommand(){}
\ No newline at end of file
+PauseCommand::PauseCommand(){}
+CommandType::CommandType PauseCommand::GetType(){return CommandType::PAUSE;}
\ No newline at end of file
diff --git a/Crawler/VisualNovel.h b/Crawler/VisualNovel.h
index 866b98d6..b5b90277 100644
--- a/Crawler/VisualNovel.h
+++ b/Crawler/VisualNovel.h
@@ -39,17 +39,32 @@ SUCH DAMAGE.
 
 class VisualNovel;
 
+namespace CommandType{
+	enum CommandType{
+		PAUSE,
+		DIALOG,
+		SPEAKER,
+		BACKGROUND,
+		RIGHT,
+		LEFT,
+		LOCATION
+	};
+}
+
 class Command{
 	friend class VisualNovel;
 	virtual void Execute(VisualNovel&vn)=0;
 protected:
 	Command();
+public:
+	virtual CommandType::CommandType GetType()=0;
 };
 
 class PauseCommand final:public Command{
 public:
 	void Execute(VisualNovel&vn)override;
 	PauseCommand();
+	CommandType::CommandType GetType()final override;
 };
 
 class DialogCommand final:public Command{
@@ -57,6 +72,7 @@ class DialogCommand final:public Command{
 public:
 	void Execute(VisualNovel&vn)override;
 	DialogCommand(std::string dialog);
+	CommandType::CommandType GetType()final override;
 };
 
 class SpeakerCommand final:public Command{
@@ -66,6 +82,7 @@ public:
 	void Execute(VisualNovel&vn)override;
 	SpeakerCommand(std::string speaker);
 	SpeakerCommand(std::string displayedName,std::string speaker);
+	CommandType::CommandType GetType()final override;
 };
 
 class BackgroundCommand final:public Command{
@@ -73,6 +90,7 @@ class BackgroundCommand final:public Command{
 public:
 	void Execute(VisualNovel&vn)override;
 	BackgroundCommand(std::string backgroundFilename);
+	CommandType::CommandType GetType()final override;
 };
 
 class RightCommand final:public Command{
@@ -80,6 +98,7 @@ class RightCommand final:public Command{
 public:
 	void Execute(VisualNovel&vn)override;
 	RightCommand(std::vector<std::string>characters);
+	CommandType::CommandType GetType()final override;
 };
 
 class LeftCommand final:public Command{
@@ -87,6 +106,7 @@ class LeftCommand final:public Command{
 public:
 	void Execute(VisualNovel&vn)override;
 	LeftCommand(std::vector<std::string>characters);
+	CommandType::CommandType GetType()final override;
 };
 
 class LocationCommand final:public Command{
@@ -94,6 +114,7 @@ class LocationCommand final:public Command{
 public:
 	void Execute(VisualNovel&vn)override;
 	LocationCommand(std::string location);
+	CommandType::CommandType GetType()final override;
 };
 
 class VisualNovel{
@@ -114,6 +135,8 @@ class VisualNovel{
 	std::vector<std::string>leftCharacters;
 	std::vector<std::string>rightCharacters;
 	std::string backgroundFilename;
+	std::string prevBackgroundFilename;
+	float transitionTime=0;
 	std::vector<Command*>commands;
 	int commandIndex=0;
 	std::string locationDisplayText="";
diff --git a/Crawler/assets/backgrounds/rest.png b/Crawler/assets/backgrounds/rest.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b695b3b24d65b1a1d9ef94c57a5efe97a307eb6
GIT binary patch
literal 5502
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

literal 0
HcmV?d00001

diff --git a/Crawler/assets/config/story/Chapter 1.txt b/Crawler/assets/config/story/Chapter 1.txt
index 1aed8d86..6e1c415a 100644
--- a/Crawler/assets/config/story/Chapter 1.txt	
+++ b/Crawler/assets/config/story/Chapter 1.txt	
@@ -106,7 +106,7 @@ What shall I do. I can't return to the Kingdom without it.
 [You]
 
 First you should rest. Once you are able to walk on your own again, we can think about a solution for your lost object.
-
+{BACKGROUND sea.png}
 []
 
 You set up a tent and a campfire a little outside of the main camp where the tragedy happened and help Sherman to move over.