From 607459e65b7cfcd9abe81a80d6719f5f24d6de81 Mon Sep 17 00:00:00 2001 From: Kelly Roberts <105584129+bubstance@users.noreply.github.com> Date: Fri, 10 Jun 2022 07:09:53 -0700 Subject: [PATCH 01/19] Corrected some grammar, edited names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made some of the trainer names to be more "Pokémon-y". --- pokete_data/trainers.py | 97 +++++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 48 deletions(-) diff --git a/pokete_data/trainers.py b/pokete_data/trainers.py index 215d6e80..2aec88c3 100644 --- a/pokete_data/trainers.py +++ b/pokete_data/trainers.py @@ -9,7 +9,7 @@ "cave_1": [{ "poke": ("hornita", 128), "args": ("Monica", "She", - [" < Hello noble traveler", " < Are you willing to fight me?"], + [" < Hello, noble traveler", " < Are you willing to fight me?"], [" < Hahaha!", " < Looooser!"], [" < Congratulations!", " < Have a great day!"], 23, 10) }, @@ -20,13 +20,13 @@ [" < Isn't it a great day?", " < I traveled here from a distant country", " < Do you want to fight against my rare Pokete?"], [" < It is stronger than you might have expected"], - [" < Oh, I didn't think you can defeat my Pokete!", " < You are a very good trainer!"], 32, 12) + [" < Oh, I didn't think you could defeat my Pokete!", " < You are a very good trainer!"], 32, 12) }, ], "playmap_3": [{ "poke": ("hornita", 200), "args": ("Markus", "He", - [" < Hey!", " < Welcome to Sunnydale", " < But first we have to fight!"], + [" < Hey!", " < Welcome to Sunnydale!", " < But first, we must fight!"], [" < Hahaha!", " < Hahaha!", " < You're a loser!"], [" < Damn, I lost!"], 11, 5) }, @@ -34,7 +34,7 @@ "playmap_4": [{ "poke": ("karpi", 340), "args": ("Kevin", "He", - [" < Jo!", " < What up?", " < Wanna see my sick ass Pokete?"], + [" < Yo!", " < Whaddup?", " < Wanna see my sick-ass Pokete?"], [" < Yeaaah!", " < My Pokete is sooo sick!"], [" < Daaaamn", " < Your Pokete is nooot from this planet!"], 32, 31) }, @@ -42,8 +42,8 @@ "playmap_5": [{ "poke": ("bator", 350), "args": ("Caveman Marc", "He", - [" < Oh!", " < I've not seen anyone down here for while", - " < Can I show you my rare Pokete, which can only be found in this cave?"], + [" < Oh!", " < I haven't seen anyone down here for a while", + " < Can I show you my rare Pokete which can only be found in this cave?"], [" < Oh!", " < My Pokete is not just rare", " < It's also strong"], [" < Congratulations!", " < I hope you can also catch one!"], 23, 12) }, @@ -51,7 +51,8 @@ "playmap_6": [{ "poke": ("treenator", 400), "args": ("Eva", "She", - [" < Hi!", " < Fight?"], [" < Loser"], + [" < Hi!", " < Fight?"], + [" < Loser"], [" < I lost!"], 47, 43) }, ], @@ -59,13 +60,13 @@ "poke": ("steini", 400), "args": ("Caveman Dieter", "He", [" < Oh!", " < I didn't see you coming"], - [" < My steini is old but classy"], + [" < My Steini is old but classy"], [" < You're a great trainer!"], 18, 7) }, ], "playmap_8": [{ "poke": ("gobost", 400), - "args": ("Wood man Bert", "He", + "args": ("Woodsman Bert", "He", [" < Do you see this abandoned house?", " < I caught this Pokete in there!"], [" < It's pretty cool huh?!"], [" < Oh, yours is better than mine!"], 39, 6) @@ -73,16 +74,16 @@ ], "playmap_11": [{ "poke": ("clampi", 450), - "args": ("Fishermans friend", "He", - [" < G'day young trainer", " < I've lived here for years"], + "args": ("Fishermans Friend", "He", + [" < G'day, young trainer", " < I've lived here for years"], [" < Those years of training were worth it"], - [" < I haven't trained it in years!"], 42, 7) + [" < I haven't trained my Pokete in years!"], 42, 7) }, ], "playmap_12": [{ "poke": ("blub", 600), "args": ("Brother Justin", "He", - [" < Hey, my brother and me want to fight!"], + [" < Hey, my brother and I want to fight!"], [" < Haha, you're bad!"], [" < Damn!"], 26, 10) }, { @@ -96,33 +97,33 @@ "playmap_13": [{ "poke": ("vogli", 600), "args": ("Citizen", "He", - [" < Hello fellow stranger!", " < This town is known for its bird Poketes"], + [" < Hello, fellow stranger!", " < This town is known for its bird Poketes"], [" < Haha, you're bad!"], [" < Damn!"], 5, 31) }, ], "playmap_14": [{ "poke": ("owol", 650), - "args": ("First trainer", "He", + "args": ("First Trainer", "He", [" < Welcome to the Deepest Forest Pokete Arena", " < I'm your first enemy!"], [" < Haha, you're bad!"], [" < Good luck!"], 17, 10) }, { "poke": ("voglo", 700), - "args": ("Second trainer", "She", + "args": ("Second Trainer", "She", [" < Now it's my turn!"], [" < Haha, you're bad!"], [" < Good luck with the next trainer!"], 22, 10) }, { "poke": ("treenator", 750), - "args": ("Third trainer", "She", + "args": ("Third Trainer", "She", [" < Let's see what other Poketes you have!"], [" < Haha, you're bad!"], [" < Good luck with the last trainer!"], 22, 5) }, { "poke": ("ostri", 780), - "args": ("Last trainer", "He", + "args": ("Last Trainer", "He", [" < I'm your last enemy!"], [" < Haha, you're bad!"], [" < Oh!", " < You were able to defeat me?", " < You can now leave Deepest Forest"], 17, 5) @@ -131,7 +132,7 @@ "playmap_15": [{ "poke": ("clampi", 650), "args": ("Samantha", "She", - [" < Hey you!", " < My Pokete is very effective against bird Poketes"], + [" < Hey, you!", " < My Pokete is very effective against bird Poketes"], [" < You see, it's effective"], [" < Oh no", " < I guess yours is even more effective than mine!"], 43, 17) }, { @@ -152,29 +153,29 @@ "poke": ("clampi", 700), "args": ("Karen", "She", [" < I don't think you can walk here", " < I demand a fight with you!"], - [" < Go home little zoomer."], + [" < Go home, little zoomer."], [" < I want to talk to your manager."], 56, 11) }, ], "playmap_19": [{ "poke": ("choka", 850), "args": ("Brian", "He", - [" < Hello fellow cave man!"], + [" < Hello fellow cave diver!"], [" < Oooooh!", " < You're a loooser!"], [" < Oh!", " < You were lucky!"], 16, 15) }, { "poke": ("wolfiro", 850), "args": ("Simon", "He", - [" < Joooo!", " < What up?"], + [" < Yoooo!", " < What's up?"], [" < You're a loooser!"], [" < Duck!"], 15, 7) }, ], "playmap_21": [{ "poke": ("bigstone", 900), - "args": ("Rock hard Rick", "He", + "args": ("Rock-hard Rick", "He", [" < Hello trainer!", - " < Welcome to Rock-ville, the highest place in the Pokete world and the home of all stone Poketes.", + " < Welcome to Rock-ville, the highest place in the Pokete world and home of all stone Poketes.", " < When leaving this town through the 'Cave of Doom' you have to fight against the best trainers of " "this town.", " < But first, you have to fight me!"], @@ -191,13 +192,13 @@ }, { "poke": ("steini", 900), "args": ("Gerard", "He", - [" < My Steini will rip out your Poketes heart!"], + [" < My Steini will rip out your Pokete's heart!"], [" < You're a loooser!"], [" < The other trainers wont be as easy!"], 11, 10) }, { "poke": ("treenator", 950), "args": ("Jessica", "She", - [" < You wont be ready for my treenator!"], + [" < You wont be ready for my Treenator!"], [" < You're a loooser!"], [" < Our best trainer will defeat you though!"], 16, 6) }, @@ -211,10 +212,10 @@ ], "playmap_28": [{ "poke": ("electrode", 950), - "args": ("Steven the big", "He", + "args": ("Steven the Big", "He", [" < I don't think you ever met an Electrode!"], [" < You're a loooser!"], - [" < hups!", " < It's not as great as I thought!"], 36, 47) + [" < Hmph!", " < It's not as great as I thought!"], 36, 47) }, { "poke": ("steini", 850), "args": ("Laurena", "She", @@ -231,17 +232,17 @@ { "poke": ("confuso", 900), "args": ("Fucking badass looking dude in the woods", "He", - [" < You have to win against my Pokete to enter 'Flowy Town'", " < I guess it'll confuse you!"], + [" < You have to beat my Pokete to enter 'Flowy Town'", " < I guess it'll confuse you!"], [" < You're a loooser!"], - [" < I wish you the best luck in 'Flowy Town'!"], 190, 8) + [" < I wish you the best of luck in 'Flowy Town'!"], 190, 8) }, ], "playmap_30": [{ "poke": ("poisopla", 950), - "args": ("Guy at the entrance", "He", - [" < Welcome to 'Flowy Town' the home of the flowers."], + "args": ("Guy at the Entrance", "He", + [" < Welcome to 'Flowy Town', home of the flowers."], [" < You're a loooser!"], - [" < I wish you the best luck fighting against our best trainers!"], 5, 18) + [" < I wish you the best of luck fighting against our best trainers!"], 5, 18) }, ], "playmap_31": [{ @@ -259,13 +260,13 @@ }, { "poke": ("treenator", 1000), "args": ("Aurelia", "She", - [" < You wont be ready for my treenator!"], + [" < You wont be ready for myTtreenator!"], [" < You're a loooser!"], [" < Our best trainer will defeat you though!"], 28, 6) }, { "poke": ("rosi", 1200), - "args": ("Master of the flowers", "He", + "args": ("Master of the Flowers", "He", [" < I'm the Master of the plants and I have one of the rarest plant Poketes!"], [" < You're a loooser!"], [" < This was unfortunate!"], 31, 4) @@ -291,7 +292,7 @@ "poke": ("dicki", 1250), "args": ("Farmer Doora", "She", [" < This is a cool Pokete I found on my field!"], - [" < It's cool, init?!"], + [" < It's cool, innit?!"], [" < I guess have still have to train it. :("], 74, 33) }, { "poke": ("wolfiro", 1300), @@ -303,16 +304,16 @@ ], "playmap_39": [{ "poke": ("megapois", 2000), - "args": ("Angela the gardener", "She", + "args": ("Gardener Angela", "She", [" < Have you already fought our lead trainer?", - " < If so, look at cool Pokete!"], + " < If so, look at this cool Pokete!"], [" < You're a loooser!"], [" < Cool, huh?"], 8, 37) }, ], "playmap_40": [{ "poke": ("rustacean", 1800), - "args": ("Gustav the angler", "He", + "args": ("Angler Gustav", "He", [" < My Pokete will blow you away!"], [" < You're a loooser!"], [" < Cool, huh?"], 58, 12) @@ -320,44 +321,44 @@ ], "playmap_41": [{ "poke": ("wheeto", 2000), - "args": ("Daniel the farmer", "He", - [" < Howdy partner!", " < How ya doin?", + "args": ("Farmer Daniel", "He", + [" < Howdy, partner!", " < How ya doin?", " < My Pokete is one of a kind", " < The good stuff!"], [" < Uhhh yeah!", " < The good stuff...!"], - [" < I guess, it's not the good stuff"], 17, 4) + [" < I guess it's not the good stuff"], 17, 4) }, ], "playmap_46": [ { "poke": ("wheeto", 2000), - "args": ("Martin the farmer", "He", - [" < Howdy partner!", " < I will be your first challenger!"], + "args": ("Farmer Martin", "He", + [" < Howdy, partner!", " < I will be your first challenger!"], [" < You'll do better next time."], [" < I wish you the best of luck"], 19, 7) }, { "poke": ("dicko", 2100), - "args": ("The undetermined", "They", + "args": ("The Undetermined", "They", [" < I see you're not as bad as we thought!"], [" < You'll do better next time."], [" < I wish you the best of luck"], 16, 7) }, { "poke": ("megapois", 2200), - "args": ("Daniela the gardener", "She", + "args": ("Gardener Daniela", "She", [" < Look at my newest creation!"], [" < You'll do better next time."], [" < I wish you the best of luck"], 13, 7) }, { "poke": ("mowcow", 2300), - "args": ("Sebastian the leader", "He", + "args": ("Leader Sebastian", "He", [" < So, I'll be your last opponent.", " < Let's have a fair fight!"], [" < You'll do better next time."], [" < You're quite a good trainer.", - " < Hopefully you can beat all other trainers, with whom " + " < Hopefully you can beat all other trainers with whom " "you may cross paths!"], 10, 7) }, ], From 882b8ace5b9c02fc1432dbb0d48e6ca85fd2da25 Mon Sep 17 00:00:00 2001 From: Kelly Roberts <105584129+bubstance@users.noreply.github.com> Date: Fri, 10 Jun 2022 07:20:09 -0700 Subject: [PATCH 02/19] Edited Decks grammar --- pokete_data/poketes.py | 56 +++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/pokete_data/poketes.py b/pokete_data/poketes.py index 9dacb2f0..c13d32b8 100644 --- a/pokete_data/poketes.py +++ b/pokete_data/poketes.py @@ -34,7 +34,7 @@ "attacks": ["tackle", "politure", "brick_throw"], "pool": [], "miss_chance": 0, - "desc": "A squared stone that can casually be found on the ground.", + "desc": "A squared stone that can be readily found just lying around.", "lose_xp": 3, "rarity": 1, "types": ["stone", "normal"], @@ -56,7 +56,7 @@ "attacks": ["tackle"], "pool": ["supercow_power", "meat_skewer"], "miss_chance": 0, - "desc": "A cow-like creature found on meadows.", + "desc": "A cow-like creature found in meadows.", "lose_xp": 2, "rarity": 1, "types": ["normal"], @@ -77,7 +77,7 @@ "attacks": ["snooze", "politure", "brick_throw"], "pool": [], "miss_chance": 0, - "desc": "A big and heavy stone made from one of the hardest stones.", + "desc": "A big and heavy stone made from one of the hardest materials.", "lose_xp": 5, "rarity": 0.3, "types": ["stone", "normal"], @@ -143,7 +143,7 @@ "attacks": ["sucker", "super_sucker"], "pool": [], "miss_chance": 0, - "desc": "A plant Pokete, that's often mistaken for a normal flower.", + "desc": "A plant Pokete that's often mistaken for a normal flower.", "lose_xp": 2, "rarity": 0.8, "types": ["plant"], @@ -165,7 +165,7 @@ "attacks": ["root_slap", "special_smell"], "pool": [], "miss_chance": 0.1, - "desc": "A plant Pokete found in Agrawos, with special 'Powers'.", + "desc": "A plant Pokete found in Agrawos; it has special 'Powers'.", "lose_xp": 2, "rarity": 1, "types": ["plant"], @@ -187,7 +187,7 @@ "attacks": ["mind_blow", "fire_ball", "sand_throw"], "pool": ["hiding"], "miss_chance": 1, - "desc": "The dark firy souls of those who got burned to death by the hot sun!", + "desc": "The dark and fiery souls of those who got burned to death by the hot sun!", "lose_xp": 4, "rarity": 0.5, "types": ["undead", "fire"], @@ -259,7 +259,7 @@ "attacks": ["tackle", "power_pick"], "pool": ["cry"], "miss_chance": 0, - "desc": "A very common bird Pokete that lives everywhere.", + "desc": "A very common bird Pokete; it lives everywhere.", "lose_xp": 2, "rarity": 1, "types": ["flying", "normal", "bird"], @@ -328,8 +328,8 @@ "attacks": ["tackle", "eye_pick", "brooding"], "pool": ["cry"], "miss_chance": 0, - "desc": "A very aggressive bird Pokete that lives near deserts and \ -will try to pick out your eyes.", + "desc": "A very aggressive bird Pokete that lives near deserts; \ +it will try to peck out your eyes.", "rarity": 0.6, "lose_xp": 4, "types": ["flying", "normal", "bird"], @@ -351,7 +351,7 @@ "attacks": ["tackle"], "pool": [], "miss_chance": 0, - "desc": "A very harmless water Pokete that can be found everywhere.", + "desc": "A harmless water Pokete that can be found everywhere.", "lose_xp": 1, "rarity": 3, "types": ["water", "normal"], @@ -417,7 +417,7 @@ "attacks": ["apple_drop", "bark_hardening", "branch_stab", "root_strangler"], "pool": [], "miss_chance": 0, - "desc": "A scary an dangerous apple tree.", + "desc": "A scary and dangerous apple tree.", "lose_xp": 2, "rarity": 1, "types": ["plant"], @@ -504,7 +504,7 @@ "attacks": ["pick", "wing_hit", "cry"], "pool": ["cry"], "miss_chance": 0, - "desc": "A night active Pokete, that is looking for lil children as a midnight snack.", + "desc": "A nocturnal Pokete that is looking for small children to eat as a midnight snack.", "lose_xp": 2, "rarity": 0.5, "types": ["flying", "normal", "bird"], @@ -549,7 +549,7 @@ "attacks": ["tackle", "tail_wipe", "power_bite"], "pool": ["bite"], "miss_chance": 0, - "desc": "A damn dangerous and enourmous rat, that will bite of your leg.", + "desc": "A damn dangerous and enourmous rat; it will bite of your leg.", "lose_xp": 2, "rarity": 0.7, "types": ["normal"], @@ -574,7 +574,7 @@ "attacks": ["tackle", "meat_skewer", "tail_wipe"], "pool": [], "miss_chance": 0, - "desc": "An majestic horse that is always looking for something to pick with its horn.", + "desc": "A majestic horse that is always looking for something to pick with its horn.", "lose_xp": 3, "rarity": 1, "types": ["normal"], @@ -639,7 +639,7 @@ "attacks": ["tackle", "fire_bite", "ash_throw"], "pool": ["cry", "bite", "power_bite"], "miss_chance": 0, - "desc": "A fiery wolf straight from hell, that likes to burn 11 years old butts of.", + "desc": "A fiery wolf straight from hell that likes to burn 11 years old butts off.", "lose_xp": 2, "rarity": 1, "types": ["fire", "normal"], @@ -689,7 +689,7 @@ "attacks": ["tackle", "power_roll"], "pool": ["hiding"], "miss_chance": 0, - "desc": "A big chunk of stone and dirt, that roles around.", + "desc": "A big chunk of stone and dirt that rolls around.", "lose_xp": 3, "rarity": 0.5, "types": ["ground", "normal"], @@ -711,7 +711,7 @@ "attacks": ["tackle", "bubble_bomb", "shell_pinch"], "pool": [], "miss_chance": 0, - "desc": "A shell that lives deep in the see or near bays, that's pretty hard to crack.", + "desc": "A shell that lives deep in the sea or near bays; it's pretty hard to crack.", "lose_xp": 5, "rarity": 0.8, "types": ["water", "normal"], @@ -759,7 +759,7 @@ "attacks": ["toe_breaker", "bubble_gun", "earch_quake", "shell_pinch"], "pool": [], "miss_chance": 0, - "desc": "A crusty Pokete that will pinch your toe, and check whether \ + "desc": "A crusty Pokete that will pinch your toes and check whether \ or not you borrowed something.", "lose_xp": 5, "rarity": 0.5, @@ -925,7 +925,7 @@ "attacks": ["root_slap", "poison_spores", "leaf_storm", "poison_thorn"], "pool": [], "miss_chance": 0.1, - "desc": "A very unsuspicious plant.", + "desc": "A not at all suspicious plant.", "lose_xp": 6, "rarity": 0.9, "types": ["plant", "poison"], @@ -951,7 +951,7 @@ "attacks": ["tackle", "hiding"], "pool": [], "miss_chance": 0, - "desc": "A small heavy thing, that can be found on the ground, but that may reveal something wonderful later.", + "desc": "A small heavy thing that can be found on the ground; it may reveal something wonderful later.", "lose_xp": 1, "rarity": 1, "night_active": False, @@ -975,7 +975,7 @@ "attacks": ["tackle", "hiding"], "pool": [], "miss_chance": 0, - "desc": "A small heavy thing, that can be found on the ground, but that may reveal something wonderful later.", + "desc": "A small heavy thing that can be found on the ground; it may reveal something wonderful later.", "lose_xp": 1, "rarity": 1, "night_active": True, @@ -999,7 +999,7 @@ "attacks": ["tackle", "hiding"], "pool": [], "miss_chance": 0.1, - "desc": "A small caterpillar found on leafs.", + "desc": "A small caterpillar found on leaves.", "lose_xp": 2, "rarity": 1, "night_active": False, @@ -1024,7 +1024,7 @@ "attacks": ["tackle", "hiding"], "pool": [], "miss_chance": 0.1, - "desc": "A small caterpillar found on leafs.", + "desc": "A small caterpillar found on leaves.", "lose_xp": 2, "rarity": 1, "night_active": True, @@ -1096,14 +1096,14 @@ ] }, "lil_nut": { - "name": "Lil nut", + "name": "Lil Nut", "hp": 20, "atc": 1, "defense": 3, "attacks": ["tackle", "ground_hit"], "pool": ["dick_energy", "hiding"], "miss_chance": 0.1, - "desc": "A very small what ever, that sticks out of the ground.", + "desc": "A very small whatever that sticks out of the ground.", "lose_xp": 2, "rarity": 1, "types": ["ground", "normal"], @@ -1126,7 +1126,7 @@ "attacks": ["tackle", "dick_energy", "hiding", "ground_hit"], "pool": [], "miss_chance": 0.1, - "desc": "A little what ever, that sticks out of the ground.", + "desc": "A little whatever that sticks out of the ground.", "lose_xp": 2, "rarity": 1, "types": ["ground", "normal"], @@ -1149,7 +1149,7 @@ "attacks": ["tackle", "dick_energy", "hiding", "ground_hit"], "pool": [], "miss_chance": 0.1, - "desc": "An even bigger what ever, that sticks out of the ground.", + "desc": "An even bigger whatever that sticks out of the ground.", "lose_xp": 2, "rarity": 1, "types": ["ground", "normal"], @@ -1172,7 +1172,7 @@ "attacks": ["tackle", "politure", "dazzle"], "pool": ["dia_stab", "dia_spikes"], "miss_chance": 0.1, - "desc": "A precious diamond, that can only be found in the darkest caves.", + "desc": "A precious diamond that can only be found in the darkest caves.", "lose_xp": 2, "rarity": 1, "types": ["stone"], From fea11f11d8d027f8854d3e61c257c7ef66388164 Mon Sep 17 00:00:00 2001 From: Kelly Roberts <105584129+bubstance@users.noreply.github.com> Date: Fri, 10 Jun 2022 07:38:39 -0700 Subject: [PATCH 03/19] Edited grammar and spelling --- pokete_data/npcs.py | 120 ++++++++++++++++++++++---------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/pokete_data/npcs.py b/pokete_data/npcs.py index 315c2e7c..48c49781 100644 --- a/pokete_data/npcs.py +++ b/pokete_data/npcs.py @@ -1,16 +1,16 @@ npcs = { "test_npc": { - "texts": [" < Hey"], + "texts": [" < Hey."], "fn": None, "map": "playmap_3", "x": 49, "y": 14 }, "old_man": { - "texts": [" < Hello young trainer", - " < When I've been at your age, I also was a trainer", - " < And I found this very special Poketeball", - " < A Hyperball", " < It's one of the oldest and rarerest of them all", + "texts": [" < Hello, young trainer.", + " < When I was your age... I also was a trainer.", + " < One day I found this very special Poketeball...", + " < A Hyperball!", " < It's one of the oldest and rarest of them all.", " < You can keep it!"], "fn": "playmap_10_old_man", "map": "playmap_10", @@ -18,24 +18,24 @@ "y": 3 }, "healer": { - "texts": [" < Hello fellow trainer", " < You and your Poketes look exhausted", " < I will heal them!"], + "texts": [" < Hello, fellow trainer.", " < You and your Poketes look exhausted.", " < I can heal them!"], "fn": "heal", "map": "playmap_8", "x": 52, "y": 1 }, "npc_1": { - "texts": [" < To get to the other side of this building, you have to win some epic fights against Deepens " - "forests' best trainers!", " < This won't be easy!"], + "texts": [" < To get to the other side of this building, you have to win some epic fights against Deepest " + "Forests' best trainers!", " < This won't be easy!"], "fn": None, "map": "playmap_13", "x": 33, "y": 6 }, "npc_2": { - "texts": [" < Welcome to Deepens forest", - " < To get through this town you have to win against the best trainers of Deepens forest!", - " < I wish you a great time in Deepens forest!"], + "texts": [" < Welcome to Deepest Forest!", + " < To get through this town you have to win against the best trainers of Deepest Forest!", + " < I hope you have a great time!"], "fn": None, "map": "playmap_13", "x": 38, @@ -50,21 +50,21 @@ "y": 15 }, "npc_4": { - "texts": [" < In this lake live...", " < ...Karpis"], + "texts": [" < In this lake live...", " < ...Karpis."], "fn": None, "map": "playmap_21", "x": 64, "y": 12 }, "npc_5": { - "texts": [" < This is the townhall of Rock-ville.", " < Here you can meet our major"], + "texts": [" < This is the town hall of Rock-ville.", " < Here you can meet our mayor."], "fn": None, "map": "playmap_21", "x": 112, "y": 12 }, "npc_6": { - "texts": [" < Welcome to the Rocky Hotel, here you can rent a room to sleep."], + "texts": [" < Welcome to the Rocky Hotel!", " < Here you can rent a room to sleep."], "fn": None, "map": "playmap_22", "x": 12, @@ -78,22 +78,22 @@ "y": 8 }, "npc_8": { - "texts": [" < Isn't this a nice town?", " < 100$ would be very usefull for a young trainer like you, init?"], + "texts": [" < Isn't this a nice town?", " < $100 would be very useful for a young trainer like you, wouldn't it?"], "fn": "playmap_23_npc_8", "map": "playmap_23", "x": 3, "y": 7 }, "npc_9": { - "texts": [" < British devs be like:", " < It's a constructor, __init__?"], + "texts": [" < British devs be like:", " < It's a constructor, __innit__?"], "fn": None, "map": "playmap_24", "x": 14, "y": 3 }, "major": { - "texts": [" < Hello trainer!", " < I'm the major of Rock-ville", - " < I think you are interested in fighting our best trainers!?", " < I wish you luck!"], + "texts": [" < Hello trainer!", " < I'm the mayor of Rock-ville.", + " < Is it true that you are interested in fighting our best trainers!?", " < I wish you luck!"], "fn": None, "map": "playmap_26", "x": 9, @@ -116,11 +116,11 @@ "y": 3 }, "ld_man": { - "texts": [" < Hello fellow trainer!", + "texts": [" < Hello, fellow trainer!", " < You may have noticed that traveling between cities is not so comfortable nowadays.", - " < But i can help you.", " < I can give you this lerning disc", - " < You can use it to teach the 'flying' attack to one of your flying Poketes to ride on it to the " - "next town.", + " < But I can help you.", " < I can give you this Learning Disc.", + " < You can use it to teach the 'Flying' attack to one of your flying Poketes so you can ride it to " + "the next town.", " < Isn't this great?"], "fn": "playmap_29_ld_man", "map": "playmap_29", @@ -129,9 +129,9 @@ }, "lxgr": { "texts": [" < Hello fellow traveler, my name is lxgr and I created this game. ", - " < You may ask your self: 'Lxgr, what are you doing in this game?', and the answer is 'Standing " + " < You may be asking yourself: 'Lxgr, what are you doing in this game?', and the answer is: 'Standing " "around'.", - " < I added this NPC, because I'm stuck in a train somewere between Hamburg and Rostock, " + " < I added this NPC because I'm stuck on a train somewere between Hamburg and Rostock, " "and I'm bored.", " < You can contribute to this game at https://github.com/lxgr-linux/pokete .", " < If you want to hire me and stuff you can write me at lxgr@protonmail.com ."], @@ -149,14 +149,14 @@ }, "npc_11": { "texts": [" < This is the great Pokete arena of Flowy Town.", - " < Here you'll have to fight our best trainers and most rare Poketes!"], + " < Here you'll have to fight our best trainers and rarest Poketes!"], "fn": None, "map": "playmap_30", "x": 60, "y": 18 }, "npc_12": { - "texts": [" < I guess this will be helpfull for you!"], + "texts": [" < I think this will be helpful for you!"], "fn": "playmap_32_npc_12", "map": "playmap_32", "x": 8, @@ -170,7 +170,7 @@ "y": 4 }, "npc_14": { - "texts": [" < I guess this will be helpfull for you!"], + "texts": [" < I think this will be helpful for you!"], "fn": "playmap_36_npc_14", "map": "playmap_36", "x": 15, @@ -178,14 +178,14 @@ }, "npc_15": { "texts": [" < Hello fellow trainer!", - " < This is a very helpfull potion, that will save your Pokete in riscy fights!"], + " < This is a very helpful potion that will save your Pokete in risky fights!"], "fn": "playmap_37_npc_15", "map": "playmap_37", "x": 4, "y": 3 }, "npc_16": { - "texts": [" < WTF r u doing here?", " < Screw of!"], + "texts": [" < WTF r u doing here?", " < Screw off!"], "fn": None, "map": "playmap_38", "x": 11, @@ -195,17 +195,17 @@ "texts": [], "fn": "chat", "chat": { - "q": [" < Hello there"], + "q": [" < Hello there!"], "a": { "Hello": { - "q": [" < Hi"], + "q": [" < Hi."], "a": {} }, "How are you?": { - "q": [" < I'm fine, thanks", " < Where are you from?"], + "q": [" < I'm fine, thanks.", " < Where are you from?"], "a": { - "Home": { - "q": [" < Wow"], + "Home.": { + "q": [" < Wow."], "a": {} } } @@ -220,50 +220,50 @@ "texts": [], "fn": "chat", "chat": { - "q": [" < Hey there", " < What are you doing here at the beach?"], + "q": [" < Hey there!", " < What are you doing here at the beach?"], "a": { - "Just chilling": { - "q": [" < Nice", " < This beach is the most beautiful in the region!", " < Isn't the weather great today?"], + "Just chilling.": { + "q": [" < Nice.", " < This beach is the most beautiful in the region!", " < Isn't the weather great today?"], "a": {} }, "Searching for Poketes": { - "q": [" < Oh cool, your a Pokete trainer!", " < Did already find some?"], + "q": [" < Oh cool, you're a Pokete trainer!", " < Did you already find some?"], "a": { "Yes": { - "q": [" < Cool!", " < Have you already caught a Crabbat?"], + "q": [" < Cool!", " < Have you caught a Crabbat yet?"], "a": { "Yes": { - "q": [" < That's pretty cool!", "But have you also met a Saugh?"], + "q": [" < That's pretty cool!", "But have you also seen a Saugh?"], "a": { "Yes": { "q": [" < Those are fucking beasts!"], "a": {} }, "Hell, what are those?": { - "q": [" < Their the dark firy souls of those who got burned to death by the hot sun!"], + "q": [" < They're the dark and fiery souls of those who got burned to death by the hot sun!"], "a": {} } } }, "Yes, of course" : { - "q": [" < You're a good trainer, huh?", " < I wan't to see you fight a Rustcean", " < They're very tough!"], + "q": [" < You're a good trainer, huh?", " < I want to see you fight a Rustacean.", " < They're very tough!"], "a": {} }, "No": { - "q": [" < That's too bad", " < But they're very tought!"], + "q": [" < That's too bad.", " < But they're very tough!"], "a": {} } } }, "No": { - "q": [" < That's too bad", " < You can find some in the sand fields"], + "q": [" < That's too bad.", " < You can find some in the sand fields."], "a": { - "Thank's a lot": { + "Thanks a lot!": { "q": [" < No problem!"], "a": {} }, - "Are you a trainer your self?": { - "q": [" < No, but the guy overthere"], + "Are you a trainer yourself?": { + "q": [" < No, but the guy over there is."], "a": {} } } @@ -278,7 +278,7 @@ }, "npc_17": { "texts": [" < Welcome to Agrawos!", - " < Check out the MowCow-Burger restaurant, they have the best beef!", + " < Check out the Mowcow-Burger restaurant, they have the best beef!", " < If you want a challenge check out the Pokete-Arena, they have some quite heavy Poketes there!"], "fn": None, "map": "playmap_39", @@ -286,7 +286,7 @@ "y": 5 }, "npc_18": { - "texts": [" < This is the Pokete Arena of Agrawos, only go there if you're sure you can beat the challenge.", + "texts": [" < This is the Pokete Arena of Agrawos; only go there if you're sure you can beat the challenge.", " < They got some very heavy Poketes in there!"], "fn": None, "map": "playmap_39", @@ -317,7 +317,7 @@ "y": 3 }, "npc_22": { - "texts": [" < Oh man, if only I had a big and tasty MowCow-Burger...!"], + "texts": [" < Oh man, if only I had a big and tasty Mowcow-Burger...!"], "fn": None, "map": "playmap_42", "x": 22, @@ -334,9 +334,9 @@ }, "npc_24": { "texts": [" < I'm the mayor of Agrawos, the greatest city around.", - " < Check out the MowCow-Burger restaurant, which offers the best MowCow-Burgers and take a look at " + " < Check out the Mowcow-Burger restaurant; they have the best Mowcow-Burgers! And take a look at " "the Pokete-Arena.", - " < And as a special tip, take a look at the temple of the Wheeto."], + " < Here's a special tip: take a look at the temple of the Wheeto."], "fn": None, "map": "playmap_45", "x": 9, @@ -350,9 +350,9 @@ "y": 33 }, "npc_26": { - "texts": [" < H-h-hello young trainer", - " < I've lived a loong live, b-but now it's time to go.", - " < And I'm trying to scatter all my belongings all over the world.", + "texts": [" < H-h-hello young trainer.", + " < I've lived a looong life, b-but now it's time to go.", + " < I'm trying to scatter all my belongings all over the world.", " < Since you're a Pokete trainer, you may have use for this healing potion!"], "fn": "playmap_47_npc_26", "map": "playmap_47", @@ -360,11 +360,11 @@ "y": 4 }, "npc_27": { - "texts": [" < Hello young pall", - " < This city has been the center for plant Poketes for generations.", - " < I posses one of the oldest and most powerful attack aver known to Poketes.", - " < 'The old roots hit', the most powerful of the powerful.", - " < Sadly all Poketes having this attack have been extinct for years.", + "texts": [" < Hello, young pal!", + " < This city has been the home of plant Poketes for generations.", + " < I posses one of the oldest and most powerful attacks aver known to Poketes.", + " < 'The Old Roots Hit', the most powerful of the powerful.", + " < Sadly, all Poketes with this attack have been extinct for years.", " < The only thing that remained from them is this Learning Disc.", " < Do you want to have it?"], "fn": "playmap_48_npc_27", From a899ed044a1f6e1e32050389617e2f9cf956293c Mon Sep 17 00:00:00 2001 From: Kelly Roberts <105584129+bubstance@users.noreply.github.com> Date: Fri, 10 Jun 2022 07:53:12 -0700 Subject: [PATCH 04/19] Edited grammar and spelling --- pokete_data/attacks.py | 148 ++++++++++++++++++++--------------------- 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/pokete_data/attacks.py b/pokete_data/attacks.py index 8492520f..3f495253 100644 --- a/pokete_data/attacks.py +++ b/pokete_data/attacks.py @@ -22,7 +22,7 @@ "move": ["downgrade"], "miss_chance": 0, "min_lvl": 0, - "desc": "So loud, it confuses the enemy.", + "desc": "So loud that it confuses the enemy.", "types": ["normal"], "effect": None, "is_generic": False, @@ -43,7 +43,7 @@ "ap": 30, }, "power_bite": { - "name": "Power bite", + "name": "Power Bite", "factor": 8, "action": None, "world_action": "", @@ -71,21 +71,21 @@ "ap": 15, }, "tail_wipe": { - "name": "Tail wipe", + "name": "Tail Swipe", "factor": 2.5, "action": None, "world_action": "", "move": ["attack"], "miss_chance": 0.5, "min_lvl": 10, - "desc": "Wipes through the enemy's face.", + "desc": "Swipes through the enemy's face.", "types": ["normal"], "effect": None, "is_generic": False, "ap": 10, }, "meat_skewer": { - "name": "Meat skewer", + "name": "Meat Skewer", "factor": 3.5, "action": None, "world_action": "", @@ -113,7 +113,7 @@ "ap": 15, }, "supercow_power": { - "name": "Supercow power", + "name": "Supercow Power", "factor": 0, "action": "self.atc += 1", "world_action": "", @@ -128,7 +128,7 @@ }, # poison attacks "poison_bite": { - "name": "Poison bite", + "name": "Poison Bite", "factor": 1, "action": None, "world_action": "", @@ -142,7 +142,7 @@ "ap": 10, }, "poison_thorn": { - "name": "Poison thorn", + "name": "Poison Thorn", "factor": 2.75, "action": None, "world_action": "", @@ -157,21 +157,21 @@ }, # stone attacks "pepple_fire": { - "name": "Pepple fire", + "name": "Pebble Fire", "factor": 1, "action": "cry", "world_action": "", "move": ["attack", "downgrade"], "miss_chance": 0, "min_lvl": 0, - "desc": "Fires pepples at the enemy and makes it blind.", + "desc": "Fires pebbles at the enemy and makes it blind.", "types": ["stone"], "effect": None, "is_generic": True, "ap": 5, }, "sand_throw": { - "name": "Sand throw", + "name": "Sand Throw", "factor": 1, "action": "cry", "world_action": "", @@ -185,7 +185,7 @@ "ap": 5, }, "politure": { - "name": "Politure", + "name": "Polish", "factor": 0, "action": "politure", "world_action": "", @@ -199,42 +199,42 @@ "ap": 15, }, "brick_throw": { - "name": "Brick throw", + "name": "Brick Throw", "factor": 2, "action": None, "world_action": "", "move": ["throw"], "miss_chance": 0.3, "min_lvl": 15, - "desc": "Throws an euler brick at the enemy.", + "desc": "Throws an Euler brick at the enemy.", "types": ["stone"], "effect": None, "is_generic": True, "ap": 20, }, "rock_smash": { - "name": "Rock smash", + "name": "Rock Smash", "factor": 5, "action": None, "world_action": "", "move": ["pound"], "miss_chance": 0.1, "min_lvl": 15, - "desc": "Pounds the enemy with the Poketes full weight.", + "desc": "Pounds the enemy with the Pokete's full weight.", "types": ["stone"], "effect": None, "is_generic": True, "ap": 5, }, "dia_stab": { - "name": "Dia stab", + "name": "Dia Stab", "factor": 5, "action": None, "world_action": "", "move": ["attack"], "miss_chance": 0.1, "min_lvl": 15, - "desc": "Stabs the enemy with an giant diamond spike.", + "desc": "Stabs the enemy with a giant diamond spike.", "types": ["stone"], "effect": None, "is_generic": False, @@ -270,21 +270,21 @@ }, # ground attacks "earch_quake": { - "name": "Earch quake", + "name": "Earthquake", "factor": 4, "action": None, "world_action": "", "move": ["pound"], "miss_chance": 0, "min_lvl": 0, - "desc": "Brings the earth to shift.", + "desc": "Moves the ground with tremendous force.", "types": ["ground"], "effect": None, "is_generic": True, "ap": 10, }, "power_roll": { - "name": "Power roll", + "name": "Power Roll", "factor": 2.5, "action": None, "world_action": "", @@ -305,14 +305,14 @@ "move": ["attack"], "miss_chance": 0.3, "min_lvl": 0, - "desc": "Breaks the enemys toes.", + "desc": "Breaks the enemy's toes.", "types": ["ground"], "effect": None, "is_generic": True, "ap": 20, }, "ground_hit": { - "name": "Ground hit", + "name": "Ground Hit", "factor": 3, "action": None, "world_action": "", @@ -326,14 +326,14 @@ "ap": 10, }, "dick_energy": { - "name": "Dick energy", + "name": "Dick Energy", "factor": 0, "action": "dick_energy", "world_action": "", "move": ["shine"], "miss_chance": 0, "min_lvl": 0, - "desc": "Collects a great amount of energy in the Poketes tip.", + "desc": "Collects a great amount of energy in the Pokete's tip.", "types": ["ground"], "effect": None, "is_generic": False, @@ -356,7 +356,7 @@ # Fire attacks "fire_bite": { - "name": "Fire bite", + "name": "Fire Bite", "factor": 2, "action": None, "world_action": "", @@ -370,7 +370,7 @@ "ap": 15, }, "ash_throw": { - "name": "Ash throw", + "name": "Ash Throw", "factor": 0.5, "action": "cry", "world_action": "", @@ -384,14 +384,14 @@ "ap": 15, }, "flame_throw": { - "name": "Flame throw", + "name": "Flame Throw", "factor": 2.5, "action": None, "world_action": "", "move": ["attack"], "miss_chance": 0, "min_lvl": 15, - "desc": "Hans get ze Flammenwerfer!", + "desc": "Hans! Get ze Flammenwerfer!", "types": ["fire"], "effect": "burning", "is_generic": True, @@ -399,7 +399,7 @@ }, "fire_ball": { - "name": "Fire ball", + "name": "Fire Ball", "factor": 4, "action": None, "world_action": "", @@ -421,50 +421,50 @@ "move": ["attack"], "miss_chance": 0.1, "min_lvl": 0, - "desc": "Gives the Pokete the abbility to fly you around.", + "desc": "Gives the Pokete the ability to fly you around.", "types": ["flying"], "effect": None, "is_generic": False, "ap": 30, }, "pick": { - "name": "Pick", + "name": "Peck", "factor": 1.7, "action": None, "world_action": "", "move": ["attack"], "miss_chance": 0.1, "min_lvl": 0, - "desc": "A pick at the enemy's weakest spot.", + "desc": "A peck at the enemy's weakest spot.", "types": ["flying", "bird"], "effect": None, "is_generic": True, "ap": 30, }, "wind_blow": { - "name": "Wind blow", + "name": "Wind Blow", "factor": 2, "action": None, "world_action": "", "move": ["attack"], "miss_chance": 0, "min_lvl": 0, - "desc": "Casts a wind blow at the enemy.", + "desc": "Casts a gust of wind at the enemy.", "types": ["flying"], "effect": None, "is_generic": True, "ap": 20, }, "storm_gust": { - "name": "Storm gust", + "name": "Storm Gale", "factor": 6, "action": None, "world_action": "", "move": ["attack"], "miss_chance": 0, "min_lvl": 0, - "desc": "Casts a strong and fast storm gust full of rain and hail that hits the enemy at it's weakest spots " - "and makes it wanting to die.", + "desc": "Casts a vicious and violent storm full of rain and hail that hits the enemy in its weakest spots " + "and makes it want to die.", "types": ["flying"], "effect": None, "is_generic": True, @@ -485,21 +485,21 @@ "ap": 30, }, "eye_pick": { - "name": "Eye pick", + "name": "Eye Pick", "factor": 2.5, "action": "eye_pick", "world_action": "", "move": ["attack", "downgrade"], "miss_chance": 0.6, "min_lvl": 0, - "desc": "Picks out one of the enemy's eyes.", + "desc": "Pecks out one of the enemy's eyes.", "types": ["flying", "bird"], "effect": None, "is_generic": True, "ap": 10, }, "wing_hit": { - "name": "Wing hit", + "name": "Wing Hit", "factor": 2.5, "action": None, "world_action": "", @@ -527,14 +527,14 @@ "ap": 10, }, "power_pick": { - "name": "Power pick", + "name": "Power Peck", "factor": 2, "action": None, "world_action": "", "move": ["attack"], "miss_chance": 0.4, "min_lvl": 0, - "desc": "A harsh picking on the enemy's head.", + "desc": "A harsh pecking on the enemy's head.", "types": ["flying", "bird"], "effect": None, "is_generic": True, @@ -542,7 +542,7 @@ }, # water attacks "bubble_gun": { - "name": "Bubble gun", + "name": "Bubble Gun", "factor": 2, "action": None, "world_action": "", @@ -556,7 +556,7 @@ "ap": 20, }, "bubble_bomb": { - "name": "Bubble bomb", + "name": "Bubble Bomb", "factor": 6, "action": "cry", "world_action": "", @@ -570,7 +570,7 @@ "ap": 10, }, "bubble_shield": { - "name": "Bubble shield", + "name": "Bubble Shield", "factor": 0, "action": "hiding", "world_action": "", @@ -584,28 +584,28 @@ "ap": 10, }, "wet_slap": { - "name": "Wet slap", + "name": "Wet Slap", "factor": 2.5, "action": None, "world_action": "", "move": ["attack"], "miss_chance": 0.1, "min_lvl": 10, - "desc": "Gives the enemy a wet and cold slap in the face.", + "desc": "Gives the enemy a cold and wet slap in the face.", "types": ["water"], "effect": None, "is_generic": True, "ap": 15, }, "shell_pinch": { - "name": "Shell pinch", + "name": "Shell Pinch", "factor": 2.5, "action": None, "world_action": "", "move": ["attack"], "miss_chance": 0.1, "min_lvl": 15, - "desc": "Pinches the enemy with its strong shells.", + "desc": "Pinches the enemy with its strong shell.", "types": ["water"], "effect": None, "is_generic": False, @@ -613,14 +613,14 @@ }, # undead attacks "heart_touch": { - "name": "Heart touch", + "name": "Heart Touch", "factor": 4, "action": "heart_touch", "world_action": "", "move": ["attack", "downgrade"], "miss_chance": 0, "min_lvl": 20, - "desc": "Touches the enemy's heard with its' cold ghost claws.", + "desc": "Touches the enemy's heart with cold ghost claws.", "types": ["undead"], "effect": None, "is_generic": True, @@ -641,7 +641,7 @@ "ap": 40, }, "mind_blow": { - "name": "Mind blow", + "name": "Mind Blow", "factor": 0, "action": None, "world_action": "", @@ -684,14 +684,14 @@ "ap": 15, }, "mega_arch": { - "name": "Mega arch", + "name": "Mega Arch", "factor": 5, "action": None, "world_action": "", "move": ["arch"], "miss_chance": 0, "min_lvl": 15, - "desc": "Gives the enemy heavy a shock.", + "desc": "Gives the enemy a massive shock.", "types": ["electro"], "effect": "paralyzation", "is_generic": True, @@ -699,7 +699,7 @@ }, # plant attacks "special_smell": { - "name": "Special smell", + "name": "Special Smell", "factor": 0, "action": None, "world_action": "", @@ -713,28 +713,28 @@ "ap": 10, }, "apple_drop": { - "name": "Apple drop", + "name": "Apple Drop", "factor": 1.7, "action": None, "world_action": "", "move": ["attack"], "miss_chance": 0.3, "min_lvl": 0, - "desc": "Lets an apple drop on the enemy's head.", + "desc": "Makes an apple drop on the enemy's head.", "types": ["plant"], "effect": None, "is_generic": False, "ap": 30, }, "super_sucker": { - "name": "Super sucker", + "name": "Super Sucker", "factor": 0, "action": "super_sucker", "world_action": "", "move": ["downgrade", "shine"], "miss_chance": 0, "min_lvl": 0, - "desc": "Sucks 2 HP from the enemy and adds it to it's own.", + "desc": "Sucks 2 HP from the enemy and adds to its own.", "types": ["plant"], "effect": None, "is_generic": False, @@ -748,14 +748,14 @@ "move": ["downgrade", "shine"], "miss_chance": 0, "min_lvl": 0, - "desc": "Sucks 1 HP from the enemy and adds it to it's own.", + "desc": "Sucks 1 HP from the enemy and adds to its own.", "types": ["plant"], "effect": None, "is_generic": False, "ap": 20, }, "root_strangler": { - "name": "Root strangler", + "name": "Root Strangler", "factor": 1, "action": None, "world_action": "", @@ -769,7 +769,7 @@ "ap": 15, }, "root_slap": { - "name": "Root slap", + "name": "Root Slap", "factor": 1.5, "action": None, "world_action": "", @@ -783,49 +783,49 @@ "ap": 30, }, "the_old_roots_hit": { - "name": "The old roots hit", + "name": "The Old Roots Hit", "factor": 50, "action": None, "world_action": "", "move": ["shine", "shine", "attack"], "miss_chance": 0, "min_lvl": 0, - "desc": "An ancient attack that summons the deepest and oldest roots from old times, laying deep in the grounds, to defeat the enemy.", + "desc": "An ancient attack that summons the deepest and oldest roots from deep in the earth to defeat the enemy.", "types": ["plant"], "effect": None, "is_generic": False, "ap": 1, }, "leaf_storm": { - "name": "Leaf storm", + "name": "Leaf Storm", "factor": 5, "action": None, "world_action": "", "move": ["attack"], "miss_chance": 0, "min_lvl": 20, - "desc": "Blasts a bunch of spiky leafs at the enemy.", + "desc": "Blasts a bunch of spiky leaves at the enemy.", "types": ["plant"], "effect": None, "is_generic": True, "ap": 10, }, "bark_hardening": { - "name": "Bark hardening", + "name": "Bark Hardening", "factor": 0, "action": "bark_hardening", "world_action": "", "move": ["shine"], "miss_chance": 0, "min_lvl": 0, - "desc": "Hardens the bark to protect it better.", + "desc": "Hardens its outer layers to protect itself.", "types": ["plant"], "effect": None, "is_generic": True, "ap": 15, }, "poison_spores": { - "name": "Poison spores", + "name": "Poison Spores", "factor": 0, "action": None, "world_action": "", @@ -839,7 +839,7 @@ "ap": 15, }, "branch_stab": { - "name": "Branch stab", + "name": "Branch Stab", "factor": 4, "action": "cry", "world_action": "", @@ -868,7 +868,7 @@ "ap": 10, }, "snow_storm": { - "name": "Snow storm", + "name": "Snow Storm", "factor": 2.5, "action": None, "world_action": "", @@ -882,7 +882,7 @@ "ap": 20, }, "sword_of_ice": { - "name": "Sword of ice", + "name": "Sword of Ice", "factor": 5, "action": None, "world_action": "", @@ -903,7 +903,7 @@ "move": ["attack"], "miss_chance": 0, "min_lvl": 0, - "desc": "Stabs the enemy with an some ice spikes.", + "desc": "Stabs the enemy with some small ice spikes.", "types": ["ice"], "effect": None, "is_generic": True, From a59e47125e039c9ffb966d747a05574b8f2e93c5 Mon Sep 17 00:00:00 2001 From: Kelly Roberts <105584129+bubstance@users.noreply.github.com> Date: Fri, 10 Jun 2022 07:56:04 -0700 Subject: [PATCH 05/19] Update npcs.py --- pokete_data/npcs.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pokete_data/npcs.py b/pokete_data/npcs.py index 48c49781..878ecf3b 100644 --- a/pokete_data/npcs.py +++ b/pokete_data/npcs.py @@ -85,7 +85,7 @@ "y": 7 }, "npc_9": { - "texts": [" < British devs be like:", " < It's a constructor, __innit__?"], + "texts": [" < British devs be like:", " < It's a constructor, __init__?"], "fn": None, "map": "playmap_24", "x": 14, @@ -129,7 +129,7 @@ }, "lxgr": { "texts": [" < Hello fellow traveler, my name is lxgr and I created this game. ", - " < You may be asking yourself: 'Lxgr, what are you doing in this game?', and the answer is: 'Standing " + " < You may be asking yourself: 'Lxgr, what are you doing in this game?', and the answer is: 'standing " "around'.", " < I added this NPC because I'm stuck on a train somewere between Hamburg and Rostock, " "and I'm bored.", @@ -279,7 +279,7 @@ "npc_17": { "texts": [" < Welcome to Agrawos!", " < Check out the Mowcow-Burger restaurant, they have the best beef!", - " < If you want a challenge check out the Pokete-Arena, they have some quite heavy Poketes there!"], + " < If you want a challenge, check out the Pokete-Arena; they have some quite heavy Poketes there!"], "fn": None, "map": "playmap_39", "x": 102, @@ -335,7 +335,7 @@ "npc_24": { "texts": [" < I'm the mayor of Agrawos, the greatest city around.", " < Check out the Mowcow-Burger restaurant; they have the best Mowcow-Burgers! And take a look at " - "the Pokete-Arena.", + "the Pokete-Arena!", " < Here's a special tip: take a look at the temple of the Wheeto."], "fn": None, "map": "playmap_45", From c496b3b5835ac4f5d84dae3ab0c5b23624855800 Mon Sep 17 00:00:00 2001 From: Kelly Roberts <105584129+bubstance@users.noreply.github.com> Date: Fri, 10 Jun 2022 07:57:24 -0700 Subject: [PATCH 06/19] Edited grammar and spelling --- pokete_data/npcs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pokete_data/npcs.py b/pokete_data/npcs.py index 878ecf3b..cd813886 100644 --- a/pokete_data/npcs.py +++ b/pokete_data/npcs.py @@ -373,7 +373,7 @@ "y": 4 }, "npc_28": { - "texts": [" < Want a treat?", " < With those treats you can level up one of your Poketes by a level!"], + "texts": [" < Would you like a treat?", " < With those treats you can level up one of your Poketes by a level!"], "fn": "playmap_49_npc_28", "map": "playmap_49", "x": 15, From c1f2bc5aa68cdb86c40854375d871d9ff7e76b0b Mon Sep 17 00:00:00 2001 From: Kelly Roberts <105584129+bubstance@users.noreply.github.com> Date: Fri, 10 Jun 2022 08:06:38 -0700 Subject: [PATCH 07/19] Edited grammar and spelling of some strings --- pokete.py | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/pokete.py b/pokete.py index 8a613fe0..697e82e3 100755 --- a/pokete.py +++ b/pokete.py @@ -80,13 +80,13 @@ def playmap_17_boy(npc): " < I've never seen one before!", " < Here you go, 200$"]) if ask_bool(mvp.movemap, - "Young boy gifted you 200$. Do you want to accept it?"): + "Young boy gifted you $200. Do you want to accept it?"): figure.add_money(200) npc.set_used() else: - npc.text([" < In this region lives the würgos Pokete.", + npc.text([" < In this region lives the Würgos Pokete.", f" < At level {p_data.pokes['würgos']['evolve_lvl']} \ -it evolves to Choka.", +It evolves into Choka.", " < I have never seen one before!"]) @staticmethod @@ -109,7 +109,7 @@ def playmap_50_npc_29(npc): npc.text([" < Here you can leave one of your Poketes for some time \ and we will train it."]) if ask_bool(mvp.movemap, "Do you want to put a Pokete into the \ -Pokete-Care"): +Pokete-Care?"): if (index := deck.deck(6, "Your deck", True)) is not None: pokete_care.poke = figure.pokes[index] pokete_care.entry = timer.time.time @@ -135,7 +135,7 @@ def playmap_50_npc_29(npc): def playmap_23_npc_8(npc): """Interaction with npc_8""" if ask_bool(mvp.movemap, - "The man gifted you 100$. Do you want to accept it?"): + "The man gifted you $100. Do you want to accept it?"): npc.set_used() figure.add_money(100) @@ -199,15 +199,15 @@ def playmap_42_npc_21(npc): if ask_bool(mvp.movemap, "Do you want to give your Mowcow to the cook?"): figure.pokes[figure.pokes.index(poke)] = Poke("__fallback__", 0) - npc.text([" < Here you go, 1000$"]) + npc.text([" < Here you go, $1000"]) if ask_bool(mvp.movemap, - "The cook gifted you 1000$. " + "The cook gifted you $1000. " "Do you want to accept it?"): figure.add_money(1000) npc.set_used() else: npc.text([" < Ohhh man...", " < All of our beef is empty...", - " < How are we going to serve the best MowCow-Burgers " + " < How are we going to serve the best Mowcow-Burgers " "without beef?", " < If only someone here could bring me a fitting " "Mowcow!?", @@ -317,7 +317,7 @@ def __init__(self, _he, _wi): self.trader = NPC("trader", [" < I'm a trader.", " < Here you can trade one of your Poketes for \ -another players' one."], +one from another trainer."], "swap_poke") # adding self.dor_back1.add(self, int(self.width / 2), 8) @@ -415,12 +415,12 @@ def set_money(self, money): """Sets the money to a certain value ARGS: money: New value""" - assert money >= 0, "money has to be positive" - logging.info("[Figure] Money set to %d$ from %d$", + assert money >= 0, "Money has to be positive." + logging.info("[Figure] Money set to $%d from $%d", money, self.__money) self.__money = money for cls in [inv, buy]: - cls.money_label.rechar(str(self.__money) + "$") + cls.money_label.rechar("$" + str(self.__money)) cls.box.set_ob(cls.money_label, cls.box.width - 2 - len(cls.money_label.text), 0) @@ -444,7 +444,7 @@ def add_poke(self, poke, idx=None): def give_item(self, item, amount=1): """Gives an item to the player""" - assert amount > 0, "Amounts have to be positive" + assert amount > 0, "Amounts have to be positive." if item not in self.inv: self.inv[item] = amount else: @@ -464,10 +464,10 @@ def remove_item(self, item, amount=1): ARGS: item: Generic item name amount: Amount of items beeing removed""" - assert amount > 0, "Amounts have to be positive" - assert item in self.inv, f"Item {item} is not in the inventory" + assert amount > 0, "Amounts have to be positive." + assert item in self.inv, f"Item {item} is not in the inventory." assert self.inv[item] - amount >= 0, f"There are not enought {item}s \ -in the inventory" +in the inventory." self.inv[item] -= amount logging.info("[Figure] %d %s(s) removed", amount, item) @@ -1047,12 +1047,12 @@ def intro(): "Welcome to Pokete!\nPlease choose your name!\n", "Name:", "", "Name", 17) mvp.movemap.name_label_rechar(figure.name) - mvp.movemap.text(4, 3, [" < Hello my child.", + mvp.movemap.text(4, 3, [" < Hello, my child.", " < You're now ten years old.", - " < And I think it's now time for you to travel \ + " < I think it's now time for you to travel \ the world and be a Pokete-trainer.", - " < Therefore I give you this powerfull 'Steini', \ -15 'Poketeballs' to catch Poketes and a " + " < Therefore, I give you this powerful 'Steini', \ +15 'Poketeballs' to catch Poketes, and a " "'Healing potion'.", " < You will be the best Pokete-Trainer in Nice \ town.", From b6d56dc4266ded41233060c73ff6d18bad3fff74 Mon Sep 17 00:00:00 2001 From: Kelly Roberts <105584129+bubstance@users.noreply.github.com> Date: Fri, 10 Jun 2022 08:29:37 -0700 Subject: [PATCH 08/19] Fixed some more things --- pokete.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pokete.py b/pokete.py index 697e82e3..55603044 100755 --- a/pokete.py +++ b/pokete.py @@ -78,7 +78,7 @@ def playmap_17_boy(npc): if "choka" in [i.identifier for i in figure.pokes[:6]]: npc.text([" < Oh, cool!", " < You have a Choka!", " < I've never seen one before!", - " < Here you go, 200$"]) + " < Here you go, have $200!"]) if ask_bool(mvp.movemap, "Young boy gifted you $200. Do you want to accept it?"): figure.add_money(200) @@ -191,15 +191,15 @@ def playmap_42_npc_21(npc): if i.lvl() >= 50 and i.identifier == "mowcow"] if len(poke_list) > 0: poke = poke_list[0] - npc.text([" < Oh great!", " < You're my saviour!", + npc.text([" < Oh great!", " < You're my hero!", f" < You brought me a level {poke.lvl()} Mowcow!", " < I'm thanking you!", - " < Now I can still serve the best MowCow-Burgers!", + " < Now I can still serve the best Mowcow-Burgers!", " < Can I have it?"]) if ask_bool(mvp.movemap, "Do you want to give your Mowcow to the cook?"): figure.pokes[figure.pokes.index(poke)] = Poke("__fallback__", 0) - npc.text([" < Here you go, $1000"]) + npc.text([" < Here you go, have $1000!"]) if ask_bool(mvp.movemap, "The cook gifted you $1000. " "Do you want to accept it?"): @@ -211,15 +211,15 @@ def playmap_42_npc_21(npc): "without beef?", " < If only someone here could bring me a fitting " "Mowcow!?", - " < But it has to be at least on level 50, to fit our " + " < But it has to be at least on level 50 to meet our " "high quality standards.", " < I will pay a good price!"]) @staticmethod def playmap_39_npc_25(npc): """Interaction with npc_25""" - if not NPC.get("Sebastian the leader").used: - npc.text([" < I can't let you go.", + if not NPC.get("Leader Sebastian").used: + npc.text([" < I can't let you go!", " < You first have to defeat our arena leader!"]) figure.set(figure.x + 1, figure.y) else: @@ -402,7 +402,7 @@ def set_args(self, _si): def add_money(self, money): """Adds money ARGS: - money: Amount of money beeing added""" + money: Amount of money being added""" self.set_money(self.__money + money) def get_money(self): @@ -748,7 +748,7 @@ def save(): def read_save(): - """Reads form savefile + """Reads from savefile RETURNS: session_info dict""" Path(HOME + SAVEPATH).mkdir(parents=True, exist_ok=True) @@ -1072,7 +1072,7 @@ def parse_obj(_map, name, obj, _dict): def gen_obs(): - """Genrates all objests on the maps""" + """Generates all objects on the maps""" map_data = p_data.map_data npcs = p_data.npcs trainers = p_data.trainers From 79d71bef2c970e328a827fd2ec6d4850148bea4d Mon Sep 17 00:00:00 2001 From: Kelly Roberts <105584129+bubstance@users.noreply.github.com> Date: Fri, 10 Jun 2022 16:54:13 +0000 Subject: [PATCH 09/19] Reverted changes to MowCow-Burger Reverted back to "MowCow-Burger" for restaurant name per request. --- pokete.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pokete.py b/pokete.py index 55603044..cf096aec 100755 --- a/pokete.py +++ b/pokete.py @@ -194,7 +194,7 @@ def playmap_42_npc_21(npc): npc.text([" < Oh great!", " < You're my hero!", f" < You brought me a level {poke.lvl()} Mowcow!", " < I'm thanking you!", - " < Now I can still serve the best Mowcow-Burgers!", + " < Now I can still serve the best MowCow-Burgers!", " < Can I have it?"]) if ask_bool(mvp.movemap, "Do you want to give your Mowcow to the cook?"): @@ -207,7 +207,7 @@ def playmap_42_npc_21(npc): npc.set_used() else: npc.text([" < Ohhh man...", " < All of our beef is empty...", - " < How are we going to serve the best Mowcow-Burgers " + " < How are we going to serve the best MowCow-Burgers " "without beef?", " < If only someone here could bring me a fitting " "Mowcow!?", From b3e1eb8da9a9ac231d05db0d93f033cbea576048 Mon Sep 17 00:00:00 2001 From: Kelly Roberts <105584129+bubstance@users.noreply.github.com> Date: Fri, 10 Jun 2022 17:12:23 +0000 Subject: [PATCH 10/19] Fixed another currency symbol order --- pokete.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pokete.py b/pokete.py index cf096aec..b8cf564b 100755 --- a/pokete.py +++ b/pokete.py @@ -490,7 +490,7 @@ def __init__(self, _map): self.map = _map self.box = ChooseBox(_map.height - 3, 35, "Inventory", "R:remove") self.box2 = Box(7, 21) - self.money_label = se.Text(f"{figure.get_money()}$") + self.money_label = se.Text(f"${figure.get_money()}") self.desc_label = se.Text(" ") # adding self.box.add_ob(self.money_label, From b76e8081fcdb019a9a01c733a667c58e217b4f6e Mon Sep 17 00:00:00 2001 From: Kelly Roberts <105584129+bubstance@users.noreply.github.com> Date: Fri, 10 Jun 2022 18:02:50 +0000 Subject: [PATCH 11/19] Fixed trainer currency symbol order Just another flipping of the currency symbol order, this time for the victory reward. --- pokete_classes/npcs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pokete_classes/npcs.py b/pokete_classes/npcs.py index a56a65ab..c360a01a 100644 --- a/pokete_classes/npcs.py +++ b/pokete_classes/npcs.py @@ -237,7 +237,7 @@ def action(self): self.poke, info={"type": "duel", "player": self}) self.text({True: self.lose_texts, - False: self.win_texts + [" < Here u go 20$"]} + False: self.win_texts + [" < Here's $20!"]} [winner == self.poke]) if winner != self.poke: self.fig.add_money(20) From 64388d578c203215b0adfb08e8688c7a02c33ae1 Mon Sep 17 00:00:00 2001 From: "Kelly G. Roberts" Date: Fri, 10 Jun 2022 12:14:45 -0700 Subject: [PATCH 12/19] Changed 'catched' to 'caught'. --- pokete_classes/fightmap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pokete_classes/fightmap.py b/pokete_classes/fightmap.py index adb3b8d5..d8dc95c0 100644 --- a/pokete_classes/fightmap.py +++ b/pokete_classes/fightmap.py @@ -438,7 +438,7 @@ def throw(self, obj, enem, info, chance, name): * chance + catch_chance, enem.full_hp], k=1)[0]: self.fig.add_poke(enem) - fightmap.outp.outp(f"You catched {enem.name}") + fightmap.outp.outp(f"You caught {enem.name}!") time.sleep(2) fightmap.pball.remove() fightmap.clean_up(obj, enem) From 3d900d91f735ceef8fba030467367ad1b8f030f0 Mon Sep 17 00:00:00 2001 From: "Kelly G. Roberts" Date: Fri, 10 Jun 2022 12:30:15 -0700 Subject: [PATCH 13/19] More grammar fixes --- pokete_classes/dex.py | 2 +- pokete_classes/general.py | 2 +- pokete_classes/nature.py | 4 ++-- pokete_classes/poke.py | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pokete_classes/dex.py b/pokete_classes/dex.py index d89c5cb2..e66a5724 100644 --- a/pokete_classes/dex.py +++ b/pokete_classes/dex.py @@ -53,7 +53,7 @@ def detail(self, poke): None: ("Always", "") }[poke.night_active] desc_text = liner(poke.desc.text.replace("\n", " ") + - (f"""\n\n Evolves to { + (f"""\n\n Evolves into { p_data.pokes[poke.evolve_poke]['name'] if poke.evolve_poke in self.figure.caught_pokes else '???' diff --git a/pokete_classes/general.py b/pokete_classes/general.py index a97d4178..f4348296 100644 --- a/pokete_classes/general.py +++ b/pokete_classes/general.py @@ -15,7 +15,7 @@ def check_walk_back(figure, self=None): heal(figure) ask_ok(mvp.movemap, f"""All your Poketes have died and you ran back to the last Pokecenter you visited, to heal them! -On the way there {amount}$ fell out of your pocket!""") +On the way there ${amount} fell out of your pocket!""") figure.remove() figure.map = figure.last_center_map logging.info("[Figure] Lost all Poketes and ran away") diff --git a/pokete_classes/nature.py b/pokete_classes/nature.py index 49cb6bbe..8a5d6926 100644 --- a/pokete_classes/nature.py +++ b/pokete_classes/nature.py @@ -91,8 +91,8 @@ def __init__(self, p_n): + se.Text(p_n.nature.name, esccode=Color.thicc + p_n.nature.esccode) \ + se.Text(liner(f"\n\n That means it has {atc} attack, \ -{defense} defense and {init} initiative points more than normal Poketes \ -of its' kind.", 40, pre="")) +{defense} defense and {init} initiative points compared to normal Poketes \ +of its kind.", 40, pre="")) super().__init__(text, name="Nature", info="q:close") @staticmethod diff --git a/pokete_classes/poke.py b/pokete_classes/poke.py index e13d9039..7c8c0b30 100644 --- a/pokete_classes/poke.py +++ b/pokete_classes/poke.py @@ -214,7 +214,7 @@ def attack(self, attack, enem, fightmap): f'{self.ext_name} used {attack.name}! {eff_text}') if enem == self: time.sleep(1) - fightmap.outp.outp(f'{self.ext_name} hurt it self!') + fightmap.outp.outp(f'{self.ext_name} hurt itself!') if n_hp != 0 or attack.factor == 0: attack.give_effect(enem) for obj in [enem, self] if enem != self else [enem]: @@ -261,7 +261,7 @@ def evolve(self, figure, _map): evomap.show() time.sleep(0.01) new.moves.shine() - evomap.outp.outp(f"{self.name} evolved to {new.name}!") + evomap.outp.outp(f"{self.name} evolved into {new.name}!") time.sleep(5) for i in range(max(len(p_data.pokes[new.identifier]["attacks"]) - len(self.attack_obs), 0)): @@ -269,7 +269,7 @@ def evolve(self, figure, _map): figure.pokes[figure.pokes.index(self)] = new if new.identifier not in figure.caught_pokes: figure.caught_pokes.append(new.identifier) - logging.info("[Poke] %s evolved to %s", self.name, new.name) + logging.info("[Poke] %s evolved into %s", self.name, new.name) del self return True From 10f94483a382d80bc999616ed5ced94f74b00c93 Mon Sep 17 00:00:00 2001 From: bubstance Date: Fri, 10 Jun 2022 20:28:47 +0000 Subject: [PATCH 14/19] More grammar touch-ups --- pokete.py | 2 +- pokete_data/npcs.py | 12 ++++++------ pokete_data/trainers.py | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pokete.py b/pokete.py index b8cf564b..4fa7db20 100755 --- a/pokete.py +++ b/pokete.py @@ -80,7 +80,7 @@ def playmap_17_boy(npc): " < I've never seen one before!", " < Here you go, have $200!"]) if ask_bool(mvp.movemap, - "Young boy gifted you $200. Do you want to accept it?"): + "The young boy gifted you $200. Do you want to accept it?"): figure.add_money(200) npc.set_used() else: diff --git a/pokete_data/npcs.py b/pokete_data/npcs.py index cd813886..ffc7991a 100644 --- a/pokete_data/npcs.py +++ b/pokete_data/npcs.py @@ -121,14 +121,14 @@ " < But I can help you.", " < I can give you this Learning Disc.", " < You can use it to teach the 'Flying' attack to one of your flying Poketes so you can ride it to " "the next town.", - " < Isn't this great?"], + " < Isn't that great?"], "fn": "playmap_29_ld_man", "map": "playmap_29", "x": 13, "y": 4 }, "lxgr": { - "texts": [" < Hello fellow traveler, my name is lxgr and I created this game. ", + "texts": [" < Hello, fellow traveler. My name is lxgr and I created this game. ", " < You may be asking yourself: 'Lxgr, what are you doing in this game?', and the answer is: 'standing " "around'.", " < I added this NPC because I'm stuck on a train somewere between Hamburg and Rostock, " @@ -278,7 +278,7 @@ }, "npc_17": { "texts": [" < Welcome to Agrawos!", - " < Check out the Mowcow-Burger restaurant, they have the best beef!", + " < Check out the MowCow-Burger restaurant, they have the best beef!", " < If you want a challenge, check out the Pokete-Arena; they have some quite heavy Poketes there!"], "fn": None, "map": "playmap_39", @@ -301,7 +301,7 @@ "y": 65 }, "npc_20": { - "texts": [" < Hello yall, this town is soo famous for its' craaazy plants.", + "texts": [" < Hey y'all, this town is soo famous for its' craaazy plants.", " < Especially Wheeto, from which healing potions can be made.", " < Want one?"], "fn": "playmap_39_npc_20", @@ -317,7 +317,7 @@ "y": 3 }, "npc_22": { - "texts": [" < Oh man, if only I had a big and tasty Mowcow-Burger...!"], + "texts": [" < Oh man, if only I had a big and tasty MowCow-Burger...!"], "fn": None, "map": "playmap_42", "x": 22, @@ -334,7 +334,7 @@ }, "npc_24": { "texts": [" < I'm the mayor of Agrawos, the greatest city around.", - " < Check out the Mowcow-Burger restaurant; they have the best Mowcow-Burgers! And take a look at " + " < Check out the MowCow-Burger restaurant; they have the best MowCow-Burgers! Also take a look at " "the Pokete-Arena!", " < Here's a special tip: take a look at the temple of the Wheeto."], "fn": None, diff --git a/pokete_data/trainers.py b/pokete_data/trainers.py index 2aec88c3..cdf3931c 100644 --- a/pokete_data/trainers.py +++ b/pokete_data/trainers.py @@ -74,7 +74,7 @@ ], "playmap_11": [{ "poke": ("clampi", 450), - "args": ("Fishermans Friend", "He", + "args": ("Fisherman's Friend", "He", [" < G'day, young trainer", " < I've lived here for years"], [" < Those years of training were worth it"], [" < I haven't trained my Pokete in years!"], 42, 7) From 1e618f065b27647069243f6e72e6afaad3bc829c Mon Sep 17 00:00:00 2001 From: bubstance Date: Fri, 10 Jun 2022 20:45:00 +0000 Subject: [PATCH 15/19] Capitalized some place names --- pokete_data/maps.py | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pokete_data/maps.py b/pokete_data/maps.py index b0d9a4d0..14c54de8 100644 --- a/pokete_data/maps.py +++ b/pokete_data/maps.py @@ -22,7 +22,7 @@ "cave_1": { "height": 30, "width": 90, - "pretty_name": "Nice Town cave", + "pretty_name": "Nice Town Cave", "extra_actions": None, "poke_args": { "pokes": ["steini", "bato", "lilstone", "rato"], @@ -75,7 +75,7 @@ "playmap_5": { "height": 60, "width": 60, - "pretty_name": "Mysterious cave", + "pretty_name": "Mysterious Cave", "extra_actions": None, "poke_args": { "pokes": ["bato", "bator", "steini"], @@ -99,7 +99,7 @@ "playmap_7": { "height": 30, "width": 60, - "pretty_name": "Dark cave", + "pretty_name": "Dark Cave", "extra_actions": "playmap_7", "poke_args": { "pokes": ["steini", "bato", "lilstone", "rollator", "gobost"], @@ -111,7 +111,7 @@ "playmap_8": { "height": 20, "width": 80, - "pretty_name": "Abandoned village", + "pretty_name": "Abandoned Village", "extra_actions": None, "poke_args": { "pokes": ["gobost", "owol", "corcos_day", "corcos_night"], @@ -123,7 +123,7 @@ "playmap_9": { "height": 15, "width": 30, - "pretty_name": "Abandoned house", + "pretty_name": "Abandoned House", "extra_actions": None, "poke_args": { "pokes": ["gobost", "rato"], @@ -135,7 +135,7 @@ "playmap_10": { "height": 15, "width": 30, - "pretty_name": "Old house", + "pretty_name": "Old House", "extra_actions": None, "poke_args": None, "weather": None @@ -172,7 +172,7 @@ "playmap_13": { "height": 35, "width": 70, - "pretty_name": "Deepens forest", + "pretty_name": "Deepest Forest", "extra_actions": None, "poke_args": { "pokes": ["voglo", "vogli", "owol", "rato"], @@ -216,7 +216,7 @@ "playmap_17": { "height": 15, "width": 30, - "pretty_name": "Old house", + "pretty_name": "Old House", "extra_actions": None, "poke_args": None, "weather": None @@ -224,7 +224,7 @@ "playmap_18": { "height": 23, "width": 98, - "pretty_name": "Big mountain see", + "pretty_name": "Big Mountain Sea", "extra_actions": None, "poke_args": { "pokes": ["poundi", "rollator", "würgos", "rato"], @@ -241,7 +241,7 @@ "playmap_19": { "height": 30, "width": 60, - "pretty_name": "Big mountain cave", + "pretty_name": "Big Mountain Cave", "extra_actions": None, "poke_args": { "pokes": ["poundi", "steini", "lilstone", "bato"], @@ -298,7 +298,7 @@ "playmap_25": { "height": 15, "width": 30, - "pretty_name": "Townhall", + "pretty_name": "Town Hall", "extra_actions": None, "poke_args": None, "weather": None @@ -306,7 +306,7 @@ "playmap_26": { "height": 15, "width": 30, - "pretty_name": "Townhall", + "pretty_name": "Town Hall", "extra_actions": None, "poke_args": None, "weather": None @@ -314,7 +314,7 @@ "playmap_27": { "height": 15, "width": 40, - "pretty_name": "Battle cave", + "pretty_name": "Battle Cave", "extra_actions": None, "poke_args": None, "weather": None @@ -366,7 +366,7 @@ "playmap_33": { "height": 44, "width": 154, - "pretty_name": "Mowcow meadow", + "pretty_name": "Mowcow Meadow", "extra_actions": None, "poke_args": { "pokes": ["mowcow", "voglo", "bushy"], @@ -386,7 +386,7 @@ "playmap_35": { "height": 69, "width": 144, - "pretty_name": "The fields of Agrawos", + "pretty_name": "The Fields of Agrawos", "extra_actions": None, "poke_args": { "pokes": ["mowcow", "voglo", "lil_nut", "megapois"], @@ -459,7 +459,7 @@ "playmap_42": { "height": 15, "width": 60, - "pretty_name": "MowCow-Burger restaurant", + "pretty_name": "MowCow-Burger Restaurant", "extra_actions": None, "poke_args": None, "weather": None @@ -475,7 +475,7 @@ "playmap_44": { "height": 15, "width": 30, - "pretty_name": "Townhall", + "pretty_name": "Town Hall", "extra_actions": None, "poke_args": None, "weather": None @@ -483,7 +483,7 @@ "playmap_45": { "height": 15, "width": 30, - "pretty_name": "Townhall", + "pretty_name": "Town Hall", "extra_actions": None, "poke_args": None, "weather": None From 716ce02ede92f8d60aadd63cda46b8a0e0ddddac Mon Sep 17 00:00:00 2001 From: bubstance Date: Fri, 10 Jun 2022 20:49:59 +0000 Subject: [PATCH 16/19] More fixes --- pokete_data/trainers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pokete_data/trainers.py b/pokete_data/trainers.py index cdf3931c..c762a0a0 100644 --- a/pokete_data/trainers.py +++ b/pokete_data/trainers.py @@ -154,7 +154,7 @@ "args": ("Karen", "She", [" < I don't think you can walk here", " < I demand a fight with you!"], [" < Go home, little zoomer."], - [" < I want to talk to your manager."], 56, 11) + [" < I want to talk to your manager!"], 56, 11) }, ], "playmap_19": [{ From 7b45ea4542601e309e77a413e05ca37d8cfd9d26 Mon Sep 17 00:00:00 2001 From: bubstance <105584129+bubstance@users.noreply.github.com> Date: Fri, 10 Jun 2022 21:06:54 +0000 Subject: [PATCH 17/19] Even more fixes --- pokete_classes/general.py | 6 +++--- pokete_data/attacks.py | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pokete_classes/general.py b/pokete_classes/general.py index f4348296..e1d2d6be 100644 --- a/pokete_classes/general.py +++ b/pokete_classes/general.py @@ -14,11 +14,11 @@ def check_walk_back(figure, self=None): figure.add_money(-amount) heal(figure) ask_ok(mvp.movemap, f"""All your Poketes have died and you ran -back to the last Pokecenter you visited, to heal them! -On the way there ${amount} fell out of your pocket!""") +back to the last Pokecenter you visited to heal them! +On the way there, ${amount} fell out of your pocket!""") figure.remove() figure.map = figure.last_center_map - logging.info("[Figure] Lost all Poketes and ran away") + logging.info("[Figure] lost all Poketes and ran away!") DoorToCenter().action(figure) diff --git a/pokete_data/attacks.py b/pokete_data/attacks.py index 3f495253..86330ddc 100644 --- a/pokete_data/attacks.py +++ b/pokete_data/attacks.py @@ -36,7 +36,7 @@ "move": ["attack"], "miss_chance": 0.1, "min_lvl": 0, - "desc": "A hard bite the sharp teeth.", + "desc": "A hard bite with sharp teeth.", "types": ["normal"], "effect": None, "is_generic": False, @@ -149,7 +149,7 @@ "move": ["attack", "downgrade"], "miss_chance": 0.1, "min_lvl": 15, - "desc": "Stabs a venomous thorn in the enemy's flesh.", + "desc": "Stabs a venomous thorn into the enemy's flesh.", "types": ["poison"], "effect": "poison", "is_generic": False, @@ -262,7 +262,7 @@ "move": ["attack"], "miss_chance": 0, "min_lvl": 20, - "desc": "Throws a heck lot of diamond spikes at the enemy.", + "desc": "Throws a heck of a lot of diamond spikes at the enemy.", "types": ["stone"], "effect": None, "is_generic": False, @@ -463,7 +463,7 @@ "move": ["attack"], "miss_chance": 0, "min_lvl": 0, - "desc": "Casts a vicious and violent storm full of rain and hail that hits the enemy in its weakest spots " + "desc": "Casts a vicious and violent storm full of rain and hail, hitting the enemy in its weakest spots " "and makes it want to die.", "types": ["flying"], "effect": None, @@ -492,7 +492,7 @@ "move": ["attack", "downgrade"], "miss_chance": 0.6, "min_lvl": 0, - "desc": "Pecks out one of the enemy's eyes.", + "desc": "Pecks at one of the enemy's eyes.", "types": ["flying", "bird"], "effect": None, "is_generic": True, @@ -620,7 +620,7 @@ "move": ["attack", "downgrade"], "miss_chance": 0, "min_lvl": 20, - "desc": "Touches the enemy's heart with cold ghost claws.", + "desc": "Touches the enemy's heart with cold, ghostly claws.", "types": ["undead"], "effect": None, "is_generic": True, @@ -677,7 +677,7 @@ "move": ["shine"], "miss_chance": 0, "min_lvl": 10, - "desc": "Charges the Pokete.", + "desc": "Charges up the Pokete.", "types": ["electro"], "effect": None, "is_generic": True, @@ -706,7 +706,7 @@ "move": ["downgrade"], "miss_chance": 0, "min_lvl": 0, - "desc": "Spreads a special smell that will make the enemy confused and very happy.", + "desc": "Spreads a special smell that will make the enemy confused but very happy.", "types": ["plant"], "effect": "confusion", "is_generic": False, From bfdf5a74643ce5c4179b8f303c4c263a95ca3812 Mon Sep 17 00:00:00 2001 From: bubstance <105584129+bubstance@users.noreply.github.com> Date: Sat, 11 Jun 2022 21:10:18 +0000 Subject: [PATCH 18/19] Edited as per MaFeLP's suggestions --- pokete.py | 8 ++++---- pokete_classes/general.py | 2 +- pokete_data/attacks.py | 2 +- pokete_data/trainers.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pokete.py b/pokete.py index 4fa7db20..c73a9f04 100755 --- a/pokete.py +++ b/pokete.py @@ -444,7 +444,7 @@ def add_poke(self, poke, idx=None): def give_item(self, item, amount=1): """Gives an item to the player""" - assert amount > 0, "Amounts have to be positive." + assert amount > 0, "Amounts have to be positive!" if item not in self.inv: self.inv[item] = amount else: @@ -464,10 +464,10 @@ def remove_item(self, item, amount=1): ARGS: item: Generic item name amount: Amount of items beeing removed""" - assert amount > 0, "Amounts have to be positive." - assert item in self.inv, f"Item {item} is not in the inventory." + assert amount > 0, "Amounts have to be positive!" + assert item in self.inv, f"Item {item} is not in the inventory!" assert self.inv[item] - amount >= 0, f"There are not enought {item}s \ -in the inventory." +in the inventory!" self.inv[item] -= amount logging.info("[Figure] %d %s(s) removed", amount, item) diff --git a/pokete_classes/general.py b/pokete_classes/general.py index e1d2d6be..d3f1c5fd 100644 --- a/pokete_classes/general.py +++ b/pokete_classes/general.py @@ -18,7 +18,7 @@ def check_walk_back(figure, self=None): On the way there, ${amount} fell out of your pocket!""") figure.remove() figure.map = figure.last_center_map - logging.info("[Figure] lost all Poketes and ran away!") + logging.info("[Figure] You lost all Poketes and ran away!") DoorToCenter().action(figure) diff --git a/pokete_data/attacks.py b/pokete_data/attacks.py index 86330ddc..1e099247 100644 --- a/pokete_data/attacks.py +++ b/pokete_data/attacks.py @@ -485,7 +485,7 @@ "ap": 30, }, "eye_pick": { - "name": "Eye Pick", + "name": "Eye Peck", "factor": 2.5, "action": "eye_pick", "world_action": "", diff --git a/pokete_data/trainers.py b/pokete_data/trainers.py index c762a0a0..5a573733 100644 --- a/pokete_data/trainers.py +++ b/pokete_data/trainers.py @@ -260,7 +260,7 @@ }, { "poke": ("treenator", 1000), "args": ("Aurelia", "She", - [" < You wont be ready for myTtreenator!"], + [" < You wont be ready for my Treenator!"], [" < You're a loooser!"], [" < Our best trainer will defeat you though!"], 28, 6) }, From b7a2105acde0a7f408f8c56b823018f99beed72f Mon Sep 17 00:00:00 2001 From: bubstance <105584129+bubstance@users.noreply.github.com> Date: Sat, 11 Jun 2022 21:44:51 +0000 Subject: [PATCH 19/19] Edited some grammar and spelling --- HowToPlay.md | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/HowToPlay.md b/HowToPlay.md index 4a75e9e5..c2d91aad 100644 --- a/HowToPlay.md +++ b/HowToPlay.md @@ -19,9 +19,9 @@ ## Plot -The plot of the game is that you, a ten years old boy/girl/what ever, are running around in the world and does what ten years olds do: Catching little creatures (Poketes) and letting them fight against other little creatures. +The plot of the game is that you--a ten year old boy/girl/whatever--are running around in the world doing what ten years olds do: catching little creatures (Poketes) and letting them fight against other little creatures. -You are on a journey to explore the world and catch all Poketes. On this way you will meet many different NPCs that may or may not be nice to you. +You are on a journey to explore the world and catch all Poketes. Along the way you will meet many different NPCs that may or may not be nice to you. ## Controls After first starting the game you can move the character, the one little `a` on the screen using `w`, `a`, `s` and `d`. @@ -42,26 +42,26 @@ When going onto the green grass patch you may get attacked by a wild Pokete. ![Grass](assets/ss/ss10.png) -Now you have several options to do, you can attack and weaken the Pokete to catch it, run away or choose another Pokete. +Now you have several options to choose from, you can attack and weaken the Pokete to catch it, run away, or choose another Pokete. -To attack just press `1` and a little selection window opens where you can choose from your attacks. You can ether navigate the cursor to the attack you want to choose (using `w` and `s`) and then press `enter`, or you just type in the number before the attack name. +To attack, just press `1` and a little selection window opens where you can choose from your attacks. You can ether navigate the cursor to the attack you want to choose (using `w` and `s`) and then press `enter`, or you just type in the number before the attack name. -The Number behind the name are the AP (Attack Points) of the attack (The times you can use the attack, you have left). +The Number behind the name are the AP (Attack Points) of the attack (The number of times you can use the attack and the number of uses you have remaining). ![Attacking](assets/ss/ss11.png) -When you fight until the enemy Poketes' HP are low (like 1 to 3 HP) you can try to catch it. By pressing `3` you can open your inventory where you can choose from the items you have. By pressing `enter` you can use your chosen item. In case of trying to catch the enemy should select the Poketeball. +When you fight until the enemy Pokete's HP is low (like 1 to 3 HP), you can try to catch it. By pressing `3` you can open your inventory where you can choose from the items you have. By pressing `enter` you can use your chosen item. In the case of trying to catch the opposing Pokete, you should select the Poketeball. ![Catching](assets/ss/ss12.png) -Catching a Pokete may not be successful at the first try. +Catching a Pokete may not be successful on the first try. You can also kill the Pokete and gain XP for your Pokete. ## Trainers -Trainers are other ten years old Pokete trainers just like you that train Poketes. They are the other `a`s you may encounter on the map. They will talk to you and then start a fight, the only difference between a trainer fight and a normal fight is that you can not run away from a trainer fight and can not catch the enemys' Pokete. They will give you 20$ if you win. +Trainers are other ten years old Pokete trainers just like you. They are the other `a`s you may encounter on the map. They will talk to you and then start a fight; the only difference between a trainer fight and a normal fight is that you cannot run away from a trainer fight and cannot catch the enemys' Pokete. They will give you $20 if you win. ## Inventory -By Pressing `4` you can open your inventory where you can see all your items, their amounts and how much money you have. By selecting and item with the cursor and pressing `enter` you can see the items description. To exit just press `Esc` or `q`. +By Pressing `4` you can open your inventory. This is where you can see all of your items, their amounts, and how much money you have. By selecting an item with the cursor and pressing `enter` you can see the item's description. To exit, just press `Esc` or `q`. ![Inv](assets/ss/ss18.png) @@ -92,7 +92,7 @@ By going up to the person behind the counter you can interact with them. ![Shop](assets/ss/ss16.png) -To by an item just navigate the cursor to it and press `enter`, then it will be added to your inventory. To exit just press `Esc` or `q`. +To by an item just navigate the cursor to it and press `enter`. The item will then be added to your inventory. To exit just press `Esc` or `q`. ## Poketeballs Poketeballs are needed to catch Poketes. You can see how many Poketeballs you have in your Inventory, buy them in the [Pokete shop](#pokete-shops) and find them on the map. @@ -101,43 +101,43 @@ They are the small red balls hidden all over the map, and can be collected by ju ![Balls](assets/ss/ss17.png) ## Settings -I the games menu/settings you can change the players name, save, exit or change other settings. To exit just press `Esc` or `q`. +In the game's menu/settings you can change the players name, save, exit, or change other settings. To exit just press `Esc` or `q`. ![Settings](assets/ss/ss20.png) ## Trading -When your in the same network with another Pokete-player you can trade one of your Poketes with one of their. +When you're in the same network as another Pokete-player you can trade one of your Poketes for one of theirs. In the Pokete-center stands another NPC, the trader, who you can talk to and start the trade. ![trading](assets/ss/ss21.png) -One of the both players has to be the host and one not, the host has to start the trade first for it to work. +One of the two players must be the host while the other is the guest. The host has to start the trade first for it to work. ![trading](assets/ss/ss22.png) -When prompted the not host has to type in the hostname of the hosts' computer displayed on the hosts display. +When prompted, the guest must type in the hostname of the host's computer displayed on the host's display. You may run into problems with firewalls. ![trading](assets/ss/ss23.png) ## Shiny Poketes -Shiny Poketes are rare to find (chance 1/500) and have 2 points more of attac, defense and initiative and 5 HP more than normal. Their names are highlighted yellow. +Shiny Poketes are rare to find (chance 1/500) and have 2 points more of attack, defense, and initiative as well as 5 HP more than normal. Their names are highlighted yellow. ![shiny](assets/ss/ss24.png) ## Pokete-dex -The Pokete dex is made for the user to keep track of all Poketes they ever caught, with their stats. It does not list individual Poketes but instead the Pokete 'race' itself. Poketes your never caught are shown with a "???". +The Pokete dex is made for the user to keep track of all Poketes they ever caught along with their stats. It does not list individual Poketes, but instead the Pokete 'race' itself. Poketes your never caught are shown with a "???". It can be accessed by pressing 5 in the main game. ![dex](assets/ss/ss25.png) ## Learning Attacks -Every fifth level a Poketes tries to learn a new attack. If the number of attacks a Pokete has is already four the player will be prompted to choose which attack will be replaced by the new one, else it will just be added to the existing attacks. +Every fifth level, a Pokete will try to learn a new attack. If the number of attacks a Pokete has is already four, the player will be prompted to choose which attack will be replaced by the new one, otherwise it will just be added to the existing attacks. ![learning](assets/ss/ss26.png) ![learning](assets/ss/ss27.png) ## Learning-Discs -LDs are DVD like items you can find on the map, that can be used to teach a special attack to a Pokete. They can only be used once! +LDs are DVD-like items you can find on the map which can be used to teach a special attack to a Pokete. They can only be used once!