diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..4b82ccd9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.vs/ +bin/ +obj/ diff --git a/Assets/blowfish/NormalMaps/mk2FuselageShort_height.psd b/Assets/blowfish/NormalMaps/mk2FuselageShort_height.psd new file mode 100644 index 00000000..9cd67651 Binary files /dev/null and b/Assets/blowfish/NormalMaps/mk2FuselageShort_height.psd differ diff --git a/Assets/blowfish/license.txt b/Assets/blowfish/license.txt new file mode 100644 index 00000000..e3ee94cb --- /dev/null +++ b/Assets/blowfish/license.txt @@ -0,0 +1,437 @@ +Attribution-NonCommercial-ShareAlike 4.0 International + +======================================================================= + +Creative Commons Corporation ("Creative Commons") is not a law firm and +does not provide legal services or legal advice. Distribution of +Creative Commons public licenses does not create a lawyer-client or +other relationship. Creative Commons makes its licenses and related +information available on an "as-is" basis. Creative Commons gives no +warranties regarding its licenses, any material licensed under their +terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the +fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and +conditions that creators and other rights holders may use to share +original works of authorship and other material subject to copyright +and certain other rights specified in the public license below. The +following considerations are for informational purposes only, are not +exhaustive, and do not form part of our licenses. + + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + +======================================================================= + +Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International +Public License + +By exercising the Licensed Rights (defined below), You accept and agree +to be bound by the terms and conditions of this Creative Commons +Attribution-NonCommercial-ShareAlike 4.0 International Public License +("Public License"). To the extent this Public License may be +interpreted as a contract, You are granted the Licensed Rights in +consideration of Your acceptance of these terms and conditions, and the +Licensor grants You such rights in consideration of benefits the +Licensor receives from making the Licensed Material available under +these terms and conditions. + + +Section 1 -- Definitions. + + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + + c. BY-NC-SA Compatible License means a license listed at + creativecommons.org/compatiblelicenses, approved by Creative + Commons as essentially the equivalent of this Public License. + + d. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + + e. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + + f. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + + g. License Elements means the license attributes listed in the name + of a Creative Commons Public License. The License Elements of this + Public License are Attribution, NonCommercial, and ShareAlike. + + h. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + + i. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + + j. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + + k. NonCommercial means not primarily intended for or directed towards + commercial advantage or monetary compensation. For purposes of + this Public License, the exchange of the Licensed Material for + other material subject to Copyright and Similar Rights by digital + file-sharing or similar means is NonCommercial provided there is + no payment of monetary compensation in connection with the + exchange. + + l. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + + m. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + + n. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + + +Section 2 -- Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + + a. reproduce and Share the Licensed Material, in whole or + in part, for NonCommercial purposes only; and + + b. produce, reproduce, and Share Adapted Material for + NonCommercial purposes only. + + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + + 3. Term. The term of this Public License is specified in Section + 6(a). + + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + + 5. Downstream recipients. + + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + + b. Additional offer from the Licensor -- Adapted Material. + Every recipient of Adapted Material from You + automatically receives an offer from the Licensor to + exercise the Licensed Rights in the Adapted Material + under the conditions of the Adapter's License You apply. + + c. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this + Public License. + + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties, including when + the Licensed Material is used other than for NonCommercial + purposes. + + +Section 3 -- License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the +following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified + form), You must: + + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of + warranties; + + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + + b. ShareAlike. + + In addition to the conditions in Section 3(a), if You Share + Adapted Material You produce, the following conditions also apply. + + 1. The Adapter's License You apply must be a Creative Commons + license with the same License Elements, this version or + later, or a BY-NC-SA Compatible License. + + 2. You must include the text of, or the URI or hyperlink to, the + Adapter's License You apply. You may satisfy this condition + in any reasonable manner based on the medium, means, and + context in which You Share Adapted Material. + + 3. You may not offer or impose any additional or different terms + or conditions on, or apply any Effective Technological + Measures to, Adapted Material that restrict exercise of the + rights granted under the Adapter's License You apply. + + +Section 4 -- Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that +apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database for NonCommercial purposes + only; + + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material, + including for purposes of Section 3(b); and + + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not +replace Your obligations under this Public License where the Licensed +Rights include other Copyright and Similar Rights. + + +Section 5 -- Disclaimer of Warranties and Limitation of Liability. + + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + + +Section 6 -- Term and Termination. + + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + + +Section 7 -- Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + + +Section 8 -- Interpretation. + + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + +======================================================================= + +Creative Commons is not a party to its public +licenses. Notwithstanding, Creative Commons may elect to apply one of +its public licenses to material it publishes and in those instances +will be considered the “Licensor.” The text of the Creative Commons +public licenses is dedicated to the public domain under the CC0 Public +Domain Dedication. Except for the limited purpose of indicating that +material is shared under a Creative Commons public license or as +otherwise permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the +public licenses. + +Creative Commons may be contacted at creativecommons.org. diff --git a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-0625-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-0625-1-n.tga new file mode 100644 index 00000000..abe0e1ba Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-0625-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-0625-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-0625-1.mu new file mode 100644 index 00000000..72440203 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-0625-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-0625-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-0625-1.tga new file mode 100644 index 00000000..6828462c Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-0625-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-block-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-block-1.mu new file mode 100644 index 00000000..160fa2d8 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-block-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-blocks-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-blocks-1-n.tga new file mode 100644 index 00000000..3bc01258 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-blocks-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-blocks-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-blocks-1.tga new file mode 100644 index 00000000..9410160d Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-blocks-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-linear-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-linear-1.mu new file mode 100644 index 00000000..e026f2fc Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-linear-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-flood-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-flood-1.mu new file mode 100644 index 00000000..3c703b58 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-flood-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-spot-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-spot-1.mu new file mode 100644 index 00000000..c10c9617 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-spot-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1-e.tga b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1-e.tga new file mode 100644 index 00000000..8b8964a3 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1-e.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1-n.tga new file mode 100644 index 00000000..d4b9d6a5 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1.tga new file mode 100644 index 00000000..2dfa5be7 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-flea-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-flea-1.mu index ddc00d67..c91f9876 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-flea-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-flea-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-hammer-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-hammer-1.mu index a5cdbc59..c4718452 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-hammer-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-hammer-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-shrouds-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-shrouds-1-n.tga new file mode 100644 index 00000000..f4007a20 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-shrouds-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-shrouds-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-shrouds-1.tga new file mode 100644 index 00000000..e5e75126 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-shrouds-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-terrier-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-terrier-1.mu index 92b4cb52..b8aa6b7b 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-terrier-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-terrier-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-adapter-375-fueled-1.mu b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-adapter-375-fueled-1.mu new file mode 100644 index 00000000..d2484d35 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-adapter-375-fueled-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-125-1-dark.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-125-1-dark.tga new file mode 100644 index 00000000..799770d5 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-125-1-dark.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-125-1-orange.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-125-1-orange.tga new file mode 100644 index 00000000..871cb126 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-125-1-orange.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-125-1-white.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-125-1-white.tga new file mode 100644 index 00000000..2fe08c31 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-125-1-white.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-mk2-short-n.dds b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-mk2-short-n.dds new file mode 100644 index 00000000..a4f5a5ec Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-mk2-short-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-rcs-0625-1.mu b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-rcs-0625-1.mu new file mode 100644 index 00000000..82671f4b Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-rcs-0625-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-rcs-125-1.mu b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-rcs-125-1.mu new file mode 100644 index 00000000..6a6c5be6 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-rcs-125-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-rcs-25-1.mu b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-rcs-25-1.mu new file mode 100644 index 00000000..94952687 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-rcs-25-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-rcs-radial-1.mu b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-rcs-radial-1.mu new file mode 100644 index 00000000..63acb445 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-rcs-radial-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-rcs-radial-2.mu b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-rcs-radial-2.mu new file mode 100644 index 00000000..e0da80b6 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-rcs-radial-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-1-n.tga new file mode 100644 index 00000000..c6971ca3 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-1.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-1.tga new file mode 100644 index 00000000..4a33370f Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-2-n.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-2-n.tga new file mode 100644 index 00000000..df333275 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-2-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-2.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-2.tga new file mode 100644 index 00000000..4e19efcc Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-2.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-variants-adapter-375-n.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-variants-adapter-375-n.tga new file mode 100644 index 00000000..c62616dd Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-variants-adapter-375-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-variants-adapter-375.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-variants-adapter-375.tga new file mode 100644 index 00000000..0227581d Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-variants-adapter-375.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-125-0625-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-125-0625-1.mu index 8d3de138..9e2455f1 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-125-0625-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-125-0625-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-125-0625-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-125-0625-2.mu index c8a70125..77c3d4fb 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-125-0625-2.mu and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-125-0625-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1-alt-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1-alt-n.tga new file mode 100644 index 00000000..cd7fdf2b Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1-alt-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1-alt.tga b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1-alt.tga new file mode 100644 index 00000000..c07743fb Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1-alt.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1.mu index ff97152e..8d7c41ac 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1.tga index 897c5788..413fea28 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1.tga and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-2.mu index e5625765..1eb09b53 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-2.mu and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-1-n.tga new file mode 100644 index 00000000..f60c93df Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-1.mu index 7e4eecd5..96a158b9 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-1.tga new file mode 100644 index 00000000..cac2cfac Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-2.mu new file mode 100644 index 00000000..65e588aa Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-3.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-3.mu new file mode 100644 index 00000000..ad9505ba Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-3.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1-alt-b.tga b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1-alt-b.tga new file mode 100644 index 00000000..632bca81 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1-alt-b.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1-alt-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1-alt-n.tga new file mode 100644 index 00000000..906ed126 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1-alt-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1-alt.tga b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1-alt.tga new file mode 100644 index 00000000..0edd4799 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1-alt.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1.mu index c299ea81..6925c18f 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg b/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg index 4844f6ad..820978fe 100644 --- a/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg +++ b/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg @@ -38,5 +38,8 @@ Localization #LOC_Restock_variant-heat-shield-brown = Classic #LOC_Restock_variant-heat-shield-red = Unpainted + #LOC_Restock_variant-linear-rcs-pod = Podded + #LOC_Restock_variant-linear-rcs-bare = Bare + } } diff --git a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-0625.cfg b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-0625.cfg new file mode 100644 index 00000000..2f471254 --- /dev/null +++ b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-0625.cfg @@ -0,0 +1,15 @@ +// Patches applying art changes to 0.625m aerodynamic parts +// Contents: +// - Small Nose Cone (standardNoseCone) + +@PART[standardNoseCone] +{ + @author = Chris Adderley (Nertea) + + !mesh = DELETE + !MODEL {} + MODEL { + model = ReStock/Assets/Aero/restock-nosecone-0625-1 + } + +} diff --git a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-125.cfg b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-125.cfg index c8eee626..09441d3f 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-125.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-125.cfg @@ -1,6 +1,8 @@ // Patches applying art changes to 1.25m aerodynamic parts // Contents: // - Aerodynamic Nose Cone (noseCone) +// - Advanced Nose Cone - Type A (pointyNoseConeA) +// - Advanced Nose Cone - Type B (pointyNoseConeB) @PART[noseCone] { @@ -11,4 +13,228 @@ MODEL { model = ReStock/Assets/Structural/restock-nosecone-125-1 } + !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = BlackAndWhite + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + 125mConeBlackWhite = true + 125mConeWhite = false + 125mConeDark = false + 125mConeOrange = false + } + } + + VARIANT + { + name = Dark + displayName = #autoLOC_8007117 + themeName = Dark + primaryColor = #4c4f47 + secondaryColor = #4c4f47 + GAMEOBJECTS + { + 125mConeBlackWhite = false + 125mConeWhite = false + 125mConeDark = true + 125mConeOrange = false + } + } + VARIANT + { + name = White + displayName = #autoLOC_8007119 + themeName = White + primaryColor = #ffffff + secondaryColor = #ffffff + GAMEOBJECTS + { + 125mConeBlackWhite = false + 125mConeWhite = true + 125mConeDark = false + 125mConeOrange = false + } + } + VARIANT + { + name = Orange + displayName = #autoLOC_8007121 + themeName = Orange + primaryColor = #4c4f47 + secondaryColor = #f49841 + GAMEOBJECTS + { + 125mConeBlackWhite = false + 125mConeWhite = false + 125mConeDark = false + 125mConeOrange = true + } + } + } +} + +@PART[pointyNoseConeA] +{ + @author = Chris Adderley (Nertea) + + !mesh = DELETE + !MODEL {} + MODEL { + model = ReStock/Assets/Structural/restock-nosecone-125-2 + } + !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = White + VARIANT + { + name = White + displayName = #autoLOC_8007119 + themeName = White + primaryColor = #ffffff + secondaryColor = #ffffff + GAMEOBJECTS + { + 125SharpConeDark = false + 125SharpConeWhite = true + 125SharpConeBlackWhite = false + 125SharpConeOrange = false + } + } + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + 125SharpConeDark = false + 125SharpConeWhite = false + 125SharpConeBlackWhite = true + 125SharpConeOrange = false + + } + } + VARIANT + { + name = Orange + displayName = #autoLOC_8007121 + themeName = Orange + primaryColor = #4c4f47 + secondaryColor = #f49841 + GAMEOBJECTS + { + 125SharpConeDark = false + 125SharpConeWhite = false + 125SharpConeBlackWhite = false + 125SharpConeOrange = true + } + } + VARIANT + { + name = Dark + displayName = #autoLOC_8007117 + themeName = Dark + primaryColor = #4c4f47 + secondaryColor = #4c4f47 + GAMEOBJECTS + { + 125SharpConeDark = true + 125SharpConeWhite = false + 125SharpConeBlackWhite = false + 125SharpConeOrange = false + } + } + } + !MODULE[ModuleAnimateHeat] {} +} + +@PART[pointyNoseConeB] +{ + @author = Chris Adderley (Nertea) + + !mesh = DELETE + !MODEL {} + MODEL { + model = ReStock/Assets/Structural/restock-nosecone-125-3 + } + !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = White + VARIANT + { + name = White + displayName = #autoLOC_8007119 + themeName = White + primaryColor = #ffffff + secondaryColor = #ffffff + GAMEOBJECTS + { + 125mBentConeDark = false + 125mBentConeWhite = true + 125mBentConeBlackandWhite = false + 125mBentConeOrange = false + } + } + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + 125mBentConeDark = false + 125mBentConeWhite = false + 125mBentConeBlackandWhite = true + 125mBentConeOrange = false + } + } + VARIANT + { + name = Orange + displayName = #autoLOC_8007121 + themeName = Orange + primaryColor = #4c4f47 + secondaryColor = #f49841 + GAMEOBJECTS + { + 125mBentConeDark = false + 125mBentConeWhite = false + 125mBentConeBlackandWhite = false + 125mBentConeOrange = true + } + } + VARIANT + { + name = Dark + displayName = #autoLOC_8007117 + themeName = Dark + primaryColor = #4c4f47 + secondaryColor = #4c4f47 + GAMEOBJECTS + { + 125mBentConeDark = true + 125mBentConeWhite = false + 125mBentConeBlackandWhite = false + 125mBentConeOrange = false + } + } + } + !MODULE[ModuleAnimateHeat] {} } diff --git a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-25.cfg b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-25.cfg index 58f0b28f..c2de8a5c 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-25.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-25.cfg @@ -1,8 +1,8 @@ // Patches applying art changes to 2.5m aerodynamic parts // Contents: -// - Protective Rocket Nose Cone Mk7 (rocketNoseCone) +// - Protective Rocket Nose Cone Mk7 (rocketNoseCone_v2) -@PART[rocketNoseCone] +@PART[rocketNoseCone_v2] { @author = Chris Adderley (Nertea) @@ -11,4 +11,54 @@ MODEL { model = ReStock/Assets/Structural/restock-nosecone-25-1 } + !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = White + VARIANT + { + name = White + displayName = #autoLOC_8007119 + themeName = White + primaryColor = #ffffff + secondaryColor = #ffffff + GAMEOBJECTS + { + 25mNoseconeBlackWhite = false + 25mNoseconeWhite = true + 25mNoseconeOrange = false + } + } + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + 25mNoseconeBlackWhite = true + 25mNoseconeWhite = false + 25mNoseconeOrange = false + } + + } + + VARIANT + { + name = Orange + displayName = #autoLOC_8007121 + themeName = Orange + primaryColor = #4c4f47 + secondaryColor = #f49841 + GAMEOBJECTS + { + 25mNoseconeBlackWhite = false + 25mNoseconeWhite = false + 25mNoseconeOrange = true + } + } + } } diff --git a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg new file mode 100644 index 00000000..428909ce --- /dev/null +++ b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg @@ -0,0 +1,45 @@ +// Patches applying art changes to lights +// Contents: +// - Illuminator Mk1 (spotLight1) +// - Illuminator Mk2 (spotLight2) + +// Spotlight +@PART[spotLight1] +{ + @author = Chris Adderley (Nertea) + !mesh = DELETE + !MODEL,* {} + MODEL + { + model = ReStock/Assets/Electrical/restock-light-spot-1 + position = 0.0, 0.0, 0.0 + scale = 1,1,1 + rotation = 0, 0, 0 + } + + @MODULE[ModuleLight] + { + @animationName = RestockSpotLight_On + @lightName = Spot + } + +} +// Floodlight +@PART[spotLight2] +{ + @author = Chris Adderley (Nertea) + !mesh = DELETE + !MODEL,* {} + MODEL + { + model = ReStock/Assets/Electrical/restock-light-flood-1 + position = 0.0, 0.0, 0.0 + scale = 1,1,1 + rotation = 0, 0, 0 + } + @MODULE[ModuleLight] + { + @animationName = RestockFloodLight_On + @lightName = Spot + } +} diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-ion-0625.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-ion-0625.cfg index 944fc440..7173a269 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-ion-0625.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-ion-0625.cfg @@ -67,909 +67,3 @@ jettisonDirection = 0 0 1 } } - -// Spider -@PART[radialEngineMini] -{ - @author = Chris Adderley (Nertea) - - !mesh = DELETE - !MODEL {} - MODEL { - model = ReStock/Assets/Engine/restock-engine-spider-1 - } - !EFFECTS {} - EFFECTS - { - engage - { - AUDIO - { - channel = Ship - clip = sound_vent_soft - volume = 1.0 - pitch = 2.0 - loop = false - } - } - flameout - { - PREFAB_PARTICLE - { - prefabName = fx_exhaustSparks_flameout_2 - transformName = thrustTransform - oneShot = true - } - AUDIO - { - channel = Ship - clip = sound_explosion_low - volume = 1.0 - pitch = 2.0 - loop = false - } - } - fx-spider-running - { - AUDIO - { - channel = Ship - clip = sound_rocket_mini - volume = 0.0 0.0 - volume = 1.0 0.3 - pitch = 0.0 0.75 - pitch = 1.0 1.5 - loop = true - } - - MODEL_MULTI_PARTICLE - { - name = core - modelName = ReStock/FX/restock-fx-ant-1 - transformName = fxTransform - emission = 0.0 0.0 - emission = 0.01 0.1 - emission = 0.075 0.25 - emission = 1.0 1.0 - speed = 0.0 0.35 - speed = 1.0 1.0 - } - } - } - @MODULE[ModuleEnginesFX] - { - @runningEffectName = fx-spider-running - } - @MODULE[ModuleGimbal] - { - @gimbalTransformName = B_Gimbal - } - MODULE - { - name = FXModuleLookAtConstraint - CONSTRAINLOOKFX - { - targetName = CylTop001 - rotatorsName = Cyl001 - } - CONSTRAINLOOKFX - { - targetName = CylTop002 - rotatorsName = Cyl002 - } - CONSTRAINLOOKFX - { - targetName = Cyl001 - rotatorsName = CylTop001 - } - CONSTRAINLOOKFX - { - targetName = Cyl002 - rotatorsName = CylTop002 - } - } - !MODULE[FXModuleAnimateThrottle] {} - MODULE - { - name = FXModuleThrottleEffects - fxModuleNames = heatColor - responseSpeed = 0.005 - dependOnEngineState = True - dependOnThrottle = True - } - MODULE - { - name = FXModuleThrottleEffects - fxModuleNames = throttleColor - responseSpeed = 1.0 - dependOnEngineState = True - dependOnThrottle = True - } - - MODULE - { - name = ModuleColorChanger - moduleID = heatColor - animRate = 0.05 - shaderProperty = _EmissiveColor - excludedRenderer = EngineCore - toggleInEditor = false - toggleInFlight = false - redCurve - { - key = 0 1 - key = 1 1 - } - greenCurve - { - key = 0 1 - key = 1 1 - } - blueCurve - { - key = 0 1 - key = 1 1 - } - alphaCurve - { - key = 0 0 - key = 1 1 - } - } - MODULE - { - name = ModuleColorChanger - moduleID = throttleColor - animRate = 1 - shaderProperty = _EmissiveColor - includedRenderer = EngineCore - toggleInEditor = false - toggleInFlight = false - redCurve - { - key = 0 1 - key = 1 1 - } - greenCurve - { - key = 0 1 - key = 1 1 - } - blueCurve - { - key = 0 1 - key = 1 1 - } - alphaCurve - { - key = 0 0 - key = 1 1 - } - } -} - -// Spark -@PART[liquidEngineMini] -{ - @author = Chris Adderley (Nertea) - - !mesh = DELETE - !MODEL {} - MODEL { - model = ReStock/Assets/Engine/restock-engine-spark-1 - } - %node_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 3 - @attachRules = 1,1,1,0,0 - !EFFECTS {} - EFFECTS - { - engage - { - AUDIO - { - channel = Ship - clip = sound_vent_medium - volume = 1.0 - pitch = 2.0 - loop = false - } - } - disengage - { - AUDIO - { - channel = Ship - clip = sound_vent_soft - loop = false - } - } - flameout - { - PREFAB_PARTICLE - { - prefabName = fx_exhaustSparks_flameout_2 - transformName = thrustTransform - oneShot = true - } - AUDIO - { - channel = Ship - clip = sound_explosion_low - volume = 1.0 - pitch = 2.0 - loop = false - } - } - fx-spark-running - { - AUDIO - { - channel = Ship - clip = sound_rocket_mini - volume = 0.0 0.0 - volume = 1.0 1.0 - pitch = 0.0 0.75 - pitch = 1.0 0.95 - loop = true - } - - MODEL_MULTI_PARTICLE - { - name = core - modelName = ReStock/FX/restock-fx-spark-core-1 - transformName = fxTransformCore - emission = 0.0 0.0 - emission = 0.01 0.1 - emission = 0.075 0.25 - emission = 1.0 1.0 - speed = 0.0 0.35 - speed = 1.0 1.0 - } - MODEL_MULTI_PARTICLE - { - name = plume - modelName = ReStock/FX/restock-fx-spark-plume-1 - transformName = fxTransformPlume - emission = 0.0 0.0 - emission = 0.01 0.1 - emission = 0.075 0.25 - emission = 1.0 1.0 - speed = 0.0 0.35 - speed = 1.0 1.0 - } - MODEL_MULTI_PARTICLE - { - name = turbo - modelName = ReStock/FX/restock-fx-spark-turbo-1 - transformName = fxTransformTurbo - emission = 0.0 0.0 - emission = 0.01 0.1 - emission = 0.075 0.25 - emission = 1.0 1.0 - speed = 0.0 0.35 - speed = 1.0 1.0 - } - } - } - MODULE - { - name = FXModuleLookAtConstraint - - // Basic - - CONSTRAINLOOKFX - { - targetName = CylBot001 - rotatorsName = CylTop001 - } - CONSTRAINLOOKFX - { - targetName = CylBot002 - rotatorsName = CylTop002 - } - CONSTRAINLOOKFX - { - targetName = CylTop001 - rotatorsName = CylBot001 - } - CONSTRAINLOOKFX - { - targetName = CylTop002 - rotatorsName = CylBot002 - } - CONSTRAINLOOKFX - { - targetName = CylBot003 - rotatorsName = CylTop003 - } - CONSTRAINLOOKFX - { - targetName = CylBot004 - rotatorsName = CylTop004 - } - CONSTRAINLOOKFX - { - targetName = CylTop003 - rotatorsName = CylBot003 - } - CONSTRAINLOOKFX - { - targetName = CylTop004 - rotatorsName = CylBot004 - } - CONSTRAINLOOKFX - { - targetName = CylBot005 - rotatorsName = CylTop005 - } - CONSTRAINLOOKFX - { - targetName = CylBot006 - rotatorsName = CylTop006 - } - CONSTRAINLOOKFX - { - targetName = CylTop005 - rotatorsName = CylBot005 - } - CONSTRAINLOOKFX - { - targetName = CylTop006 - rotatorsName = CylBot006 - } - - } - @MODULE[ModuleGimbal] - { - @gimbalTransformName = B_Gimbal - } - MODULE - { - name = ModulePartVariants - baseVariant = Size0 - VARIANT - { - name = Size0 - displayName = #LOC_Restock_variant-engine_size0 - primaryColor = #999999 - secondaryColor = #da8544 - GAMEOBJECTS - { - SparkBasic = true - CylBot001 = false - CylBot002 = false - CylBot003 = true - CylBot004 = true - CylBot005 = false - CylBot006 = false - SparkCompact = false - SparkBoattail = false - AdditionalColliders = false - } - } - VARIANT - { - name = Boattail - displayName = #LOC_Restock_variant-engine_boattail - primaryColor = #da8544 - secondaryColor = #999999 - GAMEOBJECTS - { - SparkBasic = false - CylBot001 = false - CylBot002 = false - CylBot003 = false - CylBot004 = false - CylBot005 = true - CylBot006 = true - SparkCompact = false - SparkBoattail = true - AdditionalColliders = true - } - - } - VARIANT - { - name = Compact - displayName = #LOC_Restock_variant-engine_compact - primaryColor = #999999 - secondaryColor = #555555 - GAMEOBJECTS - { - SparkBasic = false - CylBot001 = true - CylBot002 = true - CylBot003 = false - CylBot004 = false - CylBot005 = false - CylBot006 = false - SparkCompact = true - SparkBoattail = false - AdditionalColliders = true - - } - } - } - @MODULE[ModuleEnginesFX] - { - %runningEffectName = fx-spark-running - } - !MODULE[FXModuleAnimateThrottle] {} - MODULE - { - name = FXModuleThrottleEffects - fxModuleNames = heatColor - responseSpeed = 0.005 - dependOnEngineState = True - dependOnThrottle = True - } - MODULE - { - name = FXModuleThrottleEffects - fxModuleNames = throttleColor - responseSpeed = 1.0 - dependOnEngineState = True - dependOnThrottle = True - } - - MODULE - { - name = ModuleColorChanger - moduleID = heatColor - animRate = 0.0005 - shaderProperty = _EmissiveColor - excludedRenderer = EngineCore - toggleInEditor = false - toggleInFlight = false - redCurve - { - key = 0 1 - key = 1 1 - } - greenCurve - { - key = 0 1 - key = 1 1 - } - blueCurve - { - key = 0 1 - key = 1 1 - } - alphaCurve - { - key = 0 0 - key = 1 1 - } - } - MODULE - { - name = ModuleColorChanger - moduleID = throttleColor - animRate = 1 - shaderProperty = _EmissiveColor - includedRenderer = EngineCore - toggleInEditor = false - toggleInFlight = false - redCurve - { - key = 0 1 - key = 1 1 - } - greenCurve - { - key = 0 1 - key = 1 1 - } - blueCurve - { - key = 0 1 - key = 1 1 - } - alphaCurve - { - key = 0 0 - key = 1 1 - } - } - @MODULE[ModuleJettison] - { - @jettisonName = ShroudSparkBasic - } -} - -// Twitch -@PART[smallRadialEngine] -{ - @author = Chris Adderley (Nertea) - - !mesh = DELETE - !MODEL {} - MODEL { - model = ReStock/Assets/Engine/restock-engine-twitch-1 - } - !EFFECTS {} - EFFECTS - { - engage - { - AUDIO - { - channel = Ship - clip = sound_vent_medium - volume = 1.0 - pitch = 2.0 - loop = false - } - } - disengage - { - AUDIO - { - channel = Ship - clip = sound_vent_soft - loop = false - } - } - flameout - { - PREFAB_PARTICLE - { - prefabName = fx_exhaustSparks_flameout_2 - transformName = thrustTransform - oneShot = true - } - AUDIO - { - channel = Ship - clip = sound_explosion_low - volume = 1.0 - pitch = 2.0 - loop = false - } - } - fx-twitch-running - { - AUDIO - { - channel = Ship - clip = sound_rocket_mini - volume = 0.0 0.0 - volume = 1.0 1.0 - pitch = 0.0 0.8 - pitch = 1.0 1.0 - loop = true - } - MODEL_MULTI_PARTICLE - { - name = turbo - modelName = ReStock/FX/restock-fx-spark-turbo-1 - transformName = fxTransformTurbo - emission = 0.0 0.0 - emission = 0.01 0.1 - emission = 0.075 0.25 - emission = 1.0 1.0 - speed = 0.0 0.35 - speed = 1.0 1.0 - } - MODEL_MULTI_PARTICLE - { - name = core - modelName = ReStock/FX/restock-fx-spark-core-1 - transformName = fxTransformCore - emission = 0.0 0.0 - emission = 0.01 0.1 - emission = 0.075 0.25 - emission = 1.0 1.0 - speed = 0.0 0.35 - speed = 1.0 1.0 - } - MODEL_MULTI_PARTICLE - { - name = plume - modelName = ReStock/FX/restock-fx-spark-plume-1 - transformName = fxTransformPlume - emission = 0.0 0.0 - emission = 0.01 0.1 - emission = 0.075 0.25 - emission = 1.0 1.0 - speed = 0.0 0.35 - speed = 1.0 1.0 - } - } - } - MODULE - { - name = FXModuleLookAtConstraint - - // Ringed - CONSTRAINLOOKFX - { - targetName = CyBotRad001 - rotatorsName = CylTopRad001 - } - CONSTRAINLOOKFX - { - targetName = CyBotRad002 - rotatorsName = CylTopRad002 - } - CONSTRAINLOOKFX - { - targetName = CylTopRad001 - rotatorsName = CyBotRad001 - } - CONSTRAINLOOKFX - { - targetName = CylTopRad002 - rotatorsName = CyBotRad002 - } - } - @MODULE[ModuleEnginesFX] - { - runningEffectName = fx-twitch-running - } - @MODULE[ModuleGimbal] - { - @gimbalTransformName = B_Gimbal - } - !MODULE[FXModuleAnimateThrottle] {} - MODULE - { - name = FXModuleThrottleEffects - fxModuleNames = heatColor - responseSpeed = 0.005 - dependOnEngineState = True - dependOnThrottle = True - } - MODULE - { - name = FXModuleThrottleEffects - fxModuleNames = throttleColor - responseSpeed = 1.0 - dependOnEngineState = True - dependOnThrottle = True - } - - MODULE - { - name = ModuleColorChanger - moduleID = heatColor - animRate = 0.05 - shaderProperty = _EmissiveColor - excludedRenderer = EngineCore - toggleInEditor = false - toggleInFlight = false - redCurve - { - key = 0 1 - key = 1 1 - } - greenCurve - { - key = 0 1 - key = 1 1 - } - blueCurve - { - key = 0 1 - key = 1 1 - } - alphaCurve - { - key = 0 0 - key = 1 1 - } - } - MODULE - { - name = ModuleColorChanger - moduleID = throttleColor - animRate = 1 - shaderProperty = _EmissiveColor - includedRenderer = EngineCore - toggleInEditor = false - toggleInFlight = false - redCurve - { - key = 0 1 - key = 1 1 - } - greenCurve - { - key = 0 1 - key = 1 1 - } - blueCurve - { - key = 0 1 - key = 1 1 - } - alphaCurve - { - key = 0 0 - key = 1 1 - } - } - -} - -// Puff -@PART[omsEngine] -{ - @author = Chris Adderley (Nertea) - - !mesh = DELETE - !MODEL {} - MODEL { - model = ReStock/Assets/Engine/restock-engine-puff-1 - } - !EFFECTS {} - EFFECTS - { - engage - { - AUDIO - { - channel = Ship - clip = sound_vent_soft - volume = 1.0 - pitch = 2.0 - loop = false - } - } - flameout - { - PREFAB_PARTICLE - { - prefabName = fx_exhaustSparks_flameout_2 - transformName = thrustTransform - oneShot = true - } - AUDIO - { - channel = Ship - clip = sound_explosion_low - volume = 1.0 - pitch = 2.0 - loop = false - } - } - fx-puff-running - { - AUDIO - { - channel = Ship - clip = sound_rocket_mini - volume = 0.0 0.0 - volume = 1.0 0.5 - pitch = 0.0 0.5 - pitch = 1.0 1.0 - loop = true - } - - MODEL_MULTI_PARTICLE - { - name = plume - modelName = ReStock/FX/restock-fx-puff-1 - transformName = fxTransform - emission = 0.0 0.0 - emission = 0.01 0.1 - emission = 0.075 0.25 - emission = 1.0 1.0 - speed = 0.0 0.35 - speed = 1.0 1.0 - } - } - } - - MODULE - { - name = FXModuleLookAtConstraint - - // Ringed - CONSTRAINLOOKFX - { - targetName = Cyl005 - rotatorsName = CylTop005 - } - CONSTRAINLOOKFX - { - targetName = Cyl006 - rotatorsName = CylTop006 - } - CONSTRAINLOOKFX - { - targetName = CylTop005 - rotatorsName = Cyl005 - } - CONSTRAINLOOKFX - { - targetName = CylTop006 - rotatorsName = Cyl006 - } - - } - @MODULE[ModuleEnginesFX] - { - @runningEffectName = fx-puff-running - } - - !MODULE[FXModuleAnimateThrottle] {} - MODULE - { - name = FXModuleThrottleEffects - fxModuleNames = heatColor - responseSpeed = 0.005 - dependOnEngineState = True - dependOnThrottle = True - } - MODULE - { - name = FXModuleThrottleEffects - fxModuleNames = throttleColor - responseSpeed = 1.0 - dependOnEngineState = True - dependOnThrottle = True - } - - MODULE - { - name = ModuleColorChanger - moduleID = heatColor - animRate = 0.05 - shaderProperty = _EmissiveColor - excludedRenderer = EngineCore - toggleInEditor = false - toggleInFlight = false - redCurve - { - key = 0 1 - key = 1 1 - } - greenCurve - { - key = 0 1 - key = 1 1 - } - blueCurve - { - key = 0 1 - key = 1 1 - } - alphaCurve - { - key = 0 0 - key = 1 1 - } - } - MODULE - { - name = ModuleColorChanger - moduleID = throttleColor - animRate = 1 - shaderProperty = _EmissiveColor - includedRenderer = EngineCore - toggleInEditor = false - toggleInFlight = false - redCurve - { - key = 0 1 - key = 1 1 - } - greenCurve - { - key = 0 1 - key = 1 1 - } - blueCurve - { - key = 0 1 - key = 1 1 - } - alphaCurve - { - key = 0 0 - key = 1 1 - } - } -} diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg index 8e87e9df..1534f44b 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg @@ -2,7 +2,7 @@ // Contents: // - LV-1 "Ant" Liquid Fuel Engine (microEngine) // - LV-1R "Spider" Liquid Fuel Engine (radialEngineMini) -// - 48-7S "Spark" Liquid Fuel Engine (liquidEngineMini) +// - 48-7S "Spark" Liquid Fuel Engine (liquidEngineMini_v2) // - 24-77 "Twitch" Liquid Fuel Engine (smallRadialEngine) // - O-10 "Puff" MonoPropellant Fuel Engine (omsEngine) @@ -350,7 +350,7 @@ } // Spark -@PART[liquidEngineMini] +@PART[liquidEngineMini_v2] { @author = Chris Adderley (Nertea) @@ -524,6 +524,7 @@ { @gimbalTransformName = B_Gimbal } + !MODULE[ModulePartVariants] {} MODULE { name = ModulePartVariants diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg index 8bb3ecbf..704b3572 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg @@ -2,7 +2,7 @@ // Contents: // - LV-N "Nerv" Atomic Rocket Motor (nuclearEngine) // - S3 KS-25 "Vector" Liquid Fuel Engine (SSME) -// - LV-909 "Terrier" Liquid Fuel Engine (liquidEngine3) +// - LV-909 "Terrier" Liquid Fuel Engine (liquidEngine3_v2) // - LV-T45 "Swivel" Liquid Fuel Engine (liquidEngine2) // - LV-T30 "Reliant" Liquid Fuel Engine (liquidEngine) @@ -12,7 +12,7 @@ @author = Chris Adderley (Nertea) !mesh = DELETE - !MODEL = {} + !MODEL {} MODEL { model = ReStock/Assets/Engine/restock-engine-nerv-1 } @@ -156,7 +156,7 @@ @author = Chris Adderley (Nertea) !mesh = DELETE - !MODEL = {} + !MODEL {} MODEL { model = ReStock/Assets/Engine/restock-engine-vector-1 } @@ -433,18 +433,17 @@ // Terrier -@PART[liquidEngine3] +@PART[liquidEngine3_v2] { @author = Porkjet and Chris Adderley (Nertea) !mesh = DELETE - !MODEL = {} + !MODEL {} MODEL { model = ReStock/Assets/Engine/restock-engine-terrier-1 } - %rescaleFactor = 1 - %node_attach = 0.0, 23.0, 0.0, 0.0, 1.0, 0.0, 1 + node_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 1 @attachRules = 1,1,1,0,0 !fx_exhaustFlame_blue = DELETE @@ -521,8 +520,9 @@ } @bulkheadProfiles = srf, size1 - @node_stack_top = 0.0, 28.75, 0.0, 0.0, 1.0, 0.0, 1 - @node_stack_bottom = 0.0, -47.281375, 0.0, 0.0, -1.0, 0.0, 1 + + !MODULE[ModulePartVariants] {} + MODULE { name = ModulePartVariants diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-rcs.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-rcs.cfg new file mode 100644 index 00000000..4d1f557f --- /dev/null +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-rcs.cfg @@ -0,0 +1,60 @@ +// Patches applying art changes to RCS blocks +// Contents: +// - RV-105 RCS Thruster Block (RCSBlock) +// - Place-Anywhere 7 Linear RCS Port (linearRcs) + +// RCS block +@PART[RCSBlock] +{ + @author = Chris Adderley (Nertea) + + !mesh = DELETE + !MODEL {} + MODEL { + model = ReStock/Assets/Control/restock-rcs-block-1 + } +} + +// Linear RCS port +@PART[linearRcs] +{ + @author = Chris Adderley (Nertea) + + !mesh = DELETE + !MODEL {} + MODEL { + model = ReStock/Assets/Control/restock-rcs-linear-1 + } + + MODULE + { + name = ModulePartVariants + baseVariant = Pod + VARIANT + { + name = Pod + displayName = #LOC_Restock_variant-linear-rcs-pod + primaryColor = #ffffff + secondaryColor = #ffffff + GAMEOBJECTS + { + RCSLinear = true + RCSLinearBase = false + } + } + VARIANT + { + name = Bare + displayName = #LOC_Restock_variant-linear-rcs-bare + + primaryColor = #999999 + secondaryColor = #999999 + GAMEOBJECTS + { + RCSLinear = false + RCSLinearBase = true + } + } + } + +} diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-125.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-125.cfg index 425c3f18..da2b3475 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-125.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-125.cfg @@ -1,9 +1,9 @@ // Patches applying art changes to 1.25m SRB engines // Contents: -// - Kickback (MassiveBooster) -// - Thumper (solidBooster1-1) -// - Hammer (solidBooster) -// - Flea (solidBooster_sm_v2) +// - S1 SRB-KD25k "Kickback" Solid Fuel Booster (MassiveBooster) +// - BACC "Thumper" Solid Fuel Booster (solidBooster1-1) +// - RT-10 "Hammer" Solid Fuel Booster (solidBooster_v2) +// - RT-5 "Flea" Solid Fuel Booster (solidBooster_sm_v2) // - Separatron I (sepMotor1) // Kickback @@ -426,6 +426,10 @@ } } } + @MODULE[ModuleJettison] + { + @jettisonName = ShroudSRB + } } // Flea @@ -566,6 +570,10 @@ } } } + @MODULE[ModuleJettison] + { + @jettisonName = ShroudSRB + } } // Separatron @PART[sepMotor1] { diff --git a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-125.cfg b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-125.cfg index 5dee4da7..15d0bde8 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-125.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-125.cfg @@ -7,7 +7,7 @@ @PART[fuelTankSmallFlat] { - @author = Porkjet + @author = Porkjet and Chris Adderley (Nertea) !mesh = DELETE !MODEL {} @@ -15,11 +15,72 @@ model = ReStock/Assets/FuelTank/restock-fueltank-125-4 } !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = BlackAndWhite + VARIANT + { + name = Dark + displayName = #autoLOC_8007117 + themeName = Dark + primaryColor = #4c4f47 + secondaryColor = #4c4f47 + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-dark + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Bumped Specular + } + } + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1 + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Bumped Specular + } + } + VARIANT + { + name = White + displayName = #autoLOC_8007119 + themeName = White + primaryColor = #ffffff + secondaryColor = #ffffff + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-white + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Specular + } + } + VARIANT + { + name = GrayAndOrange + displayName = #autoLOC_8007121 + themeName = GrayAndOrange + primaryColor = #4c4f47 + secondaryColor = #f49841 + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-orange + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Specular + } + } + } } @PART[fuelTankSmall] { - @author = Porkjet + @author = Porkjet and Chris Adderley (Nertea) // @node_stack_top = 0.0, 5.5525, 0.0, 0.0, 1.0, 0.0 // @node_stack_bottom = 0.0, -5.5525, 0.0, 0.0, -1.0, 0.0 // @node_attach = 6.2625, 0.0, 0.0, 1.0, 0.0, 0.0, 1 @@ -30,11 +91,72 @@ } %rescaleFactor = 1 !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = BlackAndWhite + VARIANT + { + name = Dark + displayName = #autoLOC_8007117 + themeName = Dark + primaryColor = #4c4f47 + secondaryColor = #4c4f47 + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-dark + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Bumped Specular + } + } + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1 + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Bumped Specular + } + } + VARIANT + { + name = White + displayName = #autoLOC_8007119 + themeName = White + primaryColor = #ffffff + secondaryColor = #ffffff + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-white + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Specular + } + } + VARIANT + { + name = GrayAndOrange + displayName = #autoLOC_8007121 + themeName = GrayAndOrange + primaryColor = #4c4f47 + secondaryColor = #f49841 + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-orange + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Specular + } + } + } } @PART[fuelTank] { - @author = Porkjet + @author = Porkjet and Chris Adderley (Nertea) !mesh = DELETE !MODEL {} @@ -43,6 +165,67 @@ } %rescaleFactor = 1 !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = BlackAndWhite + VARIANT + { + name = Dark + displayName = #autoLOC_8007117 + themeName = Dark + primaryColor = #4c4f47 + secondaryColor = #4c4f47 + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-dark + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Bumped Specular + } + } + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1 + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Bumped Specular + } + } + VARIANT + { + name = White + displayName = #autoLOC_8007119 + themeName = White + primaryColor = #ffffff + secondaryColor = #ffffff + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-white + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Specular + } + } + VARIANT + { + name = GrayAndOrange + displayName = #autoLOC_8007121 + themeName = GrayAndOrange + primaryColor = #4c4f47 + secondaryColor = #f49841 + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-orange + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Specular + } + } + } // @node_stack_top = 0.0, 9.81725, 0.0, 0.0, 1.0, 0.0 // @node_stack_bottom = 0.0, -9.12500, 0.0, 0.0, -1.0, 0.0 // @node_attach = 6.2625, 0.0, 0.0, 1.0, 0.0, 0.0, 1 @@ -50,7 +233,7 @@ @PART[fuelTank_long] { - @author = Porkjet + @author = Porkjet and Chris Adderley (Nertea) // @node_stack_top = 0.0, 18.75, 0.0, 0.0, 1.0, 0.0 // @node_stack_bottom = 0.0, -18.87500, 0.0, 0.0, -1.0, 0.0 // @node_attach = 6.2625, 0.0, 0.0, 1.0, 0.0, 0.0, 1 @@ -60,5 +243,66 @@ model = ReStock/Assets/FuelTank/restock-fueltank-125-1 } !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = BlackAndWhite + VARIANT + { + name = Dark + displayName = #autoLOC_8007117 + themeName = Dark + primaryColor = #4c4f47 + secondaryColor = #4c4f47 + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-dark + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Bumped Specular + } + } + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1 + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Bumped Specular + } + } + VARIANT + { + name = White + displayName = #autoLOC_8007119 + themeName = White + primaryColor = #ffffff + secondaryColor = #ffffff + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-white + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Specular + } + } + VARIANT + { + name = GrayAndOrange + displayName = #autoLOC_8007121 + themeName = GrayAndOrange + primaryColor = #4c4f47 + secondaryColor = #f49841 + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-orange + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Specular + } + } + } %rescaleFactor = 1 } diff --git a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-25.cfg b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-25.cfg index e4e48488..e96e2394 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-25.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-25.cfg @@ -26,31 +26,18 @@ scale = 1,-1,1 rotation = 0, 0, 0 } - @MODULE[ModulePartVariants] - { - baseVariant = White - !primaryColor = DELETE - !secondaryColor = DELETE - !baseDisplayName = DELETE - !baseThemeName = DELETE - @VARIANT[Orange] - { - !TEXTURE {} - !GAMEOBJECTS {} - GAMEOBJECTS - { - 25TankTinyGrey = false - 25TankTinyOrange = true - 25TankTinyWhite = false - } - } + !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = BlackAndWhite VARIANT { - name = White + name = BlackAndWhite displayName = #autoLOC_8007122 - themeName = BlackAndWhite - primaryColor = #ffffff - secondaryColor = #000000 + themeName = White + primaryColor = #ffffff + secondaryColor = #000000 GAMEOBJECTS { 25TankTinyGrey = false @@ -58,6 +45,21 @@ 25TankTinyWhite = true } } + VARIANT + { + name = Orange + displayName = #autoLOC_8007123 + themeName = Orange + primaryColor = #f49841 + secondaryColor = #4c4f47 + GAMEOBJECTS + { + 25TankTinyGrey = false + 25TankTinyOrange = true + 25TankTinyWhite = false + } + } + VARIANT { name = Metallic @@ -97,31 +99,18 @@ scale = 1,-1,1 rotation = 0, 0, 0 } - @MODULE[ModulePartVariants] - { - baseVariant = White - !primaryColor = DELETE - !secondaryColor = DELETE - !baseDisplayName = DELETE - !baseThemeName = DELETE - @VARIANT[Orange] - { - !TEXTURE {} - !GAMEOBJECTS {} - GAMEOBJECTS - { - 25TankMedGrey = false - 25TankMedOrange = true - 25TankMedWhite = false - } - } + !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = BlackAndWhite VARIANT { - name = White - displayName = #autoLOC_8007122 + name = BlackAndWhite themeName = BlackAndWhite - primaryColor = #ffffff - secondaryColor = #000000 + primaryColor = #ffffff + secondaryColor = #000000 + displayName = #autoLOC_8007122 GAMEOBJECTS { 25TankMedGrey = false @@ -129,6 +118,21 @@ 25TankMedWhite = true } } + VARIANT + { + name = Orange + displayName = #autoLOC_8007123 + themeName = Orange + primaryColor = #f49841 + secondaryColor = #4c4f47 + GAMEOBJECTS + { + 25TankMedGrey = false + 25TankMedOrange = true + 25TankMedWhite = false + } + } + VARIANT { name = Metallic @@ -167,31 +171,18 @@ scale = 1,-1,1 rotation = 0, 0, 0 } - @MODULE[ModulePartVariants] + !MODULE[ModulePartVariants] {} + MODULE { - baseVariant = White - !primaryColor = DELETE - !secondaryColor = DELETE - !baseDisplayName = DELETE - !baseThemeName = DELETE - @VARIANT[Orange] - { - !TEXTURE {} - !GAMEOBJECTS {} - GAMEOBJECTS - { - 25TankSmallGrey = false - 25TankSmallOrange = true - 25TankSmallWhite = false - } - } + name = ModulePartVariants + baseVariant = BlackAndWhite VARIANT { - name = White + name = BlackAndWhite displayName = #autoLOC_8007122 themeName = BlackAndWhite - primaryColor = #ffffff - secondaryColor = #000000 + primaryColor = #ffffff + secondaryColor = #000000 GAMEOBJECTS { 25TankSmallGrey = false @@ -199,6 +190,21 @@ 25TankSmallWhite = true } } + VARIANT + { + name = Orange + displayName = #autoLOC_8007123 + themeName = Orange + primaryColor = #f49841 + secondaryColor = #4c4f47 + GAMEOBJECTS + { + 25TankSmallGrey = false + 25TankSmallOrange = true + 25TankSmallWhite = false + } + } + VARIANT { name = Metallic @@ -237,12 +243,18 @@ scale = 1,-1,1 rotation = 0, 0, 0 } - @MODULE[ModulePartVariants] + !MODULE[ModulePartVariants] {} + MODULE { - @VARIANT[White] + name = ModulePartVariants + baseVariant = BlackAndWhite + VARIANT { - !TEXTURE {} - !GAMEOBJECTS {} + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 GAMEOBJECTS { 25TankLargeGrey = false @@ -250,17 +262,23 @@ 25TankLargeWhite = true } } - @VARIANT[Orange] + VARIANT { - !TEXTURE {} - !GAMEOBJECTS {} + name = Orange + displayName = #autoLOC_8007123 + themeName = Orange + primaryColor = #f49841 + secondaryColor = #4c4f47 GAMEOBJECTS { - 25TankLargeGrey = false - 25TankLargeOrange = true - 25TankLargeWhite = false + 25TankLargeGrey = false + 25TankLargeOrange = true + 25TankLargeWhite = false } } + + + VARIANT { name = Metallic diff --git a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-mk2.cfg b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-mk2.cfg new file mode 100644 index 00000000..d0aad58c --- /dev/null +++ b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-mk2.cfg @@ -0,0 +1,26 @@ +// Patches applying art changes to Mk2 Fuselage Parts +// Contents: +// - Mk2 Liquid Fuel Fuselage Short (mk2FuselageShortLiquid) +// - Mk2 Rocket Fuel Fuselage Short (mk2FuselageShortLFO) +// - Mk2 Monopropellant Tank (mk2FuselageShortMono) + +@PART[mk2FuselageShortLiquid|mk2FuselageShortLFO|mk2FuselageShortMono]:FOR[Restock] +{ + @author = Porkjet and blowfish + + MODULE + { + name = ModuleRestockModifyMaterials + + MATERIAL + { + shader = KSP/Bumped Specular + TEXTURE_PROPERTY + { + name = _BumpMap + textureUrl = Restock/Assets/FuelTank/restock-fueltank-mk2-short-n + isNormalMap = true + } + } + } +} diff --git a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-rcs.cfg b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-rcs.cfg new file mode 100644 index 00000000..9ca48e43 --- /dev/null +++ b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-rcs.cfg @@ -0,0 +1,72 @@ +// Patches applying art changes to RCS tanks +// Contents: +// - Stratus-V Roundified Monopropellant Tank (radialRCSTank) +// - Stratus-V Cylindrified Monopropellant Tank (rcsTankRadialLong) +// - FL-R10 RCS Fuel Tank (rcsTankMini) +// - FL-R25 RCS Fuel Tank (RCSFuelTank) +// - FL-R1 RCS Fuel Tank (RCSTank1-2) + +// Spherical Radial Tank +@PART[radialRCSTank] +{ + @author = Chris Adderley (Nertea) + + !mesh = DELETE + !MODEL {} + MODEL { + model = ReStock/Assets/FuelTank/restock-fueltank-rcs-radial-1 + } + +} + +// Capsule Radial Tank +@PART[rcsTankRadialLong] +{ + @author = Chris Adderley (Nertea) + + !mesh = DELETE + !MODEL {} + MODEL { + model = ReStock/Assets/FuelTank/restock-fueltank-rcs-radial-2 + } + +} + +// 0.625m Tank +@PART[rcsTankMini] +{ + @author = Chris Adderley (Nertea) + + !mesh = DELETE + !MODEL {} + MODEL { + model = ReStock/Assets/FuelTank/restock-fueltank-rcs-0625-1 + } + + +} + +// 1.25m Tank +@PART[RCSFuelTank] +{ + @author = Chris Adderley (Nertea) + + !mesh = DELETE + !MODEL {} + MODEL { + model = ReStock/Assets/FuelTank/restock-fueltank-rcs-125-1 + } +} + +// 2.5m Tank +@PART[RCSTank1-2] +{ + @author = Chris Adderley (Nertea) + + !mesh = DELETE + !MODEL {} + MODEL { + model = ReStock/Assets/FuelTank/restock-fueltank-rcs-25-1 + } + !MODULE[ModulePartVariants] {} +} diff --git a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-125.cfg b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-125.cfg index fda5913a..52d5ff41 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-125.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-125.cfg @@ -12,6 +12,58 @@ MODEL { model = ReStock/Assets/Structural/restock-adapter-125-0625-1 } + !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = BlackAndWhite + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + 125mAdapterTallOrange = false + 125mAdapterTallWhite = true + 125mAdapterTallDark = false + } + + } + + + VARIANT + { + name = GrayAndOrange + displayName = #autoLOC_8007121 + themeName = GrayAndOrange + primaryColor = #4c4f47 + secondaryColor = #f49841 + GAMEOBJECTS + { + 125mAdapterTallOrange = true + 125mAdapterTallWhite = false + 125mAdapterTallDark = false + } + } + VARIANT + { + name = Dark + displayName = #autoLOC_8007117 + themeName = Dark + primaryColor = #4c4f47 + secondaryColor = #4c4f47 + GAMEOBJECTS + { + 125mAdapterTallOrange = false + 125mAdapterTallWhite = false + 125mAdapterTallDark = true + } + } + + } } @PART[adapterSmallMiniShort] @@ -23,4 +75,72 @@ MODEL { model = ReStock/Assets/Structural/restock-adapter-125-0625-2 } + !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = BlackAndWhite + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + 125mAdapterShortOrange = false + 125mAdapterShortWhite = true + 125mAdapterShortDark = false + 125mAdapterShortMetal = false + } + } + VARIANT + { + name = GrayAndOrange + displayName = #autoLOC_8007121 + themeName = GrayAndOrange + primaryColor = #4c4f47 + secondaryColor = #f49841 + GAMEOBJECTS + { + 125mAdapterShortOrange = true + 125mAdapterShortWhite = false + 125mAdapterShortDark = false + 125mAdapterShortMetal = false + } + } + VARIANT + { + name = Dark + displayName = #autoLOC_8007117 + themeName = Dark + primaryColor = #4c4f47 + secondaryColor = #4c4f47 + GAMEOBJECTS + { + 125mAdapterShortOrange = false + 125mAdapterShortWhite = false + 125mAdapterShortDark = true + 125mAdapterShortMetal = false + } + + } + VARIANT + { + name = Metal + displayName = #LOC_Restock_variant-surface_metal + themeName = Metal + primaryColor = #6f6e6d + secondaryColor = #6f6e6d + GAMEOBJECTS + { + 125mAdapterShortOrange = false + 125mAdapterShortWhite = false + 125mAdapterShortDark = false + 125mAdapterShortMetal = true + } + + } + } } diff --git a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-25.cfg b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-25.cfg index 5bb8e5b4..0e1ffeb0 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-25.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-25.cfg @@ -12,7 +12,40 @@ MODEL { model = ReStock/Assets/Structural/restock-adapter-25-125-1 } + !MODULE[ModulePartVariants] {} %rescaleFactor = 1 + MODULE + { + name = ModulePartVariants + baseVariant = BlackAndWhite + + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + 25mAdapterTallOrange = false + 25mAdapterTallWhite = true + } + } + VARIANT + { + name = Orange + displayName = #autoLOC_8007123 + themeName = Orange + primaryColor = #f49841 + secondaryColor = #4c4f47 + GAMEOBJECTS + { + 25mAdapterTallOrange = true + 25mAdapterTallWhite = false + } + } + } } @PART[largeAdapter2] { @@ -24,4 +57,54 @@ model = ReStock/Assets/Structural/restock-adapter-25-125-2 } %rescaleFactor = 1 + !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = BlackAndWhite + + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + 25mAdapterShortOrange = false + 25mAdapterShortWhite = true + 25mAdapterShortMetal = false + } + } + VARIANT + { + name = Orange + displayName = #autoLOC_8007123 + themeName = Orange + primaryColor = #f49841 + secondaryColor = #4c4f47 + GAMEOBJECTS + { + 25mAdapterShortOrange = true + 25mAdapterShortWhite = false + 25mAdapterShortMetal = false + } + } + VARIANT + { + name = Metal + displayName = #LOC_Restock_variant-surface_metal + themeName = Metal + primaryColor = #6f6e6d + secondaryColor = #6f6e6d + GAMEOBJECTS + { + 25mAdapterShortOrange = false + 25mAdapterShortWhite = false + 25mAdapterShortMetal = true + } + } + + } } diff --git a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-375.cfg b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-375.cfg index d4e63f01..674906f7 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-375.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-375.cfg @@ -1,14 +1,75 @@ // Patches applying art changes to 3.75m structural parts // Contents: -// - Kerbodyne ADTP-2-3 (Size3to2Adapter) +// - Kerbodyne ADTP-2-3 (Size3to2Adapter_v2) -@PART[Size3to2Adapter] { +@PART[Size3To2Adapter_v2] { @author = Chris Adderley (Nertea) !mesh = DELETE !MODEL {} MODEL { - model = ReStock/Assets/FuelTank/restock-adapter-375-solid-1 + model = ReStock/Assets/FuelTank/restock-adapter-375-fueled-1 } + MODEL + { + model = ReStock/Assets/FuelTank/restock-endcap-fueltank-25-orange + scale = 1.0, 1.0, 1.0 + position = 0.0, 1.148, 0.0 + } + MODEL + { + model = ReStock/Assets/FuelTank/restock-endcap-fueltank-375-orange + scale = 1.0, -1.0, 1.0 + position = 0.0, -1.098, 0.0 + } %rescaleFactor = 1 + !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = BlackAndWhite + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + 375mAdapterBlackWhite = true + 375mAdapterWhite = false + 375mAdapterOrange = false + } + + } + VARIANT + { + name = White + displayName = #autoLOC_8007119 + themeName = White + primaryColor = #ffffff + secondaryColor = #ffffff + GAMEOBJECTS + { + 375mAdapterBlackWhite = false + 375mAdapterWhite = true + 375mAdapterOrange = false + } + } + VARIANT + { + name = Orange + displayName = #autoLOC_8007123 + themeName = Orange + primaryColor = #f49841 + secondaryColor = #f49841 + GAMEOBJECTS + { + 375mAdapterBlackWhite = false + 375mAdapterWhite = false + 375mAdapterOrange = true + } + } + } } diff --git a/Distribution/Restock/GameData/ReStock/Plugins/Restock.dll b/Distribution/Restock/GameData/ReStock/Plugins/Restock.dll new file mode 100644 index 00000000..9078f250 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Plugins/Restock.dll differ diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt index 51e5fcda..471218a3 100644 --- a/Distribution/Restock/changelog.txt +++ b/Distribution/Restock/changelog.txt @@ -1,4 +1,4 @@ -0.1.0 +0.1.0 ----- - Initial release - Parts included: @@ -7,6 +7,8 @@ - PPD-10 Hitchhiker Storage Container (Nertea) - Control - .625m reaction wheel (Andrew Cassidy) + - RV-105 RCS Thruster Block (Nertea) + - Place-Anywhere 7 Linear RCS Port (Nertea) - Coupling - Inline Clamp-O-Tron (Passinglurker) - Clamp-O-Tron Jr. Docking Port (Nertea) @@ -15,6 +17,8 @@ - Clamp-O-Tron Shielded Port (Nertea) - Aero - Aerodynamic Nose Cone (Nertea) + - Advanced Nose Cone - Type A + - Advanced Nose Cone - Type B - Protective Rocket Nose Cone Mk7 (Nertea) - Thermal - Heat Shield (0.625m) (Nertea) @@ -35,10 +39,10 @@ - Kerbodyne ADTP-2-3 (Nertea) - Fuel Tanks - Oscar-B Fuel Tank (Beale) - - FL-T200 Fuel Tank Porkjet - - FL-T400 Fuel Tank Porkjet - - FL-T800 Fuel Tank Porkjet - - FL-T100 Fuel Tank Porkjet + - FL-T200 Fuel Tank (Porkjet/Nertea) + - FL-T400 Fuel Tank (Porkje/Nertea) + - FL-T800 Fuel Tank (Porkjet/Nertea) + - FL-T100 Fuel Tank (Porkjet/Nertea) - Rockomax Jumbo-64 Fuel Tank (Nertea) - Rockomax X200-16 Fuel Tank (Nertea) - Rockomax X200-32 Fuel Tank (Nertea) @@ -49,12 +53,17 @@ - PB-X150 Xenon Container (Nertea) - PB-X750 Xenon Container (Nertea) - PB-X50R Xenon Container (Nertea) + - Stratus-V Roundified Monopropellant Tank (Nertea) + - Stratus-V Cylindrified Monopropellant Tank (Nertea) + - FL-R10 RCS Fuel Tank (Nertea) + - FL-R25 RCS Fuel Tank (Nertea) + - FL-R1 RCS Fuel Tank (Nertea) - Engines - Separatron I (Nertea) - - Flea (Nertea) - - Hammer (Nertea) - - Thumper (Nertea) - - Kickback (Nertea) + - RT-5 "Flea" Solid Fuel Booster (Nertea) + - RT-10 "Hammer" Solid Fuel Booster (Nertea) + - BACC "Thumper" Solid Fuel Booster (Nertea) + - S1 SRB-KD25k "Kickback" Solid Fuel Booster (Nertea) - LV-1 "Ant" Liquid Fuel Engine (Nertea) - LV-1R "Spider" Liquid Fuel Engine (Nertea) - 48-7S "Spark" Liquid Fuel Engine (Nertea) @@ -87,6 +96,7 @@ - Engines are all surface attachable - New 'Metallic' variant for 2.5m tanks - New Unpainted, Black variants for heat shields +- New Bare variant for Linear RCS - Engines have a basic and a compact variant - Most atmospheric engines also have a boattail variant - New plumes/FX for all redone engines diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-srb-gimbal.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-srb-gimbal.cfg index 39add959..5aa9f6d1 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-srb-gimbal.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-srb-gimbal.cfg @@ -1,7 +1,7 @@ // Adds gimballing to SRBs // Kickback -@PART[MassiveBooster] { +@PART[MassiveBooster]:NEEDS[!BetterSRBs] { MODULE { name = ModuleGimbal @@ -11,7 +11,7 @@ } // Thumper -@PART[solidBooster1-1] { +@PART[solidBooster1-1]:NEEDS[!BetterSRBs] { MODULE { @@ -22,7 +22,7 @@ } // Hammer -@PART[solidBooster] { +@PART[solidBooster]:NEEDS[!BetterSRBs] { MODULE { name = ModuleGimbal @@ -32,7 +32,7 @@ } // Flea -@PART[solidBooster_sm] { +@PART[solidBooster_sm]:NEEDS[!BetterSRBs] { MODULE { name = ModuleGimbal diff --git a/Source/Restock.sln b/Source/Restock.sln new file mode 100644 index 00000000..00321601 --- /dev/null +++ b/Source/Restock.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.136 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Restock", "Restock\Restock.csproj", "{0A087745-0E2B-4D11-9431-C2D4191DD510}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0A087745-0E2B-4D11-9431-C2D4191DD510}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0A087745-0E2B-4D11-9431-C2D4191DD510}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0A087745-0E2B-4D11-9431-C2D4191DD510}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0A087745-0E2B-4D11-9431-C2D4191DD510}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {B94D54D6-0912-444F-8285-8F526D28B442} + EndGlobalSection +EndGlobal diff --git a/Source/Restock/ModuleRestockModifyMaterials.cs b/Source/Restock/ModuleRestockModifyMaterials.cs new file mode 100644 index 00000000..c91aa9cd --- /dev/null +++ b/Source/Restock/ModuleRestockModifyMaterials.cs @@ -0,0 +1,73 @@ +using System; +using UnityEngine; + +namespace Restock +{ + public class ModuleRestockModifyMaterials : PartModule + { + public override void OnLoad(ConfigNode node) + { + base.OnLoad(node); + + if (HighLogic.LoadedSceneIsEditor || HighLogic.LoadedSceneIsFlight) return; + + Transform modelTransform = part.partTransform.Find("model"); + + Renderer[] renderers = modelTransform.GetComponentsInChildren(); + + if (modelTransform == null) + { + Debug.LogError("Couldn't find model transform"); + return; + } + + foreach (ConfigNode node2 in node.GetNodes("MATERIAL")) + { + if (node2.GetValue("shader") is string newShaderName) + { + if (Shader.Find(newShaderName) is Shader newShader) + { + foreach (Renderer renderer in renderers) + { + renderer.material.shader = newShader; + } + } + else + { + Debug.LogError($"Can't find shader {newShaderName}"); + continue; + } + + } + + foreach (ConfigNode node3 in node2.GetNodes("TEXTURE_PROPERTY")) + { + string name = node3.GetValue("name"); + string textureUrl = node3.GetValue("textureUrl"); + bool normalMapToggle = false; + + if (node3.GetValue("isNormalMap") is string normalMapToggleString) + { + normalMapToggle = bool.Parse(normalMapToggleString); + } + + GameDatabase.TextureInfo textureInfo = GameDatabase.Instance.GetTextureInfo(textureUrl); + + if (textureInfo == null) + { + Debug.LogError($"Cannot find texture: {textureUrl}"); + continue; + } + + foreach (Renderer renderer in renderers) + { + renderer.material.SetTexture(name, normalMapToggle ? textureInfo.normalMap : textureInfo.texture); + } + } + } + + isEnabled = false; + moduleIsEnabled = false; + } + } +} diff --git a/Source/Restock/Properties/AssemblyInfo.cs b/Source/Restock/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..8a0cb45c --- /dev/null +++ b/Source/Restock/Properties/AssemblyInfo.cs @@ -0,0 +1,38 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Restock")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Porktober Revolution")] +[assembly: AssemblyProduct("Restock")] +[assembly: AssemblyCopyright("Copyright © Porktober Revolution 2018")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("0a087745-0e2b-4d11-9431-c2d4191dd510")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("0.1.0.0")] +[assembly: AssemblyFileVersion("0.1.0.0")] + +[assembly: KSPAssembly("Restock", 0, 1, 0)] diff --git a/Source/Restock/Restock.csproj b/Source/Restock/Restock.csproj new file mode 100644 index 00000000..a74979d0 --- /dev/null +++ b/Source/Restock/Restock.csproj @@ -0,0 +1,51 @@ + + + + + Debug + AnyCPU + {0A087745-0E2B-4D11-9431-C2D4191DD510} + Library + Properties + Restock + Restock + v3.5 + 512 + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + False + + + + + False + + + + + + + + + sh -e -c "cp -v '$(TargetPath)' '$(SolutionDir)/../Distribution/Restock/GameData/ReStock/Plugins'" + + \ No newline at end of file diff --git a/Source/license.txt b/Source/license.txt new file mode 100644 index 00000000..6163256f --- /dev/null +++ b/Source/license.txt @@ -0,0 +1,165 @@ +GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + +Copyright (C) 2007 Free Software Foundation, Inc. +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. + + +This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + +0. Additional Definitions. + +As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + +"The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + +An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + +A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + +The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + +The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + +1. Exception to Section 3 of the GNU GPL. + +You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + +2. Conveying Modified Versions. + +If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + +a) under this License, provided that you make a good faith effort to +ensure that, in the event an Application does not supply the +function or data, the facility still operates, and performs +whatever part of its purpose remains meaningful, or + +b) under the GNU GPL, with none of the additional permissions of +this License applicable to that copy. + +3. Object Code Incorporating Material from Library Header Files. + +The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + +a) Give prominent notice with each copy of the object code that the +Library is used in it and that the Library and its use are +covered by this License. + +b) Accompany the object code with a copy of the GNU GPL and this license +document. + +4. Combined Works. + +You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + +a) Give prominent notice with each copy of the Combined Work that +the Library is used in it and that the Library and its use are +covered by this License. + +b) Accompany the Combined Work with a copy of the GNU GPL and this license +document. + +c) For a Combined Work that displays copyright notices during +execution, include the copyright notice for the Library among +these notices, as well as a reference directing the user to the +copies of the GNU GPL and this license document. + +d) Do one of the following: + +0) Convey the Minimal Corresponding Source under the terms of this +License, and the Corresponding Application Code in a form +suitable for, and under terms that permit, the user to +recombine or relink the Application with a modified version of +the Linked Version to produce a modified Combined Work, in the +manner specified by section 6 of the GNU GPL for conveying +Corresponding Source. + +1) Use a suitable shared library mechanism for linking with the +Library. A suitable mechanism is one that (a) uses at run time +a copy of the Library already present on the user's computer +system, and (b) will operate properly with a modified version +of the Library that is interface-compatible with the Linked +Version. + +e) Provide Installation Information, but only if you would otherwise +be required to provide such information under section 6 of the +GNU GPL, and only to the extent that such information is +necessary to install and execute a modified version of the +Combined Work produced by recombining or relinking the +Application with a modified version of the Linked Version. (If +you use option 4d0, the Installation Information must accompany +the Minimal Corresponding Source and Corresponding Application +Code. If you use option 4d1, you must provide the Installation +Information in the manner specified by section 6 of the GNU GPL +for conveying Corresponding Source.) + +5. Combined Libraries. + +You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + +a) Accompany the combined library with a copy of the same work based +on the Library, uncombined with any other library facilities, +conveyed under the terms of this License. + +b) Give prominent notice with the combined library that part of it +is a work based on the Library, and explaining where to find the +accompanying uncombined form of the same work. + +6. Revised Versions of the GNU Lesser General Public License. + +The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + +If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library.