Skip to content

Commit 33a7f4c

Browse files
Merge pull request #1258 from MBII/r22.3/legends-contributors
R22.3/legends contributors
2 parents f30feb6 + 7c0c01a commit 33a7f4c

9 files changed

Lines changed: 248 additions & 108 deletions

File tree

MBAssets3/ext_data/sabers/saber_hilts_Open2.sab

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ saber_sidious
164164
saberModel "models/weapons2/saber_plasma/saber_sidious.glm"
165165
soundOn "sound/weapons/saber/enemy_saberon3.wav"
166166
soundOff "sound/weapons/saber/enemy_saberoff3.wav"
167-
soundLoop "sound/weapons/saber/saberhum_vaderPD.wav"
167+
soundLoop "sound/weapons/saber/saberhum_OT_PDb.wav"
168168
saberLength 40
169169
saberColor red
170170
isOpenMode 1
@@ -177,7 +177,7 @@ saber_sidious2
177177
saberModel "models/weapons2/saber_plasma/saber_sidious2.glm"
178178
soundOn "sound/weapons/saber/enemy_saberon3.wav"
179179
soundOff "sound/weapons/saber/enemy_saberoff3.wav"
180-
soundLoop "sound/weapons/saber/saberhum_vaderPD.wav"
180+
soundLoop "sound/weapons/saber/saberhum_OT_PDb.wav"
181181
saberLength 40
182182
saberColor random
183183
isOpenMode 1
@@ -190,7 +190,7 @@ saber_sidious3
190190
saberModel "models/weapons2/saber_plasma/saber_sidious3.glm"
191191
soundOn "sound/weapons/saber/enemy_saberon3.wav"
192192
soundOff "sound/weapons/saber/enemy_saberoff3.wav"
193-
soundLoop "sound/weapons/saber/saberhum_vaderPD.wav"
193+
soundLoop "sound/weapons/saber/saberhum_OT_PDb.wav"
194194
saberLength 40
195195
isOpenMode 1
196196
}
@@ -264,10 +264,11 @@ 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_saberon3.wav"
267+
soundOn "sound/weapons/saber/saberon_vader2.wav"
268268
soundOff "sound/weapons/saber/enemy_saberoff2.wav"
269269
soundLoop "sound/weapons/saber/saberhum_vader.wav"
270270
saberLength 40
271+
saberRadius 2.5
271272
saberColor red
272273
isOpenMode 1
273274
}
@@ -281,6 +282,7 @@ saber_vader
281282
soundOff "sound/weapons/saber/enemy_saberoff2.wav"
282283
soundLoop "sound/weapons/saber/saberhum_vader5.wav"
283284
saberLength 40
285+
saberRadius 2.75
284286
saberColor red
285287
isOpenMode 1
286288
}
@@ -294,6 +296,7 @@ saber_vader2
294296
soundOff "sound/weapons/saber/enemy_saberoff2.wav"
295297
soundLoop "sound/weapons/saber/saberhum_vader.wav"
296298
saberLength 40
299+
saberRadius 2.75
297300
saberColor red
298301
isOpenMode 1
299302
}
@@ -661,7 +664,7 @@ saber_marek2
661664
saberType SABER_SINGLE
662665
saberModel "models/weapons2/saber_plasma/saber_marek2.glm"
663666
soundOn "sound/weapons/saber/saberon_v5.mp3"
664-
soundLoop "sound/weapons/saber/saberhum_galen2.wav"
667+
soundLoop "sound/weapons/saber/saberhum_OT.wav"
665668
soundOff "sound/weapons/saber/saberoff_v4.wav"
666669
saberLength 40
667670
saberColor blue

