Browse Source

Merge branch 'plan_generation' of https://sinistea.pkmn.cloud/Quildra/OriginDex-DataManager into plan_generation

plan_generation
Quildra 1 year ago
parent
commit
28913a5e5e
  1. 3
      ui/workers/gather_evolutions_worker.py
  2. 11
      utility/data.py

3
ui/workers/gather_evolutions_worker.py

@ -158,6 +158,9 @@ class GatherEvolutions(QRunnable):
flower_form = flower_form.replace("Male", "").replace("male", "").strip() flower_form = flower_form.replace("Male", "").replace("male", "").strip()
fix_form(evolution_tree, flower_form) fix_form(evolution_tree, flower_form)
if evolution_tree["pokemon"] == "Pichu":
evolution_tree["is_baby"] = True
cache.set(cache_record_name, evolution_tree) cache.set(cache_record_name, evolution_tree)
return evolution_tree return evolution_tree

11
utility/data.py

@ -371,10 +371,10 @@ default_pokemon_forms = {
"Urshifu": "Single Strike Style", "Urshifu": "Single Strike Style",
"Squawkabilly": "Green Plumage", "Squawkabilly": "Green Plumage",
"Dudunsparce": "Two-Segment Form", "Dudunsparce": "Two-Segment Form",
"Poltchageist": "Counterfeit Form", #"Poltchageist": "Counterfeit Form",
"Sinistcha": "Unremarkable Form", #"Sinistcha": "Unremarkable Form",
"Sinistea": "Antique Form", #"Sinistea": "Antique Form",
"Polteageist": "Phony Form", #"Polteageist": "Phony Form",
"Gimmighoul": "Chest Form" "Gimmighoul": "Chest Form"
} }
@ -455,7 +455,8 @@ POKEMON_PROPER_NOUNS = {
"Red-Striped", "Red-Striped",
"Blue-Striped", "Blue-Striped",
"White-Striped", "White-Striped",
"Ash-Greninja" "Ash-Greninja",
"Pom-Pom"
} }
POKEMON_PROPER_NOUNS = POKEMON_PROPER_NOUNS | set(regions) POKEMON_PROPER_NOUNS = POKEMON_PROPER_NOUNS | set(regions)

Loading…
Cancel
Save