Release build 6277. Fix second boss script not being loaded properly.

pull/35/head
sigonasr2 1 year ago
parent 0db3dc4424
commit 07139f06b7
  1. 1
      Adventures in Lestoria/Adventures in Lestoria.vcxproj
  2. 6
      Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters
  3. 5
      Adventures in Lestoria/DynamicCounter.cpp
  4. 1
      Adventures in Lestoria/RUN_STRATEGY.cpp
  5. 6
      Adventures in Lestoria/Ursule.cpp
  6. 2
      Adventures in Lestoria/Version.h
  7. 2
      emscripten_build.sh
  8. BIN
      x64/Release/Adventures in Lestoria.exe

@ -690,6 +690,7 @@
<ClCompile Include="Trapper.cpp" />
<ClCompile Include="Turret.cpp" />
<ClCompile Include="Unlock.cpp" />
<ClCompile Include="Ursule.cpp" />
<ClCompile Include="UserIDMenu.cpp">
<SubType>
</SubType>

@ -740,15 +740,15 @@
<ClCompile Include="Bear.cpp">
<Filter>Source Files\Monster Strategies</Filter>
</ClCompile>
<ClCompile Include="Ursule.cpp">
<Filter>Source Files\Monster Strategies</Filter>
</ClCompile>
<ClCompile Include="InputHelper.cpp">
<Filter>Source Files\Interface</Filter>
</ClCompile>
<ClCompile Include="DynamicCounter.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Ursule.cpp">
<Filter>Source Files\Monster Strategies</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="cpp.hint" />

@ -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;
}
if(tickOccurred&&targetNumberChanged){
lastTargetNumber=int(*targetNumber);
}
displayCol=PixelLerp(adjustedCol,originalCol,1-(targetChangedTimer/colorChangeTime));
}

@ -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();
}

@ -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<float>(m.GetPos(),game->GetCurrentMap().MapData.MapSize*{game->GetCurrentMap().MapData.tilewidth,game->GetCurrentMap().MapData.tileheight}).length();
if(){
float distToCenter=geom2d::line<float>(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:

@ -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

@ -1,4 +1,4 @@
clear
source ./emsdk/emsdk_env.sh
emcmake cmake .
emcmake cmake -DCMAKE_BUILD_TYPE=Release .
cmake --build . -j 8
Loading…
Cancel
Save