diff --git a/CMakeLists.txt b/CMakeLists.txt index 25b436f..2c9c152 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ project(breakhack C) set(breakhack_GAME_TITLE "BreakHack") set(breakhack_MAJOR_VERSION 0) set(breakhack_MINOR_VERSION 1) -set(breakhack_PATCH_VERSION 12) +set(breakhack_PATCH_VERSION 13) set(breakhack_RELEASE_TYPE "(early access)") include(FindLua) diff --git a/assets/Extras/icon.png b/assets/Extras/icon.png new file mode 100644 index 0000000..e82c43b Binary files /dev/null and b/assets/Extras/icon.png differ diff --git a/build/releasenotes/early-access-v13.txt b/build/releasenotes/early-access-v13.txt new file mode 100644 index 0000000..2ed97f3 --- /dev/null +++ b/build/releasenotes/early-access-v13.txt @@ -0,0 +1,8 @@ +9a610d5 Adds window icon +6af8d9d Completes #8 First boss +915ea59 Fixes a mistake in music loading. +6cc96a9 Begins #8 First boss +1a09328 Adds boss music and an additional attribution line per request. +6633db7 Adds room objects and FIRE rooms. +0b58e53 Removed "Examples" folder from assets +292f549 Minor compiler warning fix diff --git a/src/artifact.c b/src/artifact.c index b04f24d..d4f6e2e 100644 --- a/src/artifact.c +++ b/src/artifact.c @@ -96,7 +96,7 @@ artifact_create_random(Player *p, Uint8 level) { int option = -1; if (p->stats.lvl >= 4) - option = get_random(LAST_ARTIFACT_EFFECT); + option = get_random(LAST_ARTIFACT_EFFECT - 1); else if (p->stats.lvl >= 3) option = get_random(INCREASED_STUN); else diff --git a/src/main.c b/src/main.c index 5b6839f..b81f781 100644 --- a/src/main.c +++ b/src/main.c @@ -51,6 +51,7 @@ #include "input.h" #include "screen.h" #include "hiscore.h" +#include "io_util.h" typedef enum Turn_t { PLAYER, @@ -143,6 +144,9 @@ bool initSDL(void) return false; } + // Set the window icon + SDL_SetWindowIcon(gWindow, IMG_Load_RW(io_load_rwops("Extras/icon.png"), true)); + gRenderer = SDL_CreateRenderer(gWindow, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_TARGETTEXTURE); if (gRenderer == NULL) diff --git a/src/monster.c b/src/monster.c index a46bd2a..6d27f87 100644 --- a/src/monster.c +++ b/src/monster.c @@ -542,7 +542,7 @@ monster_drop_loot(Monster *monster, Map *map, Player *player) linkedlist_append(&map->items, treasure); } - if (get_random(19) == 0) { + if (monster->stats.lvl > 2 && get_random(19) == 0) { Artifact *a = artifact_create_random(player, 1); a->sprite->pos = monster->sprite->pos; linkedlist_append(&map->artifacts, a); diff --git a/src/player.c b/src/player.c index f4ee913..8af18d4 100644 --- a/src/player.c +++ b/src/player.c @@ -576,7 +576,7 @@ void player_update(UpdateData *data) return; check_skill_activation(data); - if (!check_skill_trigger(data)) + if (player->state != FALLING && !check_skill_trigger(data)) handle_next_move(data); if (player->state == FALLING && player->stats.hp > 0) { diff --git a/src/skill.c b/src/skill.c index e82b5d1..c303ea1 100644 --- a/src/skill.c +++ b/src/skill.c @@ -434,7 +434,7 @@ skill_create(enum SkillType t) return NULL; } -#ifdef DEBUG +#ifdef DEBUG_SKILLS skill->levelcap = 1; #endif return skill;