AMay/AdventuresInLestoria
1
1
Fork 0
Code Issues 26 Pull Requests Actions Projects 1 Releases Wiki Activity

Include pragma regions for specific class abilities and move Ranger stuff (that is actually player-implemented over)

Browse Source
This commit is contained in:
sigonasr2 2023-07-25 17:34:53 -05:00
parent b2b94eaf06
commit 19c2c198e6
5 changed files with 67 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Crawler/Crawler.cpp
View File

@ -90,7 +90,7 @@ bool Crawler::OnUserCreate(){
LoadLevel(CAMPAIGN_1_1); LoadLevel(CAMPAIGN_1_1);
InitializeClassAbilities(); InitializeClassAbilities();
ChangePlayerClass(WARRIOR); ChangePlayerClass(WARRIOR);
//Warrior::ability4=Wizard::ability3; //Class ability swapping demonstration. Warrior::ability4=Ranger::ability1; //Class ability swapping demonstration.
return true; return true;
} }

79
Crawler/Player.cpp
View File

@ -360,29 +360,66 @@ void Player::Update(float fElapsedTime){
CheckAbilityKeyReleasedAndCastSpell(ability4,game->GetKey(Crawler::KEY_ABILITY4)) CheckAbilityKeyReleasedAndCastSpell(ability4,game->GetKey(Crawler::KEY_ABILITY4))
} }
switch(GetState()){ #pragma region Warrior
case SWING_SWORD:{ switch(GetState()){
switch(GetFacingDirection()){ case SWING_SWORD:{
case UP:{ switch(GetFacingDirection()){
UpdateAnimation(AnimationState::WARRIOR_SWINGSWORD_N); case UP:{
}break; UpdateAnimation(AnimationState::WARRIOR_SWINGSWORD_N);
case DOWN:{ }break;
UpdateAnimation(AnimationState::WARRIOR_SWINGSWORD_S); case DOWN:{
}break; UpdateAnimation(AnimationState::WARRIOR_SWINGSWORD_S);
case LEFT:{ }break;
UpdateAnimation(AnimationState::WARRIOR_SWINGSWORD_W); case LEFT:{
}break; UpdateAnimation(AnimationState::WARRIOR_SWINGSWORD_W);
case RIGHT:{ }break;
UpdateAnimation(AnimationState::WARRIOR_SWINGSWORD_E); case RIGHT:{
}break; UpdateAnimation(AnimationState::WARRIOR_SWINGSWORD_E);
}break;
}
SetSwordSwingTimer(GetSwordSwingTimer()-fElapsedTime);
if(GetSwordSwingTimer()<=0){
SetSwordSwingTimer(0);
SetState(State::NORMAL);
}
}break;
}
#pragma endregion
#pragma region Ranger
if(GetState()==SHOOT_ARROW){
if(attack_cooldown_timer<=ARROW_ATTACK_COOLDOWN-0.3){
SetState(NORMAL);
} }
SetSwordSwingTimer(GetSwordSwingTimer()-fElapsedTime); }
if(GetSwordSwingTimer()<=0){ if(retreatTimer>0){
SetSwordSwingTimer(0); SetZ(6*sin(PI/RETREAT_TIME*retreatTimer));
SetState(State::NORMAL); retreatTimer-=fElapsedTime;
if(retreatTimer<=0){
SetVelocity({});
SetZ(0);
SetState(State::NORMAL);
} }
}break; }
} if(ghostRemoveTimer>0){
ghostRemoveTimer-=fElapsedTime;
if(ghostRemoveTimer<=0){
if(ghostPositions.size()>0){
ghostPositions.erase(ghostPositions.begin());
if(ghostPositions.size()>0){
ghostRemoveTimer=RETREAT_GHOST_FRAME_DELAY;
}
}
}
}
if(ghostFrameTimer>0){
ghostFrameTimer-=fElapsedTime;
if(ghostFrameTimer<=0&&GetState()==State::RETREAT){
ghostPositions.push_back(GetPos()+vf2d{0,-GetZ()});
ghostFrameTimer=RETREAT_GHOST_FRAME_DELAY;
}
}
#pragma endregion
} }
float Player::GetSwordSwingTimer(){ float Player::GetSwordSwingTimer(){

7
Crawler/Player.h
View File

@ -8,7 +8,6 @@
#include "Buff.h" #include "Buff.h"
#include "Pathfinding.h" #include "Pathfinding.h"
struct CastInfo{ struct CastInfo{
std::string name; std::string name;
float castTimer; float castTimer;
@ -164,6 +163,7 @@ struct Warrior:Player{
Warrior(Player*player); Warrior(Player*player);
Class GetClass()override; Class GetClass()override;
bool AutoAttack()override; bool AutoAttack()override;
//Include only WARRIOR-specific implementations!
void OnUpdate(float fElapsedTime)override; void OnUpdate(float fElapsedTime)override;
static void InitializeClassAbilities(); static void InitializeClassAbilities();
std::string GetClassName()override; std::string GetClassName()override;
@ -191,6 +191,7 @@ struct Thief:Player{
Thief(Player*player); Thief(Player*player);
Class GetClass()override; Class GetClass()override;
bool AutoAttack()override; bool AutoAttack()override;
//Include only THIEF-specific implementations!
void OnUpdate(float fElapsedTime)override; void OnUpdate(float fElapsedTime)override;
static void InitializeClassAbilities(); static void InitializeClassAbilities();
std::string GetClassName()override; std::string GetClassName()override;
@ -218,6 +219,7 @@ struct Ranger:Player{
Ranger(Player*player); Ranger(Player*player);
Class GetClass()override; Class GetClass()override;
bool AutoAttack()override; bool AutoAttack()override;
//Include only RANGER-specific implementations!
void OnUpdate(float fElapsedTime)override; void OnUpdate(float fElapsedTime)override;
static void InitializeClassAbilities(); static void InitializeClassAbilities();
std::string GetClassName()override; std::string GetClassName()override;
@ -245,6 +247,7 @@ struct Trapper:Player{
Trapper(Player*player); Trapper(Player*player);
Class GetClass()override; Class GetClass()override;
bool AutoAttack()override; bool AutoAttack()override;
//Include only TRAPPER-specific implementations!
void OnUpdate(float fElapsedTime)override; void OnUpdate(float fElapsedTime)override;
static void InitializeClassAbilities(); static void InitializeClassAbilities();
std::string GetClassName()override; std::string GetClassName()override;
@ -272,6 +275,7 @@ struct Wizard:Player{
Wizard(Player*player); Wizard(Player*player);
Class GetClass()override; Class GetClass()override;
bool AutoAttack()override; bool AutoAttack()override;
//Include only WIZARD-specific implementations!
void OnUpdate(float fElapsedTime)override; void OnUpdate(float fElapsedTime)override;
static void InitializeClassAbilities(); static void InitializeClassAbilities();
std::string GetClassName()override; std::string GetClassName()override;
@ -299,6 +303,7 @@ struct Witch:Player{
Witch(Player*player); Witch(Player*player);
Class GetClass()override; Class GetClass()override;
bool AutoAttack()override; bool AutoAttack()override;
//Include only WITCHs-specific implementations!
void OnUpdate(float fElapsedTime)override; void OnUpdate(float fElapsedTime)override;
static void InitializeClassAbilities(); static void InitializeClassAbilities();
std::string GetClassName()override; std::string GetClassName()override;

33
Crawler/Ranger.cpp
View File

@ -29,38 +29,7 @@ AnimationState Ranger::walk_w=RANGER_WALK_W;
SETUP_CLASS(Ranger) SETUP_CLASS(Ranger)
void Ranger::OnUpdate(float fElapsedTime){ void Ranger::OnUpdate(float fElapsedTime){
if(GetState()==SHOOT_ARROW){
if(attack_cooldown_timer<=ARROW_ATTACK_COOLDOWN-0.3){
SetState(NORMAL);
}
}
if(retreatTimer>0){
SetZ(6*sin(PI/RETREAT_TIME*retreatTimer));
retreatTimer-=fElapsedTime;
if(retreatTimer<=0){
SetVelocity({});
SetZ(0);
SetState(State::NORMAL);
}
}
if(ghostRemoveTimer>0){
ghostRemoveTimer-=fElapsedTime;
if(ghostRemoveTimer<=0){
if(ghostPositions.size()>0){
ghostPositions.erase(ghostPositions.begin());
if(ghostPositions.size()>0){
ghostRemoveTimer=RETREAT_GHOST_FRAME_DELAY;
}
}
}
}
if(ghostFrameTimer>0){
ghostFrameTimer-=fElapsedTime;
if(ghostFrameTimer<=0&&GetState()==State::RETREAT){
ghostPositions.push_back(GetPos()+vf2d{0,-GetZ()});
ghostFrameTimer=RETREAT_GHOST_FRAME_DELAY;
}
}
} }
bool Ranger::AutoAttack(){ bool Ranger::AutoAttack(){

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 832 #define VERSION_BUILD 833
#define stringify(a) stringify_(a) #define stringify(a) stringify_(a)
#define stringify_(a) #a #define stringify_(a) #a