diff --git a/Crawler/Buff.h b/Crawler/Buff.h index c930ccbb..a341e958 100644 --- a/Crawler/Buff.h +++ b/Crawler/Buff.h @@ -55,4 +55,8 @@ struct Buff{ float intensity=1; float nextTick=0; std::functionrepeatAction; + inline Buff(BuffType type,float duration,float intensity) + :type(type),duration(duration),intensity(intensity){} + inline Buff(BuffType type,float duration,float intensity,float timeBetweenTicks,std::functionrepeatAction) + :type(type),duration(duration),intensity(intensity),nextTick(duration-timeBetweenTicks),timeBetweenTicks(timeBetweenTicks),repeatAction(repeatAction){} }; \ No newline at end of file diff --git a/Crawler/Crawler.cpp b/Crawler/Crawler.cpp index 25a03320..c4c636a7 100644 --- a/Crawler/Crawler.cpp +++ b/Crawler/Crawler.cpp @@ -1707,7 +1707,6 @@ void Crawler::LoadLevel(MapName map){ SplitUp(foregroundTileGroups); SplitUp(upperForegroundTileGroups); #pragma endregion - #pragma region Bridge Layer Setup bridgeLayerIndex=-1; diff --git a/Crawler/Crawler.vcxproj b/Crawler/Crawler.vcxproj index 81e965f6..0fa31c4f 100644 --- a/Crawler/Crawler.vcxproj +++ b/Crawler/Crawler.vcxproj @@ -581,6 +581,7 @@ + diff --git a/Crawler/Crawler.vcxproj.filters b/Crawler/Crawler.vcxproj.filters index d8385a75..98d2af72 100644 --- a/Crawler/Crawler.vcxproj.filters +++ b/Crawler/Crawler.vcxproj.filters @@ -725,6 +725,9 @@ Documentation + + Configurations\Items + diff --git a/Crawler/ItemStats.txt b/Crawler/ItemStats.txt new file mode 100644 index 00000000..4d475c5a --- /dev/null +++ b/Crawler/ItemStats.txt @@ -0,0 +1,13 @@ +# Provide any stat name followed by its increase amount to add it to the set. Valid stat names and value examples are below: +# +# Defense = 5 # Adds 5 defense +# Health = 3 # Adds 3 Health +# Attack = 7 # Adds 7 attack +# Move Spd = 10% # Grants 10% more movement speed. +# CDR = 14% # Grants 14% cooldown reduction. +# Crit Rate = 5% # Grants 5% crit rate. +# Crit Dmg = 25% # Grants 25% bonus crit damage. +# Health % = 30% # Grants 30% Max health +# HP6 Recovery % = 4% # Grants 4% HP recovery every 6 seconds. +# HP4 Recovery % = 2% # Grants 2% HP recovery every 4 seconds. +# Damage Reduction = 2% # Grants 2% direct damage reduction \ No newline at end of file diff --git a/Crawler/Map.cpp b/Crawler/Map.cpp index ba89245e..d5d397bc 100644 --- a/Crawler/Map.cpp +++ b/Crawler/Map.cpp @@ -79,7 +79,7 @@ geom2d::rectTileGroup::GetRange(){ } geom2d::rectTileGroup::GetFadeRange(){ - return {range.pos+vi2d{-24,-24},range.size+vi2d{48,24}}; + return {range.pos+vi2d{-120,-24},range.size+vi2d{240,24}}; } std::vector&TileGroup::GetTiles(){ diff --git a/Crawler/Player.cpp b/Crawler/Player.cpp index 93075bb5..18feafd4 100644 --- a/Crawler/Player.cpp +++ b/Crawler/Player.cpp @@ -717,10 +717,10 @@ void Player::UpdateIdleAnimation(Key direction){ } void Player::AddBuff(BuffType type,float duration,float intensity){ - buffList.push_back(Buff{.type=type,.duration=duration,.intensity=intensity}); + buffList.push_back(Buff{type,duration,intensity}); } void Player::AddBuff(BuffType type,float duration,float intensity,float timeBetweenTicks,std::functionrepeatAction){ - buffList.push_back(Buff{.type=type,.duration=duration,.timeBetweenTicks=timeBetweenTicks,.intensity=intensity,.nextTick=duration-timeBetweenTicks,.repeatAction=repeatAction}); + buffList.push_back(Buff{type,duration,intensity,timeBetweenTicks,repeatAction}); } bool Player::OnUpperLevel(){ diff --git a/Crawler/TODO.txt b/Crawler/TODO.txt index c4729be7..438299a0 100644 --- a/Crawler/TODO.txt +++ b/Crawler/TODO.txt @@ -23,7 +23,6 @@ Settings Menu - 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. -Tile Groups per object instead of all adjacent tiles January 31st @@ -42,4 +41,5 @@ 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 + - Should use the Keybind structure that already exists. +- Loading Screen \ No newline at end of file diff --git a/Crawler/Version.h b/Crawler/Version.h index 11a807b7..f41a5c4e 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 4568 +#define VERSION_BUILD 4574 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Crawler/assets/config/items/ItemScript.txt b/Crawler/assets/config/items/ItemScript.txt index 2fb1af30..b71d0665 100644 --- a/Crawler/assets/config/items/ItemScript.txt +++ b/Crawler/assets/config/items/ItemScript.txt @@ -20,7 +20,14 @@ ItemScript # Parameter 2: Duration that this stat will be increased for. Buff { + Attack = 0,0.0 Attack % = 0,0.0 + Defense = 0,0.0 + Defense % = 0,0.0 + Health = 0,0.0 + Health % = 0,0.0 + Move Spd = 0,0.0 + Move Spd % = 0,0.0 } # Unlike an item or ability that requires a cast to perform, this applies a buff immediately and then moving cancels the buff mid-application. diff --git a/x64/Release/Crawler.exe b/x64/Release/Crawler.exe index 56182b71..ff1195ed 100644 Binary files a/x64/Release/Crawler.exe and b/x64/Release/Crawler.exe differ