Skip to content

Commit a88e1ea

Browse files
aerofuraerofur
committed
github sync
1 parent ba93d96 commit a88e1ea

File tree

6 files changed

+46
-43
lines changed

6 files changed

+46
-43
lines changed

‎config.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ if(first()){
3434
#Air Compressor
3535
Compressor_CFM = 254
3636
MainReservoirVolume = 33.8
37-
CompressorStart = "opencontrol/compressors/wbo/wbo9_loop.wav"
38-
CompressorShutdown = "opencontrol/compressors/wbo/wbo9_end.wav"
37+
CompressorStart = "opencontrol/compressors/wbo/wbo6_loop.wav"
38+
CompressorShutdown = "opencontrol/compressors/wbo/wbo6_end.wav"
3939

4040
#Automatic Brake Type
4141
AutomaticBrakeType = 0

‎extras/airhoseleft.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ if((O:weapon():type()=="weapon_crowbar") & !(O:inVehicle())) {
137137

138138
#Cancelling, up here to prevent a link start with E unlinking
139139
if(((PressedR & !ReadyEUnlink) | (ReadyEUnlink & PressedE)) & EH == E & LinkStage == 0){
140-
hint("Plugs unlinked.", 5)
140+
hint("Hoses unlinked.", 5)
141141
O:soundPlay(3,0,"buttons/lever8.wav")
142142
E:constraintBreak("rope")
143143
clearLink()
@@ -152,7 +152,7 @@ if((O:weapon():type()=="weapon_crowbar") & !(O:inVehicle())) {
152152

153153
if(PressedR & LinkStage>0){
154154
LinkStage = 0
155-
hint("Plug link cancelled.",5)
155+
hint("Hose link cancelled.",5)
156156
O:soundPlay(4,0,"buttons/lever8.wav")
157157
}
158158

@@ -167,7 +167,7 @@ if((O:weapon():type()=="weapon_crowbar") & !(O:inVehicle())) {
167167

168168
if(clk("linkcheck") & !BeingLinked & !Unlinking){
169169
LinkStage = 1
170-
hint("Select another MU plug with key E to link them together.", 5)
170+
hint("Select another Hose E2 with key E to link them together.", 5)
171171
O:soundPlay(1,0,"buttons/button16.wav")
172172
}
173173

@@ -185,7 +185,7 @@ if((O:weapon():type()=="weapon_crowbar") & !(O:inVehicle())) {
185185
local Plug = DoNotWireIn[3,entity]
186186
local PlugRopePos = DoNotWireIn[2,vector]
187187

188-
hint("Auth successful, MU plugs linked!",5)
188+
hint("Auth successful, Air Hoses linked!",5)
189189

190190
O:soundPlay(2,0,"buttons/button19.wav")
191191

@@ -221,7 +221,7 @@ if((O:weapon():type()=="weapon_crowbar") & !(O:inVehicle())) {
221221
}
222222

223223
if(clk("compatlinkcheck") & !PlugMsgCancel){
224-
hint("Start from the E2 MU plug, not from the Wire Plug.", 5)
224+
hint("Start from the E2, not from the Wire Plug.", 5)
225225
O:soundPlay(6,0,"buttons/button7.wav")
226226
}
227227

@@ -232,7 +232,7 @@ if((O:weapon():type()=="weapon_crowbar") & !(O:inVehicle())) {
232232

233233
clearLink()
234234

235-
hint("Old plug detected, MU plug linked!", 5)
235+
hint("Old plug detected, Air Hose linked!", 5)
236236
O:soundPlay(2,0,"buttons/button19.wav")
237237

238238
E:constraintBreak("rope")
@@ -247,7 +247,7 @@ if((O:weapon():type()=="weapon_crowbar") & !(O:inVehicle())) {
247247
#removing links and cancelling
248248

249249
if(PressedR & EH:type() == "gmod_wire_plug" & LinkStage == 0 & WonTourney){
250-
hint("Can't unlink Wire plugs! Unlink it from the E2 MU plug.", 5)
250+
hint("Can't unlink Wire plugs! Unlink it from the E2.", 5)
251251
O:soundPlay(6,0,"buttons/button7.wav")
252252
}
253253

@@ -258,7 +258,7 @@ if((O:weapon():type()=="weapon_crowbar") & !(O:inVehicle())) {
258258
#switch away reset
259259
if(LinkStage>0){
260260
LinkStage = 0
261-
hint("Plug link cancelled.",5)
261+
hint("Hose link cancelled.",5)
262262
}
263263

264264
}

‎extras/airhoseright.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ if((O:weapon():type()=="weapon_crowbar") & !(O:inVehicle())) {
137137

138138
#Cancelling, up here to prevent a link start with E unlinking
139139
if(((PressedR & !ReadyEUnlink) | (ReadyEUnlink & PressedE)) & EH == E & LinkStage == 0){
140-
hint("Plugs unlinked.", 5)
140+
hint("Hoses unlinked.", 5)
141141
O:soundPlay(3,0,"buttons/lever8.wav")
142142
E:constraintBreak("rope")
143143
clearLink()
@@ -152,7 +152,7 @@ if((O:weapon():type()=="weapon_crowbar") & !(O:inVehicle())) {
152152

153153
if(PressedR & LinkStage>0){
154154
LinkStage = 0
155-
hint("Plug link cancelled.",5)
155+
hint("Hose link cancelled.",5)
156156
O:soundPlay(4,0,"buttons/lever8.wav")
157157
}
158158

@@ -167,7 +167,7 @@ if((O:weapon():type()=="weapon_crowbar") & !(O:inVehicle())) {
167167

168168
if(clk("linkcheck") & !BeingLinked & !Unlinking){
169169
LinkStage = 1
170-
hint("Select another MU plug with key E to link them together.", 5)
170+
hint("Select another Hose E2 with key E to link them together.", 5)
171171
O:soundPlay(1,0,"buttons/button16.wav")
172172
}
173173

@@ -185,7 +185,7 @@ if((O:weapon():type()=="weapon_crowbar") & !(O:inVehicle())) {
185185
local Plug = DoNotWireIn[3,entity]
186186
local PlugRopePos = DoNotWireIn[2,vector]
187187

188-
hint("Auth successful, MU plugs linked!",5)
188+
hint("Auth successful, Air Hoses linked!",5)
189189

190190
O:soundPlay(2,0,"buttons/button19.wav")
191191

@@ -221,7 +221,7 @@ if((O:weapon():type()=="weapon_crowbar") & !(O:inVehicle())) {
221221
}
222222

223223
if(clk("compatlinkcheck") & !PlugMsgCancel){
224-
hint("Start from the E2 MU plug, not from the Wire Plug.", 5)
224+
hint("Start from the E2, not from the Wire Plug.", 5)
225225
O:soundPlay(6,0,"buttons/button7.wav")
226226
}
227227

@@ -232,7 +232,7 @@ if((O:weapon():type()=="weapon_crowbar") & !(O:inVehicle())) {
232232

233233
clearLink()
234234

235-
hint("Old plug detected, MU plug linked!", 5)
235+
hint("Old plug detected, Air Hose linked!", 5)
236236
O:soundPlay(2,0,"buttons/button19.wav")
237237

238238
E:constraintBreak("rope")
@@ -247,7 +247,7 @@ if((O:weapon():type()=="weapon_crowbar") & !(O:inVehicle())) {
247247
#removing links and cancelling
248248

249249
if(PressedR & EH:type() == "gmod_wire_plug" & LinkStage == 0 & WonTourney){
250-
hint("Can't unlink Wire plugs! Unlink it from the E2 MU plug.", 5)
250+
hint("Can't unlink Wire plugs! Unlink it from the E2.", 5)
251251
O:soundPlay(6,0,"buttons/button7.wav")
252252
}
253253

@@ -258,7 +258,7 @@ if((O:weapon():type()=="weapon_crowbar") & !(O:inVehicle())) {
258258
#switch away reset
259259
if(LinkStage>0){
260260
LinkStage = 0
261-
hint("Plug link cancelled.",5)
261+
hint("Hose link cancelled.",5)
262262
}
263263

264264
}

‎extras/workingbpanglecock.txt‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
@persist MUHoseBodyGroup
55
@trigger Valve
66
@model
7-
87

98
E = entity()
109
#E:setAlpha(0)
1110

1211
MUHoseBodyGroup = 0
12+
HandleColor = vec(150,0,0)
13+
HowFarOut = 0
1314

1415
if(first()|dupefinished()){
1516

@@ -18,21 +19,22 @@ if(first()|dupefinished()){
1819
A = 1
1920
holoCreate(A)
2021
holoParent(A,E)
21-
holoColor(A,vec(0))
22+
holoColor(A,HandleColor)
2223
holoScale(A,vec(1))
2324
holoModel(A, "models/titus's_propper_model_pack_2.4/propper/brakeline_valve_old.mdl")
24-
holoPos(A,E:toWorld(vec(0,0,2.5)))
25-
holoAng(A,E:toWorld(ang(0,180,0)))
26-
holoEntity(A):setSubMaterial(4,"models/proppertextures/enamel_white")
25+
holoPos(A,E:toWorld(vec(0,0,2.5+HowFarOut)))
26+
holoAng(A,E:toWorld(ang(0,90,0)))
27+
holoEntity(A):setSubMaterial(4,"models/proppertextures/acrylic")
28+
holoEntity(A):setSubMaterial(3,"models/proppertextures/enamel_black")
2729

2830
A = 2
2931
holoCreate(A)
3032
holoParent(A,E)
3133
holoColor(A,vec(255))
3234
holoScale(A,vec(1))
3335
holoModel(A, "models/lazpack/detail/brakehose.mdl")
34-
holoPos(A,E:toWorld(vec(0,0,7.7)))
35-
holoAng(A,E:toWorld(ang(-90,180,-(90+45))))
36+
holoPos(A,E:toWorld(vec(0,0,7.7+HowFarOut)))
37+
holoAng(A,E:toWorld(ang(-90,180,180)))
3638
holoClipEnabled(A,1,1)
3739
holoClip(A,1,vec(1.8,0,0),vec(1,0,0),0)
3840
holoEntity(A):setSubMaterial(1,"models/proppertextures/wheel")
@@ -41,13 +43,8 @@ if(first()|dupefinished()){
4143
}
4244

4345
if(Valve){
44-
holoBodygroup(A,1,1)
46+
holoBodygroup(1,1,1)
4547
}
4648
elseif(!Valve){
47-
holoBodygroup(A,1,0)
49+
holoBodygroup(1,1,0)
4850
}
49-
50-
51-
52-
53-

‎extras/workinghandbrake.txt‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,20 +93,26 @@ elseif(HandBrakeAmmount == 0){
9393
Handbrake = 0
9494
}
9595

96-
if(changed(Apply)&Apply){
97-
soundPlay("hbapply",0,"opencontrol/handbrakes/handbrake-wheel-apply.wav")
96+
if(Handbrake!=1){
97+
if(changed(Apply)&Apply){
98+
soundPlay("hbapply",0,"opencontrol/handbrakes/handbrake-wheel-apply.wav")
99+
}
98100
}
99-
elseif(changed((HandBrakeAmmount == HBA))&(HandBrakeAmmount == HBA)){
101+
102+
if(changed((HandBrakeAmmount == HBA))&(HandBrakeAmmount == HBA)){
100103
soundStop("hbapply",0.2)
101104
}
102105
elseif(changed(!Apply)&!Apply){
103106
soundStop("hbapply",0.2)
104107
}
105108

106-
if(changed(Release)&Release){
107-
soundPlay("hbrelease",0,"opencontrol/handbrakes/handbrake-wheel-release.wav")
109+
if(Handbrake!=0){
110+
if(changed(Release)&Release){
111+
soundPlay("hbrelease",0,"opencontrol/handbrakes/handbrake-wheel-release.wav")
112+
}
108113
}
109-
elseif(changed((HandBrakeAmmount == 0))&(HandBrakeAmmount == 0)){
114+
115+
if(changed((HandBrakeAmmount == 0))&(HandBrakeAmmount == 0)){
110116
soundStop("hbrelease",0.2)
111117
}
112118
elseif(changed(!Release)&!Release){

‎sound-processor.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,12 +208,12 @@ if(EngineOn){
208208

209209
if(DynamicFans>=1){
210210
DynamicFansC1 = DynamicFansC1 + (DynamicFansCA - DynamicFansC1) / max(10,0)
211-
holoAng(1,Locomotive:toWorld(ang(0,0+DynamicFansC1,0)))
211+
holoAng(1,Locomotive:toWorld(ang(0,0-DynamicFansC1,0)))
212212
}
213213

214214
if(DynamicFans>=2){
215215
DynamicFansC2 = DynamicFansC2 + (DynamicFansCA2 - DynamicFansC2) / max(10,0)
216-
holoAng(2,Locomotive:toWorld(ang(0,0+DynamicFansC2,0)))
216+
holoAng(2,Locomotive:toWorld(ang(0,0-DynamicFansC2,0)))
217217
}
218218

219219
#CONTROL_STAND_DATA = array(IncreaseTrainBrake,DecreaseTrainBrake,BrakeNotch,AutomaticPressureSet,Suppression,Emergency,BrakeCutout,IncreaseLocoBrake,DecreaseLocoBrake,
@@ -365,13 +365,13 @@ else{
365365
}
366366

367367
FansC1 = FansC1 + (FansCA1 - FansC1) / max(SpinUp,0)
368-
holoAng(3,Locomotive:toWorld(ang(0,0+FansC1,0)))
368+
holoAng(3,Locomotive:toWorld(ang(0,0-FansC1,0)))
369369

370370
FansC2 = FansC2 + (FansCA2 - FansC2) / max(SpinUp,0)
371-
holoAng(4,Locomotive:toWorld(ang(0,0+FansC2,0)))
371+
holoAng(4,Locomotive:toWorld(ang(0,0-FansC2,0)))
372372

373373
FansC3 = FansC3 + (FansCA3 - FansC3) / max(SpinUp,0)
374-
holoAng(5,Locomotive:toWorld(ang(0,0+FansC3,0)))
374+
holoAng(5,Locomotive:toWorld(ang(0,0-FansC3,0)))
375375

376376
if(changed(Dynamics)&Dynamics){
377377
if(DynamicFans>=1){

0 commit comments

Comments
 (0)