Adjust all spaces to tabs for consistent whitespace formatting on source files. Implement Throw Poison Ability. Added general Color Mod Buff so coloring targets a certain color based on applied buff is simpler. Release Build 10389.
parent
f27caf4382
commit
a5f7973c4d
@ -0,0 +1,93 @@ |
|||||||
|
#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 <ranges> |
||||||
|
#include "util.h" |
||||||
|
|
||||||
|
INCLUDE_game |
||||||
|
|
||||||
|
PoisonBottle::PoisonBottle(vf2d pos,vf2d targetPos,float explodeRadius,float z,float totalFallTime,float totalRiseZAmt,int damage,bool upperLevel,bool hitsMultiple,float lifetime,bool friendly,Pixel col,vf2d scale,float image_angle) |
||||||
|
:Bullet(pos,util::pointTo(pos,targetPos)*util::distance(pos,targetPos)/totalFallTime,0.f,damage,"poison_bottle.png",upperLevel,hitsMultiple,lifetime,false,friendly,col,scale,image_angle),initialZ(z),explodeRadius(explodeRadius),totalRiseZAmt(totalRiseZAmt),totalFallTime(totalFallTime),startingPos(pos),targetPos(targetPos),originalRisingTime(totalFallTime*0.25f),risingTime(originalRisingTime),originalFallingTime(totalFallTime*0.75f),fallingTime(originalFallingTime){ |
||||||
|
this->z=z; |
||||||
|
} |
||||||
|
|
||||||
|
void PoisonBottle::Update(float fElapsedTime){ |
||||||
|
if(IsDeactivated())return; |
||||||
|
image_angle+=0.5*PI*fElapsedTime; |
||||||
|
|
||||||
|
const bool Landed{fallingTime<=0.f}; |
||||||
|
if(Landed){ |
||||||
|
z=0.f; |
||||||
|
const float poisonCircleScale{"Witch.Ability 2.Casting Size"_F/100.f}; |
||||||
|
game->AddEffect(std::make_unique<Effect>(pos,0.f,"poison_pool.png",game->GetPlayer()->OnUpperLevel(),0.5f,1.2f,vf2d{poisonCircleScale,poisonCircleScale},vf2d{},WHITE,0.f,0.f,false),true); |
||||||
|
for(int i:std::ranges::iota_view(0,200)){ |
||||||
|
float size{util::random_range(0.4f,0.8f)}; |
||||||
|
Pixel col{PixelLerp(VERY_DARK_GREEN,DARK_GREEN,util::random(1))}; |
||||||
|
col.a=util::random_range(60,200); |
||||||
|
game->AddEffect(std::make_unique<Effect>(pos+vf2d{util::random(16)*poisonCircleScale,util::random(2*PI)}.cart(),util::random_range(1.f,4.f),"circle.png",game->GetPlayer()->OnUpperLevel(),vf2d{size,size},util::random_range(0.2f,0.5f),vf2d{util::random_range(-6.f,6.f),util::random_range(-12.f,-4.f)},col)); |
||||||
|
} |
||||||
|
const HurtList hurtList{game->Hurt(pos,explodeRadius,damage,OnUpperLevel(),z,HurtType::MONSTER,HurtFlag::PLAYER_ABILITY)}; |
||||||
|
for(const auto&[targetPtr,wasHit]:hurtList){ |
||||||
|
if(wasHit){ |
||||||
|
Monster*monsterPtr{std::get<Monster*>(targetPtr)}; |
||||||
|
const int buffDamage{int(game->GetPlayer()->GetAttack()*"Witch.Ability 2.Poison Debuff"_f[0])}; |
||||||
|
const float buffDuration{"Witch.Ability 2.Poison Debuff"_f[2]}; |
||||||
|
const float buffTimeBetweenTicks{"Witch.Ability 2.Poison Debuff"_f[1]}; |
||||||
|
monsterPtr->AddBuff(BuffType::COLOR_MOD,buffDuration,Pixel{GREEN}.n); |
||||||
|
monsterPtr->ApplyDot(buffDuration,buffDamage,buffTimeBetweenTicks); |
||||||
|
} |
||||||
|
} |
||||||
|
vel={}; |
||||||
|
fadeOutTime=0.25f; |
||||||
|
Deactivate(); |
||||||
|
}else{ |
||||||
|
if(risingTime>0.f){ |
||||||
|
risingTime-=fElapsedTime; |
||||||
|
z=util::lerp(initialZ,initialZ+totalRiseZAmt,1-(risingTime/originalRisingTime)); |
||||||
|
}else{ |
||||||
|
fallingTime-=fElapsedTime; |
||||||
|
z=util::lerp(initialZ+totalRiseZAmt,0.f,1-(fallingTime/originalFallingTime)); |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
void PoisonBottle::ModifyOutgoingDamageData(HurtDamageInfo&data){ |
||||||
|
if(friendly)data.hurtFlags|=HurtFlag::PLAYER_ABILITY; |
||||||
|
} |
||||||
Binary file not shown.
|
After Width: | Height: | Size: 777 B |
|
After Width: | Height: | Size: 752 B |
Binary file not shown.
Loading…
Reference in new issue