Balancing and Fight restructuring #145

lxgr-linux · 2022-06-12T14:50:53Z

Add xp scaling when fighting against higher level Poketes
Add multiple Poketes to trainers
Add Fail chance to some attacks
Add second Poketes to some trainers
Fixes Both i.hp <= 0 #158

This needs play testing.

terminal

lxgr-linux · 2022-06-15T23:15:54Z

@daynetran

cognivore · 2022-06-15T23:18:10Z

How does miss chance scale as a function of defense? Or is it an intrinsic thing amplified by "cry"?

…nced

lxgr-linux · 2022-06-16T09:51:13Z

Ready for review.

lxgr-linux · 2022-06-16T09:53:04Z

How does miss chance scale as a function of defense? Or is it an intrinsic thing amplified by "cry"?

The chance of missing is influenced by the attacks and the Poketes miss chance. The Poketes misschance can be influenced by attacks like cry.

…nced

mustafaquraish · 2022-06-17T20:08:04Z

pokete_classes/fightmap.py

+            sorted(
+                zip(
+                    [i.curr.initiative for i in providers],
+                    [1, 0],
+                    providers
+                )
+            )[-1][-1]


max(providers, key=lambda i: i.curr.initiative)

mustafaquraish · 2022-06-17T20:09:58Z

pokete_classes/fightmap.py

+                )
+            )[-1][-1]
+        )
+        for i in [prov.curr for prov in providers]:


There's no need to create a copy of the list here, just do:

for prov in providers: i = prov.curr ...

mustafaquraish · 2022-06-17T20:14:33Z

pokete_classes/fightmap.py

+        _xp = sum(
+            [
+                poke.lose_xp + max(0, poke.lvl() - winner.curr.lvl())
+                for poke in loser.pokes
+            ]
+        ) * (2 if type(loser) is not NatureProvider else 1)


Remove the [] around the list comprehension, sum() can operator on generators AFAIK

mustafaquraish · 2022-06-17T20:19:36Z

pokete_classes/landscape.py

+                            random.choices(
+                                list(
+                                    range(
+                                        self.arg_proto["minlvl"],
+                                        self.arg_proto["maxlvl"]
+                                    )
+                                )
+                            )[0],


use random.choice(...)

mustafaquraish · 2022-06-17T20:20:31Z

pokete_classes/landscape.py

