level selector and fx fic

4 files changed, 123 insertions, 18 deletions

diff --git a/hud/hud.c b/hud/hud.c
index 2f4eca4..30b6486 100644
--- a/hud/hud.c
+++ b/hud/hud.c
@@ -282,6 +282,17 @@ void hud_open_sel (graphic_settings *gs, hud *h,
     h->sc.rect_back.h = size[1];
 }
 
+int hud_mouse_level (float *mp, float *pos, float *size) {
+    for (int i=0; i<MAXLEVEL; i++) {
+        float p[2] = { 
+            pos[0]+size[0]-5-MAXLEVEL*9-1 + 9*i, 
+            pos[1]+size[1]-5-9-1 -1 };
+        float s[2] = { 10, 10 };
+        if (pt_rect(mp, p, s)) { return i; }
+    }
+    return -1;
+}
+
 void hud_process_form_new_unit (graphic_settings *gs, hud *h, MKb *mkb, 
     infos *info, army *ar, map *m, txtd *t, Mix_Chunk *sounds[]) 
 {
@@ -300,20 +311,32 @@ void hud_process_form_new_unit (graphic_settings *gs, hud *h, MKb *mkb,
         float possc[2] = { h->fnu.rect_chassis.x, h->fnu.rect_chassis.y };
         float sizesc[2] = { h->fnu.rect_chassis.w, h->fnu.rect_chassis.h };
         if (pt_rect(mousepos, possc, sizesc)) {
-            h->fnu.sel = 0; h->state = 2;
-            hud_open_sel(gs, h, t, info, &h->fnu.rect_chassis);
+            int lvl = hud_mouse_level(mousepos, possc, sizesc);
+            if (lvl != -1) h->fnu.uinfo.levels[LEVEL_CHASSIS] = lvl;
+            else {
+                h->fnu.sel = 0; h->state = 2;
+                hud_open_sel(gs, h, t, info, &h->fnu.rect_chassis);
+            }
         }
         float possb[2] = { h->fnu.rect_battery.x, h->fnu.rect_battery.y };
         float sizesb[2] = { h->fnu.rect_battery.w, h->fnu.rect_battery.h };
         if (pt_rect(mousepos, possb, sizesb)) {
-            h->fnu.sel = 1; h->state = 2;
-            hud_open_sel(gs, h, t, info, &h->fnu.rect_battery);
+            int lvl = hud_mouse_level(mousepos, possb, sizesb);
+            if (lvl != -1) h->fnu.uinfo.levels[LEVEL_BATTERY] = lvl;
+            else {
+                h->fnu.sel = 1; h->state = 2;
+                hud_open_sel(gs, h, t, info, &h->fnu.rect_battery);
+            }
         }
         float possbr[2] = { h->fnu.rect_brain.x, h->fnu.rect_brain.y };
         float sizesbr[2] = { h->fnu.rect_brain.w, h->fnu.rect_brain.h };
         if (pt_rect(mousepos, possbr, sizesbr)) {
-            h->fnu.sel = 5; h->state = 2;
-            hud_open_sel(gs, h, t, info, &h->fnu.rect_brain);
+            int lvl = hud_mouse_level(mousepos, possbr, sizesbr);
+            if (lvl != -1) h->fnu.uinfo.levels[LEVEL_BRAIN] = lvl;
+            else {
+                h->fnu.sel = 5; h->state = 2;
+                hud_open_sel(gs, h, t, info, &h->fnu.rect_brain);
+            }
         }
         if (h->fnu.uinfo.chassis != -1) {
             int lc = h->fnu.uinfo.levels[LEVEL_CHASSIS];
@@ -325,8 +348,12 @@ void hud_process_form_new_unit (graphic_settings *gs, hud *h, MKb *mkb,
                 float sizesa[2] = { 
                     h->fnu.rect_armor[i].w, h->fnu.rect_armor[i].h };
                 if (pt_rect(mousepos, possa, sizesa)) {
-                    h->fnu.sel = 2; h->fnu.ind = i; h->state = 2;
-                    hud_open_sel(gs, h, t, info, &h->fnu.rect_armor[i]);
+                    int lvl = hud_mouse_level(mousepos, possa, sizesa);
+                    if (lvl != -1) h->fnu.uinfo.levels[LEVEL_ARMOR+i] = lvl;
+                    else {
+                        h->fnu.sel = 2; h->fnu.ind = i; h->state = 2;
+                        hud_open_sel(gs, h, t, info, &h->fnu.rect_armor[i]);
+                    }
                 }
             }
             for (int i=0; 
@@ -337,8 +364,12 @@ void hud_process_form_new_unit (graphic_settings *gs, hud *h, MKb *mkb,
                 float sizesa[2] = { 
                     h->fnu.rect_weapons[i].w, h->fnu.rect_weapons[i].h };
                 if (pt_rect(mousepos, possa, sizesa)) {
-                    h->fnu.sel = 3; h->fnu.ind = i; h->state = 2;
-                    hud_open_sel(gs, h, t, info, &h->fnu.rect_weapons[i]);
+                    int lvl = hud_mouse_level(mousepos, possa, sizesa);
+                    if (lvl != -1) h->fnu.uinfo.levels[LEVEL_WEAPONS+i] = lvl;
+                    else {
+                        h->fnu.sel = 3; h->fnu.ind = i; h->state = 2;
+                        hud_open_sel(gs, h, t, info, &h->fnu.rect_weapons[i]);
+                    }
                 }
             }
             for (int i=0; 
@@ -349,8 +380,12 @@ void hud_process_form_new_unit (graphic_settings *gs, hud *h, MKb *mkb,
                 float sizesa[2] = { 
                     h->fnu.rect_augs[i].w, h->fnu.rect_augs[i].h };
                 if (pt_rect(mousepos, possa, sizesa)) {
-                    h->fnu.sel = 4; h->fnu.ind = i; h->state = 2;
-                    hud_open_sel(gs, h, t, info, &h->fnu.rect_augs[i]);
+                    int lvl = hud_mouse_level(mousepos, possa, sizesa);
+                    if (lvl != -1) h->fnu.uinfo.levels[LEVEL_AUGS+i] = lvl;
+                    else {
+                        h->fnu.sel = 4; h->fnu.ind = i; h->state = 2;
+                        hud_open_sel(gs, h, t, info, &h->fnu.rect_augs[i]);
+                    }
                 }
             }
         }
@@ -1027,7 +1062,6 @@ void hud_render_overlay_game (overlay_game *og, MKb *mkb,
 void hud_render_overlay_battle (overlay_battle *ob, MKb *mkb, 
     SDL_Renderer* rend, txtd *t, infos *info, gamestate *gst, float time) 
 {    
-
     SDL_SetRenderDrawColor(rend, 240, 240, 240, 255);
     SDL_RenderFillRect(rend, &ob->rect_back);
     SDL_SetRenderDrawColor(rend, 0, 0, 0, 255);
diff --git a/hud/hud.h b/hud/hud.h
index 90119cc..1901620 100644
--- a/hud/hud.h
+++ b/hud/hud.h
@@ -78,6 +78,10 @@ typedef struct {
 } hud;
 
 void hud_init(graphic_settings *gs, hud *h, txtd *t);
+
+void hud_map_sel (info_unit *u, infos *info, int sel, int ind, 
+    int8_t **n, int *bound, int size[]);
+
 void hud_resize (graphic_settings *gs, hud *h, txtd *t);
 void hud_process (graphic_settings *gs, hud *h, MKb *mkb, 
     infos *info, army *ar, map *m, txtd *t, gamestate *gst, 
diff --git a/hud/hud_views.c b/hud/hud_views.c
index 7b6d7f7..86e0722 100644
--- a/hud/hud_views.c
+++ b/hud/hud_views.c
@@ -74,6 +74,30 @@ void render_view_stats (SDL_Renderer* rend, txtd *t, int px, int py,
     h += 5;
 }
 
+
+void render_view_level (SDL_Renderer *rend, int px, int py, int lvl) {
+    // position is of bottom right corner
+    for (int i=0; i<MAXLEVEL; i++) {
+        int sel = 0;
+        if (lvl == i) {
+            SDL_SetRenderDrawColor(rend, 240, 250, 240, 255);
+            sel = 1;
+        } else {
+            SDL_SetRenderDrawColor(rend, 140, 140, 140, 255);
+            sel = 0;
+        }
+        SDL_Rect rect = { 
+            px-MAXLEVEL*9-1 + 9*i, 
+            py-9-1-sel*2, 
+            10, 
+            10+sel*2 };
+        SDL_RenderFillRect(rend, &rect);
+        SDL_SetRenderDrawColor(rend, 0, 0, 0, 255);
+        SDL_RenderDrawRect(rend, &rect);
+    }
+}
+
+
 void render_view_chassis (SDL_Renderer* rend, txtd *t, int px, int py, 
     infos *info, int chassis, int lvl, SDL_Texture *sprites) 
 {
@@ -86,11 +110,20 @@ void render_view_chassis (SDL_Renderer* rend, txtd *t, int px, int py,
         LABEL_F3(px+10, py+h, "MAX WEIGHT", 0, ch->weight_max, 1); h += 15;
         LABEL_F3(px+10, py+h, "HP", 0, ch->hp, 1); h += 15;
         LABEL_F3(px+10, py+h, "SPEED", 2, ch->speed, 1); h += 15;
-        LABEL_F3(px+10, py+h, "UPKEEP", 2, ch->upkeep, 1); h += 15;
+        LABEL_F3(px+10, py+h, "UPKEEP", 2, ch->upkeep, 1); h += 20;
+        
+        LABEL_I3(px+10, py+h, "WEAPON SLOTS", ch->slot_weapon, 1); h += 15;
+        LABEL_I3(px+10, py+h, "ARMOR SLOTS", ch->slot_armor, 1); h += 15;
+        LABEL_I3(px+10, py+h, "AUGMENT SLOTS", ch->slot_aug, 1); h += 15;
         
         SDL_Rect srcRect = { chassis*32, 32, 32, 32 };
         SDL_Rect dstRect = { px+300-32-10, py+10, 32, 32 };
         SDL_RenderCopy(rend, sprites, &srcRect, &dstRect);
+        
+        info_unit u; int8_t *_; int __; int size[2];
+        hud_map_sel(&u, info, 0, 0, &_, &__, size);
+        size[0] -= 5; size[1] -= 5;
+        render_view_level(rend, px+size[0], py+size[1], lvl);
     } else {
         float pname[2] = { px+10, py+10 };
         render_text_scaled(rend, "select a chassis...", pname, t, 1);
@@ -113,6 +146,9 @@ void render_view_battery (SDL_Renderer* rend, txtd *t, int px, int py,
             strcpy(srech, "NOT RECHARGEABLE");
         } else { strcpy(srech, "RECHARGEABLE"); }
         render_text_scaled(rend, srech, prech, t, 1);
+        
+        float size[2] = {145, 145}; size[0] -= 5; size[1] -= 5;
+        render_view_level(rend, px+size[0], py+size[1], lvl);
     } else {
         float pname[2] = { px+10, py+10 };
         render_text_scaled(rend, "select a battery...", pname, t, 1);
@@ -124,10 +160,13 @@ void render_view_armor (SDL_Renderer* rend, txtd *t, int px, int py,
     infos *info, int armor, int lvl) 
 {
     if (armor != -1) {
-        float pname[2] = { px+10, py+10 };
-        char sname[64]; sprintf(sname, "%s", info->armors[armor].name);
-        render_text_scaled(rend, sname, pname, t, 1);        
-        char sa[64]; int j=0;
+        info_armor *arm = info->armors+armor;
+        int h = 10;
+        
+        LABEL(px+10, py+h, arm->name, 1); h += 20;  
+        LABEL_F3(px+10, py+h, "WEIGHT", 0, arm->weight, 1); h += 20;
+        
+        /*char sa[64]; int j=0;
         char temp[16] = "red: ";
         strcpy(sa+j, temp);
         j += strlen(temp);
@@ -143,6 +182,9 @@ void render_view_armor (SDL_Renderer* rend, txtd *t, int px, int py,
         sa[j] = '\0';
         float pa[2] = { px+10, py+25 };
         render_text_scaled(rend, sa, pa, t, 1);
+        */
+        float size[2] = { 150, 50 }; size[0] -= 5; size[1] -= 5;
+        render_view_level(rend, px+size[0], py+size[1], lvl);
     } else {
         float pname[2] = { px+10, py+10 };
         render_text_scaled(rend, "select an armor...", pname, t, 1);
@@ -169,6 +211,10 @@ void render_view_armor_detail (SDL_Renderer* rend, txtd *t, int px, int py,
             }
             h += 15;
         }
+        info_unit u; int8_t *_; int __; int size[2];
+        hud_map_sel(&u, info, 2, 0, &_, &__, size);
+        size[0] -= 5; size[1] -= 5;
+        render_view_level(rend, px+size[0], py+size[1], lvl);
     } else {
         render_view_weapon(rend, t, px, py, info, armor, lvl);
     }
@@ -192,10 +238,14 @@ void render_view_weapon (SDL_Renderer* rend, txtd *t, int px, int py,
         LABEL_F3(px+10, py+h, "DAMAGE", 0, weap->damage, 1); h += 15;
         LABEL_F3(px+10, py+h, "RANGE", 0, weap->range, 1); h += 15;
         LABEL_F3(px+10, py+h, "COOLDOWN", 0, weap->cooldown, 1); h += 15;
+        
+        float size[2] = { 200, 110 }; size[0] -= 5; size[1] -= 5;
+        render_view_level(rend, px+size[0], py+size[1], lvl);
     } else {
         float pname[2] = { px+10, py+10 };
         render_text_scaled(rend, "select a weapon...", pname, t, 1);
     }
+    
 }
 
 void render_view_weapon_detail (SDL_Renderer* rend, txtd *t, 
@@ -230,6 +280,10 @@ void render_view_weapon_detail (SDL_Renderer* rend, txtd *t,
             LABEL_F3(px+10, py+h, "CHARGE PER SHOT",0,weap->charge_per_shot, 1);
             h += 15;
         }
+        info_unit u; int8_t *_; int __; int size[2];
+        hud_map_sel(&u, info, 3, 0, &_, &__, size);
+        size[0] -= 5; size[1] -= 5;
+        render_view_level(rend, px+size[0], py+size[1], lvl);
     } else {
         render_view_weapon(rend, t, px, py, info, weapon, lvl);
     }
@@ -245,6 +299,9 @@ void render_view_aug (SDL_Renderer* rend, txtd *t, int px, int py,
         
         LABEL(px+10, py+h, augm->name, 1); h += 20;
         LABEL_F3(px+10, py+h, "WEIGHT", 0, augm->weight, 1); h += 15;
+        
+        float size[2] = { 150, 50 }; size[0] -= 5; size[1] -= 5;
+        render_view_level(rend, px+size[0], py+size[1], lvl);
     } else {
         float pname[2] = { px+10, py+10 };
         render_text_scaled(rend, "select an augment...", pname, t, 1);
@@ -319,6 +376,10 @@ void render_view_aug_detail (SDL_Renderer* rend, txtd *t, int px, int py,
                 }
             }
         }
+        info_unit u; int8_t *_; int __; int size[2];
+        hud_map_sel(&u, info, 4, 0, &_, &__, size);
+        size[0] -= 5; size[1] -= 5;
+        render_view_level(rend, px+size[0], py+size[1], lvl);
     } else {
         render_view_aug(rend, t, px, py, info, aug, lvl);
     }
@@ -333,6 +394,9 @@ void render_view_brain (SDL_Renderer* rend, txtd *t, int px, int py,
         char sname[64]; sprintf(sname, "%s", 
             info->brains[brain].name);
         render_text_scaled(rend, sname, pname, t, 1);
+        
+        float size[2] = { 145, 145 }; size[0] -= 5; size[1] -= 5;
+        render_view_level(rend, px+size[0], py+size[1], lvl);
     } else {
         float pname[2] = { px+10, py+10 };
         render_text_scaled(rend, "select a controller...", pname, t, 1);
diff --git a/hud/hud_views.h b/hud/hud_views.h
index 50311d2..747c348 100644
--- a/hud/hud_views.h
+++ b/hud/hud_views.h
@@ -15,6 +15,9 @@ void render_view_stats (SDL_Renderer* rend, txtd *t, int px, int py,
     infos *info, info_unit *tm);
 
 
+void render_view_level (SDL_Renderer *rend, int px, int py, int lvl);
+
+
 void render_view_chassis (SDL_Renderer* rend, txtd *t, int px, int py, 
     infos *info, int chassis, int lvl, SDL_Texture *sprites);