From ffc2ac873ff3647b2db53bf9d833b2efa785b5fd Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 20 Nov 2020 13:02:08 -0800 Subject: [PATCH 1/2] Fix things again --- .mod_data.yml | 2 +- .travis.yml | 34 ------ .../Patches/Squad/liquidEngineKodiak.cfg | 103 ------------------ .../Versioning/WaterfallRestock.version | 2 +- changelog.txt | 4 + readme.txt | 4 +- 6 files changed, 8 insertions(+), 141 deletions(-) delete mode 100644 .travis.yml delete mode 100644 GameData/WaterfallRestock/Patches/Squad/liquidEngineKodiak.cfg diff --git a/.mod_data.yml b/.mod_data.yml index 31f089c..c3f8364 100644 --- a/.mod_data.yml +++ b/.mod_data.yml @@ -13,7 +13,7 @@ dependencies: # Configure dependencies Waterfall: tag: 0.2.5 location: github - repository: ChrisAdderley/Waterfall + repository: post-kerbin-mining-corporation/Waterfall deploy: SpaceDock: enabled: false # activate/deactivate this deployment script diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 9c6bbcc..0000000 --- a/.travis.yml +++ /dev/null @@ -1,34 +0,0 @@ -language: python -python: - - 3.6 -install: - - pip install awscli boto3 requests -branches: - only: - - master -script: - - 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: - - python build-deploy/src/stage.py --f ".mod_data.yml" # Run the staging script -deploy: - - provider: script - script: python build-deploy/src/deploy.py --f ".mod_data.yml" # Deploy package to spacedock, curse, github - skip_cleanup: true - on: - 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/Waterfall - skip_cleanup: true - acl: public_read - region: us-east-2 - upload-dir: waterfall - on: - branch: master diff --git a/GameData/WaterfallRestock/Patches/Squad/liquidEngineKodiak.cfg b/GameData/WaterfallRestock/Patches/Squad/liquidEngineKodiak.cfg deleted file mode 100644 index e5ba087..0000000 --- a/GameData/WaterfallRestock/Patches/Squad/liquidEngineKodiak.cfg +++ /dev/null @@ -1,103 +0,0 @@ - - -@PART[LiquidEngineRK-7]:AFTER[ReStock] -{ - - !EFFECTS {} - EFFECTS - { - engage - { - AUDIO - { - channel = Ship - clip = sound_vent_medium - volume = 1.0 - pitch = 2.0 - loop = false - } - } - flameout - { - AUDIO - { - channel = Ship - clip = sound_explosion_low - volume = 1.0 - pitch = 2.0 - loop = false - } - } - fx-kodiak-running - { - AUDIO - { - channel = Ship - clip = sound_rocket_hard - volume = 0.0 0.0 - volume = 0.01 0.2 - volume = 1.0 0.6 - pitch = 0.0 0.1 - pitch = 0.01 0.2 - pitch = 1.0 0.5 - loop = true - } - PREFAB_PARTICLE - { - prefabName = fx_smokeTrail_light - transformName = fxTransformPlume - emission = 0.0 0.0 - emission = 0.05 0.0 - emission = 0.075 0.25 - emission = 1.0 1.25 - speed = 0.0 0.25 - speed = 1.0 1.0 - } - } - } - MODULE - { - name = ModuleWaterfallFX - // This is a custom name - moduleID = kodiakFX - // This links the effects to a given ModuleEngines - engineID = basicEngine - - // List out all controllers we want available - // This controller scales with atmosphere depth - CONTROLLER - { - name = atmosphereDepth - linkedTo = atmosphere_density - } - // This controller scales with effective throttle - CONTROLLER - { - name = throttle - linkedTo = throttle - } - // this controller generates a random value in the range specified - CONTROLLER - { - name = random - linkedTo = random - range = -1,1 - } - // ----------------------------------------------------- - // Past here should be generated with the ingame editor! - // ----------------------------------------------------- - TEMPLATE - { - // This is the name of the template to use - templateName = waterfall-kerolox-lower-1 - // This field allows you to override the parentTransform name in the EFFECTS contained in the template - overrideParentTransform = thrustTransform - position = 0,0,-0.8 - rotation = 0, 0, 0 - scale = 0.7, 0.7, 0.9 - } - - - } - -} \ No newline at end of file diff --git a/GameData/WaterfallRestock/Versioning/WaterfallRestock.version b/GameData/WaterfallRestock/Versioning/WaterfallRestock.version index 403c24c..9d0f4ab 100644 --- a/GameData/WaterfallRestock/Versioning/WaterfallRestock.version +++ b/GameData/WaterfallRestock/Versioning/WaterfallRestock.version @@ -6,7 +6,7 @@ { "MAJOR":0, "MINOR":1, - "PATCH":2, + "PATCH":3, "BUILD":0 }, "KSP_VERSION": diff --git a/changelog.txt b/changelog.txt index 0140c9b..03a4f38 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +v0.1.3 +------ +- Fixed duplicated Kodiak config (again) + v0.1.2 ------ - Fixed duplicated Kodiak config diff --git a/readme.txt b/readme.txt index 0e7c4f9..fecf56e 100644 --- a/readme.txt +++ b/readme.txt @@ -1,5 +1,5 @@ ================================= -Waterfall - Restock Configs 0.1.2 +Waterfall - Restock Configs 0.1.3 ================================= This is a configuration pack for the Waterfall mod, which applies Waterfall type effects to Restock and Restock+ models. It does nothing on its own and requires the base Waterfall mod to function. @@ -9,7 +9,7 @@ DEPENDENCIES ============ Required: -- Waterfall (0.2.5) +- Waterfall (0.2.6) - Restock (1.2+) - ModuleManager (v4.1.4) From 709d97020ec23bbc281d22d388fa554b2a19af48 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 20 Nov 2020 15:39:33 -0800 Subject: [PATCH 2/2] Bump WF version --- .mod_data.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mod_data.yml b/.mod_data.yml index c3f8364..3807010 100644 --- a/.mod_data.yml +++ b/.mod_data.yml @@ -11,7 +11,7 @@ dependencies: # Configure dependencies version: 4.1.4 location: s3 Waterfall: - tag: 0.2.5 + tag: 0.2.6 location: github repository: post-kerbin-mining-corporation/Waterfall deploy: