Skip to content

Commit 1c0c1e8

Browse files
NopeyNopey
committed
Port lab_menu_customize to lang_get2
1 parent a77f78c commit 1c0c1e8

File tree

2 files changed

+50
-31
lines changed

2 files changed

+50
-31
lines changed

‎cmake-scripts/LanguageStrings.cmake‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,20 @@ macro(base_strings)
5757
from_base(LANG2_STR_NO "No" 228)
5858
from_base(LANG2_STR_YES "Yes" 229)
5959
from_base(LANG2_STR_PROMPT_CHR_NAME "Character Name Prompt" 192)
60+
from_base(LANG2_STR_CUSTOMIZE_COLOR_1 "Robot Primary color" 547)
61+
from_base(LANG2_STR_CUSTOMIZE_COLOR_2 "Robot Secondary color" 549)
62+
from_base(LANG2_STR_CUSTOMIZE_COLOR_3 "Robot Third color" 551)
63+
from_base(LANG2_STR_UPGRADE_POWER_SELL "Sell Power Upgrade" 553)
64+
from_base(LANG2_STR_UPGRADE_POWER_BUY "Buy Power Upgrade" 554)
65+
from_base(LANG2_STR_UPGRADE_SPEED_SELL "Sell Speed Upgrade" 557)
66+
from_base(LANG2_STR_UPGRADE_SPEED_BUY "Buy Speed Upgrade" 558)
67+
from_base(LANG2_STR_UPGRADE_ARMOR_SELL "Sell Armor Upgrade" 561)
68+
from_base(LANG2_STR_UPGRADE_ARMOR_BUY "Buy Armor Upgrade" 562)
69+
from_base(LANG2_STR_UPGRADE_STUNRESISTANCE_SELL "Sell Stun Res. Upgrade" 563)
70+
from_base(LANG2_STR_UPGRADE_STUNRESISTANCE_BUY "Buy Stun Res. Upgrade" 564)
71+
from_base(LANG2_STR_TRADE_HELP "Trade Robot tooltip" 565)
72+
from_base(LANG2_STR_TRADE_NONEAVAILABLE "No Robots Available" 488)
73+
from_base(LANG2_STR_TRADE_AVAILABLE "Robots Available:" 461)
74+
from_base(LANG2_STR_UPGRADE_QUIT_SELL "leave upgrade sell" 567)
75+
from_base(LANG2_STR_UPGRADE_QUIT_BUY "leave upgrade buy" 568)
6076
endmacro()