MBAssets3/ext_data/sabers/saber_hilts_Open3.sab

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ saber_luke3
280280
soundLoop "sound/weapons/saber/saberhum_OT.wav"
281281
soundOff "sound/weapons/saber/saberoff.wav"
282282
saberLength 40
283+
saberRadius 2.5
283284
saberColor blue
284285
isOpenMode 1
285286
}
@@ -293,6 +294,7 @@ saber_luke5
293294
soundLoop "sound/weapons/saber/saberhum_OT.wav"
294295
soundOff "sound/weapons/saber/saberoff.wav"
295296
saberLength 40
297+
saberRadius 2.75
296298
saberColor blue
297299
isOpenMode 1
298300
}
@@ -303,6 +305,7 @@ saber_luke2
303305
saberType SABER_SINGLE
304306
saberModel "models/weapons2/saber_plasma/saber_luke2.glm"
305307
saberLength 40
308+
saberRadius 2.75
306309
saberColor green
307310
isOpenMode 1
308311

@@ -317,6 +320,7 @@ saber_luke_mp
317320
saberType SABER_SINGLE
318321
saberModel "models/weapons2/saber_luke/saber_w.glm"
319322
saberLength 40
323+
saberRadius 2.75
320324
saberColor green
321325
isOpenMode 1
322326

@@ -331,6 +335,7 @@ saber_luke_mp2
331335
saberType SABER_SINGLE
332336
saberModel "models/weapons2/saber_rooxon/saber_luke.glm"
333337
saberLength 40
338+
saberRadius 2.75
334339
saberColor green
335340
isOpenMode 1
336341

@@ -345,9 +350,10 @@ saber_luke4
345350
saberType SABER_SINGLE
346351
saberModel "models/weapons2/saber_plasma/saber_luke4.glm"
347352
soundOn "sound/weapons/saber/saberon.wav"
348-
soundLoop "sound/weapons/saber/saberhum_anakin.wav"
353+
soundLoop "sound/weapons/saber/saberhum_OT.wav"
349354
soundOff "sound/weapons/saber/saberoff.wav"
350355
saberLength 40
356+
saberRadius 2.5
351357
saberColor random
352358
isOpenMode 1
353359
}
@@ -600,7 +606,7 @@ saber_obi_wan
600606
saberType SABER_SINGLE
601607
saberModel "models/weapons2/saber_plasma/saber_obi_wan.glm"
602608
soundOn "sound/weapons/saber/saberonquick2.wav"
603-
soundLoop "sound/weapons/saber/saberhum5.wav"
609+
soundLoop "sound/weapons/saber/saberhum_EP2a.wav"
604610
soundOff "sound/weapons/saber/saberoffquick2.wav"
605611
saberLength 40
606612
saberColor blue
@@ -629,6 +635,7 @@ saber_obi_wan3
629635
soundLoop "sound/weapons/saber/saberhum_OT.wav"
630636
soundOff "sound/weapons/saber/saberoff.wav"
631637
saberLength 40
638+
saberRadius 2.5
632639
saberColor blue
633640
isOpenMode 1
634641
}

z_MBLegends/ext_data/mb2/character/h1_SecurET.mbch

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ ClassInfo
1111
forcepool 80
1212
speed 1.01
1313

14-
classNumberLimit 4
1514
extralives 1
1615

1716
special1 EAS_HI_SPRINT
@@ -121,7 +120,7 @@ ClassInfo
121120
25% less FP damage, 50% slower mag reload"
122121

123122
c_att_skill_4 MB_ATT_CLONEBLOBS
124-
c_att_names_4 "> Repeater Conc Blobs"
123+
c_att_names_4 "> Repeater Conc Blob"
125124
c_att_ranks_4 1,1
126125

127126
c_att_skill_5 MB_ATT_SONIC_DETONATOR

z_MBLegends/ext_data/mb2/character/h1_Selk.mbch

Lines changed: 47 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ ClassInfo
1515
WP_E22Flags HELD_KNOCKBACK|HELD_ALTRELOAD
1616
WP_DEMP2Flags HELD_PULSE|HELD_EXPLOSIVE|HELD_ALTRELOAD
1717
WP_FragNadeFlags HELD_FREEZE|HELD_SLIPPERY|HELD_LOWDAMAGE
18-
WP_ConcNadeFlags HELD_BACTA
18+
WP_RepeaterFlags HELD_BACTA|HELD_LIFESTEAL
1919

