Merge pull request #224 from AssistantNMS/develop

🔖 2.17.1
AssistantNMS · Aug 24, 2023 · 95e195c · 95e195c
2 parents 84085da + 18c2009
commit 95e195c
Show file tree

Hide file tree

Showing 37 changed files with 397 additions and 439 deletions.
diff --git a/assets/data/controllerLookup.json b/assets/data/controllerLookup.json
diff --git a/assets/data/twitchDrops.json b/assets/data/twitchDrops.json
@@ -1134,31 +1134,27 @@
         "DayNumber": 3,
         "Rewards": [
           {
-            "Id": "build907",
+            "Id": "build981",
             "WatchTimeInMin": 15
           },
           {
             "Id": "other401",
             "WatchTimeInMin": 15
           },
           {
-            "Id": "build431",
-            "WatchTimeInMin": 30
-          },
-          {
-            "Id": "build969",
+            "Id": "build925",
             "WatchTimeInMin": 30
           },
           {
-            "Id": "other210",
+            "Id": "build1003",
             "WatchTimeInMin": 60
           },
           {
-            "Id": "other343",
+            "Id": "other395",
             "WatchTimeInMin": 120
           },
           {
-            "Id": "other339",
+            "Id": "other392",
             "WatchTimeInMin": 180
           }
         ]
@@ -1167,27 +1163,27 @@
         "DayNumber": 4,
         "Rewards": [
           {
-            "Id": "build981",
+            "Id": "build917",
             "WatchTimeInMin": 15
           },
           {
             "Id": "other402",
             "WatchTimeInMin": 15
           },
           {
-            "Id": "build925",
+            "Id": "build962",
             "WatchTimeInMin": 30
           },
           {
-            "Id": "build1003",
+            "Id": "build921",
             "WatchTimeInMin": 60
           },
           {
-            "Id": "other395",
+            "Id": "other398",
             "WatchTimeInMin": 120
           },
           {
-            "Id": "other392",
+            "Id": "other393",
             "WatchTimeInMin": 180
           }
         ]
@@ -1196,27 +1192,27 @@
         "DayNumber": 5,
         "Rewards": [
           {
-            "Id": "build917",
+            "Id": "build918",
             "WatchTimeInMin": 15
           },
           {
             "Id": "other403",
             "WatchTimeInMin": 15
           },
           {
-            "Id": "build962",
+            "Id": "build930",
             "WatchTimeInMin": 30
           },
           {
-            "Id": "build921",
+            "Id": "other211",
             "WatchTimeInMin": 60
           },
           {
-            "Id": "other398",
+            "Id": "other296",
             "WatchTimeInMin": 120
           },
           {
-            "Id": "other393",
+            "Id": "other394",
             "WatchTimeInMin": 180
           }
         ]

diff --git a/assets/json/de/Buildings.lang.json b/assets/json/de/Buildings.lang.json
@@ -8936,8 +8936,7 @@
       "HasDevProperties",
       "IsQuicksilver",
       "IsAddedInTrackedUpdate",
-      "IsTwitchCampaign6Reward",
-      "IsTwitchCampaign7Reward"
+      "IsTwitchCampaign6Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -18391,8 +18390,7 @@
       "HasDevProperties",
       "IsAddedInTrackedUpdate",
       "IsExpeditionSeason8Reward",
