Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add shiny_probability to quest reward structure #267

Merged
merged 3 commits into from
Mar 10, 2025
Merged

Add shiny_probability to quest reward structure #267

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0523dde
Add shiny_probability to quest reward structure
jfberry Mar 4, 2025
6251fc2
Remove extra whitespace
jfberry Mar 4, 2025
8556383
Update interface{} to any in this file
jfberry Mar 4, 2025
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
21 changes: 11 additions & 10 deletions decoder/pokestop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,12 +254,12 @@ func (stop *Pokestop) updatePokestopFromQuestProto(questProto *pogo.FortSearchOu
questTarget := int64(questData.Goal.Target)
questTemplate := strings.ToLower(questData.TemplateId)

conditions := []map[string]interface{}{}
rewards := []map[string]interface{}{}
conditions := []map[string]any{}
rewards := []map[string]any{}

for _, conditionData := range questData.Goal.Condition {
condition := make(map[string]interface{})
infoData := make(map[string]interface{})
condition := make(map[string]any)
infoData := make(map[string]any)
condition["type"] = int(conditionData.Type)
switch conditionData.Type {
case pogo.QuestConditionProto_WITH_BADGE_TYPE:
Expand Down Expand Up @@ -411,8 +411,8 @@ func (stop *Pokestop) updatePokestopFromQuestProto(questProto *pogo.FortSearchOu
}

for _, rewardData := range questData.QuestRewards {
reward := make(map[string]interface{})
infoData := make(map[string]interface{})
reward := make(map[string]any)
infoData := make(map[string]any)
reward["type"] = int(rewardData.Type)
switch rewardData.Type {
case pogo.QuestRewardProto_EXPERIENCE:
Expand All @@ -439,6 +439,7 @@ func (stop *Pokestop) updatePokestopFromQuestProto(questProto *pogo.FortSearchOu
} else {
infoData["pokemon_id"] = int(info.GetPokemonId())
}
infoData["shiny_probability"] = info.ShinyProbability
if display := info.PokemonDisplay; display != nil {
infoData["costume_id"] = int(display.Costume)
infoData["form_id"] = int(display.Form)
Expand Down Expand Up @@ -678,7 +679,7 @@ func createPokestopWebhooks(oldStop *Pokestop, stop *Pokestop) {
areas := MatchStatsGeofence(stop.Lat, stop.Lon)

if stop.AlternativeQuestType.Valid && (oldStop == nil || stop.AlternativeQuestType != oldStop.AlternativeQuestType) {
questHook := map[string]interface{}{
questHook := map[string]any{
"pokestop_id": stop.Id,
"latitude": stop.Lat,
"longitude": stop.Lon,
Expand All @@ -704,7 +705,7 @@ func createPokestopWebhooks(oldStop *Pokestop, stop *Pokestop) {
}

if stop.QuestType.Valid && (oldStop == nil || stop.QuestType != oldStop.QuestType) {
questHook := map[string]interface{}{
questHook := map[string]any{
"pokestop_id": stop.Id,
"latitude": stop.Lat,
"longitude": stop.Lon,
Expand All @@ -729,7 +730,7 @@ func createPokestopWebhooks(oldStop *Pokestop, stop *Pokestop) {
webhooksSender.AddMessage(webhooks.Quest, questHook, areas)
}
if (oldStop == nil && (stop.LureId != 0 || stop.PowerUpEndTimestamp.ValueOrZero() != 0)) || (oldStop != nil && ((stop.LureExpireTimestamp != oldStop.LureExpireTimestamp && stop.LureId != 0) || stop.PowerUpEndTimestamp != oldStop.PowerUpEndTimestamp)) {
pokestopHook := map[string]interface{}{
pokestopHook := map[string]any{
"pokestop_id": stop.Id,
"latitude": stop.Lat,
"longitude": stop.Lon,
Expand All @@ -755,7 +756,7 @@ func createPokestopWebhooks(oldStop *Pokestop, stop *Pokestop) {
"showcase_pokemon_type_id": stop.ShowcasePokemonType,
"showcase_ranking_standard": stop.ShowcaseRankingStandard,
"showcase_expiry": stop.ShowcaseExpiry,
"showcase_rankings": func() interface{} {
"showcase_rankings": func() any {
if !stop.ShowcaseRankings.Valid {
return nil
} else {
Expand Down