diff options
-rw-r--r-- | messages.pl | 11 | ||||
-rw-r--r-- | taipan.c | 69 |
2 files changed, 54 insertions, 26 deletions
diff --git a/messages.pl b/messages.pl index 2d39b6d..ad53d87 100644 --- a/messages.pl +++ b/messages.pl @@ -45,9 +45,15 @@ print "// ratio: " . sprintf("%.1f", $total_out * 100 / $total_in) . # commented-out messages can go in the pod section below: =pod +illion "illion" # somehow this wastes 2 bytes +fine "fine" +run "Run" # too short to be worth compression =cut __END__ +guns "guns" +fight "Fight" +throw "Throw Cargo" opium "Opium" silk "Silk" arms "Arms" @@ -86,6 +92,7 @@ cur_seaworth "Current seaworthiness: " what_shall_we_do "what shall we do??\r\n(Fight, Run, Throw cargo)" aye_fight "Aye, we'll fight 'em" were_firing "We're firing on 'em" +sunk "Sunk " of_the_buggers " of the buggers" didnt_sink "Hit 'em, but didn't sink 'em" ran_away " ran away" @@ -119,9 +126,13 @@ your_final_status "Your final status:\r\n\nNet cash: " ship_size "\r\nShip size: " units_with " units with " you_traded_for " guns\r\n\nYou traded for " +spc_year " year" +spc_and_spc " and " +spc_month " month" your_score_is "Your score is " land_based_job "Have you considered a land based job?\r\n\n\n" stay_on_shore "The crew has requested that you stay on\r\nshore for their safety!!\r\n\n" +3_nls "\n\n\n" your_rating "Your Rating:\r\n" ma_tsu "Ma Tsu" master_taipan "Master Taipan" @@ -390,8 +390,8 @@ unsigned long hold_[4]; long hold = 0; /* these being negative would be a Bad Thing */ +unsigned char month = 1; unsigned int guns = 0, - month = 1, year = 1860, ec = 20, ed = 1; @@ -449,9 +449,13 @@ void cprint_taipan_comma(void) { comma_space(); } +void cprint_colon_space(void) { + cputs(": "); +} + void cprint_taipan_colon(void) { cprint_taipan(); - cputs(": "); + cprint_colon_space(); } void cprint_bang(void) { @@ -592,6 +596,7 @@ void cprintfancy_big(bignump b) { cspace(); cputc(letter); cputs("illion"); + // print_msg(M_illion); } } #endif @@ -850,9 +855,14 @@ void fight_stats(int ships, int orders) { print_msg(M_your_orders_are); cblank(11); switch(orders) { + /* case 1: cputs("Fight"); break; case 2: cputs("Run"); break; case 3: cputs("Throw Cargo"); break; + */ + case 1: print_msg(M_fight); break; + case 2: cputs("Run"); break; + case 3: print_msg(M_throw); break; default: break; } @@ -906,7 +916,6 @@ char sea_battle(char id, int num_ships) { orders = 0; num_on_screen = 0; - // time = ((year - 1860) * 12) + month; time = get_time(); s0 = num_ships; ok = 0; @@ -932,7 +941,8 @@ char sea_battle(char id, int num_ships) { print_msg(M_we_have); gotoxy(30, 1); cspaces(6); - cputs("guns"); + // cputs("guns"); + print_msg(M_guns); rvs_off(); update_guns(); @@ -986,7 +996,8 @@ char sea_battle(char id, int num_ships) { gotoxy(0, 3); clrtoeol(); cprint_taipan_comma(); - cputs("what shall we do??\r\n(Fight, Run, Throw cargo)"); + // cputs("what shall we do??\r\n(Fight, Run, Throw cargo)"); + print_msg(M_what_shall_we_do); under_attack_sound(); while(!orders) set_orders(); @@ -1082,7 +1093,8 @@ char sea_battle(char id, int num_ships) { gotoxy(0, 3); clrtoeol(); if(sk > 0) { - cputs("Sunk "); + // cputs("Sunk "); + print_msg(M_sunk); cprintulong(sk); // cputs(" of the buggers"); print_msg(M_of_the_buggers); @@ -1149,22 +1161,26 @@ char sea_battle(char id, int num_ships) { gotoxy(4, 4); // cputs(item[0]); print_msg(item[0]); - cputs(": "); + // cputs(": "); + cprint_colon_space(); cprintulong(hold_[0]); gotoxy(24, 4); // cputs(item[1]); print_msg(item[1]); - cputs(": "); + // cputs(": "); + cprint_colon_space(); cprintulong(hold_[1]); gotoxy(5, 5); // cputs(item[2]); print_msg(item[2]); - cputs(": "); + // cputs(": "); + cprint_colon_space(); cprintulong(hold_[2]); gotoxy(21, 5); // cputs(item[3]); print_msg(item[3]); - cputs(": "); + // cputs(": "); + cprint_colon_space(); cprintulong(hold_[3]); gotoxy(0, 6); @@ -1464,7 +1480,8 @@ void cash_or_guns(void) { // cputs("(But no debt!)"); print_msg(M_but_no_debt); gotoxy(10, 10); - cputc('?'); + // cputc('?'); + cprint_question_space(); do { choice = agetc(); @@ -1837,7 +1854,6 @@ void retire(void) { void final_stats(void) { int years = year - 1860, - // time = ((year - 1860) * 12) + month, time = get_time(), choice = 0; @@ -1892,14 +1908,17 @@ void final_stats(void) // "You traded for "); print_msg(M_you_traded_for); cprintulong(years); - cputs(" year"); + // cputs(" year"); + print_msg(M_spc_year); if (years != 1) { cputc_s(); } - cputs(" and "); + // cputs(" and "); + print_msg(M_spc_and_spc); cprintulong(month); - cputs(" month"); + // cputs(" month"); + print_msg(M_spc_month); if (month > 1) { cputc_s(); @@ -1924,7 +1943,8 @@ void final_stats(void) // "shore for their safety!!\r\n\n"); print_msg(M_stay_on_shore); } else { - cputs("\r\n\n\n"); + // cputs("\r\n\n\n"); + print_msg(M_3_nls); } // cputs("Your Rating:\r\n"); print_msg(M_your_rating); @@ -1942,8 +1962,7 @@ void final_stats(void) print_msg(M_ma_tsu); rvs_off(); cspaces(9); - cputs("50,000 and over |\r\n"); - cprint_pipe(); + cputs("50,000 and over |\r\n|"); if ((score < 50000L) && (score > 7999L)) { @@ -1952,9 +1971,8 @@ void final_stats(void) // cputs("Master Taipan"); print_msg(M_master_taipan); rvs_off(); - cputs(" 8,000 to 49,999|\r\n"); - cprint_pipe(); - // cputc('|'); + cputs(" 8,000 to 49,999|\r\n|"); + // cprint_pipe(); if ((score < 8000L) && (score > 999L)) { @@ -1963,8 +1981,8 @@ void final_stats(void) cprint_taipan(); rvs_off(); cspaces(10); - cputs("1,000 to 7,999|\r\n"); - cprint_pipe(); + cputs("1,000 to 7,999|\r\n|"); + // cprint_pipe(); if ((score < 1000) && (score > 499)) { @@ -1974,8 +1992,8 @@ void final_stats(void) print_msg(M_compradore); rvs_off(); cspaces(8); - cputs("500 to 999|\r\n"); - cprint_pipe(); + cputs("500 to 999|\r\n|"); + // cprint_pipe(); if (score < 500) { @@ -2485,7 +2503,6 @@ void quit(void) } void li_yuen_extortion(void) { - // int time = ((year - 1860) * 12) + month; int time = get_time(); /* |