Merge pull request #95 from ChrisAdderley/dev

Release 1.1.0

.mod_data.yml

@@ -0,0 +1,24 @@
+mod-name: NearFutureConstruction
+package:
+  include-dependencies: true  # Include dependencies in the package
+  included-gamedata:
+    - NearFutureConstruction
+  included-support:  # Include these root-level files in packages
+    - readme.txt
+    - changelog.txt
+dependencies:  # Configure dependencies
+  ModuleManager:
+    version: 4.0.2
+    location: s3
+  B9PartSwitch:
+    version: 2.7.0
+    location: s3
+deploy:
+  SpaceDock:
+    enabled: true  # activate/deactivate this deployment script
+    mod-id: 563  # The Spacedock mod ID for deployment
+  CurseForge:
+    enabled: true  # activate/deactivate this deployment script
+    mod-id: 220675  # The CurseForge mod ID for deployment
+  GitHub:
+    enabled: true  # activate/deactivate this deployment script

.travis.yml

@@ -2,59 +2,33 @@ language: python
 python:
   - 3.6
 install:
-  - pip install awscli boto3 requests requests_toolbelt
+  - pip install awscli boto3 requests
 branches:
   only:
     - master
 script:
-  - python build_scripts/build.py
+  - git clone https://github.com/post-kerbin-mining-corporation/build-deploy.git  # clone this repo, it contains the stuff that does the heavy lifting
+  - cd build-deploy
+  - git checkout master
+  - cd ..
+  - pytest -s --testpath "GameData/" build-deploy/src/tests/  # run the deploy tests
+  - python build-deploy/src/package.py --f ".mod_data.yml"  # Build package
 before_deploy:
-  - VERSION=$(cat build_scripts/version.txt)
-  - CHANGELOG=$(cat build_scripts/changelog.md)
-  - IFS='/'; BASENAME=($TRAVIS_REPO_SLUG); unset IFS;
-  - RELEASE_NAME="${BASENAME[1]} $VERSION"
-  - echo $VERSION
-  - git config --local user.name "ChrisAdderley"
-  - git config --local user.email "[email protected]"
-  - git remote set-url origin https://ChrisAdderley:${GITHUB_OAUTH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git
-  # Only tag if this is the first before_deploy (runs for all providers)
-  - >
-    if ! [ "$BEFORE_DEPLOY_RUN" ]; then
-      export BEFORE_DEPLOY_RUN=1;
-      git tag $VERSION;
-      git push origin $VERSION;
-    fi
+  - python build-deploy/src/stage.py --f ".mod_data.yml" # Run the staging script
 deploy:
   - provider: script
-    script: python build_scripts/deploy.py --curse
+    script: python build-deploy/src/deploy.py --f ".mod_data.yml" # Deploy package to spacedock, curse, github
     skip_cleanup: true
     on:
-      condition: $TRAVIS_BRANCH = master
-  - provider: script
-    script: python build_scripts/deploy.py --spacedock
-    skip_cleanup: true
-    on:
-      condition: $TRAVIS_BRANCH = master
-  - provider: s3
+      branch: master
+  - provider: s3 # releases to S3
     access_key_id: $AWS_ACCESS_KEY_ID
     secret_access_key: $AWS_SECRET_ACCESS_KEY
     bucket: "nertea-ksp-modding-releases"
-    local_dir: deploy
+    local_dir: deploy/NearFutureConstruction
     skip_cleanup: true
     acl: public_read
     region: us-east-2
     upload-dir: near-future-construction
     on:
