diff --git a/src/game/gui/dialog.c b/src/game/gui/dialog.c index 807f9e76..6b76dc5c 100644 --- a/src/game/gui/dialog.c +++ b/src/game/gui/dialog.c @@ -12,12 +12,12 @@ void dialog_create(dialog *dlg, dialog_style style, const char *text, int x, int text_settings tconf; text_defaults(&tconf); tconf.font = FONT_BIG; - tconf.cforeground = color_create(0, 121, 0, 255); + tconf.cforeground = COLOR_DARK_GREEN; text_settings tconf_desc; text_defaults(&tconf_desc); tconf_desc.font = FONT_SMALL; - tconf_desc.cforeground = color_create(0, 121, 0, 255); + tconf_desc.cforeground = COLOR_DARK_GREEN; dlg->x = x; dlg->y = y; diff --git a/src/game/gui/textbutton.c b/src/game/gui/textbutton.c index 8ac67e4b..02367dab 100644 --- a/src/game/gui/textbutton.c +++ b/src/game/gui/textbutton.c @@ -63,7 +63,7 @@ static void textbutton_render(component *c) { } else if(component_is_disabled(c)) { tb->tconf.cforeground = color_create(121, 121, 121, 255); } else { - tb->tconf.cforeground = color_create(0, 121, 0, 255); + tb->tconf.cforeground = COLOR_DARK_GREEN; } text_render(&tb->tconf, c->x, c->y, c->w, c->h, tb->text); diff --git a/src/game/gui/textinput.c b/src/game/gui/textinput.c index cc0877c5..caf7ceaa 100644 --- a/src/game/gui/textinput.c +++ b/src/game/gui/textinput.c @@ -47,7 +47,7 @@ static void textinput_render(component *c) { } } else { if(chars > 0) { - tb->tconf.cforeground = color_create(0, 121, 0, 255); + tb->tconf.cforeground = COLOR_DARK_GREEN; text_render(&tb->tconf, c->x, c->y, c->w, c->h, tb->buf); } } diff --git a/src/game/gui/textselector.c b/src/game/gui/textselector.c index 8e08a137..d9ad2c04 100644 --- a/src/game/gui/textselector.c +++ b/src/game/gui/textselector.c @@ -69,7 +69,7 @@ static void textselector_render(component *c) { } else if(component_is_disabled(c)) { tb->tconf.cforeground = color_create(121, 121, 121, 255); } else { - tb->tconf.cforeground = color_create(0, 121, 0, 255); + tb->tconf.cforeground = COLOR_DARK_GREEN; } text_render(&tb->tconf, c->x, c->y, c->w, c->h, buf); } diff --git a/src/game/gui/textslider.c b/src/game/gui/textslider.c index 1a164f6e..8e743054 100644 --- a/src/game/gui/textslider.c +++ b/src/game/gui/textslider.c @@ -43,7 +43,7 @@ static void textslider_render(component *c) { } else if(component_is_disabled(c)) { tb->tconf.cforeground = color_create(121, 121, 121, 255); } else { - tb->tconf.cforeground = color_create(0, 121, 0, 255); + tb->tconf.cforeground = COLOR_DARK_GREEN; } text_render(&tb->tconf, c->x, c->y, c->w, c->h, str_c(&txt)); str_free(&txt); diff --git a/src/game/scenes/arena.c b/src/game/scenes/arena.c index 98dbfb17..68c6ccf3 100644 --- a/src/game/scenes/arena.c +++ b/src/game/scenes/arena.c @@ -554,7 +554,7 @@ void arena_har_defeat_hook(int player_id, scene *scene) { local->over = 1; if(is_singleplayer(scene)) { player_winner->sp_wins |= 2 << player_loser->pilot->pilot_id; - if(player_loser->pilot->pilot_id == 10) { + if(player_loser->pilot->pilot_id == PILOT_KREISSACK) { // can't scrap/destruct kreissack winner_har->state = STATE_DONE; // major go boom @@ -1336,7 +1336,7 @@ int arena_create(scene *scene) { text_settings tconf; text_defaults(&tconf); tconf.font = FONT_BIG; - tconf.cforeground = color_create(0, 121, 0, 255); + tconf.cforeground = COLOR_DARK_GREEN; tconf.halign = TEXT_CENTER; // Arena menu diff --git a/src/game/scenes/mainmenu/menu_audio.c b/src/game/scenes/mainmenu/menu_audio.c index 6c367ee3..7c90715e 100644 --- a/src/game/scenes/mainmenu/menu_audio.c +++ b/src/game/scenes/mainmenu/menu_audio.c @@ -94,7 +94,7 @@ component *menu_audio_create(scene *s) { text_defaults(&tconf); tconf.font = FONT_BIG; tconf.halign = TEXT_CENTER; - tconf.cforeground = color_create(0, 121, 0, 255); + tconf.cforeground = COLOR_DARK_GREEN; // Create menu and its header component *menu = menu_create(11); diff --git a/src/game/scenes/mainmenu/menu_configuration.c b/src/game/scenes/mainmenu/menu_configuration.c index 0bd41b18..4d5953fd 100644 --- a/src/game/scenes/mainmenu/menu_configuration.c +++ b/src/game/scenes/mainmenu/menu_configuration.c @@ -36,7 +36,7 @@ component *menu_configuration_create(scene *s) { text_defaults(&tconf); tconf.font = FONT_BIG; tconf.halign = TEXT_CENTER; - tconf.cforeground = color_create(0, 121, 0, 255); + tconf.cforeground = COLOR_DARK_GREEN; component *menu = menu_create(11); menu_attach(menu, label_create(&tconf, "CONFIGURATION")); diff --git a/src/game/scenes/mainmenu/menu_connect.c b/src/game/scenes/mainmenu/menu_connect.c index 1f2e4db0..def847f6 100644 --- a/src/game/scenes/mainmenu/menu_connect.c +++ b/src/game/scenes/mainmenu/menu_connect.c @@ -180,7 +180,7 @@ component *menu_connect_create(scene *s) { text_defaults(&tconf); tconf.font = FONT_BIG; tconf.halign = TEXT_CENTER; - tconf.cforeground = color_create(0, 121, 0, 255); + tconf.cforeground = COLOR_DARK_GREEN; component *menu = menu_create(11); menu_attach(menu, label_create(&tconf, "CONNECT TO SERVER")); diff --git a/src/game/scenes/mainmenu/menu_gameplay.c b/src/game/scenes/mainmenu/menu_gameplay.c index 4aa633e2..aaaede24 100644 --- a/src/game/scenes/mainmenu/menu_gameplay.c +++ b/src/game/scenes/mainmenu/menu_gameplay.c @@ -23,7 +23,7 @@ component *menu_gameplay_create(scene *s) { text_defaults(&tconf); tconf.font = FONT_BIG; tconf.halign = TEXT_CENTER; - tconf.cforeground = color_create(0, 121, 0, 255); + tconf.cforeground = COLOR_DARK_GREEN; component *menu = menu_create(11); menu_attach(menu, label_create(&tconf, "GAMEPLAY")); diff --git a/src/game/scenes/mainmenu/menu_input.c b/src/game/scenes/mainmenu/menu_input.c index 5755fab3..fd593264 100644 --- a/src/game/scenes/mainmenu/menu_input.c +++ b/src/game/scenes/mainmenu/menu_input.c @@ -184,7 +184,7 @@ component *menu_input_create(scene *s, int player_id) { text_defaults(&tconf); tconf.font = FONT_BIG; tconf.halign = TEXT_CENTER; - tconf.cforeground = color_create(0, 121, 0, 255); + tconf.cforeground = COLOR_DARK_GREEN; component *menu = menu_create(11); menu_attach(menu, label_create(&tconf, "CHOOSE INPUT")); diff --git a/src/game/scenes/mainmenu/menu_keyboard.c b/src/game/scenes/mainmenu/menu_keyboard.c index 4d9400e3..914b1460 100644 --- a/src/game/scenes/mainmenu/menu_keyboard.c +++ b/src/game/scenes/mainmenu/menu_keyboard.c @@ -131,7 +131,7 @@ guiframe *menu_keyboard_create(scene *s, int selected_player) { text_defaults(&tconf); tconf.font = FONT_BIG; tconf.halign = TEXT_CENTER; - tconf.cforeground = color_create(0, 121, 0, 255); + tconf.cforeground = COLOR_DARK_GREEN; local->frame = guiframe_create(25, 5, 270, 140); component *menu = menu_create(11); diff --git a/src/game/scenes/mainmenu/menu_listen.c b/src/game/scenes/mainmenu/menu_listen.c index 0a3cdebb..f1d589e8 100644 --- a/src/game/scenes/mainmenu/menu_listen.c +++ b/src/game/scenes/mainmenu/menu_listen.c @@ -140,7 +140,7 @@ component *menu_listen_create(scene *s) { text_defaults(&tconf); tconf.font = FONT_BIG; tconf.halign = TEXT_CENTER; - tconf.cforeground = color_create(0, 121, 0, 255); + tconf.cforeground = COLOR_DARK_GREEN; // Create the menu component *menu = menu_create(11); diff --git a/src/game/scenes/mainmenu/menu_main.c b/src/game/scenes/mainmenu/menu_main.c index 0c2bfc14..19039419 100644 --- a/src/game/scenes/mainmenu/menu_main.c +++ b/src/game/scenes/mainmenu/menu_main.c @@ -95,7 +95,7 @@ component *menu_main_create(scene *s) { text_defaults(&tconf); tconf.font = FONT_BIG; tconf.halign = TEXT_CENTER; - tconf.cforeground = color_create(0, 121, 0, 255); + tconf.cforeground = COLOR_DARK_GREEN; component *menu = menu_create(11); menu_attach(menu, textbutton_create(&tconf, "ONE PLAYER GAME", COM_ENABLED, mainmenu_1v1, s)); diff --git a/src/game/scenes/mainmenu/menu_net.c b/src/game/scenes/mainmenu/menu_net.c index 4e60ac8b..bad2b39f 100644 --- a/src/game/scenes/mainmenu/menu_net.c +++ b/src/game/scenes/mainmenu/menu_net.c @@ -28,7 +28,7 @@ component *menu_net_create(scene *s) { text_defaults(&tconf); tconf.font = FONT_BIG; tconf.halign = TEXT_CENTER; - tconf.cforeground = color_create(0, 121, 0, 255); + tconf.cforeground = COLOR_DARK_GREEN; component *menu = menu_create(11); menu_attach(menu, label_create(&tconf, "NETWORK PLAY")); diff --git a/src/game/scenes/mainmenu/menu_presskey.c b/src/game/scenes/mainmenu/menu_presskey.c index 4ac1c497..3cad2978 100644 --- a/src/game/scenes/mainmenu/menu_presskey.c +++ b/src/game/scenes/mainmenu/menu_presskey.c @@ -65,7 +65,7 @@ void menu_presskey_tick(component *c) { if(local->warn_timeout == 0) { for(int i = 0; i < 2; i++) { text_settings *tconf = label_get_text_settings(local->text[i]); - tconf->cforeground = color_create(0, 121, 0, 255); + tconf->cforeground = COLOR_DARK_GREEN; } } } @@ -114,7 +114,7 @@ component *menu_presskey_create(char **key) { text_defaults(&tconf); tconf.font = FONT_BIG; tconf.halign = TEXT_CENTER; - tconf.cforeground = color_create(0, 121, 0, 255); + tconf.cforeground = COLOR_DARK_GREEN; component *menu = menu_create(11); local->text[0] = label_create(&tconf, "PRESS A KEY FOR"); diff --git a/src/game/scenes/mainmenu/menu_video.c b/src/game/scenes/mainmenu/menu_video.c index 34227fdb..9f9872cd 100644 --- a/src/game/scenes/mainmenu/menu_video.c +++ b/src/game/scenes/mainmenu/menu_video.c @@ -182,7 +182,7 @@ component *menu_video_create(scene *s) { text_defaults(&tconf); tconf.font = FONT_BIG; tconf.halign = TEXT_CENTER; - tconf.cforeground = color_create(0, 121, 0, 255); + tconf.cforeground = COLOR_DARK_GREEN; // Create menu and its header component *menu = menu_create(11); diff --git a/src/game/scenes/mainmenu/menu_video_confirm.c b/src/game/scenes/mainmenu/menu_video_confirm.c index a82eae66..122236f6 100644 --- a/src/game/scenes/mainmenu/menu_video_confirm.c +++ b/src/game/scenes/mainmenu/menu_video_confirm.c @@ -70,7 +70,7 @@ component *menu_video_confirm_create(scene *s, settings_video *old_settings) { text_defaults(&tconf); tconf.font = FONT_BIG; tconf.halign = TEXT_CENTER; - tconf.cforeground = color_create(0, 121, 0, 255); + tconf.cforeground = COLOR_DARK_GREEN; component *menu = menu_create(11); menu_attach(menu, label_create(&tconf, "ACCEPT RESOLUTION?")); diff --git a/src/game/scenes/mechlab/lab_dash_newplayer.c b/src/game/scenes/mechlab/lab_dash_newplayer.c index db882981..1d4e1ae7 100644 --- a/src/game/scenes/mechlab/lab_dash_newplayer.c +++ b/src/game/scenes/mechlab/lab_dash_newplayer.c @@ -25,7 +25,7 @@ component *lab_dash_newplayer_create(scene *s, newplayer_widgets *nw) { xysizer_attach(xy, label_create(&tconf, lang_get(192)), 110, 43, 100, 50); // Input field - tconf.cforeground = color_create(0, 121, 0, 255); + tconf.cforeground = COLOR_DARK_GREEN; nw->input = textinput_create(&tconf, "Name", ""); component_select(nw->input, 1); textinput_enable_background(nw->input, 0); diff --git a/src/game/scenes/mechlab/lab_menu_confirm.c b/src/game/scenes/mechlab/lab_menu_confirm.c index 4e5f7a92..5cb73650 100644 --- a/src/game/scenes/mechlab/lab_menu_confirm.c +++ b/src/game/scenes/mechlab/lab_menu_confirm.c @@ -73,7 +73,7 @@ component *lab_menu_confirm_create(scene *s, lab_menu_select_cb yes, void *yesda trnmenu_attach(menu, button); // Add text label - tconf.cforeground = color_create(0, 121, 0, 255); + tconf.cforeground = COLOR_DARK_GREEN; component *label = label_create(&tconf, title); component_set_pos_hints(label, 10, 155); component_set_size_hints(label, 300, 10); diff --git a/src/game/scenes/mechlab/lab_menu_difficultyselect.c b/src/game/scenes/mechlab/lab_menu_difficultyselect.c index 50429644..664e2338 100644 --- a/src/game/scenes/mechlab/lab_menu_difficultyselect.c +++ b/src/game/scenes/mechlab/lab_menu_difficultyselect.c @@ -85,7 +85,7 @@ component *lab_menu_difficultyselect_create(scene *s) { } // Add text label - tconf.cforeground = color_create(0, 121, 0, 255); + tconf.cforeground = COLOR_DARK_GREEN; component *label = label_create(&tconf, "SELECT A DIFFICULTY LEVEL"); component_set_pos_hints(label, 87, 155); component_set_size_hints(label, 150, 10); diff --git a/src/game/scenes/mechlab/lab_menu_select.c b/src/game/scenes/mechlab/lab_menu_select.c index c74fc66d..2e1f125f 100644 --- a/src/game/scenes/mechlab/lab_menu_select.c +++ b/src/game/scenes/mechlab/lab_menu_select.c @@ -88,7 +88,7 @@ component *lab_menu_select_create(scene *s, lab_menu_select_cb select, void *sel // TODO the left-right buttons apply on focus, not select // Add text label - tconf.cforeground = color_create(0, 121, 0, 255); + tconf.cforeground = COLOR_DARK_GREEN; // TODO interpolate %s in the string here with blank component *label = label_create(&tconf, lang_get(title)); component_set_pos_hints(label, 87, 155); diff --git a/src/game/scenes/melee.c b/src/game/scenes/melee.c index 142371d2..0037d8e6 100644 --- a/src/game/scenes/melee.c +++ b/src/game/scenes/melee.c @@ -306,8 +306,8 @@ void handle_action(scene *scene, int player, int action) { player2->pilot->pilot_id = local->pilot_id_b; } else { if(player1->sp_wins == (2046 ^ (2 << player1->pilot->pilot_id))) { - // everyone but kriessack - player2->pilot->pilot_id = 10; + // everyone but kreissack + player2->pilot->pilot_id = PILOT_KREISSACK; player2->pilot->har_id = HAR_NOVA; } else { // pick an opponent we have not yet beaten diff --git a/src/game/scenes/newsroom.c b/src/game/scenes/newsroom.c index 2118fb28..660cbe9b 100644 --- a/src/game/scenes/newsroom.c +++ b/src/game/scenes/newsroom.c @@ -200,8 +200,8 @@ void newsroom_input_tick(scene *scene) { game_state_set_next(scene->gs, SCENE_END); } else { if(p1->sp_wins == (2046 ^ (2 << p1->pilot->pilot_id))) { - // everyone but kriessack - p2->pilot->pilot_id = 10; + // everyone but kreissack + p2->pilot->pilot_id = PILOT_KREISSACK; p2->pilot->har_id = HAR_NOVA; } else { // pick an opponent we have not yet beaten diff --git a/src/game/scenes/vs.c b/src/game/scenes/vs.c index af48bf32..cafc05ff 100644 --- a/src/game/scenes/vs.c +++ b/src/game/scenes/vs.c @@ -278,7 +278,7 @@ void vs_render(scene *scene) { font_render_wrapped(&font_small, lang_get(66 + local->arena), 56 + 72, 160, (211 - 72) - 4, COLOR_GREEN); } else if(player2->pilot && player2->pilot->pilot_id == PILOT_KREISSACK && settings_get()->gameplay.difficulty < 2) { - // kriessack, but not on Veteran or higher + // kreissack, but not on Veteran or higher font_render_wrapped(&font_small, lang_get(747), 59, 160, 200, COLOR_YELLOW); } else if(player1->chr && player2->pilot) { font_render_wrapped(&font_small, player2->pilot->quotes[0], 320 - (59 + 150), 165, 120, COLOR_YELLOW); @@ -286,6 +286,17 @@ void vs_render(scene *scene) { // render plug's bitching font_render_wrapped(&font_small, "Hmph. you'd think this remake would've been done by now, huh?", 59, 165, 220, COLOR_YELLOW); + + // FIXME: Missing information, and money is not the same as winnings. + char winnings[16]; + snprintf(winnings, sizeof(winnings), "$ %u", player1->pilot->money); + font_render_wrapped(&font_small, "FINANCIAL REPORT", 190, 6, 100, COLOR_GREEN); + font_render(&font_small, "WINNINGS:", 190, 16, COLOR_DARK_GREEN); + font_render(&font_small, winnings, 250, 16, COLOR_GREEN); + font_render(&font_small, "BONUSES:", 196, 24, COLOR_DARK_GREEN); + font_render(&font_small, "REPAIR COST:", 172, 32, COLOR_DARK_GREEN); + font_render(&font_small, "PROFIT:", 202, 40, COLOR_DARK_GREEN); + font_render_wrapped(&font_small, "FIGHT STATISTICS", 210, 60, 60, COLOR_GREEN); } else { font_render_wrapped(&font_small, lang_get(749 + (11 * player1->pilot->pilot_id) + player2->pilot->pilot_id), 59, 160, 150, COLOR_YELLOW); @@ -532,7 +543,7 @@ int vs_create(scene *scene) { local->too_pathetic_dialog.clicked = vs_too_pathetic_dialog_clicked; if(player2->pilot && player2->pilot->pilot_id == PILOT_KREISSACK && settings_get()->gameplay.difficulty < 2) { - // kriessack, but not on Veteran or higher + // kreissack, but not on Veteran or higher dialog_show(&local->too_pathetic_dialog, 1); } diff --git a/src/video/color.h b/src/video/color.h index 0e8d16d4..6554493c 100644 --- a/src/video/color.h +++ b/src/video/color.h @@ -3,6 +3,7 @@ #define COLOR_RED color_create(255, 0, 0, 255) #define COLOR_GREEN color_create(0, 255, 0, 255) +#define COLOR_DARK_GREEN color_create(0, 121, 0, 255) #define COLOR_BLUE color_create(0, 0, 255, 255) #define COLOR_YELLOW color_create(255, 255, 0, 255) #define COLOR_WHITE color_create(255, 255, 255, 255)