From 826cbe11ff66294f9eb7b23b175199456d3866c9 Mon Sep 17 00:00:00 2001 From: Linus Probert Date: Mon, 6 May 2019 13:48:40 +0200 Subject: [PATCH] A quick start to the Mage --- src/main.c | 2 ++ src/menu.c | 13 ++++++++----- src/player.c | 3 +-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main.c b/src/main.c index ee913e1..47cbea6 100644 --- a/src/main.c +++ b/src/main.c @@ -405,6 +405,8 @@ on_character_select(const char *str) playerClass = WARRIOR; else if (strcmp(str, "rogue") == 0) playerClass = ROGUE; + else if (strcmp(str, "mage") == 0) + playerClass = MAGE; startGame(); } diff --git a/src/menu.c b/src/menu.c index c6eaad2..33da9a2 100644 --- a/src/menu.c +++ b/src/menu.c @@ -106,22 +106,25 @@ menu_create_character_selector(void (*onCharacterSelect)(const char *), Camera * { const char *spriteSheets[] = { "Commissions/Warrior.png", - "Commissions/Rogue.png" + "Commissions/Rogue.png", + "Commissions/Mage.png" }; static char *callbackData[] = { "warrior", - "rogue" + "rogue", + "mage" }; static char *descriptions[] = { "Play as the warrior", "Play as the rogue", + "Play as the mage" }; Menu *menu = menu_create(); - int xoffset = 224; - for (size_t i = 0; i < 2; ++i) { + int xoffset = 168; + for (size_t i = 0; i < 3; ++i) { Sprite *s1 = sprite_create(); sprite_set_texture(s1, texturecache_add(spriteSheets[i]), 0); s1->clip = CLIP16(0, 48); @@ -139,7 +142,7 @@ menu_create_character_selector(void (*onCharacterSelect)(const char *), Camera * menu_item_add(menu, s1, s2, (void (*)(void *)) onCharacterSelect); MenuItem *item = linkedlist_get(&menu->items, (Uint32) i); item->button->usrdata = callbackData[i]; - xoffset += 224; + xoffset += 168; linkedlist_append(&menu->descriptions, descriptions[i]); } diff --git a/src/player.c b/src/player.c index f7e67a2..3c034a5 100644 --- a/src/player.c +++ b/src/player.c @@ -553,7 +553,6 @@ player_create(class_t class, Camera *cam) player->skills[0] = skill_create(BACKSTAB, cam); player->skills[1] = skill_create(TRIP, cam); player->skills[2] = skill_create(PHASE, cam); - player->skills[3] = skill_create(DAGGER_THROW, cam); player->daggers = 10; break; case WARRIOR: @@ -562,10 +561,10 @@ player_create(class_t class, Camera *cam) player->skills[0] = skill_create(FLURRY, cam); player->skills[1] = skill_create(BASH, cam); player->skills[2] = skill_create(CHARGE, cam); - player->skills[3] = skill_create(DAGGER_THROW, cam); break; } + player->skills[3] = skill_create(DAGGER_THROW, cam); player->skills[4] = skill_create(SIP_HEALTH, cam); sprite_load_texture(player->sprite, asset, 0, cam->renderer);