Merge pull request #594 from PorktoberRevolution/master

Release 0.1.4
pull/963/head^2 0.1.4
Chris Adderley 5 years ago committed by GitHub
commit f3a6970a36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

3
.gitmodules vendored

@ -0,0 +1,3 @@
[submodule "Assets/CineboxAndrew"]
path = Assets/CineboxAndrew
url = https://github.com/drewcassidy/ReStocked-Assets.git

@ -0,0 +1 @@
Subproject commit c40a3155dbfcdcb8d1f37cd6cd9ed4129f703124

@ -1,427 +0,0 @@
Attribution-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-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-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-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 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. 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.
l. 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.
m. 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; and
b. produce, reproduce, and Share Adapted Material.
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.
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-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;
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.

@ -19,6 +19,9 @@ Localization
#LOC_Restock_variant-mounting_truss = Truss
#LOC_Restock_variant-mounting_compact = Compact
#LOC_Restock_variant-engine_pod-orange = Pod (Orange)
#LOC_Restock_variant-engine_pod-grey = Pod (Grey)
#LOC_Restock_variant-antenna_size0 = 0.625m
#LOC_Restock_variant-antenna_size1 = 1.25m
#LOC_Restock_variant-antenna_truss = Truss

@ -0,0 +1,46 @@
// Courtesy of Challyss of the KSP forums
Localization
{
fr-fr
{
#LOC_Restock_variant-engine_size0 = 0.625m
#LOC_Restock_variant-engine_size1 = 1.25m
#LOC_Restock_variant-engine_size2 = 2.5m
#LOC_Restock_variant-engine_size3 = 3.75m
#LOC_Restock_variant-engine_compact = Compact
#LOC_Restock_variant-engine_radial = Radial
#LOC_Restock_variant-engine_boattail = Caréné
#LOC_Restock_variant-mounting_truss = Treillis
#LOC_Restock_variant-mounting_compact = Compact
#LOC_Restock_variant-antenna_size0 = 0.625m
#LOC_Restock_variant-antenna_size1 = 1.25m
#LOC_Restock_variant-antenna_truss = Treillis
#LOC_Restock_variant-antenna_compact = Compact
#LOC_Restock_variant-antenna_radial = Radial
#LOC_Restock_variant-antenna_radial_reverse = Radial (Inversé)
#LOC_Restock_variant-antenna_axial = Axial
#LOC_Restock_variant-antenna_axial_reverse = Axial (Inversé)
#LOC_Restock_variant-surface_metal = Métal
#LOC_Restock_variant-service-bay-opaque = Bases pleines
#LOC_Restock_variant-service-bay-transparent = Bases treillis
#LOC_Restock_variant-service-bay-hollow = Bases vides
#LOC_Restock_variant-heat-shield-black = Noir
#LOC_Restock_variant-heat-shield-brown = Classique
#LOC_Restock_variant-heat-shield-red = Brut
#LOC_Restock_variant-linear-rcs-pod = Caréné
#LOC_Restock_variant-linear-rcs-bare = Nu
#LOC_Restock_variant-stayputnik-pod = Support
#LOC_Restock_variant-stayputnik-bare = Sans support
#LOC_Restock_variant-probe-gold = Doré
#LOC_Restock_variant-probe-silver = Argenté
#LOC_Restock_variant-probe-bare = Basique
}
}

@ -1,18 +1,18 @@
// Patches applying art changes to RCS blocks
// Contents:
// - RV-105 RCS Thruster Block (RCSBlock)
// - RV-105 RCS Thruster Block (RCSBlock_v2)
// - Place-Anywhere 7 Linear RCS Port (linearRcs)
// - Vernor Engine (vernorEngine)
// RCS block
@PART[RCSBlock]
@PART[RCSBlock_v2]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL {}
MODEL
{
model = ReStock/Assets/Control/restock-rcs-block-1
model = ReStock/Assets/Control/restock-rcs-block-2
}
!EFFECTS {}
EFFECTS
@ -58,6 +58,8 @@
}
}
}
!MODULE[FXModuleAnimateRCS] {}
}
// Linear RCS port
@ -187,4 +189,7 @@
}
}
}
!MODULE[FXModuleAnimateRCS] {}
}

