From 9756cc4a78daef1e9f9c95acfd4b0076e85b0388 Mon Sep 17 00:00:00 2001
From: sigonasr2 <sigonasr2@gmail.com>
Date: Tue, 19 Dec 2023 22:40:53 -0600
Subject: [PATCH] Add map types to every stage plate and to new stages.
 Correctly handle Discord SDK disconnects when the app is closed or not
 started initially.

---
 Crawler/CREDITS                        |  2 ++
 Crawler/Crawler.cpp                    | 34 ++++++++++++++++++++------
 Crawler/Crawler.h                      |  3 ++-
 Crawler/Crawler.tiled-project          |  3 ++-
 Crawler/Map.h                          |  3 +++
 Crawler/State_OverworldMap.cpp         |  2 +-
 Crawler/Version.h                      |  2 +-
 Crawler/assets/Campaigns/1_3.tmx       |  8 +++++-
 Crawler/assets/Campaigns/1_4.tmx       |  8 +++++-
 Crawler/assets/Campaigns/1_5.tmx       |  8 +++++-
 Crawler/assets/Campaigns/World_Map.tmx |  3 ++-
 Crawler/assets/config/levels.txt       |  3 +++
 Crawler/discord-files/core.cpp         |  2 +-
 13 files changed, 65 insertions(+), 16 deletions(-)

diff --git a/Crawler/CREDITS b/Crawler/CREDITS
index 4971096a..f783f3a6 100644
--- a/Crawler/CREDITS
+++ b/Crawler/CREDITS
@@ -1,6 +1,8 @@
 The inspiration that started it all, Pokemon-based Nico Yazawa sprite:
 https://www.deviantart.com/kirbysmith/art/Nico-Yazawa-Love-Live-Pokemon-Sprites-548007023
 
+olcPixelGameEngine Copyright 2023 OneLoneCoder.com under the OLC-3 License
+
 *** Minifantasy - Tiny Overworld v1.0 ***
 
 Minifantasy is an original idea by Krishna Palacio
diff --git a/Crawler/Crawler.cpp b/Crawler/Crawler.cpp
index 46b291ca..95c0a8ca 100644
--- a/Crawler/Crawler.cpp
+++ b/Crawler/Crawler.cpp
@@ -147,6 +147,7 @@ Crawler::Crawler()
 
 	sAppName = "GAME_NAME"_S;
 	game=this;
