Skip to content

Commit

Permalink
Merge pull request #3 from ChrisAdderley/dev
Browse files Browse the repository at this point in the history
Release 0.1.1
  • Loading branch information
ChrisAdderley authored Oct 27, 2020
2 parents 88e9547 + a3f5d55 commit 400e80b
Show file tree
Hide file tree
Showing 9 changed files with 140 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .mod_data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ mod-name: WaterfallRestock
package:
include-dependencies: true # Include dependencies in the package
included-gamedata:
- Waterfall
- WaterfallRestock
included-support: # Include these root-level files in packages
- readme.txt
- changelog.txt
Expand All @@ -11,7 +11,7 @@ dependencies: # Configure dependencies
version: 4.1.4
location: s3
Waterfall:
tag: 0.2.0
tag: 0.2.1
location: github
repository: ChrisAdderley/Waterfall
deploy:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

}

@PART[restock-rcs-block-quad-angled-1]:AFTER[ReStock]:FOR[Waterfall]
@PART[restock-rcs-block-quad-angled-1]:AFTER[ReStockPlus]
{
// Removes the stock effect block, and replace it with one that has no particles
!EFFECTS {}
Expand Down Expand Up @@ -112,7 +112,7 @@

}

@PART[restock-rcs-block-triple-angled-1]:AFTER[ReStock]:FOR[Waterfall]
@PART[restock-rcs-block-triple-angled-1]:AFTER[ReStockPlus]
{
// Removes the stock effect block, and replace it with one that has no particles
!EFFECTS {}
Expand Down Expand Up @@ -167,7 +167,7 @@
}

}
@PART[restock-rcs-block-quint-1]:AFTER[ReStock]:FOR[Waterfall]
@PART[restock-rcs-block-quint-1]:AFTER[ReStockPlus]
{
// Removes the stock effect block, and replace it with one that has no particles
!EFFECTS {}
Expand Down Expand Up @@ -223,7 +223,7 @@

}

@PART[restock-rcs-block-single-mini-1]:AFTER[ReStock]:FOR[Waterfall]
@PART[restock-rcs-block-single-mini-1]:AFTER[ReStockPlus]
{
// Removes the stock effect block, and replace it with one that has no particles
!EFFECTS {}
Expand Down Expand Up @@ -276,6 +276,5 @@
position = 0,0.015,0
}
}

}

2 changes: 1 addition & 1 deletion GameData/WaterfallRestock/Patches/Squad/SquadRCS.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
}


@PART[mk1-3pod]:AFTER[ReStock]:FOR[Waterfall]
@PART[mk1-3pod]:AFTER[ReStock]
{
// Removes the stock effect block, and replace it with one that has no particles
!EFFECTS {}
Expand Down
122 changes: 122 additions & 0 deletions GameData/WaterfallRestock/Patches/Squad/engineLargeSkipper_v2.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@


@PART[engineLargeSkipper_v2]:AFTER[ReStock]
{

!EFFECTS {}
EFFECTS
{
engage
{
AUDIO
{
channel = Ship
clip = sound_vent_medium
volume = 1.0
pitch = 2.0
loop = false
}
}
disengage
{
AUDIO
{
channel = Ship
clip = sound_vent_soft
volume = 1.0
pitch = 2.0
loop = false
}
}
flameout
{
PREFAB_PARTICLE
{
prefabName = fx_exhaustSparks_flameout_2
transformName = smokePoint
oneShot = true
}
AUDIO
{
channel = Ship
clip = sound_explosion_low
volume = 1.0
pitch = 2.0
loop = false
}
}
fx-skipper-running
{
AUDIO
{
channel = Ship
clip = sound_rocket_hard
volume = 0.0 0.0
volume = 0.01 0.4
volume = 1.0 1.0
pitch = 0.0 0.2
pitch = 0.01 0.6
pitch = 1.0 1.8
loop = true
}

PREFAB_PARTICLE
{
prefabName = fx_smokeTrail_veryLarge
transformName = smokePoint
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
localOffset = 0, 0, 1
}
}
}
MODULE
{
name = ModuleWaterfallFX
// This is a custom name
moduleID = skipperFX
// 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-sustainer-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 = 2, 2, 1.5
}


}

}
2 changes: 1 addition & 1 deletion GameData/WaterfallRestock/Patches/Squad/ionEngine.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
TEMPLATE
{
// This is the name of the template to use
templateName = ionEngineTemplate
templateName = waterfall-ion-xenon-1
// This field allows you to override the parentTransform name in the EFFECTS contained in the template
overrideParentTransform = thrustTransform
scale = 1,1,1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{
"MAJOR":0,
"MINOR":1,
"PATCH":0,
"PATCH":1,
"BUILD":0
},
"KSP_VERSION":
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ TBW
### Required
These components are required for the mod to function and are bundled as part of any download:
* [ModuleManager (4.1.4)](https://github.com/sarbian/ModuleManager)
* [Waterfall (0.2.0)](https://github.com/ChrisAdderley/Waterfall)
* [Waterfall (0.2.1)](https://github.com/ChrisAdderley/Waterfall)
* [Restock (1.2.1)](https://github.com/PorktoberRevolution/ReStocked)


Expand Down
6 changes: 6 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
v0.1.1
------
- Fixed some MM errors for some plumes
- Fixed some template errors on load
- Added Swivel, Skipper plumes

v0.1.0
------
- Initial version controlled release
Expand Down
4 changes: 2 additions & 2 deletions readme.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
=================================
Waterfall - Restock Configs 0.1.0
Waterfall - Restock Configs 0.1.1
=================================

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.
Expand All @@ -9,7 +9,7 @@ DEPENDENCIES
============

Required:
- Waterfall (0.2.0)
- Waterfall (0.2.1)
- Restock (1.2+)
- ModuleManager (v4.1.4)

Expand Down

0 comments on commit 400e80b

Please sign in to comment.