Adventures in Lestoria/Adventures in Lestoria.vcxproj

@@ -661,7 +661,6 @@
       </SubType>
     </ClInclude>
     <ClInclude Include="State.h" />
-    <ClInclude Include="State_Arena.h" />
     <ClInclude Include="State_Death.h">
       <SubType>
       </SubType>
@@ -1144,7 +1143,6 @@
       <SubType>
       </SubType>
     </ClCompile>
-    <ClCompile Include="State_Arena.cpp" />
     <ClCompile Include="ThrownProjectile.cpp">
       <SubType>
       </SubType>

Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters

@@ -714,9 +714,6 @@
     <ClInclude Include="Entity.h">
       <Filter>Header Files\Utils</Filter>
     </ClInclude>
-    <ClInclude Include="State_Arena.h">
-      <Filter>Header Files\State</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Player.cpp">
@@ -1319,9 +1316,6 @@
     <ClCompile Include="CollectedCoinEffect.cpp">
       <Filter>Source Files\Effects</Filter>
     </ClCompile>
-    <ClCompile Include="State_Arena.cpp">
-      <Filter>Source Files\Game States</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="cpp.hint" />

Adventures in Lestoria/GameState.cpp

@@ -44,7 +44,6 @@ All rights reserved.
 #include "State_GameHub.h"
 #include "State_Death.h"
 #include "State_Dialog.h"
-#include "State_Arena.h"
 
 INCLUDE_game
 
@@ -61,7 +60,6 @@ void GameState::Initialize(){
 	NEW_STATE(States::GAME_HUB,State_GameHub);
 	NEW_STATE(States::DEATH,State_Death);
 	NEW_STATE(States::DIALOG,State_Dialog);
-	NEW_STATE(States::ARENA,State_Arena);
 }
 
 void GameState::_ChangeState(States::State newState){

Adventures in Lestoria/GameState.h

@@ -54,7 +54,6 @@ namespace States{
 		DIALOG,
 		KEYBIND,
 		DEATH,
-		ARENA,
 	};
 };
 
@@ -79,6 +78,5 @@ public:
 	virtual void GetAnyMouseRelease(int32_t mouseButton);
 	static void ChangeState(States::State newState,float fadeOutDuration=0,uint8_t mosaicEffect=1U);
 	virtual void OnLevelLoad()=0;
-	virtual bool IsPlayerControlledGameplayState()=0; //Return true if this state allows the player to be controlled. Returns false for any other type of state.
 	static States::State GetCurrentState();
 };

Adventures in Lestoria/Player.cpp

