Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Edited grammar and spelling #130

Merged
merged 19 commits into from
Jun 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions HowToPlay.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand All @@ -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)

Expand Down Expand Up @@ -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.
Expand All @@ -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!
56 changes: 28 additions & 28 deletions pokete.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,15 @@ 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?"):
"The 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
Expand All @@ -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
Expand All @@ -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)

Expand Down Expand Up @@ -191,17 +191,17 @@ 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!",
" < 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$. "
"The cook gifted you $1000. "
"Do you want to accept it?"):
figure.add_money(1000)
npc.set_used()
Expand All @@ -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:
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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):
Expand All @@ -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))
bubstance marked this conversation as resolved.
Show resolved Hide resolved
cls.box.set_ob(cls.money_label,
cls.box.width - 2 - len(cls.money_label.text), 0)

Expand All @@ -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:
Expand All @@ -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)

Expand All @@ -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,
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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.",
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pokete_classes/dex.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 '???'
Expand Down
2 changes: 1 addition & 1 deletion pokete_classes/fightmap.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions pokete_classes/general.py
Original file line number Diff line number Diff line change
Expand Up @@ -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] You lost all Poketes and ran away!")
DoorToCenter().action(figure)


Expand Down
4 changes: 2 additions & 2 deletions pokete_classes/nature.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pokete_classes/npcs.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions pokete_classes/poke.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]:
Expand Down Expand Up @@ -261,15 +261,15 @@ 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)):
LearnAttack(new, evomap)()
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

Expand Down
Loading