Skip to content

Commit d7d16e1

Browse files
Journeyman716Journeyman716
authored
Merge pull request #1255 from MBII/r22.3/legends-contributors
R22.3/legends contributors
2 parents db6cd76 + e1b50dd commit d7d16e1

13 files changed

Lines changed: 123 additions & 123 deletions

File tree

‎MBAssets3/ext_data/sabers/saber_hilts_FA.sab‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ saber_maul_fa
6666
lungeAtkMove LS_HILT_BASH
6767
//flourishAnim LS_HILT_BASH
6868

69-
soundOn "sound/weapons/saber/enemy_saber_on.wav"
70-
soundOff "sound/weapons/saber/enemy_saber_off.wav"
69+
soundOn "sound/weapons/saber/enemy_saberon3.wav"
70+
soundOff "sound/weapons/saber/enemy_saberoff3.wav"
7171
soundLoop "sound/weapons/saber/saberhum_maul.wav"
7272
}
7373

‎MBAssets3/ext_data/sabers/saber_hilts_Open1.sab‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ saber_boc
488488
saberModel "models/weapons2/saber_plasma/saber_boc.glm"
489489
soundOn "sound/weapons/saber/enemy_saber_on.wav"
490490
soundLoop "sound/weapons/saber/saberhum2.wav"
491-
soundOff "sound/weapons/saber/enemy_saberoff1.wav"
491+
soundOff "sound/weapons/saber/enemy_saber_off.wav"
492492
saberLength 40
493493
saberColor purple
494494
isOpenMode 1

