diff --git a/Assets/CineboxAndrew b/Assets/CineboxAndrew index f3eea1a2..d8d49e30 160000 --- a/Assets/CineboxAndrew +++ b/Assets/CineboxAndrew @@ -1 +1 @@ -Subproject commit f3eea1a250d8367962d59a7d306b2a7075155a1e +Subproject commit d8d49e303bdd463c3f8d5e2d8c6c3f8718d2eeec diff --git a/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-orbitalscanner-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-orbitalscanner-1.mu new file mode 100644 index 00000000..39c5cd26 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-orbitalscanner-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-scanners-2-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-scanners-2-n.dds new file mode 100644 index 00000000..3753a4c3 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-scanners-2-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-scanners-2.dds b/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-scanners-2.dds new file mode 100644 index 00000000..b17a46f3 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-scanners-2.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-surveyscanner-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-surveyscanner-1.mu new file mode 100644 index 00000000..a0ec1b6f Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-surveyscanner-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-scanners.cfg b/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-scanners.cfg index be8ee2b8..45ba3f28 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-scanners.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-scanners.cfg @@ -1,6 +1,8 @@ // Patches applying art changes to ore scanners // Contents: // - Surface Scanning Module (SurfaceScanner) +// - M700 Survey Scanner (SurveyScanner) +// - M4435 Narrow-Band Scanner (OrbitalScanner) // Surface Scanning Module @PART[SurfaceScanner] @@ -23,3 +25,158 @@ evaDistance = 1.5 } } + +// M700 Survey Scanner +@PART[SurveyScanner] +{ + @author = Andrew Cassidy + + !MODEL {} + MODEL + { + model = ReStock/Assets/Resource/restock-surveyscanner-1 + scale = 1.0, 1.0, 1.0 + } + + @MODULE[ModuleAnimationGroup] + { + @deployAnimationName = Deploy + deployEffectName = Deploy + retractEffectName = Retract + } + + EFFECTS + { + Deploy { + AUDIO + { + channel = Ship + clip = ReStock/Sounds/scanner-open + volume = 0.3 + } + } + Retract { + AUDIO + { + channel = Ship + clip = ReStock/Sounds/scanner-close + volume = 0.3 + } + } + } + + MODULE + { + name = ModulePartVariants + baseVariant = Size0 + + VARIANT + { + name = Size0 + displayName = #LOC_Restock_variant-antenna_size0 + themeName = White + primaryColor = #C8C8C8 + secondaryColor = #707070 + GAMEOBJECTS + { + Body_Rad = false + Body_625 = true + Body_125 = false + } + } + + VARIANT + { + name = Size1 + displayName = #LOC_Restock_variant-antenna_size1 + themeName = White + primaryColor = #C8C8C8 + secondaryColor = #707070 + GAMEOBJECTS + { + Body_Rad = false + Body_625 = false + Body_125 = true + } + } + + VARIANT + { + name = Compact + displayName = #LOC_Restock_variant-antenna_compact + themeName = White + primaryColor = #C8C8C8 + secondaryColor = #999999 + GAMEOBJECTS + { + Body_Rad = true + Body_625 = false + Body_125 = false + } + } + } +} + +// M4435 Narrow-Band Scanner +@PART[OrbitalScanner] +{ + @author = Andrew Cassidy + + !mesh = DELETE + MODEL + { + model = ReStock/Assets/Resource/restock-orbitalscanner-1 + } + + @MODULE[ModuleAnimationGroup] + { + @activeAnimationName = Spin + activeEffectName = Active + } + + EFFECTS + { + Active { + AUDIO + { + channel = Ship + clip = ReStock/Sounds/scanner-spin + volume = 0.1 + } + } + } + + MODULE + { + name = ModulePartVariants + baseVariant = Size0 + + VARIANT + { + name = Size0 + displayName = #LOC_Restock_variant-antenna_size0 + themeName = White + primaryColor = #AC6F54 + secondaryColor = #707070 + GAMEOBJECTS + { + Base_Compact = false + Base_625 = true + } + } + + VARIANT + { + name = Compact + displayName = #LOC_Restock_variant-antenna_compact + themeName = White + primaryColor = #AC6F54 + secondaryColor = #545454 + GAMEOBJECTS + { + Base_Compact = true + Base_625 = false + } + } + } +} \ No newline at end of file diff --git a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist index 1dc3f1dd..f2e521bb 100644 --- a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist +++ b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist @@ -116,4 +116,7 @@ Squad/Parts/Resources/SmallTank/ Squad/Parts/Resources/LargeTank/ Squad/Parts/Resources/FuelCell/ Squad/Parts/Resources/MiniDrill/ -Squad/Parts/Resources/RadialDrill/ \ No newline at end of file +Squad/Parts/Resources/RadialDrill/ +Squad/Parts/Resources/SurfaceScanner/ +Squad/Parts/Resources/OrbitalScanner/ +Squad/Parts/Resources/SurveyScanner/ \ No newline at end of file diff --git a/Distribution/Restock/GameData/ReStock/Sounds/scanner-close.ogg b/Distribution/Restock/GameData/ReStock/Sounds/scanner-close.ogg new file mode 100644 index 00000000..0c2664e4 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Sounds/scanner-close.ogg differ diff --git a/Distribution/Restock/GameData/ReStock/Sounds/scanner-open.ogg b/Distribution/Restock/GameData/ReStock/Sounds/scanner-open.ogg new file mode 100644 index 00000000..6f0ac923 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Sounds/scanner-open.ogg differ diff --git a/Distribution/Restock/GameData/ReStock/Sounds/scanner-spin.ogg b/Distribution/Restock/GameData/ReStock/Sounds/scanner-spin.ogg new file mode 100644 index 00000000..29601b0c Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Sounds/scanner-spin.ogg differ diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt index cc9e8f62..47bb1284 100644 --- a/Distribution/Restock/changelog.txt +++ b/Distribution/Restock/changelog.txt @@ -7,6 +7,9 @@ v0.2.0 - Radial Holding Tank (Andrew) - Small Holding Tank (Andrew) - Large Holding Tank (Andrew) + - Surface Scanning Module (Andrew) + - M700 Survey Scanner (Andrew) + - M4435 Narrow-Band Scanner (Andrew) - Electrical - Fuel Cell (Andrew) - Fuel Cell Array (Andrew)