Merge pull request #148 from post-kerbin-mining-corporation/dev

Release 1.4.0
post-kerbin-mining-corporation · Dec 23, 2020 · 11ec634 · 11ec634
2 parents ff72ddd + 0327791
commit 11ec634
Show file tree

Hide file tree

Showing 54 changed files with 3,598 additions and 86 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,43 @@
+name: build
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  pull_request:
+    branches: [ master ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build-package:
+    env:
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      OAUTH_TOKEN: ${{ secrets.OAUTH_TOKEN }}
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checkout this repo
+    - uses: actions/checkout@v2
+    # Checkout another repo
+    - uses: actions/checkout@v2
+      with:
+        # Repository name with owner.
+        repository: 'post-kerbin-mining-corporation/build-deploy'
+        # branch
+        ref: 'actions'
+        path: 'build-deploy'
+    - uses: actions/setup-python@v2
+      with:
+        python-version: '3.8' 
+        architecture: 'x64' 
+    - name: Installing dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install flake8 pytest awscli boto3 requests
+    #- name: Running deploy tests
+    #  run: pytest -s --testpath "GameData/" build-deploy/src/tests/  # run the deploy tests
+    - name: Building package
+      run: python build-deploy/src/package.py --f ".mod_data.yml"
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -0,0 +1,47 @@
+name: deploy
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches: [ master ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  deploy-package:
+    env:
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      OAUTH_TOKEN: ${{ secrets.OAUTH_TOKEN }}
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checkout this repo
+    - uses: actions/checkout@v2
+    # Checkout another repo
+    - uses: actions/checkout@v2
+      with:
+        # Repository name with owner.
+        repository: 'post-kerbin-mining-corporation/build-deploy'
+        # branch
+        ref: 'actions'
+        path: 'build-deploy'
+    - uses: actions/setup-python@v2
+      with:
+        python-version: '3.8' 
+        architecture: 'x64' 
+    - name: Installing dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install flake8 pytest awscli boto3 requests
+    #- name: Running deploy tests
+    #  run: pytest -s --testpath "GameData/" build-deploy/src/tests/  # run the deploy tests
+    - name: Building package
+      run: python build-deploy/src/package.py --f ".mod_data.yml"  
+    - name: Staging package
+      run: python build-deploy/src/stage.py --f ".mod_data.yml" # Run the staging script
+    - name: Deploying package
+      run: python build-deploy/src/deploy.py --f ".mod_data.yml" # Deploy package to spacedock, curse, github
diff --git a/.ksp_deploy_config.yml b/.ksp_deploy_config.yml
@@ -0,0 +1,3 @@
+OAUTH_TOKEN_SSM_KEY: pkmc-bot-github-oauth-token
+GITHUB_USER_SSM_KEY: pkmc-bot-github-user
+GITHUB_USER_EMAIL_SSM_KEY: pkmc-bot-github-user-email
diff --git a/.mod_data.yml b/.mod_data.yml
@@ -14,9 +14,9 @@ dependencies:  # Configure dependencies
     version: 2.17.0
     location: s3
   NearFutureProps:
-    tag: 0.6.3
+    tag: 0.6.4
     location: github
-    repository: ChrisAdderley/NearFutureProps
+    repository: post-kerbin-mining-corporation/NearFutureProps
 deploy:
   SpaceDock:
     enabled: true  # activate/deactivate this deployment script

diff --git a/.travis.yml b/.travis.yml
diff --git a/CKAN/NearFutureSpacecraft-OrbitalLFOEngines.netkan b/CKAN/NearFutureSpacecraft-OrbitalLFOEngines.netkan
@@ -9,7 +9,7 @@
     "license": "MIT",
     "resources": {
       "homepage": "https://forum.kerbalspaceprogram.com/index.php?/topic/155465-16x-near-future-technologies-16x-fixes-jan-21/",
-      "repository": "https://github.com/ChrisAdderley/NearFutureSpacecraft"
+      "repository": "https://github.com/post-kerbin-mining-corporation/NearFutureSpacecraft"
     },
     "depends":  [
         { "name" : "NearFutureSpacecraft" }

diff --git a/CKAN/NearFutureSpacecraft.netkan b/CKAN/NearFutureSpacecraft.netkan
@@ -9,13 +9,16 @@
     "license": "restricted",
     "resources": {
       "homepage": "https://forum.kerbalspaceprogram.com/index.php?/topic/155465-16x-near-future-technologies-16x-fixes-jan-21/",
-      "repository": "https://github.com/ChrisAdderley/NearFutureSpacecraft"
+      "repository": "https://github.com/post-kerbin-mining-corporation/NearFutureSpacecraft"
     },
     "depends":  [
         { "name" : "NearFutureProps" },
         { "name" : "B9PartSwitch" },
         { "name" : "ModuleManager" }
     ],
+    "recommends": [
+      { "name" : "Waterfall" }
+    ],
     "suggests" : [
         { "name" : "CommunityTechTree" },
         { "name" : "NearFutureConstruction" },

diff --git a/GameData/NearFutureSpacecraft/Parts/Command/command-pods/command-125-1.cfg b/GameData/NearFutureSpacecraft/Parts/Command/command-pods/command-125-1.cfg
@@ -195,7 +195,7 @@ PART
 		name = ModuleRCSFX
 		thrusterTransformName = thrustVector
 		thrusterPower = 0.4
-		tagingEnabled = False
+		stagingEnabled = False
 		resourceFlowMode = STAGE_PRIORITY_FLOW
 		resourceName = MonoPropellant
 		runningEffectName = running
@@ -269,4 +269,10 @@ PART
 		nodeEnabled = True
 		attachNodeName = bottom
 	}
+  MODULE
+  {
+    name = ModuleInventoryPart
+    InventorySlots = 2
+    packedVolumeLimit = 50
+  }
 }
diff --git a/GameData/NearFutureSpacecraft/Parts/Command/command-pods/command-125-landing-1.cfg b/GameData/NearFutureSpacecraft/Parts/Command/command-pods/command-125-landing-1.cfg
@@ -239,7 +239,7 @@ PART
 		name = ModuleRCSFX
 		thrusterTransformName = thrustVector
 		thrusterPower = 0.4
-		tagingEnabled = False
+		stagingEnabled = False
 		resourceFlowMode = STAGE_PRIORITY_FLOW
 		resourceName = MonoPropellant
 		runningEffectName = running
@@ -313,4 +313,10 @@ PART
 		nodeEnabled = True
 		attachNodeName = bottom
 	}
+  MODULE
+  {
+    name = ModuleInventoryPart
+    InventorySlots = 2
+    packedVolumeLimit = 50
+  }
 }
diff --git a/GameData/NearFutureSpacecraft/Parts/Command/command-pods/command-125-orbit-1.cfg b/GameData/NearFutureSpacecraft/Parts/Command/command-pods/command-125-orbit-1.cfg
@@ -231,7 +231,7 @@ PART
 		name = ModuleRCSFX
 		thrusterTransformName = thrustVector
 		thrusterPower = 0.4
-		tagingEnabled = False
+		stagingEnabled = False
 		resourceFlowMode = STAGE_PRIORITY_FLOW
 		resourceName = MonoPropellant
 		runningEffectName = running
@@ -241,4 +241,10 @@ PART
 		 key = 1 100
 		}
 	}
+  MODULE
+  {
+    name = ModuleInventoryPart
+    InventorySlots = 3
+    packedVolumeLimit = 60
+  }
 }
diff --git a/GameData/NearFutureSpacecraft/Parts/Command/command-pods/command-25-1.cfg b/GameData/NearFutureSpacecraft/Parts/Command/command-pods/command-25-1.cfg
@@ -129,15 +129,28 @@ PART
 		amount = 60
 		maxAmount = 60
 	}
+
+  MODULE
+  {
+    name = ModuleLight
+    moduleID = lightEmissive
+    lightName = Spotlight
+    lightBrightenSpeed = 2.5
+    lightDimSpeed = 2.5
+    resourceAmount = 0.005
+    lightMeshRendererName = PodDockingLight
+    useResources = true
+    useAnimationDim = true
+  }
 	MODULE
 	{
-		name = ModuleColorChanger
+		name = ModuleAdvancedColorChanger
 		moduleID = windowEmissive
 		shaderProperty = _EmissiveColor
-		excludedRenderer = PodDockingLight
+		includedTransformList = 25mPodAdvanced
 		animRate = 0.8
 		animState = false
-		useRate = true
+
 		toggleInEditor = true
 		toggleInFlight = true
 		unfocusedRange = 5
@@ -167,18 +180,6 @@ PART
 		}
 	}
 
