|
|
@ -1222,9 +1222,9 @@ public: |
|
|
|
int healPower=30; |
|
|
|
int healPower=30; |
|
|
|
int healRoll=healPower+rand()%ref->damageRoll*sign(healPower); |
|
|
|
int healRoll=healPower+rand()%ref->damageRoll*sign(healPower); |
|
|
|
if (BATTLE_CURRENT_TURN_ENTITY==-1) { |
|
|
|
if (BATTLE_CURRENT_TURN_ENTITY==-1) { |
|
|
|
effectRadius({(int)PLAYER_COORDS[0],(int)PLAYER_COORDS[1]},ref,-healPower,true); |
|
|
|
effectRadius({(int)PLAYER_COORDS[0],(int)PLAYER_COORDS[1]},ref,-healRoll,true); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
effectRadius({CURRENT_ENCOUNTER.entities[BATTLE_CURRENT_TURN_ENTITY]->x+CURRENT_ENCOUNTER.x,CURRENT_ENCOUNTER.entities[BATTLE_CURRENT_TURN_ENTITY]->y+CURRENT_ENCOUNTER.y},ref,-healPower,false); |
|
|
|
effectRadius({CURRENT_ENCOUNTER.entities[BATTLE_CURRENT_TURN_ENTITY]->x+CURRENT_ENCOUNTER.x,CURRENT_ENCOUNTER.entities[BATTLE_CURRENT_TURN_ENTITY]->y+CURRENT_ENCOUNTER.y},ref,-healRoll,false); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if (EFFECT_TIMER==30&&ref->name.compare("Seed Storm")==0) { |
|
|
|
if (EFFECT_TIMER==30&&ref->name.compare("Seed Storm")==0) { |
|
|
@ -1614,11 +1614,11 @@ public: |
|
|
|
DrawDecal({(float)(WIDTH-52*0.4),(float)(meterYOffset)},OXYGEN_METER_DECAL,{0.4,0.4}); |
|
|
|
DrawDecal({(float)(WIDTH-52*0.4),(float)(meterYOffset)},OXYGEN_METER_DECAL,{0.4,0.4}); |
|
|
|
meterYOffset+=(2+48*0.4); |
|
|
|
meterYOffset+=(2+48*0.4); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
SetDrawTarget(2); |
|
|
|
DrawPartialDecal({(float)(WIDTH/2-16+(current_playerAnim.flipped?32:0)),(float)(HEIGHT/2-16)},current_playerAnim.spr,current_playerAnim.getCurrentFrame(),{32,32},{(float)(current_playerAnim.flipped?-1:1),1}); |
|
|
|
DrawPartialDecal({(float)(WIDTH/2-16+(current_playerAnim.flipped?32:0)),(float)(HEIGHT/2-16)},current_playerAnim.spr,current_playerAnim.getCurrentFrame(),{32,32},{(float)(current_playerAnim.flipped?-1:1),1}); |
|
|
|
if (IN_BATTLE_ENCOUNTER&&BATTLE_ENTRY_TIMER<45) { |
|
|
|
if (IN_BATTLE_ENCOUNTER&&BATTLE_ENTRY_TIMER<45) { |
|
|
|
DrawStringDecal({(float)(WIDTH/2-16+(current_playerAnim.flipped?32:0)+8),(float)(HEIGHT/2-16-sin(frameCount*12/60.0)*4-12)},"!!",RED); |
|
|
|
DrawStringDecal({(float)(WIDTH/2-16+(current_playerAnim.flipped?32:0)+8),(float)(HEIGHT/2-16-sin(frameCount*12/60.0)*4-12)},"!!",RED); |
|
|
|
} |
|
|
|
} |
|
|
|
SetDrawTarget(2); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
}break; |
|
|
|
}break; |
|
|
|
case CUTSCENE_3:{ |
|
|
|
case CUTSCENE_3:{ |
|
|
|