From 84198fe5699e02dba08ef5d529f91bd7c49df3f0 Mon Sep 17 00:00:00 2001 From: Hourier Date: Tue, 21 Apr 2020 19:26:54 +0900 Subject: [PATCH] [Refactor] Separated play-gamble.c/h from bldg.c --- Hengband_vcs2017/Hengband/Hengband.vcxproj | 2 + Hengband_vcs2017/Hengband/Hengband.vcxproj.filters | 6 + src/Makefile.am | 1 + src/bldg.c | 317 +------------------- src/market/play-gamble.c | 319 +++++++++++++++++++++ src/market/play-gamble.h | 3 + 6 files changed, 332 insertions(+), 316 deletions(-) create mode 100644 src/market/play-gamble.c create mode 100644 src/market/play-gamble.h diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj index a45b37940..b70dedd55 100644 --- a/Hengband_vcs2017/Hengband/Hengband.vcxproj +++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj @@ -215,6 +215,7 @@ + @@ -397,6 +398,7 @@ + diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters index 824165d37..77812fcc3 100644 --- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters +++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters @@ -574,6 +574,9 @@ market + + market + @@ -1130,6 +1133,9 @@ market + + market + diff --git a/src/Makefile.am b/src/Makefile.am index 56550e440..3abf926f6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,6 +12,7 @@ hengband_SOURCES = \ avatar.h avatar.c birth.c birth.h \ \ market/building-util.c market/building-util.h \ + market/play-gamble.c market/play-gamble.h \ market/poker.c market/poker.h market/store-owners.c market/store-owners.h \ market/store-owner-comments.c market/store-owner-comments.h \ market/articles-on-sale.c market/articles-on-sale.h \ diff --git a/src/bldg.c b/src/bldg.c index 11503a856..75af79057 100644 --- a/src/bldg.c +++ b/src/bldg.c @@ -65,12 +65,9 @@ #include "market/poker.h" #include "market/building-util.h" #include "market/arena_info_table.h" +#include "market/play-gamble.h" #include "view/display-fruit.h" -/* - * todo MAX_BLDGが定義されていない旨のエラーが出る……がコンパイルには成功する - * Buildings - */ building_type building[MAX_BLDG]; MONRACE_IDX battle_mon[4]; @@ -382,318 +379,6 @@ static void arena_comm(player_type *player_ptr, int cmd) /*! - * @brief カジノ1プレイごとのメインルーチン / gamble_comm - * @param player_ptr プレーヤーへの参照ポインタ - * @param cmd プレイするゲームID - * @return なし - */ -static bool gamble_comm(player_type *player_ptr, int cmd) -{ - int i; - int roll1, roll2, roll3, choice, odds, win; - s32b wager; - s32b maxbet; - s32b oldgold; - - char out_val[160], tmp_str[80], again; - concptr p; - - screen_save(); - - if (cmd == BACT_GAMBLE_RULES) - { - (void)show_file(player_ptr, TRUE, _("jgambling.txt", "gambling.txt"), NULL, 0, 0); - screen_load(); - return TRUE; - } - - if (player_ptr->au < 1) - { - msg_print(_("おい！おまえ一文なしじゃないか！こっから出ていけ！", - "Hey! You don't have gold - get out of here!")); - msg_print(NULL); - screen_load(); - return FALSE; - } - - clear_bldg(5, 23); - maxbet = player_ptr->lev * 200; - maxbet = MIN(maxbet, player_ptr->au); - - strcpy(out_val, ""); - sprintf(tmp_str, _("賭け金 (1-%ld)？", "Your wager (1-%ld) ? "), (long int)maxbet); - - - /* - * Use get_string() because we may need more than - * the s16b value returned by get_quantity(). - */ - if (!get_string(tmp_str, out_val, 32)) - { - msg_print(NULL); - screen_load(); - return TRUE; - } - - for (p = out_val; *p == ' '; p++); - - wager = atol(p); - if (wager > player_ptr->au) - { - msg_print(_("おい！金が足りないじゃないか！出ていけ！", "Hey! You don't have the gold - get out of here!")); - msg_print(NULL); - screen_load(); - return FALSE; - } - else if (wager > maxbet) - { - msg_format(_("%ldゴールドだけ受けよう。残りは取っときな。", - "I'll take %ld gold of that. Keep the rest."), (long int)maxbet); - wager = maxbet; - } - else if (wager < 1) - { - msg_print(_("ＯＫ、１ゴールドからはじめよう。", "Ok, we'll start with 1 gold.")); - wager = 1; - } - msg_print(NULL); - win = FALSE; - odds = 0; - oldgold = player_ptr->au; - - sprintf(tmp_str, _("ゲーム前の所持金: %9ld", "Gold before game: %9ld"), (long int)oldgold); - prt(tmp_str, 20, 2); - sprintf(tmp_str, _("現在の掛け金: %9ld", "Current Wager: %9ld"), (long int)wager); - prt(tmp_str, 21, 2); - - do - { - player_ptr->au -= wager; - switch (cmd) - { - case BACT_IN_BETWEEN: /* Game of In-Between */ - c_put_str(TERM_GREEN, _("イン・ビトイーン", "In Between"), 5, 2); - - odds = 4; - win = FALSE; - roll1 = randint1(10); - roll2 = randint1(10); - choice = randint1(10); - sprintf(tmp_str, _("黒ダイス: %d 黒ダイス: %d", "Black die: %d Black Die: %d"), roll1, roll2); - - prt(tmp_str, 8, 3); - sprintf(tmp_str, _("赤ダイス: %d", "Red die: %d"), choice); - - prt(tmp_str, 11, 14); - if (((choice > roll1) && (choice < roll2)) || - ((choice < roll1) && (choice > roll2))) - win = TRUE; - break; - case BACT_CRAPS: /* Game of Craps */ - c_put_str(TERM_GREEN, _("クラップス", "Craps"), 5, 2); - - win = 3; - odds = 2; - roll1 = randint1(6); - roll2 = randint1(6); - roll3 = roll1 + roll2; - choice = roll3; - sprintf(tmp_str, _("１振りめ: %d %d Total: %d", - "First roll: %d %d Total: %d"), roll1, roll2, roll3); - prt(tmp_str, 7, 5); - if ((roll3 == 7) || (roll3 == 11)) - win = TRUE; - else if ((roll3 == 2) || (roll3 == 3) || (roll3 == 12)) - win = FALSE; - else - { - do - { - msg_print(_("なにかキーを押すともう一回振ります。", "Hit any key to roll again")); - - msg_print(NULL); - roll1 = randint1(6); - roll2 = randint1(6); - roll3 = roll1 + roll2; - sprintf(tmp_str, _("出目: %d %d 合計: %d", - "Roll result: %d %d Total: %d"), roll1, roll2, roll3); - prt(tmp_str, 8, 5); - if (roll3 == choice) - win = TRUE; - else if (roll3 == 7) - win = FALSE; - } while ((win != TRUE) && (win != FALSE)); - } - - break; - - case BACT_SPIN_WHEEL: /* Spin the Wheel Game */ - win = FALSE; - odds = 9; - c_put_str(TERM_GREEN, _("ルーレット", "Wheel"), 5, 2); - - prt("0 1 2 3 4 5 6 7 8 9", 7, 5); - prt("--------------------------------", 8, 3); - strcpy(out_val, ""); - get_string(_("何番？ (0-9): ", "Pick a number (0-9): "), out_val, 32); - - for (p = out_val; iswspace(*p); p++); - choice = atol(p); - if (choice < 0) - { - msg_print(_("0番にしとくぜ。", "I'll put you down for 0.")); - choice = 0; - } - else if (choice > 9) - { - msg_print(_("ＯＫ、9番にしとくぜ。", "Ok, I'll put you down for 9.")); - choice = 9; - } - msg_print(NULL); - roll1 = randint0(10); - sprintf(tmp_str, _("ルーレットは回り、止まった。勝者は %d番だ。", - "The wheel spins to a stop and the winner is %d"), roll1); - prt(tmp_str, 13, 3); - prt("", 9, 0); - prt("*", 9, (3 * roll1 + 5)); - if (roll1 == choice) - win = TRUE; - break; - - case BACT_DICE_SLOTS: /* The Dice Slots */ - c_put_str(TERM_GREEN, _("ダイス・スロット", "Dice Slots"), 5, 2); - c_put_str(TERM_YELLOW, _("レモン レモン 2", ""), 6, 37); - c_put_str(TERM_YELLOW, _("レモン レモン レモン 5", ""), 7, 37); - c_put_str(TERM_ORANGE, _("オレンジ オレンジ オレンジ 10", ""), 8, 37); - c_put_str(TERM_UMBER, _("剣 剣 剣 20", ""), 9, 37); - c_put_str(TERM_SLATE, _("盾 盾 盾 50", ""), 10, 37); - c_put_str(TERM_VIOLET, _("プラム プラム プラム 200", ""), 11, 37); - c_put_str(TERM_RED, _("チェリー チェリー チェリー 1000", ""), 12, 37); - - win = FALSE; - roll1 = randint1(21); - for (i = 6; i > 0; i--) - { - if ((roll1 - i) < 1) - { - roll1 = 7 - i; - break; - } - roll1 -= i; - } - roll2 = randint1(21); - for (i = 6; i > 0; i--) - { - if ((roll2 - i) < 1) - { - roll2 = 7 - i; - break; - } - roll2 -= i; - } - choice = randint1(21); - for (i = 6; i > 0; i--) - { - if ((choice - i) < 1) - { - choice = 7 - i; - break; - } - choice -= i; - } - put_str("/--------------------------\\", 7, 2); - prt("\\--------------------------/", 17, 2); - display_fruit(8, 3, roll1 - 1); - display_fruit(8, 12, roll2 - 1); - display_fruit(8, 21, choice - 1); - if ((roll1 == roll2) && (roll2 == choice)) - { - win = TRUE; - switch (roll1) - { - case 1: - odds = 5; break; - case 2: - odds = 10; break; - case 3: - odds = 20; break; - case 4: - odds = 50; break; - case 5: - odds = 200; break; - case 6: - odds = 1000; break; - } - } - else if ((roll1 == 1) && (roll2 == 1)) - { - win = TRUE; - odds = 2; - } - break; - case BACT_POKER: - win = FALSE; - odds = do_poker(); - if (odds) win = TRUE; - break; - } - - if (win) - { - prt(_("あなたの勝ち", "YOU WON"), 16, 37); - - player_ptr->au += odds * wager; - sprintf(tmp_str, _("倍率: %d", "Payoff: %d"), odds); - - prt(tmp_str, 17, 37); - } - else - { - prt(_("あなたの負け", "You Lost"), 16, 37); - prt("", 17, 37); - } - - sprintf(tmp_str, _("現在の所持金: %9ld", "Current Gold: %9ld"), (long int)player_ptr->au); - - prt(tmp_str, 22, 2); - prt(_("もう一度(Y/N)？", "Again(Y/N)?"), 18, 37); - - move_cursor(18, 52); - again = inkey(); - prt("", 16, 37); - prt("", 17, 37); - prt("", 18, 37); - if (wager > player_ptr->au) - { - msg_print(_("おい！金が足りないじゃないか！ここから出て行け！", - "Hey! You don't have the gold - get out of here!")); - msg_print(NULL); - - /* Get out here */ - break; - } - } while ((again == 'y') || (again == 'Y')); - - prt("", 18, 37); - if (player_ptr->au >= oldgold) - { - msg_print(_("「今回は儲けたな！でも次はこっちが勝ってやるからな、絶対に！」", - "You came out a winner! We'll win next time, I'm sure.")); - chg_virtue(player_ptr, V_CHANCE, 3); - } - else - { - msg_print(_("「金をスッてしまったな、わはは！うちに帰った方がいいぜ。」", "You lost gold! Haha, better head home.")); - chg_virtue(player_ptr, V_CHANCE, -3); - } - - msg_print(NULL); - screen_load(); - return TRUE; -} - - -/*! * @brief モンスター闘技場に参加するモンスターを更新する。 * @param player_ptr プレーヤーへの参照ポインタ * @return なし diff --git a/src/market/play-gamble.c b/src/market/play-gamble.c new file mode 100644 index 000000000..e92e16e4c --- /dev/null +++ b/src/market/play-gamble.c @@ -0,0 +1,319 @@ +#include "angband.h" +#include "play-gamble.h" +#include "term.h" +#include "avatar.h" +#include "core/show-file.h" +#include "market/building-util.h" +#include "market/poker.h" +#include "view/display-fruit.h" + +/*! + * @brief カジノ1プレイごとのメインルーチン / gamble_comm + * @param player_ptr プレーヤーへの参照ポインタ + * @param cmd プレイするゲームID + * @return プレイ成立やルール説明のみ等ならTRUE、賭け金不足で不成立ならFALSE + */ +bool gamble_comm(player_type *player_ptr, int cmd) +{ + int i; + int roll1, roll2, roll3, choice, odds, win; + s32b wager; + s32b maxbet; + s32b oldgold; + + char out_val[160], tmp_str[80], again; + concptr p; + + screen_save(); + + if (cmd == BACT_GAMBLE_RULES) + { + (void)show_file(player_ptr, TRUE, _("jgambling.txt", "gambling.txt"), NULL, 0, 0); + screen_load(); + return TRUE; + } + + if (player_ptr->au < 1) + { + msg_print(_("おい！おまえ一文なしじゃないか！こっから出ていけ！", + "Hey! You don't have gold - get out of here!")); + msg_print(NULL); + screen_load(); + return FALSE; + } + + clear_bldg(5, 23); + maxbet = player_ptr->lev * 200; + maxbet = MIN(maxbet, player_ptr->au); + + strcpy(out_val, ""); + sprintf(tmp_str, _("賭け金 (1-%ld)？", "Your wager (1-%ld) ? "), (long int)maxbet); + + + /* + * Use get_string() because we may need more than + * the s16b value returned by get_quantity(). + */ + if (!get_string(tmp_str, out_val, 32)) + { + msg_print(NULL); + screen_load(); + return TRUE; + } + + for (p = out_val; *p == ' '; p++); + + wager = atol(p); + if (wager > player_ptr->au) + { + msg_print(_("おい！金が足りないじゃないか！出ていけ！", "Hey! You don't have the gold - get out of here!")); + msg_print(NULL); + screen_load(); + return FALSE; + } + else if (wager > maxbet) + { + msg_format(_("%ldゴールドだけ受けよう。残りは取っときな。", + "I'll take %ld gold of that. Keep the rest."), (long int)maxbet); + wager = maxbet; + } + else if (wager < 1) + { + msg_print(_("ＯＫ、１ゴールドからはじめよう。", "Ok, we'll start with 1 gold.")); + wager = 1; + } + msg_print(NULL); + win = FALSE; + odds = 0; + oldgold = player_ptr->au; + + sprintf(tmp_str, _("ゲーム前の所持金: %9ld", "Gold before game: %9ld"), (long int)oldgold); + prt(tmp_str, 20, 2); + sprintf(tmp_str, _("現在の掛け金: %9ld", "Current Wager: %9ld"), (long int)wager); + prt(tmp_str, 21, 2); + + do + { + player_ptr->au -= wager; + switch (cmd) + { + case BACT_IN_BETWEEN: /* Game of In-Between */ + c_put_str(TERM_GREEN, _("イン・ビトイーン", "In Between"), 5, 2); + + odds = 4; + win = FALSE; + roll1 = randint1(10); + roll2 = randint1(10); + choice = randint1(10); + sprintf(tmp_str, _("黒ダイス: %d 黒ダイス: %d", "Black die: %d Black Die: %d"), roll1, roll2); + + prt(tmp_str, 8, 3); + sprintf(tmp_str, _("赤ダイス: %d", "Red die: %d"), choice); + + prt(tmp_str, 11, 14); + if (((choice > roll1) && (choice < roll2)) || + ((choice < roll1) && (choice > roll2))) + win = TRUE; + break; + case BACT_CRAPS: /* Game of Craps */ + c_put_str(TERM_GREEN, _("クラップス", "Craps"), 5, 2); + + win = 3; + odds = 2; + roll1 = randint1(6); + roll2 = randint1(6); + roll3 = roll1 + roll2; + choice = roll3; + sprintf(tmp_str, _("１振りめ: %d %d Total: %d", + "First roll: %d %d Total: %d"), roll1, roll2, roll3); + prt(tmp_str, 7, 5); + if ((roll3 == 7) || (roll3 == 11)) + win = TRUE; + else if ((roll3 == 2) || (roll3 == 3) || (roll3 == 12)) + win = FALSE; + else + { + do + { + msg_print(_("なにかキーを押すともう一回振ります。", "Hit any key to roll again")); + + msg_print(NULL); + roll1 = randint1(6); + roll2 = randint1(6); + roll3 = roll1 + roll2; + sprintf(tmp_str, _("出目: %d %d 合計: %d", + "Roll result: %d %d Total: %d"), roll1, roll2, roll3); + prt(tmp_str, 8, 5); + if (roll3 == choice) + win = TRUE; + else if (roll3 == 7) + win = FALSE; + } while ((win != TRUE) && (win != FALSE)); + } + + break; + + case BACT_SPIN_WHEEL: /* Spin the Wheel Game */ + win = FALSE; + odds = 9; + c_put_str(TERM_GREEN, _("ルーレット", "Wheel"), 5, 2); + + prt("0 1 2 3 4 5 6 7 8 9", 7, 5); + prt("--------------------------------", 8, 3); + strcpy(out_val, ""); + get_string(_("何番？ (0-9): ", "Pick a number (0-9): "), out_val, 32); + + for (p = out_val; iswspace(*p); p++); + choice = atol(p); + if (choice < 0) + { + msg_print(_("0番にしとくぜ。", "I'll put you down for 0.")); + choice = 0; + } + else if (choice > 9) + { + msg_print(_("ＯＫ、9番にしとくぜ。", "Ok, I'll put you down for 9.")); + choice = 9; + } + msg_print(NULL); + roll1 = randint0(10); + sprintf(tmp_str, _("ルーレットは回り、止まった。勝者は %d番だ。", + "The wheel spins to a stop and the winner is %d"), roll1); + prt(tmp_str, 13, 3); + prt("", 9, 0); + prt("*", 9, (3 * roll1 + 5)); + if (roll1 == choice) + win = TRUE; + break; + + case BACT_DICE_SLOTS: /* The Dice Slots */ + c_put_str(TERM_GREEN, _("ダイス・スロット", "Dice Slots"), 5, 2); + c_put_str(TERM_YELLOW, _("レモン レモン 2", ""), 6, 37); + c_put_str(TERM_YELLOW, _("レモン レモン レモン 5", ""), 7, 37); + c_put_str(TERM_ORANGE, _("オレンジ オレンジ オレンジ 10", ""), 8, 37); + c_put_str(TERM_UMBER, _("剣 剣 剣 20", ""), 9, 37); + c_put_str(TERM_SLATE, _("盾 盾 盾 50", ""), 10, 37); + c_put_str(TERM_VIOLET, _("プラム プラム プラム 200", ""), 11, 37); + c_put_str(TERM_RED, _("チェリー チェリー チェリー 1000", ""), 12, 37); + + win = FALSE; + roll1 = randint1(21); + for (i = 6; i > 0; i--) + { + if ((roll1 - i) < 1) + { + roll1 = 7 - i; + break; + } + roll1 -= i; + } + roll2 = randint1(21); + for (i = 6; i > 0; i--) + { + if ((roll2 - i) < 1) + { + roll2 = 7 - i; + break; + } + roll2 -= i; + } + choice = randint1(21); + for (i = 6; i > 0; i--) + { + if ((choice - i) < 1) + { + choice = 7 - i; + break; + } + choice -= i; + } + put_str("/--------------------------\\", 7, 2); + prt("\\--------------------------/", 17, 2); + display_fruit(8, 3, roll1 - 1); + display_fruit(8, 12, roll2 - 1); + display_fruit(8, 21, choice - 1); + if ((roll1 == roll2) && (roll2 == choice)) + { + win = TRUE; + switch (roll1) + { + case 1: + odds = 5; break; + case 2: + odds = 10; break; + case 3: + odds = 20; break; + case 4: + odds = 50; break; + case 5: + odds = 200; break; + case 6: + odds = 1000; break; + } + } + else if ((roll1 == 1) && (roll2 == 1)) + { + win = TRUE; + odds = 2; + } + break; + case BACT_POKER: + win = FALSE; + odds = do_poker(); + if (odds) win = TRUE; + break; + } + + if (win) + { + prt(_("あなたの勝ち", "YOU WON"), 16, 37); + + player_ptr->au += odds * wager; + sprintf(tmp_str, _("倍率: %d", "Payoff: %d"), odds); + + prt(tmp_str, 17, 37); + } + else + { + prt(_("あなたの負け", "You Lost"), 16, 37); + prt("", 17, 37); + } + + sprintf(tmp_str, _("現在の所持金: %9ld", "Current Gold: %9ld"), (long int)player_ptr->au); + + prt(tmp_str, 22, 2); + prt(_("もう一度(Y/N)？", "Again(Y/N)?"), 18, 37); + + move_cursor(18, 52); + again = inkey(); + prt("", 16, 37); + prt("", 17, 37); + prt("", 18, 37); + if (wager > player_ptr->au) + { + msg_print(_("おい！金が足りないじゃないか！ここから出て行け！", + "Hey! You don't have the gold - get out of here!")); + msg_print(NULL); + + /* Get out here */ + break; + } + } while ((again == 'y') || (again == 'Y')); + + prt("", 18, 37); + if (player_ptr->au >= oldgold) + { + msg_print(_("「今回は儲けたな！でも次はこっちが勝ってやるからな、絶対に！」", + "You came out a winner! We'll win next time, I'm sure.")); + chg_virtue(player_ptr, V_CHANCE, 3); + } + else + { + msg_print(_("「金をスッてしまったな、わはは！うちに帰った方がいいぜ。」", "You lost gold! Haha, better head home.")); + chg_virtue(player_ptr, V_CHANCE, -3); + } + + msg_print(NULL); + screen_load(); + return TRUE; +} diff --git a/src/market/play-gamble.h b/src/market/play-gamble.h new file mode 100644 index 000000000..6957d438d --- /dev/null +++ b/src/market/play-gamble.h @@ -0,0 +1,3 @@ +#pragma once + +bool gamble_comm(player_type *player_ptr, int cmd); -- 2.11.0