Merge with master

Adventures in Lestoria Tests/BuffTests.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:
@@ -74,6 +74,7 @@ namespace BuffTests
 			Menu::InitializeMenus();
 			Tutorial::Initialize();
 			Stats::InitializeDamageReductionTable();
+			Monster::InitializeStrategies();
 
 			GameState::Initialize();
 			GameState::STATE=GameState::states.at(States::State::GAME_RUN);

Adventures in Lestoria Tests/EnchantTests.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:
@@ -81,6 +81,7 @@ namespace EnchantTests
 			Menu::InitializeMenus();
 			Tutorial::Initialize();
 			Stats::InitializeDamageReductionTable();
+			Monster::InitializeStrategies();
 
 			GameState::Initialize();
 			GameState::STATE=GameState::states.at(States::State::GAME_RUN);

Adventures in Lestoria Tests/EngineTests.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria Tests/FileTests.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria Tests/GameHelper.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:
@@ -60,7 +60,7 @@ namespace Game{
 		Game::Update(ability.precastInfo.castTime);
 	}
 	inline void ChangeClass(Player*&player_in,const Class&cl){
-		game->ChangePlayerClass(cl);
+		game->ResetPlayerAndChangeClass(cl);
 		player_in=game->GetPlayer();
 	}
 	inline std::weak_ptr<Item>GiveAndEquipEnchantedRing(const std::string_view enchantName,const EquipSlot slot=EquipSlot::RING1){
@@ -84,6 +84,11 @@ namespace Game{
 		game->GetPlayer()->AddBuff(type,duration,intensity,attr);
 		Update(0.f);
 	}
+
+	inline void ResetPlayerAndChangeClass(Class cl,Player*&pl,AiL*const game){
+		game->ResetPlayerAndChangeClass(cl);
+		pl=game->GetPlayer(); //The player pointer has been reassigned...
+	}
 }
 
 namespace Test

Adventures in Lestoria Tests/GeometryTests.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria Tests/ItemTests.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:
@@ -273,8 +273,7 @@ namespace ItemTests
 				}
 				if(ItemEnchantInfo::ENCHANT_LIST.at(slimeKingRing.lock()->GetEnchant().value().Name()).GetClass().has_value())Assert::AreEqual(int(player->GetClass()),int(ItemEnchantInfo::ENCHANT_LIST.at(slimeKingRing.lock()->GetEnchant().value().Name()).GetClass().value())); //Validate enchant is only for this class if it's a class-based ability.
 			}
