reachy 1.3 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9949423745158b64ce0eb35a1048532d0126ff15
-  data.tar.gz: 79b2dfad74077eecf8bb07b7c41403325f28abcd
+  metadata.gz: 6e5328063f4857c83190ae7f87090f152cf4ebc2
+  data.tar.gz: 8a0c4842099094a6b2d771b9cf78a1773bd292cb
 SHA512:
-  metadata.gz: 6aa36eb5bbf2dc854a5a331d9593fbbf4ab35b8df7807fa4521bd3269e468dd9bdd75f8cb48ca9c0370bceeb8b65526e672c61a5c898803431558429b813c99b
-  data.tar.gz: fd4222023e0122c15d2647440034dcd8deb2843b5e1d0c33acf3c755b5e90857e0be3f6114d4ffa3bb3b6cc92954054a3bcaeb2485d28bb2c1f6c63fbbcf0111
+  metadata.gz: a1e07d427f652106437fbe06f497bfbe2a704b95406ae829109d7bf105dfc44f623150545762a595ac8ea7ae9c74cf5f553acf0213fde86a5a45abb159c5f08a
+  data.tar.gz: 78ac4684331e6dcb31cb10df0c70ef1fdd1c490476c43fafcea56a47ca8985054cb68185b88b964ac1e3c398a1c419f465fd813430e672c4b9592e35e19c9d88

data/lib/banner

@@ -2,7 +2,6 @@
 ###         RIICHI SCORE TRACKER         ###
 ############################################
 By: Thao Truong (Kainu) & Joshua Tang
-Last Updated: 15 Jul 2016
 
 A demo program that helps you keep track of
 Japanese mahjong (Riichi) score as you play.

data/lib/reachy/defines.rb

@@ -18,6 +18,7 @@ module Reachy
   T_TENPAI  = 3
   T_NOTEN   = 4
   T_CHOMBO  = 5
+  T_RESET   = 6
 
   # List of named hand values
   L_HANDS   = ["mangan","haneman","baiman","sanbaiman","yakuman"]

data/lib/reachy/game_menu.rb

@@ -81,7 +81,8 @@ module Reachy
         "  2) Ron\n" \
         "  3) Tenpai\n" \
         "  4) Noten\n" \
-        "  5) Chombo\n"
+        "  5) Chombo\n" \
+        "  6) Round reset\n"
       choice = prompt "---> Select round result: "
       case choice
       when "x"
@@ -100,7 +101,7 @@ module Reachy
         end
         next if not game.validate_players(winner)
 
-        hand = prompt "---> Hand value(s) (e.g. \"2 30\" or \"mangan\"): "
+        hand = prompt "---> Hand value (e.g. \"2 30\" or \"mangan\"): "
         return if hand == "x"
         hand = validate_hand(hand)
 
@@ -116,6 +117,15 @@ module Reachy
         winner = winner.split
         next if not game.validate_players(winner)
 
+        hand = prompt "---> Hand value(s) (e.g. \"2 30 yakuman\" or \"mangan\"): "
+        puts nil
+        return if hand == "x"
+        hand = validate_hand(hand)
+        if hand.length != winner.length
+          printf "The number of winners and winning hands do not match. " \
+                 "Please try again.\n\n"
+        end
+
         loser = prompt "---> Player who dealt into winning hand(s): "
         return if loser == "x"
         loser = loser.split
@@ -130,15 +140,6 @@ module Reachy
           next
         end
 
-        hand = prompt "---> Hand value(s) (e.g. \"2 30 yakuman\" or \"mangan\"): "
-        puts nil
-        return if hand == "x"
-        hand = validate_hand(hand)
-
-        if hand.length != winner.length
-          printf "The number of winners and winning hands do not match. " \
-                 "Please try again.\n\n"
-        end
         game.add_round(type, dealer, winner, loser, hand)
         break
       when "3"
@@ -178,6 +179,16 @@ module Reachy
         hand = []
         game.add_round(type, dealer, winner, loser, hand)
         break
+      when "6"
+        # Round reset
+        type = T_RESET
+        winner = []
+        loser = []
+        hand = []
+        game.add_round(type, dealer, winner, loser, hand)
+        puts "*** Round reset."
+        puts nil
+        break
       when ""
         puts "Enter a choice... >_>"
         puts nil

data/lib/reachy/round.rb

@@ -166,8 +166,8 @@ module Reachy
         # Tenpai type: losers = all - winners
         losers = @scores.keys
         losers -= winner
+        if dealer_flag then @bonus += 1 else self.next_round end
         if winner.length < @mode
-          if dealer_flag then @bonus += 1 else self.next_round end
           total = @mode==4 ? Scoring::P_TENPAI_4 : Scoring::P_TENPAI_3
           paym = total / losers.length
           recv = total / winner.length
@@ -195,6 +195,10 @@ module Reachy
           @scores[w] += score_h[w==dealer ? "dealer" : "nondealer"]
         end
 
+      when T_RESET
+        # Round reset: add bonus stick
+        @bonus += 1
+
       else
         printf "Invalid round result type\n", type
         puts nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reachy
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.4'
 platform: ruby
 authors:
 - Thao Truong (Kainu)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-22 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: someone@nowhere.com