Refactor Riichi point calculations #22
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| import { Constants } from './Constants'; | ||
| import { NewGameUtils } from './NewGameUtils'; | ||
|
|
||
| export var PointCalculationUtils = { | ||
|
There was a problem hiding this comment. If you're going to do this, make it generic (include HK calculation too it's much more simple anyway) There was a problem hiding this comment. I'd like to do it later, since this ticket is already quite large. There was a problem hiding this comment. I'm just worried about JPN and HKG code diverging too much when it should be converging. |
||
| jpn_dealin_delta, | ||
| jpn_selfdraw_delta, | ||
| jpn_mistake_delta | ||
|
There was a problem hiding this comment. Hmm, is it possible to keep the jpn object in PointCalculationUtils with members "dealin_delta = jpn_dealin_delta"? It seems you removed it this entry in favour of just the suffix. |
||
| }; | ||
|
|
||
| /** | ||
| * Calculates the change in points as a result of a deal-in hand | ||
| * Uses the formula from https://en.wikipedia.org/wiki/Japanese_Mahjong_scoring_rules | ||
| * | ||
| * @return {Object} containing the point difference for each seat | ||
| */ | ||
| function jpn_dealin_delta(points, fu, winnerWind, loserWind, riichiSticks) { | ||
|
There was a problem hiding this comment. If we're adding function headers, make sure to add @param entries |
||
| let winds = {}; | ||
| winds[Constants.EAST] = winds[Constants.SOUTH] = winds[Constants.WEST] = winds[Constants.NORTH] = 0; | ||
|
|
||
| let basicPoints; | ||
|
There was a problem hiding this comment. Some funky indentation here There was a problem hiding this comment. I'll fix that in my next commit. |
||
| let currentBonus = Number(Session.get("current_bonus")) * Constants.BONUS_POINTS; | ||
|
|
||
| // The multiplier is for whether or not it's a dealer victory | ||
| let multiplier = (winnerWind != NewGameUtils.roundToDealerDirection(Number(Session.get("current_round")))) ? 4 : 6; | ||
|
|
||
| // Check to see if you have to count basic points | ||
| if (points < 5) { | ||
| if (fu == 20 || (points == 1 && fu == 25)) { | ||
| return 0; // Issue Protection | ||
| } else { | ||
| let manganPayout = Constants.JPN_MANGAN_BASE_POINTS * multiplier; | ||
| basicPoints = Math.ceil((fu * Math.pow(2, 2 + points)) * multiplier / 100) * 100; | ||
| basicPoints = basicPoints < manganPayout ? basicPoints : manganPayout; | ||
| } | ||
| } else { basicPoints = manganValue(points) * multiplier }; | ||
|
There was a problem hiding this comment. If you're going to do this, the semicolon should be at the end of the line, not the end of the block. I would still make this and the other one like it a seperate line. |
||
|
|
||
| winds[winnerWind] = basicPoints + currentBonus + (riichiSticks * Constants.RIICHI_POINTS); | ||
| winds[loserWind] = -(basicPoints + currentBonus); | ||
|
|
||
| Session.set("free_riichi_sticks", 0); | ||
| return winds; | ||
| }; | ||
|
|
||
|
|
||
| /** | ||
| * Calculates the change in points as a result of a self-drawn hand | ||
| * Uses the formula from https://en.wikipedia.org/wiki/Japanese_Mahjong_scoring_rules | ||
| * | ||
| * @return {Object} containing the point difference for each seat | ||
| */ | ||
| function jpn_selfdraw_delta(points, fu, winnerWind, riichiSticks) { | ||
| let winds = {}; | ||
| let dealerWind = NewGameUtils.roundToDealerDirection(Number(Session.get("current_round"))); | ||
|
|
||
| let basicPoints; | ||
| let nonDealerPays; | ||
| let dealerPays; | ||
|
|
||
| let currentBonus = Number(Session.get("currentBonus")); | ||
| let individualBonusPayout = Constants.BONUS_POINTS / 3; | ||
|
|
||
| winds[Constants.EAST] = winds[Constants.SOUTH] = winds[Constants.WEST] = winds[Constants.NORTH] = 0; | ||
|
|
||
| // Check to see if you have to count basic points | ||
| if (points < 5) { | ||
| if (points == 1 && (fu == 20 || fu == 25)) { | ||
|
There was a problem hiding this comment. You also need to protect 2 point 25 selfdraw as that combination does not exist. There was a problem hiding this comment. That is prevented in NewGameUtils#noIllegalSelfDraw. This should be removed for issue #27. There was a problem hiding this comment. So will this be removed or augmented with 2p25f? In between makes no sense |
||
| return 0; // Issue Protection | ||
| } else { | ||
| basicPoints = fu * Math.pow(2, 2 + points); | ||
| basicPoints = basicPoints < Constants.JPN_MANGAN_BASE_POINTS ? basicPoints : Constants.JPN_MANGAN_BASE_POINTS; | ||
| } | ||
| } else { basicPoints = manganValue(points); } | ||
|
|
||
| nonDealerPays = Math.ceil(basicPoints / 100 * (dealerWind == winnerWind ? 2 : 1)) * 100; | ||
| dealerPays = Math.ceil(basicPoints / 100 * 2) * 100; | ||
|
|
||
| for (let w in winds) { | ||
| if (winnerWind != dealerWind) { | ||
| if (w == dealerWind) { | ||
| winds[w] = -(dealerPays + currentBonus * individualBonusPayout); | ||
| } else if (w == winnerWind) { | ||
| winds[w] = dealerPays + (nonDealerPays * 2) + (currentBonus * Constants.BONUS_POINTS) + (riichiSticks * Constants.RIICHI_POINTS); | ||
| } else { | ||
| winds[w] = -(nonDealerPays + currentBonus * individualBonusPayout); | ||
| } | ||
| } else { | ||
| if (w == winnerWind) { | ||
| winds[w] = (nonDealerPays * 3) + (currentBonus * Constants.BONUS_POINTS) + (riichiSticks * Constants.RIICHI_POINTS); | ||
| } else { | ||
| winds[w] = -(nonDealerPays + (currentBonus * individualBonusPayout)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| Session.set("free_riichi_sticks", 0); | ||
| return winds; | ||
| }; | ||
|
|
||
| /** | ||
| * Calculates the point difference as the result of a mistaken hand | ||
| * @return {Object} containing the point difference for each seat | ||
| */ | ||
| function jpn_mistake_delta(loser) { | ||
| let winds = {}; | ||
| winds[Constants.EAST] = winds[Constants.SOUTH] = winds[Constants.WEST] = winds[Constants.NORTH] = Constants.MISTAKE_POINTS / 3; | ||
|
|
||
| winds[loser] = -Constants.MISTAKE_POINTS; | ||
|
|
||
| return winds; | ||
| }; | ||
|
|
||
| /** | ||
| * Calculates the total base points from han + dora values for high value hands | ||
| * @returns {Number} representing number of base points as the result of a certain point threshold | ||
| */ | ||
| function manganValue(points) { | ||
| switch(points) { | ||
| case 5: return Constants.JPN_MANGAN_BASE_POINTS; | ||
| case 6: | ||
| case 7: return Constants.JPN_MANGAN_BASE_POINTS * 1.5; | ||
| case 8: | ||
| case 9: | ||
| case 10: return Constants.JPN_MANGAN_BASE_POINTS * 2; | ||
| case 11: | ||
| case 12: return Constants.JPN_MANGAN_BASE_POINTS * 3; | ||
| case 13: return Constants.JPN_MANGAN_BASE_POINTS * 4; | ||
| case 26: return Constants.JPN_MANGAN_BASE_POINTS * 4 * 2; | ||
| case 39: return Constants.JPN_MANGAN_BASE_POINTS * 4 * 3; | ||
| case 52: return Constants.JPN_MANGAN_BASE_POINTS * 4 * 4; | ||
| case 65: return Constants.JPN_MANGAN_BASE_POINTS * 4 * 5; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please specify this is the Japanese chombo amount. The Hong Kong amount is different.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Might as well give the JPN_ prefix to bonus and Riichi too, since that is sort of the convention it seems.