Make player dot damage numbers fall instead of rise as well. Remove unused originalRiseSpd damage number member. Refactor buff repeat action system to instead use internal hard-coded restoration functions. Include the target of buffs inside the buff classes themselves so they know what to interact with. Updated Player and Monster AddBuff functions to represent new buff constructor requirements. Implemented Bear Trap ability. Refactored Monster Hit callback for bullets to send the amount of stacks a monster had before getting hit which is used as getting hurt removed a mark stack. Release Build 10300.
parent
b3c5894be7
commit
2420d02f24
@ -0,0 +1,76 @@ |
|||||||
|
#pragma region License |
||||||
|
/*
|
||||||
|
License (OLC-3) |
||||||
|
~~~~~~~~~~~~~~~ |
||||||
|
|
||||||
|
Copyright 2024 Joshua Sigona <sigonasr2@gmail.com> |
||||||
|
|
||||||
|
Redistribution and use in source and binary forms, with or without modification, |
||||||
|
are permitted provided that the following conditions are met: |
||||||
|
|
||||||
|
1. Redistributions or derivations of source code must retain the above copyright |
||||||
|
notice, this list of conditions and the following disclaimer. |
||||||
|
|
||||||
|
2. Redistributions or derivative works in binary form must reproduce the above |
||||||
|
copyright notice. This list of conditions and the following disclaimer must be |
||||||
|
reproduced in the documentation and/or other materials provided with the distribution. |
||||||
|
|
||||||
|
3. Neither the name of the copyright holder nor the names of its contributors may |
||||||
|
be used to endorse or promote products derived from this software without specific |
||||||
|
prior written permission. |
||||||
|
|
||||||
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY |
||||||
|
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||||
|
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT |
||||||
|
SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, |
||||||
|
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED |
||||||
|
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR |
||||||
|
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
||||||
|
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN |
||||||
|
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
||||||
|
SUCH DAMAGE. |
||||||
|
|
||||||
|
Portions of this software are copyright © 2024 The FreeType |
||||||
|
Project (www.freetype.org). Please see LICENSE_FT.txt for more information. |
||||||
|
All rights reserved. |
||||||
|
*/ |
||||||
|
#pragma endregion |
||||||
|
|
||||||
|
#include "BulletTypes.h" |
||||||
|
#include "AdventuresInLestoria.h" |
||||||
|
|
||||||
|
INCLUDE_ANIMATION_DATA |
||||||
|
INCLUDE_game |
||||||
|
|
||||||
|
BearTrap::BearTrap(vf2d pos,float radius,int damage,float fadeinTime,float fadeoutTime,bool upperLevel,bool hitsMultiple,float lifetime,bool friendly,Pixel col,vf2d scale) |
||||||
|
:Bullet(pos,{},radius,damage,"Ability Icons/bear_trap.png",upperLevel,hitsMultiple,lifetime,false,friendly,col,scale,0.f,"Trap Hit"){ |
||||||
|
fadeInTime=fadeinTime; |
||||||
|
animation.AddState("bear_trap.png",ANIMATION_DATA["bear_trap.png"]); |
||||||
|
if(!friendly)ERR("WARNING! Trying to use unimplemented enemy version of the Bear Trap Bullet!"); |
||||||
|
} |
||||||
|
void BearTrap::ModifyOutgoingDamageData(HurtDamageInfo&data){ |
||||||
|
data.hurtFlags|=HurtFlag::PLAYER_ABILITY; |
||||||
|
} |
||||||
|
|
||||||
|
BulletDestroyState BearTrap::PlayerHit(Player*player){ |
||||||
|
fadeOutTime=0.5f; |
||||||
|
animation.ChangeState(internal_animState,"bear_trap.png"); |
||||||
|
return BulletDestroyState::KEEP_ALIVE; |
||||||
|
} |
||||||
|
|
||||||
|
BulletDestroyState BearTrap::MonsterHit(Monster&monster,const uint8_t markStacksBeforeHit){ |
||||||
|
fadeOutTime=0.5f; |
||||||
|
animation.ChangeState(internal_animState,"bear_trap.png"); |
||||||
|
|
||||||
|
const float bleedDamage{"Trapper.Ability 2.Marked Target Bleed"_f[0]/100.f*game->GetPlayer()->GetAttack()}; |
||||||
|
const float bleedDuration{"Trapper.Ability 2.Marked Target Bleed"_f[1]}; |
||||||
|
const float timeBetweenTicks{"Trapper.Ability 2.Marked Target Bleed"_f[2]}; |
||||||
|
|
||||||
|
if(markStacksBeforeHit>0){ |
||||||
|
const uint8_t resetStackCount{uint8_t("Trapper.Ability 2.Marked Target Stack Count Reset"_I)+1U}; //Add an additional stack because we know the target hit is about to lose one stack.
|
||||||
|
const uint8_t numberOfStacksToReplenish{uint8_t(resetStackCount-monster.GetMarkStacks())}; |
||||||
|
monster.ApplyMark("Trapper.Ability 2.Marked Target Reset Time"_F,numberOfStacksToReplenish); |
||||||
|
monster.AddBuff(BuffRestorationType::OVER_TIME,BuffOverTimeType::HP_DAMAGE_OVER_TIME,bleedDuration,bleedDamage,timeBetweenTicks); |
||||||
|
} |
||||||
|
return BulletDestroyState::KEEP_ALIVE; |
||||||
|
} |
||||||
@ -0,0 +1,101 @@ |
|||||||
|
#pragma region License |
||||||
|
/*
|
||||||
|
License (OLC-3) |
||||||
|
~~~~~~~~~~~~~~~ |
||||||
|
|
||||||
|
Copyright 2024 Joshua Sigona <sigonasr2@gmail.com> |
||||||
|
|
||||||
|
Redistribution and use in source and binary forms, with or without modification, |
||||||
|
are permitted provided that the following conditions are met: |
||||||
|
|
||||||
|
1. Redistributions or derivations of source code must retain the above copyright |
||||||
|
notice, this list of conditions and the following disclaimer. |
||||||
|
|
||||||
|
2. Redistributions or derivative works in binary form must reproduce the above |
||||||
|
copyright notice. This list of conditions and the following disclaimer must be |
||||||
|
reproduced in the documentation and/or other materials provided with the distribution. |
||||||
|
|
||||||
|
3. Neither the name of the copyright holder nor the names of its contributors may |
||||||
|
be used to endorse or promote products derived from this software without specific |
||||||
|
prior written permission. |
||||||
|
|
||||||
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY |
||||||
|
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||||
|
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT |
||||||
|
SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, |
||||||
|
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED |
||||||
|
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR |
||||||
|
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
||||||
|
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN |
||||||
|
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
||||||
|
SUCH DAMAGE. |
||||||
|
|
||||||
|
Portions of this software are copyright © 2024 The FreeType |
||||||
|
Project (www.freetype.org). Please see LICENSE_FT.txt for more information. |
||||||
|
All rights reserved. |
||||||
|
*/ |
||||||
|
#pragma endregion |
||||||
|
|
||||||
|
#include "Buff.h" |
||||||
|
#include "Player.h" |
||||||
|
#include "Monster.h" |
||||||
|
|
||||||
|
|
||||||
|
Buff::Buff(std::variant<Player*,Monster*>attachedTarget,BuffType type,float duration,float intensity) |
||||||
|
:attachedTarget(attachedTarget),type(type),duration(duration),intensity(intensity){} |
||||||
|
Buff::Buff(std::variant<Player*,Monster*>attachedTarget,BuffType type,float duration,float intensity,std::set<ItemAttribute> attr) |
||||||
|
:attachedTarget(attachedTarget),type(type),duration(duration),intensity(intensity),attr(attr){} |
||||||
|
Buff::Buff(std::variant<Player*,Monster*>attachedTarget,BuffType type,float duration,float intensity,std::set<std::string> attr) |
||||||
|
:attachedTarget(attachedTarget),type(type),duration(duration),intensity(intensity){ |
||||||
|
for(const std::string&s:attr){ |
||||||
|
this->attr.insert(ItemAttribute::attributes.at(s)); |
||||||
|
} |
||||||
|
} |
||||||
|
Buff::Buff(std::variant<Player*,Monster*>attachedTarget,BuffRestorationType type,BuffOverTimeType::BuffOverTimeType overTimeType,float duration,float intensity,float timeBetweenTicks) |
||||||
|
:attachedTarget(attachedTarget),type(type==BuffRestorationType::OVER_TIME||type==BuffRestorationType::ONE_OFF?OVER_TIME:OVER_TIME_DURING_CAST),duration(duration),intensity(intensity),nextTick(duration-timeBetweenTicks),timeBetweenTicks(timeBetweenTicks),overTimeType(overTimeType){} |
||||||
|
|
||||||
|
void Buff::Update(AiL*game,float fElapsedTime){ |
||||||
|
duration-=fElapsedTime; |
||||||
|
if(enabled&&overTimeType.has_value()&&nextTick>0&&duration<nextTick){ |
||||||
|
BuffTick(game,fElapsedTime); |
||||||
|
nextTick-=timeBetweenTicks; |
||||||
|
if(type==ONE_OFF)enabled=false; |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
void Buff::BuffTick(AiL*game,float fElapsedTime){ |
||||||
|
if(!overTimeType.has_value())ERR("WARNING! Trying to run BuffTick without a valid over time type provided! THIS SHOULD NOT BE HAPPENING!"); |
||||||
|
using enum BuffOverTimeType::BuffOverTimeType; |
||||||
|
switch(int(overTimeType.value())){ |
||||||
|
case HP_RESTORATION:{ |
||||||
|
IfEntity(Player)GetEntity(Player)->Heal(intensity); |
||||||
|
else IfEntity(Monster)GetEntity(Monster)->Heal(intensity); |
||||||
|
else ERR("WARNING! Buff Over Time attached Target is somehow not a Player nor a Monster Pointer! THIS SHOULD NOT BE HAPPENING!") |
||||||
|
}break; |
||||||
|
case MP_RESTORATION:{ |
||||||
|
IfEntity(Player)GetEntity(Player)->RestoreMana(intensity); |
||||||
|
else IfEntity(Monster)ERR("WARNING! Monsters don't have mana, this functionality is not supported!") |
||||||
|
else ERR("WARNING! Buff Over Time attached Target is somehow not a Player nor a Monster Pointer! THIS SHOULD NOT BE HAPPENING!") |
||||||
|
}break; |
||||||
|
case HP_PCT_RESTORATION:{ |
||||||
|
IfEntity(Player)GetEntity(Player)->Heal(GetEntity(Player)->GetMaxHealth()*intensity/100.f); |
||||||
|
else IfEntity(Monster)GetEntity(Monster)->Heal(GetEntity(Monster)->GetMaxHealth()*intensity/100.f); |
||||||
|
else ERR("WARNING! Buff Over Time attached Target is somehow not a Player nor a Monster Pointer! THIS SHOULD NOT BE HAPPENING!") |
||||||
|
}break; |
||||||
|
case MP_PCT_RESTORATION:{ |
||||||
|
IfEntity(Player)GetEntity(Player)->RestoreMana(GetEntity(Player)->GetMaxMana()*intensity/100.f); |
||||||
|
else IfEntity(Monster)ERR("WARNING! Monsters don't have mana, this functionality is not supported!") |
||||||
|
else ERR("WARNING! Buff Over Time attached Target is somehow not a Player nor a Monster Pointer! THIS SHOULD NOT BE HAPPENING!") |
||||||
|
}break; |
||||||
|
case HP_DAMAGE_OVER_TIME:{ |
||||||
|
IfEntity(Player)GetEntity(Player)->Hurt(intensity,GetEntity(Player)->OnUpperLevel(),GetEntity(Player)->GetZ(),HurtFlag::DOT); |
||||||
|
else IfEntity(Monster)GetEntity(Monster)->Hurt(intensity,GetEntity(Monster)->OnUpperLevel(),GetEntity(Monster)->GetZ(),HurtFlag::DOT); |
||||||
|
else ERR("WARNING! Buff Over Time attached Target is somehow not a Player nor a Monster Pointer! THIS SHOULD NOT BE HAPPENING!") |
||||||
|
}break; |
||||||
|
case HP_PCT_DAMAGE_OVER_TIME:{ |
||||||
|
IfEntity(Player)GetEntity(Player)->Hurt(GetEntity(Player)->GetMaxHealth()*intensity/100.f,GetEntity(Player)->OnUpperLevel(),GetEntity(Player)->GetZ(),HurtFlag::DOT); |
||||||
|
else IfEntity(Monster)GetEntity(Monster)->Hurt(GetEntity(Monster)->GetMaxHealth()*intensity/100.f,GetEntity(Monster)->OnUpperLevel(),GetEntity(Monster)->GetZ(),HurtFlag::DOT); |
||||||
|
else ERR("WARNING! Buff Over Time attached Target is somehow not a Player nor a Monster Pointer! THIS SHOULD NOT BE HAPPENING!") |
||||||
|
}break; |
||||||
|
} |
||||||
|
} |
||||||
|
After Width: | Height: | Size: 4.6 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in new issue