diff --git a/Crawler/Crawler.cpp b/Crawler/Crawler.cpp index 37315036..475d2307 100644 --- a/Crawler/Crawler.cpp +++ b/Crawler/Crawler.cpp @@ -1572,6 +1572,7 @@ void Crawler::LoadLevel(MapName map){ TileGroup group; foregroundTilesIncluded.insert({x,y}); group.InsertTile(tile); + std::cout<<"Insert "<0&&foregroundTilesIncluded.find(vi2d{x,y}+vi2d{-1,0})==foregroundTilesIncluded.end())tileGroupChecks.push({x-1,y}); if(x0&&foregroundTilesIncluded.find(vi2d{x,y}+vi2d{0,-1})==foregroundTilesIncluded.end())tileGroupChecks.push({x,y-1}); @@ -1602,6 +1603,7 @@ void Crawler::LoadLevel(MapName map){ IterateThroughOtherLayers({x,y}); while(!tileGroupChecks.empty()){ vi2d&pos=tileGroupChecks.front(); + std::cout< + diff --git a/Crawler/Crawler.vcxproj.filters b/Crawler/Crawler.vcxproj.filters index 1e5a7534..d8385a75 100644 --- a/Crawler/Crawler.vcxproj.filters +++ b/Crawler/Crawler.vcxproj.filters @@ -722,6 +722,9 @@ Configurations\Item Merchants + + Documentation + diff --git a/Crawler/Player.cpp b/Crawler/Player.cpp index 5abb2e42..93075bb5 100644 --- a/Crawler/Player.cpp +++ b/Crawler/Player.cpp @@ -655,9 +655,12 @@ Key Player::GetFacingDirection(){ } void Player::CancelCast(){ + bool wasCasting=castInfo.castTimer>0; castInfo={"",0}; std::erase_if(buffList,[](Buff&b){return b.type==RESTORATION_DURING_CAST;}); //Remove all buffs that would be applied during a cast, as we got interrupted. - DAMAGENUMBER_LIST.push_back(std::make_shared(GetPos(),0,true,INTERRUPT)); + if(wasCasting){ + DAMAGENUMBER_LIST.push_back(std::make_shared(GetPos(),0,true,INTERRUPT)); + } } void Player::Moved(){ diff --git a/Crawler/TODO.txt b/Crawler/TODO.txt new file mode 100644 index 00000000..1f74b44a --- /dev/null +++ b/Crawler/TODO.txt @@ -0,0 +1,44 @@ +January 1st +=========== +Buff Item Script +Sell Item Merchant Screen +Blacksmith Item Crafting Screen +Randomized Item Stats + - Get Item may return multiples of the same item. + - Removing an item with multiples require a specific item to be selected. + - Gear should never stack. +The Hub / NPC Interactions +Save/Load Game + - Save Inventory Items/Equips + - Player Base Level/Stats + - Unlock Progress + - World Map Location +Audio Engine + - Audio Ambience Zones + - Menu Sound Effects + - Attack / Enemy Sound Effects + - Music Loading/Looping +Settings Menu + - Volume Controls + - Key Configuration + -Upon pressing a key, check if the key is bound to another option, if so, + remove that bind from the list. Up to two keys may be binded per action. + + +January 31st +============ +Implement the rest of the enemy types: +- Baby Wolf +- Wolf +- Wolf Leader +- Baby Bear +- Brown Bear +- Green Frog +- Red Frog +- Orange Frog +- Blue Frog +Implement Ursule, Mother of Bears Boss +Story proofreading/correcting/storyboarding +- Add a command to play sound effects/music. +- Game Controller Support + - Should use the Keybind structure that already exists. \ No newline at end of file diff --git a/Crawler/Version.h b/Crawler/Version.h index bf15cc55..c1552f6a 100644 --- a/Crawler/Version.h +++ b/Crawler/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 0 #define VERSION_MINOR 2 #define VERSION_PATCH 1 -#define VERSION_BUILD 4538 +#define VERSION_BUILD 4543 #define stringify(a) stringify_(a) #define stringify_(a) #a