Effects good to go

Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
master
sigonasr2 3 years ago
parent 95d0f85cff
commit e0f6a98407
  1. 6
      SeasonsOfLoneliness.cpp
  2. BIN
      Seasons_of_Loneliness
  3. 1
      data.h

@ -1502,7 +1502,6 @@ public:
} else { } else {
DrawWrappedText({4,4},CURRENT_ENCOUNTER.entities[BATTLE_CURRENT_TURN_ENTITY]->name+" "+(char)('A'+BATTLE_CURRENT_TURN_ENTITY)+" with "+CURRENT_ENCOUNTER.entities[BATTLE_CURRENT_TURN_ENTITY]->selectedMove->name,WIDTH-8,WHITE,{2,2}); DrawWrappedText({4,4},CURRENT_ENCOUNTER.entities[BATTLE_CURRENT_TURN_ENTITY]->name+" "+(char)('A'+BATTLE_CURRENT_TURN_ENTITY)+" with "+CURRENT_ENCOUNTER.entities[BATTLE_CURRENT_TURN_ENTITY]->selectedMove->name,WIDTH-8,WHITE,{2,2});
} }
FillRectDecal({0,0},{WIDTH,HEIGHT},Pixel(ORIGINAL_FOREGROUND_EFFECT_COLOR.r,ORIGINAL_FOREGROUND_EFFECT_COLOR.g,ORIGINAL_FOREGROUND_EFFECT_COLOR.b,ORIGINAL_FOREGROUND_EFFECT_COLOR.a*PIXEL_EFFECT_TRANSPARENCY));
}break; }break;
} }
if (IN_BATTLE_ENCOUNTER||(!CUTSCENE_ACTIVE&&PLAYER_HP!=PLAYER_MAXHP)) { if (IN_BATTLE_ENCOUNTER||(!CUTSCENE_ACTIVE&&PLAYER_HP!=PLAYER_MAXHP)) {
@ -1531,6 +1530,7 @@ public:
FillRectDecal(pixels[i]->pos,pixels[i]->size,{pixels[i]->r,pixels[i]->g,pixels[i]->b,pixels[i]->a}); FillRectDecal(pixels[i]->pos,pixels[i]->size,{pixels[i]->r,pixels[i]->g,pixels[i]->b,pixels[i]->a});
} }
} }
FillRectDecal({0,0},{WIDTH,HEIGHT},Pixel(ORIGINAL_FOREGROUND_EFFECT_COLOR.r,ORIGINAL_FOREGROUND_EFFECT_COLOR.g,ORIGINAL_FOREGROUND_EFFECT_COLOR.b,ORIGINAL_FOREGROUND_EFFECT_COLOR.a*PIXEL_EFFECT_TRANSPARENCY));
SetDrawTarget(1); SetDrawTarget(1);
} }
if (messageBoxVisible) { if (messageBoxVisible) {
@ -2045,7 +2045,7 @@ public:
Clear(BLANK); Clear(BLANK);
SetDrawTarget(1); SetDrawTarget(1);
applyPixelEffect( applyPixelEffect(
{(pos.x-PLAYER_COORDS[0])*32+WIDTH/2-16-effect->effectSize.x/2,(pos.y-PLAYER_COORDS[1])*32+HEIGHT/2-16-effect->effectSize.y/2}, {(pos.x-PLAYER_COORDS[0])*32+WIDTH/2-effect->effectSize.x/2,(pos.y-PLAYER_COORDS[1])*32+HEIGHT/2-effect->effectSize.y/2},
effect->effectSize, effect->effectSize,
effect->pos_low, effect->pos_low,
effect->pos_high, effect->pos_high,
@ -2065,7 +2065,7 @@ public:
Clear(BLANK); Clear(BLANK);
SetDrawTarget(1); SetDrawTarget(1);
applyPixelEffect( applyPixelEffect(
{(pos.x-PLAYER_COORDS[0])*32+WIDTH/2-16-power->effect->effectSize.x/2,(pos.y-PLAYER_COORDS[1])*32+HEIGHT/2-16-power->effect->effectSize.y/2}, {(pos.x-PLAYER_COORDS[0])*32+WIDTH/2-power->effect->effectSize.x/2,(pos.y-PLAYER_COORDS[1])*32+HEIGHT/2-power->effect->effectSize.y/2},
power->effect->effectSize, power->effect->effectSize,
power->effect->pos_low, power->effect->pos_low,
power->effect->pos_high, power->effect->pos_high,

Binary file not shown.

@ -67,4 +67,5 @@ olc::Pixel TILE_COLORS[]={
olc::Pixel(30, 84, 87), //2 WATER olc::Pixel(30, 84, 87), //2 WATER
olc::Pixel(180, 191, 209), //3 MARBLE olc::Pixel(180, 191, 209), //3 MARBLE
olc::Pixel(112, 88, 64), //4 WALL (DIRT) olc::Pixel(112, 88, 64), //4 WALL (DIRT)
olc::Pixel(33, 12, 28), //5 Volcanic Ground
}; };
Loading…
Cancel
Save