diff --git a/Makefile b/Makefile index 1ba8c169..a2b1b8bb 100755 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/data/v2/csv/item_flavor_text.csv b/data/v2/csv/item_flavor_text.csv index 55f279ae..8b9d0e74 100644 --- a/data/v2/csv/item_flavor_text.csv +++ b/data/v2/csv/item_flavor_text.csv @@ -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." diff --git a/data/v2/csv/item_names.csv b/data/v2/csv/item_names.csv index a9c08f82..a64fed6d 100644 --- a/data/v2/csv/item_names.csv +++ b/data/v2/csv/item_names.csv @@ -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 diff --git a/data/v2/csv/items.csv b/data/v2/csv/items.csv index 1978b2df..1ce97345 100644 --- a/data/v2/csv/items.csv +++ b/data/v2/csv/items.csv @@ -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,,