diff --git a/Adventures in Lestoria/AdventuresInLestoria.cpp b/Adventures in Lestoria/AdventuresInLestoria.cpp index 400d7080..b42d6054 100644 --- a/Adventures in Lestoria/AdventuresInLestoria.cpp +++ b/Adventures in Lestoria/AdventuresInLestoria.cpp @@ -455,8 +455,9 @@ void AiL::HandleUserInput(float fElapsedTime){ int truncatedPlayerY=int(player->GetY())/game->GetCurrentMapData().tilewidth; int tileID=layer.tiles[truncatedPlayerY][truncatedPlayerX]; TilesheetData dat=GetTileSheet(GetCurrentLevel(),tileID); - if(MAP_TILESETS.at(dat.tilesetName).staircaseTiles.find(tileID)!=MAP_TILESETS.at(dat.tilesetName).staircaseTiles.end()){ - return MAP_TILESETS.at(dat.tilesetName).staircaseTiles.at(tileID).data.at("value"); + int realTileID{tileID-dat.firstgid-1}; + if(MAP_TILESETS.at(dat.tilesetName).staircaseTiles.find(realTileID)!=MAP_TILESETS.at(dat.tilesetName).staircaseTiles.end()){ + return MAP_TILESETS.at(dat.tilesetName).staircaseTiles.at(realTileID).data.at("value"); } } return std::string("NONE"); diff --git a/Adventures in Lestoria/Stone_Elemental.cpp b/Adventures in Lestoria/Stone_Elemental.cpp index a18ea321..36197db8 100644 --- a/Adventures in Lestoria/Stone_Elemental.cpp +++ b/Adventures in Lestoria/Stone_Elemental.cpp @@ -202,7 +202,8 @@ void Monster::STRATEGY::STONE_ELEMENTAL(Monster&m,float fElapsedTime,std::string const float bulletAngRandomOffset{util::random(PI/2)}; for(int i=0;iSetIframeTimeOnHit(0.15f); } } }break; diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 84b3d6da..edb8eb9d 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 10256 +#define VERSION_BUILD 10258 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Adventures in Lestoria/assets/Campaigns/2_8.tmx b/Adventures in Lestoria/assets/Campaigns/2_8.tmx index 9e42e3ca..b7076ccf 100644 --- a/Adventures in Lestoria/assets/Campaigns/2_8.tmx +++ b/Adventures in Lestoria/assets/Campaigns/2_8.tmx @@ -1,5 +1,5 @@ - + @@ -1527,6 +1527,6 @@ - + diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index 83a2387d..5dbf0c95 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