volleyballsimtypes 0.0.380 → 0.0.383

package/dist/cjs/src/data/models/gacha-pity.js

@@ -15,17 +15,17 @@ class GachaPityModel extends sequelize_1.Model {
                 }
             },
             legendary_pity: {
-                type: sequelize_1.DataTypes.FLOAT,
+                type: sequelize_1.DataTypes.INTEGER,
                 allowNull: false,
                 defaultValue: 0
             },
             mythic_pity: {
-                type: sequelize_1.DataTypes.FLOAT,
+                type: sequelize_1.DataTypes.INTEGER,
                 allowNull: false,
                 defaultValue: 0
             },
             special_pity: {
-                type: sequelize_1.DataTypes.FLOAT,
+                type: sequelize_1.DataTypes.INTEGER,
                 allowNull: false,
                 defaultValue: 0
             }

package/dist/cjs/src/service/player/player-generator.d.ts

@@ -2,6 +2,11 @@ import { Rarity } from './rarity';
 import { Role } from './role';
 import { Country } from '../country';
 import { Player } from './player';
+export declare const PITY_THRESHOLDS: {
+    legendary: number;
+    mythic: number;
+    special: number;
+};
 export interface PityState {
     legendaryPity: number;
     mythicPity: number;

package/dist/cjs/src/service/player/player-generator.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PlayerGenerator = exports.TOURNAMENT_PULL_CONFIG = exports.QUALIFIER_PULL_CONFIG = exports.NORMAL_PULL_CONFIG = void 0;
+exports.PlayerGenerator = exports.TOURNAMENT_PULL_CONFIG = exports.QUALIFIER_PULL_CONFIG = exports.NORMAL_PULL_CONFIG = exports.PITY_THRESHOLDS = void 0;
 exports.rollRarity = rollRarity;
 exports.pickPlayerCountry = pickPlayerCountry;
 const uuid_1 = require("uuid");
@@ -14,9 +14,14 @@ const utils_1 = require("../utils");
 const player_1 = require("./player");
 const trait_1 = require("./trait");
 const decline_1 = require("./decline");
-const LEGENDARY_PITY_STEP = 0.004;
-const MYTHIC_PITY_STEP = 0.00001;
-const SPECIAL_PITY_STEP = 0.000005;
+// Hard pity: each rarity's counter is the number of pulls since its last hit. Odds ramp linearly from
+// the base rate to 1 (a guaranteed drop) as the counter climbs from 0 to its threshold, so the
+// guarantee falls out for free once the counter reaches the threshold.
+exports.PITY_THRESHOLDS = {
+    legendary: 25,
+    mythic: 200,
+    special: 575
+};
 // Used for world/bot player generation — full rarity range
 const WORLD_PULL_CONFIG = {
     special: 0.0003,
@@ -69,11 +74,20 @@ exports.TOURNAMENT_PULL_CONFIG = {
     accumulateMythicPity: true,
     accumulateSpecialPity: true
 };
+// Effective odds for a rarity: the base rate ramped linearly toward 1 (a guaranteed drop) as the
+// integer pity counter climbs from 0 to its threshold. At count 0 it equals the base rate; at
+// count === threshold it is 1, so the rarity is guaranteed. Returns the base rate unchanged when
+// pity is not applied for this pull type.
+function effectiveOdds(base, count, threshold, apply) {
+    if (!apply)
+        return base;
+    return Math.min(1, base + (count / threshold) * (1 - base));
+}
 function rollRarity(pity, config = WORLD_PULL_CONFIG) {
     const roll = Math.random();
-    const tSpecial = config.special + (config.applySpecialPity ? pity.specialPity : 0);
-    const tMythic = tSpecial + config.mythic + (config.applyMythicPity ? pity.mythicPity : 0);
-    const tLegendary = tMythic + config.legendary + (config.applyLegendaryPity ? pity.legendaryPity : 0);
+    const tSpecial = effectiveOdds(config.special, pity.specialPity, exports.PITY_THRESHOLDS.special, config.applySpecialPity);
+    const tMythic = tSpecial + effectiveOdds(config.mythic, pity.mythicPity, exports.PITY_THRESHOLDS.mythic, config.applyMythicPity);
+    const tLegendary = tMythic + effectiveOdds(config.legendary, pity.legendaryPity, exports.PITY_THRESHOLDS.legendary, config.applyLegendaryPity);
     const tRare = tLegendary + config.rare;
     let rarity;
     if (roll < tSpecial) {
@@ -93,16 +107,17 @@ function rollRarity(pity, config = WORLD_PULL_CONFIG) {
     }
     const hitLegendaryPlus = rarity === rarity_1.RarityEnum.LEGENDARY || rarity === rarity_1.RarityEnum.MYTHIC || rarity === rarity_1.RarityEnum.SPECIAL;
     const hitMythicPlus = rarity === rarity_1.RarityEnum.MYTHIC || rarity === rarity_1.RarityEnum.SPECIAL;
+    // Integer counters: reset to 0 on a hit of that rarity-or-better, otherwise +1.
     const updatedPity = {
         legendaryPity: !config.accumulateLegendaryPity
             ? pity.legendaryPity
-            : hitLegendaryPlus ? 0 : pity.legendaryPity + LEGENDARY_PITY_STEP,
+            : hitLegendaryPlus ? 0 : pity.legendaryPity + 1,
         mythicPity: !config.accumulateMythicPity
             ? pity.mythicPity
-            : hitMythicPlus ? 0 : pity.mythicPity + MYTHIC_PITY_STEP,
+            : hitMythicPlus ? 0 : pity.mythicPity + 1,
         specialPity: !config.accumulateSpecialPity
             ? pity.specialPity
-            : rarity === rarity_1.RarityEnum.SPECIAL ? 0 : pity.specialPity + SPECIAL_PITY_STEP
+            : rarity === rarity_1.RarityEnum.SPECIAL ? 0 : pity.specialPity + 1
     };
     return { rarity, pity: updatedPity };
 }

package/dist/esm/src/data/models/gacha-pity.js

@@ -12,17 +12,17 @@ export class GachaPityModel extends Model {
                 }
             },
             legendary_pity: {
-                type: DataTypes.FLOAT,
+                type: DataTypes.INTEGER,
                 allowNull: false,
                 defaultValue: 0
             },
             mythic_pity: {
-                type: DataTypes.FLOAT,
+                type: DataTypes.INTEGER,
                 allowNull: false,
                 defaultValue: 0
             },
             special_pity: {
-                type: DataTypes.FLOAT,
+                type: DataTypes.INTEGER,
                 allowNull: false,
                 defaultValue: 0
             }

package/dist/esm/src/service/player/player-generator.d.ts

@@ -2,6 +2,11 @@ import { Rarity } from './rarity';
 import { Role } from './role';
 import { Country } from '../country';
 import { Player } from './player';
+export declare const PITY_THRESHOLDS: {
+    legendary: number;
+    mythic: number;
+    special: number;
+};
 export interface PityState {
     legendaryPity: number;
     mythicPity: number;

package/dist/esm/src/service/player/player-generator.js

@@ -9,9 +9,14 @@ import { shuffle, generatePlayerName } from '../utils';
 import { Player } from './player';
 import { assignTraits } from './trait';
 import { declineProfiles } from './decline';
-const LEGENDARY_PITY_STEP = 0.004;
-const MYTHIC_PITY_STEP = 0.00001;
-const SPECIAL_PITY_STEP = 0.000005;
+// Hard pity: each rarity's counter is the number of pulls since its last hit. Odds ramp linearly from
+// the base rate to 1 (a guaranteed drop) as the counter climbs from 0 to its threshold, so the
+// guarantee falls out for free once the counter reaches the threshold.
+export const PITY_THRESHOLDS = {
+    legendary: 25,
+    mythic: 200,
+    special: 575
+};
 // Used for world/bot player generation — full rarity range
 const WORLD_PULL_CONFIG = {
     special: 0.0003,
@@ -64,11 +69,20 @@ export const TOURNAMENT_PULL_CONFIG = {
     accumulateMythicPity: true,
     accumulateSpecialPity: true
 };
+// Effective odds for a rarity: the base rate ramped linearly toward 1 (a guaranteed drop) as the
+// integer pity counter climbs from 0 to its threshold. At count 0 it equals the base rate; at
+// count === threshold it is 1, so the rarity is guaranteed. Returns the base rate unchanged when
+// pity is not applied for this pull type.
+function effectiveOdds(base, count, threshold, apply) {
+    if (!apply)
+        return base;
+    return Math.min(1, base + (count / threshold) * (1 - base));
+}
 export function rollRarity(pity, config = WORLD_PULL_CONFIG) {
     const roll = Math.random();
-    const tSpecial = config.special + (config.applySpecialPity ? pity.specialPity : 0);
-    const tMythic = tSpecial + config.mythic + (config.applyMythicPity ? pity.mythicPity : 0);
-    const tLegendary = tMythic + config.legendary + (config.applyLegendaryPity ? pity.legendaryPity : 0);
+    const tSpecial = effectiveOdds(config.special, pity.specialPity, PITY_THRESHOLDS.special, config.applySpecialPity);
+    const tMythic = tSpecial + effectiveOdds(config.mythic, pity.mythicPity, PITY_THRESHOLDS.mythic, config.applyMythicPity);
+    const tLegendary = tMythic + effectiveOdds(config.legendary, pity.legendaryPity, PITY_THRESHOLDS.legendary, config.applyLegendaryPity);
     const tRare = tLegendary + config.rare;
     let rarity;
     if (roll < tSpecial) {
@@ -88,16 +102,17 @@ export function rollRarity(pity, config = WORLD_PULL_CONFIG) {
     }
     const hitLegendaryPlus = rarity === RarityEnum.LEGENDARY || rarity === RarityEnum.MYTHIC || rarity === RarityEnum.SPECIAL;
     const hitMythicPlus = rarity === RarityEnum.MYTHIC || rarity === RarityEnum.SPECIAL;
+    // Integer counters: reset to 0 on a hit of that rarity-or-better, otherwise +1.
     const updatedPity = {
         legendaryPity: !config.accumulateLegendaryPity
             ? pity.legendaryPity
-            : hitLegendaryPlus ? 0 : pity.legendaryPity + LEGENDARY_PITY_STEP,
+            : hitLegendaryPlus ? 0 : pity.legendaryPity + 1,
         mythicPity: !config.accumulateMythicPity
             ? pity.mythicPity
-            : hitMythicPlus ? 0 : pity.mythicPity + MYTHIC_PITY_STEP,
+            : hitMythicPlus ? 0 : pity.mythicPity + 1,
         specialPity: !config.accumulateSpecialPity
             ? pity.specialPity
-            : rarity === RarityEnum.SPECIAL ? 0 : pity.specialPity + SPECIAL_PITY_STEP
+            : rarity === RarityEnum.SPECIAL ? 0 : pity.specialPity + 1
     };
     return { rarity, pity: updatedPity };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "volleyballsimtypes",
-  "version": "0.0.380",
+  "version": "0.0.383",
   "description": "vbsim types",
   "main": "./dist/cjs/src/index.js",
   "module": "./dist/esm/src/index.js",