Merge branch 'Staging'

Core-Team-META · Apr 15, 2021 · ee0ff38 · ee0ff38
2 parents 5b1e6a3 + 1439c0a
commit ee0ff38
Show file tree

Hide file tree

Showing 56 changed files with 64,308 additions and 402 deletions.
diff --git a/Loadout/Data/Scripts/LootSelector.lua b/Loadout/Data/Scripts/LootSelector.lua
@@ -16,9 +16,6 @@ function AllUnlockableWeaponsSetup()
     for k,v in pairs(_G["DataBase"]:ReturnBySlot("Melee")) do
         table.insert(AllUnlockableWeapons,v)
     end
-    for k,v in pairs(_G["DataBase"]:ReturnBySlot("Equipment")) do
-        table.insert(AllUnlockableWeapons,v)
-    end
 end
 
 function AllUnlockableSkinSetUp()

diff --git a/Loadout/Data/Templates/EquipmentHandler.pbt b/Loadout/Data/Templates/EquipmentHandler.pbt
@@ -1425,6 +1425,7 @@ Assets {
         ChildIds: 2538983546841194580
         ChildIds: 14911383720396035464
         ChildIds: 8281176061757728399
+        ChildIds: 16343596422628324832
         UnregisteredParameters {
           Overrides {
             Name: "cs:Weapon"
@@ -1872,6 +1873,52 @@ Assets {
           }
         }
       }
+      Objects {
+        Id: 16343596422628324832
+        Name: "Industrial"
+        Transform {
+          Location {
+          }
+          Rotation {
+          }
+          Scale {
+            X: 1
+            Y: 1
+            Z: 1
+          }
+        }
+        ParentId: 2136086721307223701
+        UnregisteredParameters {
+          Overrides {
+            Name: "cs:ID"
+            String: "IN"
+          }
+          Overrides {
+            Name: "cs:SKIN"
+            AssetReference {
+              Id: 9430142071829026358
+            }
+          }
+          Overrides {
+            Name: "cs:Rarity"
+            String: "Rare"
+          }
+        }
+        Collidable_v2 {
+          Value: "mc:ecollisionsetting:inheritfromparent"
+        }
+        Visible_v2 {
+          Value: "mc:evisibilitysetting:inheritfromparent"
+        }
+        CameraCollidable {
+          Value: "mc:ecollisionsetting:inheritfromparent"
+        }
+        Script {
+          ScriptAsset {
+            Id: 16583515440227484556
+          }
+        }
+      }
       Objects {
         Id: 2411214559175194743
         Name: "Sub Machine Gun"
@@ -13697,11 +13744,11 @@ Assets {
           }
           Overrides {
             Name: "cs:Rarity"
-            String: "Rare"
+            String: "Easter"
           }
           Overrides {
             Name: "cs:EventSkin"
-            Bool: true
+            Bool: false
           }
         }
         Collidable_v2 {
@@ -13797,11 +13844,11 @@ Assets {
           }
           Overrides {
             Name: "cs:Rarity"
-            String: "Event"
+            String: "Stpat"
           }
           Overrides {
             Name: "cs:EventSkin"
-            Bool: false
+            Bool: true
           }
         }
         Collidable_v2 {
@@ -13847,11 +13894,11 @@ Assets {
           }
           Overrides {
             Name: "cs:Rarity"
-            String: "Event"
+            String: "Stpat"
           }
           Overrides {
             Name: "cs:EventSkin"
-            Bool: false
+            Bool: true
           }
         }
         Collidable_v2 {
@@ -15122,6 +15169,7 @@ Assets {
         ChildIds: 2158213175594460956
         ChildIds: 9154454223948297388
         ChildIds: 17118012168274349952
+        ChildIds: 14947812311197093140
         UnregisteredParameters {
           Overrides {
             Name: "cs:Description"
@@ -15423,6 +15471,52 @@ Assets {
           }
         }
       }
+      Objects {
+        Id: 14947812311197093140
+        Name: "Industrial"
+        Transform {
+          Location {
+          }
+          Rotation {
+          }
+          Scale {
+            X: 1
+            Y: 1
+            Z: 1
+          }
+        }
+        ParentId: 17180424648927893776
+        UnregisteredParameters {
+          Overrides {
+            Name: "cs:ID"
+            String: "IN"
+          }
+          Overrides {
+            Name: "cs:SKIN"
+            AssetReference {
+              Id: 16528962632325830093
+            }
+          }
+          Overrides {
+            Name: "cs:Rarity"
+            String: "Rare"
+          }
+        }
+        Collidable_v2 {
+          Value: "mc:ecollisionsetting:inheritfromparent"
+        }
+        Visible_v2 {
+          Value: "mc:evisibilitysetting:inheritfromparent"
+        }
+        CameraCollidable {
+          Value: "mc:ecollisionsetting:inheritfromparent"
+        }
+        Script {
+          ScriptAsset {
+            Id: 16583515440227484556
+          }
+        }
+      }
       Objects {
         Id: 9110716462400792456
         Name: "ME7A"

diff --git a/Loadout/Data/Templates/High_Latency_Rifle_Weapon.pbt b/Loadout/Data/Templates/High_Latency_Rifle_Weapon.pbt
@@ -181,7 +181,7 @@ Assets {
             MaxAmmo: -1
             AmmoType: "rounds"
             MultiShot: 1
-            ProjectileSpeed: 25000
+            ProjectileSpeed: 28000
             ProjectileLifeSpan: 10
             ProjectileLength: 50
             ProjectileRadius: 5