added weapons to stations

rudderbucky · Jul 13, 2019 · a6f1fec · a6f1fec
1 parent e082a90
commit a6f1fec
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 24 deletions.
diff --git a/Assets/Blueprints/Entities/Constructs/Air Constructs/Core Upgrader.asset b/Assets/Blueprints/Entities/Constructs/Air Constructs/Core Upgrader.asset
@@ -4,7 +4,8 @@
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
@@ -41,15 +42,15 @@ MonoBehaviour:
   - location: {x: 0.9, y: -0.16}
     rotation: 180
     mirrored: 1
-    abilityID: 0
-    tier: 0
+    abilityID: 7
+    tier: 1
     secondaryData: 
     partID: BigSide1
   - location: {x: -0.9, y: -0.16}
     rotation: 180
     mirrored: 0
-    abilityID: 0
-    tier: 0
+    abilityID: 5
+    tier: 1
     secondaryData: 
     partID: BigSide1
   dialogue: {fileID: 11400000, guid: fe3dc4919b3204043a02df34dab8c348, type: 2}
diff --git a/...Air Crafts/Shellcores/DroneWorkshop.asset → ...tructs/Air Constructs/DroneWorkshop.asset b/...Air Crafts/Shellcores/DroneWorkshop.asset → ...tructs/Air Constructs/DroneWorkshop.asset
@@ -28,36 +28,36 @@ MonoBehaviour:
   - location: {x: 0.8, y: 0.2}
     rotation: 0
     mirrored: 1
-    abilityID: 7
-    tier: 2
-    secondaryData: mini_drone_spawn
+    abilityID: 0
+    tier: 0
+    secondaryData: 
     partID: BigWing1
   - location: {x: -0.8, y: 0.2}
     rotation: 0
     mirrored: 0
-    abilityID: 6
-    tier: 2
-    secondaryData: mini_drone_spawn
+    abilityID: 0
+    tier: 0
+    secondaryData: 
     partID: BigWing1
   - location: {x: -1.6, y: 0.6}
     rotation: 0
     mirrored: 0
     abilityID: 7
     tier: 1
-    secondaryData: mini_drone_spawn
+    secondaryData: 
     partID: BigSide1
   - location: {x: 1.6, y: 0.6}
     rotation: 0
     mirrored: 1
     abilityID: 6
     tier: 3
-    secondaryData: mini_drone_spawn
+    secondaryData: 
     partID: BigSide1
   - location: {x: 0, y: -0.8}
     rotation: 180
     mirrored: 0
     abilityID: 2
     tier: 2
-    secondaryData: mini_drone_spawn
+    secondaryData: 
     partID: SmallCenter9
   dialogue: {fileID: 11400000, guid: 58be45d3a9cad0149944c08939f23090, type: 2}
diff --git a/...rafts/Shellcores/DroneWorkshop.asset.meta → ...s/Air Constructs/DroneWorkshop.asset.meta b/...rafts/Shellcores/DroneWorkshop.asset.meta → ...s/Air Constructs/DroneWorkshop.asset.meta
diff --git a/Assets/Blueprints/Entities/Constructs/Air Constructs/MissionControl.asset b/Assets/Blueprints/Entities/Constructs/Air Constructs/MissionControl.asset
@@ -35,8 +35,8 @@ MonoBehaviour:
   - location: {x: 1.7399323, y: 0.24856125}
     rotation: 0
     mirrored: 1
-    abilityID: 0
-    tier: 0
+    abilityID: 4
+    tier: 1
     secondaryData: 
     partID: BigWing1
   - location: {x: 0.74568343, y: 0}

diff --git a/Assets/Blueprints/Entities/Constructs/Air Constructs/Trader.asset b/Assets/Blueprints/Entities/Constructs/Air Constructs/Trader.asset
@@ -4,7 +4,8 @@
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
@@ -41,15 +42,15 @@ MonoBehaviour:
   - location: {x: 0.8, y: 0.4}
     rotation: 0
     mirrored: 1
-    abilityID: 19
-    tier: 0
+    abilityID: 5
+    tier: 1
     secondaryData: 
     partID: BigSide1
   - location: {x: -0.8, y: 0.4}
     rotation: 0
     mirrored: 0
-    abilityID: 0
-    tier: 0
+    abilityID: 5
+    tier: 1
     secondaryData: 
     partID: BigSide1
   - location: {x: -0.8, y: -0.7}

diff --git a/Assets/Blueprints/Entities/Constructs/Air Constructs/Yard.asset b/Assets/Blueprints/Entities/Constructs/Air Constructs/Yard.asset
@@ -4,7 +4,8 @@
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
@@ -35,14 +36,14 @@ MonoBehaviour:
     rotation: 0
     mirrored: 1
     abilityID: 5
-    tier: 2
+    tier: 1
     secondaryData: 
     partID: BigSide3
   - location: {x: -0.85, y: 0.3}
     rotation: 0
     mirrored: 0
     abilityID: 7
-    tier: 2
+    tier: 1
     secondaryData: 
     partID: BigSide4
   - location: {x: 0.85, y: 0.3}