-	MODULE
-	{
-		name = ModuleLight
-		moduleID = lightEmissive
-		lightName = Spotlight
-		lightBrightenSpeed = 2.5
-		lightDimSpeed = 2.5
-		resourceAmount = 0.005
-		animationName = PandoraDockingLight
-		useResources = true
-		useAnimationDim = true
-	}
 	MODULE
 	{
 		  name = FlagDecal
@@ -252,7 +253,7 @@ PART
 		name = ModuleRCSFX
 		thrusterTransformName = thrustVector
 		thrusterPower = 0.8
-		tagingEnabled = False
+		stagingEnabled = False
 		resourceFlowMode = STAGE_PRIORITY_FLOW
 		resourceName = MonoPropellant
 		runningEffectName = running
@@ -283,4 +284,10 @@ PART
 		nodeEnabled = True
 		attachNodeName = bottom
 	}
+  MODULE
+  {
+    name = ModuleInventoryPart
+    InventorySlots = 6
+    packedVolumeLimit = 400
+  }
 }
diff --git a/GameData/NearFutureSpacecraft/Parts/Command/command-pods/command-25-landing-1.cfg b/GameData/NearFutureSpacecraft/Parts/Command/command-pods/command-25-landing-1.cfg
@@ -267,7 +267,7 @@ PART
 		name = ModuleRCSFX
 		thrusterTransformName = thrustVector
 		thrusterPower = 0.8
-		tagingEnabled = False
+		stagingEnabled = False
 		resourceFlowMode = STAGE_PRIORITY_FLOW
 		resourceName = MonoPropellant
 		runningEffectName = running
@@ -297,4 +297,10 @@ PART
 		nodeEnabled = True
 		attachNodeName = bottom
 	}
+  MODULE
+  {
+    name = ModuleInventoryPart
+    InventorySlots = 3
+    packedVolumeLimit = 180
+  }
 }
diff --git a/GameData/NearFutureSpacecraft/Parts/Command/command-pods/command-375-biconic-1.cfg b/GameData/NearFutureSpacecraft/Parts/Command/command-pods/command-375-biconic-1.cfg
@@ -301,5 +301,10 @@ PART
 		transformDir = Z
 		transformSign = -1
 	}
-
+  MODULE
+  {
+    name = ModuleInventoryPart
+    InventorySlots = 6
+    packedVolumeLimit = 1200
+  }
 }
diff --git a/GameData/NearFutureSpacecraft/Parts/Command/command-pods/command-mk3-9.cfg b/GameData/NearFutureSpacecraft/Parts/Command/command-pods/command-mk3-9.cfg
@@ -245,7 +245,7 @@ PART
 		name = ModuleRCSFX
 		thrusterTransformName = thrustVector
 		thrusterPower = 0.8
-		tagingEnabled = False
+		stagingEnabled = False
 		resourceFlowMode = STAGE_PRIORITY_FLOW
 		resourceName = MonoPropellant
 		runningEffectName = running
@@ -275,4 +275,10 @@ PART
 		nodeEnabled = True
 		attachNodeName = bottom
 	}
+  MODULE
+  {
+    name = ModuleInventoryPart
+    InventorySlots = 4
+    packedVolumeLimit = 200
+  }
 }
diff --git a/GameData/NearFutureSpacecraft/Parts/Command/command-pods/command-mk4-1.cfg b/GameData/NearFutureSpacecraft/Parts/Command/command-pods/command-mk4-1.cfg
@@ -320,7 +320,7 @@ PART
 		name = ModuleRCSFX
 		thrusterTransformName = thrustVector
 		thrusterPower = 1
-		tagingEnabled = False
+		stagingEnabled = False
 		resourceFlowMode = STAGE_PRIORITY_FLOW
 		resourceName = MonoPropellant
 		runningEffectName = running
@@ -350,4 +350,10 @@ PART
 		nodeEnabled = True
 		attachNodeName = bottom02
 	}
+  MODULE
+  {
+    name = ModuleInventoryPart
+    InventorySlots = 8
+    packedVolumeLimit = 1000
+  }
 }
diff --git a/GameData/NearFutureSpacecraft/Parts/Command/command-pods/command-ppd-1.cfg b/GameData/NearFutureSpacecraft/Parts/Command/command-pods/command-ppd-1.cfg
@@ -226,7 +226,7 @@ PART
 		name = ModuleRCSFX
 		thrusterTransformName = thrustVector
 		thrusterPower = 1
-		tagingEnabled = False
+		stagingEnabled = False
 		resourceFlowMode = STAGE_PRIORITY_FLOW
 		resourceName = MonoPropellant
 		runningEffectName = running
@@ -236,4 +236,10 @@ PART
 		 key = 1 100
 		}
 	}
+  MODULE
+  {
+    name = ModuleInventoryPart
+    InventorySlots = 5
+    packedVolumeLimit = 500
+  }
 }