mirror of
https://github.com/veekun/pokedex.git
synced 2024-08-20 18:16:34 +00:00
Store each Pokémon's initial hatch counter instead of a step count.
The step counts we had weren't even good estimates. To hatch an egg uninterrupted takes (counter + 1) * 255 steps in gen IV; what we had was counter * 256. Phione and Manaphy have different counters, as do Croagunk and Toxicroak for some reason, so they're associated with individual Pokémon now, rather than entire evolution chains. Double-checked with Pearl, Platinum, and SoulSilver; there were no differences between the three, aside from the alternate forms introduced in Platinum.
This commit is contained in:
parent
5cd4fe7f2c
commit
276098b655
3 changed files with 755 additions and 755 deletions
|
@ -1,248 +1,248 @@
|
|||
id,growth_rate_id,steps_to_hatch,baby_trigger_item
|
||||
1,4,5120,
|
||||
2,4,5120,
|
||||
3,4,5120,
|
||||
4,2,3840,
|
||||
5,2,3840,
|
||||
6,4,3840,
|
||||
7,2,3840,
|
||||
8,2,3840,
|
||||
9,2,5120,
|
||||
10,2,2560,
|
||||
11,2,5120,
|
||||
12,4,5120,
|
||||
13,4,5120,
|
||||
14,3,2560,
|
||||
15,2,5120,
|
||||
16,3,2560,
|
||||
17,2,3840,
|
||||
18,4,5120,
|
||||
19,2,5120,
|
||||
20,2,5120,
|
||||
21,2,5120,
|
||||
22,2,5120,
|
||||
23,2,5120,
|
||||
24,2,5120,
|
||||
25,1,5120,
|
||||
26,4,5120,
|
||||
27,4,5120,
|
||||
28,4,5120,
|
||||
29,4,5120,
|
||||
30,1,5120,
|
||||
31,4,3840,
|
||||
32,2,5120,
|
||||
33,2,5120,
|
||||
34,2,5120,
|
||||
35,2,5120,
|
||||
36,2,5120,
|
||||
37,2,5120,
|
||||
38,2,5120,
|
||||
39,1,5120,
|
||||
40,4,5120,
|
||||
41,2,6400,
|
||||
42,2,5120,
|
||||
43,2,5120,
|
||||
44,2,5120,
|
||||
45,1,5120,
|
||||
46,2,5120,
|
||||
47,2,6400,
|
||||
48,2,5120,
|
||||
49,2,5120,
|
||||
50,1,5120,
|
||||
51,3,10240,Luck Incense
|
||||
52,2,5120,
|
||||
53,2,5120,
|
||||
54,2,5120,
|
||||
55,2,5120,
|
||||
56,1,5120,
|
||||
57,2,6400,Odd Incense
|
||||
58,2,6400,
|
||||
59,2,6400,
|
||||
60,2,6400,
|
||||
61,2,6400,
|
||||
62,1,6400,
|
||||
63,1,5120,
|
||||
64,1,1280,
|
||||
65,1,10240,
|
||||
66,2,5120,
|
||||
67,2,8960,
|
||||
68,2,5120,
|
||||
69,2,7680,
|
||||
70,2,7680,
|
||||
71,1,8960,
|
||||
72,1,10240,Full Incense
|
||||
73,1,20480,
|
||||
74,1,20480,
|
||||
75,1,20480,
|
||||
76,1,10240,
|
||||
77,1,30720,
|
||||
78,4,30720,
|
||||
79,4,5120,
|
||||
80,4,5120,
|
||||
81,4,5120,
|
||||
82,2,3840,
|
||||
83,2,3840,
|
||||
84,3,3840,
|
||||
85,3,3840,
|
||||
86,1,5120,
|
||||
87,3,2560,
|
||||
88,2,5120,
|
||||
89,4,5120,
|
||||
90,3,2560,Sea Incense
|
||||
91,2,5120,Rock Incense
|
||||
92,4,5120,
|
||||
93,3,5120,
|
||||
94,4,5120,
|
||||
95,2,5120,
|
||||
96,2,5120,
|
||||
97,4,5120,
|
||||
98,3,6400,
|
||||
99,2,10240,
|
||||
100,2,5120,Lax Incense
|
||||
101,2,5120,
|
||||
102,2,5120,
|
||||
103,2,5120,
|
||||
104,4,5120,
|
||||
105,3,5120,
|
||||
106,2,5120,
|
||||
107,4,5120,
|
||||
108,1,6400,
|
||||
109,4,5120,
|
||||
110,2,5120,
|
||||
111,2,5120,
|
||||
112,1,5120,
|
||||
113,3,5120,
|
||||
114,2,5120,
|
||||
115,3,5120,
|
||||
116,1,6400,Wave Incense
|
||||
117,1,6400,
|
||||
118,1,5120,
|
||||
119,2,5120,
|
||||
120,1,5120,
|
||||
121,3,5120,
|
||||
122,1,5120,
|
||||
123,1,20480,
|
||||
124,1,20480,
|
||||
125,1,20480,
|
||||
126,1,10240,
|
||||
127,1,30720,
|
||||
128,1,30720,
|
||||
129,4,30720,
|
||||
130,4,5120,
|
||||
131,4,5120,
|
||||
132,4,5120,
|
||||
133,2,3840,
|
||||
134,2,3840,
|
||||
135,2,3840,
|
||||
136,4,3840,
|
||||
137,4,3840,
|
||||
138,4,3840,
|
||||
139,2,5120,
|
||||
140,1,5120,
|
||||
141,2,3840,
|
||||
142,6,3840,
|
||||
143,1,3840,
|
||||
144,5,3840,
|
||||
145,4,5120,
|
||||
146,6,5120,
|
||||
147,2,5120,
|
||||
148,3,3840,
|
||||
149,4,6400,
|
||||
150,3,5120,
|
||||
151,1,8960,
|
||||
152,2,5120,
|
||||
153,1,5120,
|
||||
154,2,5120,
|
||||
155,2,5120,
|
||||
156,5,3840,
|
||||
157,6,3840,
|
||||
158,4,5120,Rose Incense
|
||||
159,6,5120,
|
||||
160,1,5120,
|
||||
161,6,10240,
|
||||
162,2,5120,
|
||||
163,2,5120,
|
||||
164,3,5120,
|
||||
165,3,3840,
|
||||
166,4,5120,
|
||||
167,4,5120,
|
||||
168,5,5120,
|
||||
169,5,5120,
|
||||
170,6,5120,
|
||||
171,3,6400,
|
||||
172,3,6400,
|
||||
173,2,5120,
|
||||
174,6,3840,
|
||||
175,2,5120,
|
||||
176,5,7680,
|
||||
177,5,7680,
|
||||
178,5,5120,
|
||||
179,2,6400,
|
||||
180,4,5120,
|
||||
181,3,6400,
|
||||
182,3,6400,
|
||||
183,1,6400,
|
||||
184,3,6400,Pure Incense
|
||||
185,4,6400,
|
||||
186,2,5120,
|
||||
187,4,5120,
|
||||
188,5,5120,
|
||||
189,1,10240,
|
||||
190,3,5120,
|
||||
191,1,10240,
|
||||
192,1,10240,
|
||||
193,1,20480,
|
||||
194,1,20480,
|
||||
195,1,20480,
|
||||
196,1,30720,
|
||||
197,1,30720,
|
||||
198,1,30720,
|
||||
199,1,30720,
|
||||
200,1,30720,
|
||||
201,1,30720,
|
||||
202,1,30720,
|
||||
203,4,5120,
|
||||
204,4,5120,
|
||||
205,4,5120,
|
||||
206,4,3840,
|
||||
207,2,3840,
|
||||
208,4,3840,
|
||||
209,4,5120,
|
||||
211,5,7680,
|
||||
212,5,7680,
|
||||
213,2,3840,
|
||||
214,4,3840,
|
||||
215,2,2560,
|
||||
216,2,5120,
|
||||
217,2,5120,
|
||||
218,2,5120,
|
||||
219,6,7680,
|
||||
220,2,5120,
|
||||
221,3,5120,
|
||||
223,2,5120,
|
||||
224,2,5120,
|
||||
228,4,5120,
|
||||
229,2,7680,
|
||||
230,1,10240,
|
||||
232,4,6400,
|
||||
233,1,7680,
|
||||
234,1,5120,
|
||||
235,2,2560,
|
||||
236,1,6400,
|
||||
237,5,5120,
|
||||
239,1,5120,
|
||||
240,2,5120,
|
||||
241,1,20480,
|
||||
242,1,20480,
|
||||
243,1,20480,
|
||||
244,1,30720,
|
||||
245,1,30720,
|
||||
246,1,2560,
|
||||
247,1,30720,
|
||||
248,1,30720,
|
||||
249,1,30720,
|
||||
250,1,10240,
|
||||
251,1,2560,
|
||||
252,1,30720,
|
||||
253,4,30720,
|
||||
254,1,30720,
|
||||
id,growth_rate_id,baby_trigger_item
|
||||
1,4,
|
||||
2,4,
|
||||
3,4,
|
||||
4,2,
|
||||
5,2,
|
||||
6,4,
|
||||
7,2,
|
||||
8,2,
|
||||
9,2,
|
||||
10,2,
|
||||
11,2,
|
||||
12,4,
|
||||
13,4,
|
||||
14,3,
|
||||
15,2,
|
||||
16,3,
|
||||
17,2,
|
||||
18,4,
|
||||
19,2,
|
||||
20,2,
|
||||
21,2,
|
||||
22,2,
|
||||
23,2,
|
||||
24,2,
|
||||
25,1,
|
||||
26,4,
|
||||
27,4,
|
||||
28,4,
|
||||
29,4,
|
||||
30,1,
|
||||
31,4,
|
||||
32,2,
|
||||
33,2,
|
||||
34,2,
|
||||
35,2,
|
||||
36,2,
|
||||
37,2,
|
||||
38,2,
|
||||
39,1,
|
||||
40,4,
|
||||
41,2,
|
||||
42,2,
|
||||
43,2,
|
||||
44,2,
|
||||
45,1,
|
||||
46,2,
|
||||
47,2,
|
||||
48,2,
|
||||
49,2,
|
||||
50,1,
|
||||
51,3,Luck Incense
|
||||
52,2,
|
||||
53,2,
|
||||
54,2,
|
||||
55,2,
|
||||
56,1,
|
||||
57,2,Odd Incense
|
||||
58,2,
|
||||
59,2,
|
||||
60,2,
|
||||
61,2,
|
||||
62,1,
|
||||
63,1,
|
||||
64,1,
|
||||
65,1,
|
||||
66,2,
|
||||
67,2,
|
||||
68,2,
|
||||
69,2,
|
||||
70,2,
|
||||
71,1,
|
||||
72,1,Full Incense
|
||||
73,1,
|
||||
74,1,
|
||||
75,1,
|
||||
76,1,
|
||||
77,1,
|
||||
78,4,
|
||||
79,4,
|
||||
80,4,
|
||||
81,4,
|
||||
82,2,
|
||||
83,2,
|
||||
84,3,
|
||||
85,3,
|
||||
86,1,
|
||||
87,3,
|
||||
88,2,
|
||||
89,4,
|
||||
90,3,Sea Incense
|
||||
91,2,Rock Incense
|
||||
92,4,
|
||||
93,3,
|
||||
94,4,
|
||||
95,2,
|
||||
96,2,
|
||||
97,4,
|
||||
98,3,
|
||||
99,2,
|
||||
100,2,Lax Incense
|
||||
101,2,
|
||||
102,2,
|
||||
103,2,
|
||||
104,4,
|
||||
105,3,
|
||||
106,2,
|
||||
107,4,
|
||||
108,1,
|
||||
109,4,
|
||||
110,2,
|
||||
111,2,
|
||||
112,1,
|
||||
113,3,
|
||||
114,2,
|
||||
115,3,
|
||||
116,1,Wave Incense
|
||||
117,1,
|
||||
118,1,
|
||||
119,2,
|
||||
120,1,
|
||||
121,3,
|
||||
122,1,
|
||||
123,1,
|
||||
124,1,
|
||||
125,1,
|
||||
126,1,
|
||||
127,1,
|
||||
128,1,
|
||||
129,4,
|
||||
130,4,
|
||||
131,4,
|
||||
132,4,
|
||||
133,2,
|
||||
134,2,
|
||||
135,2,
|
||||
136,4,
|
||||
137,4,
|
||||
138,4,
|
||||
139,2,
|
||||
140,1,
|
||||
141,2,
|
||||
142,6,
|
||||
143,1,
|
||||
144,5,
|
||||
145,4,
|
||||
146,6,
|
||||
147,2,
|
||||
148,3,
|
||||
149,4,
|
||||
150,3,
|
||||
151,1,
|
||||
152,2,
|
||||
153,1,
|
||||
154,2,
|
||||
155,2,
|
||||
156,5,
|
||||
157,6,
|
||||
158,4,Rose Incense
|
||||
159,6,
|
||||
160,1,
|
||||
161,6,
|
||||
162,2,
|
||||
163,2,
|
||||
164,3,
|
||||
165,3,
|
||||
166,4,
|
||||
167,4,
|
||||
168,5,
|
||||
169,5,
|
||||
170,6,
|
||||
171,3,
|
||||
172,3,
|
||||
173,2,
|
||||
174,6,
|
||||
175,2,
|
||||
176,5,
|
||||
177,5,
|
||||
178,5,
|
||||
179,2,
|
||||
180,4,
|
||||
181,3,
|
||||
182,3,
|
||||
183,1,
|
||||
184,3,Pure Incense
|
||||
185,4,
|
||||
186,2,
|
||||
187,4,
|
||||
188,5,
|
||||
189,1,
|
||||
190,3,
|
||||
191,1,
|
||||
192,1,
|
||||
193,1,
|
||||
194,1,
|
||||
195,1,
|
||||
196,1,
|
||||
197,1,
|
||||
198,1,
|
||||
199,1,
|
||||
200,1,
|
||||
201,1,
|
||||
202,1,
|
||||
203,4,
|
||||
204,4,
|
||||
205,4,
|
||||
206,4,
|
||||
207,2,
|
||||
208,4,
|
||||
209,4,
|
||||
211,5,
|
||||
212,5,
|
||||
213,2,
|
||||
214,4,
|
||||
215,2,
|
||||
216,2,
|
||||
217,2,
|
||||
218,2,
|
||||
219,6,
|
||||
220,2,
|
||||
221,3,
|
||||
223,2,
|
||||
224,2,
|
||||
228,4,
|
||||
229,2,
|
||||
230,1,
|
||||
232,4,
|
||||
233,1,
|
||||
234,1,
|
||||
235,2,
|
||||
236,1,
|
||||
237,5,
|
||||
239,1,
|
||||
240,2,
|
||||
241,1,
|
||||
242,1,
|
||||
243,1,
|
||||
244,1,
|
||||
245,1,
|
||||
246,1,
|
||||
247,1,
|
||||
248,1,
|
||||
249,1,
|
||||
250,1,
|
||||
251,1,
|
||||
252,1,
|
||||
253,4,
|
||||
254,1,
|
||||
|
|
|
File diff suppressed because it is too large
Load diff
|
@ -177,7 +177,6 @@ class EvolutionChain(TableBase):
|
|||
__tablename__ = 'evolution_chains'
|
||||
id = Column(Integer, primary_key=True, nullable=False)
|
||||
growth_rate_id = Column(Integer, ForeignKey('growth_rates.id'), nullable=False)
|
||||
steps_to_hatch = Column(Integer, nullable=False)
|
||||
baby_trigger_item = Column(Unicode(12))
|
||||
|
||||
class EvolutionTrigger(TableBase):
|
||||
|
@ -456,6 +455,7 @@ class Pokemon(TableBase):
|
|||
base_experience = Column(Integer, nullable=False)
|
||||
base_happiness = Column(Integer, nullable=False)
|
||||
is_baby = Column(Boolean, nullable=False)
|
||||
hatch_counter = Column(Integer, nullable=False)
|
||||
has_gen4_fem_sprite = Column(Boolean, nullable=False)
|
||||
has_gen4_fem_back_sprite = Column(Boolean, nullable=False)
|
||||
|
||||
|
|
Loading…
Reference in a new issue