Moved fenerox dialogs from glitch emotes

SBT-community · Jul 1, 2017 · ce5c4f8 · ce5c4f8
1 parent 830853e
commit ce5c4f8
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 99 deletions.
diff --git a/translations/substitutions.json b/translations/substitutions.json
@@ -1051,16 +1051,6 @@
     "/reattack/default/default/2": "texts/dialog/shared_.config.json",
     "/reattack/default/default/4": "texts/dialog/shared_.config.json"
   },
-  "dialog/fenerox.config": {
-    "/converse/default/glitch/0/glitchEmote": "texts/glitchEmotes.json",
-    "/converse/default/glitch/0/glitchEmotedText": "texts/dialog/fenerox.config.json",
-    "/converse/default/glitch/1/glitchEmote": "texts/glitchEmotes.json",
-    "/converse/default/glitch/1/glitchEmotedText": "texts/dialog/fenerox.config.json",
-    "/converse/default/glitch/4/glitchEmote": "texts/glitchEmotes.json",
-    "/converse/default/glitch/4/glitchEmotedText": "texts/dialog/fenerox.config.json",
-    "/converse/default/glitch/6/glitchEmote": "texts/glitchEmotes.json",
-    "/converse/default/glitch/6/glitchEmotedText": "texts/dialog/fenerox.config.json"
-  },
   "dialog/flee.config": {
     "/helpme/avian/default/1": "texts/dialog/shared_.config.json",
     "/helpme/default/default/1": "texts/dialog/shared_.config.json",

diff --git a/translations/texts/dialog/fenerox.config.json b/translations/texts/dialog/fenerox.config.json
@@ -385,18 +385,6 @@
       "Rus": "Дом повреждён. Стены сломаны. Нужна починка!"
     }
   },
-  {
-    "DeniedAlternatives": [],
-    "Files": {
-      "dialog/fenerox.config": [
-        "/converse/default/glitch/1/glitchEmotedText"
-      ]
-    },
-    "Texts": {
-      "Eng": "Hopefully nice. Feeling cautious!",
-      "Rus": "Надеюсь хорошая. Чувствую настороженность!"
-    }
-  },
   {
     "DeniedAlternatives": [],
     "Files": {
@@ -445,18 +433,6 @@
       "Rus": "Ухожу сейчас. Не слушают. Бедный дом!"
     }
   },
-  {
-    "DeniedAlternatives": [],
-    "Files": {
-      "dialog/fenerox.config": [
-        "/converse/default/glitch/0/glitchEmotedText"
-      ]
-    },
-    "Texts": {
-      "Eng": "Looks metal. Quite exciting!",
-      "Rus": "Выглядит железным. Весьма волнительно!"
-    }
-  },
   {
     "DeniedAlternatives": [],
     "Files": {
@@ -511,6 +487,18 @@
       "Rus": "Новая личность. Ярко сияет. Весьма волнительно!"
     }
   },
+  {
+    "DeniedAlternatives": [],
+    "Files": {
+      "dialog/fenerox.config": [
+        "/converse/default/glitch/0"
+      ]
+    },
+    "Texts": {
+      "Eng": "New person. Looks metal. Quite exciting!",
+      "Rus": "Новая личность. Выглядит железным. Весьма волнительно!"
+    }
+  },
   {
     "DeniedAlternatives": [],
     "Files": {
@@ -546,6 +534,7 @@
         "/converse/default/avian/6",
         "/converse/default/default/6",
         "/converse/default/floran/6",
+        "/converse/default/glitch/6",
         "/converse/default/hylotl/6",
         "/converse/default/novakid/6"
       ]
@@ -592,18 +581,6 @@
       "Rus": "Без оружия. Был атакован. Нужна помощь!"
     }
   },
