diff --git a/Adventures in Lestoria/Bear.cpp b/Adventures in Lestoria/Bear.cpp index f74923ce..06dcfc90 100644 --- a/Adventures in Lestoria/Bear.cpp +++ b/Adventures in Lestoria/Bear.cpp @@ -85,16 +85,19 @@ void Monster::STRATEGY::BEAR(Monster&m,float fElapsedTime,std::string strategy){ SoundEffect::PlaySFX("Bear Slam Attack",m.GetPos()+m.V(A::LOCKON_POS)); m.I(A::PHASE)=0; geom2d::circleattackCircle={m.GetPos()+m.V(A::LOCKON_POS),float(operator""_Pixels(ConfigFloat("Smash Attack Diameter"))/2.f)}; - float lockOnDistToPlayer=geom2d::line(m.V(A::LOCKON_POS),game->GetPlayer()->GetPos()).length(); + float lockOnDistToPlayer=geom2d::line(game->GetPlayer()->GetPos(),m.V(A::LOCKON_POS)).length(); if(geom2d::overlaps(attackCircle,game->GetPlayer()->Hitbox())){ if(game->GetPlayer()->Hurt(m.GetAttack(),m.OnUpperLevel(),0.f)){ game->GetPlayer()->Knockup(ConfigFloat("Attack Knockup Duration")); + vf2d playerDirVecNorm=geom2d::line(game->GetPlayer()->GetPos(),m.V(A::LOCKON_POS)).vector().norm(); + game->GetPlayer()->Knockback(playerDirVecNorm*ConfigFloat("Attack Knockback Amount")); } } for(Monster&otherM:MONSTER_LIST){ - if(!otherM.AttackAvoided(m.GetZ())&&&m!=&otherM&& - geom2d::overlaps(attackCircle,otherM.Hitbox())){ + if(!otherM.AttackAvoided(m.GetZ())&&&m!=&otherM&&geom2d::overlaps(attackCircle,otherM.Hitbox())){ otherM.Knockup(ConfigFloat("Attack Knockup Duration")); + vf2d monsterDirVecNorm=geom2d::line(m.V(A::LOCKON_POS),otherM.GetPos()).vector().norm(); + game->GetPlayer()->Knockback(monsterDirVecNorm*ConfigFloat("Attack Knockback Amount")); } } m.spriteRot=0.f; diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 7303b755..571b6143 100644 --- a/Adventures in Lestoria/Version.h +++ b/Adventures in Lestoria/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 0 #define VERSION_MINOR 3 #define VERSION_PATCH 0 -#define VERSION_BUILD 6381 +#define VERSION_BUILD 6388 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Adventures in Lestoria/assets/config/MonsterStrategies.txt b/Adventures in Lestoria/assets/config/MonsterStrategies.txt index 7cf4b38f..034ba4e6 100644 --- a/Adventures in Lestoria/assets/config/MonsterStrategies.txt +++ b/Adventures in Lestoria/assets/config/MonsterStrategies.txt @@ -226,6 +226,9 @@ MonsterStrategy # How long the duration of the knockup is. Attack Knockup Duration = 0.7s + + # Sets how much knockback the attack will have. + Attack Knockback Amount = 0.0 } # The Ursule, Mother of Bears Boss script Ursule @@ -372,6 +375,7 @@ MonsterStrategy # How much time (in seconds) to wait between each pattern spawn. # 100% speed means it takes 6 seconds for all the wisps to move entirely down. + # "Wisp Pattern Spawn Y" / Speed determines time between spawns. Wisp Pattern Spawn Wait Time = 1.6s # This value is either Bag or Random. Bag means every pattern gets selected once before re-cycling. Random is truly random with potential repeats. @@ -454,8 +458,9 @@ MonsterStrategy Wisp Fadeout Time = 0.3s # How much time (in seconds) to wait between each pattern spawn. - # 100% speed means it takes 6 seconds for all the wisps to move entirely down. - Wisp Pattern Spawn Wait Time = 1.6s + # 100 speed means it takes 1.44 seconds for 6 rows of wisps to move down + # "Wisp Pattern Spawn Y" / Speed determines time between spawns. + Wisp Pattern Spawn Wait Time = 1.51s # This value is either Bag or Random. Bag means every pattern gets selected once before re-cycling. Random is truly random with potential repeats. Wisp Pattern Random Selection = Random diff --git a/Adventures in Lestoria/assets/config/Monsters.txt b/Adventures in Lestoria/assets/config/Monsters.txt index bdf2c934..2e3b0600 100644 --- a/Adventures in Lestoria/assets/config/Monsters.txt +++ b/Adventures in Lestoria/assets/config/Monsters.txt @@ -359,6 +359,9 @@ Monsters # How long the duration of the knockup is. Attack Knockup Duration = 0.4s + # Sets how much knockback the attack will have. + Attack Knockback Amount = 250 + # ^^^^^ End Bear script overrides ^^^^^ diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index 3b9b97ea..924d38ba 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