@ -1,13 +1,13 @@
// Patches applying art changes to 0.625m engines
// Contents:
// - LV-1 "Ant" Liquid Fuel Engine (microEngine)
// - LV-1R "Spider" Liquid Fuel Engine (radialEngineMini)
// - LV-1 "Ant" Liquid Fuel Engine (microEngine_v2)
// - LV-1R "Spider" Liquid Fuel Engine (radialEngineMini_v2)
// - 48-7S "Spark" Liquid Fuel Engine (liquidEngineMini_v2)
// - 24-77 "Twitch" Liquid Fuel Engine (smallRadialEngine)
// - 24-77 "Twitch" Liquid Fuel Engine (smallRadialEngine_v2)
// - O-10 "Puff" MonoPropellant Fuel Engine (omsEngine)
// Ant
@PART[microEngine]
@PART[microEngine_v2]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
@ -75,6 +75,7 @@
@runningEffectName = fx-ant-running
@fxOffset = 0, 0, 0
}
!MODULE[ModulePartVariants] {}
!MODULE[FXModuleAnimateThrottle] {}
MODULE
{
@ -165,7 +166,7 @@
}
// Spider
@PART[radialEngineMini]
@PART[radialEngineMini_v2]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
@ -229,6 +230,7 @@
}
}
}
!MODULE[ModulePartVariants] {}
@MODULE[ModuleEnginesFX]
{
@runningEffectName = fx-spider-running
@ -691,14 +693,14 @@
}
// Twitch
@PART[smallRadialEngine]
@PART[smallRadialEngine_v2]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL {}
MODEL
{
model = ReStock/Assets/Engine/restock-engine-twitch-1
model = ReStock/Assets/Engine/restock-engine-twitch-2
}
!EFFECTS {}
EFFECTS
@ -799,29 +801,159 @@
}
}
}
!MODULE[ModulePartVariants] {}
MODULE
{
name = ModulePartVariants
baseVariant = Orange
VARIANT
{
name = Orange
displayName = #autoLOC_8007123
themeName = Orange
primaryColor = #f49841
secondaryColor = #f49841
GAMEOBJECTS
{
CompactStructureGrey = false
CompactStructureOrange = true
StructureRadialGrey = false
StructureRadialOrange = false
CylBotPod001 = false
CylBotPod002 = false
CylTopPod001 = false
CylTopPod002 = false
CylBotBare001 = true
CylBotBare002 = true
CylTopBare001 = true
CylTopBare002 = true
EnginePod = false
EngineBare = true
}
}
VARIANT
{
name = GrayAndOrange
displayName = #autoLOC_8007121
themeName = GrayAndOrange
primaryColor = #4c4f47
secondaryColor = #f49841
GAMEOBJECTS
{
CompactStructureGrey = true
CompactStructureOrange = false
StructureRadialGrey = false
StructureRadialOrange = false
CylBotPod001 = false
CylBotPod002 = false
CylTopPod001 = false
CylTopPod002 = false
CylBotBare001 = true
CylBotBare002 = true
CylTopBare001 = true
CylTopBare002 = true
EnginePod = false
EngineBare = true
}
}
VARIANT
{
name = OrangePodded
displayName = #LOC_Restock_variant-engine_pod-orange
primaryColor = #f49841
secondaryColor = #f49841
GAMEOBJECTS
{
CompactStructureGrey = false
CompactStructureOrange = false
StructureRadialGrey = false
StructureRadialOrange = true
CylBotPod001 = true
CylBotPod002 = true
CylTopPod001 = true
CylTopPod002 = true
CylBotBare001 = false
CylBotBare002 = false
CylTopBare001 = false
CylTopBare002 = false
EnginePod = true
EngineBare = false
}
}
VARIANT
{
name = GrayAndOrangePodded
displayName = #LOC_Restock_variant-engine_pod-grey
primaryColor = #4c4f47
secondaryColor = #f49841
GAMEOBJECTS
{
CompactStructureGrey = false
CompactStructureOrange = false
StructureRadialGrey = true
StructureRadialOrange = false
CylBotPod001 = true
CylBotPod002 = true
CylTopPod001 = true
CylTopPod002 = true
CylBotBare001 = false
CylBotBare002 = false
CylTopBare001 = false
CylTopBare002 = false
EnginePod = true
EngineBare = false
}
}
useMultipleDragCubes = false
}
MODULE
{
name = FXModuleLookAtConstraint
// Ringed
// Bare
CONSTRAINLOOKFX
{
targetName = CylBotBare001
rotatorsName = CylTopBare001
}
CONSTRAINLOOKFX
{
targetName = CylBotBare002
rotatorsName = CylTopBare002
}
CONSTRAINLOOKFX
{
targetName = CylTopBare001
rotatorsName = CylBotBare001
}
CONSTRAINLOOKFX
{
targetName = CylTopBare002
rotatorsName = CylBotBare002
}
// Podded
CONSTRAINLOOKFX
{
targetName = CylBotRad001
rotatorsName = CylTopRad001
targetName = CylBotPod001
rotatorsName = CylTopPod001
}
CONSTRAINLOOKFX
{
targetName = CylBotRad002
rotatorsName = CylTopRad002
targetName = CylBotPod002
rotatorsName = CylTopPod002
}
CONSTRAINLOOKFX
{
targetName = CylTopRad001
rotatorsName = CylBotRad001
targetName = CylTopPod001
rotatorsName = CylBotPod001
}
CONSTRAINLOOKFX
{
targetName = CylTopRad002
rotatorsName = CylBotRad002
targetName = CylTopPod002
rotatorsName = CylBotPod002
}
}
@MODULE[ModuleEnginesFX]