-			testGame->ChangePlayerClass(WIZARD);
-			player=testGame->GetPlayer(); //The player pointer has been reassigned...
+			Game::ResetPlayerAndChangeClass(WIZARD,player,&*testGame);
 			for(int i:std::ranges::iota_view(0,1000)){
 				std::optional<ItemEnchant> previousEnchant{slimeKingRing.lock()->GetEnchant()};
 				std::string previousEnchantName{};

Adventures in Lestoria Tests/MonsterTests.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:
@@ -535,6 +535,7 @@ namespace MonsterTests
 		}
 		TEST_METHOD(MonsterCollisionRadiusTest){
 			Monster&parrot{game->SpawnMonster({},MONSTER_DATA.at("Parrot"))};
+			parrot.strategy="[TEST]Run Right"; //Disable default AI for testing collisions
 			Game::Update(1.f);
 			Game::Update(1.f);
 			Assert::AreEqual(parrot.GetOriginalCollisionRadius(),parrot.GetCollisionRadius(),L"Parrot collision radius should be normal.");
@@ -555,5 +556,34 @@ namespace MonsterTests
 		TEST_METHOD(MonsterCollisionRadiusSizeTest){
 			Monster&parrot{game->SpawnMonster({},MONSTER_DATA.at("Parrot"))};
 		}
+		TEST_METHOD(MonsterRunRightTest){
+			testGame->InitializeLevel("map_path"_S+DATA["Levels"]["TEST_MAP"]["Map File"].GetString(),"TEST_MAP");
+			testGame->_SetCurrentLevel("TEST_MAP");
+			testGame->GetPlayer()->ForceSetPos({100,100});
+			Monster&boar{game->SpawnMonster({24,24},MONSTER_DATA.at("Boar"))};
+			Game::Update(0.f); // Make sure monster spawns first.
+			boar.strategy="[TEST]Run Right";
+			const vf2d originalBoarPos{boar.GetPos()};
+			Game::Update(0.5f);
+			Assert::IsTrue(originalBoarPos+vf2d{50.f*boar.GetMoveSpdMult(),0.f}==boar.GetPos(),util::wformat("The boar should have moved {} units in half a second. Expected {}=={}",50.f*boar.GetMoveSpdMult(),(originalBoarPos+vf2d{50.f*boar.GetMoveSpdMult(),0.f}).str(),boar.GetPos().str()).c_str());
+		}
+		TEST_METHOD(MonsterHasteMoveTest){
+			testGame->InitializeLevel("map_path"_S+DATA["Levels"]["TEST_MAP"]["Map File"].GetString(),"TEST_MAP");
+			testGame->_SetCurrentLevel("TEST_MAP");
+			Monster&parrot{game->SpawnMonster({24,24},MONSTER_DATA.at("Parrot"))};
+			Game::Update(0.f); // Make sure monster spawns first.
+			parrot.strategy="[TEST]Run Right";
+			{
+				const vf2d originalParrotPos{parrot.GetPos()};
+				Game::Update(0.5f);
+				Assert::IsTrue(originalParrotPos+vf2d{50.f*parrot.GetMoveSpdMult(),0.f}==parrot.GetPos(),util::wformat("The parrot should have moved {} units in half a second without the Hasten buff. Expected {}=={}",50.f*parrot.GetMoveSpdMult(),(originalParrotPos+vf2d{50.f*parrot.GetMoveSpdMult(),0.f}).str(),parrot.GetPos().str()).c_str());
+			}
+			parrot.AddBuff(BuffType::HASTEN,INFINITE,0.3f);
+			{
+				const vf2d originalParrotPos{parrot.GetPos()};
+				Game::Update(0.5f);
+				Assert::IsTrue(originalParrotPos+vf2d{65.f*parrot.GetMoveSpdMult(),0.f}==parrot.GetPos(),util::wformat("The parrot should have moved {} units in half a second without the Hasten buff. Expected {}=={}",65.f*parrot.GetMoveSpdMult(),(originalParrotPos+vf2d{65.f*parrot.GetMoveSpdMult(),0.f}).str(),parrot.GetPos().str()).c_str());
+			}
+		}
 	};
 }