+	gameStarted=time(NULL);
 }
 
 bool Crawler::OnUserCreate(){
@@ -226,7 +227,12 @@ bool Crawler::OnUserUpdate(float fElapsedTime){
 	RenderVersionInfo();
 	#ifndef __EMSCRIPTEN__
 		if(Discord){
-			Discord->RunCallbacks();
+			auto result=Discord->RunCallbacks();
+			if(result!=::discord::Result::Ok){
+				std::cout<<"Discord Error Code "<<int(result)<<std::endl;
+				delete Discord;
+				Discord=nullptr;
+			}
 		}
 	#endif
 	return !gameEnd;
@@ -1959,6 +1965,9 @@ void Crawler::InitializeLevels(){
 	INITLEVEL(CAMPAIGN_1_1);
 	INITLEVEL(BOSS_1);
 	INITLEVEL(CAMPAIGN_1_2);
+	INITLEVEL(CAMPAIGN_1_3);
+	INITLEVEL(CAMPAIGN_1_4);
+	INITLEVEL(CAMPAIGN_1_5);
 
 	Test::RunMapTests();
 
@@ -2293,10 +2302,9 @@ void Crawler::EndGame(){
 	gameEnd=true;
 }
 
-void Crawler::SetupDiscord(){
-	gameStarted=time(NULL);
+::discord::Result Crawler::SetupDiscord(){
 	#ifndef __EMSCRIPTEN__
-		auto result = ::discord::Core::Create(1186719371750555780,DiscordCreateFlags_NoRequireDiscord,&Discord);
+		auto result=::discord::Core::Create(1186719371750555780,DiscordCreateFlags_NoRequireDiscord,&Discord);
 		if(result==::discord::Result::Ok){
 			Discord->SetLogHook(
 			  discord::LogLevel::Debug, [](discord::LogLevel level, const char* message) {
@@ -2304,7 +2312,10 @@ void Crawler::SetupDiscord(){
 			  });
 			std::cout<<"Connected to Discord!"<<std::endl;
 			UpdateDiscordStatus("Main Menu",player.get()->GetClassName());
+		}else{
+			std::cout<<"Could not connect to Discord. Error Code "<<int(result)<<std::endl;
 		}
+		return result;
 	#endif
 }
 
@@ -2319,15 +2330,24 @@ void Crawler::UpdateDiscordStatus(std::string levelName,std::string className){
 			newActivity.SetType(discord::ActivityType::Playing);
 			discord::ActivityAssets&assets=newActivity.GetAssets();
 			assets.SetLargeImage("heart_512");
+			assets.SetLargeText(game->sAppName.c_str());
+			assets.SetSmallText(className.c_str());
+
 			if(levelName!="Main Menu"){
 				std::for_each(className.begin(),className.end(),[](char&c){c=std::tolower(c);});
 				assets.SetSmallImage(("nico-"+className+"_512").c_str());
 			}
-			assets.SetLargeText(game->sAppName.c_str());
-			assets.SetSmallText(className.c_str());
 			Discord->ActivityManager().UpdateActivity(newActivity,[](::discord::Result result){
-				std::cout<<"Discord Activity successfully updated!"<<std::endl;
+				if(result==::discord::Result::Ok){
+					std::cout<<"Discord Activity successfully updated!"<<std::endl;
+				}else{
+					std::cout<<"Could not update Discord Activity. Error Code "<<int(result)<<std::endl;
+				}
 			});
+		}else{
+			if(SetupDiscord()==::discord::Result::Ok){
+				UpdateDiscordStatus(levelName,className);
+			}
 		}
 	#endif
 }
\ No newline at end of file
diff --git a/Crawler/Crawler.h b/Crawler/Crawler.h
index 47caa589..c1f7c223 100644
--- a/Crawler/Crawler.h
+++ b/Crawler/Crawler.h
@@ -50,6 +50,7 @@ All rights reserved.
 #include "olcUTIL_DataFile.h"
 #include "Key.h"
 #include "GameState.h"
+#include "discord.h"
 
 class Crawler : public olc::PixelGameEngine
 {
@@ -113,7 +114,7 @@ private:
 	time_t gameStarted;
 
 	void ValidateGameStatus();
-	void SetupDiscord();
+	::discord::Result SetupDiscord();
 public:
 	Crawler();
 	bool OnUserCreate() override;
diff --git a/Crawler/Crawler.tiled-project b/Crawler/Crawler.tiled-project
index 7df310f0..d112b4a3 100644
--- a/Crawler/Crawler.tiled-project
+++ b/Crawler/Crawler.tiled-project
@@ -298,7 +298,7 @@
                     "name": "Type",
                     "propertyType": "StageType",
                     "type": "string",
-                    "value": "DUNGEON"
+                    "value": "NONE"
                 },
                 {
                     "name": "Unlock Condition",
@@ -320,6 +320,7 @@
             "storageType": "string",
             "type": "enum",
             "values": [
+                "NONE",
                 "DUNGEON",
                 "BOSS",
                 "STORY",
diff --git a/Crawler/Map.h b/Crawler/Map.h
index 996e1e1f..6fe4dcf7 100644
--- a/Crawler/Map.h
+++ b/Crawler/Map.h
@@ -45,6 +45,9 @@ struct XMLTag;
 enum MapName{
 	CAMPAIGN_1_1,
 	CAMPAIGN_1_2,
+	CAMPAIGN_1_3,
+	CAMPAIGN_1_4,
+	CAMPAIGN_1_5,
 	BOSS_1,
 	WORLD_MAP
 };
diff --git a/Crawler/State_OverworldMap.cpp b/Crawler/State_OverworldMap.cpp
index 95cd0d41..a80c4718 100644
--- a/Crawler/State_OverworldMap.cpp
+++ b/Crawler/State_OverworldMap.cpp
@@ -120,7 +120,7 @@ void State_OverworldMap::OnUserUpdate(Crawler*game){
 						Component<MenuLabel>(OVERWORLD_LEVEL_SELECT,"Stage Label")->SetLabel(currentConnectionPoint->name);
 						Component<EncountersSpawnListScrollableWindowComponent>(OVERWORLD_LEVEL_SELECT,"Spawns List")->UpdateSpawns(currentConnectionPoint->spawns);
 						Component<MenuComponent>(OVERWORLD_LEVEL_SELECT,"Enter Button")->Enable(currentConnectionPoint->levelDataExists);
-						Component<MenuComponent>(OVERWORLD_LEVEL_SELECT,"Change Loadout Button")->Enable(!(currentConnectionPoint->type=="STORY"||currentConnectionPoint->type=="SHOP"));
+						Component<MenuComponent>(OVERWORLD_LEVEL_SELECT,"Change Loadout Button")->Enable(currentConnectionPoint->levelDataExists&&!(currentConnectionPoint->type=="STORY"||currentConnectionPoint->type=="SHOP"));
 						break;
 					}
 				}
diff --git a/Crawler/Version.h b/Crawler/Version.h
index b9a24053..621ae255 100644
--- a/Crawler/Version.h
+++ b/Crawler/Version.h
@@ -39,7 +39,7 @@ All rights reserved.
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 2
 #define VERSION_PATCH 1
-#define VERSION_BUILD 4251
+#define VERSION_BUILD 4267
 
 #define stringify(a) stringify_(a)
 #define stringify_(a) #a
diff --git a/Crawler/assets/Campaigns/1_3.tmx b/Crawler/assets/Campaigns/1_3.tmx
index 8eac1135..5471f54e 100644
--- a/Crawler/assets/Campaigns/1_3.tmx
+++ b/Crawler/assets/Campaigns/1_3.tmx
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="240" height="120" tilewidth="24" tileheight="24" infinite="0" nextlayerid="6" nextobjectid="1">
+<map version="1.10" tiledversion="1.10.1" class="Map" orientation="orthogonal" renderorder="right-down" width="240" height="120" tilewidth="24" tileheight="24" infinite="0" nextlayerid="7" nextobjectid="2">
+ <properties>
+  <property name="Level Type" propertytype="LevelType" value="Dungeon"/>
+ </properties>
  <tileset firstgid="1" source="../maps/Tilesheet_No_Shadow24x24.tsx"/>
  <tileset firstgid="2913" source="../maps/Decorations_c1_No_Shadow24x24.tsx"/>
  <layer id="2" name="Layer 1" width="240" height="120">
@@ -498,4 +501,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
+ <objectgroup id="6" name="Spawn Zones">
+  <object id="1" name="End Zone" type="EndZone" x="5136" y="2640" width="72" height="72"/>
+ </objectgroup>
 </map>
diff --git a/Crawler/assets/Campaigns/1_4.tmx b/Crawler/assets/Campaigns/1_4.tmx
index a21394f7..6abe6cb4 100644
--- a/Crawler/assets/Campaigns/1_4.tmx
+++ b/Crawler/assets/Campaigns/1_4.tmx
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="200" height="120" tilewidth="24" tileheight="24" infinite="0" nextlayerid="8" nextobjectid="1">
+<map version="1.10" tiledversion="1.10.1" class="Map" orientation="orthogonal" renderorder="right-down" width="200" height="120" tilewidth="24" tileheight="24" infinite="0" nextlayerid="9" nextobjectid="2">
+ <properties>
+  <property name="Level Type" propertytype="LevelType" value="Dungeon"/>
+ </properties>
  <tileset firstgid="1" source="../maps/Tilesheet_No_Shadow24x24.tsx"/>
  <tileset firstgid="2913" source="../maps/Decorations_c1_No_Shadow24x24.tsx"/>
  <layer id="5" name="Layer 1" width="200" height="120">
@@ -374,4 +377,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
+ <objectgroup id="8" name="Spawn Zones">
+  <object id="1" name="End Zone" type="EndZone" x="1608" y="1464" width="72" height="72"/>
+ </objectgroup>
 </map>
diff --git a/Crawler/assets/Campaigns/1_5.tmx b/Crawler/assets/Campaigns/1_5.tmx
index 150284d2..fbdaf36b 100644
--- a/Crawler/assets/Campaigns/1_5.tmx
+++ b/Crawler/assets/Campaigns/1_5.tmx
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="200" height="250" tilewidth="24" tileheight="24" infinite="0" nextlayerid="6" nextobjectid="1">
+<map version="1.10" tiledversion="1.10.1" class="Map" orientation="orthogonal" renderorder="right-down" width="200" height="250" tilewidth="24" tileheight="24" infinite="0" nextlayerid="7" nextobjectid="2">
+ <properties>
+  <property name="Level Type" propertytype="LevelType" value="Dungeon"/>
+ </properties>
  <tileset firstgid="1" source="../maps/Tilesheet_No_Shadow24x24.tsx"/>
  <tileset firstgid="2913" source="../maps/Decorations_c1_No_Shadow24x24.tsx"/>
  <tileset firstgid="4533" source="../maps/24x24_Waterfall.tsx"/>
@@ -257,6 +260,9 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
+ <objectgroup id="6" name="Spawn Zones">
+  <object id="1" name="End Zone" type="EndZone" x="2976" y="1608" width="72" height="72"/>
+ </objectgroup>
  <layer id="3" name="Layer 2" width="200" height="250">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
diff --git a/Crawler/assets/Campaigns/World_Map.tmx b/Crawler/assets/Campaigns/World_Map.tmx
index 7a6ce804..47f7f8dd 100644
--- a/Crawler/assets/Campaigns/World_Map.tmx
+++ b/Crawler/assets/Campaigns/World_Map.tmx
@@ -594,7 +594,7 @@
    <properties>
     <property name="Connection 1" type="object" value="6"/>
     <property name="Map" propertytype="Level" value="STORY_1_2"/>
-    <property name="Type" propertytype="StageType" value="DUNGEON"/>
+    <property name="Type" propertytype="StageType" value="STORY"/>
     <property name="Unlock Condition" propertytype="Level" value="CAMPAIGN_1_2"/>
    </properties>
   </object>
@@ -618,6 +618,7 @@
    <properties>
     <property name="Connection 1" type="object" value="0"/>
     <property name="Map" propertytype="Level" value="BOSS_1"/>
+    <property name="Type" propertytype="StageType" value="BOSS"/>
     <property name="Unlock Condition" propertytype="Level" value="CAMPAIGN_1_8"/>
    </properties>
   </object>
diff --git a/Crawler/assets/config/levels.txt b/Crawler/assets/config/levels.txt
index eb7843b3..400276b3 100644
--- a/Crawler/assets/config/levels.txt
+++ b/Crawler/assets/config/levels.txt
@@ -8,4 +8,7 @@ Levels
     BOSS_1          =   Boss_1_v2.tmx
 
     CAMPAIGN_1_2    =   1_2.tmx
+    CAMPAIGN_1_3    =   1_3.tmx
+    CAMPAIGN_1_4    =   1_4.tmx
+    CAMPAIGN_1_5    =   1_5.tmx
 }
\ No newline at end of file
diff --git a/Crawler/discord-files/core.cpp b/Crawler/discord-files/core.cpp
index 110c9ef6..e09f1048 100644
--- a/Crawler/discord-files/core.cpp
+++ b/Crawler/discord-files/core.cpp
@@ -43,7 +43,7 @@ Result Core::Create(ClientId clientId, std::uint64_t flags, Core** instance)
 Core::~Core()
 {
     if (internal_) {
-        internal_->destroy(internal_);
+        //internal_->destroy(internal_);
         internal_ = nullptr;
     }
 }