Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
164 changes: 82 additions & 82 deletions consts/randomChaoItemList.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,30 @@ var RandomChaoWheelCharacterPrizes = map[string]float64{
// characterID: load
// Hopefully this should sum up to 100 just for
// simplicity, but it shouldn't be a requirement.
enums.CTStrSonic: 0.65, // Initial character - Permanent Pool
enums.CTStrTails: 0.65, // Obtained in story mode - Permanent Pool
enums.CTStrKnuckles: 0.65, // Obtained in story mode - Permanent Pool
// enums.CTStrAmy: 0.65, // Permanent Pool; Purchasable Only
// enums.CTStrBig: 0.65, // Permanent Pool; Purchasable Only
enums.CTStrBlaze: 0.65, // Permanent Pool
// enums.CTStrCharmy: 0.65, // Permanent Pool; Purchasable Only
// enums.CTStrCream: 0.65, // Permanent Pool; Purchasable Only
// enums.CTStrEspio: 0.65, // Permanent Pool; Purchasable Only
enums.CTStrMephiles: 0.65, // Permanent Pool
// enums.CTStrOmega: 0.65, // Permanent Pool; Purchasable Only
enums.CTStrPSISilver: 0.65, // Permanent Pool
// enums.CTStrRouge: 0.65, // Permanent Pool; Purchasable Only
// enums.CTStrShadow: 0.65, // Permanent Pool; Purchasable Only
enums.CTStrMarine: 0.65, // Permanent Pool
enums.CTStrTangle: 0.65, // Permanent Pool
enums.CTStrWhisper: 0.65, // Permanent Pool
enums.CTStrSticks: 0.65, // Permanent Pool
enums.CTStrTikal: 0.65, // Permanent Pool
// enums.CTStrVector: 0.65, // Permanent Pool; Purchasable Only
enums.CTStrWerehog: 0.65, // Permanent Pool
enums.CTStrClassicSonic: 1.5, // Permanent Pool
enums.CTStrMetalSonic: 0.65, // Permanent Pool
// enums.CTStrSilver: 0.65, // Permanent Pool; Purchasable Only
enums.CTStrSonic: 0.71, // Initial character - Permanent Pool
enums.CTStrTails: 0.71, // Obtained in story mode - Permanent Pool
enums.CTStrKnuckles: 0.71, // Obtained in story mode - Permanent Pool
// enums.CTStrAmy: 0.71, // Permanent Pool; Purchasable Only
// enums.CTStrBig: 0.71, // Permanent Pool; Purchasable Only
enums.CTStrBlaze: 0.71, // Permanent Pool
// enums.CTStrCharmy: 0.71, // Permanent Pool; Purchasable Only
// enums.CTStrCream: 0.71, // Permanent Pool; Purchasable Only
// enums.CTStrEspio: 0.71, // Permanent Pool; Purchasable Only
enums.CTStrMephiles: 0.71, // Permanent Pool
// enums.CTStrOmega: 0.71, // Permanent Pool; Purchasable Only
enums.CTStrPSISilver: 0.71, // Permanent Pool
// enums.CTStrRouge: 0.71, // Permanent Pool; Purchasable Only
// enums.CTStrShadow: 0.71, // Permanent Pool; Purchasable Only
enums.CTStrMarine: 0.71, // Permanent Pool
enums.CTStrTangle: 0.71, // Permanent Pool
enums.CTStrWhisper: 0.71, // Permanent Pool
enums.CTStrSticks: 0.71, // Permanent Pool
enums.CTStrTikal: 0.71, // Permanent Pool
// enums.CTStrVector: 0.71, // Permanent Pool; Purchasable Only
enums.CTStrWerehog: 0.71, // Permanent Pool
enums.CTStrClassicSonic: 0.71, // Permanent Pool
enums.CTStrMetalSonic: 0.71, // Permanent Pool
// enums.CTStrSilver: 0.71, // Permanent Pool; Purchasable Only

// enums.CTStrAmitieAmy: 1.81, // Event (Puyo Puyo Quest)
// enums.CTStrGothicAmy: 1.81, // Revival Event
Expand Down Expand Up @@ -70,90 +70,90 @@ var RandomChaoWheelChaoPrizes = map[string]float64{
enums.ChaoIDStrRCPiggyBank: 2.13, // Permanent Pool
enums.ChaoIDStrRCBalloon: 2.13, // Permanent Pool
enums.ChaoIDStrEasterChao: 2.13, // Event (Easter; Increase Odds During Event) - Permanent Pool
enums.ChaoIDStrEasterBunny: 0.21, // Event (Easter; Increase Odds During Event) - Permanent Pool
enums.ChaoIDStrEasterBunny: 1.03, // Event (Easter; Increase Odds During Event) - Permanent Pool
//enums.ChaoIDStrMerlina: 1.5, // Event (Easter: Premium Roulette for Timed Mode Event Only; Obtainable through Rewards List Only for Story Event)
// enums.ChaoIDStrPurplePapurisu: 6.8, // Event (Puyo Puyo Quest)
//enums.ChaoIDStrSuketoudara: 2.5, // Event (Puyo Puyo Quest)
//enums.ChaoIDStrCarbuncle: 3.67, // Event (Puyo Puyo Quest: Premium Roulette for Timed Mode Event Only; Obtainable through Rewards List Only for Story Event)
enums.ChaoIDStrEggChao: 0.21, // Permanent Pool
enums.ChaoIDStrPumpkinChao: 0.21, // Permanent Pool
enums.ChaoIDStrSkullChao: 0.21, // Permanent Pool
enums.ChaoIDStrYacker: 0.21, // Permanent Pool
enums.ChaoIDStrRCGoldenPiggyBank: 0.21, // Permanent Pool
enums.ChaoIDStrWizardChao: 0.21, // Permanent Pool
enums.ChaoIDStrRCTurtle: 0.21, // Permanent Pool
enums.ChaoIDStrRCUFO: 0.21, // Permanent Pool
enums.ChaoIDStrRCBomber: 0.21, // Permanent Pool
enums.ChaoIDStrStarShapedMissile: 0.21, // Event (Zazz Raid Boss; Increase Odds During Event) - Permanent Pool
enums.ChaoIDStrRCSatellite: 0.21, // Event (Zazz Raid Boss; Increase Odds During Event) - Permanent Pool
enums.ChaoIDStrEggChao: 1.03, // Permanent Pool
enums.ChaoIDStrPumpkinChao: 1.03, // Permanent Pool
enums.ChaoIDStrSkullChao: 1.03, // Permanent Pool
enums.ChaoIDStrYacker: 1.03, // Permanent Pool
enums.ChaoIDStrRCGoldenPiggyBank: 1.03, // Permanent Pool
enums.ChaoIDStrWizardChao: 1.03, // Permanent Pool
enums.ChaoIDStrRCTurtle: 1.03, // Permanent Pool
enums.ChaoIDStrRCUFO: 1.03, // Permanent Pool
enums.ChaoIDStrRCBomber: 1.03, // Permanent Pool
enums.ChaoIDStrStarShapedMissile: 1.03, // Event (Zazz Raid Boss; Increase Odds During Event) - Permanent Pool
enums.ChaoIDStrRCSatellite: 1.03, // Event (Zazz Raid Boss; Increase Odds During Event) - Permanent Pool
// enums.ChaoIDStrRCMoonMech: 3.67, // Event (Zazz Raid Boss; Only Obtainable through the Raid Boss Roulette, which is currently unavailable)
// enums.ChaoIDStrRappy: 4.25, // Event (Phantasy Star Online 2)
// enums.ChaoIDStrKuna: 3.67, // Event (Phantasy Star Online 2)
// enums.ChaoIDStrMagLv1: 6.18, // Event (Phantasy Star Online 2)
enums.ChaoIDStrBlowfishTransporter: 0.21, // Event (Tropical Coast; Increase Odds During Event) - Permanent Pool
enums.ChaoIDStrBlowfishTransporter: 1.03, // Event (Tropical Coast; Increase Odds During Event) - Permanent Pool
//enums.ChaoIDStrMotherWisp: 1.2, // Event (Tropical Coast: Premium Roulette for Timed Mode Event Only; Obtainable through Rewards List Only for Story Event)
enums.ChaoIDStrMarineChao: 0.21, // Event (Tropical Coast; Increase Odds During Event) - Permanent Pool
enums.ChaoIDStrMarineChao: 1.03, // Event (Tropical Coast; Increase Odds During Event) - Permanent Pool
//enums.ChaoIDStrGenesis: 1.5, // Event (Birthday: Premium Roulette for Timed Mode Event Only; Obtainable through Rewards List Only for Story Event)
enums.ChaoIDStrCartridge: 3.4, // Event (Birthday; Increase Odds During Event) - Permanent Pool
enums.ChaoIDStrDeathEgg: 2.2, // Event (Birthday; Increase Odds During Event) - Permanent Pool
enums.ChaoIDStrRCFighter: 0.21, // Permanent Pool
enums.ChaoIDStrRCHovercraft: 0.21, // Permanent Pool
enums.ChaoIDStrRCHelicopter: 0.21, // Permanent Pool
enums.ChaoIDStrGreenCrystalMonsterS: 0.21, // Permanent Pool
enums.ChaoIDStrGreenCrystalMonsterL: 0.21, // Permanent Pool
enums.ChaoIDStrRCAirship: 0.21, // Permanent Pool
enums.ChaoIDStrMagicLamp: 0.21, // Event (Desert Ruins and Animal Rescue 2.0; Increase Odds During Event) - Permanent Pool
enums.ChaoIDStrDesertChao: 0.21, // Event (Desert Ruins; Increase Odds During Event) - Permanent Pool
enums.ChaoIDStrCartridge: 1.03, // Event (Birthday; Increase Odds During Event) - Permanent Pool
enums.ChaoIDStrDeathEgg: 1.22, // Event (Birthday; Increase Odds During Event) - Permanent Pool
enums.ChaoIDStrRCFighter: 1.03, // Permanent Pool
enums.ChaoIDStrRCHovercraft: 1.03, // Permanent Pool
enums.ChaoIDStrRCHelicopter: 1.03, // Permanent Pool
enums.ChaoIDStrGreenCrystalMonsterS: 1.03, // Permanent Pool
enums.ChaoIDStrGreenCrystalMonsterL: 1.03, // Permanent Pool
enums.ChaoIDStrRCAirship: 1.03, // Permanent Pool
enums.ChaoIDStrMagicLamp: 1.03, // Event (Desert Ruins and Animal Rescue 2.0; Increase Odds During Event) - Permanent Pool
enums.ChaoIDStrDesertChao: 1.03, // Event (Desert Ruins; Increase Odds During Event) - Permanent Pool
// enums.ChaoIDStrErazorDjinn: 4.0, // Event (Desert Ruins: Premium Roulette for Timed Mode Event Only; Obtainable through Rewards List Only for Story Event)
// enums.ChaoIDStrNightopian: 4.25, // Event (NiGHTS)
// enums.ChaoIDStrNiGHTS: 3.67, // Event (NiGHTS)
// enums.ChaoIDStrReala: 3.67, // Event (NiGHTS)
enums.ChaoIDStrSonicOmochao: 0.21, // Event (Team Sonic Omochao) - Permanent Pool
enums.ChaoIDStrTailsOmochao: 0.21, // Event (Team Sonic Omochao) - Permanent Pool
enums.ChaoIDStrKnucklesOmochao: 0.21, // Event (Team Sonic Omochao) - Permanent Pool
enums.ChaoIDStrSonicOmochao: 1.03, // Event (Team Sonic Omochao) - Permanent Pool
enums.ChaoIDStrTailsOmochao: 1.03, // Event (Team Sonic Omochao) - Permanent Pool
enums.ChaoIDStrKnucklesOmochao: 1.03, // Event (Team Sonic Omochao) - Permanent Pool
//enums.ChaoIDStrKingBoomBoo: 1.5, // Event (Halloween: Premium Roulette for Timed Mode Event Only; Obtainable through Rewards List Only for Story Event)
enums.ChaoIDStrBoo: 0.21, // Event (Halloween; Increase Odds During Event) - Permanent Pool
enums.ChaoIDStrHalloweenChao: 0.21, // Event (Halloween; Increase Odds During Event) - Permanent Pool
enums.ChaoIDStrBoo: 1.03, // Event (Halloween; Increase Odds During Event) - Permanent Pool
enums.ChaoIDStrHalloweenChao: 1.03, // Event (Halloween; Increase Odds During Event) - Permanent Pool
// enums.ChaoIDStrHeavyBomb: 4.25, // Event (Fantasy Zone)
// enums.ChaoIDStrOPapa: 3.4, // Event (Fantasy Zone)
// enums.ChaoIDStrOpaOpa: 3.67, // Event (Fantasy Zone)
enums.ChaoIDStrBlockBomb: 0.21, // Permanent Pool
enums.ChaoIDStrHunkofMeat: 0.21, // Permanent Pool
enums.ChaoIDStrBlockBomb: 1.03, // Permanent Pool
enums.ChaoIDStrHunkofMeat: 1.03, // Permanent Pool
// enums.ChaoIDStrYeti: 3.58, // Event (Christmas)
// enums.ChaoIDStrSnowChao: 3.58, // Event (Christmas)
// enums.ChaoIDStrChristmasYeti: 1.5, // Event (Christmas)
// enums.ChaoIDStrChristmasNiGHTS: 4.0, // Event (Christmas NiGHTS)
// enums.ChaoIDStrIdeya: 3.58, // Event (Christmas NiGHTS)
// enums.ChaoIDStrChristmasNightopian: 3.58, // Event (Christmas NiGHTS)
enums.ChaoIDStrOrbot: 0.21, // Permanent Pool
enums.ChaoIDStrCubot: 0.21, // Permanent Pool
enums.ChaoIDStrLightChaos: 1.16, // Permanent Pool
enums.ChaoIDStrHeroChaos: 1.16, // Permanent Pool
enums.ChaoIDStrDarkChaos: 1.16, // Permanent Pool
enums.ChaoIDStrChip: 1.16, // Permanent Pool
enums.ChaoIDStrOrbot: 1.03, // Permanent Pool
enums.ChaoIDStrCubot: 1.03, // Permanent Pool
enums.ChaoIDStrLightChaos: 1.22, // Permanent Pool
enums.ChaoIDStrHeroChaos: 1.22, // Permanent Pool
enums.ChaoIDStrDarkChaos: 1.22, // Permanent Pool
enums.ChaoIDStrChip: 1.22, // Permanent Pool
// enums.ChaoIDStrShahra: 4.0, // Runners' League Story Mode
enums.ChaoIDStrCaliburn: 1.16, // Permanent Pool
enums.ChaoIDStrKingArthursGhost: 1.16, // Permanent Pool
enums.ChaoIDStrRCTornado: 1.16, // Permanent Pool
enums.ChaoIDStrRCBattleCruiser: 1.16, // Permanent Pool
enums.ChaoIDStrRedCrystalMonsterS: 1.16, // Permanent Pool
enums.ChaoIDStrRedCrystalMonsterL: 1.16, // Permanent Pool
enums.ChaoIDStrGoldenGoose: 1.16, // Permanent Pool
enums.ChaoIDStrRCPirateSpaceship: 1.16, // Permanent Pool
enums.ChaoIDStrGoldenAngel: 1.16, // Permanent Pool
enums.ChaoIDStrRCTornado2: 1.16, // Event (Sonic Adventure; Increase Odds During Event) - Permanent Pool
enums.ChaoIDStrChaos: 1.16, // Event (Sonic Adventure; Increase Odds During Event) - Permanent Pool
enums.ChaoIDStrOrca: 0.21, // Event (Sonic Adventure; Increase Odds During Event) - Permanent Pool
enums.ChaoIDStrCaliburn: 1.22, // Permanent Pool
enums.ChaoIDStrKingArthursGhost: 1.22, // Permanent Pool
enums.ChaoIDStrRCTornado: 1.22, // Permanent Pool
enums.ChaoIDStrRCBattleCruiser: 1.22, // Permanent Pool
enums.ChaoIDStrRedCrystalMonsterS: 1.22, // Permanent Pool
enums.ChaoIDStrRedCrystalMonsterL: 1.22, // Permanent Pool
enums.ChaoIDStrGoldenGoose: 1.22, // Permanent Pool
enums.ChaoIDStrRCPirateSpaceship: 1.22, // Permanent Pool
enums.ChaoIDStrGoldenAngel: 1.22, // Permanent Pool
enums.ChaoIDStrRCTornado2: 1.22, // Event (Sonic Adventure; Increase Odds During Event) - Permanent Pool
enums.ChaoIDStrChaos: 1.22, // Event (Sonic Adventure; Increase Odds During Event) - Permanent Pool
enums.ChaoIDStrOrca: 1.03, // Event (Sonic Adventure; Increase Odds During Event) - Permanent Pool
//enums.ChaoIDStrChaoWalker: 0.0, // Daily Battle
// enums.ChaoIDStrDarkQueen: 3.67, // Runners' League Timed Mode
enums.ChaoIDStrRCBlockFace: 1.16, // Permanent Pool
enums.ChaoIDStrRCBlockFace: 1.22, // Permanent Pool
//enums.ChaoIDStrDFekt: 0.0, // Revival Event (assets TBD)
enums.ChaoIDStrDarkChaoWalker: 1.16, // Permanent Pool
enums.ChaoIDStrPrideChaoL: 3.4, // Revival Event (Pride Month Celebration)
enums.ChaoIDStrPrideChaoG: 3.4, // Revival Event (Pride Month Celebration)
enums.ChaoIDStrPrideChaoB: 3.4, // Revival Event (Pride Month Celebration)
enums.ChaoIDStrPrideChaoT: 3.4, // Revival Event (Pride Month Celebration)
enums.ChaoIDStrPrideChaoP: 3.4, // Revival Event (Pride Month Celebration)
enums.ChaoIDStrPrideChaoA: 3.4, // Revival Event (Pride Month Celebration)
enums.ChaoIDStrPrideChaoNB: 3.4, // Revival Event (Pride Month Celebration)
enums.ChaoIDStrDarkChaoWalker: 1.22, // Permanent Pool
// enums.ChaoIDStrPrideChaoL: 3.4, // Revival Event (Pride Month Celebration)
// enums.ChaoIDStrPrideChaoG: 3.4, // Revival Event (Pride Month Celebration)
// enums.ChaoIDStrPrideChaoB: 3.4, // Revival Event (Pride Month Celebration)
// enums.ChaoIDStrPrideChaoT: 3.4, // Revival Event (Pride Month Celebration)
// enums.ChaoIDStrPrideChaoP: 3.4, // Revival Event (Pride Month Celebration)
// enums.ChaoIDStrPrideChaoA: 3.4, // Revival Event (Pride Month Celebration)
// enums.ChaoIDStrPrideChaoNB: 3.4, // Revival Event (Pride Month Celebration)
}
2 changes: 1 addition & 1 deletion obj/constobjs/defaultEventRewardList.go
Original file line number Diff line number Diff line change
Expand Up @@ -2189,7 +2189,7 @@ var DefaultAnimalEventRewardList = func() []obj.EventReward {


func GetPendingEventRewards(oldParam, newParam int64) ([]obj.EventReward, int64) {
rewards := DefaultBirthdayEventRewardList()
rewards := DefaultEventRewardList()
pendingRewards := []obj.EventReward{}
oldParamRewardId := int64(8008135)
highestRewardIdSoFar := int64(-1)
Expand Down
2 changes: 1 addition & 1 deletion responses/event.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func DefaultEventRewardList(base responseobjs.BaseInfo) EventRewardListResponse
// TODO: Maybe *don't* hardcode this mess? We'd have to recompile Outrun to change rewards.
return EventRewardList(
base,
constobjs.DefaultBirthdayEventRewardList(),
constobjs.DefaultEventRewardList(),
)
}

Expand Down