Skip to content

Commit

Permalink
Merge pull request #22 from BobPalmer/DEVELOP
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
BobPalmer authored Oct 11, 2016
2 parents 0832148 + e55954e commit 7156428
Show file tree
Hide file tree
Showing 81 changed files with 538 additions and 357 deletions.
10 changes: 10 additions & 0 deletions FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
0.8.0 - (KSP 1.2)
------------------
Fixed issue with version file
Engineers can now operate power couplers if they are within scavange range (thanks tomforwood).
Two way auto transfers! Resources above 85% are now pushed to warehouses (thanks tomforwood).
Modified pulse drives in support of the Nuclear Rockets mod
Added new USI Part Catalog options
Swappable Converters!
Non-Engineers have (potentially) learned how to make things explode! Settable as a config option

0.7.4 - (KSP 1.1.3)
------------------
Compatibility for KSP 1.1.3
Expand Down
16 changes: 16 additions & 0 deletions FOR_RELEASE/GameData/000_USITools/Comms.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
@PART[*]:HAS[!MODULE[ModuleDataTransmitter],MODULE[ModuleCommand]]
{
MODULE
{
name = ModuleDataTransmitter
antennaType = INTERNAL
packetInterval = 1.0
packetSize = 2
packetResourceCost = 12.0
requiredResource = ElectricCharge
antennaPower = 5000
optimumRange = 2500
packetFloor = .1
packetCeiling = 5
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FOR_RELEASE/GameData/000_USITools/Logistics_N.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FOR_RELEASE/GameData/000_USITools/Logistics_S.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FOR_RELEASE/GameData/000_USITools/Rovers_N.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FOR_RELEASE/GameData/000_USITools/Rovers_S.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
128 changes: 128 additions & 0 deletions FOR_RELEASE/GameData/000_USITools/Spaces/USIGeneric_IVA.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
INTERNAL
{
name = USIGenericInternal
MODEL
{
model = 000_USITools/Spaces/IVAShell
}
MODULE
{
name = InternalSeat
seatTransformName = Kerbal
allowCrewHelmet = false
}
MODULE
{
name = InternalSeat
seatTransformName = Kerbal
allowCrewHelmet = false
}
MODULE
{
name = InternalSeat
seatTransformName = Kerbal
allowCrewHelmet = false
}
MODULE
{
name = InternalSeat
seatTransformName = Kerbal
allowCrewHelmet = false
}
MODULE
{
name = InternalSeat
seatTransformName = Kerbal
allowCrewHelmet = false
}
MODULE
{
name = InternalSeat
seatTransformName = Kerbal
allowCrewHelmet = false
}
MODULE
{
name = InternalSeat
seatTransformName = Kerbal
allowCrewHelmet = false
}
MODULE
{
name = InternalSeat
seatTransformName = Kerbal
allowCrewHelmet = false
}
MODULE
{
name = InternalSeat
seatTransformName = Kerbal
allowCrewHelmet = false
}
MODULE
{
name = InternalSeat
seatTransformName = Kerbal
allowCrewHelmet = false
}
MODULE
{
name = InternalSeat
seatTransformName = Kerbal
allowCrewHelmet = false
}
MODULE
{
name = InternalSeat
seatTransformName = Kerbal
allowCrewHelmet = false
}
MODULE
{
name = InternalSeat
seatTransformName = Kerbal
allowCrewHelmet = false
}
MODULE
{
name = InternalSeat
seatTransformName = Kerbal
allowCrewHelmet = false
}
MODULE
{
name = InternalSeat
seatTransformName = Kerbal
allowCrewHelmet = false
}
MODULE
{
name = InternalSeat
seatTransformName = Kerbal
allowCrewHelmet = false
}
MODULE
{
name = InternalSeat
seatTransformName = Kerbal
allowCrewHelmet = false
}
MODULE
{
name = InternalSeat
seatTransformName = Kerbal
allowCrewHelmet = false
}
MODULE
{
name = InternalSeat
seatTransformName = Kerbal
allowCrewHelmet = false
}
MODULE
{
name = InternalSeat
seatTransformName = Kerbal
allowCrewHelmet = false
}
}
Binary file not shown.
Binary file modified FOR_RELEASE/GameData/000_USITools/USITools.dll
Binary file not shown.
Binary file not shown.
Binary file added FOR_RELEASE/GameData/000_USITools/USITools.pdb
Binary file not shown.
16 changes: 8 additions & 8 deletions FOR_RELEASE/GameData/000_USITools/USITools.version
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"NAME":"USI Tools",
"URL":"https://raw.githubusercontent.com/BobPalmer/UmbraSpaceIndustries/master/FOR_RELEASE/GameData/UmbraSpaceIndustries/USICore.version",
"URL":"https://raw.githubusercontent.com/BobPalmer/UmbraSpaceIndustries/master/FOR_RELEASE/GameData/000_USITools/USITools.version",
"DOWNLOAD":"https://github.com/BobPalmer/UmbraSpaceIndustries/releases",
"GITHUB":{
"USERNAME":"BobPalmer",
Expand All @@ -9,23 +9,23 @@
},
"VERSION":{
"MAJOR":0,
"MINOR":7,
"PATCH":4,
"MINOR":8,
"PATCH":0,
"BUILD":0
},
"KSP_VERSION":{
"MAJOR":1,
"MINOR":1,
"PATCH":3
"MINOR":2,
"PATCH":0
},
"KSP_VERSION_MIN":{
"MAJOR":1,
"MINOR":0,
"MINOR":2,
"PATCH":0
},
"KSP_VERSION_MAX":{
"MAJOR":1,
"MINOR":1,
"PATCH":3
"MINOR":2,
"PATCH":0
}
}
8 changes: 4 additions & 4 deletions FOR_RELEASE/GameData/Firespitter/Firespitter.version
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"URL": "https://raw.githubusercontent.com/snjo/Firespitter/master/For%20release/Firespitter/Firespitter.version",
"VERSION": {
"MAJOR": 7,
"MINOR": 3,
"PATCH": 0
"MINOR": 4,
"PATCH": 1
},
"KSP_VERSION": {
"MAJOR": 1,
"MINOR": 1,
"PATCH": 3
"MINOR": 2,
"PATCH": 0
}
}
Binary file modified FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
7 changes: 7 additions & 0 deletions FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
0.3.0 - (KSP 1.2)
------------------
All Kontainers moved to the Logistics division (to support new category icons)
All tanks now have a standard crash tolerance of 8m/s and are set to stock dry mass / volume ratios.
Corrected volume of the containers (no more kontainers of holding)
Dry Kontainers and Tanks now have five more resources - Silicates, Silicon, RefinedExotics, Organics, and ColonySupplies.

