diff --git a/Adventures in Lestoria/Adventures in Lestoria.vcxproj b/Adventures in Lestoria/Adventures in Lestoria.vcxproj index c69926ff..a85325bd 100644 --- a/Adventures in Lestoria/Adventures in Lestoria.vcxproj +++ b/Adventures in Lestoria/Adventures in Lestoria.vcxproj @@ -690,6 +690,7 @@ + diff --git a/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters b/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters index 034b28ce..a5fe276e 100644 --- a/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters +++ b/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters @@ -740,15 +740,15 @@ Source Files\Monster Strategies - - Source Files\Monster Strategies - Source Files\Interface Source Files + + Source Files\Monster Strategies + diff --git a/Adventures in Lestoria/DynamicCounter.cpp b/Adventures in Lestoria/DynamicCounter.cpp index 82f35bcf..37aa18e5 100644 --- a/Adventures in Lestoria/DynamicCounter.cpp +++ b/Adventures in Lestoria/DynamicCounter.cpp @@ -60,6 +60,8 @@ void DynamicCounter::Update(){ bool targetNumberChanged=*targetNumber!=lastTargetNumber; tickTimer+=game->GetElapsedTime(); + bool tickOccurred=false; + while(tickTimer>tickRate){ tickTimer-=tickRate; if(displayNumber!=int(*targetNumber)){ @@ -79,9 +81,12 @@ void DynamicCounter::Update(){ } } } + tickOccurred=true; } - lastTargetNumber=int(*targetNumber); + if(tickOccurred&&targetNumberChanged){ + lastTargetNumber=int(*targetNumber); + } displayCol=PixelLerp(adjustedCol,originalCol,1-(targetChangedTimer/colorChangeTime)); } diff --git a/Adventures in Lestoria/RUN_STRATEGY.cpp b/Adventures in Lestoria/RUN_STRATEGY.cpp index 3a9a9b55..facb0f3f 100644 --- a/Adventures in Lestoria/RUN_STRATEGY.cpp +++ b/Adventures in Lestoria/RUN_STRATEGY.cpp @@ -51,6 +51,7 @@ void Monster::InitializeStrategies(){ STRATEGY_DATA.insert("Frog",Monster::STRATEGY::FROG); STRATEGY_DATA.insert("Wolf",Monster::STRATEGY::WOLF); STRATEGY_DATA.insert("Bear",Monster::STRATEGY::BEAR); + STRATEGY_DATA.insert("Ursule",Monster::STRATEGY::URSULE); STRATEGY_DATA.SetInitialized(); } diff --git a/Adventures in Lestoria/Ursule.cpp b/Adventures in Lestoria/Ursule.cpp index b9096195..dca26e09 100644 --- a/Adventures in Lestoria/Ursule.cpp +++ b/Adventures in Lestoria/Ursule.cpp @@ -63,12 +63,12 @@ void Monster::STRATEGY::URSULE(Monster&m,float fElapsedTime,std::string strategy //We also need to move to the center of the map. if(m.I(A::PHASE)!=0.f)goto bear; else{ - float distToCenter=geom2d::line(m.GetPos(),game->GetCurrentMap().MapData.MapSize*{game->GetCurrentMap().MapData.tilewidth,game->GetCurrentMap().MapData.tileheight}).length(); - if(){ + float distToCenter=geom2d::line(m.GetPos(),game->GetCurrentMap().MapData.MapSize*vf2d{float(game->GetCurrentMap().MapData.tilewidth),float(game->GetCurrentMap().MapData.tileheight)}).length(); + /*if(){ }else{ //Now we're finally good for phase 2. m.phase=2; - } + }*/ } } bear: diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index ad79f529..1082dd90 100644 --- a/Adventures in Lestoria/Version.h +++ b/Adventures in Lestoria/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 0 #define VERSION_MINOR 3 #define VERSION_PATCH 0 -#define VERSION_BUILD 6271 +#define VERSION_BUILD 6277 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/emscripten_build.sh b/emscripten_build.sh index b645f356..7aab7278 100755 --- a/emscripten_build.sh +++ b/emscripten_build.sh @@ -1,4 +1,4 @@ clear source ./emsdk/emsdk_env.sh -emcmake cmake . +emcmake cmake -DCMAKE_BUILD_TYPE=Release . cmake --build . -j 8 \ No newline at end of file diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index 4430a127..3922ee8a 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