Compare commits

...

2 Commits

Author SHA1 Message Date
5847d5eb00 Add heal "potions" to Game 2024-11-25 20:18:35 +01:00
9f9a0cbe4f Add damage.png 2024-11-25 20:17:50 +01:00
3 changed files with 137 additions and 62 deletions

View File

@ -8,6 +8,15 @@
bool keys[4] = {false, false, false, false};
void Game::spawnItem(Type type) {
Item item{};
item.type = type;
item.x = rand() % WINDOW_WIDTH;
item.y = rand() % WINDOW_HEIGHT;
items.push_back(item);
}
void Opponent::move(int timeMultiplier) {
if (this->x < this->targetX) this->x += timeMultiplier;
if (this->x > this->targetX) this->x -= timeMultiplier;
@ -36,16 +45,35 @@ for (int i = 0; i < opponents.size(); i++) {
if (player.x < o.x + 80 && player.x + 80 > o.x && player.y < o.y + 96 && player.y + 96 > o.y) {
if (player.health > 0) {
player.health--;
} else {
}
else {
// TODO: Game over sccreen
}
opponents.erase(opponents.begin() + i);
}
}
for (int i = 0; i < items.size(); i++) {
Item item = items[i];
if (player.x < item.x + 24 && player.x + 80 > item.x && player.y < item.y + 24 && player.y + 96 > item.y) {
switch (item.type) {
case Type::HEALTH:
if (player.health < 3) {
player.health++;
}
break;
case Type::DAMAGE:
player.health--;
break;
}
void Game::renderHUD(SDL_Renderer *renderer, SDL_Texture *heart) {
items.erase(items.begin() + i);
}
}
}
void Game::renderHUD(SDL_Renderer* renderer, SDL_Texture* heart) const {
SDL_SetRenderDrawColor(renderer, 0, 0, 0, SDL_ALPHA_OPAQUE);
SDL_Rect bgRect = {0, 0, 30 * 3 + 15, 40};
SDL_RenderFillRect(renderer, &bgRect);
@ -55,7 +83,7 @@ void Game::renderHUD(SDL_Renderer *renderer, SDL_Texture *heart) {
}
}
void Game::renderPlayer(SDL_Renderer *renderer, SDL_Texture *playerTexture, Player p) {
void Game::renderPlayer(SDL_Renderer* renderer, SDL_Texture* playerTexture, Player p) const {
drawTexture(renderer, playerTexture, p.x, p.y, 80, 96);
if (showHitboxes) {
@ -65,6 +93,28 @@ void Game::renderPlayer(SDL_Renderer *renderer, SDL_Texture *playerTexture, Play
}
}
void Game::renderItem(SDL_Renderer* renderer, Item i) const {
SDL_Texture* itemTexture = IMG_LoadTexture(renderer, i.type == Type::HEALTH ? "./res/heart.png" : "./res/damage.png");
switch (i.type) {
case Type::HEALTH:
drawTexture(renderer, itemTexture, i.x, i.y, 24, 24);
SDL_DestroyTexture(itemTexture);
break;
case Type::DAMAGE:
drawTexture(renderer, itemTexture, i.x, i.y, 24, 24);
SDL_DestroyTexture(itemTexture);
break;
default: break;
}
if (showHitboxes) {
SDL_SetRenderDrawColor(renderer, 255, 0, 0, SDL_ALPHA_OPAQUE);
SDL_Rect hitbox = {i.x, i.y, 24, 24};
SDL_RenderDrawRect(renderer, &hitbox);
}
}
void Game::createOpponent() {
Opponent o;
@ -99,7 +149,7 @@ void Game::createOpponent() {
opponents.push_back(o);
}
void Game::renderOpponent(SDL_Renderer *renderer, SDL_Texture *opponentTexture, Opponent o) {
void Game::renderOpponent(SDL_Renderer* renderer, SDL_Texture* opponentTexture, Opponent o) const {
drawTexture(renderer, opponentTexture, o.x, o.y, 80, 96);
if (showHitboxes) {
@ -124,10 +174,13 @@ void Game::render(SDL_Renderer *renderer, SDL_Texture *bg) {
renderOpponent(renderer, opponentTexture, o);
}
for (Item i : this->items) {
renderItem(renderer, i);
}
SDL_Texture* heart = IMG_LoadTexture(renderer, "./res/heart.png");
renderHUD(renderer, heart);
TTF_Init();
TTF_Font* font = TTF_OpenFont("./res/font.ttf", 24);
drawText(renderer, font, "h: " + std::to_string(player.health), 30 * 3 + 15 + 10, 10);
@ -148,6 +201,8 @@ void Game::run() {
int startTime = time(nullptr);
TTF_Init();
bool gameOpen = true;
while (gameOpen) {
SDL_Event event;
@ -185,6 +240,11 @@ void Game::run() {
if (rand() % 100 == 0) createOpponent();
if (time(nullptr) - startTime > 5) {
startTime = time(nullptr);
spawnItem(Type::HEALTH);
}
for (Opponent& o : opponents) {
o.move(10);
}

25
Game.h
View File

@ -17,8 +17,19 @@ public:
void moveY(int dy);
};
class Opponent: public Player {
enum class Type {
HEALTH,
DAMAGE
};
struct Item {
int x;
int y;
Type type;
};
class Opponent : public Player {
public:
int targetX = 0;
int targetY = 0;
@ -28,18 +39,22 @@ public:
class Game {
Player player;
std::vector<Opponent> opponents;
std::vector<Item> items;
bool showHitboxes = false;
void renderPlayer(SDL_Renderer *renderer, SDL_Texture *player, Player p);
public:
void renderPlayer(SDL_Renderer* renderer, SDL_Texture* player, Player p) const;
public:
void spawnItem(Type type);
void createOpponent();
void checkCollision();
void renderHUD(SDL_Renderer *renderer, SDL_Texture *heart);
void renderHUD(SDL_Renderer* renderer, SDL_Texture* heart) const;
void renderItem(SDL_Renderer* renderer, Item i) const;
void render(SDL_Renderer* renderer, SDL_Texture* bg);
void run();
void renderOpponent(SDL_Renderer *renderer, SDL_Texture *opponentTexture, Opponent o);
void renderOpponent(SDL_Renderer* renderer, SDL_Texture* opponentTexture, Opponent o) const;
};

BIN
res/damage.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 193 B