From a6f1fece19f506c3f84d47b3330882256032e60c Mon Sep 17 00:00:00 2001 From: rudderbucky Date: Sat, 13 Jul 2019 14:57:15 -0700 Subject: [PATCH] added weapons to stations --- .../Air Constructs/Core Upgrader.asset | 11 ++++++----- .../Air Constructs}/DroneWorkshop.asset | 18 +++++++++--------- .../Air Constructs}/DroneWorkshop.asset.meta | 0 .../Air Constructs/MissionControl.asset | 4 ++-- .../Constructs/Air Constructs/Trader.asset | 11 ++++++----- .../Constructs/Air Constructs/Yard.asset | 7 ++++--- 6 files changed, 27 insertions(+), 24 deletions(-) rename Assets/Blueprints/Entities/{Crafts/Air Crafts/Shellcores => Constructs/Air Constructs}/DroneWorkshop.asset (83%) rename Assets/Blueprints/Entities/{Crafts/Air Crafts/Shellcores => Constructs/Air Constructs}/DroneWorkshop.asset.meta (100%) diff --git a/Assets/Blueprints/Entities/Constructs/Air Constructs/Core Upgrader.asset b/Assets/Blueprints/Entities/Constructs/Air Constructs/Core Upgrader.asset index 1b103a0cc..b45761859 100644 --- 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/Assets/Blueprints/Entities/Crafts/Air Crafts/Shellcores/DroneWorkshop.asset b/Assets/Blueprints/Entities/Constructs/Air Constructs/DroneWorkshop.asset similarity index 83% rename from Assets/Blueprints/Entities/Crafts/Air Crafts/Shellcores/DroneWorkshop.asset rename to Assets/Blueprints/Entities/Constructs/Air Constructs/DroneWorkshop.asset index 4d87768f7..f9f167e91 100644 --- a/Assets/Blueprints/Entities/Crafts/Air Crafts/Shellcores/DroneWorkshop.asset +++ b/Assets/Blueprints/Entities/Constructs/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/Assets/Blueprints/Entities/Crafts/Air Crafts/Shellcores/DroneWorkshop.asset.meta b/Assets/Blueprints/Entities/Constructs/Air Constructs/DroneWorkshop.asset.meta similarity index 100% rename from Assets/Blueprints/Entities/Crafts/Air Crafts/Shellcores/DroneWorkshop.asset.meta rename to Assets/Blueprints/Entities/Constructs/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 index 8507c5457..6558c750f 100644 --- 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 index 674222abb..45955f80f 100644 --- 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 index 2459307a1..2811c6b27 100644 --- 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}