From 2523eec9eba0fb8c4669d32b28b8e06ec671f24f Mon Sep 17 00:00:00 2001 From: Thutmose Date: Tue, 25 Oct 2022 21:58:01 -0400 Subject: [PATCH] more database adjustments --- .../{basculin-red-striped.json => basculin.json} | 0 .../database_update/data/pokemobs/loot_tables.json | 2 +- processing_scripts/database_update/legacy_renamer.py | 6 ++++++ .../resources/assets/pokecube_mobs/lang/de_de.json | 2 +- .../resources/assets/pokecube_mobs/lang/en_us.json | 2 +- .../resources/assets/pokecube_mobs/lang/es_es.json | 2 +- .../resources/assets/pokecube_mobs/lang/fr_fr.json | 2 +- .../resources/assets/pokecube_mobs/lang/it_it.json | 2 +- .../resources/assets/pokecube_mobs/lang/ja_jp.json | 2 +- .../resources/assets/pokecube_mobs/lang/ko_kr.json | 2 +- .../resources/assets/pokecube_mobs/lang/zh_cn.json | 2 +- .../resources/data/pokecube/tags/entity_types/pokemob.json | 2 +- .../{basculin-red-striped.json => basculin.json} | 2 +- 13 files changed, 17 insertions(+), 11 deletions(-) rename example_datapacks/_removal_template_/data/pokecube_mobs/database/pokemobs/pokedex_entries/{basculin-red-striped.json => basculin.json} (100%) rename src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/{basculin-red-striped.json => basculin.json} (99%) diff --git a/example_datapacks/_removal_template_/data/pokecube_mobs/database/pokemobs/pokedex_entries/basculin-red-striped.json b/example_datapacks/_removal_template_/data/pokecube_mobs/database/pokemobs/pokedex_entries/basculin.json similarity index 100% rename from example_datapacks/_removal_template_/data/pokecube_mobs/database/pokemobs/pokedex_entries/basculin-red-striped.json rename to example_datapacks/_removal_template_/data/pokecube_mobs/database/pokemobs/pokedex_entries/basculin.json diff --git a/processing_scripts/database_update/data/pokemobs/loot_tables.json b/processing_scripts/database_update/data/pokemobs/loot_tables.json index c7f6472d1d..d5e32d8243 100644 --- a/processing_scripts/database_update/data/pokemobs/loot_tables.json +++ b/processing_scripts/database_update/data/pokemobs/loot_tables.json @@ -674,7 +674,7 @@ "uxie", "azelf", "oshawott", - "basculin-red-striped", + "basculin", "basculin-white-striped", "frillish", "jellicent", diff --git a/processing_scripts/database_update/legacy_renamer.py b/processing_scripts/database_update/legacy_renamer.py index 94a8636c10..fd0edcddd6 100644 --- a/processing_scripts/database_update/legacy_renamer.py +++ b/processing_scripts/database_update/legacy_renamer.py @@ -7,6 +7,12 @@ RENAMES = { "minior-red-meteor": "minior-meteor", } +RENAMES = { + # Minior meteors are all the same externally, so the internals are handled in code + "minior-red-meteor": "minior-meteor", + # basculin red and blue stripes are essentially cosmetic, so merged to basculin + "basculin-red-striped": "basculin", +} LEGACY_REV_MAP = { "missingno": "missingno", diff --git a/src/generated/resources/assets/pokecube_mobs/lang/de_de.json b/src/generated/resources/assets/pokecube_mobs/lang/de_de.json index 57d7a19164..7108dcba7a 100644 --- a/src/generated/resources/assets/pokecube_mobs/lang/de_de.json +++ b/src/generated/resources/assets/pokecube_mobs/lang/de_de.json @@ -668,7 +668,7 @@ "entity.pokecube.petilil": "Lilminip", "entity.pokecube.lilligant": "Dressella", "entity.pokecube.lilligant-hisui": "Dressella", - "entity.pokecube.basculin-red-striped": "Barschuft", + "entity.pokecube.basculin": "Barschuft", "entity.pokecube.basculin-white-striped": "Barschuft", "entity.pokecube.sandile": "Ganovil", "entity.pokecube.krokorok": "Rokkaiman", diff --git a/src/generated/resources/assets/pokecube_mobs/lang/en_us.json b/src/generated/resources/assets/pokecube_mobs/lang/en_us.json index d088f80c4f..e4287abe61 100644 --- a/src/generated/resources/assets/pokecube_mobs/lang/en_us.json +++ b/src/generated/resources/assets/pokecube_mobs/lang/en_us.json @@ -668,7 +668,7 @@ "entity.pokecube.petilil": "Petilil", "entity.pokecube.lilligant": "Lilligant", "entity.pokecube.lilligant-hisui": "Lilligant", - "entity.pokecube.basculin-red-striped": "Basculin", + "entity.pokecube.basculin": "Basculin", "entity.pokecube.basculin-white-striped": "Basculin", "entity.pokecube.sandile": "Sandile", "entity.pokecube.krokorok": "Krokorok", diff --git a/src/generated/resources/assets/pokecube_mobs/lang/es_es.json b/src/generated/resources/assets/pokecube_mobs/lang/es_es.json index d14d72c74f..75bd226370 100644 --- a/src/generated/resources/assets/pokecube_mobs/lang/es_es.json +++ b/src/generated/resources/assets/pokecube_mobs/lang/es_es.json @@ -668,7 +668,7 @@ "entity.pokecube.petilil": "Petilil", "entity.pokecube.lilligant": "Lilligant", "entity.pokecube.lilligant-hisui": "Lilligant", - "entity.pokecube.basculin-red-striped": "Basculin", + "entity.pokecube.basculin": "Basculin", "entity.pokecube.basculin-white-striped": "Basculin", "entity.pokecube.sandile": "Sandile", "entity.pokecube.krokorok": "Krokorok", diff --git a/src/generated/resources/assets/pokecube_mobs/lang/fr_fr.json b/src/generated/resources/assets/pokecube_mobs/lang/fr_fr.json index b0f709b607..15de872f12 100644 --- a/src/generated/resources/assets/pokecube_mobs/lang/fr_fr.json +++ b/src/generated/resources/assets/pokecube_mobs/lang/fr_fr.json @@ -668,7 +668,7 @@ "entity.pokecube.petilil": "Chlorobule", "entity.pokecube.lilligant": "Fragilady", "entity.pokecube.lilligant-hisui": "Fragilady", - "entity.pokecube.basculin-red-striped": "Bargantua", + "entity.pokecube.basculin": "Bargantua", "entity.pokecube.basculin-white-striped": "Bargantua", "entity.pokecube.sandile": "Mascaïman", "entity.pokecube.krokorok": "Escroco", diff --git a/src/generated/resources/assets/pokecube_mobs/lang/it_it.json b/src/generated/resources/assets/pokecube_mobs/lang/it_it.json index f8e57d2f38..b865f2a4ea 100644 --- a/src/generated/resources/assets/pokecube_mobs/lang/it_it.json +++ b/src/generated/resources/assets/pokecube_mobs/lang/it_it.json @@ -668,7 +668,7 @@ "entity.pokecube.petilil": "Petilil", "entity.pokecube.lilligant": "Lilligant", "entity.pokecube.lilligant-hisui": "Lilligant", - "entity.pokecube.basculin-red-striped": "Basculin", + "entity.pokecube.basculin": "Basculin", "entity.pokecube.basculin-white-striped": "Basculin", "entity.pokecube.sandile": "Sandile", "entity.pokecube.krokorok": "Krokorok", diff --git a/src/generated/resources/assets/pokecube_mobs/lang/ja_jp.json b/src/generated/resources/assets/pokecube_mobs/lang/ja_jp.json index ee2d1a5d4a..315c1a2713 100644 --- a/src/generated/resources/assets/pokecube_mobs/lang/ja_jp.json +++ b/src/generated/resources/assets/pokecube_mobs/lang/ja_jp.json @@ -668,7 +668,7 @@ "entity.pokecube.petilil": "チュリネ", "entity.pokecube.lilligant": "ドレディア", "entity.pokecube.lilligant-hisui": "ドレディア", - "entity.pokecube.basculin-red-striped": "バスラオ", + "entity.pokecube.basculin": "バスラオ", "entity.pokecube.basculin-white-striped": "バスラオ", "entity.pokecube.sandile": "メグロコ", "entity.pokecube.krokorok": "ワルビル", diff --git a/src/generated/resources/assets/pokecube_mobs/lang/ko_kr.json b/src/generated/resources/assets/pokecube_mobs/lang/ko_kr.json index a249b02b93..8fa9446d27 100644 --- a/src/generated/resources/assets/pokecube_mobs/lang/ko_kr.json +++ b/src/generated/resources/assets/pokecube_mobs/lang/ko_kr.json @@ -668,7 +668,7 @@ "entity.pokecube.petilil": "치릴리", "entity.pokecube.lilligant": "드레디어", "entity.pokecube.lilligant-hisui": "드레디어", - "entity.pokecube.basculin-red-striped": "배쓰나이", + "entity.pokecube.basculin": "배쓰나이", "entity.pokecube.basculin-white-striped": "배쓰나이", "entity.pokecube.sandile": "깜눈크", "entity.pokecube.krokorok": "악비르", diff --git a/src/generated/resources/assets/pokecube_mobs/lang/zh_cn.json b/src/generated/resources/assets/pokecube_mobs/lang/zh_cn.json index 9e05ec78e2..84b232a517 100644 --- a/src/generated/resources/assets/pokecube_mobs/lang/zh_cn.json +++ b/src/generated/resources/assets/pokecube_mobs/lang/zh_cn.json @@ -668,7 +668,7 @@ "entity.pokecube.petilil": "百合根娃娃", "entity.pokecube.lilligant": "裙儿小姐", "entity.pokecube.lilligant-hisui": "裙儿小姐", - "entity.pokecube.basculin-red-striped": "野蛮鲈鱼", + "entity.pokecube.basculin": "野蛮鲈鱼", "entity.pokecube.basculin-white-striped": "野蛮鲈鱼", "entity.pokecube.sandile": "黑眼鳄", "entity.pokecube.krokorok": "混混鳄", diff --git a/src/generated/resources/data/pokecube/tags/entity_types/pokemob.json b/src/generated/resources/data/pokecube/tags/entity_types/pokemob.json index 110f4ac78c..4d96e842fa 100644 --- a/src/generated/resources/data/pokecube/tags/entity_types/pokemob.json +++ b/src/generated/resources/data/pokecube/tags/entity_types/pokemob.json @@ -671,7 +671,7 @@ "pokecube:petilil", "pokecube:lilligant", "pokecube:lilligant-hisui", - "pokecube:basculin-red-striped", + "pokecube:basculin", "pokecube:basculin-white-striped", "pokecube:sandile", "pokecube:krokorok", diff --git a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/basculin-red-striped.json b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/basculin.json similarity index 99% rename from src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/basculin-red-striped.json rename to src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/basculin.json index aafaccd691..1fe5349527 100644 --- a/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/basculin-red-striped.json +++ b/src/generated/resources/data/pokecube_mobs/database/pokemobs/pokedex_entries/basculin.json @@ -1,5 +1,5 @@ { - "name": "basculin-red-striped", + "name": "basculin", "id": 550, "stock": true, "base_experience": 161,