Revert "Make honba customisable in event settings"

This reverts commit 44fb9a9.
Jesterboxboy · Jan 16, 2025 · b810064 · b810064
1 parent 44fb9a9
commit b810064
Show file tree

Hide file tree

Showing 19 changed files with 13 additions and 129 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,7 +10,6 @@
 .phpunit.result.cache
 php-errors.log
 tmp/*.log
-package-lock.json
 
 .env.e2e
 

diff --git a/Common/generated/Common/RulesetConfig.php b/Common/generated/Common/RulesetConfig.php
diff --git a/Common/generated/GPBMetadata/Proto/Atoms.php b/Common/generated/GPBMetadata/Proto/Atoms.php
diff --git a/Common/proto/atoms.proto b/Common/proto/atoms.proto
@@ -649,7 +649,6 @@ message RulesetConfig {
   bool with_yakitori = 36;
   int32 yakitori_penalty = 37;
   bool chombo_ends_game = 38;
-  int32 honba_value = 39;
 }
 
 // Generics

diff --git a/Common/rulesets/ema.php b/Common/rulesets/ema.php
@@ -15,7 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 namespace Common;
 
 require_once __DIR__ . '/../YakuMap.php';
@@ -35,7 +34,6 @@
     ->setEqualizeUma(true)
     ->setWithWinningDealerHonbaSkipped(false)
     ->setOka(0)
-    ->setHonbaValue(300)
     ->setReplacementPlayerFixedPoints(-15000)
     ->setReplacementPlayerOverrideUma(-15000)
     ->setAllowedYaku(YakuMap::listExcept([

diff --git a/Common/rulesets/jpmlA.php b/Common/rulesets/jpmlA.php
@@ -15,7 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 namespace Common;
 
 require_once __DIR__ . '/../YakuMap.php';
@@ -50,7 +49,6 @@
     ->setEqualizeUma(true)
     ->setWithWinningDealerHonbaSkipped(false)
     ->setOka(0)
-    ->setHonbaValue(300)
     ->setReplacementPlayerFixedPoints(-15000)
     ->setReplacementPlayerOverrideUma(-15000)
     ->setAllowedYaku(YakuMap::listExcept([

diff --git a/Common/rulesets/rrc.php b/Common/rulesets/rrc.php
@@ -15,7 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 namespace Common;
 
 require_once __DIR__ . '/../YakuMap.php';
@@ -35,7 +34,6 @@
     ->setEqualizeUma(true)
     ->setWithWinningDealerHonbaSkipped(false)
     ->setOka(0)
-    ->setHonbaValue(300)
     ->setReplacementPlayerFixedPoints(-15000)
     ->setReplacementPlayerOverrideUma(-15000)
     ->setAllowedYaku(YakuMap::listExcept([

diff --git a/Common/rulesets/tenhounet.php b/Common/rulesets/tenhounet.php
@@ -15,7 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 namespace Common;
 
 require_once __DIR__ . '/../YakuMap.php';
@@ -35,7 +34,6 @@
     ->setEqualizeUma(false)
     ->setWithWinningDealerHonbaSkipped(false)
     ->setOka(20000)
-    ->setHonbaValue(300)
     ->setReplacementPlayerFixedPoints(-15000)
     ->setReplacementPlayerOverrideUma(-15000)
     ->setAllowedYaku(YakuMap::listExcept([

diff --git a/Common/rulesets/wrc.php b/Common/rulesets/wrc.php
@@ -15,7 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 namespace Common;
 
 require_once __DIR__ . '/../YakuMap.php';
@@ -35,7 +34,6 @@
     ->setEqualizeUma(true)
     ->setWithWinningDealerHonbaSkipped(false)
     ->setOka(0)
-    ->setHonbaValue(300)
     ->setReplacementPlayerFixedPoints(-15000)
     ->setReplacementPlayerOverrideUma(-15000)
     ->setAllowedYaku(YakuMap::listExcept([

diff --git a/Forseti/app/clients/proto/atoms.pb.ts b/Forseti/app/clients/proto/atoms.pb.ts
@@ -643,7 +643,6 @@ export interface RulesetConfig {
   withYakitori: boolean;
   yakitoriPenalty: number;
   chomboEndsGame: boolean;
-  honbaValue: number;
 }
 
 export interface GenericSuccessResponse {
@@ -7732,7 +7731,6 @@ export const RulesetConfig = {
       withYakitori: false,
       yakitoriPenalty: 0,
       chomboEndsGame: false,
-      honbaValue: 0,
       ...msg,
     };
   },
@@ -7858,9 +7856,6 @@ export const RulesetConfig = {
     if (msg.chomboEndsGame) {
       writer.writeBool(38, msg.chomboEndsGame);
     }
-    if (msg.honbaValue) {
-      writer.writeInt32(39, msg.honbaValue);
-    }
     return writer;
   },
 
@@ -8034,10 +8029,6 @@ export const RulesetConfig = {
           msg.chomboEndsGame = reader.readBool();
           break;
         }
-        case 39: {
-          msg.honbaValue = reader.readInt32();
-          break;
-        }
         default: {
           reader.skipField();
           break;
@@ -14428,7 +14419,6 @@ export const RulesetConfigJSON = {
       withYakitori: false,
       yakitoriPenalty: 0,
       chomboEndsGame: false,
-      honbaValue: 0,
       ...msg,
     };
   },
@@ -14560,9 +14550,6 @@ export const RulesetConfigJSON = {
     if (msg.chomboEndsGame) {
       json["chomboEndsGame"] = msg.chomboEndsGame;
     }
-    if (msg.honbaValue) {
-      json["honbaValue"] = msg.honbaValue;
-    }
     return json;
   },
 
@@ -14744,10 +14731,6 @@ export const RulesetConfigJSON = {
     if (_chomboEndsGame_) {
       msg.chomboEndsGame = _chomboEndsGame_;
     }
-    const _honbaValue_ = json["honbaValue"] ?? json["honba_value"];
-    if (_honbaValue_) {
-      msg.honbaValue = protoscript.parseNumber(_honbaValue_);
-    }
     return msg;
   },
 };

diff --git a/Forseti/app/pages/OwnedEventsEdit/RulesetSettings.tsx b/Forseti/app/pages/OwnedEventsEdit/RulesetSettings.tsx
@@ -160,14 +160,6 @@ export const RulesetSettings: React.FC<RulesetSettingsProps> = ({ form, i18n })
         min={0}
         {...form.getInputProps('ruleset.oka')}
       />
-      <NumberInput
-        icon={<IconCash size='1rem' />}
-        label={i18n._t('Honba Value')}
-        description={i18n._t('Value of one honba stick')}
-        defaultValue={300}
-        min={0}
-        {...form.getInputProps('ruleset.honbaValue')}
-      />
       <UmaSelect form={form} i18n={i18n} />
       <Checkbox
         label={i18n._t('Equalize uma')}

diff --git a/Forseti/app/pages/OwnedEventsEdit/index.tsx b/Forseti/app/pages/OwnedEventsEdit/index.tsx
@@ -128,7 +128,6 @@ export const OwnedEventsEdit: React.FC<{ params: { id?: string } }> = ({ params:
         endingPolicy: EndingPolicy.ENDING_POLICY_EP_UNSPECIFIED,
         startRating: 0,
         startPoints: 30000,
-        honbaValue: 300,
         replacementPlayerFixedPoints: -15000, // tourn
         withYakitori: false,
         yakitoriPenalty: 0,

diff --git a/Mimir/src/helpers/PointsCalc.php b/Mimir/src/helpers/PointsCalc.php
@@ -15,7 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 namespace Mimir;
 
 class PointsCalc
@@ -77,7 +76,6 @@ public static function ron(
         int $totalRiichiInRound = 0,
     ): array {
         self::resetPaymentsInfo();
-        $honbaValue = $rules->rules()->getHonbaValue();
         $pointsDiff = self::_calcPoints($rules, $han, $fu, false, $isDealer);
 
         if (empty($winnerId) || empty($loserId)) {
@@ -132,14 +130,14 @@ public static function ron(
         if ($rules->rules()->getDoubleronHonbaAtamahane() && $closestWinner) {
             // on tenhou we had to give all honba sticks to closest winner only
             if ($winnerId == $closestWinner) {
-                $currentScores[$winnerId] += $honbaValue * $honba;
-                $currentScores[$loserId] -= $honbaValue * $honba;
-                self::$_lastPaymentsInfo['honba'][$winnerId . '<-' . $loserId] = $honbaValue * $honba;
+                $currentScores[$winnerId] += 300 * $honba;
+                $currentScores[$loserId] -= 300 * $honba;
+                self::$_lastPaymentsInfo['honba'][$winnerId . '<-' . $loserId] = 300 * $honba;
             }
         } else {
-            $currentScores[$winnerId] += $honbaValue * $honba;
-            $currentScores[$loserId] -= $honbaValue * $honba;
-            self::$_lastPaymentsInfo['honba'][$winnerId . '<-' . $loserId] = $honbaValue * $honba;
+            $currentScores[$winnerId] += 300 * $honba;
+            $currentScores[$loserId] -= 300 * $honba;
+            self::$_lastPaymentsInfo['honba'][$winnerId . '<-' . $loserId] = 300 * $honba;
         }
 
         return $currentScores;
@@ -173,7 +171,6 @@ public static function tsumo(
         ?int $paoPlayerId
     ) {
         self::resetPaymentsInfo();
-        $honbaValue = $rules->rules()->getHonbaValue();
 
         if (empty($winnerId)) {
             throw new InvalidParametersException('Tsumo must have winner');
@@ -204,7 +201,7 @@ public static function tsumo(
                     continue;
                 }
                 $currentScores[$playerId] += $pointsDiff['dealer'] ?? 0;
-                self::$_lastPaymentsInfo['direct'][$winnerId . '<-' . $playerId] = - ($pointsDiff['dealer'] ?? 0);
+                self::$_lastPaymentsInfo['direct'][$winnerId . '<-' . $playerId] = -($pointsDiff['dealer'] ?? 0);
             }
         } else {
             foreach ($currentScores as $playerId => $value) {
@@ -213,10 +210,10 @@ public static function tsumo(
                 }
                 if ($playerId == $currentDealer) {
                     $currentScores[$playerId] += $pointsDiff['dealer'] ?? 0;
-                    self::$_lastPaymentsInfo['direct'][$winnerId . '<-' . $playerId] = - ($pointsDiff['dealer'] ?? 0);
+                    self::$_lastPaymentsInfo['direct'][$winnerId . '<-' . $playerId] = -($pointsDiff['dealer'] ?? 0);
                 } else {
                     $currentScores[$playerId] += $pointsDiff['player'] ?? 0;
-                    self::$_lastPaymentsInfo['direct'][$winnerId . '<-' . $playerId] = - ($pointsDiff['player'] ?? 0);
+                    self::$_lastPaymentsInfo['direct'][$winnerId . '<-' . $playerId] = -($pointsDiff['player'] ?? 0);
                 }
             }
         }
@@ -233,14 +230,14 @@ public static function tsumo(
         $currentScores[$winnerId] += 1000 * count($riichiIds);
         $currentScores[$winnerId] += 1000 * $riichiBetsCount;
         self::$_lastPaymentsInfo['riichi'][$winnerId . '<-'] = 1000 * $riichiBetsCount;
-        $currentScores[$winnerId] += $honbaValue * $honba;
+        $currentScores[$winnerId] += 300 * $honba;
 
         foreach ($currentScores as $playerId => $value) {
             if ($playerId == $winnerId) {
                 continue;
             }
-            $currentScores[$playerId] -= ($honbaValue / 3) * $honba;
-            self::$_lastPaymentsInfo['honba'][$winnerId . '<-' . $playerId] = ($honbaValue / 3) * $honba;
+            $currentScores[$playerId] -= 100 * $honba;
+            self::$_lastPaymentsInfo['honba'][$winnerId . '<-' . $playerId] = 100 * $honba;
         }
 
         return $currentScores;
@@ -525,7 +522,7 @@ public static function assignRiichiBets(array $rounds, int $loserId, int $riichi
             $winners[$round->getWinnerId()] = [];
             foreach ($bets as $k => $player) {
                 if (isset($winners[$player])) {
-                    $winners[$player][] = $round->getWinnerId(); // winner always gets back his bet
+                    $winners[$player] []= $round->getWinnerId(); // winner always gets back his bet
                     unset($bets[$k]);
                 }
             }

diff --git a/Mimir/tests/models/MajsoulOnlineSessionModelTest.php b/Mimir/tests/models/MajsoulOnlineSessionModelTest.php
@@ -15,7 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 namespace models;
 
 use Common\PlatformType;
@@ -292,7 +291,6 @@ public function testAllTempaiBug()
 
         $this->_event->getRulesetConfig()->rules()->setStartPoints(30000);
         $this->_event->getRulesetConfig()->rules()->setOka(0);
-        $this->_event->getRulesetConfig()->rules()->setHonbaValue(300);
         $this->_event->getRulesetConfig()->rules()->getUma()->setPlace1(30000);
         $this->_event->getRulesetConfig()->rules()->getUma()->setPlace2(10000);
         $this->_event->getRulesetConfig()->rules()->getUma()->setPlace3(-10000);

diff --git a/Mimir/tests/models/OnlineSessionTest.php b/Mimir/tests/models/OnlineSessionTest.php
@@ -15,7 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 namespace Mimir;
 
 use Common\PlatformType;
@@ -216,7 +215,6 @@ public function testAddOnlineGameWithChips()
         $ruleset = \Common\Ruleset::instance('tenhounet');
         $ruleset->rules()
             ->setOka(0)
-            ->setHonbaValue(300)
             ->setStartRating(0)
             ->setStartPoints(30000)
             ->setUma((new Uma())

diff --git a/Mimir/tests/primitives/SessionResultsTest.php b/Mimir/tests/primitives/SessionResultsTest.php
@@ -15,7 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 namespace Mimir;
 
 use Common\EndingPolicy;
@@ -77,7 +76,6 @@ protected function setUp(): void
                 ->setPlace3(-5000)
                 ->setPlace4(-15000))
             ->setOka(0)
-            ->setHonbaValue(300)
             ->setChomboAmount(20000)
             ->setEqualizeUma(false)
             ->setReplacementPlayerOverrideUma(0)