@ -0,0 +1,105 @@
// Patches applying art changes to Legacy RCS blocks
// Contents:
// - RV-105 RCS Thruster Block (RCSBlock)
// - Vernor Engine (vernorEngine)
// RCS block
@PART[RCSBlock]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL {}
MODEL
{
model = ReStock/Assets/Control/restock-rcs-block-1
}
!EFFECTS {}
EFFECTS
{
running
{
AUDIO_MULTI_POOL
{
channel = Ship
transformName = RCSjet
clip = sound_rocket_mini
volume = 0.0 0.0
volume = 0.1 0.0
volume = 0.5 0.025
volume = 1.0 0.1
pitch = 1.0
loop = true
}
MODEL_MULTI_PARTICLE
{
name = fx1
modelName = ReStock/FX/restock-fx-rcs-1
transformName = RCSjet
emission = 0.0 0.0
emission = 0.1 0.0
emission = 1.0 1.0
speed = 0.0 0.8
speed = 1.0 1.0
//localRotation = -90, 0, 0
}
MODEL_MULTI_PARTICLE
{
name = fx2
modelName = ReStock/FX/restock-fx-rcs-1
transformName = RCSjet
emission = 0.0 0.0
emission = 0.1 0.0
emission = 1.0 1.0
speed = 0.0 0.8
speed = 1.0 1.0
//localRotation = -90, 0, 0
localPosition = 0, -0.015, 0
}
}
}
}
// Vernor Engine
@PART[vernierEngine]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL {}
MODEL
{
model = ReStock/Assets/Control/restock-rcs-vernor-1
scale = 1,1,1
}
@scale = 1
@rescaleFactor = 1
!EFFECTS {}
EFFECTS
{
running
{
AUDIO
{
channel = Ship
clip = sound_rocket_mini
volume = 0.0 0.0
volume = 0.02 0.2
volume = 0.5 0.2
volume = 1.0 0.2
pitch = 1.0
loop = true
}
MODEL_MULTI_PARTICLE
{
name = fx1
modelName = ReStock/FX/restock-fx-vernor-1
transformName = RCSthruster
emission = 0.0 0.0
emission = 0.1 0.0
emission = 1.0 1.0
speed = 0.0 0.8
speed = 1.0 1.0
localRotation = -180, 0, 0
}
}
}
}