‎MBAssets3/ext_data/sabers/saber_hilts_Open2.sab‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ saber_maul
6868
name "Darth Maul (Ep. I)"
6969
saberType SABER_STAFF
7070
saberModel "models/weapons2/saber_plasma/saber_maul.glm"
71-
soundOn "sound/weapons/saber/enemy_saber_on.wav"
72-
soundOff "sound/weapons/saber/enemy_saber_off.wav"
71+
soundOn "sound/weapons/saber/enemy_saberon3.wav"
72+
soundOff "sound/weapons/saber/enemy_saberoff3.wav"
7373
soundLoop "sound/weapons/saber/saberhum_maul.wav"
7474
saberColor red
7575
numBlades 2
@@ -89,8 +89,8 @@ saber_maul_broke
8989
name "Darth Maul - Broken (Ep. I)"
9090
saberType SABER_SINGLE
9191
saberModel "models/weapons2/saber_plasma/saber_maul_broke.glm"
92-
soundOn "sound/weapons/saber/enemy_saber_on.wav"
93-
soundOff "sound/weapons/saber/enemy_saber_off.wav"
92+
soundOn "sound/weapons/saber/enemy_saberon3.wav"
93+
soundOff "sound/weapons/saber/enemy_saberoff3.wav"
9494
soundLoop "sound/weapons/saber/saberhum_maul.wav"
9595
saberLength 40
9696
saberColor red
@@ -162,8 +162,8 @@ saber_sidious
162162
name "Darth Sidious (Ep. III)"
163163
saberType SABER_SINGLE
164164
saberModel "models/weapons2/saber_plasma/saber_sidious.glm"
165-
soundOn "sound/weapons/saber/enemy_saber_on.wav"
166-
soundOff "sound/weapons/saber/enemy_saber_off.wav"
165+
soundOn "sound/weapons/saber/enemy_saberon3.wav"
166+
soundOff "sound/weapons/saber/enemy_saberoff3.wav"
167167
soundLoop "sound/weapons/saber/saberhum_vaderPD.wav"
168168
saberLength 40
169169
saberColor red
@@ -175,8 +175,8 @@ saber_sidious2
175175
name "Darth Sidious - Dark (Ep. III)"
176176
saberType SABER_SINGLE
177177
saberModel "models/weapons2/saber_plasma/saber_sidious2.glm"
178-
soundOn "sound/weapons/saber/enemy_saber_on.wav"
179-
soundOff "sound/weapons/saber/enemy_saber_off.wav"
178+
soundOn "sound/weapons/saber/enemy_saberon3.wav"
179+
soundOff "sound/weapons/saber/enemy_saberoff3.wav"
180180
soundLoop "sound/weapons/saber/saberhum_vaderPD.wav"
181181
saberLength 40
182182
saberColor random
@@ -188,8 +188,8 @@ saber_sidious3
188188
name "Darth Sidious (GE)"
189189
saberType SABER_SINGLE
190190
saberModel "models/weapons2/saber_plasma/saber_sidious3.glm"
191-
soundOn "sound/weapons/saber/enemy_saber_on.wav"
192-
soundOff "sound/weapons/saber/enemy_saber_off.wav"
191+
soundOn "sound/weapons/saber/enemy_saberon3.wav"
192+
soundOff "sound/weapons/saber/enemy_saberoff3.wav"
193193
soundLoop "sound/weapons/saber/saberhum_vaderPD.wav"
194194
saberLength 40
195195
isOpenMode 1
@@ -200,9 +200,9 @@ saber_sidious4
200200
name "Darth Sidious (DE)"
201201
saberType SABER_SINGLE
202202
saberModel "models/weapons2/saber_plasma/saber_sidious4.glm"
203-
soundOn "sound/weapons/saber/saberon.wav"
204-
soundOff "sound/weapons/saber/saberoff.wav"
205-
soundLoop "sound/weapons/saber/saberhum_vaderPD.wav"
203+
soundOn "sound/weapons/saber/enemy_saber_on.wav"
204+
soundOff "sound/weapons/saber/enemy_saber_off.wav"
205+
soundLoop "sound/weapons/saber/saberhum3.wav"
206206
saberLength 40
207207
isOpenMode 1
208208
}
@@ -264,7 +264,7 @@ saber_vader3
264264
name "Darth Vader (Ep. IV)"
265265
saberType SABER_SINGLE
266266
saberModel "models/weapons2/saber_plasma/saber_vader3.glm"
267-
soundOn "sound/weapons/saber/enemy_saber_on.wav"
267+
soundOn "sound/weapons/saber/enemy_saberon3.wav"
268268
soundOff "sound/weapons/saber/enemy_saberoff2.wav"
269269
soundLoop "sound/weapons/saber/saberhum_vader.wav"
270270
saberLength 40
@@ -277,7 +277,7 @@ saber_vader
277277
name "Darth Vader (Ep. V)"
278278
saberType SABER_SINGLE
279279
saberModel "models/weapons2/saber_plasma/saber_vader.glm"
280-
soundOn "sound/weapons/saber/enemy_saber_on.wav"
280+
soundOn "sound/weapons/saber/enemy_saberon3.wav"
281281
soundOff "sound/weapons/saber/enemy_saberoff2.wav"
282282
soundLoop "sound/weapons/saber/saberhum_vader5.wav"
283283
saberLength 40
@@ -290,7 +290,7 @@ saber_vader2
290290
name "Darth Vader (Ep. VI)"
291291
saberType SABER_SINGLE
292292
saberModel "models/weapons2/saber_plasma/saber_vader2.glm"
293-
soundOn "sound/weapons/saber/enemy_saber_on.wav"
293+
soundOn "sound/weapons/saber/enemy_saberon3.wav"
294294
soundOff "sound/weapons/saber/enemy_saberoff2.wav"
295295
soundLoop "sound/weapons/saber/saberhum_vader.wav"
296296
saberLength 40
@@ -837,7 +837,7 @@ saber_ima
837837
saberModel "models/weapons2/saber_plasma/saber_ima.glm"
838838
soundOn "sound/weapons/saber/saberon_v5.wav"
839839
soundLoop "sound/weapons/saber/saberhum1.wav"
840-
soundOff "sound/weapons/saber/enemy_saber_off.wav"
840+
soundOff "sound/weapons/saber/enemy_saberoff3.wav"
841841
saberLength 40
842842
isOpenMode 1
843843
}
@@ -1057,7 +1057,7 @@ saber_jerec
10571057
isOpenMode 1
10581058

10591059
soundOn "sound/weapons/saber/saberon.wav"
1060-
soundLoop "sound/weapons/saber/saberhum_OT2.wav"
1060+
soundLoop "sound/weapons/saber/saberhum_RH2.wav"
10611061
soundOff "sound/weapons/saber/saberoff_df2.wav"
10621062
}
10631063

@@ -1091,9 +1091,9 @@ saber_joruus
10911091
name "Joruus C'baoth No. 1 (EU)"
10921092
saberType SABER_SINGLE
10931093
saberModel "models/weapons2/saber_plasma/saber_joruus.glm"
1094-
soundOn "sound/weapons/saber/enemy_saber_on.wav"
1094+
soundOn "sound/weapons/saber/enemy_saberon3.wav"
10951095
soundLoop "sound/weapons/saber/saberhum2.wav"
1096-
soundOff "sound/weapons/saber/enemy_saber_off.wav"
1096+
soundOff "sound/weapons/saber/enemy_saberoff3.wav"
10971097
saberLength 40
10981098
isOpenMode 1
10991099
}
@@ -1103,9 +1103,9 @@ saber_joruus2
11031103
name "Joruus C'baoth No. 2 (EU)"
11041104
saberType SABER_SINGLE
11051105
saberModel "models/weapons2/saber_plasma/saber_joruus2.glm"
1106-
soundOn "sound/weapons/saber/enemy_saber_on.wav"
1106+
soundOn "sound/weapons/saber/enemy_saberon3.wav"
11071107
soundLoop "sound/weapons/saber/saberhum2.wav"
1108-
soundOff "sound/weapons/saber/enemy_saber_off.wav"
1108+
soundOff "sound/weapons/saber/enemy_saberoff3.wav"
11091109
saberLength 40
11101110
isOpenMode 1
11111111
}