Adventures in Lestoria Tests/PlayerTests.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:
@@ -158,7 +158,7 @@ namespace PlayerTests
 			Assert::AreEqual(int(State::BLOCK),int(player->GetState()));
 		}
 		TEST_METHOD(WizardCastDoesNotConsumeManaImmediately){
-			testGame->ChangePlayerClass(WIZARD);
+			testGame->ResetPlayerAndChangeClass(WIZARD);
 			player=testGame->GetPlayer(); //The player pointer has been reassigned...
 			//Ability 3 is Meteor, which is a cast. Mana should not be consumed for a spell that begins as a cast.
 			testKey->bHeld=true; //Force the key to be held down for testing purposes.
@@ -166,7 +166,7 @@ namespace PlayerTests
 			Assert::AreEqual(player->GetMaxMana(),player->GetMana());
 		}
 		TEST_METHOD(RangerCastDoesNotConsumeManaImmediately){
-			testGame->ChangePlayerClass(RANGER);
+			testGame->ResetPlayerAndChangeClass(RANGER);
 			player=testGame->GetPlayer(); //The player pointer has been reassigned...
 			//Ability 2 is Charged Shot, which is a cast. Mana should not be consumed for a spell that begins as a cast.
 			testKey->bHeld=true; //Force the key to be held down for testing purposes.
@@ -588,7 +588,7 @@ namespace PlayerTests
 			Assert::AreEqual(player->GetMaxHealth(),player->GetHealth(),L"After waiting for 1 second, the player should be at full health.");
 		}
 		TEST_METHOD(AdrenalineRushSkillBuffTest){
-			testGame->ChangePlayerClass(THIEF);
+			testGame->ResetPlayerAndChangeClass(THIEF);
 			player=testGame->GetPlayer(); //The player pointer has been reassigned...
 			Assert::AreEqual(1.f,player->GetMoveSpdMult(),L"Move Speed Multiplier is set to x1.0 by default.");
 			Assert::AreEqual(0.f,player->GetAttackRecoveryRateReduction(),L"Attack rate cooldown starts with being reduced by 0 seconds.");
@@ -729,7 +729,7 @@ namespace PlayerTests
 			}
 		}
 		TEST_METHOD(ChargesEquipBehaviorCheck){
-			testGame->ChangePlayerClass(RANGER);
+			testGame->ResetPlayerAndChangeClass(RANGER);
 			player=testGame->GetPlayer();
 			player->GetAbility3().charges=3;
 			testKey->bHeld=true; //Force the key to be held down for testing purposes.
@@ -740,7 +740,7 @@ namespace PlayerTests
 			Assert::AreEqual(uint8_t(0),player->GetAbility3().charges,L"Back down to 0 charges without having Multi-Multishot enchant equipped.");
 		}
 		TEST_METHOD(CooldownEquipBehaviorCheck){
-			testGame->ChangePlayerClass(RANGER);
+			testGame->ResetPlayerAndChangeClass(RANGER);
 			player=testGame->GetPlayer();
 			float oldCooldownTime{player->GetAbility3().GetCooldownTime()};
 			player->GetAbility3().cooldown=player->GetAbility3().GetCooldownTime();
@@ -799,5 +799,55 @@ namespace PlayerTests
 			player->Hurt(10U,player->OnUpperLevel(),player->GetZ());
 			Assert::AreEqual(player->GetMaxHealth()-10,player->GetHealth(),L"Player now takes damage with 0 shield.");
 		}
+		TEST_METHOD(PlayerHasteMoveCheck){
+			testGame->InitializeLevel("map_path"_S+DATA["Levels"]["TEST_MAP"]["Map File"].GetString(),"TEST_MAP");
+			testGame->_SetCurrentLevel("TEST_MAP");
+			player=testGame->GetPlayer();
+			player->ForceSetPos({12,12});
+			testKeyboardInput.AddKeybind(Input{InputType::KEY,D});
+			testKey=testGame->GetKeyboardState(D);
+			testKey->bHeld=true;
+			{
+				const vf2d originalPlayerPos{player->GetPos()};
+				Game::Update(0.5f);
+				Assert::IsFalse(originalPlayerPos==player->GetPos(),L"The player should have moved when holding down the D key.");
+				const float movedDist{(originalPlayerPos-player->GetPos()).mag()};
+				Assert::AreEqual(50.f,movedDist,L"The player should have moved 50 units in half a second with no buffs.");
+			}
+			Game::AddBuffToPlayer(BuffType::HASTEN,INFINITE,0.3f);
+			const vf2d originalHastenedPlayerPos{player->GetPos()};
+			Game::Update(0.5f);
+			const float hastenMovedDist{(originalHastenedPlayerPos-player->GetPos()).mag()};
+			Assert::AreEqual(65.f,hastenMovedDist,L"The player should have moved 65 units in half a second with the Hasten buff.");
+			player->RemoveAllBuffs();
+			{
+				const vf2d originalPlayerPos{player->GetPos()};
+				Game::Update(0.5f);
+				const float movedDist{(originalPlayerPos-player->GetPos()).mag()};
+				Assert::AreEqual(50.f,movedDist,L"The player should have moved 50 units in half a second with no buffs.");
+			}
+		}
+		TEST_METHOD(PlayerHasteCooldownCheck){
+			testGame->InitializeLevel("map_path"_S+DATA["Levels"]["TEST_MAP"]["Map File"].GetString(),"TEST_MAP");
+			testGame->_SetCurrentLevel("TEST_MAP");
+			player=testGame->GetPlayer();
+			player->ForceSetPos({12,12});
+			testKeyboardInput.AddKeybind(Input{InputType::KEY,D});
+			testKey=testGame->GetKeyboardState(D);
+			testKey->bHeld=true;
+			Game::CastAbilityAtLocation(player->GetAbility3(),{});
+			Game::Update(5.f);
+			Assert::AreEqual(player->GetAbility3().GetCooldownTime()-5.f,player->GetAbility3().cooldown,L"Sonic Slash should have 5 seconds removed from its cooldown time.");
+			Game::ResetPlayerAndChangeClass(Class::WARRIOR,player,&*testGame);
+			Game::CastAbilityAtLocation(player->GetAbility3(),{});
+			Game::AddBuffToPlayer(BuffType::HASTEN,INFINITE,0.3f);
+			Game::Update(5.f);
+			Assert::AreEqual(player->GetAbility3().GetCooldownTime()-6.5f,player->GetAbility3().cooldown,L"Sonic Slash should have 6.5 seconds removed from its cooldown time.");
+			player->RemoveAllBuffs();
+			player->GetAbility3().cooldown=0;
+			Game::CastAbilityAtLocation(player->GetAbility3(),{});
+			Game::Update(5.f);
+			Assert::AreEqual(player->GetAbility3().GetCooldownTime()-5.f,player->GetAbility3().cooldown,L"Sonic Slash should have 5 seconds removed from its cooldown time with no buffs.");
+		}
 	};
 }