20-
attributes MB_ATT_DASH,1|MB_ATT_WATER_BREATHING|MB_ATT_GETUPS,4|MB_ATT_AMMO,3|MB_ATT_ASSEMBLE,1|MB_ATT_SPEEDLUNGE|MB_ATT_WOOKIEE_FURY,1|MB_ATT_DEXTERITY,3|MB_ATT_ENV_PROT,1|MB_ATT_SHOTGUN,2|MB_ATT_FP_SABER_DEFENSE,1
20+
attributes MB_ATT_DASH,1|MB_ATT_WATER_BREATHING|MB_ATT_GETUPS,4|MB_ATT_AMMO,3|MB_ATT_ASSEMBLE,1|MB_ATT_SPEEDLUNGE|MB_ATT_WOOKIEE_FURY,1|MB_ATT_DEXTERITY,3|MB_ATT_ENV_PROT,1|MB_ATT_SHOTGUN,2|MB_ATT_FP_SABER_DEFENSE,1|MB_ATT_REPEATER_NADES,2
2121

2222
forcepowers FP_SPEED,1|FP_DARKRAGE,1
2323
resource RESOURCE_RAGE
@@ -49,7 +49,7 @@ ClassInfo
4949
special3 EAS_FP_SPEED
5050
special4 EAS_HI_PSHIELD
5151
special1HUD HUD_FRAGNADE
52-
special2HUD HUD_CONCNADE
52+
special2HUD HUD_REPEATERNADE
5353

5454
//forcepool 35
5555
//forceregen 0.01
@@ -59,6 +59,9 @@ ClassInfo
5959

6060
RunForward BOTH_WOOKIEE_RAGE_RUN
6161
flourishAnim TORSO_MELEE_BACKHAND_SWIMFORWARD
62+
kickAnim BOTH_WOOKIEE_MELEE
63+
64+
meleeknockback_flat 30
6265

6366
rageSoundOverride "sound/chars/selkath/misc/land1.mp3"
6467
bargeSoundOverride "sound/chars/selkath/misc/jump1.mp3"
@@ -109,12 +112,12 @@ ClassInfo
109112
20% more knockback, 30% more special damage, 30% shorter"
110113

111114
c_att_skill_1 MB_ATT_CLONE_PISTOL
112-
c_att_names_1 "Sonic Emitters (Clone Pistols)"
115+
c_att_names_1 "Sonic Emitters (Clone Pistol)"
113116
c_att_ranks_1 3,0,0
114117
c_att_descs_1 "Hitscan rounds, 40% less damage, 5% slower RoF, Mag reload"
115118

116119
c_att_skill_2 MB_ATT_MANDO_PISTOL
117-
c_att_names_2 "Fira Blaster Pistols (WESTARs)"
120+
c_att_names_2 "Fira Blaster Pistols (WESTAR)"
118121
c_att_ranks_2 3,0,0
119122
c_att_descs_2 "15% slower RoF, Mag reload"
120123

@@ -123,21 +126,22 @@ ClassInfo
123126
c_att_ranks_3 1
124127
c_att_descs_3 "Pushes on hit, 10% more damage, 10% more FP damage, Mag reload"
125128

126-
c_att_skill_4 MB_ATT_DEMP2
127-
c_att_names_4 "Verpine Ion Pistol (DEMP2)"
128-
c_att_ranks_4 1,0,0
129-
c_att_descs_4 "Shocks/explodes on hit, 50% more damage/FP damage, 30% faster RoF,
130-
75% less velo, 75% smaller splash, 50% slower mag reload"
129+
c_att_skill_4 MB_ATT_REPEATER
130+
c_att_names_4 "Kolto Grenade (4) (IHR)"
131+
c_att_ranks_4 2
132+
c_att_descs_4 "Team-heals/drains on det, 68% larger splash, 100% less damage,
133+
Secondary fire only"
131134

