From 9a610d5f88931061cdc63289bdf540c458590559 Mon Sep 17 00:00:00 2001 From: Linus Probert Date: Wed, 15 Aug 2018 08:08:18 +0200 Subject: [PATCH 1/4] Adds window icon - Fixes bug where you could move when falling. --- assets/Extras/icon.png | Bin 0 -> 640 bytes src/main.c | 4 ++++ src/player.c | 2 +- src/skill.c | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 assets/Extras/icon.png diff --git a/assets/Extras/icon.png b/assets/Extras/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e82c43b6cdd30c188b2e369a8285c0e1474dcab6 GIT binary patch literal 640 zcmV-`0)PF9P)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00HPpL_t(I%Y~CMXxmT_hCijD zIN%{r8DwyVP=|UcRNxF9GI-F~AxlBoQfQzZ3f7RpLx&6+I;ha0hITNWJQTWU^q|3m z3kk@efCUP;gCT+l)IozNhSx#0uw{qdcK7c7`|s|5@XzFOO-$p7(CSSApw*i~t2c#Q zt_itZ%VX1clKTML6wETuFgl2q@eW--q~E_J4jg)42f{MXis@`EJIP>((fPu&7f&;= z>m+}Bex%ZRbwM&1t^i2O&Vt(MYmKq(tt6HXs*Hv%08uiNHjWS_Gf6Jj#Mt(5!w{#v z3qb4RZ`7rndq)6J6$MLAv#uv9rIW055i8o-65TMw9?LlGT~hA|0H^I@kGD4hNX39w zZwfaIFPh;^OdpT42d>r(ph8GuGZ#s}oECbpKlTY8FPeF7j39QyrBs@`O!!Q1!e zImp@-7K<|Hb9_G{4jkgZ$(aEhYZ(jQk2VWQRTQlK3IN9RE?eM!1!H7bg?_ajC_ zmnfM@_g-NkUw|~YWf7wws0YPjOHX;UQ--}KjD{|iKbeeQKAvM9KjhobbVZFD|HA)l a8Q?F(tstate != 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; From 8fa4fbd51c6dda812a3e4145c757428aded6a18b Mon Sep 17 00:00:00 2001 From: Linus Probert Date: Wed, 15 Aug 2018 08:08:58 +0200 Subject: [PATCH 2/4] Patch version raised to 13 --- CMakeLists.txt | 2 +- build/releasenotes/early-access-v13.txt | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 build/releasenotes/early-access-v13.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 750b7cc..bc5b267 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/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 From 3fabd039a477840df914aab4ae555d2f127e751a Mon Sep 17 00:00:00 2001 From: Linus Probert Date: Wed, 15 Aug 2018 18:16:44 +0200 Subject: [PATCH 3/4] Prevents artifacts before level 3 - Also fixes a potential segfault --- src/artifact.c | 2 +- src/monster.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/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); From 6763ef0144bc175b255bcf9f515d68395566c244 Mon Sep 17 00:00:00 2001 From: Linus Probert Date: Sat, 18 Aug 2018 20:53:13 +0200 Subject: [PATCH 4/4] Prevent levels > 10 from crashing the game. --- data/monstergen.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/monstergen.lua b/data/monstergen.lua index de98692..bd28aba 100644 --- a/data/monstergen.lua +++ b/data/monstergen.lua @@ -220,7 +220,7 @@ end -- Begin script local enemies = {} -if(CURRENT_LEVEL > 0 and CURRENT_LEVEL < 10) then +if(CURRENT_LEVEL > 0) then if (CURRENT_LEVEL == 1) then enemies = concat(enemies, pests) enemies = concat(enemies, misc)