Adventures in Lestoria/Ability.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Ability.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/AccessoryRowItemDisplay.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Adventures in Lestoria.vcxproj

@@ -283,7 +283,7 @@
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpplatest</LanguageStandard>
-      <AdditionalIncludeDirectories>C:\Users\LabUser\source\repos\AdventuresInLestoria\Adventures in Lestoria\steam;$(ProjectDir)steam;$(ProjectDir)discord-files;C:\Users\LabUser\source\repos\AdventuresInLestoria\Adventures in Lestoria\discord-files;C:\Users\LabUser\Documents\include;C:\Users\niconiconii\source\repos\AdventuresInLestoria\Adventures in Lestoria\discord-files;C:\Users\niconiconii\OneDrive\Documents\include;C:\Users\niconiconii\source\repos\AdventuresInLestoria\Adventures in Lestoria\steam;C:\Users\sigon\source\repos\AdventuresInLestoria\Adventures in Lestoria\steam;C:\Users\sigon\source\repos\AdventuresInLestoria\Adventures in Lestoria\discord-files;C:\Users\sigon\OneDrive\Documents\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)steam;$(ProjectDir)discord-files;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
@@ -1144,6 +1144,10 @@
       <SubType>
       </SubType>
     </ClCompile>
+    <ClCompile Include="SkeletonBarbarian.cpp">
+      <SubType>
+      </SubType>
+    </ClCompile>
     <ClCompile Include="State_Arena.cpp" />
     <ClCompile Include="ThrownProjectile.cpp">
       <SubType>
@@ -1288,6 +1292,7 @@
     <ClCompile Include="Wizard.cpp" />
     <ClCompile Include="Wolf.cpp" />
     <ClCompile Include="Zephy.cpp" />
+    <ClCompile Include="_RunRight.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\commit.bat" />

Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters

@@ -1106,9 +1106,6 @@
     <ClCompile Include="DaggerStab.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Do_Nothing.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="LevitatingRock.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1325,6 +1322,15 @@
     <ClCompile Include="State_Arena.cpp">
       <Filter>Source Files\Game States</Filter>
     </ClCompile>
+    <ClCompile Include="SkeletonBarbarian.cpp">
+      <Filter>Source Files\Monster Strategies</Filter>
+    </ClCompile>
+    <ClCompile Include="_RunRight.cpp">
+      <Filter>Source Files\Monster Strategies</Filter>
+    </ClCompile>
+    <ClCompile Include="Do_Nothing.cpp">
+      <Filter>Source Files\Monster Strategies</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="cpp.hint" />

