diff --git a/Assets/CineboxAndrew b/Assets/CineboxAndrew index b12e82d8..4e8fd3b0 160000 --- a/Assets/CineboxAndrew +++ b/Assets/CineboxAndrew @@ -1 +1 @@ -Subproject commit b12e82d8474d748d472d7fb50585052ea8067464 +Subproject commit 4e8fd3b0ce692e186bc08119bbd023a976cb2c0d diff --git a/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-oretanks-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-oretank-1-n.dds similarity index 100% rename from Distribution/Restock/GameData/ReStock/Assets/Resource/restock-oretanks-1-n.dds rename to Distribution/Restock/GameData/ReStock/Assets/Resource/restock-oretank-1-n.dds diff --git a/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-oretank-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-oretank-1.dds new file mode 100644 index 00000000..9b2d943f Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-oretank-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-oretank-125.mu b/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-oretank-125-1.mu similarity index 99% rename from Distribution/Restock/GameData/ReStock/Assets/Resource/restock-oretank-125.mu rename to Distribution/Restock/GameData/ReStock/Assets/Resource/restock-oretank-125-1.mu index 4b8ba7b0..c9daf05e 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-oretank-125.mu and b/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-oretank-125-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-oretank-25.mu b/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-oretank-25-1.mu similarity index 94% rename from Distribution/Restock/GameData/ReStock/Assets/Resource/restock-oretank-25.mu rename to Distribution/Restock/GameData/ReStock/Assets/Resource/restock-oretank-25-1.mu index 9d297361..97f20fbf 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-oretank-25.mu and b/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-oretank-25-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-oretank-radial.mu b/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-oretank-radial-1.mu similarity index 98% rename from Distribution/Restock/GameData/ReStock/Assets/Resource/restock-oretank-radial.mu rename to Distribution/Restock/GameData/ReStock/Assets/Resource/restock-oretank-radial-1.mu index 4de55b95..1778dca5 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-oretank-radial.mu and b/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-oretank-radial-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-oretanks-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-oretanks-1.dds deleted file mode 100644 index ae98bf76..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Resource/restock-oretanks-1.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-oretanks.cfg b/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-oretanks.cfg index e50f8b07..8040994d 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-oretanks.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-oretanks.cfg @@ -12,7 +12,7 @@ !mesh = DELETE MODEL { - model = ReStock/Assets/Resource/restock-oretank-radial + model = ReStock/Assets/Resource/restock-oretank-radial-1 } } @@ -24,7 +24,7 @@ !mesh = DELETE MODEL { - model = ReStock/Assets/Resource/restock-oretank-125 + model = ReStock/Assets/Resource/restock-oretank-125-1 } } @@ -36,6 +36,6 @@ !mesh = DELETE MODEL { - model = ReStock/Assets/Resource/restock-oretank-25 + model = ReStock/Assets/Resource/restock-oretank-25-1 } } \ No newline at end of file diff --git a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist index 1193b76d..454810c6 100644 --- a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist +++ b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist @@ -111,6 +111,6 @@ Squad/Parts/Utility/rockomaxAdapters/ Squad/Parts/Utility/ServiceBay/ Squad/Parts/Utility/spotLightMk1/ Squad/Parts/Utility/spotLightMk2/ -Squad/Parts/Resources/RadialTank -Squad/Parts/Resources/SmallTank -Squad/Parts/Resources/LargeTank +Squad/Parts/Resources/RadialTank/ +Squad/Parts/Resources/SmallTank/ +Squad/Parts/Resources/LargeTank/ \ No newline at end of file diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Resource/restock-oretank-1875-1.mu b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Resource/restock-oretank-1875-1.mu new file mode 100644 index 00000000..87239172 Binary files /dev/null and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Resource/restock-oretank-1875-1.mu differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Resource/restock-oretank-2-n.dds b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Resource/restock-oretank-2-n.dds new file mode 100644 index 00000000..4d4283d9 Binary files /dev/null and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Resource/restock-oretank-2-n.dds differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Resource/restock-oretank-2.dds b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Resource/restock-oretank-2.dds new file mode 100644 index 00000000..80755954 Binary files /dev/null and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Resource/restock-oretank-2.dds differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Resource/restock-oretank-375-1.mu b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Resource/restock-oretank-375-1.mu new file mode 100644 index 00000000..adf2bcea Binary files /dev/null and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Resource/restock-oretank-375-1.mu differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg index ac133932..e780dd68 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg @@ -1,4 +1,4 @@ -// Proposed format: +3 Proposed format: // #LOC_RestockPlus_partconfigname_fieldname // eg. // #LOC_RestockPlus_restock-engine-375-3_title = ... @@ -183,5 +183,14 @@ Localization #LOC_RestockPlus_restock-antenna-stack-3_title = Communotron HG-61 #LOC_RestockPlus_restock-antenna-stack-3_description = After developing the venerable HG-55, one of our marketing people came up with the idea of a budget version for small probes. The HG-61 removes the fancy extending arm, while still providing the same great communication range of its predecessor, making it perfect for building deep space probes on a budget. #LOC_RestockPlus_restock-antenna-stack-3_tags = antenna radial transmit data dish Galileo TDRS restock communotron hg 61 + + // Resource + #LOC_RestockPlus_restock-oretank-1875-1_title = Medium Holding Tank + #LOC_RestockPlus_restock-oretank-1875-1_description = A medium tank that can be used for storing raw materials. Warranty void if used to store snacks. + #LOC_RestockPlus_restock-oretank-1875-1_tags = black isru mine )mining (ore resource store restock + + #LOC_RestockPlus_restock-oretank-375-1_title = Jumbo Holding Tank + #LOC_RestockPlus_restock-oretank-375-1_description = A very large tank that can be used for storing raw materials. The manufacturer denies any claims that it has been re-purposed from a local farm + #LOC_RestockPlus_restock-oretank-375-1_tags = black isru mine )mining (ore resource store restock } } diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Resource/restock-oretank-1875-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Resource/restock-oretank-1875-1.cfg new file mode 100644 index 00000000..937c5ada --- /dev/null +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Resource/restock-oretank-1875-1.cfg @@ -0,0 +1,56 @@ +// ReStock+ 0.2.0 +// 1.875m Ore Tank +PART +{ + // --- general parameters --- + name = restock-oretank-1875-1 + module = Part + author = Andrew Cassidy + // --- asset parameters --- + MODEL + { + model = ReStockPlus/Assets/Resource/restock-oretank-1875-1 + } + scale = 1.0 + rescaleFactor = 1 + // --- node definitions --- + node_attach = 0,0,0.9,0,0,-1,2 + node_stack_top = 0.0, 0.9, 0.0, 0.0, 1.0, 0.0, 2 + node_stack_bottom = 0.0, -0.9, 0.0, 0.0, -1.0, 0.0, 2 + // --- editor parameters --- + TechRequired = experimentalScience + entryCost = 6000 + cost = 2000 + category = FuelTank // y tho + subcategory = 0 + title = #LOC_RestockPlus_restock-oretank-1875-1_title //Medium Holding Tank + manufacturer = #autoLOC_501627 //#autoLOC_501627 = Jebediah Kerman's Junkyard and Spacecraft Parts Co + description = #LOC_RestockPlus_restock-oretank-1875-1_description //A medium tank that can be used for storing raw materials. Warranty void if used to store snacks. + + // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision + attachRules = 1,1,1,1,0 + bulkheadProfiles = size1p5 + // --- standard part parameters --- + mass = 1.2 + dragModelType = default + maximum_drag = 0.2 + minimum_drag = 0.2 + angularDrag = 2 + crashTolerance = 7 + maxTemp = 2000 + breakingForce = 5000 + breakingTorque = 5000 + tags = #LOC_RestockPlus_restock-oretank-1875-1_tags //black isru mine )mining (ore resource store restock + + RESOURCE + { + name = Ore + amount = 0 + maxAmount = 800 + } + + MODULE + { + name = ModuleFuelJettison + } +} diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Resource/restock-oretank-375-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Resource/restock-oretank-375-1.cfg new file mode 100644 index 00000000..869398e5 --- /dev/null +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Resource/restock-oretank-375-1.cfg @@ -0,0 +1,55 @@ +// ReStock+ 0.2.0 +// 3.75m Ore Tank +PART +{ + // --- general parameters --- + name = restock-oretank-375-1 + module = Part + author = Andrew Cassidy + // --- asset parameters --- + MODEL + { + model = ReStockPlus/Assets/Resource/restock-oretank-375-1 + } + scale = 1.0 + rescaleFactor = 1 + // --- node definitions --- + node_attach = 0,0,1.85,0,0,-1,3 + node_stack_top = 0.0, 0.9, 0.0, 0.0, 1.0, 0.0, 3 + node_stack_bottom = 0.0, -0.9, 0.0, 0.0, -1.0, 0.0, 3 + // --- editor parameters --- + TechRequired = experimentalScience + entryCost = 12000 + cost = 4000 + category = FuelTank // y tho + subcategory = 0 + title = #LOC_RestockPlus_restock-oretank-375-1_title //Jumbo Holding Tank + manufacturer = #autoLOC_501627 //#autoLOC_501627 = Jebediah Kerman's Junkyard and Spacecraft Parts Co + description = #LOC_RestockPlus_restock-oretank-375-1_description //A very large tank that can be used for storing raw materials. The manufacturer denies any claims that it has been re-purposed from a local farm + // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision + attachRules = 1,1,1,1,0 + bulkheadProfiles = size3 + // --- standard part parameters --- + mass = 4.3 + dragModelType = default + maximum_drag = 0.2 + minimum_drag = 0.2 + angularDrag = 2 + crashTolerance = 7 + maxTemp = 2000 + breakingForce = 5000 + breakingTorque = 5000 + tags = #LOC_RestockPlus_restock-oretank-375-1_tags //black isru mine )mining (ore resource store restock + + RESOURCE + { + name = Ore + amount = 0 + maxAmount = 3500 + } + + MODULE + { + name = ModuleFuelJettison + } +} diff --git a/Distribution/RestockPlus/changelog.txt b/Distribution/RestockPlus/changelog.txt index 0c1223ea..bd5e426e 100644 --- a/Distribution/RestockPlus/changelog.txt +++ b/Distribution/RestockPlus/changelog.txt @@ -2,6 +2,8 @@ v0.2.0 ------ - New Science parts - Experiment Return Unit (Andrew Cassidy): Inline science box + - Medium Holding Tank (Andrew Cassidy): 1.875m Ore Tank + - Jumbo Holding Tank (Andrew Cassidy): 3.75m Ore Tank v0.1.4 ------