diff --git a/Adventures in Lestoria/Adventures in Lestoria.tiled-project b/Adventures in Lestoria/Adventures in Lestoria.tiled-project index 997f3a89..3d730564 100644 --- a/Adventures in Lestoria/Adventures in Lestoria.tiled-project +++ b/Adventures in Lestoria/Adventures in Lestoria.tiled-project @@ -287,7 +287,7 @@ { "id": 25, "name": "LevelType", - "storageType": "string", + "storageType": "int", "type": "enum", "values": [ "Dungeon", @@ -380,8 +380,8 @@ { "name": "Level Type", "propertyType": "LevelType", - "type": "string", - "value": "World Map" + "type": "int", + "value": 4 }, { "name": "Optimize", diff --git a/Adventures in Lestoria/AdventuresInLestoria.cpp b/Adventures in Lestoria/AdventuresInLestoria.cpp index 03a81974..292d4a2c 100644 --- a/Adventures in Lestoria/AdventuresInLestoria.cpp +++ b/Adventures in Lestoria/AdventuresInLestoria.cpp @@ -2388,7 +2388,7 @@ void AiL::_PrepareLevel(MapName map,MusicChange changeMusic){ #pragma region Reset all data (Loading phase 1) LoadingScreen::AddPhase([&](){ if(game->MAP_DATA.count(GetCurrentLevel())==0)ERR(std::format("WARNING! Could not load map {}! Does not exist! Refer to levels.txt for valid maps.",map)); - if(game->MAP_DATA[GetCurrentLevel()].GetMapType()=="Hub"&&GameState::STATE!=GameState::states[States::GAME_HUB])ERR("WARNING! A hub level should only be initiated in the GAME_HUB game state!"); + if(game->MAP_DATA[GetCurrentLevel()].GetMapType()==Map::MapType::HUB&&GameState::STATE!=GameState::states[States::GAME_HUB])ERR("WARNING! A hub level should only be initiated in the GAME_HUB game state!"); #pragma region Reset Environmental Audio for(EnvironmentalAudio&audio:MAP_DATA[previousLevel].environmentalAudioData){ @@ -3341,7 +3341,7 @@ void AiL::InitializeLevels(){ MAP_DATA[cp.map].name=cp.name; //Boss arena map zone check. - if(MAP_DATA[cp.map].GetMapType()=="Boss"&&MAP_DATA[cp.map].GetZones().at("BossArena").size()==0)ERR(std::format("WARNING! Map {} doesn't have a boss arena region defined! Add an object of class BossArena to the map.",MAP_DATA[cp.map].GetMapDisplayName())); + if(MAP_DATA[cp.map].GetMapType()==Map::MapType::BOSS&&MAP_DATA[cp.map].GetZones().at("BossArena").size()==0)ERR(std::format("WARNING! Map {} doesn't have a boss arena region defined! Add an object of class BossArena to the map.",MAP_DATA[cp.map].GetMapDisplayName())); for(std::string spawn:MAP_DATA[cp.map].spawns){ cp.spawns.push_back(MONSTER_DATA.at(spawn).GetDisplayName()); @@ -3662,6 +3662,10 @@ void AiL::RenderMenu(){ } #endif #pragma endregion + + for(Notification¬ification:notifications){ + notification.Draw(*this); + } } void AiL::InitializeGraphics(){ @@ -4416,6 +4420,11 @@ void AiL::GlobalGameUpdates(){ } #pragma endregion + for(Notification¬ification:notifications){ + notification.Update(GetElapsedTime()); + } + std::erase_if(notifications,[](const Notification¬ification){return notification.Expired();}); + if(GetMousePos()!=lastMousePos){ lastMouseMovement=0.f; lastMousePos=GetMousePos(); @@ -4642,4 +4651,25 @@ void AiL::ResetLevelStates(){ GetPlayer()->ResetVelocity(); GetPlayer()->RemoveAllBuffs(); GetPlayer()->ResetTimers(); -} \ No newline at end of file +} + + +void AiL::Notification::Update(const float fElapsedTime){ + time-=fElapsedTime; +} +const bool AiL::Notification::Expired()const{ + return time<=0.f; +} +const bool AiL::Notification::operator==(const Notification&n)const{ + return message==n.message; +} +void AiL::Notification::Draw(PixelGameEngine&pge){ + pge.DrawShadowStringPropDecal(vf2d{float(pge.ScreenWidth()/2),float(pge.ScreenHeight()/4)}-pge.GetTextSizeProp(message)/2,message,col,col/2); +} +void AiL::AddNotification(const Notification&n){ + auto it=std::find(notifications.begin(),notifications.end(),n); + if(it!=notifications.end())*it=n; + else notifications.emplace_back(n); +} +AiL::Notification::Notification(const std::string_view message,const float time,const Pixel col) +:message(message),time(time),col(col){} \ No newline at end of file diff --git a/Adventures in Lestoria/AdventuresInLestoria.h b/Adventures in Lestoria/AdventuresInLestoria.h index de073335..1872bc82 100644 --- a/Adventures in Lestoria/AdventuresInLestoria.h +++ b/Adventures in Lestoria/AdventuresInLestoria.h @@ -100,6 +100,18 @@ class AiL : public olc::PixelGameEngine std::unique_ptrplayer; SplashScreen splash; public: + class Notification{ + std::string message; + float time; + Pixel col; + public: + #undef GetMessage + Notification(const std::string_view message,const float time,const Pixel col); + void Update(const float fElapsedTime); + const bool Expired()const; + const bool operator==(const Notification&n)const; + void Draw(PixelGameEngine&pge); + }; enum MusicChange{ NO_MUSIC_CHANGE, PLAY_LEVEL_MUSIC, @@ -236,6 +248,7 @@ private: void AdminConsole(); virtual bool OnConsoleCommand(const std::string& sCommand)override final; Pixel vignetteOverlayCol{"Interface.Vignette Color"_Pixel}; + std::vectornotifications; public: AiL(bool testingMode=false); bool OnUserCreate() override; @@ -395,6 +408,7 @@ public: void InitializeClasses(); void _SetCurrentLevel(const MapName map); //NOTE: This will modify the currentLevel variable without triggering anything else in-game, this will normally mess up the state in the game. Ideally this is only used when initializing a test level. void InitializeCamera(); + void AddNotification(const Notification&n); void ResetLevelStates(); diff --git a/Adventures in Lestoria/CharacterMenuWindow.cpp b/Adventures in Lestoria/CharacterMenuWindow.cpp index 84aed64e..e12e5f85 100644 --- a/Adventures in Lestoria/CharacterMenuWindow.cpp +++ b/Adventures in Lestoria/CharacterMenuWindow.cpp @@ -199,6 +199,10 @@ void Menu::InitializeCharacterMenuWindow(){ EquipSlot slot=EquipSlot(equipSlot); auto equipmentSlot=characterMenuWindow->ADD("Equip Slot "+CharacterMenuWindow::slotNames[i],EquipSlotButton)(geom2d::rect{{x,y+28},{24,24}},slot, [&](MenuFuncData data){ + if(game->GetCurrentMap().GetMapType()!=Map::MapType::HUB&&game->GetCurrentMap().GetMapType()!=Map::MapType::WORLD_MAP){ + game->AddNotification(AiL::Notification{"Cannot change equipment in a stage!",5.f,YELLOW}); + return false; + } EquipSlot slot=EquipSlot(data.component.lock()->I(Attribute::EQUIP_TYPE)); data.menu.I(A::EQUIP_TYPE)=int(slot); diff --git a/Adventures in Lestoria/ItemDrop.cpp b/Adventures in Lestoria/ItemDrop.cpp index 21905683..2a9d1ff4 100644 --- a/Adventures in Lestoria/ItemDrop.cpp +++ b/Adventures in Lestoria/ItemDrop.cpp @@ -52,7 +52,7 @@ void ItemDrop::Initialize(){ ItemDrop::ItemDrop(const ItemInfo*item,const vf2d pos,const bool isUpper) :item(item),pos(pos),upperLevel(isUpper){ - const bool HasBossArenaBounds=game->GetCurrentMap().GetMapType()=="Boss"; + const bool HasBossArenaBounds=game->GetCurrentMap().GetMapType()==Map::MapType::BOSS; if(HasBossArenaBounds){ const geom2d::rectarenaBounds=game->GetZones().at("BossArena")[0].zone; this->pos.x=std::clamp(this->pos.x,float(arenaBounds.pos.x),float(arenaBounds.pos.x+arenaBounds.size.x)); diff --git a/Adventures in Lestoria/Player.cpp b/Adventures in Lestoria/Player.cpp index 34dc85d6..f72ae76d 100644 --- a/Adventures in Lestoria/Player.cpp +++ b/Adventures in Lestoria/Player.cpp @@ -1913,7 +1913,7 @@ void Player::CheckAndPerformAbility(Ability&ability,InputGroup key){ } } else if(ability.cooldown==0&&GetMana(){text,displayTime}; +} +void Player::NotificationDisplay(const std::string_view text,const float displayTime){ + notificationDisplay=std::pair{text,displayTime}; } \ No newline at end of file diff --git a/Adventures in Lestoria/Player.h b/Adventures in Lestoria/Player.h index 8de37bde..8d51596b 100644 --- a/Adventures in Lestoria/Player.h +++ b/Adventures in Lestoria/Player.h @@ -326,6 +326,8 @@ public: ShieldAmount SubtractShield(const ShieldAmount shieldDamage); //Returns how much damage was not absorbed by shields. const float GetManaRatio()const; void OnLevelStart(); + void NotEnoughManaDisplay(const std::string_view text,const float displayTime); //Red text for displayTime seconds. + void NotificationDisplay(const std::string_view text,const float displayTime); //Blue text for displayTime seconds. private: const int SHIELD_CAPACITY{32}; int hp="Warrior.BaseHealth"_I; diff --git a/Adventures in Lestoria/TMXParser.h b/Adventures in Lestoria/TMXParser.h index b708f8cd..59988d84 100644 --- a/Adventures in Lestoria/TMXParser.h +++ b/Adventures in Lestoria/TMXParser.h @@ -125,6 +125,14 @@ namespace MonsterTests{ struct Map{ friend class AiL; friend class TMXParser; + enum class MapType{ + DUNGEON, + BOSS, + STORY, + BLACKSMITH, + WORLD_MAP, + HUB + }; private: MapTag MapData; std::string name; @@ -134,7 +142,7 @@ private: std::vectorenvironmentalAudioData; std::vectorstageLoot; std::vectornpcs; - std::string mapType=""; + MapType mapType{}; std::string bgmSongName=""; std::unordered_mapdevCompletionTrialTime; BackdropName backdrop=""; @@ -147,7 +155,7 @@ public: void _SetMapData(MapTag data); bool skipLoadoutScreen=false; const MapTag&GetMapData()const; - const std::string_view GetMapType()const; + const MapType&GetMapType()const; const std::vector&GetStageLoot()const; const std::vector&GetLayers()const; const std::vector&GetEnvironmentalAudio()const; @@ -305,7 +313,7 @@ class TMXParser{ } return displayStr; } - const std::string_view Map::GetMapType()const{ + const Map::MapType&Map::GetMapType()const{ return mapType; } const MapName&Map::GetMapName()const{ @@ -512,7 +520,7 @@ class TMXParser{ parsedMapInfo.SpawnerData[prevSpawner].bossNameDisplay=newTag.data["value"]; }else if (newTag.tag=="property"&&newTag.data["name"]=="Level Type") { - parsedMapInfo.mapType=newTag.data["value"]; + parsedMapInfo.mapType=Map::MapType(stoi(newTag.data["value"])); }else if (newTag.tag=="property"&&newTag.data["name"]=="Background Music") { if(newTag.data["value"]!="None"){ //None is a default value that we ignore. diff --git a/Adventures in Lestoria/Test.cpp b/Adventures in Lestoria/Test.cpp index 5327e6a1..851bd6c7 100644 --- a/Adventures in Lestoria/Test.cpp +++ b/Adventures in Lestoria/Test.cpp @@ -57,9 +57,7 @@ void Test::RunMapTests(){ game->GetZones("CAMPAIGN_1_1").count("LowerBridgeCollision") &&game->GetZones("CAMPAIGN_1_1").at("LowerBridgeCollision").size()>=2); for(auto&[key,value]:game->MAP_DATA){ - is("A Map type has been selected for map "+key, - value.GetMapType()!=""&&value.GetMapType()!="Unspecified"); - if(value.GetMapType()=="Dungeon"){ + if(value.GetMapType()==Map::MapType::DUNGEON){ is("There is an EndZone in Dungeon "+key, game->GetZones(key).count("EndZone")); } diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 8b4d885f..a4a9dddb 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 11079 +#define VERSION_BUILD 11084 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Adventures in Lestoria/Wizard.cpp b/Adventures in Lestoria/Wizard.cpp index 9fbb47ab..ceee9ebc 100644 --- a/Adventures in Lestoria/Wizard.cpp +++ b/Adventures in Lestoria/Wizard.cpp @@ -147,7 +147,7 @@ void Wizard::InitializeClassAbilities(){ p->lastPathfindingCooldown=0.1f; return true; } else { - p->notificationDisplay={"Cannot Teleport to that location!",0.5}; + p->NotificationDisplay("Cannot Teleport to that location!",0.5f); p->lastPathfindingCooldown=0.1f; return false; } diff --git a/Adventures in Lestoria/assets/Campaigns/1_1_v2.tmx b/Adventures in Lestoria/assets/Campaigns/1_1_v2.tmx index 9e555529..4a09fedb 100644 --- a/Adventures in Lestoria/assets/Campaigns/1_1_v2.tmx +++ b/Adventures in Lestoria/assets/Campaigns/1_1_v2.tmx @@ -6,7 +6,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/1_2.tmx b/Adventures in Lestoria/assets/Campaigns/1_2.tmx index 7eb4e972..6f45c7e7 100644 --- a/Adventures in Lestoria/assets/Campaigns/1_2.tmx +++ b/Adventures in Lestoria/assets/Campaigns/1_2.tmx @@ -3,7 +3,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/1_3.tmx b/Adventures in Lestoria/assets/Campaigns/1_3.tmx index 323c3bdb..eccbb656 100644 --- a/Adventures in Lestoria/assets/Campaigns/1_3.tmx +++ b/Adventures in Lestoria/assets/Campaigns/1_3.tmx @@ -3,7 +3,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/1_4.tmx b/Adventures in Lestoria/assets/Campaigns/1_4.tmx index e9ca834c..00e3cf61 100644 --- a/Adventures in Lestoria/assets/Campaigns/1_4.tmx +++ b/Adventures in Lestoria/assets/Campaigns/1_4.tmx @@ -1,9 +1,9 @@ - + - + diff --git a/Adventures in Lestoria/assets/Campaigns/1_5.tmx b/Adventures in Lestoria/assets/Campaigns/1_5.tmx index a597255f..6ec79895 100644 --- a/Adventures in Lestoria/assets/Campaigns/1_5.tmx +++ b/Adventures in Lestoria/assets/Campaigns/1_5.tmx @@ -3,7 +3,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/1_6.tmx b/Adventures in Lestoria/assets/Campaigns/1_6.tmx index 3ffbc02c..9b5cb2c6 100644 --- a/Adventures in Lestoria/assets/Campaigns/1_6.tmx +++ b/Adventures in Lestoria/assets/Campaigns/1_6.tmx @@ -3,7 +3,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/1_7.tmx b/Adventures in Lestoria/assets/Campaigns/1_7.tmx index 8274feb2..f7a0e6e5 100644 --- a/Adventures in Lestoria/assets/Campaigns/1_7.tmx +++ b/Adventures in Lestoria/assets/Campaigns/1_7.tmx @@ -3,7 +3,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/1_8.tmx b/Adventures in Lestoria/assets/Campaigns/1_8.tmx index 39c93fb4..8c9ad1d6 100644 --- a/Adventures in Lestoria/assets/Campaigns/1_8.tmx +++ b/Adventures in Lestoria/assets/Campaigns/1_8.tmx @@ -3,7 +3,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/1_B1.tmx b/Adventures in Lestoria/assets/Campaigns/1_B1.tmx index 7906b063..12fe0c47 100644 --- a/Adventures in Lestoria/assets/Campaigns/1_B1.tmx +++ b/Adventures in Lestoria/assets/Campaigns/1_B1.tmx @@ -3,7 +3,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/1_B2.tmx b/Adventures in Lestoria/assets/Campaigns/1_B2.tmx index fcfc3180..fd0011e3 100644 --- a/Adventures in Lestoria/assets/Campaigns/1_B2.tmx +++ b/Adventures in Lestoria/assets/Campaigns/1_B2.tmx @@ -3,7 +3,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/2_1.tmx b/Adventures in Lestoria/assets/Campaigns/2_1.tmx index 107a5b13..51e94750 100644 --- a/Adventures in Lestoria/assets/Campaigns/2_1.tmx +++ b/Adventures in Lestoria/assets/Campaigns/2_1.tmx @@ -3,7 +3,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/2_2.tmx b/Adventures in Lestoria/assets/Campaigns/2_2.tmx index e479dfc5..aea3089a 100644 --- a/Adventures in Lestoria/assets/Campaigns/2_2.tmx +++ b/Adventures in Lestoria/assets/Campaigns/2_2.tmx @@ -1,9 +1,9 @@ - + - + diff --git a/Adventures in Lestoria/assets/Campaigns/2_3.tmx b/Adventures in Lestoria/assets/Campaigns/2_3.tmx index 901358d9..cdb1dc75 100644 --- a/Adventures in Lestoria/assets/Campaigns/2_3.tmx +++ b/Adventures in Lestoria/assets/Campaigns/2_3.tmx @@ -1,9 +1,9 @@ - + - + diff --git a/Adventures in Lestoria/assets/Campaigns/2_4.tmx b/Adventures in Lestoria/assets/Campaigns/2_4.tmx index a98d5c59..de6f9a30 100644 --- a/Adventures in Lestoria/assets/Campaigns/2_4.tmx +++ b/Adventures in Lestoria/assets/Campaigns/2_4.tmx @@ -3,7 +3,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/2_5.tmx b/Adventures in Lestoria/assets/Campaigns/2_5.tmx index efaee291..6e27d560 100644 --- a/Adventures in Lestoria/assets/Campaigns/2_5.tmx +++ b/Adventures in Lestoria/assets/Campaigns/2_5.tmx @@ -3,7 +3,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/2_6.tmx b/Adventures in Lestoria/assets/Campaigns/2_6.tmx index 92b114c3..17a99029 100644 --- a/Adventures in Lestoria/assets/Campaigns/2_6.tmx +++ b/Adventures in Lestoria/assets/Campaigns/2_6.tmx @@ -3,7 +3,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/2_7.tmx b/Adventures in Lestoria/assets/Campaigns/2_7.tmx index 87efc41e..513ac96a 100644 --- a/Adventures in Lestoria/assets/Campaigns/2_7.tmx +++ b/Adventures in Lestoria/assets/Campaigns/2_7.tmx @@ -1,9 +1,9 @@ - + - + diff --git a/Adventures in Lestoria/assets/Campaigns/2_8.tmx b/Adventures in Lestoria/assets/Campaigns/2_8.tmx index 4885aad1..e21d8999 100644 --- a/Adventures in Lestoria/assets/Campaigns/2_8.tmx +++ b/Adventures in Lestoria/assets/Campaigns/2_8.tmx @@ -1,9 +1,9 @@ - + - + diff --git a/Adventures in Lestoria/assets/Campaigns/2_B1.tmx b/Adventures in Lestoria/assets/Campaigns/2_B1.tmx index 1238bf8a..6684f5e4 100644 --- a/Adventures in Lestoria/assets/Campaigns/2_B1.tmx +++ b/Adventures in Lestoria/assets/Campaigns/2_B1.tmx @@ -3,7 +3,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/3_1.tmx b/Adventures in Lestoria/assets/Campaigns/3_1.tmx index de60134d..38abc4e7 100644 --- a/Adventures in Lestoria/assets/Campaigns/3_1.tmx +++ b/Adventures in Lestoria/assets/Campaigns/3_1.tmx @@ -2,7 +2,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/3_2.tmx b/Adventures in Lestoria/assets/Campaigns/3_2.tmx index b36a9c8f..5c1e961a 100644 --- a/Adventures in Lestoria/assets/Campaigns/3_2.tmx +++ b/Adventures in Lestoria/assets/Campaigns/3_2.tmx @@ -1,5 +1,5 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/3_3.tmx b/Adventures in Lestoria/assets/Campaigns/3_3.tmx index d6cae513..0c852389 100644 --- a/Adventures in Lestoria/assets/Campaigns/3_3.tmx +++ b/Adventures in Lestoria/assets/Campaigns/3_3.tmx @@ -1,5 +1,5 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/3_4.tmx b/Adventures in Lestoria/assets/Campaigns/3_4.tmx index f9a1b846..41943dbf 100644 --- a/Adventures in Lestoria/assets/Campaigns/3_4.tmx +++ b/Adventures in Lestoria/assets/Campaigns/3_4.tmx @@ -1,5 +1,5 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/3_5.tmx b/Adventures in Lestoria/assets/Campaigns/3_5.tmx index 818d397c..504d9fad 100644 --- a/Adventures in Lestoria/assets/Campaigns/3_5.tmx +++ b/Adventures in Lestoria/assets/Campaigns/3_5.tmx @@ -1,5 +1,5 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/3_6.tmx b/Adventures in Lestoria/assets/Campaigns/3_6.tmx index 61aa0284..08418a95 100644 --- a/Adventures in Lestoria/assets/Campaigns/3_6.tmx +++ b/Adventures in Lestoria/assets/Campaigns/3_6.tmx @@ -1,5 +1,5 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/3_B1.tmx b/Adventures in Lestoria/assets/Campaigns/3_B1.tmx index 8f59ab89..eb08fa63 100644 --- a/Adventures in Lestoria/assets/Campaigns/3_B1.tmx +++ b/Adventures in Lestoria/assets/Campaigns/3_B1.tmx @@ -1,5 +1,5 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/Boss_1_B.tmx b/Adventures in Lestoria/assets/Campaigns/Boss_1_B.tmx index aa38ce71..b5027fb3 100644 --- a/Adventures in Lestoria/assets/Campaigns/Boss_1_B.tmx +++ b/Adventures in Lestoria/assets/Campaigns/Boss_1_B.tmx @@ -3,7 +3,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/Boss_1_v2.tmx b/Adventures in Lestoria/assets/Campaigns/Boss_1_v2.tmx index cb2c03e3..eba4b352 100644 --- a/Adventures in Lestoria/assets/Campaigns/Boss_1_v2.tmx +++ b/Adventures in Lestoria/assets/Campaigns/Boss_1_v2.tmx @@ -3,7 +3,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/Boss_2.tmx b/Adventures in Lestoria/assets/Campaigns/Boss_2.tmx index 9f20a919..bf651808 100644 --- a/Adventures in Lestoria/assets/Campaigns/Boss_2.tmx +++ b/Adventures in Lestoria/assets/Campaigns/Boss_2.tmx @@ -4,7 +4,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/Boss_2_B.tmx b/Adventures in Lestoria/assets/Campaigns/Boss_2_B.tmx index 302aafe8..b19bc8a0 100644 --- a/Adventures in Lestoria/assets/Campaigns/Boss_2_B.tmx +++ b/Adventures in Lestoria/assets/Campaigns/Boss_2_B.tmx @@ -3,7 +3,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/Boss_3_B.tmx b/Adventures in Lestoria/assets/Campaigns/Boss_3_B.tmx index 6c5556c1..dee53787 100644 --- a/Adventures in Lestoria/assets/Campaigns/Boss_3_B.tmx +++ b/Adventures in Lestoria/assets/Campaigns/Boss_3_B.tmx @@ -1,5 +1,5 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/Hub_v2.tmx b/Adventures in Lestoria/assets/Campaigns/Hub_v2.tmx index b69cdec0..179dd2c9 100644 --- a/Adventures in Lestoria/assets/Campaigns/Hub_v2.tmx +++ b/Adventures in Lestoria/assets/Campaigns/Hub_v2.tmx @@ -3,7 +3,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/Intro_Map.tmx b/Adventures in Lestoria/assets/Campaigns/Intro_Map.tmx index 614a513b..6142739d 100644 --- a/Adventures in Lestoria/assets/Campaigns/Intro_Map.tmx +++ b/Adventures in Lestoria/assets/Campaigns/Intro_Map.tmx @@ -2,7 +2,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/World_Map.tmx b/Adventures in Lestoria/assets/Campaigns/World_Map.tmx index 2397a9bc..3398048a 100644 --- a/Adventures in Lestoria/assets/Campaigns/World_Map.tmx +++ b/Adventures in Lestoria/assets/Campaigns/World_Map.tmx @@ -1,8 +1,8 @@ - + - + diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index 7a8b2a2d..10920d73 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