‎MBAssets3/ext_data/sabers/saber_hilts_Open3.sab‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -436,8 +436,8 @@ saber_maul2
436436
name "Maul (Rebels)"
437437
saberType SABER_STAFF
438438
saberModel "models/weapons2/saber_plasma/saber_maul2.glm"
439-
soundOn "sound/weapons/saber/enemy_saber_on.wav"
440-
soundOff "sound/weapons/saber/enemy_saber_off.wav"
439+
soundOn "sound/weapons/saber/enemy_saberon3.wav"
440+
soundOff "sound/weapons/saber/enemy_saberoff3.wav"
441441
soundLoop "sound/weapons/saber/saberhum_maul.wav"
442442
saberColor red
443443
numBlades 2
@@ -457,8 +457,8 @@ saber_maul3
457457
name "Maul (TCW)"
458458
saberType SABER_STAFF
459459
saberModel "models/weapons2/saber_plasma/saber_maul3.glm"
460-
soundOn "sound/weapons/saber/enemy_saber_on.wav"
461-
soundOff "sound/weapons/saber/enemy_saber_off.wav"
460+
soundOn "sound/weapons/saber/enemy_saberon3.wav"
461+
soundOff "sound/weapons/saber/enemy_saberoff3.wav"
462462
soundLoop "sound/weapons/saber/saberhum_maul.wav"
463463
numBlades 2
464464
saberLength 32
@@ -478,7 +478,7 @@ saber_maw
478478
saberType SABER_SINGLE
479479
saberModel "models/weapons2/saber_plasma/saber_maw.glm"
480480
soundOn "sound/weapons/saber/enemy_saber_on.wav"
481-
soundLoop "sound/weapons/saber/saberhum3.wav"
481+
soundLoop "sound/weapons/saber/saberhum2.wav"
482482
soundOff "sound/weapons/saber/enemy_saber_off.wav"
483483
saberLength 40
484484
saberColor red
@@ -667,9 +667,9 @@ saber_osha
667667
saberLength 40
668668
isOpenMode 1
669669

670-
soundOn "sound/weapons/saber/enemy_saber_on.wav"
670+
soundOn "sound/weapons/saber/enemy_saberon3.wav"
671671
soundLoop "sound/weapons/saber/Plasma/or_saberhum.wav"
672-
soundOff "sound/weapons/saber/enemy_saber_off.wav"
672+
soundOff "sound/weapons/saber/enemy_saberoff3.wav"
673673
}
674674

675675
saber_pablo
@@ -704,7 +704,7 @@ saber_pic_gorc
704704
saberType SABER_SINGLE
705705
saberModel "models/weapons2/saber_plasma/saber_pic_gorc.glm"
706706
soundOn "sound/weapons/saber/saberon.wav"
707-
soundLoop "sound/weapons/saber/saberhum2.wav"
707+
soundLoop "sound/weapons/saber/saberhum3.wav"
708708
soundOff "sound/weapons/saber/enemy_saber_off.wav"
709709
saberLength 40
710710
saberColor orange
@@ -795,7 +795,7 @@ saber_qu_rahn
795795
saberType SABER_SINGLE
796796
saberModel "models/weapons2/saber_plasma/saber_qu_rahn.glm"
797797
soundOn "sound/weapons/saber/saberon.wav"
798-
soundLoop "sound/weapons/saber/saberhum_OT.wav"
798+
soundLoop "sound/weapons/saber/saberhum_RH.wav"
799799
soundOff "sound/weapons/saber/saberoff_df2.wav"
800800
saberLength 40
801801
saberColor green
@@ -872,9 +872,9 @@ saber_reborn_mp
872872
name "Reborn (JA)"
873873
saberType SABER_SINGLE
874874
saberModel "models/weapons2/saber_reborn/saber_w.glm"
875-
soundOn "sound/weapons/saber/OT/enemy_saber_on.wav"
875+
soundOn "sound/weapons/saber/enemy_saber_on.wav"
876876
soundLoop "sound/weapons/saber/saberhum3.wav"
877-
soundOff "sound/weapons/saber/OT/enemy_saber_off.wav"
877+
soundOff "sound/weapons/saber/enemy_saber_off.wav"
878878
saberLength 40
879879
saberColor red
880880
isOpenMode 1