@ -0,0 +1,564 @@
// Patches applying art changes to LEGACY 0.625m engines
// Contents:
// - LV-1 "Ant" Liquid Fuel Engine (microEngine)
// - LV-1R "Spider" Liquid Fuel Engine (radialEngineMini)
// - 24-77 "Twitch" Liquid Fuel Engine (smallRadialEngine)
// Ant
@PART[microEngine]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL {}
MODEL
{
model = ReStock/Assets/Engine/restock-engine-ant-1
}
!EFFECTS {}
EFFECTS
{
engage
{
AUDIO
{
channel = Ship
clip = sound_vent_soft
volume = 1.0
pitch = 2.0
loop = false
}
}
flameout
{
AUDIO
{
channel = Ship
clip = sound_explosion_low
volume = 1.0
pitch = 2.0
loop = false
}
}
fx-ant-running
{
AUDIO
{
channel = Ship
clip = sound_rocket_mini
volume = 0.0 0.0
volume = 0.01 0.2
volume = 1.0 0.6
pitch = 0.0 0.1
pitch = 0.01 0.2
pitch = 1.0 0.5
loop = true
}
MODEL_MULTI_PARTICLE
{
name = plume
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-ant-running
@fxOffset = 0, 0, 0
}
!MODULE[FXModuleAnimateThrottle] {}
MODULE
{
name = FXModuleThrottleEffects
fxModuleNames = heatColor
responseSpeed = 1.0
dependOnEngineState = True
dependOnThrottle = True
}
MODULE
{
name = FXModuleThrottleEffects
fxModuleNames = throttleColor
responseSpeed = 1.0
dependOnEngineState = True
dependOnThrottle = True
}
MODULE
{
name = ModuleColorChanger
moduleID = heatColor
animRate = 0.025
shaderProperty = _EmissiveColor
excludedRenderer = EngineCore
toggleInEditor = false
toggleInFlight = false
redCurve
{
key = 0 0 1 1
key = 1 1 1 1
}
greenCurve
{
key = 0 0 1 1
key = 1 1 1 1
}
blueCurve
{
key = 0 0 1 1
key = 1 1 1 1
}
alphaCurve
{
key = 0 0 1 1
key = 1 1 1 1
}
}
MODULE
{
name = ModuleColorChanger
moduleID = throttleColor
animRate = 1
shaderProperty = _TintColor
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
{
name = ModuleJettison
jettisonName = ShroudAnt
bottomNodeName = bottom
isFairing = True
jettisonedObjectMass = 0.1
jettisonForce = 5
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
{
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 = 0.01 0.2
volume = 1.0 0.6
pitch = 0.0 0.1
pitch = 0.01 0.2
pitch = 1.0 0.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
gimbalResponseSpeed = 8
useGimbalResponseSpeed = true
}
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 = 1.0
dependOnEngineState = True
dependOnThrottle = True
}
MODULE
{
name = FXModuleThrottleEffects
fxModuleNames = throttleColor
responseSpeed = 1.0
dependOnEngineState = True
dependOnThrottle = True
}
MODULE
{
name = ModuleColorChanger
moduleID = heatColor
animRate = 0.025
shaderProperty = _EmissiveColor
excludedRenderer = EngineCore
toggleInEditor = false
toggleInFlight = false
redCurve
{
key = 0 0 1 1
key = 1 1 1 1
}
greenCurve
{
key = 0 0 1 1
key = 1 1 1 1
}
blueCurve
{
key = 0 0 1 1
key = 1 1 1 1
}
alphaCurve
{
key = 0 0 1 1
key = 1 1 1 1
}
}
MODULE
{
name = ModuleColorChanger
moduleID = throttleColor
animRate = 1
shaderProperty = _TintColor
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
}
}
}
// 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
{
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 = 0.01 0.4
volume = 1.0 1.0
pitch = 0.0 0.2
pitch = 0.01 0.6
pitch = 1.0 1.8
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 = turboglow
modelName = ReStock/FX/restock-fx-spark-turbo-glow-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 = CylBotRad001
rotatorsName = CylTopRad001
}
CONSTRAINLOOKFX
{
targetName = CylBotRad002
rotatorsName = CylTopRad002
}
CONSTRAINLOOKFX
{
targetName = CylTopRad001
rotatorsName = CylBotRad001
}
CONSTRAINLOOKFX
{
targetName = CylTopRad002
rotatorsName = CylBotRad002
}
}
@MODULE[ModuleEnginesFX]
{
runningEffectName = fx-twitch-running
}
@MODULE[ModuleGimbal]
{
@gimbalTransformName = B_Gimbal
gimbalResponseSpeed = 8
useGimbalResponseSpeed = true
}
!MODULE[FXModuleAnimateThrottle] {}
MODULE
{
name = FXModuleThrottleEffects
fxModuleNames = heatColor
responseSpeed = 1.0
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 0 1 1
key = 1 1 1 1
}
greenCurve
{
key = 0 0 1 1
key = 1 1 1 1
}
blueCurve
{
key = 0 0 1 1
key = 1 1 1 1
}
alphaCurve
{
key = 0 0 1 1
key = 1 1 1 1
}
}
MODULE
{
name = ModuleColorChanger
moduleID = throttleColor
animRate = 1
shaderProperty = _TintColor
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
}
}
}

@ -6,23 +6,23 @@
{
"MAJOR":0,
"MINOR":1,
"PATCH":3,
"PATCH":4,
"BUILD":0
},
"KSP_VERSION":
{
"MAJOR":1,
"MINOR":6,
"PATCH":1
"MINOR":7,
"PATCH":0
},
"KSP_VERSION_MIN":{
"MAJOR":1,
"MINOR":6,
"MINOR":7,
"PATCH":0
},
"KSP_VERSION_MAX":{
"MAJOR":1,
"MINOR":6,
"MINOR":7,
"PATCH":99
}
}

@ -1,4 +1,19 @@
v0.1.3
v0.1.4
------
- KSP 1.7.x
- Fixed scale of linear RCS collider (#569)
- Fixed flag transform on Mk1 lander can (#558)
- Adaptations for stock 1.7 changes
- Propagated legacy patches for 1.6-era parts into a Legacy folder
- New base model for Twitch
- New variants for Twitch with 1.6-era Restock podded model
- Tuned colliders, pivots of parts to line up with 1.7-era parts
- Plugin improvements:
- Warn user if Restock is installed in the wrong location
- Warn user if old 1.25m tank directories are detected
- Added French localization of Restock strings (thanks Challyss)
v0.1.3
------
- Fixed animation of SC-9001 Material Bay
- Fixed thrust offset on LV-909 (#553)

@ -1,5 +1,5 @@
=============
RESTOCK 0.1.3
RESTOCK 0.1.4
=============
Restock is a project to improve the art of the Kerbal Space Program part set. Some of the revisions are based on the cancelled Part Overhaul project by Porkjet.
@ -78,6 +78,7 @@ LOCALIZATION
This mod primarily uses vanilla-provided localization, but for additional strings, it provides localization support for the following languages:
- English
- German (woeller)
- French (Challyss
=========
LICENSING

@ -20,8 +20,8 @@ PART
node_attach = 0.045212, -0.0, -0.00, 1.0, 0.0, 0.0
// --- editor parameters ---
TechRequired = advFlightControl
entryCost = 1650
cost = 320
entryCost = 600
cost = 30
category = Control
subcategory = 0
title = #LOC_RestockPlus_restock-rcs-block-dual-1_title
@ -30,7 +30,7 @@ PART
// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
attachRules = 0,1,0,0,0
// --- standard part parameters ---
mass = 0.025
mass = 0.02
dragModelType = default
maximum_drag = 0.001
minimum_drag = 0.001

@ -20,8 +20,8 @@ PART
node_attach = 0.008, -0.0, -0.00, 1.0, 0.0, 0.0
// --- editor parameters ---
TechRequired = advFlightControl
entryCost = 750
cost = 100
entryCost = 200
cost = 8
category = Control
subcategory = 0
title = #LOC_RestockPlus_restock-rcs-block-dual-mini-1_title
@ -30,7 +30,7 @@ PART
// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
attachRules = 0,1,0,0,0
// --- standard part parameters ---
mass = 0.01
mass = 0.005
dragModelType = default
maximum_drag = 0.001
minimum_drag = 0.001

@ -20,8 +20,8 @@ PART
node_attach = 0.045212, -0.0, -0.00, 1.0, 0.0, 0.0
// --- editor parameters ---
TechRequired = advFlightControl
entryCost = 3250
cost = 635
entryCost = 1300
cost = 45
category = Control
subcategory = 0
title = #LOC_RestockPlus_restock-rcs-block-quad-angled-1_title
@ -30,7 +30,7 @@ PART
// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
attachRules = 0,1,0,0,0
// --- standard part parameters ---
mass = 0.05
mass = 0.04
dragModelType = default
maximum_drag = 0.001
minimum_drag = 0.001

@ -20,8 +20,8 @@ PART
node_attach = 0.008, -0.0, -0.00, 1.0, 0.0, 0.0
// --- editor parameters ---
TechRequired = advFlightControl
entryCost = 900
cost = 200
entryCost = 400
cost = 16
category = Control
subcategory = 0
title = #LOC_RestockPlus_restock-rcs-block-quad-angled-mini-1_title
@ -30,7 +30,7 @@ PART
// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
attachRules = 0,1,0,0,0
// --- standard part parameters ---
mass = 0.0125
mass = 0.01
dragModelType = default
maximum_drag = 0.001
minimum_drag = 0.001

@ -20,8 +20,8 @@ PART
node_attach = 0.008, -0.0, -0.00, 1.0, 0.0, 0.0
// --- editor parameters ---
TechRequired = advFlightControl
entryCost = 850
cost = 180
entryCost = 400
cost = 16
category = Control
subcategory = 0
title = #LOC_RestockPlus_restock-rcs-block-quad-mini-1_title
@ -30,7 +30,7 @@ PART
// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
attachRules = 0,1,0,0,0
// --- standard part parameters ---
mass = 0.0125
mass = 0.01
dragModelType = default
maximum_drag = 0.001
minimum_drag = 0.001

@ -20,8 +20,8 @@ PART
node_attach = 0.045212, -0.0, -0.00, 1.0, 0.0, 0.0
// --- editor parameters ---
TechRequired = advFlightControl
entryCost = 4250
cost = 800
entryCost = 1500
cost = 60
category = Control
subcategory = 0
title = #LOC_RestockPlus_restock-rcs-block-quint-1_title
@ -30,7 +30,7 @@ PART
// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
attachRules = 0,1,0,0,0
// --- standard part parameters ---
mass = 0.0625
mass = 0.05
dragModelType = default
maximum_drag = 0.001
minimum_drag = 0.001

@ -20,8 +20,8 @@ PART
node_attach = 0.008, -0.0, -0.00, 1.0, 0.0, 0.0
// --- editor parameters ---
TechRequired = advFlightControl
entryCost = 1000
cost = 210
entryCost = 450
cost = 20
category = Control
subcategory = 0
title = #LOC_RestockPlus_restock-rcs-block-quint-mini-1_title
@ -30,7 +30,7 @@ PART
// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
attachRules = 0,1,0,0,0
// --- standard part parameters ---
mass = 0.0155
mass = 0.0125
dragModelType = default
maximum_drag = 0.001
minimum_drag = 0.001

@ -20,8 +20,8 @@ PART
node_attach = 0.045212, -0.0, -0.00, 1.0, 0.0, 0.0
// --- editor parameters ---
TechRequired = advFlightControl
entryCost = 2760
cost = 480
entryCost = 900
cost = 35
category = Control
subcategory = 0
title = #LOC_RestockPlus_restock-rcs-block-triple-angled-1_title
@ -30,7 +30,7 @@ PART
// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
attachRules = 0,1,0,0,0
// --- standard part parameters ---
mass = 0.0375
mass = 0.03
dragModelType = default
maximum_drag = 0.001
minimum_drag = 0.001

@ -20,8 +20,8 @@ PART
node_attach = 0.008, -0.0, -0.00, 1.0, 0.0, 0.0
// --- editor parameters ---
TechRequired = advFlightControl
entryCost = 950
cost = 150
entryCost = 350
cost = 12
category = Control
subcategory = 0
title = #LOC_RestockPlus_restock-rcs-block-triple-angled-mini-1_title
@ -30,7 +30,7 @@ PART
// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
attachRules = 0,1,0,0,0
// --- standard part parameters ---
mass = 0.015
mass = 0.0075
dragModelType = default
maximum_drag = 0.001
minimum_drag = 0.001

@ -20,8 +20,8 @@ PART
node_attach = 0.008, -0.0, -0.00, 1.0, 0.0, 0.0
// --- editor parameters ---
TechRequired = advFlightControl
entryCost = 350
cost = 45
entryCost = 125
cost = 4
category = Control
subcategory = 0
title = #LOC_RestockPlus_restock-rcs-single-mini-1_title
@ -30,7 +30,7 @@ PART
// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
attachRules = 0,1,0,0,0
// --- standard part parameters ---
mass = 0.005
mass = 0.0025
dragModelType = default
maximum_drag = 0.001
minimum_drag = 0.001

@ -96,7 +96,7 @@ PART
}
}
// --- editor parameters ---
TechRequired = basicRocketry
TechRequired = propulsionSystems
entryCost = 5150
cost = 280
category = Engine
@ -108,7 +108,7 @@ PART
attachRules = 1,1,1,0,0
bulkheadProfiles = size0, srf
// --- standard part parameters ---
mass = 0.30
mass = 0.29
dragModelType = default
maximum_drag = 0.2
minimum_drag = 0.2
@ -146,7 +146,7 @@ PART
atmosphereCurve
{
key = 0 295
key = 1 260
key = 1 275
key = 12 100
}
}

@ -117,7 +117,7 @@ PART
}
atmosphereCurve
{
key = 0 320
key = 0 330
key = 1 150
key = 2 0.001
}

