sigonasr2
/
SeasonI
generated from sigonasr2/CPlusPlusProjectTemplate
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Fixed a segfault with the ally selection system. Implemented battle properties into battle turns

Browse Source 
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
master
sigonasr2 2 years ago
parent 4e293ff983
commit 300f77d51e
9 changed files with 496 additions and 429 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. BIN
      C++ProjectTemplate
  2. 1
      battle.h
  3. 0
      battleproperty.c
  4. 168
      battleproperty.h
  5. 15
      defines.h
  6. 158
      encounters.h
  7. 168
      entity.h
  8. 85
      main.cpp
  9. 2
      sig

BIN
C++ProjectTemplate
View File

Binary file not shown.

1
battle.h
Unescape View File

@ -2,7 +2,6 @@
#define BATTLE_H #define BATTLE_H
#include "effect.h" #include "effect.h"
#include "pixelGameEngine.h" #include "pixelGameEngine.h"
#include "battleproperty.h"
using namespace olc; using namespace olc;
enum class BattleMoveName{ enum class BattleMoveName{

0
battleproperty.c
Unescape View File

168
battleproperty.h
Unescape View File

@ -1,7 +1,7 @@
#ifndef BATTLE_PROPERTY_H #ifndef BATTLE_PROPERTY_H
#define BATTLE_PROPERTY_H #define BATTLE_PROPERTY_H
#include "pixelGameEngine.h" #include "pixelGameEngine.h"
#include "defines.h" #include "entity.h"
using namespace olc; using namespace olc;
@ -9,24 +9,26 @@ class BattleProperty{
public: public:
std::string displayName; std::string displayName;
std::string effectName; std::string effectName;
BattleProperty(std::string displayName,std::string effectName) Property prop;
:displayName(displayName),effectName(effectName){} BattleProperty(Property prop,std::string displayName,std::string effectName)
virtual void OnApplication()=0; //What happens when the effect is immediately applied. :prop(prop),displayName(displayName),effectName(effectName){}
virtual void OnTurnStart()=0; //Effects on turn start. virtual void OnApplication(Entity*ent,int val)=0; //What happens when the effect is immediately applied.
virtual void OnTurnEnd()=0; //Effects on turn end. virtual bool OnTurnStart(Entity*ent,int val)=0; //Effects on turn start.
virtual void OnTurnEnd(Entity*ent,int val)=0; //Effects on turn end.
}; };
class Property_PETRIFY:public BattleProperty{ class Property_PETRIFY:public BattleProperty{
public: public:
Property_PETRIFY() Property_PETRIFY()
:BattleProperty("PETRIFY","Petrified"){} :BattleProperty(Property::PETRIFY,"PETRIFY","Petrified"){}
void OnApplication(){ void OnApplication(Entity*ent,int val){
} }
void OnTurnStart(){ //Return false to cancel the move.
bool OnTurnStart(Entity*ent,int val){
return true;
} }
void OnTurnEnd(){ void OnTurnEnd(Entity*ent,int val){
} }
}; };
@ -34,14 +36,15 @@ class Property_PETRIFY:public BattleProperty{
class Property_PARALYZE:public BattleProperty{ class Property_PARALYZE:public BattleProperty{
public: public:
Property_PARALYZE() Property_PARALYZE()
:BattleProperty("PARALYZE","Paralyzed"){} :BattleProperty(Property::PARALYZE,"PARALYZE","Paralyzed"){}
void OnApplication(){ void OnApplication(Entity*ent,int val){
} }
void OnTurnStart(){ //Return false to cancel the move.
bool OnTurnStart(Entity*ent,int val){
return true;
} }
void OnTurnEnd(){ void OnTurnEnd(Entity*ent,int val){
} }
}; };
@ -49,14 +52,15 @@ class Property_PARALYZE:public BattleProperty{
class Property_DIAMONDIZE:public BattleProperty{ class Property_DIAMONDIZE:public BattleProperty{
public: public:
Property_DIAMONDIZE() Property_DIAMONDIZE()
:BattleProperty("DIAMONDIZE","Diamondized"){} :BattleProperty(Property::DIAMONDIZE,"DIAMONDIZE","Diamondized"){}
void OnApplication(){ void OnApplication(Entity*ent,int val){
} }
void OnTurnStart(){ //Return false to cancel the move.
bool OnTurnStart(Entity*ent,int val){
return true;
} }
void OnTurnEnd(){ void OnTurnEnd(Entity*ent,int val){
} }
}; };
@ -64,14 +68,15 @@ class Property_DIAMONDIZE:public BattleProperty{
class Property_CRYING:public BattleProperty{ class Property_CRYING:public BattleProperty{
public: public:
Property_CRYING() Property_CRYING()
:BattleProperty("CRYING","Crying"){} :BattleProperty(Property::CRYING,"CRYING","Crying"){}
void OnApplication(){ void OnApplication(Entity*ent,int val){
} }
void OnTurnStart(){ //Return false to cancel the move.
bool OnTurnStart(Entity*ent,int val){
return true;
} }
void OnTurnEnd(){ void OnTurnEnd(Entity*ent,int val){
} }
}; };
@ -79,29 +84,34 @@ class Property_CRYING:public BattleProperty{
class Property_SLOW:public BattleProperty{ class Property_SLOW:public BattleProperty{
public: public:
Property_SLOW() Property_SLOW()
:BattleProperty("SLOW","Slowed"){} :BattleProperty(Property::SLOW,"SLOW","Slowed"){}
void OnApplication(){ void OnApplication(Entity*ent,int val){
ent->statusEffects[prop]=val;
printf("%s: %s - %d\n",displayName.c_str(),ent->obj->name.c_str(),ent->statusEffects[prop]);
} }
void OnTurnStart(){ //Return false to cancel the move.
bool OnTurnStart(Entity*ent,int val){
printf("%s: %s - %d\n",displayName.c_str(),ent->obj->name.c_str(),ent->statusEffects[prop]);
return true;
} }
void OnTurnEnd(){ void OnTurnEnd(Entity*ent,int val){
ent->statusEffects[prop]--;
printf("%s: %s - %d\n",displayName.c_str(),ent->obj->name.c_str(),ent->statusEffects[prop]);
} }
}; };
class Property_MUSHROOMIZED:public BattleProperty{ class Property_MUSHROOMIZED:public BattleProperty{
public: public:
Property_MUSHROOMIZED() Property_MUSHROOMIZED()
:BattleProperty("MUSHROOMIZED","Mushroomized"){} :BattleProperty(Property::MUSHROOMIZED,"MUSHROOMIZED","Mushroomized"){}
void OnApplication(){ void OnApplication(Entity*ent,int val){
} }
void OnTurnStart(){ //Return false to cancel the move.
bool OnTurnStart(Entity*ent,int val){
return true;
} }
void OnTurnEnd(){ void OnTurnEnd(Entity*ent,int val){
} }
}; };
@ -109,14 +119,15 @@ class Property_MUSHROOMIZED:public BattleProperty{
class Property_CONFUSE:public BattleProperty{ class Property_CONFUSE:public BattleProperty{
public: public:
Property_CONFUSE() Property_CONFUSE()
:BattleProperty("CONFUSE","Confused"){} :BattleProperty(Property::CONFUSE,"CONFUSE","Confused"){}
void OnApplication(){ void OnApplication(Entity*ent,int val){
} }
void OnTurnStart(){ //Return false to cancel the move.
bool OnTurnStart(Entity*ent,int val){
return true;
} }
void OnTurnEnd(){ void OnTurnEnd(Entity*ent,int val){
} }
}; };
@ -124,14 +135,15 @@ class Property_CONFUSE:public BattleProperty{
class Property_POISON:public BattleProperty{ class Property_POISON:public BattleProperty{
public: public:
Property_POISON() Property_POISON()
:BattleProperty("POISON","Poisoned"){} :BattleProperty(Property::POISON,"POISON","Poisoned"){}
void OnApplication(){ void OnApplication(Entity*ent,int val){
} }
void OnTurnStart(){ //Return false to cancel the move.
bool OnTurnStart(Entity*ent,int val){
return true;
} }
void OnTurnEnd(){ void OnTurnEnd(Entity*ent,int val){
} }
}; };
@ -139,14 +151,15 @@ class Property_POISON:public BattleProperty{
class Property_REGEN:public BattleProperty{ class Property_REGEN:public BattleProperty{
public: public:
Property_REGEN() Property_REGEN()
:BattleProperty("REGEN","Regenerating"){} :BattleProperty(Property::REGEN,"REGEN","Regenerating"){}
void OnApplication(){ void OnApplication(Entity*ent,int val){
} }
void OnTurnStart(){ //Return false to cancel the move.
bool OnTurnStart(Entity*ent,int val){
return true;
} }
void OnTurnEnd(){ void OnTurnEnd(Entity*ent,int val){
} }
}; };
@ -154,13 +167,15 @@ class Property_REGEN:public BattleProperty{
class Property_DEFENSE_UP:public BattleProperty{ class Property_DEFENSE_UP:public BattleProperty{
public: public:
Property_DEFENSE_UP() Property_DEFENSE_UP()
:BattleProperty("DEFENSE_UP","Hardened"){} :BattleProperty(Property::DEFENSE_UP,"DEFENSE_UP","Hardened"){}
void OnApplication(){ void OnApplication(Entity*ent,int val){
}
void OnTurnStart(){
} }
void OnTurnEnd(){ //Return false to cancel the move.
bool OnTurnStart(Entity*ent,int val){
return true;
}
void OnTurnEnd(Entity*ent,int val){
} }
}; };
@ -168,14 +183,15 @@ class Property_DEFENSE_UP:public BattleProperty{
class Property_REVIVE:public BattleProperty{ class Property_REVIVE:public BattleProperty{
public: public:
Property_REVIVE() Property_REVIVE()
:BattleProperty("REVIVE","Revived"){} :BattleProperty(Property::REVIVE,"REVIVE","Revived"){}
void OnApplication(){ void OnApplication(Entity*ent,int val){
} }
void OnTurnStart(){ //Return false to cancel the move.
bool OnTurnStart(Entity*ent,int val){
return true;
} }
void OnTurnEnd(){ void OnTurnEnd(Entity*ent,int val){
} }
}; };
@ -183,30 +199,16 @@ class Property_REVIVE:public BattleProperty{
class Property_NONE:public BattleProperty{ class Property_NONE:public BattleProperty{
public: public:
Property_NONE() Property_NONE()
:BattleProperty("NONE",""){} :BattleProperty(Property::NONE,"NONE",""){}
void OnApplication(){ void OnApplication(Entity*ent,int val){
} }
void OnTurnStart(){ //Return false to cancel the move.
bool OnTurnStart(Entity*ent,int val){
return true;
} }
void OnTurnEnd(){ void OnTurnEnd(Entity*ent,int val){
} }
}; };
enum class Property{
PETRIFY,
PARALYZE,
DIAMONDIZE,
CRYING,
SLOW,
MUSHROOMIZED,
CONFUSE,
POISON,
REGEN,
DEFENSE_UP,
REVIVE,
NONE
};
#endif #endif

15
defines.h
Unescape View File

@ -36,6 +36,21 @@ using namespace olc;
#define 액션 (CutsceneAction*)new #define 액션 (CutsceneAction*)new
enum class Property{
PETRIFY,
PARALYZE,
DIAMONDIZE,
CRYING,
SLOW,
MUSHROOMIZED,
CONFUSE,
POISON,
REGEN,
DEFENSE_UP,
REVIVE,
NONE
};
extern PixelGameEngine*GAME; extern PixelGameEngine*GAME;
extern vd2d cameraPos; extern vd2d cameraPos;
#endif #endif

158
encounters.h
Unescape View File

@ -6,6 +6,7 @@ using namespace olc;
#include "object.h" #include "object.h"
#include "battle.h" #include "battle.h"
#include "item.h" #include "item.h"
#include "entity.h"
extern std::vector<Item*> PARTY_INVENTORY; extern std::vector<Item*> PARTY_INVENTORY;
@ -18,163 +19,6 @@ namespace encounter{
}; };
} }
class Entity{
private:
int HP=0;
int targetHP=0;
int PP=0;
int targetPP=0;
public:
int maxHP=0;
int maxPP=0;
std::array<int,4>resistances={0,0,0,0};
int speed=0;
int baseAtk=0;
int damageReduction=0; //A percentage of how much damage to reduce.
bool smart=false;
bool dumb=false;
int atb=0; //When this value reaches 1000, it's this entity's turn.
Object* obj;
std::vector<Battle::Move*> moveSet;
std::map<Property,int> statusEffects;
int selectedTarget = NO_TARGET;
Battle::Move*selectedMove = nullptr; //The index of the selected move.
int channelTimeRemaining = 0; //The amount of channel time left until move can be performed.
vd2d channelPos = DEFAULT_CHANNELPOS; //Where our channel is happening.
std::vector<Item*> inventory; //Used mostly for enemy spoils.
std::array<Item*,3> equipment = {nullptr,nullptr,nullptr}; //Equipment this character is using.
bool isPlayer=false; //Whether or not this is a player entity.
//Used for initializing players.
Entity(int HP,int maxHP,int PP,int maxPP,int baseAtk,std::array<int,4>resistances,int speed,std::vector<Battle::Move*>moveSet,std::vector<Item*>items={},std::array<Item*,3>equipment={},int damageReduction=0,bool smart=false,bool dumb=false)
:Entity(nullptr,HP,maxHP,PP,maxPP,baseAtk,resistances,speed,moveSet,items,equipment,damageReduction,smart,dumb){
isPlayer=true;
}
//Use this for initializing enemies as it lets you specify an object.
Entity(Object*obj,int HP,int maxHP,int PP,int maxPP,int baseAtk,std::array<int,4>resistances,int speed,std::vector<Battle::Move*>moveSet,std::vector<Item*>items={},std::array<Item*,3>equipment={},int damageReduction=0,bool smart=false,bool dumb=false)
:obj(obj),HP(HP),maxHP(maxHP),PP(PP),maxPP(maxPP),baseAtk(baseAtk),speed(speed),equipment(equipment),moveSet(moveSet),damageReduction(damageReduction),inventory(items),smart(smart),dumb(dumb){
for (int i=0;i<4;i++) {
this->resistances[i]=resistances[i];
}
this->targetHP=HP;
this->targetPP=PP;
}
Property GetPrimaryStatusEffect() {
for (std::map<Property,int>::iterator it = statusEffects.begin();it!=statusEffects.end();++it) {
if (it->second!=0) {
return it->first;
}
}
return Property::NONE;
}
//Get the HP that the rolling counter is moving towards.
int GetTargetHP() {
return targetHP;
}
//Gets the current actual health of the target.
int GetHP() {
return HP;
}
//Get the PP that the rolling counter is moving towards.
int GetTargetPP() {
return targetPP;
}
//Gets the current actual pp of the target.
int GetPP() {
return PP;
}
//Sets the rolling counter target to this health value.
void SetTargetHP(int hp) {
targetHP=hp;
}
//Sets the rolling counter target to this pp value.
void SetTargetPP(int pp) {
targetPP=pp;
}
//Subtracts from the rolling counter target from this health value.
void SubtractHP(int hp) {
targetHP-=hp;
}
//Adds to the rolling counter target from this health value.
void AddHP(int hp) {
targetHP=std::clamp(targetHP+hp,0,maxHP);
}
//Subtracts from the rolling counter target from this pp value.
void SubtractPP(int pp) {
targetPP=std::clamp(targetPP-pp,0,maxPP);
}
//Adds to the rolling counter target from this pp value.
void AddPP(int pp) {
targetPP=std::clamp(targetPP+pp,0,maxPP);
}
//THIS IS FOR SPECIAL USE CASES ONLY! Normally you want to touch the rolling counter amount instead using SetTargetHP()!
void _SetDirectHP(int hp) {
HP=hp;
}
//THIS IS FOR SPECIAL USE CASES ONLY! Normally you want to touch the rolling counter amount instead using SetTargetPP()!
void _SetDirectPP(int pp) {
PP=pp;
}
void RemoveItem(int index) {
if (isPlayer) {
PARTY_INVENTORY.erase(PARTY_INVENTORY.begin()+index);
} else {
inventory.erase(inventory.begin()+index);
}
}
//If index is -1, the item is inserted at the end of the list. Otherwise it's going to overwrite a certain slot. Be certain you swap the item before doing this!
void RemoveEquip(EquipSlot::Equip slot,int index=-1) {
Item*CurrentEquip=equipment[slot];
if (CurrentEquip==nullptr) {
return;
}
if (isPlayer) {
if (index==-1) {
PARTY_INVENTORY.push_back(CurrentEquip);
} else {
PARTY_INVENTORY[index]=CurrentEquip;
}
equipment[slot]=nullptr;
} else {
if (index==-1) {
inventory.push_back(CurrentEquip);
} else {
inventory[index]=CurrentEquip;
}
equipment[slot]=nullptr;
}
}
//Will automatically swap items with current equipment so no need to call remove first.
void EquipItem(int index) {
Item*equip=nullptr;
if (isPlayer) {
equip=PARTY_INVENTORY[index];
} else {
equip=inventory[index];
}
if (equip==nullptr) {
return;
}
if (equip->stats.equip==EquipSlot::NONE) {
printf("Cannot equip %s! Does not have a valid Equip slot!\n",equip->name.c_str());
return;
}
Item*CurrentEquip=equipment[equip->stats.equip];
if (CurrentEquip==nullptr) {
if (isPlayer) {
PARTY_INVENTORY.erase(PARTY_INVENTORY.begin()+index);
} else {
inventory.erase(inventory.begin()+index);
}
} else {
RemoveEquip(CurrentEquip->stats.equip,index);
}
equipment[equip->stats.equip]=equip;
}
};
class Encounter{ class Encounter{
public: public:
vd2d pos; vd2d pos;

168
entity.h
Unescape View File

@ -0,0 +1,168 @@
#ifndef ENTITY_H
#define ENTITY_H
#include "pixelGameEngine.h"
#include "object.h"
extern std::vector<Item*>PARTY_INVENTORY;
using namespace olc;
class Entity{
private:
int HP=0;
int targetHP=0;
int PP=0;
int targetPP=0;
public:
int maxHP=0;
int maxPP=0;
std::array<int,4>resistances={0,0,0,0};
int speed=0;
int baseAtk=0;
int damageReduction=0; //A percentage of how much damage to reduce.
bool smart=false;
bool dumb=false;
int atb=0; //When this value reaches 1000, it's this entity's turn.
Object* obj;
std::vector<Battle::Move*> moveSet;
std::map<Property,int> statusEffects;
int selectedTarget = NO_TARGET;
Battle::Move*selectedMove = nullptr; //The index of the selected move.
int channelTimeRemaining = 0; //The amount of channel time left until move can be performed.
vd2d channelPos = DEFAULT_CHANNELPOS; //Where our channel is happening.
std::vector<Item*> inventory; //Used mostly for enemy spoils.
std::array<Item*,3> equipment = {nullptr,nullptr,nullptr}; //Equipment this character is using.
bool isPlayer=false; //Whether or not this is a player entity.
//Used for initializing players.
Entity(int HP,int maxHP,int PP,int maxPP,int baseAtk,std::array<int,4>resistances,int speed,std::vector<Battle::Move*>moveSet,std::vector<Item*>items={},std::array<Item*,3>equipment={},int damageReduction=0,bool smart=false,bool dumb=false)
:Entity(nullptr,HP,maxHP,PP,maxPP,baseAtk,resistances,speed,moveSet,items,equipment,damageReduction,smart,dumb){
isPlayer=true;
}
//Use this for initializing enemies as it lets you specify an object.
Entity(Object*obj,int HP,int maxHP,int PP,int maxPP,int baseAtk,std::array<int,4>resistances,int speed,std::vector<Battle::Move*>moveSet,std::vector<Item*>items={},std::array<Item*,3>equipment={},int damageReduction=0,bool smart=false,bool dumb=false)
:obj(obj),HP(HP),maxHP(maxHP),PP(PP),maxPP(maxPP),baseAtk(baseAtk),speed(speed),equipment(equipment),moveSet(moveSet),damageReduction(damageReduction),inventory(items),smart(smart),dumb(dumb){
for (int i=0;i<4;i++) {
this->resistances[i]=resistances[i];
}
this->targetHP=HP;
this->targetPP=PP;
}
Property GetPrimaryStatusEffect() {
for (std::map<Property,int>::iterator it = statusEffects.begin();it!=statusEffects.end();++it) {
if (it->second!=0) {
return it->first;
}
}
return Property::NONE;
}
//Get the HP that the rolling counter is moving towards.
int GetTargetHP() {
return targetHP;
}
//Gets the current actual health of the target.
int GetHP() {
return HP;
}
//Get the PP that the rolling counter is moving towards.
int GetTargetPP() {
return targetPP;
}
//Gets the current actual pp of the target.
int GetPP() {
return PP;
}
//Sets the rolling counter target to this health value.
void SetTargetHP(int hp) {
targetHP=hp;
}
//Sets the rolling counter target to this pp value.
void SetTargetPP(int pp) {
targetPP=pp;
}
//Subtracts from the rolling counter target from this health value.
void SubtractHP(int hp) {
targetHP-=hp;
}
//Adds to the rolling counter target from this health value.
void AddHP(int hp) {
targetHP=std::clamp(targetHP+hp,0,maxHP);
}
//Subtracts from the rolling counter target from this pp value.
void SubtractPP(int pp) {
targetPP=std::clamp(targetPP-pp,0,maxPP);
}
//Adds to the rolling counter target from this pp value.
void AddPP(int pp) {
targetPP=std::clamp(targetPP+pp,0,maxPP);
}
//THIS IS FOR SPECIAL USE CASES ONLY! Normally you want to touch the rolling counter amount instead using SetTargetHP()!
void _SetDirectHP(int hp) {
HP=hp;
}
//THIS IS FOR SPECIAL USE CASES ONLY! Normally you want to touch the rolling counter amount instead using SetTargetPP()!
void _SetDirectPP(int pp) {
PP=pp;
}
void RemoveItem(int index) {
if (isPlayer) {
PARTY_INVENTORY.erase(PARTY_INVENTORY.begin()+index);
} else {
inventory.erase(inventory.begin()+index);
}
}
//If index is -1, the item is inserted at the end of the list. Otherwise it's going to overwrite a certain slot. Be certain you swap the item before doing this!
void RemoveEquip(EquipSlot::Equip slot,int index=-1) {
Item*CurrentEquip=equipment[slot];
if (CurrentEquip==nullptr) {
return;
}
if (isPlayer) {
if (index==-1) {
PARTY_INVENTORY.push_back(CurrentEquip);
} else {
PARTY_INVENTORY[index]=CurrentEquip;
}
equipment[slot]=nullptr;
} else {
if (index==-1) {
inventory.push_back(CurrentEquip);
} else {
inventory[index]=CurrentEquip;
}
equipment[slot]=nullptr;
}
}
//Will automatically swap items with current equipment so no need to call remove first.
void EquipItem(int index) {
Item*equip=nullptr;
if (isPlayer) {
equip=PARTY_INVENTORY[index];
} else {
equip=inventory[index];
}
if (equip==nullptr) {
return;
}
if (equip->stats.equip==EquipSlot::NONE) {
printf("Cannot equip %s! Does not have a valid Equip slot!\n",equip->name.c_str());
return;
}
Item*CurrentEquip=equipment[equip->stats.equip];
if (CurrentEquip==nullptr) {
if (isPlayer) {
PARTY_INVENTORY.erase(PARTY_INVENTORY.begin()+index);
} else {
inventory.erase(inventory.begin()+index);
}
} else {
RemoveEquip(CurrentEquip->stats.equip,index);
}
equipment[equip->stats.equip]=equip;
}
};
#endif

85
main.cpp
Unescape View File

@ -56,6 +56,8 @@ class Map{
} }
}; };
class DamageNumber{ class DamageNumber{
public: public:
int damage; //If it's negative then it's a healing number. int damage; //If it's negative then it's a healing number.
@ -65,15 +67,6 @@ class DamageNumber{
:damage(damage),pos(pos),timer(timer){} :damage(damage),pos(pos),timer(timer){}
}; };
class SeasonI : public PixelGameEngine
{
public:
SeasonI()
{
sAppName = "Season I: Winters of Loneliness";
}
public:
int frameCount=0; int frameCount=0;
float elapsedTime=0; float elapsedTime=0;
const float TARGET_RATE = 1/60.0; const float TARGET_RATE = 1/60.0;
@ -192,10 +185,18 @@ public:
FountainEffect*FOUNTAIN_EFFECT=nullptr; FountainEffect*FOUNTAIN_EFFECT=nullptr;
FireFountainEffect*FIREFOUNTAIN_EFFECT=nullptr; FireFountainEffect*FIREFOUNTAIN_EFFECT=nullptr;
Effect*CURRENT_EFFECT=nullptr;
Effect*CURRENT_EFFECT=nullptr; class SeasonI : public PixelGameEngine
{
public:
SeasonI()
{
sAppName = "Season I: Winters of Loneliness";
}
public:
bool OnUserCreate() override bool OnUserCreate() override
{ {
srand(time(NULL)); srand(time(NULL));
@ -1992,7 +1993,7 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
SetDrawTarget(layer::GROUND); SetDrawTarget(layer::GROUND);
if (SELECTED_TARGET<0||GAME_STATE==GameState::OVERWORLD_TARGET_MENU) { if (SELECTED_TARGET<0||GAME_STATE==GameState::OVERWORLD_TARGET_MENU) {
int memberIndex = GAME_STATE==GameState::OVERWORLD_TARGET_MENU?OVERWORLD_TARGET_SELECTION:-SELECTED_TARGET-1; int memberIndex = GAME_STATE==GameState::OVERWORLD_TARGET_MENU?OVERWORLD_TARGET_SELECTION:-SELECTED_TARGET-1;
Battle::Move*selectedMove=GameState::OVERWORLD_TARGET_MENU?OVERWORLD_SELECTED_POWER:PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedMove; Battle::Move*selectedMove= GAME_STATE==GameState::OVERWORLD_TARGET_MENU?OVERWORLD_SELECTED_POWER:PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedMove;
vd2d scale = {PARTY_MEMBER_OBJ[memberIndex]->spr->width/(double)SPRITES["targetCircle.png"]->sprite->width,PARTY_MEMBER_OBJ[memberIndex]->spr->spr->sprite->height/(double)SPRITES["targetCircle.png"]->sprite->height}; vd2d scale = {PARTY_MEMBER_OBJ[memberIndex]->spr->width/(double)SPRITES["targetCircle.png"]->sprite->width,PARTY_MEMBER_OBJ[memberIndex]->spr->spr->sprite->height/(double)SPRITES["targetCircle.png"]->sprite->height};
vi2d size = {SPRITES["targetCircle.png"]->sprite->width,SPRITES["targetCircle.png"]->sprite->height}; vi2d size = {SPRITES["targetCircle.png"]->sprite->width,SPRITES["targetCircle.png"]->sprite->height};
DrawDecal(PARTY_MEMBER_OBJ[memberIndex]->GetPosWithOrigin()-cameraPos-size/2*scale,SPRITES["targetCircle.png"],{static_cast<float>(PARTY_MEMBER_OBJ[memberIndex]->spr->width/(double)SPRITES["targetCircle.png"]->sprite->width),static_cast<float>(PARTY_MEMBER_OBJ[memberIndex]->spr->spr->sprite->height/(double)SPRITES["targetCircle.png"]->sprite->height)},GREEN); DrawDecal(PARTY_MEMBER_OBJ[memberIndex]->GetPosWithOrigin()-cameraPos-size/2*scale,SPRITES["targetCircle.png"],{static_cast<float>(PARTY_MEMBER_OBJ[memberIndex]->spr->width/(double)SPRITES["targetCircle.png"]->sprite->width),static_cast<float>(PARTY_MEMBER_OBJ[memberIndex]->spr->spr->sprite->height/(double)SPRITES["targetCircle.png"]->sprite->height)},GREEN);
@ -2537,10 +2538,10 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
MOVELIST[BattleMoveName::METEORRAIN_B]=new Battle::Move{"Meteor Rain","Causes fiery rocks to fall from the skies. Chance to burn trees.",BETA,baseDmg:110,randomDmg:30,PPCost:22,range:2,channelTime:0,friendly:false,composition:{0,0,20,0}}; MOVELIST[BattleMoveName::METEORRAIN_B]=new Battle::Move{"Meteor Rain","Causes fiery rocks to fall from the skies. Chance to burn trees.",BETA,baseDmg:110,randomDmg:30,PPCost:22,range:2,channelTime:0,friendly:false,composition:{0,0,20,0}};
MOVELIST[BattleMoveName::METEORRAIN_G]=new Battle::Move{"Meteor Rain","Causes fiery rocks to fall from the skies. Chance to burn trees.",GAMMA,baseDmg:200,randomDmg:50,PPCost:47,range:2,channelTime:0,friendly:false,composition:{0,0,20,0}}; MOVELIST[BattleMoveName::METEORRAIN_G]=new Battle::Move{"Meteor Rain","Causes fiery rocks to fall from the skies. Chance to burn trees.",GAMMA,baseDmg:200,randomDmg:50,PPCost:47,range:2,channelTime:0,friendly:false,composition:{0,0,20,0}};
MOVELIST[BattleMoveName::METEORRAIN_O]=new Battle::Move{"Meteor Rain","Causes fiery rocks to fall from the skies. Chance to burn trees.",OMEGA,baseDmg:390,randomDmg:60,PPCost:98,range:2,channelTime:0,friendly:false,composition:{0,0,20,0}}; MOVELIST[BattleMoveName::METEORRAIN_O]=new Battle::Move{"Meteor Rain","Causes fiery rocks to fall from the skies. Chance to burn trees.",OMEGA,baseDmg:390,randomDmg:60,PPCost:98,range:2,channelTime:0,friendly:false,composition:{0,0,20,0}};
MOVELIST[BattleMoveName::PKFREEZE_A]=new Battle::Move{"PK Freeze","A powerful chilling attack causing frostbite and slow.",ALPHA,baseDmg:80,randomDmg:10,PPCost:4,range:1,channelTime:0,friendly:false,composition:{0,0,20,10}}; MOVELIST[BattleMoveName::PKFREEZE_A]=new Battle::Move{"PK Freeze","A powerful chilling attack causing frostbite and slow.",ALPHA,baseDmg:10,randomDmg:10,PPCost:4,range:1,channelTime:0,friendly:false,composition:{0,0,20,10},properties:{{Property::SLOW,4}}};
MOVELIST[BattleMoveName::PKFREEZE_B]=new Battle::Move{"PK Freeze","A powerful chilling attack causing frostbite and slow.",BETA,baseDmg:120,randomDmg:20,PPCost:8,range:1,channelTime:0,friendly:false,composition:{0,0,20,0}}; MOVELIST[BattleMoveName::PKFREEZE_B]=new Battle::Move{"PK Freeze","A powerful chilling attack causing frostbite and slow.",BETA,baseDmg:120,randomDmg:20,PPCost:8,range:1,channelTime:0,friendly:false,composition:{0,0,20,0},properties:{{Property::SLOW,4}}};
MOVELIST[BattleMoveName::PKFREEZE_G]=new Battle::Move{"PK Freeze","A powerful chilling attack causing frostbite and slow.",GAMMA,baseDmg:240,randomDmg:40,PPCost:12,range:1,channelTime:0,friendly:false,composition:{0,0,20,0}}; MOVELIST[BattleMoveName::PKFREEZE_G]=new Battle::Move{"PK Freeze","A powerful chilling attack causing frostbite and slow.",GAMMA,baseDmg:240,randomDmg:40,PPCost:12,range:1,channelTime:0,friendly:false,composition:{0,0,20,0},properties:{{Property::SLOW,4}}};
MOVELIST[BattleMoveName::PKFREEZE_O]=new Battle::Move{"PK Freeze","A powerful chilling attack causing frostbite and slow.",OMEGA,baseDmg:480,randomDmg:50,PPCost:22,range:1,channelTime:0,friendly:false,composition:{0,0,20,0}}; MOVELIST[BattleMoveName::PKFREEZE_O]=new Battle::Move{"PK Freeze","A powerful chilling attack causing frostbite and slow.",OMEGA,baseDmg:480,randomDmg:50,PPCost:22,range:1,channelTime:0,friendly:false,composition:{0,0,20,0},properties:{{Property::SLOW,4}}};
MOVELIST[BattleMoveName::PKSHIELD_A]=new Battle::Move{"PK Shield","Protects against physical attacks.",ALPHA,baseDmg:0,randomDmg:0,PPCost:12,range:1,channelTime:0,friendly:true,composition:{0,0,20,0}}; MOVELIST[BattleMoveName::PKSHIELD_A]=new Battle::Move{"PK Shield","Protects against physical attacks.",ALPHA,baseDmg:0,randomDmg:0,PPCost:12,range:1,channelTime:0,friendly:true,composition:{0,0,20,0}};
MOVELIST[BattleMoveName::PKSHIELD_B]=new Battle::Move{"PK Shield","Protects against physical attacks.",BETA,baseDmg:0,randomDmg:0,PPCost:20,range:1,channelTime:0,friendly:true,composition:{0,0,20,0}}; MOVELIST[BattleMoveName::PKSHIELD_B]=new Battle::Move{"PK Shield","Protects against physical attacks.",BETA,baseDmg:0,randomDmg:0,PPCost:20,range:1,channelTime:0,friendly:true,composition:{0,0,20,0}};
MOVELIST[BattleMoveName::PKSHIELD_O]=new Battle::Move{"PK Shield","Protects against physical attacks.",OMEGA,baseDmg:0,randomDmg:0,PPCost:59,range:4,channelTime:0,friendly:true,composition:{0,0,20,0}}; MOVELIST[BattleMoveName::PKSHIELD_O]=new Battle::Move{"PK Shield","Protects against physical attacks.",OMEGA,baseDmg:0,randomDmg:0,PPCost:59,range:4,channelTime:0,friendly:true,composition:{0,0,20,0}};
@ -2983,8 +2984,8 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
return GAME_STATE==GameState::GAME_WORLD&&BATTLE_ENCOUNTER==nullptr&&!IsTextEntryEnabled()&&!messageBoxVisible&&PARTY_MEMBER_OBJ[0]!=nullptr&&CurrentCutscene==nullptr; return GAME_STATE==GameState::GAME_WORLD&&BATTLE_ENCOUNTER==nullptr&&!IsTextEntryEnabled()&&!messageBoxVisible&&PARTY_MEMBER_OBJ[0]!=nullptr&&CurrentCutscene==nullptr;
} }
void DisplayMessageBox(std::string targetText) { void DisplayMessageBox(std::string targetT) {
this->targetText=targetText; targetText=targetT;
messageBoxText=""; messageBoxText="";
messageBoxFinalText=""; messageBoxFinalText="";
messageBoxLoad=true; messageBoxLoad=true;
@ -3294,12 +3295,22 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
if (PARTY_MEMBER_STATS[PARTY_MEMBER_ID[i]]->GetHP()>0) { if (PARTY_MEMBER_STATS[PARTY_MEMBER_ID[i]]->GetHP()>0) {
if (PARTY_MEMBER_STATS[PARTY_MEMBER_ID[i]]->selectedMove==nullptr) { if (PARTY_MEMBER_STATS[PARTY_MEMBER_ID[i]]->selectedMove==nullptr) {
if (PARTY_MEMBER_STATS[PARTY_MEMBER_ID[i]]->atb>=1000) { if (PARTY_MEMBER_STATS[PARTY_MEMBER_ID[i]]->atb>=1000) {
bool turnAllowed=true;
for (std::map<Property,int>::iterator it=PARTY_MEMBER_STATS[PARTY_MEMBER_ID[i]]->statusEffects.begin();it!=PARTY_MEMBER_STATS[PARTY_MEMBER_ID[i]]->statusEffects.end();++it) {
if (!BATTLE_PROPERTIES[it->first]->OnTurnStart(PARTY_MEMBER_STATS[PARTY_MEMBER_ID[i]],it->second)) {
turnAllowed=false;
}
}
if (turnAllowed) {
printf("%s ready.\n",PARTY_MEMBER_OBJ[i]->name.c_str()); printf("%s ready.\n",PARTY_MEMBER_OBJ[i]->name.c_str());
CURRENT_TURN=-i-1; CURRENT_TURN=-i-1;
BATTLE_STATE=BattleState::SELECT_ACTION; BATTLE_STATE=BattleState::SELECT_ACTION;
BATTLE_SELECTION_CURSOR=0; BATTLE_SELECTION_CURSOR=0;
POWER_GRADE_CURSOR[-CURRENT_TURN-1]=0; POWER_GRADE_CURSOR[-CURRENT_TURN-1]=0;
done=true; done=true;
} else {
PARTY_MEMBER_STATS[PARTY_MEMBER_ID[i]]->atb=0;
}
break; break;
} else { } else {
PARTY_MEMBER_STATS[PARTY_MEMBER_ID[i]]->atb+=PARTY_MEMBER_STATS[PARTY_MEMBER_ID[i]]->speed; PARTY_MEMBER_STATS[PARTY_MEMBER_ID[i]]->atb+=PARTY_MEMBER_STATS[PARTY_MEMBER_ID[i]]->speed;
@ -3316,6 +3327,15 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
if (BATTLE_ENCOUNTER->objs[i]->selectedMove==nullptr) { if (BATTLE_ENCOUNTER->objs[i]->selectedMove==nullptr) {
if (BATTLE_ENCOUNTER->objs[i]->atb>=1000) { if (BATTLE_ENCOUNTER->objs[i]->atb>=1000) {
printf("%s (%d) ready.\n",BATTLE_ENCOUNTER->objs[i]->obj->name.c_str(),i); printf("%s (%d) ready.\n",BATTLE_ENCOUNTER->objs[i]->obj->name.c_str(),i);
bool turnAllowed=true;
for (std::map<Property,int>::iterator it=BATTLE_ENCOUNTER->objs[i]->statusEffects.begin();it!=BATTLE_ENCOUNTER->objs[i]->statusEffects.end();++it) {
if (BATTLE_ENCOUNTER->objs[i]->statusEffects[it->first]) {
if (!BATTLE_PROPERTIES[it->first]->OnTurnStart(BATTLE_ENCOUNTER->objs[i],it->second)) {
turnAllowed=false;
}
}
}
if (turnAllowed) {
CURRENT_TURN=i; CURRENT_TURN=i;
//Enemy picks a random move from the movelist. And a random target. //Enemy picks a random move from the movelist. And a random target.
BATTLE_ENCOUNTER->objs[i]->selectedMove=BATTLE_ENCOUNTER->objs[i]->moveSet[rand()%BATTLE_ENCOUNTER->objs[i]->moveSet.size()]; BATTLE_ENCOUNTER->objs[i]->selectedMove=BATTLE_ENCOUNTER->objs[i]->moveSet[rand()%BATTLE_ENCOUNTER->objs[i]->moveSet.size()];
@ -3345,6 +3365,9 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
BATTLE_STATE=BattleState::WAIT; BATTLE_STATE=BattleState::WAIT;
BATTLE_SELECTION_CURSOR=0; BATTLE_SELECTION_CURSOR=0;
done=true; done=true;
} else {
BATTLE_ENCOUNTER->objs[i]->atb=0;
}
break; break;
} else { } else {
BATTLE_ENCOUNTER->objs[i]->atb+=BATTLE_ENCOUNTER->objs[i]->speed; BATTLE_ENCOUNTER->objs[i]->atb+=BATTLE_ENCOUNTER->objs[i]->speed;
@ -3419,9 +3442,6 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
} }
if (CURRENT_EFFECT==nullptr&&BATTLE_ANIMATION_TIMER==90||CURRENT_EFFECT!=nullptr&&BATTLE_ANIMATION_TIMER>CURRENT_EFFECT->maxLifeTime) { if (CURRENT_EFFECT==nullptr&&BATTLE_ANIMATION_TIMER==90||CURRENT_EFFECT!=nullptr&&BATTLE_ANIMATION_TIMER>CURRENT_EFFECT->maxLifeTime) {
if (CURRENT_TURN<0) { if (CURRENT_TURN<0) {
for (std::map<Property,int>::iterator it=PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->statusEffects.begin();it!=PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->statusEffects.end();++it) {
BATTLE_PROPERTIES[it->first]->OnApplication();
}
if (PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedTarget!=NO_TARGET) { if (PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedTarget!=NO_TARGET) {
if (PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedMove->friendly) { if (PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedMove->friendly) {
if (PARTY_MEMBER_STATS[-PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedTarget-1]->GetHP()>0) { if (PARTY_MEMBER_STATS[-PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedTarget-1]->GetHP()>0) {
@ -3434,6 +3454,9 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
vi2d box = {(128-32*PARTY_MEMBER_COUNT)+memberID*64+29,170}; vi2d box = {(128-32*PARTY_MEMBER_COUNT)+memberID*64+29,170};
DAMAGE_NUMBERS.push_back(new DamageNumber(-healAmt,box+cameraPos)); DAMAGE_NUMBERS.push_back(new DamageNumber(-healAmt,box+cameraPos));
} }
for (std::map<Property,int>::iterator it=PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedMove->properties.begin();it!=PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedMove->properties.end();++it) {
BATTLE_PROPERTIES[it->first]->OnApplication(PARTY_MEMBER_STATS[PARTY_MEMBER_ID[PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedTarget]],it->second);
}
} }
} else { } else {
std::cout << PARTY_MEMBER_OBJ[-CURRENT_TURN-1]->name << " uses " << PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedMove->name << " " << PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedMove->grade << " on " << PARTY_MEMBER_OBJ[-PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedTarget-1]->name << " but it failed.\n"; std::cout << PARTY_MEMBER_OBJ[-CURRENT_TURN-1]->name << " uses " << PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedMove->name << " " << PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedMove->grade << " on " << PARTY_MEMBER_OBJ[-PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedTarget-1]->name << " but it failed.\n";
@ -3453,15 +3476,15 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
DAMAGE_NUMBERS.push_back(new DamageNumber(dmgAmt,ent->obj->GetPosWithOrigin())); DAMAGE_NUMBERS.push_back(new DamageNumber(dmgAmt,ent->obj->GetPosWithOrigin()));
} }
} }
for (std::map<Property,int>::iterator it=PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedMove->properties.begin();it!=PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedMove->properties.end();++it) {
BATTLE_PROPERTIES[it->first]->OnApplication(BATTLE_ENCOUNTER->objs[PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedTarget],it->second);
}
} else { } else {
std::cout << PARTY_MEMBER_OBJ[-CURRENT_TURN-1]->name << " uses " << PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedMove->name << " " << PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedMove->grade << " on " << BATTLE_ENCOUNTER->objs[PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedTarget]->obj->name << " but it failed.\n"; std::cout << PARTY_MEMBER_OBJ[-CURRENT_TURN-1]->name << " uses " << PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedMove->name << " " << PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedMove->grade << " on " << BATTLE_ENCOUNTER->objs[PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedTarget]->obj->name << " but it failed.\n";
} }
} }
} }
} else { } else {
for (std::map<Property,int>::iterator it=BATTLE_ENCOUNTER->objs[CURRENT_TURN]->statusEffects.begin();it!=BATTLE_ENCOUNTER->objs[CURRENT_TURN]->statusEffects.end();++it) {
BATTLE_PROPERTIES[it->first]->OnApplication();
}
if (BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedTarget!=-NO_TARGET) { if (BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedTarget!=-NO_TARGET) {
if (BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedMove->friendly) { if (BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedMove->friendly) {
if (BATTLE_ENCOUNTER->objs[BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedTarget]->GetHP()>0) { if (BATTLE_ENCOUNTER->objs[BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedTarget]->GetHP()>0) {
@ -3476,6 +3499,9 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
} else { } else {
std::cout << BATTLE_ENCOUNTER->objs[CURRENT_TURN]->obj->name << " uses " << BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedMove->name << " " << BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedMove->grade << " on " << BATTLE_ENCOUNTER->objs[BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedTarget]->obj->name << " but it failed.\n"; std::cout << BATTLE_ENCOUNTER->objs[CURRENT_TURN]->obj->name << " uses " << BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedMove->name << " " << BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedMove->grade << " on " << BATTLE_ENCOUNTER->objs[BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedTarget]->obj->name << " but it failed.\n";
} }
for (std::map<Property,int>::iterator it=BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedMove->properties.begin();it!=BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedMove->properties.end();++it) {
BATTLE_PROPERTIES[it->first]->OnApplication(BATTLE_ENCOUNTER->objs[BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedTarget],it->second);
}
} else { } else {
if (PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedTarget-1]]->GetHP()>0) { if (PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedTarget-1]]->GetHP()>0) {
for (auto&ent:GetEntitiesInRange(BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedTarget,BATTLE_ENCOUNTER->objs[CURRENT_TURN]->channelPos,BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedMove)) { for (auto&ent:GetEntitiesInRange(BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedTarget,BATTLE_ENCOUNTER->objs[CURRENT_TURN]->channelPos,BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedMove)) {
@ -3493,6 +3519,9 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
DAMAGE_NUMBERS.push_back(new DamageNumber(dmgAmt,box+cameraPos)); DAMAGE_NUMBERS.push_back(new DamageNumber(dmgAmt,box+cameraPos));
} }
} }
for (std::map<Property,int>::iterator it=BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedMove->properties.begin();it!=BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedMove->properties.end();++it) {
BATTLE_PROPERTIES[it->first]->OnApplication(PARTY_MEMBER_STATS[PARTY_MEMBER_ID[BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedTarget]],it->second);
}
} else { } else {
std::cout << BATTLE_ENCOUNTER->objs[CURRENT_TURN]->obj->name << " uses " << BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedMove->name << " " << BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedMove->grade << " on " << PARTY_MEMBER_OBJ[-BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedTarget-1]->name << " but it failed.\n"; std::cout << BATTLE_ENCOUNTER->objs[CURRENT_TURN]->obj->name << " uses " << BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedMove->name << " " << BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedMove->grade << " on " << PARTY_MEMBER_OBJ[-BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedTarget-1]->name << " but it failed.\n";
} }
@ -3514,12 +3543,22 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
printf("Equipped item: %s\n",PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->equipment[PrevEquip->stats.equip]->name.c_str()); printf("Equipped item: %s\n",PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->equipment[PrevEquip->stats.equip]->name.c_str());
previousEquip[-CURRENT_TURN-1]=-1; previousEquip[-CURRENT_TURN-1]=-1;
} }
for (std::map<Property,int>::iterator it=PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->statusEffects.begin();it!=PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->statusEffects.end();++it) {
if (PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->statusEffects[it->first]) {
BATTLE_PROPERTIES[it->first]->OnTurnEnd(PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]],it->second);
}
}
} else { } else {
BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedMove=nullptr; BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedMove=nullptr;
BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedTarget=NO_TARGET; BATTLE_ENCOUNTER->objs[CURRENT_TURN]->selectedTarget=NO_TARGET;
BATTLE_ENCOUNTER->objs[CURRENT_TURN]->atb=0; BATTLE_ENCOUNTER->objs[CURRENT_TURN]->atb=0;
BATTLE_ENCOUNTER->objs[CURRENT_TURN]->channelPos=DEFAULT_CHANNELPOS; BATTLE_ENCOUNTER->objs[CURRENT_TURN]->channelPos=DEFAULT_CHANNELPOS;
BATTLE_STATE=BattleState::WAIT; BATTLE_STATE=BattleState::WAIT;
for (std::map<Property,int>::iterator it=BATTLE_ENCOUNTER->objs[CURRENT_TURN]->statusEffects.begin();it!=BATTLE_ENCOUNTER->objs[CURRENT_TURN]->statusEffects.end();++it) {
if (BATTLE_ENCOUNTER->objs[CURRENT_TURN]->statusEffects[it->first]) {
BATTLE_PROPERTIES[it->first]->OnTurnEnd(BATTLE_ENCOUNTER->objs[CURRENT_TURN],it->second);
}
}
} }
bool enemyStillAlive=false; bool enemyStillAlive=false;

2
sig
Unescape View File

@ -3,7 +3,7 @@ export AUTO_UPDATE=true
source utils/define.sh source utils/define.sh
define PROJECT_NAME "C++ProjectTemplate" define PROJECT_NAME "C++ProjectTemplate"
define CUSTOM_PARAMS "-std=c++17 -lX11 -lGL -lpthread -lpng -lstdc++fs -lpulse -lpulse-simple" define CUSTOM_PARAMS "-g -std=c++17 -lX11 -lGL -lpthread -lpng -lstdc++fs -lpulse -lpulse-simple"
define LANGUAGE "C++" define LANGUAGE "C++"
source utils/main.sh source utils/main.sh

Write Preview
Loading…
Cancel
Save