From 4a378b8c1de8b929d4864a0c9516194709891a15 Mon Sep 17 00:00:00 2001 From: lxgr-linux Date: Tue, 16 Sep 2025 23:33:35 +0200 Subject: [PATCH 01/47] feat(pokes): Gitignored zed --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 8d1c4832..30ffa256 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ scrap_engine.py .ropeproject .fleet .vim +.zed From f85b9dd42521af5336db695d71ee8c6d8cc50049 Mon Sep 17 00:00:00 2001 From: Pacino125 Date: Tue, 3 Oct 2023 17:57:20 +0200 Subject: [PATCH 02/47] #new pokete Pacino --- src/pokete/data/poketes.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/pokete/data/poketes.py b/src/pokete/data/poketes.py index c748762e..156bb9f5 100644 --- a/src/pokete/data/poketes.py +++ b/src/pokete/data/poketes.py @@ -1519,6 +1519,27 @@ "esc": ["thicc", "white"] }] }, + "Pacino": { + "name": "Pacino", + "hp": 5, + "atc": 30, + "defense": 0, + "attacks": ["cry", "power_bite", "snooze"], + "pool": [], + "miss_chance": 20, + "desc": "Lazy pokete with huge power, but zero stamina.", + "lose_xp": 4, + "rarity": 3, + "types": ["undead", "normal"], + "evolve_poke": "", + "evolve_lvl": "", + "initiative": 1, + "ico": [{ + "txt": r""" (-)(-) + / '' / +w w""", + "esc": None}] + }, } if __name__ == "__main__": From d7bbbce8a6b4d0987a3e240bc107f3064e9db277 Mon Sep 17 00:00:00 2001 From: "LAPTOP-BUTQHUA2\\matej" Date: Tue, 27 Sep 2022 19:21:37 +0200 Subject: [PATCH 03/47] asd --- src/pokete/data/poketes.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/pokete/data/poketes.py b/src/pokete/data/poketes.py index 156bb9f5..8d79073f 100644 --- a/src/pokete/data/poketes.py +++ b/src/pokete/data/poketes.py @@ -1540,6 +1540,29 @@ w w""", "esc": None}] }, + + "pepegus": { + "name": "Pepegus", + "hp": 21, + "atc": 7, + "defense": 0.5, + "attacks": ["stone_crush", "dia_stab", "dick_energy", "sand_throw"], + "pool": [], + "miss_chance": 0, + "desc": "Cute frog with surprising abilities.", + "lose_xp": 3, + "rarity": 0.9, + "types": ["stone", "normal"], + "evolve_poke": "", + "evolve_lvl": 0, + "initiative": 2, + "ico": [{ + "txt": r""" ()-() + .-(___)-. +_< >_ +\/ \/""", + "esc": None}] + }, } if __name__ == "__main__": From b6f967da89b2947723c752c415e87a424a2e9ae1 Mon Sep 17 00:00:00 2001 From: radkyz <114510489+radkyz@users.noreply.github.com> Date: Tue, 27 Sep 2022 19:20:58 +0200 Subject: [PATCH 04/47] Update poketes.py --- src/pokete/data/poketes.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/pokete/data/poketes.py b/src/pokete/data/poketes.py index 8d79073f..28a48413 100644 --- a/src/pokete/data/poketes.py +++ b/src/pokete/data/poketes.py @@ -28,6 +28,28 @@ "txt": """ """, "esc": []}], }, + "vacter": { + "name": "Vacter", + "hp": 19, + "atc": 6, + "defense": 1, + "attacks": ["shock", "wing_hit", "wind_blow", "pick"], + "pool": ["mega_arch", "eye_pick", "power_pick", "storm_gust"], + "miss_chance": 0, + "desc": "A lighting fast bird.", + "lose_xp": 4, + "rarity": 0.5, + "types": ["flying", "electro"], + "evolve_poke": "", + "evolve_lvl": 0, + "initiative": 8, + "ico": [{ + "txt": r""" //\ +<[*] // + -; + \ \""", + "esc": None}], + }, "steini": { "name": "Steini", "hp": 25, From b35e72c9f5f86f4c78cbfee25b2fc9ba96f3a981 Mon Sep 17 00:00:00 2001 From: lxgr-linux Date: Tue, 16 Sep 2025 23:52:32 +0200 Subject: [PATCH 05/47] feat(pokes): linting --- src/pokete/data/poketes.py | 788 +++++++++++++++++++++++-------------- 1 file changed, 503 insertions(+), 285 deletions(-) diff --git a/src/pokete/data/poketes.py b/src/pokete/data/poketes.py index 28a48413..1acbc2a8 100644 --- a/src/pokete/data/poketes.py +++ b/src/pokete/data/poketes.py @@ -1,10 +1,11 @@ """Here starts to definition of all the Poketes - If you want to contribute Poketes, you have to keep in mind, that "ico" - can be max 11x4 chars big - and that the max for attacks is (until now) 4 - All attributes have to be present make a Pokete work - A type has to be present - Hornita was inspired and partly designed by Pia """ +If you want to contribute Poketes, you have to keep in mind, that "ico" +can be max 11x4 chars big +and that the max for attacks is (until now) 4 +All attributes have to be present make a Pokete work +A type has to be present +Hornita was inspired and partly designed by Pia """ + from pokete.classes.asset_service.resources.base import PokeDict pokes: dict[str, PokeDict] = { @@ -24,9 +25,7 @@ "evolve_lvl": 0, "initiative": 0, "night_active": None, - "ico": [{ - "txt": """ """, - "esc": []}], + "ico": [{"txt": """ """, "esc": []}], }, "vacter": { "name": "Vacter", @@ -43,12 +42,15 @@ "evolve_poke": "", "evolve_lvl": 0, "initiative": 8, - "ico": [{ - "txt": r""" //\ + "ico": [ + { + "txt": r""" //\ <[*] // -; - \ \""", - "esc": None}], + \ \ """, + "esc": None, + } + ], }, "steini": { "name": "Steini", @@ -66,12 +68,15 @@ "evolve_lvl": 0, "initiative": 5, "night_active": None, - "ico": [{ - "txt": r""" +-------+ + "ico": [ + { + "txt": r""" +-------+ | o o | | www | +-------+ """, - "esc": []}], + "esc": [], + } + ], }, "mowcow": { "name": "Mowcow", @@ -89,11 +94,14 @@ "evolve_lvl": 0, "initiative": 2, "night_active": None, - "ico": [{ - "txt": r""" ^__^ + "ico": [ + { + "txt": r""" ^__^ (oo) (__)""", - "esc": []}], + "esc": [], + } + ], }, "bigstone": { "name": "Bigstone", @@ -111,12 +119,15 @@ "evolve_lvl": 0, "initiative": 5, "night_active": None, - "ico": [{ - "txt": r"""+---------+ + "ico": [ + { + "txt": r"""+---------+ | o o | | --- | +---------+""", - "esc": []}], + "esc": [], + } + ], }, "poundi": { "name": "Poundi", @@ -134,12 +145,15 @@ "evolve_lvl": 0, "initiative": 4, "night_active": None, - "ico": [{ - "txt": r""" A-A-A + "ico": [ + { + "txt": r""" A-A-A < o o > < --- > VvVvV""", - "esc": []}], + "esc": [], + } + ], }, "lilstone": { "name": "Lilstone", @@ -157,12 +171,15 @@ "evolve_lvl": 25, "initiative": 3, "night_active": None, - "ico": [{ - "txt": r""" + "ico": [ + { + "txt": r""" _____ |'ᵕ'| ‾‾‾‾‾""", - "esc": []}], + "esc": [], + } + ], }, "rosi": { "name": "Rosi", @@ -180,12 +197,15 @@ "evolve_lvl": 0, "initiative": 3, "night_active": None, - "ico": [{ - "txt": r""" + "ico": [ + { + "txt": r""" (@) | \|/""", - "esc": []}], + "esc": [], + } + ], }, "wheeto": { "name": "Wheeto", @@ -203,12 +223,15 @@ "evolve_lvl": 0, "initiative": 2, "night_active": None, - "ico": [{ - "txt": r""" \ / + "ico": [ + { + "txt": r""" \ / \|/ \|/ |""", - "esc": []}], + "esc": [], + } + ], }, "saugh": { "name": "Saugh", @@ -226,18 +249,21 @@ "evolve_lvl": 0, "initiative": 5, "night_active": None, - "ico": [{ - "txt": r""" + "ico": [ + { + "txt": r""" ., , .. . ...,..,.""", - "esc": ["yellow"] - }, { - "txt": r""" + "esc": ["yellow"], + }, + { + "txt": r""" * *""", - "esc": ["thicc", "red"] - }], + "esc": ["thicc", "red"], + }, + ], }, "gobost": { "name": "Gobost", @@ -255,12 +281,15 @@ "evolve_lvl": 25, "initiative": 6, "night_active": None, - "ico": [{ - "txt": r""" .░░░░░░░. + "ico": [ + { + "txt": r""" .░░░░░░░. ░░o░░░o░░ ░░░░░░░░░ ░ ░ ░ ░ ░""", - "esc": []}], + "esc": [], + } + ], }, "angrilo": { "name": "Angrilo", @@ -278,12 +307,15 @@ "evolve_lvl": 0, "initiative": 7, "night_active": None, - "ico": [{ - "txt": r""" .░░░░░░░. + "ico": [ + { + "txt": r""" .░░░░░░░. ░░\░░░/░░ .░░( )░░. . .""", - "esc": []}], + "esc": [], + } + ], }, "vogli": { "name": "Vogli", @@ -301,12 +333,15 @@ "initiative": 6, "evolve_lvl": 20, "night_active": None, - "ico": [{ - "txt": r""" A + "ico": [ + { + "txt": r""" A <') www* || """, - "esc": []}] + "esc": [], + } + ], }, "voglo": { "name": "Voglo", @@ -324,12 +359,15 @@ "evolve_lvl": 35, "initiative": 7, "night_active": None, - "ico": [{ - "txt": r""" ? + "ico": [ + { + "txt": r""" ? >´) www* || """, - "esc": []}] + "esc": [], + } + ], }, "voglus": { "name": "Voglus", @@ -347,15 +385,20 @@ "evolve_lvl": 0, "initiative": 8, "night_active": None, - "ico": [{ - "txt": r""" / + "ico": [ + { + "txt": r""" / > } WWW' ||""", - "esc": []}, { - "txt": """ + "esc": [], + }, + { + "txt": """ ´""", - "esc": ["thicc", "red"]}] + "esc": ["thicc", "red"], + }, + ], }, "ostri": { "name": "Ostri", @@ -374,12 +417,15 @@ "evolve_lvl": 0, "initiative": 7, "night_active": None, - "ico": [{ - "txt": r""" ! + "ico": [ + { + "txt": r""" ! >´) \www' ||""", - "esc": []}] + "esc": [], + } + ], }, "karpi": { "name": "Karpi", @@ -397,12 +443,15 @@ "evolve_lvl": 30, "initiative": 0, "night_active": None, - "ico": [{ - "txt": r""" + "ico": [ + { + "txt": r""" <°))))>< """, - "esc": []}] + "esc": [], + } + ], }, "würgos": { "name": "Würgos", @@ -420,12 +469,15 @@ "evolve_lvl": 30, "initiative": 3, "night_active": None, - "ico": [{ - "txt": r""" >'({{{ + "ico": [ + { + "txt": r""" >'({{{ }}}}}}} {{{{{{{{{ """, - "esc": []}] + "esc": [], + } + ], }, "choka": { "name": "Choka", @@ -443,20 +495,27 @@ "evolve_lvl": 0, "initiative": 4, "night_active": None, - "ico": [{ - "txt": r""" _______ + "ico": [ + { + "txt": r""" _______ /____ * \ ( \ \ \______ \ """, - "esc": []}] + "esc": [], + } + ], }, "treenator": { "name": "Treenator", "hp": 25, "atc": 2, "defense": 2, - "attacks": ["apple_drop", "bark_hardening", "branch_stab", - "root_strangler"], + "attacks": [ + "apple_drop", + "bark_hardening", + "branch_stab", + "root_strangler", + ], "pool": [], "miss_chance": 0, "desc": "A scary and dangerous apple tree.", @@ -467,12 +526,15 @@ "evolve_lvl": 0, "initiative": 2, "night_active": None, - "ico": [{ - "txt": r""" (() + "ico": [ + { + "txt": r""" (() (())) H H""", - "esc": []}] + "esc": [], + } + ], }, "bato": { "name": "Bato", @@ -490,11 +552,14 @@ "evolve_lvl": 20, "initiative": 6, "night_active": None, - "ico": [{ - "txt": r""" ___ + "ico": [ + { + "txt": r""" ___ WW\/* *\/WW \v-v/""", - "esc": []}] + "esc": [], + } + ], }, "bator": { "name": "Bator", @@ -512,12 +577,15 @@ "evolve_lvl": 0, "initiative": 8, "night_active": None, - "ico": [{ - "txt": r""" ___ + "ico": [ + { + "txt": r""" ___ WW\/o o\/WW |v-v| \___/""", - "esc": []}] + "esc": [], + } + ], }, "blub": { "name": "Blub", @@ -535,12 +603,15 @@ "evolve_lvl": 0, "initiative": 1, "night_active": None, - "ico": [{ - "txt": r""" _____ + "ico": [ + { + "txt": r""" _____ / o \ > v >< \_____/""", - "esc": []}] + "esc": [], + } + ], }, "owol": { "name": "Owol", @@ -558,13 +629,16 @@ "evolve_lvl": 0, "initiative": 3, "night_active": True, - "ico": [{ - "txt": r""" ,___, + "ico": [ + { + "txt": r""" ,___, {o,o} /)_) "" """, - "esc": []}] + "esc": [], + } + ], }, "rato": { "name": "Rato", @@ -582,11 +656,14 @@ "evolve_lvl": 25, "initiative": 6, "night_active": None, - "ico": [{ - "txt": r""" ^---^ + "ico": [ + { + "txt": r""" ^---^ \o o/ >\./<""", - "esc": []}] + "esc": [], + } + ], }, "ratatat": { "name": "Ratatat", @@ -604,15 +681,20 @@ "evolve_lvl": 0, "initiative": 7, "night_active": None, - "ico": [{ - "txt": r""" ^---^ + "ico": [ + { + "txt": r""" ^---^ \ / >VvV< ^^^""", - "esc": []}, { - "txt": r""" + "esc": [], + }, + { + "txt": r""" * *""", - "esc": ["thicc", "green"]}] + "esc": ["thicc", "green"], + }, + ], }, "hornita": { "name": "Hornita", @@ -630,12 +712,15 @@ "evolve_lvl": 0, "initiative": 3, "night_active": None, - "ico": [{ - "txt": r""" \ + "ico": [ + { + "txt": r""" \ =')~ (¯¯¯¯)~ //¯¯\\ """, - "esc": []}] + "esc": [], + } + ], }, "horny": { "name": "Horny", @@ -653,12 +738,15 @@ "evolve_lvl": 20, "initiative": 4, "night_active": None, - "ico": [{ - "txt": r""" , + "ico": [ + { + "txt": r""" , =') (¯¯¯)~ //¯\\ """, - "esc": []}] + "esc": [], + } + ], }, "bushy": { "name": "Bushy", @@ -676,11 +764,14 @@ "evolve_lvl": 20, "initiative": 1, "night_active": None, - "ico": [{ - "txt": r""" + "ico": [ + { + "txt": r""" (() (()))""", - "esc": []}] + "esc": [], + } + ], }, "wolfior": { "name": "Wolfior", @@ -698,15 +789,20 @@ "evolve_lvl": 25, "initiative": 4, "night_active": None, - "ico": [{ - "txt": r""" ^---^ + "ico": [ + { + "txt": r""" ^---^ ( ) >(.)<""", - "esc": []}, { - "txt": r""" + "esc": [], + }, + { + "txt": r""" * * """, - "esc": ["thicc", "red"]}] + "esc": ["thicc", "red"], + }, + ], }, "wolfiro": { "name": "Wolfiro", @@ -724,15 +820,20 @@ "evolve_lvl": 0, "initiative": 5, "night_active": None, - "ico": [{ - "txt": r""" \^-^/ + "ico": [ + { + "txt": r""" \^-^/ { } >{.}<""", - "esc": []}, { - "txt": r""" + "esc": [], + }, + { + "txt": r""" * * """, - "esc": ["thicc", "red"]}] + "esc": ["thicc", "red"], + }, + ], }, "lindemon": { "name": "Lindemon", @@ -756,13 +857,14 @@ /v___/ \ \-^-/_ \ \_""", - "esc": [] - }, { + "esc": [], + }, + { "txt": r""" . *""", - "esc": ["thicc", "red"] - } - ] + "esc": ["thicc", "red"], + }, + ], }, "rollator": { "name": "Rollator", @@ -780,12 +882,15 @@ "evolve_lvl": 0, "initiative": 3, "night_active": None, - "ico": [{ - "txt": r""" _____ + "ico": [ + { + "txt": r""" _____ / o o \ | ___ | \_____/""", - "esc": []}] + "esc": [], + } + ], }, "clampi": { "name": "Clampi", @@ -803,14 +908,19 @@ "evolve_lvl": 20, "initiative": 3, "night_active": None, - "ico": [{ - "txt": r""" ___ + "ico": [ + { + "txt": r""" ___ -/ \- -\___/-""", - "esc": []}, { - "txt": r""" + "esc": [], + }, + { + "txt": r""" *""", - "esc": ["lightblue"]}] + "esc": ["lightblue"], + }, + ], }, "crabbat": { "name": "Crabbat", @@ -828,14 +938,19 @@ "evolve_lvl": 40, "initiative": 4, "night_active": None, - "ico": [{ - "txt": r""" ( ___ ) + "ico": [ + { + "txt": r""" ( ___ ) \- -/ ^ ^""", - "esc": []}, { - "txt": r""" + "esc": [], + }, + { + "txt": r""" * *""", - "esc": ["lightblue"]}] + "esc": ["lightblue"], + }, + ], }, "rustacean": { "name": "Rustacean", @@ -854,14 +969,19 @@ "evolve_lvl": 0, "initiative": 5, "night_active": None, - "ico": [{ - "txt": r""" { ^^^ } + "ico": [ + { + "txt": r""" { ^^^ } \- -/ ^ ^""", - "esc": []}, { - "txt": r""" + "esc": [], + }, + { + "txt": r""" * *""", - "esc": ["lightblue"]}] + "esc": ["lightblue"], + }, + ], }, "electrode": { "name": "Electrode", @@ -879,13 +999,18 @@ "evolve_lvl": 30, "initiative": 4, "night_active": None, - "ico": [{ - "txt": r""" + "ico": [ + { + "txt": r""" ( )""", - "esc": []}, { - "txt": """ + "esc": [], + }, + { + "txt": """ +""", - "esc": ["lightblue"]}] + "esc": ["lightblue"], + }, + ], }, "cubl": { "name": "Cubl", @@ -903,20 +1028,25 @@ "evolve_lvl": 30, "initiative": 1, "night_active": None, - "ico": [{ - "txt": r""" ----- + "ico": [ + { + "txt": r""" ----- | | -----""", - "esc": []}, { - "txt": r""" + "esc": [], + }, + { + "txt": r""" * *""", - "esc": ["lightblue"]}, { - "txt": r""" / \ + "esc": ["lightblue"], + }, + { + "txt": r""" / \ \ /""", - "esc": ["cyan"] - } - ] + "esc": ["cyan"], + }, + ], }, "spikl": { "name": "Spikl", @@ -934,22 +1064,25 @@ "evolve_lvl": 0, "initiative": 2, "night_active": None, - "ico": [{ - "txt": r""" ------- + "ico": [ + { + "txt": r""" ------- | | -------""", - "esc": []}, + "esc": [], + }, { "txt": r""" * *""", - "esc": ["lightblue"]}, + "esc": ["lightblue"], + }, { "txt": r""" / \ \ /""", - "esc": ["cyan"] - } - ] + "esc": ["cyan"], + }, + ], }, "confuso": { "name": "Confuso", @@ -968,19 +1101,25 @@ "evolve_lvl": 0, "initiative": 2, "night_active": None, - "ico": [{ - "txt": r""" + "ico": [ + { + "txt": r""" _ (_) """, - "esc": []}, { - "txt": r""" } + "esc": [], + }, + { + "txt": r""" } { }""", - "esc": ["purple"]}, { - "txt": r""" } + "esc": ["purple"], + }, + { + "txt": r""" } {""", - "esc": ["lightblue"]}, - ] + "esc": ["lightblue"], + }, + ], }, "poisopla": { "name": "Poisopla", @@ -998,16 +1137,20 @@ "evolve_lvl": 20, "initiative": 1, "night_active": None, - "ico": [{ - "txt": r""" + "ico": [ + { + "txt": r""" . .__ |/| \_\||/""", - "esc": []}, { - "txt": r""" + "esc": [], + }, + { + "txt": r""" w""", - "esc": ["purple"]}, - ] + "esc": ["purple"], + }, + ], }, "radishon": { "name": "Radishon", @@ -1025,16 +1168,20 @@ "evolve_lvl": 20, "initiative": 1, "night_active": None, - "ico": [{ - "txt": r""" .__ / __. + "ico": [ + { + "txt": r""" .__ / __. \_\|/_/""", - "esc": ["thicc", "green"]}, { - "txt": r""" + "esc": ["thicc", "green"], + }, + { + "txt": r""" /o o\ \ - /""", - "esc": ["purple"]}, - ] + "esc": ["purple"], + }, + ], }, "radishuk": { "name": "Radishuk", @@ -1052,21 +1199,27 @@ "evolve_lvl": 40, "initiative": 1, "night_active": None, - "ico": [{ - "txt": r""" .__ __. + "ico": [ + { + "txt": r""" .__ __. \_\_/_/""", - "esc": ["thicc", "green"]}, { - "txt": r""" + "esc": ["thicc", "green"], + }, + { + "txt": r""" /o o\ \ - /""", - "esc": ["purple"]}, { - "txt": r""" + "esc": ["purple"], + }, + { + "txt": r""" _ \ \/ _/""", - "esc": ["yellow"]} - ] + "esc": ["yellow"], + }, + ], }, "radishull": { "name": "Radishull", @@ -1084,18 +1237,22 @@ "evolve_lvl": 0, "initiative": 2, "night_active": None, - "ico": [{ - "txt": r""" + "ico": [ + { + "txt": r""" /o o\ \ - /""", - "esc": ["purple"]}, { - "txt": r""" _ \ _\ + "esc": ["purple"], + }, + { + "txt": r""" _ \ _\ / \_/_/ _ \ \/ _/""", - "esc": ["yellow"]} - ] + "esc": ["yellow"], + }, + ], }, "megapois": { "name": "Megapois", @@ -1113,16 +1270,20 @@ "evolve_lvl": 0, "initiative": 2, "night_active": None, - "ico": [{ - "txt": r""" + "ico": [ + { + "txt": r""" |/. .__\|/| \_\||/ """, - "esc": []}, { - "txt": r""" w w + "esc": [], + }, + { + "txt": r""" w w w""", - "esc": ["purple"]}, - ] + "esc": ["purple"], + }, + ], }, "corcos_day": { "name": "Corcos", @@ -1140,13 +1301,15 @@ "evolve_poke": "raupathor_day", "evolve_lvl": 20, "initiative": 1, - "ico": [{ - "txt": r""" + "ico": [ + { + "txt": r""" |\ |'\ \_|""", - "esc": []} - ] + "esc": [], + } + ], }, "corcos_night": { "name": "Corcos", @@ -1164,13 +1327,15 @@ "evolve_poke": "raupathor_night", "evolve_lvl": 20, "initiative": 1, - "ico": [{ - "txt": r""" + "ico": [ + { + "txt": r""" |\ |'\ \_|""", - "esc": []} - ] + "esc": [], + } + ], }, "raupathor_day": { "name": "Raupathor", @@ -1188,14 +1353,16 @@ "evolve_poke": "schmetterling", "evolve_lvl": 30, "initiative": 3, - "ico": [{ - "txt": r""" + "ico": [ + { + "txt": r""" .__.__. ()__)__)}´ ' ' ' """, - "esc": []} - ] + "esc": [], + } + ], }, "raupathor_night": { "name": "Raupathor", @@ -1213,17 +1380,21 @@ "evolve_poke": "mothor", "evolve_lvl": 30, "initiative": 3, - "ico": [{ - "txt": r""" + "ico": [ + { + "txt": r""" __ __ ()__)__)}´""", - "esc": []}, { - "txt": r""" + "esc": [], + }, + { + "txt": r""" . . . ' ' '""", - "esc": ["thicc", "blue"]} - ] + "esc": ["thicc", "blue"], + }, + ], }, "schmetterling": { "name": "Schmetterling", @@ -1241,12 +1412,14 @@ "evolve_poke": "", "evolve_lvl": 0, "initiative": 4, - "ico": [{ - "txt": r""" .__ o __. + "ico": [ + { + "txt": r""" .__ o __. \_\|/_/ /_/'\_\ """, - "esc": []} - ] + "esc": [], + } + ], }, "mothor": { "name": "Mothor", @@ -1264,17 +1437,21 @@ "evolve_poke": "", "evolve_lvl": 0, "initiative": 4, - "ico": [{ - "txt": r""" __`o´__ + "ico": [ + { + "txt": r""" __`o´__ \_\|/_/ /_/'\_\ """, - "esc": []}, { - "txt": r""" . . + "esc": [], + }, + { + "txt": r""" . . ´ `""", - "esc": ["thicc", "blue"]} - ] + "esc": ["thicc", "blue"], + }, + ], }, "lil_nut": { "name": "Lil Nut", @@ -1292,13 +1469,15 @@ "evolve_lvl": 35, "initiative": 1, "night_active": None, - "ico": [{ - "txt": r""" + "ico": [ + { + "txt": r""" __ ('')""", - "esc": []} - ] + "esc": [], + } + ], }, "dicki": { "name": "Dicki", @@ -1316,13 +1495,15 @@ "evolve_lvl": 55, "initiative": 2, "night_active": None, - "ico": [{ - "txt": r""" + "ico": [ + { + "txt": r""" __ ('') | |""", - "esc": []} - ] + "esc": [], + } + ], }, "dicko": { "name": "Dicko", @@ -1340,13 +1521,15 @@ "evolve_lvl": 0, "initiative": 3, "night_active": None, - "ico": [{ - "txt": r""" __ + "ico": [ + { + "txt": r""" __ ('') | | | |""", - "esc": []} - ] + "esc": [], + } + ], }, "diamondos": { "name": "Diamondos", @@ -1364,23 +1547,29 @@ "evolve_lvl": 0, "initiative": 2, "night_active": None, - "ico": [{ - "txt": r""" + "ico": [ + { + "txt": r""" o o -""", - "esc": []}, { - "txt": r""" + "esc": [], + }, + { + "txt": r""" /\ / > <_""", - "esc": ["cyan"]}, { - "txt": r""" + "esc": ["cyan"], + }, + { + "txt": r""" ^ < _>""", - "esc": ["white"]} - ] + "esc": ["white"], + }, + ], }, "kartmen": { "name": "Kartmen", @@ -1398,12 +1587,15 @@ "evolve_lvl": 0, "initiative": 1, "night_active": None, - "ico": [{ - "txt": r""" _(((( + "ico": [ + { + "txt": r""" _(((( /O _\/)) >_((((/\)) ((((""", - "esc": []}] + "esc": [], + } + ], }, "bablbam": { "name": "Bablbam", @@ -1421,11 +1613,14 @@ "evolve_lvl": 0, "initiative": 1, "night_active": None, - "ico": [{ - "txt": r""" (.)~ + "ico": [ + { + "txt": r""" (.)~ -)_(-U / ; \ """, - "esc": []}] + "esc": [], + } + ], }, "kakraholt": { "name": "Kakraholt", @@ -1443,20 +1638,27 @@ "evolve_lvl": 0, "initiative": 5, "night_active": None, - "ico": [{ - "txt": r""" _ + "ico": [ + { + "txt": r""" _ O O /( )\ /\|^|/\ """, - "esc": []}, { - "txt": r""" + "esc": [], + }, + { + "txt": r""" ->> ->>""", - "esc": ["yellow"]}, { - "txt": r""" + "esc": ["yellow"], + }, + { + "txt": r""" + + + """, - "esc": ["lightblue"]}] + "esc": ["lightblue"], + }, + ], }, "pavous": { "name": "Pavous", @@ -1474,11 +1676,14 @@ "evolve_lvl": 30, "initiative": 3, "night_active": None, - "ico": [{ - "txt": r""" (0)(0) + "ico": [ + { + "txt": r""" (0)(0) / '' \ w w""", - "esc": []}] + "esc": [], + } + ], }, "uberpavous": { "name": "Uberpavous", @@ -1496,12 +1701,15 @@ "evolve_lvl": 0, "initiative": 5, "night_active": None, - "ico": [{ - "txt": r""" /\~-~/\ + "ico": [ + { + "txt": r""" /\~-~/\ //\0_0/\\ // ''' \\ W W""", - "esc": []}] + "esc": [], + } + ], }, "peachade": { "name": "Peachade", @@ -1519,27 +1727,32 @@ "evolve_lvl": 0, "initiative": 1, "night_active": None, - "ico": [{ - "txt": r""" / __. + "ico": [ + { + "txt": r""" / __. |/_/""", - "esc": ["thicc", "green"] - },{ - "txt": r""" + "esc": ["thicc", "green"], + }, + { + "txt": r""" /o -\ \ (/""", - "esc": ["thicc", "peach"] - },{ - "txt": r""" + "esc": ["thicc", "peach"], + }, + { + "txt": r""" x""", - "esc": ["thicc", "red"] - },{ - "txt": r""" + "esc": ["thicc", "red"], + }, + { + "txt": r""" *""", - "esc": ["thicc", "white"] - }] + "esc": ["thicc", "white"], + }, + ], }, "Pacino": { "name": "Pacino", @@ -1556,13 +1769,15 @@ "evolve_poke": "", "evolve_lvl": "", "initiative": 1, - "ico": [{ - "txt": r""" (-)(-) + "ico": [ + { + "txt": r""" (-)(-) / '' / w w""", - "esc": None}] + "esc": None, + } + ], }, - "pepegus": { "name": "Pepegus", "hp": 21, @@ -1578,12 +1793,15 @@ "evolve_poke": "", "evolve_lvl": 0, "initiative": 2, - "ico": [{ - "txt": r""" ()-() + "ico": [ + { + "txt": r""" ()-() .-(___)-. _< >_ \/ \/""", - "esc": None}] + "esc": None, + } + ], }, } From abaf0422b66bee2d9b806c757af4966ea02940c2 Mon Sep 17 00:00:00 2001 From: lxgr-linux Date: Wed, 17 Sep 2025 00:17:57 +0200 Subject: [PATCH 06/47] Entered some map data in the creation of the map Watermill. Co-Authored-By: amber-codex --- src/pokete/data/attacks.py | 26 +++++++--- src/pokete/data/map_data.py | 88 ++++++++++++++++++++++++++++++++++ src/pokete/data/maps.py | 32 +++++++++++++ src/pokete/data/mapstations.py | 11 +++++ 4 files changed, 151 insertions(+), 6 deletions(-) diff --git a/src/pokete/data/attacks.py b/src/pokete/data/attacks.py index ce3b1258..a9d7aaa4 100644 --- a/src/pokete/data/attacks.py +++ b/src/pokete/data/attacks.py @@ -157,6 +157,20 @@ "is_generic": False, "ap": 20, }, + "poison_wrap": { + "name": "Poison Wrap", + "factor": 1.5, + "action": None, + "world_action": "", + "move": ["attack", "downgrade"], + "miss_chance": 0.2, + "min_lvl": 20, + "desc": "Grapple an enemy into venomous bear hug", + "types": ["poison"], + "effect": "poison", + "is_generic": False, + "ap": 30, + }, # stone attacks "pepple_fire": { "name": "Pebble Fire", @@ -170,7 +184,7 @@ "types": ["stone"], "effect": None, "is_generic": True, - "ap": 5, + "ap": 10, }, "sand_throw": { "name": "Sand Throw", @@ -184,7 +198,7 @@ "types": ["stone"], "effect": None, "is_generic": False, - "ap": 5, + "ap": 10, }, "politure": { "name": "Polish", @@ -240,7 +254,7 @@ "types": ["stone"], "effect": None, "is_generic": True, - "ap": 5, + "ap": 10, }, "dia_stab": { "name": "Dia Stab", @@ -424,7 +438,7 @@ "types": ["fire"], "effect": "burning", "is_generic": True, - "ap": 10, + "ap": 20, }, "fire_ball": { "name": "Fire Ball", @@ -438,7 +452,7 @@ "types": ["fire"], "effect": None, "is_generic": True, - "ap": 10, + "ap": 15, }, # flying attacks "flying": { @@ -949,7 +963,7 @@ "types": ["ice"], "effect": None, "is_generic": True, - "ap": 10, + "ap": 20, }, "spikes": { "name": "Spikes", diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index f6f82d77..9d3c1363 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -4543,6 +4543,94 @@ }, }, }, + + "playmap_52":{ + "hard_obs":{ + "workshop":{ + "x": 30, + "y": 15, + "txt": """ + _________ + / ^ ^ /\ +/________/ \ ______ +|o ___ o| | / ___ /\ +|__| |__|___| |_| |_||""" + }, + "house1":{ + "x": 12, + "y": 28, + "txt": r""" + _________ + / ^ ^ /o\____ +/_______/ / /\ +|o 0 o| /___/ \ +|o ___ o| | o | | +|__| |__|_|___|__|""" + }, + "house2":{ + "x": 42, + "y": 22, + "txt": HOUSE1 + }, + + + }, + "soft_obs":{ + "road_1": { + "x": 1, + "y" : 23, + "txt": """ + + """ + }, + "water_1":{ + "x": 0, + "y": 0, + "txt": r""" +~ +~~ +~~~~ +~~~~~ +~~~~~~ +~~~~~~~ +~~~~~~~~ +~~~~~~~~~ +~~~~~~~~~~~ +~~~~~~~~~~~ +~~~~~~~~~~~~ +~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~""" + }, + }, + "sand_1":{ + "x": 0, + "y": 19, + "txt": r""" +.... +....... +......... + ......... + ......... + ........ + ....... + ........ + ....... + ....... + ....... + ........ + ....... + ....... + ....... + ..... + .....""" + } + + }, + "playmap_53":{} + } if __name__ == "__main__": diff --git a/src/pokete/data/maps.py b/src/pokete/data/maps.py index e2485aa3..12375a13 100644 --- a/src/pokete/data/maps.py +++ b/src/pokete/data/maps.py @@ -596,6 +596,38 @@ "poke_args": None, "weather": None }, + "playmap_52":{ + "height": 70, + "width": 130, + "song": "Map.mp3", + "pretty_name": "Town of Watermill", + "extra_actions": None, + "poke_args": { + "pokes": ["kartmen", "rustacean", "lil_nut", "megapois"], + "minlvl": 1100, + "maxlvl": 1500 + }, + "weather": None + }, + "playmap_53":{ + "height": 25, + "width": 50, + "song": "Map.mp3", + "pretty_name": "workshop", + "extra": None, + "poke_args": None, + "weather": None + + }, + "playmap_54":{ + "height": 10, + "width": 15, + "song": "Map.mp3", + "pretty_name": "workshop", + "extra": None, + "poke_args": None, + "weather": None + } } if __name__ == "__main__": diff --git a/src/pokete/data/mapstations.py b/src/pokete/data/mapstations.py index 8447ac50..36c34524 100644 --- a/src/pokete/data/mapstations.py +++ b/src/pokete/data/mapstations.py @@ -354,6 +354,7 @@ "juiciest and most delicious Mowcow-burgers, cut from the " "happiest and most delicious Mowcows anywhere to find!", "w_next": "playmap_35", + "a_next": "playmap_52", "text": """ #│# P│A ├─┘# @@ -365,6 +366,16 @@ "y": 7 } }, + "playmap_52":{ + "gen":{ + "additionals":["playmap_53", "playmap_54"], + "desc": "The town of Watermill is known for " + "the beautiful plants and wonderful " + "nature reserves.""", + "d_next": "playmap_39", + + } + } } From 1cdd29fa2cccf4059f2ca4c3cf7d0aef84a9ebff Mon Sep 17 00:00:00 2001 From: amber-codex <157549008+amber-codex@users.noreply.github.com> Date: Sun, 4 May 2025 12:23:53 -0400 Subject: [PATCH 07/47] More data for map_data.py regarding pathways, meadows, and fences in Watermill --- src/pokete/data/map_data.py | 140 ++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index 9d3c1363..643c1d5f 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -4626,6 +4626,146 @@ ....... ..... .....""" +<<<<<<< HEAD:src/pokete/data/map_data.py +======= + }, + "pathway_1":{ + "x": 0, + "y": 23, + "txt": r""" + _______________| \_______/ / + | / + |___ __________________/ + \__ \ + \_ \ + \ \ + \ \ + \ \ + | \ + \_ \ _____/ /__________/ / + | \ / / + | \ / _________________/ + \_ \_/ / + \ / + \ __/ + \ \ + \ \ + \ \ + \ \ + | | + """ + }, + "pathway_2": { + "x": 15, + "y": 29, + "txt": r""" +| | +| |_ +\ \ + \ \ +""" + }, + "pathway_3": { + "x": 38, + "y": 32, + "txt": r""" + / / + / / + / / + / / + / / + / / + / / + / / +/ / +""" + }, + "pathway_4": { + "x": 37, + "y": 60, + "txt": r""" + | | + | | + | | +_| | + | +_ | + | | + | | + | |__________ + | + | __________ + | | + | | + | | + | | +\| | + | + | +\ | + \ | + | | + | | + | | | | + | \ / / ___________ + | \ / / / + | \________/ /________/ ________ + | / + ________ _________ \ + \ \ \ \ + \ \ \ \ + \ \ \ \ + | | \ \ + | | | | + | | | | + | | | | + | |_________| | + | / + | ____________/ + | | + | | + | | + | | + | | + + """ + }, + "meadow_1":{ + "x": 12, + "y":20, + "txt": r""" +;;;;;;;;;;; + ;;;;;;;;;;; + ;;;;;;;; + ;;;;;; + ;;;;;;; + ;;;;;;""" + }, + "meadow_2": { + "x": 32, + "y": 8, + "txt": r""" + ;;;; + ;;;;;;; +;;;;;;;;;; +;;;;;;;;;; + ;;;;;;;;;; + ;;;;;;;;;;; + ;;;;;;;;;;; + ;;;;;;;;;""" + }, + "meadow_3":{ + "x": 57, + "y": 31, + "txt": r""" +;;;;;;;; + ;;;;;;;; + ;;;;;;;; + ;;;;;;;;; + ;;;;;;;;; + ;;;;;;;;; +""" +>>>>>>> fc03fd4 (More data for map_data.py regarding pathways, meadows, and fences in Watermill):pokete_data/map_data.py } }, From 8b8defef719319dd099091914886d97682cd6c7e Mon Sep 17 00:00:00 2001 From: amber-codex <157549008+amber-codex@users.noreply.github.com> Date: Sun, 4 May 2025 13:15:53 -0400 Subject: [PATCH 08/47] More map data for Watermill. Doors have entered implementation phase --- src/pokete/data/map_data.py | 1584 ++++++++++++++--------------------- src/pokete/data/maps.py | 6 +- 2 files changed, 645 insertions(+), 945 deletions(-) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index 643c1d5f..d36f9955 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -1,5 +1,6 @@ """This file contains a dict with all Strings that will be - added to the maps""" +added to the maps""" + from pokete.classes.asset_service.resources import ObmapDict # Those are some vars used in map_data @@ -40,14 +41,14 @@ "y": 2, "txt": """ (()(()((())((()((() ())(())))())))()))(() - || ||| ||||| |||||""" + || ||| ||||| |||||""", }, "tree_group_2": { "x": 25, "y": 15, "txt": """ (()(()((())((()((() ())(())))())))()))(() - || ||| ||||| ||||||""" + || ||| ||||| ||||||""", }, "tree_group_3": { "x": 73, @@ -55,33 +56,13 @@ "txt": """ ())) (()))) ())()) - ||||""" - }, - "pokecenter": { - "x": 20, - "y": 0, - "txt": CENTER - }, - "house1": { - "x": 2, - "y": 0, - "txt": HOUSE1 - }, - "house2": { - "x": 5, - "y": 17, - "txt": HOUSE1 - }, - "house3": { - "x": 53, - "y": 17, - "txt": HOUSE1 - }, - "house4": { - "x": 61, - "y": 0, - "txt": HOUSE1 + ||||""", }, + "pokecenter": {"x": 20, "y": 0, "txt": CENTER}, + "house1": {"x": 2, "y": 0, "txt": HOUSE1}, + "house2": {"x": 5, "y": 17, "txt": HOUSE1}, + "house3": {"x": 53, "y": 17, "txt": HOUSE1}, + "house4": {"x": 61, "y": 0, "txt": HOUSE1}, "fence": { "x": 0, "y": 0, @@ -109,7 +90,7 @@ # # # -##########################################################################################""" +##########################################################################################""", }, "tree_group_4": { "x": 2, @@ -117,7 +98,7 @@ "txt": """ ())) (()))) ())()) - ||||""" + ||||""", }, # "cave_1_entrance": { # "x": 60, @@ -146,41 +127,27 @@ ;;;;;;;;;;;;;;; ;;;;;;;;;;;; ;;;;;;;;; -""" +""", }, }, "dors": { "dor_playmap_51_1": { "x": 90, "y": 12, - "args": {"map": "playmap_51", "x": 1, "y": 28} + "args": {"map": "playmap_51", "x": 1, "y": 28}, }, "dor_playmap_51_2": { "x": 90, "y": 13, - "args": {"map": "playmap_51", "x": 1, "y": 29} + "args": {"map": "playmap_51", "x": 1, "y": 29}, }, }, - "special_dors": { - "dor": { - "x": 25, - "y": 4 - } - }, + "special_dors": {"dor": {"x": 25, "y": 4}}, "balls": { - "ball_1": { - "x": 54, - "y": 4 - }, - "ball_2": { - "x": 38, - "y": 16 - }, - "ball_3": { - "x": 78, - "y": 21 - }, - } + "ball_1": {"x": 54, "y": 4}, + "ball_2": {"x": 38, "y": 16}, + "ball_3": {"x": 78, "y": 21}, + }, }, "playmap_2": { "hard_obs": { @@ -192,7 +159,7 @@ ())() (())) ((()) - |||""" + |||""", }, "tree_group_2": { "x": 0, @@ -209,7 +176,7 @@ (((()()))))()(((((()))))))()())()()())))()()()))))))(()()()()()()))))))((()))))()(()))))))))(((((())))))))()))) (()())))))(())))))((((())))((((()))((((()()()))))(()()))))()()(()))))))()(()()))))((()))))))))(((()))))))))))() (()())))))((()()()))()()())))()()))())))))((((()()))))()()()))((((((((()(((((()()()))))(())))))(((())))))))())) -|||||||| |||||| | | | ||| | | | ||||||| | | ||||||| | | | |||||| | | |||| | | || |||| ||| ||| || |||||| || |""" +|||||||| |||||| | | | ||| | | | ||||||| | | ||||||| | | | |||||| | | |||| | | || |||| ||| ||| || |||||| || |""", }, "tree_group_3": { "x": 58, @@ -219,7 +186,7 @@ ())() (())) ((()) - |||""" + |||""", }, "tree_group_4": { "x": 106, @@ -232,7 +199,7 @@ (())) (())) ((()) - ||||""" + ||||""", }, "cave_1_entrance": { "x": 0, @@ -245,7 +212,7 @@ | / / -""" +""", }, }, "soft_obs": { @@ -259,7 +226,7 @@ ;;;;;; ;;;;;; ;;;;;;;;;;;; ;;;;;;;;; - ;;;;;;;""" + ;;;;;;;""", }, "meadow2": { "x": 40, @@ -270,7 +237,7 @@ ;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;; - ;;;;;;""" + ;;;;;;""", }, "meadow3": { "x": 70, @@ -287,36 +254,30 @@ ;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;; - ;;;;;;;;;;""" + ;;;;;;;;;;""", }, }, "dors": { "dor_cave_1": { "x": 1, "y": 5, - "args": {"map": "cave_1", "x": 39, "y": 3} + "args": {"map": "cave_1", "x": 39, "y": 3}, }, "dor_playmap_3_1": { "x": 110, "y": 9, - "args": {"map": "playmap_3", "x": 1, "y": 9} + "args": {"map": "playmap_3", "x": 1, "y": 9}, }, "dor_playmap_3_2": { "x": 110, "y": 10, - "args": {"map": "playmap_3", "x": 1, "y": 10} + "args": {"map": "playmap_3", "x": 1, "y": 10}, }, }, "balls": { - "ball_1": { - "x": 58, - "y": 0 - }, - "ball_2": { - "x": 18, - "y": 4 - }, - } + "ball_1": {"x": 58, "y": 0}, + "ball_2": {"x": 18, "y": 4}, + }, }, "cave_1": { "hard_obs": { @@ -342,38 +303,31 @@ +------+ | | | | | - | |""" + | |""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_51_1": { "x": 14, "y": 20, - "args": {"map": "playmap_51", "x": 21, "y": 1} + "args": {"map": "playmap_51", "x": 21, "y": 1}, }, "dor_playmap_51_2": { "x": 15, "y": 20, - "args": {"map": "playmap_51", "x": 21, "y": 1} + "args": {"map": "playmap_51", "x": 21, "y": 1}, }, "dor_playmap_2": { "x": 40, "y": 3, - "args": {"map": "playmap_2", "x": 2, "y": 5} + "args": {"map": "playmap_2", "x": 2, "y": 5}, }, }, "balls": { - "ball_1": { - "x": 1, - "y": 1 - }, - "ball_2": { - "x": 7, - "y": 12 - }, - } + "ball_1": {"x": 1, "y": 1}, + "ball_2": {"x": 7, "y": 12}, + }, }, "playmap_3": { "hard_obs": { @@ -388,7 +342,7 @@ ())) ())) (()) -|||""" +|||""", }, "tree_group_2": { "x": 0, @@ -398,21 +352,21 @@ ())) )()( (()) -|||""" +|||""", }, "tree_group_3": { "x": 35, "y": 4, "txt": """ ()) ())() - |||""" + |||""", }, "tree_group_5": { "x": 45, "y": 4, "txt": """ ()) ())() - |||""" + |||""", }, "tree_group_6": { "x": 49, @@ -420,7 +374,7 @@ "txt": """ ())) (()))) ())()) - ||||""" + ||||""", }, "tree_group_7": { "x": 51, @@ -428,7 +382,7 @@ "txt": """ ())) (()))) ())()) - ||||""" + ||||""", }, "tree_group_8": { "x": 6, @@ -436,7 +390,7 @@ "txt": """())) ()))) ()()) -||||""" +||||""", }, "tree_group_9": { "x": 31, @@ -444,33 +398,13 @@ "txt": """ ())) (()))) ())()) - ||||""" - }, - "pokecenter": { - "x": 20, - "y": 2, - "txt": CENTER - }, - "shop": { - "x": 56, - "y": 2, - "txt": SHOP - }, - "house2": { - "x": 18, - "y": 11, - "txt": HOUSE1 - }, - "house3": { - "x": 18, - "y": 17, - "txt": HOUSE1 - }, - "house4": { - "x": 58, - "y": 9, - "txt": HOUSE1 + ||||""", }, + "pokecenter": {"x": 20, "y": 2, "txt": CENTER}, + "shop": {"x": 56, "y": 2, "txt": SHOP}, + "house2": {"x": 18, "y": 11, "txt": HOUSE1}, + "house3": {"x": 18, "y": 17, "txt": HOUSE1}, + "house4": {"x": 58, "y": 9, "txt": HOUSE1}, "fence1": { "x": 3, "y": 0, @@ -483,7 +417,7 @@ # # ### -""" +""", }, "fence2": { "x": 45, @@ -514,7 +448,7 @@ # # ################################### -#""" +#""", }, "fence3": { "x": 3, @@ -534,7 +468,7 @@ # # ################################## - #""" + #""", }, }, "soft_obs": { @@ -547,84 +481,84 @@ ;;;;;;;;;;;;;; ;;;;;;;;;;;;; ;;;;;;;;;;; - ;;;;;;;""" + ;;;;;;;""", }, }, "dors": { "dor_playmap_2_1": { "x": 0, "y": 9, - "args": {"map": "playmap_2", "x": 109, "y": 9} + "args": {"map": "playmap_2", "x": 109, "y": 9}, }, "dor_playmap_2_2": { "x": 0, "y": 10, - "args": {"map": "playmap_2", "x": 109, "y": 10} + "args": {"map": "playmap_2", "x": 109, "y": 10}, }, "dor_playmap_4_1": { "x": 39, "y": 0, - "args": {"map": "playmap_4", "x": 29, "y": 58} + "args": {"map": "playmap_4", "x": 29, "y": 58}, }, "dor_playmap_4_2": { "x": 40, "y": 0, - "args": {"map": "playmap_4", "x": 29, "y": 58} + "args": {"map": "playmap_4", "x": 29, "y": 58}, }, "dor_playmap_4_3": { "x": 41, "y": 0, - "args": {"map": "playmap_4", "x": 29, "y": 58} + "args": {"map": "playmap_4", "x": 29, "y": 58}, }, "dor_playmap_4_4": { "x": 42, "y": 0, - "args": {"map": "playmap_4", "x": 30, "y": 58} + "args": {"map": "playmap_4", "x": 30, "y": 58}, }, "dor_playmap_4_5": { "x": 43, "y": 0, - "args": {"map": "playmap_4", "x": 30, "y": 58} + "args": {"map": "playmap_4", "x": 30, "y": 58}, }, "dor_playmap_4_6": { "x": 44, "y": 0, - "args": {"map": "playmap_4", "x": 30, "y": 58} + "args": {"map": "playmap_4", "x": 30, "y": 58}, }, "dor_playmap_6_1": { "x": 39, "y": 26, - "args": {"map": "playmap_6", "x": 29, "y": 1} + "args": {"map": "playmap_6", "x": 29, "y": 1}, }, "dor_playmap_6_2": { "x": 40, "y": 26, - "args": {"map": "playmap_6", "x": 29, "y": 1} + "args": {"map": "playmap_6", "x": 29, "y": 1}, }, "dor_playmap_6_3": { "x": 41, "y": 26, - "args": {"map": "playmap_6", "x": 29, "y": 1} + "args": {"map": "playmap_6", "x": 29, "y": 1}, }, "dor_playmap_6_4": { "x": 42, "y": 26, - "args": {"map": "playmap_6", "x": 30, "y": 1} + "args": {"map": "playmap_6", "x": 30, "y": 1}, }, "dor_playmap_6_5": { "x": 43, "y": 26, - "args": {"map": "playmap_6", "x": 30, "y": 1} + "args": {"map": "playmap_6", "x": 30, "y": 1}, }, "dor_playmap_6_6": { "x": 44, "y": 26, - "args": {"map": "playmap_6", "x": 30, "y": 1} + "args": {"map": "playmap_6", "x": 30, "y": 1}, }, "dor_playmap_49": { "x": 22, "y": 15, - "args": {"map": "playmap_49", "x": 11, "y": 7} + "args": {"map": "playmap_49", "x": 11, "y": 7}, }, }, "special_dors": { @@ -635,22 +569,13 @@ "shopdor": { "x": 61, "y": 6, - } + }, }, "balls": { - "ball_1": { - "x": 56, - "y": 13 - }, - "ball_2": { - "x": 22, - "y": 21 - }, - "ball_3": { - "x": 6, - "y": 2 - }, - } + "ball_1": {"x": 56, "y": 13}, + "ball_2": {"x": 22, "y": 21}, + "ball_3": {"x": 6, "y": 2}, + }, }, "playmap_4": { "hard_obs": { @@ -662,14 +587,14 @@ ())))((((((()()()))() ()()))()((((((((((() ()))))))()((((((((())))))) (((()()))))(((((((()()()) ()()()))))()()()())))((())))) (((())()(((()()(()((((((()))) -|||| || | |||| | |||| | | || || |||| | ||| ||||| |||| |||""" +|||| || | |||| | |||| | | || || |||| | ||| ||||| |||| |||""", }, "tree_group_2": { "x": 29, "y": 33, "txt": """ (()(((()())))())((())((()((()) (())))()))())(())))())))()))(() - || ||| ||||| ||| ||||| |||||||""" + || ||| ||||| ||| ||||| |||||||""", }, "tree_group_3": { "x": 0, @@ -677,14 +602,14 @@ "txt": """ (()(((()())))())((())((()((()) ()) (())))()))())(())))()))))())()))(() -|||||| ||||| ||| | || |||| ||| |||""" +|||||| ||||| ||| | || |||| ||| |||""", }, "tree_group_4": { "x": 0, "y": 42, "txt": """ ())() ())())) - |||||""" + |||||""", }, "tree_group_5": { "x": 56, @@ -701,7 +626,7 @@ ((() ())) (()) - |||""" + |||""", }, }, "soft_obs": { @@ -717,7 +642,7 @@ ;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;; - ;;;;;;;;""" + ;;;;;;;;""", }, "meadow2": { "x": 0, @@ -729,7 +654,7 @@ ;;;;;;;; ;;;;;; ;;;;;;;;;;;;; ;;;;;;;;;; - ;;;;;;;""" + ;;;;;;;""", }, "water1": { "x": 0, @@ -745,45 +670,36 @@ ~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~ ~~~~~~~~~ ~~~~~~~~ -~~~""" +~~~""", }, }, "dors": { "dor_playmap_3_1": { "x": 29, "y": 59, - "args": {"map": "playmap_3", "x": 41, "y": 1} + "args": {"map": "playmap_3", "x": 41, "y": 1}, }, "dor_playmap_3_2": { "x": 30, "y": 59, - "args": {"map": "playmap_3", "x": 42, "y": 1} + "args": {"map": "playmap_3", "x": 42, "y": 1}, }, "dor_playmap_28_1": { "x": 59, "y": 22, - "args": {"map": "playmap_28", "x": 1, "y": 40} + "args": {"map": "playmap_28", "x": 1, "y": 40}, }, "dor_playmap_28_2": { "x": 59, "y": 23, - "args": {"map": "playmap_28", "x": 1, "y": 41} + "args": {"map": "playmap_28", "x": 1, "y": 41}, }, }, "balls": { - "ball_1": { - "x": 0, - "y": 44 - }, - "ball_2": { - "x": 46, - "y": 35 - }, - "ball_3": { - "x": 8, - "y": 32 - }, - } + "ball_1": {"x": 0, "y": 44}, + "ball_2": {"x": 46, "y": 35}, + "ball_3": {"x": 8, "y": 32}, + }, }, "playmap_5": { "hard_obs": { @@ -806,20 +722,18 @@ | | | | | | +-+ | | - | |""" + | |""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_4": { "x": 17, "y": 17, - "args": {"map": "playmap_4", "x": 56, "y": 2} + "args": {"map": "playmap_4", "x": 56, "y": 2}, }, }, - "balls": { - } + "balls": {}, }, "playmap_6": { "hard_obs": { @@ -857,7 +771,7 @@ \ \_______ \ \ \ \ \_______ \ \ \ \___________ \_______ \ \ \ \ \ - \ \ \ \ \_________________ \ """ + \ \ \ \ \_________________ \ """, }, "tree_group_1": { "x": 0, @@ -867,7 +781,7 @@ (())) |||| ||| | |||| ||||| )(()) ()))) - |||""" + |||""", }, "tree_group_2": { "x": 31, @@ -931,8 +845,8 @@ ()))( ()()()()()()()(() (()))))()()())(()) - ||| ||| ||| || ||""" - } + ||| ||| ||| || ||""", + }, }, "soft_obs": { "meadow1": { @@ -950,7 +864,7 @@ ;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;; - ;;;;;;;;;;""" + ;;;;;;;;;;""", }, "meadow2": { "x": 2, @@ -962,7 +876,7 @@ ;;;;;;;;;; ;;;;;;;;; ;;;;;;; - ;;;;""" + ;;;;""", }, "meadow3": { "x": 29, @@ -973,7 +887,7 @@ ;;;;;;;;;;;;;; ;;;;;;;;;;;;; ;;;;;;;;;;; - ;;;;;;;""" + ;;;;;;;""", }, "meadow4": { "x": 28, @@ -984,42 +898,39 @@ ;;;;;;;;;;;;;; ;;;;;;;;;;;;; ;;;;;;;;;;; - ;;;;;;;""" - } + ;;;;;;;""", + }, }, "dors": { "dor_playmap_3_1": { "x": 29, "y": 0, - "args": {"map": "playmap_3", "x": 41, "y": 25} + "args": {"map": "playmap_3", "x": 41, "y": 25}, }, "dor_playmap_3_2": { "x": 30, "y": 0, - "args": {"map": "playmap_3", "x": 42, "y": 25} + "args": {"map": "playmap_3", "x": 42, "y": 25}, }, "dor_playmap_7": { "x": 2, "y": 34, - "args": {"map": "playmap_7", "x": 27, "y": 12} + "args": {"map": "playmap_7", "x": 27, "y": 12}, }, "dor_playmap_8_1": { "x": 59, "y": 46, - "args": {"map": "playmap_8", "x": 1, "y": 9} + "args": {"map": "playmap_8", "x": 1, "y": 9}, }, "dor_playmap_8_2": { "x": 59, "y": 47, - "args": {"map": "playmap_8", "x": 1, "y": 10} + "args": {"map": "playmap_8", "x": 1, "y": 10}, }, }, "balls": { - "ball_1": { - "x": 42, - "y": 42 - }, - } + "ball_1": {"x": 42, "y": 42}, + }, }, "playmap_7": { "hard_obs": { @@ -1045,32 +956,22 @@ | | +---------+ | | | - +---+""" + +---+""", } }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_6": { "x": 28, "y": 12, - "args": {"map": "playmap_6", "x": 3, "y": 34} + "args": {"map": "playmap_6", "x": 3, "y": 34}, }, }, "balls": { - "ball_1": { - "x": 19, - "y": 18 - }, - "ball_2": { - "x": 23, - "y": 7 - }, - "ball_3": { - "x": 1, - "y": 6 - }, - } + "ball_1": {"x": 19, "y": 18}, + "ball_2": {"x": 23, "y": 7}, + "ball_3": {"x": 1, "y": 6}, + }, }, "playmap_8": { "hard_obs": { @@ -1085,7 +986,7 @@ )()) )()( (()) -|||""" +|||""", }, "tree_group_2": { "x": 0, @@ -1098,7 +999,7 @@ )()) ())) )()((())))))())()())))()()() () () ()) ()) ())(((()((()()))()()((()))))()) (())))))()())))()()))())())))())()()) ()(((()()(())()))()()((())))))(()))()))()) -||||| || ||| ||| ||| | ||||| ||| ||| ||| ||||| | |||| || ||| | ||||| |||| |||""" +||||| || ||| ||| ||| | ||||| ||| ||| ||| ||||| | |||| || ||| | ||||| |||| |||""", }, "tree_group_3": { "x": 34, @@ -1109,7 +1010,7 @@ (())) ((()) ((()) - |||""" + |||""", }, "tree_group_4": { "x": 76, @@ -1122,18 +1023,10 @@ ())) (()( (()) - |||""" - }, - "house1": { - "x": 40, - "y": 0, - "txt": HOUSE1 - }, - "house2": { - "x": 46, - "y": 10, - "txt": HOUSE1 + |||""", }, + "house1": {"x": 40, "y": 0, "txt": HOUSE1}, + "house2": {"x": 46, "y": 10, "txt": HOUSE1}, }, "soft_obs": { "meadow1": { @@ -1147,7 +1040,7 @@ ;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;; - ;;;;;;;;;""" + ;;;;;;;;;""", }, "meadow2": { "x": 57, @@ -1158,60 +1051,51 @@ ;;;;;;;;;;;;;; ;;;;;;;;;;;;; ;;;;;;;;;;; - ;;;;;;;""" + ;;;;;;;""", }, }, "dors": { "dor_playmap_6_1": { "x": 0, "y": 9, - "args": {"map": "playmap_6", "x": 58, "y": 46} + "args": {"map": "playmap_6", "x": 58, "y": 46}, }, "dor_playmap_6_2": { "x": 0, "y": 10, - "args": {"map": "playmap_6", "x": 58, "y": 47} + "args": {"map": "playmap_6", "x": 58, "y": 47}, }, "dor_playmap_9": { "x": 44, "y": 4, - "args": {"map": "playmap_9", "x": 14, "y": 10} + "args": {"map": "playmap_9", "x": 14, "y": 10}, }, "dor_playmap_10": { "x": 50, "y": 14, - "args": {"map": "playmap_10", "x": 11, "y": 7} + "args": {"map": "playmap_10", "x": 11, "y": 7}, }, "dor_playmap_11": { "x": 37, "y": 19, - "args": {"map": "playmap_11", "x": 37, "y": 1} + "args": {"map": "playmap_11", "x": 37, "y": 1}, }, "dor_playmap_12_1": { "x": 79, "y": 9, - "args": {"map": "playmap_12", "x": 1, "y": 6} + "args": {"map": "playmap_12", "x": 1, "y": 6}, }, "dor_playmap_12_2": { "x": 79, "y": 10, - "args": {"map": "playmap_12", "x": 1, "y": 7} + "args": {"map": "playmap_12", "x": 1, "y": 7}, }, }, "balls": { - "ball_1": { - "x": 3, - "y": 8 - }, - "ball_2": { - "x": 34, - "y": 0 - }, - "ball_3": { - "x": 58, - "y": 14 - }, - } + "ball_1": {"x": 3, "y": 8}, + "ball_2": {"x": 34, "y": 0}, + "ball_3": {"x": 58, "y": 14}, + }, }, "playmap_9": { "hard_obs": { @@ -1227,24 +1111,20 @@ |# | | ########| |___________ ___#_______| -|__________| |__________|""" +|__________| |__________|""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_8": { "x": 14, "y": 11, - "args": {"map": "playmap_8", "x": 44, "y": 5} + "args": {"map": "playmap_8", "x": 44, "y": 5}, }, }, "balls": { - "ball_1": { - "x": 25, - "y": 4 - }, - } + "ball_1": {"x": 25, "y": 4}, + }, }, "playmap_10": { "hard_obs": { @@ -1257,20 +1137,18 @@ | | | | |_______ _______| - |______| |______|""" + |______| |______|""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_8": { "x": 11, "y": 8, - "args": {"map": "playmap_8", "x": 50, "y": 15} + "args": {"map": "playmap_8", "x": 50, "y": 15}, }, }, - "balls": { - }, + "balls": {}, }, "playmap_11": { "hard_obs": { @@ -1282,7 +1160,7 @@ (())) |||| ||| | |||| ||||| ||| ||| )(()) ()))) -||||""" +||||""", }, "tree_group_2": { "x": 38, @@ -1292,20 +1170,16 @@ || || |||| || | ()(() (()() ()(() - ||||""" + ||||""", }, "tree_group_3": { "x": 42, "y": 8, "txt": """ ())() ())())) - |||||""" - }, - "house1": { - "x": 7, - "y": 4, - "txt": HOUSE1 + |||||""", }, + "house1": {"x": 7, "y": 4, "txt": HOUSE1}, }, "soft_obs": { "water1": { @@ -1326,22 +1200,13 @@ "dor_playmap_8": { "x": 37, "y": 0, - "args": {"map": "playmap_8", "x": 37, "y": 18} + "args": {"map": "playmap_8", "x": 37, "y": 18}, }, }, "balls": { - "ball_1": { - "x": 0, - "y": 6 - }, - "ball_2": { - "x": 54, - "y": 2 - }, - "ball_3": { - "x": 48, - "y": 10 - }, + "ball_1": {"x": 0, "y": 6}, + "ball_2": {"x": 54, "y": 2}, + "ball_3": {"x": 48, "y": 10}, }, }, "playmap_12": { @@ -1363,7 +1228,7 @@ ())) (()))( ()() (((( ))() ()))()()())) ()())) )))) ()))) ())))))()))))) ())())() ()))() ((()) -())))()(()()()((()()()()()()()())(()()(()()()()))((())())(()(()))(())()(()))()()""" +())))()(()()()((()()()()()()()())(()()(()()()()))((())())(()(()))(())()(()))()()""", }, }, "soft_obs": { @@ -1381,7 +1246,7 @@ ;;;;;;;;;;;; ;;;;;;;;;;;; ;;;;;;;;;;; - ;;;;;;;;;""" + ;;;;;;;;;""", }, "meadow_2": { "x": 32, @@ -1394,7 +1259,7 @@ ;;;;;;;;; ;;;;;;; ;;;;;; - ;;;;""" + ;;;;""", }, "meadow_3": { "x": 41, @@ -1402,7 +1267,7 @@ "txt": """ ;;;; ;;;;;; ;;;;; - ;;;""" + ;;;""", }, "meadow_4": { "x": 46, @@ -1413,7 +1278,7 @@ ;;;;;;;; ;;;;;; ;;;; - ;;""" + ;;""", }, "meadow_5": { "x": 63, @@ -1423,53 +1288,41 @@ ;;;;;;;;;;;; ;;;;;;;;;;; ;;;;;;;;; - ;;;;;""" + ;;;;;""", }, }, "dors": { "dor_playmap_8_1": { "x": 0, "y": 6, - "args": {"map": "playmap_8", "x": 78, "y": 9} + "args": {"map": "playmap_8", "x": 78, "y": 9}, }, "dor_playmap_8_2": { "x": 0, "y": 7, - "args": {"map": "playmap_8", "x": 78, "y": 10} + "args": {"map": "playmap_8", "x": 78, "y": 10}, }, "dor_playmap_13_1": { "x": 70, "y": 0, - "args": {"map": "playmap_13", "x": 34, "y": 33} + "args": {"map": "playmap_13", "x": 34, "y": 33}, }, "dor_playmap_13_2": { "x": 71, "y": 0, - "args": {"map": "playmap_13", "x": 35, "y": 33} + "args": {"map": "playmap_13", "x": 35, "y": 33}, }, "dor_playmap_13_3": { "x": 72, "y": 0, - "args": {"map": "playmap_13", "x": 36, "y": 33} + "args": {"map": "playmap_13", "x": 36, "y": 33}, }, }, "balls": { - "ball_1": { - "x": 28, - "y": 7 - }, - "ball_2": { - "x": 35, - "y": 1 - }, - "ball_3": { - "x": 57, - "y": 10 - }, - "ball_4": { - "x": 5, - "y": 13 - }, + "ball_1": {"x": 28, "y": 7}, + "ball_2": {"x": 35, "y": 1}, + "ball_3": {"x": 57, "y": 10}, + "ball_4": {"x": 5, "y": 13}, }, }, "playmap_13": { @@ -1512,48 +1365,16 @@ ()()) ()))) (()))((((()()()()()(((()()))(())) (())(((()(((()((()())(((()()())( ()()))((()()()))()(()(((()()(((()) (()())((()()()()()()))()))((())() -""" - }, - "pokecenter": { - "x": 9, - "y": 25, - "txt": CENTER - }, - "shop": { - "x": 47, - "y": 25, - "txt": SHOP - }, - "house1": { - "x": 47, - "y": 4, - "txt": HOUSE1 - }, - "house2": { - "x": 47, - "y": 10, - "txt": HOUSE1 - }, - "house3": { - "x": 47, - "y": 16, - "txt": HOUSE1 - }, - "house4": { - "x": 10, - "y": 4, - "txt": HOUSE1 - }, - "house5": { - "x": 10, - "y": 10, - "txt": HOUSE1 - }, - "house6": { - "x": 10, - "y": 16, - "txt": HOUSE1 +""", }, + "pokecenter": {"x": 9, "y": 25, "txt": CENTER}, + "shop": {"x": 47, "y": 25, "txt": SHOP}, + "house1": {"x": 47, "y": 4, "txt": HOUSE1}, + "house2": {"x": 47, "y": 10, "txt": HOUSE1}, + "house3": {"x": 47, "y": 16, "txt": HOUSE1}, + "house4": {"x": 10, "y": 4, "txt": HOUSE1}, + "house5": {"x": 10, "y": 10, "txt": HOUSE1}, + "house6": {"x": 10, "y": 16, "txt": HOUSE1}, }, "soft_obs": { "meadow_1": { @@ -1564,39 +1385,39 @@ ;;;;;;;;;;;; ;;;;;;;;;;; ;;;;;;;;; - ;;;;;""" + ;;;;;""", }, }, "dors": { "dor_playmap_12_1": { "x": 34, "y": 34, - "args": {"map": "playmap_12", "x": 70, "y": 1} + "args": {"map": "playmap_12", "x": 70, "y": 1}, }, "dor_playmap_12_2": { "x": 35, "y": 34, - "args": {"map": "playmap_12", "x": 71, "y": 1} + "args": {"map": "playmap_12", "x": 71, "y": 1}, }, "dor_playmap_12_3": { "x": 36, "y": 34, - "args": {"map": "playmap_12", "x": 72, "y": 1} + "args": {"map": "playmap_12", "x": 72, "y": 1}, }, "dor_playmap_14_1": { "x": 32, "y": 4, - "args": {"map": "playmap_14", "x": 14, "y": 13} + "args": {"map": "playmap_14", "x": 14, "y": 13}, }, "dor_playmap_14_2": { "x": 33, "y": 4, - "args": {"map": "playmap_14", "x": 15, "y": 13} + "args": {"map": "playmap_14", "x": 15, "y": 13}, }, "dor_playmap_20": { "x": 51, "y": 14, - "args": {"map": "playmap_20", "x": 11, "y": 7} + "args": {"map": "playmap_20", "x": 11, "y": 7}, }, }, "special_dors": { @@ -1607,22 +1428,13 @@ "shopdor": { "x": 52, "y": 29, - } + }, }, "balls": { - "ball_1": { - "x": 14, - "y": 14 - }, - "ball_2": { - "x": 65, - "y": 13 - }, - "ball_3": { - "x": 64, - "y": 32 - }, - } + "ball_1": {"x": 14, "y": 14}, + "ball_2": {"x": 65, "y": 13}, + "ball_3": {"x": 64, "y": 32}, + }, }, "playmap_14": { "hard_obs": { @@ -1641,35 +1453,33 @@ | | | | |___________ ____________| -|__________| |___________|""" +|__________| |___________|""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_13_1": { "x": 14, "y": 14, - "args": {"map": "playmap_13", "x": 32, "y": 5} + "args": {"map": "playmap_13", "x": 32, "y": 5}, }, "dor_playmap_13_2": { "x": 15, "y": 14, - "args": {"map": "playmap_13", "x": 33, "y": 5} + "args": {"map": "playmap_13", "x": 33, "y": 5}, }, "dor_playmap_15_1": { "x": 14, "y": 3, - "args": {"map": "playmap_15", "x": 33, "y": 23} + "args": {"map": "playmap_15", "x": 33, "y": 23}, }, "dor_playmap_15_2": { "x": 15, "y": 3, - "args": {"map": "playmap_15", "x": 34, "y": 23} + "args": {"map": "playmap_15", "x": 34, "y": 23}, }, }, - "balls": { - } + "balls": {}, }, "playmap_15": { "hard_obs": { @@ -1701,7 +1511,7 @@ ()())((())()))(()())))()()))()() ()))((()()()((()()())))((()()(((()()(((()()))((()()()()((((()()))(()()(()))))((()()) ())))()()(((((())((()))(())())))) (()((()))((())(()(()(()))()(())))((()()()()()(((()))((()()()((()()(((()()())))((()))) | |||| ||| ||||| |||| ||| |||||| || ||||| ||| ||| || ||| |||| ||| ||| || | |||||| ||||||| | |||||| ||||| ||||| |||||| -""" +""", }, }, "soft_obs": { @@ -1721,7 +1531,7 @@ ;;;;;;;;;;;; ;;;;;;;;;;; ;;;;;;;;; - ;;;;""" + ;;;;""", }, "meadow2": { "x": 10, @@ -1732,7 +1542,7 @@ ;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;; - ;;;;;;;;;;""" + ;;;;;;;;;;""", }, "meadow3": { "x": 6, @@ -1743,7 +1553,7 @@ ;;;;;;;; ;;;;;; ;;;; - ;;""" + ;;""", }, "meadow4": { "x": 55, @@ -1753,7 +1563,7 @@ ;;;;;;;;;;;; ;;;;;;;;;;; ;;;;;;;;; - ;;;;;""" + ;;;;;""", }, "meadow5": { "x": 74, @@ -1763,7 +1573,7 @@ ;;;;;;;;;;;; ;;;;;;;;;;; ;;;;;;;;; - ;;;;;""" + ;;;;;""", }, "meadow6": { "x": 39, @@ -1771,45 +1581,36 @@ "txt": """ ;;;; ;;;;;; ;;;;; - ;;;""" + ;;;""", }, }, "dors": { "dor_playmap_14_1": { "x": 33, "y": 24, - "args": {"map": "playmap_14", "x": 14, "y": 4} + "args": {"map": "playmap_14", "x": 14, "y": 4}, }, "dor_playmap_14_2": { "x": 34, "y": 24, - "args": {"map": "playmap_14", "x": 15, "y": 4} + "args": {"map": "playmap_14", "x": 15, "y": 4}, }, "dor_playmap_16_1": { "x": 119, "y": 12, - "args": {"map": "playmap_16", "x": 1, "y": 8} + "args": {"map": "playmap_16", "x": 1, "y": 8}, }, "dor_playmap_16_2": { "x": 119, "y": 13, - "args": {"map": "playmap_16", "x": 1, "y": 9} + "args": {"map": "playmap_16", "x": 1, "y": 9}, }, }, "balls": { - "ball_1": { - "x": 114, - "y": 2 - }, - "ball_2": { - "x": 68, - "y": 11 - }, - "ball_3": { - "x": 5, - "y": 2 - }, - } + "ball_1": {"x": 114, "y": 2}, + "ball_2": {"x": 68, "y": 11}, + "ball_3": {"x": 5, "y": 2}, + }, }, "playmap_16": { "hard_obs": { @@ -1832,19 +1633,15 @@ )))) ()(())) ())) ()() ||||| ()() )())) (())) -)())())((()()()()()))(()))()()))())())()(()((()(()(()))()()))()))""" - }, - "house1": { - "x": 46, - "y": 2, - "txt": HOUSE1 +)())())((()()()()()))(()))()()))())())()(()((()(()(()))()()))()))""", }, + "house1": {"x": 46, "y": 2, "txt": HOUSE1}, "tree_group_2": { "x": 37, "y": 4, "txt": """ ())() ())())) - |||||""" + |||||""", }, }, "soft_obs": { @@ -1859,7 +1656,7 @@ ;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;; ;;;;;;;;;;;; - ;;;;;""" + ;;;;;""", }, "meadow2": { "x": 42, @@ -1869,50 +1666,41 @@ ;;;;;;;;;;;; ;;;;;;;;;;; ;;;;;;;;; - ;;;;;""" + ;;;;;""", }, }, "dors": { "dor_playmap_15_1": { "x": 0, "y": 8, - "args": {"map": "playmap_15", "x": 118, "y": 12} + "args": {"map": "playmap_15", "x": 118, "y": 12}, }, "dor_playmap_15_2": { "x": 0, "y": 9, - "args": {"map": "playmap_15", "x": 118, "y": 13} + "args": {"map": "playmap_15", "x": 118, "y": 13}, }, "dor_playmap_17": { "x": 50, "y": 6, - "args": {"map": "playmap_17", "x": 11, "y": 7} + "args": {"map": "playmap_17", "x": 11, "y": 7}, }, "dor_playmap_18_1": { "x": 64, "y": 8, - "args": {"map": "playmap_18", "x": 1, "y": 11} + "args": {"map": "playmap_18", "x": 1, "y": 11}, }, "dor_playmap_18_2": { "x": 64, "y": 9, - "args": {"map": "playmap_18", "x": 1, "y": 12} + "args": {"map": "playmap_18", "x": 1, "y": 12}, }, }, "balls": { - "ball_1": { - "x": 5, - "y": 1 - }, - "ball_2": { - "x": 59, - "y": 15 - }, - "ball_3": { - "x": 43, - "y": 6 - }, - } + "ball_1": {"x": 5, "y": 1}, + "ball_2": {"x": 59, "y": 15}, + "ball_3": {"x": 43, "y": 6}, + }, }, "playmap_17": { "hard_obs": { @@ -1925,20 +1713,18 @@ | | | | |_______ _______| - |______| |______|""" + |______| |______|""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_16": { "x": 11, "y": 8, - "args": {"map": "playmap_16", "x": 50, "y": 7} + "args": {"map": "playmap_16", "x": 50, "y": 7}, }, }, - "balls": { - }, + "balls": {}, }, "playmap_18": { "hard_obs": { @@ -1967,7 +1753,7 @@ ())) _____/ ____/ / / / (())) ________/ _____/ / / / (())()())))(())()()))((()()()()()(())(())) ___/ ________/ ______/ / ___/ -((())()()))((()())(((()()(()(()))(()(())())/ / / / /""" +((())()()))((()())(((()()(()(()))(()(())())/ / / / /""", }, }, "soft_obs": { @@ -1981,7 +1767,7 @@ ;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;; ;;;;;;;;;;; - ;;;;;;;""" + ;;;;;;;""", }, "meadow2": { "x": 29, @@ -1992,7 +1778,7 @@ ;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;; ;;;;;;;;; - ;;;;""" + ;;;;""", }, "meadow3": { "x": 45, @@ -2000,7 +1786,7 @@ "txt": """;; ;;;;;;;;;; ;;;;;;;; - ;;;;""" + ;;;;""", }, "meadow4": { "x": 89, @@ -2012,7 +1798,7 @@ ;;;;; ;;; ; -""" +""", }, "water4": { "x": 72, @@ -2026,57 +1812,39 @@ ~~~~~~~~ ~~~~~~ ~~~~ - ~~""" + ~~""", }, }, "dors": { "dor_playmap_16_1": { "x": 0, "y": 11, - "args": {"map": "playmap_16", "x": 63, "y": 8} + "args": {"map": "playmap_16", "x": 63, "y": 8}, }, "dor_playmap_16_2": { "x": 0, "y": 12, - "args": {"map": "playmap_16", "x": 63, "y": 9} + "args": {"map": "playmap_16", "x": 63, "y": 9}, }, "dor_playmap_19_1": { "x": 52, "y": 1, - "args": {"map": "playmap_19", "x": 13, "y": 28} + "args": {"map": "playmap_19", "x": 13, "y": 28}, }, "dor_playmap_19_2": { "x": 94, "y": 8, - "args": {"map": "playmap_19", "x": 35, "y": 25} + "args": {"map": "playmap_19", "x": 35, "y": 25}, }, }, "balls": { - "ball_1": { - "x": 43, - "y": 2 - }, - "ball_2": { - "x": 51, - "y": 13 - }, - "ball_3": { - "x": 42, - "y": 21 - }, - "ball_4": { - "x": 12, - "y": 17 - }, - "ball_5": { - "x": 73, - "y": 0 - }, - "ball_6": { - "x": 90, - "y": 14 - }, - } + "ball_1": {"x": 43, "y": 2}, + "ball_2": {"x": 51, "y": 13}, + "ball_3": {"x": 42, "y": 21}, + "ball_4": {"x": 12, "y": 17}, + "ball_5": {"x": 73, "y": 0}, + "ball_6": {"x": 90, "y": 14}, + }, }, "playmap_19": { "hard_obs": { @@ -2112,47 +1880,37 @@ | | \---------+ | | | | - | |""" + | |""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_18_1": { "x": 13, "y": 29, - "args": {"map": "playmap_18", "x": 52, "y": 2} + "args": {"map": "playmap_18", "x": 52, "y": 2}, }, "dor_playmap_18_2": { "x": 34, "y": 25, - "args": {"map": "playmap_18", "x": 93, "y": 8} + "args": {"map": "playmap_18", "x": 93, "y": 8}, }, "dor_playmap_21_1": { "x": 26, "y": 0, - "args": {"map": "playmap_21", "x": 5, "y": 25} + "args": {"map": "playmap_21", "x": 5, "y": 25}, }, "dor_playmap_21_2": { "x": 27, "y": 0, - "args": {"map": "playmap_21", "x": 5, "y": 25} + "args": {"map": "playmap_21", "x": 5, "y": 25}, }, }, "balls": { - "ball_1": { - "x": 46, - "y": 13 - }, - "ball_2": { - "x": 9, - "y": 5 - }, - "ball_3": { - "x": 42, - "y": 8 - }, - } + "ball_1": {"x": 46, "y": 13}, + "ball_2": {"x": 9, "y": 5}, + "ball_3": {"x": 42, "y": 8}, + }, }, "intromap": { "hard_obs": { @@ -2165,20 +1923,18 @@ | | | | |_______ _______| - |______| |______|""" + |______| |______|""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_1": { "x": 11, "y": 8, - "args": {"map": "playmap_1", "x": 6, "y": 5} + "args": {"map": "playmap_1", "x": 6, "y": 5}, }, }, - "balls": { - }, + "balls": {}, }, "playmap_20": { "hard_obs": { @@ -2191,20 +1947,18 @@ | | | | |_______ _______| - |______| |______|""" + |______| |______|""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_13": { "x": 11, "y": 8, - "args": {"map": "playmap_13", "x": 51, "y": 15} + "args": {"map": "playmap_13", "x": 51, "y": 15}, }, }, - "balls": { - }, + "balls": {}, }, "playmap_21": { "hard_obs": { @@ -2241,7 +1995,7 @@ \____ \ _______/ _________________/ / ___/ \___ \___ (())()(())))()))(()))))()))()((()())(())(((()((()((()(((()(()((()) _____/ __________________/ ___/ / \ \ \(()()))(()(()))())()))()()()(()))((()))()())())((((())(()((()))()())/ / / / / -""" +""", }, "tree_group_2": { "x": 21, @@ -2249,7 +2003,7 @@ "txt": """ ())) (()))) ())()) - ||||""" + ||||""", }, "tree_group_3": { "x": 35, @@ -2257,7 +2011,7 @@ "txt": """ ())) (()))) ())()) - ||||""" + ||||""", }, "tree_group_4": { "x": 60, @@ -2265,7 +2019,7 @@ "txt": """ ())) (()))) ())()) - ||||""" + ||||""", }, "tree_group_5": { "x": 60, @@ -2275,7 +2029,7 @@ ())()) )()))) ()))() - ||||""" + ||||""", }, "tree_group_6": { "x": 111, @@ -2283,7 +2037,7 @@ "txt": """ (())()) ()()))(() (((()(()) - ||| |||""" + ||| |||""", }, "tree_group_7": { "x": 100, @@ -2291,7 +2045,7 @@ "txt": """ ())) (()))) ())()) - ||||""" + ||||""", }, "tree_group_8": { "x": 4, @@ -2299,7 +2053,7 @@ "txt": """ ())) (()))) ())()) - ||||""" + ||||""", }, "tree_group_9": { "x": 28, @@ -2308,18 +2062,10 @@ ()()))(()() ()))()))()) (((()(()))) - ||||| |||""" - }, - "pokecenter": { - "x": 5, - "y": 3, - "txt": CENTER - }, - "shop": { - "x": 29, - "y": 3, - "txt": SHOP + ||||| |||""", }, + "pokecenter": {"x": 5, "y": 3, "txt": CENTER}, + "shop": {"x": 29, "y": 3, "txt": SHOP}, "hotel": { "x": 43, "y": 18, @@ -2329,7 +2075,7 @@ /___Hotel!___/ \ | ## ## | ## | | ____ | | -|____| |____|____|""" +|____| |____|____|""", }, "townhall": { "x": 108, @@ -2342,23 +2088,11 @@ /____________/ \ | ## ____ ## | ## | | ## | | ## | | -|____| |____|____|""" - }, - "house1": { - "x": 21, - "y": 20, - "txt": HOUSE1 - }, - "house2": { - "x": 69, - "y": 20, - "txt": HOUSE1 - }, - "house3": { - "x": 46, - "y": 3, - "txt": HOUSE1 +|____| |____|____|""", }, + "house1": {"x": 21, "y": 20, "txt": HOUSE1}, + "house2": {"x": 69, "y": 20, "txt": HOUSE1}, + "house3": {"x": 46, "y": 3, "txt": HOUSE1}, "house4": { "x": 84, "y": 20, @@ -2366,18 +2100,10 @@ / /\ /_Pokete-Care_/ \#### | # ___ #### | | # -|___| |_______|_######""" - }, - "house5": { - "x": 130, - "y": 6, - "txt": HOUSE1 - }, - "house6": { - "x": 72, - "y": 2, - "txt": HOUSE1 +|___| |_______|_######""", }, + "house5": {"x": 130, "y": 6, "txt": HOUSE1}, + "house6": {"x": 72, "y": 2, "txt": HOUSE1}, }, "soft_obs": { "water1": { @@ -2391,74 +2117,74 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~ - ~~~~~~~~""" + ~~~~~~~~""", } }, "dors": { "dor_playmap_19": { "x": 5, "y": 25, - "args": {"map": "playmap_19", "x": 26, "y": 1} + "args": {"map": "playmap_19", "x": 26, "y": 1}, }, "dor_playmap_22_1": { "x": 49, "y": 24, - "args": {"map": "playmap_22", "x": 13, "y": 10} + "args": {"map": "playmap_22", "x": 13, "y": 10}, }, "dor_playmap_22_2": { "x": 50, "y": 24, - "args": {"map": "playmap_22", "x": 14, "y": 10} + "args": {"map": "playmap_22", "x": 14, "y": 10}, }, "dor_playmap_24": { "x": 88, "y": 24, - "args": {"map": "playmap_24", "x": 11, "y": 7} + "args": {"map": "playmap_24", "x": 11, "y": 7}, }, "dor_playmap_25_1": { "x": 114, "y": 10, - "args": {"map": "playmap_25", "x": 13, "y": 10} + "args": {"map": "playmap_25", "x": 13, "y": 10}, }, "dor_playmap_25_2": { "x": 115, "y": 10, - "args": {"map": "playmap_25", "x": 14, "y": 10} + "args": {"map": "playmap_25", "x": 14, "y": 10}, }, "dor_playmap_27": { "x": 143, "y": 13, - "args": {"map": "playmap_27", "x": 3, "y": 8} + "args": {"map": "playmap_27", "x": 3, "y": 8}, }, "dor_playmap_29": { "x": 76, "y": 6, - "args": {"map": "playmap_29", "x": 11, "y": 7} + "args": {"map": "playmap_29", "x": 11, "y": 7}, }, "dor_playmap_40_1": { "x": 95, "y": 0, - "args": {"map": "playmap_40", "x": 69, "y": 28} + "args": {"map": "playmap_40", "x": 69, "y": 28}, }, "dor_playmap_40_2": { "x": 96, "y": 0, - "args": {"map": "playmap_40", "x": 70, "y": 28} + "args": {"map": "playmap_40", "x": 70, "y": 28}, }, "dor_playmap_40_3": { "x": 97, "y": 0, - "args": {"map": "playmap_40", "x": 71, "y": 28} + "args": {"map": "playmap_40", "x": 71, "y": 28}, }, "dor_playmap_40_4": { "x": 98, "y": 0, - "args": {"map": "playmap_40", "x": 72, "y": 28} + "args": {"map": "playmap_40", "x": 72, "y": 28}, }, "dor_playmap_50": { "x": 89, "y": 24, - "args": {"map": "playmap_50", "x": 11, "y": 7} + "args": {"map": "playmap_50", "x": 11, "y": 7}, }, }, "special_dors": { @@ -2469,25 +2195,13 @@ "shopdor": { "x": 34, "y": 7, - } + }, }, "balls": { - "ball_1": { - "x": 146, - "y": 1 - }, - "ball_2": { - "x": 115, - "y": 19 - }, - "ball_3": { - "x": 85, - "y": 28 - }, - "ball_4": { - "x": 3, - "y": 1 - }, + "ball_1": {"x": 146, "y": 1}, + "ball_2": {"x": 115, "y": 19}, + "ball_3": {"x": 85, "y": 28}, + "ball_4": {"x": 3, "y": 1}, }, }, "playmap_22": { @@ -2504,30 +2218,28 @@ | | | __| |__________ __________| -|_________| |_________|""" +|_________| |_________|""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_21_1": { "x": 13, "y": 11, - "args": {"map": "playmap_21", "x": 49, "y": 25} + "args": {"map": "playmap_21", "x": 49, "y": 25}, }, "dor_playmap_21_2": { "x": 14, "y": 11, - "args": {"map": "playmap_21", "x": 50, "y": 25} + "args": {"map": "playmap_21", "x": 50, "y": 25}, }, "dor_playmap_23": { "x": 26, "y": 5, - "args": {"map": "playmap_23", "x": 26, "y": 5} + "args": {"map": "playmap_23", "x": 26, "y": 5}, }, }, - "balls": { - }, + "balls": {}, }, "playmap_23": { "hard_obs": { @@ -2543,20 +2255,18 @@ | | | | | | |__________|___________| -|______________________|""" +|______________________|""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_22": { "x": 26, "y": 6, - "args": {"map": "playmap_22", "x": 26, "y": 6} + "args": {"map": "playmap_22", "x": 26, "y": 6}, }, }, - "balls": { - }, + "balls": {}, }, "playmap_24": { "hard_obs": { @@ -2569,20 +2279,18 @@ | | | | |_______ _______| - |______| |______|""" + |______| |______|""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_21": { "x": 11, "y": 8, - "args": {"map": "playmap_21", "x": 88, "y": 25} + "args": {"map": "playmap_21", "x": 88, "y": 25}, }, }, - "balls": { - }, + "balls": {}, }, "playmap_25": { "hard_obs": { @@ -2598,30 +2306,28 @@ | | | __| |__________ __________| -|_________| |_________|""" +|_________| |_________|""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_21_1": { "x": 13, "y": 11, - "args": {"map": "playmap_21", "x": 114, "y": 11} + "args": {"map": "playmap_21", "x": 114, "y": 11}, }, "dor_playmap_21_2": { "x": 14, "y": 11, - "args": {"map": "playmap_21", "x": 115, "y": 11} + "args": {"map": "playmap_21", "x": 115, "y": 11}, }, "dor_playmap_23": { "x": 26, "y": 5, - "args": {"map": "playmap_26", "x": 26, "y": 5} + "args": {"map": "playmap_26", "x": 26, "y": 5}, }, }, - "balls": { - }, + "balls": {}, }, "playmap_26": { "hard_obs": { @@ -2637,20 +2343,18 @@ | | | | | | |__________________|___| -|______________________|""" +|______________________|""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_25": { "x": 26, "y": 6, - "args": {"map": "playmap_25", "x": 26, "y": 6} + "args": {"map": "playmap_25", "x": 26, "y": 6}, }, }, - "balls": { - }, + "balls": {}, }, "playmap_27": { "hard_obs": { @@ -2669,25 +2373,23 @@ | +----/ \ | \_____ __/ - \______________/""" + \______________/""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_21": { "x": 2, "y": 8, - "args": {"map": "playmap_21", "x": 142, "y": 13} + "args": {"map": "playmap_21", "x": 142, "y": 13}, }, "dor_playmap_33": { "x": 33, "y": 9, - "args": {"map": "playmap_33", "x": 1, "y": 25} + "args": {"map": "playmap_33", "x": 1, "y": 25}, }, }, - "balls": { - }, + "balls": {}, }, "playmap_28": { "hard_obs": { @@ -2746,7 +2448,7 @@ )))( ((())() (())) ()() ())) ()()()) ()()) ()()) ()))))()((())))()))()((()))()))())()())))()))()))()(()())()()()())))((())()))()()()())))(()(((())(())(()(((((()()()()))())(((((()))))((((((())))))()()()()(((()()()()))()()()))))()))))())))(()))()((( -()()))(())()()()))()(((()(((()())))()()(()))))(()(())((((()((((((()))()()()(((((((()()()((())))))(())((((()())()()()(()(((()()()())()()()())()()())))()()())()()))))()()()())))()()((()())))))(()()()(""" +()()))(())()()()))()(((()(((()())))()()(()))))(()(())((((()((((((()))()()()(((((((()()()((())))))(())((((()())()()()(()(((()()()())()()()())()()())))()()())()()))))()()()())))()()((()())))))(()()()(""", } }, "soft_obs": { @@ -2801,29 +2503,29 @@ ;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;; - ;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;""" + ;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;""", } }, "dors": { "dor_playmap_4_1": { "x": 0, "y": 40, - "args": {"map": "playmap_4", "x": 58, "y": 22} + "args": {"map": "playmap_4", "x": 58, "y": 22}, }, "dor_playmap_4_2": { "x": 0, "y": 41, - "args": {"map": "playmap_4", "x": 58, "y": 23} + "args": {"map": "playmap_4", "x": 58, "y": 23}, }, "dor_playmap_30_1": { "x": 197, "y": 11, - "args": {"map": "playmap_30", "x": 1, "y": 15} + "args": {"map": "playmap_30", "x": 1, "y": 15}, }, "dor_playmap_30_2": { "x": 197, "y": 12, - "args": {"map": "playmap_30", "x": 1, "y": 16} + "args": {"map": "playmap_30", "x": 1, "y": 16}, }, }, "balls": { @@ -2855,7 +2557,7 @@ "x": 186, "y": 2, }, - } + }, }, "playmap_29": { "hard_obs": { @@ -2868,20 +2570,18 @@ | | | | |_______ _______| - |______| |______|""" + |______| |______|""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_21": { "x": 11, "y": 8, - "args": {"map": "playmap_21", "x": 76, "y": 7} + "args": {"map": "playmap_21", "x": 76, "y": 7}, }, }, - "balls": { - }, + "balls": {}, }, "playmap_30": { "hard_obs": { @@ -2920,46 +2620,37 @@ ())) ())) ()))()()))())(()())(())())()()()()())()()(()()()()()()()()))()()()()()()()()()))))))()())(()()())))))))(()()()()((((()(())))))()()()(())))()()((())) ()())))))))()()()())))))))((()))(()(()()(((((()()()()()()()))))((()(()()()()()((())((()()(()))((()))())(()(((()))((()()))())))))(()())))()())()((()) -""" +""", }, - "pokecenter": { - "x": 8, - "y": 3, - "txt": CENTER - }, - "shop": { - "x": 25, - "y": 3, - "txt": SHOP - }, - }, - "soft_obs": { + "pokecenter": {"x": 8, "y": 3, "txt": CENTER}, + "shop": {"x": 25, "y": 3, "txt": SHOP}, }, + "soft_obs": {}, "dors": { "dor_playmap_28_1": { "x": 0, "y": 15, - "args": {"map": "playmap_28", "x": 196, "y": 11} + "args": {"map": "playmap_28", "x": 196, "y": 11}, }, "dor_playmap_28_2": { "x": 0, "y": 16, - "args": {"map": "playmap_28", "x": 196, "y": 12} + "args": {"map": "playmap_28", "x": 196, "y": 12}, }, "dor_playmap_31_1": { "x": 61, "y": 16, - "args": {"map": "playmap_31", "x": 17, "y": 12} + "args": {"map": "playmap_31", "x": 17, "y": 12}, }, "dor_playmap_31_2": { "x": 62, "y": 16, - "args": {"map": "playmap_31", "x": 18, "y": 12} + "args": {"map": "playmap_31", "x": 18, "y": 12}, }, "dor_playmap_32": { "x": 94, "y": 27, - "args": {"map": "playmap_32", "x": 11, "y": 7} + "args": {"map": "playmap_32", "x": 11, "y": 7}, }, }, "special_dors": { @@ -2970,7 +2661,7 @@ "shopdor": { "x": 30, "y": 7, - } + }, }, "balls": { "ball_1": { @@ -3016,25 +2707,23 @@ | | | | | | |______________ ________________| | -|_____________| |_______________| |""" +|_____________| |_______________| |""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_30_1": { "x": 36, "y": 13, - "args": {"map": "playmap_30", "x": 61, "y": 17} + "args": {"map": "playmap_30", "x": 61, "y": 17}, }, "dor_playmap_30_2": { "x": 37, "y": 13, - "args": {"map": "playmap_30", "x": 62, "y": 17} + "args": {"map": "playmap_30", "x": 62, "y": 17}, }, }, - "balls": { - }, + "balls": {}, }, "playmap_32": { "hard_obs": { @@ -3047,20 +2736,18 @@ | | | | |_______ _______| - |______| |______|""" + |______| |______|""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_30": { "x": 11, "y": 8, - "args": {"map": "playmap_30", "x": 94, "y": 28} + "args": {"map": "playmap_30", "x": 94, "y": 28}, }, }, - "balls": { - }, + "balls": {}, }, "playmap_33": { "hard_obs": { @@ -3110,7 +2797,7 @@ )() ))( ()( )() ())) (()) -(()))(()(()((()()))(()))()()()))((()))(((()()))(()()()())(())))(()()((()))(()(()())))())()))()()()()(())(()))(())())()()))(())(())))()()()()))(())((()))()""" +(()))(()(()((()()))(()))()()()))((()))(((()()))(()()()())(())))(()()((()))(()(()())))())()))()()()()(())(()))(())())()()))(())(())))()()()()))(())((()))()""", }, }, "soft_obs": { @@ -3132,7 +2819,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;; - ;;;;;;;;""" + ;;;;;;;;""", }, "grass_2": { "x": 93, @@ -3151,7 +2838,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;; - ;;;;;;;;;;;""" + ;;;;;;;;;;;""", }, "grass_3": { "x": 60, @@ -3165,7 +2852,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;; - ;;;;;;;;;;;;;;;;;;""" + ;;;;;;;;;;;;;;;;;;""", }, "grass_4": { "x": 65, @@ -3179,7 +2866,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;; - ;;;;;;;;;;;;;;;;;;""" + ;;;;;;;;;;;;;;;;;;""", }, "grass_5": { "x": 115, @@ -3193,7 +2880,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;; - ;;;;;;;;;;;""" + ;;;;;;;;;;;""", }, "grass_6": { "x": 116, @@ -3207,7 +2894,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;; - ;;;;;;;;;;;""" + ;;;;;;;;;;;""", }, "grass_7": { "x": 30, @@ -3220,34 +2907,34 @@ ;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;; - ;;;;;;;;""" + ;;;;;;;;""", }, }, "dors": { "dor_playmap_27_1": { "x": 0, "y": 25, - "args": {"map": "playmap_27", "x": 32, "y": 9} + "args": {"map": "playmap_27", "x": 32, "y": 9}, }, "dor_playmap_27_2": { "x": 0, "y": 26, - "args": {"map": "playmap_27", "x": 32, "y": 9} + "args": {"map": "playmap_27", "x": 32, "y": 9}, }, "dor_playmap_34": { "x": 75, "y": 23, - "args": {"map": "playmap_34", "x": 11, "y": 7} + "args": {"map": "playmap_34", "x": 11, "y": 7}, }, "dor_playmap_35_1": { "x": 153, "y": 22, - "args": {"map": "playmap_35", "x": 1, "y": 14} + "args": {"map": "playmap_35", "x": 1, "y": 14}, }, "dor_playmap_35_2": { "x": 153, "y": 23, - "args": {"map": "playmap_35", "x": 1, "y": 15} + "args": {"map": "playmap_35", "x": 1, "y": 15}, }, }, "balls": { @@ -3288,20 +2975,18 @@ | | | | |_______ _______| - |______| |______|""" + |______| |______|""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_33": { "x": 11, "y": 8, - "args": {"map": "playmap_33", "x": 75, "y": 24} + "args": {"map": "playmap_33", "x": 75, "y": 24}, }, }, - "balls": { - }, + "balls": {}, }, "playmap_35": { "hard_obs": { @@ -3376,7 +3061,7 @@ ((( || | || # ))( ()) # ))) )(() # # # ()( -())()())()())))(((()(()))(()()))()))((()))()(()))))())(()((((()(((()))()(()((()()((())))))()))())(((()((())(((# #)()()()(())((()))(()(()))((""" +())()())()())))(((()(()))(()()))()))((()))()(()))))())(()((((()(((()))()(()((()()((())))))()))())(((()((())(((# #)()()()(())((()))(()(()))((""", }, }, "soft_obs": { @@ -3399,7 +3084,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;""" + ;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;""", }, "grass_2": { "x": 76, @@ -3418,7 +3103,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;""" + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;""", }, "grass_3": { "x": 7, @@ -3460,7 +3145,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ;;;;;;;;;;;;;;;;;;;""" + ;;;;;;;;;;;;;;;;;;;""", }, "grass_4": { "x": 80, @@ -3479,54 +3164,54 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;; - ;;;;;;;;;;;""" + ;;;;;;;;;;;""", }, }, "dors": { "dor_playmap_33_1": { "x": 0, "y": 14, - "args": {"map": "playmap_33", "x": 152, "y": 22} + "args": {"map": "playmap_33", "x": 152, "y": 22}, }, "dor_playmap_33_2": { "x": 0, "y": 15, - "args": {"map": "playmap_33", "x": 152, "y": 23} + "args": {"map": "playmap_33", "x": 152, "y": 23}, }, "dor_playmap_36": { "x": 127, "y": 20, - "args": {"map": "playmap_36", "x": 11, "y": 7} + "args": {"map": "playmap_36", "x": 11, "y": 7}, }, "dor_playmap_37": { "x": 79, "y": 31, - "args": {"map": "playmap_37", "x": 11, "y": 7} + "args": {"map": "playmap_37", "x": 11, "y": 7}, }, "dor_playmap_38": { "x": 128, "y": 63, - "args": {"map": "playmap_38", "x": 11, "y": 7} + "args": {"map": "playmap_38", "x": 11, "y": 7}, }, "dor_playmap_39_1": { "x": 111, "y": 68, - "args": {"map": "playmap_39", "x": 96, "y": 1} + "args": {"map": "playmap_39", "x": 96, "y": 1}, }, "dor_playmap_39_2": { "x": 112, "y": 68, - "args": {"map": "playmap_39", "x": 97, "y": 1} + "args": {"map": "playmap_39", "x": 97, "y": 1}, }, "dor_playmap_39_3": { "x": 113, "y": 68, - "args": {"map": "playmap_39", "x": 98, "y": 1} + "args": {"map": "playmap_39", "x": 98, "y": 1}, }, "dor_playmap_39_4": { "x": 114, "y": 68, - "args": {"map": "playmap_39", "x": 99, "y": 1} + "args": {"map": "playmap_39", "x": 99, "y": 1}, }, }, "balls": { @@ -3567,20 +3252,18 @@ | | | | |_______ _______| - |______| |______|""" + |______| |______|""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_35": { "x": 11, "y": 8, - "args": {"map": "playmap_35", "x": 127, "y": 21} + "args": {"map": "playmap_35", "x": 127, "y": 21}, }, }, - "balls": { - }, + "balls": {}, }, "playmap_37": { "hard_obs": { @@ -3593,20 +3276,18 @@ | | | | |_______ _______| - |______| |______|""" + |______| |______|""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_35": { "x": 11, "y": 8, - "args": {"map": "playmap_35", "x": 79, "y": 32} + "args": {"map": "playmap_35", "x": 79, "y": 32}, }, }, - "balls": { - }, + "balls": {}, }, "playmap_38": { "hard_obs": { @@ -3619,20 +3300,18 @@ | | | | |_______ _______| - |______| |______|""" + |______| |______|""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_35": { "x": 11, "y": 8, - "args": {"map": "playmap_35", "x": 128, "y": 64} + "args": {"map": "playmap_35", "x": 128, "y": 64}, }, }, - "balls": { - }, + "balls": {}, }, "playmap_39": { "hard_obs": { @@ -3707,25 +3386,17 @@ ))( # # (() ((( # # )() ((((())()())))(((())()((((()))())())(()(())((()()(()((((()(((())((()()(()(())))()(((())))()))))()))((())()()))(()(()()())))))))((()())())))))()()())())())()())()))))))()(()()((()()())((()))))))()()) -""" - }, - "pokecenter": { - "x": 39, - "y": 48, - "txt": CENTER - }, - "shop": { - "x": 117, - "y": 60, - "txt": SHOP +""", }, + "pokecenter": {"x": 39, "y": 48, "txt": CENTER}, + "shop": {"x": 117, "y": 60, "txt": SHOP}, "tree_group_1": { "x": 135, "y": 61, "txt": """ ())) (()))) ())()) - ||||""" + ||||""", }, "tree_group_2": { "x": 109, @@ -3733,7 +3404,7 @@ "txt": """ ())) (()))) ())()) - ||||""" + ||||""", }, }, "soft_obs": { @@ -3746,7 +3417,7 @@ ~~~~~ ~~~~~ ~~~~ ~~~~ ~~~~~~~~~~~~ - ~~~~~~~~""" + ~~~~~~~~""", }, "grass_1": { "x": 155, @@ -3766,7 +3437,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ;;;;;;;;;;;;;;;;;;;;;;;;;""" + ;;;;;;;;;;;;;;;;;;;;;;;;;""", }, "grass_2": { "x": 32, @@ -3779,7 +3450,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;""" + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;""", }, "grass_3": { "x": 168, @@ -3790,7 +3461,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;; - ;;;;;;;;;;;;;;;;;;;;;;""" + ;;;;;;;;;;;;;;;;;;;;;;""", }, "grass_4": { "x": 4, @@ -3817,85 +3488,84 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;; - ;;;""" - + ;;;""", }, }, "dors": { "dor_playmap_35_1": { "x": 96, "y": 0, - "args": {"map": "playmap_35", "x": 111, "y": 67} + "args": {"map": "playmap_35", "x": 111, "y": 67}, }, "dor_playmap_35_2": { "x": 97, "y": 0, - "args": {"map": "playmap_35", "x": 112, "y": 67} + "args": {"map": "playmap_35", "x": 112, "y": 67}, }, "dor_playmap_35_3": { "x": 98, "y": 0, - "args": {"map": "playmap_35", "x": 113, "y": 67} + "args": {"map": "playmap_35", "x": 113, "y": 67}, }, "dor_playmap_35_4": { "x": 99, "y": 0, - "args": {"map": "playmap_35", "x": 114, "y": 67} + "args": {"map": "playmap_35", "x": 114, "y": 67}, }, "dor_playmap_41_1": { "x": 42, "y": 6, - "args": {"map": "playmap_41", "x": 26, "y": 7} + "args": {"map": "playmap_41", "x": 26, "y": 7}, }, "dor_playmap_41_2": { "x": 33, "y": 6, - "args": {"map": "playmap_41", "x": 11, "y": 7} + "args": {"map": "playmap_41", "x": 11, "y": 7}, }, "dor_playmap_42_1": { "x": 89, "y": 47, - "args": {"map": "playmap_42", "x": 18, "y": 7} + "args": {"map": "playmap_42", "x": 18, "y": 7}, }, "dor_playmap_42_2": { "x": 90, "y": 47, - "args": {"map": "playmap_42", "x": 19, "y": 7} + "args": {"map": "playmap_42", "x": 19, "y": 7}, }, "dor_playmap_43": { "x": 18, "y": 63, - "args": {"map": "playmap_43", "x": 11, "y": 7} + "args": {"map": "playmap_43", "x": 11, "y": 7}, }, "dor_playmap_44_1": { "x": 90, "y": 22, - "args": {"map": "playmap_44", "x": 13, "y": 10} + "args": {"map": "playmap_44", "x": 13, "y": 10}, }, "dor_playmap_44_2": { "x": 91, "y": 22, - "args": {"map": "playmap_44", "x": 14, "y": 10} + "args": {"map": "playmap_44", "x": 14, "y": 10}, }, "dor_playmap_46_1": { "x": 129, "y": 34, - "args": {"map": "playmap_46", "x": 22, "y": 10} + "args": {"map": "playmap_46", "x": 22, "y": 10}, }, "dor_playmap_46_2": { "x": 130, "y": 34, - "args": {"map": "playmap_46", "x": 22, "y": 10} + "args": {"map": "playmap_46", "x": 22, "y": 10}, }, "dor_playmap_47": { "x": 68, "y": 6, - "args": {"map": "playmap_47", "x": 11, "y": 7} + "args": {"map": "playmap_47", "x": 11, "y": 7}, }, "dor_playmap_48": { "x": 152, "y": 64, - "args": {"map": "playmap_48", "x": 11, "y": 7} + "args": {"map": "playmap_48", "x": 11, "y": 7}, }, }, "special_dors": { @@ -3906,7 +3576,7 @@ "shopdor": { "x": 122, "y": 64, - } + }, }, "balls": { "ball_1": { @@ -4013,7 +3683,7 @@ ())( ()() ())() (()() (()()))))(()))(()(((()(())(()))())))())((()))(()()())((()))(())((() # # ())()()(()))(()()())()())((()()()))(()))()))()(())))((()))()))(() -(())((())()()()(((())((())(()()(())((()()()())((()))(()()()))((()())# #(()))(()()()()))(((()))((()))(((())))(((())(()()))((((())))((()))(""" +(())((())()()()(((())((())(()()(())((()()()())((()))(()()()))((()())# #(()))(()()()()))(((()))((()))(((())))(((())(()()))((((())))((()))(""", } }, "soft_obs": { @@ -4034,7 +3704,7 @@ ~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~ ~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~ -~~~""" +~~~""", }, "sand1": { "x": 10, @@ -4045,7 +3715,7 @@ ....................... ................... .............. - ...""" + ...""", }, "sand2": { "x": 86, @@ -4060,7 +3730,7 @@ ...................... ................. .......... - ...""" + ...""", }, "sand3": { "x": 39, @@ -4071,7 +3741,7 @@ ..................... .................. ................ - .......""" + .......""", }, "sand4": { "x": 115, @@ -4082,29 +3752,29 @@ ................ ............... ............. - .......""" + .......""", }, }, "dors": { "dor_playmap_21_1": { "x": 69, "y": 29, - "args": {"map": "playmap_21", "x": 95, "y": 1} + "args": {"map": "playmap_21", "x": 95, "y": 1}, }, "dor_playmap_21_2": { "x": 70, "y": 29, - "args": {"map": "playmap_21", "x": 96, "y": 1} + "args": {"map": "playmap_21", "x": 96, "y": 1}, }, "dor_playmap_21_3": { "x": 71, "y": 29, - "args": {"map": "playmap_21", "x": 97, "y": 1} + "args": {"map": "playmap_21", "x": 97, "y": 1}, }, "dor_playmap_21_4": { "x": 72, "y": 29, - "args": {"map": "playmap_21", "x": 98, "y": 1} + "args": {"map": "playmap_21", "x": 98, "y": 1}, }, }, "balls": { @@ -4120,7 +3790,7 @@ "x": 139, "y": 22, }, - } + }, }, "playmap_41": { "hard_obs": { @@ -4133,25 +3803,23 @@ | | | | |_______ ______________ _______| - |______| |____________| |______|""" + |______| |____________| |______|""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_39_1": { "x": 11, "y": 8, - "args": {"map": "playmap_39", "x": 33, "y": 7} + "args": {"map": "playmap_39", "x": 33, "y": 7}, }, "dor_playmap_39_2": { "x": 26, "y": 8, - "args": {"map": "playmap_39", "x": 42, "y": 7} - } - }, - "balls": { + "args": {"map": "playmap_39", "x": 42, "y": 7}, + }, }, + "balls": {}, }, "playmap_42": { "hard_obs": { @@ -4164,25 +3832,23 @@ |-------- | | | |______________ ______________| - |_____________| |_____________|""" + |_____________| |_____________|""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_39_1": { "x": 18, "y": 8, - "args": {"map": "playmap_39", "x": 89, "y": 48} + "args": {"map": "playmap_39", "x": 89, "y": 48}, }, "dor_playmap_39_2": { "x": 19, "y": 8, - "args": {"map": "playmap_39", "x": 90, "y": 48} - } - }, - "balls": { + "args": {"map": "playmap_39", "x": 90, "y": 48}, + }, }, + "balls": {}, }, "playmap_43": { "hard_obs": { @@ -4195,20 +3861,18 @@ | | | | |_______ _______| - |______| |______|""" + |______| |______|""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_35": { "x": 11, "y": 8, - "args": {"map": "playmap_39", "x": 18, "y": 64} + "args": {"map": "playmap_39", "x": 18, "y": 64}, }, }, - "balls": { - }, + "balls": {}, }, "playmap_44": { "hard_obs": { @@ -4224,30 +3888,28 @@ | | | __| |__________ __________| -|_________| |_________|""" +|_________| |_________|""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_39_1": { "x": 13, "y": 11, - "args": {"map": "playmap_39", "x": 90, "y": 23} + "args": {"map": "playmap_39", "x": 90, "y": 23}, }, "dor_playmap_39_2": { "x": 14, "y": 11, - "args": {"map": "playmap_39", "x": 91, "y": 23} + "args": {"map": "playmap_39", "x": 91, "y": 23}, }, "dor_playmap_45": { "x": 26, "y": 5, - "args": {"map": "playmap_45", "x": 26, "y": 5} + "args": {"map": "playmap_45", "x": 26, "y": 5}, }, }, - "balls": { - }, + "balls": {}, }, "playmap_45": { "hard_obs": { @@ -4263,20 +3925,18 @@ | | | | | | |__________________|___| -|______________________|""" +|______________________|""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_44": { "x": 26, "y": 6, - "args": {"map": "playmap_44", "x": 26, "y": 6} + "args": {"map": "playmap_44", "x": 26, "y": 6}, }, }, - "balls": { - }, + "balls": {}, }, "playmap_46": { "hard_obs": { @@ -4293,20 +3953,18 @@ | | | |___________________ __| | |__________________| |_| | - #""" + #""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_39": { "x": 26, "y": 11, - "args": {"map": "playmap_39", "x": 129, "y": 35} + "args": {"map": "playmap_39", "x": 129, "y": 35}, }, }, - "balls": { - }, + "balls": {}, }, "playmap_47": { "hard_obs": { @@ -4319,20 +3977,18 @@ | | | | |_______ _______| - |______| |______|""" + |______| |______|""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_35": { "x": 11, "y": 8, - "args": {"map": "playmap_39", "x": 68, "y": 7} + "args": {"map": "playmap_39", "x": 68, "y": 7}, }, }, - "balls": { - }, + "balls": {}, }, "playmap_48": { "hard_obs": { @@ -4345,20 +4001,18 @@ | | | | |_______ _______| - |______| |______|""" + |______| |______|""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_35": { "x": 11, "y": 8, - "args": {"map": "playmap_39", "x": 152, "y": 65} + "args": {"map": "playmap_39", "x": 152, "y": 65}, }, }, - "balls": { - }, + "balls": {}, }, "playmap_49": { "hard_obs": { @@ -4371,20 +4025,18 @@ | | | | |_______ _______| - |______| |______|""" + |______| |______|""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_35": { "x": 11, "y": 8, - "args": {"map": "playmap_3", "x": 22, "y": 16} + "args": {"map": "playmap_3", "x": 22, "y": 16}, }, }, - "balls": { - }, + "balls": {}, }, "playmap_50": { "hard_obs": { @@ -4397,20 +4049,18 @@ |----- #####| | | |_______ ________________| - |______| |_______________|""" + |______| |_______________|""", }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_21": { "x": 11, "y": 8, - "args": {"map": "playmap_21", "x": 89, "y": 25} + "args": {"map": "playmap_21", "x": 89, "y": 25}, }, }, - "balls": { - }, + "balls": {}, }, "playmap_51": { "hard_obs": { @@ -4454,7 +4104,7 @@ (() ()()) ))) )() (())) (() )() (())()) ()( -)(((())()()()(()())))))(()()()())()()))())(())())))(())()(((())((()()(())())(()()())))((()(())))))(()())))((""" +)(((())()()()(()())))))(()()()())()()))())(())())))(())()(((())((()()(())())(()()())))((()(())))))(()())))((""", }, }, "soft_obs": { @@ -4496,24 +4146,24 @@ ;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;""" + ;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;""", }, }, "dors": { "dor_cave_1": { "x": 21, "y": 0, - "args": {"map": "cave_1", "x": 14, "y": 19} + "args": {"map": "cave_1", "x": 14, "y": 19}, }, "dor_playmap_1_1": { "x": 0, "y": 28, - "args": {"map": "playmap_1", "x": 89, "y": 12} + "args": {"map": "playmap_1", "x": 89, "y": 12}, }, "dor_playmap_1_2": { "x": 0, "y": 29, - "args": {"map": "playmap_1", "x": 89, "y": 13} + "args": {"map": "playmap_1", "x": 89, "y": 13}, }, }, "balls": { @@ -4543,10 +4193,9 @@ }, }, }, - - "playmap_52":{ - "hard_obs":{ - "workshop":{ + "playmap_52": { + "hard_obs": { + "workshop": { "x": 30, "y": 15, "txt": """ @@ -4554,9 +4203,9 @@ / ^ ^ /\ /________/ \ ______ |o ___ o| | / ___ /\ -|__| |__|___| |_| |_||""" +|__| |__|___| |_| |_||""", }, - "house1":{ + "house1": { "x": 12, "y": 28, "txt": r""" @@ -4565,25 +4214,19 @@ /_______/ / /\ |o 0 o| /___/ \ |o ___ o| | o | | -|__| |__|_|___|__|""" - }, - "house2":{ - "x": 42, - "y": 22, - "txt": HOUSE1 +|__| |__|_|___|__|""", }, - - + "house2": {"x": 42, "y": 22, "txt": HOUSE1}, }, - "soft_obs":{ + "soft_obs": { "road_1": { - "x": 1, - "y" : 23, - "txt": """ - - """ - }, - "water_1":{ + "x": 1, + "y": 23, + "txt": """ + + """, + }, + "water_1": { "x": 0, "y": 0, "txt": r""" @@ -4602,16 +4245,54 @@ ~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~ -~~~~~~~~~~~~~~~~~~~~""" +~~~~~~~~~~~~~~~~~~~~""", }, - }, - "sand_1":{ - "x": 0, - "y": 19, - "txt": r""" + "water_2": { + "x": 75, + "y": 34, + "txt": r""" +~~~ +~~~~ + ~~~ + ~~~~ + ~~~~~ + ~~~~~ + ~~~~ + ~~~~ + ~~~~~ + ~~~~~~ + ~~~~~~~ + ~~~~~~~~ +~~~~~~~~~~ """, + }, + "water_3": { + "x": 73, + "y": 21, + "txt": r""" + ~~~~~~~~~~~~ + ~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~ + ~~~~~~~~~~~~~ + ~~~~~~~~~~~ + ~~~~~~~~~~ + ~~~~~~~~~ + ~~~~~ + ~~~ +""", + }, + "sand_1": { + "x": 0, + "y": 19, + "txt": r""" .... -....... -......... +....... +......... ......... ......... ........ @@ -4625,50 +4306,48 @@ ....... ....... ..... - .....""" -<<<<<<< HEAD:src/pokete/data/map_data.py -======= - }, - "pathway_1":{ - "x": 0, - "y": 23, - "txt": r""" + .....""", + }, + "pathway_1": { + "x": 0, + "y": 23, + "txt": r""" _______________| \_______/ / | / |___ __________________/ \__ \ - \_ \ - \ \ - \ \ - \ \ - | \ + \_ \ + \ \ + \ \ + \ \ + | \ \_ \ _____/ /__________/ / | \ / / - | \ / _________________/ - \_ \_/ / - \ / - \ __/ + | \ / _________________/ + \_ \_/ / + \ / + \ __/ \ \ - \ \ + \ \ \ \ \ \ | | - """ - }, - "pathway_2": { - "x": 15, - "y": 29, - "txt": r""" + """, + }, + "pathway_2": { + "x": 15, + "y": 29, + "txt": r""" | | | |_ \ \ \ \ -""" - }, - "pathway_3": { - "x": 38, - "y": 32, - "txt": r""" +""", + }, + "pathway_3": { + "x": 38, + "y": 32, + "txt": r""" / / / / / / @@ -4678,12 +4357,12 @@ / / / / / / -""" - }, - "pathway_4": { - "x": 37, - "y": 60, - "txt": r""" +""", + }, + "pathway_4": { + "x": 37, + "y": 60, + "txt": r""" | | | | | | @@ -4692,9 +4371,9 @@ _ | | | | | - | |__________ - | - | __________ + | |________________________ + | + | ________________________ | | | | | | @@ -4706,7 +4385,7 @@ \ | | | | | - | | | | + | | | | | \ / / ___________ | \ / / / | \________/ /________/ ________ @@ -4722,29 +4401,29 @@ | |_________| | | / | ____________/ - | | + | | | | | | | | | | - """ - }, - "meadow_1":{ - "x": 12, - "y":20, - "txt": r""" + """, + }, + "meadow_1": { + "x": 12, + "y": 20, + "txt": r""" ;;;;;;;;;;; ;;;;;;;;;;; ;;;;;;;; ;;;;;; ;;;;;;; - ;;;;;;""" - }, - "meadow_2": { - "x": 32, - "y": 8, - "txt": r""" + ;;;;;;""", + }, + "meadow_2": { + "x": 32, + "y": 8, + "txt": r""" ;;;; ;;;;;;; ;;;;;;;;;; @@ -4752,25 +4431,46 @@ ;;;;;;;;;; ;;;;;;;;;;; ;;;;;;;;;;; - ;;;;;;;;;""" - }, - "meadow_3":{ - "x": 57, - "y": 31, - "txt": r""" + ;;;;;;;;;""", + }, + "meadow_3": { + "x": 57, + "y": 31, + "txt": r""" ;;;;;;;; ;;;;;;;; ;;;;;;;; ;;;;;;;;; ;;;;;;;;; ;;;;;;;;; -""" ->>>>>>> fc03fd4 (More data for map_data.py regarding pathways, meadows, and fences in Watermill):pokete_data/map_data.py - } - +""", + }, + }, + "playmap_53": { + "hard_obs": { + "inner_walls": { + "x": 2, + "y": 1, + "txt": """ + __________________________ + | | + | | | + |_____| | + | | + |_______ ________________| + |______| |_______________|""", + }, + }, + "soft_obs": {}, + "dors": { + "dor_playmap_53": { + "x": 9, + "y": 0, + "args": {"map": "playmap_52", "x": 33, "y": 15}, + }, + }, + }, }, - "playmap_53":{} - } if __name__ == "__main__": diff --git a/src/pokete/data/maps.py b/src/pokete/data/maps.py index 12375a13..d90dfb43 100644 --- a/src/pokete/data/maps.py +++ b/src/pokete/data/maps.py @@ -610,8 +610,8 @@ "weather": None }, "playmap_53":{ - "height": 25, - "width": 50, + "height": 15, + "width": 30, "song": "Map.mp3", "pretty_name": "workshop", "extra": None, @@ -623,7 +623,7 @@ "height": 10, "width": 15, "song": "Map.mp3", - "pretty_name": "workshop", + "pretty_name": "house", "extra": None, "poke_args": None, "weather": None From 0013c808c642c8b81e60f89026275171c8dfcf3f Mon Sep 17 00:00:00 2001 From: amber-codex <157549008+amber-codex@users.noreply.github.com> Date: Sun, 4 May 2025 13:43:50 -0400 Subject: [PATCH 09/47] second attempt at adding doors to the map --- src/pokete/data/map_data.py | 91 +++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index d36f9955..4debf540 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -4216,7 +4216,77 @@ |o ___ o| | o | | |__| |__|_|___|__|""", }, +<<<<<<< HEAD:src/pokete/data/map_data.py "house2": {"x": 42, "y": 22, "txt": HOUSE1}, +======= + "house2":{ + "x": 42, + "y": 22, + "txt": HOUSE1 + }, + "house3":{ + "x": 52, + "y": 44, + "txt":""" + _________ + / ^ ^ /o\____ +/_______/ / /\ +|o 0 o| /___/ \ +|o ___ o| | o | | +|__| |__|_|___|__| +""" + + }, + "fence_1": { + "x": 41, + "y": 48, + "txt": r""" +############ +# # +# # +# # +# # +# # +# +# +# +# +# + # + ########## +""" + }, + "barn":{ + "x": 3, + "y": 54, + "txt":r""" + __________ + / \ \ +/ 0 \______\ +| ___ | | +|_| |_|______|""" + }, + "fence_2":{ + "x": 0, + "y": 41, + "txt": r""" + # + # + # + # + # + # + + + + # + # + # +########################""" + } + + +>>>>>>> f3a51d9 (second attempt at adding doors to the map):pokete_data/map_data.py }, "soft_obs": { "road_1": { @@ -4443,6 +4513,7 @@ ;;;;;;;;; ;;;;;;;;; ;;;;;;;;; +<<<<<<< HEAD:src/pokete/data/map_data.py """, }, }, @@ -4452,6 +4523,26 @@ "x": 2, "y": 1, "txt": """ +======= +""" + } + }, + "dors": { + "dor_playmap_53": { + "x": 33, + "y": 15, + "args": {"map": "playmap_53", "x": 9, "y": 0} + } + } + + }, + "playmap_53":{ + "hard_obs": { + "inner_walls": { + "x": 2, + "y": 1, + "txt": """ +>>>>>>> f3a51d9 (second attempt at adding doors to the map):pokete_data/map_data.py __________________________ | | | | | From b381e47ab5c268ca8d1157483c25475d20a553d6 Mon Sep 17 00:00:00 2001 From: amber-codex <157549008+amber-codex@users.noreply.github.com> Date: Sun, 4 May 2025 13:48:01 -0400 Subject: [PATCH 10/47] fixed expression error at end of map_data --- src/pokete/data/map_data.py | 68 +++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 37 deletions(-) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index 4debf540..db4de434 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -4216,9 +4216,6 @@ |o ___ o| | o | | |__| |__|_|___|__|""", }, -<<<<<<< HEAD:src/pokete/data/map_data.py - "house2": {"x": 42, "y": 22, "txt": HOUSE1}, -======= "house2":{ "x": 42, "y": 22, @@ -4235,7 +4232,7 @@ |o ___ o| | o | | |__| |__|_|___|__| """ - + }, "fence_1": { "x": 41, @@ -4247,12 +4244,12 @@ # # # # # # -# -# -# -# -# - # +# +# +# +# +# + # ########## """ }, @@ -4260,7 +4257,7 @@ "x": 3, "y": 54, "txt":r""" - __________ + __________ / \ \ / 0 \______\ | ___ | | @@ -4271,22 +4268,21 @@ "y": 41, "txt": r""" # - # - # - # - # - # - - - # - # - # + # + # + # + # + + + + # + # + # ########################""" } ->>>>>>> f3a51d9 (second attempt at adding doors to the map):pokete_data/map_data.py }, "soft_obs": { "road_1": { @@ -4513,17 +4509,6 @@ ;;;;;;;;; ;;;;;;;;; ;;;;;;;;; -<<<<<<< HEAD:src/pokete/data/map_data.py -""", - }, - }, - "playmap_53": { - "hard_obs": { - "inner_walls": { - "x": 2, - "y": 1, - "txt": """ -======= """ } }, @@ -4534,15 +4519,14 @@ "args": {"map": "playmap_53", "x": 9, "y": 0} } } - + }, "playmap_53":{ "hard_obs": { "inner_walls": { "x": 2, "y": 1, - "txt": """ ->>>>>>> f3a51d9 (second attempt at adding doors to the map):pokete_data/map_data.py + "txt": """ __________________________ | | | | | @@ -4561,8 +4545,18 @@ }, }, }, - }, + "soft_obs": { + }, + "dors": { + "dor_playmap_53": { + "x": 9, + "y": 0, + "args": {"map": "playmap_52", "x": 33, "y": 15} + }, + }, + } } + if __name__ == "__main__": print("\033[31;1mDo not execute this!\033[0m") From b51fe65296a49239065d426a87deea2e9a9d0a2f Mon Sep 17 00:00:00 2001 From: amber-codex <157549008+amber-codex@users.noreply.github.com> Date: Tue, 6 May 2025 10:13:03 -0400 Subject: [PATCH 11/47] Map data for watermill including more water, sand, and meadow textures. Trees added on top border --- src/pokete/data/map_data.py | 106 ++++++++++++++++++++++++++++++++++-- src/pokete/data/maps.py | 2 +- 2 files changed, 103 insertions(+), 5 deletions(-) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index db4de434..ed3cd4cc 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -4193,11 +4193,28 @@ }, }, }, +<<<<<<< HEAD:src/pokete/data/map_data.py "playmap_52": { "hard_obs": { "workshop": { "x": 30, "y": 15, +======= + + "playmap_52":{ + "hard_obs":{ + "tree_group_51_1":{ + "x": 0, + "y": 70, + "txt": r""" +()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()() +()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()() +""" + }, + "workshop":{ + "x": 29, + "y": 19, +>>>>>>> e78631c (Map data for watermill including more water, sand, and meadow textures. Trees added on top border):pokete_data/map_data.py "txt": """ _________ / ^ ^ /\ @@ -4372,12 +4389,40 @@ ....... ....... ..... +<<<<<<< HEAD:src/pokete/data/map_data.py .....""", }, "pathway_1": { "x": 0, "y": 23, "txt": r""" +======= + .....""" + }, + "sand_2": { + "x": 69, + "y": 21, + "txt": r""" + .. + ... + .... + .... +.... +.... +..... + ..... + ..... + ... + ... + .. + .. + ..""" + }, + "pathway_1":{ + "x": 0, + "y": 23, + "txt": r""" +>>>>>>> e78631c (Map data for watermill including more water, sand, and meadow textures. Trees added on top border):pokete_data/map_data.py _______________| \_______/ / | / |___ __________________/ @@ -4510,13 +4555,37 @@ ;;;;;;;;; ;;;;;;;;; """ + }, + "meadow_4":{ + "x": 54, + "y": 14, + "txt": r""" + ;; + ;;;;;;;;; + ;;;;;;;;;;;; + ;;;;;;;;;;;;;; + ;;;;;;;;;;;;;;; + ;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;; + ;;;;;;;;;;;;;;;; + ;;;;;;;;;;;;;;; + ;;;;;;;;;;;; + ;;;;;;; + ;;;""" } + }, "dors": { - "dor_playmap_53": { + "dor_playmap_52_1": { "x": 33, "y": 15, "args": {"map": "playmap_53", "x": 9, "y": 0} + }, + "dor_playmap_52_2": { + "x": 16, + "y": 29, + "args": { "map": "playmap_54", "x": 13,"y": 0} } } @@ -4526,7 +4595,11 @@ "inner_walls": { "x": 2, "y": 1, +<<<<<<< HEAD:src/pokete/data/map_data.py "txt": """ +======= + "txt": r""" +>>>>>>> e78631c (Map data for watermill including more water, sand, and meadow textures. Trees added on top border):pokete_data/map_data.py __________________________ | | | | | @@ -4552,11 +4625,36 @@ "x": 9, "y": 0, "args": {"map": "playmap_52", "x": 33, "y": 15} - }, + } + } + }, + "playmap_54": { + "hard_obs":{ + "inner_walls":{ + "x": 2, + "y": 1, + "txt": r""" +_________________________ +| | | +| | +|___ ___| | +| | _____| +| | | +|________|___ ___|""" + } }, - } -} + "soft_obs":{ + }, + "dors":{ + "dor_playmap_54":{ + "x": 13, + "y": 0, + "args":{"map": "playmap_52", "x": 16, "y":29} + } + } + } + } if __name__ == "__main__": print("\033[31;1mDo not execute this!\033[0m") diff --git a/src/pokete/data/maps.py b/src/pokete/data/maps.py index d90dfb43..1fe28357 100644 --- a/src/pokete/data/maps.py +++ b/src/pokete/data/maps.py @@ -621,7 +621,7 @@ }, "playmap_54":{ "height": 10, - "width": 15, + "width": 25, "song": "Map.mp3", "pretty_name": "house", "extra": None, From f1d79952220e0994e50193cb2ad452883e46a862 Mon Sep 17 00:00:00 2001 From: amber-codex <157549008+amber-codex@users.noreply.github.com> Date: Tue, 6 May 2025 11:37:54 -0400 Subject: [PATCH 12/47] shifted sand texture to encompass most of the small lake. More homes and fences also added --- src/pokete/data/map_data.py | 168 +++++++++++++++++++++++++----------- 1 file changed, 119 insertions(+), 49 deletions(-) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index ed3cd4cc..43b87b61 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -4193,13 +4193,6 @@ }, }, }, -<<<<<<< HEAD:src/pokete/data/map_data.py - "playmap_52": { - "hard_obs": { - "workshop": { - "x": 30, - "y": 15, -======= "playmap_52":{ "hard_obs":{ @@ -4210,11 +4203,42 @@ ()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()() ()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()() """ + }, + "tree2":{ + "x": 51, + "y": 4, + "txt": r""" +() +() +||""" + }, + "tree3":{ + "x": 49, + "y": 6, + "txt": r""" +() +() +||""" + }, + "tree2":{ + "x": 55, + "y": 10, + "txt": r""" +() +() +||""" + }, + "tree2":{ + "x": 61, + "y": 8, + "txt": r""" +() +() +||""" }, "workshop":{ "x": 29, "y": 19, ->>>>>>> e78631c (Map data for watermill including more water, sand, and meadow textures. Trees added on top border):pokete_data/map_data.py "txt": """ _________ / ^ ^ /\ @@ -4251,6 +4275,32 @@ """ }, + "house4": { + "x": 105, + "y": 7, + "txt": r""" + _________ + / ^ ^ /\ +/________/ \ +|o ___ o| | +|__| |__|___|""" + + }, + "house5": { + "x": 113, + "y": 13, + "txt": r""" + _________ + / ^ ^ /\ +/________/ \ +|o ___ o| | +|__| |__|___|""" + }, + "center":{ + "x": 90, + "y": 37, + "txt": CENTER + }, "fence_1": { "x": 41, "y": 48, @@ -4270,6 +4320,32 @@ ########## """ }, + "fence_2":{ + "x": 99, + "y": 18, + "txt": r""" +############################## +# +# + + + + +# +# +# +# +# +# +# +# +# +# +# """ + }, + "small_house":{ + "x" + }, "barn":{ "x": 3, "y": 54, @@ -4282,7 +4358,7 @@ }, "fence_2":{ "x": 0, - "y": 41, + "y": 54, "txt": r""" # # @@ -4389,14 +4465,6 @@ ....... ....... ..... -<<<<<<< HEAD:src/pokete/data/map_data.py - .....""", - }, - "pathway_1": { - "x": 0, - "y": 23, - "txt": r""" -======= .....""" }, "sand_2": { @@ -4415,14 +4483,20 @@ ... ... .. - .. - ..""" + .. .. + .. .. + .. .. + ... .. + .... .. + ......... + ....... + ... + """ }, "pathway_1":{ "x": 0, "y": 23, "txt": r""" ->>>>>>> e78631c (Map data for watermill including more water, sand, and meadow textures. Trees added on top border):pokete_data/map_data.py _______________| \_______/ / | / |___ __________________/ @@ -4494,24 +4568,24 @@ | \ | \ | - | | - | | - | | | | - | \ / / ___________ - | \ / / / - | \________/ /________/ ________ - | / - ________ _________ \ - \ \ \ \ - \ \ \ \ - \ \ \ \ - | | \ \ - | | | | - | | | | - | | | | - | |_________| | - | / - | ____________/ + | | / / + | | / / + | | | | / / + | \ / / _______________/ / + | \ / / / / + | \________/ /________/ __________ / + | / \ \ + ________ _________ \ \ \ + \ \ \ \ \ \ + \ \ \ \ \ \ + \ \ \ \ \ \ + | | \ \ \ \ + | | | | \ \ + | | | | \ \ + | | | | \ \ + | |_________| | \ \ + | / \ \ + | ____________/ \ \ | | | | | | @@ -4557,7 +4631,7 @@ """ }, "meadow_4":{ - "x": 54, + "x": 51, "y": 14, "txt": r""" ;; @@ -4565,11 +4639,11 @@ ;;;;;;;;;;;; ;;;;;;;;;;;;;; ;;;;;;;;;;;;;;; - ;;;;;;;;;;;;;;;; -;;;;;;;;;;;;;;;;;; -;;;;;;;;;;;;;;;;;; - ;;;;;;;;;;;;;;;; - ;;;;;;;;;;;;;;; + ;;;; ;;;;;;;;;; +;;;;; ;;;;;;;;;;; +;;;;; ;;;; ;;;;; + ;;;;;;;;;; ;;;; + ;;;;;;;;; ;;;; ;;;;;;;;;;;; ;;;;;;; ;;;""" @@ -4595,11 +4669,7 @@ "inner_walls": { "x": 2, "y": 1, -<<<<<<< HEAD:src/pokete/data/map_data.py - "txt": """ -======= - "txt": r""" ->>>>>>> e78631c (Map data for watermill including more water, sand, and meadow textures. Trees added on top border):pokete_data/map_data.py + "txt": r""" __________________________ | | | | | From 2b4655bd733ec48c48c903e5d27fae497bcce08f Mon Sep 17 00:00:00 2001 From: amber-codex <157549008+amber-codex@users.noreply.github.com> Date: Tue, 6 May 2025 12:25:28 -0400 Subject: [PATCH 13/47] added door to enter Agrawos to the left --- src/pokete/data/map_data.py | 31 +++++++++++++++++++++++++------ src/pokete/data/mapstations.py | 4 ++-- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index 43b87b61..10f45f0d 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -3354,8 +3354,8 @@ ((()) | | | # # | | # # | | ||| || | # ___ # | | ()) ()()) [--] [--] |__________| |_________|____| |___| |___|__| ()( #### ||| [------] (() -() # )(( -(() _______________________ ___________________ ((( +() # +(() _______________________ ___________________ ))( / /\ / /\ __________ )(( (()#### /______________________/ \ /__________________/ \ / /\ ()) ()) # | ## ___ ## ___ ## | | | ___ ### | | /_________/ \ ()( @@ -3577,7 +3577,16 @@ "x": 122, "y": 64, }, - }, + "dor_playmap_52": { + "x": 200, + "y": 32, + "args": {"map": "playmap_52", "x": 0, "y": 32} + }, + "dor_playmap_48": { + "x": 200, + "y": 31, + "args": {"map": "playmap_52", "x": 0, "y": 31} + }, "balls": { "ball_1": { "x": 3, @@ -4220,7 +4229,7 @@ () ||""" }, - "tree2":{ + "tree4":{ "x": 55, "y": 10, "txt": r""" @@ -4228,7 +4237,7 @@ () ||""" }, - "tree2":{ + "tree":{ "x": 61, "y": 8, "txt": r""" @@ -4660,7 +4669,17 @@ "x": 16, "y": 29, "args": { "map": "playmap_54", "x": 13,"y": 0} - } + }, + "dor_playmap_52_3": { + "x": 0, + "y": 32, + "args": {"map": "playmap_52", "x": 200, "y": 32} + }, + "dor_playmap_52_4": { + "x": 0, + "y": 31, + "args": {"map": "playmap_52", "x": 200, "y": 31} + }, } }, diff --git a/src/pokete/data/mapstations.py b/src/pokete/data/mapstations.py index 36c34524..b6a11f60 100644 --- a/src/pokete/data/mapstations.py +++ b/src/pokete/data/mapstations.py @@ -354,7 +354,7 @@ "juiciest and most delicious Mowcow-burgers, cut from the " "happiest and most delicious Mowcows anywhere to find!", "w_next": "playmap_35", - "a_next": "playmap_52", + "d_next": "playmap_52", "text": """ #│# P│A ├─┘# @@ -372,7 +372,7 @@ "desc": "The town of Watermill is known for " "the beautiful plants and wonderful " "nature reserves.""", - "d_next": "playmap_39", + "a_next": "playmap_39", } } From 0b855e2f183d59bf905d1f7fb1ad16cae04415c8 Mon Sep 17 00:00:00 2001 From: amber-codex <157549008+amber-codex@users.noreply.github.com> Date: Tue, 6 May 2025 13:09:47 -0400 Subject: [PATCH 14/47] added a school another meadow a poke center and some more pathways --- src/pokete/data/map_data.py | 68 +++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 3 deletions(-) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index 10f45f0d..71eb3d2d 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -4352,8 +4352,17 @@ # # """ }, - "small_house":{ - "x" + "School":{ + "x": 99, + "y": 52, + "txt": r""" + ____ + ______| |_________ + /______| |_______/ \ +| () () |OO| () () | |_______ +| () () | | () () | / ^ ^ /\ +|_______|()|_______| |o o o| | +|_||_||_|__|_||_||_|_|_____|_|""" }, "barn":{ "x": 3, @@ -4501,12 +4510,31 @@ ....... ... """ + }, + "pathway_exit":{ + "x": 0, + "y": 36, + "txt": r""" + ____ + | + __ | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + """ }, "pathway_1":{ "x": 0, "y": 23, "txt": r""" - _______________| \_______/ / + _ ___________| \_______/ / | / |___ __________________/ \__ \ @@ -4656,6 +4684,39 @@ ;;;;;;;;;;;; ;;;;;;; ;;;""" + }, + "meadow_4": { + "x": 70, + "y": 68, + "txt": r""" +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + ;;;;;;;;;;;;;;;;;;;;;;;;;;;; + ;;;;;;;;;;;;;;;;;;;;;;;;;;; + ;;;;;;;;;;;;;;;;;;;;;;;;; + ;;;;;;;;;;;;;;;;;;;;;;;; + ;;;;;;;;;;;;;;;;;;;;; + ;;;;;;;;;;;;;;;;;;;;; + ;;;;;;;;;;;;;;;;;;;;; + ;;;;;;;;;;;;;;;;;;;;; + ;;;;;;;;;;;;;;;;;;;;; + ;;;;;;;;;;;;;;;;;;;;; + ;;;;;;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;; + ;;;;;;;;;;;;;;;;;;;; + ;;;;;;;;;;;;;;;;;; + ;;;;;;;;;;;;;;;;;; + ;;;;;;;;;;;;;;;; + ;;;;;;;;;;;;;;; + ;;;;;;;;;;;;;; + ;;;;;;;;;;;; + ;;;;;;;;;; + ;;;;;;;;; + ;;;;; + ;;;; + ;""" } }, @@ -4744,6 +4805,7 @@ } } +} if __name__ == "__main__": print("\033[31;1mDo not execute this!\033[0m") From 362d395e471bd8e5efbcb2924a0dcae1241cb8af Mon Sep 17 00:00:00 2001 From: amber-codex <157549008+amber-codex@users.noreply.github.com> Date: Tue, 6 May 2025 15:40:30 -0400 Subject: [PATCH 15/47] More map data for Watermill --- src/pokete/data/map_data.py | 189 ++++++++++++++++++++++++++++++++- src/pokete/data/maps.py | 13 +++ src/pokete/data/mapstations.py | 10 +- 3 files changed, 209 insertions(+), 3 deletions(-) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index 71eb3d2d..01f0bd05 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -4205,13 +4205,39 @@ "playmap_52":{ "hard_obs":{ - "tree_group_51_1":{ + "tree_group_52_1":{ "x": 0, "y": 70, "txt": r""" ()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()() ()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()() """ + }, + "tree_group_52_1": { + "x": 95, + "y": 30, + "txt": r""" + () + ()((() + ()))()()() + )()((()((()() + ()((()()()())) + ()()((()()()()) +()()()()()((()()() + ()()()))()()()( + ()()()()))()()() + ()()()()((()()()""" + }, + "tree_group_52_3":{ + "x": 111, + "y": 40, + "txt": r""" +()()()()()()()() + )()()()()()()() + )()()))()()()) + ()()()((()() + ((()()() + )()()""" }, "tree2":{ "x": 51, @@ -4717,6 +4743,25 @@ ;;;;; ;;;; ;""" + }, + "meadow_5": { + "x": 25, + "y": 63, + "txt": r""" + ... + .... + ...... + ...... + ....... + ........ + .......... + ........... + ........... +............ +........... + ......... + ...... + ...""" } }, @@ -4741,6 +4786,60 @@ "y": 31, "args": {"map": "playmap_52", "x": 200, "y": 31} }, + }, + "balls": { + "ball_1": { + "x": 2, + "y": 44 + }, + "ball_2": { + "x": 21, + "y": 49 + }, + "ball_3": { + "x": 38, + "y": 26 + }, + "ball_4": { + "x": 48, + "y": 12 + }, + "ball_5": { + "x": 50, + "y": 44 + }, + "ball_5": { + "x": 71, + "y": 6 + }, + "ball_6": { + "x": 66, + "y": 27 + }, + "ball_7": { + "x": 88, + "y": 8 + }, + "ball_8": { + "x": 91, + "y": 30 + }, + "ball_9": { + "x": 102, + "y": 4 + }, + "ball_10": { + "x": 123, + "y": 21 + }, + "ball_11": { + "x": 127, + "y": 25 + }, + "ball_12": { + "x": 127, + "y": 62 + }, } }, @@ -4803,6 +4902,94 @@ } } + }, + "playmap_55":{ + "hard_obs":{ + "inner_walls":{ + "x": 2, + "y": 1, + "txt": r""" +__________________________________________________________________ +| | | | +| | | | +| o o | | | +| <> | | | +| o o | | | +| o o | | +| <> | | +| o o | +| |_______________ | +| | | | +| o o | | | +| <> | | | +| o o | | | +| | | | +| | | | +| | | | +| | | | +| | | | +| | | | +| | | | +| | | +| | | | +|____ ____________________ ____|_________ ____|_ _____________| +| | +| | +|____ ____________________ ____________________________| +| | +| | +|______________________________ ______________________________| +| | | | +| | | +| | | +| | | | +| | | | +|________________________ ___| |______________________________| +| | | | +| | | | +| | | +| | | | +| | | | +| | | | +| | | | +| | | | +| | | | +|______________________________/ \______________________________|""" + } + }, + "soft_obs":{ + }, + "dors": { + "dor_playmap_55_1":{ + "x": 34, + "y": 0, + "args":{"map": "playmap_52", "x": 107, "y":42} + }, + "dor_playmap_55_2":{ + "x": 35, + "y": 0, + "args":{"map": "playmap_52", "x": 108, "y":42} + }, + "dor_playmap_54_3":{ + "x": 36, + "y": 0, + "args":{"map": "playmap_52", "x": 18, "y":42} + } + }, + "balls": { + "ball_1": { + "x": 3, + "y": 2 + }, + "ball_2": { + "x": 60, + "y": 10 + }, + "ball_3": { + "x": 10, + "y": 40 + } + } } } } diff --git a/src/pokete/data/maps.py b/src/pokete/data/maps.py index 1fe28357..0734f6c3 100644 --- a/src/pokete/data/maps.py +++ b/src/pokete/data/maps.py @@ -627,6 +627,19 @@ "extra": None, "poke_args": None, "weather": None + }, + "playmap_55": { + "height": 45, + "width": 65, + "song": "Map.mp3", + "pretty_name": "Watermill School", + "extra": None, + "poke_args":{ + "pokes": ["kartmen", "rustacean", "lil_nut", "megapois"], + "minlvl": 1100, + "maxlvl": 1500 + }, + "weather": None } } diff --git a/src/pokete/data/mapstations.py b/src/pokete/data/mapstations.py index b6a11f60..2c0343c3 100644 --- a/src/pokete/data/mapstations.py +++ b/src/pokete/data/mapstations.py @@ -357,7 +357,7 @@ "d_next": "playmap_52", "text": """ #│# P│A -├─┘# +├─┘ $ #""", "color": "yellow" }, @@ -373,7 +373,13 @@ "the beautiful plants and wonderful " "nature reserves.""", "a_next": "playmap_39", - + "text": """ +____""", + "color": "yellow" + }, + "add": { + "x": 39, + "y": 2 } } From c79262d640de156a479d70b37c819bf1eb377850 Mon Sep 17 00:00:00 2001 From: amber-codex <157549008+amber-codex@users.noreply.github.com> Date: Tue, 6 May 2025 16:40:01 -0400 Subject: [PATCH 16/47] added an npc for the pokete center in Watermill --- src/pokete/data/map_data.py | 47 ++++++++++++++++++++++++++++++++++++- src/pokete/data/maps.py | 10 ++++++++ src/pokete/data/npcs.py | 7 ++++++ 3 files changed, 63 insertions(+), 1 deletion(-) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index 01f0bd05..7e518405 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -4786,6 +4786,11 @@ "y": 31, "args": {"map": "playmap_52", "x": 200, "y": 31} }, + "dor_playmap_52_5": { + "x": 94, + "y": 33, + "args": {"map": "playmap_56", "x": , "y": 31} + } }, "balls": { "ball_1": { @@ -4900,6 +4905,15 @@ "y": 0, "args":{"map": "playmap_52", "x": 16, "y":29} } + }, + "balls": { + "ball_1": { + "x": 12, + "y": 4 + }, + "ball_2": { + "x": + } } }, @@ -4974,7 +4988,12 @@ "x": 36, "y": 0, "args":{"map": "playmap_52", "x": 18, "y":42} - } + }, + "dor_playmap_54_4":{ + "x": 94, + "y":33, + "args":{"map": "playmap_56", "x": 14, "y":0} + }, }, "balls": { "ball_1": { @@ -4990,6 +5009,32 @@ "y": 40 } } + }, + "playmap_56": { + "hard_obs": { + "inner_walls": { + "x": 2, + "y": 1, + "txt": r""" +_________________________ +| | a | +| | +|___ ___| | +| | _____| +| | | +|________|___ ___|""" + } + }, + "soft_obs"{ + }, + "dors": { + "dor_playmap_56_1":{ + "x": 14, + "y": 0, + "args":{"map": "playmap_52", "x": 94, "y":33} + } + } + } } } } diff --git a/src/pokete/data/maps.py b/src/pokete/data/maps.py index 0734f6c3..f45d6fc9 100644 --- a/src/pokete/data/maps.py +++ b/src/pokete/data/maps.py @@ -640,7 +640,17 @@ "maxlvl": 1500 }, "weather": None + }, + "playmap_56": { + "height": 10, + "width": 30, + "song": "Map.mp3", + "pretty_name": "Watermill Center", + "extra": None, + "poke_args": None, + "weather": None } + } if __name__ == "__main__": diff --git a/src/pokete/data/npcs.py b/src/pokete/data/npcs.py index 220dc790..507d3d19 100644 --- a/src/pokete/data/npcs.py +++ b/src/pokete/data/npcs.py @@ -26,6 +26,13 @@ "x": 52, "y": 1 }, + "healer_2": { + "texts": ["Hello, fellow trainer.", "You and your Poketes look exhausted.", "I can heal them!"], + "fn": "heal", + "map": "playmap_56", + "x": 17, + "y": 9 + }, "npc_1": { "texts": [], "fn": "playmap_13_introductor", From aac0e8887231470a191c5ad17d910db2cf843d42 Mon Sep 17 00:00:00 2001 From: amber-codex <157549008+amber-codex@users.noreply.github.com> Date: Tue, 6 May 2025 16:46:56 -0400 Subject: [PATCH 17/47] missed a semicolon on a dict object --- src/pokete/data/map_data.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index 7e518405..3933eb6d 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -4789,7 +4789,7 @@ "dor_playmap_52_5": { "x": 94, "y": 33, - "args": {"map": "playmap_56", "x": , "y": 31} + "args": {"map": "playmap_56", "x": 14, "y": 0} } }, "balls": { @@ -4912,11 +4912,11 @@ "y": 4 }, "ball_2": { - "x": + "x": 21, + "y": 7 } } - - }, + }, "playmap_55":{ "hard_obs":{ "inner_walls":{ @@ -5025,15 +5025,16 @@ |________|___ ___|""" } }, - "soft_obs"{ + "soft_obs":{ + }, + "dors": { "dor_playmap_56_1":{ "x": 14, "y": 0, "args":{"map": "playmap_52", "x": 94, "y":33} - } - } + } } } } From c45fb6c9d50efa4b092a1fc7db27d073b93ae390 Mon Sep 17 00:00:00 2001 From: craigb20 <157324902+craigb20@users.noreply.github.com> Date: Tue, 6 May 2025 16:47:18 -0400 Subject: [PATCH 18/47] Add playmap_57 --- src/pokete/data/maps.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/pokete/data/maps.py b/src/pokete/data/maps.py index f45d6fc9..6f4ff8de 100644 --- a/src/pokete/data/maps.py +++ b/src/pokete/data/maps.py @@ -649,8 +649,16 @@ "extra": None, "poke_args": None, "weather": None - } - + }, + "playmap_57": { + "height": 25, + "width": 91, + "song": "Map.mp3", + "pretty_name": "New Town", + "extra_actions": None, + "poke_args": None, + "weather": None + }, } if __name__ == "__main__": From 9da4e087647493dcb2c21af7bfa3339b632de502 Mon Sep 17 00:00:00 2001 From: craigb20 <157324902+craigb20@users.noreply.github.com> Date: Tue, 6 May 2025 16:51:50 -0400 Subject: [PATCH 19/47] Add playmap_57 to mapstations.py --- src/pokete/data/mapstations.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/pokete/data/mapstations.py b/src/pokete/data/mapstations.py index 2c0343c3..c266dfd2 100644 --- a/src/pokete/data/mapstations.py +++ b/src/pokete/data/mapstations.py @@ -531,6 +531,21 @@ "y": 15 } }, + "playmap_57": { + "gen": { + "additionals": [], + "desc": "A new community surrounding a small field.", + "d_next": "playmap_1", + "text": """ *P# +├─── + # #""", + "color": "brightgreen" + }, + "add": { + "x": 3, + "y": 3 + } + }, } if __name__ == "__main__": From 987ba9fc3c6d24c1f20e57785a79966ea265b206 Mon Sep 17 00:00:00 2001 From: craigb20 <157324902+craigb20@users.noreply.github.com> Date: Tue, 6 May 2025 17:04:03 -0400 Subject: [PATCH 20/47] Created and implemented design to playmap_57 --- src/pokete/data/map_data.py | 102 ++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index 3933eb6d..01b934df 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -5036,6 +5036,108 @@ "args":{"map": "playmap_52", "x": 94, "y":33} } } + }, + "playmap_57": { + "hard_obs": { + "house_top_left": { + "x": 10, + "y": 1, + "txt": HOUSE1 + }, + "house_top_center": { + "x": 40, + "y": 1, + "txt": HOUSE1 + }, + "house_top_right": { + "x": 70, + "y": 1, + "txt": HOUSE1 + }, + "house_bottom_left": { + "x": 10, + "y": 17, + "txt": HOUSE1 + }, + "house_bottom_center": { + "x": 40, + "y": 17, + "txt": HOUSE1 + }, + "house_bottom_right": { + "x": 70, + "y": 17, + "txt": HOUSE1 + }, + "fence": { + "x": 0, + "y": 0, + "txt": """ # + # + # + # + # + # + # + # + # + # + # + ## + + + ## + # + # + # + # + # + # + # + # + # + ##########################################################################################""" + } + }, + "soft_obs": { + "meadow_center": { + "x": 32, + "y": 7, + "txt": """ ,;;;;;;;;;, + ;;;;;;;;;;;;;;; + ;;;;;;;;;;;;;;;;; + ;;;;;;;;;;;;;;;;;;; + ;;;;;;;;;;;;;;;;; + ;;;;;;;;;;;;;;; + ';;;;;;;;;'""" + } + }, + "dors": { + "dor_playmap_57_1": { + "x": 90, + "y": 12, + "args": {"map": "playmap_57", "x": 1, "y": 28} + }, + "dor_playmap_57_2": { + "x": 90, + "y": 13, + "args": {"map": "playmap_57", "x": 1, "y": 29} + } + }, + "balls": { + "ball_1": { + "x": 12, + "y": 3 + }, + "ball_2": { + "x": 42, + "y": 19 + }, + "ball_3": { + "x": 72, + "y": 3 + } + } } } } From 304910c68223df84b96311ffbf0bf436a92f7c99 Mon Sep 17 00:00:00 2001 From: craigb20 <157324902+craigb20@users.noreply.github.com> Date: Tue, 6 May 2025 17:09:00 -0400 Subject: [PATCH 21/47] Add playmap_57 to mapstations.py --- src/pokete/data/mapstations.py | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/src/pokete/data/mapstations.py b/src/pokete/data/mapstations.py index c266dfd2..7f38aa0b 100644 --- a/src/pokete/data/mapstations.py +++ b/src/pokete/data/mapstations.py @@ -381,6 +381,21 @@ "x": 39, "y": 2 } + }, + "playmap_57": { + "gen": { + "additionals": [], + "desc": "A new community surrounding a small field.", + "d_next": "playmap_1", + "text": """ *P# +├─── + # #""", + "color": "brightgreen" + }, + "add": { + "x": 3, + "y": 3 + } } } @@ -530,22 +545,8 @@ "x": 14, "y": 15 } - }, - "playmap_57": { - "gen": { - "additionals": [], - "desc": "A new community surrounding a small field.", - "d_next": "playmap_1", - "text": """ *P# -├─── - # #""", - "color": "brightgreen" - }, - "add": { - "x": 3, - "y": 3 - } - }, + } + } if __name__ == "__main__": From e2838caf16ac402647457490ff9a64d86497ceed Mon Sep 17 00:00:00 2001 From: amber-codex <157549008+amber-codex@users.noreply.github.com> Date: Tue, 6 May 2025 20:08:04 -0400 Subject: [PATCH 22/47] added bracket to get balls back in playmap 39 --- src/pokete/data/map_data.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index 01b934df..803cb83a 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -3587,6 +3587,7 @@ "y": 31, "args": {"map": "playmap_52", "x": 0, "y": 31} }, + }, "balls": { "ball_1": { "x": 3, From 8bf30d85eeb2fc817a377748b7ef67fc1507f3c9 Mon Sep 17 00:00:00 2001 From: amber-codex <157549008+amber-codex@users.noreply.github.com> Date: Tue, 6 May 2025 20:09:54 -0400 Subject: [PATCH 23/47] removed bracket at end --- src/pokete/data/map_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index 803cb83a..7d71ce34 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -5141,7 +5141,7 @@ } } } -} + if __name__ == "__main__": print("\033[31;1mDo not execute this!\033[0m") From 868bc487791cf7cdd44a3dc7dfc5891680a90a4b Mon Sep 17 00:00:00 2001 From: amber-codex <157549008+amber-codex@users.noreply.github.com> Date: Tue, 6 May 2025 20:13:32 -0400 Subject: [PATCH 24/47] added balls to playmap 53 --- src/pokete/data/map_data.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index 7d71ce34..f76624a3 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -4881,6 +4881,8 @@ "y": 0, "args": {"map": "playmap_52", "x": 33, "y": 15} } + }, + "balls":{ } }, "playmap_54": { From e87a05e36f58c26d92e55f43ae99213829c2120b Mon Sep 17 00:00:00 2001 From: amber-codex <157549008+amber-codex@users.noreply.github.com> Date: Tue, 6 May 2025 20:15:59 -0400 Subject: [PATCH 25/47] added balls to playmap 56 --- src/pokete/data/map_data.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index f76624a3..2959f187 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -5038,6 +5038,8 @@ "y": 0, "args":{"map": "playmap_52", "x": 94, "y":33} } + }, + "balls":{ } }, "playmap_57": { From 829de911b42d75a4a579069bff0a4f2b66d0c197 Mon Sep 17 00:00:00 2001 From: amber-codex <157549008+amber-codex@users.noreply.github.com> Date: Tue, 6 May 2025 20:18:36 -0400 Subject: [PATCH 26/47] fixed extra to extra actions in a few playmaps in maps.py --- src/pokete/data/maps.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pokete/data/maps.py b/src/pokete/data/maps.py index 6f4ff8de..84bdb506 100644 --- a/src/pokete/data/maps.py +++ b/src/pokete/data/maps.py @@ -614,7 +614,7 @@ "width": 30, "song": "Map.mp3", "pretty_name": "workshop", - "extra": None, + "extra_actions": None, "poke_args": None, "weather": None @@ -624,7 +624,7 @@ "width": 25, "song": "Map.mp3", "pretty_name": "house", - "extra": None, + "extra_actions": None, "poke_args": None, "weather": None }, @@ -633,7 +633,7 @@ "width": 65, "song": "Map.mp3", "pretty_name": "Watermill School", - "extra": None, + "extra_actions": None, "poke_args":{ "pokes": ["kartmen", "rustacean", "lil_nut", "megapois"], "minlvl": 1100, @@ -646,7 +646,7 @@ "width": 30, "song": "Map.mp3", "pretty_name": "Watermill Center", - "extra": None, + "extra_actions": None, "poke_args": None, "weather": None }, From 6fafafc8f89989bff2395b0605e1622a6a366130 Mon Sep 17 00:00:00 2001 From: amber-codex <157549008+amber-codex@users.noreply.github.com> Date: Tue, 6 May 2025 20:28:55 -0400 Subject: [PATCH 27/47] fixed map dictionary in playmap 52 to connect to playmap 39 --- src/pokete/data/map_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index 2959f187..dcda7e1c 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -4785,7 +4785,7 @@ "dor_playmap_52_4": { "x": 0, "y": 31, - "args": {"map": "playmap_52", "x": 200, "y": 31} + "args": {"map": "playmap_39", "x": 200, "y": 31} }, "dor_playmap_52_5": { "x": 94, From 149d59f70e672d6b8262600f5a341886dca970c9 Mon Sep 17 00:00:00 2001 From: amber-codex <157549008+amber-codex@users.noreply.github.com> Date: Tue, 6 May 2025 20:50:56 -0400 Subject: [PATCH 28/47] moved door over 1 space --- src/pokete/data/map_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index dcda7e1c..0aafc5b7 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -4785,7 +4785,7 @@ "dor_playmap_52_4": { "x": 0, "y": 31, - "args": {"map": "playmap_39", "x": 200, "y": 31} + "args": {"map": "playmap_39", "x": 199, "y": 31} }, "dor_playmap_52_5": { "x": 94, From c78034904767daa7a0625a212e48ebab1734734f Mon Sep 17 00:00:00 2001 From: amber-codex <157549008+amber-codex@users.noreply.github.com> Date: Tue, 6 May 2025 20:53:04 -0400 Subject: [PATCH 29/47] forgot to fix a door --- src/pokete/data/map_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index 0aafc5b7..fb792dd7 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -4780,7 +4780,7 @@ "dor_playmap_52_3": { "x": 0, "y": 32, - "args": {"map": "playmap_52", "x": 200, "y": 32} + "args": {"map": "playmap_52", "x": 199, "y": 32} }, "dor_playmap_52_4": { "x": 0, From b65eb55e9d87a0327d78f6d5ddf5bd5e169d687a Mon Sep 17 00:00:00 2001 From: amber-codex <157549008+amber-codex@users.noreply.github.com> Date: Tue, 6 May 2025 20:56:07 -0400 Subject: [PATCH 30/47] fixed doors in playmap39 --- src/pokete/data/map_data.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index fb792dd7..ce1722d8 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -3578,12 +3578,12 @@ "y": 64, }, "dor_playmap_52": { - "x": 200, + "x": 199, "y": 32, "args": {"map": "playmap_52", "x": 0, "y": 32} }, "dor_playmap_48": { - "x": 200, + "x": 199, "y": 31, "args": {"map": "playmap_52", "x": 0, "y": 31} }, From 962d6648947356abb941f815224c75ca4beb68b8 Mon Sep 17 00:00:00 2001 From: amber-codex <157549008+amber-codex@users.noreply.github.com> Date: Tue, 6 May 2025 21:05:03 -0400 Subject: [PATCH 31/47] moved trees down --- src/pokete/data/map_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index ce1722d8..683b892a 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -4208,7 +4208,7 @@ "hard_obs":{ "tree_group_52_1":{ "x": 0, - "y": 70, + "y": 69, "txt": r""" ()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()() ()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()() From d7965cb2dd874832e61137d703b9cadf2a2a976c Mon Sep 17 00:00:00 2001 From: amber-codex <157549008+amber-codex@users.noreply.github.com> Date: Tue, 6 May 2025 21:24:15 -0400 Subject: [PATCH 32/47] moved trees down again --- src/pokete/data/map_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index 683b892a..ee4bd780 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -4208,7 +4208,7 @@ "hard_obs":{ "tree_group_52_1":{ "x": 0, - "y": 69, + "y": 68, "txt": r""" ()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()() ()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()() From 010f2d01aa54272a37ec709e47e07e9c1521a825 Mon Sep 17 00:00:00 2001 From: amber-codex <157549008+amber-codex@users.noreply.github.com> Date: Tue, 6 May 2025 21:28:08 -0400 Subject: [PATCH 33/47] fixed variable name --- src/pokete/data/map_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index ee4bd780..4f7d8d40 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -4214,7 +4214,7 @@ ()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()() """ }, - "tree_group_52_1": { + "tree_group_52_2": { "x": 95, "y": 30, "txt": r""" From e593ddd479597d5bff322b581d585cc4f703e79c Mon Sep 17 00:00:00 2001 From: amber-codex <157549008+amber-codex@users.noreply.github.com> Date: Tue, 6 May 2025 21:29:25 -0400 Subject: [PATCH 34/47] removed top border trees --- src/pokete/data/map_data.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index 4f7d8d40..3406dc74 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -4206,14 +4206,6 @@ "playmap_52":{ "hard_obs":{ - "tree_group_52_1":{ - "x": 0, - "y": 68, - "txt": r""" -()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()() -()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()() -""" - }, "tree_group_52_2": { "x": 95, "y": 30, From 6502789c3b460391894e3f25f2039ba2522537ac Mon Sep 17 00:00:00 2001 From: amber-codex <157549008+amber-codex@users.noreply.github.com> Date: Tue, 6 May 2025 21:35:35 -0400 Subject: [PATCH 35/47] moved meadow down 1 --- src/pokete/data/map_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index 3406dc74..73c0323b 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -4706,7 +4706,7 @@ }, "meadow_4": { "x": 70, - "y": 68, + "y": 67, "txt": r""" ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; From 85c2839dc065fcd45c3656c165bdc84d86a457bc Mon Sep 17 00:00:00 2001 From: amber-codex <157549008+amber-codex@users.noreply.github.com> Date: Tue, 6 May 2025 21:39:07 -0400 Subject: [PATCH 36/47] expanded map --- src/pokete/data/maps.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pokete/data/maps.py b/src/pokete/data/maps.py index 84bdb506..1dcb63dd 100644 --- a/src/pokete/data/maps.py +++ b/src/pokete/data/maps.py @@ -597,8 +597,8 @@ "weather": None }, "playmap_52":{ - "height": 70, - "width": 130, + "height": 75, + "width": 135, "song": "Map.mp3", "pretty_name": "Town of Watermill", "extra_actions": None, From 7f4d6333a9cec3ef8cf8f66ffbabd2d575454009 Mon Sep 17 00:00:00 2001 From: amber-codex <157549008+amber-codex@users.noreply.github.com> Date: Wed, 7 May 2025 09:28:50 -0400 Subject: [PATCH 37/47] added map 55 and 56 to mapstations in 52 --- src/pokete/data/map_data.py | 25 +++++++++---------------- src/pokete/data/mapstations.py | 2 +- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index 73c0323b..73b8afdf 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -3354,8 +3354,8 @@ ((()) | | | # # | | # # | | ||| || | # ___ # | | ()) ()()) [--] [--] |__________| |_________|____| |___| |___|__| ()( #### ||| [------] (() -() # -(() _______________________ ___________________ +() # +(() _______________________ ___________________ ))( / /\ / /\ __________ )(( (()#### /______________________/ \ /__________________/ \ / /\ ()) ()) # | ## ___ ## ___ ## | | | ___ ### | | /_________/ \ ()( @@ -4217,7 +4217,7 @@ ()((()()()())) ()()((()()()()) ()()()()()((()()() - ()()()))()()()( + ()()()))()()()( ()()()()))()()() ()()()()((()()()""" }, @@ -4375,7 +4375,7 @@ "x": 99, "y": 52, "txt": r""" - ____ + ____ ______| |_________ /______| |_______/ \ | () () |OO| () () | |_______ @@ -4414,15 +4414,8 @@ }, - "soft_obs": { - "road_1": { - "x": 1, - "y": 23, - "txt": """ - - """, - }, - "water_1": { + "soft_obs":{ + "water_1":{ "x": 0, "y": 0, "txt": r""" @@ -4908,7 +4901,7 @@ }, "ball_2": { "x": 21, - "y": 7 + "y": 7 } } }, @@ -5021,7 +5014,7 @@ } }, "soft_obs":{ - + }, "dors": { @@ -5029,7 +5022,7 @@ "x": 14, "y": 0, "args":{"map": "playmap_52", "x": 94, "y":33} - } + } }, "balls":{ } diff --git a/src/pokete/data/mapstations.py b/src/pokete/data/mapstations.py index 7f38aa0b..432ae38a 100644 --- a/src/pokete/data/mapstations.py +++ b/src/pokete/data/mapstations.py @@ -368,7 +368,7 @@ }, "playmap_52":{ "gen":{ - "additionals":["playmap_53", "playmap_54"], + "additionals":["playmap_53", "playmap_54","playmap_55","playmap_56"], "desc": "The town of Watermill is known for " "the beautiful plants and wonderful " "nature reserves.""", From 327e1fe079061fba8aab81fd805f84e3c36139b6 Mon Sep 17 00:00:00 2001 From: craigb20 <157324902+craigb20@users.noreply.github.com> Date: Wed, 7 May 2025 10:08:04 -0400 Subject: [PATCH 38/47] Updated playmap_57 --- src/pokete/data/mapstations.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pokete/data/mapstations.py b/src/pokete/data/mapstations.py index 432ae38a..33e0f0a9 100644 --- a/src/pokete/data/mapstations.py +++ b/src/pokete/data/mapstations.py @@ -22,7 +22,7 @@ "desc": "Some small patches of grass surrounded by forrest, near " "Nice Town.", - "a_next": "playmap_1", + "a_next": "playmap_57", "w_next": "cave_1", "text": r"""└─┐ ──┘""", @@ -386,15 +386,16 @@ "gen": { "additionals": [], "desc": "A new community surrounding a small field.", - "d_next": "playmap_1", + "a_next": "playmap_1", + "d_next": "playmap_51", "text": """ *P# ├─── # #""", "color": "brightgreen" }, "add": { - "x": 3, - "y": 3 + "x": 8, + "y": 13 } } From e97dcc60c0cb2415cc398d1f19bcd881609affc8 Mon Sep 17 00:00:00 2001 From: craigb20 <157324902+craigb20@users.noreply.github.com> Date: Wed, 7 May 2025 10:29:55 -0400 Subject: [PATCH 39/47] Move playmap_57 earlier in the game for demo purpose --- src/pokete/data/map_data.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index 73b8afdf..38ec56e0 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -134,12 +134,12 @@ "dor_playmap_51_1": { "x": 90, "y": 12, - "args": {"map": "playmap_51", "x": 1, "y": 28}, + "args": {"map": "playmap_57", "x": 1, "y": 28} }, "dor_playmap_51_2": { "x": 90, "y": 13, - "args": {"map": "playmap_51", "x": 1, "y": 29}, + "args": {"map": "playmap_57", "x": 1, "y": 29} }, }, "special_dors": {"dor": {"x": 25, "y": 4}}, From 635aef69875597be5424be3725a38d3b97631e75 Mon Sep 17 00:00:00 2001 From: Mila-7553 Date: Wed, 7 May 2025 10:36:25 -0400 Subject: [PATCH 40/47] Fixed issue with map sizes and objects --- src/pokete/data/maps.py | 12 ++++++------ src/pokete/data/npcs.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pokete/data/maps.py b/src/pokete/data/maps.py index 1dcb63dd..a18ce528 100644 --- a/src/pokete/data/maps.py +++ b/src/pokete/data/maps.py @@ -597,8 +597,8 @@ "weather": None }, "playmap_52":{ - "height": 75, - "width": 135, + "height": 105, + "width": 140, "song": "Map.mp3", "pretty_name": "Town of Watermill", "extra_actions": None, @@ -621,7 +621,7 @@ }, "playmap_54":{ "height": 10, - "width": 25, + "width": 28, "song": "Map.mp3", "pretty_name": "house", "extra_actions": None, @@ -629,8 +629,8 @@ "weather": None }, "playmap_55": { - "height": 45, - "width": 65, + "height": 48, + "width": 95, "song": "Map.mp3", "pretty_name": "Watermill School", "extra_actions": None, @@ -652,7 +652,7 @@ }, "playmap_57": { "height": 25, - "width": 91, + "width": 99, "song": "Map.mp3", "pretty_name": "New Town", "extra_actions": None, diff --git a/src/pokete/data/npcs.py b/src/pokete/data/npcs.py index 507d3d19..3ba34ca5 100644 --- a/src/pokete/data/npcs.py +++ b/src/pokete/data/npcs.py @@ -31,7 +31,7 @@ "fn": "heal", "map": "playmap_56", "x": 17, - "y": 9 + "y": 8 }, "npc_1": { "texts": [], From e613774c43212bdff09aa3c783574f8d9b5f52e0 Mon Sep 17 00:00:00 2001 From: craigb20 <157324902+craigb20@users.noreply.github.com> Date: Wed, 7 May 2025 10:48:01 -0400 Subject: [PATCH 41/47] Changed coordinates on the first playmap back for demo --- src/pokete/data/map_data.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index 38ec56e0..26a13318 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -134,12 +134,12 @@ "dor_playmap_51_1": { "x": 90, "y": 12, - "args": {"map": "playmap_57", "x": 1, "y": 28} + "args": {"map": "playmap_51", "x": 1, "y": 28} }, "dor_playmap_51_2": { "x": 90, "y": 13, - "args": {"map": "playmap_57", "x": 1, "y": 29} + "args": {"map": "playmap_51", "x": 1, "y": 29} }, }, "special_dors": {"dor": {"x": 25, "y": 4}}, From cb5c8db8dc6ea8b7794f336e169ab0864d2e14cf Mon Sep 17 00:00:00 2001 From: lxgr-linux Date: Wed, 17 Sep 2025 00:50:14 +0200 Subject: [PATCH 42/47] feat(pokes): linting fixes --- src/pokete/data/map_data.py | 503 ++++++++++++++---------------------- src/pokete/data/poketes.py | 8 +- 2 files changed, 194 insertions(+), 317 deletions(-) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index 26a13318..45f42384 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -134,12 +134,12 @@ "dor_playmap_51_1": { "x": 90, "y": 12, - "args": {"map": "playmap_51", "x": 1, "y": 28} + "args": {"map": "playmap_51", "x": 1, "y": 28}, }, "dor_playmap_51_2": { "x": 90, "y": 13, - "args": {"map": "playmap_51", "x": 1, "y": 29} + "args": {"map": "playmap_51", "x": 1, "y": 29}, }, }, "special_dors": {"dor": {"x": 25, "y": 4}}, @@ -3580,12 +3580,12 @@ "dor_playmap_52": { "x": 199, "y": 32, - "args": {"map": "playmap_52", "x": 0, "y": 32} + "args": {"map": "playmap_52", "x": 0, "y": 32}, }, "dor_playmap_48": { "x": 199, "y": 31, - "args": {"map": "playmap_52", "x": 0, "y": 31} + "args": {"map": "playmap_52", "x": 0, "y": 31}, }, }, "balls": { @@ -4203,9 +4203,8 @@ }, }, }, - - "playmap_52":{ - "hard_obs":{ + "playmap_52": { + "hard_obs": { "tree_group_52_2": { "x": 95, "y": 30, @@ -4219,9 +4218,9 @@ ()()()()()((()()() ()()()))()()()( ()()()()))()()() - ()()()()((()()()""" + ()()()()((()()()""", }, - "tree_group_52_3":{ + "tree_group_52_3": { "x": 111, "y": 40, "txt": r""" @@ -4230,41 +4229,41 @@ )()()))()()()) ()()()((()() ((()()() - )()()""" + )()()""", }, - "tree2":{ + "tree2": { "x": 51, "y": 4, "txt": r""" () () -||""" +||""", }, - "tree3":{ + "tree3": { "x": 49, "y": 6, "txt": r""" () () -||""" +||""", }, - "tree4":{ + "tree4": { "x": 55, "y": 10, "txt": r""" () () -||""" +||""", }, - "tree":{ + "tree": { "x": 61, "y": 8, "txt": r""" () () -||""" +||""", }, - "workshop":{ + "workshop": { "x": 29, "y": 19, "txt": """ @@ -4285,23 +4284,18 @@ |o ___ o| | o | | |__| |__|_|___|__|""", }, - "house2":{ - "x": 42, - "y": 22, - "txt": HOUSE1 - }, - "house3":{ + "house2": {"x": 42, "y": 22, "txt": HOUSE1}, + "house3": { "x": 52, "y": 44, - "txt":""" + "txt": """ _________ / ^ ^ /o\____ /_______/ / /\ |o 0 o| /___/ \ |o ___ o| | o | | |__| |__|_|___|__| -""" - +""", }, "house4": { "x": 105, @@ -4311,8 +4305,7 @@ / ^ ^ /\ /________/ \ |o ___ o| | -|__| |__|___|""" - +|__| |__|___|""", }, "house5": { "x": 113, @@ -4322,13 +4315,9 @@ / ^ ^ /\ /________/ \ |o ___ o| | -|__| |__|___|""" - }, - "center":{ - "x": 90, - "y": 37, - "txt": CENTER +|__| |__|___|""", }, + "center": {"x": 90, "y": 37, "txt": CENTER}, "fence_1": { "x": 41, "y": 48, @@ -4346,9 +4335,9 @@ # # ########## -""" +""", }, - "fence_2":{ + "fence_2": { "x": 99, "y": 18, "txt": r""" @@ -4369,9 +4358,9 @@ # # # -# """ +# """, }, - "School":{ + "School": { "x": 99, "y": 52, "txt": r""" @@ -4381,19 +4370,19 @@ | () () |OO| () () | |_______ | () () | | () () | / ^ ^ /\ |_______|()|_______| |o o o| | -|_||_||_|__|_||_||_|_|_____|_|""" +|_||_||_|__|_||_||_|_|_____|_|""", }, - "barn":{ + "barn": { "x": 3, "y": 54, - "txt":r""" + "txt": r""" __________ / \ \ / 0 \______\ | ___ | | -|_| |_|______|""" +|_| |_|______|""", }, - "fence_2":{ + "fence_2": { "x": 0, "y": 54, "txt": r""" @@ -4409,13 +4398,11 @@ # # # -########################""" - } - - +########################""", + }, }, - "soft_obs":{ - "water_1":{ + "soft_obs": { + "water_1": { "x": 0, "y": 0, "txt": r""" @@ -4495,12 +4482,12 @@ ....... ....... ..... - .....""" - }, - "sand_2": { - "x": 69, - "y": 21, - "txt": r""" + .....""", + }, + "sand_2": { + "x": 69, + "y": 21, + "txt": r""" .. ... .... @@ -4521,12 +4508,12 @@ ......... ....... ... - """ - }, - "pathway_exit":{ - "x": 0, - "y": 36, - "txt": r""" + """, + }, + "pathway_exit": { + "x": 0, + "y": 36, + "txt": r""" ____ | __ | @@ -4540,12 +4527,12 @@ | | | | | | - """ - }, - "pathway_1":{ - "x": 0, - "y": 23, - "txt": r""" + """, + }, + "pathway_1": { + "x": 0, + "y": 23, + "txt": r""" _ ___________| \_______/ / | / |___ __________________/ @@ -4677,12 +4664,12 @@ ;;;;;;;;; ;;;;;;;;; ;;;;;;;;; -""" - }, - "meadow_4":{ - "x": 51, - "y": 14, - "txt": r""" +""", + }, + "meadow_4": { + "x": 51, + "y": 14, + "txt": r""" ;; ;;;;;;;;; ;;;;;;;;;;;; @@ -4695,12 +4682,12 @@ ;;;;;;;;; ;;;; ;;;;;;;;;;;; ;;;;;;; - ;;;""" - }, - "meadow_4": { - "x": 70, - "y": 67, - "txt": r""" + ;;;""", + }, + "meadow_4": { + "x": 70, + "y": 67, + "txt": r""" ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -4728,12 +4715,12 @@ ;;;;;;;;; ;;;;; ;;;; - ;""" - }, - "meadow_5": { - "x": 25, - "y": 63, - "txt": r""" + ;""", + }, + "meadow_5": { + "x": 25, + "y": 63, + "txt": r""" ... .... ...... @@ -4747,94 +4734,53 @@ ........... ......... ...... - ...""" - } - + ...""", + }, }, "dors": { "dor_playmap_52_1": { "x": 33, "y": 15, - "args": {"map": "playmap_53", "x": 9, "y": 0} + "args": {"map": "playmap_53", "x": 9, "y": 0}, }, "dor_playmap_52_2": { "x": 16, "y": 29, - "args": { "map": "playmap_54", "x": 13,"y": 0} + "args": {"map": "playmap_54", "x": 13, "y": 0}, }, "dor_playmap_52_3": { "x": 0, "y": 32, - "args": {"map": "playmap_52", "x": 199, "y": 32} + "args": {"map": "playmap_52", "x": 199, "y": 32}, }, "dor_playmap_52_4": { "x": 0, "y": 31, - "args": {"map": "playmap_39", "x": 199, "y": 31} + "args": {"map": "playmap_39", "x": 199, "y": 31}, }, "dor_playmap_52_5": { "x": 94, "y": 33, - "args": {"map": "playmap_56", "x": 14, "y": 0} - } + "args": {"map": "playmap_56", "x": 14, "y": 0}, + }, }, "balls": { - "ball_1": { - "x": 2, - "y": 44 - }, - "ball_2": { - "x": 21, - "y": 49 - }, - "ball_3": { - "x": 38, - "y": 26 - }, - "ball_4": { - "x": 48, - "y": 12 - }, - "ball_5": { - "x": 50, - "y": 44 - }, - "ball_5": { - "x": 71, - "y": 6 - }, - "ball_6": { - "x": 66, - "y": 27 - }, - "ball_7": { - "x": 88, - "y": 8 - }, - "ball_8": { - "x": 91, - "y": 30 - }, - "ball_9": { - "x": 102, - "y": 4 - }, - "ball_10": { - "x": 123, - "y": 21 - }, - "ball_11": { - "x": 127, - "y": 25 - }, - "ball_12": { - "x": 127, - "y": 62 - }, - } - + "ball_1": {"x": 2, "y": 44}, + "ball_2": {"x": 21, "y": 49}, + "ball_3": {"x": 38, "y": 26}, + "ball_4": {"x": 48, "y": 12}, + "ball_5": {"x": 50, "y": 44}, + "ball_5": {"x": 71, "y": 6}, + "ball_6": {"x": 66, "y": 27}, + "ball_7": {"x": 88, "y": 8}, + "ball_8": {"x": 91, "y": 30}, + "ball_9": {"x": 102, "y": 4}, + "ball_10": {"x": 123, "y": 21}, + "ball_11": {"x": 127, "y": 25}, + "ball_12": {"x": 127, "y": 62}, + }, }, - "playmap_53":{ + "playmap_53": { "hard_obs": { "inner_walls": { "x": 2, @@ -4847,32 +4793,20 @@ | | |_______ ________________| |______| |_______________|""", - }, - }, - "soft_obs": {}, - "dors": { - "dor_playmap_53": { - "x": 9, - "y": 0, - "args": {"map": "playmap_52", "x": 33, "y": 15}, - }, }, }, - "soft_obs": { - }, + "soft_obs": {}, "dors": { "dor_playmap_53": { "x": 9, "y": 0, - "args": {"map": "playmap_52", "x": 33, "y": 15} - } + "args": {"map": "playmap_52", "x": 33, "y": 15}, + }, }, - "balls":{ - } }, "playmap_54": { - "hard_obs":{ - "inner_walls":{ + "hard_obs": { + "inner_walls": { "x": 2, "y": 1, "txt": r""" @@ -4882,35 +4816,25 @@ |___ ___| | | | _____| | | | -|________|___ ___|""" +|________|___ ___|""", } }, - "soft_obs":{ - }, - "dors":{ - "dor_playmap_54":{ + "soft_obs": {}, + "dors": { + "dor_playmap_54": { "x": 13, "y": 0, - "args":{"map": "playmap_52", "x": 16, "y":29} + "args": {"map": "playmap_52", "x": 16, "y": 29}, } }, - "balls": { - "ball_1": { - "x": 12, - "y": 4 - }, - "ball_2": { - "x": 21, - "y": 7 - } - } + "balls": {"ball_1": {"x": 12, "y": 4}, "ball_2": {"x": 21, "y": 7}}, }, - "playmap_55":{ - "hard_obs":{ - "inner_walls":{ - "x": 2, - "y": 1, - "txt": r""" + "playmap_55": { + "hard_obs": { + "inner_walls": { + "x": 2, + "y": 1, + "txt": r""" __________________________________________________________________ | | | | | | | | @@ -4956,113 +4880,75 @@ | | | | | | | | | | | | -|______________________________/ \______________________________|""" - } - }, - "soft_obs":{ +|______________________________/ \______________________________|""", + } }, - "dors": { - "dor_playmap_55_1":{ + "soft_obs": {}, + "dors": { + "dor_playmap_55_1": { "x": 34, "y": 0, - "args":{"map": "playmap_52", "x": 107, "y":42} + "args": {"map": "playmap_52", "x": 107, "y": 42}, }, - "dor_playmap_55_2":{ + "dor_playmap_55_2": { "x": 35, "y": 0, - "args":{"map": "playmap_52", "x": 108, "y":42} + "args": {"map": "playmap_52", "x": 108, "y": 42}, }, - "dor_playmap_54_3":{ + "dor_playmap_54_3": { "x": 36, "y": 0, - "args":{"map": "playmap_52", "x": 18, "y":42} + "args": {"map": "playmap_52", "x": 18, "y": 42}, }, - "dor_playmap_54_4":{ + "dor_playmap_54_4": { "x": 94, - "y":33, - "args":{"map": "playmap_56", "x": 14, "y":0} + "y": 33, + "args": {"map": "playmap_56", "x": 14, "y": 0}, }, }, "balls": { - "ball_1": { - "x": 3, - "y": 2 - }, - "ball_2": { - "x": 60, - "y": 10 - }, - "ball_3": { - "x": 10, - "y": 40 - } - } - }, - "playmap_56": { - "hard_obs": { - "inner_walls": { - "x": 2, - "y": 1, - "txt": r""" + "ball_1": {"x": 3, "y": 2}, + "ball_2": {"x": 60, "y": 10}, + "ball_3": {"x": 10, "y": 40}, + }, + }, + "playmap_56": { + "hard_obs": { + "inner_walls": { + "x": 2, + "y": 1, + "txt": r""" _________________________ | | a | | | |___ ___| | | | _____| | | | -|________|___ ___|""" - } - }, - "soft_obs":{ - - }, - - "dors": { - "dor_playmap_56_1":{ - "x": 14, - "y": 0, - "args":{"map": "playmap_52", "x": 94, "y":33} - } - }, - "balls":{ +|________|___ ___|""", + } + }, + "soft_obs": {}, + "dors": { + "dor_playmap_56_1": { + "x": 14, + "y": 0, + "args": {"map": "playmap_52", "x": 94, "y": 33}, } }, - "playmap_57": { - "hard_obs": { - "house_top_left": { - "x": 10, - "y": 1, - "txt": HOUSE1 - }, - "house_top_center": { - "x": 40, - "y": 1, - "txt": HOUSE1 - }, - "house_top_right": { - "x": 70, - "y": 1, - "txt": HOUSE1 - }, - "house_bottom_left": { - "x": 10, - "y": 17, - "txt": HOUSE1 - }, - "house_bottom_center": { - "x": 40, - "y": 17, - "txt": HOUSE1 - }, - "house_bottom_right": { - "x": 70, - "y": 17, - "txt": HOUSE1 - }, - "fence": { - "x": 0, - "y": 0, - "txt": """ # + "balls": {}, + }, + "playmap_57": { + "hard_obs": { + "house_top_left": {"x": 10, "y": 1, "txt": HOUSE1}, + "house_top_center": {"x": 40, "y": 1, "txt": HOUSE1}, + "house_top_right": {"x": 70, "y": 1, "txt": HOUSE1}, + "house_bottom_left": {"x": 10, "y": 17, "txt": HOUSE1}, + "house_bottom_center": {"x": 40, "y": 17, "txt": HOUSE1}, + "house_bottom_right": {"x": 70, "y": 17, "txt": HOUSE1}, + "fence": { + "x": 0, + "y": 0, + "txt": """ # # # # @@ -5086,50 +4972,41 @@ # # # - ##########################################################################################""" - } - }, - "soft_obs": { - "meadow_center": { - "x": 32, - "y": 7, - "txt": """ ,;;;;;;;;;, + ##########################################################################################""", + }, + }, + "soft_obs": { + "meadow_center": { + "x": 32, + "y": 7, + "txt": """ ,;;;;;;;;;, ;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;; - ';;;;;;;;;'""" - } - }, - "dors": { - "dor_playmap_57_1": { - "x": 90, - "y": 12, - "args": {"map": "playmap_57", "x": 1, "y": 28} - }, - "dor_playmap_57_2": { - "x": 90, - "y": 13, - "args": {"map": "playmap_57", "x": 1, "y": 29} - } - }, - "balls": { - "ball_1": { - "x": 12, - "y": 3 - }, - "ball_2": { - "x": 42, - "y": 19 - }, - "ball_3": { - "x": 72, - "y": 3 - } + ';;;;;;;;;'""", } - } - } + }, + "dors": { + "dor_playmap_57_1": { + "x": 90, + "y": 12, + "args": {"map": "playmap_57", "x": 1, "y": 28}, + }, + "dor_playmap_57_2": { + "x": 90, + "y": 13, + "args": {"map": "playmap_57", "x": 1, "y": 29}, + }, + }, + "balls": { + "ball_1": {"x": 12, "y": 3}, + "ball_2": {"x": 42, "y": 19}, + "ball_3": {"x": 72, "y": 3}, + }, + }, +} if __name__ == "__main__": diff --git a/src/pokete/data/poketes.py b/src/pokete/data/poketes.py index 1acbc2a8..20e7e954 100644 --- a/src/pokete/data/poketes.py +++ b/src/pokete/data/poketes.py @@ -48,7 +48,7 @@ <[*] // -; \ \ """, - "esc": None, + "esc": [], } ], }, @@ -1774,7 +1774,7 @@ "txt": r""" (-)(-) / '' / w w""", - "esc": None, + "esc": [], } ], }, @@ -1798,8 +1798,8 @@ "txt": r""" ()-() .-(___)-. _< >_ -\/ \/""", - "esc": None, +\/ \/ """, + "esc": [], } ], }, From e13a85cd76a0e520723f82c9c58925c605c36932 Mon Sep 17 00:00:00 2001 From: lxgr-linux Date: Wed, 17 Sep 2025 00:57:36 +0200 Subject: [PATCH 43/47] feat(pokes): fixed poketes validity --- src/pokete/data/poketes.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pokete/data/poketes.py b/src/pokete/data/poketes.py index 20e7e954..46f503b4 100644 --- a/src/pokete/data/poketes.py +++ b/src/pokete/data/poketes.py @@ -41,6 +41,7 @@ "types": ["flying", "electro"], "evolve_poke": "", "evolve_lvl": 0, + "night_active": None, "initiative": 8, "ico": [ { @@ -1766,8 +1767,9 @@ "lose_xp": 4, "rarity": 3, "types": ["undead", "normal"], + "night_active": None, "evolve_poke": "", - "evolve_lvl": "", + "evolve_lvl": 0, "initiative": 1, "ico": [ { @@ -1782,13 +1784,14 @@ "name": "Pepegus", "hp": 21, "atc": 7, - "defense": 0.5, + "defense": 2, "attacks": ["stone_crush", "dia_stab", "dick_energy", "sand_throw"], "pool": [], "miss_chance": 0, "desc": "Cute frog with surprising abilities.", "lose_xp": 3, "rarity": 0.9, + "night_active": None, "types": ["stone", "normal"], "evolve_poke": "", "evolve_lvl": 0, From c0facce7e5351aa896bae7dc47c3eaae7dd21af2 Mon Sep 17 00:00:00 2001 From: lxgr-linux Date: Wed, 17 Sep 2025 01:31:49 +0200 Subject: [PATCH 44/47] feat(pokes): fixed validation --- src/pokete/data/map_data.py | 33 +-- src/pokete/data/maps.py | 200 +++++++++--------- src/pokete/data/mapstations.py | 359 +++++++++++---------------------- 3 files changed, 241 insertions(+), 351 deletions(-) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index 45f42384..15890af2 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -3567,6 +3567,16 @@ "y": 64, "args": {"map": "playmap_48", "x": 11, "y": 7}, }, + "dor_playmap_52_1": { + "x": 197, + "y": 36, + "args": {"map": "playmap_52", "x": 0, "y": 32}, + }, + "dor_playmap_52_2": { + "x": 197, + "y": 37, + "args": {"map": "playmap_52", "x": 0, "y": 31}, + }, }, "special_dors": { "dor": { @@ -3577,16 +3587,6 @@ "x": 122, "y": 64, }, - "dor_playmap_52": { - "x": 199, - "y": 32, - "args": {"map": "playmap_52", "x": 0, "y": 32}, - }, - "dor_playmap_48": { - "x": 199, - "y": 31, - "args": {"map": "playmap_52", "x": 0, "y": 31}, - }, }, "balls": { "ball_1": { @@ -4266,7 +4266,7 @@ "workshop": { "x": 29, "y": 19, - "txt": """ + "txt": r""" _________ / ^ ^ /\ /________/ \ ______ @@ -4288,7 +4288,7 @@ "house3": { "x": 52, "y": 44, - "txt": """ + "txt": r""" _________ / ^ ^ /o\____ /_______/ / /\ @@ -4382,7 +4382,7 @@ | ___ | | |_| |_|______|""", }, - "fence_2": { + "fence_3": { "x": 0, "y": 54, "txt": r""" @@ -4684,7 +4684,7 @@ ;;;;;;; ;;;""", }, - "meadow_4": { + "meadow_5": { "x": 70, "y": 67, "txt": r""" @@ -4717,7 +4717,7 @@ ;;;; ;""", }, - "meadow_5": { + "meadow_6": { "x": 25, "y": 63, "txt": r""" @@ -4770,7 +4770,7 @@ "ball_3": {"x": 38, "y": 26}, "ball_4": {"x": 48, "y": 12}, "ball_5": {"x": 50, "y": 44}, - "ball_5": {"x": 71, "y": 6}, + "ball_13": {"x": 71, "y": 6}, "ball_6": {"x": 66, "y": 27}, "ball_7": {"x": 88, "y": 8}, "ball_8": {"x": 91, "y": 30}, @@ -4803,6 +4803,7 @@ "args": {"map": "playmap_52", "x": 33, "y": 15}, }, }, + "balls": {}, }, "playmap_54": { "hard_obs": { diff --git a/src/pokete/data/maps.py b/src/pokete/data/maps.py index a18ce528..7641ffcf 100644 --- a/src/pokete/data/maps.py +++ b/src/pokete/data/maps.py @@ -8,7 +8,7 @@ "pretty_name": "Your home", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_1": { "height": 25, @@ -19,9 +19,9 @@ "poke_args": { "pokes": ["rato", "horny", "vogli"], "minlvl": 15, - "maxlvl": 40 + "maxlvl": 40, }, - "weather": None + "weather": None, }, "playmap_51": { "height": 40, @@ -32,9 +32,9 @@ "poke_args": { "pokes": ["bushy", "lil_nut", "radishon", "horny"], "minlvl": 30, - "maxlvl": 60 + "maxlvl": 60, }, - "weather": None + "weather": None, }, "cave_1": { "height": 30, @@ -45,9 +45,9 @@ "poke_args": { "pokes": ["steini", "bato", "lilstone", "rato"], "minlvl": 40, - "maxlvl": 128 + "maxlvl": 128, }, - "weather": None + "weather": None, }, "playmap_2": { "height": 30, @@ -58,9 +58,9 @@ "poke_args": { "pokes": ["rato", "hornita", "steini", "voglo", "wolfior"], "minlvl": 60, - "maxlvl": 128 + "maxlvl": 128, }, - "weather": None + "weather": None, }, "playmap_3": { "height": 30, @@ -71,9 +71,9 @@ "poke_args": { "pokes": ["rato", "hornita", "steini", "voglo", "wolfior"], "minlvl": 100, - "maxlvl": 200 + "maxlvl": 200, }, - "weather": None + "weather": None, }, "playmap_4": { "height": 60, @@ -84,14 +84,14 @@ "poke_args": { "pokes": ["rato", "hornita", "steini", "voglo", "wolfior"], "minlvl": 180, - "maxlvl": 230 + "maxlvl": 230, }, "w_poke_args": { "pokes": ["karpi", "blub"], "minlvl": 180, - "maxlvl": 230 + "maxlvl": 230, }, - "weather": None + "weather": None, }, "playmap_5": { "height": 60, @@ -102,9 +102,9 @@ "poke_args": { "pokes": ["bato", "bator", "steini"], "minlvl": 180, - "maxlvl": 230 + "maxlvl": 230, }, - "weather": None + "weather": None, }, "playmap_6": { "height": 60, @@ -115,9 +115,9 @@ "poke_args": { "pokes": ["steini", "voglo", "bushy", "rollator"], "minlvl": 200, - "maxlvl": 260 + "maxlvl": 260, }, - "weather": None + "weather": None, }, "playmap_7": { "height": 30, @@ -128,9 +128,9 @@ "poke_args": { "pokes": ["steini", "bato", "lilstone", "rollator", "gobost"], "minlvl": 200, - "maxlvl": 260 + "maxlvl": 260, }, - "weather": None + "weather": None, }, "playmap_8": { "height": 20, @@ -141,9 +141,9 @@ "poke_args": { "pokes": ["gobost", "owol", "corcos_day", "corcos_night"], "minlvl": 230, - "maxlvl": 290 + "maxlvl": 290, }, - "weather": "foggy" + "weather": "foggy", }, "playmap_9": { "height": 15, @@ -154,9 +154,9 @@ "poke_args": { "pokes": ["gobost", "rato"], "minlvl": 230, - "maxlvl": 290 + "maxlvl": 290, }, - "weather": None + "weather": None, }, "playmap_10": { "height": 15, @@ -165,7 +165,7 @@ "song": "Map.mp3", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_11": { "height": 20, @@ -176,14 +176,14 @@ "poke_args": { "pokes": ["steini", "voglo", "wolfior", "owol"], "minlvl": 230, - "maxlvl": 290 + "maxlvl": 290, }, "w_poke_args": { "pokes": ["karpi", "clampi", "clampi"], "minlvl": 290, - "maxlvl": 350 + "maxlvl": 350, }, - "weather": None + "weather": None, }, "playmap_12": { "height": 15, @@ -194,9 +194,9 @@ "poke_args": { "pokes": ["voglo", "vogli", "owol", "rato"], "minlvl": 300, - "maxlvl": 480 + "maxlvl": 480, }, - "weather": None + "weather": None, }, "playmap_13": { "height": 35, @@ -207,9 +207,9 @@ "poke_args": { "pokes": ["voglo", "vogli", "owol", "rato"], "minlvl": 300, - "maxlvl": 480 + "maxlvl": 480, }, - "weather": None + "weather": None, }, "playmap_14": { "height": 15, @@ -218,7 +218,7 @@ "song": "xDeviruchi - Prepare for Battle! .mp3", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_15": { "height": 25, @@ -229,9 +229,9 @@ "poke_args": { "pokes": ["voglo", "owol", "würgos", "hornita"], "minlvl": 400, - "maxlvl": 550 + "maxlvl": 550, }, - "weather": None + "weather": None, }, "playmap_16": { "height": 17, @@ -242,9 +242,9 @@ "poke_args": { "pokes": ["voglo", "owol", "würgos", "hornita"], "minlvl": 480, - "maxlvl": 600 + "maxlvl": 600, }, - "weather": None + "weather": None, }, "playmap_17": { "height": 15, @@ -253,7 +253,7 @@ "pretty_name": "Old House", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_18": { "height": 23, @@ -264,14 +264,14 @@ "poke_args": { "pokes": ["poundi", "rollator", "würgos", "rato"], "minlvl": 540, - "maxlvl": 640 + "maxlvl": 640, }, "w_poke_args": { "pokes": ["karpi", "blub", "clampi"], "minlvl": 540, - "maxlvl": 640 + "maxlvl": 640, }, - "weather": None + "weather": None, }, "playmap_19": { "height": 30, @@ -282,9 +282,9 @@ "poke_args": { "pokes": ["poundi", "steini", "lilstone", "bato"], "minlvl": 540, - "maxlvl": 640 + "maxlvl": 640, }, - "weather": None + "weather": None, }, "playmap_20": { "height": 15, @@ -293,7 +293,7 @@ "pretty_name": "House", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_21": { "height": 30, @@ -305,9 +305,9 @@ "w_poke_args": { "pokes": ["karpi", "blub"], "minlvl": 540, - "maxlvl": 640 + "maxlvl": 640, }, - "weather": None + "weather": None, }, "playmap_22": { "height": 15, @@ -316,7 +316,7 @@ "pretty_name": "Rocky Hotel", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_23": { "height": 15, @@ -325,7 +325,7 @@ "pretty_name": "Rocky Hotel", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_24": { "height": 15, @@ -334,7 +334,7 @@ "pretty_name": "House", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_25": { "height": 15, @@ -343,7 +343,7 @@ "pretty_name": "Town Hall", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_26": { "height": 15, @@ -352,7 +352,7 @@ "pretty_name": "Town Hall", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_27": { "height": 15, @@ -361,7 +361,7 @@ "song": "xDeviruchi - The Icy Cave .mp3", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_28": { "height": 55, @@ -370,12 +370,19 @@ "extra_actions": None, "song": "xDeviruchi - Take some rest and eat some food!.mp3", "poke_args": { - "pokes": ["poisopla", "treenator", "bushy", "confuso", "gobost", - "raupathor_day", "raupathor_night"], + "pokes": [ + "poisopla", + "treenator", + "bushy", + "confuso", + "gobost", + "raupathor_day", + "raupathor_night", + ], "minlvl": 640, - "maxlvl": 740 + "maxlvl": 740, }, - "weather": "rain" + "weather": "rain", }, "playmap_29": { "height": 15, @@ -384,7 +391,7 @@ "pretty_name": "House", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_30": { "height": 63, @@ -393,7 +400,7 @@ "pretty_name": "Flowy Town", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_31": { "height": 14, @@ -402,7 +409,7 @@ "song": "xDeviruchi - Prepare for Battle! .mp3", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_32": { "height": 15, @@ -411,7 +418,7 @@ "pretty_name": "House", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_33": { "height": 44, @@ -422,9 +429,9 @@ "poke_args": { "pokes": ["mowcow", "voglo", "bushy"], "minlvl": 800, - "maxlvl": 1000 + "maxlvl": 1000, }, - "weather": None + "weather": None, }, "playmap_34": { "height": 15, @@ -433,7 +440,7 @@ "pretty_name": "House", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_35": { "height": 69, @@ -444,9 +451,9 @@ "poke_args": { "pokes": ["mowcow", "voglo", "lil_nut", "megapois"], "minlvl": 900, - "maxlvl": 1300 + "maxlvl": 1300, }, - "weather": None + "weather": None, }, "playmap_36": { "height": 15, @@ -455,7 +462,7 @@ "pretty_name": "House", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_37": { "height": 15, @@ -464,7 +471,7 @@ "pretty_name": "House", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_38": { "height": 15, @@ -473,7 +480,7 @@ "pretty_name": "House", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_39": { "height": 70, @@ -484,9 +491,9 @@ "poke_args": { "pokes": ["mowcow", "voglo", "wheeto", "megapois"], "minlvl": 1000, - "maxlvl": 1500 + "maxlvl": 1500, }, - "weather": None + "weather": None, }, "playmap_40": { "height": 30, @@ -497,14 +504,14 @@ "poke_args": { "pokes": ["crabbat", "saugh", "würgos"], "minlvl": 1400, - "maxlvl": 1700 + "maxlvl": 1700, }, "w_poke_args": { "pokes": ["karpi", "blub", "clampi"], "minlvl": 1400, - "maxlvl": 1700 + "maxlvl": 1700, }, - "weather": "sunny" + "weather": "sunny", }, "playmap_41": { "height": 15, @@ -513,7 +520,7 @@ "pretty_name": "House", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_42": { "height": 15, @@ -522,7 +529,7 @@ "pretty_name": "MowCow-Burger Restaurant", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_43": { "height": 15, @@ -531,7 +538,7 @@ "pretty_name": "The Temple of the Wheeto", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_44": { "height": 15, @@ -540,7 +547,7 @@ "pretty_name": "Town Hall", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_45": { "height": 15, @@ -549,7 +556,7 @@ "pretty_name": "Town Hall", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_46": { "height": 15, @@ -558,7 +565,7 @@ "song": "xDeviruchi - Prepare for Battle! .mp3", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_47": { "height": 15, @@ -567,7 +574,7 @@ "pretty_name": "House", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_48": { "height": 15, @@ -576,7 +583,7 @@ "pretty_name": "House", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_49": { "height": 15, @@ -585,7 +592,7 @@ "pretty_name": "House", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_50": { "height": 15, @@ -594,39 +601,38 @@ "pretty_name": "Pokete-Care", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, - "playmap_52":{ + "playmap_52": { "height": 105, "width": 140, "song": "Map.mp3", "pretty_name": "Town of Watermill", "extra_actions": None, - "poke_args": { + "poke_args": { "pokes": ["kartmen", "rustacean", "lil_nut", "megapois"], "minlvl": 1100, - "maxlvl": 1500 + "maxlvl": 1500, }, - "weather": None + "weather": None, }, - "playmap_53":{ + "playmap_53": { "height": 15, "width": 30, "song": "Map.mp3", "pretty_name": "workshop", "extra_actions": None, "poke_args": None, - "weather": None - + "weather": None, }, - "playmap_54":{ + "playmap_54": { "height": 10, "width": 28, "song": "Map.mp3", "pretty_name": "house", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_55": { "height": 48, @@ -634,12 +640,12 @@ "song": "Map.mp3", "pretty_name": "Watermill School", "extra_actions": None, - "poke_args":{ + "poke_args": { "pokes": ["kartmen", "rustacean", "lil_nut", "megapois"], "minlvl": 1100, - "maxlvl": 1500 + "maxlvl": 1500, }, - "weather": None + "weather": None, }, "playmap_56": { "height": 10, @@ -648,7 +654,7 @@ "pretty_name": "Watermill Center", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, "playmap_57": { "height": 25, @@ -657,7 +663,7 @@ "pretty_name": "New Town", "extra_actions": None, "poke_args": None, - "weather": None + "weather": None, }, } diff --git a/src/pokete/data/mapstations.py b/src/pokete/data/mapstations.py index 33e0f0a9..d6291745 100644 --- a/src/pokete/data/mapstations.py +++ b/src/pokete/data/mapstations.py @@ -1,4 +1,4 @@ -from pokete.classes.asset_service.resources import StationDict, DecorationDict +from pokete.classes.asset_service.resources import DecorationDict, StationDict stations: dict[str, StationDict] = { "playmap_1": { @@ -9,29 +9,22 @@ "text": """ *P# ├─── # #""", - "color": "brightgreen" + "color": "brightgreen", }, - "add": { - "x": 3, - "y": 12 - } + "add": {"x": 3, "y": 12}, }, "playmap_51": { "gen": { "additionals": [], - "desc": - "Some small patches of grass surrounded by forrest, near " - "Nice Town.", + "desc": "Some small patches of grass surrounded by forrest, near " + "Nice Town.", "a_next": "playmap_57", "w_next": "cave_1", "text": r"""└─┐ ──┘""", - "color": "darkgreen" + "color": "darkgreen", }, - "add": { - "x": 7, - "y": 12 - } + "add": {"x": 7, "y": 12}, }, "cave_1": { "gen": { @@ -42,12 +35,9 @@ "text": """█ █ █""", - "color": "cavegrey" + "color": "cavegrey", }, - "add": { - "x": 7, - "y": 9 - } + "add": {"x": 7, "y": 9}, }, "playmap_2": { "gen": { @@ -56,12 +46,9 @@ "a_next": "cave_1", "d_next": "playmap_3", "text": """────""", - "color": "darkgreen" + "color": "darkgreen", }, - "add": { - "x": 8, - "y": 9 - } + "add": {"x": 8, "y": 9}, }, "playmap_3": { "gen": { @@ -73,12 +60,9 @@ "text": """P│$ ─┤ #│#""", - "color": "brightgreen" + "color": "brightgreen", }, - "add": { - "x": 12, - "y": 8 - } + "add": {"x": 12, "y": 8}, }, "playmap_4": { "gen": { @@ -89,12 +73,9 @@ "text": """├ │ │""", - "color": "darkgreen" + "color": "darkgreen", }, - "add": { - "x": 13, - "y": 5 - } + "add": {"x": 13, "y": 5}, }, "playmap_6": { "gen": { @@ -107,12 +88,9 @@ "text": """│ │ ┴──""", - "color": "deepgreen" + "color": "deepgreen", }, - "add": { - "x": 13, - "y": 11 - } + "add": {"x": 13, "y": 11}, }, "playmap_7": { "gen": { @@ -120,12 +98,9 @@ "desc": "A dark and mysterious cave.", "d_next": "playmap_6", "text": """██""", - "color": "cavegrey" + "color": "cavegrey", }, - "add": { - "x": 11, - "y": 13 - } + "add": {"x": 11, "y": 13}, }, "playmap_8": { "gen": { @@ -136,12 +111,9 @@ "d_next": "playmap_12", "text": """# ─┬─""", - "color": "brightyellow" + "color": "brightyellow", }, - "add": { - "x": 16, - "y": 12 - } + "add": {"x": 16, "y": 12}, }, "playmap_11": { "gen": { @@ -149,12 +121,9 @@ "desc": "The shore of a lake near an olf fisher village.", "w_next": "playmap_8", "text": """│""", - "color": "yellow" + "color": "yellow", }, - "add": { - "x": 17, - "y": 14 - } + "add": {"x": 17, "y": 14}, }, "playmap_12": { "gen": { @@ -164,30 +133,24 @@ "w_next": "playmap_13", "text": """ │ ─┘""", - "color": "brown" + "color": "brown", }, - "add": { - "x": 19, - "y": 12 - } + "add": {"x": 19, "y": 12}, }, "playmap_13": { "gen": { "additionals": ["playmap_14", "playmap_20"], "desc": "Deepens forest, a big town in the middle of the deepest " - "forest, populated by thousands of people and cultural " - "center of the region.", + "forest, populated by thousands of people and cultural " + "center of the region.", "s_next": "playmap_12", "w_next": "playmap_15", "text": """#│A │ P│$""", - "color": "gold" + "color": "gold", }, - "add": { - "x": 19, - "y": 9 - } + "add": {"x": 19, "y": 9}, }, "playmap_15": { "gen": { @@ -196,12 +159,9 @@ "s_next": "playmap_13", "d_next": "playmap_16", "text": """┌──""", - "color": "brown" + "color": "brown", }, - "add": { - "x": 20, - "y": 8 - } + "add": {"x": 20, "y": 8}, }, "playmap_16": { "gen": { @@ -210,12 +170,9 @@ "a_next": "playmap_15", "d_next": "playmap_18", "text": """───""", - "color": "brightyellow" + "color": "brightyellow", }, - "add": { - "x": 23, - "y": 8 - } + "add": {"x": 23, "y": 8}, }, "playmap_18": { "gen": { @@ -224,12 +181,9 @@ "a_next": "playmap_16", "w_next": "playmap_19", "text": """──┘""", - "color": "darkgreen" + "color": "darkgreen", }, - "add": { - "x": 26, - "y": 8 - } + "add": {"x": 26, "y": 8}, }, "playmap_19": { "gen": { @@ -239,33 +193,34 @@ "w_next": "playmap_21", "text": """█ █""", - "color": "cavegrey" + "color": "cavegrey", }, - "add": { - "x": 28, - "y": 6 - } + "add": {"x": 28, "y": 6}, }, "playmap_21": { "gen": { - "additionals": ["playmap_22", "playmap_23", "playmap_24", - "playmap_25", "playmap_26", "playmap_27", - "playmap_29", "playmap_50"], + "additionals": [ + "playmap_22", + "playmap_23", + "playmap_24", + "playmap_25", + "playmap_26", + "playmap_27", + "playmap_29", + "playmap_50", + ], "desc": "The great Rock-ville is the biggest city in the region " - "around the Big mountain. With the Rocky hotel it's " - "also a tourist hotspot.", + "around the Big mountain. With the Rocky hotel it's " + "also a tourist hotspot.", "s_next": "playmap_19", "d_next": "playmap_33", "w_next": "playmap_40", "text": """P│ # ┌┴── │#C """, - "color": "lightgrey" + "color": "lightgrey", }, - "add": { - "x": 28, - "y": 3 - } + "add": {"x": 28, "y": 3}, }, "playmap_40": { "gen": { @@ -273,12 +228,9 @@ "desc": "A Great beach, with great weather, always.", "s_next": "playmap_21", "text": """│""", - "color": "yellow" + "color": "yellow", }, - "add": { - "x": 29, - "y": 2 - } + "add": {"x": 29, "y": 2}, }, "playmap_28": { "gen": { @@ -288,29 +240,23 @@ "d_next": "playmap_30", "text": """ ┌── ──┘""", - "color": "brightgreen" + "color": "brightgreen", }, - "add": { - "x": 14, - "y": 4 - } + "add": {"x": 14, "y": 4}, }, "playmap_30": { "gen": { "additionals": ["playmap_31", "playmap_32"], "desc": "With its plant Poketes, Flowy Town may be the greenest " - "spot in the Pokete world and with the great git-tree it " - "may also be one of the most spectacular.", + "spot in the Pokete world and with the great git-tree it " + "may also be one of the most spectacular.", "a_next": "playmap_28", "text": """A$P ───┤ # # """, - "color": "deepgreen" + "color": "deepgreen", }, - "add": { - "x": 19, - "y": 3 - } + "add": {"x": 19, "y": 3}, }, "playmap_33": { "gen": { @@ -319,12 +265,9 @@ "a_next": "playmap_21", "d_next": "playmap_35", "text": """──""", - "color": "yellow" + "color": "yellow", }, - "add": { - "x": 34, - "y": 4 - } + "add": {"x": 34, "y": 4}, }, "playmap_35": { "gen": { @@ -335,52 +278,56 @@ "text": """──┐ ┌─┘ └─┐""", - "color": "brightyellow" + "color": "brightyellow", }, - "add": { - "x": 36, - "y": 4 - } + "add": {"x": 36, "y": 4}, }, "playmap_39": { "gen": { - "additionals": ["playmap_41", "playmap_42", "playmap_43", - "playmap_44", "playmap_45", "playmap_46", - "playmap_47", "playmap_48"], + "additionals": [ + "playmap_41", + "playmap_42", + "playmap_43", + "playmap_44", + "playmap_45", + "playmap_46", + "playmap_47", + "playmap_48", + ], "desc": "The great city of Agrawos, agricultural and cultural " - "center of the whole region. It's famous for its great " - "Pokete-Arena and its master trainer. Check out the " - "MowCow-Burger restaurant, which offers the best, " - "juiciest and most delicious Mowcow-burgers, cut from the " - "happiest and most delicious Mowcows anywhere to find!", + "center of the whole region. It's famous for its great " + "Pokete-Arena and its master trainer. Check out the " + "MowCow-Burger restaurant, which offers the best, " + "juiciest and most delicious Mowcow-burgers, cut from the " + "happiest and most delicious Mowcows anywhere to find!", "w_next": "playmap_35", "d_next": "playmap_52", "text": """ #│# P│A ├─┘ $ #""", - "color": "yellow" + "color": "yellow", }, - "add": { - "x": 36, - "y": 7 - } + "add": {"x": 36, "y": 7}, }, - "playmap_52":{ - "gen":{ - "additionals":["playmap_53", "playmap_54","playmap_55","playmap_56"], + "playmap_52": { + "gen": { + "additionals": [ + "playmap_53", + "playmap_54", + "playmap_55", + "playmap_56", + ], "desc": "The town of Watermill is known for " - "the beautiful plants and wonderful " - "nature reserves.""", + "the beautiful plants and wonderful " + "nature reserves." + "", "a_next": "playmap_39", "text": """ ____""", - "color": "yellow" + "color": "yellow", }, - "add": { - "x": 39, - "y": 2 - } + "add": {"x": 39, "y": 2}, }, "playmap_57": { "gen": { @@ -391,14 +338,10 @@ "text": """ *P# ├─── # #""", - "color": "brightgreen" + "color": "brightgreen", }, - "add": { - "x": 8, - "y": 13 - } - } - + "add": {"x": 8, "y": 13}, + }, } decorations: dict[str, DecorationDict] = { @@ -407,53 +350,37 @@ "text": """██ ████ ███""", - "color": "mediumgrey" + "color": "mediumgrey", }, - "add": { - "x": 8, - "y": 10 - } + "add": {"x": 8, "y": 10}, }, - "cave2": { "gen": { "text": """█ ███ ███""", - "color": "mediumgrey" + "color": "mediumgrey", }, - "add": { - "x": 10, - "y": 13 - } + "add": {"x": 10, "y": 13}, }, - "cave1": { "gen": { "text": """ ██████ ██████ █""", - "color": "mediumgrey" + "color": "mediumgrey", }, - "add": { - "x": 1, - "y": 8 - } + "add": {"x": 1, "y": 8}, }, - "cave4-1": { "gen": { "text": """████ ████""", - "color": "mediumgrey" + "color": "mediumgrey", }, - "add": { - "x": 23, - "y": 1 - } + "add": {"x": 23, "y": 1}, }, - "cave4": { "gen": { "text": """ ███ @@ -461,93 +388,49 @@ ███ ███ ██""", - "color": "mediumgrey" + "color": "mediumgrey", }, - "add": { - "x": 23, - "y": 3 - } + "add": {"x": 23, "y": 3}, }, - "cave5": { "gen": { "text": """ ██ █████ ████ ██ """, - "color": "mediumgrey" + "color": "mediumgrey", }, - "add": { - "x": 29, - "y": 5 - } + "add": {"x": 29, "y": 5}, }, "mountainsee": { - "gen": { - "text": """█""", - "color": "lakeblue" - }, - "add": { - "x": 29, - "y": 8 - } + "gen": {"text": """█""", "color": "lakeblue"}, + "add": {"x": 29, "y": 8}, }, - "cave7": { "gen": { "text": """ ████ ████ ███ """, - "color": "mediumgrey" + "color": "mediumgrey", }, - "add": { - "x": 31, - "y": 1 - } + "add": {"x": 31, "y": 1}, }, - "rockybeach": { - "gen": { - "text": """█████""", - "color": "lakeblue" - }, - "add": { - "x": 27, - "y": 1 - } + "gen": {"text": """█████""", "color": "lakeblue"}, + "add": {"x": 27, "y": 1}, }, - "cave6": { - "gen": { - "text": """██""", - "color": "cavegrey" - }, - "add": { - "x": 32, - "y": 4 - } + "gen": {"text": """██""", "color": "cavegrey"}, + "add": {"x": 32, "y": 4}, }, "sunnylake": { - "gen": { - "text": """███""", - "color": "lakeblue" - }, - "add": { - "x": 12, - "y": 4 - } + "gen": {"text": """███""", "color": "lakeblue"}, + "add": {"x": 12, "y": 4}, }, "fisherlake": { - "gen": { - "text": """ ████ """, - "color": "lakeblue" - }, - "add": { - "x": 14, - "y": 15 - } - } - + "gen": {"text": """ ████ """, "color": "lakeblue"}, + "add": {"x": 14, "y": 15}, + }, } if __name__ == "__main__": From 638ea092ba1c9c28bd6c1fc0f82424803ac31528 Mon Sep 17 00:00:00 2001 From: lxgr-linux Date: Wed, 17 Sep 2025 11:27:11 +0200 Subject: [PATCH 45/47] feat(pokes): Added misc obs --- src/pokete/classes/generate.py | 3 +- src/pokete/classes/landscape.py | 84 +++++++++++++++++++++------------ src/pokete/data/map_data.py | 27 +++++++---- 3 files changed, 76 insertions(+), 38 deletions(-) diff --git a/src/pokete/classes/generate.py b/src/pokete/classes/generate.py index 90260efc..9a1d2d45 100644 --- a/src/pokete/classes/generate.py +++ b/src/pokete/classes/generate.py @@ -15,7 +15,7 @@ from .asset_service.service import asset_service from .classes import PlayMap from .doors import Door, DoorToCenter, DoorToShop -from .landscape import Meadow, Poketeball, Sand, Water +from .landscape import Meadow, Misc, Poketeball, Sand, Water from .map_additions.center import CenterMap, ShopMap from .npcs import NPC, Trainer from .poke import Poke @@ -109,6 +109,7 @@ def gen_single_map_obs(_map: PlayMap, single_map: Obmap, used_npcs: list[str]): "sand": Sand, "meadow": Meadow, "water": Water, + "misc": Misc, }[single_soft_ob.cls if single_soft_ob.cls is not None else "meadow"] __parse_obj( _map, diff --git a/src/pokete/classes/landscape.py b/src/pokete/classes/landscape.py index 0487542e..5889e042 100644 --- a/src/pokete/classes/landscape.py +++ b/src/pokete/classes/landscape.py @@ -1,11 +1,15 @@ """Contains classes that can be placed on playmaps""" import random + import scrap_engine as se -from pokete.classes import timer, movemap as mvp -from pokete.base.input_loops import ask_ok -from pokete.base.context import Context + from pokete.base.color import Color +from pokete.base.context import Context +from pokete.base.input_loops import ask_ok +from pokete.classes import movemap as mvp +from pokete.classes import timer + from .asset_service.resources import PokeArgs from .asset_service.service import asset_service from .fight import Fight, NatureProvider @@ -23,20 +27,22 @@ def set_ctx(cls, ctx: Context): class HighGrass(se.Object, MapInteract): """Object on the map, that triggers a fight""" + arg_proto: PokeArgs def action(self, ob): """Action triggers the fight ARGS: ob: The object triggering this action""" - is_night = (360 > timer.time.normalized - or timer.time.normalized > 1320) + is_night = 360 > timer.time.normalized or timer.time.normalized > 1320 all_pokes = asset_service.get_base_assets().pokes - pokes = {i: all_pokes[i] - for i in self.arg_proto.pokes - if (n_a := all_pokes[i].night_active) is None - or (not n_a and not is_night) - or (n_a and is_night)} + pokes = { + i: all_pokes[i] + for i in self.arg_proto.pokes + if (n_a := all_pokes[i].night_active) is None + or (not n_a and not is_night) + or (n_a and is_night) + } if random.randint(0, 8) == 0: Fight()( self.ctx, @@ -46,17 +52,16 @@ def action(self, ob): Poke.wild( random.choices( list(pokes), - weights=[i.rarity for i in pokes.values()] + weights=[i.rarity for i in pokes.values()], )[0], random.choice( range( - self.arg_proto.minlvl, - self.arg_proto.maxlvl + self.arg_proto.minlvl, self.arg_proto.maxlvl ) - ) + ), ) - ) - ] + ), + ], ) check_walk_back(self.ctx) @@ -66,15 +71,21 @@ class Meadow(se.Text): ARGS: string: The character representing the meadow poke_args: Dict containing relevant information about Pokes""" + esccode = Color.green all_grass = [] all_water = [] all_sand = [] def __init__(self, string, poke_args): - super().__init__(string, ignore=self.esccode + " " + Color.reset, - ob_class=HighGrass, ob_args=poke_args, - state="float", esccode=self.esccode) + super().__init__( + string, + ignore=self.esccode + " " + Color.reset, + ob_class=HighGrass, + ob_args=poke_args, + state="float", + esccode=self.esccode, + ) { Color.green: Meadow.all_grass, Color.blue: Meadow.all_water, @@ -84,14 +95,25 @@ def __init__(self, string, poke_args): class Water(Meadow): """Same as Meadow, but for Water""" + esccode = Color.blue class Sand(Meadow): """Same as Meadow, but for Sand""" + esccode = Color.yellow +class Misc(se.Text): + def __init__(self, string, _): + super().__init__( + string, + ignore=" ", + state="float", + ) + + class Poketeball(se.Object, MapInteract): """Poketeball that can be picked up on the map ARGS: @@ -99,22 +121,26 @@ class Poketeball(se.Object, MapInteract): def __init__(self, name): self.name = name - super().__init__(Color.thicc + Color.red + "o" + Color.reset, - state="float") + super().__init__( + Color.thicc + Color.red + "o" + Color.reset, state="float" + ) def action(self, ob): """Action triggers the pick up ARGS: ob: The object triggering this action""" - amount = random.choices([1, 2, 3], - weights=[10, 2, 1], k=1)[0] - item = random.choices(["poketeball", "hyperball", "superball", - "healing_potion", "treat"], - weights=[10, 1.5, 1, 1, 1], - k=1)[0] + amount = random.choices([1, 2, 3], weights=[10, 2, 1], k=1)[0] + item = random.choices( + ["poketeball", "hyperball", "superball", "healing_potion", "treat"], + weights=[10, 1.5, 1, 1, 1], + k=1, + )[0] self.ctx.figure.give_item(item, amount) self.remove() mvp.movemap.full_show() - ask_ok(self.ctx, f"You found {amount if amount > 1 else 'a'} \ -{asset_service.get_base_assets().items[item].pretty_name}{'s' if amount > 1 else ''}!") + ask_ok( + self.ctx, + f"You found {amount if amount > 1 else 'a'} \ +{asset_service.get_base_assets().items[item].pretty_name}{'s' if amount > 1 else ''}!", + ) self.ctx.figure.used_npcs.append(self.name) diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index 15890af2..d4ef0dea 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -4275,7 +4275,7 @@ }, "house1": { "x": 12, - "y": 28, + "y": 35, "txt": r""" _________ / ^ ^ /o\____ @@ -4382,7 +4382,7 @@ | ___ | | |_| |_|______|""", }, - "fence_3": { + "fence_2": { "x": 0, "y": 54, "txt": r""" @@ -4405,6 +4405,7 @@ "water_1": { "x": 0, "y": 0, + "cls": "water", "txt": r""" ~ ~~ @@ -4426,6 +4427,7 @@ "water_2": { "x": 75, "y": 34, + "cls": "water", "txt": r""" ~~~ ~~~~ @@ -4444,6 +4446,7 @@ "water_3": { "x": 73, "y": 21, + "cls": "water", "txt": r""" ~~~~~~~~~~~~ ~~~~~~~~~~~~~ @@ -4465,6 +4468,7 @@ "sand_1": { "x": 0, "y": 19, + "cls": "sand", "txt": r""" .... ....... @@ -4487,6 +4491,7 @@ "sand_2": { "x": 69, "y": 21, + "cls": "sand", "txt": r""" .. ... @@ -4513,6 +4518,7 @@ "pathway_exit": { "x": 0, "y": 36, + "cls": "misc", "txt": r""" ____ | @@ -4532,6 +4538,7 @@ "pathway_1": { "x": 0, "y": 23, + "cls": "misc", "txt": r""" _ ___________| \_______/ / | / @@ -4558,6 +4565,7 @@ "pathway_2": { "x": 15, "y": 29, + "cls": "misc", "txt": r""" | | | |_ @@ -4568,6 +4576,7 @@ "pathway_3": { "x": 38, "y": 32, + "cls": "misc", "txt": r""" / / / / @@ -4578,11 +4587,12 @@ / / / / / / -""", + """, }, "pathway_4": { "x": 37, "y": 60, + "cls": "misc", "txt": r""" | | | | @@ -4628,7 +4638,7 @@ | | | | - """, + """, }, "meadow_1": { "x": 12, @@ -4684,7 +4694,7 @@ ;;;;;;; ;;;""", }, - "meadow_5": { + "meadow_4": { "x": 70, "y": 67, "txt": r""" @@ -4717,9 +4727,10 @@ ;;;; ;""", }, - "meadow_6": { + "meadow_5": { "x": 25, "y": 63, + "cls": "sand", "txt": r""" ... .... @@ -4770,7 +4781,7 @@ "ball_3": {"x": 38, "y": 26}, "ball_4": {"x": 48, "y": 12}, "ball_5": {"x": 50, "y": 44}, - "ball_13": {"x": 71, "y": 6}, + "ball_5": {"x": 71, "y": 6}, "ball_6": {"x": 66, "y": 27}, "ball_7": {"x": 88, "y": 8}, "ball_8": {"x": 91, "y": 30}, @@ -4801,7 +4812,7 @@ "x": 9, "y": 0, "args": {"map": "playmap_52", "x": 33, "y": 15}, - }, + } }, "balls": {}, }, From bdf90fd7b93be1bbfcac9402eaeebd76f0b5bc78 Mon Sep 17 00:00:00 2001 From: lxgr-linux Date: Thu, 9 Oct 2025 16:29:17 +0200 Subject: [PATCH 46/47] Moved stuff --- src/pokete/base/ui/elements/box.py | 29 +++++++++---- src/pokete/data/map_data.py | 66 ++++++++++++++++-------------- 2 files changed, 56 insertions(+), 39 deletions(-) diff --git a/src/pokete/base/ui/elements/box.py b/src/pokete/base/ui/elements/box.py index d2286e90..cc7de1ba 100644 --- a/src/pokete/base/ui/elements/box.py +++ b/src/pokete/base/ui/elements/box.py @@ -1,11 +1,13 @@ from typing import Optional + import scrap_engine as se from pokete.base.game_map import CompatMap -from .frame import StdFrame -from ..overview import Overview from ...context import Context +from ..overview import Overview +from .frame import StdFrame + class Box(se.Box, Overview): """Box to show content in @@ -15,8 +17,15 @@ class Box(se.Box, Overview): name: The boxes displayed name info: Info that will be displayed in the bottom left corner of the box""" - def __init__(self, height, width, name="", info="", - overview:Optional[Overview]=None, ctx:Optional[Context]=None): + def __init__( + self, + height, + width, + name="", + info="", + overview: Optional[Overview] = None, + ctx: Optional[Context] = None, + ): super().__init__(height, width) self.map: Optional[CompatMap] self.overview: Optional[Overview] = overview @@ -24,8 +33,9 @@ def __init__(self, height, width, name="", info="", self.overview = ctx.overview self.map = ctx.map self.frame = StdFrame(height, width) - self.inner = se.Square(char=" ", width=width - 2, height=height - 2, - state="float") + self.inner = se.Square( + char=" ", width=width - 2, height=height - 2, state="float" + ) self.name_label = se.Text(name, state="float") self.info_label = se.Text(info, state="float") # adding @@ -46,8 +56,11 @@ def center_add(self, _map): """Adds the box to the maps center ARGS: _map: se.Map the box will be added to""" - self.add(_map, round((_map.width - self.width) / 2), - round((_map.height - self.height) / 2)) + self.add( + _map, + round((_map.width - self.width) / 2), + round((_map.height - self.height) / 2), + ) return self def resize(self, height, width): diff --git a/src/pokete/data/map_data.py b/src/pokete/data/map_data.py index d4ef0dea..cb65d949 100644 --- a/src/pokete/data/map_data.py +++ b/src/pokete/data/map_data.py @@ -3570,12 +3570,12 @@ "dor_playmap_52_1": { "x": 197, "y": 36, - "args": {"map": "playmap_52", "x": 0, "y": 32}, + "args": {"map": "playmap_52", "x": 1, "y": 31}, }, "dor_playmap_52_2": { "x": 197, "y": 37, - "args": {"map": "playmap_52", "x": 0, "y": 31}, + "args": {"map": "playmap_52", "x": 1, "y": 32}, }, }, "special_dors": { @@ -4404,7 +4404,7 @@ "soft_obs": { "water_1": { "x": 0, - "y": 0, + "y": 3, "cls": "water", "txt": r""" ~ @@ -4426,7 +4426,7 @@ }, "water_2": { "x": 75, - "y": 34, + "y": 10, "cls": "water", "txt": r""" ~~~ @@ -4445,7 +4445,7 @@ }, "water_3": { "x": 73, - "y": 21, + "y": 23, "cls": "water", "txt": r""" ~~~~~~~~~~~~ @@ -4466,8 +4466,8 @@ """, }, "sand_1": { - "x": 0, - "y": 19, + "x": 3, + "y": 2, "cls": "sand", "txt": r""" .... @@ -4512,28 +4512,26 @@ .... .. ......... ....... - ... - """, + ...""", }, "pathway_exit": { "x": 0, - "y": 36, + "y": 30, "cls": "misc", - "txt": r""" - ____ - | - __ | - | | - | | - | | - | | - | | - | | - | | - | | - | | - | | - """, + "txt": r"""____ + | + | +__ | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | |""", }, "pathway_1": { "x": 0, @@ -4759,15 +4757,21 @@ "y": 29, "args": {"map": "playmap_54", "x": 13, "y": 0}, }, - "dor_playmap_52_3": { + # "dor_playmap_52_3": { + # "x": 0, + # "y": 32, + # + # "args": {"map": "playmap_52", "x": 199, "y": 32}, + # }, + "dor_playmap_39_1": { "x": 0, - "y": 32, - "args": {"map": "playmap_52", "x": 199, "y": 32}, + "y": 31, + "args": {"map": "playmap_39", "x": 196, "y": 36}, }, - "dor_playmap_52_4": { + "dor_playmap_39_2": { "x": 0, - "y": 31, - "args": {"map": "playmap_39", "x": 199, "y": 31}, + "y": 32, + "args": {"map": "playmap_39", "x": 196, "y": 37}, }, "dor_playmap_52_5": { "x": 94, From cb9d5a20bddfabeb1000a85a2f32e7cb7aa4af90 Mon Sep 17 00:00:00 2001 From: lxgr-linux Date: Mon, 23 Feb 2026 19:22:17 +0100 Subject: [PATCH 47/47] feat: Added color to vactor --- src/pokete/data/poketes.py | 27 ++- src/pokete/util/utility/wiki.py | 303 ++++++++++++++++++++------------ 2 files changed, 213 insertions(+), 117 deletions(-) diff --git a/src/pokete/data/poketes.py b/src/pokete/data/poketes.py index 46f503b4..ddc7f472 100644 --- a/src/pokete/data/poketes.py +++ b/src/pokete/data/poketes.py @@ -45,12 +45,23 @@ "initiative": 8, "ico": [ { - "txt": r""" //\ -<[*] // - -; - \ \ """, + "txt": r""" +<[*] + ; + \ \ """, "esc": [], - } + }, + { + "txt": r""" //\ + // + -""", + "esc": ["thicc", "yellow"], + }, + { + "txt": r""" + *""", + "esc": ["thicc", "blue"], + }, ], }, "steini": { @@ -1799,9 +1810,9 @@ "ico": [ { "txt": r""" ()-() - .-(___)-. -_< >_ -\/ \/ """, +.-(___)-. + _< >_ + \/ \/""", "esc": [], } ], diff --git a/src/pokete/util/utility/wiki.py b/src/pokete/util/utility/wiki.py index 49644910..f25511ec 100644 --- a/src/pokete/util/utility/wiki.py +++ b/src/pokete/util/utility/wiki.py @@ -1,11 +1,14 @@ #!/usr/bin/env python3 """This script generates the Pokete wiki""" + import os from os.path import exists, isdir + import scrap_engine as se + from pokete import release -from pokete.classes.effects import effects, effect_list -from pokete.data import pokes, attacks, types, items, maps +from pokete.classes.effects import effect_list, effects +from pokete.data import attacks, items, maps, pokes, types from pokete.util.command import Flag SILENT = False @@ -51,11 +54,16 @@ def overview(multi_page: bool = False) -> str: ------- An overview for a multi-page wiki. """ - return "Table of contents\n" + \ - "\n".join( + return ( + "Table of contents\n" + + "\n".join( f"{i + 1}. [{name.capitalize()}]({'' if multi_page else '#'}{name})" - for i, name in enumerate(["poketes", "attacks", "types", "item", - "effects"])) + "\n" + for i, name in enumerate( + ["poketes", "attacks", "types", "item", "effects"] + ) + ) + + "\n" + ) @staticmethod def get_name(poke): @@ -65,7 +73,7 @@ def get_name(poke): additional = " night" elif "_day" in poke: additional = " day" - return pokes[poke]['name'] + additional + return pokes[poke]["name"] + additional @staticmethod def table_of_contents(multi_page: bool = False) -> str: @@ -79,7 +87,7 @@ def table_of_contents(multi_page: bool = False) -> str: ------- A Table of contents for a single page wiki. """ - out = '' + out = "" # Table of contents if not multi_page: @@ -88,16 +96,27 @@ def table_of_contents(multi_page: bool = False) -> str: """ for i, typ in enumerate(sorted(types)): out += f""" {i + 1}. [{typ.capitalize()} Poketes](#{typ}-poketes)\n""" - for j, poke in enumerate([k for k in sorted(list(pokes)[1:]) if - pokes[k]["types"][0] == typ]): + for j, poke in enumerate( + [ + k + for k in sorted(list(pokes)[1:]) + if pokes[k]["types"][0] == typ + ] + ): out += f""" {j + 1}. [{Wiki.get_name(poke)}](#{poke.replace("_", "-")})\n""" out += "2. [Attacks](#attacks)\n" for i, typ in enumerate(sorted(types)): out += f""" {i + 1}. [{typ.capitalize()} attacks](#{typ}-attacks)\n""" - for j, atc in enumerate([k for k in sorted(attacks) if - attacks[k]["types"][0] == typ]): - out += f""" {j + 1}. [{attacks[atc]["name"]}](#{attacks[atc]["name"] - .replace(" ", "-").lower()})\n""" + for j, atc in enumerate( + [ + k + for k in sorted(attacks) + if attacks[k]["types"][0] == typ + ] + ): + out += f""" {j + 1}. [{attacks[atc]["name"]}](#{ + attacks[atc]["name"].replace(" ", "-").lower() + })\n""" out += """3. [Types](#types) 4. [Items](#items) """ @@ -115,14 +134,24 @@ def table_of_contents(multi_page: bool = False) -> str: """ for i, typ in enumerate(sorted(types)): out += f""" {i + 1}. [{typ.capitalize()} Poketes](./poketes/{typ})\n""" - for j, poke in enumerate([k for k in sorted(list(pokes)[1:]) if - pokes[k]["types"][0] == typ]): + for j, poke in enumerate( + [ + k + for k in sorted(list(pokes)[1:]) + if pokes[k]["types"][0] == typ + ] + ): out += f""" {j + 1}. [{Wiki.get_name(poke)}](./poketes/{typ}#{poke.replace("_", "-")})\n""" out += "2. [Attacks](./attacks)\n" for i, typ in enumerate(sorted(types)): out += f""" {i + 1}. [{typ.capitalize()} attacks](./attacks/{typ})\n""" - for j, atc in enumerate([k for k in sorted(attacks) if - attacks[k]["types"][0] == typ]): + for j, atc in enumerate( + [ + k + for k in sorted(attacks) + if attacks[k]["types"][0] == typ + ] + ): out += f""" {j + 1}. [{attacks[atc]["name"]}](./attack/{typ}#{atc.replace("_", "-")})\n""" out += """3. [Types](./types) 4. [Items](./items) @@ -137,7 +166,7 @@ def table_of_contents(multi_page: bool = False) -> str: return out @staticmethod - def poketes(page_mode='single', pokete_type=None) -> str: + def poketes(page_mode="single", pokete_type=None) -> str: """The function to add all poketes and their attributes to the wiki. Arguments: @@ -154,7 +183,7 @@ def poketes(page_mode='single', pokete_type=None) -> str: ------- All poketes and their attributes as a markdown string. """ - if page_mode == 'single': + if page_mode == "single": out = """ ## Poketes In the following all Poketes with their attributes are displayed. @@ -162,13 +191,16 @@ def poketes(page_mode='single', pokete_type=None) -> str: """ for typ in sorted(types): out += f"### {typ.capitalize()} Poketes" - for poke in [k for k in sorted(list(pokes)[1:]) if - pokes[k]["types"][0] == typ]: + for poke in [ + k + for k in sorted(list(pokes)[1:]) + if pokes[k]["types"][0] == typ + ]: if VERBOSE: - print(f' -> Adding {pokes[poke]["name"]}') + print(f" -> Adding {pokes[poke]['name']}") out += Wiki.poke_info(poke) return out - elif page_mode == 'index': + elif page_mode == "index": out = """# Poketes In the following all Poketes with their attributes are displayed. @@ -178,27 +210,35 @@ def poketes(page_mode='single', pokete_type=None) -> str: out += "\n---\n\n## All poketes sorted by their type:\n" for typ in sorted(types): out += f"- [{typ.capitalize()} Poketes](./{typ})\n" - for poke in [k for k in sorted(list(pokes)[1:]) if - pokes[k]["types"][0] == typ]: + for poke in [ + k + for k in sorted(list(pokes)[1:]) + if pokes[k]["types"][0] == typ + ]: out += f""" - [{pokes[poke]["name"].capitalize()}](./{typ}#{poke})\n""" return out - elif page_mode == 'multi': + elif page_mode == "multi": if pokete_type is not None: out = f"# {pokete_type.capitalize()} Poketes" - for poke in [k for k in sorted(list(pokes)[1:]) if - pokes[k]["types"][0] == pokete_type]: + for poke in [ + k + for k in sorted(list(pokes)[1:]) + if pokes[k]["types"][0] == pokete_type + ]: if poke == sorted(list(pokes)[1:])[-1]: if VERBOSE: - print(f' `-> Adding {pokes[poke]["name"]}') + print(f" `-> Adding {pokes[poke]['name']}") else: if VERBOSE: - print(f' |-> Adding {pokes[poke]["name"]}') + print(f" |-> Adding {pokes[poke]['name']}") out += Wiki.poke_info(poke=poke, multi_page=True) return out raise AttributeError( - "Pokete_type can not be none, if mode 'multi' is selected.") - raise AttributeError("Please select a valid page mode of: 'single'," - "'index' or 'multi'!") + "Pokete_type can not be none, if mode 'multi' is selected." + ) + raise AttributeError( + "Please select a valid page mode of: 'single','index' or 'multi'!" + ) @staticmethod def poke_info(poke: str, multi_page: bool = False) -> str: @@ -217,19 +257,24 @@ def poke_info(poke: str, multi_page: bool = False) -> str: if (evolve_pokete := pokes[poke]["evolve_poke"]) == "": evolve_txt = "- Does not evolve\n" else: - evolve_txt = f"""- Evolves to [{Wiki.get_name(evolve_pokete)}]({f'./{pokes[evolve_pokete]["types"][0]}' - if multi_page else ""}#{evolve_pokete.replace("_", "-")}) at level {pokes[poke]['evolve_lvl']}""" - - md_attacks = "\n + " + "\n + ".join(f"""[{attacks[atc]["name"]}]({ - f'../attacks/{attacks[atc]["types"][0].capitalize()}' - if multi_page else "" - }#{attacks[atc]["name"] - .replace(" ", "-").lower()})""" - for atc in - pokes[poke]["attacks"]) + evolve_txt = f"""- Evolves to [{Wiki.get_name(evolve_pokete)}]({ + f"./{pokes[evolve_pokete]['types'][0]}" if multi_page else "" + }#{evolve_pokete.replace("_", "-")}) at level { + pokes[poke]["evolve_lvl"] + }""" + + md_attacks = "\n + " + "\n + ".join( + f"""[{attacks[atc]["name"]}]({ + f"../attacks/{attacks[atc]['types'][0].capitalize()}" + if multi_page + else "" + }#{attacks[atc]["name"].replace(" ", "-").lower()})""" + for atc in pokes[poke]["attacks"] + ) # ico ico_map = se.Map(4, 11, background=" ") for ico in pokes[poke]["ico"]: + print(poke) se.Text(ico["txt"], state="float", ignore=" ").add(ico_map, 0, 0) ico = "".join("".join(arr) + "\n" for arr in ico_map.map) @@ -239,23 +284,26 @@ def poke_info(poke: str, multi_page: bool = False) -> str: None: "Always", }[pokes[poke].get("night_active")] - md_locations = "\n + ".join(maps[i]["pretty_name"] for i in maps - if maps[i]["poke_args"] is not None - and poke in maps[i]["poke_args"]["pokes"] - or "w_poke_args" in maps[i] - and poke in maps[i]["w_poke_args"][ - "pokes"]) + md_locations = "\n + ".join( + maps[i]["pretty_name"] + for i in maps + if maps[i]["poke_args"] is not None + and poke in maps[i]["poke_args"]["pokes"] + or "w_poke_args" in maps[i] + and poke in maps[i]["w_poke_args"]["pokes"] + ) return f""" -##{'' if multi_page else '##'} {Wiki.get_name(poke)} +##{"" if multi_page else "##"} {Wiki.get_name(poke)} {pokes[poke]["desc"]} ``` {ico} ``` -- Type: [{pokes[poke]["types"][0].capitalize()}]({'../types' if multi_page - else '#types'}) +- Type: [{pokes[poke]["types"][0].capitalize()}]({ + "../types" if multi_page else "#types" + }) - Health points: {pokes[poke]["hp"]} - Attack factor: {pokes[poke]["atc"]} - Defense factor: {pokes[poke]["defense"]} @@ -293,29 +341,37 @@ def attacks(multi_page: bool = False) -> str or list: print(f" -> Adding {typ}") index += f"\n- [{typ.capitalize()}](./{typ})" page = f"# {typ.capitalize()} attacks" - for atc in [k for k in attacks if - attacks[k]["types"][0] == typ]: + for atc in [ + k for k in attacks if attacks[k]["types"][0] == typ + ]: if multi_page: - if atc == [k for k in attacks if - attacks[k]["types"][0] == typ][-1]: + if ( + atc + == [ + k + for k in attacks + if attacks[k]["types"][0] == typ + ][-1] + ): if VERBOSE: - print(f' `-> Adding {attacks[atc]["name"]}') + print(f" `-> Adding {attacks[atc]['name']}") else: if VERBOSE: - print(f' |-> Adding {attacks[atc]["name"]}') + print(f" |-> Adding {attacks[atc]['name']}") else: if VERBOSE: - print(f' -> Adding {attacks[atc]["name"]}') + print(f" -> Adding {attacks[atc]['name']}") page += Wiki.attack_info(atc, True) pages.append((f"{typ}.md", page)) index += "\n\n---\n\n## All attacks sorted by their type:\n" for typ in sorted(types): index += f"- [{typ.capitalize()} Attacks](./{typ})\n" - for atc in [k for k in attacks if - attacks[k]["types"][0] == typ]: - index += f""" - [{attacks[atc]["name"].capitalize()}](./{typ}#{atc.replace('_', '-')})\n""" + for atc in [ + k for k in attacks if attacks[k]["types"][0] == typ + ]: + index += f""" - [{attacks[atc]["name"].capitalize()}](./{typ}#{atc.replace("_", "-")})\n""" - index += '\n' + index += "\n" pages.insert(0, ("index.md", index)) return pages out = """ @@ -324,16 +380,16 @@ def attacks(multi_page: bool = False) -> str or list: """ for typ in sorted(types): out += f"\n### {typ.capitalize()} attacks" - for atc in [k for k in attacks if - attacks[k]["types"][0] == typ]: - if atc == \ - [k for k in attacks if attacks[k]["types"][0] == typ][ - -1]: + for atc in [k for k in attacks if attacks[k]["types"][0] == typ]: + if ( + atc + == [k for k in attacks if attacks[k]["types"][0] == typ][-1] + ): if VERBOSE: - print(f' `-> Adding {attacks[atc]["name"]}') + print(f" `-> Adding {attacks[atc]['name']}") else: if VERBOSE: - print(f' |-> Adding {attacks[atc]["name"]}') + print(f" |-> Adding {attacks[atc]['name']}") out += Wiki.attack_info(atc) return out @@ -353,18 +409,26 @@ def attack_info(attack: str, multi_page: bool = False) -> str: ------- A markdown string with the information about the attack. """ - eff = None if attacks[attack]["effect"] is None \ + eff = ( + None + if attacks[attack]["effect"] is None else getattr(effects, attacks[attack]["effect"]) + ) return f"""\n##{"" if multi_page else "##"} {attacks[attack]["name"]} {attacks[attack]["desc"]} -- Type: [{attacks[attack]["types"][0].capitalize()}]({"../types" if multi_page - else "#types"}) +- Type: [{attacks[attack]["types"][0].capitalize()}]({ + "../types" if multi_page else "#types" + }) - Minimum Level: {attacks[attack]["min_lvl"]} - Attack factor: {attacks[attack]["factor"]} - Missing chance: {attacks[attack]["miss_chance"]} - Attack points: {attacks[attack]["ap"]} -- Effect: {"None" if eff is None else f'[{eff.c_name.capitalize()}]({"../effects" if multi_page else ""}#{eff.c_name.replace("_", "-")})'} +- Effect: { + "None" + if eff is None + else f"[{eff.c_name.capitalize()}]({'../effects' if multi_page else ''}#{eff.c_name.replace('_', '-')})" + } """ @staticmethod @@ -381,7 +445,7 @@ def types(multi_page: bool = False) -> str: A markdown string of all available types. """ out = f""" -#{'' if multi_page else '#'} Types +#{"" if multi_page else "#"} Types Those are all the Pokete/Attack types that are present in the game with all their (in)effectivities against other types. |Type|Effective against|Ineffective against| @@ -389,15 +453,19 @@ def types(multi_page: bool = False) -> str: """ for poke_type in types: - effective, ineffective = ("".join([i.capitalize() + (", " - if i != types[ - poke_type][j][-1] - else "") - for i in types[poke_type][j]]) - for j in ["effective", "ineffective"]) + effective, ineffective = ( + "".join( + [ + i.capitalize() + + (", " if i != types[poke_type][j][-1] else "") + for i in types[poke_type][j] + ] + ) + for j in ["effective", "ineffective"] + ) out += f"|{poke_type.capitalize()}|{effective}|{ineffective}|\n" - return out + '\n' + return out + "\n" @staticmethod def items(multi_page: bool = False) -> str: @@ -412,11 +480,13 @@ def items(multi_page: bool = False) -> str: ------- A markdown string that contains information about all items. """ - return f"""#{'' if multi_page else '#'} Items + return f"""#{"" if multi_page else "#"} Items Those are all items present in the game, that can be traded or found. -""" + '\n'.join(Wiki.item_info(item=item, multi_page=multi_page) - for item in sorted(items)) +""" + "\n".join( + Wiki.item_info(item=item, multi_page=multi_page) + for item in sorted(items) + ) @staticmethod def item_info(item: str, multi_page: bool = False) -> str: @@ -432,7 +502,7 @@ def item_info(item: str, multi_page: bool = False) -> str: ------- A markdown string with the information about the item. """ - return f"""##{'' if multi_page else '#'} {items[item]["pretty_name"]} + return f"""##{"" if multi_page else "#"} {items[item]["pretty_name"]} {items[item]["desc"]} - Price: {items[item]["price"]} @@ -456,8 +526,9 @@ def effects(multi_page: bool = False) -> str: out = """# Effects Those effects can be given to a Pokete through an attack. """ - out += str.join("", [effect.ret_md() for effect in - effect_list]).replace("###", "##") + out += str.join( + "", [effect.ret_md() for effect in effect_list] + ).replace("###", "##") else: out = """ ## Effects @@ -487,11 +558,26 @@ def single(filename: str = "wiki.md") -> None: if QUIET or VERBOSE: print(":: Generating wiki.md...") md_str: str = "" - for _text, obj in zip(["page start", "table of contents", "poketes", - "attacks", "types", "items", "effects"], - [Wiki.start, Wiki.table_of_contents, Wiki.poketes, - Wiki.attacks, Wiki.types, Wiki.items, - Wiki.effects]): + for _text, obj in zip( + [ + "page start", + "table of contents", + "poketes", + "attacks", + "types", + "items", + "effects", + ], + [ + Wiki.start, + Wiki.table_of_contents, + Wiki.poketes, + Wiki.attacks, + Wiki.types, + Wiki.items, + Wiki.effects, + ], + ): if QUIET or VERBOSE: print(f"==> Adding {_text}...") md_str += obj() @@ -523,9 +609,9 @@ def multi(folder_name: str = "wiki") -> None: if QUIET or VERBOSE: print(":: Generating multi-page wiki...") print("==> Checking if old wiki exists...") - for folder in ['', '/poketes', '/attacks']: + for folder in ["", "/poketes", "/attacks"]: if VERBOSE: - print(f' -> Checking "{folder_name}{folder}": ', end='') + print(f' -> Checking "{folder_name}{folder}": ', end="") if exists(folder_name + folder): if not isdir(folder_name + folder): if VERBOSE: @@ -552,30 +638,30 @@ def multi(folder_name: str = "wiki") -> None: index += Wiki.table_of_contents(multi_page=True) if VERBOSE: print(f' -> Writing to "{folder_name}/index.md"...') - with open(f"{folder_name}/index.md", 'w') as file: + with open(f"{folder_name}/index.md", "w") as file: file.write(index) if QUIET or VERBOSE: print("==> Adding poketes...") if VERBOSE: print(" -> Adding index.md...") - with open(f"{folder_name}/poketes/index.md", 'w') as file: - file.write(Wiki.poketes(page_mode='index')) + with open(f"{folder_name}/poketes/index.md", "w") as file: + file.write(Wiki.poketes(page_mode="index")) for typ in types: - with open(f"{folder_name}/poketes/{typ}.md", 'w') as file: - file.write(Wiki.poketes(page_mode='multi', pokete_type=typ)) + with open(f"{folder_name}/poketes/{typ}.md", "w") as file: + file.write(Wiki.poketes(page_mode="multi", pokete_type=typ)) if QUIET or VERBOSE: print("==> Adding attacks...") for page in Wiki.attacks(multi_page=True): file_name, file_contents = page - with open(f"{folder_name}/attacks/{file_name}", 'w') as file: + with open(f"{folder_name}/attacks/{file_name}", "w") as file: file.write(file_contents) for name in ["types", "items", "effects"]: if QUIET or VERBOSE: print(f"==> Adding {name}...") - with open(f"{folder_name}/{name}.md", 'w') as file: + with open(f"{folder_name}/{name}.md", "w") as file: file.write(getattr(Wiki, name)(multi_page=True)) @@ -591,8 +677,7 @@ def gen_pics(): file.write(md_str) -def gen(ex: str, options: list[str], - flags: dict[str, list[str]]): +def gen(ex: str, options: list[str], flags: dict[str, list[str]]): global SILENT, QUIET, VERBOSE if len(flags) == 0: SILENT, QUIET, VERBOSE = False, True, False @@ -618,7 +703,7 @@ def gen(ex: str, options: list[str], quiet_flag = Flag(["--quiet"], "Prints only some minimal statements") verbose_flag = Flag(["--verbose"], "Prints everything it's doing") single_flag = Flag(["--single"], "Generates the `wiki.md` as a single file") -multi_flag = Flag(["--multi"], - "Generates a folder `wiki` with the wiki files") -pics_flag = Flag(["--pics"], - "Generates the `assets/pics.md` file with all sample pictures") +multi_flag = Flag(["--multi"], "Generates a folder `wiki` with the wiki files") +pics_flag = Flag( + ["--pics"], "Generates the `assets/pics.md` file with all sample pictures" +)