-      condition: $TRAVIS_BRANCH = master
-  - deploy:
-    provider: releases
-    api_key: $GITHUB_OAUTH_TOKEN
-    file_glob: true
-    file: deploy/*
-    # Disable for now, newlines don't work
-    #body: "$CHANGELOG"
-    name: $RELEASE_NAME
-    skip_cleanup: true
-    on:
-      tags: false
-      condition: $TRAVIS_BRANCH = master
+      branch: master

CKAN/NearFutureConstruction.netkan

@@ -0,0 +1,32 @@
+{
+    "spec_version"        : "v1.4",
+    "identifier"          : "NearFutureConstruction",
+    "$kref"               : "#/ckan/spacedock/563",
+    "abstract"            : "Structural components and truss segments for building deep space vessels and bases. Includes various skeletal adapters and docking ports.",
+    "author"              : "Nertea",
+    "license"             : "restricted",
+    "$vref"               : "#/ckan/ksp-avc",
+    "resources": {
+      "homepage": "https://forum.kerbalspaceprogram.com/index.php?/topic/155465-16x-near-future-technologies-16x-fixes-jan-21/",
+      "repository": "https://github.com/ChrisAdderley/NearFutureConstruction"
+    },
+    "depends" : [
+        { "name" : "B9PartSwitch" },
+        { "name" : "ModuleManager" }
+    ],
+    "suggests": [
+        { "name" : "CommunityTechTree" },
+        { "name" : "NearFutureElectrical" },
+        { "name" : "NearFuturePropulsion" },
+        { "name" : "NearFutureSolar" },
+        { "name" : "NearFutureSpacecraft" },
+        { "name" : "StationPartsExpansionRedux" }
+    ],
+    "supports": [
+        { "name" : "ConnectedLivingSpace", },
+        { "name" : "CommunityResourcePack" }
+    ],
+    "install" : [
+        { "find" : "NearFutureConstruction", "install_to" : "GameData" }
+    ]
+}

GameData/NearFutureConstruction/Localization/en-us.cfg

@@ -135,7 +135,7 @@ Localization
     #LOC_NFConstruction_truss-octo-hub-crew-1_tags = connect frame scaffold structur strut truss nearfuture octo center central hub nexus crew pressur
     #LOC_NFConstruction_truss-octo-drone-1_title = Octo-Girder Guidance Unit
     #LOC_NFConstruction_truss-octo-drone-1_description = Remotely operated guidance unit with the most advanced algorithms. Also incorporates a large, powerful set of reaction wheels suitable for moving large spacecraft.
-    #LOC_NFConstruction_truss-octo-drone-1_tags = cmg command control (core fly gyro moment probe react sas satellite space stab steer torque connect frame scaffold structur strut truss
+    #LOC_NFConstruction_truss-octo-drone-1_tags = cmg command control (core fly gyro moment probe react sas satellite space stab steer torque connect frame scaffold structur strut truss nearfuture
     #LOC_NFConstruction_truss-octo-docking-25_title = Octo-Girder Heavy Docking Connector
     #LOC_NFConstruction_truss-octo-docking-25_description = A heavier Modular Octo-Girder docking port. Compatible with the larger standard Clamp-O-Tron Senior docking port.
     #LOC_NFConstruction_truss-octo-docking-25_tags = connect frame scaffold structur strut truss nearfuture octo berth capture connect couple dock fasten join moor socket

GameData/NearFutureConstruction/Parts/Truss/truss-octo/truss-octo-crew-01.cfg

@@ -91,7 +91,6 @@ PART
 		{
 			name =Solid
 			title= #LOC_NFConstruction_switcher_subtype_variant1
-			transform = TubeLrg
 			transform = OctoLarge001
 			transform = COLLISION15
 		}
@@ -100,7 +99,6 @@ PART
 		{
 			name = Hollow
 			title= #LOC_NFConstruction_switcher_subtype_variant2
-			transform = TubeLrg
 			transform = OctoLargeHollowCrew
 			transform = OctoLargeHollowStructCrew
 			transform = COLLIDERTUBE
@@ -118,7 +116,6 @@ PART
 		{
 			name = Dual
 			title= #LOC_NFConstruction_switcher_subtype_variant4
-			transform = TubeLrg
 			transform = OctoLargeHollowHalfCrew
 			transform = OctoLargeHollowStructHalfCrew
 			transform = COLLIDERTUBE

GameData/NearFutureConstruction/Parts/Truss/truss-octo/truss-octo-crew-02.cfg

@@ -91,7 +91,6 @@ PART
 		{
 			name = Solid
 			title= #LOC_NFConstruction_switcher_subtype_variant1
-			transform = TubeMedium
 			transform = OctoMedium001
 			transform = COLLISION032
 		}
@@ -100,7 +99,6 @@ PART
 		{
 			name = Hollow
 			title= #LOC_NFConstruction_switcher_subtype_variant2
-			transform = TubeMedium
 			transform = OctoMedHollowCrew
 			transform = OctoMedHollowStructCrew
 			transform = COLLIDERTUBEMED
@@ -118,7 +116,6 @@ PART
 		{
 			name = Dual
 			title= #LOC_NFConstruction_switcher_subtype_variant4
-			transform = TubeMedium
 			transform = OctoMedHollowHalfCrew
 			transform = OctoMedHollowStructHalfCrew
 			transform = COLLIDERTUBEMED

GameData/NearFutureConstruction/Parts/Truss/truss-octo/truss-octo-crew-03.cfg

@@ -90,7 +90,6 @@ PART
 		{
 			name = Solid
 			title= #LOC_NFConstruction_switcher_subtype_variant1
-			transform = TubeSmall
 			transform = OctoSmall001
 			transform = COLLISION031
 		}
@@ -99,7 +98,6 @@ PART
 		{
 			name = Hollow
 			title= #LOC_NFConstruction_switcher_subtype_variant2
-			transform = TubeSmall
 			transform = OctoSmallHollowCrew
 			transform = OctoSmallHollowStructCrew
 			transform = COLLIDERTUBESML
@@ -117,7 +115,6 @@ PART
 		{
 			name = Dual
 			title= #LOC_NFConstruction_switcher_subtype_variant4
-			transform = TubeSmall
 			transform = OctoSmallHollowHalfCrew
 			transform = OctoSmallHollowStructHalfCrew
 			transform = COLLIDERTUBESML

GameData/NearFutureConstruction/Parts/Truss/truss-octo/truss-octo-docking-125.cfg

@@ -89,4 +89,23 @@ PART
 		nodeType = size1
 		stagingEnabled = False
 	}
+	MODULE
+	{
+		name = ModuleB9PartSwitch
+		moduleID = meshSwitch
+		switcherDescription = #LOC_NFConstruction_switcher_docking_title
+		SUBTYPE
+		{
+			name = Basic
+			title= #LOC_NFConstruction_switcher_docking_variant1
+			transform = DockingPortClassicHollow
+		}
+		SUBTYPE
+		{
+			name = Hatch
+			title= #LOC_NFConstruction_switcher_docking_variant2
+			transform = DockingPortClassicReg
+		}
+
+	}
 }

GameData/NearFutureConstruction/Parts/Truss/truss-octo/truss-octo-docking-octo.cfg

@@ -106,8 +106,7 @@ PART
 		{
 			name = Hatch
 			title= #LOC_NFConstruction_switcher_docking_variant2
-			transform = Hatch
-			transform = HatchBack
+			transform = Hatches
 		}
 
 	}

GameData/NearFutureConstruction/Patches/NFConstructionCRPTrusses.cfg

@@ -54,9 +54,13 @@
   MODULE
 	{
 		name =  ModuleCryoTank
-		FuelName = LqdHydrogen
-		// in % per hour
-		BoiloffRate = 0.05
+		CoolingEnabled = True
+    BOILOFFCONFIG
+    {
+      FuelName = LqdHydrogen
+      // in % per hr
+      BoiloffRate = 0.05
+    }
 		// in Ec per 1000 units per second
 		CoolingCost = 0.08
 	}
@@ -181,9 +185,13 @@
   MODULE
   {
     name =  ModuleCryoTank
-    FuelName = LqdHydrogen
-    // in % per hour
-    BoiloffRate = 0.05
+    CoolingEnabled = True
+    BOILOFFCONFIG
+    {
+      FuelName = LqdHydrogen
+      // in % per hr
+      BoiloffRate = 0.05
+    }
     // in Ec per 1000 units per second
     CoolingCost = 0.08
   }

GameData/NearFutureConstruction/Patches/NFConstructionCommunityTechTree.cfg

@@ -1,4 +1,4 @@
-// CTT Compatibility for Near Future Construction v0.6.0
+// CTT Compatibility for Near Future Construction v1.0+
 
 // Adapters
 

GameData/NearFutureConstruction/Patches/NFConstructionConnectedLivingSpaces.cfg

@@ -66,7 +66,7 @@
 		passable = true
 	}
 }
-@PART[truss-octo-angled-crew-01]:NEEDS[ConnectedLivingSpace]:HAS[!MODULE[ModuleConnectedLivingSpace]] 
+@PART[truss-octo-angled-crew-01]:NEEDS[ConnectedLivingSpace]:HAS[!MODULE[ModuleConnectedLivingSpace]]
 {
     MODULE
 	{

GameData/NearFutureConstruction/Patches/NFConstructionStockPartReplacements.cfg

@@ -1,4 +1,4 @@
-// Replaces certain stock parts
+// Updates the stock Cubic Strut model with planar and tri versions to match the new versions added
 
 // Cubic strut
 @PART[strutCube]:FOR[zzzzNFConstruction]
@@ -47,37 +47,5 @@
 			addedMass = -0.0005
 			addedCost = -12
 		}
-
-
-	}
-}
-
-// Micronode
-@PART[structuralMiniNode]:FOR[zzzzNFConstruction]
-{
-	@author = Chris Adderley
-	!mesh = DELETE
-	!MODEL,* {}
-	MODEL
-	{
-		model = NearFutureConstruction/Parts/Truss/truss-micro/truss-micro-node-1
-		position = 0.0, 0.0, 0.0
-		scale = 1,1,1
-		rotation = 0, 0, 0
-	}
-}
-
-// Octo-Strut
-@PART[strutOcto]:FOR[zzzzNFConstruction]
-{
-	@author = Chris Adderley
-	!mesh = DELETE
-	!MODEL,* {}
-	MODEL
-	{
-		model = NearFutureConstruction/Parts/Truss/truss-micro/truss-micro-octo-1
-		position = 0.0, 0.0, 0.0
-		scale = 1,1,1
-		rotation = 0, 0, 0
 	}
 }

GameData/NearFutureConstruction/Versioning/NearFutureConstruction.version

@@ -5,8 +5,8 @@
     "VERSION":
     {
         "MAJOR":1,
-        "MINOR":0,
-        "PATCH":6,
+        "MINOR":1,
+        "PATCH":0,
         "BUILD":0
     },
     "KSP_VERSION":

README.md

@@ -25,8 +25,8 @@ A number of parts designed to help build cooler spacecraft with girders and trus
 
 ### Required
 These components are required for the mod to function and are bundled as part of any download:
-* [ModuleManager (3.1.3)](https://github.com/sarbian/ModuleManager)
-* [B9PartSwitch (2.6.0)](https://github.com/blowfishpro/B9PartSwitch)
+* [ModuleManager (4.0.2)](https://github.com/sarbian/ModuleManager)
+* [B9PartSwitch (2.7.0)](https://github.com/blowfishpro/B9PartSwitch)
 
 ## Installation