‎MBAssets3/ext_data/sabers/saber_hilts_Open4.sab‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ saber_sariss
4343
saberType SABER_SINGLE
4444
saberModel "models/weapons2/saber_plasma/saber_sariss.glm"
4545
soundOn "sound/weapons/saber/saberon.wav"
46-
soundLoop "sound/weapons/saber/saberhum4.wav"
46+
soundLoop "sound/weapons/saber/saberhum_RH2.wav"
4747
soundOff "sound/weapons/saber/saberoff.wav"
4848
saberLength 40
4949
saberColor blue
@@ -910,7 +910,7 @@ saber_yun
910910
saberType SABER_SINGLE
911911
saberModel "models/weapons2/saber_plasma/saber_yun.glm"
912912
soundOn "sound/weapons/saber/saberon.wav"
913-
soundLoop "sound/weapons/saber/saberhum_OT2.wav"
913+
soundLoop "sound/weapons/saber/saberhum_RH.wav"
914914
soundOff "sound/weapons/saber/saberoff_df2.wav"
915915
saberLength 40
916916
saberColor yellow

‎MBAssets3/ext_data/sabers/sabers_PSkor.sab‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ single_2_kor_siege_sith // balanced for base duals saber damage
109109
name "^4Adept"
110110
saberType SABER_SINGLE
111111
saberModel "models/weapons2/saber_reborn/saber_w.glm"
112-
soundOn "sound/weapons/saberot/enemy_saber_on.wav"
112+
soundOn "sound/weapons/saber/enemy_saber_on.wav"
113113
soundLoop "sound/weapons/saber/saberhum2.wav"
114-
soundOff "sound/weapons/saberot/enemy_saber_off.wav"
114+
soundOff "sound/weapons/saber/enemy_saber_off.wav"
115115
saberLength 40
116116
saberColor random
117117
damageScale .9

‎MBAssets3/models/players/bobafett/modeldata.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ boba_bf2
1111
m
1212

1313
sounds_mand1
14-
jango_bh
14+
boba_bf
1515
m
1616

1717
sounds_mand2
18-
jango_bh
18+
boba_bf
1919
m
2020

2121
sounds_rgb1

‎MBAssets3/models/players/jangofett/modeldata.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jango_nohelm
1111
m
1212

1313
sounds_poncho
14-
jango_nohelm
14+
jango_bh
1515
m
1616

1717
sounds_wren

‎mb2_pb_assets2/ext_data/sabers/pb_sabers.sab‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ ghostben_pb
8787
saberModel "models/weapons2/saber_plasma/saber_obi_wan3.glm"
8888
customSkin "models/weapons2/saber_ghost/model_ben.skin"
8989
soundOn "sound/weapons/saber/saberon.wav"
90-
soundLoop "sound/weapons/saber/saberhum2.wav"
90+
soundLoop "sound/weapons/saber/saberhumkenobi.wav"
9191
soundOff "sound/weapons/saber/saberoff.wav"
9292
saberLength 41
9393
saberColor random
@@ -116,9 +116,9 @@ ghost_palp
116116
saberType SABER_SINGLE
117117
saberModel "models/weapons2/saber_plasma/saber_sidious2.glm"
118118
customSkin "models/weapons2/saber_ghost/model_palp.skin"
119-
soundOn "sound/weapons/saber/Plasma/rd_saberon.wav"
120-
soundOff "sound/weapons/saber/Plasma/rd_saberoff.wav"
121-
soundLoop "sound/weapons/saber/Plasma/rd_saberhum.wav"
119+
soundOn "sound/weapons/saber/enemy_saberon3.wav"
120+
soundOff "sound/weapons/saber/enemy_saberoff3.wav"
121+
soundLoop "sound/weapons/saber/saberhum_vaderPD.wav"
122122
saberLength 41
123123
saberColor random
124124
damageScale 0.02
@@ -233,9 +233,9 @@ Windu_Ep2_pb
233233
name "^4Mace Windu ^7[Ep. II-III]"
234234
saberType SABER_SINGLE
235235
saberModel "models/weapons2/saber_plasma/saber_mace.glm"
236-
soundOn "sound/weapons/saber/saberon.wav"
236+
soundOn "sound/weapons/saber/saberonquick2.wav"
237237
soundLoop "sound/weapons/saber/saberhum2.wav"
238-
soundOff "sound/weapons/saber/enemy_saber_off.wav"
238+
soundOff "sound/weapons/saber/enemy_saberoff3.wav"
239239
saberLength 40
240240
saberColor purple
241241
damageScale 1.2

0 commit comments

Comments
 (0)