Merge branch 'master' into map_generation

# Conflicts:
#	squirrelbattle/entities/player.py
#	squirrelbattle/game.py
#	squirrelbattle/interfaces.py
#	squirrelbattle/tests/game_test.py

squirrelbattle/entities/player.py

@@ -1,11 +1,13 @@
-# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse
+# Copyright (C) 2020-2021 by ÿnérant, eichhornchen, nicomarg, charlse
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+from math import log
 from random import randint
 from typing import Dict, Optional, Tuple
 
 from .items import Item
 from ..interfaces import FightingEntity, InventoryHolder
+from ..translations import gettext as _
 
 
 class Player(InventoryHolder, FightingEntity):
@@ -61,6 +63,31 @@ class Player(InventoryHolder, FightingEntity):
         self.recalculate_paths()
         self.map.compute_visibility(self.y, self.x, self.vision)
 
+    def dance(self) -> None:
+        """
+        Dancing has a certain probability or making ennemies unable
+        to fight for 3 turns. That probability depends on the player's
+        charisma.
+        """
+        diceroll = randint(1, 10)
+        found = False
+        if diceroll <= self.charisma:
+            for entity in self.map.entities:
+                if entity.is_fighting_entity() and not entity == self \
+                        and entity.distance(self) <= 3:
+                    found = True
+                    entity.confused = 1
+                    entity.effects.append(["confused", 1, 3])
+            if found:
+                self.map.logs.add_message(_(
+                    "It worked! Nearby ennemies will be confused for 3 turns."))
+            else:
+                self.map.logs.add_message(_(
+                    "It worked, but there is no one nearby..."))
+        else:
+            self.map.logs.add_message(
+                _("The dance was not effective..."))
+
     def level_up(self) -> None:
         """
         Add as many levels as possible to the player.
@@ -69,8 +96,18 @@ class Player(InventoryHolder, FightingEntity):
             self.level += 1
             self.current_xp -= self.max_xp
             self.max_xp = self.level * 10
+            self.maxhealth += int(2 * log(self.level) / log(2))
             self.health = self.maxhealth
             self.strength = self.strength + 1
+            if self.level % 3 == 0:
+                self.dexterity += 1
+                self.constitution += 1
+            if self.level % 4 == 0:
+                self.intelligence += 1
+            if self.level % 6 == 0:
+                self.charisma += 1
+            if self.level % 10 == 0 and self.critical < 95:
+                self.critical += (100 - self.charisma) // 30
 
     def add_xp(self, xp: int) -> None:
         """