-  {
-    "DeniedAlternatives": [],
-    "Files": {
-      "dialog/fenerox.config": [
-        "/converse/default/glitch/6/glitchEmotedText"
-      ]
-    },
-    "Texts": {
-      "Eng": "Not confident. Saying hello!",
-      "Rus": "Не уверен. Говорю привет!"
-    }
-  },
   {
     "DeniedAlternatives": [],
     "Files": {
@@ -624,6 +601,7 @@
         "/converse/default/avian/1",
         "/converse/default/default/1",
         "/converse/default/floran/1",
+        "/converse/default/glitch/1",
         "/converse/default/hylotl/1",
         "/converse/default/novakid/1"
       ]
@@ -641,6 +619,7 @@
         "/converse/default/avian/4",
         "/converse/default/default/4",
         "/converse/default/floran/4",
+        "/converse/default/glitch/4",
         "/converse/default/hylotl/4",
         "/converse/default/novakid/4"
       ]
@@ -686,18 +665,6 @@
       "Rus": "Очень расстроен. Чувствую невнимание. Должен уйти."
     }
   },
-  {
-    "DeniedAlternatives": [],
-    "Files": {
-      "dialog/fenerox.config": [
-        "/converse/default/glitch/4/glitchEmotedText"
-      ]
-    },
-    "Texts": {
-      "Eng": "Saying hello. Not Fenerox?",
-      "Rus": "Говорю привет. Не Фенерокс?"
-    }
-  },
   {
     "DeniedAlternatives": [],
     "Files": {

diff --git a/translations/texts/glitchEmotes.json b/translations/texts/glitchEmotes.json
@@ -10688,30 +10688,6 @@
       "Rus": "Нейтрально."
     }
   },
-  {
-    "DeniedAlternatives": [],
-    "Files": {
-      "dialog/fenerox.config": [
-        "/converse/default/glitch/0/glitchEmote"
-      ]
-    },
-    "Texts": {
-      "Eng": "New person.",
-      "Rus": "Новая личность."
-    }
-  },
-  {
-    "DeniedAlternatives": [],
-    "Files": {
-      "dialog/fenerox.config": [
-        "/converse/default/glitch/6/glitchEmote"
-      ]
-    },
-    "Texts": {
-      "Eng": "New stranger.",
-      "Rus": "Новый незнакомец."
-    }
-  },
   {
     "DeniedAlternatives": [],
     "Files": {
@@ -11625,19 +11601,6 @@
       "Rus": "Навязчиво."
     }
   },
-  {
-    "DeniedAlternatives": [],
-    "Files": {
-      "dialog/fenerox.config": [
-        "/converse/default/glitch/1/glitchEmote",
-        "/converse/default/glitch/4/glitchEmote"
-      ]
-    },
-    "Texts": {
-      "Eng": "Odd person.",
-      "Rus": "Странная личность."
-    }
-  },
   {
     "DeniedAlternatives": [],
     "Files": {

diff --git a/translations/totallabels.json b/translations/totallabels.json
@@ -350,7 +350,7 @@
       "devoutavian.config.json": 134,
       "eyeguard.config.json": 26,
       "eyepatch.config.json": 26,
-      "fenerox.config.json": 78,
+      "fenerox.config.json": 75,
       "flee.config.json": 43,
       "frog.config.json": 2,
       "gatherer.config.json": 15,
@@ -386,7 +386,7 @@
     "generic": {
       "shared_lightbulb.json": 1
     },
-    "glitchEmotes.json": 499,
+    "glitchEmotes.json": 496,
     "help.config.json": 66,
     "hunger.config.json": 15,
     "interface": {

diff --git a/translations/translatedlabels.json b/translations/translatedlabels.json
@@ -350,7 +350,7 @@
       "devoutavian.config.json": 134,
       "eyeguard.config.json": 26,
       "eyepatch.config.json": 26,
-      "fenerox.config.json": 78,
+      "fenerox.config.json": 75,
       "flee.config.json": 43,
       "frog.config.json": 2,
       "gatherer.config.json": 15,
@@ -386,7 +386,7 @@
     "generic": {
       "shared_lightbulb.json": 1
     },
-    "glitchEmotes.json": 354,
+    "glitchEmotes.json": 351,
     "help.config.json": 62,
     "hunger.config.json": 15,
     "interface": {