132-
c_att_skill_5 MB_ATT_FRAGS
133-
c_att_names_5 "Cryo-Frag Grenades"
134-
c_att_ranks_5 1,1,1
135-
c_att_descs_5 "Freezes/slips on det, 50% less damage"
135+
c_att_skill_5 MB_ATT_DEMP2
136+
c_att_names_5 "Verpine Ion Pistol (DEMP2)"
137+
c_att_ranks_5 1,0,0
138+
c_att_descs_5 "Shocks/explodes on hit, 50% more damage/FP damage, 30% faster RoF,
139+
75% less velo, 75% smaller splash, 50% slower mag reload"
136140

137-
c_att_skill_6 MB_ATT_MICRO_GRENADES
138-
c_att_names_6 "Kolto Grenades (Conc)"
141+
c_att_skill_6 MB_ATT_FRAGS
142+
c_att_names_6 "Cryo-Frag Grenade"
139143
c_att_ranks_6 1,1,1
140-
c_att_descs_6 "Team-heals on det, 20% larger splash, 100% less damage"
144+
c_att_descs_6 "Freezes/slips on det, 50% less damage"
141145

142146
c_att_skill_7 MB_ATT_FP_DARKRAGE
143147
c_att_names_7 "Insanity (Dark Rage) ^3[CS1]"
@@ -256,10 +260,13 @@ WeaponInfo4
256260

257261
WeaponInfo5
258262
{
259-
WeaponToReplace WP_CONC_NADE
263+
WeaponToReplace WP_REPEATER
260264
WeaponBasedOff WP_CONC_NADE
261265
NewWorldModel "models/weapons/Grenade_Concussion/model.glm"
262-
NewViewModel "models/map_objects/mp/bacta.md3"
266+
NewViewModel "models/weapons2/dummy/dummy.md3"
267+
268+
flashSound0 "sound/player/nullifyloop.wav"
269+
altFlashSound0 "sound/player/nullifyloop.wav"
263270

264271
MissileModel "models/map_objects/mp/bacta.md3"
265272
MissileEffect "force/pushblur"
@@ -272,11 +279,27 @@ WeaponInfo5
272279
altMissileMissEffect "grenades/exp_heal"
273280
altMissileHitHumanEffect "grenades/exp_heal"
274281
altMissileHitDroidEffect "grenades/exp_heal"
282+
275283
Icon "gfx/hud/w_icon_stungrenade"
276-
WeaponName "Kolto Grenades"
284+
WeaponName "Kolto Grenade"
285+
277286
damageMod 0
278-
splashdamage 0
287+
splashdamage 1
279288
splashradius 216
289+
primFireEnabled 0
290+
customAmmo -1
291+
clipSize -1
292+
293+
selectSound "sound/player/pickuphealth.mp3"
294+
295+
hasAnimOverrides 1
296+
animReadyRun BOTH_THERMAL_READY2
297+
animReady BOTH_THERMAL_READY2
298+
animReadyWalk BOTH_THERMAL_READY2
299+
animReadyNoAmmo BOTH_THERMAL_READY2
300+
animAttackRun BOTH_THERMAL_THROW2
301+
animAttack BOTH_THERMAL_THROW2
302+
animAttackWalk BOTH_THERMAL_THROW2
280303
}
281304

282305
WeaponInfo6
@@ -351,7 +374,7 @@ WeaponInfo7
351374
altMissileEffect "grenades/glowfragb"
352375

353376
Icon "gfx/hud/w_icon_cryobangrenade"
354-
WeaponName "Cryo-Frag Grenades"
377+
WeaponName "Cryo-Frag Grenade"
355378
}
356379

357380
WeaponInfo8
@@ -378,6 +401,8 @@ Agile creatures prone to mania. Combat-proficient both on land and in the sea. S
378401
-- Lightweight
379402
-- 10% more damage
380403
-- 25% faster RoF
404+
-- 30% more knockback
405+
-- No kicks
381406
- Progenitor's Call (1) (Shotgun 2)
382407
-- Stuns on hit
383408
-- Lightweight

0 commit comments

Comments
 (0)