Merge branch 'master' into 'equipment'

# Conflicts:
#   squirrelbattle/display/statsdisplay.py
#   squirrelbattle/entities/items.py
#   squirrelbattle/entities/player.py
#   squirrelbattle/interfaces.py
#   squirrelbattle/locale/de/LC_MESSAGES/squirrelbattle.po
#   squirrelbattle/locale/es/LC_MESSAGES/squirrelbattle.po
#   squirrelbattle/locale/fr/LC_MESSAGES/squirrelbattle.po
#   squirrelbattle/tests/game_test.py

squirrelbattle/locale/es/LC_MESSAGES/squirrelbattle.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: squirrelbattle 3.14.1\n"
 "Report-Msgid-Bugs-To: squirrel-battle@crans.org\n"
-"POT-Creation-Date: 2021-01-08 01:57+0100\n"
+"POT-Creation-Date: 2021-01-06 15:19+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -82,11 +82,21 @@ msgstr "La bomba está explotando."
 msgid "{player} exchanged its body with {entity}."
 msgstr "{player} intercambió su cuerpo con {entity}."
 
-#: squirrelbattle/game.py:228 squirrelbattle/tests/game_test.py:595
+#: squirrelbattle/game.py:182
+#, python-brace-format
+msgid "The player climbs down to the floor {floor}."
+msgstr ""
+
+#: squirrelbattle/game.py:195
+#, python-brace-format
+msgid "The player climbs up the floor {floor}."
+msgstr ""
+
+#: squirrelbattle/game.py:285 squirrelbattle/tests/game_test.py:592
 msgid "The buyer does not have enough money"
 msgstr "El comprador no tiene suficiente dinero"
 
-#: squirrelbattle/game.py:271
+#: squirrelbattle/game.py:328
 msgid ""
 "Some keys are missing in your save file.\n"
 "Your save seems to be corrupt. It got deleted."
@@ -94,7 +104,7 @@ msgstr ""
 "Algunas claves faltan en su archivo de guarda.\n"
 "Su guarda parece a ser corruptido. Fue eliminado."
 
-#: squirrelbattle/game.py:279
+#: squirrelbattle/game.py:336
 msgid ""
 "No player was found on this map!\n"
 "Maybe you died?"
@@ -102,7 +112,7 @@ msgstr ""
 "No jugador encontrado sobre la carta !\n"
 "¿ Quizas murió ?"
 
-#: squirrelbattle/game.py:299
+#: squirrelbattle/game.py:356
 msgid ""
 "The JSON file is not correct.\n"
 "Your save seems corrupted. It got deleted."
@@ -119,17 +129,17 @@ msgstr ""
 msgid "{name} hits {opponent}."
 msgstr "{name} golpea a {opponent}."
 
-#: squirrelbattle/interfaces.py:466
+#: squirrelbattle/interfaces.py:465
 #, python-brace-format
 msgid "{name} takes {damage} damage."
 msgstr ""
 
-#: squirrelbattle/interfaces.py:468
+#: squirrelbattle/interfaces.py:467
 #, python-brace-format
 msgid "{name} dies."
 msgstr "{name} se muere."
 
-#: squirrelbattle/interfaces.py:502
+#: squirrelbattle/interfaces.py:501
 #, python-brace-format
 msgid "{entity} said: {message}"
 msgstr "{entity} dijo : {message}"
@@ -138,8 +148,8 @@ msgstr "{entity} dijo : {message}"
 msgid "Back"
 msgstr "Volver"
 
-#: squirrelbattle/tests/game_test.py:361 squirrelbattle/tests/game_test.py:364
-#: squirrelbattle/tests/game_test.py:367 squirrelbattle/tests/game_test.py:370
+#: squirrelbattle/tests/game_test.py:358 squirrelbattle/tests/game_test.py:361
+#: squirrelbattle/tests/game_test.py:364 squirrelbattle/tests/game_test.py:367
 #: squirrelbattle/tests/translations_test.py:16
 msgid "New game"
 msgstr "Nuevo partido"
@@ -225,53 +235,61 @@ msgid "Key used to wait"
 msgstr "Tecla para espera"
 
 #: squirrelbattle/tests/translations_test.py:56
+msgid "Key used to use ladders"
+msgstr "Tecla para el uso de las escaleras"
+
+#: squirrelbattle/tests/translations_test.py:58
 msgid "Texture pack"
 msgstr "Paquete de texturas"
 
-#: squirrelbattle/tests/translations_test.py:57
+#: squirrelbattle/tests/translations_test.py:59
 msgid "Language"
 msgstr "Languaje"
 
 #: squirrelbattle/tests/translations_test.py:62
+msgid "player"
+msgstr "jugador"
+
+#: squirrelbattle/tests/translations_test.py:64
 msgid "hedgehog"
 msgstr "erizo"
 
-#: squirrelbattle/tests/translations_test.py:63
+#: squirrelbattle/tests/translations_test.py:65
 msgid "merchant"
 msgstr "comerciante"
 
-#: squirrelbattle/tests/translations_test.py:64
+#: squirrelbattle/tests/translations_test.py:66
 msgid "rabbit"
 msgstr "conejo"
 
-#: squirrelbattle/tests/translations_test.py:65
+#: squirrelbattle/tests/translations_test.py:67
 msgid "sunflower"
 msgstr "girasol"
 
-#: squirrelbattle/tests/translations_test.py:66
+#: squirrelbattle/tests/translations_test.py:68
 msgid "teddy bear"
 msgstr "osito de peluche"
 
-#: squirrelbattle/tests/translations_test.py:67
+#: squirrelbattle/tests/translations_test.py:69
 msgid "tiger"
 msgstr "tigre"
 
-#: squirrelbattle/tests/translations_test.py:69
+#: squirrelbattle/tests/translations_test.py:71
 msgid "body snatch potion"
 msgstr "poción de intercambio"
 
-#: squirrelbattle/tests/translations_test.py:70
+#: squirrelbattle/tests/translations_test.py:72
 msgid "bomb"
 msgstr "bomba"
 
-#: squirrelbattle/tests/translations_test.py:71
+#: squirrelbattle/tests/translations_test.py:73
 msgid "explosion"
 msgstr "explosión"
 
-#: squirrelbattle/tests/translations_test.py:72
+#: squirrelbattle/tests/translations_test.py:74
 msgid "heart"
 msgstr "corazón"
 
-#: squirrelbattle/tests/translations_test.py:73
+#: squirrelbattle/tests/translations_test.py:75
 msgid "sword"
 msgstr "espada"