aboutsummaryrefslogtreecommitdiff
path: root/src/game_loop
diff options
context:
space:
mode:
Diffstat (limited to 'src/game_loop')
-rw-r--r--src/game_loop/gameplay.c50
-rw-r--r--src/game_loop/shop.c48
-rw-r--r--src/game_loop/shop.h6
3 files changed, 59 insertions, 45 deletions
diff --git a/src/game_loop/gameplay.c b/src/game_loop/gameplay.c
index b7da04f..384ce40 100644
--- a/src/game_loop/gameplay.c
+++ b/src/game_loop/gameplay.c
@@ -1,5 +1,7 @@
#include "gameplay.h"
#include "engine/entity.h"
+#include "static/tilemap.h"
+// player struct
void hh_gameplay(hh_g_all_levels* game, hh_e_game_state* hh_game_state){
@@ -10,18 +12,18 @@ void hh_gameplay(hh_g_all_levels* game, hh_e_game_state* hh_game_state){
.speed = 6,
.is_grounded = false,
.is_hit = false,
- .radius = 16,
- .pos = (vec2){32,32},
- .size = (vec2){32,32},
+ .radius = 8,
+ .pos = (vec2){32,200},
+ .size = (vec2){16,32},
.vel = (vec2){0,0},
.render = {
- .frame0 = 3,
+ .frame0 = HH_TM_GOZER_OFFSET,
.palette = 3,
.fam = (hh_s_ppu_loc_fam_entry){
.horizontal_flip = false,
.vertical_flip = false,
.palette_index = 3,
- .tilemap_index = 80,
+ .tilemap_index = HH_TM_GOZER_OFFSET,
}
}
};
@@ -38,17 +40,17 @@ void hh_gameplay(hh_g_all_levels* game, hh_e_game_state* hh_game_state){
.vel = (vec2){0,0},
// .vec = (vec2){0,0},
.render = {
- .frame0 = 1,
- .palette = 7,
+ .frame0 = HH_TM_SLIME_OFFSET,
+ .palette = 2,
.fam = (hh_s_ppu_loc_fam_entry){
.horizontal_flip = false,
.vertical_flip = false,
- .palette_index = 7,
- .tilemap_index = 1,
+ .palette_index = 2,
+ .tilemap_index = HH_TM_SLIME_OFFSET,
}
}
};
- static int total_bullets = 5;
+ static int total_bullets = 15;
switch (gameplay)
{
case hh_e_setup_screen:
@@ -77,15 +79,15 @@ void hh_gameplay(hh_g_all_levels* game, hh_e_game_state* hh_game_state){
}
break;
case hh_e_level_complete:
- // TODO: from complete to shop or game_over
- if(game->current_level < 3){
- game->current_level+=1;
- gameplay = hh_e_setup_screen;
- }
- else {
+ // // TODO: from complete to shop or game_over
+ // if(game->current_level < 3){
+ // game->current_level+=1;
+ // gameplay = hh_e_setup_screen;
+ // }
+ // else {
- gameplay = hh_e_game_over;
- }
+ // gameplay = hh_e_game_over;
+ // }
break;
case hh_e_game_over:
// todo make reset levels
@@ -106,16 +108,16 @@ void hh_reset_levels(hh_entity* player){
.is_hit = false,
.radius = 16,
.pos = (vec2){32,32},
- .size = (vec2){32,32},
+ .size = (vec2){16,32},
.vel = (vec2){0,0},
.render = {
- .frame0 = 3,
+ .frame0 = HH_TM_GOZER_OFFSET,
.palette = 3,
.fam = (hh_s_ppu_loc_fam_entry){
.horizontal_flip = false,
.vertical_flip = false,
.palette_index = 3,
- .tilemap_index = 80,
+ .tilemap_index = HH_TM_GOZER_OFFSET,
}
}
};
@@ -125,12 +127,12 @@ void hh_reset_levels(hh_entity* player){
void hh_render_all_entities(hh_entity* player, hh_entity* bullets, hh_entity* enemies, int bullet_size, int enemy_size, vec_cor cam_pos){
int index = 0;
- hh_update_sprite(0 , player, cam_pos);
+ hh_update_sprite(&index , player, cam_pos);
for (int i = 0; i < bullet_size; i++) {
- hh_update_sprite(i+5,&bullets[i],cam_pos);
+ hh_update_sprite(&index,&bullets[i],cam_pos);
}
for (int i = 0; i < enemy_size; i++) {
- hh_update_sprite(i+5+bullet_size,&enemies[i],cam_pos);
+ hh_update_sprite(&index,&enemies[i],cam_pos);
}
}
diff --git a/src/game_loop/shop.c b/src/game_loop/shop.c
index ea75d46..da27524 100644
--- a/src/game_loop/shop.c
+++ b/src/game_loop/shop.c
@@ -2,37 +2,44 @@
#include "engine/maths.h"
#include "ppu/ppu.h"
-void hh_shop(hh_e_game_state* hh_game_state){
+void hh_shop(hh_e_game_state* hh_game_state, hh_level_entity* level_shop){
static hh_e_shop_states hh_e_shop = hh_e_shop_show;
static hh_e_upgrades upgrades[HH_SHOP_UPG_DISPLAY] = {0};
static uint8_t selected = 0;
+ static bool pressed_LR = false;
switch (hh_e_shop)
{
case hh_e_shop_show:
- hh_clear_screen();
- hh_clear_sprite();
+ // hh_clear_screen();
+ // hh_clear_sprite();
// TODO: make function to show shop
//hh_setup_shop();
+ hh_setup_screen(*level_shop);
hh_shop_init(&upgrades);
selected = HH_SHOP_UPG_DISPLAY/2;
- // hh_shop_display(selected, &upgrades);
+ hh_shop_display(selected, &upgrades);
hh_e_shop = hh_e_shop_main;
break;
case hh_e_shop_main:
if(g_hh_controller_p1.dpad_left || g_hh_controller_p1.dpad_right){
- hh_shift_selected(&selected,(g_hh_controller_p1.dpad_right?1:0),0,HH_SHOP_UPG_DISPLAY);
- // hh_shop_display(selected, &upgrades);
+ if (!pressed_LR) {
+ hh_shift_selected(&selected,(g_hh_controller_p1.dpad_right?1:0),0,HH_SHOP_UPG_DISPLAY-1);
+ hh_shop_display(selected, &upgrades);
+ }
+ pressed_LR = true;
+ } else {
+ pressed_LR = false;
+ }
+ if(g_hh_controller_p1.button_primary){
+ //apply selected upgrade
+ // hh_e_shop = hh_e_shop_end;
}
- // if(g_hh_controller_p1.button_primary){
- // //apply selected upgrade
- // hh_e_shop = hh_e_shop_end;
- // }
if(g_hh_controller_p1.button_secondary){//Quick exit
hh_e_shop = hh_e_shop_end;
}
break;
- case hh_e_shop_end:
+ case hh_e_shop_end: // delay?
hh_e_shop = hh_e_shop_show;
*hh_game_state = hh_e_state_gameplay;
break;
@@ -42,6 +49,10 @@ void hh_shop(hh_e_game_state* hh_game_state){
}
}
+uint8_t hh_shop_translate_upgrades(hh_e_upgrades upg) {
+ return upg+10;
+}
+
void hh_shop_init(hh_e_upgrades* in) {
for (int i = 0; i < HH_SHOP_UPG_DISPLAY; i++) {
in[i] = i%HH_SHOP_UPG_COUNT;
@@ -49,7 +60,7 @@ void hh_shop_init(hh_e_upgrades* in) {
}
void hh_shop_display(uint8_t selected, hh_e_upgrades* upgrades) {
- const vec_cor start = {48,16};
+ const vec_cor start = {104,144+16};
const uint8_t up = 8,
space = 24+8;
@@ -57,20 +68,19 @@ void hh_shop_display(uint8_t selected, hh_e_upgrades* upgrades) {
hh_ppu_update_foreground(i+16,
(hh_s_ppu_loc_fam_entry){
.horizontal_flip = false, .vertical_flip = false,
- .position_x = i*space+start.x, .position_y = start.y + (i==selected?up:0),
+ .position_x = i*space+start.x, .position_y = start.y + (i==selected?-up:0),
.palette_index = 7,
- .tilemap_index = 8
+ .tilemap_index = hh_shop_translate_upgrades(upgrades[i])
});
}
}
-void hh_shift_selected(uint8_t* pos, bool dir, uint8_t min, uint8_t max) {
+void hh_shift_selected(uint8_t *pos, bool dir, uint8_t min, uint8_t max) {
if (dir) {
- pos = CLAMP(++pos,min,max);
+ *pos = MIN(*pos+1,max);
} else {
- if (pos > 0) {
- pos--;
- }
+ *pos = MAX(*pos-1,min);
}
+ // printf("b: %d sel: %d\n",dir, *pos);
}
diff --git a/src/game_loop/shop.h b/src/game_loop/shop.h
index b0ad5e4..6f8f5a7 100644
--- a/src/game_loop/shop.h
+++ b/src/game_loop/shop.h
@@ -15,12 +15,14 @@ typedef enum {
} hh_e_shop_states;
/** @brief amount of upgrade types */
-#define HH_SHOP_UPG_COUNT 2
+#define HH_SHOP_UPG_COUNT 5
/** @brief count of visible upgrades in shop */
#define HH_SHOP_UPG_DISPLAY 4
/** @brief all possible upgrades */
typedef enum {
hh_e_upg_jump,
+ hh_e_upg_speed,
+ hh_e_upg_damage,
hh_e_upg_heal,
hh_e_upg_max_health,
} hh_e_upgrades;
@@ -32,4 +34,4 @@ void hh_shop_display(uint8_t selected, hh_e_upgrades* upgrades);
/** @brief moves 'cursor' through selection field */
void hh_shift_selected(uint8_t* pos, bool dir, uint8_t min, uint8_t max);
-void hh_shop(hh_e_game_state*);
+void hh_shop(hh_e_game_state* ,hh_level_entity* );