Adventures in Lestoria/AdventuresInLestoria.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:
@@ -321,7 +321,6 @@ bool AiL::OnUserCreate(){
 	//Initialize Camera.
 	InitializeCamera();
 
-	sig::Animation::SetupPlayerAnimations();
 	view=TileTransformedView{GetScreenSize(),{1,1}};
 
 	Audio::Initialize();
@@ -330,7 +329,7 @@ bool AiL::OnUserCreate(){
 
 	Menu::InitializeMenus();
 
-	ChangePlayerClass(WARRIOR);
+	ResetPlayerAndChangeClass(WARRIOR);
 
 	GameState::Initialize();
 	GameState::ChangeState(States::MAIN_MENU);
@@ -445,6 +444,12 @@ bool AiL::OnConsoleCommand(const std::string& sCommand){
 				std::weak_ptr<Item>accessory{Inventory::AddItem(args[1])};
 				if(args.size()>=3)accessory.lock()->_EnchantItem(ItemEnchant{args[2]});
 				ConsoleOut()<<"Added "<<args[1]<<" to player's inventory."<<std::endl;
+			}else
+			if(args[0]=="/mana"){
+				if(args.size()>=2){
+					GetPlayer()->mana=std::stoi(args[1]);
+					ConsoleOut()<<"Set Player's mana to "<<GetPlayer()->mana<<std::endl;
+				}else ConsoleOut()<<"Usage: /mana <val>"<<std::endl;
 			}else{
 				ConsoleOut()<<"Invalid command! Use /help to see available commands."<<std::endl;
 			}
@@ -1073,14 +1078,16 @@ void AiL::RenderWorld(float fElapsedTime){
 		const std::vector<Buff>damageReductionBuffs{player->GetBuffs(BuffType::DAMAGE_REDUCTION)};
 		const std::vector<Buff>inkSlowdownDebuff{player->GetBuffs(BuffType::INK_SLOWDOWN)};
 		const std::vector<Buff>curseDebuff{player->GetBuffs(BuffType::PIRATE_GHOST_CAPTAIN_CURSE_DOT)};
+		const std::vector<Buff>hastenBuff{player->GetBuffs(BuffType::HASTEN)};
 		const bool displayCoinSymbol{player->GetBuffs(BuffType::PIRATE_GHOST_CAPTAIN_CURSE_COIN).size()>0};
 
 		Pixel playerCol{WHITE};
-		if(attackBuffs.size()>0)playerCol={255,uint8_t(255*abs(sin(1.4f*attackBuffs[0].duration))),uint8_t(255*abs(sin(1.4f*attackBuffs[0].duration)))};
-		else if(adrenalineRushBuffs.size()>0)playerCol={uint8_t(255*abs(sin(6.f*adrenalineRushBuffs[0].duration))),255,uint8_t(255*abs(sin(6.f*adrenalineRushBuffs[0].duration)))};
-		else if(movespeedBuffs.size()>0)playerCol={uint8_t(255*abs(sin(2.f*movespeedBuffs[0].duration))),255,uint8_t(255*abs(sin(2.f*movespeedBuffs[0].duration)))};
-		else if(inkSlowdownDebuff.size()>0)playerCol={uint8_t(255*abs(sin(2.f*inkSlowdownDebuff[0].duration))),uint8_t(255*abs(sin(2.f*inkSlowdownDebuff[0].duration))),uint8_t(255*abs(sin(2.f*inkSlowdownDebuff[0].duration)))};
+		if(attackBuffs.size()>0)playerCol={255,uint8_t(255*abs(sin(1.4f*attackBuffs[0].lifetime))),uint8_t(255*abs(sin(1.4f*attackBuffs[0].lifetime)))};
+		else if(adrenalineRushBuffs.size()>0)playerCol={uint8_t(255*abs(sin(6.f*adrenalineRushBuffs[0].lifetime))),255,uint8_t(255*abs(sin(6.f*adrenalineRushBuffs[0].lifetime)))};
+		else if(movespeedBuffs.size()>0)playerCol={uint8_t(255*abs(sin(2.f*movespeedBuffs[0].lifetime))),255,uint8_t(255*abs(sin(2.f*movespeedBuffs[0].lifetime)))};
+		else if(inkSlowdownDebuff.size()>0)playerCol={uint8_t(255*abs(sin(2.f*inkSlowdownDebuff[0].lifetime))),uint8_t(255*abs(sin(2.f*inkSlowdownDebuff[0].lifetime))),uint8_t(255*abs(sin(2.f*inkSlowdownDebuff[0].lifetime)))};
 		else if(curseDebuff.size()>0)playerCol={uint8_t(128*abs(sin(2.f*GetRunTime()))+127),uint8_t(128*abs(sin(2.f*GetRunTime()))),uint8_t(128*abs(sin(2.f*GetRunTime()))+127)};
+		else if(hastenBuff.size()>0)playerCol={uint8_t(abs(sin(0.4f*GetRunTime()))+127),uint8_t(0),uint8_t(0)};
 		
 		if(player->HasIframes())playerCol.a*=0.62f;
 
@@ -1999,11 +2006,11 @@ void AiL::RenderHud(){
 	DrawDecal({2,2},GFX["heart_outline.png"].Decal(),{1.f,1.f},healthOutlineCol);
 	const Decal*heartImg{GFX["heart.png"].Decal()};
 	if(player->GetShield()>0)heartImg=GFX["shield_heart.png"].Decal();
-	float healthRatio{float(healthCounter.GetDisplayValue())/player->GetMaxHealth()};
-	float manaRatio{float(manaCounter.GetDisplayValue())/player->GetMaxMana()};
-	DrawPartialDecal(vf2d{2.f,floor(2+(15*(1-healthRatio)))},const_cast<Decal*>(heartImg),vf2d{0.f,floor(15*(1-healthRatio))},vf2d{17.f,floor(15*healthRatio)});
+	int healthRatio{int((float(healthCounter.GetDisplayValue())/player->GetMaxHealth())*100)};
+	int manaRatio{int((float(manaCounter.GetDisplayValue())/player->GetMaxMana())*100)};
+	DrawPartialDecal(vi2d{2,2+int((15*(100-healthRatio))/100.f)},const_cast<Decal*>(heartImg),vi2d{0,int(15*(100-healthRatio)/100.f)},vi2d{17,int(15*healthRatio/100.f)});
 	DrawDecal({2,20},GFX["mana_outline.png"].Decal());
-	DrawPartialDecal(vf2d{2,float(20+(15*(1-manaRatio)))},GFX["mana.png"].Decal(),vf2d{0.f,float(15*(1-manaRatio))},vf2d{17,float(15*manaRatio)});
+	DrawPartialDecal(vi2d{2,20+int((15*(100-manaRatio))/100.f)},GFX["mana.png"].Decal(),vi2d{0,int(15*(100-manaRatio)/100.f)},vi2d{17,int(15*manaRatio/100.f)});
 	std::string text=player->GetHealth()>0?std::to_string(healthCounter.GetDisplayValue()+shieldCounter.GetDisplayValue()):"X";
 	std::string text_mana=std::to_string(manaCounter.GetDisplayValue());
 
@@ -2929,7 +2936,7 @@ const MapName&AiL::GetCurrentLevel()const{
 	}
 }
 
-void AiL::ChangePlayerClass(Class cl){
+void AiL::ResetPlayerAndChangeClass(Class cl){
 	Ability itemAbility1=player->useItem1;
 	Ability itemAbility2=player->useItem2;
 	Ability itemAbility3=player->useItem3;
@@ -4382,7 +4389,16 @@ void AiL::UpdateMonsters(){
 			AMonsterIsMarkedForDeletion();
 			continue;
 		}
-		[[likely]]if(m->isBoss||m->GetDistanceFrom(GetPlayer()->GetPos())<40.f*24)m->Update(game->GetElapsedTime());
+		[[likely]]if(m->isBoss||m->GetDistanceFrom(GetPlayer()->GetPos())<40.f*24){
+			//In order to simulate attack speeds, movement speeds, and other boosts via haste we are going to artificially affect
+			//all fElapsedTime retrievals to make it seem like everything is faster for this unit.
+			const float originalElapsedTime{GetElapsedTime()};
+			const float adjustedElapsedTime{originalElapsedTime*m->GetHastePct()};
+			SetElapsedTime(adjustedElapsedTime); //All calls to GetElapsedTime() should reciprocate the fake amount of added time passed.
+			m->Update(GetElapsedTime());
+			SetElapsedTime(originalElapsedTime);
+			[[unlikely]]if(GetElapsedTime()!=originalElapsedTime)ERR(std::format("WARNING! Readjusted elapsed time is not equal to original elapsed time!!! {} ~= {}. THIS SHOULD NOT BE HAPPENING!!!",GetElapsedTime(),originalElapsedTime));
+		}
 	}
 	for(std::shared_ptr<Monster>&m:game->monstersToBeSpawned){
 		size_t prevCapacity=MONSTER_LIST.capacity();
@@ -4541,7 +4557,9 @@ void AiL::UpdateEntities(){
 	for(std::shared_ptr<Monster>&m:MONSTER_LIST){
 		m->B(Attribute::COLLIDED_WITH_PLAYER)=false;
 	}
-	GetPlayer()->Update(GetElapsedTime());
+	//In order to simulate attack speeds, movement speeds, and other boosts via haste we are going to artificially affect
+	//all fElapsedTime retrievals to make it seem like everything is faster for this unit.
+	GetPlayer()->Update(GetElapsedTime()*GetPlayer()->GetHastePct());
 	UpdateMonsters();
 
 	ItemDrop::UpdateDrops(GetElapsedTime());

Adventures in Lestoria/AdventuresInLestoria.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:
@@ -319,7 +319,7 @@ public:
 	bool IsBridgeLayer(LayerTag&layer);
 	bool IsOverlayLayer(LayerTag&layer);
 	void PopulateRenderLists();
-	void ChangePlayerClass(Class cl);
+	void ResetPlayerAndChangeClass(Class cl);
 	std::string GetString(std::string key);
 	datafilestringdata GetStringList(std::string key);
 	int GetInt(std::string key);

Adventures in Lestoria/Animation.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Animation.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Arc.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Arc.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Arrow.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/ArtificerDisassembleWindow.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:
@@ -46,6 +46,7 @@ All rights reserved.
 #include "SoundEffect.h"
 
 INCLUDE_game
+INCLUDE_GFX
 
 void Menu::InitializeArtificerDisassembleWindow(){
 	Menu*artificerDisassembleWindow=CreateMenu(ARTIFICER_DISASSEMBLE,CENTERED,game->GetScreenSize()-vi2d{52,52});
@@ -109,7 +110,7 @@ void Menu::InitializeArtificerDisassembleWindow(){
 			EnableDisassemblyDisplay();
 			RowItemDisplay&item{*DYNAMIC_POINTER_CAST<RowItemDisplay>(data.component)};
 			Component<MenuItemItemButton>(data.menu.type,"Item Icon")->SetItem(item.GetItem().lock());
-			Component<MenuIconButton>(data.menu.type,"Disassembly Result")->SetIcon(item.GetItem().lock()->Icon().Decal());
+			Component<MenuIconButton>(data.menu.type,"Disassembly Result")->SetIcon(GFX[item.GetItem().lock()->FragmentIcon().value_or("pixel.png")].Decal());
 			Component<MenuLabel>(data.menu.type,"Disassembly Result Title")->SetLabel(item.GetItem().lock()->FragmentName());
 			Component<MenuLabel>(data.menu.type,"Fragment Total Count")->SetLabel(std::format("Currently Owned: {}",Inventory::GetItemCount(item.GetItem().lock()->FragmentName())));
 			return true;	
@@ -119,7 +120,7 @@ void Menu::InitializeArtificerDisassembleWindow(){
 			if(childComponent){
 				RowItemDisplay&item{childComponent.value().get()};
 				Component<MenuItemItemButton>(data.menu.type,"Item Icon")->SetItem(item.GetItem().lock());
-				Component<MenuIconButton>(data.menu.type,"Disassembly Result")->SetIcon(item.GetItem().lock()->Icon().Decal());
+				Component<MenuIconButton>(data.menu.type,"Disassembly Result")->SetIcon(GFX[item.GetItem().lock()->FragmentIcon().value_or("pixel.png")].Decal());
 				Component<MenuLabel>(data.menu.type,"Disassembly Result Title")->SetLabel(item.GetItem().lock()->FragmentName());
 				Component<MenuLabel>(data.menu.type,"Fragment Total Count")->SetLabel(std::format("Currently Owned: {}",Inventory::GetItemCount(item.GetItem().lock()->FragmentName())));
 				EnableDisassemblyDisplay();

Adventures in Lestoria/ArtificerEnchantConfirmWindow.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/ArtificerEnchantWindow.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/ArtificerRefineResultWindow.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/ArtificerRefineWindow.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/ArtificerWindow.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Attributable.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/AttributableStat.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/AttributableStat.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Audio.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Audio.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Bear.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/BearTrap.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/BitwiseEnum.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/BlackHole.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/BlacksmithCraftingWindow.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Boar.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Bomb.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/BombBoom.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/BreakingPillar.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Buff.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Buff.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:
@@ -69,6 +69,7 @@ enum BuffType{
 	PIRATE_GHOST_CAPTAIN_PRECURSE, //A coin icon appears above the player's head.
 	PIRATE_GHOST_CAPTAIN_CURSE_COIN, //A coin icon appears above the player's head.
 	PIRATE_GHOST_CAPTAIN_CURSE_DOT, //The same as above, but now is a damage over time as well.
+	HASTEN, //Any unit under this effect gets X% Attack,Movement speed, and Animation speed
 };
 enum class BuffRestorationType{
 	ONE_OFF, //This is used as a hack fix for the RestoreDuringCast Item script since they require us to restore 1 tick immediately. Over time buffs do not apply a tick immediately.

Adventures in Lestoria/Bullet.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Bullet.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/BulletTypes.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/BurstBullet.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/BuyItemWindow.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/CharacterAbilityPreviewComponent.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/CharacterMenuWindow.cpp

@@ -4,7 +4,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/CharacterRotatingDisplay.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/ChargedArrow.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Checkbox.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Class.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/ClassInfo.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/ClassInfoWindow.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/ClassSelectionWindow.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:
@@ -92,7 +92,7 @@ void Menu::InitializeClassSelectionWindow(){
 		Inventory::AddItem("Minor Health Potion"s,3);
 		Inventory::AddItem("Bandages"s,10);
 
-		data.game->ChangePlayerClass(classutils::StringToClass(selectedClass));
+		data.game->ResetPlayerAndChangeClass(classutils::StringToClass(selectedClass));
 		#ifdef __EMSCRIPTEN__
 			if(SaveFile::IsOnline()){
 				SaveFile::SetSaveFileID(SaveFile::GetOnlineSaveFileCount());

Adventures in Lestoria/CollectedCoinEffect.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/ConnectionPoint.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/ConnectionPoint.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/ConsoleCommands.txt

@@ -7,4 +7,5 @@ Items with spaces must be surrounded in quotation marks "".
 Valid Commands are:
 /help - Shows this help file.
 /give <Item Name> [Amount] - Gives an item of type <Item Name> into the player's inventory. Optionally adds [Amount] amount of items to the player's inventory.
-/accessory <Accessory Name> [Enchant Name] - Gives an accessory of type <Accessory Name> into the player's inventory. Optionally adds an enchant of type [Enchant Name].
+/accessory <Accessory Name> [Enchant Name] - Gives an accessory of type <Accessory Name> into the player's inventory. Optionally adds an enchant of type [Enchant Name].
+/mana <val> - Sets player's mana to val.

Adventures in Lestoria/ConsumableCraftItemWindow.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/ConsumableCraftingWindow.cpp

@@ -4,7 +4,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Crab.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/CraftItemWindow.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/CraftingRequirement.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/CraftingRequirement.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/CreditsWindow.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/DEFINES.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/DaggerSlash.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/DaggerStab.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/DamageNumber.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/DamageNumber.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/DeadlyDash.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/DeathMenu.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Debris.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Direction.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Do_Nothing.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/DynamicCounter.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/DynamicCounter.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/DynamicMenuLabel.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Effect.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Effect.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Emitter.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Emitter.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/EncountersSpawnListScrollableWindowComponent.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/EnergyBolt.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/EnhancementStatsLabel.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Entity.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Entity.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/EnvironmentalAudio.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/EnvironmentalAudio.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/EquipSlotButton.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Error.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/ExpandingRing.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/ExplosiveTrap.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/FadeInOutEffect.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/FallingBullet.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/FallingDebris.h

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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:

Adventures in Lestoria/Feather.cpp

@@ -3,7 +3,7 @@
 License (OLC-3)
 ~~~~~~~~~~~~~~~
 
-Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>
+Copyright 2026 Amy 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: