Skip to content

Commit a0c16c2

Browse files
authored
Merge pull request #1117 from BobPalmer/DEVELOP
Develop
2 parents e2b81f0 + f1865b3 commit a0c16c2

File tree

97 files changed

+360
-323
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+360
-323
lines changed

FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
0.8.8 - 2017.01.01
1+
0.8.10 - 2017.01.15
2+
-------------------
3+
Performance Updates
4+
Fixed a bug that caused animations to auto-deploy
5+
6+
0.8.9 - 2017.01.01
27
-------------------
38
Fixed bug w/swappable converter multi-bays
49

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
@EXPERIENCE_TRAIT[Pilot] {
2+
EFFECT {
3+
name = RepBoost
4+
}
5+
EFFECT
6+
{
7+
name = LogisticsSkill
8+
}
9+
EFFECT
10+
{
11+
name = ExplorerSkill
12+
}
13+
}
14+
15+
@EXPERIENCE_TRAIT[Engineer] {
16+
EFFECT {
17+
name = FundsBoost
18+
}
19+
EFFECT {
20+
name = GeologySkill
21+
}
22+
}
23+
24+
@EXPERIENCE_TRAIT[Scientist] {
25+
EFFECT {
26+
name = ScienceBoost
27+
}
28+
EFFECT {
29+
name = BotanySkill
30+
}
31+
EFFECT {
32+
name = AgronomySkill
33+
}
34+
EFFECT {
35+
name = MedicalSkill
36+
}
37+
}
-2.5 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.

FOR_RELEASE/GameData/000_USITools/USITools.version

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"VERSION":{
1111
"MAJOR":0,
1212
"MINOR":8,
13-
"PATCH":9,
13+
"PATCH":10,
1414
"BUILD":0
1515
},
1616
"KSP_VERSION":{

FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
0.3.4 - 2017.01.01
1+
0.3.7 - 2017.01.15
2+
------------------
3+
KIS Kontainers are now hidden if KIS is not installed (Thanks Wyzard256!)
4+
5+
0.3.6 - 2017.01.01
26
-------------------
37
All USI reactors now include a fill-cap of 95% to leave some headroom for solar panels.
48

FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/CHANGELOG.txt

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
0.1.10 - 2017.01.15
2+
-------------------
3+
Construction ports now default to snap being OFF to avoid confusion
4+
15
0.1.9 - 2017.01.01
26
-------------------
37
Dependency Updates
Binary file not shown.
Binary file not shown.
Binary file not shown.

FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.version

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"VERSION":{
1111
"MAJOR":0,
1212
"MINOR":1,
13-
"PATCH":9,
13+
"PATCH":10,
1414
"BUILD":0
1515
},
1616
"KSP_VERSION":{

FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Parts/ConstructionPort0/dockingPortJr.cfg

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ PART
1515
manufacturer = USI - Construction Division
1616
subcategory = 0
1717
title = Clamp-O-Tron Construction Port Jr.
18-
description = Variants of the popular Clamp-O-Tron Docking Ports that can be compressed for construction, and will snap to 90 degree angles.
18+
description = Variants of the popular Clamp-O-Tron Docking Ports that can be compressed for construction, and can angle snap.
1919
attachRules = 1,0,1,0,0
2020
mass = 0.02
2121
dragModelType = default
@@ -43,5 +43,6 @@ PART
4343
MODULE
4444
{
4545
name = ModuleWeldablePort
46+
portSnap = false
4647
}
4748
}

FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Parts/ConstructionPort1/dockingPort.cfg

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ PART
1515
manufacturer = USI - Construction Division
1616
subcategory = 0
1717
title = Clamp-O-Tron Construction Port
18-
description = Variants of the popular Clamp-O-Tron Docking Ports that can be compressed for construction, and will snap to 90 degree angles.
18+
description = Variants of the popular Clamp-O-Tron Docking Ports that can be compressed for construction, and can angle snap.
1919
attachRules = 1,0,1,0,0
2020
mass = 0.05
2121
dragModelType = default
@@ -42,5 +42,6 @@ PART
4242
MODULE
4343
{
4444
name = ModuleWeldablePort
45+
portSnap = false
4546
}
4647
}

FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Parts/ConstructionPort2/dockingPortSr.cfg

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ PART
1414
manufacturer = USI - Construction Division
1515
subcategory = 0
1616
title = Clamp-O-Tron Construction Port Sr.
17-
description = Variants of the popular Clamp-O-Tron Docking Ports that can be compressed for construction, and will snap to 90 degree angles.
17+
description = Variants of the popular Clamp-O-Tron Docking Ports that can be compressed for construction, and can angle snap.
1818
attachRules = 1,0,1,0,0
1919
mass = 0.2
2020
dragModelType = default
@@ -42,5 +42,6 @@ PART
4242
MODULE
4343
{
4444
name = ModuleWeldablePort
45+
portSnap = false
4546
}
4647
}

FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_KIS_01.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
PART
1+
PART:NEEDS[KIS]
22
{
33
// --- general parameters ---
44
name = C3_Kontainer_KIS_01

FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_KIS_02.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
PART
1+
PART:NEEDS[KIS]
22
{
33
// --- general parameters ---
44
name = C3_Kontainer_KIS_02

FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_KIS_03.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
PART
1+
PART:NEEDS[KIS]
22
{
33
// --- general parameters ---
44
name = C3_Kontainer_KIS_03

FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_KIS_04.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
PART
1+
PART:NEEDS[KIS]
22
{
33
// --- general parameters ---
44
name = C3_Kontainer_KIS_04

FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_KIS_M.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
PART
1+
PART:NEEDS[KIS]
22
{
33
// --- general parameters ---
44
name = C3_Kontainer_KIS_M

FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/CHANGELOG.txt

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
0.50.12 - 2017.01.15
2+
--------------------
3+
Performance updates
4+
Added the ability for MKS modules to enable ground tethering.
5+
Added additional fixes for overly 'jittery' bases.
6+
Added weight transfer to the small KIS container (Thanks Wyzard256!)
7+
Added weight transfer to the radial liquid tank and other Ranger-size tanks (Thanks dboi88!)
8+
Fixed texture path for Toolbar icons (Thanks fat-lobyte!)
9+
Fixed issue where the KoloniationMonitor was displaying incorrect resources (thanks again fat-lobyte!)
10+
Efficiency Parts are no longer bound to skill bonuses
11+
112
0.50.11 - 2017.01.08
213
--------------------
314
Fixed an issue where multi-bay modules were not operating at peak efficiency (Note that this is a USI Tools change so be sure to have the latest version! This is why I bundle MiniAVC ;))

FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Kolonists.cfg

-38
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,3 @@
1-
@EXPERIENCE_TRAIT[Pilot] {
2-
EFFECT {
3-
name = RepBoost
4-
}
5-
EFFECT
6-
{
7-
name = LogisticsSkill
8-
}
9-
EFFECT
10-
{
11-
name = ExplorerSkill
12-
}
13-
}
14-
15-
@EXPERIENCE_TRAIT[Engineer] {
16-
EFFECT {
17-
name = FundsBoost
18-
}
19-
EFFECT {
20-
name = GeologySkill
21-
}
22-
}
23-
24-
@EXPERIENCE_TRAIT[Scientist] {
25-
EFFECT {
26-
name = ScienceBoost
27-
}
28-
EFFECT {
29-
name = BotanySkill
30-
}
31-
EFFECT {
32-
name = AgronomySkill
33-
}
34-
EFFECT {
35-
name = MedicalSkill
36-
}
37-
}
38-
391
EXPERIENCE_TRAIT
402
{
413
name = Kolonist
Binary file not shown.
Binary file not shown.
Binary file not shown.

FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/MKS.version

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"VERSION":{
1111
"MAJOR":0,
1212
"MINOR":50,
13-
"PATCH":11,
13+
"PATCH":12,
1414
"BUILD":0
1515
},
1616
"KSP_VERSION":{

FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_Agriculture.cfg

+5
Original file line numberDiff line numberDiff line change
@@ -477,4 +477,9 @@ PART
477477
name = USI_ModuleFieldRepair
478478
}
479479
480+
MODULE
481+
{
482+
name = USI_InertialDampener
483+
}
484+
480485
}

FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_Kerbitat.cfg

+5
Original file line numberDiff line numberDiff line change
@@ -205,4 +205,9 @@ PART
205205
{
206206
name = USI_ModuleFieldRepair
207207
}
208+
209+
MODULE
210+
{
211+
name = USI_InertialDampener
212+
}
208213
}

FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_Kolonist.cfg

+6
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,14 @@ PART
164164
Ratio = 0.000139
165165
}
166166
}
167+
167168
MODULE
168169
{
169170
name = USI_ModuleFieldRepair
170171
}
172+
173+
MODULE
174+
{
175+
name = USI_InertialDampener
176+
}
171177
}

FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_LogCenter.cfg

+5
Original file line numberDiff line numberDiff line change
@@ -153,4 +153,9 @@ PART
153153
name = USI_ModuleFieldRepair
154154
}
155155

156+
MODULE
157+
{
158+
name = USI_InertialDampener
159+
}
160+
156161
}

FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_MedBay.cfg

+5
Original file line numberDiff line numberDiff line change
@@ -173,4 +173,9 @@ PART
173173
{
174174
name = USI_ModuleFieldRepair
175175
}
176+
177+
MODULE
178+
{
179+
name = USI_InertialDampener
180+
}
176181
}

FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_PDU.cfg

+5
Original file line numberDiff line numberDiff line change
@@ -237,4 +237,9 @@ PART
237237
{
238238
name = USI_ModuleFieldRepair
239239
}
240+
241+
MODULE
242+
{
243+
name = USI_InertialDampener
244+
}
240245
}

FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Duna_Pioneer.cfg

+5
Original file line numberDiff line numberDiff line change
@@ -231,4 +231,9 @@ PART
231231
{
232232
name = ModuleResourceSurveyor
233233
}
234+
235+
MODULE
236+
{
237+
name = USI_InertialDampener
238+
}
234239
}

FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_LandingLeg.cfg

+4
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,8 @@ bulkheadProfiles = size1,srf
5757
allowAnimationWhileShielded = False
5858
}
5959
60+
MODULE
61+
{
62+
name = USI_InertialDampener
63+
}
6064
}

FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_WideLeg.cfg

+5
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,9 @@ PART
6868
actionGUIName = Toggle Stabilizer
6969
allowAnimationWhileShielded = False
7070
}
71+
72+
MODULE
73+
{
74+
name = USI_InertialDampener
75+
}
7176
}

FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_AgModule.cfg

+6-5
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,7 @@ PART
155155
eTag = Greenhouse
156156
StartActionName = Start [Greenhouse]
157157
StopActionName = Stop [Greenhouse]
158-
159-
UseSpecialistBonus = true
160-
SpecialistEfficiencyFactor = 0.2
161-
SpecialistBonusBase = 0.05
162-
ExperienceEffect = BotanySkill
158+
163159
Efficiency = 1
164160
eMultiplier = 3.47
165161
INPUT_RESOURCE
@@ -380,4 +376,9 @@ PART
380376
typeName = Bay
381377
ResourceCosts = SpecializedParts,17,MaterialKits,85,ElectricCharge,85
382378
}
379+
380+
MODULE
381+
{
382+
name = USI_InertialDampener
383+
}
383384
}

FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_Airlock.cfg

+6-1
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,10 @@ PART
8080
MODULE
8181
{
8282
name = ModuleWeightDistributableCargo
83-
}
83+
}
84+
85+
MODULE
86+
{
87+
name = USI_InertialDampener
88+
}
8489
}

FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_AnchorHub.cfg

+5
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ PART
6161
passable = true
6262
}
6363

64+
6465
MODULE
6566
{
6667
name = ModuleLight
@@ -106,4 +107,8 @@ PART
106107
name = ModuleWeightDistributor
107108
}
108109

110+
MODULE
111+
{
112+
name = USI_InertialDampener
113+
}
109114
}

FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_AuxCon.cfg

+5
Original file line numberDiff line numberDiff line change
@@ -123,4 +123,9 @@ PART
123123
{
124124
name = ModuleWeightDistributableCargo
125125
}
126+
127+
MODULE
128+
{
129+
name = USI_InertialDampener
130+
}
126131
}

FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/Ranger_BallHub.cfg

+7
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,13 @@ PART
4545
name = ModuleConnectedLivingSpace
4646
passable = true
4747
}
48+
49+
50+
MODULE
51+
{
52+
name = USI_InertialDampener
53+
}
54+
4855

4956
MODULE
5057
{

0 commit comments

Comments
 (0)