diff --git a/squirrelbattle/interfaces.py b/squirrelbattle/interfaces.py index 330301c..c71d7c8 100644 --- a/squirrelbattle/interfaces.py +++ b/squirrelbattle/interfaces.py @@ -774,7 +774,8 @@ class FightingEntity(Entity): The entity takes damage from the attacker based on their respective stats. """ - damage = max(1, amount - self.constitution) + if amount != 0 : + damage = max(1, amount - self.constitution) self.health -= damage if self.health <= 0: self.die() diff --git a/squirrelbattle/locale/de/LC_MESSAGES/squirrelbattle.po b/squirrelbattle/locale/de/LC_MESSAGES/squirrelbattle.po index 1aed270..a468076 100644 --- a/squirrelbattle/locale/de/LC_MESSAGES/squirrelbattle.po +++ b/squirrelbattle/locale/de/LC_MESSAGES/squirrelbattle.po @@ -1,12 +1,12 @@ -#, python-brace-format -msgid "{name} takes {amount} damage." -msgstr "{name} nimmt {amount} Schadenspunkte." +msgid "ring_of_critical_damage" +msgstr "" msgid "ring_of_more_experience" msgstr "" -msgid "ring_of_critical_damage" -msgstr "" +#, python-brace-format +msgid "{name} takes {amount} damage." +msgstr "{name} nimmt {amount} Schadenspunkte." # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR ÿnérant, eichhornchen, nicomarg, charlse, ifugao @@ -18,7 +18,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-10 20:35+0100\n" +"POT-Creation-Date: 2021-01-10 21:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -63,7 +63,8 @@ msgstr "Ziehen Sie zu der freundlichen Einheit hin, um mit ihr zu sprechen" #: squirrelbattle/display/gamedisplay.py:212 #, python-brace-format msgid "Use {key} then move to talk to the entity" -msgstr "Verwenden Sie {key} dann bewegen Sie sich, um mit der Einheit zu sprechen" +msgstr "" +"Verwenden Sie {key} dann bewegen Sie sich, um mit der Einheit zu sprechen" #: squirrelbattle/display/menudisplay.py:124 #: squirrelbattle/display/menudisplay.py:149 @@ -132,8 +133,9 @@ msgstr "{player} täuscht seinem Körper mit {entity} aus." msgid "" "The ennemies have -{max(1, self.held_by.intelligence // 2)}strength for 3 " "turns" -msgstr "Die Feinde haben 3 Runden lang - {max(1, self.held_by.intelligence // 2)} Stärke" -"" +msgstr "" +"Die Feinde haben 3 Runden lang - {max(1, self.held_by.intelligence // 2)} " +"Stärke" #: squirrelbattle/entities/items.py:552 #, python-brace-format @@ -142,7 +144,9 @@ msgstr "{name}" #: squirrelbattle/entities/player.py:83 msgid "It worked! Nearby ennemies will be confused for 3 turns." -msgstr "Es funktionierte! In der Nähe befindliche Feinde werden 3 Runden lang verwirrt." +msgstr "" +"Es funktionierte! In der Nähe befindliche Feinde werden 3 Runden lang " +"verwirrt." #: squirrelbattle/entities/player.py:86 msgid "It worked, but there is no one nearby..." @@ -204,17 +208,17 @@ msgstr "Es ist ein kritischer Treffer!" msgid "{name} hits {opponent}." msgstr "{name} schlägt {opponent}." -#: squirrelbattle/interfaces.py:781 +#: squirrelbattle/interfaces.py:782 #, python-brace-format msgid "{name} takes {damage} damage." msgstr "{name} erleidet {damage} Schaden." -#: squirrelbattle/interfaces.py:783 +#: squirrelbattle/interfaces.py:784 #, python-brace-format msgid "{name} dies." msgstr "{name} stirbt." -#: squirrelbattle/interfaces.py:817 +#: squirrelbattle/interfaces.py:818 #, python-brace-format msgid "{entity} said: {message}" msgstr "{entity} hat gesagt: {message}" diff --git a/squirrelbattle/locale/es/LC_MESSAGES/squirrelbattle.po b/squirrelbattle/locale/es/LC_MESSAGES/squirrelbattle.po index 7b19c4e..7428cd8 100644 --- a/squirrelbattle/locale/es/LC_MESSAGES/squirrelbattle.po +++ b/squirrelbattle/locale/es/LC_MESSAGES/squirrelbattle.po @@ -1,12 +1,12 @@ -#, python-brace-format -msgid "{name} takes {amount} damage." -msgstr "{name} recibe {amount} daño." +msgid "ring_of_critical_damage" +msgstr "ring_of_critical_damage" msgid "ring_of_more_experience" msgstr "ring_of_more_experience" -msgid "ring_of_critical_damage" -msgstr "ring_of_critical_damage" +#, python-brace-format +msgid "{name} takes {amount} damage." +msgstr "{name} recibe {amount} daño." # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR ÿnérant, eichhornchen, nicomarg, charlse, ifugao @@ -18,7 +18,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-10 20:35+0100\n" +"POT-Creation-Date: 2021-01-10 21:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -132,8 +132,8 @@ msgid "" "The ennemies have -{max(1, self.held_by.intelligence // 2)}strength for 3 " "turns" msgstr "" -"Los enemigos tienen - {max(1, self.held_by.intelligence // 2)} fuerza durante 3" -"turnos" +"Los enemigos tienen - {max(1, self.held_by.intelligence // 2)} fuerza " +"durante 3turnos" #: squirrelbattle/entities/items.py:552 #, python-brace-format @@ -204,17 +204,17 @@ msgstr "¡Es un golpe crítico!" msgid "{name} hits {opponent}." msgstr "{name} golpea a {opponent}." -#: squirrelbattle/interfaces.py:781 +#: squirrelbattle/interfaces.py:782 #, python-brace-format msgid "{name} takes {damage} damage." msgstr "{name} recibe {damage} daño." -#: squirrelbattle/interfaces.py:783 +#: squirrelbattle/interfaces.py:784 #, python-brace-format msgid "{name} dies." msgstr "{name} se muere." -#: squirrelbattle/interfaces.py:817 +#: squirrelbattle/interfaces.py:818 #, python-brace-format msgid "{entity} said: {message}" msgstr "{entity} dijo : {message}" diff --git a/squirrelbattle/locale/fr/LC_MESSAGES/squirrelbattle.po b/squirrelbattle/locale/fr/LC_MESSAGES/squirrelbattle.po index c8835bd..bdd5132 100644 --- a/squirrelbattle/locale/fr/LC_MESSAGES/squirrelbattle.po +++ b/squirrelbattle/locale/fr/LC_MESSAGES/squirrelbattle.po @@ -12,7 +12,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-10 20:35+0100\n" +"POT-Creation-Date: 2021-01-10 21:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -199,17 +199,17 @@ msgstr "C'est un coup critique !" msgid "{name} hits {opponent}." msgstr "{name} frappe {opponent}." -#: squirrelbattle/interfaces.py:781 +#: squirrelbattle/interfaces.py:782 #, python-brace-format msgid "{name} takes {damage} damage." msgstr "{name} prend {damage} dégâts." -#: squirrelbattle/interfaces.py:783 +#: squirrelbattle/interfaces.py:784 #, python-brace-format msgid "{name} dies." msgstr "{name} meurt." -#: squirrelbattle/interfaces.py:817 +#: squirrelbattle/interfaces.py:818 #, python-brace-format msgid "{entity} said: {message}" msgstr "{entity} a dit : {message}"