Fix Move Spd% typo on Octopus and Captain's Diamond Ring. Add missing item icons / hud icons. Fix typos in status effects and shards for accessories. Add in Octopus bullet shots.

master
sigonasr2 2 months ago
parent 2752f6630d
commit 60b31a602c
  1. 18
      Adventures in Lestoria/GiantOctopus.cpp
  2. 2
      Adventures in Lestoria/Version.h
  3. 15
      Adventures in Lestoria/assets/config/MonsterStrategies.txt
  4. 2
      Adventures in Lestoria/assets/config/items/Accessories.txt
  5. BIN
      Adventures in Lestoria/assets/gamepack.pak
  6. BIN
      Adventures in Lestoria/assets/items/Captain's Diamond Ring.png
  7. BIN
      Adventures in Lestoria/assets/items/Crab Claw.png
  8. BIN
      Adventures in Lestoria/assets/items/Octopus Ring.png
  9. BIN
      x64/Release/Adventures in Lestoria.exe

@ -75,6 +75,9 @@ void Monster::STRATEGY::GIANT_OCTOPUS(Monster&m,float fElapsedTime,std::string s
if(!GFX.count(takoyakiImgDir))ERR(std::format("WARNING! Could not find item image {}",takoyakiImgDir)); if(!GFX.count(takoyakiImgDir))ERR(std::format("WARNING! Could not find item image {}",takoyakiImgDir));
game->AddEffect(std::make_unique<Effect>(m.GetPos(),INFINITE,"item_img_directory"_S+"Takoyaki.png",m.OnUpperLevel(),1.f,0.f,vf2d{4.f,4.f},vf2d{},WHITE)); game->AddEffect(std::make_unique<Effect>(m.GetPos(),INFINITE,"item_img_directory"_S+"Takoyaki.png",m.OnUpperLevel(),1.f,0.f,vf2d{4.f,4.f},vf2d{},WHITE));
m.SetLifetime(4.f); m.SetLifetime(4.f);
m.F(A::SHOOT_TIMER)=ConfigFloat("Shoot Frequency");
m.F(A::SHOOT_ANIMATION_TIME)=m.GetAnimation("ATTACK").GetTotalAnimationDuration();
m.I(A::ATTACK_COUNT)=0;
return false; return false;
}); });
SETPHASE(IDENTIFY_ARMS); SETPHASE(IDENTIFY_ARMS);
@ -95,7 +98,12 @@ void Monster::STRATEGY::GIANT_OCTOPUS(Monster&m,float fElapsedTime,std::string s
} }
}break; }break;
case NORMAL:{ case NORMAL:{
m.F(A::SHOOT_TIMER)-=fElapsedTime;
m.F(A::CASTING_TIMER)-=fElapsedTime; m.F(A::CASTING_TIMER)-=fElapsedTime;
if(m.F(A::SHOOT_ANIMATION_TIME)>0.f){
m.F(A::SHOOT_ANIMATION_TIME)-=fElapsedTime;
if(m.F(A::SHOOT_ANIMATION_TIME)<=0.f)m.PerformIdleAnimation();
}
if(m.F(A::CASTING_TIMER)<=0.f){ if(m.F(A::CASTING_TIMER)<=0.f){
int deadMonsterCount{0}; int deadMonsterCount{0};
std::vector<vf2d>unoccupiedArmLocs; std::vector<vf2d>unoccupiedArmLocs;
@ -125,6 +133,16 @@ void Monster::STRATEGY::GIANT_OCTOPUS(Monster&m,float fElapsedTime,std::string s
} }
m.F(A::CASTING_TIMER)=util::random_range(ConfigFloatArr("Arm Move Timer",0),ConfigFloatArr("Arm Move Timer",1)); m.F(A::CASTING_TIMER)=util::random_range(ConfigFloatArr("Arm Move Timer",0),ConfigFloatArr("Arm Move Timer",1));
} }
if(m.F(A::SHOOT_TIMER)<=0.f){
if(m.I(A::ATTACK_COUNT)>=ConfigInt("Big Bullet Frequency")){
CreateBullet(Bullet)(m.GetPos(),util::pointTo(m.GetPos(),game->GetPlayer()->GetPos())*ConfigFloat("Big Bullet Speed"),ConfigFloat("Big Bullet Radius")*1.5f,ConfigFloat("Big Bullet Damage"),m.OnUpperLevel(),false,ConfigPixel("Big Bullet Color"),{ConfigFloat("Big Bullet Radius"),ConfigFloat("Big Bullet Radius")})EndBullet;
m.I(A::ATTACK_COUNT)=-1;
}else CreateBullet(Bullet)(m.GetPos(),util::pointTo(m.GetPos(),game->GetPlayer()->GetPos())*ConfigFloat("Bullet Speed"),ConfigFloat("Bullet Radius"),ConfigFloat("Bullet Damage"),m.OnUpperLevel(),false,ConfigPixel("Bullet Color"),{ConfigFloat("Bullet Radius"),ConfigFloat("Bullet Radius")})EndBullet;
m.PerformShootAnimation();
m.F(A::SHOOT_TIMER)=ConfigFloat("Shoot Frequency");
m.I(A::ATTACK_COUNT)++;
}
}break; }break;
case HURT_ANIMATION:{ case HURT_ANIMATION:{

@ -39,7 +39,7 @@ All rights reserved.
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 3 #define VERSION_MINOR 3
#define VERSION_PATCH 0 #define VERSION_PATCH 0
#define VERSION_BUILD 11865 #define VERSION_BUILD 11871
#define stringify(a) stringify_(a) #define stringify(a) stringify_(a)
#define stringify_(a) #a #define stringify_(a) #a

@ -1252,5 +1252,20 @@ MonsterStrategy
# How long to play the hurt animation for before reverting back to a normal animation. # How long to play the hurt animation for before reverting back to a normal animation.
Hurt Animation Time = 2s Hurt Animation Time = 2s
Shoot Frequency = 1s
Bullet Speed = 200
Bullet Radius = 4px
Bullet Damage = 40
Bullet Color = 0r,0g,0b,255a
# Number of shots when a big bullet comes out instead.
Big Bullet Frequency = 6shots
Big Bullet Speed = 250
Big Bullet Radius = 12px
Big Bullet Damage = 90
Big Bullet Extra Bullet Count = 10
Big Bullet Boss Rest Time = 2s
Big Bullet Color = 255r,0g,0b,255a
} }
} }

@ -78,7 +78,7 @@ Equipment
Slot = Ring1,Ring2 Slot = Ring1,Ring2
ItemCategory = Accessories ItemCategory = Accessories
Fragment Name = Bird's Treasure Fragment Fragment Name = Octopus Ring's Fragment
# See ItemStats.txt for valid stat names # See ItemStats.txt for valid stat names
StatValues = CDR,Move Spd %,Attack,Mana StatValues = CDR,Move Spd %,Attack,Mana

Binary file not shown.

After

Width:  |  Height:  |  Size: 657 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 621 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 621 B

Loading…
Cancel
Save