Skip to content

Add X & Y Friend Safari Data#1489

Open
ItsMeJoji wants to merge 1 commit intoPokeAPI:masterfrom
ItsMeJoji:xy-friend-safari
Open

Add X & Y Friend Safari Data#1489
ItsMeJoji wants to merge 1 commit intoPokeAPI:masterfrom
ItsMeJoji:xy-friend-safari

Conversation

@ItsMeJoji
Copy link
Copy Markdown
Contributor

Change description

This PR contains the missing X & Y Friend Safari information. Because of the nature of encounters in these Type-based Safari, Encounter Conditions were added to these entries. For example, For a Normal Friend Safari, there are 4 possible encounters for the 1st Encounter Slot. The game randomly sets one of them at a 25% chance. So each Encounter has been given a 33.3% Encounter chance with an Encounter Condition Value of Randomly assigned to Friend Safari Slot 1 at a 25% chance. The same was done for Slots 2 and 3 of each Friend Safari type.

AI coding assistance disclosure

AI was used in the auto-completion of repetitive data (such as X Data being replicated for Y Data in encounters.csv and encounter_condition_value_map.csv

Contributor check list

  • I have written a description of the contribution and explained its motivation.
  • I have written tests for my code changes (if applicable).
  • I have read and understood the AI Assisted Contribution guidelines.
  • I will own this change in production, and I am prepared to fix any bugs caused by my code change.

14,9,Special encounter
15,9,Trade a specific Pokemon to an NPC
16,9,Redeem Coins for a Pokemon at the Prize Corner or Game Corner
17,9,Friend Safari Slot assignment at a 25% chance
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not all are a 25% chance - they are just equally probable. (Like for the dragon type safari: https://www.serebii.net/xy/friendsafari.shtml)

Comment on lines -18217 to +18226
71344,169
71345,170
71346,171
71347,169
71348,170
71349,171
71350,172
71351,173
71352,174
71353,175
71354,176
71355,176
71356,176
71357,176
71358,177
71359,177
71360,177
71361,177
71362,178
71363,178
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like some encounter conditions were removed - was this intentional?

Comment on lines +1205 to +1222
1322,680,0,normal-type-safari
1323,680,0,fire-type-safari
1324,680,0,fighting-type-safari
1325,680,0,water-type-safari
1326,680,0,flying-type-safari
1327,680,0,grass-type-safari
1328,680,0,poison-type-safari
1329,680,0,electric-type-safari
1330,680,0,ground-type-safari
1331,680,0,psychic-type-safari
1332,680,0,rock-type-safari
1333,680,0,ice-type-safari
1334,680,0,bug-type-safari
1335,680,0,dragon-type-safari
1336,680,0,ghost-type-safari
1337,680,0,dark-type-safari
1338,680,0,steel-type-safari
1339,680,0,fairy-type-safari No newline at end of file
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since these are suffixes to the location named friend-safari I think the IDs here can be something like normal or normal-type. That way we'd get something like friend-safari-normal or friend-safari-normal-type in the end.

Comment on lines +2355 to +2372
1322,9,Normal-type Safari
1323,9,Fire-type Safari
1324,9,Fighting-type Safari
1325,9,Water-type Safari
1326,9,Flying-type Safari
1327,9,Grass-type Safari
1328,9,Poison-type Safari
1329,9,Electric-type Safari
1330,9,Ground-type Safari
1331,9,Psychic-type Safari
1332,9,Rock-type Safari
1333,9,Ice-type Safari
1334,9,Bug-type Safari
1335,9,Dragon-type Safari
1336,9,Ghost-type Safari
1337,9,Dark-type Safari
1338,9,Steel-type Safari
1339,9,Fairy-type Safari No newline at end of file
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To follow convention with the location area prose being the location name followed by the qualifier, maybe something like "Friend Safari (Normal)" or "Friend Safari (Normal-type)"?

14,special-encounter
15,trade
16,coins
17,friend-safari No newline at end of file
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
17,friend-safari
17,friend-safari-slot

The slot itself is more of a concern, so maybe this would be more accurate

Comment on lines +299 to +301
176,9,Randomly assigned to Friend Safari Slot 1 at a 25% chance
177,9,Randomly assigned to Friend Safari Slot 2 at a 25% chance
178,9,Randomly assigned to Friend Safari Slot 3 at a 25% chance No newline at end of file
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similar comment as before – not necessarily a 25% chance if there are less than four pokemon in this slot.

Comment on lines +55 to +57
54,friend-safari-slot-1,54
55,friend-safari-slot-2,55
56,friend-safari-slot-3,56 No newline at end of file
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We already have encounter conditions that take care of this detail - the encounter method can simply be the usual one for walking in tall grass. (If I recall, all encounters in the safari are in tall grass.)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants