Merge pull request #108 from ChrisAdderley/dev

Release 1.0.0

.mod_data.yml

@@ -0,0 +1,31 @@
+mod-name: NearFutureElectrical
+package:
+  include-dependencies: true  # Include dependencies in the package
+  included-gamedata:
+    - NearFutureElectrical
+  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.6.0
+    location: s3
+  CommunityResourcePack:
+    version: 1.0.0
+    location: s3
+  DynamicBatteryStorage:
+    tag: 1.4.0
+    location: github
+    repository: ChrisAdderley/DynamicBatteryStorage
+deploy:
+  SpaceDock:
+    enabled: true  # activate/deactivate this deployment script
+    mod-id: 558  # The Spacedock mod ID for deployment
+  CurseForge:
+    enabled: true  # activate/deactivate this deployment script
+    mod-id: 220671  # The CurseForge mod ID for deployment
+  GitHub:
+    enabled: true  # activate/deactivate this deployment script

.travis.yml

@@ -7,54 +7,28 @@ 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/NearFutureElectrical
     skip_cleanup: true
     acl: public_read
     region: us-east-2
     upload-dir: near-future-electrical
     on:
-      condition: $TRAVIS_BRANCH = master
-  - deploy:
-    provider: releases
-    api_key: $GITHUB_OAUTH_TOKEN
-    file_glob: true
-    file: deploy/*
-    # Newline handling is currently broken so changelog must be added manually...
-    # body: "$CHANGELOG"
-    name: $RELEASE_NAME
-    skip_cleanup: true
-    on:
-      tags: false
-      condition: $TRAVIS_BRANCH = master
+      branch: master

CKAN/NearFutureElectrical-Core.netkan

@@ -0,0 +1,18 @@
+{
+    "spec_version"        : "v1.4",
+    "identifier"          : "NearFutureElectrical-Core",
+    "$kref"               : "#/ckan/spacedock/558",
+    "$vref"               : "#/ckan/ksp-avc/NearFutureElectrical.version",
+    "name"                : "Near Future Electrical Core",
+    "abstract"            : "This is the Near Future Electrical plugin stand-alone, for adding functionality to other mods. It contains no parts and does nothing by itself.",
+    "author"              : "Nertea",
+    "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/NearFutureElectrical"
+    },
+    "install" : [
+        { "file"       : "GameData/NearFutureElectrical/Plugins/NearFutureElectrical.dll",
+          "install_to" : "GameData/NearFutureElectrical/Plugins" }
+    ]
+}

CKAN/NearFutureElectrical-DecayingRTGs.netkan

@@ -0,0 +1,16 @@
+{
+    "spec_version"        : "v1.4",
+    "identifier"          : "NearFutureElectrical-DecayingRTGs",
+    "$kref"               : "#/ckan/spacedock/558",
+    "$vref"               : "#/ckan/ksp-avc/NearFutureElectrical.version",
+    "name"                : "Near Future Electrical - Decaying RTGs",
+    "abstract"            : "This optional patch makes the power output of RTGs (both stock and Near Future's) shrink over time, like they would in real life.",
+    "author"              : "Nertea",
+    "license"             : "MIT",
+    "depends" : [
+        { "name" : "NearFutureElectrical" }
+    ],
+    "install" : [
+        { "find" : "DecayingRTGs", "install_to" : "GameData" }
+    ]
+}

CKAN/NearFutureElectrical.netkan

@@ -0,0 +1,37 @@
+{
+    "spec_version"        : "v1.4",
+    "identifier"          : "NearFutureElectrical",
+    "$kref"               : "#/ckan/spacedock/558",
+    "name"                : "Near Future Electrical",
+    "abstract"            : "Nuclear reactors, capacitors and more batteries that fit right in with stock",
+    "author"              : "Nertea",
+    "license"             : "restricted",
+    "$vref"               : "#/ckan/ksp-avc/NearFutureElectrical.version",
+    "resources": {
+      "homepage": "https://forum.kerbalspaceprogram.com/index.php?/topic/155465-16x-near-future-technologies-16x-fixes-jan-21/",
+      "repository": "https://github.com/ChrisAdderley/NearFutureElectrical"
+    },
+    "depends" : [
+        { "name" : "B9PartSwitch" },
+        { "name" : "CommunityResourcePack" },
+        { "name" : "NearFutureElectrical-Core" },
+        { "name" : "ModuleManager" },
+        { "name" : "DynamicBatteryStorage" }
+    ],
+    "recommends": [
+        { "name" : "CommunityTechTree" }
+    ],
+    "suggests": [
+        { "name" : "NearFutureConstruction" },
+        { "name" : "NearFutureElectrical-DecayingRTGs" },
+        { "name" : "NearFuturePropulsion" },
+        { "name" : "NearFutureSolar" },
+        { "name" : "NearFutureSpacecraft" }
+    ],
+    "install" : [
+        { "find"       : "NearFutureElectrical",
+          "install_to" : "GameData",
+          "filter"     : "NearFutureElectrical.dll"
+        }
+    ]
+}

GameData/NearFutureElectrical/Localization/en-us.cfg

@@ -2,7 +2,7 @@ Localization
 {
   en-us
   {
-	#LOC_NFElectrical_Version = Near Future Electrical 0.9.6
+	  #LOC_NFElectrical_Version = Near Future Electrical 1.0.0
 
     // CONFIG
     // MANUFACTURERS
@@ -28,7 +28,7 @@ Localization
     #LOC_NFElectrical_battery-25_description = In order to undercut Zaltonic Electronics, Batt Man Batteries has begun selling its largest 12K battery pack at wholesale prices directly to the KSC. A key selling point? The integrated ladder.
     #LOC_NFElectrical_battery-25_tags = cell charge e/c elect pack power volt watt nearfuture
     #LOC_NFElectrical_battery-375_title = B-10K Rechargeable Battery Bank
-    #LOC_NFElectrical_battery-375_description = It's likely that without the impetus for extra-large parts that Kerbodyne provided, the B-10K would have remained a far-off dream in Bandas Kerman's mind. An innovative system of removable wedge-shaped battery platters deliver quite a large amount of charge.
+    #LOC_NFElectrical_battery-375_description = DEPRECATED
     #LOC_NFElectrical_battery-375_tags = cell charge e/c elect pack power volt watt nearfuture
     #LOC_NFElectrical_battery-rad-125_title = B-800 Rechargeable Battery
     #LOC_NFElectrical_battery-rad-125_description = After the collapse of Batt-Direct's "hoverboard" project, which has been generally attributed to repeated, intense bursts of flames, the company found themselves with a surplus of large, potent scooter batteries. What better use for these than in a burgeoning space program?

GameData/NearFutureElectrical/Parts/Batteries/battery-0625/battery-0625.cfg → GameData/NearFutureElectrical/Parts/Batteries/battery-0625.cfg

@@ -1,46 +1,52 @@
-// Near Future Electrical 0.4.0
-// Battery Bank - 0.625m
-PART {
-
-	name = battery-0625
-	module = Part
-	author = Chris Adderley
-
-	mesh = battery-0625.mu
-	rescaleFactor = 1.0
-
-	node_stack_top = 0.0, 0.422, 0.0, 0.0, 1.0, 0.0, 1
-	node_stack_bottom = 0.0, -0.4006, 0.0, 0.0, -1.0, 0.0, 1
-
-	TechRequired = largeElectrics
-	entryCost = 9050
-
-	cost = 3150
-	category = Electrical
-	subcategory = 0
-	title = #LOC_NFElectrical_battery-0625_title
-	manufacturer = #LOC_NFElectrical_manufacturer_battdirect_title
-	description = #LOC_NFElectrical_battery-0625_description
-
-	bulkheadProfiles = size0
-
-	attachRules = 1,0,1,1,0
-
-	mass = 0.14
-	dragModelType = default
-	maximum_drag = 0.2
-	minimum_drag = 0.2
-	angularDrag = 1
-	crashTolerance = 8
-	maxTemp = 2000
-
-	tags = #LOC_NFElectrical_battery-0625_tags
-
-	RESOURCE
-	{
-		name = ElectricCharge
-		amount = 2800
-		maxAmount = 2800
-
-	}
-}
+// Near Future Electrical 1.0.0
+// Battery Bank - 0.625m
+PART {
+
+	name = battery-0625
+	module = Part
+	author = Chris Adderley
+
+	MODEL
+  {
+    model = NearFutureElectrical/Parts/Batteries/battery-0625
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+	rescaleFactor = 1.0
+
+	node_stack_top = 0.0, 0.422, 0.0, 0.0, 1.0, 0.0, 1
+	node_stack_bottom = 0.0, -0.4006, 0.0, 0.0, -1.0, 0.0, 1
+
+	TechRequired = largeElectrics
+	entryCost = 9050
+
+	cost = 3150
+	category = Electrical
+	subcategory = 0
+	title = #LOC_NFElectrical_battery-0625_title
+	manufacturer = #LOC_NFElectrical_manufacturer_battdirect_title
+	description = #LOC_NFElectrical_battery-0625_description
+
+	bulkheadProfiles = size0
+
+	attachRules = 1,0,1,1,0
+
+	mass = 0.14
+	dragModelType = default
+	maximum_drag = 0.2
+	minimum_drag = 0.2
+	angularDrag = 1
+	crashTolerance = 8
+	maxTemp = 2000
+
+	tags = #LOC_NFElectrical_battery-0625_tags
+
+	RESOURCE
+	{
+		name = ElectricCharge
+		amount = 2800
+		maxAmount = 2800
+
+	}
+}

GameData/NearFutureElectrical/Parts/Batteries/battery-125/battery-125.cfg → GameData/NearFutureElectrical/Parts/Batteries/battery-125.cfg

@@ -1,46 +1,52 @@
-// Near Future Electrical 0.4.0
-// Battery Bank - 1.25m
-PART {
-
-	name = battery-125
-	module = Part
-	author = Chris Adderley
-
-	mesh = battery-125.mu
-	rescaleFactor = 1.0
-
-	node_stack_top = 0.0, 0.51, 0.0, 0.0, 1.0, 0.0, 1
-	node_stack_bottom = 0.0, -0.51, 0.0, 0.0, -1.0, 0.0, 1
-
-	TechRequired = specializedElectrics
-	entryCost = 19500
-
-	cost = 7200
-	category = Electrical
-	subcategory = 0
-	title = #LOC_NFElectrical_battery-125_title
-	manufacturer = #LOC_NFElectrical_manufacturer_battdirect_title
-	description = #LOC_NFElectrical_battery-125_description
-
-	bulkheadProfiles = size1
-
-	attachRules = 1,0,1,1,0
-
-	mass = 0.32
-	dragModelType = default
-	maximum_drag = 0.2
-	minimum_drag = 0.2
-	angularDrag = 1
-	crashTolerance = 8
-	maxTemp = 2000
-
-	tags = #LOC_NFElectrical_battery-125_tags
-
-	RESOURCE
-	{
-		name = ElectricCharge
-		amount = 6400
-		maxAmount = 6400
-
-	}
-}
+// Near Future Electrical 1.0.0
+// Battery Bank - 1.25m
+PART {
+
+	name = battery-125
+	module = Part
+	author = Chris Adderley
+
+	MODEL
+  {
+    model = NearFutureElectrical/Parts/Batteries/battery-125
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+	rescaleFactor = 1.0
+
+	node_stack_top = 0.0, 0.51, 0.0, 0.0, 1.0, 0.0, 1
+	node_stack_bottom = 0.0, -0.51, 0.0, 0.0, -1.0, 0.0, 1
+
+	TechRequired = specializedElectrics
+	entryCost = 19500
+
+	cost = 7200
+	category = Electrical
+	subcategory = 0
+	title = #LOC_NFElectrical_battery-125_title
+	manufacturer = #LOC_NFElectrical_manufacturer_battdirect_title
+	description = #LOC_NFElectrical_battery-125_description
+
+	bulkheadProfiles = size1
+
+	attachRules = 1,0,1,1,0
+
+	mass = 0.32
+	dragModelType = default
+	maximum_drag = 0.2
+	minimum_drag = 0.2
+	angularDrag = 1
+	crashTolerance = 8
+	maxTemp = 2000
+
+	tags = #LOC_NFElectrical_battery-125_tags
+
+	RESOURCE
+	{
+		name = ElectricCharge
+		amount = 6400
+		maxAmount = 6400
+
+	}
+}