AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix PowerBomb radius derp

This commit is contained in:
Phillip Stephens 2020-09-23 16:32:15 -07:00
parent 3d01549af3
commit 9ab8c4cd8b
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/Weapon/CPowerBomb.cpp
View File

@ -62,7 +62,8 @@ void CPowerBomb::Think(float dt, CStateManager& mgr) {
if (x15c_curTime > 2.5f) if (x15c_curTime > 2.5f)
x158_24_canStartFilter = false; x158_24_canStartFilter = false;
} else if (x15c_curTime > 3.75 && x158_25_filterEnabled) { } else {
if (x15c_curTime > 3.75 && x158_25_filterEnabled) {
mgr.GetCameraFilterPass(6).DisableFilter(.5f); mgr.GetCameraFilterPass(6).DisableFilter(.5f);
x158_25_filterEnabled = false; x158_25_filterEnabled = false;
} }
@ -76,11 +77,12 @@ void CPowerBomb::Think(float dt, CStateManager& mgr) {
mgr.FreeScriptObject(GetUniqueId()); mgr.FreeScriptObject(GetUniqueId());
return; return;
} }
}
if (x15c_curTime > 1.f && x15c_curTime < 4.f) { if (x15c_curTime > 1.f && x15c_curTime < 4.f) {
x110_origDamageInfo.SetRadius(x160_curRadius); x110_origDamageInfo.SetRadius(x160_curRadius);
ApplyDynamicDamage(GetTranslation(), mgr); ApplyDynamicDamage(GetTranslation(), mgr);
x160_curRadius += x164_radiusIncrement; x160_curRadius += dt * x164_radiusIncrement;
} }
x168_particle->Update(dt); x168_particle->Update(dt);

2
specter

@ -1 +1 @@
Subproject commit 4cf1da025bc9a3a4e75ed2fbc8f3a8ff77e7ce33 Subproject commit 23f70151250ac08c78559ad71bf92e80912e678d