‎src/game/scenes/mechlab/lab_menu_customize.c‎

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -449,9 +449,9 @@ void lab_menu_focus_blue(component *c, bool focused, void *userdata) {
449449
if(focused) {
450450
scene *s = userdata;
451451
if(mechlab_get_selling(s)) {
452-
mechlab_set_hint(s, lang_get(547));
452+
mechlab_set_hint(s, lang_get2(LANG2_STR_CUSTOMIZE_COLOR_1));
453453
} else {
454-
mechlab_set_hint(s, lang_get(548));
454+
mechlab_set_hint(s, lang_get2(LANG2_STR_CUSTOMIZE_COLOR_1));
455455
}
456456
label_set_text(header_label, "");
457457
label_set_text(details_label, "");
@@ -462,9 +462,9 @@ void lab_menu_focus_yellow(component *c, bool focused, void *userdata) {
462462
if(focused) {
463463
scene *s = userdata;
464464
if(mechlab_get_selling(s)) {
465-
mechlab_set_hint(s, lang_get(551));
465+
mechlab_set_hint(s, lang_get2(LANG2_STR_CUSTOMIZE_COLOR_2));
466466
} else {
467-
mechlab_set_hint(s, lang_get(552));
467+
mechlab_set_hint(s, lang_get2(LANG2_STR_CUSTOMIZE_COLOR_2));
468468
}
469469
label_set_text(header_label, "");
470470
label_set_text(details_label, "");
@@ -475,9 +475,9 @@ void lab_menu_focus_red(component *c, bool focused, void *userdata) {
475475
if(focused) {
476476
scene *s = userdata;
477477
if(mechlab_get_selling(s)) {
478-
mechlab_set_hint(s, lang_get(549));
478+
mechlab_set_hint(s, lang_get2(LANG2_STR_CUSTOMIZE_COLOR_3));
479479
} else {
480-
mechlab_set_hint(s, lang_get(550));
480+
mechlab_set_hint(s, lang_get2(LANG2_STR_CUSTOMIZE_COLOR_3));
481481
}
482482
label_set_text(header_label, "");
483483
label_set_text(details_label, "");
@@ -501,7 +501,7 @@ static void lab_menu_focus_arm_power(component *c, bool focused, void *userdata)
501501
snprintf(tmp, sizeof(tmp), "Level %d\n\n$ %sK", pilot->arm_power, price_str);
502502
label_set_text(details_label, tmp);
503503
}
504-
snprintf(tmp, sizeof(tmp), lang_get(553), "arm");
504+
snprintf(tmp, sizeof(tmp), lang_get2(LANG2_STR_UPGRADE_POWER_SELL), "arm");
505505
mechlab_set_hint(s, tmp);
506506
} else {
507507
label_set_text(header_label, "ARM POWER:\n\nUPGRADE COST:");
@@ -514,7 +514,7 @@ static void lab_menu_focus_arm_power(component *c, bool focused, void *userdata)
514514
snprintf(tmp, sizeof(tmp), "Level %d\n\n$ %sK", pilot->arm_power + 1, price_str);
515515
label_set_text(details_label, tmp);
516516
}
517-
snprintf(tmp, sizeof(tmp), lang_get(554), "arm");
517+
snprintf(tmp, sizeof(tmp), lang_get2(LANG2_STR_UPGRADE_POWER_BUY), "arm");
518518
mechlab_set_hint(s, tmp);
519519
}
520520
}
@@ -537,7 +537,7 @@ static void lab_menu_focus_leg_power(component *c, bool focused, void *userdata)
537537
snprintf(tmp, sizeof(tmp), "Level %d\n\n$ %sK", pilot->leg_power, price_str);
538538
label_set_text(details_label, tmp);
539539
}
540-
snprintf(tmp, sizeof(tmp), lang_get(555), "leg");
540+
snprintf(tmp, sizeof(tmp), lang_get2(LANG2_STR_UPGRADE_POWER_SELL), "leg");
541541
mechlab_set_hint(s, tmp);
542542
} else {
543543
label_set_text(header_label, "LEG POWER:\n\nUPGRADE COST:");
@@ -550,7 +550,7 @@ static void lab_menu_focus_leg_power(component *c, bool focused, void *userdata)
550550
snprintf(tmp, sizeof(tmp), "Level %d\n\n$ %sK", pilot->leg_power + 1, price_str);
551551
label_set_text(details_label, tmp);
552552
}
553-
snprintf(tmp, sizeof(tmp), lang_get(556), "leg");
553+
snprintf(tmp, sizeof(tmp), lang_get2(LANG2_STR_UPGRADE_POWER_BUY), "leg");
554554
mechlab_set_hint(s, tmp);
555555
}
556556
}
@@ -573,7 +573,7 @@ static void lab_menu_focus_arm_speed(component *c, bool focused, void *userdata)
573573
snprintf(tmp, sizeof(tmp), "Level %d\n\n$ %sK", pilot->arm_speed, price_str);
574574
label_set_text(details_label, tmp);
575575
}
576-
snprintf(tmp, sizeof(tmp), lang_get(557), "arm");
576+
snprintf(tmp, sizeof(tmp), lang_get2(LANG2_STR_UPGRADE_SPEED_SELL), "arm");
577577
mechlab_set_hint(s, tmp);
578578
} else {
579579
label_set_text(header_label, "ARM SPEED:\n\nUPGRADE COST:");
@@ -586,7 +586,7 @@ static void lab_menu_focus_arm_speed(component *c, bool focused, void *userdata)
586586
snprintf(tmp, sizeof(tmp), "Level %d\n\n$ %sK", pilot->arm_speed + 1, price_str);
587587
label_set_text(details_label, tmp);
588588
}
589-
snprintf(tmp, sizeof(tmp), lang_get(558), "arm");
589+
snprintf(tmp, sizeof(tmp), lang_get2(LANG2_STR_UPGRADE_SPEED_BUY), "arm");
590590
mechlab_set_hint(s, tmp);
591591
}
592592
}
@@ -609,7 +609,7 @@ static void lab_menu_focus_leg_speed(component *c, bool focused, void *userdata)
609609
snprintf(tmp, sizeof(tmp), "Level %d\n\n$ %sK", pilot->leg_speed, price_str);
610610
label_set_text(details_label, tmp);
611611
}
612-
snprintf(tmp, sizeof(tmp), lang_get(559), "leg");
612+
snprintf(tmp, sizeof(tmp), lang_get2(LANG2_STR_UPGRADE_SPEED_SELL), "leg");
613613
mechlab_set_hint(s, tmp);
614614
} else {
615615
label_set_text(header_label, "LEG SPEED:\n\nUPGRADE COST:");
@@ -622,7 +622,7 @@ static void lab_menu_focus_leg_speed(component *c, bool focused, void *userdata)
622622
snprintf(tmp, sizeof(tmp), "Level %d\n\n$ %sK", pilot->leg_speed + 1, price_str);
623623
label_set_text(details_label, tmp);
624624
}
625-
snprintf(tmp, sizeof(tmp), lang_get(560), "leg");
625+
snprintf(tmp, sizeof(tmp), lang_get2(LANG2_STR_UPGRADE_SPEED_BUY), "leg");
626626
mechlab_set_hint(s, tmp);
627627
}
628628
}
@@ -645,7 +645,7 @@ static void lab_menu_focus_armor(component *c, bool focused, void *userdata) {
645645
snprintf(tmp, sizeof(tmp), "Level %d\n\n$ %sK", pilot->armor, price_str);
646646
label_set_text(details_label, tmp);
647647
}
648-
mechlab_set_hint(s, lang_get(561));
648+
mechlab_set_hint(s, lang_get2(LANG2_STR_UPGRADE_ARMOR_SELL));
649649
} else {
650650
label_set_text(header_label, "ARMOR PLATE:\n\nUPGRADE COST:");
651651
int32_t price = armor_prices[pilot->har_id][pilot->armor + 1];
@@ -656,7 +656,7 @@ static void lab_menu_focus_armor(component *c, bool focused, void *userdata) {
656656
snprintf(tmp, sizeof(tmp), "Level %d\n\n$ %sK", pilot->armor + 1, price_str);
657657
label_set_text(details_label, tmp);
658658
}
659-
mechlab_set_hint(s, lang_get(562));
659+
mechlab_set_hint(s, lang_get2(LANG2_STR_UPGRADE_ARMOR_BUY));
660660
}
661661
}
662662
}
@@ -678,7 +678,7 @@ static void lab_menu_focus_stun_resistance(component *c, bool focused, void *use
678678
snprintf(tmp, sizeof(tmp), "Level %d\n\n$ %sK", pilot->stun_resistance, price_str);
679679
label_set_text(details_label, tmp);
680680
}
681-
mechlab_set_hint(s, lang_get(563));
681+
mechlab_set_hint(s, lang_get2(LANG2_STR_UPGRADE_STUNRESISTANCE_SELL));
682682
} else {
683683
label_set_text(header_label, "STUN RES.:\n\nUPGRADE COST:");
684684
int32_t price = stun_resistance_prices[pilot->har_id][pilot->stun_resistance + 1];
@@ -689,7 +689,7 @@ static void lab_menu_focus_stun_resistance(component *c, bool focused, void *use
689689
snprintf(tmp, sizeof(tmp), "Level %d\n\n$ %sK", pilot->stun_resistance + 1, price_str);
690690
label_set_text(details_label, tmp);
691691
}
692-
mechlab_set_hint(s, lang_get(564));
692+
mechlab_set_hint(s, lang_get2(LANG2_STR_UPGRADE_STUNRESISTANCE_BUY));
693693
}
694694
}
695695
}
@@ -698,7 +698,7 @@ void lab_menu_focus_trade(component *c, bool focused, void *userdata) {
698698
if(focused) {
699699
scene *s = userdata;
700700
game_player *p1 = game_state_get_player(s->gs, 0);
701-
mechlab_set_hint(s, lang_get(565));
701+
mechlab_set_hint(s, lang_get2(LANG2_STR_TRADE_HELP));
702702
int trade_value = calculate_trade_value(p1->pilot);
703703
uint8_t trades[5];
704704
memset(trades, 0, sizeof(trades));
@@ -716,26 +716,29 @@ void lab_menu_focus_trade(component *c, bool focused, void *userdata) {
716716
DEBUG("got %d trades from the bitmask %d", tradecount, p1->pilot->har_trades);
717717
// check if there's anything for trade
718718
if(tradecount == 0) {
719-
label_set_text(header_label, lang_get(488));
719+
label_set_text(header_label, lang_get2(LANG2_STR_TRADE_NONEAVAILABLE));
720720
label_set_text(details_label, "");
721721
} else {
722-
label_set_text(header_label, lang_get(461));
722+
label_set_text(header_label, lang_get2(LANG2_STR_TRADE_AVAILABLE));
723723
char tmp[200] = "";
724724
// pick 5 of however many we got
725725
// naturally, I unrolled this loop for performance
726726
if(tradecount == 1) {
727-
snprintf(tmp, 200, "%s", lang_get(31 + trades[0]));
727+
snprintf(tmp, 200, "%s", lang_get2_offset(LANG2_STR_ROBOT, trades[0]));
728728
} else if(tradecount == 2) {
729-
snprintf(tmp, 200, "%s %s", lang_get(31 + trades[0]), lang_get(31 + trades[1]));
729+
snprintf(tmp, 200, "%s %s", lang_get2_offset(LANG2_STR_ROBOT, trades[0]),
730+
lang_get2_offset(LANG2_STR_ROBOT, trades[1]));
730731
} else if(tradecount == 3) {
731-
snprintf(tmp, 200, "%s %s %s", lang_get(31 + trades[0]), lang_get(31 + trades[1]),
732-
lang_get(31 + trades[2]));
732+
snprintf(tmp, 200, "%s %s %s", lang_get2_offset(LANG2_STR_ROBOT, trades[0]),
733+
lang_get2_offset(LANG2_STR_ROBOT, trades[1]), lang_get2_offset(LANG2_STR_ROBOT, trades[2]));
733734
} else if(tradecount == 4) {
734-
snprintf(tmp, 200, "%s %s %s %s", lang_get(31 + trades[0]), lang_get(31 + trades[1]),
735-
lang_get(31 + trades[2]), lang_get(31 + trades[3]));
735+
snprintf(tmp, 200, "%s %s %s %s", lang_get2_offset(LANG2_STR_ROBOT, trades[0]),
736+
lang_get2_offset(LANG2_STR_ROBOT, trades[1]), lang_get2_offset(LANG2_STR_ROBOT, trades[2]),
737+
lang_get2_offset(LANG2_STR_ROBOT, trades[3]));
736738
} else if(tradecount == 5) {
737-
snprintf(tmp, 200, "%s %s %s %s %s", lang_get(31 + trades[0]), lang_get(31 + trades[1]),
738-
lang_get(31 + trades[2]), lang_get(31 + trades[3]), lang_get(31 + trades[4]));
739+
snprintf(tmp, 200, "%s %s %s %s %s", lang_get2_offset(LANG2_STR_ROBOT, trades[0]),
740+
lang_get2_offset(LANG2_STR_ROBOT, trades[1]), lang_get2_offset(LANG2_STR_ROBOT, trades[2]),
741+
lang_get2_offset(LANG2_STR_ROBOT, trades[3]), lang_get2_offset(LANG2_STR_ROBOT, trades[4]));
739742
}
740743
label_set_text(details_label, tmp);
741744
}
@@ -746,9 +749,9 @@ void lab_menu_focus_done(component *c, bool focused, void *userdata) {
746749
if(focused) {
747750
scene *s = userdata;
748751
if(mechlab_get_selling(s)) {
749-
mechlab_set_hint(s, lang_get(567));
752+
mechlab_set_hint(s, lang_get2(LANG2_STR_UPGRADE_QUIT_SELL));
750753
} else {
751-
mechlab_set_hint(s, lang_get(568));
754+
mechlab_set_hint(s, lang_get2(LANG2_STR_UPGRADE_QUIT_BUY));
752755
}
753756
label_set_text(header_label, "");
754757
label_set_text(details_label, "");

0 commit comments

Comments
 (0)