@@ -892,7 +892,7 @@ bool Player::CanAct(){
 
 const bool Player::CanAct(const Ability&ability){
 	return knockUpTimer==0&&!ability.waitForRelease&&(ability.canCancelCast||state!=State::CASTING)&&state!=State::ANIMATION_LOCK&&state!=State::DEADLYDASH&&state!=State::RETREAT&&
-		GameState::STATE->IsPlayerControlledGameplayState();
+		(GameState::STATE==GameState::states[States::GAME_RUN]||GameState::STATE==GameState::states[States::GAME_HUB]);
 }
 
 bool Player::HasIframes(){

Adventures in Lestoria/State_Arena.cpp

@@ -1,87 +0,0 @@
-#pragma region License
-/*
-License (OLC-3)
-~~~~~~~~~~~~~~~
-
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions or derivations of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-2. Redistributions or derivative works in binary form must reproduce the above
-copyright notice. This list of conditions and the following	disclaimer must be
-reproduced in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may
-be used to endorse or promote products derived from this software without specific
-prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS	"AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-SHALL THE COPYRIGHT	HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL,	SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-Portions of this software are copyright © 2024 The FreeType
-Project (www.freetype.org). Please see LICENSE_FT.txt for more information.
-All rights reserved.
-*/
-#pragma endregion
-#include "State_Arena.h"
-#include "AdventuresInLestoria.h"
-#include "DEFINES.h"
-#include "Menu.h"
-#include "ItemDrop.h"
-#include "VisualNovel.h"
-#include "State_OverworldMap.h"
-#include "GameEvent.h"
-#include "SaveFile.h"
-#include "MenuComponent.h"
-#include "Unlock.h"
-#include "Tutorial.h"
-
-INCLUDE_MONSTER_LIST
-INCLUDE_game
-
-void State_Arena::OnStateChange(GameState*prevState){
-	if(Menu::IsMenuOpen()){
-		Menu::CloseAllMenus();
-	}
-	
-	if(Unlock::IsUnlocked("STORY_1_3")&&!Tutorial::TaskIsComplete(TutorialTaskName::CLEAR_DEMO)){
-		Tutorial::SetNextTask(TutorialTaskName::CLEAR_DEMO);
-	}
-	else
-	if(Unlock::IsUnlocked("STORY_1_2")&&!Tutorial::TaskIsComplete(TutorialTaskName::BLACKSMITH)){
-		Tutorial::SetNextTask(TutorialTaskName::BLACKSMITH);
-	}
-	else
-	if(Unlock::IsUnlocked("BOSS_2_B")&&!Tutorial::TaskIsComplete(TutorialTaskName::ARTIFICER_INTRO)){
-		Tutorial::SetNextTask(TutorialTaskName::ARTIFICER_INTRO);
-	}
-
-	SaveFile::SaveGame();
-
-	game->GetPlayer()->SetState(State::NORMAL);
-
-	game->LoadLevel("HUB");
-}
-void State_Arena::OnLevelLoad(){
-	game->UpdateDiscordStatus("Eternal Arena",game->GetPlayer()->GetClassName());
-}
-void State_Arena::OnUserUpdate(AiL*game){
-	State_GameRun::OnUserUpdate(game);
-
-	game->ClearTimedOutGarbage();
-}
-void State_Arena::Draw(AiL*game){
-	State_GameRun::Draw(game);
-}

Adventures in Lestoria/State_Arena.h

@@ -1,49 +0,0 @@
-#pragma region License
-/*
-License (OLC-3)
-~~~~~~~~~~~~~~~
-
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions or derivations of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-2. Redistributions or derivative works in binary form must reproduce the above
-copyright notice. This list of conditions and the following	disclaimer must be
-reproduced in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may
-be used to endorse or promote products derived from this software without specific
-prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS	"AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-SHALL THE COPYRIGHT	HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL,	SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-Portions of this software are copyright © 2024 The FreeType
-Project (www.freetype.org). Please see LICENSE_FT.txt for more information.
-All rights reserved.
-*/
-#pragma endregion
-#pragma once
-#include "State_GameRun.h"
-#include "olcPGEX_ViewPort.h"
-
-class State_Arena:public State_GameRun{
-	ViewPort port;
-	Renderable r;
-	virtual void OnStateChange(GameState*prevState)override final;
-	virtual void OnUserUpdate(AiL*game)override final;
-	virtual void Draw(AiL*game)override final;
-	virtual void OnLevelLoad()override final;
-};

Adventures in Lestoria/State_Death.h

@@ -48,5 +48,4 @@ protected:
 	virtual void OnUserUpdate(AiL*game)override;
 	virtual void Draw(AiL*game)override;
 	virtual void OnLevelLoad()override;
-	inline virtual bool IsPlayerControlledGameplayState()override final{return false;}
 };

Adventures in Lestoria/State_Dialog.h

@@ -43,5 +43,4 @@ class State_Dialog:public GameState {
 	virtual void OnUserUpdate(AiL*game)override final;
 	virtual void Draw(AiL*game)override final;
 	virtual void OnLevelLoad()override final;
-	inline virtual bool IsPlayerControlledGameplayState()override final{return false;}
 };

Adventures in Lestoria/State_GameRun.h

@@ -47,5 +47,4 @@ protected:
 	virtual void OnUserUpdate(AiL*game)override;
 	virtual void Draw(AiL*game)override;
 	virtual void OnLevelLoad()override;
-	inline virtual bool IsPlayerControlledGameplayState()override final{return true;}
 };

Adventures in Lestoria/State_LevelComplete.h

@@ -50,7 +50,6 @@ class State_LevelComplete:public GameState{
 	virtual void Draw(AiL*game)override final;
 	virtual void DrawOverlay(AiL*game)override final;
 	virtual void OnLevelLoad()override final;
-	inline virtual bool IsPlayerControlledGameplayState()override final{return false;}
 public:
 	static void TurnOffXPSound();
 };

Adventures in Lestoria/State_MainMenu.h

@@ -43,7 +43,6 @@ class State_MainMenu:public GameState{
 	virtual void OnUserUpdate(AiL*game)override final;
 	virtual void Draw(AiL*game)override final;
 	virtual void OnLevelLoad()override final;
-	inline virtual bool IsPlayerControlledGameplayState()override final{return false;}
 
 	const ZoneData&ChooseRandomFocusArea();
 	vf2d cameraMoveDir;

Adventures in Lestoria/State_OverworldMap.h

@@ -63,7 +63,6 @@ public:
 	virtual void Draw(AiL*game)override final;
 	virtual void DrawOverlay(AiL*game)override final;
 	virtual void OnLevelLoad()override final;
-	inline virtual bool IsPlayerControlledGameplayState()override final{return false;}
 	static void StartLevel();
 	static void UpdateCurrentConnectionPoint(const ConnectionPoint&connection);
 };

Adventures in Lestoria/State_Story.h

@@ -43,5 +43,4 @@ class State_Story:public GameState{
 	virtual void OnUserUpdate(AiL*game)override final;
 	virtual void Draw(AiL*game)override final;
 	virtual void OnLevelLoad()override final;
-	inline virtual bool IsPlayerControlledGameplayState()override final{return false;}
 };

Adventures in Lestoria/Version.h

@@ -39,7 +39,7 @@ All rights reserved.
 #define VERSION_MAJOR 1
 #define VERSION_MINOR 3
 #define VERSION_PATCH 0
-#define VERSION_BUILD 12140
+#define VERSION_BUILD 12137
 
 #define stringify(a) stringify_(a)
 #define stringify_(a) #a