0.2.4 - (KSP 1.1.3)
------------------
All Kontainers have had their prices fixed.
Expand Down

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ cost = 3800
category = none
subcategory = -1
title = Nuclear Waste Container
manufacturer = USI - Freight Division
manufacturer = USI - Logistics Division
description = A specialized container for holding nuclear waste

// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ breakingTorque = 2072
TechRequired = heavierRocketry
entryCost = 7600
cost = 95
category = Utility
category = none
subcategory = 0
title = Kontainer Tank - Cluster (1.25m)
manufacturer = USI - Freight Division
manufacturer = USI - Logistics Division
description = Shipping container for transporting various goods

// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
Expand All @@ -41,12 +41,12 @@ attachRules = 1,0,1,1,0


// --- standard part parameters ---
mass = .075
mass = 0.075
dragModelType = default
maximum_drag = 0.20
minimum_drag = 0.15
angularDrag = 2
crashTolerance = 10
crashTolerance = 8
maxTemp = 2000
bulkheadProfiles = size0,srf

Expand All @@ -57,7 +57,7 @@ bulkheadProfiles = size0,srf
resourceAmounts = 600;6000;60000;54,66;600;600;600;2400;120;120
initialResourceAmounts = 0;0;0;0;0;0;0;0;0;0
tankCost = 2400000;24000;630;55.2;0.48;9600;0;88.2;96;144
basePartMass = .075
basePartMass = 0.075
tankMass = 0;0;0;0;0;0;0;0;0;0
hasGUI = false
}
Expand Down Expand Up @@ -96,9 +96,4 @@ bulkheadProfiles = size0,srf
{
name = USI_ModuleResourceWarehouse
}

MODULE
{
name = ModuleDistributedWarehouse
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ breakingTorque = 2072
TechRequired = heavierRocketry
entryCost = 7600
cost = 95
category = Utility
category = none
subcategory = 0
title = Kontainer Tank - Cluster (2.5m)
manufacturer = USI - Freight Division
manufacturer = USI - Logistics Division
description = Shipping container for transporting various goods

// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
Expand All @@ -46,7 +46,7 @@ dragModelType = default
maximum_drag = 0.20
minimum_drag = 0.15
angularDrag = 2
crashTolerance = 10
crashTolerance = 8
maxTemp = 2000
bulkheadProfiles = size0,srf

Expand All @@ -57,7 +57,7 @@ bulkheadProfiles = size0,srf
resourceAmounts = 4500;45000;450000;405,495;4500;4500;4500;18000;900;900
initialResourceAmounts = 0;0;0;0;0;0;0;0;0;0
tankCost = 18000000;180000;4725;414;3.6;72000;0;661.5;720;1080
basePartMass = 0.5625
basePartMass = 0.5625
tankMass = 0;0;0;0;0;0;0;0;0;0
hasGUI = false
}
Expand Down Expand Up @@ -96,9 +96,4 @@ bulkheadProfiles = size0,srf
{
name = USI_ModuleResourceWarehouse
}

MODULE
{
name = ModuleDistributedWarehouse
}
}
Loading

0 comments on commit 7156428

Please sign in to comment.