Skip to content

Commit 2f5f1f8

Browse files
Merge pull request #29 from KnightofStJohn/dev
Dev
2 parents edeb203 + c23ac7b commit 2f5f1f8

File tree

13 files changed

+4733
-5
lines changed

13 files changed

+4733
-5
lines changed
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//Remove engine lights if on a part that has waterfall
2-
@PART[*]:HAS[@MODULE[ModuleWaterfallFX]]:NEEDS[EngineLight]:LAST[Waterfall]
3-
{
4-
!MODULE[EngineLightEffect]{}
1+
//Remove engine lights if on a part that has waterfall
2+
@PART[*]:HAS[@MODULE[ModuleWaterfallFX]]:NEEDS[EngineLight]:LAST[Waterfall]
3+
{
4+
!MODULE[EngineLightEffect]{}
55
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
@PART[toroidalAerospike]:NEEDS[Waterfall&StockWaterfallEffects&ReStock]:AFTER[StockWaterfallEffects]
2+
{
3+
@MODULE[ModuleWaterfallFX]
4+
{
5+
@TEMPLATE:HAS[#templateName[stock-hydrolox-aerospike]]
6+
{
7+
@position = 0,0,0.013
8+
@scale = 1.05,1.05,1.05
9+
}
10+
}
11+
}
12+
13+
@EFFECTTEMPLATE:NEEDS[Waterfall&StockWaterfallEffects&ReStock]:AFTER[StockWaterfallEffects]:HAS[#templateName[stock-hydrolox-aerospike]]
14+
{
15+
@EFFECT[spikeFlameInner]
16+
{
17+
@MODEL
18+
{
19+
@positionOffset = 0,0,-0.3
20+
}
21+
}
22+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
@PART[RAPIER]:NEEDS[Waterfall&StockWaterfallEffects&ReStock]:AFTER[StockWaterfallEffects]
2+
{
3+
@MODULE[ModuleWaterfallFX],*
4+
{
5+
@TEMPLATE:HAS[#templateName[stock-rapier-core]]
6+
{
7+
@position = 0,0,-0.22
8+
}
9+
10+
@TEMPLATE:HAS[#templateName[stock-methane-jet-2]]
11+
{
12+
@position = 0,0,-0.22
13+
}
14+
15+
@TEMPLATE:HAS[#templateName[stock-methalox-lower-2]]
16+
{
17+
@position = 0,0,-0.06
18+
}
19+
}
20+
}
Lines changed: 195 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,195 @@
1+
@PART[Size3EngineCluster]:NEEDS[Waterfall&StockWaterfallEffects&ReStock]:LAST[StockWaterfallEffects]
2+
{
3+
!EFFECTS {}
4+
!MODULE[EngineLightEffect] {}
5+
!MODULE[ModuleWaterfallFX],* {}
6+
!MODULE[ModuleB9PartSwitch]:HAS[#moduleID[plumeSwitch]] {}
7+
8+
EFFECTS
9+
{
10+
engage
11+
{
12+
AUDIO
13+
{
14+
channel = Ship
15+
clip = Waterfall/Sounds/KW/sound_liq4
16+
volume = 1.5
17+
pitch = 1.0
18+
loop = false
19+
}
20+
}
21+
disengage
22+
{
23+
AUDIO
24+
{
25+
channel = Ship
26+
clip = sound_vent_soft
27+
volume = 1.5
28+
pitch = 2.0
29+
loop = false
30+
}
31+
}
32+
flameout
33+
{
34+
AUDIO
35+
{
36+
channel = Ship
37+
clip = sound_explosion_low
38+
volume = 1.5
39+
pitch = 2.0
40+
loop = false
41+
}
42+
}
43+
fx-mammoth-running
44+
{
45+
AUDIO
46+
{
47+
channel = Ship
48+
clip = Waterfall/Sounds/KW/sound_altloop
49+
volume = 0.0 0.0
50+
volume = 1.0 1.5
51+
pitch = 0.0 1.0
52+
pitch = 1.0 1.0
53+
loop = true
54+
}
55+
}
56+
}
57+
58+
@MODULE[ModuleEngines*]
59+
{
60+
@name = ModuleEnginesFX
61+
%runningEffectName = fx-mammoth-running
62+
!powerEffectName
63+
}
64+
65+
MODULE
66+
{
67+
name = ModuleWaterfallFX
68+
moduleID = MammothFX
69+
70+
CONTROLLER
71+
{
72+
name = atmosphereDepth
73+
linkedTo = atmosphere_density
74+
}
75+
CONTROLLER
76+
{
77+
name = throttle
78+
linkedTo = throttle
79+
engineID = basicEngine
80+
responseRateUp = 0.100000001
81+
responseRateDown = 0.200000003
82+
}
83+
CONTROLLER
84+
{
85+
name = random1
86+
linkedTo = random
87+
noiseType = perlin
88+
scale = 1
89+
minimum = 0
90+
speed = 8
91+
seed = 0
92+
}
93+
CONTROLLER
94+
{
95+
name = random2
96+
linkedTo = random
97+
noiseType = perlin
98+
scale = 1
99+
minimum = 0
100+
speed = 10
101+
seed = 0
102+
}
103+
CONTROLLER
104+
{
105+
name = Ignition
106+
linkedTo = engineEvent
107+
eventDuration = 2
108+
eventName = ignition
109+
eventCurve
110+
{
111+
key = 0 0 10 10
112+
key = 0.1 1 4.444445 4.444445
113+
key = 1 0 -1.111111 -1.111111
114+
}
115+
}
116+
117+
TEMPLATE
118+
{
119+
name = plume
120+
templateName = stock-hydrolox-lower-2
121+
position = 0,0,-0.63
122+
rotation = 0, 0, 0
123+
scale = 0.95, 0.95, 0.95
124+
}
125+
}
126+
127+
MODULE
128+
{
129+
name = ModuleB9PartSwitch
130+
moduleID = plumeSwitch
131+
switcherDescription = Plume
132+
switcherDescriptionPlural = Plumes
133+
affectDragCubes = false
134+
affectFARVoxels = false
135+
switchInFlight = true
136+
137+
SUBTYPE
138+
{
139+
name = default
140+
title = Hydrolox
141+
primaryColor = OrangeRed
142+
secondaryColor = SkyBlue
143+
descriptionSummary = Hydrogen-Oxygen Fuel Exhaust
144+
descriptionDetail = Representing one of the most reliable engines in spaceflight history, this orange-red Hydrolox plume is based off of the Space Shuttle's RS-25 Main Engine.
145+
}
146+
SUBTYPE
147+
{
148+
name = methalox
149+
title = Methalox
150+
primaryColor = VioletBlue
151+
secondaryColor = BubbleGumPink
152+
descriptionSummary = Methane-Oxygen Fuel Exhaust
153+
descriptionDetail = Feel like revolutionizing the Aerospace Industry? Now you can with a Methalox exhaust plume based off of SpaceX's Raptor One Engine!
154+
MODULE
155+
{
156+
IDENTIFIER { name = ModuleWaterfallFX }
157+
DATA
158+
{
159+
TEMPLATE
160+
{
161+
name = plume
162+
templateName = stock-methalox-lower-2
163+
position = 0,0,-0.63
164+
rotation = 0, 0, 0
165+
scale = 0.95, 0.95, 0.95
166+
}
167+
}
168+
}
169+
}
170+
SUBTYPE
171+
{
172+
name = hydroloxsimple
173+
title = The Stratzenblitz
174+
primaryColor = Cyan
175+
secondaryColor = Vermillion
176+
descriptionSummary = High Performance Hydrogen-Oxygen Fuel Exhaust
177+
descriptionDetail = Get the full Stratzenblitz experience with this single-mesh plume. Is lag your primary design constraint? Are you planning to launch a million tons into space? Is getting every last CPU cycle out of that precious Ryzen your only reason for living? Hesitate not! (But know I am silently weeping in a corner somewhere).
178+
MODULE
179+
{
180+
IDENTIFIER { name = ModuleWaterfallFX }
181+
DATA
182+
{
183+
TEMPLATE
184+
{
185+
name = plume
186+
templateName = stock-hydrolox-lower-Stratzenblitz
187+
position = 0,0,0
188+
rotation = 0, 0, 0
189+
scale = 1, 1, 1
190+
}
191+
}
192+
}
193+
}
194+
}
195+
}
Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
@PART[nuclearEngine]:NEEDS[Waterfall&StockWaterfallEffects&ReStock]:LAST[StockWaterfallEffects]
2+
{
3+
!EFFECTS {}
4+
!MODULE[EngineLightEffect] {}
5+
!MODULE[ModuleWaterfallFX],* {}
6+
!MODULE[ModuleB9PartSwitch]:HAS[#moduleID[plumeSwitch]] {}
7+
8+
EFFECTS
9+
{
10+
engage
11+
{
12+
AUDIO
13+
{
14+
channel = Ship
15+
clip = Waterfall/Sounds/KW/sound_liq7
16+
volume = 0.6
17+
pitch = 0.7
18+
loop = false
19+
}
20+
}
21+
disengage
22+
{
23+
AUDIO
24+
{
25+
channel = Ship
26+
clip = sound_vent_soft
27+
volume = 1.0
28+
pitch = 0.7
29+
loop = false
30+
}
31+
}
32+
flameout
33+
{
34+
AUDIO
35+
{
36+
channel = Ship
37+
clip = sound_explosion_low
38+
volume = 1.0
39+
pitch = 0.7
40+
loop = false
41+
}
42+
}
43+
fx-nerv-running
44+
{
45+
AUDIO
46+
{
47+
channel = Ship
48+
clip = sound_rocket_hard
49+
volume = 0.0 0.0
50+
volume = 0.01 0.1
51+
volume = 0.5 0.35
52+
volume = 1.0 0.7
53+
pitch = 0.0 0.5
54+
pitch = 1.0 0.7
55+
loop = true
56+
}
57+
}
58+
}
59+
60+
@MODULE[ModuleEngines*]
61+
{
62+
@name = ModuleEnginesFX
63+
@runningEffectName = fx-nerv-running
64+
}
65+
66+
MODULE
67+
{
68+
name = ModuleWaterfallFX
69+
moduleID = nukeFX
70+
71+
CONTROLLER
72+
{
73+
name = atmosphereDepth
74+
linkedTo = atmosphere_density
75+
}
76+
CONTROLLER
77+
{
78+
name = throttle
79+
linkedTo = throttle
80+
engineID = basicEngine
81+
responseRateUp = 0.1
82+
responseRateDown = 0.2
83+
}
84+
85+
CONTROLLER
86+
{
87+
name = random1
88+
linkedTo = random
89+
noiseType = perlin
90+
scale = 1.0
91+
minimum = 0.0
92+
speed = 10
93+
seed = 15
94+
}
95+
96+
TEMPLATE
97+
{
98+
templateName = stock-nuclear-upper-2
99+
position = 0,0,0.013
100+
rotation = 0, 0, 0
101+
scale = 0.85, 0.85, 0.85
102+
}
103+
}
104+
}
105+
106+
@EFFECTTEMPLATE:NEEDS[Waterfall&StockWaterfallEffects&ReStock]:AFTER[StockWaterfallEffects]:HAS[#templateName[stock-nuclear-upper-2]]
107+
{
108+
!EFFECT[Core] {}
109+
}

0 commit comments

Comments
 (0)