fix #79 Goal Sabotage is broken

slipcor · Mar 12, 2021 · a2ad45d · a2ad45d
1 parent d19c8bb
commit a2ad45d
Show file tree

Hide file tree

Showing 7 changed files with 152 additions and 119 deletions.
diff --git a/lang/lang_en.yml b/lang/lang_en.yml
@@ -300,7 +300,9 @@ nulang:
       tntignite: '%1% ignited the TNT of team %2%!'
       set: 'TNT set: %1%'
       toset: 'TNT to set: %1%'
-      youtnt: You now carry the sabotage materials!'
+      noselfdestroy: 'You can not ignite your own TNT!'
+      youtnt: 'You now carry the sabotage tool!'
+      notgooditem: 'You need sabotage tool to ignite the TNT.'
     tank:
       tankdown: The tank is down!
       tankmode: TANK MODE! Everyone kill %1%, the tank!

diff --git a/lang/lang_es-es.yml b/lang/lang_es-es.yml
@@ -248,7 +248,7 @@ nulang:
       tntignite: '%1% encendió la TNT del Equipo %2%!'
       set: 'TNT añadida: %1%'
       toset: 'TNT por añadir: %1%'
-      youtnt: ¡Estas llevando los materiales de Sabotage!'
+      youtnt: '¡Estas llevando los materiales de Sabotage!'
     tank:
       tankdown: ¡El Tanque esta muerto!
       tankmode: Todos a matar a %1% ¡Él/Ella es el Tanque!
@@ -561,4 +561,4 @@ lang:
     Arenas Disponibles: %2%'
 log:
   tagapi: ¡Enganchando en la TagAPI!
-version: 0.9.0.0
+version: 0.9.0.0
diff --git a/lang/lang_fr.yml b/lang/lang_fr.yml
@@ -318,8 +318,9 @@ nulang:
       tntignite: '%1% a allumé la TNT de l''équipe %2% !'
       set: 'TNT configurée: %1%'
       toset: 'TNT a configurer: %1%'
-      youcannotselfdestroy: You can not ignite your own TNT!'
-      youtnt: Vous portez maintenant le matériel de sabotage !'
+      noselfdestroy: 'Vous ne pouvez pas faire exploser votre TNT!'
+      youtnt: 'Vous portez maintenant l''outil de sabotage !'
+      notgooditem: 'Vous avez besoin de l''outil de sabotage pour allumer la TNT.'
     tank:
       tankdown: Le tank est H.S. !
       tankmode: MODE TANK ! Tous le monde doit tuer %1%, le tank !

diff --git a/lang/lang_ru.yml b/lang/lang_ru.yml
@@ -234,7 +234,7 @@ nulang:
       tntignite: '%1% подожгли TNT команды %2%!'
       set: 'TNT выбрана: %1%'
       toset: 'TNT для выбора: %1%'
-      youtnt: У вас есть TNT для сабботажа!'
+      youtnt: 'У вас есть TNT для сабботажа!'
     tank:
       tankdown: Танк убит!
       tankmode: Режим танка! Все должны убить %1%, он танк!

diff --git a/src/net/slipcor/pvparena/arena/ArenaTeam.java b/src/net/slipcor/pvparena/arena/ArenaTeam.java
@@ -125,4 +125,12 @@ public boolean isEveryoneReady() {
     public void remove(final ArenaPlayer player) {
         players.remove(player);
     }
-}
+
+    @Override
+    public String toString() {
+        return "ArenaTeam{" +
+                "color=" + this.color +
+                ", name='" + this.name + '\'' +
+                '}';
+    }
+}
diff --git a/src/net/slipcor/pvparena/core/Language.java b/src/net/slipcor/pvparena/core/Language.java
@@ -531,8 +531,9 @@ public enum MSG {
         GOAL_SABOTAGE_IGNITED("nulang.goal.sabotage.tntignite", "%1% ignited the TNT of team %2%!"),
         GOAL_SABOTAGE_SETTNT("nulang.goal.sabotage.set", "TNT set: %1%"),
         GOAL_SABOTAGE_TOSETTNT("nulang.goal.sabotage.toset", "TNT to set: %1%"),
-        GOAL_SABOTAGE_YOUCANNOTSELFDESTROY("nulang.goal.sabotage.youcannotselfdestroy", "You can not ignite your own TNT!'"),
-        GOAL_SABOTAGE_YOUTNT("nulang.goal.sabotage.youtnt", "You now carry the sabotage materials!'"),
+        GOAL_SABOTAGE_NOSELFDESTROY("nulang.goal.sabotage.noselfdestroy", "You can not ignite your own TNT!"),
+        GOAL_SABOTAGE_NOTGOODITEM("nulang.goal.sabotage.notgooditem", "You need sabotage tool to ignite the TNT."),
+        GOAL_SABOTAGE_YOUTNT("nulang.goal.sabotage.youtnt", "You now carry the sabotage tool."),
 
         GOAL_TANK_TANKDOWN("nulang.goal.tank.tankdown", "The tank is down!"),
         GOAL_TANK_TANKMODE("nulang.goal.tank.tankmode", "TANK MODE! Everyone kill %1%, the tank!"),