-      "IsTwitchCampaign6Reward",
-      "IsTwitchCampaign7Reward"
+      "IsTwitchCampaign6Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -18693,7 +18691,8 @@
     "Usages": [
       "HasDevProperties",
       "IsQuicksilver",
-      "IsAddedInTrackedUpdate"
+      "IsAddedInTrackedUpdate",
+      "IsTwitchCampaign7Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -18978,7 +18977,8 @@
     "Usages": [
       "HasDevProperties",
       "IsAddedInTrackedUpdate",
-      "IsExpeditionSeason7Reward"
+      "IsExpeditionSeason7Reward",
+      "IsTwitchCampaign7Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -19976,8 +19976,7 @@
       "HasDevProperties",
       "IsAddedInTrackedUpdate",
       "IsExpeditionSeason6Reward",
-      "IsTwitchCampaign6Reward",
-      "IsTwitchCampaign7Reward"
+      "IsTwitchCampaign6Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",

diff --git a/assets/json/de/Others.lang.json b/assets/json/de/Others.lang.json
@@ -3390,8 +3390,7 @@
       "HasDevProperties",
       "IsAddedInTrackedUpdate",
       "IsExpeditionSeason5Reward",
-      "IsTwitchCampaign6Reward",
-      "IsTwitchCampaign7Reward"
+      "IsTwitchCampaign6Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -3413,7 +3412,8 @@
     "Usages": [
       "HasDevProperties",
       "IsAddedInTrackedUpdate",
-      "IsExpeditionSeason5Reward"
+      "IsExpeditionSeason5Reward",
+      "IsTwitchCampaign7Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -4614,7 +4614,8 @@
     "Usages": [
       "HasDevProperties",
       "IsAddedInTrackedUpdate",
-      "IsExpeditionSeason8Reward"
+      "IsExpeditionSeason8Reward",
+      "IsTwitchCampaign7Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -5556,8 +5557,7 @@
     "Usages": [
       "HasDevProperties",
       "IsAddedInTrackedUpdate",
-      "IsTwitchCampaign6Reward",
-      "IsTwitchCampaign7Reward"
+      "IsTwitchCampaign6Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -5645,8 +5645,7 @@
     "Usages": [
       "HasDevProperties",
       "IsAddedInTrackedUpdate",
-      "IsTwitchCampaign6Reward",
-      "IsTwitchCampaign7Reward"
+      "IsTwitchCampaign6Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -6845,7 +6844,8 @@
     "Colour": "2C7C9F",
     "Usages": [
       "HasDevProperties",
-      "IsAddedInTrackedUpdate"
+      "IsAddedInTrackedUpdate",
+      "IsTwitchCampaign7Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",

diff --git a/assets/json/en/Buildings.lang.json b/assets/json/en/Buildings.lang.json
@@ -9045,8 +9045,7 @@
       "HasDevProperties",
       "IsQuicksilver",
       "IsAddedInTrackedUpdate",
-      "IsTwitchCampaign6Reward",
-      "IsTwitchCampaign7Reward"
+      "IsTwitchCampaign6Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -18500,8 +18499,7 @@
       "HasDevProperties",
       "IsAddedInTrackedUpdate",
       "IsExpeditionSeason8Reward",
-      "IsTwitchCampaign6Reward",
-      "IsTwitchCampaign7Reward"
+      "IsTwitchCampaign6Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -18802,7 +18800,8 @@
     "Usages": [
       "HasDevProperties",
       "IsQuicksilver",
-      "IsAddedInTrackedUpdate"
+      "IsAddedInTrackedUpdate",
+      "IsTwitchCampaign7Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -19087,7 +19086,8 @@
     "Usages": [
       "HasDevProperties",
       "IsAddedInTrackedUpdate",
-      "IsExpeditionSeason7Reward"
+      "IsExpeditionSeason7Reward",
+      "IsTwitchCampaign7Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -20085,8 +20085,7 @@
       "HasDevProperties",
       "IsAddedInTrackedUpdate",
       "IsExpeditionSeason6Reward",
-      "IsTwitchCampaign6Reward",
-      "IsTwitchCampaign7Reward"
+      "IsTwitchCampaign6Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",

diff --git a/assets/json/en/Others.lang.json b/assets/json/en/Others.lang.json
@@ -3417,8 +3417,7 @@
       "HasDevProperties",
       "IsAddedInTrackedUpdate",
       "IsExpeditionSeason5Reward",
-      "IsTwitchCampaign6Reward",
-      "IsTwitchCampaign7Reward"
+      "IsTwitchCampaign6Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -3440,7 +3439,8 @@
     "Usages": [
       "HasDevProperties",
       "IsAddedInTrackedUpdate",
-      "IsExpeditionSeason5Reward"
+      "IsExpeditionSeason5Reward",
+      "IsTwitchCampaign7Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -4641,7 +4641,8 @@
     "Usages": [
       "HasDevProperties",
       "IsAddedInTrackedUpdate",
-      "IsExpeditionSeason8Reward"
+      "IsExpeditionSeason8Reward",
+      "IsTwitchCampaign7Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -5583,8 +5584,7 @@
     "Usages": [
       "HasDevProperties",
       "IsAddedInTrackedUpdate",
-      "IsTwitchCampaign6Reward",
-      "IsTwitchCampaign7Reward"
+      "IsTwitchCampaign6Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -5672,8 +5672,7 @@
     "Usages": [
       "HasDevProperties",
       "IsAddedInTrackedUpdate",
-      "IsTwitchCampaign6Reward",
-      "IsTwitchCampaign7Reward"
+      "IsTwitchCampaign6Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -6872,7 +6871,8 @@
     "Colour": "2C7C9F",
     "Usages": [
       "HasDevProperties",
-      "IsAddedInTrackedUpdate"
+      "IsAddedInTrackedUpdate",
+      "IsTwitchCampaign7Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",

diff --git a/assets/json/en/TechnologyModule.lang.json b/assets/json/en/TechnologyModule.lang.json
@@ -7531,6 +7531,7 @@
   },
   {
     "Id": "tMod178",
+    "Icon": "other/404.png",
     "Name": "Exosuit",
     "Group": "Salvaged Upgrade Components",
     "Description": "A <STELLAR>salvaged<> upgrade for <TECHNOLOGY>Exosuit<>. Use <VAL_ON><IMG>FE_ALT1<><> to begin upgrade <VAL_ON>installation process<>.\n\nConstructed by the <TRANS_BUI>Autophage<>, this technology package is the result of a high degree of engineering improvisation. As a one-of-kind piece of repurposed technology, its exact effect upon suit performance is hard to determine to predict prior to installation within the Exosuit's systems.",

diff --git a/assets/json/es-la/Buildings.lang.json b/assets/json/es-la/Buildings.lang.json
@@ -8936,8 +8936,7 @@
       "HasDevProperties",
       "IsQuicksilver",
       "IsAddedInTrackedUpdate",
-      "IsTwitchCampaign6Reward",
-      "IsTwitchCampaign7Reward"
+      "IsTwitchCampaign6Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -18391,8 +18390,7 @@
       "HasDevProperties",
       "IsAddedInTrackedUpdate",
       "IsExpeditionSeason8Reward",
-      "IsTwitchCampaign6Reward",
-      "IsTwitchCampaign7Reward"
+      "IsTwitchCampaign6Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -18693,7 +18691,8 @@
     "Usages": [
       "HasDevProperties",
       "IsQuicksilver",
-      "IsAddedInTrackedUpdate"
+      "IsAddedInTrackedUpdate",
+      "IsTwitchCampaign7Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -18978,7 +18977,8 @@
     "Usages": [
       "HasDevProperties",
       "IsAddedInTrackedUpdate",
-      "IsExpeditionSeason7Reward"
+      "IsExpeditionSeason7Reward",
+      "IsTwitchCampaign7Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",
@@ -19976,8 +19976,7 @@
       "HasDevProperties",
       "IsAddedInTrackedUpdate",
       "IsExpeditionSeason6Reward",
-      "IsTwitchCampaign6Reward",
-      "IsTwitchCampaign7Reward"
+      "IsTwitchCampaign6Reward"
     ],
     "BlueprintCost": 1,
     "BlueprintCostType": "None",