diff --git a/Adventures in Lestoria/Boar.cpp b/Adventures in Lestoria/Boar.cpp index 8bb3ee32..09ee1a4d 100644 --- a/Adventures in Lestoria/Boar.cpp +++ b/Adventures in Lestoria/Boar.cpp @@ -81,6 +81,7 @@ void Monster::STRATEGY::BOAR(Monster&m,float fElapsedTime,std::string strategy){ float distanceToChargePoint=geom2d::line(m.GetPos(),chargeTargetPoint).length(); m.F(A::TARGET_TIMER)=distanceToChargePoint/(100.f*m.GetMoveSpdMult()); //This should be how long a charge takes. m.target=chargeTargetPoint; + m.UpdateFacingDirection(game->GetPlayer()->GetPos()); } }break; case PhaseName::SCRATCH:{ @@ -94,7 +95,6 @@ void Monster::STRATEGY::BOAR(Monster&m,float fElapsedTime,std::string strategy){ m.AddBuff(BuffType::COLLISION_KNOCKBACK_STRENGTH,15,ConfigFloat("Charge Knockback Amount")); } - m.UpdateFacingDirection(game->GetPlayer()->GetPos()); }break; case PhaseName::CHARGE:{ m.F(A::TARGET_TIMER)-=fElapsedTime; diff --git a/Adventures in Lestoria/TMXParser.h b/Adventures in Lestoria/TMXParser.h index 9acf9cf3..a668ae31 100644 --- a/Adventures in Lestoria/TMXParser.h +++ b/Adventures in Lestoria/TMXParser.h @@ -138,7 +138,6 @@ private: std::mapSpawnerData; //Spawn groups have IDs, mobs associate which spawner they are tied to via this ID. std::optional>spawnControllerIDs; std::map> ZoneData; - const std::map>&GetZones()const; public: bool skipLoadoutScreen=false; const MapTag&GetMapData()const; @@ -152,6 +151,7 @@ public: const bool HasMoreSpawns()const; //Returns whether or not there are more spawns for the spawn controller. const int Spawn_pop(); //Grabs the next spawn controller ID and removes it from the stack. const Renderable*const GetOptimizedMap()const; + const std::map>&GetZones()const; std::string FormatLayerData(std::ostream& os, std::vectortiles); std::string FormatSpawnerData(std::ostream& os, std::maptiles); friend std::ostream& operator << (std::ostream& os, Map& rhs); diff --git a/Adventures in Lestoria/Test.cpp b/Adventures in Lestoria/Test.cpp index 7959f377..5327e6a1 100644 --- a/Adventures in Lestoria/Test.cpp +++ b/Adventures in Lestoria/Test.cpp @@ -63,5 +63,10 @@ void Test::RunMapTests(){ is("There is an EndZone in Dungeon "+key, game->GetZones(key).count("EndZone")); } + + for(const ZoneData&endZone:value.GetZones().at("EndZone")){ + if(endZone.isUpper&&(!value.GetZones().count("UpperZone")||value.GetZones().at("UpperZone").size()==0))ERR(std::format("WARNING! An End Zone was found in map {} with the upper flag when no upper transition zones have been defined in a stage!",value.GetMapDisplayName())); + } } + } \ No newline at end of file diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 80d3ad14..5a1c9f9e 100644 --- a/Adventures in Lestoria/Version.h +++ b/Adventures in Lestoria/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 1 #define VERSION_MINOR 2 #define VERSION_PATCH 3 -#define VERSION_BUILD 10183 +#define VERSION_BUILD 10186 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Adventures in Lestoria/assets/Campaigns/2_1.tmx b/Adventures in Lestoria/assets/Campaigns/2_1.tmx index a383aaef..41d17f1c 100644 --- a/Adventures in Lestoria/assets/Campaigns/2_1.tmx +++ b/Adventures in Lestoria/assets/Campaigns/2_1.tmx @@ -1,5 +1,5 @@ - + @@ -1877,7 +1877,11 @@ - + + + + + diff --git a/Adventures in Lestoria/assets/Campaigns/2_2.tmx b/Adventures in Lestoria/assets/Campaigns/2_2.tmx index 0e38fa30..ea1ac58a 100644 --- a/Adventures in Lestoria/assets/Campaigns/2_2.tmx +++ b/Adventures in Lestoria/assets/Campaigns/2_2.tmx @@ -1703,7 +1703,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/2_3.tmx b/Adventures in Lestoria/assets/Campaigns/2_3.tmx index 8b5c5a16..a703f541 100644 --- a/Adventures in Lestoria/assets/Campaigns/2_3.tmx +++ b/Adventures in Lestoria/assets/Campaigns/2_3.tmx @@ -1180,7 +1180,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/2_4.tmx b/Adventures in Lestoria/assets/Campaigns/2_4.tmx index 156be08e..f97ad88e 100644 --- a/Adventures in Lestoria/assets/Campaigns/2_4.tmx +++ b/Adventures in Lestoria/assets/Campaigns/2_4.tmx @@ -1266,7 +1266,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/2_5.tmx b/Adventures in Lestoria/assets/Campaigns/2_5.tmx index f4f180dd..c5f0d2dc 100644 --- a/Adventures in Lestoria/assets/Campaigns/2_5.tmx +++ b/Adventures in Lestoria/assets/Campaigns/2_5.tmx @@ -1654,7 +1654,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/2_6.tmx b/Adventures in Lestoria/assets/Campaigns/2_6.tmx index 7c66f042..b4744f16 100644 --- a/Adventures in Lestoria/assets/Campaigns/2_6.tmx +++ b/Adventures in Lestoria/assets/Campaigns/2_6.tmx @@ -803,7 +803,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/2_7.tmx b/Adventures in Lestoria/assets/Campaigns/2_7.tmx index 62529819..39810ad8 100644 --- a/Adventures in Lestoria/assets/Campaigns/2_7.tmx +++ b/Adventures in Lestoria/assets/Campaigns/2_7.tmx @@ -1436,7 +1436,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/2_8.tmx b/Adventures in Lestoria/assets/Campaigns/2_8.tmx index 9c868175..9e42e3ca 100644 --- a/Adventures in Lestoria/assets/Campaigns/2_8.tmx +++ b/Adventures in Lestoria/assets/Campaigns/2_8.tmx @@ -1524,7 +1524,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/2_B1.tmx b/Adventures in Lestoria/assets/Campaigns/2_B1.tmx index 4b97831f..d4e4cc71 100644 --- a/Adventures in Lestoria/assets/Campaigns/2_B1.tmx +++ b/Adventures in Lestoria/assets/Campaigns/2_B1.tmx @@ -887,7 +887,7 @@ - + diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index 200cc534..96bd298f 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