@ -14,11 +14,11 @@ PART
scale = 1.0, 1.0, 1.0
}
DRAG_CUBE
{
{
cube = 0, 6.005,0.7711,1.302, 6.005,0.7711,1.853, 4.87,0.85,0.2801, 4.87,0.85,0.2801, 5.975,0.7708,1.334, 5.975,0.771,1.334, 1.192E-07,-0.5142,0, 2.5,2.518,2.5
cube = 1, 3.622,0.7014,1.451, 3.623,0.7133,1.842, 4.87,0.65,0.2801, 4.87,0.55,0.2801, 3.956,0.7193,1.355, 3.959,0.7207,1.355, 0,-0.4773,-1.192E-07, 2.5,2.444,2.5
cube = 2, 5.803,0.7729,1.302, 5.803,0.7729,1.842, 4.87,0.35,0.2801, 4.87,0.35,0.2801, 5.755,0.7725,1.334, 5.755,0.7728,1.334, 1.192E-07,-0.5129,0, 2.5,2.516,2.5
}
}
scale = 1.0
rescaleFactor = 1
// --- node definitions ---
@ -117,7 +117,7 @@ PART
// --- editor parameters ---
TechRequired = veryHeavyRocketry
entryCost = 31000
cost = 12000
cost = 7000
category = Engine
subcategory = 0
title = #LOC_RestockPlus_restock-engine-boar_title