+                        Poke(
+                            random.choices(
+                                list(pokes),
+                                weights=[i["rarity"] for _, i in pokes.items()]


No point looping over .items() and then ignoring the key, you're wasting tuple constructions

weights=[i["rarity"] for i in pokes.values()]

mustafaquraish · 2022-06-17T20:21:03Z

pokete_classes/landscape.py

+                    NatureProvider(
+                        Poke(
+                            random.choices(
+                                list(pokes),


Does this need to be a list? Can random.choices() not handle any iterable?

It only takes a list.

mustafaquraish · 2022-06-17T20:23:12Z

pokete_classes/fightmap.py

+            for obj in [
+                prov.curr.text_name, prov.curr.text_lvl, prov.curr.text_hp,
+                prov.curr.ico, prov.curr.hp_bar, prov.curr.tril, prov.curr.trir,
+                prov.curr.pball_small
+            ]:


Make this a tuple instead

mustafaquraish · 2022-06-17T20:40:16Z

pokete_classes/providers.py

+    def index_conf(self):
+        """Sets index correctly"""
+        self.play_index = self.pokes.index(
+            [poke for poke in self.pokes if poke.hp > 0][0]


You can instead do:

self.play_index = next(i for i, poke in enumerate(self.pokes) if poke.hp > 0)

Co-authored-by: Mustafa Quraish <mustafaq9@gmail.com>

mustafaquraish · 2022-06-17T20:59:22Z

pokete_classes/fightmap.py

+            for prov in providers:
+                if prov.curr.hp <= 0:
+                    winner = providers[(providers.index(prov) + 1) % 2]


providers.index(prov) takes linear time, so is this what you really want? Can you not just use:

for i, prov in enumerate(providers): if prov.curr.hp <= 0: winner = providers[(i + 1) % 2]

mustafaquraish · 2022-06-17T21:01:00Z

pokete_classes/fightmap.py

-                    players, player = self.choose_poke(figure, players,
-                                                       player, enemy)
-                    if old_player == player:
+                loser = providers[(providers.index(winner) + 1) % 2]


You already knew the index in the block above, so why not just save that instead? That will save you having to re-look through the whole list to find the index for the object.

mustafaquraish · 2022-06-17T21:01:29Z

pokete_classes/fightmap.py

                        break
+                elif (
+                    type(loser) is Trainer


isinstance()

mustafaquraish · 2022-06-17T21:01:41Z

pokete_classes/fightmap.py

+        _xp = sum(
+            poke.lose_xp + max(0, poke.lvl() - winner.curr.lvl())
+            for poke in loser.pokes
+        ) * (2 if type(loser) is not NatureProvider else 1)


isinstance()

mustafaquraish · 2022-06-17T21:01:47Z

pokete_classes/fightmap.py

+            f"{winner.curr.ext_name} won!" +
+            (f'\nXP + {_xp}' if winner.curr.player else '')
+        )
+        if winner.curr.player and type(loser) is Trainer:


isinstance()

mustafaquraish · 2022-06-17T21:02:06Z

pokete_classes/fightmap.py

@@ -428,105 +439,83 @@ def throw(self, obj, enem, info, chance, name):
            2: The win the game
            None: To let the enemy attack"""

-        if obj.identifier == "__fallback__" or info["type"] == "duel":
+        if type(enem) is not NatureProvider:


not isinstance()

Co-authored-by: Mustafa Quraish <mustafaq9@gmail.com>

lxgr-linux added the enhancement New feature or request label Jun 12, 2022

lxgr-linux requested a review from MaFeLP June 12, 2022 14:50

lxgr-linux self-assigned this Jun 12, 2022

This was linked to issues Jun 12, 2022

A few ideas to make the game more balanced #133

Closed

Proper PvE system #146

Open

Added better xp scaling

9667837

lxgr-linux force-pushed the 133-a-few-ideas-to-make-the-game-more-balanced branch from 8f08047 to 9667837 Compare June 14, 2022 11:46

lxgr-linux added 5 commits June 14, 2022 15:28

made trainers support multiple poketes

69afa61

reformated fight and added context management to avoid not resetting the

975fcd7

terminal

added misschances to some attacks

e2d2f2f

added comments

23da02b

Added index_conf to ensure indexes are set properly

7fea8cc

lxgr-linux changed the title ~~Balancing~~ Balancing and Fight restructuring Jun 15, 2022

lxgr-linux added 2 commits June 16, 2022 10:28

Merge branch 'master' into 133-a-few-ideas-to-make-the-game-more-bala…

442747f

…nced

added more Pokete to some trainers

d740d69

Merge branch 'master' into 133-a-few-ideas-to-make-the-game-more-bala…

3791681

…nced

mustafaquraish reviewed Jun 17, 2022

View reviewed changes

Applied suggestions from codereview

396d174

Co-authored-by: Mustafa Quraish <mustafaq9@gmail.com>

mustafaquraish reviewed Jun 17, 2022

View reviewed changes

lxgr-linux and others added 2 commits June 17, 2022 23:16

Applied suggestions from codereview

1b6289b

Co-authored-by: Mustafa Quraish <mustafaq9@gmail.com>

Removed contextmanager in favour of final

3c3b5f5

Co-authored-by: Mustafa Quraish <mustafaq9@gmail.com>

mustafaquraish approved these changes Jun 17, 2022

View reviewed changes

lxgr-linux merged commit d02a06a into master Jun 17, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Balancing and Fight restructuring #145

Balancing and Fight restructuring #145

lxgr-linux commented Jun 12, 2022 •

edited

lxgr-linux commented Jun 15, 2022

cognivore commented Jun 15, 2022

lxgr-linux commented Jun 16, 2022

lxgr-linux commented Jun 16, 2022

mustafaquraish Jun 17, 2022

mustafaquraish Jun 17, 2022 •

edited

mustafaquraish Jun 17, 2022

mustafaquraish Jun 17, 2022

mustafaquraish Jun 17, 2022

mustafaquraish Jun 17, 2022

lxgr-linux Jun 17, 2022

mustafaquraish Jun 17, 2022

mustafaquraish Jun 17, 2022 •

edited

mustafaquraish Jun 17, 2022

mustafaquraish Jun 17, 2022

mustafaquraish Jun 17, 2022

mustafaquraish Jun 17, 2022

mustafaquraish Jun 17, 2022

mustafaquraish Jun 17, 2022

Balancing and Fight restructuring #145

Balancing and Fight restructuring #145

Conversation

lxgr-linux commented Jun 12, 2022 • edited

lxgr-linux commented Jun 15, 2022

cognivore commented Jun 15, 2022

lxgr-linux commented Jun 16, 2022

lxgr-linux commented Jun 16, 2022

Choose a reason for hiding this comment

mustafaquraish Jun 17, 2022 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mustafaquraish Jun 17, 2022 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lxgr-linux commented Jun 12, 2022 •

edited

mustafaquraish Jun 17, 2022 •

edited

mustafaquraish Jun 17, 2022 •

edited