Merge branch 'master' into feature/type_name_icons

This commit is contained in:
Alessandro Pezzè 2024-08-08 16:49:34 +09:00 committed by GitHub
commit d8824bf480
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 35 additions and 1 deletions

View file

@ -146,7 +146,7 @@ down-graphql-prod:
update-graphql-data-prod:
docker compose ${gql_compose_config} stop
git pull origin master
git submodule update --init
git submodule update --remote --merge
docker compose ${gql_compose_config} up --pull always -d app cache db
sync; echo 3 > /proc/sys/vm/drop_caches
make docker-migrate

View file

@ -140521,3 +140521,15 @@ Bountiful Harvests to express their gratitude."
1658,20,12,"拿到光下即可生辉的布。
人们曾经将其进献给
丰饶之王以表感谢之意。"
2223,24,9,"Doesn't fly far, but is more effective if the Pokémon
hasn't noticed the player."
2224,24,9,"Upgraded version of the Heavy Ball. Doesn't fly far,
but is more effective if the Pokémon hasn't noticed the player."
2225,24,9,"Upgraded version of the Leaden Ball. Doesn't fly far,
but is more effective if the Pokémon hasn't noticed the player."
2226,24,9,"Can be thrown further than a regular Poké Ball.
Is more effective for catching Pokémon that fly high in the air."
2227,24,9,"Can be thrown further than a Feather Ball.
Is more effective for catching Pokémon that fly high in the air."
2228,24,9,"Can be thrown further than a Wing Ball.
Is more effective for catching Pokémon that fly high in the air."

Can't render this file because it is too large.

View file

@ -17940,3 +17940,14 @@ item_id,local_language_id,name
2217,11,わざマシン228
2218,9,TM229
2218,11,わざマシン229
2219,9,Strange Ball
2220,9,Poké Ball
2221,9,Great Ball
2222,9,Ultra Ball
2223,9,Heavy Ball
2224,9,Leaden Ball
2225,9,Gigaton Ball
2226,9,Feather Ball
2227,9,Wing Ball
2228,9,Jet Ball
2229,9,Origin Ball

1 item_id local_language_id name
17940 2217 11 わざマシン228
17941 2218 9 TM229
17942 2218 11 わざマシン229
17943 2219 9 Strange Ball
17944 2220 9 Poké Ball
17945 2221 9 Great Ball
17946 2222 9 Ultra Ball
17947 2223 9 Heavy Ball
17948 2224 9 Leaden Ball
17949 2225 9 Gigaton Ball
17950 2226 9 Feather Ball
17951 2227 9 Wing Ball
17952 2228 9 Jet Ball
17953 2229 9 Origin Ball

View file

@ -2166,5 +2166,16 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
2216,tm227,37,0,,
2217,tm228,37,0,,
2218,tm229,37,0,,
2219,lastrange-ball,34,0,,
2220,lapoke-ball,34,0,,
2221,lagreat-ball,34,0,,
2222,laultra-ball,34,0,,
2223,laheavy-ball,34,0,,
2224,laleaden-ball,34,0,,
2225,lagigaton-ball,34,0,,
2226,lafeather-ball,34,0,,
2227,lawing-ball,34,0,,
2228,lajet-ball,34,0,,
2229,laorigin-ball,34,0,,
10001,black-augurite,10,0,,
10002,peat-block,10,0,,

1 id identifier category_id cost fling_power fling_effect_id
2166 2216 tm227 37 0
2167 2217 tm228 37 0
2168 2218 tm229 37 0
2169 2219 lastrange-ball 34 0
2170 2220 lapoke-ball 34 0
2171 2221 lagreat-ball 34 0
2172 2222 laultra-ball 34 0
2173 2223 laheavy-ball 34 0
2174 2224 laleaden-ball 34 0
2175 2225 lagigaton-ball 34 0
2176 2226 lafeather-ball 34 0
2177 2227 lawing-ball 34 0
2178 2228 lajet-ball 34 0
2179 2229 laorigin-ball 34 0
2180 10001 black-augurite 10 0
2181 10002 peat-block 10 0