@ -41,24 +41,24 @@ PART
{
name = ModuleAnimateGeneric
animationName = inline-Deploy
startEventGUIName = Deploy
endEventGUIName = Close
actionGUIName = Toggle Cover
startEventGUIName = #autoLOC_502050 //#autoLOC_502050 = Deploy
endEventGUIName = #autoLOC_502051 //#autoLOC_502051 = Close
actionGUIName = #autoLOC_502052 //#autoLOC_502052 = Toggle Cover
evaDistance = 1.5
}
MODULE
{
name = ModuleScienceExperiment
experimentID = mysteryGoo
experimentActionName = Observe Mystery Goo
resetActionName = Reset Goo Canister
experimentActionName = #autoLOC_502053 //#autoLOC_502053 = Observe Mystery Goo
resetActionName = #autoLOC_502054 //#autoLOC_502054 = Reset Goo Canister
useStaging = False
useActionGroups = True
hideUIwhenUnavailable = True
xmitDataScalar = 0.3
FxModules = 0
dataIsCollectable = True
collectActionName = Collect Data
collectActionName = #autoLOC_6004057 //#autoLOC_6004057 = Collect Data
interactionRange = 1.5
usageReqMaskInternal = 1
usageReqMaskExternal = 8

@ -40,17 +40,17 @@ PART
{
name = ModuleAnimateGeneric
animationName = radial-Deploy
startEventGUIName = Open Doors
endEventGUIName = Close Doors
actionGUIName = Toggle Doors
startEventGUIName = #autoLOC_502058 //#autoLOC_502058 = Open Doors
endEventGUIName = #autoLOC_502059 //#autoLOC_502059 = Close Doors
actionGUIName = #autoLOC_502060 //#autoLOC_502060 = Toggle Doors
evaDistance = 1.85
}
MODULE
{
name = ModuleScienceExperiment
experimentID = mobileMaterialsLab
experimentActionName = Observe Materials Bay
resetActionName = Reset Materials Bay
experimentActionName = #autoLOC_502061 //#autoLOC_502061 = Observe Materials Bay
resetActionName = #autoLOC_502062 //#autoLOC_502062 = Reset Materials Bay
useStaging = False
useActionGroups = True
hideUIwhenUnavailable = True
@ -58,7 +58,7 @@ PART
xmitDataScalar = 0.35
FxModules = 0
dataIsCollectable = True
collectActionName = Collect Data
collectActionName = #autoLOC_6004057 //#autoLOC_6004057 = Collect Data
interactionRange = 1.85
usageReqMaskInternal = 1
usageReqMaskExternal = 8

@ -0,0 +1,16 @@
// Allows for the ReStockPlus parts to fulfill requirements for stock experiments in Satellite contracts
@Contracts:FOR[ReStockPlus]
{
@Satellite
{
@PART_REQUEST:HAS[#Part[GooExperiment]]
{
Part = restock-goocanister-625-1
}
@PART_REQUEST:HAS[#Part[science_module]]
{
Part = restock-materialbay-radial-1
}
}
}

@ -6,18 +6,18 @@
{
"MAJOR":0,
"MINOR":1,
"PATCH":3,
"PATCH":4,
"BUILD":0
},
"KSP_VERSION":
{
"MAJOR":1,
"MINOR":6,
"PATCH":1
"MINOR":7,
"PATCH":0
},
"KSP_VERSION_MIN":{
"MAJOR":1,
"MINOR":6,
"MINOR":7,
"PATCH":0
},
"KSP_VERSION_MAX":{

@ -1,4 +1,14 @@
v0.1.3
v0.1.4
------
- KSP 1.7.x
- Changed radial material bay and inline goo canister to use localization strings (#557)
- Fixed radial material bay and inline goo canister not counting for satellite contracts (#557)
- Adjusted cost of Boar to 7000 from 12000 (#571)
- Adjusted cost and masses of all RCS blocks for consistency with KSP 1.7 (#582)
- Changed Torch tech node to Precision Propulsion, ASL Isp to 275s from 260s, mass from 0.3 to 0.29 (#582)
- Changed Pug vacuum Isp to 330s from 320s (#582)
v0.1.3
------
- Balance tweaks to Anvil SRB. Fuel increased to 7200, thrust increased to 2250 kN (#547)
- Fixed light pivots not moving light emitters (#548)

@ -1,5 +1,5 @@
==============
RESTOCK+ 0.1.3
RESTOCK+ 0.1.4
==============
Restock+ is a complement to Restock which adds useful parts that we feel are missing from the base game. Functionally, these parts additions allow better flexibility in craft construction and not add new gameplay systems or form factors. Some examples might include:
@ -15,7 +15,7 @@ DEPENDENCIES
============
Required:
- Restock (0.1.3)
- Restock (0.1.4)
- ModuleManager (4.0.2)
=============

@ -0,0 +1,101 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using UnityEngine;
namespace Restock
{
[KSPAddon(KSPAddon.Startup.Instantly, true)]
public class InstallChecker : MonoBehaviour
{
public readonly IEnumerable<string> UNEXPECTED_URLS = Array.AsReadOnly(new[] {
"Squad/Parts/FuelTank/fuelTankT100",
"Squad/Parts/FuelTank/fuelTankT200",
"Squad/Parts/FuelTank/fuelTankT400",
"Squad/Parts/FuelTank/fuelTankT800",
});
private void Start()
{
string[] errorMessages = CheckInstallLocation().Concat(CheckUnexpectedUrls()).ToArray();
if (errorMessages.Length > 0) CreateWarningDialog(errorMessages);
}
private IEnumerable<string> CheckInstallLocation()
{
UrlDir gameData = GameDatabase.Instance.root.children.First(dir => dir.type == UrlDir.DirectoryType.GameData);
AssemblyLoader.LoadedAssembly loadedAssembly = AssemblyLoader.loadedAssemblies.GetByAssembly(Assembly.GetExecutingAssembly());
if (loadedAssembly == null)
{
Debug.LogError("[Restock] Error checking install location - could not find loaded assembly");
yield break;
}
UrlDir assemblyDir = GetDirectory(gameData, loadedAssembly.url);
if (assemblyDir == null)
{
Debug.LogError("[Restock] Error checking install location - could not find assembly url directory: " + loadedAssembly.url);
yield break;
}
string observedInstallPath = Path.GetFullPath(assemblyDir.parent.path);
string expectedInstallPath = Path.GetFullPath(Path.Combine(KSPUtil.ApplicationRootPath, Path.Combine("GameData", "ReStock")));
if (observedInstallPath != expectedInstallPath)
{
Debug.LogError($"[Restock] Install found at '{observedInstallPath}'");
yield return $"Expected Restock to be installed at\n{expectedInstallPath}\nbut actually installed at\n{observedInstallPath}";
}
}
private IEnumerable<string> CheckUnexpectedUrls()
{
UrlDir gameData = GameDatabase.Instance.root.children.First(dir => dir.type == UrlDir.DirectoryType.GameData);
foreach (string unexpectedUrl in UNEXPECTED_URLS)
{
if (!(gameData.GetDirectory(unexpectedUrl) is UrlDir unexpectedDir)) continue;
Debug.LogError("[ReStock] Found unexpected directory " + unexpectedDir.path);
yield return $"Found unexpected directory, likely left over from an older version of KSP:\n" + unexpectedDir.path;
}
}
private void CreateWarningDialog(params string[] allMessages)
{
PopupDialog.SpawnPopupDialog(new Vector2(0.5f, 0.5f),
new Vector2(0.5f, 0.5f),
new MultiOptionDialog(
"RestockInstallWarning",
$"Restock has detected installation issues:\n\n{string.Join("\n\n", allMessages)}",
"Restock - installation issues detected",
HighLogic.UISkin,
new Rect(0.5f, 0.5f, 500f, 60f),
new DialogGUIFlexibleSpace(),
new DialogGUIHorizontalLayout(
new DialogGUIFlexibleSpace(),
new DialogGUIButton("OK", delegate () { }, 140.0f, 30.0f, true),
new DialogGUIFlexibleSpace()
)
),
true,
HighLogic.UISkin);
}
private UrlDir GetDirectory(UrlDir baseUrl, string url)
{
string[] splitUrl = url.Trim().Split('/');
UrlDir currentDir = baseUrl;
foreach (string dirName in splitUrl)
{
currentDir = currentDir.children.FirstOrDefault(dir => dir.name == dirName);
if (currentDir == null) return null;
}
return currentDir;
}
}
}

@ -41,6 +41,7 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="InstallChecker.cs" />
<Compile Include="MaterialModifiers\ColorPropertyMaterialModifier.cs" />
<Compile Include="MaterialModifiers\FloatPropertyMaterialModifier.cs" />
<Compile Include="MaterialModifiers\IMaterialModifier.cs" />

Loading…
Cancel
Save