sigonasr2/AdventuresInLestoria
1
1
Fork 0
Code Issues 11 Pull Requests Projects 1 Releases Wiki Activity

Added MP restore and consume functions. Converted old direct variable accesses to use these as well. Item restore script completed.

Browse Source
This commit is contained in:
sigonasr2 2023-10-06 18:54:17 -05:00
parent ba6505b266
commit 48a8165086
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Crawler/Item.cpp
View File

@ -97,9 +97,9 @@ std::string ItemProps::GetStringProp(std::string prop){
void ItemInfo::InitializeScripts(){ void ItemInfo::InitializeScripts(){
ITEM_SCRIPTS["Restore"]=[](Crawler*game,ItemProps props){ ITEM_SCRIPTS["Restore"]=[](Crawler*game,ItemProps props){
game->GetPlayer()->Heal(props.GetIntProp("HP Restore")); game->GetPlayer()->Heal(props.GetIntProp("HP Restore"));
game->GetPlayer()->Heal(props.GetIntProp("HP % Restore")); game->GetPlayer()->Heal(game->GetPlayer()->GetMaxHealth()*props.GetIntProp("HP % Restore")/100.f);
game->GetPlayer()->Heal(props.GetIntProp("HP Restore")); game->GetPlayer()->RestoreMana(props.GetIntProp("MP Restore"));
game->GetPlayer()->Heal(props.GetIntProp("HP % Restore")); game->GetPlayer()->RestoreMana(game->GetPlayer()->GetMaxMana()*props.GetIntProp("MP % Restore")/100.f);
return true; return true;
}; };

14
Crawler/Player.cpp
View File

@ -195,7 +195,7 @@ void Player::Update(float fElapsedTime){
if(castInfo.castTimer<=0){ if(castInfo.castTimer<=0){
if(castPrepAbility->action(this,castInfo.castPos)){ if(castPrepAbility->action(this,castInfo.castPos)){
castPrepAbility->cooldown=castPrepAbility->COOLDOWN_TIME; castPrepAbility->cooldown=castPrepAbility->COOLDOWN_TIME;
mana-=castPrepAbility->manaCost; ConsumeMana(castPrepAbility->manaCost);
} }
castInfo.castTimer=0; castInfo.castTimer=0;
SetState(State::NORMAL); SetState(State::NORMAL);
@ -203,7 +203,7 @@ void Player::Update(float fElapsedTime){
} }
while(manaTickTimer<=0){ while(manaTickTimer<=0){
manaTickTimer+=0.2; manaTickTimer+=0.2;
mana=std::min(maxmana,mana+1); RestoreMana(1);
} }
for(std::vector<Buff>::iterator it=buffList.begin();it!=buffList.end();++it){ for(std::vector<Buff>::iterator it=buffList.begin();it!=buffList.end();++it){
Buff&b=*it; Buff&b=*it;
@ -365,7 +365,7 @@ void Player::Update(float fElapsedTime){
} }
if(AllowedToCast(ability)&&ability.action(this,{})){ if(AllowedToCast(ability)&&ability.action(this,{})){
ability.cooldown=ability.COOLDOWN_TIME; ability.cooldown=ability.COOLDOWN_TIME;
mana-=ability.manaCost; ConsumeMana(ability.manaCost);
}else }else
if(ability.precastInfo.precastTargetingRequired&&GetState()==State::NORMAL){ if(ability.precastInfo.precastTargetingRequired&&GetState()==State::NORMAL){
PrepareCast(ability); PrepareCast(ability);
@ -704,4 +704,12 @@ void Player::SetIframes(float duration){
bool Player::Heal(int damage){ bool Player::Heal(int damage){
hp=std::clamp(hp+damage,0,maxhp); hp=std::clamp(hp+damage,0,maxhp);
return true; return true;
}
void Player::RestoreMana(int amt){
mana=std::clamp(mana+amt,0,maxmana);
}
void Player::ConsumeMana(int amt){
mana=std::clamp(mana-amt,0,maxmana);
} }

2
Crawler/Player.h
View File

@ -134,6 +134,8 @@ public:
bool CanAct(Ability&ability); bool CanAct(Ability&ability);
void Knockback(vf2d vel); void Knockback(vf2d vel);
void SetIframes(float duration); void SetIframes(float duration);
void RestoreMana(int amt);
void ConsumeMana(int amt);
void AddBuff(BuffType type,float duration,float intensity); void AddBuff(BuffType type,float duration,float intensity);
std::vector<Buff>GetBuffs(BuffType buff); std::vector<Buff>GetBuffs(BuffType buff);

2
Crawler/Version.h
View File

@ -2,7 +2,7 @@
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 2 #define VERSION_MINOR 2
#define VERSION_PATCH 0 #define VERSION_PATCH 0
#define VERSION_BUILD 1811 #define VERSION_BUILD 1814
#define stringify(a) stringify_(a) #define stringify(a) stringify_(a)
#define stringify_(a) #a #define stringify_(a) #a