diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/VR_mgs1_psychomantis.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/VR_mgs1_psychomantis.mbch index 933fe1806..05d406ed0 100644 --- a/03_MovieGameMappack/Ext_Data/MB2/character/VR_mgs1_psychomantis.mbch +++ b/03_MovieGameMappack/Ext_Data/MB2/character/VR_mgs1_psychomantis.mbch @@ -15,8 +15,8 @@ ClassInfo speed 1.2 classNumberLimit 1 classflags CFL_MIRALUKA - jetpackThrustEffect "force/pushblur" - jetpackIdleEffect "force/pushblur" + jetpackThrustEffect "gfx/effects/dekashield2" + jetpackIdleEffect "gfx/effects/dekashield2" jetpackJetTag "*r_leg_foot" jetpackJet2Tag "*l_leg_foot" jetpackJetOffset "0, 0, 21" diff --git a/MBAssets3/ext_data/mb2/character/duel_uta_grievous.mbch b/MBAssets3/ext_data/mb2/character/duel_uta_grievous.mbch index 247626cc2..ff8bfb097 100644 --- a/MBAssets3/ext_data/mb2/character/duel_uta_grievous.mbch +++ b/MBAssets3/ext_data/mb2/character/duel_uta_grievous.mbch @@ -11,7 +11,7 @@ Classinfo forcepool 10 classflags CFL_FASTFORCEREGEN model "grievous" - skin "worn_nocape" + skin "nocape" uishader "models/players/grievous/mb2_icon_nocape" MBclass MB_CLASS_ARCTROOPER modelscale 1.1 diff --git a/MBAssets3/ext_data/npcs/BDroidRed.npc b/MBAssets3/ext_data/npcs/BDroidRed.npc deleted file mode 100644 index 849cc9359..000000000 --- a/MBAssets3/ext_data/npcs/BDroidRed.npc +++ /dev/null @@ -1,29 +0,0 @@ -BDroidRed -{ - fullName "BDroidRed" - playerModel battledroid - customSkin default_security - scale 100 - weapon WP_BLASTER - height 100 - aggression 5 - aim 1 - evasion 1 - intelligence 1 - move 3 - reactions 1 - rank commander - playerTeam TEAM_PLAYER - enemyTeam TEAM_ENEMY - health 30 - earshot 1024 - visrange 2048 - vigilance 0.8 - hfov 160 - vfov 160 - class MB_CLASS_SOLDIER - yawSpeed 180 - walkSpeed 50 - runspeed 100 - snd battledroid -} diff --git a/MBAssets3/ext_data/npcs/BDroidYel.npc b/MBAssets3/ext_data/npcs/BDroidYel.npc deleted file mode 100644 index 98954f33d..000000000 --- a/MBAssets3/ext_data/npcs/BDroidYel.npc +++ /dev/null @@ -1,29 +0,0 @@ -BDroidYel -{ - fullName "BDroidYel" - playerModel battledroid - customSkin command - scale 100 - weapon WP_BLASTER - height 100 - aggression 5 - aim 1 - evasion 1 - intelligence 1 - move 3 - reactions 1 - rank commander - playerTeam TEAM_PLAYER - enemyTeam TEAM_ENEMY - health 30 - earshot 1024 - visrange 2048 - vigilance 0.8 - hfov 160 - vfov 160 - class MB_CLASS_SOLDIER - yawSpeed 180 - walkSpeed 50 - runspeed 100 - snd battledroid -} diff --git a/MBAssets3/ext_data/npcs/Lando.npc b/MBAssets3/ext_data/npcs/Lando.npc index 5b9351761..56d8613a9 100644 --- a/MBAssets3/ext_data/npcs/Lando.npc +++ b/MBAssets3/ext_data/npcs/Lando.npc @@ -1,4 +1,4 @@ -//NNN: JKO npc for cinimatics +//NNN: JKO npc for cutscenes on ns_hideout and ns_starpad Lando { playerModel lando diff --git a/MBAssets3/ext_data/npcs/Mark4.npc b/MBAssets3/ext_data/npcs/Mark4.npc index c1e441ef0..783b9549f 100644 --- a/MBAssets3/ext_data/npcs/Mark4.npc +++ b/MBAssets3/ext_data/npcs/Mark4.npc @@ -1,6 +1,7 @@ m4droid { playermodel m4droid + MBClass 11 weapon WP_BOT_LASER headYawRangeLeft 180 headYawRangeRight 180 diff --git a/MBAssets3/ext_data/npcs/alora.npc b/MBAssets3/ext_data/npcs/alora.npc index d31accb2e..f8eae08a1 100644 --- a/MBAssets3/ext_data/npcs/alora.npc +++ b/MBAssets3/ext_data/npcs/alora.npc @@ -3,6 +3,7 @@ alora { playerModel alora + MBClass 5 rank lt saber single_4 saberColor red @@ -62,6 +63,7 @@ alora_dual { // playerModel alora2 playerModel alora + MBClass 5 rank commander saber single_4 saberColor red @@ -76,7 +78,7 @@ alora_dual forcePowerMax 200 Pbchance 40 MBchance 4 - SBchance 70 + SBchance 80 saberStyle 6 health 500 FP_HEAL 0 diff --git a/MBAssets3/ext_data/npcs/assassin_droid.npc b/MBAssets3/ext_data/npcs/assassin_droid.npc index e75648306..e8af5f19e 100644 --- a/MBAssets3/ext_data/npcs/assassin_droid.npc +++ b/MBAssets3/ext_data/npcs/assassin_droid.npc @@ -1,7 +1,8 @@ -//NNN: Seen in JKA t2_rogue, setup with regenerating armor for now and the mb2 galak_shield, given EE-4 to be more dangerous +//NNN: Seen in JKA t2_rogue and vjun3, setup with regenerating armor for now and the mb2 galak_shield, given EE-4 to be more dangerous assassin_droid { playerModel assassin_droid + MBClass 11 weapon WP_BLASTER //MB_ATT_BLASTER 3 //altFire 1 @@ -11,7 +12,7 @@ assassin_droid MB_ATT_SHIELD_RECHARGE2 1 //NPCAI_SHOCK_FIELD 1 //Doesn't work, stil uses CLASS_ASSASSIN_DROID to action health 200 - armor 100 + armor 40 MB_ATT_WOOKIE_STRENGTH 3 headPitchRangeDown 30 FL_NO_KNOCKBACK 1 diff --git a/MBAssets3/ext_data/npcs/atst.npc b/MBAssets3/ext_data/npcs/atst.npc index d0ce18885..b25b9dc44 100644 --- a/MBAssets3/ext_data/npcs/atst.npc +++ b/MBAssets3/ext_data/npcs/atst.npc @@ -1,7 +1,8 @@ -//NNN: Has custom AI and weapons, currently attacks don't have the correct muzzels +//NNN: Has custom AI and weapons, currently attacks don't have the correct muzzels. Only seen in t2_dpred. atst { playerModel atst + MBClass 11 weapon WP_ATST_MAIN weapon WP_ATST_SIDE // headModel atst diff --git a/MBAssets3/ext_data/npcs/b-wing_mini.npc b/MBAssets3/ext_data/npcs/b-wing_mini.npc index 671c8eb26..1bcbd1f3a 100644 --- a/MBAssets3/ext_data/npcs/b-wing_mini.npc +++ b/MBAssets3/ext_data/npcs/b-wing_mini.npc @@ -1,4 +1,3 @@ - //NOTE: for vehicle-class NPCs, the playerModel key is actually their entry in the vehicles.dat b-wing_mini diff --git a/MBAssets3/ext_data/npcs/bartender.npc b/MBAssets3/ext_data/npcs/bartender.npc index 6dda31dd0..67188d71d 100644 --- a/MBAssets3/ext_data/npcs/bartender.npc +++ b/MBAssets3/ext_data/npcs/bartender.npc @@ -1,4 +1,4 @@ -//NNN: The JKO bartender on NarShadda +//NNN: The JKO bartender on ns_streets Bartender { playerModel chiss diff --git a/MBAssets3/ext_data/npcs/bespincop.npc b/MBAssets3/ext_data/npcs/bespincop.npc index d27b32c23..4e96cde81 100644 --- a/MBAssets3/ext_data/npcs/bespincop.npc +++ b/MBAssets3/ext_data/npcs/bespincop.npc @@ -1,4 +1,4 @@ -//NNN: Used in JKO Bespin levels as allies that assist the player, the spawner between default and 2 is randomized so there's a bit of variety +//NNN: Used in JKO bespin_streets level as allies that assist the player, the spawner between default and 2 is randomized so there's a bit of variety BespinCop { playerModel bespin_cop diff --git a/MBAssets3/ext_data/npcs/boba_fett.npc b/MBAssets3/ext_data/npcs/boba_fett.npc index 384f01066..b0b15a6fc 100644 --- a/MBAssets3/ext_data/npcs/boba_fett.npc +++ b/MBAssets3/ext_data/npcs/boba_fett.npc @@ -2,6 +2,7 @@ boba_fett { playerModel boba_fett + MBClass 13 altFire 1 weapon WP_MELEE weapon WP_DISRUPTOR diff --git a/MBAssets3/ext_data/npcs/chewie.npc b/MBAssets3/ext_data/npcs/chewie.npc index e23d7cbf0..3ecd86e7e 100644 --- a/MBAssets3/ext_data/npcs/chewie.npc +++ b/MBAssets3/ext_data/npcs/chewie.npc @@ -3,6 +3,7 @@ chewie { playerModel chewbacca //altFire 0 + MBClass 10 weapon WP_BOWCASTER MB_ATT_BOWCASTER 3 FP_HEAL 0 diff --git a/MBAssets3/ext_data/npcs/cultist.npc b/MBAssets3/ext_data/npcs/cultist.npc index 11293d646..74fb34836 100644 --- a/MBAssets3/ext_data/npcs/cultist.npc +++ b/MBAssets3/ext_data/npcs/cultist.npc @@ -2,6 +2,7 @@ cultist { playerModel cultist + MBClass 5 weapon WP_BLASTER MB_ATT_BLASTER 3 altFire 1 diff --git a/MBAssets3/ext_data/npcs/cultist_destroyer.npc b/MBAssets3/ext_data/npcs/cultist_destroyer.npc index 39f3af930..625a0280d 100644 --- a/MBAssets3/ext_data/npcs/cultist_destroyer.npc +++ b/MBAssets3/ext_data/npcs/cultist_destroyer.npc @@ -1,9 +1,10 @@ -//NNN: This is supposed to be a cultist zealot who would charge the player chanting until blowing themself up with force destruction, maybe using rage to close the distance +//NNN: This is supposed to be a cultist zealot who would charge the player chanting until blowing themself up with force destruction, maybe using force dark rage to close the distance //NNN: Doesn't work currently, will need a lot of work code side cultist_destroyer { playerModel cultist customSkin red + MBClass 5 weapon WP_MELEE RESOURCE_FORCE 1 forcePowerMax 200 diff --git a/MBAssets3/ext_data/npcs/cultist_mage.npc b/MBAssets3/ext_data/npcs/cultist_mage.npc index 5f8881fa1..c454f2a03 100644 --- a/MBAssets3/ext_data/npcs/cultist_mage.npc +++ b/MBAssets3/ext_data/npcs/cultist_mage.npc @@ -3,6 +3,7 @@ cultist_lightning { playerModel cultist customSkin blue + MBClass 5 weapon WP_MELEE MB_ATT_FORCEBLOCK 3 FP_LEVITATION 3 @@ -43,6 +44,7 @@ cultist_drain { playerModel cultist customSkin red + MBClass 5 weapon WP_MELEE MB_ATT_FORCEBLOCK 3 FP_LEVITATION 3 @@ -82,6 +84,7 @@ cultist_drain cultist_grip { playerModel cultist + MBClass 5 weapon WP_MELEE MB_ATT_FORCEBLOCK 3 FP_LEVITATION 3 @@ -123,6 +126,7 @@ cultist_push //NNN: Should be a combined push/pull/repulse/superpush eventually { playerModel reborn_concept customSkin force + MBClass 5 weapon WP_MELEE MB_ATT_FORCEBLOCK 3 FP_LEVITATION 3 @@ -162,6 +166,7 @@ cultist_pull { playerModel reborn_concept customSkin force + MBClass 5 weapon WP_MELEE MB_ATT_FORCEBLOCK 3 FP_LEVITATION 3 @@ -202,6 +207,7 @@ cultist_destruction { playerModel reborn_concept customSkin force + MBClass 5 weapon WP_MELEE MB_ATT_FORCEBLOCK 3 FP_LEVITATION 3 @@ -242,6 +248,7 @@ cultist_blind { playerModel reborn_concept customSkin force + MBClass 5 weapon WP_MELEE MB_ATT_FORCEBLOCK 3 FP_LEVITATION 3 @@ -282,6 +289,7 @@ cultist_sight { playerModel reborn_concept customSkin force + MBClass 5 weapon WP_MELEE MB_ATT_FORCEBLOCK 3 FP_LEVITATION 3 @@ -322,6 +330,7 @@ cultist_heal { playerModel reborn_concept customSkin force + MBClass 5 weapon WP_MELEE MB_ATT_FORCEBLOCK 3 FP_LEVITATION 3 @@ -362,6 +371,7 @@ cultist_teamheal { playerModel reborn_concept customSkin force + MBClass 5 weapon WP_MELEE MB_ATT_FORCEBLOCK 3 FP_LEVITATION 3 @@ -402,6 +412,7 @@ cultist_teamforce { playerModel reborn_concept customSkin force + MBClass 5 weapon WP_MELEE MB_ATT_FORCEBLOCK 3 FP_LEVITATION 3 @@ -442,6 +453,7 @@ cultist_speed { playerModel reborn_concept customSkin force + MBClass 5 weapon WP_MELEE MB_ATT_FORCEBLOCK 3 FP_LEVITATION 3 @@ -482,6 +494,7 @@ cultist_rage { playerModel reborn_concept customSkin force + MBClass 5 weapon WP_MELEE MB_ATT_FORCEBLOCK 3 FP_LEVITATION 3 @@ -522,6 +535,7 @@ cultist_mt { playerModel reborn_concept customSkin force + MBClass 5 weapon WP_MELEE MB_ATT_FORCEBLOCK 3 FP_LEVITATION 3 @@ -562,6 +576,7 @@ cultist_protect { playerModel reborn_concept customSkin force + MBClass 5 weapon WP_MELEE MB_ATT_FORCEBLOCK 3 FP_LEVITATION 3 @@ -602,6 +617,7 @@ cultist_absorb { playerModel reborn_concept customSkin force + MBClass 5 weapon WP_MELEE MB_ATT_FORCEBLOCK 3 FP_LEVITATION 3 diff --git a/MBAssets3/ext_data/npcs/cultist_saber.npc b/MBAssets3/ext_data/npcs/cultist_saber.npc index 2b3b93799..bda673a2b 100644 --- a/MBAssets3/ext_data/npcs/cultist_saber.npc +++ b/MBAssets3/ext_data/npcs/cultist_saber.npc @@ -4,6 +4,7 @@ cultist_saber { playerModel cultist customSkin brown + MBClass 5 saber reborn weapon WP_SABER //MB_ATT_FORCEBLOCK 1 @@ -46,6 +47,7 @@ cultist_saber_throw { playerModel cultist customSkin brown + MBClass 5 saber reborn weapon WP_SABER //MB_ATT_FORCEBLOCK 1 @@ -89,6 +91,7 @@ cultist_saber_med { playerModel cultist customSkin brown + MBClass 5 saber reborn weapon WP_SABER //MB_ATT_FORCEBLOCK 1 @@ -132,6 +135,7 @@ cultist_saber_med_throw { playerModel cultist customSkin brown + MBClass 5 saber reborn weapon WP_SABER //MB_ATT_FORCEBLOCK 1 @@ -176,6 +180,7 @@ cultist_saber_strong { playerModel cultist customSkin brown + MBClass 5 saber reborn weapon WP_SABER //MB_ATT_FORCEBLOCK 1 @@ -219,6 +224,7 @@ cultist_saber_strong_throw { playerModel cultist customSkin brown + MBClass 5 saber reborn weapon WP_SABER //MB_ATT_FORCEBLOCK 1 @@ -263,6 +269,7 @@ cultist_saber_all { playerModel cultist customSkin brown + MBClass 5 saber reborn weapon WP_SABER //MB_ATT_FORCEBLOCK 1 @@ -309,6 +316,7 @@ cultist_saber_all_throw { playerModel cultist customSkin brown + MBClass 5 saber reborn weapon WP_SABER //MB_ATT_FORCEBLOCK 1 diff --git a/MBAssets3/ext_data/npcs/cultist_saber_powers.npc b/MBAssets3/ext_data/npcs/cultist_saber_powers.npc index 97499f25e..4e39cd0ca 100644 --- a/MBAssets3/ext_data/npcs/cultist_saber_powers.npc +++ b/MBAssets3/ext_data/npcs/cultist_saber_powers.npc @@ -4,6 +4,7 @@ cultist_saber2 { playerModel cultist customSkin brown + MBClass 5 saber reborn weapon WP_SABER //MB_ATT_FORCEBLOCK 2 @@ -48,6 +49,7 @@ cultist_saber_throw2 { playerModel cultist customSkin brown + MBClass 5 saber reborn weapon WP_SABER //MB_ATT_FORCEBLOCK 2 @@ -93,6 +95,7 @@ cultist_saber_med2 { playerModel cultist customSkin brown + MBClass 5 saber reborn weapon WP_SABER //MB_ATT_FORCEBLOCK 2 @@ -137,6 +140,7 @@ cultist_saber_med_throw2 { playerModel cultist customSkin brown + MBClass 5 saber reborn weapon WP_SABER //MB_ATT_FORCEBLOCK 2 @@ -182,6 +186,7 @@ cultist_saber_strong2 { playerModel cultist customSkin brown + MBClass 5 saber reborn weapon WP_SABER //MB_ATT_FORCEBLOCK 2 @@ -226,6 +231,7 @@ cultist_saber_strong_throw2 { playerModel cultist customSkin brown + MBClass 5 saber reborn weapon WP_SABER //MB_ATT_FORCEBLOCK 2 @@ -271,6 +277,7 @@ cultist_saber_all2 { playerModel cultist customSkin brown + MBClass 5 saber reborn weapon WP_SABER //MB_ATT_FORCEBLOCK 2 @@ -319,6 +326,7 @@ cultist_saber_all_throw2 { playerModel cultist customSkin brown + MBClass 5 saber reborn weapon WP_SABER //MB_ATT_FORCEBLOCK 2 diff --git a/MBAssets3/ext_data/npcs/cultistcommando.npc b/MBAssets3/ext_data/npcs/cultistcommando.npc index cd9e89ca4..f65fd212a 100644 --- a/MBAssets3/ext_data/npcs/cultistcommando.npc +++ b/MBAssets3/ext_data/npcs/cultistcommando.npc @@ -1,14 +1,14 @@ -//NNN: Unused base force gunner, currently being used as a testing NPC while trying to get that working +//NNN: Unused base force gunner, currently being used as a testing NPC cultistcommando { playerModel cultist weapon WP_MANDO_PISTOL //MB_ATT_MANDO_PISTOL 3 //altFire 1 - //MB_ATT_FORCEBLOCK 2 MB_ATT_STAMINA 3 MB_ATT_DEXTERITY 3 - RESOURCE_FORCE 1 + MB_ATT_KNOCKDOWN_ROLL 1 + RESOURCE_STAMINA 1 //FP_LEVITATION 2 forcePowerMax 200 rank ltcomm @@ -23,7 +23,7 @@ cultistcommando playerTeam TEAM_PLAYER enemyTeam TEAM_ENEMY // class CLASS_COMMANDO - class CLASS_REBORN + class CLASS_STORMTROOPER snd cultist3 sndcombat cultist3 sndextra cultist3 diff --git a/MBAssets3/ext_data/npcs/darkjedi.npc b/MBAssets3/ext_data/npcs/darkjedi.npc deleted file mode 100644 index 8180abdaf..000000000 --- a/MBAssets3/ext_data/npcs/darkjedi.npc +++ /dev/null @@ -1,105 +0,0 @@ -dark_e -{ - playerModel reborn - customSkin darkjedi - saber single_2 - saberColor red - weapon WP_SABER - saberStyle 7 - FP_HEAL 3 - FP_LEVITATION 3 - FP_SPEED 3 - FP_PUSH 3 - FP_PULL 3 - FP_TELEPATHY 3 - FP_GRIP 3 - FP_LIGHTNING 3 - FP_RAGE 3 - FP_PROTECT 0 - FP_ABSORB 0 - FP_DRAIN 3 - FP_SEE 3 - FP_SABERTHROW 3 - FP_SABER_DEFENSE 3 - FP_SABER_OFFENSE 3 - forceRegenRate 500 - rank commander - reactions 5 - aim 5 - move 5 - aggression 5 - evasion 5 - intelligence 5 - hfov 160 - vfov 160 - playerTeam TEAM_ENEMY - enemyTeam TEAM_PLAYER -// race human - class CLASS_REBORN - yawSpeed 120 - walkSpeed 55 - runSpeed 200 - sex male - snd reborn1 - sndcombat reborn1 - sndjedi reborn1 - health 500 - dismemberProbHead 50 - dismemberProbArms 50 - dismemberProbLegs 50 - dismemberProbHands 50 - dismemberProbWaist 50 -} - -dark_a -{ - playerModel reborn - customSkin darkjedi - saber single_2 - saberColor blue - weapon WP_SABER - saberStyle 7 - FP_HEAL 3 - FP_LEVITATION 3 - FP_SPEED 3 - FP_PUSH 3 - FP_PULL 3 - FP_TELEPATHY 3 - FP_GRIP 0 - FP_LIGHTNING 0 - FP_RAGE 0 - FP_PROTECT 3 - FP_ABSORB 3 - FP_DRAIN 0 - FP_SEE 3 - FP_SABERTHROW 3 - FP_SABER_DEFENSE 3 - FP_SABER_OFFENSE 3 - forceRegenRate 500 - rank commander - reactions 5 - aim 5 - move 5 - aggression 3 - evasion 5 - intelligence 5 - hfov 160 - vfov 160 - playerTeam TEAM_PLAYER - enemyTeam TEAM_ENEMY -// race human - class CLASS_REBORN - yawSpeed 120 - walkSpeed 55 - runSpeed 200 - sex male - snd reborn1 - sndcombat reborn1 - sndjedi reborn1 - health 500 - dismemberProbHead 50 - dismemberProbArms 50 - dismemberProbLegs 50 - dismemberProbHands 50 - dismemberProbWaist 50 -} \ No newline at end of file diff --git a/MBAssets3/ext_data/npcs/desann.npc b/MBAssets3/ext_data/npcs/desann.npc index ca48ef4b7..9007658c4 100644 --- a/MBAssets3/ext_data/npcs/desann.npc +++ b/MBAssets3/ext_data/npcs/desann.npc @@ -1,7 +1,8 @@ -//NNN: The main boss of JKO +//NNN: The main boss of JKO Desann { playerModel desann + MBClass 5 saber desann weapon WP_SABER MB_ATT_FORCEBLOCK 3 @@ -13,7 +14,7 @@ Desann forceRegenAmount 2 Pbchance 40 MBchance 4 - SBchance 70 + SBchance 90 saberStyle 4 FP_HEAL 0 FP_LEVITATION 3 diff --git a/MBAssets3/ext_data/npcs/falcon.npc b/MBAssets3/ext_data/npcs/falcon.npc index cfaa97c99..b2f4c8689 100644 --- a/MBAssets3/ext_data/npcs/falcon.npc +++ b/MBAssets3/ext_data/npcs/falcon.npc @@ -1,4 +1,3 @@ - //NOTE: for vehicle-class NPCs, the playerModel key is actually their entry in the vehicles.dat falcon diff --git a/MBAssets3/ext_data/npcs/galak.npc b/MBAssets3/ext_data/npcs/galak.npc index 29eaa81c3..1eafda97f 100644 --- a/MBAssets3/ext_data/npcs/galak.npc +++ b/MBAssets3/ext_data/npcs/galak.npc @@ -1,4 +1,4 @@ -//NNN: JKO cinimatic NPC +//NNN: JKO cinimatic only NPC Galak { playerModel galak diff --git a/MBAssets3/ext_data/npcs/galak_mech.npc b/MBAssets3/ext_data/npcs/galak_mech.npc index 8ed10340b..052d83d9e 100644 --- a/MBAssets3/ext_data/npcs/galak_mech.npc +++ b/MBAssets3/ext_data/npcs/galak_mech.npc @@ -1,7 +1,8 @@ -//NNN: Final JKO boss on the doomgiver, his custom AI doesn't work currently, setup with regenrating armor for now +//NNN: Final JKO boss on the doomgiver, his custom AI doesn't work currently, setup to mimic the JKA assassin_droid for now Galak_Mech { playerModel galak_mech + MBClass 11 weapon WP_REPEATER health 200 armor 100 diff --git a/MBAssets3/ext_data/npcs/gonk.npc b/MBAssets3/ext_data/npcs/gonk.npc index ad3b0fd41..08b78e70d 100644 --- a/MBAssets3/ext_data/npcs/gonk.npc +++ b/MBAssets3/ext_data/npcs/gonk.npc @@ -1,6 +1,7 @@ gonk { playerModel gonk + MBClass 11 weapon WP_NONE reactions 3 aim 1 diff --git a/MBAssets3/ext_data/npcs/gran.npc b/MBAssets3/ext_data/npcs/gran.npc index 22742d158..c861809f6 100644 --- a/MBAssets3/ext_data/npcs/gran.npc +++ b/MBAssets3/ext_data/npcs/gran.npc @@ -6,6 +6,7 @@ Gran customRGBA random1 weapon WP_THERMAL weapon WP_MELEE + MB_ATT_WOOKIE_STRENGTH 1 altFire 1 reactions 3 aim 1 @@ -39,6 +40,7 @@ Gran2 weapon WP_THERMAL weapon WP_STUN_BATON MB_ATT_STUN_BATON 3 + MB_ATT_WOOKIE_STRENGTH 1 altFire 1 reactions 3 aim 1 @@ -70,6 +72,7 @@ GranBoxer customSkin sp customRGBA random1 weapon WP_MELEE + MB_ATT_WOOKIE_STRENGTH 1 altFire 1 surfOff "l_leg_kneeguard r_leg_kneeguard" reactions 3 @@ -107,6 +110,7 @@ GranShooter //altFire 1 weapon WP_CR2 MB_ATT_CR2 3 + MB_ATT_WOOKIE_STRENGTH 1 surfOff "l_leg_kneeguard" reactions 3 aim 5 diff --git a/MBAssets3/ext_data/npcs/hazardtrooper.npc b/MBAssets3/ext_data/npcs/hazardtrooper.npc index 5e0dd2ddc..308300df7 100644 --- a/MBAssets3/ext_data/npcs/hazardtrooper.npc +++ b/MBAssets3/ext_data/npcs/hazardtrooper.npc @@ -8,6 +8,7 @@ hazardtrooper armor 150 MB_ATT_MAGNETIC_PLATING 1 MB_ATT_WOOKIE_STRENGTH 3 + MB_ATT_ENV_PROT 3 headPitchRangeDown 30 reactions 3 aim 1 @@ -43,6 +44,7 @@ hazardtrooperconcussion armor 150 MB_ATT_MAGNETIC_PLATING 1 MB_ATT_WOOKIE_STRENGTH 3 + MB_ATT_ENV_PROT 3 headPitchRangeDown 30 reactions 3 aim 1 @@ -78,6 +80,7 @@ hazardtrooperofficer armor 150 MB_ATT_MAGNETIC_PLATING 1 MB_ATT_WOOKIE_STRENGTH 3 + MB_ATT_ENV_PROT 3 headPitchRangeDown 30 reactions 4 aim 3 diff --git a/MBAssets3/ext_data/npcs/hordeCIS.npc b/MBAssets3/ext_data/npcs/hordeCIS.npc index c683f35e0..8655787a7 100644 --- a/MBAssets3/ext_data/npcs/hordeCIS.npc +++ b/MBAssets3/ext_data/npcs/hordeCIS.npc @@ -1,13 +1,11 @@ //Dooku's Dark Acolytes and cultists from Thule. Need different models, skins, snds, and hilts. Maybe some variance in stats and saber colors too. Current colors are based on style. -//TO DO: Dooku, Ventress, Grevious, other named Acolytes? Nikto Morgukai warriors with their plasma tipped cortosis staffs? - -//For the sake of testing, sabers are setup to be the color of the style, most stats have been maxed, and each has been given a force power -//Need to make notes on how dangerous the AI is with each style, and investigate variance between rank, stats, and attributes +//TO DO: Dooku, Ventress, Grevious, other named Acolytes? DA1 //saberstyle 1 blue { playerModel reborn_concept customSkin force + MBCLASS 5 saber saber_reborn_mp saberColor blue weapon WP_SABER @@ -52,6 +50,7 @@ DA2 //saberstyle 2 yellow { playerModel reborn_concept customSkin force + MBCLASS 5 saber saber_reborn_mp saberColor yellow weapon WP_SABER @@ -98,6 +97,7 @@ DA3 //saberstyle 3 red { playerModel reborn_concept customSkin force + MBCLASS 5 saber saber_reborn_mp saberColor red weapon WP_SABER @@ -144,6 +144,7 @@ DA4 //saberstyle 4 purple { playerModel reborn_concept customSkin force + MBCLASS 5 saber saber_reborn_mp saberColor purple weapon WP_SABER @@ -189,6 +190,7 @@ DA5 //saberstyle 5 cyan { playerModel reborn_concept customSkin force + MBCLASS 5 saber saber_reborn_mp saberColor orange weapon WP_SABER @@ -234,10 +236,11 @@ DA6 //saberstyle 6 green/duals { playerModel reborn_concept customSkin force + MBCLASS 5 saber saber_reborn_mp saberColor green saber2 saber_reborn_mp - saber2Color random + saber2Color green weapon WP_SABER MB_ATT_FORCEBLOCK 3 MB_ATT_FP_SABER_DEFENSE 3 @@ -281,6 +284,7 @@ DA7 //saberstyle 7 staff/white { playerModel reborn_concept customSkin force + MBCLASS 5 saber dual_1 saberColor silver weapon WP_SABER @@ -327,6 +331,7 @@ DA6B //saberstyle 6 green/duals { playerModel reborn_concept customSkin force + MBCLASS 5 saber saber_reborn_mp saberColor random weapon WP_SABER @@ -372,6 +377,7 @@ DA6C //saberstyle 6 green/duals { playerModel reborn_concept customSkin force + MBCLASS 5 saber2 saber_reborn_mp saber2Color random weapon WP_SABER @@ -417,6 +423,7 @@ DA7B //saberstyle 7 staff/white { playerModel reborn_concept customSkin force + MBCLASS 5 saber saber_reborn_mp saberColor silver weapon WP_SABER @@ -463,6 +470,7 @@ lightning_mage //NNN: Sith cultist from Thule { playerModel reborn_concept customSkin force + MBCLASS 5 weapon WP_MELEE MB_ATT_FORCEBLOCK 3 FP_LEVITATION 3 @@ -497,6 +505,49 @@ lightning_mage //NNN: Sith cultist from Thule dismemberProbHands 30 dismemberProbWaist 0 } + +Morgukai //Morgukai warrior, Nikto order of force sensitives that th CIS made a clone army of them. +{ + playerModel weequay + customSkin nikto + MBCLASS 5 + saber qstaff //placeholder for their plasma tipped cortosis staffs + weapon WP_SABER + saberStyle 7 + MB_ATT_FP_SABER_DEFENSE 2 + MB_ATT_FORCEBLOCK 1 + RESOURCE_FORCE 1 + forcePowerMax 100 + Pbchance 20 + MBchance 2 + SBchance 45 + FP_SPEED 3 + FP_LEVITATION 2 + reactions 1 + aim 1 + move 1 + aggression 1 + evasion 1 + intelligence 1 + hfov 120 + vfov 120 + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY + class CLASS_REBORN + snd nikto + sndcombat nikto + sndjedi nikto + yawSpeed 60 + walkSpeed 45 + runSpeed 180 + health 80 + armor 40 + dismemberProbHead 0 + dismemberProbArms 20 + dismemberProbLegs 0 + dismemberProbHands 30 + dismemberProbWaist 0 +} //CIS Droids, note need a pass on models, skins, and snds. //TO DO: SBDs, Trando Mercs/Slavers (shotgun, smg/ee4, dual knives, minigun) from RC. //Future Ideas: Dekas, Crab Droids, Walking Vulture Droid, Organic Seps, and other vehicles? @@ -505,11 +556,12 @@ MagnaGuard //IG-100 MagnaGuards with electrostaff { playerModel magnaguard //customSkin default + MBClass 11 saber electrostaff_legends weapon WP_SABER saberStyle 7 MB_ATT_FP_SABER_DEFENSE 2 - FP_LEVITATION 1 + FP_LEVITATION 2 RESOURCE_FORCE 1 forcePowerMax 100 PBchance 20 @@ -541,10 +593,56 @@ MagnaGuard //IG-100 MagnaGuards with electrostaff dismemberProbWaist 0 } -BX_Sword2 //AI works best with style 2/yellow. +B1_Assassin +{ + playerModel battledroid + customSkin assassin + MBClass 11 + saber droid_shiv + saber2 droid_shiv_dual + weapon WP_SABER + saberStyle 6 + MB_ATT_FP_SABER_DEFENSE 1 + PBchance 10 + MBchance 1 + SBchance 30 + FP_LEVITATION 1 + RESOURCE_FORCE 1 + forcePowerMax 100 + PBchance 20 + MBchance 2 + SBchance 45 + reactions 3 + aim 1 + move 3 + aggression 5 + evasion 1 + intelligence 5 + hfov 120 + vfov 120 + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY + class CLASS_SHADOWTROOPER + snd BD_BF2_1 + sndcombat BD_BF2_1 + sndjedi BD_BF2_1 + yawSpeed 60 + walkSpeed 45 + runSpeed 180 + health 80 + armor 40 + dismemberProbHead 0 + dismemberProbArms 20 + dismemberProbLegs 0 + dismemberProbHands 30 + dismemberProbWaist 0 +} + +BX_Sword2 { playerModel bxdroid - customSkin default + customSkin melee + MBClass 11 saber Vibro_bx_legends weapon WP_SABER saberStyle 2 @@ -585,6 +683,7 @@ BX_EE4 //works better then E-11 because of the bloom { playerModel bxdroid customSkin default + MBClass 11 weapon WP_EE4 MB_ATT_EE4 3 health 80 @@ -619,7 +718,8 @@ BX_EE4 //works better then E-11 because of the bloom BX_A280 //animation looks derpy { playerModel bxdroid - customSkin default + customSkin capt + MBClass 11 weapon WP_A280 MB_ATT_A280 3 health 80 @@ -654,7 +754,8 @@ BX_A280 //animation looks derpy BX_DLT20A //animation looks derpy { playerModel bxdroid - customSkin default + customSkin capt + MBClass 11 weapon WP_DLT20A MB_ATT_DLT20A 3 altFire 1 @@ -690,7 +791,8 @@ BX_DLT20A //animation looks derpy BX_T21 //no alt fire but interesting mixup { playerModel bxdroid - customSkin default + customSkin capt + MBClass 11 weapon WP_T21 MB_ATT_T21 3 altFire 1 @@ -726,7 +828,8 @@ BX_T21 //no alt fire but interesting mixup BX_E22 //possible useful { playerModel bxdroid - customSkin default + customSkin capt + MBClass 11 weapon WP_E_22 MB_ATT_E_22 3 altFire 1 @@ -762,7 +865,8 @@ BX_E22 //possible useful BX_EE3 //pretty good with it { playerModel bxdroid - customSkin default + customSkin capt + MBClass 11 weapon WP_EE3 MB_ATT_EE3 3 health 80 @@ -797,7 +901,8 @@ BX_EE3 //pretty good with it BX_AMBAN //WIP: no altFire so useless, only tries to melee and stuck inplace { playerModel bxdroid - customSkin default + customSkin citadel + MBClass 11 weapon WP_AMBAN MB_ATT_AMBAN 3 altFire 1 @@ -833,7 +938,8 @@ BX_AMBAN //WIP: no altFire so useless, only tries to melee and stuck inplace BX_Rocket //so jedi have something to push { playerModel bxdroid - customSkin default + customSkin citadel + MBClass 11 weapon WP_ROCKET_LAUNCHER MB_ATT_ROCKET_LAUNCHER 3 altFire 1 @@ -870,6 +976,7 @@ B1_Blaster //the most basic guy, no altFire really kills usefulness but it works { playerModel battledroid customSkin ep1 + MBClass 11 weapon WP_BLASTER MB_ATT_BLASTER 3 altFire 1 @@ -889,11 +996,11 @@ B1_Blaster //the most basic guy, no altFire really kills usefulness but it works class CLASS_STORMTROOPER height 64 crouchheight 38 - walkSpeed 51 - runSpeed 200 - snd battledroid - sndcombat battledroid - sndextra battledroid + walkSpeed 67 + runSpeed 187 + snd BD_BF1 + sndcombat BD_BF1 + sndextra BD_BF1 yawspeed 70 dismemberProbHead 0 dismemberProbArms 10 @@ -905,7 +1012,8 @@ B1_Blaster //the most basic guy, no altFire really kills usefulness but it works B1_Shotgun //might be annoying to fight, maybe should be on bx or trando merc, pump action sounds terrible on a Star Wars gun too { playerModel battledroid - customSkin ep1 + customSkin ep1_security + MBClass 11 weapon WP_SHOTGUN MB_ATT_SHOTGUN 1 health 50 @@ -924,8 +1032,8 @@ B1_Shotgun //might be annoying to fight, maybe should be on bx or trando merc, p class CLASS_STORMTROOPER height 64 crouchheight 38 - walkSpeed 51 - runSpeed 200 + walkSpeed 67 + runSpeed 187 snd battledroid sndcombat battledroid sndextra battledroid @@ -940,7 +1048,8 @@ B1_Shotgun //might be annoying to fight, maybe should be on bx or trando merc, p B1_Pistol //nice difference from other blasters, maybe should be on an officer or merc { playerModel battledroid - customSkin ep1 + customSkin ep1_pilot + MBClass 11 weapon WP_BLASTER_PISTOL MB_ATT_PISTOL 3 health 50 @@ -959,44 +1068,8 @@ B1_Pistol //nice difference from other blasters, maybe should be on an officer o class CLASS_STORMTROOPER height 64 crouchheight 38 - walkSpeed 51 - runSpeed 200 - snd battledroid - sndcombat battledroid - sndextra battledroid - yawspeed 70 - dismemberProbHead 0 - dismemberProbArms 10 - dismemberProbLegs 0 - dismemberProbHands 20 - dismemberProbWaist 0 -} - -B1_Demp //nice mixup from normal blasters, idk if it makes sense for B1s to have this though, maybe give to a merc -{ - playerModel battledroid - customSkin ep1 - weapon WP_DEMP2 - MB_ATT_DEMP2 3 - MB_ATT_PISTOL 3 - health 50 - armor 15 - headPitchRangeDown 30 - reactions 3 - aim 1 - move 3 - aggression 3 - evasion 1 - intelligence 5 - rank crewman - playerTeam TEAM_PLAYER - enemyTeam TEAM_ENEMY -// race klingon - class CLASS_STORMTROOPER - height 64 - crouchheight 38 - walkSpeed 51 - runSpeed 200 + walkSpeed 67 + runSpeed 187 snd battledroid sndcombat battledroid sndextra battledroid @@ -1012,6 +1085,7 @@ B1_Thermal //nice mixup over only blasters but very derpy, works for B1 and untr { playerModel battledroid customSkin grenadier2 + MBClass 11 weapon WP_THERMAL weapon WP_MELEE reactions 3 @@ -1026,12 +1100,12 @@ B1_Thermal //nice mixup over only blasters but very derpy, works for B1 and untr playerTeam TEAM_PLAYER enemyTeam TEAM_ENEMY class CLASS_GRAN - snd battledroid - sndcombat battledroid - sndextra battledroid + snd battledroid_cw2 + sndcombat battledroid_cw2 + sndextra battledroid_cw2 yawspeed 90 - walkSpeed 55 - runSpeed 200 + walkSpeed 67 + runSpeed 187 dismemberProbHead 0 dismemberProbArms 10 dismemberProbLegs 1 @@ -1043,6 +1117,7 @@ B1_Baton //same as nader but will pull out a stun baton if you get too close wit { playerModel battledroid customSkin grenadier2 + MBClass 11 weapon WP_THERMAL weapon WP_STUN_BATON MB_ATT_STUN_BATON 3 @@ -1058,12 +1133,12 @@ B1_Baton //same as nader but will pull out a stun baton if you get too close wit playerTeam TEAM_PLAYER enemyTeam TEAM_ENEMY class CLASS_GRAN - snd battledroid - sndcombat battledroid - sndextra battledroid + snd battledroid_cw2 + sndcombat battledroid_cw2 + sndextra battledroid_cw2 yawspeed 90 - walkSpeed 55 - runSpeed 200 + walkSpeed 67 + runSpeed 187 dismemberProbHead 0 dismemberProbArms 10 dismemberProbLegs 1 @@ -1075,6 +1150,7 @@ B1_Frag //WIP: they blow themselves up { playerModel battledroid customSkin grenadier2 + MBClass 11 weapon WP_FRAG_NADE weapon WP_STUN_BATON MB_ATT_STUN_BATON 3 @@ -1090,12 +1166,12 @@ B1_Frag //WIP: they blow themselves up playerTeam TEAM_PLAYER enemyTeam TEAM_ENEMY class CLASS_GRAN - snd battledroid - sndcombat battledroid - sndextra battledroid + snd battledroid_cw2 + sndcombat battledroid_cw2 + sndextra battledroid_cw2 yawspeed 90 - walkSpeed 55 - runSpeed 200 + walkSpeed 67 + runSpeed 187 dismemberProbHead 0 dismemberProbArms 10 dismemberProbLegs 1 @@ -1106,7 +1182,8 @@ B1_Frag //WIP: they blow themselves up B1_Pulse //WIP: they blow themselves up { playerModel battledroid - customSkin grenadier2 + customSkin adv + MBClass 11 weapon WP_PULSE_NADE weapon WP_STUN_BATON MB_ATT_STUN_BATON 3 @@ -1122,12 +1199,12 @@ B1_Pulse //WIP: they blow themselves up playerTeam TEAM_PLAYER enemyTeam TEAM_ENEMY class CLASS_GRAN - snd battledroid - sndcombat battledroid - sndextra battledroid + snd BD_RC + sndcombat BD_RC + sndextra BD_RC yawspeed 90 - walkSpeed 55 - runSpeed 200 + walkSpeed 67 + runSpeed 187 dismemberProbHead 0 dismemberProbArms 10 dismemberProbLegs 1 @@ -1138,7 +1215,8 @@ B1_Pulse //WIP: they blow themselves up B1_Fire //WIP: they barely don't light themselves on fire { playerModel battledroid - customSkin grenadier2 + customSkin flame + MBClass 11 weapon WP_FIRE_NADE weapon WP_STUN_BATON MB_ATT_STUN_BATON 3 @@ -1154,11 +1232,11 @@ B1_Fire //WIP: they barely don't light themselves on fire playerTeam TEAM_PLAYER enemyTeam TEAM_ENEMY class CLASS_GRAN - snd battledroid + snd battledroid sndcombat battledroid sndextra battledroid yawspeed 90 - walkSpeed 55 + walkSpeed 67 runSpeed 200 dismemberProbHead 0 dismemberProbArms 10 @@ -1171,6 +1249,7 @@ B1_Sonic //WIP: they sonic themselves { playerModel battledroid customSkin grenadier2 + MBClass 11 weapon WP_SONIC_NADE weapon WP_STUN_BATON MB_ATT_STUN_BATON 3 @@ -1186,12 +1265,12 @@ B1_Sonic //WIP: they sonic themselves playerTeam TEAM_PLAYER enemyTeam TEAM_ENEMY class CLASS_GRAN - snd battledroid - sndcombat battledroid - sndextra battledroid + snd battledroid_cw2 + sndcombat battledroid_cw2 + sndextra battledroid_cw2 yawspeed 90 - walkSpeed 55 - runSpeed 200 + walkSpeed 67 + runSpeed 187 dismemberProbHead 0 dismemberProbArms 10 dismemberProbLegs 1 @@ -1203,6 +1282,7 @@ B1_Conc //WIP: they blow themselves up, barely { playerModel battledroid customSkin grenadier2 + MBClass 11 weapon WP_CONC_NADE weapon WP_STUN_BATON MB_ATT_STUN_BATON 3 @@ -1218,12 +1298,12 @@ B1_Conc //WIP: they blow themselves up, barely playerTeam TEAM_PLAYER enemyTeam TEAM_ENEMY class CLASS_GRAN - snd battledroid - sndcombat battledroid - sndextra battledroid + snd battledroid_cw2 + sndcombat battledroid_cw2 + sndextra battledroid_cw2 yawspeed 90 - walkSpeed 55 - runSpeed 200 + walkSpeed 67 + runSpeed 187 dismemberProbHead 0 dismemberProbArms 10 dismemberProbLegs 1 @@ -1234,7 +1314,8 @@ B1_Conc //WIP: they blow themselves up, barely B1_Cryo //WIP: they cryo themselves, however cryo doesn't work on npcs so this could be useful { playerModel battledroid - customSkin grenadier2 + customSkin firefighter + MBClass 11 weapon WP_CRYO_NADE weapon WP_STUN_BATON MB_ATT_STUN_BATON 3 @@ -1250,12 +1331,12 @@ B1_Cryo //WIP: they cryo themselves, however cryo doesn't work on npcs so this c playerTeam TEAM_PLAYER enemyTeam TEAM_ENEMY class CLASS_GRAN - snd battledroid - sndcombat battledroid - sndextra battledroid + snd battledroid_cw + sndcombat battledroid_cw + sndextra battledroid_cw yawspeed 90 - walkSpeed 55 - runSpeed 200 + walkSpeed 67 + runSpeed 187 dismemberProbHead 0 dismemberProbArms 10 dismemberProbLegs 1 @@ -1266,7 +1347,8 @@ B1_Cryo //WIP: they cryo themselves, however cryo doesn't work on npcs so this c B1_TD //WIP: they blow themselves up, funny though, might work as an erzatz suicide NPC in close quaters maps { playerModel battledroid - customSkin grenadier2 + customSkin adv + MBClass 11 weapon WP_REAL_TD weapon WP_STUN_BATON MB_ATT_STUN_BATON 3 @@ -1282,12 +1364,12 @@ B1_TD //WIP: they blow themselves up, funny though, might work as an erzatz suic playerTeam TEAM_PLAYER enemyTeam TEAM_ENEMY class CLASS_GRAN - snd battledroid - sndcombat battledroid - sndextra battledroid + snd BD_RC + sndcombat BD_RC + sndextra BD_RC yawspeed 90 - walkSpeed 55 - runSpeed 200 + walkSpeed 67 + runSpeed 187 dismemberProbHead 0 dismemberProbArms 10 dismemberProbLegs 1 @@ -1299,6 +1381,7 @@ B1_Flame //don't attack perfectly but it's good enough for variety { playerModel battledroid customSkin flame + MBClass 11 weapon WP_THROWER MB_ATT_THROWER_FLAME 1 health 50 @@ -1317,14 +1400,12 @@ B1_Flame //don't attack perfectly but it's good enough for variety class CLASS_STORMTROOPER height 64 crouchheight 38 - walkSpeed 51 - runSpeed 200 + walkSpeed 67 + runSpeed 187 snd battledroid sndcombat battledroid sndextra battledroid yawspeed 70 - walkSpeed 55 - runSpeed 200 dismemberProbHead 0 dismemberProbArms 10 dismemberProbLegs 0 @@ -1335,6 +1416,7 @@ B1_Plasma //don't attack perfectly but it's good enough for variety, plasma don' { playerModel battledroid customSkin flame + MBClass 11 weapon WP_THROWER MB_ATT_THROWER_PLASMA 1 health 50 @@ -1353,14 +1435,12 @@ B1_Plasma //don't attack perfectly but it's good enough for variety, plasma don' class CLASS_STORMTROOPER height 64 crouchheight 38 - walkSpeed 51 - runSpeed 200 + walkSpeed 67 + runSpeed 187 snd battledroid sndcombat battledroid sndextra battledroid yawspeed 70 - walkSpeed 55 - runSpeed 200 dismemberProbHead 0 dismemberProbArms 10 dismemberProbLegs 0 @@ -1370,7 +1450,8 @@ B1_Plasma //don't attack perfectly but it's good enough for variety, plasma don' B1_Ice //has a hard time hitting enough times to slow or freeze a player { playerModel battledroid - customSkin flame + customSkin firefighter + MBClass 11 weapon WP_THROWER MB_ATT_THROWER_ICE 1 health 50 @@ -1389,14 +1470,12 @@ B1_Ice //has a hard time hitting enough times to slow or freeze a player class CLASS_STORMTROOPER height 64 crouchheight 38 - walkSpeed 51 - runSpeed 200 - snd battledroid - sndcombat battledroid - sndextra battledroid + walkSpeed 67 + runSpeed 187 + snd battledroid_cw + sndcombat battledroid_cw + sndextra battledroid_cw yawspeed 70 - walkSpeed 55 - runSpeed 200 dismemberProbHead 0 dismemberProbArms 10 dismemberProbLegs 0 @@ -1406,7 +1485,8 @@ B1_Ice //has a hard time hitting enough times to slow or freeze a player B1_Lightning //don't attack perfectly but it's good enough for variety of attacks { playerModel battledroid - customSkin flame + customSkin adv + MBClass 11 weapon WP_THROWER MB_ATT_THROWER_LIGHTNING 1 health 50 @@ -1425,24 +1505,58 @@ B1_Lightning //don't attack perfectly but it's good enough for variety of attack class CLASS_STORMTROOPER height 64 crouchheight 38 - walkSpeed 51 - runSpeed 200 - snd battledroid - sndcombat battledroid - sndextra battledroid + walkSpeed 67 + runSpeed 187 + snd BD_RC + sndcombat BD_RC + sndextra BD_RC + yawspeed 70 + dismemberProbHead 0 + dismemberProbArms 10 + dismemberProbLegs 0 + dismemberProbHands 20 + dismemberProbWaist 0 +} +B1_Poison //don't attack perfectly but it's good enough for variety of attacks, effect is very ugly though +{ + playerModel battledroid + customSkin adv + MBClass 11 + weapon WP_THROWER + MB_ATT_THROWER_POISON 1 + health 50 + armor 15 + headPitchRangeDown 30 + reactions 3 + aim 1 + move 3 + aggression 3 + evasion 1 + intelligence 5 + rank crewman + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race klingon + class CLASS_STORMTROOPER + height 64 + crouchheight 38 + walkSpeed 67 + runSpeed 187 + snd BD_RC + sndcombat BD_RC + sndextra BD_RC yawspeed 70 - walkSpeed 55 - runSpeed 200 dismemberProbHead 0 dismemberProbArms 10 dismemberProbLegs 0 dismemberProbHands 20 dismemberProbWaist 0 } -B1_Sniper //stands in the back and shoots, not amazing but an ok way to vary up the projectile types +B1_Ruptor //stands in the back and shoots, not amazing but an ok way to vary up the projectile types { playerModel battledroid customSkin sniper + MBClass 11 weapon WP_DISRUPTOR MB_ATT_DISRUPTOR 2 altFire 1 @@ -1458,12 +1572,12 @@ B1_Sniper //stands in the back and shoots, not amazing but an ok way to vary up playerTeam TEAM_PLAYER enemyTeam TEAM_ENEMY class CLASS_STORMTROOPER - snd battledroid - sndcombat battledroid - sndextra battledroid + snd BD_EP3 + sndcombat BD_EP3 + sndextra BD_EP3 yawSpeed 140 - walkSpeed 55 - runSpeed 200 + walkSpeed 67 + runSpeed 187 health 50 armor 15 dismemberProbHead 0 @@ -1477,10 +1591,14 @@ B2 //WIP: needs work and variants { playerModel sbd //customSkin ep1 + MBClass 11 weapon WP_SBD MB_ATT_FIREPOWER 3 + MB_ATT_RECHARGE 3 + RESOURCE_BATTERY 1 + noLocationalDamage 1 health 250 - scale 120 + scale 110 headPitchRangeDown 30 reactions 3 aim 1 @@ -1495,8 +1613,8 @@ B2 //WIP: needs work and variants class CLASS_STORMTROOPER height 80 crouchheight 60 - walkSpeed 51 - runSpeed 200 + walkSpeed 100 + runSpeed 100 snd sbd sndcombat sbd sndextra sbd diff --git a/MBAssets3/ext_data/npcs/hordeClones.npc b/MBAssets3/ext_data/npcs/hordeClones.npc new file mode 100644 index 000000000..639970800 --- /dev/null +++ b/MBAssets3/ext_data/npcs/hordeClones.npc @@ -0,0 +1,618 @@ +//Clones for Order 66. Need to figure out models, skins, and snds. +//TO DO: Royal Guards, Senate Guards/Commandos, Ani/Vader, Palpy. +//Future Ideas: Jettroopers, SD-6 Droids, UC Police, Blaze Troopers? +CT_Baton //leaving this here for now but the AI type doesn't feel right for Clones +{ + playerModel clonetrooper_p2 + customSkin cody_rgb + weapon WP_THERMAL + weapon WP_STUN_BATON + MB_ATT_STUN_BATON 3 + reactions 3 + aim 1 + move 3 + aggression 3 + evasion 1 + intelligence 5 + rank crewman + health 50 + armor 15 + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY + class CLASS_GRAN + snd clone_ep3 + sndcombat clone_ep3 + sndextra clone_ep3 + yawspeed 90 + walkSpeed 55 + runSpeed 200 + dismemberProbHead 0 + dismemberProbArms 10 + dismemberProbLegs 1 + dismemberProbHands 20 + dismemberProbWaist 0 +} +CT_CR2 //another bloom weapon the works well in the AI's hands +{ + playerModel clonetrooper_p2 + customSkin airborne_rgb + weapon WP_CR2 + MB_ATT_CR2 3 + health 80 + armor 40 + headPitchRangeDown 30 + reactions 3 + aim 1 + move 3 + aggression 3 + evasion 1 + intelligence 5 + rank crewman + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race klingon + class CLASS_STORMTROOPER + height 64 + crouchheight 38 + walkSpeed 51 + runSpeed 200 + snd clone_ep3 + sndcombat clone_ep3 + sndextra clone_ep3 + yawspeed 70 + dismemberProbHead 0 + dismemberProbArms 10 + dismemberProbLegs 0 + dismemberProbHands 20 + dismemberProbWaist 0 +} +CT_Rocket //so jedi have something they can't block +{ + playerModel clonetrooper_p2 + customSkin 501 + weapon WP_ROCKET_LAUNCHER + MB_ATT_ROCKET_LAUNCHER 3 + health 80 + armor 40 + headPitchRangeDown 30 + reactions 3 + aim 1 + move 3 + aggression 3 + evasion 1 + intelligence 5 + rank crewman + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race klingon + class CLASS_STORMTROOPER + height 64 + crouchheight 38 + walkSpeed 51 + runSpeed 200 + snd clone_ep3 + sndcombat clone_ep3 + sndextra clone_ep3 + yawspeed 70 + dismemberProbHead 0 + dismemberProbArms 10 + dismemberProbLegs 0 + dismemberProbHands 20 + dismemberProbWaist 0 +} +CT_CR //not as fast as it should be but workable on the AI +{ + playerModel clonetrooper_p2 + customSkin 501 + weapon WP_CLONE_RIFLE + MB_ATT_CLONERIFLE 3 + health 80 + armor 40 + headPitchRangeDown 30 + reactions 3 + aim 1 + move 3 + aggression 3 + evasion 1 + intelligence 5 + rank crewman + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race klingon + class CLASS_STORMTROOPER + height 64 + crouchheight 38 + walkSpeed 51 + runSpeed 200 + snd clone_ep3 + sndcombat clone_ep3 + sndextra clone_ep3 + yawspeed 70 + dismemberProbHead 0 + dismemberProbArms 10 + dismemberProbLegs 0 + dismemberProbHands 20 + dismemberProbWaist 0 +} +CT_Carbine //AI is really good at using this, the aim slop makes it very effective +{ + playerModel clonetrooper_p2 + customSkin 501 + weapon WP_DC_CARBINE + MB_ATT_DC_CARBINE 3 + health 80 + armor 40 + headPitchRangeDown 30 + reactions 3 + aim 1 + move 3 + aggression 3 + evasion 1 + intelligence 5 + rank crewman + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race klingon + class CLASS_STORMTROOPER + height 64 + crouchheight 38 + walkSpeed 51 + runSpeed 200 + snd clone_ep3 + sndcombat clone_ep3 + sndextra clone_ep3 + yawspeed 70 + dismemberProbHead 0 + dismemberProbArms 10 + dismemberProbLegs 0 + dismemberProbHands 20 + dismemberProbWaist 0 +} + +CT_Flame //something jedi can't block, AI constantly taps it but it can eventually set a player on fire. AI starts firing from too far away though +{ + playerModel clonetrooper_p2 + customSkin 501 + weapon WP_THROWER + MB_ATT_THROWER_FLAME 1 + health 80 + armor 40 + headPitchRangeDown 30 + reactions 3 + aim 1 + move 3 + aggression 3 + evasion 1 + intelligence 5 + rank crewman + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race klingon + class CLASS_STORMTROOPER + height 64 + crouchheight 38 + walkSpeed 51 + runSpeed 200 + snd clone_ep3 + sndcombat clone_ep3 + sndextra clone_ep3 + yawspeed 70 + walkSpeed 55 + runSpeed 200 + dismemberProbHead 0 + dismemberProbArms 10 + dismemberProbLegs 0 + dismemberProbHands 20 + dismemberProbWaist 0 +} + +CT_Plasma //something jedi can't block x2, doesn't look good though +{ + playerModel clonetrooper_p2 + customSkin 501 + weapon WP_THROWER + MB_ATT_THROWER_PLASMA 1 + health 80 + armor 40 + headPitchRangeDown 30 + reactions 3 + aim 1 + move 3 + aggression 3 + evasion 1 + intelligence 5 + rank crewman + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race klingon + class CLASS_STORMTROOPER + height 64 + crouchheight 38 + walkSpeed 51 + runSpeed 200 + snd clone_ep3 + sndcombat clone_ep3 + sndextra clone_ep3 + yawspeed 70 + walkSpeed 55 + runSpeed 200 + dismemberProbHead 0 + dismemberProbArms 10 + dismemberProbLegs 0 + dismemberProbHands 20 + dismemberProbWaist 0 +} + +CT_Ice //something jedi can't block x3, AI has a hard time landing enough of this to freeze a player though +{ + playerModel clonetrooper_p2 + customSkin 501 + weapon WP_THROWER + MB_ATT_THROWER_ICE 1 + health 80 + armor 40 + headPitchRangeDown 30 + reactions 3 + aim 1 + move 3 + aggression 3 + evasion 1 + intelligence 5 + rank crewman + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race klingon + class CLASS_STORMTROOPER + height 64 + crouchheight 38 + walkSpeed 51 + runSpeed 200 + snd clone_ep3 + sndcombat clone_ep3 + sndextra clone_ep3 + yawspeed 70 + walkSpeed 55 + runSpeed 200 + dismemberProbHead 0 + dismemberProbArms 10 + dismemberProbLegs 0 + dismemberProbHands 20 + dismemberProbWaist 0 +} + +CT_Lightning //another good projectile mixup +{ + playerModel clonetrooper_p2 + customSkin 501 + weapon WP_THROWER + MB_ATT_THROWER_LIGHTNING 3 + health 80 + armor 40 + headPitchRangeDown 30 + reactions 3 + aim 1 + move 3 + aggression 3 + evasion 1 + intelligence 5 + rank crewman + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race klingon + class CLASS_STORMTROOPER + height 64 + crouchheight 38 + walkSpeed 51 + runSpeed 200 + snd clone_ep3 + sndcombat clone_ep3 + sndextra clone_ep3 + yawspeed 70 + walkSpeed 55 + runSpeed 200 + dismemberProbHead 0 + dismemberProbArms 10 + dismemberProbLegs 0 + dismemberProbHands 20 + dismemberProbWaist 0 +} + +CT_CPistol //WIP: the attribute for clone/mando pistols that can be dual weilded crash, commenting out for now +{ + playerModel clonetrooper_p2 + customSkin 501 + weapon WP_CLONE_PISTOL + //MB_ATT_CLONE_PISTOL 2 + health 80 + armor 40 + headPitchRangeDown 30 + reactions 3 + aim 1 + move 3 + aggression 3 + evasion 1 + intelligence 5 + rank crewman + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race klingon + class CLASS_STORMTROOPER + height 64 + crouchheight 38 + walkSpeed 51 + runSpeed 200 + snd clone_ep3 + sndcombat clone_ep3 + sndextra clone_ep3 + yawspeed 70 + walkSpeed 55 + runSpeed 200 + dismemberProbHead 0 + dismemberProbArms 10 + dismemberProbLegs 0 + dismemberProbHands 20 + dismemberProbWaist 0 +} + +CT_M5 //animation looks derpy on AI +{ + playerModel clonetrooper_p2 + customSkin 501 + weapon WP_M5 + MB_ATT_WESTARM5 2 + health 80 + armor 40 + headPitchRangeDown 30 + reactions 3 + aim 1 + move 3 + aggression 3 + evasion 1 + intelligence 5 + rank crewman + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race klingon + class CLASS_STORMTROOPER + height 64 + crouchheight 38 + walkSpeed 51 + runSpeed 200 + snd clone_ep3 + sndcombat clone_ep3 + sndextra clone_ep3 + yawspeed 70 + walkSpeed 55 + runSpeed 200 + dismemberProbHead 0 + dismemberProbArms 10 + dismemberProbLegs 0 + dismemberProbHands 20 + dismemberProbWaist 0 +} + +CT_Minigun //WIP: will never hold fire down long enough to shoot +{ + playerModel clonetrooper_p2 + customSkin 501 + weapon WP_MINIGUN + MB_ATT_MINIGUN 3 + health 80 + armor 40 + headPitchRangeDown 30 + reactions 3 + aim 1 + move 3 + aggression 3 + evasion 1 + intelligence 5 + rank crewman + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race klingon + class CLASS_STORMTROOPER + height 64 + crouchheight 38 + walkSpeed 51 + runSpeed 200 + snd clone_ep3 + sndcombat clone_ep3 + sndextra clone_ep3 + yawspeed 70 + walkSpeed 55 + runSpeed 200 + dismemberProbHead 0 + dismemberProbArms 10 + dismemberProbLegs 0 + dismemberProbHands 20 + dismemberProbWaist 0 +} + +CT_Proj //WIP: can't scope in so useless +{ + playerModel clonetrooper_p2 + customSkin 501 + weapon WP_PROJ + MB_ATT_PROJECTILE_RIFLE 1 + altFire 1 + health 80 + armor 40 + headPitchRangeDown 30 + reactions 3 + aim 1 + move 3 + aggression 3 + evasion 1 + intelligence 5 + rank crewman + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race klingon + class CLASS_STORMTROOPER + height 64 + crouchheight 38 + walkSpeed 51 + runSpeed 200 + snd clone_ep3 + sndcombat clone_ep3 + sndextra clone_ep3 + yawspeed 70 + walkSpeed 55 + runSpeed 200 + dismemberProbHead 0 + dismemberProbArms 10 + dismemberProbLegs 0 + dismemberProbHands 20 + dismemberProbWaist 0 +} + +CT_PLX1 //WIP: can't reload it so useless +{ + playerModel clonetrooper_p2 + customSkin 501 + weapon WP_PLX1 + MB_ATT_PLX1 1 + altFire 1 + health 80 + armor 40 + headPitchRangeDown 30 + reactions 3 + aim 1 + move 3 + aggression 3 + evasion 1 + intelligence 5 + rank crewman + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race klingon + class CLASS_STORMTROOPER + height 64 + crouchheight 38 + walkSpeed 51 + runSpeed 200 + snd clone_ep3 + sndcombat clone_ep3 + sndextra clone_ep3 + yawspeed 70 + walkSpeed 55 + runSpeed 200 + dismemberProbHead 0 + dismemberProbArms 10 + dismemberProbLegs 0 + dismemberProbHands 20 + dismemberProbWaist 0 +} + +CT_Assassin //like hows this works, the small jumps work well for his animations +{ + playerModel clonetrooper_p2 + customSkin assassin + weapon WP_SABER + MB_ATT_FP_SABER_DEFENSE 2 + PBchance 20 + MBchance 2 + SBchance 45 + saber arc_shiv + saber2 arc_shiv_dual + saberStyle 6 + rank lt + reactions 5 + aim 5 + move 5 + aggression 5 + evasion 5 + intelligence 5 + hfov 160 + vfov 160 + scale 96 + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race human + class CLASS_SHADOWTROOPER + snd clone_ep3 + sndcombat clone_ep3 + sndjedi clone_ep3 + yawSpeed 140 + walkSpeed 55 + runSpeed 200 + health 80 + armor 80 + dismemberProbHead 0 + dismemberProbArms 20 + dismemberProbLegs 0 + dismemberProbHands 30 + dismemberProbWaist 0 +} + +Wook_Bowcaster //WIP: shoots slow, even at at high weapon level, need to be resized +{ + playerModel chewbacca + customSkin default + weapon WP_BOWCASTER + MB_ATT_BOWCASTER 3 + MB_ATT_WOOKIE_STRENGTH 3 + scale 117 + health 450 + headPitchRangeDown 30 + reactions 3 + aim 1 + move 3 + aggression 3 + evasion 1 + intelligence 5 + rank crewman + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race klingon + class CLASS_STORMTROOPER + height 70 + crouchheight 56 + walkSpeed 51 + runSpeed 200 + snd chewbacca + sndcombat chewbacca + sndextra chewbacca + yawspeed 70 + dismemberProbHead 0 + dismemberProbArms 10 + dismemberProbLegs 0 + dismemberProbHands 20 + dismemberProbWaist 0 +} + +Wook_Trad // +{ + playerModel chewbacca + customSkin default + weapon WP_TRAD_BOWCASTER + MB_ATT_TRAD_BOWCASTER 3 + MB_ATT_WOOKIE_STRENGTH 3 + scale 117 + health 450 + headPitchRangeDown 30 + reactions 3 + aim 1 + move 3 + aggression 3 + evasion 1 + intelligence 5 + rank crewman + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race klingon + class CLASS_STORMTROOPER + height 70 + crouchheight 56 + walkSpeed 51 + runSpeed 200 + snd chewbacca + sndcombat chewbacca + sndextra chewbacca + yawspeed 70 + dismemberProbHead 0 + dismemberProbArms 10 + dismemberProbLegs 0 + dismemberProbHands 20 + dismemberProbWaist 0 +} \ No newline at end of file diff --git a/MBAssets3/ext_data/npcs/hordeKotor.npc b/MBAssets3/ext_data/npcs/hordeKotor.npc index baee25309..aa0a668c7 100644 --- a/MBAssets3/ext_data/npcs/hordeKotor.npc +++ b/MBAssets3/ext_data/npcs/hordeKotor.npc @@ -2,15 +2,16 @@ //To Do: Sith Apprentice, Revan, Malak, Brandon, Sion, Nilus, Traya, etc for Kotor era //Future Ideas: Kotor era: Probe Droid, Mark I/II/III, Floating Mine, Mining Droids, Monsters, Trayas Gunner, Thugs/BHs/Mercs -//Sith +//Kotor Sith Dark_Jedi { playerModel reborn customSkin darkjedi + MBClass 5 saber kotorsab saberColor red weapon WP_SABER - MB_ATT_FORCEBLOCK 1 + MB_ATT_FORCEBLOCK 2 MB_ATT_FP_SABER_DEFENSE 2 MB_ATT_GUN_DEFENSE 3 MB_ATT_DEFLECT 2 @@ -52,11 +53,12 @@ Sith_Lord { playerModel sith_assassin customSkin master + MBClass 5 saber kotorsab saberColor purple weapon WP_SABER MB_ATT_FORCEBLOCK 3 - MB_ATT_FP_SABER_DEFENSE 1 + MB_ATT_FP_SABER_DEFENSE 3 MB_ATT_GUN_DEFENSE 2 MB_ATT_DEFLECT 2 RESOURCE_FORCE 1 @@ -99,6 +101,7 @@ Sith_Marauder { playerModel sith_officer customSkin sith2 + MBClass 5 saber kotorsab saberColor red saber2 kotorsab @@ -148,6 +151,7 @@ Trayas_Assassin { playerModel sith_assassin weapon WP_SABER + MBClass 5 saber qstaff MB_ATT_FP_SABER_DEFENSE 2 RESOURCE_FORCE 1 @@ -704,7 +708,7 @@ ST_Baton playerTeam TEAM_PLAYER enemyTeam TEAM_ENEMY class CLASS_GRAN - snd exile_sith + snd exile_sith sndcombat exile_sith sndextra exile_sith yawspeed 90 @@ -722,6 +726,7 @@ HK_Pistol { playerModel hk47 customSkin hk50 + MBClass 11 weapon WP_HEAVY_PISTOL MB_ATT_HEAVY_PISTOL 3 health 100 @@ -759,6 +764,7 @@ HK_Plasma { playerModel hk47 customSkin hk50 + MBClass 11 weapon WP_THROWER MB_ATT_THROWER_PLASMA 1 health 100 @@ -796,6 +802,7 @@ HK_Shotgun { playerModel hk47 customSkin hk50 + MBClass 11 weapon WP_SHOTGUN MB_ATT_SHOTGUN 2 health 100 @@ -832,9 +839,11 @@ T3_Ice { playerModel t3m4 //customSkin blue + MBClass 11 scale 72 weapon WP_THROWER MB_ATT_THROWER_ICE 1 + MB_ATT_WOOKIE_STRENGTH 2 health 80 headPitchRangeDown 30 reactions 3 @@ -869,8 +878,10 @@ T3_Lightning { playerModel t3m4 //customSkin blue + MBClass 11 weapon WP_THROWER MB_ATT_THROWER_LIGHTNING 1 + MB_ATT_WOOKIE_STRENGTH 2 health 80 scale 72 headPitchRangeDown 30 @@ -906,7 +917,8 @@ Wardroid_Repeater { playerModel wardroid //customSkin hk50 - scale 120 + MBClass 11 + //scale 120 weapon WP_DLT19 MB_ATT_DLT19 3 health 80 @@ -944,8 +956,10 @@ Wardroid_Repeater MarkIV { playermodel m4droid + MBClass 11 weapon WP_E_22 MB_ATT_E_22 3 + RESOURCE_DEKASHIELD 1 headYawRangeLeft 180 headYawRangeRight 180 headPitchRangeUp 0 @@ -972,5 +986,5 @@ MarkIV hFOV 120 vfov 45 scale 160 - snd r2d2 + snd r2d2 } diff --git a/MBAssets3/ext_data/npcs/hordeSaber.npc b/MBAssets3/ext_data/npcs/hordeSaber.npc index 538ba305b..ea767f6e4 100644 --- a/MBAssets3/ext_data/npcs/hordeSaber.npc +++ b/MBAssets3/ext_data/npcs/hordeSaber.npc @@ -9,8 +9,6 @@ // Saber has 3 for all base stats, pbchance 30, mbchance 3, and sbchance 50, Saber Defense 3, 100 fp, and Jump 3. // Master has 5 for all base stats, pbchance 40, mbchance 4, and sbchance 70, Saber Defense 3, 200 fp, and Jump 3. -// Saber and Master also have Deflect 3, Gun Defense 3, Saber Throw 3, Force Block 3, and each have another random level 3 force power. - Sword1 { playerModel sithtrooper @@ -275,6 +273,7 @@ Saber1 //saberstyle 1 blue { playerModel cultist customSkin blue + MBClass 5 saber saber_reborn_mp saberColor blue weapon WP_SABER @@ -286,9 +285,7 @@ Saber1 //saberstyle 1 blue Pbchance 30 MBchance 3 SBchance 50 - FP_SABERTHROW 3 FP_LEVITATION 3 - FP_PUSH 3 //rank captain forcePowerMax 100 reactions 3 @@ -320,6 +317,7 @@ Saber2 //saberstyle 2 yellow { playerModel cultist customSkin brown + MBClass 5 saber saber_reborn_mp saberColor yellow weapon WP_SABER @@ -333,9 +331,6 @@ Saber2 //saberstyle 2 yellow SBchance 50 saberStyle 2 FP_LEVITATION 3 - FP_SABERTHROW 3 - FP_PROTECT 3 - FP_ABSORB 3 //rank captain forcePowerMax 100 reactions 3 @@ -367,6 +362,7 @@ Saber3 //saberstyle 3 red { playerModel cultist customSkin red + MBClass 5 saber saber_reborn_mp saberColor red weapon WP_SABER @@ -378,11 +374,8 @@ Saber3 //saberstyle 3 red Pbchance 30 MBchance 3 SBchance 50 - FP_SABERTHROW 3 saberStyle 3 FP_LEVITATION 3 - FP_SABERTHROW 3 - FP_PULL 3 //rank captain forcePowerMax 100 reactions 3 @@ -414,6 +407,7 @@ Saber4 //saberstyle 4 purple { playerModel reborn_new customSkin red + MBClass 5 saber saber_reborn_mp saberColor purple weapon WP_SABER @@ -427,8 +421,6 @@ Saber4 //saberstyle 4 purple SBchance 50 saberStyle 4 FP_LEVITATION 3 - FP_SABERTHROW 3 - FP_LIGHTNING 3 //rank captain forcePowerMax 100 reactions 3 @@ -460,6 +452,7 @@ Saber5 //saberstyle 5 cyan { playerModel reborn_new customSkin blue + MBClass 5 saber saber_reborn_mp saberColor orange weapon WP_SABER @@ -473,8 +466,6 @@ Saber5 //saberstyle 5 cyan SBchance 50 saberStyle 5 FP_LEVITATION 3 - FP_SABERTHROW 3 - FP_GRIP 3 //rank captain forcePowerMax 100 reactions 3 @@ -506,6 +497,7 @@ Saber6 //saberstyle 6 green/duals { playerModel cultist //customSkin green + MBClass 5 saber saber_reborn_mp saberColor green saber2 saber_reborn_mp @@ -521,8 +513,6 @@ Saber6 //saberstyle 6 green/duals SBchance 50 saberStyle 6 FP_LEVITATION 3 - FP_SABERTHROW 3 - FP_SPEED 3 //rank captain forcePowerMax 100 reactions 3 @@ -554,6 +544,7 @@ Saber7 //saberstyle 7 staff/white { playerModel reborn_concept customSkin force + MBClass 5 saber dual_1 saberColor silver weapon WP_SABER @@ -567,8 +558,6 @@ Saber7 //saberstyle 7 staff/white SBchance 50 saberStyle 7 FP_LEVITATION 3 - FP_SABERTHROW 3 - FP_HEAL 3 //rank captain forcePowerMax 100 reactions 3 @@ -600,6 +589,7 @@ Master1 //saberstyle 1 blue Obi { playerModel obiwan_ep3 //customSkin robe + MBClass 5 saber saber_obi_wan_legends3 saberColor blue weapon WP_SABER @@ -611,9 +601,7 @@ Master1 //saberstyle 1 blue Obi Pbchance 40 MBchance 4 SBchance 70 - FP_SABERTHROW 3 FP_LEVITATION 3 - FP_PUSH 3 //rank captain forcePowerMax 200 reactions 5 @@ -645,6 +633,7 @@ Master2 //saberstyle 2 yellow Luke { playerModel Luke_ROTJ //customSkin force + MBClass 5 saber saber_luke2 saberColor green weapon WP_SABER @@ -658,9 +647,6 @@ Master2 //saberstyle 2 yellow Luke SBchance 70 saberStyle 2 FP_LEVITATION 3 - FP_SABERTHROW 3 - FP_PROTECT 3 - FP_ABSORB 3 //rank captain forcePowerMax 200 reactions 5 @@ -692,6 +678,7 @@ Master3 //saberstyle 3 red Vader { playerModel DarthVader //customSkin force + MBClass 5 saber saber_vader saberColor red weapon WP_SABER @@ -705,8 +692,6 @@ Master3 //saberstyle 3 red Vader SBchance 70 saberStyle 3 FP_LEVITATION 3 - FP_SABERTHROW 3 - FP_GRIP 3 //rank captain forcePowerMax 200 reactions 5 @@ -738,6 +723,7 @@ Master4 //saberstyle 4 purple Mace { playerModel macewindu //customSkin force + MBClass 5 saber saber_mace saberColor purple weapon WP_SABER @@ -751,8 +737,6 @@ Master4 //saberstyle 4 purple Mace SBchance 70 saberStyle 4 FP_LEVITATION 3 - FP_SABERTHROW 3 - FP_PULL 3 //rank captain forcePowerMax 200 reactions 5 @@ -784,6 +768,7 @@ Master5 //saberstyle 5 cyan Dooku { playerModel dooku //customSkin force + MBClass 5 saber saber_dooku saberColor red weapon WP_SABER @@ -797,8 +782,6 @@ Master5 //saberstyle 5 cyan Dooku SBchance 70 saberStyle 5 FP_LEVITATION 3 - FP_SABERTHROW 3 - FP_LIGHTNING 3 //rank captain forcePowerMax 200 reactions 5 @@ -830,6 +813,7 @@ Master6 //saberstyle 6 green/duals Ventress { playerModel assajv //customSkin force + MBClass 5 saber saber_asajj2 saberColor red saber2 saber_asajj2 @@ -845,8 +829,6 @@ Master6 //saberstyle 6 green/duals Ventress SBchance 70 saberStyle 6 FP_LEVITATION 3 - FP_SABERTHROW 3 - FP_SPEED 3 //rank captain forcePowerMax 200 reactions 5 @@ -878,6 +860,7 @@ Master7 //saberstyle 7 staff/white Maul { playerModel darthmaul //customSkin force + MBClass 5 saber saber_maul saberColor red weapon WP_SABER @@ -891,8 +874,6 @@ Master7 //saberstyle 7 staff/white Maul SBchance 70 saberStyle 7 FP_LEVITATION 3 - FP_SABERTHROW 3 - FP_HEAL 3 //rank captain forcePowerMax 200 reactions 5 diff --git a/MBAssets3/ext_data/npcs/hordeThug.npc b/MBAssets3/ext_data/npcs/hordeThug.npc new file mode 100644 index 000000000..de3c159e4 --- /dev/null +++ b/MBAssets3/ext_data/npcs/hordeThug.npc @@ -0,0 +1,278 @@ +//Criminal Thugs, note use the existing base NPCs to fill out this rooster (rodian, gran, trandoshan, weequay, human_merc, etc) along with base droids. +//TO DO: +//Future Ideas: Mando mercs, IG-88, and other named BH's + +gamorrean_ax +{ + playerModel gamorrean + //customSkin default + saber exec_axe + weapon WP_SABER + MB_ATT_FP_SABER_DEFENSE 1 + saberStyle 3 + PBchance 10 + MBchance 1 + SBchance 30 + reactions 1 + aim 1 + move 1 + aggression 1 + evasion 1 + intelligence 1 + hfov 120 + vfov 120 + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY + class CLASS_REBORN + snd gamorrean + sndcombat gamorrean + sndjedi gamorrean + yawSpeed 60 + walkSpeed 45 + runSpeed 180 + health 100 + dismemberProbHead 0 + dismemberProbArms 20 + dismemberProbLegs 0 + dismemberProbHands 30 + dismemberProbWaist 0 +} + +weequay_pike +{ + playerModel weequay + customSkin default + saber vibroaxe + weapon WP_SABER + saberStyle 4 + MB_ATT_FP_SABER_DEFENSE 1 + PBchance 10 + MBchance 1 + SBchance 30 + reactions 1 + aim 1 + move 1 + aggression 1 + evasion 1 + intelligence 1 + hfov 120 + vfov 120 + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY + class CLASS_REBORN + snd weequay + sndcombat weequay + sndjedi weequay + yawSpeed 60 + walkSpeed 45 + runSpeed 180 + health 50 + armor 15 + dismemberProbHead 0 + dismemberProbArms 20 + dismemberProbLegs 0 + dismemberProbHands 30 + dismemberProbWaist 0 +} + +chiss_shotgun +{ + playerModel chiss + //customSkin captain + weapon WP_SHOTGUN + MB_ATT_SHOTGUN 1 + //altFire 1 + MB_ATT_GETUPS 0 + health 50 + armor 15 + headPitchRangeDown 30 + reactions 3 + aim 1 + move 3 + aggression 3 + evasion 1 + intelligence 5 + rank crewman + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race klingon + class CLASS_STORMTROOPER + height 64 + crouchheight 38 + walkSpeed 51 + runSpeed 200 + snd bartender + sndcombat bartender + sndextra bartender + yawspeed 70 + dismemberProbHead 0 + dismemberProbArms 10 + dismemberProbLegs 0 + dismemberProbHands 20 + dismemberProbWaist 0 +} + +abyssin_pistol +{ + playerModel weequay + customSkin abyssin + weapon WP_BLASTER_PISTOL + MB_ATT_PISTOL 1 + //altFire 1 + MB_ATT_GETUPS 1 + health 50 + armor 15 + headPitchRangeDown 30 + reactions 3 + aim 1 + move 3 + aggression 3 + evasion 1 + intelligence 5 + rank crewman + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race klingon + class CLASS_STORMTROOPER + height 64 + crouchheight 38 + walkSpeed 51 + runSpeed 200 + snd abyssin + sndcombat abyssin + sndextra abyssin + yawspeed 70 + dismemberProbHead 0 + dismemberProbArms 10 + dismemberProbLegs 0 + dismemberProbHands 20 + dismemberProbWaist 0 +} + +nikto_pistol +{ + playerModel weequay + customSkin nikto + weapon WP_BLASTER_PISTOL + MB_ATT_PISTOL 1 + //altFire 1 + MB_ATT_GETUPS 2 + health 50 + armor 15 + headPitchRangeDown 30 + reactions 3 + aim 1 + move 3 + aggression 3 + evasion 1 + intelligence 5 + rank crewman + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race klingon + class CLASS_STORMTROOPER + height 64 + crouchheight 38 + walkSpeed 51 + runSpeed 200 + snd nikto + sndcombat nikto + sndextra nikto + yawspeed 70 + dismemberProbHead 0 + dismemberProbArms 10 + dismemberProbLegs 0 + dismemberProbHands 20 + dismemberProbWaist 0 +} + +pyke2_pistol +{ + playerModel pyke2 + //customSkin default + weapon WP_BLASTER_PISTOL + MB_ATT_PISTOL 1 + //altFire 1 + MB_ATT_GETUPS 4 + health 50 + armor 15 + headPitchRangeDown 30 + reactions 3 + aim 1 + move 3 + aggression 3 + evasion 1 + intelligence 5 + rank crewman + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race klingon + class CLASS_STORMTROOPER + height 64 + crouchheight 38 + walkSpeed 51 + runSpeed 200 + snd pyke2 + sndcombat pyke2 + sndextra pyke2 + yawspeed 70 + dismemberProbHead 0 + dismemberProbArms 10 + dismemberProbLegs 0 + dismemberProbHands 20 + dismemberProbWaist 0 +} + +jawa_demp2 +{ + playerModel jawa + weapon WP_DEMP2 + scale 75 + health 30 + snd jawa + reactions 3 + aim 1 + move 3 + aggression 3 + evasion 1 + intelligence 5 + rank crewman + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY + class CLASS_STORMTROOPER + yawspeed 90 + walkSpeed 55 + runSpeed 100 + dismemberProbHead 0 + dismemberProbArms 10 + dismemberProbLegs 1 + dismemberProbHands 20 + dismemberProbWaist 0 +} + +rat +{ + playerModel salaciouscrumb + weapon WP_MELEE + scale 63 + health 30 + snd salaciouscrumb + reactions 3 + aim 1 + move 3 + aggression 3 + evasion 1 + intelligence 5 + rank crewman + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY + class CLASS_STORMTROOPER + yawspeed 90 + walkSpeed 55 + runSpeed 195 + dismemberProbHead 0 + dismemberProbArms 10 + dismemberProbLegs 1 + dismemberProbHands 20 + dismemberProbWaist 0 +} \ No newline at end of file diff --git a/MBAssets3/ext_data/npcs/howler.npc b/MBAssets3/ext_data/npcs/howler.npc index e5382c6de..bef694f0d 100644 --- a/MBAssets3/ext_data/npcs/howler.npc +++ b/MBAssets3/ext_data/npcs/howler.npc @@ -1,4 +1,4 @@ -//NNN: The lizards in the early Yavin levels of JKA, currently just tries to bit their enemies +//NNN: The lizards in the yavin1b and yavin2, currently just tries to bit their enemies Howler { playerModel howler diff --git a/MBAssets3/ext_data/npcs/human_merc.npc b/MBAssets3/ext_data/npcs/human_merc.npc index 705422d44..7fca50e50 100644 --- a/MBAssets3/ext_data/npcs/human_merc.npc +++ b/MBAssets3/ext_data/npcs/human_merc.npc @@ -1,4 +1,4 @@ -//NNN: JKA mercs used to add variance to the pool of thug npcs, eventually the completely replace the lower tier aliens at later levels of JKA +//NNN: JKA mercs used to add variance to the pool of thug npcs, eventually they completely replace the lower tier aliens by the later levels of JKA human_merc { playerModel human_merc diff --git a/MBAssets3/ext_data/npcs/impcom.npc b/MBAssets3/ext_data/npcs/impcom.npc index d328c9cbd..67c695392 100644 --- a/MBAssets3/ext_data/npcs/impcom.npc +++ b/MBAssets3/ext_data/npcs/impcom.npc @@ -4,6 +4,7 @@ impcom fullname "Imperial Commander" playerModel imperial customSkin commander + MB_ATT_ENV_PROT 3 health 1500 reactions 4 aim 5 @@ -13,9 +14,9 @@ impcom intelligence 5 playerTeam TEAM_PLAYER class CLASS_FAST_VIP - yawSpeed 20//50 + yawSpeed 50 walkSpeed 85//65 - runSpeed 110 + runSpeed 143//110 snd io3 forceImmunity 1 } \ No newline at end of file diff --git a/MBAssets3/ext_data/npcs/impworker.npc b/MBAssets3/ext_data/npcs/impworker.npc index 46241d2e6..f49c718c4 100644 --- a/MBAssets3/ext_data/npcs/impworker.npc +++ b/MBAssets3/ext_data/npcs/impworker.npc @@ -1,4 +1,4 @@ -//NNN: JKA/JKO imp civilians, they have very poor AI, in mb2, 1/3 of them spawn with a demp2 and the rest with pistol 1's +//NNN: JKA/JKO imp civilians, they have very poor AI by design ImpWorker { playerModel imperial_worker @@ -70,8 +70,7 @@ ImpWorker2 ImpWorker3 { playerModel imperial_worker - weapon WP_DEMP2 - MB_ATT_DEMP2 3 + weapon WP_BLASTER_PISTOL headPitchRangeDown 30 health 50 reactions 3 diff --git a/MBAssets3/ext_data/npcs/interrogator.npc b/MBAssets3/ext_data/npcs/interrogator.npc index de2287d46..48d59205b 100644 --- a/MBAssets3/ext_data/npcs/interrogator.npc +++ b/MBAssets3/ext_data/npcs/interrogator.npc @@ -2,6 +2,7 @@ interrogator { playermodel interrogator + MBClass 11 weapon WP_NONE health 200 reactions 3 diff --git a/MBAssets3/ext_data/npcs/jan.npc b/MBAssets3/ext_data/npcs/jan.npc index 3cf335004..7625aa9e2 100644 --- a/MBAssets3/ext_data/npcs/jan.npc +++ b/MBAssets3/ext_data/npcs/jan.npc @@ -1,4 +1,4 @@ -//NNN: JKO jan, used in cutscenes and as an ally in the first few levels +//NNN: JKO Jan, used in cutscenes and as an ally in kejim_post Jan { playerModel jan diff --git a/MBAssets3/ext_data/npcs/jawa.npc b/MBAssets3/ext_data/npcs/jawa.npc index 62a696137..03b8ed865 100644 --- a/MBAssets3/ext_data/npcs/jawa.npc +++ b/MBAssets3/ext_data/npcs/jawa.npc @@ -26,30 +26,3 @@ jawa dismemberProbHands 20 dismemberProbWaist 0 } - -jawa_armed -{ - playerModel jawa - weapon WP_DEMP2 - scale 75 - health 30 - snd jawa - reactions 3 - aim 1 - move 3 - aggression 3 - evasion 1 - intelligence 5 - rank crewman - playerTeam TEAM_NEUTRAL - enemyTeam TEAM_FREE - class CLASS_JAWA - yawspeed 90 - walkSpeed 55 - runSpeed 100 - dismemberProbHead 0 - dismemberProbArms 10 - dismemberProbLegs 1 - dismemberProbHands 20 - dismemberProbWaist 0 -} diff --git a/MBAssets3/ext_data/npcs/jedi.npc b/MBAssets3/ext_data/npcs/jedi.npc index 64f964e95..978812836 100644 --- a/MBAssets3/ext_data/npcs/jedi.npc +++ b/MBAssets3/ext_data/npcs/jedi.npc @@ -1,6 +1,7 @@ -//NNN: Jedi allies in JKO/JKA, have slight randomization between default/2/F -//NNN: In JKA they has full randomization that used the SP main character creator but that isn't setup in MP -Jedi +//NNN: Jedi allies in JKO/JKA +//NNN: In JKA they has full randomization that used the SP main character creator but that isn't setup in MP, currently setup to mimic that randoization for Jedi0-Jedi12 + +Jedi //NNN: JKO JEDI { playerModel jedi saber single_2 @@ -58,11 +59,73 @@ Jedi dismemberProbWaist 0 } -Jedi2 +Jedi0 { - playerModel jedi + playerModel jedi_hm //jedi + customSkin legends1 + customRGBA random1 + MBClass 6 + saber single_2 + saberColor random + weapon WP_SABER + MB_ATT_FORCEBLOCK 2 + MB_ATT_FP_SABER_DEFENSE 2 + MB_ATT_GUN_DEFENSE 2 + MB_ATT_DEFLECT 2 + RESOURCE_FORCE 1 + forcePowerMax 100 + Pbchance 30 + Pbchance 3 + SBchance 50 + //saberStyle 1 + //saberStyle 3 + saberStyle 2 + FP_HEAL 1 + FP_LEVITATION 2 + FP_SPEED 2 + FP_PUSH 2 + FP_PULL 1 + FP_TELEPATHY 1 + FP_GRIP 0 + FP_LIGHTNING 0 + FP_RAGE 0 + FP_PROTECT 1 + FP_ABSORB 1 + FP_DRAIN 0 + FP_SEE 1 + FP_SABERTHROW 2 + rank lt + reactions 3 + aim 3 + move 3 + aggression 3 + evasion 2 + intelligence 3 + playerTeam TEAM_ENEMY + enemyTeam TEAM_PLAYER + class CLASS_JEDI + yawSpeed 140 + walkSpeed 55 + runSpeed 200 + snd jedi1 + sndcombat jedi1 + sndjedi jedi1 + health 200 + dismemberProbHead 0 + dismemberProbArms 5 + dismemberProbLegs 0 + dismemberProbHands 10 + dismemberProbWaist 0 +} + +Jedi1 +{ + playerModel jedi_hm //jedi + customSkin legends2 + customRGBA random1 + MBClass 6 saber single_7 - saberColor orange + saberColor random weapon WP_SABER MB_ATT_FORCEBLOCK 2 MB_ATT_FP_SABER_DEFENSE 2 @@ -73,9 +136,9 @@ Jedi2 Pbchance 30 Pbchance 3 SBchance 50 - saberStyle 1 + //saberStyle 1 saberStyle 2 - saberStyle 3 + //saberStyle 3 FP_HEAL 1 FP_LEVITATION 2 FP_SPEED 2 @@ -90,10 +153,7 @@ Jedi2 FP_DRAIN 0 FP_SEE 1 FP_SABERTHROW 2 - forceRegenRate 200 - forcePowerMax 75 rank lt - customSkin j2 reactions 3 aim 3 move 3 @@ -117,11 +177,244 @@ Jedi2 dismemberProbWaist 0 } -JediF +Jedi2 +{ + playerModel jedi_zf + customSkin legends1 + customRGBA random1 + MBClass 6 + saber single_1 + saber2 single_1 + saberColor random + saber2Color random + weapon WP_SABER + MB_ATT_FORCEBLOCK 2 + MB_ATT_FP_SABER_DEFENSE 2 + MB_ATT_GUN_DEFENSE 2 + MB_ATT_DEFLECT 2 + RESOURCE_FORCE 1 + forcePowerMax 100 + Pbchance 30 + Pbchance 3 + SBchance 50 + saberStyle 6 + FP_HEAL 1 + FP_LEVITATION 2 + FP_SPEED 2 + FP_PUSH 2 + FP_PULL 1 + FP_TELEPATHY 1 + FP_GRIP 0 + FP_LIGHTNING 0 + FP_RAGE 0 + FP_PROTECT 1 + FP_ABSORB 1 + FP_DRAIN 0 + FP_SEE 1 + FP_SABERTHROW 2 + rank lt + reactions 3 + aim 3 + move 3 + aggression 3 + evasion 2 + intelligence 3 + playerTeam TEAM_ENEMY + enemyTeam TEAM_PLAYER + class CLASS_JEDI + yawSpeed 140 + walkSpeed 55 + runSpeed 200 + snd female_jedi1 + sndcombat female_jedi1 + sndjedi female_jedi1 + health 200 + dismemberProbHead 0 + dismemberProbArms 5 + dismemberProbLegs 0 + dismemberProbHands 10 + dismemberProbWaist 0 +} + +Jedi3 +{ + playerModel jedi_zf + customSkin legends2 + customRGBA random1 + MBClass 6 + saber single_3 + saber2 single_3 + saberColor random + saber2Color random + weapon WP_SABER + MB_ATT_FORCEBLOCK 2 + MB_ATT_FP_SABER_DEFENSE 2 + MB_ATT_GUN_DEFENSE 2 + MB_ATT_DEFLECT 2 + RESOURCE_FORCE 1 + forcePowerMax 100 + Pbchance 30 + Pbchance 3 + SBchance 50 + saberStyle 6 + FP_HEAL 1 + FP_LEVITATION 2 + FP_SPEED 2 + FP_PUSH 2 + FP_PULL 1 + FP_TELEPATHY 1 + FP_GRIP 0 + FP_LIGHTNING 0 + FP_RAGE 0 + FP_PROTECT 1 + FP_ABSORB 1 + FP_DRAIN 0 + FP_SEE 1 + FP_SABERTHROW 2 + rank lt + reactions 3 + aim 3 + move 3 + aggression 3 + evasion 2 + intelligence 3 + playerTeam TEAM_ENEMY + enemyTeam TEAM_PLAYER + class CLASS_JEDI + yawSpeed 140 + walkSpeed 55 + runSpeed 200 + snd female_rebel + sndcombat female_rebel + sndjedi female_rebel + health 200 + dismemberProbHead 0 + dismemberProbArms 5 + dismemberProbLegs 0 + dismemberProbHands 10 + dismemberProbWaist 0 +} + +Jedi4 +{ + playerModel jedi_tf + customSkin jt + customRGBA random1 + MBClass 6 + saber single_4 + saberColor random + weapon WP_SABER + MB_ATT_FORCEBLOCK 2 + MB_ATT_FP_SABER_DEFENSE 2 + MB_ATT_GUN_DEFENSE 2 + MB_ATT_DEFLECT 2 + RESOURCE_FORCE 1 + forcePowerMax 100 + Pbchance 30 + Pbchance 3 + SBchance 50 + saberStyle 3 + FP_HEAL 1 + FP_LEVITATION 2 + FP_SPEED 2 + FP_PUSH 2 + FP_PULL 1 + FP_TELEPATHY 1 + FP_GRIP 0 + FP_LIGHTNING 0 + FP_RAGE 0 + FP_PROTECT 1 + FP_ABSORB 1 + FP_DRAIN 0 + FP_SEE 1 + FP_SABERTHROW 2 + rank lt + reactions 3 + aim 3 + move 3 + aggression 3 + evasion 2 + intelligence 3 + playerTeam TEAM_ENEMY + enemyTeam TEAM_PLAYER + class CLASS_JEDI + yawSpeed 140 + walkSpeed 55 + runSpeed 200 + snd female_twilek + sndcombat female_twilek + sndjedi female_twilek + health 200 + dismemberProbHead 0 + dismemberProbArms 5 + dismemberProbLegs 0 + dismemberProbHands 10 + dismemberProbWaist 0 +} + +Jedi5 +{ + playerModel jedi_tf + customSkin legends2 + customRGBA random1 + MBClass 6 + saber single_5 + saberColor random + weapon WP_SABER + MB_ATT_FORCEBLOCK 2 + MB_ATT_FP_SABER_DEFENSE 2 + MB_ATT_GUN_DEFENSE 2 + MB_ATT_DEFLECT 2 + RESOURCE_FORCE 1 + forcePowerMax 100 + Pbchance 30 + Pbchance 3 + SBchance 50 + saberStyle 1 + FP_HEAL 1 + FP_LEVITATION 2 + FP_SPEED 2 + FP_PUSH 2 + FP_PULL 1 + FP_TELEPATHY 1 + FP_GRIP 0 + FP_LIGHTNING 0 + FP_RAGE 0 + FP_PROTECT 1 + FP_ABSORB 1 + FP_DRAIN 0 + FP_SEE 1 + FP_SABERTHROW 2 + rank lt + reactions 3 + aim 3 + move 3 + aggression 3 + evasion 2 + intelligence 3 + playerTeam TEAM_ENEMY + enemyTeam TEAM_PLAYER + class CLASS_JEDI + yawSpeed 140 + walkSpeed 55 + runSpeed 200 + snd jaden_fmle + sndcombat jaden_fmle + sndjedi jaden_fmle + health 200 + dismemberProbHead 0 + dismemberProbArms 5 + dismemberProbLegs 0 + dismemberProbHands 10 + dismemberProbWaist 0 +} + +Jedi6 { playerModel jedi_hf - surfOff "torso_vest hips_chaps torso_computer head_goggles torso_comp hips_belt" - surfOn "torso_augment hips_augment hips_torso" + customSkin legends1 + customRGBA random1 + MBClass 6 saber dual_3 saberColor random weapon WP_SABER @@ -163,9 +456,301 @@ JediF walkSpeed 55 runSpeed 200 sex female - snd jan - sndcombat jan - sndjedi jan + snd female_rebel3 + sndcombat female_rebel3 + sndjedi female_rebel3 + health 200 + dismemberProbHead 0 + dismemberProbArms 5 + dismemberProbLegs 0 + dismemberProbHands 10 + dismemberProbWaist 0 +} + +Jedi7 //JediF +{ + playerModel jedi_hf + customSkin legends2 + customRGBA random1 + MBClass 6 + //surfOff "torso_vest hips_chaps torso_computer head_goggles torso_comp hips_belt" + //surfOn "torso_augment hips_augment hips_torso" + saber dual_2 + saberColor random + weapon WP_SABER + MB_ATT_FORCEBLOCK 2 + MB_ATT_FP_SABER_DEFENSE 2 + MB_ATT_GUN_DEFENSE 2 + MB_ATT_DEFLECT 2 + RESOURCE_FORCE 1 + forcePowerMax 100 + Pbchance 30 + Pbchance 3 + SBchance 50 + saberStyle 7 + FP_HEAL 1 + FP_LEVITATION 2 + FP_SPEED 2 + FP_PUSH 2 + FP_PULL 1 + FP_TELEPATHY 1 + FP_GRIP 0 + FP_LIGHTNING 0 + FP_RAGE 0 + FP_PROTECT 1 + FP_ABSORB 1 + FP_DRAIN 0 + FP_SEE 2 + FP_SABERTHROW 2 + rank lt + reactions 3 + aim 3 + move 3 + aggression 3 + evasion 2 + intelligence 3 + playerTeam TEAM_ENEMY + enemyTeam TEAM_PLAYER + class CLASS_JEDI + yawSpeed 140 + walkSpeed 55 + runSpeed 200 + sex female + snd female_rebel2 + sndcombat female_rebel2 + sndjedi female_rebel2 + health 200 + dismemberProbHead 0 + dismemberProbArms 5 + dismemberProbLegs 0 + dismemberProbHands 10 + dismemberProbWaist 0 +} + +Jedi8 +{ + playerModel jedi_kdm + customSkin legends1 + customRGBA random1 + MBClass 6 + saber single_9 + saberColor random + weapon WP_SABER + MB_ATT_FORCEBLOCK 2 + MB_ATT_FP_SABER_DEFENSE 2 + MB_ATT_GUN_DEFENSE 2 + MB_ATT_DEFLECT 2 + RESOURCE_FORCE 1 + forcePowerMax 100 + Pbchance 30 + Pbchance 3 + SBchance 50 + saberStyle 4 + FP_HEAL 1 + FP_LEVITATION 2 + FP_SPEED 2 + FP_PUSH 2 + FP_PULL 1 + FP_TELEPATHY 1 + FP_GRIP 0 + FP_LIGHTNING 0 + FP_RAGE 0 + FP_PROTECT 1 + FP_ABSORB 1 + FP_DRAIN 0 + FP_SEE 2 + FP_SABERTHROW 2 + rank lt + reactions 3 + aim 3 + move 3 + aggression 3 + evasion 2 + intelligence 3 + playerTeam TEAM_ENEMY + enemyTeam TEAM_PLAYER + class CLASS_JEDI + yawSpeed 140 + walkSpeed 55 + runSpeed 200 + sex female + snd jaden_keldor + sndcombat jaden_keldor + sndjedi jaden_keldor + health 200 + dismemberProbHead 0 + dismemberProbArms 5 + dismemberProbLegs 0 + dismemberProbHands 10 + dismemberProbWaist 0 +} + +Jedi9 +{ + playerModel jedi_kdm + customSkin legends2 + customRGBA random1 + MBClass 6 + saber single_10 + saberColor random + weapon WP_SABER + MB_ATT_FORCEBLOCK 2 + MB_ATT_FP_SABER_DEFENSE 2 + MB_ATT_GUN_DEFENSE 2 + MB_ATT_DEFLECT 2 + RESOURCE_FORCE 1 + forcePowerMax 100 + Pbchance 30 + Pbchance 3 + SBchance 50 + saberStyle 5 + FP_HEAL 1 + FP_LEVITATION 2 + FP_SPEED 2 + FP_PUSH 2 + FP_PULL 1 + FP_TELEPATHY 1 + FP_GRIP 0 + FP_LIGHTNING 0 + FP_RAGE 0 + FP_PROTECT 1 + FP_ABSORB 1 + FP_DRAIN 0 + FP_SEE 2 + FP_SABERTHROW 2 + rank lt + reactions 3 + aim 3 + move 3 + aggression 3 + evasion 2 + intelligence 3 + playerTeam TEAM_ENEMY + enemyTeam TEAM_PLAYER + class CLASS_JEDI + yawSpeed 140 + walkSpeed 55 + runSpeed 200 + sex female + snd keldor_soldier + sndcombat keldor_soldier + sndjedi keldor_soldier + health 200 + dismemberProbHead 0 + dismemberProbArms 5 + dismemberProbLegs 0 + dismemberProbHands 10 + dismemberProbWaist 0 +} + +Jedi10 +{ + playerModel jedi_rm + customSkin legends1 + customRGBA random1 + MBClass 6 + saber dual_1 + saberColor random + weapon WP_SABER + MB_ATT_FORCEBLOCK 2 + MB_ATT_FP_SABER_DEFENSE 2 + MB_ATT_GUN_DEFENSE 2 + MB_ATT_DEFLECT 2 + RESOURCE_FORCE 1 + forcePowerMax 100 + Pbchance 30 + Pbchance 3 + SBchance 50 + saberStyle 7 + FP_HEAL 1 + FP_LEVITATION 2 + FP_SPEED 2 + FP_PUSH 2 + FP_PULL 1 + FP_TELEPATHY 1 + FP_GRIP 0 + FP_LIGHTNING 0 + FP_RAGE 0 + FP_PROTECT 1 + FP_ABSORB 1 + FP_DRAIN 0 + FP_SEE 2 + FP_SABERTHROW 2 + rank lt + reactions 3 + aim 3 + move 3 + aggression 3 + evasion 2 + intelligence 3 + playerTeam TEAM_ENEMY + enemyTeam TEAM_PLAYER + class CLASS_JEDI + yawSpeed 140 + walkSpeed 55 + runSpeed 200 + sex female + snd jaden_rod + sndcombat jaden_rod + sndjedi jaden_rod + health 200 + dismemberProbHead 0 + dismemberProbArms 5 + dismemberProbLegs 0 + dismemberProbHands 10 + dismemberProbWaist 0 +} + +Jedi11 +{ + playerModel jedi_rm + customSkin legends2 + customRGBA random1 + MBClass 6 + saber single_106 + saberColor random + weapon WP_SABER + MB_ATT_FORCEBLOCK 2 + MB_ATT_FP_SABER_DEFENSE 2 + MB_ATT_GUN_DEFENSE 2 + MB_ATT_DEFLECT 2 + RESOURCE_FORCE 1 + forcePowerMax 100 + Pbchance 30 + Pbchance 3 + SBchance 50 + saberStyle 2 + FP_HEAL 1 + FP_LEVITATION 2 + FP_SPEED 2 + FP_PUSH 2 + FP_PULL 1 + FP_TELEPATHY 1 + FP_GRIP 0 + FP_LIGHTNING 0 + FP_RAGE 0 + FP_PROTECT 1 + FP_ABSORB 1 + FP_DRAIN 0 + FP_SEE 2 + FP_SABERTHROW 2 + rank lt + reactions 3 + aim 3 + move 3 + aggression 3 + evasion 2 + intelligence 3 + playerTeam TEAM_ENEMY + enemyTeam TEAM_PLAYER + class CLASS_JEDI + yawSpeed 140 + walkSpeed 55 + runSpeed 200 + sex female + snd rodian_rebel + sndcombat rodian_rebel + sndjedi rodian_rebel health 200 dismemberProbHead 0 dismemberProbArms 5 @@ -178,6 +763,7 @@ JediF JediTrainer { playerModel jeditrainer + MBClass 6 saber jedi saber2 jedi saberColor purple @@ -236,6 +822,7 @@ JediMaster { playerModel jedi customSkin master + MBClass 6 saber dual_3 saberColor green weapon WP_SABER diff --git a/MBAssets3/ext_data/npcs/kaadu.npc b/MBAssets3/ext_data/npcs/kaadu.npc index c24cfe209..237633a9f 100644 --- a/MBAssets3/ext_data/npcs/kaadu.npc +++ b/MBAssets3/ext_data/npcs/kaadu.npc @@ -1,4 +1,3 @@ - //NOTE: for vehicle-class NPCs, the playerModel key is actually their entry in the vehicles.dat kaadu diff --git a/MBAssets3/ext_data/npcs/kxdroid.npc b/MBAssets3/ext_data/npcs/kxdroid.npc index 77599ac04..642b150c5 100644 --- a/MBAssets3/ext_data/npcs/kxdroid.npc +++ b/MBAssets3/ext_data/npcs/kxdroid.npc @@ -1,6 +1,7 @@ kxdroid { playerModel k2so + MBClass 11 weapon WP_NONE surfOn head_off surfOff head diff --git a/MBAssets3/ext_data/npcs/kyle.npc b/MBAssets3/ext_data/npcs/kyle.npc index 0169228ec..8dff2324f 100644 --- a/MBAssets3/ext_data/npcs/kyle.npc +++ b/MBAssets3/ext_data/npcs/kyle.npc @@ -1,7 +1,8 @@ -//NNN: Kyle, main character in JKO and used in cinimatics in JKA and an ally in Vjun1. +//NNN: Kyle, main character in JKO and used in cinimatics in JKA and as an ally in Vjun1. Kyle { playerModel kyle + MBClass 6 saber kyle rank commander health 1000 @@ -17,7 +18,7 @@ Kyle forceRegenAmount 2 Pbchance 40 MBchance 4 - SBchance 70 + SBchance 80 saberStyle 1 saberStyle 3 saberStyle 2 @@ -59,6 +60,7 @@ Kyle Kyle_boss { playerModel kyle + MBClass 6 saber kyle_boss rank captain health 1000 @@ -72,7 +74,7 @@ Kyle_boss forceRegenAmount 2 Pbchance 40 MBchance 4 - SBchance 70 + SBchance 80 saberStyle 1 saberStyle 2 saberStyle 3 diff --git a/MBAssets3/ext_data/npcs/luke.npc b/MBAssets3/ext_data/npcs/luke.npc index 35528e880..fd3ca6331 100644 --- a/MBAssets3/ext_data/npcs/luke.npc +++ b/MBAssets3/ext_data/npcs/luke.npc @@ -1,7 +1,8 @@ -//NNN: Used in JKO/JKA in cinimatics and rarely as an Ally. Have to be careful with his stats as he's used to fight Desann in a in-game cutscene battle. +//NNN: Used in JKO/JKA in cinimatics and rarely as an ally. Have to be careful with his stats as he's used to fight Desann in a in-game cutscene battle. Luke { playerModel luke + MBClass 6 saber luke weapon WP_SABER MB_ATT_FORCEBLOCK 3 @@ -13,7 +14,7 @@ Luke forceRegenAmount 2 Pbchance 40 MBchance 4 - SBchance 70 + SBchance 80 saberStyle 1 saberStyle 3 saberStyle 2 diff --git a/MBAssets3/ext_data/npcs/mark1.npc b/MBAssets3/ext_data/npcs/mark1.npc index c1347d5cb..e321da153 100644 --- a/MBAssets3/ext_data/npcs/mark1.npc +++ b/MBAssets3/ext_data/npcs/mark1.npc @@ -1,7 +1,8 @@ -//NNN: JKO small droid walker like an at-pt, has custom weapons and it's walking animations are a bit broken +//NNN: JKO small droid walker like an AT-PT, has custom weapons and it's walking animations are a bit broken mark1 { playerModel mark1 + MBClass 11 weapon WP_BOT_LASER reactions 3 aim 1 diff --git a/MBAssets3/ext_data/npcs/mark2.npc b/MBAssets3/ext_data/npcs/mark2.npc index ae51817ae..199c29ddf 100644 --- a/MBAssets3/ext_data/npcs/mark2.npc +++ b/MBAssets3/ext_data/npcs/mark2.npc @@ -1,7 +1,8 @@ -//NNN: Unused JKO npc, currnetly gets stuck in a loop and doesn't shoot +//NNN: Unused JKO npc, gets stuck in a loop and doesn't shoot mark2 { playerModel mark2 + MBClass 11 weapon WP_BOT_LASER health 300 reactions 3 diff --git a/MBAssets3/ext_data/npcs/minemonster.npc b/MBAssets3/ext_data/npcs/minemonster.npc index 176c9e1b1..f23ebcc30 100644 --- a/MBAssets3/ext_data/npcs/minemonster.npc +++ b/MBAssets3/ext_data/npcs/minemonster.npc @@ -1,3 +1,4 @@ +//NNN: JKO monster seen in artus_mine and artus_detention Minemonster { playerModel minemonster diff --git a/MBAssets3/ext_data/npcs/mouse.npc b/MBAssets3/ext_data/npcs/mouse.npc index dab2b1fc5..2a5af88d5 100644 --- a/MBAssets3/ext_data/npcs/mouse.npc +++ b/MBAssets3/ext_data/npcs/mouse.npc @@ -1,6 +1,7 @@ mouse { playermodel mouse + MBClass 11 weapon WP_MELEE reactions 3 aim 1 diff --git a/MBAssets3/ext_data/npcs/prisoner.npc b/MBAssets3/ext_data/npcs/prisoner.npc index 11ef41ee4..6c25d1b05 100644 --- a/MBAssets3/ext_data/npcs/prisoner.npc +++ b/MBAssets3/ext_data/npcs/prisoner.npc @@ -1,4 +1,4 @@ -//NNN: JKO prisoners you rescue can help you right +//NNN: JKO prisoners you rescue and fight in artus_topside Prisoner { playerModel prisoner @@ -30,7 +30,7 @@ Prisoner2 { playerModel prisoner weapon WP_NONE - customSkin prisoner2 + //customSkin prisoner2 //NNN: Doesn't exist in MB2 reactions 3 aim 1 move 3 diff --git a/MBAssets3/ext_data/npcs/probe.npc b/MBAssets3/ext_data/npcs/probe.npc index 00afaaf35..4cce1bb0c 100644 --- a/MBAssets3/ext_data/npcs/probe.npc +++ b/MBAssets3/ext_data/npcs/probe.npc @@ -1,7 +1,8 @@ -//NNN: The probe droid form TSB, seen in a couple of places in JKO/JKA, has custom weapons and AI +//NNN: The probe droid form TESB, seen in a couple of places in JKO/JKA, has custom weapons and AI probe { playerModel probe + MBClass 11 weapon WP_BOT_LASER health 500 headYawRangeLeft 180 diff --git a/MBAssets3/ext_data/npcs/protocol.npc b/MBAssets3/ext_data/npcs/protocol.npc index befd1c1ea..897d2ac1b 100644 --- a/MBAssets3/ext_data/npcs/protocol.npc +++ b/MBAssets3/ext_data/npcs/protocol.npc @@ -1,6 +1,7 @@ protocol { playerModel protocol + MBClass 11 weapon WP_NONE reactions 3 aim 1 diff --git a/MBAssets3/ext_data/npcs/protocol_imp.npc b/MBAssets3/ext_data/npcs/protocol_imp.npc index e5708f870..32be39fb6 100644 --- a/MBAssets3/ext_data/npcs/protocol_imp.npc +++ b/MBAssets3/ext_data/npcs/protocol_imp.npc @@ -1,6 +1,7 @@ protocol_imp { playerModel protocol + MBClass 11 weapon WP_NONE surfOn head_off surfOff head diff --git a/MBAssets3/ext_data/npcs/r2d2.npc b/MBAssets3/ext_data/npcs/r2d2.npc index 132d98fe2..6f95ca0f7 100644 --- a/MBAssets3/ext_data/npcs/r2d2.npc +++ b/MBAssets3/ext_data/npcs/r2d2.npc @@ -2,6 +2,7 @@ r2d2 { fullName "R2D2" playermodel r2d2 + MBClass 11 weapon WP_NONE headYawRangeLeft 180 headYawRangeRight 180 diff --git a/MBAssets3/ext_data/npcs/r2d2_imp.npc b/MBAssets3/ext_data/npcs/r2d2_imp.npc index 43fbd3d5e..a17d4f14d 100644 --- a/MBAssets3/ext_data/npcs/r2d2_imp.npc +++ b/MBAssets3/ext_data/npcs/r2d2_imp.npc @@ -1,6 +1,7 @@ r2d2_imp { playermodel r2d2 + MBClass 11 weapon WP_NONE customSkin imp headYawRangeLeft 180 diff --git a/MBAssets3/ext_data/npcs/r2d2_imp_lunar.npc b/MBAssets3/ext_data/npcs/r2d2_imp_lunar.npc index 099f2e139..76fff5b63 100644 --- a/MBAssets3/ext_data/npcs/r2d2_imp_lunar.npc +++ b/MBAssets3/ext_data/npcs/r2d2_imp_lunar.npc @@ -1,6 +1,7 @@ r2d2_imp_lunar { playermodel r2d2 + MBClass 11 weapon WP_NONE customSkin imp headYawRangeLeft 180 diff --git a/MBAssets3/ext_data/npcs/r2d2mb.npc b/MBAssets3/ext_data/npcs/r2d2mb.npc index 395fa107b..eb9b7ec6c 100644 --- a/MBAssets3/ext_data/npcs/r2d2mb.npc +++ b/MBAssets3/ext_data/npcs/r2d2mb.npc @@ -2,6 +2,7 @@ r2d2mb { fullname "R2D2" playermodel r2d2 + MBClass 11 health 700 headYawRangeLeft 180 headYawRangeRight 180 diff --git a/MBAssets3/ext_data/npcs/r5d2.npc b/MBAssets3/ext_data/npcs/r5d2.npc index c69cb0818..71a2db5f9 100644 --- a/MBAssets3/ext_data/npcs/r5d2.npc +++ b/MBAssets3/ext_data/npcs/r5d2.npc @@ -1,6 +1,7 @@ r5d2 { playerModel r5d2 + MBClass 11 weapon WP_NONE headYawRangeLeft 180 headYawRangeRight 180 diff --git a/MBAssets3/ext_data/npcs/r5d2_imp.npc b/MBAssets3/ext_data/npcs/r5d2_imp.npc index 6a2909ac9..22bb57b53 100644 --- a/MBAssets3/ext_data/npcs/r5d2_imp.npc +++ b/MBAssets3/ext_data/npcs/r5d2_imp.npc @@ -1,6 +1,7 @@ r5d2_imp { playerModel r5d2 + MBClass 11 weapon WP_NONE //oops, guess they never made this skin... // customSkin imp diff --git a/MBAssets3/ext_data/npcs/ragnos.npc b/MBAssets3/ext_data/npcs/ragnos.npc index 93e716efa..2108e0032 100644 --- a/MBAssets3/ext_data/npcs/ragnos.npc +++ b/MBAssets3/ext_data/npcs/ragnos.npc @@ -1,9 +1,9 @@ -//NNN: Used in cutscenes in JKA, currently set to be a jawa because of how he used to server crash +//NNN: Used in cutscenes in JKA Ragnos { - playerModel jawa - saber reborn - weapon WP_SABER + playerModel old_marka_ragnos + customSkin ghost_legends + weapon WP_NONE saberStyle 1 FP_HEAL 0 FP_LEVITATION 3 @@ -31,14 +31,13 @@ Ragnos intelligence 3 hfov 120 vfov 120 - scale 75 playerTeam TEAM_PLAYER enemyTeam TEAM_ENEMY // race human - class CLASS_REBORN - snd jawa - sndcombat jawa - sndjedi jawa + class CLASS_MAGE + snd ragnos + sndcombat ragnos + sndjedi ragnos yawSpeed 70 walkSpeed 55 runSpeed 200 diff --git a/MBAssets3/ext_data/npcs/rancor.npc b/MBAssets3/ext_data/npcs/rancor.npc index e6f2c4266..47e2e775b 100644 --- a/MBAssets3/ext_data/npcs/rancor.npc +++ b/MBAssets3/ext_data/npcs/rancor.npc @@ -1,4 +1,4 @@ -//NNN: Rancors used in base and in some MB2 levels, the rancor_welp is smaller variant, the mutant_rancor is for t3_stamp in JKA SP, uds_rancor is used in mb2_undeadstar. +//NNN: Rancors used in base and in some MB2 maps, the rancor_welp is smaller variant, the mutant_rancor is for t3_stamp in JKA SP, uds_rancor is used in mb2_undeadstar. rancor { playerModel rancor diff --git a/MBAssets3/ext_data/npcs/rebel.npc b/MBAssets3/ext_data/npcs/rebel.npc index 4a36e6358..52db3dceb 100644 --- a/MBAssets3/ext_data/npcs/rebel.npc +++ b/MBAssets3/ext_data/npcs/rebel.npc @@ -1,4 +1,4 @@ -//NNN: Used in JKO as an allies on the end missions on Yavin +//NNN: Used in JKO as an allies on yavin_courtyard Rebel { playerModel rebel @@ -21,7 +21,7 @@ Rebel // snd rebel1 // sndcombat rebel1 // sndextra rebel1 - snd rebel_pilot + snd rebel_pilot sndcombat rebel_pilot sndextra rebel_pilot yawspeed 120 diff --git a/MBAssets3/ext_data/npcs/reborn_JKO.npc b/MBAssets3/ext_data/npcs/reborn_JKO.npc index 55bf38c89..5f8c00475 100644 --- a/MBAssets3/ext_data/npcs/reborn_JKO.npc +++ b/MBAssets3/ext_data/npcs/reborn_JKO.npc @@ -1,7 +1,8 @@ -//NNN: JKO reborn, they are a bit different then the JKA variants, first one is just a basic grunt +//NNN: JKO Reborn, they are a bit different then the JKA variants, first one is just a basic grunt Reborn { playerModel reborn + MBClass 5 saber reborn weapon WP_SABER MB_ATT_FORCEBLOCK 1 @@ -60,6 +61,7 @@ RebornAcrobat { playerModel reborn customSkin acrobat + MBClass 5 saber reborn saberColor red weapon WP_SABER @@ -115,11 +117,12 @@ RebornAcrobat dismemberProbWaist 0 } -//NNN: This one is supposed to use force power more despite what it's low rank stat would suggest. +//NNN: This one is supposed to use force powers more despite what it's low rank stat would suggest. RebornForceUser { playerModel reborn customSkin forceuser + MBClass 5 saber reborn weapon WP_SABER MB_ATT_FORCEBLOCK 3 @@ -181,10 +184,11 @@ RebornFencer { playerModel reborn customSkin fencer + MBClass 5 saber reborn weapon WP_SABER MB_ATT_FORCEBLOCK 1 - MB_ATT_FP_SABER_DEFENSE 3 + MB_ATT_FP_SABER_DEFENSE 2 MB_ATT_GUN_DEFENSE 2 MB_ATT_DEFLECT 1 RESOURCE_FORCE 1 @@ -242,6 +246,7 @@ RebornBoss { playerModel reborn customSkin boss + MBClass 5 saber shadowtrooper weapon WP_SABER MB_ATT_FORCEBLOCK 3 diff --git a/MBAssets3/ext_data/npcs/reborn_new.npc b/MBAssets3/ext_data/npcs/reborn_new.npc index cc7311bf0..b141cfce8 100644 --- a/MBAssets3/ext_data/npcs/reborn_new.npc +++ b/MBAssets3/ext_data/npcs/reborn_new.npc @@ -1,8 +1,9 @@ -//NNN: The JKA new reborn, much more dangerous then cultists, come in single, dual, staff with a powerful red and a weaker blue version each +//NNN: The JKA New Reborn, much more dangerous then cultists, come in single, dual, staff with a powerful red and a weaker blue version each //NNN: Note the single saberists are supposed to have blue, red, and yellow and switch between them. For now they just use yellow as it's their best style. reborn_new { playerModel reborn_new + MBClass 5 saber reborn_new weapon WP_SABER MB_ATT_FORCEBLOCK 2 @@ -62,6 +63,7 @@ reborn_new reborn_new2 { playerModel reborn_new + MBClass 5 customSkin blue saber shadowtrooper weapon WP_SABER @@ -124,6 +126,7 @@ reborn_new2 reborn_dual { playerModel reborn_new + MBClass 5 customSkin red saber reborn saberColor red @@ -185,6 +188,7 @@ reborn_dual reborn_dual2 { playerModel reborn_new + MBClass 5 customSkin blue saber reborn saberColor red @@ -249,6 +253,7 @@ reborn_staff { playerModel reborn_new customSkin red + MBClass 5 saber dual_1 saberColor red weapon WP_SABER @@ -308,6 +313,7 @@ reborn_staff2 { playerModel reborn_new customSkin blue + MBClass 5 saber dual_1 saberColor red weapon WP_SABER diff --git a/MBAssets3/ext_data/npcs/reborn_twin.npc b/MBAssets3/ext_data/npcs/reborn_twin.npc index 874035859..75e417625 100644 --- a/MBAssets3/ext_data/npcs/reborn_twin.npc +++ b/MBAssets3/ext_data/npcs/reborn_twin.npc @@ -3,6 +3,7 @@ DKothos { playerModel reborn_twin // customSkin ? + MBClass 5 weapon WP_MELEE MB_ATT_FORCEBLOCK 3 RESOURCE_FORCE 1 @@ -57,6 +58,7 @@ VKothos { playerModel reborn_twin // customSkin ? + MBClass 5 weapon WP_MELEE MB_ATT_FORCEBLOCK 3 RESOURCE_FORCE 1 @@ -113,6 +115,7 @@ RebornMaster { playerModel reborn_twin customSkin boss + MBClass 5 saber rebornmaster weapon WP_SABER MB_ATT_FORCEBLOCK 3 @@ -179,6 +182,7 @@ RebornMasterDual { playerModel reborn_twin customSkin boss + MBClass 5 saber shadowtrooper saberColor red saber2 shadowtrooper @@ -245,6 +249,7 @@ RebornMasterStaff { playerModel reborn_twin customSkin boss + MBClass 5 saber dual_1 saberColor red weapon WP_SABER diff --git a/MBAssets3/ext_data/npcs/revan.npc b/MBAssets3/ext_data/npcs/revan.npc deleted file mode 100644 index 367164fdf..000000000 --- a/MBAssets3/ext_data/npcs/revan.npc +++ /dev/null @@ -1,56 +0,0 @@ -revan -{ - playerModel revan - saber revan - weapon WP_SABER - saber saber_revan - saberStyle 4 - saberColor red - FP_HEAL 0 - FP_LEVITATION 3 - FP_SPEED 3 - FP_PUSH 3 - FP_PULL 3 - FP_TELEPATHY 0 - FP_GRIP 3 - FP_LIGHTNING 3 - FP_RAGE 3 - FP_PROTECT 0 - FP_ABSORB 0 - FP_DRAIN 3 - FP_SEE 3 - FP_SABERTHROW 3 - FP_SABER_DEFENSE 3 - FP_SABER_OFFENSE 3 - forceRegenRate 50 - forceImmunity 0 - rank captain - reactions 3 - aim 3 - move 5 - aggression 3 - evasion 5 - intelligence 5 - hfov 160 - vfov 160 - scale 135 - height 78 - crouchheight 42 - width 18 - playerTeam TEAM_ENEMY - enemyTeam TEAM_PLAYER -// race human - class CLASS_DESANN - yawSpeed 120 - walkSpeed 55 - runSpeed 200 - snd revan - sndcombat revan - sndjedi revan - health 500 - dismemberProbHead 50 - dismemberProbArms 50 - dismemberProbLegs 50 - dismemberProbHands 50 - dismemberProbWaist 50 -} \ No newline at end of file diff --git a/MBAssets3/ext_data/npcs/rockettrooper2.npc b/MBAssets3/ext_data/npcs/rockettrooper2.npc index acba9dcf9..ad64550c4 100644 --- a/MBAssets3/ext_data/npcs/rockettrooper2.npc +++ b/MBAssets3/ext_data/npcs/rockettrooper2.npc @@ -4,6 +4,7 @@ RocketTrooper2 playerModel rockettrooper weapon WP_ROCKET_LAUNCHER MB_ATT_ROCKET_LAUNCHER 3 + MB_ATT_ENV_PROT 1 RESOURCE_FORCE 1 forcePowerMax 200 FP_LEVITATION 3 @@ -45,6 +46,8 @@ RocketTrooper2Officer { playerModel rockettrooper weapon WP_REPEATER + MB_ATT_REPEATER 3 + MB_ATT_ENV_PROT 1 RESOURCE_FORCE 1 forcePowerMax 200 FP_LEVITATION 3 diff --git a/MBAssets3/ext_data/npcs/rosh_penin.npc b/MBAssets3/ext_data/npcs/rosh_penin.npc index cf23ecfac..2d4c2371f 100644 --- a/MBAssets3/ext_data/npcs/rosh_penin.npc +++ b/MBAssets3/ext_data/npcs/rosh_penin.npc @@ -1,7 +1,8 @@ -//NNN: Rosh as seen in JKA +//NNN: Rosh as seen in JKA, first version is from yavin1b rosh_penin_noforce { playerModel rosh_penin + MBClass 6 weapon WP_MELEE RESOURCE_FORCE 1 forcePowerMax 100 @@ -44,6 +45,7 @@ rosh_penin_noforce rosh_penin { playerModel rosh_penin + MBClass 6 saber training weapon WP_SABER MB_ATT_FORCEBLOCK 1 @@ -94,10 +96,11 @@ rosh_penin rosh_dark { playerModel rosh_penin + MBClass 5 saber shadowtrooper weapon WP_SABER MB_ATT_FORCEBLOCK 3 - MB_ATT_FP_SABER_DEFENSE 3 + MB_ATT_FP_SABER_DEFENSE 2 MB_ATT_GUN_DEFENSE 3 MB_ATT_DEFLECT 3 RESOURCE_FORCE 1 diff --git a/MBAssets3/ext_data/npcs/saber_droid.npc b/MBAssets3/ext_data/npcs/saber_droid.npc index 59cbd70e7..1e5b495d9 100644 --- a/MBAssets3/ext_data/npcs/saber_droid.npc +++ b/MBAssets3/ext_data/npcs/saber_droid.npc @@ -1,11 +1,12 @@ //NNN: Saber droid there's a default version in JKA Vjun3 and a less dangerous training on used in Yavin2 -//NNN: Currently just setup as a normal saberist +//NNN: Currently just setup as a normal saberist for MB2 saber_droid_training { playerModel saber_droid + MBClass 11 saber droid weapon WP_SABER - MB_ATT_FP_SABER_DEFENSE 2 + MB_ATT_FP_SABER_DEFENSE 1 Pbchance 20 MBchance 2 SBchance 45 @@ -40,9 +41,10 @@ saber_droid_training saber_droid { playerModel saber_droid + MBClass 11 saber droid weapon WP_SABER - MB_ATT_FP_SABER_DEFENSE 3 + MB_ATT_FP_SABER_DEFENSE 2 Pbchance 40 MBchance 4 SBchance 70 diff --git a/MBAssets3/ext_data/npcs/saber_power.npc b/MBAssets3/ext_data/npcs/saber_power.npc new file mode 100644 index 000000000..1f9f374cb --- /dev/null +++ b/MBAssets3/ext_data/npcs/saber_power.npc @@ -0,0 +1,831 @@ +//NNN: Basic Sith each setup with a different force power and a saber for testing purposes +saber_lightning //NNN: works fine +{ + playerModel reborn_concept + customSkin force + MBCLASS 5 + saber saber_reborn_mp + saberColor red + weapon WP_SABER + MB_ATT_FORCEBLOCK 3 + MB_ATT_FP_SABER_DEFENSE 1 + MB_ATT_GUN_DEFENSE 1 + MB_ATT_DEFLECT 1 + RESOURCE_FORCE 1 + Pbchance 30 + MBchance 3 + SBchance 50 + saberStyle 2 + FP_LEVITATION 3 + //FP_PUSH 3 + FP_LIGHTNING 3 + RESOURCE_FORCE 1 + forcePowerMax 200 + //forceRegenRate 50 + forceRegenAmount 2 + rank captain + reactions 1 + aim 1 + move 1 + aggression 5 + evasion 3 + intelligence 1 + hfov 120 + vfov 120 + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race human + class CLASS_REBORN + snd cultist3 + sndcombat cultist3 + sndjedi cultist3 + yawSpeed 60 + walkSpeed 45 + runSpeed 180 + health 100 + dismemberProbHead 0 + dismemberProbArms 20 + dismemberProbLegs 0 + dismemberProbHands 30 + dismemberProbWaist 0 +} + +saber_drain //NNN: not working +{ + playerModel reborn_concept + customSkin force + MBCLASS 5 + saber saber_reborn_mp + saberColor red + weapon WP_SABER + MB_ATT_FORCEBLOCK 3 + MB_ATT_FP_SABER_DEFENSE 1 + MB_ATT_GUN_DEFENSE 1 + MB_ATT_DEFLECT 1 + RESOURCE_FORCE 1 + Pbchance 30 + MBchance 3 + SBchance 50 + saberStyle 2 + FP_LEVITATION 3 + FP_DRAIN 3 + RESOURCE_FORCE 1 + forcePowerMax 200 + //forceRegenRate 50 + forceRegenAmount 2 + rank captain + reactions 1 + aim 1 + move 1 + aggression 5 + evasion 3 + intelligence 1 + hfov 120 + vfov 120 + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race human + class CLASS_REBORN + snd cultist3 + sndcombat cultist3 + sndjedi cultist3 + yawSpeed 60 + walkSpeed 45 + runSpeed 180 + health 100 + dismemberProbHead 0 + dismemberProbArms 20 + dismemberProbLegs 0 + dismemberProbHands 30 + dismemberProbWaist 0 +} + +saber_grip //NNN: Works fairly well though has a hard time getting through force block +{ + playerModel reborn_concept + customSkin force + MBCLASS 5 + saber saber_reborn_mp + saberColor red + weapon WP_SABER + MB_ATT_FORCEBLOCK 3 + MB_ATT_FP_SABER_DEFENSE 1 + MB_ATT_GUN_DEFENSE 1 + MB_ATT_DEFLECT 1 + RESOURCE_FORCE 1 + Pbchance 30 + MBchance 3 + SBchance 50 + saberStyle 2 + FP_LEVITATION 3 + FP_GRIP 3 + RESOURCE_FORCE 1 + forcePowerMax 200 + //forceRegenRate 50 + forceRegenAmount 2 + rank captain + reactions 1 + aim 1 + move 1 + aggression 5 + evasion 3 + intelligence 1 + hfov 120 + vfov 120 + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race human + class CLASS_REBORN + snd cultist3 + sndcombat cultist3 + sndjedi cultist3 + yawSpeed 60 + walkSpeed 45 + runSpeed 180 + health 100 + dismemberProbHead 0 + dismemberProbArms 20 + dismemberProbLegs 0 + dismemberProbHands 30 + dismemberProbWaist 0 +} + +//NNN: Should be a combined push/pull/repulse/superpush eventually +saber_push //NNN: not working +{ + playerModel reborn_concept + customSkin force + MBCLASS 5 + saber saber_reborn_mp + saberColor red + weapon WP_SABER + MB_ATT_FORCEBLOCK 3 + MB_ATT_FP_SABER_DEFENSE 1 + MB_ATT_GUN_DEFENSE 1 + MB_ATT_DEFLECT 1 + RESOURCE_FORCE 1 + Pbchance 30 + MBchance 3 + SBchance 50 + saberStyle 2 + FP_LEVITATION 3 + FP_PUSH 3 + RESOURCE_FORCE 1 + forcePowerMax 200 + //forceRegenRate 50 + forceRegenAmount 2 + rank captain + reactions 1 + aim 1 + move 1 + aggression 5 + evasion 3 + intelligence 1 + hfov 120 + vfov 120 + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race human + class CLASS_REBORN + snd cultist3 + sndcombat cultist3 + sndjedi cultist3 + yawSpeed 60 + walkSpeed 45 + runSpeed 180 + health 100 + dismemberProbHead 0 + dismemberProbArms 20 + dismemberProbLegs 0 + dismemberProbHands 30 + dismemberProbWaist 0 +} + +saber_pull //NNN: not working +{ + playerModel reborn_concept + customSkin force + MBCLASS 5 + saber saber_reborn_mp + saberColor red + weapon WP_SABER + MB_ATT_FORCEBLOCK 3 + MB_ATT_FP_SABER_DEFENSE 1 + MB_ATT_GUN_DEFENSE 1 + MB_ATT_DEFLECT 1 + RESOURCE_FORCE 1 + Pbchance 30 + MBchance 3 + SBchance 50 + saberStyle 2 + FP_LEVITATION 3 + FP_PULL 3 + RESOURCE_FORCE 1 + forcePowerMax 200 + //forceRegenRate 50 + forceRegenAmount 2 + rank captain + reactions 1 + aim 1 + move 1 + aggression 5 + evasion 3 + intelligence 1 + hfov 120 + vfov 120 + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race human + class CLASS_REBORN + snd cultist3 + sndcombat cultist3 + sndjedi cultist3 + yawSpeed 60 + walkSpeed 45 + runSpeed 180 + health 100 + dismemberProbHead 0 + dismemberProbArms 20 + dismemberProbLegs 0 + dismemberProbHands 30 + dismemberProbWaist 0 +} + +saber_destruction //NNN: not working +{ + playerModel reborn_concept + customSkin force + MBCLASS 5 + saber saber_reborn_mp + saberColor red + weapon WP_SABER + MB_ATT_FORCEBLOCK 3 + MB_ATT_FP_SABER_DEFENSE 1 + MB_ATT_GUN_DEFENSE 1 + MB_ATT_DEFLECT 1 + RESOURCE_FORCE 1 + Pbchance 30 + MBchance 3 + SBchance 50 + saberStyle 2 + FP_LEVITATION 3 + FP_DESTRUCTION 3 + RESOURCE_FORCE 1 + forcePowerMax 200 + //forceRegenRate 50 + forceRegenAmount 2 + rank captain + reactions 1 + aim 1 + move 1 + aggression 5 + evasion 3 + intelligence 1 + hfov 120 + vfov 120 + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race human + class CLASS_REBORN + snd cultist3 + sndcombat cultist3 + sndjedi cultist3 + yawSpeed 60 + walkSpeed 45 + runSpeed 180 + health 100 + dismemberProbHead 0 + dismemberProbArms 20 + dismemberProbLegs 0 + dismemberProbHands 30 + dismemberProbWaist 0 +} + +saber_blind //NNN: not working +{ + playerModel reborn_concept + customSkin force + MBCLASS 5 + saber saber_reborn_mp + saberColor red + weapon WP_SABER + MB_ATT_FORCEBLOCK 3 + MB_ATT_FP_SABER_DEFENSE 1 + MB_ATT_GUN_DEFENSE 1 + MB_ATT_DEFLECT 1 + RESOURCE_FORCE 1 + Pbchance 30 + MBchance 3 + SBchance 50 + saberStyle 2 + FP_LEVITATION 3 + FP_BLIND 3 + RESOURCE_FORCE 1 + forcePowerMax 200 + //forceRegenRate 50 + forceRegenAmount 2 + rank captain + reactions 1 + aim 1 + move 1 + aggression 5 + evasion 3 + intelligence 1 + hfov 120 + vfov 120 + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race human + class CLASS_REBORN + snd cultist3 + sndcombat cultist3 + sndjedi cultist3 + yawSpeed 60 + walkSpeed 45 + runSpeed 180 + health 100 + dismemberProbHead 0 + dismemberProbArms 20 + dismemberProbLegs 0 + dismemberProbHands 30 + dismemberProbWaist 0 +} + +saber_sight //NNN: not working +{ + playerModel reborn_concept + customSkin force + MBCLASS 5 + saber saber_reborn_mp + saberColor red + weapon WP_SABER + MB_ATT_FORCEBLOCK 3 + MB_ATT_FP_SABER_DEFENSE 1 + MB_ATT_GUN_DEFENSE 1 + MB_ATT_DEFLECT 1 + RESOURCE_FORCE 1 + Pbchance 30 + MBchance 3 + SBchance 50 + saberStyle 2 + FP_LEVITATION 3 + FP_DEADLYSIGHT 3 + RESOURCE_FORCE 1 + forcePowerMax 200 + //forceRegenRate 50 + forceRegenAmount 2 + rank captain + reactions 1 + aim 1 + move 1 + aggression 5 + evasion 3 + intelligence 1 + hfov 120 + vfov 120 + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race human + class CLASS_REBORN + snd cultist3 + sndcombat cultist3 + sndjedi cultist3 + yawSpeed 60 + walkSpeed 45 + runSpeed 180 + health 100 + dismemberProbHead 0 + dismemberProbArms 20 + dismemberProbLegs 0 + dismemberProbHands 30 + dismemberProbWaist 0 +} + +saber_heal //NNN: not working +{ + playerModel reborn_concept + customSkin force + MBCLASS 5 + saber saber_reborn_mp + saberColor red + weapon WP_SABER + MB_ATT_FORCEBLOCK 3 + MB_ATT_FP_SABER_DEFENSE 1 + MB_ATT_GUN_DEFENSE 1 + MB_ATT_DEFLECT 1 + RESOURCE_FORCE 1 + Pbchance 30 + MBchance 3 + SBchance 50 + saberStyle 2 + FP_LEVITATION 3 + FP_DEADLYSIGHT 3 + RESOURCE_FORCE 1 + forcePowerMax 200 + //forceRegenRate 50 + forceRegenAmount 2 + rank captain + reactions 1 + aim 1 + move 1 + aggression 5 + evasion 3 + intelligence 1 + hfov 120 + vfov 120 + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race human + class CLASS_REBORN + snd cultist3 + sndcombat cultist3 + sndjedi cultist3 + yawSpeed 60 + walkSpeed 45 + runSpeed 180 + health 100 + dismemberProbHead 0 + dismemberProbArms 20 + dismemberProbLegs 0 + dismemberProbHands 30 + dismemberProbWaist 0 +} + +saber_teamheal //NNN: not working +{ + playerModel reborn_concept + customSkin force + MBCLASS 5 + saber saber_reborn_mp + saberColor red + weapon WP_SABER + MB_ATT_FORCEBLOCK 3 + MB_ATT_FP_SABER_DEFENSE 1 + MB_ATT_GUN_DEFENSE 1 + MB_ATT_DEFLECT 1 + RESOURCE_FORCE 1 + Pbchance 30 + MBchance 3 + SBchance 50 + saberStyle 2 + FP_LEVITATION 3 + FP_HEAL 3 + RESOURCE_FORCE 1 + forcePowerMax 200 + //forceRegenRate 50 + forceRegenAmount 2 + rank captain + reactions 1 + aim 1 + move 1 + aggression 5 + evasion 3 + intelligence 1 + hfov 120 + vfov 120 + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race human + class CLASS_REBORN + snd cultist3 + sndcombat cultist3 + sndjedi cultist3 + yawSpeed 60 + walkSpeed 45 + runSpeed 180 + health 100 + dismemberProbHead 0 + dismemberProbArms 20 + dismemberProbLegs 0 + dismemberProbHands 30 + dismemberProbWaist 0 +} + +saber_teamforce //NNN: not working +{ + playerModel reborn_concept + customSkin force + MBCLASS 5 + saber saber_reborn_mp + saberColor red + weapon WP_SABER + MB_ATT_FORCEBLOCK 3 + MB_ATT_FP_SABER_DEFENSE 1 + MB_ATT_GUN_DEFENSE 1 + MB_ATT_DEFLECT 1 + RESOURCE_FORCE 1 + Pbchance 30 + MBchance 3 + SBchance 50 + saberStyle 2 + FP_LEVITATION 3 + FP_TEAM_FORCE 3 + RESOURCE_FORCE 1 + forcePowerMax 200 + //forceRegenRate 50 + forceRegenAmount 2 + rank captain + reactions 1 + aim 1 + move 1 + aggression 5 + evasion 3 + intelligence 1 + hfov 120 + vfov 120 + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race human + class CLASS_REBORN + snd cultist3 + sndcombat cultist3 + sndjedi cultist3 + yawSpeed 60 + walkSpeed 45 + runSpeed 180 + health 100 + dismemberProbHead 0 + dismemberProbArms 20 + dismemberProbLegs 0 + dismemberProbHands 30 + dismemberProbWaist 0 +} + +saber_speed //NNN: Only seems to use speed to chase enemies fleeing with speed and very fast turns on saber. +{ + playerModel reborn_concept + customSkin force + MBCLASS 5 + saber saber_reborn_mp + saberColor red + weapon WP_SABER + MB_ATT_FORCEBLOCK 3 + MB_ATT_FP_SABER_DEFENSE 1 + MB_ATT_GUN_DEFENSE 1 + MB_ATT_DEFLECT 1 + RESOURCE_FORCE 1 + Pbchance 30 + MBchance 3 + SBchance 50 + saberStyle 2 + FP_LEVITATION 3 + FP_SPEED 3 + RESOURCE_FORCE 1 + forcePowerMax 200 + //forceRegenRate 50 + forceRegenAmount 2 + rank captain + reactions 1 + aim 1 + move 1 + aggression 5 + evasion 3 + intelligence 1 + hfov 120 + vfov 120 + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race human + class CLASS_REBORN + snd cultist3 + sndcombat cultist3 + sndjedi cultist3 + yawSpeed 60 + walkSpeed 45 + runSpeed 180 + health 100 + dismemberProbHead 0 + dismemberProbArms 20 + dismemberProbLegs 0 + dismemberProbHands 30 + dismemberProbWaist 0 +} + +saber_rage //NNN: not working +{ + playerModel reborn_concept + customSkin force + MBCLASS 5 + saber saber_reborn_mp + saberColor red + weapon WP_SABER + MB_ATT_FORCEBLOCK 3 + MB_ATT_FP_SABER_DEFENSE 1 + MB_ATT_GUN_DEFENSE 1 + MB_ATT_DEFLECT 1 + RESOURCE_FORCE 1 + Pbchance 30 + MBchance 3 + SBchance 50 + saberStyle 2 + FP_LEVITATION 3 + FP_RAGE 3 + RESOURCE_FORCE 1 + forcePowerMax 200 + //forceRegenRate 50 + forceRegenAmount 2 + rank captain + reactions 1 + aim 1 + move 1 + aggression 5 + evasion 3 + intelligence 1 + hfov 120 + vfov 120 + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race human + class CLASS_REBORN + snd cultist3 + sndcombat cultist3 + sndjedi cultist3 + yawSpeed 60 + walkSpeed 45 + runSpeed 180 + health 100 + dismemberProbHead 0 + dismemberProbArms 20 + dismemberProbLegs 0 + dismemberProbHands 30 + dismemberProbWaist 0 +} + +saber_mt //NNN: not working +{ + playerModel reborn_concept + customSkin force + MBCLASS 5 + saber saber_reborn_mp + saberColor red + weapon WP_SABER + MB_ATT_FORCEBLOCK 3 + MB_ATT_FP_SABER_DEFENSE 1 + MB_ATT_GUN_DEFENSE 1 + MB_ATT_DEFLECT 1 + RESOURCE_FORCE 1 + Pbchance 30 + MBchance 3 + SBchance 50 + saberStyle 2 + FP_LEVITATION 3 + FP_TELEPATHY 3 + RESOURCE_FORCE 1 + forcePowerMax 200 + //forceRegenRate 50 + forceRegenAmount 2 + rank captain + reactions 1 + aim 1 + move 1 + aggression 5 + evasion 3 + intelligence 1 + hfov 120 + vfov 120 + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race human + class CLASS_REBORN + snd cultist3 + sndcombat cultist3 + sndjedi cultist3 + yawSpeed 60 + walkSpeed 45 + runSpeed 180 + health 100 + dismemberProbHead 0 + dismemberProbArms 20 + dismemberProbLegs 0 + dismemberProbHands 30 + dismemberProbWaist 0 +} + +saber_protect //NNN: not working +{ + playerModel reborn_concept + customSkin force + MBCLASS 5 + weapon WP_SABER + saber saber_reborn_mp + saberColor red + MB_ATT_FORCEBLOCK 3 + FP_LEVITATION 3 + //FP_PUSH 3 + FP_PROTECT 3 + RESOURCE_FORCE 1 + forcePowerMax 200 + //forceRegenRate 50 + forceRegenAmount 2 + rank captain + reactions 1 + aim 1 + move 1 + aggression 5 + evasion 3 + intelligence 1 + hfov 120 + vfov 120 + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race human + class CLASS_REBORN + snd cultist3 + sndcombat cultist3 + sndjedi cultist3 + yawSpeed 60 + walkSpeed 45 + runSpeed 180 + health 100 + dismemberProbHead 0 + dismemberProbArms 20 + dismemberProbLegs 0 + dismemberProbHands 30 + dismemberProbWaist 0 +} + +saber_absorb //NNN: not working +{ + playerModel reborn_concept + customSkin force + MBCLASS 5 + weapon WP_SABER + saber saber_reborn_mp + saberColor red + MB_ATT_FORCEBLOCK 3 + FP_LEVITATION 3 + //FP_PUSH 3 + FP_ABSORB 3 + RESOURCE_FORCE 1 + forcePowerMax 200 + //forceRegenRate 50 + forceRegenAmount 2 + rank captain + reactions 1 + aim 1 + move 1 + aggression 5 + evasion 3 + intelligence 1 + hfov 120 + vfov 120 + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race human + class CLASS_REBORN + snd cultist3 + sndcombat cultist3 + sndjedi cultist3 + yawSpeed 60 + walkSpeed 45 + runSpeed 180 + health 100 + dismemberProbHead 0 + dismemberProbArms 20 + dismemberProbLegs 0 + dismemberProbHands 30 + dismemberProbWaist 0 +} + +saber_throw //NNN: throws very occasionally and misses a lot +{ + playerModel reborn_concept + customSkin force + MBCLASS 5 + weapon WP_SABER + saber saber_reborn_mp + saberColor red + MB_ATT_FORCEBLOCK 3 + FP_LEVITATION 3 + //FP_PUSH 3 + FP_SABERTHROW 3 + RESOURCE_FORCE 1 + forcePowerMax 200 + //forceRegenRate 50 + forceRegenAmount 2 + rank captain + reactions 1 + aim 1 + move 1 + aggression 5 + evasion 3 + intelligence 1 + hfov 120 + vfov 120 + playerTeam TEAM_PLAYER + enemyTeam TEAM_ENEMY +// race human + class CLASS_REBORN + snd cultist3 + sndcombat cultist3 + sndjedi cultist3 + yawSpeed 60 + walkSpeed 45 + runSpeed 180 + health 100 + dismemberProbHead 0 + dismemberProbArms 20 + dismemberProbLegs 0 + dismemberProbHands 30 + dismemberProbWaist 0 +} \ No newline at end of file diff --git a/MBAssets3/ext_data/npcs/saboteur.npc b/MBAssets3/ext_data/npcs/saboteur.npc index 632af1274..423e43eac 100644 --- a/MBAssets3/ext_data/npcs/saboteur.npc +++ b/MBAssets3/ext_data/npcs/saboteur.npc @@ -6,7 +6,7 @@ saboteur weapon WP_EE4 MB_ATT_EE4 3 //altFire 1 - RESOURCE_FORCE 1 + RESOURCE_ENERGY 1 forcePowerMax 100 rank crewman reactions 5 @@ -38,10 +38,10 @@ saboteur saboteurcommando { playerModel saboteur - weapon WP_BLASTER //NNN: Probably should have a different weapon + weapon WP_BLASTER MB_ATT_BLASTER 3 altFire 1 - RESOURCE_FORCE 1 + RESOURCE_ENERGY 1 forcePowerMax 100 rank crewman reactions 5 @@ -76,7 +76,7 @@ saboteurpistol weapon WP_BLASTER_PISTOL MB_ATT_PISTOL 3 altFire 1 - RESOURCE_FORCE 1 + RESOURCE_ENERGY 1 forcePowerMax 100 rank ltjg reactions 5 @@ -111,7 +111,7 @@ saboteursniper weapon WP_DISRUPTOR MB_ATT_DISRUPTOR 2 altFire 1 - RESOURCE_FORCE 1 + RESOURCE_ENERGY 1 forcePowerMax 100 rank crewman reactions 5 diff --git a/MBAssets3/ext_data/npcs/seeker.npc b/MBAssets3/ext_data/npcs/seeker.npc index 776d5e587..e061ab0c7 100644 --- a/MBAssets3/ext_data/npcs/seeker.npc +++ b/MBAssets3/ext_data/npcs/seeker.npc @@ -5,6 +5,7 @@ remote // torsomodel none // legsmodel remote playerModel remote_mb2 + MBClass 11 health 50 weapon WP_NONE reactions 3 @@ -34,6 +35,7 @@ seeker //torsomodel none //legsmodel remote playerModel remote_mb2 + MBClass 11 health 50 weapon WP_BOT_LASER reactions 3 @@ -60,6 +62,7 @@ seeker remote_imp { playerModel remote_imp + MBClass 11 weapon WP_NONE health 50 reactions 5 diff --git a/MBAssets3/ext_data/npcs/sentry.npc b/MBAssets3/ext_data/npcs/sentry.npc index b2dec56be..f6fa25b81 100644 --- a/MBAssets3/ext_data/npcs/sentry.npc +++ b/MBAssets3/ext_data/npcs/sentry.npc @@ -2,6 +2,7 @@ sentry { playermodel sentry + MBClass 11 weapon WP_NONE health 300 reactions 3 diff --git a/MBAssets3/ext_data/npcs/shadowtrooper.npc b/MBAssets3/ext_data/npcs/shadowtrooper.npc index 5e9721745..2101bb01a 100644 --- a/MBAssets3/ext_data/npcs/shadowtrooper.npc +++ b/MBAssets3/ext_data/npcs/shadowtrooper.npc @@ -2,10 +2,11 @@ ShadowTrooper { playerModel shadowtrooper + MBClass 5 saber shadowtrooper weapon WP_SABER MB_ATT_FORCEBLOCK 3 - MB_ATT_FP_SABER_DEFENSE 3 + MB_ATT_FP_SABER_DEFENSE 2 MB_ATT_GUN_DEFENSE 3 MB_ATT_DEFLECT 3 RESOURCE_FORCE 1 @@ -61,11 +62,12 @@ ShadowTrooper ShadowTrooper2 { playerModel shadowtrooper + MBClass 5 saber shadowtrooper saberColor red weapon WP_SABER MB_ATT_FORCEBLOCK 3 - MB_ATT_FP_SABER_DEFENSE 3 + MB_ATT_FP_SABER_DEFENSE 2 MB_ATT_GUN_DEFENSE 3 MB_ATT_DEFLECT 3 RESOURCE_FORCE 1 diff --git a/MBAssets3/ext_data/npcs/stormtrooper.npc b/MBAssets3/ext_data/npcs/stormtrooper.npc index 346c7af90..55a96ca0c 100644 --- a/MBAssets3/ext_data/npcs/stormtrooper.npc +++ b/MBAssets3/ext_data/npcs/stormtrooper.npc @@ -1,4 +1,4 @@ -//NNN: The main enemy throughout JKO/JKA, comes in several variants, normal ST with radomize with the 2 variant for mixing up sounds +//NNN: The main enemy throughout JKO/JKA, comes in several variants, the normal E-11 one is radomized with the 2 variant for mixing up sounds StormTrooper { playerModel stormtrooper diff --git a/MBAssets3/ext_data/npcs/swamptrooper.npc b/MBAssets3/ext_data/npcs/swamptrooper.npc index 78cf9deb5..9d5288658 100644 --- a/MBAssets3/ext_data/npcs/swamptrooper.npc +++ b/MBAssets3/ext_data/npcs/swamptrooper.npc @@ -1,3 +1,4 @@ +//NNN: Advanced stormtroopers only seen in JKO yavin_swamp SwampTrooper { playerModel swamptrooper diff --git a/MBAssets3/ext_data/npcs/tavion.npc b/MBAssets3/ext_data/npcs/tavion.npc index 45e4accaf..dae21df82 100644 --- a/MBAssets3/ext_data/npcs/tavion.npc +++ b/MBAssets3/ext_data/npcs/tavion.npc @@ -2,6 +2,7 @@ Tavion { playerModel tavion + MBClass 5 rank commander saber tavion saberColor red @@ -14,7 +15,7 @@ Tavion forcePowerMax 200 Pbchance 40 MBchance 4 - SBchance 70 + SBchance 80 saberStyle 5 FP_HEAL 0 FP_LEVITATION 3 @@ -57,10 +58,11 @@ Tavion dismemberProbWaist 0 } -//NNN: Used in JKA for Tavion +//NNN: Used in JKA for most appreances of Tavion Tavion_new { playerModel tavion_new + MBClass 5 rank commander saber tavion saberColor red @@ -73,7 +75,7 @@ Tavion_new forcePowerMax 200 Pbchance 40 MBchance 4 - SBchance 70 + SBchance 90 saberStyle 5 FP_HEAL 0 FP_LEVITATION 3 @@ -120,6 +122,7 @@ Tavion_new Tavion_scepter { playerModel tavion_new + MBClass 5 rank commander saber tavion saberColor red @@ -135,7 +138,7 @@ Tavion_scepter forceRegenAmount 2 Pbchance 40 MBchance 4 - SBchance 70 + SBchance 90 saberStyle 6 health 1000 FP_HEAL 0 @@ -181,6 +184,7 @@ Tavion_sith_sword { playerModel tavion_new customSkin possessed + MBClass 5 rank captain weapon WP_SABER MB_ATT_FORCEBLOCK 3 @@ -192,7 +196,7 @@ Tavion_sith_sword forceRegenAmount 2 Pbchance 40 MBchance 4 - SBchance 70 + SBchance 90 saber sith_sword_legends saberStyle 4 health 1000 diff --git a/MBAssets3/ext_data/npcs/trandoshan.npc b/MBAssets3/ext_data/npcs/trandoshan.npc index 207c1b0a6..9ea81fd1f 100644 --- a/MBAssets3/ext_data/npcs/trandoshan.npc +++ b/MBAssets3/ext_data/npcs/trandoshan.npc @@ -1,4 +1,4 @@ -//NNN: JKO/JKA thug with WP_REPEATER, in mb2 they have healing and more HP to better repersent their species +//NNN: JKO/JKA thug with WP_REPEATER, in MB2 they have Healing and more HP to better repersent their species Trandoshan { playerModel trandoshan diff --git a/MBAssets3/ext_data/npcs/tusken.npc b/MBAssets3/ext_data/npcs/tusken.npc index 78a963f85..5c0071c4a 100644 --- a/MBAssets3/ext_data/npcs/tusken.npc +++ b/MBAssets3/ext_data/npcs/tusken.npc @@ -1,4 +1,4 @@ -//NNN: Used in JKA t1_surprise, currenlty setup as saberists and disruptor snipers as their weapons don't exist in MB2. Also set to TEAM_PLAYER, as the TEAM_FREE AI doesn't work correctly +//NNN: Used in JKA t1_surprise, setup as saberists and disruptor snipers as their base weapons don't exist in MB2. Also set to TEAM_PLAYER, as the TEAM_FREE AI doesn't work correctly tusken { playerModel tusken diff --git a/MBAssets3/ext_data/npcs/ubermouse.npc b/MBAssets3/ext_data/npcs/ubermouse.npc deleted file mode 100644 index e69de29bb..000000000 diff --git a/MBAssets3/ext_data/npcs/younglings.npc b/MBAssets3/ext_data/npcs/younglings.npc index f6f881e2e..a12e57828 100644 --- a/MBAssets3/ext_data/npcs/younglings.npc +++ b/MBAssets3/ext_data/npcs/younglings.npc @@ -1,4 +1,4 @@ - +//NNN: Objs for mb2_jeditemple jedikid { fullName "jedi kid" diff --git a/MBAssets3/ext_data/vehicles/droideka.veh b/MBAssets3/ext_data/vehicles/droideka.veh index 4f2e78a2e..d639c5b25 100644 --- a/MBAssets3/ext_data/vehicles/droideka.veh +++ b/MBAssets3/ext_data/vehicles/droideka.veh @@ -15,7 +15,7 @@ speedMax 500 speedMin -80 acceleration 8 decelIdle 10 -strafePerc 0.5 +strafePerc 1 bankingSpeed 0.0 rollLimit 2 pitchLimit 0 @@ -28,7 +28,7 @@ traction 100 friction 100 maxSlope 0.7 mass 10 -armor 450 +armor 260 toughness 10 model droideka skin default diff --git a/MBAssets3/ext_data/vehicles/droideka2.veh b/MBAssets3/ext_data/vehicles/droideka2.veh index cfd40a134..caf4abf17 100644 --- a/MBAssets3/ext_data/vehicles/droideka2.veh +++ b/MBAssets3/ext_data/vehicles/droideka2.veh @@ -15,7 +15,7 @@ speedMax 500 speedMin -80 acceleration 8 decelIdle 10 -strafePerc 0.5 +strafePerc 1 bankingSpeed 0.0 rollLimit 2 pitchLimit 0 @@ -28,7 +28,7 @@ traction 100 friction 100 maxSlope 0.7 mass 10 -armor 450 +armor 260 toughness 10 model droideka skin bronze diff --git a/MBAssets3/ext_data/vehicles/droideka3.veh b/MBAssets3/ext_data/vehicles/droideka3.veh index dba84fbf7..12aac762a 100644 --- a/MBAssets3/ext_data/vehicles/droideka3.veh +++ b/MBAssets3/ext_data/vehicles/droideka3.veh @@ -15,7 +15,7 @@ speedMax 500 speedMin -80 acceleration 8 decelIdle 10 -strafePerc 0.5 +strafePerc 1 bankingSpeed 0.0 rollLimit 2 pitchLimit 0 @@ -28,7 +28,7 @@ traction 100 friction 100 maxSlope 0.7 mass 10 -armor 450 +armor 260 toughness 10 model droideka skin elite diff --git a/MBAssets3/ext_data/vehicles/droideka4.veh b/MBAssets3/ext_data/vehicles/droideka4.veh index d6bd4786c..9e73a84ee 100644 --- a/MBAssets3/ext_data/vehicles/droideka4.veh +++ b/MBAssets3/ext_data/vehicles/droideka4.veh @@ -15,7 +15,7 @@ speedMax 500 speedMin -80 acceleration 8 decelIdle 10 -strafePerc 0.5 +strafePerc 1 bankingSpeed 0.0 rollLimit 2 pitchLimit 0 @@ -28,7 +28,7 @@ traction 100 friction 100 maxSlope 0.7 mass 10 -armor 450 +armor 260 toughness 10 model droideka skin black diff --git a/MBAssets3/ext_data/vehicles/droideka5.veh b/MBAssets3/ext_data/vehicles/droideka5.veh index e1d65f3ad..f287d626e 100644 --- a/MBAssets3/ext_data/vehicles/droideka5.veh +++ b/MBAssets3/ext_data/vehicles/droideka5.veh @@ -15,7 +15,7 @@ speedMax 500 speedMin -80 acceleration 8 decelIdle 10 -strafePerc 0.5 +strafePerc 1 bankingSpeed 0.0 rollLimit 2 pitchLimit 0 @@ -28,7 +28,7 @@ traction 100 friction 100 maxSlope 0.7 mass 10 -armor 450 +armor 260 toughness 10 model droideka skin silver diff --git a/MBAssets3/ext_data/vehicles/droideka6.veh b/MBAssets3/ext_data/vehicles/droideka6.veh index 7cfef90dd..653d63abc 100644 --- a/MBAssets3/ext_data/vehicles/droideka6.veh +++ b/MBAssets3/ext_data/vehicles/droideka6.veh @@ -15,7 +15,7 @@ speedMax 500 speedMin -80 acceleration 8 decelIdle 10 -strafePerc 0.5 +strafePerc 1 bankingSpeed 0.0 rollLimit 2 pitchLimit 0 @@ -28,7 +28,7 @@ traction 100 friction 100 maxSlope 0.7 mass 10 -armor 450 +armor 260 toughness 10 model droideka skin white diff --git a/MBAssets3/ext_data/vehicles/droideka7.veh b/MBAssets3/ext_data/vehicles/droideka7.veh index 42f8d6d1a..aefc7ff67 100644 --- a/MBAssets3/ext_data/vehicles/droideka7.veh +++ b/MBAssets3/ext_data/vehicles/droideka7.veh @@ -15,7 +15,7 @@ speedMax 500 speedMin -80 acceleration 8 decelIdle 10 -strafePerc 0.5 +strafePerc 1 bankingSpeed 0.0 rollLimit 2 pitchLimit 0 @@ -28,7 +28,7 @@ traction 100 friction 100 maxSlope 0.7 mass 10 -armor 450 +armor 260 toughness 10 model droideka skin bedlam diff --git a/MBAssets3/ext_data/vehicles/droideka_legends.veh b/MBAssets3/ext_data/vehicles/droideka_legends.veh index 06b9f7f06..21e3fa8e8 100644 --- a/MBAssets3/ext_data/vehicles/droideka_legends.veh +++ b/MBAssets3/ext_data/vehicles/droideka_legends.veh @@ -15,7 +15,7 @@ speedMax 500 speedMin -80 acceleration 8 decelIdle 10 -strafePerc 0.5 +strafePerc 1 bankingSpeed 0.0 rollLimit 2 pitchLimit 0 @@ -28,7 +28,7 @@ traction 100 friction 100 maxSlope 0.9 mass 40 -armor 500 +armor 260 toughness 20 model droideka skin default diff --git a/MBAssets3/maps/mb2_citadel.siege b/MBAssets3/maps/mb2_citadel.siege index f26c0eab7..4e78407ff 100644 --- a/MBAssets3/maps/mb2_citadel.siege +++ b/MBAssets3/maps/mb2_citadel.siege @@ -10,14 +10,18 @@ LevelshotDesc { desc1 { - text "Obj: Defend the capture points, do not let the rebel infiltrators into the Vault!" + text "Without the Project Stardust plans the Alliance is doomed. Keep the Data Cores intact until our data upload to the fleet finishes! + +For Jedha!" rect "410 147 220 55" scale 0.125 } desc2 { - text "Obj: Capture 2 points and then get into the vault! There is a security panel which opens up the blue doors." + text "Rebels have hijacked the Data Vault and are uploading to their fleet. Get to the vault and then destroy/erase the data by any means neccessary. + +Deploy the Garrison!" rect "410 258 220 55" scale 0.125 @@ -179,28 +183,27 @@ HelpIcons end0 "unlock_side_icon" end1 "midaccess_imp_lowpop" end2 "zonescaptured_2" - origin "93 1242 89" // Hack side doors on high pop + origin "54 1088 128" // Hack side doors on high pop blueicon HLP_HACK specicon HLP_HACK radius 1500 } - HelpIcon12 { - end0 "sidedoor_gen_unlock" - end1 "zonescaptured_1" - origin "-180 -2910 98" // Hack side doors on high pop + start0 "sidedoor_unlockyay" + end0 "hangersidebridge_relay"// Hack the thing to open the big side doors + origin "-1166 1044 88" blueicon HLP_HACK specicon HLP_HACK radius 1500 } - - HelpIcon13 + + HelpIcon13 { start0 "sidedoor_unlockyay" end0 "hangersidebridge_relay"// Hack the thing to open the big side doors - origin "-1166 1044 88" + origin "-1870 1330 98" blueicon HLP_HACK specicon HLP_HACK radius 1500 @@ -210,7 +213,7 @@ HelpIcons { end0 "zonescaptured_1" end1 "meunlock_blue_side" - //end2 "sidedoor_gen_unlock" + end1 "meunlock_blue_main" origin "48 -2368 48" // Hack the thing to unlock blue doors blueicon HLP_HACK specicon HLP_HACK @@ -221,6 +224,7 @@ HelpIcons { end0 "zonescaptured_1" end1 "meunlock_blue_main" + end2 "meunlock_blue_side" //end2 "sidedoor_gen_unlock" origin "1877 -1894 192" // Hack the thing to unlock blue doors blueicon HLP_HACK diff --git a/MBAssets3/models/players/4lom/animevents.cfg b/MBAssets3/models/players/4lom/animevents.cfg index b4b4ab83d..38e99bf0b 100644 --- a/MBAssets3/models/players/4lom/animevents.cfg +++ b/MBAssets3/models/players/4lom/animevents.cfg @@ -149,10 +149,10 @@ UPPEREVENTS BOTH_SHOWOFF_DUAL AEV_SOUNDCHAN 13 CHAN_AUTO sound/weapons/saber/saber_catch.mp3 0 0 0 BOTH_SHOWOFF_DUAL AEV_SOUNDCHAN 6 CHAN_WEAPON sound/weapons/saber/saberspin.wav 0 0 0 //saber_clash isn't used anywhere else so use saber_block and extra sounds to save on FX -// BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_clash.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_block.efx *blade1 0 @@ -256,10 +256,10 @@ UPPEREVENTS BOTH_V6_T__S6 AEV_SOUNDCHAN 3 CHAN_AUTO sound/weapons/saber/saberhup%d.wav 1 3 0 //saber_clash isn't used anywhere else so use saber_block and extra sounds to save on FX // BOTH_VICTORY_DUAL AEV_SOUNDCHAN 4 CHAN_WEAPON sound/weapons/saber/saberspin.wav 0 0 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_clash.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_block.efx *blade1 0 BOTH_VICTORY_DUAL AEV_SOUNDCHAN 15 CHAN_AUTO sound/weapons/saber/saberblock3.mp3 0 0 0 BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_block.efx *blade1 0 BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_block.efx *blade1 0 diff --git a/MBAssets3/models/players/Kino/animevents.cfg b/MBAssets3/models/players/Kino/animevents.cfg index fc218fe2e..54a7e0686 100644 --- a/MBAssets3/models/players/Kino/animevents.cfg +++ b/MBAssets3/models/players/Kino/animevents.cfg @@ -148,10 +148,10 @@ UPPEREVENTS BOTH_SHOWOFF_DUAL AEV_SOUNDCHAN 13 CHAN_AUTO sound/weapons/saber/saber_catch.mp3 0 0 0 BOTH_SHOWOFF_DUAL AEV_SOUNDCHAN 6 CHAN_WEAPON sound/weapons/saber/saberspin.wav 0 0 0 //saber_clash isn't used anywhere else so use saber_block and extra sounds to save on FX -// BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_clash.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_block.efx *blade1 0 @@ -255,10 +255,10 @@ UPPEREVENTS BOTH_V6_T__S6 AEV_SOUNDCHAN 3 CHAN_AUTO sound/weapons/saber/saberhup%d.wav 1 3 0 //saber_clash isn't used anywhere else so use saber_block and extra sounds to save on FX // BOTH_VICTORY_DUAL AEV_SOUNDCHAN 4 CHAN_WEAPON sound/weapons/saber/saberspin.wav 0 0 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_clash.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_block.efx *blade1 0 BOTH_VICTORY_DUAL AEV_SOUNDCHAN 15 CHAN_AUTO sound/weapons/saber/saberblock3.mp3 0 0 0 BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_block.efx *blade1 0 BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_block.efx *blade1 0 diff --git a/MBAssets3/models/players/asajj_cw/saberauth.cfg b/MBAssets3/models/players/asajj_cw/saberauth.cfg new file mode 100644 index 000000000..13037bfb8 --- /dev/null +++ b/MBAssets3/models/players/asajj_cw/saberauth.cfg @@ -0,0 +1,7 @@ +all_sabers +saber_asajj2 +1.0 +saber_asajj2 +1.0 +saber_asajj2 +1.0 \ No newline at end of file diff --git a/MBAssets3/models/players/bastila/model_default.skin b/MBAssets3/models/players/bastila/model_default.skin index 464f5dddb..0482ab73b 100644 --- a/MBAssets3/models/players/bastila/model_default.skin +++ b/MBAssets3/models/players/bastila/model_default.skin @@ -1,41 +1,37 @@ head,models/players/bastila/head.tga +head_back,models/players/bastila/hair.tga +head_hair,models/players/bastila/hair.tga +head_hair_b,*off +head_hairtie,models/players/bastila/hairtie.tga +head_eyes_mouth,models/players/common/mouth_eyes8.tga +head_neckpiece,models/players/bastila/extras.tga +hips,models/players/bastila/body_classic.tga +hips_belt,models/players/bastila/extras.tga +hips_buckle,*off +l_arm,models/players/bastila/body_classic.tga +l_hand,models/players/bastila/boots_hands.tga +l_leg,models/players/bastila/boots_hands.tga +r_arm,models/players/bastila/body_classic.tga +r_hand,models/players/bastila/boots_hands.tga +r_leg,models/players/bastila/boots_hands.tga +torso,models/players/bastila/body_classic.tga +torso_augment,models/players/bastila/body_classic.tga +torso_layers,models/players/bastila/layers.tga +hips_layers,models/players/bastila/layers.tga -torso,models/players/bastila/body.tga -l_arm,models/players/bastila/body.tga -l_hand,models/players/bastila/body.tga -r_hand,models/players/bastila/body.tga -r_arm,models/players/bastila/body.tga - -hips,models/players/bastila/body.tga -r_leg,models/players/bastila/body.tga -l_leg,models/players/bastila/body.tga - -hipsb,*off -torsob,*off -l_armb,*off -r_armb,*off -headb,*off - -head_hood,*off -hips_jedi_robe,*off -torso_jedi_robe,*off -torso_jedi_robe_hood,*off -l_arm_jedi_robe,*off -r_arm_jedi_robe,*off - -hips_cap_l_leg_off,models/players/stormtrooper/caps.tga -hips_cap_torso_off,models/players/stormtrooper/caps.tga -hips_cap_r_leg_off,models/players/stormtrooper/caps.tga -l_leg_cap_hips_off,models/players/stormtrooper/caps.tga r_leg_cap_hips_off,models/players/stormtrooper/caps.tga -r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga -r_arm_cap_torso_off,models/players/stormtrooper/caps.tga -r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga +l_leg_cap_hips_off,models/players/stormtrooper/caps.tga l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga -l_arm_cap_torso_off,models/players/stormtrooper/caps.tga l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga +l_arm_cap_torso_off,models/players/stormtrooper/caps.tga +r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga +r_arm_cap_torso_off,models/players/stormtrooper/caps.tga +r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga torso_cap_head_off,models/players/stormtrooper/caps.tga torso_cap_hips_off,models/players/stormtrooper/caps.tga torso_cap_l_arm_off,models/players/stormtrooper/caps.tga torso_cap_r_arm_off,models/players/stormtrooper/caps.tga +hips_cap_l_leg_off,models/players/stormtrooper/caps.tga +hips_cap_torso_off,models/players/stormtrooper/caps.tga +hips_cap_r_leg_off,models/players/stormtrooper/caps.tga head_cap_torso_off,models/players/stormtrooper/caps.tga diff --git a/MBAssets3/models/players/bastila/model_sith.skin b/MBAssets3/models/players/bastila/model_sith.skin index cdf2fc449..eb1e857d2 100644 --- a/MBAssets3/models/players/bastila/model_sith.skin +++ b/MBAssets3/models/players/bastila/model_sith.skin @@ -1,41 +1,37 @@ head,models/players/bastila/head_sith.tga - -torso,models/players/bastila/body_sith.tga +head_back,models/players/bastila/hair_sith.tga +head_hair,*off +head_hair_b,models/players/bastila/hair_sith.tga +head_hairtie,models/players/bastila/hairtie.tga +head_eyes_mouth,models/players/common/mouth_eyes8.tga +head_neckpiece,models/players/bastila/extras_sith.tga +hips,models/players/bastila/body_sith.tga +hips_belt,models/players/bastila/extras_sith.tga +hips_buckle,*off l_arm,models/players/bastila/body_sith.tga -l_hand,models/players/bastila/body_sith.tga -r_hand,models/players/bastila/body_sith.tga +l_hand,models/players/bastila/boots_hands_sith.tga +l_leg,models/players/bastila/boots_hands_sith.tga r_arm,models/players/bastila/body_sith.tga +r_hand,models/players/bastila/boots_hands_sith.tga +r_leg,models/players/bastila/boots_hands_sith.tga +torso,models/players/bastila/body_sith.tga +torso_augment,models/players/bastila/body_sith.tga +torso_layers,models/players/bastila/layers_sith.tga +hips_layers,models/players/bastila/layers_sith.tga -hips,models/players/bastila/body_sith.tga -r_leg,models/players/bastila/body_sith.tga -l_leg,models/players/bastila/body_sith.tga - -hipsb,*off -torsob,*off -l_armb,*off -r_armb,*off -headb,*off - -head_hood,*off -hips_jedi_robe,*off -torso_jedi_robe,*off -torso_jedi_robe_hood,*off -l_arm_jedi_robe,*off -r_arm_jedi_robe,*off - -hips_cap_l_leg_off,models/players/stormtrooper/caps.tga -hips_cap_torso_off,models/players/stormtrooper/caps.tga -hips_cap_r_leg_off,models/players/stormtrooper/caps.tga -l_leg_cap_hips_off,models/players/stormtrooper/caps.tga r_leg_cap_hips_off,models/players/stormtrooper/caps.tga -r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga -r_arm_cap_torso_off,models/players/stormtrooper/caps.tga -r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga +l_leg_cap_hips_off,models/players/stormtrooper/caps.tga l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga -l_arm_cap_torso_off,models/players/stormtrooper/caps.tga l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga +l_arm_cap_torso_off,models/players/stormtrooper/caps.tga +r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga +r_arm_cap_torso_off,models/players/stormtrooper/caps.tga +r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga torso_cap_head_off,models/players/stormtrooper/caps.tga torso_cap_hips_off,models/players/stormtrooper/caps.tga torso_cap_l_arm_off,models/players/stormtrooper/caps.tga torso_cap_r_arm_off,models/players/stormtrooper/caps.tga +hips_cap_l_leg_off,models/players/stormtrooper/caps.tga +hips_cap_torso_off,models/players/stormtrooper/caps.tga +hips_cap_r_leg_off,models/players/stormtrooper/caps.tga head_cap_torso_off,models/players/stormtrooper/caps.tga diff --git a/MBAssets3/models/players/bastila/model_yellow.skin b/MBAssets3/models/players/bastila/model_yellow.skin new file mode 100644 index 000000000..efd6ea4a9 --- /dev/null +++ b/MBAssets3/models/players/bastila/model_yellow.skin @@ -0,0 +1,37 @@ +head,models/players/bastila/head.tga +head_back,models/players/bastila/hair.tga +head_hair,models/players/bastila/hair.tga +head_hair_b,*off +head_hairtie,models/players/bastila/hairtie.tga +head_eyes_mouth,models/players/common/mouth_eyes8.tga +head_neckpiece,models/players/bastila/extras.tga +hips,models/players/bastila/body.tga +hips_belt,models/players/bastila/extras.tga +hips_buckle,*off +l_arm,models/players/bastila/body.tga +l_hand,models/players/bastila/boots_hands.tga +l_leg,models/players/bastila/boots_hands.tga +r_arm,models/players/bastila/body.tga +r_hand,models/players/bastila/boots_hands.tga +r_leg,models/players/bastila/boots_hands.tga +torso,models/players/bastila/body.tga +torso_augment,models/players/bastila/body.tga +torso_layers,models/players/bastila/layers.tga +hips_layers,models/players/bastila/layers.tga + +r_leg_cap_hips_off,models/players/stormtrooper/caps.tga +l_leg_cap_hips_off,models/players/stormtrooper/caps.tga +l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga +l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga +l_arm_cap_torso_off,models/players/stormtrooper/caps.tga +r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga +r_arm_cap_torso_off,models/players/stormtrooper/caps.tga +r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga +torso_cap_head_off,models/players/stormtrooper/caps.tga +torso_cap_hips_off,models/players/stormtrooper/caps.tga +torso_cap_l_arm_off,models/players/stormtrooper/caps.tga +torso_cap_r_arm_off,models/players/stormtrooper/caps.tga +hips_cap_l_leg_off,models/players/stormtrooper/caps.tga +hips_cap_torso_off,models/players/stormtrooper/caps.tga +hips_cap_r_leg_off,models/players/stormtrooper/caps.tga +head_cap_torso_off,models/players/stormtrooper/caps.tga diff --git a/MBAssets3/models/players/battledroid/animevents.cfg b/MBAssets3/models/players/battledroid/animevents.cfg index 1d456cf79..7616b217c 100644 --- a/MBAssets3/models/players/battledroid/animevents.cfg +++ b/MBAssets3/models/players/battledroid/animevents.cfg @@ -149,10 +149,10 @@ UPPEREVENTS BOTH_SHOWOFF_DUAL AEV_SOUNDCHAN 13 CHAN_AUTO sound/weapons/saber/saber_catch.mp3 0 0 0 BOTH_SHOWOFF_DUAL AEV_SOUNDCHAN 6 CHAN_WEAPON sound/weapons/saber/saberspin.wav 0 0 0 //saber_clash isn't used anywhere else so use saber_block and extra sounds to save on FX -// BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_clash.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_block.efx *blade1 0 @@ -256,10 +256,10 @@ UPPEREVENTS BOTH_V6_T__S6 AEV_SOUNDCHAN 3 CHAN_AUTO sound/weapons/saber/saberhup%d.wav 1 3 0 //saber_clash isn't used anywhere else so use saber_block and extra sounds to save on FX // BOTH_VICTORY_DUAL AEV_SOUNDCHAN 4 CHAN_WEAPON sound/weapons/saber/saberspin.wav 0 0 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_clash.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_block.efx *blade1 0 BOTH_VICTORY_DUAL AEV_SOUNDCHAN 15 CHAN_AUTO sound/weapons/saber/saberblock3.mp3 0 0 0 BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_block.efx *blade1 0 BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_block.efx *blade1 0 diff --git a/MBAssets3/models/players/bodhi/holster.cfg b/MBAssets3/models/players/bodhi/holster.cfg index 42eafa9f5..e623baeb9 100644 --- a/MBAssets3/models/players/bodhi/holster.cfg +++ b/MBAssets3/models/players/bodhi/holster.cfg @@ -1,14 +1,14 @@ { holsterType HLR_SINGLESABER_1 boneIndex HOLSTER_RIGHTHIP - posOffset "3, -2, 0" - angOffset "10, 10, -8" + posOffset "2, -3, 7" + angOffset "0, 0, 0" } { holsterType HLR_SINGLESABER_2 boneIndex HOLSTER_LEFTHIP - posOffset "-2.5, -3.5, 0" + posOffset "-1.5, -2.8, 7" angOffset "0, 0, 0" } @@ -29,8 +29,8 @@ { holsterType HLR_PISTOL_R boneIndex HOLSTER_RIGHTHIP - posOffset "3, 2, 2" - angOffset "90, 0, 0" + posOffset "5, 3, 0" + angOffset "90, -10, 0" } { @@ -43,7 +43,7 @@ { holsterType HLR_BLASTER_R boneIndex HOLSTER_RIGHTHIP - posOffset "3.5, 2, 2" + posOffset "4.5, 5, 2" angOffset "90, 0, 0" } @@ -57,34 +57,34 @@ { holsterType HLR_REPEATER boneIndex HOLSTER_UPPERBACK - posOffset "-5, -3, 0" - angOffset "-40, 0, 0" + posOffset "-3, 10, -6" + angOffset "0, 178, -90" } { holsterType HLR_FLECHETTE boneIndex HOLSTER_UPPERBACK - posOffset "-6, -3, 0" - angOffset "-40, 0, 0" + posOffset "-3, 10, -6" + angOffset "0, 178, -90" } { holsterType HLR_DISRUPTOR boneIndex HOLSTER_UPPERBACK - posOffset "-6.1, -8, 4" - angOffset "-40, 0, 0" + posOffset "-3, 10, -6" + angOffset "0, 178, -90" } { holsterType HLR_T21 boneIndex HOLSTER_UPPERBACK - posOffset "-5, -7, 3" - angOffset "-40, 0, 0" + posOffset "-3, 10, -6" + angOffset "0, 178, -90" } { holsterType HLR_PROJ boneIndex HOLSTER_UPPERBACK - posOffset "-6.3, -7, 3" - angOffset "-40, 0, 0" + posOffset "-3, 10, -6" + angOffset "0, 178, -90" } \ No newline at end of file diff --git a/MBAssets3/models/players/bodhi/model_default.skin b/MBAssets3/models/players/bodhi/model_default.skin index a5916fd2a..b70c644ec 100644 --- a/MBAssets3/models/players/bodhi/model_default.skin +++ b/MBAssets3/models/players/bodhi/model_default.skin @@ -1,17 +1,19 @@ -hips,models/players/bodhi/body.tga -r_leg,models/players/bodhi/body.tga -l_leg,models/players/bodhi/body.tga +head,models/players/bodhi/head.tga +head_goggles,models/players/bodhi/head.tga + torso,models/players/bodhi/body.tga +torso_backpack,models/players/bodhi/head.tga +torso_backpack2,models/players/bodhi/head.tga r_arm,models/players/bodhi/body.tga r_hand,models/players/bodhi/head.tga l_arm,models/players/bodhi/body.tga l_hand,models/players/bodhi/head.tga -head,models/players/bodhi/head.tga -hair,models/players/bodhi/head.tga -backpack,models/players/bodhi/head.tga -backpack2,models/players/bodhi/head.tga -goggle,models/players/bodhi/head.tga -eyes,models/players/bodhi/head.tga + +hips,models/players/bodhi/body.tga +r_leg,models/players/bodhi/body.tga +r_leg_boot,models/players/bodhi/head.tga +l_leg,models/players/bodhi/body.tga +l_leg_boot,models/players/bodhi/head.tga head_cap_torso_off,models/players/stormtrooper/caps.tga l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga diff --git a/MBAssets3/models/players/bxdroid/animevents.cfg b/MBAssets3/models/players/bxdroid/animevents.cfg index 1d456cf79..7616b217c 100644 --- a/MBAssets3/models/players/bxdroid/animevents.cfg +++ b/MBAssets3/models/players/bxdroid/animevents.cfg @@ -149,10 +149,10 @@ UPPEREVENTS BOTH_SHOWOFF_DUAL AEV_SOUNDCHAN 13 CHAN_AUTO sound/weapons/saber/saber_catch.mp3 0 0 0 BOTH_SHOWOFF_DUAL AEV_SOUNDCHAN 6 CHAN_WEAPON sound/weapons/saber/saberspin.wav 0 0 0 //saber_clash isn't used anywhere else so use saber_block and extra sounds to save on FX -// BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_clash.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_block.efx *blade1 0 @@ -256,10 +256,10 @@ UPPEREVENTS BOTH_V6_T__S6 AEV_SOUNDCHAN 3 CHAN_AUTO sound/weapons/saber/saberhup%d.wav 1 3 0 //saber_clash isn't used anywhere else so use saber_block and extra sounds to save on FX // BOTH_VICTORY_DUAL AEV_SOUNDCHAN 4 CHAN_WEAPON sound/weapons/saber/saberspin.wav 0 0 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_clash.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_block.efx *blade1 0 BOTH_VICTORY_DUAL AEV_SOUNDCHAN 15 CHAN_AUTO sound/weapons/saber/saberblock3.mp3 0 0 0 BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_block.efx *blade1 0 BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_block.efx *blade1 0 diff --git a/MBAssets3/models/players/darthvader/animevents_legends.cfg b/MBAssets3/models/players/darthvader/animevents_legends.cfg index 2519b5d1e..db0de1957 100644 --- a/MBAssets3/models/players/darthvader/animevents_legends.cfg +++ b/MBAssets3/models/players/darthvader/animevents_legends.cfg @@ -245,14 +245,14 @@ UPPEREVENTS BOTH_SHOWOFF_STRONG AEV_SOUNDCHAN 6 CHAN_AUTO sound/weapons/saber/saberspin.wav 0 0 0 BOTH_SHOWOFF_STRONG AEV_SOUNDCHAN 10 CHAN_AUTO sound/weapons/saber/saberspin.wav 0 0 0 BOTH_SHOWOFF_STRONG AEV_SOUNDCHAN 15 CHAN_AUTO sound/weapons/saber/saber_catch.mp3 0 0 0 - BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_clash.efx *blade1 0 - BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_clash.efx *blade1 0 - BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_clash.efx *blade1 0 - BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_clash.efx *blade1 0 - BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_clash.efx *blade1 0 - BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_clash.efx *blade1 0 - BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_clash.efx *blade1 0 - BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_clash.efx *blade1 0 + BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_block.efx *blade1 0 + BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_block.efx *blade1 0 + BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_block.efx *blade1 0 + BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_block.efx *blade1 0 + BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_block.efx *blade1 0 + BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_block.efx *blade1 0 + BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_block.efx *blade1 0 + BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_block.efx *blade1 0 BOTH_VICTORY_STAFF AEV_EFFECT 83 force/pushblur.efx *r_hand 0 BOTH_VICTORY_STAFF AEV_EFFECT 84 force/pushblur.efx *r_hand 0 BOTH_VICTORY_STAFF AEV_EFFECT 85 force/pushblur.efx *r_hand 0 @@ -267,7 +267,7 @@ UPPEREVENTS BOTH_VICTORY_STRONG AEV_EFFECT 65 force/pushblur.efx *r_hand 0 BOTH_VICTORY_STRONG AEV_EFFECT 66 force/pushblur.efx *r_hand 0 BOTH_VICTORY_STRONG AEV_EFFECT 67 force/pushblur.efx *r_hand 0 - BOTH_KYLE_MISS AEV_SOUNDCHAN 1 CHAN_AUTO *taunt%a.mp3 1 3 0 + BOTH_KYLE_MISS AEV_SOUNDCHAN 1 CHAN_AUTO *taunt%a.mp3 1 3 0 } LOWEREVENTS diff --git a/MBAssets3/models/players/dooku_pyjama/animevents.cfg b/MBAssets3/models/players/dooku_pyjama/animevents.cfg index 158c827b9..adf65e407 100644 --- a/MBAssets3/models/players/dooku_pyjama/animevents.cfg +++ b/MBAssets3/models/players/dooku_pyjama/animevents.cfg @@ -148,10 +148,10 @@ UPPEREVENTS BOTH_SHOWOFF_DUAL AEV_SOUNDCHAN 13 CHAN_AUTO sound/weapons/saber/saber_catch.mp3 0 0 0 BOTH_SHOWOFF_DUAL AEV_SOUNDCHAN 6 CHAN_WEAPON sound/weapons/saber/saberspin.wav 0 0 0 //saber_clash isn't used anywhere else so use saber_block and extra sounds to save on FX -// BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_clash.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_block.efx *blade1 0 @@ -255,10 +255,10 @@ UPPEREVENTS BOTH_V6_T__S6 AEV_SOUNDCHAN 3 CHAN_AUTO sound/weapons/saber/saberhup%d.wav 1 3 0 //saber_clash isn't used anywhere else so use saber_block and extra sounds to save on FX // BOTH_VICTORY_DUAL AEV_SOUNDCHAN 4 CHAN_WEAPON sound/weapons/saber/saberspin.wav 0 0 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_clash.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_block.efx *blade1 0 BOTH_VICTORY_DUAL AEV_SOUNDCHAN 15 CHAN_AUTO sound/weapons/saber/saberblock3.mp3 0 0 0 BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_block.efx *blade1 0 BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_block.efx *blade1 0 diff --git a/MBAssets3/models/players/grievous/animevents.cfg b/MBAssets3/models/players/grievous/animevents.cfg index 5c1873587..1d52886f5 100644 --- a/MBAssets3/models/players/grievous/animevents.cfg +++ b/MBAssets3/models/players/grievous/animevents.cfg @@ -149,10 +149,10 @@ UPPEREVENTS BOTH_SHOWOFF_DUAL AEV_SOUNDCHAN 13 CHAN_AUTO sound/weapons/saber/saber_catch.mp3 0 0 0 BOTH_SHOWOFF_DUAL AEV_SOUNDCHAN 6 CHAN_WEAPON sound/weapons/saber/saberspin.wav 0 0 0 //saber_clash isn't used anywhere else so use saber_block and extra sounds to save on FX -// BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_clash.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_block.efx *blade1 0 @@ -256,10 +256,10 @@ UPPEREVENTS BOTH_V6_T__S6 AEV_SOUNDCHAN 3 CHAN_AUTO sound/weapons/saber/saberhup%d.wav 1 3 0 //saber_clash isn't used anywhere else so use saber_block and extra sounds to save on FX // BOTH_VICTORY_DUAL AEV_SOUNDCHAN 4 CHAN_WEAPON sound/weapons/saber/saberspin.wav 0 0 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_clash.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_block.efx *blade1 0 BOTH_VICTORY_DUAL AEV_SOUNDCHAN 15 CHAN_AUTO sound/weapons/saber/saberblock3.mp3 0 0 0 BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_block.efx *blade1 0 BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_block.efx *blade1 0 diff --git a/MBAssets3/models/players/grievous/model_default.skin b/MBAssets3/models/players/grievous/model_default.skin index a93ffc99c..c4acea063 100644 --- a/MBAssets3/models/players/grievous/model_default.skin +++ b/MBAssets3/models/players/grievous/model_default.skin @@ -1,18 +1,38 @@ -hips,models/players/grievous/legs.tga -l_leg,models/players/grievous/legs.tga -l_leg_foot,models/players/grievous/feet.tga -r_leg_foot,models/players/grievous/feet.tga -r_leg,models/players/grievous/legs.tga -torso,models/players/grievous/torso.tga -l_arm,models/players/grievous/arms.tga -l_hand,models/players/grievous/hands.tga -r_arm,models/players/grievous/arms.tga -r_hand,models/players/grievous/hands.tga -head,models/players/grievous/head.tga +head,models/players/grievous/g02.tga +hips,models/players/grievous/g02.tga +l_arm,models/players/grievous/g01.tga +l_hand,models/players/grievous/g02.tga +l_leg,models/players/grievous/g02.tga +r_arm,models/players/grievous/g01.tga +r_hand,models/players/grievous/g02.tga +r_leg,models/players/grievous/g02.tga +torso,models/players/grievous/g01.tga +torso_gutsack,models/players/grievous/g03.tga -hips_sabers,models/players/grievous/sabers.tga -hips_gun,models/players/grievous/gun.tga +torso_cape,models/players/grievous/g_cape.tga +hips_cape,models/players/grievous/g_cape.tga -torso_plate,*off -torso_plate2,models/players/grievous/breastplate.tga -torso_cape,models/players/grievous/cape.tga \ No newline at end of file +torso_capeb,*off + +torsob,*off +l_armb,*off +l_handb,*off +r_armb,*off +r_handb,*off + +r_leg_cap_hips_off,models/players/stormtrooper/caps.tga +l_leg_cap_hips_off,models/players/stormtrooper/caps.tga +l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga +l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga +l_arm_cap_torso_off,models/players/stormtrooper/caps.tga +r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga +r_arm_cap_torso_off,models/players/stormtrooper/caps.tga +r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga +torso_cap_head_off,models/players/stormtrooper/caps.tga +torso_cap_hips_off,models/players/stormtrooper/caps.tga +torso_cap_l_arm_off,models/players/stormtrooper/caps.tga +torso_cap_r_arm_off,models/players/stormtrooper/caps.tga +hips_cap_l_leg_off,models/players/stormtrooper/caps.tga +hips_cap_torso_off,models/players/stormtrooper/caps.tga +hips_cap_r_leg_off,models/players/stormtrooper/caps.tga +head_cap_torso_off,models/players/stormtrooper/caps.tga diff --git a/mb2_cmp_assets3/models/players/jolee/model_default.skin b/MBAssets3/models/players/grievous/model_fourarms.skin similarity index 60% rename from mb2_cmp_assets3/models/players/jolee/model_default.skin rename to MBAssets3/models/players/grievous/model_fourarms.skin index 7df16ea9c..d4d39a394 100644 --- a/mb2_cmp_assets3/models/players/jolee/model_default.skin +++ b/MBAssets3/models/players/grievous/model_fourarms.skin @@ -1,14 +1,24 @@ -head,models/players/jolee/head.tga +head,models/players/grievous/g02.tga +hips,models/players/grievous/g02.tga +l_arm,*off +l_hand,off +l_leg,models/players/grievous/g02.tga +r_arm,*off +r_hand,off +r_leg,models/players/grievous/g02.tga +torso,*off +torso_gutsack,models/players/grievous/g03.tga -torso,models/players/jolee/body.tga -l_arm,models/players/jolee/body.tga -l_hand,models/players/jolee/body.tga -r_arm,models/players/jolee/body.tga -r_hand,models/players/jolee/body.tga +torso_cape,*off +hips_cape,*off -hips,models/players/jolee/body.tga -l_leg,models/players/jolee/body.tga -r_leg,models/players/jolee/body.tga +torso_capeb,*off + +torsob,models/players/grievous/g01.tga +l_armb,models/players/grievous/g01.tga +l_handb,models/players/grievous/g02.tga +r_armb,models/players/grievous/g01.tga +r_handb,models/players/grievous/g02.tga r_leg_cap_hips_off,models/players/stormtrooper/caps.tga l_leg_cap_hips_off,models/players/stormtrooper/caps.tga @@ -25,4 +35,4 @@ torso_cap_r_arm_off,models/players/stormtrooper/caps.tga hips_cap_l_leg_off,models/players/stormtrooper/caps.tga hips_cap_torso_off,models/players/stormtrooper/caps.tga hips_cap_r_leg_off,models/players/stormtrooper/caps.tga -head_cap_torso_off,models/players/stormtrooper/caps.tga \ No newline at end of file +head_cap_torso_off,models/players/stormtrooper/caps.tga diff --git a/MBAssets3/models/players/grievous/model_nocape.skin b/MBAssets3/models/players/grievous/model_nocape.skin index 2d5d6103b..1288f4373 100644 --- a/MBAssets3/models/players/grievous/model_nocape.skin +++ b/MBAssets3/models/players/grievous/model_nocape.skin @@ -1,18 +1,38 @@ -hips,models/players/grievous/legs.tga -l_leg,models/players/grievous/legs.tga -l_leg_foot,models/players/grievous/feet.tga -r_leg_foot,models/players/grievous/feet.tga -r_leg,models/players/grievous/legs.tga -torso,models/players/grievous/torso.tga -l_arm,models/players/grievous/arms.tga -l_hand,models/players/grievous/hands.tga -r_arm,models/players/grievous/arms.tga -r_hand,models/players/grievous/hands.tga -head,models/players/grievous/head.tga +head,models/players/grievous/g02.tga +hips,models/players/grievous/g02.tga +l_arm,models/players/grievous/g01.tga +l_hand,models/players/grievous/g02.tga +l_leg,models/players/grievous/g02.tga +r_arm,models/players/grievous/g01.tga +r_hand,models/players/grievous/g02.tga +r_leg,models/players/grievous/g02.tga +torso,models/players/grievous/g01.tga +torso_gutsack,models/players/grievous/g03.tga -hips_sabers, *off -hips_gun, *off +torso_cape,*off +hips_cape,*off -torso_plate,models/players/grievous/breastplate.tga -torso_plate2,*off -torso_cape,*off \ No newline at end of file +torso_capeb,*off + +torsob,*off +l_armb,*off +l_handb,*off +r_armb,*off +r_handb,*off + +r_leg_cap_hips_off,models/players/stormtrooper/caps.tga +l_leg_cap_hips_off,models/players/stormtrooper/caps.tga +l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga +l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga +l_arm_cap_torso_off,models/players/stormtrooper/caps.tga +r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga +r_arm_cap_torso_off,models/players/stormtrooper/caps.tga +r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga +torso_cap_head_off,models/players/stormtrooper/caps.tga +torso_cap_hips_off,models/players/stormtrooper/caps.tga +torso_cap_l_arm_off,models/players/stormtrooper/caps.tga +torso_cap_r_arm_off,models/players/stormtrooper/caps.tga +hips_cap_l_leg_off,models/players/stormtrooper/caps.tga +hips_cap_torso_off,models/players/stormtrooper/caps.tga +hips_cap_r_leg_off,models/players/stormtrooper/caps.tga +head_cap_torso_off,models/players/stormtrooper/caps.tga diff --git a/MBAssets3/models/players/grievous/model_oldcape.skin b/MBAssets3/models/players/grievous/model_oldcape.skin new file mode 100644 index 000000000..cde972d29 --- /dev/null +++ b/MBAssets3/models/players/grievous/model_oldcape.skin @@ -0,0 +1,38 @@ +head,models/players/grievous/g02.tga +hips,models/players/grievous/g02.tga +l_arm,models/players/grievous/g01.tga +l_hand,models/players/grievous/g02.tga +l_leg,models/players/grievous/g02.tga +r_arm,models/players/grievous/g01.tga +r_hand,models/players/grievous/g02.tga +r_leg,models/players/grievous/g02.tga +torso,models/players/grievous/g01.tga +torso_gutsack,models/players/grievous/g03.tga + +torso_cape,*off +hips_cape,*off + +torso_capeb,models/players/grievous/cape.tga + +torsob,*off +l_armb,*off +l_handb,*off +r_armb,*off +r_handb,*off + +r_leg_cap_hips_off,models/players/stormtrooper/caps.tga +l_leg_cap_hips_off,models/players/stormtrooper/caps.tga +l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga +l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga +l_arm_cap_torso_off,models/players/stormtrooper/caps.tga +r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga +r_arm_cap_torso_off,models/players/stormtrooper/caps.tga +r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga +torso_cap_head_off,models/players/stormtrooper/caps.tga +torso_cap_hips_off,models/players/stormtrooper/caps.tga +torso_cap_l_arm_off,models/players/stormtrooper/caps.tga +torso_cap_r_arm_off,models/players/stormtrooper/caps.tga +hips_cap_l_leg_off,models/players/stormtrooper/caps.tga +hips_cap_torso_off,models/players/stormtrooper/caps.tga +hips_cap_r_leg_off,models/players/stormtrooper/caps.tga +head_cap_torso_off,models/players/stormtrooper/caps.tga diff --git a/MBAssets3/models/players/grievous/model_worn.skin b/MBAssets3/models/players/grievous/model_worn.skin deleted file mode 100644 index b5a50f871..000000000 --- a/MBAssets3/models/players/grievous/model_worn.skin +++ /dev/null @@ -1,18 +0,0 @@ -hips,models/players/grievous/legs_worn.tga -l_leg,models/players/grievous/legs_worn.tga -l_leg_foot,models/players/grievous/feet.tga -r_leg_foot,models/players/grievous/feet.tga -r_leg,models/players/grievous/legs_worn.tga -torso,models/players/grievous/torso.tga -l_arm,models/players/grievous/arms_worn.tga -l_hand,models/players/grievous/hands_worn.tga -r_arm,models/players/grievous/arms_worn.tga -r_hand,models/players/grievous/hands_worn.tga -head,models/players/grievous/head_worn.tga - -hips_sabers,models/players/grievous/sabers.tga -hips_gun,models/players/grievous/gun.tga - -torso_plate,*off -torso_plate2,models/players/grievous/breastplate_worn.tga -torso_cape,models/players/grievous/cape.tga \ No newline at end of file diff --git a/MBAssets3/models/players/grievous/model_worn_nocape.skin b/MBAssets3/models/players/grievous/model_worn_nocape.skin deleted file mode 100644 index 234fc5496..000000000 --- a/MBAssets3/models/players/grievous/model_worn_nocape.skin +++ /dev/null @@ -1,18 +0,0 @@ -hips,models/players/grievous/legs_worn.tga -l_leg,models/players/grievous/legs_worn.tga -l_leg_foot,models/players/grievous/feet.tga -r_leg_foot,models/players/grievous/feet.tga -r_leg,models/players/grievous/legs_worn.tga -torso,models/players/grievous/torso.tga -l_arm,models/players/grievous/arms_worn.tga -l_hand,models/players/grievous/hands_worn.tga -r_arm,models/players/grievous/arms_worn.tga -r_hand,models/players/grievous/hands_worn.tga -head,models/players/grievous/head_worn.tga - -hips_sabers, *off -hips_gun, *off - -torso_plate,models/players/grievous/breastplate_worn.tga -torso_plate2,*off -torso_cape, *off \ No newline at end of file diff --git a/MBAssets3/models/players/grievous4/model_default.skin b/MBAssets3/models/players/grievous4/model_default.skin index e8d21d5d0..d4d39a394 100644 --- a/MBAssets3/models/players/grievous4/model_default.skin +++ b/MBAssets3/models/players/grievous4/model_default.skin @@ -1,25 +1,38 @@ -l_arm,models/players/grievous/arms.tga -l_arm_upper,models/players/grievous/arms.tga -l_hand,models/players/grievous/hands.tga -l_hand_upper_hand,models/players/grievous/hands.tga -l_leg,models/players/grievous/legs.tga -l_leg_foot,models/players/grievous/feet.tga -r_arm,models/players/grievous/arms.tga -r_arm_upper,models/players/grievous/arms.tga -r_hand,models/players/grievous/hands.tga -r_hand_upper_hand,models/players/grievous/hands.tga -r_leg,models/players/grievous/legs.tga -r_leg_foot,models/players/grievous/feet.tga -hips,models/players/grievous/legs.tga -torso,models/players/grievous/torso.tga -head,models/players/grievous4/head.tga +head,models/players/grievous/g02.tga +hips,models/players/grievous/g02.tga +l_arm,*off +l_hand,off +l_leg,models/players/grievous/g02.tga +r_arm,*off +r_hand,off +r_leg,models/players/grievous/g02.tga +torso,*off +torso_gutsack,models/players/grievous/g03.tga -hips_sabers,*off -hips_gun,*off - -torso_plate_l,models/players/grievous/breastplate.tga -torso_plate_r,models/players/grievous/breastplate.tga torso_cape,*off +hips_cape,*off + +torso_capeb,*off + +torsob,models/players/grievous/g01.tga +l_armb,models/players/grievous/g01.tga +l_handb,models/players/grievous/g02.tga +r_armb,models/players/grievous/g01.tga +r_handb,models/players/grievous/g02.tga -torso_shoulder_l,models/players/grievous4/shoulder.tga -torso_shoulder_r,models/players/grievous4/shoulder.tga +r_leg_cap_hips_off,models/players/stormtrooper/caps.tga +l_leg_cap_hips_off,models/players/stormtrooper/caps.tga +l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga +l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga +l_arm_cap_torso_off,models/players/stormtrooper/caps.tga +r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga +r_arm_cap_torso_off,models/players/stormtrooper/caps.tga +r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga +torso_cap_head_off,models/players/stormtrooper/caps.tga +torso_cap_hips_off,models/players/stormtrooper/caps.tga +torso_cap_l_arm_off,models/players/stormtrooper/caps.tga +torso_cap_r_arm_off,models/players/stormtrooper/caps.tga +hips_cap_l_leg_off,models/players/stormtrooper/caps.tga +hips_cap_torso_off,models/players/stormtrooper/caps.tga +hips_cap_r_leg_off,models/players/stormtrooper/caps.tga +head_cap_torso_off,models/players/stormtrooper/caps.tga diff --git a/MBAssets3/models/players/imperial_garrison/animsounds.cfg b/MBAssets3/models/players/imperial_garrison/animsounds.cfg deleted file mode 100644 index 31c0cfcdb..000000000 --- a/MBAssets3/models/players/imperial_garrison/animsounds.cfg +++ /dev/null @@ -1,92 +0,0 @@ -UPPERSOUNDS -{ - BOTH_RIGHTHANDCHOPPEDOFF 25 sound/chars/st1/misc/death%d.wav 1 3 30 - BOTH_RIGHTHANDCHOPPEDOFF 64 sound/chars/st1/misc/death%d.wav 1 3 0 - BOTH_RIGHTHANDCHOPPEDOFF 88 sound/chars/st1/misc/death%d.wav 1 3 30 - BOTH_RIGHTHANDCHOPPEDOFF 100 sound/chars/st1/misc/death%d.wav 1 3 30 - BOTH_RIGHTHANDCHOPPEDOFF 110 sound/chars/stormtrooper/bodyfall%d.wav 1 2 0 -} - -LOWERSOUNDS -{ - //walk1 - BOTH_WALK1 6 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_WALK1 20 sound/player/footsteps/clank%d.wav 1 4 0 - //walk1 - BOTH_WALK2 5 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_WALK2 18 sound/player/footsteps/clank%d.wav 1 4 0 - //fastwalk (run) - BOTH_RUN1 8 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_RUN1 20 sound/player/footsteps/clank%d.wav 1 4 0 - //fastwalk (run) - BOTH_RUN2 8 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_RUN2 20 sound/player/footsteps/clank%d.wav 1 4 0 - // - BOTH_RUNBACK1 3 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_RUNBACK1 8 sound/player/footsteps/clank%d.wav 1 4 0 - // - BOTH_WALKBACK1 3 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_WALKBACK1 10 sound/player/footsteps/clank%d.wav 1 4 0 - // - BOTH_RUNBACK2 3 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_RUNBACK2 8 sound/player/footsteps/clank%d.wav 1 4 0 - // - BOTH_WALKBACK2 3 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_WALKBACK2 10 sound/player/footsteps/clank%d.wav 1 4 0 - // - BOTH_WALL_RUN_LEFT 5 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_WALL_RUN_LEFT 9 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_WALL_RUN_LEFT 13 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_WALL_RUN_LEFT 17 sound/player/footsteps/clank%d.wav 1 4 0 - // - BOTH_WALL_RUN_RIGHT 5 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_WALL_RUN_RIGHT 9 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_WALL_RUN_RIGHT 13 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_WALL_RUN_RIGHT 17 sound/player/footsteps/clank%d.wav 1 4 0 - // - BOTH_WALL_FLIP_BACK1 1 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_WALL_FLIP_BACK1 3 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_WALL_FLIP_BACK1 7 sound/player/footsteps/clank%d.wav 1 4 0 - // - BOTH_DEATH1 13 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH2 13 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH3 15 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH4 19 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH5 19 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH6 14 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH7 13 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH8 17 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH9 21 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH9 40 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH10 26 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH10 52 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH11 19 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH11 40 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH12 14 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH13 12 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_DEATH13 17 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_DEATH13 33 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH13 49 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_DEATH13 50 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_DEATH14 24 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH15 15 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH15 43 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH16 25 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH17 43 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_DEATH17 50 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_DEATH17 56 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH18 20 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_DEATH18 21 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_DEATH18 38 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_DEATH18 68 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH19 20 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_DEATH19 21 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_DEATH19 38 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_DEATH19 68 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH20 33 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH21 34 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH22 6 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH23 6 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH24 15 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH25 15 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 -} \ No newline at end of file diff --git a/MBAssets3/models/players/imperial_garrison/model_default.skin b/MBAssets3/models/players/imperial_garrison/model_default.skin deleted file mode 100644 index 927549423..000000000 --- a/MBAssets3/models/players/imperial_garrison/model_default.skin +++ /dev/null @@ -1,52 +0,0 @@ -hips,models/players/imperial_garrison/legs.tga -hips_cap_l_leg_off,models/players/stormtrooper/caps.tga -hips_cap_r_leg_off,models/players/stormtrooper/caps.tga -hips_cap_torso_off,models/players/stormtrooper/caps.tga -hips_belt,models/players/imperial_army/boots_hips.tga -hips_belt_buckle,models/players/imperial_army/boots_hips.tga -hips_belt_pockets,models/players/imperial_army/boots_hips.tga -hips_holster_empty,*off - -l_leg,models/players/imperial_army/boots_hips.tga -l_leg_cap_hips_off,models/players/stormtrooper/caps.tga -r_leg,models/players/imperial_army/boots_hips.tga -r_leg_cap_hips_off,models/players/stormtrooper/caps.tga - -head,models/players/hs_imperial/head-olive-b.tga -head_face,models/players/hs_imperial/face5.tga -head_eyes,models/players/common/mouth_eyes2.tga -off_hat,models/players/hs_imperial/head-olive-b.tga - -l_arm,models/players/imperial_garrison/cloth.tga -l_hand,models/players/imperial_garrison/cloth.tga -l_hand_wrist,models/players/imperial_garrison/cloth.tga -r_arm,models/players/imperial_garrison/cloth.tga -r_hand,models/players/imperial_garrison/cloth.tga -r_hand_wrist,models/players/imperial_garrison/cloth.tga - -torso,models/players/imperial_garrison/cloth.tga -torso_chest_heavy,models/players/imperial_garrison/armor_sergeant.tga -torso_chest_heavy_augment,models/players/imperial_army/armor_heavy_augment.tga -torso_collar,models/players/imperial_garrison/cloth.tga - -torso_l_tricep,models/players/imperial_garrison/armor_sergeant.tga -torso_r_tricep,models/players/imperial_garrison/armor_sergeant.tga -torso_l_shoulder,models/players/imperial_garrison/armor_sergeant.tga -torso_r_shoulder,models/players/imperial_garrison/armor_sergeant.tga - -r_leg_cap_hips_off,models/players/stormtrooper/caps.tga -l_leg_cap_hips_off,models/players/stormtrooper/caps.tga -hips_cap_l_leg_off,models/players/stormtrooper/caps.tga -hips_cap_torso_off,models/players/stormtrooper/caps.tga -hips_cap_r_leg_off,models/players/stormtrooper/caps.tga -l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga -l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga -l_arm_cap_torso_off,models/players/stormtrooper/caps.tga -r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga -r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga -r_arm_cap_torso_off,models/players/stormtrooper/caps.tga -torso_cap_head_off,models/players/stormtrooper/caps.tga -torso_cap_hips_off,models/players/stormtrooper/caps.tga -torso_cap_l_arm_off,models/players/stormtrooper/caps.tga -torso_cap_r_arm_off,models/players/stormtrooper/caps.tga -head_cap_torso_off,models/players/stormtrooper/caps.tga \ No newline at end of file diff --git a/MBAssets3/models/players/jedi_tor/model_sith.skin b/MBAssets3/models/players/jedi_tor/model_sith.skin new file mode 100644 index 000000000..d6ed39510 --- /dev/null +++ b/MBAssets3/models/players/jedi_tor/model_sith.skin @@ -0,0 +1,34 @@ +hips,models/players/sith_eradicator/body.tga +hips_belt,models/players/sith_eradicator/body.tga +hips_robe,models/players/sith_eradicator/body_cull.tga +l_leg,models/players/sith_eradicator/body.tga +r_leg,models/players/sith_eradicator/body.tga +torso,models/players/sith_eradicator/body.tga +torso_robe,models/players/sith_eradicator/body_cull.tga +torso_hood,models/players/jedi_tor/hood_sith_cull.tga +l_arm,models/players/sith_eradicator/body.tga +l_hand,models/players/sith_eradicator/body.tga +r_arm,models/players/sith_eradicator/body.tga +r_hand,models/players/sith_eradicator/body.tga + +head,models/players/jedi_tor/head_face_aviar.tga +headb,*off +head_horns,*off +mouth_eyes,models/players/freedon_nadd/mouth_eyes.tga + +hips_cap_l_leg_off,models/players/stormtrooper/caps.tga +hips_cap_r_leg_off,models/players/stormtrooper/caps.tga +hips_cap_torso_off,models/players/stormtrooper/caps.tga +l_leg_cap_hips_off,models/players/stormtrooper/caps.tga +r_leg_cap_hips_off,models/players/stormtrooper/caps.tga +l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga +l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga +l_arm_cap_torso_off,models/players/stormtrooper/caps.tga +r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga +r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga +r_arm_cap_torso_off,models/players/stormtrooper/caps.tga +torso_cap_hips_off,models/players/stormtrooper/caps.tga +torso_cap_l_arm_off,models/players/stormtrooper/caps.tga +torso_cap_r_arm_off,models/players/stormtrooper/caps.tga +torso_cap_head_off,models/players/stormtrooper/caps.tga +head_cap_torso_off,models/players/stormtrooper/caps.tga \ No newline at end of file diff --git a/MBAssets3/models/players/jedi_tor/modeldata.cfg b/MBAssets3/models/players/jedi_tor/modeldata.cfg index 0ac5b1f06..9cfb5940c 100644 --- a/MBAssets3/models/players/jedi_tor/modeldata.cfg +++ b/MBAssets3/models/players/jedi_tor/modeldata.cfg @@ -6,6 +6,10 @@ sounds_default jedi_tor m +sounds_sith +sith_eradicator +m + // trueview offsetX "1.5" diff --git a/MBAssets3/models/players/jedi_tor/saberauth.cfg b/MBAssets3/models/players/jedi_tor/saberauth.cfg index 2da57e2cb..b49c45149 100644 --- a/MBAssets3/models/players/jedi_tor/saberauth.cfg +++ b/MBAssets3/models/players/jedi_tor/saberauth.cfg @@ -4,4 +4,12 @@ saber_ven satele 0.6277 none -0.0722 \ No newline at end of file +0.0722 + +sabers_sith +saber_marauder +1.0 +saber_marauder +1.0 +saber_marauder +1.0 \ No newline at end of file diff --git a/MBAssets3/models/players/jolee/model_default.skin b/MBAssets3/models/players/jolee/model_default.skin new file mode 100644 index 000000000..5b5237335 --- /dev/null +++ b/MBAssets3/models/players/jolee/model_default.skin @@ -0,0 +1,32 @@ +head,models/players/jolee/head.tga +head_eyes_mouth,models/players/kyle/mouth_eyes.tga +torso,models/players/jolee/robes.tga +torso_hood,models/players/jolee/hood.tga +torso_pads,models/players/jolee/shoulderpad.tga +r_hand,models/players/jolee/hands.tga +r_arm,models/players/jolee/robes_arms.tga +l_hand,models/players/jolee/hands.tga +l_arm,models/players/jolee/robes_arms.tga + +hips,models/players/jolee/legs.tga +hips_belt,models/players/jolee/boots_belt.tga +hips_lower_robe,models/players/jolee/lower_robe.tga +l_leg,models/players/jolee/boots_belt.tga +r_leg,models/players/jolee/boots_belt.tga + +head_cap_torso_off,models/players/stormtrooper/caps.tga +r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga +r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga +r_arm_cap_torso_off,models/players/stormtrooper/caps.tga +l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga +l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga +l_arm_cap_torso_off,models/players/stormtrooper/caps.tga +torso_cap_l_arm_off,models/players/stormtrooper/caps.tga +torso_cap_r_arm_off,models/players/stormtrooper/caps.tga +torso_cap_head_off,models/players/stormtrooper/caps.tga +torso_cap_hips_off,models/players/stormtrooper/caps.tga +l_leg_cap_hips_off,models/players/stormtrooper/caps.tga +r_leg_cap_hips_off,models/players/stormtrooper/caps.tga +hips_cap_torso_off,models/players/stormtrooper/caps.tga +hips_cap_l_leg_off,models/players/stormtrooper/caps.tga +hips_cap_r_leg_off,models/players/stormtrooper/caps.tga \ No newline at end of file diff --git a/mb2_cmp_assets3/models/players/jolee/modeldata.cfg b/MBAssets3/models/players/jolee/modeldata.cfg similarity index 100% rename from mb2_cmp_assets3/models/players/jolee/modeldata.cfg rename to MBAssets3/models/players/jolee/modeldata.cfg diff --git a/mb2_cmp_assets3/models/players/jolee/saberauth.cfg b/MBAssets3/models/players/jolee/saberauth.cfg similarity index 100% rename from mb2_cmp_assets3/models/players/jolee/saberauth.cfg rename to MBAssets3/models/players/jolee/saberauth.cfg diff --git a/MBAssets3/models/players/kitfisto_cw/animevents.cfg b/MBAssets3/models/players/kitfisto_cw/animevents.cfg index 158c827b9..adf65e407 100644 --- a/MBAssets3/models/players/kitfisto_cw/animevents.cfg +++ b/MBAssets3/models/players/kitfisto_cw/animevents.cfg @@ -148,10 +148,10 @@ UPPEREVENTS BOTH_SHOWOFF_DUAL AEV_SOUNDCHAN 13 CHAN_AUTO sound/weapons/saber/saber_catch.mp3 0 0 0 BOTH_SHOWOFF_DUAL AEV_SOUNDCHAN 6 CHAN_WEAPON sound/weapons/saber/saberspin.wav 0 0 0 //saber_clash isn't used anywhere else so use saber_block and extra sounds to save on FX -// BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_clash.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_block.efx *blade1 0 @@ -255,10 +255,10 @@ UPPEREVENTS BOTH_V6_T__S6 AEV_SOUNDCHAN 3 CHAN_AUTO sound/weapons/saber/saberhup%d.wav 1 3 0 //saber_clash isn't used anywhere else so use saber_block and extra sounds to save on FX // BOTH_VICTORY_DUAL AEV_SOUNDCHAN 4 CHAN_WEAPON sound/weapons/saber/saberspin.wav 0 0 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_clash.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_block.efx *blade1 0 BOTH_VICTORY_DUAL AEV_SOUNDCHAN 15 CHAN_AUTO sound/weapons/saber/saberblock3.mp3 0 0 0 BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_block.efx *blade1 0 BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_block.efx *blade1 0 diff --git a/MBAssets3/models/players/kreia/model_traya_hood.skin b/MBAssets3/models/players/kreia/model_traya_hood.skin new file mode 100644 index 000000000..c57dd7a77 --- /dev/null +++ b/MBAssets3/models/players/kreia/model_traya_hood.skin @@ -0,0 +1,39 @@ +hips,models/players/Kreia/robe_traya.tga +hips_bootzor,models/players/Kreia/boot_traya.tga +r_leg,models/players/Kreia/boot_traya.tga +l_leg,models/players/Kreia/boot_traya.tga +torsob,models/players/Kreia/robe_traya.tga +torsob_belt,models/players/Kreia/belt_traya.tga +head_hood,models/players/Kreia/robe_traya.tga +r_arm,models/players/Kreia/robe_traya.tga +r_arm_wrist,models/players/Kreia/basic_hand_traya.tga +r_hand,models/players/Kreia/basic_hand_traya.tga +l_arm,models/players/Kreia/robe_traya.tga +l_arm_wrist,models/players/Kreia/basic_hand_traya.tga +l_hand,models/players/Kreia/basic_hand_traya.tga +head,models/players/Kreia/head_traya.tga +head_hair,models/players/Kreia/head_traya.tga +head_face,models/players/Kreia/face_traya.tga +head_eyelids,models/players/Kreia/eye_traya.tga +head_eyes,models/players/Kreia/eye_traya.tga +head_face_mouth,models/players/common/mouth_eyes2.tga + +head_hood_traya,*off +torsoa,*off + +r_leg_cap_hips_off,models/players/stormtrooper/caps.tga +l_leg_cap_hips_off,models/players/stormtrooper/caps.tga +r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga +r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga +r_arm_cap_torso_off,models/players/stormtrooper/caps.tga +l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga +l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga +l_arm_cap_torso_off,models/players/stormtrooper/caps.tga +head_cap_torso_off,models/players/stormtrooper/caps.tga +torso_cap_head_off,models/players/stormtrooper/caps.tga +torso_cap_hips_off,models/players/stormtrooper/caps.tga +torso_cap_l_arm_off,models/players/stormtrooper/caps.tga +torso_cap_r_arm_off,models/players/stormtrooper/caps.tga +hips_cap_l_leg_off,models/players/stormtrooper/caps.tga +hips_cap_torso_off,models/players/stormtrooper/caps.tga +hips_cap_r_leg_off,models/players/stormtrooper/caps.tga \ No newline at end of file diff --git a/MBAssets3/models/players/kreia/modeldata.cfg b/MBAssets3/models/players/kreia/modeldata.cfg index d57c73ad4..c4e1dd535 100644 --- a/MBAssets3/models/players/kreia/modeldata.cfg +++ b/MBAssets3/models/players/kreia/modeldata.cfg @@ -14,6 +14,10 @@ sounds_traya darthtraya f +sounds_traya_hood +darthtraya +f + // trueview offsetX "1.5" diff --git a/MBAssets3/models/players/kreia/saberauth.cfg b/MBAssets3/models/players/kreia/saberauth.cfg index 514d92661..77deba3d9 100644 --- a/MBAssets3/models/players/kreia/saberauth.cfg +++ b/MBAssets3/models/players/kreia/saberauth.cfg @@ -12,4 +12,12 @@ kotorsab kotorsab 0.97 kotorsab +0.97 + +sabers_traya_hood +kotorsab +1.0 +kotorsab +0.97 +kotorsab 0.97 \ No newline at end of file diff --git a/MBAssets3/models/players/magnaguard/animevents.cfg b/MBAssets3/models/players/magnaguard/animevents.cfg index ba1fb57fb..644230928 100644 --- a/MBAssets3/models/players/magnaguard/animevents.cfg +++ b/MBAssets3/models/players/magnaguard/animevents.cfg @@ -149,10 +149,10 @@ UPPEREVENTS BOTH_SHOWOFF_DUAL AEV_SOUNDCHAN 13 CHAN_AUTO sound/weapons/saber/saber_catch.mp3 0 0 0 BOTH_SHOWOFF_DUAL AEV_SOUNDCHAN 6 CHAN_WEAPON sound/weapons/saber/saberspin.wav 0 0 0 //saber_clash isn't used anywhere else so use saber_block and extra sounds to save on FX -// BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_clash.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_block.efx *blade1 0 @@ -256,10 +256,10 @@ UPPEREVENTS BOTH_V6_T__S6 AEV_SOUNDCHAN 3 CHAN_AUTO sound/weapons/saber/saberhup%d.wav 1 3 0 //saber_clash isn't used anywhere else so use saber_block and extra sounds to save on FX // BOTH_VICTORY_DUAL AEV_SOUNDCHAN 4 CHAN_WEAPON sound/weapons/saber/saberspin.wav 0 0 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_clash.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_block.efx *blade1 0 BOTH_VICTORY_DUAL AEV_SOUNDCHAN 15 CHAN_AUTO sound/weapons/saber/saberblock3.mp3 0 0 0 BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_block.efx *blade1 0 BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_block.efx *blade1 0 diff --git a/MBAssets3/models/players/mudtrooper/model_clean.skin b/MBAssets3/models/players/mudtrooper/model_clean.skin index c85d3f843..3b6529d69 100644 --- a/MBAssets3/models/players/mudtrooper/model_clean.skin +++ b/MBAssets3/models/players/mudtrooper/model_clean.skin @@ -3,6 +3,7 @@ r_shins,models/players/mudtrooper/newparts_clean.tga l_leg,models/players/mudtrooper/cloth_clean.tga l_shins,models/players/mudtrooper/newparts_clean.tga hips_legs,models/players/mudtrooper/cloth_clean.tga +hips_legs_b,*off hips,models/players/mudtrooper/cloth_clean.tga hips_boxes,models/players/mudtrooper/newparts_clean.tga hips_holster,*off diff --git a/MBAssets3/models/players/mudtrooper/model_default.skin b/MBAssets3/models/players/mudtrooper/model_default.skin index 4d4957963..70dbd1dca 100644 --- a/MBAssets3/models/players/mudtrooper/model_default.skin +++ b/MBAssets3/models/players/mudtrooper/model_default.skin @@ -3,6 +3,7 @@ r_shins,models/players/mudtrooper/newparts.tga l_leg,models/players/mudtrooper/cloth.tga l_shins,models/players/mudtrooper/newparts.tga hips_legs,models/players/mudtrooper/cloth.tga +hips_legs_b,*off hips,models/players/mudtrooper/cloth.tga hips_boxes,models/players/mudtrooper/newparts.tga hips_holster,*off diff --git a/MBAssets3/models/players/mudtrooper/model_driver.skin b/MBAssets3/models/players/mudtrooper/model_driver.skin index be27d82b9..b41542324 100644 --- a/MBAssets3/models/players/mudtrooper/model_driver.skin +++ b/MBAssets3/models/players/mudtrooper/model_driver.skin @@ -3,6 +3,7 @@ r_shins,models/players/mudtrooper/newparts_clean.tga l_leg,models/players/mudtrooper/cloth_clean.tga l_shins,models/players/mudtrooper/newparts_clean.tga hips_legs,models/players/mudtrooper/cloth_clean.tga +hips_legs_b,*off hips,models/players/mudtrooper/cloth_clean.tga hips_boxes,models/players/mudtrooper/newparts_clean.tga hips_holster,*off diff --git a/MBAssets3/models/players/mudtrooper/model_security2.skin b/MBAssets3/models/players/mudtrooper/model_garrison.skin similarity index 80% rename from MBAssets3/models/players/mudtrooper/model_security2.skin rename to MBAssets3/models/players/mudtrooper/model_garrison.skin index 3398a29da..29cda8792 100644 --- a/MBAssets3/models/players/mudtrooper/model_security2.skin +++ b/MBAssets3/models/players/mudtrooper/model_garrison.skin @@ -2,7 +2,8 @@ r_leg,models/players/mudtrooper/cloth_clean.tga r_shins,models/players/mudtrooper/newparts_clean.tga l_leg,models/players/mudtrooper/cloth_clean.tga l_shins,models/players/mudtrooper/newparts_clean.tga -hips_legs,models/players/mudtrooper/cloth_clean.tga +hips_legs,*off +hips_legs_b,models/players/mudtrooper/legs_b.tga hips,models/players/mudtrooper/cloth_clean.tga hips_boxes,models/players/mudtrooper/newparts_andor.tga hips_holster,*off @@ -17,17 +18,17 @@ r_hand,models/players/mudtrooper/cloth_clean.tga r_hand_wrist,models/players/mudtrooper/cloth_clean.tga torso,models/players/mudtrooper/cloth_clean.tga -torso_chest_heavy,models/players/mudtrooper/armor_andor.tga +torso_chest_heavy,models/players/mudtrooper/armor_sergeant.tga torso_chest_heavy_augment,models/players/imperial_army/armor_heavy_augment.tga torso_collar,models/players/mudtrooper/cloth_clean.tga torso_collar_augment,models/players/imperial_army/neck.tga torso_cape,*off torso_pack,*off -torso_l_tricep,models/players/mudtrooper/armor_andor.tga -torso_r_tricep,models/players/mudtrooper/armor_andor.tga -torso_l_shoulder,models/players/mudtrooper/armor_andor.tga -torso_r_shoulder,models/players/mudtrooper/armor_andor.tga +torso_l_tricep,models/players/mudtrooper/armor_sergeant.tga +torso_r_tricep,models/players/mudtrooper/armor_sergeant.tga +torso_l_shoulder,models/players/mudtrooper/armor_sergeant.tga +torso_r_shoulder,models/players/mudtrooper/armor_sergeant.tga helmet,*off helmet_buttons,*off @@ -38,12 +39,12 @@ visor,*off gogs_up,*off visor_up,*off -head,models/players/imperial/bl_head.tga +head,models/players/hs_imperial/head-olive-b.tga head_eyes_mouth,models/players/common/mouth_eyes2.tga -head_face,models/players/imperial/bl_face.tga +head_face,models/players/hs_imperial/face5.tga head_face_b,*off head_inner,*off -head_hat,models/players/hs_imperial/head-olive.tga +head_hat,models/players/hs_imperial/head-olive-b.tga head_m,*off head_m_eyes_mouth,*off diff --git a/MBAssets3/models/players/mudtrooper/model_mayfeld.skin b/MBAssets3/models/players/mudtrooper/model_mayfeld.skin index 5ac41d478..7d2b0e90f 100644 --- a/MBAssets3/models/players/mudtrooper/model_mayfeld.skin +++ b/MBAssets3/models/players/mudtrooper/model_mayfeld.skin @@ -3,6 +3,7 @@ r_shins,models/players/mudtrooper/newparts.tga l_leg,models/players/mudtrooper/cloth.tga l_shins,models/players/mudtrooper/newparts.tga hips_legs,models/players/mudtrooper/cloth.tga +hips_legs_b,*off hips,models/players/mudtrooper/cloth.tga hips_boxes,models/players/mudtrooper/newparts.tga hips_holster,*off diff --git a/MBAssets3/models/players/mudtrooper/model_nomask.skin b/MBAssets3/models/players/mudtrooper/model_nomask.skin index 999b228c5..307287d1f 100644 --- a/MBAssets3/models/players/mudtrooper/model_nomask.skin +++ b/MBAssets3/models/players/mudtrooper/model_nomask.skin @@ -3,6 +3,7 @@ r_shins,models/players/mudtrooper/newparts.tga l_leg,models/players/mudtrooper/cloth.tga l_shins,models/players/mudtrooper/newparts.tga hips_legs,models/players/mudtrooper/cloth.tga +hips_legs_b,*off hips,models/players/mudtrooper/cloth.tga hips_boxes,models/players/mudtrooper/newparts.tga hips_holster,*off diff --git a/MBAssets3/models/players/mudtrooper/model_security.skin b/MBAssets3/models/players/mudtrooper/model_security.skin index 1b7b1ca5f..b304fbf49 100644 --- a/MBAssets3/models/players/mudtrooper/model_security.skin +++ b/MBAssets3/models/players/mudtrooper/model_security.skin @@ -3,6 +3,7 @@ r_shins,models/players/mudtrooper/newparts_clean.tga l_leg,models/players/mudtrooper/cloth_andor.tga l_shins,models/players/mudtrooper/newparts_clean.tga hips_legs,models/players/mudtrooper/cloth_andor.tga +hips_legs_b,*off hips,models/players/mudtrooper/cloth_andor.tga hips_boxes,models/players/mudtrooper/newparts_andor.tga hips_holster,*off diff --git a/MBAssets3/models/players/mudtrooper/model_tactician.skin b/MBAssets3/models/players/mudtrooper/model_tactician.skin index fd4385f52..95a1543f6 100644 --- a/MBAssets3/models/players/mudtrooper/model_tactician.skin +++ b/MBAssets3/models/players/mudtrooper/model_tactician.skin @@ -3,6 +3,7 @@ r_shins,models/players/mudtrooper/newparts_ISB.tga l_leg,models/players/mudtrooper/cloth_ISB.tga l_shins,models/players/mudtrooper/newparts_ISB.tga hips_legs,models/players/mudtrooper/cloth_ISB.tga +hips_legs_b,*off hips,models/players/mudtrooper/cloth_ISB.tga hips_boxes,models/players/mudtrooper/newparts_ISB.tga hips_holster,*off diff --git a/MBAssets3/models/players/mudtrooper/modeldata.cfg b/MBAssets3/models/players/mudtrooper/modeldata.cfg index 5f7583245..2f1c6c0e1 100644 --- a/MBAssets3/models/players/mudtrooper/modeldata.cfg +++ b/MBAssets3/models/players/mudtrooper/modeldata.cfg @@ -22,8 +22,8 @@ sounds_security io_bf2 m -sounds_security2 -io_bf2 +sounds_garrison +io2 m sounds_tactician diff --git a/MBAssets3/models/players/nd5/animevents.cfg b/MBAssets3/models/players/nd5/animevents.cfg index 337c7a6d4..cfc7b9d47 100644 --- a/MBAssets3/models/players/nd5/animevents.cfg +++ b/MBAssets3/models/players/nd5/animevents.cfg @@ -148,10 +148,10 @@ UPPEREVENTS BOTH_SHOWOFF_DUAL AEV_SOUNDCHAN 13 CHAN_AUTO sound/weapons/saber/saber_catch.mp3 0 0 0 BOTH_SHOWOFF_DUAL AEV_SOUNDCHAN 6 CHAN_WEAPON sound/weapons/saber/saberspin.wav 0 0 0 //saber_clash isn't used anywhere else so use saber_block and extra sounds to save on FX -// BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_clash.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_block.efx *blade1 0 @@ -255,10 +255,10 @@ UPPEREVENTS BOTH_V6_T__S6 AEV_SOUNDCHAN 3 CHAN_AUTO sound/weapons/saber/saberhup%d.wav 1 3 0 //saber_clash isn't used anywhere else so use saber_block and extra sounds to save on FX // BOTH_VICTORY_DUAL AEV_SOUNDCHAN 4 CHAN_WEAPON sound/weapons/saber/saberspin.wav 0 0 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_clash.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_block.efx *blade1 0 BOTH_VICTORY_DUAL AEV_SOUNDCHAN 15 CHAN_AUTO sound/weapons/saber/saberblock3.mp3 0 0 0 BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_block.efx *blade1 0 BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_block.efx *blade1 0 diff --git a/MBAssets3/models/players/noghri/animevents.cfg b/MBAssets3/models/players/noghri/animevents.cfg index 158c827b9..adf65e407 100644 --- a/MBAssets3/models/players/noghri/animevents.cfg +++ b/MBAssets3/models/players/noghri/animevents.cfg @@ -148,10 +148,10 @@ UPPEREVENTS BOTH_SHOWOFF_DUAL AEV_SOUNDCHAN 13 CHAN_AUTO sound/weapons/saber/saber_catch.mp3 0 0 0 BOTH_SHOWOFF_DUAL AEV_SOUNDCHAN 6 CHAN_WEAPON sound/weapons/saber/saberspin.wav 0 0 0 //saber_clash isn't used anywhere else so use saber_block and extra sounds to save on FX -// BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_clash.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_block.efx *blade1 0 @@ -255,10 +255,10 @@ UPPEREVENTS BOTH_V6_T__S6 AEV_SOUNDCHAN 3 CHAN_AUTO sound/weapons/saber/saberhup%d.wav 1 3 0 //saber_clash isn't used anywhere else so use saber_block and extra sounds to save on FX // BOTH_VICTORY_DUAL AEV_SOUNDCHAN 4 CHAN_WEAPON sound/weapons/saber/saberspin.wav 0 0 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_clash.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_block.efx *blade1 0 BOTH_VICTORY_DUAL AEV_SOUNDCHAN 15 CHAN_AUTO sound/weapons/saber/saberblock3.mp3 0 0 0 BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_block.efx *blade1 0 BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_block.efx *blade1 0 diff --git a/MBAssets3/models/players/obiwan_tcw/model_default.skin b/MBAssets3/models/players/obiwan_tcw/model_default.skin new file mode 100644 index 000000000..4b1a89c2f --- /dev/null +++ b/MBAssets3/models/players/obiwan_tcw/model_default.skin @@ -0,0 +1,44 @@ +hips,models/players/obiwan_tcw/hips.tga +hips_belt,models/players/obiwan_tcw/torso.tga +hips_legs,models/players/obiwan_tcw/boots.tga +torso,models/players/obiwan_tcw/torso.tga +torso_armor,models/players/obiwan_tcw/torso_armor.tga + +r_arm,models/players/obiwan_tcw/bodysuit_clean.tga +r_arm_armor,models/players/obiwan_tcw/body_clean.tga +r_hand,models/players/obiwan_tcw/bodysuit_clean.tga +r_hand_plate,models/players/obiwan_tcw/body_clean.tga +l_arm,models/players/obiwan_tcw/bodysuit_clean.tga +l_hand,models/players/obiwan_tcw/bodysuit_clean.tga +l_hand_plate,models/players/obiwan_tcw/body_clean.tga +l_arm_armor,models/players/obiwan_tcw/body_clean.tga + +r_leg,models/players/obiwan_tcw/bodysuit_clean.tga +r_leg_armor,models/players/obiwan_tcw/body_clean.tga +l_leg,models/players/obiwan_tcw/bodysuit_clean.tga +l_leg_armor,models/players/obiwan_tcw/body_clean.tga + +head,*off +head_ep2,*off +head_ep2_hair,*off +head_ep2_eyes,*off +head_ep3,models/players/obiwan_ep3/head.tga +head_ep3_hair,models/players/obiwan_ep3/hair.tga +head_ep3_eyes,models/players/common/mouth_eyes.tga + +head_cap_torso_off,models/players/stormtrooper/caps.tga +r_leg_cap_hips_off,models/players/stormtrooper/caps.tga +l_leg_cap_hips_off,models/players/stormtrooper/caps.tga +l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga +l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga +l_arm_cap_torso_off,models/players/stormtrooper/caps.tga +r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga +r_arm_cap_torso_off,models/players/stormtrooper/caps.tga +r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga +torso_cap_head_off,models/players/stormtrooper/caps.tga +torso_cap_hips_off,models/players/stormtrooper/caps.tga +torso_cap_l_arm_off,models/players/stormtrooper/caps.tga +torso_cap_r_arm_off,models/players/stormtrooper/caps.tga +hips_cap_l_leg_off,models/players/stormtrooper/caps.tga +hips_cap_torso_off,models/players/stormtrooper/caps.tga +hips_cap_r_leg_off,models/players/stormtrooper/caps.tga diff --git a/MBAssets3/models/players/obiwan_tcw/model_mullet.skin b/MBAssets3/models/players/obiwan_tcw/model_mullet.skin new file mode 100644 index 000000000..e809780e9 --- /dev/null +++ b/MBAssets3/models/players/obiwan_tcw/model_mullet.skin @@ -0,0 +1,44 @@ +hips,models/players/obiwan_tcw/hips.tga +hips_belt,models/players/obiwan_tcw/torso.tga +hips_legs,models/players/obiwan_tcw/boots.tga +torso,models/players/obiwan_tcw/torso.tga +torso_armor,models/players/obiwan_tcw/torso_armor.tga + +r_arm,models/players/obiwan_tcw/bodysuit_clean.tga +r_arm_armor,models/players/obiwan_tcw/body_clean.tga +r_hand,models/players/obiwan_tcw/bodysuit_clean.tga +r_hand_plate,models/players/obiwan_tcw/body_clean.tga +l_arm,models/players/obiwan_tcw/bodysuit_clean.tga +l_hand,models/players/obiwan_tcw/bodysuit_clean.tga +l_hand_plate,models/players/obiwan_tcw/body_clean.tga +l_arm_armor,models/players/obiwan_tcw/body_clean.tga + +r_leg,models/players/obiwan_tcw/bodysuit_clean.tga +r_leg_armor,models/players/obiwan_tcw/body_clean.tga +l_leg,models/players/obiwan_tcw/bodysuit_clean.tga +l_leg_armor,models/players/obiwan_tcw/body_clean.tga + +head,*off +head_ep2,models/players/obiwan_ep2/head.tga +head_ep2_hair,models/players/obiwan_ep2/hair.tga +head_ep2_eyes,models/players/obiwan_ep2/mouth_eyes.tga +head_ep3,*off +head_ep3_hair,*off +head_ep3_eyes,*off + +head_cap_torso_off,models/players/stormtrooper/caps.tga +r_leg_cap_hips_off,models/players/stormtrooper/caps.tga +l_leg_cap_hips_off,models/players/stormtrooper/caps.tga +l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga +l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga +l_arm_cap_torso_off,models/players/stormtrooper/caps.tga +r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga +r_arm_cap_torso_off,models/players/stormtrooper/caps.tga +r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga +torso_cap_head_off,models/players/stormtrooper/caps.tga +torso_cap_hips_off,models/players/stormtrooper/caps.tga +torso_cap_l_arm_off,models/players/stormtrooper/caps.tga +torso_cap_r_arm_off,models/players/stormtrooper/caps.tga +hips_cap_l_leg_off,models/players/stormtrooper/caps.tga +hips_cap_torso_off,models/players/stormtrooper/caps.tga +hips_cap_r_leg_off,models/players/stormtrooper/caps.tga diff --git a/MBAssets3/models/players/imperial_garrison/modeldata.cfg b/MBAssets3/models/players/obiwan_tcw/modeldata.cfg similarity index 95% rename from MBAssets3/models/players/imperial_garrison/modeldata.cfg rename to MBAssets3/models/players/obiwan_tcw/modeldata.cfg index a3a04b92a..fa7b55bd6 100644 --- a/MBAssets3/models/players/imperial_garrison/modeldata.cfg +++ b/MBAssets3/models/players/obiwan_tcw/modeldata.cfg @@ -1,18 +1,18 @@ -// breath -breathes "1" - -// soundsets -sounds_default -io3 -m - -// trueview -offsetX "1.5" - -// gore -hitPersonShotEffect "effects/gore/shotspurt_red.efx" -hitPersonShotShader "gfx/gore/bullethole_red" -hitPersonBladeEffect "effects/gore/bladespurt_red.efx" -g2MarksBladeShader "gfx/gore/slash_red" -g2WeaponMarksBladeShader "gfx/gore/spats/spat_big_red.efx" +// breath +breathes "1" + +// soundsets +sounds_default +obiwan_tcw +m + +// trueview +offsetX "1.5" + +// gore +hitPersonShotEffect "effects/gore/shotspurt_red.efx" +hitPersonShotShader "gfx/gore/bullethole_red" +hitPersonBladeEffect "effects/gore/bladespurt_red.efx" +g2MarksBladeShader "gfx/gore/slash_red" +g2WeaponMarksBladeShader "gfx/gore/spats/spat_big_red.efx" dismemberEffect "effects/gore/shotspurt_red.efx" \ No newline at end of file diff --git a/MBAssets3/models/players/obiwan_tcw/saberauth.cfg b/MBAssets3/models/players/obiwan_tcw/saberauth.cfg new file mode 100644 index 000000000..24ca05b1e --- /dev/null +++ b/MBAssets3/models/players/obiwan_tcw/saberauth.cfg @@ -0,0 +1,7 @@ +all_sabers +saber_obi_wan +0.6277 +saber_obi_wan +0.6277 +saber_anakin +0.6277 \ No newline at end of file diff --git a/MBAssets3/models/players/prisoner_narkina/animevents.cfg b/MBAssets3/models/players/prisoner_narkina/animevents.cfg index 158c827b9..adf65e407 100644 --- a/MBAssets3/models/players/prisoner_narkina/animevents.cfg +++ b/MBAssets3/models/players/prisoner_narkina/animevents.cfg @@ -148,10 +148,10 @@ UPPEREVENTS BOTH_SHOWOFF_DUAL AEV_SOUNDCHAN 13 CHAN_AUTO sound/weapons/saber/saber_catch.mp3 0 0 0 BOTH_SHOWOFF_DUAL AEV_SOUNDCHAN 6 CHAN_WEAPON sound/weapons/saber/saberspin.wav 0 0 0 //saber_clash isn't used anywhere else so use saber_block and extra sounds to save on FX -// BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_clash.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_block.efx *blade1 0 @@ -255,10 +255,10 @@ UPPEREVENTS BOTH_V6_T__S6 AEV_SOUNDCHAN 3 CHAN_AUTO sound/weapons/saber/saberhup%d.wav 1 3 0 //saber_clash isn't used anywhere else so use saber_block and extra sounds to save on FX // BOTH_VICTORY_DUAL AEV_SOUNDCHAN 4 CHAN_WEAPON sound/weapons/saber/saberspin.wav 0 0 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_clash.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_block.efx *blade1 0 BOTH_VICTORY_DUAL AEV_SOUNDCHAN 15 CHAN_AUTO sound/weapons/saber/saberblock3.mp3 0 0 0 BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_block.efx *blade1 0 BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_block.efx *blade1 0 diff --git a/MBAssets3/models/players/rab-24/animevents.cfg b/MBAssets3/models/players/rab-24/animevents.cfg index 828a556f5..6f5480d32 100644 --- a/MBAssets3/models/players/rab-24/animevents.cfg +++ b/MBAssets3/models/players/rab-24/animevents.cfg @@ -148,10 +148,10 @@ UPPEREVENTS BOTH_SHOWOFF_DUAL AEV_SOUNDCHAN 13 CHAN_AUTO sound/weapons/saber/saber_catch.mp3 0 0 0 BOTH_SHOWOFF_DUAL AEV_SOUNDCHAN 6 CHAN_WEAPON sound/weapons/saber/saberspin.wav 0 0 0 //saber_clash isn't used anywhere else so use saber_block and extra sounds to save on FX -// BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_clash.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_block.efx *blade1 0 @@ -255,10 +255,10 @@ UPPEREVENTS BOTH_V6_T__S6 AEV_SOUNDCHAN 3 CHAN_AUTO sound/weapons/saber/saberhup%d.wav 1 3 0 //saber_clash isn't used anywhere else so use saber_block and extra sounds to save on FX // BOTH_VICTORY_DUAL AEV_SOUNDCHAN 4 CHAN_WEAPON sound/weapons/saber/saberspin.wav 0 0 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_clash.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_block.efx *blade1 0 BOTH_VICTORY_DUAL AEV_SOUNDCHAN 15 CHAN_AUTO sound/weapons/saber/saberblock3.mp3 0 0 0 BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_block.efx *blade1 0 BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_block.efx *blade1 0 diff --git a/MBAssets3/models/players/rebel_magma/modeldata.cfg b/MBAssets3/models/players/rebel_magma/modeldata.cfg index 8f8bd0a5c..f44bb79fe 100644 --- a/MBAssets3/models/players/rebel_magma/modeldata.cfg +++ b/MBAssets3/models/players/rebel_magma/modeldata.cfg @@ -30,9 +30,9 @@ f offsetX "1.0" // gore -hitPersonShotEffect "effects/gore/shotspurt_yellowgreen.efx" -hitPersonShotShader "gfx/gore/bullethole_yellowgreen" -hitPersonBladeEffect "effects/gore/bladespurt_yellowgreen.efx" -g2MarksBladeShader "gfx/gore/slash_yellowgreen" -g2WeaponMarksBladeShader "gfx/gore/spats/spat_big_yellowgreen.efx" -dismemberEffect "effects/gore/shotspurt_yellowgreen.efx" \ No newline at end of file +hitPersonShotEffect "effects/gore/shotspurt_red.efx" +hitPersonShotShader "gfx/gore/bullethole_red" +hitPersonBladeEffect "effects/gore/bladespurt_red.efx" +g2MarksBladeShader "gfx/gore/slash_red" +g2WeaponMarksBladeShader "gfx/gore/spats/spat_big_red.efx" +dismemberEffect "effects/gore/shotspurt_red.efx" \ No newline at end of file diff --git a/MBAssets3/models/players/starkiller/model_default.skin b/MBAssets3/models/players/starkiller/model_default.skin new file mode 100644 index 000000000..f528e0533 --- /dev/null +++ b/MBAssets3/models/players/starkiller/model_default.skin @@ -0,0 +1,45 @@ +head,models/players/starkiller/face +head_eyes,models/players/starkiller/mouth_eyes + +torso,models/players/starkiller/body +torso_armor,models/players/starkiller/torso_armor +torso_belt,models/players/starkiller/belt_extras + +hips,models/players/starkiller/body +hips_belt,models/players/starkiller/belt_extras +hips_flaps,models/players/starkiller/fular + +r_leg,models/players/starkiller/boots +r_leg_bandage,models/players/starkiller/bandages + +l_leg,models/players/starkiller/boots +l_leg_bandage,models/players/starkiller/bandages + +r_arm,models/players/starkiller/body +r_arm_bandage,models/players/starkiller/bandages +r_arm2_bandage,models/players/starkiller/bandages +r_barearm,models/players/starkiller/belt_extras +r_barearm_com,models/players/starkiller/belt_extras +r_hand,models/players/starkiller/hands + +l_arm,models/players/starkiller/body +l_arm_bandage,models/players/starkiller/bandages +l_barearm,models/players/starkiller/belt_extras +l_hand,models/players/starkiller/hands + +r_leg_cap_hips_off,models/players/stormtrooper/caps.tga +l_leg_cap_hips_off,models/players/stormtrooper/caps.tga +l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga +l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga +l_arm_cap_torso_off,models/players/stormtrooper/caps.tga +r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga +r_arm_cap_torso_off,models/players/stormtrooper/caps.tga +r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga +torso_cap_head_off,models/players/stormtrooper/caps.tga +torso_cap_hips_off,models/players/stormtrooper/caps.tga +torso_cap_l_arm_off,models/players/stormtrooper/caps.tga +torso_cap_r_arm_off,models/players/stormtrooper/caps.tga +hips_cap_l_leg_off,models/players/stormtrooper/caps.tga +hips_cap_torso_off,models/players/stormtrooper/caps.tga +hips_cap_r_leg_off,models/players/stormtrooper/caps.tga +head_cap_torso_off,models/players/stormtrooper/caps.tga \ No newline at end of file diff --git a/MBAssets3/models/players/starkiller/modeldata.cfg b/MBAssets3/models/players/starkiller/modeldata.cfg new file mode 100644 index 000000000..93acfe225 --- /dev/null +++ b/MBAssets3/models/players/starkiller/modeldata.cfg @@ -0,0 +1,18 @@ +// breath +breathes "1" + +// soundsets +sounds_default +starkiller +m + +// trueview +offsetX "1.5" + +// gore +hitPersonShotEffect "effects/gore/shotspurt_red.efx" +hitPersonShotShader "gfx/gore/bullethole_red" +hitPersonBladeEffect "effects/gore/bladespurt_red.efx" +g2MarksBladeShader "gfx/gore/slash_red" +g2WeaponMarksBladeShader "gfx/gore/spats/spat_big_red.efx" +dismemberEffect "effects/gore/shotspurt_red.efx" \ No newline at end of file diff --git a/MBAssets3/models/players/starkiller/saberauth.cfg b/MBAssets3/models/players/starkiller/saberauth.cfg new file mode 100644 index 000000000..8be2496e6 --- /dev/null +++ b/MBAssets3/models/players/starkiller/saberauth.cfg @@ -0,0 +1,7 @@ +all_sabers +saber_marek +1.0 +saber_marek +1.0 +saber_marek +1.0 \ No newline at end of file diff --git a/MBAssets3/models/players/stormie_tfa/animsounds.cfg b/MBAssets3/models/players/stormie_tfa/animsounds.cfg deleted file mode 100644 index 31c0cfcdb..000000000 --- a/MBAssets3/models/players/stormie_tfa/animsounds.cfg +++ /dev/null @@ -1,92 +0,0 @@ -UPPERSOUNDS -{ - BOTH_RIGHTHANDCHOPPEDOFF 25 sound/chars/st1/misc/death%d.wav 1 3 30 - BOTH_RIGHTHANDCHOPPEDOFF 64 sound/chars/st1/misc/death%d.wav 1 3 0 - BOTH_RIGHTHANDCHOPPEDOFF 88 sound/chars/st1/misc/death%d.wav 1 3 30 - BOTH_RIGHTHANDCHOPPEDOFF 100 sound/chars/st1/misc/death%d.wav 1 3 30 - BOTH_RIGHTHANDCHOPPEDOFF 110 sound/chars/stormtrooper/bodyfall%d.wav 1 2 0 -} - -LOWERSOUNDS -{ - //walk1 - BOTH_WALK1 6 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_WALK1 20 sound/player/footsteps/clank%d.wav 1 4 0 - //walk1 - BOTH_WALK2 5 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_WALK2 18 sound/player/footsteps/clank%d.wav 1 4 0 - //fastwalk (run) - BOTH_RUN1 8 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_RUN1 20 sound/player/footsteps/clank%d.wav 1 4 0 - //fastwalk (run) - BOTH_RUN2 8 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_RUN2 20 sound/player/footsteps/clank%d.wav 1 4 0 - // - BOTH_RUNBACK1 3 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_RUNBACK1 8 sound/player/footsteps/clank%d.wav 1 4 0 - // - BOTH_WALKBACK1 3 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_WALKBACK1 10 sound/player/footsteps/clank%d.wav 1 4 0 - // - BOTH_RUNBACK2 3 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_RUNBACK2 8 sound/player/footsteps/clank%d.wav 1 4 0 - // - BOTH_WALKBACK2 3 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_WALKBACK2 10 sound/player/footsteps/clank%d.wav 1 4 0 - // - BOTH_WALL_RUN_LEFT 5 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_WALL_RUN_LEFT 9 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_WALL_RUN_LEFT 13 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_WALL_RUN_LEFT 17 sound/player/footsteps/clank%d.wav 1 4 0 - // - BOTH_WALL_RUN_RIGHT 5 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_WALL_RUN_RIGHT 9 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_WALL_RUN_RIGHT 13 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_WALL_RUN_RIGHT 17 sound/player/footsteps/clank%d.wav 1 4 0 - // - BOTH_WALL_FLIP_BACK1 1 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_WALL_FLIP_BACK1 3 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_WALL_FLIP_BACK1 7 sound/player/footsteps/clank%d.wav 1 4 0 - // - BOTH_DEATH1 13 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH2 13 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH3 15 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH4 19 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH5 19 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH6 14 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH7 13 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH8 17 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH9 21 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH9 40 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH10 26 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH10 52 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH11 19 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH11 40 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH12 14 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH13 12 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_DEATH13 17 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_DEATH13 33 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH13 49 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_DEATH13 50 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_DEATH14 24 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH15 15 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH15 43 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH16 25 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH17 43 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_DEATH17 50 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_DEATH17 56 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH18 20 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_DEATH18 21 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_DEATH18 38 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_DEATH18 68 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH19 20 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_DEATH19 21 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_DEATH19 38 sound/player/footsteps/clank%d.wav 1 4 0 - BOTH_DEATH19 68 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH20 33 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH21 34 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH22 6 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH23 6 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH24 15 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 - BOTH_DEATH25 15 sound/chars/stormtrooper/bodyfall_trooper%d.wav 1 4 0 -} \ No newline at end of file diff --git a/MBAssets3/models/players/stormie_tfa/model_cardinal.skin b/MBAssets3/models/players/stormie_tfa/model_cardinal.skin index d5ecfa0f6..9690f9945 100644 --- a/MBAssets3/models/players/stormie_tfa/model_cardinal.skin +++ b/MBAssets3/models/players/stormie_tfa/model_cardinal.skin @@ -33,6 +33,8 @@ helmet_l,*off helmet_r,*off helmet_parts_l,*off helmet_parts_r,*off +helmet_sith,*off +helmet_sith_parts,*off torso_cap_l_arm_off,models/players/stormtrooper/caps.tga torso_cap_r_arm_off,models/players/stormtrooper/caps.tga torso_cap_head_off,models/players/stormtrooper/caps.tga diff --git a/MBAssets3/models/players/stormie_tfa/model_default.skin b/MBAssets3/models/players/stormie_tfa/model_default.skin index 3c23aff8b..d53c28ae7 100644 --- a/MBAssets3/models/players/stormie_tfa/model_default.skin +++ b/MBAssets3/models/players/stormie_tfa/model_default.skin @@ -33,6 +33,8 @@ helmet_l,*off helmet_r,*off helmet_parts_l,*off helmet_parts_r,*off +helmet_sith,*off +helmet_sith_parts,*off torso_cap_l_arm_off,models/players/stormtrooper/caps.tga torso_cap_r_arm_off,models/players/stormtrooper/caps.tga torso_cap_head_off,models/players/stormtrooper/caps.tga diff --git a/MBAssets3/models/players/stormie_tfa/model_exe.skin b/MBAssets3/models/players/stormie_tfa/model_exe.skin index fafd2e9b3..691ff5324 100644 --- a/MBAssets3/models/players/stormie_tfa/model_exe.skin +++ b/MBAssets3/models/players/stormie_tfa/model_exe.skin @@ -33,6 +33,8 @@ helmet_l,models/players/stormie_tfa/helmet.tga helmet_r,models/players/stormie_tfa/helmet_exe.tga helmet_parts_l,models/players/stormie_tfa/helmet.tga helmet_parts_r,models/players/stormie_tfa/helmet_exe.tga +helmet_sith,*off +helmet_sith_parts,*off torso_cap_l_arm_off,models/players/stormtrooper/caps.tga torso_cap_r_arm_off,models/players/stormtrooper/caps.tga torso_cap_head_off,models/players/stormtrooper/caps.tga diff --git a/MBAssets3/models/players/stormie_tfa/model_finn.skin b/MBAssets3/models/players/stormie_tfa/model_finn.skin index 245481d71..362ad76db 100644 --- a/MBAssets3/models/players/stormie_tfa/model_finn.skin +++ b/MBAssets3/models/players/stormie_tfa/model_finn.skin @@ -33,6 +33,8 @@ helmet_l,models/players/stormie_tfa/helmet_finn_l.tga helmet_r,models/players/stormie_tfa/helmet_finn_r.tga helmet_parts_l,models/players/stormie_tfa/helmet_finn_l.tga helmet_parts_r,models/players/stormie_tfa/helmet_finn_r.tga +helmet_sith,*off +helmet_sith_parts,*off torso_cap_l_arm_off,models/players/stormtrooper/caps.tga torso_cap_r_arm_off,models/players/stormtrooper/caps.tga torso_cap_head_off,models/players/stormtrooper/caps.tga diff --git a/MBAssets3/models/players/stormie_tfa/model_pauldron.skin b/MBAssets3/models/players/stormie_tfa/model_pauldron.skin index fd09c1a92..6bd6fe331 100644 --- a/MBAssets3/models/players/stormie_tfa/model_pauldron.skin +++ b/MBAssets3/models/players/stormie_tfa/model_pauldron.skin @@ -33,6 +33,8 @@ helmet_l,*off helmet_r,*off helmet_parts_l,*off helmet_parts_r,*off +helmet_sith,*off +helmet_sith_parts,*off torso_cap_l_arm_off,models/players/stormtrooper/caps.tga torso_cap_r_arm_off,models/players/stormtrooper/caps.tga torso_cap_head_off,models/players/stormtrooper/caps.tga diff --git a/MBAssets3/models/players/stormie_tfa/model_pyre.skin b/MBAssets3/models/players/stormie_tfa/model_pyre.skin index f412e975b..e323bda53 100644 --- a/MBAssets3/models/players/stormie_tfa/model_pyre.skin +++ b/MBAssets3/models/players/stormie_tfa/model_pyre.skin @@ -33,6 +33,8 @@ helmet_l,*off helmet_r,*off helmet_parts_l,*off helmet_parts_r,*off +helmet_sith,*off +helmet_sith_parts,*off torso_cap_l_arm_off,models/players/stormtrooper/caps.tga torso_cap_r_arm_off,models/players/stormtrooper/caps.tga torso_cap_head_off,models/players/stormtrooper/caps.tga diff --git a/MBAssets3/models/players/stormie_tfa/model_rgb.skin b/MBAssets3/models/players/stormie_tfa/model_rgb.skin index 0e84002d6..a32e2ecc9 100644 --- a/MBAssets3/models/players/stormie_tfa/model_rgb.skin +++ b/MBAssets3/models/players/stormie_tfa/model_rgb.skin @@ -33,6 +33,8 @@ helmet_l,*off helmet_r,*off helmet_parts_l,*off helmet_parts_r,*off +helmet_sith,*off +helmet_sith_parts,*off torso_cap_l_arm_off,models/players/stormtrooper/caps.tga torso_cap_r_arm_off,models/players/stormtrooper/caps.tga torso_cap_head_off,models/players/stormtrooper/caps.tga diff --git a/MBAssets3/models/players/stormie_tfa/model_sith.skin b/MBAssets3/models/players/stormie_tfa/model_sith.skin new file mode 100644 index 000000000..6a9c80dd0 --- /dev/null +++ b/MBAssets3/models/players/stormie_tfa/model_sith.skin @@ -0,0 +1,61 @@ +hips,models/players/sithtrooper_ep9/armor.tga +hips_belt,models/players/sithtrooper_ep9/armor.tga +hips_bodysock,models/players/sithtrooper_ep9/bodysuit.tga +hips_thighs,models/players/sithtrooper_ep9/armor.tga +torso,models/players/sithtrooper_ep9/armor.tga +r_shoulder,models/players/sithtrooper_ep9/bodysuit.tga +l_shoulder,models/players/sithtrooper_ep9/bodysuit.tga +torso_bomb,models/players/sithtrooper_ep9/armor.tga +r_shoulder_plate,models/players/sithtrooper_ep9/armor.tga +l_shoulder_plate,models/players/sithtrooper_ep9/armor.tga +l_arm,models/players/sithtrooper_ep9/armor.tga +l_hand,models/players/sithtrooper_ep9/bodysuit.tga +l_hand_plate,models/players/sithtrooper_ep9/armor.tga +l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga +l_forearm,models/players/sithtrooper_ep9/armor.tga +l_elbow,models/players/sithtrooper_ep9/bodysuit.tga +l_arm_cap_torso_off,models/players/stormtrooper/caps.tga +l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga +r_arm,models/players/sithtrooper_ep9/armor.tga +r_hand,models/players/sithtrooper_ep9/bodysuit.tga +r_hand_plate,models/players/sithtrooper_ep9/armor.tga +r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga +r_forearm,models/players/sithtrooper_ep9/armor.tga +r_elbow,models/players/sithtrooper_ep9/bodysuit.tga +r_arm_cap_torso_off,models/players/stormtrooper/caps.tga +r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga +torso_lower,models/players/sithtrooper_ep9/armor.tga +head,models/players/sithtrooper_ep9/bodysuit.tga +head_cap_torso_off,models/players/stormtrooper/caps.tga +helmet,*off +helmet_parts,*off +helmet_l,*off +helmet_r,*off +helmet_parts_l,*off +helmet_parts_r,*off +helmet_sith,models/players/sithtrooper_ep9/helmet.tga +helmet_sith_parts,models/players/sithtrooper_ep9/helmet.tga +torso_cap_l_arm_off,models/players/stormtrooper/caps.tga +torso_cap_r_arm_off,models/players/stormtrooper/caps.tga +torso_cap_head_off,models/players/stormtrooper/caps.tga +torso_cap_hips_off,models/players/stormtrooper/caps.tga +r_shoulder_plate_pauldron,*off +pauldron,*off +torso_vest_ammo,*off +torso_vest,*off +torso_vest_packs,*off +torso_cape,*off +l_leg,models/players/sithtrooper_ep9/armor.tga +l_knee_plate,models/players/sithtrooper_ep9/armor.tga +l_knee,models/players/sithtrooper_ep9/bodysuit.tga +l_leg_cap_hips_off,models/players/stormtrooper/caps.tga +l_knee_upper,models/players/sithtrooper_ep9/bodysuit.tga +r_knee_upper,models/players/sithtrooper_ep9/bodysuit.tga +hips_holster,models/players/sithtrooper_ep9/armor.tga +r_leg,models/players/sithtrooper_ep9/armor.tga +r_knee,models/players/sithtrooper_ep9/bodysuit.tga +r_knee_plate,models/players/sithtrooper_ep9/armor.tga +r_leg_cap_hips_off,models/players/stormtrooper/caps.tga +hips_cap_l_leg_off,models/players/stormtrooper/caps.tga +hips_cap_r_leg_off,models/players/stormtrooper/caps.tga +hips_cap_torso_off,models/players/stormtrooper/caps.tga \ No newline at end of file diff --git a/MBAssets3/models/players/stormie_tfa/model_vest.skin b/MBAssets3/models/players/stormie_tfa/model_vest.skin index c1df06f88..950ba37cd 100644 --- a/MBAssets3/models/players/stormie_tfa/model_vest.skin +++ b/MBAssets3/models/players/stormie_tfa/model_vest.skin @@ -33,6 +33,8 @@ helmet_l,*off helmet_r,*off helmet_parts_l,*off helmet_parts_r,*off +helmet_sith,*off +helmet_sith_parts,*off torso_cap_l_arm_off,models/players/stormtrooper/caps.tga torso_cap_r_arm_off,models/players/stormtrooper/caps.tga torso_cap_head_off,models/players/stormtrooper/caps.tga diff --git a/MBAssets3/models/players/stormie_tfa/modeldata.cfg b/MBAssets3/models/players/stormie_tfa/modeldata.cfg index 92827ea7d..ccd349391 100644 --- a/MBAssets3/models/players/stormie_tfa/modeldata.cfg +++ b/MBAssets3/models/players/stormie_tfa/modeldata.cfg @@ -6,6 +6,10 @@ sounds_default stormie_tfa m +sounds_sith +sithtrooper_ep9 +m + // trueview offsetX "2.0" diff --git a/MBAssets3/models/players/wampa/animevents.cfg b/MBAssets3/models/players/wampa/animevents.cfg index b83afdb5e..7156acc4b 100644 --- a/MBAssets3/models/players/wampa/animevents.cfg +++ b/MBAssets3/models/players/wampa/animevents.cfg @@ -52,5 +52,5 @@ LOWEREVENTS BOTH_VT_RUN_REV AEV_SOUND 5 sound/chars/tauntaun/taun_step%d.mp3 1 8 0 BOTH_VT_RUN_REV AEV_SOUND 24 sound/chars/tauntaun/taun_step%d.mp3 1 8 0 BOTH_ATTACK4 AEV_SOUND 29 sound/chars/wampa/swipe%d.mp3 1 4 0 -} - + AEV_AMBIENT 9900 300 CHAN_AUTO sound/chars/wampa/misc/sound%d.mp3 1 3 0 +} \ No newline at end of file diff --git a/MBAssets3/models/players/wat_tambor/animevents.cfg b/MBAssets3/models/players/wat_tambor/animevents.cfg index ad3ab349f..5acb038f1 100644 --- a/MBAssets3/models/players/wat_tambor/animevents.cfg +++ b/MBAssets3/models/players/wat_tambor/animevents.cfg @@ -148,10 +148,10 @@ UPPEREVENTS BOTH_SHOWOFF_DUAL AEV_SOUNDCHAN 13 CHAN_AUTO sound/weapons/saber/saber_catch.mp3 0 0 0 BOTH_SHOWOFF_DUAL AEV_SOUNDCHAN 6 CHAN_WEAPON sound/weapons/saber/saberspin.wav 0 0 0 //saber_clash isn't used anywhere else so use saber_block and extra sounds to save on FX -// BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_clash.efx *blade1 0 -// BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_clash.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_block.efx *blade1 0 +// BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_block.efx *blade1 0 BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_block.efx *blade1 0 @@ -255,10 +255,10 @@ UPPEREVENTS BOTH_V6_T__S6 AEV_SOUNDCHAN 3 CHAN_AUTO sound/weapons/saber/saberhup%d.wav 1 3 0 //saber_clash isn't used anywhere else so use saber_block and extra sounds to save on FX // BOTH_VICTORY_DUAL AEV_SOUNDCHAN 4 CHAN_WEAPON sound/weapons/saber/saberspin.wav 0 0 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_clash.efx *blade1 0 -// BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_clash.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_block.efx *blade1 0 +// BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_block.efx *blade1 0 BOTH_VICTORY_DUAL AEV_SOUNDCHAN 15 CHAN_AUTO sound/weapons/saber/saberblock3.mp3 0 0 0 BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_block.efx *blade1 0 BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_block.efx *blade1 0 diff --git a/MBAssets3/shaders/grievous.shader b/MBAssets3/shaders/grievous.shader index 2cc1bb958..0c98a2ada 100644 --- a/MBAssets3/shaders/grievous.shader +++ b/MBAssets3/shaders/grievous.shader @@ -1,176 +1,73 @@ -models/players/grievous/cape +models/players/grievous/g02 { - q3map_nolightmap - cull disable - { - map models/players/grievous/cape - blendFunc GL_ONE GL_ZERO - rgbGen lightingDiffuse - } -} - -models/players/grievous/arms -{ - { - map models/players/grievous/arms - rgbGen lightingDiffuse - //alphaFunc GE128 - } - { - map models/players/grievous/arms_spec - blendFunc GL_SRC_ALPHA GL_ONE - alphaGen lightingSpecular - detail - } + { + map models/players/grievous/g02 + rgbGen lightingDiffuse + } + { + map models/players/grievous/metal_env + blendFunc GL_DST_COLOR GL_SRC_COLOR + tcGen environment + detail + } + { + map models/players/grievous/metal_env2 + blendFunc GL_ONE GL_ONE + tcGen environment + detail + } + { + map models/players/grievous/g02 + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + rgbGen lightingDiffuse + detail + } + { + map models/players/grievous/g02_spec + blendFunc GL_SRC_ALPHA GL_ONE + alphaGen lightingSpecular + detail + } } -models/players/grievous/breastplate +models/players/grievous/g03 { - { - map models/players/grievous/breastplate + { + map models/players/grievous/g03 + tcMod turb 1 0.001 0 4 rgbGen lightingDiffuse - //alphaFunc GE128 - } - { - map models/players/grievous/breastplate_spec - blendFunc GL_SRC_ALPHA GL_ONE - alphaGen lightingSpecular - detail - } -} - -models/players/grievous/hands -{ - { - map models/players/grievous/hands + } + { + map models/players/grievous/green_env + blendFunc GL_ONE GL_ONE rgbGen lightingDiffuse - //alphaFunc GE128 - } - { - map models/players/grievous/hands_spec - blendFunc GL_SRC_ALPHA GL_ONE - alphaGen lightingSpecular - detail - } + tcGen environment + detail + } + { + map models/players/grievous/g03_2 + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + tcMod turb 1 0.001 0 2.25 + rgbGen lightingDiffuse + } + { + map models/players/grievous/g03_3 + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + rgbGen lightingDiffuse + } + { + map models/players/grievous/g03_4 + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + rgbGen lightingDiffuse + } } -models/players/grievous/head +models/players/grievous/g01 { - { - map models/players/grievous/head - rgbGen lightingDiffuse - //alphaFunc GE128 - } - { - map models/players/grievous/head_spec - blendFunc GL_SRC_ALPHA GL_ONE - alphaGen lightingSpecular - detail - } -} - -models/players/grievous/legs -{ - { - map models/players/grievous/legs - rgbGen lightingDiffuse - //alphaFunc GE128 - } - { - map models/players/grievous/legs_spec - blendFunc GL_SRC_ALPHA GL_ONE - alphaGen lightingSpecular - detail - } -} - -models/players/grievous/torso -{ - { - map models/players/grievous/torso - rgbGen lightingDiffuse - //alphaFunc GE128 - } - { - map models/players/grievous/torso_spec - blendFunc GL_SRC_ALPHA GL_ONE - alphaGen lightingSpecular - detail - } -} - - -models/players/grievous/arms_worn -{ - { - map models/players/grievous/arms_worn - rgbGen lightingDiffuse - //alphaFunc GE128 - } - { - map models/players/grievous/arms_spec - blendFunc GL_SRC_ALPHA GL_ONE - alphaGen lightingSpecular - detail - } -} - -models/players/grievous/breastplate_worn -{ - { - map models/players/grievous/breastplate_worn - rgbGen lightingDiffuse - //alphaFunc GE128 - } - { - map models/players/grievous/breastplate_spec - blendFunc GL_SRC_ALPHA GL_ONE - alphaGen lightingSpecular - detail - } -} - -models/players/grievous/hands_worn -{ - { - map models/players/grievous/hands_worn - rgbGen lightingDiffuse - //alphaFunc GE128 - } - { - map models/players/grievous/hands_spec - blendFunc GL_SRC_ALPHA GL_ONE - alphaGen lightingSpecular - detail - } -} - -models/players/grievous/head_worn -{ - { - map models/players/grievous/head_worn - rgbGen lightingDiffuse - //alphaFunc GE128 - } - { - map models/players/grievous/head_spec - blendFunc GL_SRC_ALPHA GL_ONE - alphaGen lightingSpecular - detail - } -} - -models/players/grievous/legs_worn -{ - { - map models/players/grievous/legs_worn - rgbGen lightingDiffuse - //alphaFunc GE128 - } - { - map models/players/grievous/legs_spec - blendFunc GL_SRC_ALPHA GL_ONE - alphaGen lightingSpecular - detail - } + cull twosided + { + map models/players/grievous/g01 + rgbGen lightingDiffuse + alphaFunc GE128 + } } \ No newline at end of file diff --git a/MBAssets3/shaders/jedi_tor.shader b/MBAssets3/shaders/jedi_tor.shader index a3d09456e..ab05c2d2c 100644 --- a/MBAssets3/shaders/jedi_tor.shader +++ b/MBAssets3/shaders/jedi_tor.shader @@ -62,4 +62,30 @@ models/players/jedi_tor/jedi_knight_cull alphaGen lightingSpecular detail } +} + + +// Sith Eradicator - Aviar + +models/players/jedi_tor/head_face_aviar +{ + { + map models/players/jedi_tor/head_face_aviar + rgbGen lightingDiffuse + } + { + map models/players/jedi_tor/head_face_aviar-spec + blendFunc GL_SRC_ALPHA GL_ONE + alphaGen lightingSpecular + detail + } +} + +models/players/jedi_tor/hood_sith_cull +{ + cull twosided + { + map models/players/jedi_tor/hood_sith + rgbGen lightingDiffuse + } } \ No newline at end of file diff --git a/MBAssets3/shaders/mb2_kotor_pm.mtr b/MBAssets3/shaders/mb2_kotor_pm.mtr index 8141c56b4..9b2b30330 100644 --- a/MBAssets3/shaders/mb2_kotor_pm.mtr +++ b/MBAssets3/shaders/mb2_kotor_pm.mtr @@ -17,48 +17,142 @@ models/players/atton/atton_head } //// Bastilla Shan //// -models/players/bastila/body +models/players/bastila/boots_hands { { - map models/players/bastila/body + map models/players/bastila/boots_hands rgbGen lightingDiffuse } { - map models/players/bastila/body_spec + map models/players/bastila/boots_hands_spec blendFunc GL_SRC_ALPHA GL_ONE alphaGen lightingSpecular detail } } -models/players/bastila/head +models/players/bastila/boots_hands_sith +{ + { + map models/players/bastila/boots_hands_sith + rgbGen lightingDiffuse + } + { + map models/players/bastila/boots_hands_spec + blendFunc GL_SRC_ALPHA GL_ONE + alphaGen lightingSpecular + detail + } +} + +models/players/bastila/extras +{ + cull disable + { + map models/players/bastila/extras + rgbGen lightingDiffuse + } + { + map models/players/bastila/extras_spec + blendFunc GL_SRC_ALPHA GL_ONE + alphaGen lightingSpecular + detail + } +} + +models/players/bastila/extras_sith +{ + cull disable + { + map models/players/bastila/extras_sith + rgbGen lightingDiffuse + } + { + map models/players/bastila/extras_spec + blendFunc GL_SRC_ALPHA GL_ONE + alphaGen lightingSpecular + detail + } +} + +models/players/bastila/hairtie +{ + { + map models/players/bastila/hairtie + rgbGen lightingDiffuse + } + { + map models/players/bastila/hairtie_spec + blendFunc GL_SRC_ALPHA GL_ONE + alphaGen lightingSpecular + detail + } +} + +models/players/bastila/hairtie_sith +{ + { + map models/players/bastila/hairtie_sith + rgbGen lightingDiffuse + } + { + map models/players/bastila/hairtie_spec + blendFunc GL_SRC_ALPHA GL_ONE + alphaGen lightingSpecular + detail + } +} + +models/players/bastila/layers { cull disable { - map models/players/bastila/head + map models/players/bastila/layers rgbGen lightingDiffuse } + { + map models/players/bastila/layers_spec + blendFunc GL_SRC_ALPHA GL_ONE + alphaGen lightingSpecular + detail + } } -models/players/bastila/body_sith +models/players/bastila/layers_sith { + cull disable { - map models/players/bastila/body_sith + map models/players/bastila/layers_sith rgbGen lightingDiffuse } { - map models/players/bastila/body_sith_spec + map models/players/bastila/layers_spec blendFunc GL_SRC_ALPHA GL_ONE alphaGen lightingSpecular detail } } -models/players/bastila/head_sith +models/players/bastila/hair { cull disable { - map models/players/bastila/head_sith + map models/players/bastila/hair + alphaFunc GE128 + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + depthWrite + rgbGen lightingDiffuse + } +} + +models/players/bastila/hair_sith +{ + cull disable + { + map models/players/bastila/hair_sith + alphaFunc GE128 + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + depthWrite rgbGen lightingDiffuse } } diff --git a/MBAssets3/shaders/mb2_kotor_pm.shader b/MBAssets3/shaders/mb2_kotor_pm.shader index 92b922d43..fd339c759 100644 --- a/MBAssets3/shaders/mb2_kotor_pm.shader +++ b/MBAssets3/shaders/mb2_kotor_pm.shader @@ -17,52 +17,148 @@ models/players/atton/atton_head } //// Bastilla Shan //// -models/players/bastila/body +models/players/bastila/boots_hands { { - map models/players/bastila/body + map models/players/bastila/boots_hands rgbGen lightingDiffuse } { - map models/players/bastila/body_spec + map models/players/bastila/boots_hands_spec blendFunc GL_SRC_ALPHA GL_ONE alphaGen lightingSpecular detail } } -models/players/bastila/head +models/players/bastila/boots_hands_sith +{ + { + map models/players/bastila/boots_hands_sith + rgbGen lightingDiffuse + } + { + map models/players/bastila/boots_hands_spec + blendFunc GL_SRC_ALPHA GL_ONE + alphaGen lightingSpecular + detail + } +} + +models/players/bastila/extras { cull disable { - map models/players/bastila/head + map models/players/bastila/extras rgbGen lightingDiffuse } + { + map models/players/bastila/extras_spec + blendFunc GL_SRC_ALPHA GL_ONE + alphaGen lightingSpecular + detail + } } -models/players/bastila/body_sith +models/players/bastila/extras_sith { + cull disable { - map models/players/bastila/body_sith + map models/players/bastila/extras_sith rgbGen lightingDiffuse } { - map models/players/bastila/body_sith_spec + map models/players/bastila/extras_spec blendFunc GL_SRC_ALPHA GL_ONE alphaGen lightingSpecular detail } } -models/players/bastila/head_sith +models/players/bastila/hairtie +{ + { + map models/players/bastila/hairtie + rgbGen lightingDiffuse + } + { + map models/players/bastila/hairtie_spec + blendFunc GL_SRC_ALPHA GL_ONE + alphaGen lightingSpecular + detail + } +} + +models/players/bastila/hairtie_sith +{ + { + map models/players/bastila/hairtie_sith + rgbGen lightingDiffuse + } + { + map models/players/bastila/hairtie_spec + blendFunc GL_SRC_ALPHA GL_ONE + alphaGen lightingSpecular + detail + } +} + +models/players/bastila/layers { cull disable { - map models/players/bastila/head_sith + map models/players/bastila/layers + rgbGen lightingDiffuse + } + { + map models/players/bastila/layers_spec + blendFunc GL_SRC_ALPHA GL_ONE + alphaGen lightingSpecular + detail + } +} + +models/players/bastila/layers_sith +{ + cull disable + { + map models/players/bastila/layers_sith + rgbGen lightingDiffuse + } + { + map models/players/bastila/layers_spec + blendFunc GL_SRC_ALPHA GL_ONE + alphaGen lightingSpecular + detail + } +} + +models/players/bastila/hair +{ + cull disable + { + map models/players/bastila/hair + alphaFunc GE128 + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + depthWrite rgbGen lightingDiffuse } } +models/players/bastila/hair_sith +{ + cull disable + { + map models/players/bastila/hair_sith + alphaFunc GE128 + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + depthWrite + rgbGen lightingDiffuse + } +} + + + //// Calo Nord //// models/players/calonord/torso { @@ -224,7 +320,6 @@ models/players/darthbandon/bandon_torso // HK-47 // - models/players/hk47/hk47 { { @@ -267,7 +362,6 @@ models/players/hk47/hk47_body_old // HK-50 // - models/players/hk47/hk50 { { @@ -290,7 +384,6 @@ models/players/hk47/hk50 // HK-51 // - models/players/hk47/hk51 { { @@ -312,6 +405,17 @@ models/players/hk47/hk51 } +//// Jolee Bindo //// +models/players/jolee/lower_robe +{ + cull twosided + { + map models/players/jolee/lower_robe + rgbGen lightingDiffuse + } +} + + //// Kreia //// models/players/kreia/belt_traya { @@ -411,7 +515,7 @@ models/players/kreia/head_traya } } -models/players/kreia/robe_nocull +models/players/kreia/robe_twosided { cull twosided { @@ -420,7 +524,7 @@ models/players/kreia/robe_nocull } } -models/players/kreia/robe_traya_nocull +models/players/kreia/robe_traya_twosided { cull twosided { diff --git a/MBAssets3/shaders/mudtrooper.shader b/MBAssets3/shaders/mudtrooper.shader index f4fe4b542..99ce80461 100644 --- a/MBAssets3/shaders/mudtrooper.shader +++ b/MBAssets3/shaders/mudtrooper.shader @@ -184,12 +184,12 @@ models/players/mudtrooper/newparts_andor // Andor - Garrison -models/players/imperial_garrison/armor_sergeant +models/players/mudtrooper/armor_sergeant { q3map_nolightmap cull disable { - map models/players/imperial_garrison/armor_sergeant + map models/players/mudtrooper/armor_sergeant rgbGen lightingDiffuse } { @@ -200,22 +200,6 @@ models/players/imperial_garrison/armor_sergeant } } -models/players/imperial_garrison/cloth -{ - q3map_nolightmap - cull disable - { - map models/players/imperial_garrison/cloth - rgbGen lightingDiffuse - } - { - map models/players/mudtrooper/cloth_clean_spec - blendFunc GL_SRC_ALPHA GL_ONE - detail - alphaGen lightingSpecular - } -} - // Andor - ISB Tactical Agent diff --git a/MBAssets3/shaders/obiwan.shader b/MBAssets3/shaders/obiwan.shader index c98cf06bb..fb4bfdbf1 100644 --- a/MBAssets3/shaders/obiwan.shader +++ b/MBAssets3/shaders/obiwan.shader @@ -142,7 +142,9 @@ models/players/obiwan_ot/legs } } + // CW + models/players/obiwan_cw/cape { cull twosided @@ -161,6 +163,53 @@ models/players/obiwan_cw/torso } } + +// TCW + +models/players/obiwan_tcw/body_clean +{ + { + map models/players/obiwan_tcw/body_clean + blendFunc GL_ONE GL_ZERO + rgbGen lightingDiffuse + } + { + map models/players/MB2_clones/body_clean_spec + blendFunc GL_SRC_ALPHA GL_ONE + alphaGen lightingSpecular + detail + } +} + +models/players/obiwan_tcw/bodysuit_clean +{ + { + map models/players/obiwan_tcw/bodysuit_clean + blendFunc GL_ONE GL_ZERO + rgbGen lightingDiffuse + } + { + map models/players/MB2_clones/bodysuit_clean_spec + blendFunc GL_SRC_ALPHA GL_ONE + alphaGen lightingSpecular + detail + } +} + +models/players/obiwan_tcw/boots +{ + { + map models/players/obiwan_tcw/boots + rgbGen lightingDiffuse + } + { + map models/players/obiwan_ep3/boots_spec + blendFunc GL_SRC_ALPHA GL_ONE + alphaGen lightingSpecular + detail + } +} + // OT Ghost models/players/obiwan_ot/belt_ghost { diff --git a/MBAssets3/shaders/sithtrooper_ep9.shader b/MBAssets3/shaders/sithtrooper_ep9.shader new file mode 100644 index 000000000..06a8d7e9e --- /dev/null +++ b/MBAssets3/shaders/sithtrooper_ep9.shader @@ -0,0 +1,77 @@ +// Sith Trooper Ep9 + +models/players/sithtrooper_ep9/armor +{ + q3map_nolightmap + { + map models/players/sithtrooper_ep9/armor + blendFunc GL_ONE GL_ZERO + rgbGen lightingDiffuse + } + { + map models/players/common/spec1 + blendFunc GL_DST_COLOR GL_SRC_COLOR + tcGen environment + blendFunc GL_SRC_ALPHA GL_ONE + detail + alphaGen lightingSpecular + } + { + map models/players/sithtrooper_ep9/armor_s + blendFunc GL_SRC_ALPHA GL_ONE + detail + alphaGen lightingSpecular + } +} + +models/players/sithtrooper_ep9/helmet +{ + q3map_nolightmap + { + map models/players/sithtrooper_ep9/helmet + blendFunc GL_ONE GL_ZERO + rgbGen lightingDiffuse + } + { + map models/players/common/spec1 + blendFunc GL_DST_COLOR GL_SRC_COLOR + tcGen environment + blendFunc GL_SRC_ALPHA GL_ONE + detail + alphaGen lightingSpecular + } + { + map models/players/sithtrooper_ep9/helmet_s + blendFunc GL_SRC_ALPHA GL_ONE + detail + alphaGen lightingSpecular + } +} + +models/players/sithtrooper_ep9/pauldron_d_white +{ + { + map models/players/sithtrooper_ep9/pauldron_d_white + rgbGen lightingDiffuse + } + { + map models/players/sithtrooper_ep9/pauldron_s + blendFunc GL_SRC_ALPHA GL_ONE + detail + alphaGen lightingSpecular + } +} + +models/players/sithtrooper_ep9/vest +{ + { + map models/players/sithtrooper_ep9/vest + rgbGen lightingDiffuse + } + { + map models/players/sithtrooper_ep9/vest_s + blendFunc GL_SRC_ALPHA GL_ONE + detail + alphaGen lightingSpecular + } +} diff --git a/MBAssets3/shaders/starkiller.shader b/MBAssets3/shaders/starkiller.shader new file mode 100644 index 000000000..776f9b80d --- /dev/null +++ b/MBAssets3/shaders/starkiller.shader @@ -0,0 +1,51 @@ +models/players/starkiller/fular +{ + cull twosided + { + map models/players/starkiller/fular + alphaFunc GE128 + depthWrite + rgbGen lightingDiffuse + } +} + +models/players/starkiller/bandages +{ + cull twosided + { + map models/players/starkiller/bandages + rgbGen lightingDiffuse + } +} + +models/players/starkiller/belt_extras +{ + cull twosided + { + map models/players/starkiller/belt_extras + blendFunc GL_ONE GL_ZERO + rgbGen lightingDiffuse + } + { + map models/players/starkiller/belt_extras_spec + blendFunc GL_SRC_ALPHA GL_ONE + detail + alphaGen lightingSpecular + } +} + +models/players/starkiller/torso_armor +{ + cull twosided + { + map models/players/starkiller/torso_armor + blendFunc GL_ONE GL_ZERO + rgbGen lightingDiffuse + } + { + map models/players/starkiller/torso_armor_spec + blendFunc GL_SRC_ALPHA GL_ONE + detail + alphaGen lightingSpecular + } +} \ No newline at end of file diff --git a/MBAssets3/ui/mb/alpha/game/class/mb_class_droideka.menu b/MBAssets3/ui/mb/alpha/game/class/mb_class_droideka.menu index 1f63cfad8..433b4803e 100644 --- a/MBAssets3/ui/mb/alpha/game/class/mb_class_droideka.menu +++ b/MBAssets3/ui/mb/alpha/game/class/mb_class_droideka.menu @@ -317,7 +317,7 @@ rect 8 165 147 18 text " " noTextBlink 1 - text2 "Shield Discharge" + text2 "Shield Discharge [CS2]" font 6 text2alignx -95 textalign ITEM_ALIGN_LEFT @@ -325,7 +325,8 @@ textaligny -5 textscale .15 forecolor 1 1 1 0.8 - descText "Uses shield energy to create a discharge shockwave knocking down or back enemies" + bindings { "+button11" } + descText "Uses shield energy to create a discharge shockwave knocking down or back enemies\nUse with: Class Special 2 [%b]" visible 1 action { play "sound/interface/button1.wav" diff --git a/MBAssets3/ui/mb/alpha/game/mb_ingame_moderate.menu b/MBAssets3/ui/mb/alpha/game/mb_ingame_moderate.menu index e7b90f4d9..808918c85 100644 --- a/MBAssets3/ui/mb/alpha/game/mb_ingame_moderate.menu +++ b/MBAssets3/ui/mb/alpha/game/mb_ingame_moderate.menu @@ -96,45 +96,6 @@ hide btn_hl } } - itemDef - { - name back2 - group bg_button - text "BACK" - descText @MENUS_BACKUP_ONE_MENU - type ITEM_TYPE_BUTTON - style WINDOW_STYLE_FILLED_RGB1 - textstyle WINDOW_STYLE_TEXT_RGB2 - background "gfx/menus/alpha/Btn_Bg" - rect 0 382 120 36 - textaligny -8 - font 6 - textscale 0.3 - textalignx 58 - textalign ITEM_ALIGN_CENTER - visible 1 - forecolor 1 1 1 1 - action - { - play "sound/interface/back.mp3" - hide customizeMap - show smod - show maintitle - hide maptitle - show password - hide back2 - show back1 - } - mouseenter - { - show btn_hl - setitemrect btn_hl 0 382 120 36 - } - mouseExit - { - hide btn_hl - } - } // APPLY CHANGES BUTTON diff --git a/MBAssets3/ui/mb/alpha/hud/mb_hud_playerstatus.menu b/MBAssets3/ui/mb/alpha/hud/mb_hud_playerstatus.menu index d6c7c2ef2..6e28bf3ec 100644 --- a/MBAssets3/ui/mb/alpha/hud/mb_hud_playerstatus.menu +++ b/MBAssets3/ui/mb/alpha/hud/mb_hud_playerstatus.menu @@ -344,6 +344,20 @@ rect 610 410 -128 128 // Size and position of the menu visible 1 // Visible on open + +/* + itemDef + { + name "genericTimer" + forecolor 1 1 1 0.75 + background "gfx/hud/Alpha/HUD_StatusEmplacedFlipped" + background2 "gfx/hud/Alpha/HUD_StatusEmplacedFlipped" + rect -29 4 -70 -12 + backcolor 0 0 0 0.5 + style 2 + } +*/ + // Metal Frame itemDef { diff --git a/MBAssets3/ui/mb/alpha/share/mb_settings.menu b/MBAssets3/ui/mb/alpha/share/mb_settings.menu index dfdb68c0e..059346bdd 100644 --- a/MBAssets3/ui/mb/alpha/share/mb_settings.menu +++ b/MBAssets3/ui/mb/alpha/share/mb_settings.menu @@ -13660,6 +13660,41 @@ itemDef } } + itemDef + { + group othercontrols + style WINDOW_STYLE_TEXT_RGB2 + type ITEM_TYPE_BIND + text " " + cvar "messagemode3" + text2 "Private Message:" + rect 142 170 230 14 + textalign ITEM_ALIGN_RIGHT + textalignx 140 + text2alignx -118 + textaligny -5 + font 5 + textscale 0.15 + forecolor 0.5 0.5 0.5 1 + visible 0 + descText "When looking at a player, start writing them a private message." + mouseenter + { + show button_glow + setitemrect button_glow 142 171 230 15 + show keybindstatus + } + mouseExit + { + hide button_glow + hide keybindstatus + } + action + { + play "sound/interface/go.mp3" + } + } + itemDef { group othercontrols @@ -13668,7 +13703,7 @@ itemDef text " " cvar "voicechat" text2 @MENUS_VC_CONTROLS - rect 142 170 230 14 + rect 142 185 230 14 textalign ITEM_ALIGN_RIGHT textalignx 140 text2alignx -118 @@ -13681,7 +13716,7 @@ itemDef mouseenter { show button_glow - setitemrect button_glow 142 171 230 15 + setitemrect button_glow 142 186 230 15 show keybindstatus } mouseExit @@ -13703,7 +13738,7 @@ itemDef text " " cvar "automap_toggle" text2 @MENUS_AUTOMAP - rect 142 185 230 14 + rect 142 200 230 14 textalign ITEM_ALIGN_RIGHT textalignx 140 text2alignx -118 @@ -13720,7 +13755,7 @@ itemDef mouseenter { show button_glow - setitemrect button_glow 142 186 230 15 + setitemrect button_glow 142 201 230 15 show keybindstatus } mouseExit @@ -13738,7 +13773,7 @@ itemDef text " " cvar "+scores" text2 @MENUS_SHOW_SCORES - rect 142 200 230 14 + rect 142 215 230 14 textalign ITEM_ALIGN_RIGHT textalignx 140 text2alignx -118 @@ -13751,7 +13786,7 @@ itemDef mouseenter { show button_glow - setitemrect button_glow 142 201 230 15 + setitemrect button_glow 142 216 230 15 show keybindstatus } mouseExit @@ -13773,7 +13808,7 @@ itemDef text " " cvar "cg_thirdperson !" text2 "1st/3rd Person:" - rect 142 215 230 14 + rect 142 230 230 14 textalign ITEM_ALIGN_RIGHT textalignx 140 text2alignx -118 @@ -13786,7 +13821,7 @@ itemDef mouseenter { show button_glow - setitemrect button_glow 142 216 230 15 + setitemrect button_glow 142 231 230 15 show keybindstatus } mouseExit @@ -13808,7 +13843,7 @@ itemDef text " " cvar "taunt" text2 @MENUS_TAUNT - rect 142 230 230 14 + rect 142 245 230 14 textalign ITEM_ALIGN_RIGHT textalignx 140 text2alignx -118 @@ -13821,7 +13856,7 @@ itemDef mouseenter { show button_glow - setitemrect button_glow 142 231 230 15 + setitemrect button_glow 142 246 230 15 show keybindstatus } mouseExit @@ -13843,7 +13878,7 @@ itemDef text " " cvar "bow" text2 @MENUS_BOW - rect 142 245 230 14 + rect 142 260 230 14 textalign ITEM_ALIGN_RIGHT textalignx 140 text2alignx -118 @@ -13856,7 +13891,7 @@ itemDef mouseenter { show button_glow - setitemrect button_glow 142 246 230 15 + setitemrect button_glow 142 261 230 15 show keybindstatus } mouseExit @@ -13878,7 +13913,7 @@ itemDef text " " cvar "meditate" text2 @MENUS_MEDITATE - rect 142 260 230 14 + rect 142 275 230 14 textalign ITEM_ALIGN_RIGHT textalignx 140 text2alignx -118 @@ -13891,7 +13926,7 @@ itemDef mouseenter { show button_glow - setitemrect button_glow 142 261 230 15 + setitemrect button_glow 142 276 230 15 show keybindstatus } mouseExit @@ -13913,7 +13948,7 @@ itemDef text " " cvar "flourish" text2 @MENUS_FLOURISH - rect 142 275 230 14 + rect 142 290 230 14 textalign ITEM_ALIGN_RIGHT textalignx 140 text2alignx -118 @@ -13926,7 +13961,7 @@ itemDef mouseenter { show button_glow - setitemrect button_glow 142 276 230 15 + setitemrect button_glow 142 291 230 15 show keybindstatus } mouseExit @@ -13948,7 +13983,7 @@ itemDef text " " cvar "gloat" text2 @MENUS_GLOAT - rect 142 290 230 14 + rect 142 305 230 14 textalign ITEM_ALIGN_RIGHT textalignx 140 text2alignx -118 @@ -13961,7 +13996,7 @@ itemDef mouseenter { show button_glow - setitemrect button_glow 142 291 230 15 + setitemrect button_glow 142 306 230 15 show keybindstatus } mouseExit @@ -13981,7 +14016,7 @@ itemDef group none ownerdraw 250 text @MENUS_BLANK_1 - rect 172 300 0 0 + rect 172 320 0 0 textStyle 0 font 5 textscale 0.15 diff --git a/MBAssets3/ui/mb/hybrid/game/class/mb_class_droideka.menu b/MBAssets3/ui/mb/hybrid/game/class/mb_class_droideka.menu index 61c883029..f52e545f6 100644 --- a/MBAssets3/ui/mb/hybrid/game/class/mb_class_droideka.menu +++ b/MBAssets3/ui/mb/hybrid/game/class/mb_class_droideka.menu @@ -433,7 +433,7 @@ name setfp_rage group darkpowers style WINDOW_STYLE_TEXT_RGB1 - text "Shield Discharge" + text "Shield Discharge [CS 2]" //descText @MENUS_DESCRIPTION_OF_A_FORCE rect 230 220 110 15 textalign ITEM_ALIGN_RIGHT @@ -467,7 +467,7 @@ forecolor 0.1 0.7 1 0.7 border 0 bordercolor 0 0 0 0 - descText "Uses shield energy to create a discharge shockwave knocking down or back enemies" + descText "Uses shield energy to create a discharge shockwave knocking down or back enemies with the Class Special 2 key" visible 1 action { diff --git a/MBAssets3/ui/mb/minimalismhud/hud/mb_hud_centered_playerstatus.menu b/MBAssets3/ui/mb/minimalismhud/hud/mb_hud_centered_playerstatus.menu index e26ba917b..5925f5704 100644 --- a/MBAssets3/ui/mb/minimalismhud/hud/mb_hud_centered_playerstatus.menu +++ b/MBAssets3/ui/mb/minimalismhud/hud/mb_hud_centered_playerstatus.menu @@ -348,6 +348,19 @@ style 0 // Determines whether Player Status HUD is Horizontal (0), Vertical (1), Circular (2) } + itemDef + { + name "genericTimer" + forecolor 1 1 1 0.92 + background "gfx/hud/Alpha/HUD_TickMark_Full" + background2 "gfx/hud/Alpha/HUD_TickMark_Full" + rect -89 54 -8 -58 + backcolor 0 0 0 0.5 + style 1 // 1 Vertical, 2 Horizontal + align 5 + textalignx -14 + } + //Player Mode Frame itemDef { diff --git a/MBAssets3/ui/mb/minimalismhud/hud/mb_hud_centerfuelbar_playerstatus.menu b/MBAssets3/ui/mb/minimalismhud/hud/mb_hud_centerfuelbar_playerstatus.menu index 37b6410bc..4ddcebdc5 100644 --- a/MBAssets3/ui/mb/minimalismhud/hud/mb_hud_centerfuelbar_playerstatus.menu +++ b/MBAssets3/ui/mb/minimalismhud/hud/mb_hud_centerfuelbar_playerstatus.menu @@ -348,6 +348,19 @@ style 0 // Determines whether Player Status HUD is Horizontal (0), Vertical (1), Circular (2) } + itemDef + { + name "genericTimer" + forecolor 1 1 1 0.92 + background "gfx/hud/Alpha/HUD_TickMark_Full" + background2 "gfx/hud/Alpha/HUD_TickMark_Full" + rect -89 54 -8 -58 + backcolor 0 0 0 0.5 + style 1 // 1 Vertical, 2 Horizontal + align 5 + textalignx -14 + } + //Player Mode Frame itemDef { diff --git a/MBAssets3/ui/mb/minimalismhud/hud/mb_hud_fuelbar_playerstatus.menu b/MBAssets3/ui/mb/minimalismhud/hud/mb_hud_fuelbar_playerstatus.menu index 3acd8f9ef..f5d72987d 100644 --- a/MBAssets3/ui/mb/minimalismhud/hud/mb_hud_fuelbar_playerstatus.menu +++ b/MBAssets3/ui/mb/minimalismhud/hud/mb_hud_fuelbar_playerstatus.menu @@ -347,7 +347,20 @@ rect 22 -12 -200 100 style 0 // Determines whether Player Status HUD is Horizontal (0), Vertical (1), Circular (2) } - //Weapon Mode Frame + + itemDef + { + name "genericTimer" + forecolor 1 1 1 0.92 + background "gfx/hud/Alpha/HUD_TickMark_Full" + background2 "gfx/hud/Alpha/HUD_TickMark_Full" + rect 30 54 -8 -58 + backcolor 0 0 0 0.5 + style 1 // 1 Vertical, 2 Horizontal + align 5 + textalignx -184 + } + //Weapon Mode Frame diff --git a/MBAssets3/ui/mb/minimalismhud/hud/mb_hud_playerstatus.menu b/MBAssets3/ui/mb/minimalismhud/hud/mb_hud_playerstatus.menu index cdc0735bf..e55c706ff 100644 --- a/MBAssets3/ui/mb/minimalismhud/hud/mb_hud_playerstatus.menu +++ b/MBAssets3/ui/mb/minimalismhud/hud/mb_hud_playerstatus.menu @@ -348,6 +348,19 @@ rect 22 -12 -200 100 style 0 // Determines whether Player Status HUD is Horizontal (0), Vertical (1), Circular (2) } + + itemDef + { + name "genericTimer" + forecolor 1 1 1 0.92 + background "gfx/hud/Alpha/HUD_TickMark_Full" + background2 "gfx/hud/Alpha/HUD_TickMark_Full" + rect 30 54 -8 -58 + backcolor 0 0 0 0.5 + style 1 // 1 Vertical, 2 Horizontal + align 5 + textalignx -184 + } //Weapon Mode Frame diff --git a/MB_Effects/effects/Flamethrower/poisonthrower.efx b/MB_Effects/effects/Flamethrower/poisonthrower.efx new file mode 100644 index 000000000..6eafe6c2c --- /dev/null +++ b/MB_Effects/effects/Flamethrower/poisonthrower.efx @@ -0,0 +1,58 @@ +repeatDelay 300 + +Particle +{ + name mist + + flags useAlpha + + count 4 + + life 1000 2000 + + origin -2 -5 -5 2 5 5 + + rotation 0 360 + + rotationDelta -15 15 + + gravity 5 + + rgb + { + start 0.8588 0.9803 0.3803 + end 0 0 0 + flags linear + } + + alpha + { + start 0.5 0.8 + end 0 + parm 60 75 + flags linear clamp + } + + size + { + end 140 140 + parm 140 + flags clamp + } + + shaders + [ + gfx/effects/alpha_smoke + ] +} + +Sound +{ + name massive_smoke + + sounds + [ + sound/effects/gassing2.wav + sound/effects/gassing3.wav + ] +} diff --git a/MB_Effects/effects/slime_explosion_new.efx b/MB_Effects/effects/slime_explosion_new.efx index ef0a34df4..089dba6df 100644 --- a/MB_Effects/effects/slime_explosion_new.efx +++ b/MB_Effects/effects/slime_explosion_new.efx @@ -5,25 +5,22 @@ Particle name LingeringSmoke spawnFlags evenDistribution rgbComponentInterpolation - count 10 life 1500 2500 - delay 100 200 - origin 10 10 10 -10 -10 -10 + origin 33.75 33.75 33.75 -33.75 -33.75 -33.75 rotation 0 360 - rotationDelta -4 4 - velocity 30 30 30 -30 -30 -30 + velocity 101.25 101.25 101.25 -101.25 -101.25 -101.25 rgb { - start 0.6431 0.2078 0 0.502 0 0 - end 0.502 0 0 1 0.502 0 + start 0.1 0.5 0.1 0.2 1 0.2 + end 0.05 0.3 0.05 0.6 1 0.2 flags linear } @@ -37,9 +34,9 @@ Particle size { - start 1 4 - end 30 70 - parm 30 50 + start 3.375 13.5 + end 101.25 236.25 + parm 101.25 168.75 flags linear clamp } @@ -52,40 +49,35 @@ Particle Light { name Flash - delay 100 rgb { - start 1 0.502 0 1 0 0 + start 0.3 1 0.3 0.6 1 0.2 } size { - start 90 100 + start 303.75 337.5 } } Particle { name Dust - flags useAlpha - spawnFlags rgbComponentInterpolation life 150 200 - delay 100 rotation -360 360 - rotationDelta -5 5 rgb { - start 0.9922 0.9059 0.302 1 0 0 - end 1 0 0 0.949 0.7255 0.05098 + start 0.6 1 0.2 0.2 0.8 0.2 + end 0.3 0.6 0.1 0.6 1 0.2 flags linear } @@ -99,9 +91,9 @@ Particle size { - start 0.1 6 - end 70 110 - parm 20 30 + start 0.3375 20.25 + end 236.25 371.25 + parm 67.5 101.25 flags linear } @@ -114,20 +106,15 @@ Particle CameraShake { name Shake - flags usePhysics - life 500 800 - bounce 2 4 - radius 200 300 } Sound { name Boom - sounds [ sound/weapons/explosions/explosion_huge3.mp3 @@ -137,21 +124,18 @@ Sound Particle { name exp - spawnFlags rgbComponentInterpolation - count 2 life 500 rotation -30 30 - rotationDelta -4 4 rgb { - start 1 0 0 1 0.502 0 - end 0.6431 0.2078 0 0.949 0.7255 0.05098 + start 0.6 1 0.2 0.2 1 0.2 + end 0.1 0.5 0.1 0.6 1 0.2 flags linear } @@ -165,9 +149,9 @@ Particle size { - start 80 90 - end 2 1 - parm 30 40 + start 270 303.75 + end 6.75 3.375 + parm 101.25 135 flags linear clamp } @@ -180,12 +164,11 @@ Particle OrientedParticle { life 600 800 - delay 100 rgb { - start 1 0 0 0.6431 0.2078 0 + start 0.6 1 0.2 0.1 0.5 0.1 } alpha @@ -197,7 +180,7 @@ OrientedParticle size { - end 200 150 + end 675 506.25 flags linear } @@ -210,12 +193,11 @@ OrientedParticle Particle { life 600 750 - delay 100 rgb { - start 1 0 0 0.502 0 0 + start 0.2 1 0.2 0.1 0.5 0.1 } alpha @@ -227,7 +209,7 @@ Particle size { - end 200 150 + end 675 506.25 flags nonlinear } diff --git a/mb2_cmp_assets3/shaders/jolee.shader b/mb2_cmp_assets3/shaders/jolee.shader deleted file mode 100644 index 1d9937385..000000000 --- a/mb2_cmp_assets3/shaders/jolee.shader +++ /dev/null @@ -1,10 +0,0 @@ -// Jolee Bindo - -models/players/jolee/body -{ - cull disable - { - map models/players/jolee/body - rgbGen lightingDiffuse - } -} \ No newline at end of file diff --git a/mb2_pb_assets2/models/players/Borat/animevents.cfg b/mb2_pb_assets2/models/players/Borat/animevents.cfg index 7d53d13f8..d4b6660fb 100644 --- a/mb2_pb_assets2/models/players/Borat/animevents.cfg +++ b/mb2_pb_assets2/models/players/Borat/animevents.cfg @@ -290,15 +290,15 @@ UPPEREVENTS BOTH_SHOWOFF_STRONG AEV_SOUNDCHAN 6 CHAN_AUTO sound/weapons/saber/saberspin.wav 0 0 0 BOTH_SHOWOFF_STRONG AEV_SOUNDCHAN 10 CHAN_AUTO sound/weapons/saber/saberspin.wav 0 0 0 BOTH_SHOWOFF_STRONG AEV_SOUNDCHAN 15 CHAN_AUTO sound/weapons/saber/saber_catch.mp3 0 0 0 - BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_clash.efx *blade1 0 - BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_clash.efx *blade1 0 - BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_clash.efx *blade1 0 - BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_clash.efx *blade1 0 - BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_clash.efx *blade1 0 - BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_clash.efx *blade1 0 - BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_clash.efx *blade1 0 - BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_clash.efx *blade1 0 - BOTH_VICTORY_STAFF AEV_EFFECT 83 force/pushblur.efx *r_hand 0 + BOTH_VICTORY_DUAL AEV_EFFECT 15 saber/saber_block.efx *blade1 0 + BOTH_VICTORY_DUAL AEV_EFFECT 16 saber/saber_block.efx *blade1 0 + BOTH_VICTORY_DUAL AEV_EFFECT 17 saber/saber_block.efx *blade1 0 + BOTH_VICTORY_DUAL AEV_EFFECT 18 saber/saber_block.efx *blade1 0 + BOTH_SHOWOFF_DUAL AEV_EFFECT 6 saber/saber_block.efx *blade1 0 + BOTH_SHOWOFF_DUAL AEV_EFFECT 8 saber/saber_block.efx *blade1 0 + BOTH_SHOWOFF_DUAL AEV_EFFECT 10 saber/saber_block.efx *blade1 0 + BOTH_SHOWOFF_DUAL AEV_EFFECT 12 saber/saber_block.efx *blade1 0 +/* BOTH_VICTORY_STAFF AEV_EFFECT 83 force/pushblur.efx *r_hand 0 BOTH_VICTORY_STAFF AEV_EFFECT 84 force/pushblur.efx *r_hand 0 BOTH_VICTORY_STAFF AEV_EFFECT 85 force/pushblur.efx *r_hand 0 BOTH_VICTORY_STAFF AEV_EFFECT 86 force/pushblur.efx *r_hand 0 @@ -311,7 +311,7 @@ UPPEREVENTS BOTH_VICTORY_STAFF AEV_EFFECT 93 force/pushblur.efx *r_hand 0 BOTH_VICTORY_STRONG AEV_EFFECT 65 force/pushblur.efx *r_hand 0 BOTH_VICTORY_STRONG AEV_EFFECT 66 force/pushblur.efx *r_hand 0 - BOTH_VICTORY_STRONG AEV_EFFECT 67 force/pushblur.efx *r_hand 0 + BOTH_VICTORY_STRONG AEV_EFFECT 67 force/pushblur.efx *r_hand 0 */ } LOWEREVENTS diff --git a/mb2_um_assets3/ext_data/mb2/character/lpb_tech.mbch b/mb2_um_assets3/ext_data/mb2/character/lpb_tech.mbch index 4977abf96..0b8282e98 100644 --- a/mb2_um_assets3/ext_data/mb2/character/lpb_tech.mbch +++ b/mb2_um_assets3/ext_data/mb2/character/lpb_tech.mbch @@ -12,8 +12,8 @@ ClassInfo maxarmor 100 holdables HI_MEDPAC|HI_MEDPAC_BIG|HI_SENTRY_GUN|HI_EWEB|HI_SHIELD|HI_SEEKER|HI_CLOAK model "grievous" //this is optional, if it's here it forces the model to this. - skin "default" //this is optional, if it's here it forces the skin to this. - uishader "models/players/grievous/mb2_icon_default" + skin "oldcape" //this is optional, if it's here it forces the skin to this. + uishader "models/players/grievous/mb2_icon_oldcape" MBClass MB_CLASS_BOUNTY_HUNTER extralives 2 } diff --git a/z_MBLegends/ext_data/mb2/character/h10_Grogu.mbch b/z_MBLegends/ext_data/mb2/character/h10_Grogu.mbch index 499e3d1c5..457e33bce 100644 --- a/z_MBLegends/ext_data/mb2/character/h10_Grogu.mbch +++ b/z_MBLegends/ext_data/mb2/character/h10_Grogu.mbch @@ -4,17 +4,28 @@ ClassInfo name "h10_Grogu" MBClass MB_CLASS_JEDI classNumberLimit 1 + + weapons WP_MELEE + attributes MB_ATT_FP_REPULSE,1|MB_ATT_FORCEFOCUS,1|MB_ATT_LIGHTS_BEACON - forcepowers FP_PUSH,3|FP_PULL,3|FP_SEE,3|FP_GRIP,3|FP_TEAM_HEAL,1|FP_TEAM_FORCE,1|FP_PROTECT,3|FP_ABSORB,3|FP_HEAL,1|FP_LEVITATION,1 + + forcepowers FP_PUSH,3|FP_PULL,3|FP_SEE,3|FP_GRIP,3|FP_TEAM_HEAL,1|FP_HEAL,1|FP_LEVITATION,1 + basespeed 187 maxhealth 60 + resource RESOURCE_FORCE forcepool 185 forceregen 1.1 - basespeed 187 - resource RESOURCE_FORCE - - weapons WP_MELEE classflags CFL_STATVIEWER|CFL_NOPICKUPS|CFL_NOLOCATIONALDAMAGE + + //jetpackThrustEffect "" + //jetpackIdleEffect "" + + //jetpackFinishSound "sound/effects/woosh4" + //jetpackThrustSound "sound/ambience/artus/artus_shaft" + //jetpackStartSound "sound/effects/woosh22" + //jetpackIdleSound "sound/ambience/artus/artus_shaft" + runForward BOTH_RUN4 runBackward BOTH_RUNBACK4 walkForward BOTH_RUN4 @@ -23,10 +34,9 @@ ClassInfo skilltimermod 1.4 - special1 EAS_FP_REPULSE - special2 EAS_FP_HEAL - special3 EAS_FP_ABSORB + special2 EAS_FP_ABSORB + special3 EAS_FP_GRIP special4 EAS_FP_PROTECT saber1 grogu_poop_stick @@ -40,19 +50,32 @@ ClassInfo uishader "models/players/baby_yoda/mb2_icon_default" uioverlay_r "gfx/icons/support" uioverlay_l "gfx/icons/medic" + +isCustomBuild 1 +mbPoints 1 + +c_att_skill_0 MB_ATT_FP_ABSORB +c_att_names_0 "Force Absorb^3* ^3[CS2]" +c_att_ranks_0 1 +c_att_descs_0 "Effect is shared with a targeted/nearby ally" + +c_att_skill_1 MB_ATT_FP_PROTECT +c_att_names_1 "Force Protect^3* ^3[CS4]" +c_att_ranks_1 1 +c_att_descs_1 "Effect is shared with a targeted/nearby ally" } ForceInfo0 { - ForceToReplace FP_GRIP - Icon "gfx/mp/new_f_icon_dk_grip" + ForceToReplace FP_GRIP + Icon "gfx/mp/new_f_icon_dk_grip" ForcePowerName "Grogu's Grip" gripDamage 4 } -description "Grogu [Jedi] +description "Grogu -A small and vulnerable supportive Force user with the ability to share his strong healing and protective abilities with allies. +A small and vulnerable support who can share his Force Powers with allies. ^2Weaponry: - Light Melee @@ -62,18 +85,15 @@ A small and vulnerable supportive Force user with the ability to share his stron - Push (3) - Pull (3) - Sense (3) -- Grogu's Grip (3) --- 50% less DMG -- Team Energize (1) -- Heal (1)^3* ^3[CS2] -- Absorb (3)^3* ^3[CS3] -- Protect (3)^3* ^3[CS4] -- Team Heal (1) - Repulse ^3[CS1 Melee] +- Grogu's Grip (3) ^3[CS3] +-- 50% less Dmg +- Heal (1)^3* +- Team Heal (1) ^8Attributes: ^7- ^3*^7Light's Beacon (Shares Force Powers with a ^7targeted/nearby ally) -- 40% slower skill CD -- Flat Damage Taken +- 40% slower Skill Cd +- Base Dmg Taken - Ally Stat Viewer - Force Focus (1)" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h10_JApostate.mbch b/z_MBLegends/ext_data/mb2/character/h10_JApostate.mbch index 5fcab109b..105b76e54 100644 --- a/z_MBLegends/ext_data/mb2/character/h10_JApostate.mbch +++ b/z_MBLegends/ext_data/mb2/character/h10_JApostate.mbch @@ -7,26 +7,28 @@ ClassInfo classNumberLimit 1 weapons WP_SABER|WP_MELEE - attributes MB_ATT_FORCEFOCUS,3|MB_ATT_FORCEBLOCK,4|MB_ATT_FP_MIRALUKA,3|MB_ATT_GUN_DEFENSE,1|MB_ATT_FP_SABER_DEFENSE,1|MB_ATT_ANTI_MT,2|MB_ATT_DEFLECT,0 + attributes MB_ATT_FORCEFOCUS,3|MB_ATT_FORCEBLOCK,4|MB_ATT_FP_MIRALUKA,3|MB_ATT_GUN_DEFENSE,1|MB_ATT_FP_SABER_DEFENSE,1|MB_ATT_ANTI_MT,2|MB_ATT_DEFLECT,0|MB_ATT_HEALING,1 forcepowers FP_LEVITATION,1|FP_PUSH,2|FP_PULL,3|FP_SABER_OFFENSE,3|FP_SEE,3|FP_SABERTHROW,3|FP_GRIP,3|FP_DRAIN,3|FP_ABSORB,3|FP_TELEPATHY,2 - maxhealth 100 + maxhealth 115 forcepool 150 forceregen 1.75 speed 0.95 //special1 EAS_FP_SABERTHROW special2 EAS_FP_DRAIN special3 EAS_FP_GRIP - special4 EAS_FP_TELEPATHY - + special4 EAS_FP_ABSORB + damageGiven 1.1 + rateOfFire_Melee 0.9 saberstyle SS_TAVION|SS_FAST saberDamageStyle SS_TAVION,130|SS_FAST,130 saberThrowDamage 40 + saberSpecialDamage 1.35 BPmultiplier 1.25 - APmultiplier 0.95 - ASmultiplier 0.95 - CSmultiplier 0.95 + APmultiplier 0.96 + ASmultiplier 0.96 + CSmultiplier 0.96 classflags CFL_SEEING_STEALTH|CFL_NOPICKUPS @@ -51,18 +53,19 @@ ClassInfo sabercolor_1 3 } -description "Jedi Apostate [Jedi] +description "Jedi Apostate -A Jedi with inferior Lightsaber skills, but strongly adept in the Force. +A Jedi who minimizes Lightsaber skills in favor of high Force talent. ^2Weaponry: - Melee +-- 10% faster RoF - Lightsaber (Cyan/Blue) -- Saber/Blaster Defense (1) --- 8% more DMG +-- 8% more Dmg +-- 135% Spec Dmg mult -- EX Saber Throw (3) ^3[CS1] ---- 33% more DMG --- Slap ^3[GB] +--- 33% more Dmg ^5Force Powers: - Jump (1) @@ -70,12 +73,13 @@ A Jedi with inferior Lightsaber skills, but strongly adept in the Force. - Pull (3) - Drain (3) ^3[CS2] - Grip (3) ^3[CS3] -- Mind Trick (2) ^3[CS4] -- Absorb (3) +- Mind Trick (2) +- Absorb (3) ^3[CS4] ^8Attributes: - Miraluka Vision (3) - Sense Immunity - Anti-Mind Trick (2) +- Healing (1) - Force Block (4) - Force Focus (3)" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h10_JForce.mbch b/z_MBLegends/ext_data/mb2/character/h10_JForce.mbch index ccda3cfae..8dc04a3c2 100644 --- a/z_MBLegends/ext_data/mb2/character/h10_JForce.mbch +++ b/z_MBLegends/ext_data/mb2/character/h10_JForce.mbch @@ -42,6 +42,8 @@ ClassInfo special1 EAS_FP_REPULSE special2 EAS_HI_DASH + special3 EAS_FP_SPEED + special4 EAS_FP_PROTECT } @@ -55,7 +57,7 @@ WeaponInfo0 WeaponName "Martial Arts" } -description "Jedi Forcemaster [Jedi] +description "Jedi Forcemaster Light side masters who forego the use of a Lightsaber in favor of martial arts and Force proficiency. @@ -66,21 +68,19 @@ Light side masters who forego the use of a Lightsaber in favor of martial arts a -- No Blaster Block -- Blocking resists Force Powers -- BP-Free Jumps --- 75% more KB --- 61% less DMG --- 160% special DMG mult --- 40% less reach --- 167% more radius --- Slap ^3[GB] +-- 75% more Kb +-- 160% Spec Dmg mult +-- 40% less Reach +-- 167% more Radius ^5Force Powers: - Jump (3) - Push (3) - Pull (3) - Sense (3) -- Mind Trick (3) ^3[CS4] -- Protect (2) +- Mind Trick (3) - Repulse ^3[CS1 Melee] +- Protect (2) ^3[CS4] - Speed (3) ^3[CS3] ^8Attributes: diff --git a/z_MBLegends/ext_data/mb2/character/h10_JHeal.mbch b/z_MBLegends/ext_data/mb2/character/h10_JHeal.mbch index 84551049c..d532d3507 100644 --- a/z_MBLegends/ext_data/mb2/character/h10_JHeal.mbch +++ b/z_MBLegends/ext_data/mb2/character/h10_JHeal.mbch @@ -9,16 +9,15 @@ ClassInfo weapons WP_MELEE|WP_SABER forcepowers FP_LEVITATION,3|FP_SEE,3|FP_SABERTHROW,2|FP_TELEPATHY,1|FP_PUSH,1|FP_PULL,1 - attributes MB_ATT_FORCEBLOCK,2|MB_ATT_FORCEFOCUS,2|MB_ATT_DEFLECT,1|MB_ATT_DISP_HEALTH,2|MB_ATT_USE_DISTANCE,7|MB_ATT_HEALING,3|MB_ATT_GUN_DEFENSE,1|MB_ATT_FP_SABER_DEFENSE,1 + attributes MB_ATT_FORCEBLOCK,2|MB_ATT_FORCEFOCUS,2|MB_ATT_DEFLECT,1|MB_ATT_DISP_HEALTH,3|MB_ATT_USE_DISTANCE,7|MB_ATT_HEALING,3|MB_ATT_GUN_DEFENSE,1|MB_ATT_FP_SABER_DEFENSE,1 saberstyle SS_FAST|SS_MEDIUM - - maxhealth 105 - skilltimermod 1.5 - damageGiven 0.90 - + damageGiven 1.1 + maxhealth 115 + skilltimermod 1.4 + rateOfFire_Melee .9 saberThrowDamage 40 saberDamageStyle SS_FAST,130|SS_MEDIUM,180 - + saberSpecialDamage 1.25 uioverlay_r "gfx/icons/support" uioverlay_l "gfx/icons/medic" modelscale 0.97 @@ -125,14 +124,14 @@ ClassInfo c_att_skill_6 MB_ATT_FP_TEAM_HEAL c_att_names_6 "Force Team Heal ^3[CS2]" - c_att_ranks_6 0,5,5 + c_att_ranks_6 0,5 c_att_skill_7 MB_ATT_FP_SPEED c_att_names_7 "Force Speed ^3[CS3]" c_att_ranks_7 8 c_att_skill_8 MB_ATT_POWER - c_att_names_8 "Force Pool (120/140)" + c_att_names_8 "FP (120/140)" c_att_ranks_8 7,7 c_att_skill_9 MB_ATT_REGEN @@ -140,19 +139,20 @@ ClassInfo c_att_ranks_9 5,9 } -description "Jedi Healer [Jedi] +description "Jedi Healer -A Jedi with passive healing and team Force healing powers. +A medic with strong support skills. ^2Weaponry: - Melee +-- 10% faster RoF - Lightsaber (Yellow/Blue) -- Saber/Blaster Defense (1) -- Blaster Deflect (1) --- 25% less Yellow/8% more Blue DMG +-- 25% less Yellow/8% more Blue Dmg +-- 125% Spec Dmg mult -- EX Saber Throw (2) ^3[CS1] ---- 33% more DMG --- Slap ^3[GB] +--- 33% more Dmg ^5Force Powers: - Jump (3) @@ -163,11 +163,11 @@ A Jedi with passive healing and team Force healing powers. - Team Heal (1) ^3[CS2] ^8Attributes: -- 50% slower skill CD +- 40% slower Skill Cd - Healing (3) - Ally Stat Viewer - Force Block/Focus (2) ^3Abilities: -- Health Dispenser (2) ^3['Use' on ^3allies] --- +7 range" \ No newline at end of file +- HP Dispenser (3) ^3['Use' on ^3allies] +-- +7 Range" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h10_JSavant.mbch b/z_MBLegends/ext_data/mb2/character/h10_JSavant.mbch index d83751933..839b3f3b5 100644 --- a/z_MBLegends/ext_data/mb2/character/h10_JSavant.mbch +++ b/z_MBLegends/ext_data/mb2/character/h10_JSavant.mbch @@ -9,18 +9,19 @@ ClassInfo weapons WP_SABER|WP_MELEE - attributes MB_ATT_SABER_FAST,2|MB_ATT_DEFLECT,3|MB_ATT_FORCEBLOCK,2|MB_ATT_FORCEFOCUS,2|MB_ATT_RALLY,1|MB_ATT_GUN_DEFENSE,2|MB_ATT_FP_SABER_DEFENSE,2 + attributes MB_ATT_SABER_FAST,2|MB_ATT_DEFLECT,3|MB_ATT_FORCEBLOCK,2|MB_ATT_FORCEFOCUS,2|MB_ATT_RALLY,1|MB_ATT_GUN_DEFENSE,2|MB_ATT_FP_SABER_DEFENSE,2|MB_ATT_HEALING,1 - forcepowers FP_LEVITATION,3|FP_PUSH,2|FP_SEE,2|FP_PULL,2|FP_DRAIN,3|FP_ABSORB,1|FP_SPEED,1|FP_SABERTHROW,1|FP_TEAM_FORCE,3 + forcepowers FP_LEVITATION,3|FP_PUSH,2|FP_SEE,2|FP_PULL,2|FP_DRAIN,3|FP_SABERTHROW,1|FP_TEAM_FORCE,2|FP_ABSORB,1 speed 1.02 - maxhealth 120 + maxhealth 135 forcepool 125 forceregen 1.1 damageGiven 1.10 - + rateOfFire_Melee 0.9 saberstyle SS_STAFF|SS_TAVION - saberDamageStyle SS_TAVION,130 + saberDamageStyle SS_TAVION,130|SS_STAFF,260 + saberSpecialDamage 1.25 saberThrowDamage 40 APmultiplier 1.1 BPmultiplier 1.1 @@ -30,7 +31,8 @@ ClassInfo classflags CFL_NOPICKUPS|CFL_STATVIEWER special2 EAS_FP_DRAIN - special4 EAS_FP_TEAM_FORCE + special3 EAS_FP_TEAM_FORCE + special4 EAS_FP_ABSORB uioverlay "gfx/icons/support" model "bastila" skin "default" @@ -49,20 +51,20 @@ ClassInfo tauntAnim BOTH_MAUL_TAUNT } -description "Jedi Savant [Jedi] +description "Jedi Savant -A well-rounded Jedi with a powerful Force ability that lets them Energize their allies' resource pools. +A support that can act as a team anchor while also holding her own. ^2Weaponry: - Melee +-- 10% faster RoF - Lightsaber (Staff/Cyan) --- 25% more reach --- 8% more Cyan DMG -- Saber/Blaster Defense (2) -- Blaster Deflect (3) +-- 25% more Reach +-- 8% more Cyan Dmg -- EX Saber Throw (1) ^3[CS1] ---- 33% more DMG --- Slap ^3[GB] +--- 33% more Dmg ^5Force Powers: - Jump (3) @@ -70,11 +72,11 @@ A well-rounded Jedi with a powerful Force ability that lets them Energize their - Pull (2) - Sense (2) - Drain (3) ^3[CS2] -- Team Energize (3) ^3[CS4] -- Absorb (1) -- Speed (1) ^3[CS3] +- Team Energize (2) ^3[CS3] +- Absorb (1) ^3[CS4] ^8Attributes: -- Force Block/Focus (2) - Ally Stat Viewer -- Rally" \ No newline at end of file +- Rally +- Healing (1) +- Force Block/Focus (2)" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h10_JTradition.mbch b/z_MBLegends/ext_data/mb2/character/h10_JTradition.mbch index d0c5466d3..82e250160 100644 --- a/z_MBLegends/ext_data/mb2/character/h10_JTradition.mbch +++ b/z_MBLegends/ext_data/mb2/character/h10_JTradition.mbch @@ -8,22 +8,23 @@ ClassInfo weapons WP_MELEE|WP_SABER - attributes MB_ATT_FORCEBLOCK,1|MB_ATT_DEFLECT,3|MB_ATT_FORCEFOCUS,1|MB_ATT_GUN_DEFENSE,3|MB_ATT_FP_SABER_DEFENSE,2 + attributes MB_ATT_FORCEBLOCK,1|MB_ATT_DEFLECT,3|MB_ATT_FORCEFOCUS,1|MB_ATT_GUN_DEFENSE,3|MB_ATT_FP_SABER_DEFENSE,2|MB_ATT_HEALING,1 - forcepowers FP_SABER_OFFENSE,3|FP_LEVITATION,2|FP_PUSH,3|FP_PULL,2|FP_PROTECT,3|FP_SEE,3|FP_SABERTHROW,2 + forcepowers FP_SABER_OFFENSE,3|FP_LEVITATION,2|FP_PUSH,3|FP_PULL,2|FP_PROTECT,2|FP_SEE,3|FP_SABERTHROW,2 speed 0.985 forcepool 160 forceregen 1.075 - maxhealth 115 - + maxhealth 120 + rateOfFire_Melee 0.9 + damageGiven 1.1 saberstyle SS_MEDIUM|SS_STRONG|SS_TAVION - saberDamageStyle SS_TAVION,130|SS_STRONG,280 + saberDamageStyle SS_TAVION,130|SS_STRONG,280|SS_MEDIUM,240 BPmultiplier 0.9 APmultiplier 0.7 ASmultiplier 0.97 saberThrowDamage 40 - + saberSpecialDamage 1.25 classflags CFL_NOPICKUPS //special1 EAS_FP_SABERTHROW @@ -56,26 +57,28 @@ ClassInfo uishader_2 "models/players/sabe/mb2_icon_depabillaba" } -description "Jedi Traditionalist [Jedi] +description "Jedi Traditionalist -A High-to-Late Republic Jedi with strong Force powers and excellent defenses against blasters, but lacking in Lightsaber dueling skills. +A master who eschews dueling prowess for strong Force powers and excellent defense against blasters. ^2Weaponry: - Melee +-- 10% faster RoF - Lightsaber (Yellow/Red/Cyan) -- Saber Defense (2) -- Blaster Defense/Deflect (3) --- 46% less Red/8% more Cyan DMG +-- 46% less Red/8% more Cyan Dmg +-- 125% Spec Dmg mult -- EX Saber Throw (2) ^3[CS1] ---- 33% more DMG --- Slap ^3[GB] +--- 33% more Dmg ^5Force Powers: - Jump (2) - Push (3) - Pull (2) - Sense (3) -- Protect (3) ^3[CS4] +- Protect (2) ^3[CS4] ^8Attributes: +- Healing (1) - Force Block/Focus (1)" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h10_LukeSky.mbch b/z_MBLegends/ext_data/mb2/character/h10_LukeSky.mbch index 5ee2f6e8a..73678f67f 100644 --- a/z_MBLegends/ext_data/mb2/character/h10_LukeSky.mbch +++ b/z_MBLegends/ext_data/mb2/character/h10_LukeSky.mbch @@ -8,17 +8,24 @@ ClassInfo weapons WP_SABER|WP_MELEE - attributes MB_ATT_DEFLECT,3|MB_ATT_FORCEBLOCK,2|MB_ATT_FORCEFOCUS,3|MB_ATT_GUN_DEFENSE,2|MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_LIGHTS_BEACON + attributes MB_ATT_DEFLECT,3|MB_ATT_FORCEBLOCK,2|MB_ATT_FORCEFOCUS,3|MB_ATT_GUN_DEFENSE,2|MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_LIGHTS_BEACON|MB_ATT_HEALING,1 - forcepowers FP_SABER_OFFENSE,3|FP_LEVITATION,3|FP_PUSH,2|FP_SEE,3|FP_SABERTHROW,2|FP_SPEED,1|FP_LIGHTNING,1 + forcepowers FP_SABER_OFFENSE,3|FP_LEVITATION,3|FP_PUSH,2|FP_SEE,3|FP_SABERTHROW,2|FP_LIGHTNING,1|FP_PULL,1 + + rateOfFire_Melee 0.9 + damageGiven 1.1 + + basespeed 240 - speed 1.02 maxhealth 135 - skilltimermod 2 + + skilltimermod 1.9 + forcepool 130 forceregen 1.05 - saberDamageStyle SS_FAST,130|SS_STRONG,280 + saberSpecialDamage 1.25 + saberDamageStyle SS_FAST,130|SS_STRONG,280|SS_MEDIUM,240 saberstyle SS_FAST|SS_MEDIUM|SS_STRONG saberThrowDamage 40 BPmultiplier 1.3 @@ -26,9 +33,9 @@ ClassInfo CSmultiplier 1.1 ASmultiplier 1.05 - special2 EAS_NONE - special3 EAS_FP_SPEED - special4 EAS_FP_LIGHTNING + special4 EAS_FP_LIGHTNING + special3 EAS_FP_ABSORB + special2 EAS_FP_PROTECT classflags CFL_NOPICKUPS @@ -142,50 +149,52 @@ uishader_20 "models/players/luke_gm/mb2_icon_default" c_att_names_0 "Force Mind Trick^3*" c_att_ranks_0 1 c_att_descs_0 "Effect is shared with a targeted/nearby ally" - + c_att_skill_1 MB_ATT_FP_ABSORB - c_att_names_1 "Force Absorb^3*" + c_att_names_1 "Force Absorb^3* ^3[CS3]" c_att_ranks_1 1 c_att_descs_1 "Effect is shared with a targeted/nearby ally" - + c_att_skill_2 MB_ATT_FP_PROTECT - c_att_names_2 "Force Protect^3*" + c_att_names_2 "Force Protect^3* ^3[CS2]" c_att_ranks_2 1 - c_att_descs_2 "Effect is shared with a targeted/nearby ally" + c_att_descs_2 "Effect is shared with a targeted/nearby ally" } ForceInfo0 { - ForceToReplace FP_LIGHTNING - Icon "gfx/forcepowers/lightning_judge" - ForcePowerName "Emerald Lightning" - ConeEffect "effects/force/lightning_judge_el" +ForceToReplace FP_LIGHTNING +Icon "gfx/forcepowers/lightning_judge" +ForcePowerName "Emerald Lightning" +ConeEffect "effects/force/lightning_judge_el" } -description "Luke Skywalker [Jedi] +description "Luke Skywalker -A defensive Jedi supplemented with a light side variant of Force Lightning, and the ability to share supportive Force Powers with allies. Regains BP upon defeating enemies. +A defensive duelist/support who can share his Force Powers with allies. ^2Weaponry: - Melee +-- 10% faster RoF - Lightsaber (Yellow/Red/Blue) -- Saber Defense (3) -- Blaster Defense (2) -- Blaster Deflect (3) --- 46% less Red/8% more Blue DMG +-- 46% less Red/8% more Blue Dmg +-- 125% Spec Dmg mult -- EX Saber Throw (2) ^3[CS1] ---- 33% more DMG --- Slap ^3[GB] +--- 33% more Dmg ^5Force Powers: - Jump (3) - Push (2) +- Pull (1) - Sense (3) - Emerald Lightning (1) ^3[CS4] -- Speed (1) ^3[CS3] ^8Attributes: ^7- ^3*^7Light's Beacon (Shares Force Powers with a ^7targeted/nearby ally) -- 100% slower skill CD +- 90% slower Skill Cd +- Healing (1) - Force Block (2) - Force Focus (3)" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h10_Obi.mbch b/z_MBLegends/ext_data/mb2/character/h10_Obi.mbch index d68657b14..f34b6d5b4 100644 --- a/z_MBLegends/ext_data/mb2/character/h10_Obi.mbch +++ b/z_MBLegends/ext_data/mb2/character/h10_Obi.mbch @@ -8,12 +8,15 @@ ClassInfo weapons WP_MELEE|WP_SABER - attributes MB_ATT_FORCEBLOCK,1|MB_ATT_FORCEFOCUS,2|MB_ATT_DEFLECT,3|MB_ATT_GUN_DEFENSE,3|MB_ATT_FP_SABER_DEFENSE,3 + attributes MB_ATT_FORCEBLOCK,1|MB_ATT_FORCEFOCUS,2|MB_ATT_DEFLECT,3|MB_ATT_GUN_DEFENSE,3|MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_HEALING,1|MB_ATT_BLAST_ARMOUR - forcepowers FP_LEVITATION,2|FP_PUSH,3|FP_SEE,3|FP_SABER_OFFENSE,3 + forcepowers FP_LEVITATION,2|FP_PUSH,3|FP_SEE,3|FP_SABER_OFFENSE,3|FP_PULL,1 + damageGiven 1.1 + rateOfFire_Melee 0.9 speed 0.94 maxhealth 150 + forcepool 140 rankForcePool 185 @@ -21,9 +24,9 @@ ClassInfo rankforceregen 1 saberstyle SS_FAST|SS_MEDIUM|SS_TAVION - saberDamageStyle SS_FAST,130|SS_TAVION,130 + saberDamageStyle SS_FAST,130|SS_TAVION,130|SS_MEDIUM,240 saberThrowDamage 40 - + saberSpecialDamage 1.25 blockRegenAmount 5 blockRegenRate 400 @@ -37,7 +40,7 @@ ClassInfo classflags CFL_NOPICKUPS //special1 EAS_FP_SABERTHROW game chooses spec1 if not defined, leave as is - special2 EAS_NONE + special2 EAS_FP_PROTECT //special3 EAS_FP_TELEPATHY //special4 @@ -91,29 +94,33 @@ ClassInfo skin_8 "default" uishader_8 "models/players/obiwan_cw/mb2_icon_default" - model_9 "obiwan_ot" + model_9 "obiwan_tcw" skin_9 "default" - uishader_9 "models/players/obiwan_ot/mb2_icon_default" + uishader_9 "models/players/obiwan_tcw/mb2_icon_default" - model_10 "obiwan_ot" - skin_10 "robed" - uishader_10 "models/players/obiwan_ot/mb2_icon_robed" + model_10 "obiwan_owk" + skin_10 "default" + uishader_10 "models/players/obiwan_owk/mb2_icon_default" - model_11 "obiwan_ot" - skin_11 "hooded" - uishader_11 "models/players/obiwan_ot/mb2_icon_hooded" + model_11 "obiwan_owk" + skin_11 "goggles" + uishader_11 "models/players/obiwan_owk/mb2_icon_goggles" model_12 "obiwan_ot" - skin_12 "ghost" - uishader_12 "models/players/obiwan_ot/mb2_icon_ghost" + skin_12 "default" + uishader_12 "models/players/obiwan_ot/mb2_icon_default" + + model_13 "obiwan_ot" + skin_13 "robed" + uishader_13 "models/players/obiwan_ot/mb2_icon_robed" - model_13 "obiwan_owk" - skin_13 "default" - uishader_13 "models/players/obiwan_owk/mb2_icon_default" + model_14 "obiwan_ot" + skin_14 "hooded" + uishader_14 "models/players/obiwan_ot/mb2_icon_hooded" - model_14 "obiwan_owk" - skin_14 "goggles" - uishader_14 "models/players/obiwan_owk/mb2_icon_goggles" + model_15 "obiwan_ot" + skin_15 "ghost" + uishader_15 "models/players/obiwan_ot/mb2_icon_ghost" isCustomBuild 1 mbPoints 0 @@ -128,27 +135,27 @@ ClassInfo c_att_skill_0 MB_ATT_BP_MULTIPLIER c_att_names_0 "Saber BP (160%)" - c_att_ranks_0 0,0,0 - c_att_ranks_0 "140% default" + c_att_ranks_0 0 + c_att_descs_0 "140% default" c_att_skill_1 MB_ATT_FP_TELEPATHY c_att_names_1 "Force Mind Trick ^3[CS4]" c_att_ranks_1 0,0,0 c_att_skill_2 MB_ATT_FP_PROTECT - c_att_names_2 "Force Protect" + c_att_names_2 "Force Protect ^3[CS2]" c_att_ranks_2 0 c_att_skill_3 MB_ATT_POWER - c_att_names_3 "Extra Force Pool (185)" + c_att_names_3 "FP (185)" c_att_ranks_3 0 - c_att_skill_15 MB_ATT_AP_MULTIPLIER - c_att_names_15 "Saber AP (100%)" - c_att_ranks_15 0,0,0 - c_att_descs_15 "80% default" + c_att_skill_15 MB_ATT_AP_MULTIPLIER + c_att_names_15 "Saber AP (100%)" + c_att_ranks_15 0 + c_att_descs_15 "80% default" c_att_skill_16 MB_ATT_FP_LEVITATION c_att_names_16 "Force Jump" @@ -163,26 +170,30 @@ ClassInfo c_att_ranks_18 0 } -description "Obi-Wan Kenobi [Jedi] +description "Obi-Wan Kenobi -A seasoned Jedi with exceptional Saber skills and high BP regen. Choice of old and young builds. +A Jedi with exceptional defenses. Choose between the resourcefulness of a Master or the raw agility of a Padawan. ^2Weaponry: - Melee +-- 10% faster RoF - Lightsaber (Yellow/Cyan/Blue) -- Saber/Blaster Defense (3) --- BP Regen: 5/.4s to 100 -- Blaster Deflect (3) --- 8% more Cyan/Blue DMG +-- 8% more Fast style Dmg +-- 125% Spec Dmg mult -- Saber Throw ^3[CS1] ---- 33% more DMG --- Slap ^3[GB] +--- 33% more Dmg ^5Force Powers: - Jump (2) - Push (3) +- Pull (1) - Sense (3) ^8Attributes: +- Blast Armor +- Healing (1) - Force Block (1) - Force Focus (2)" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h10_PloK.mbch b/z_MBLegends/ext_data/mb2/character/h10_PloK.mbch index 7b6932f23..ad273ac93 100644 --- a/z_MBLegends/ext_data/mb2/character/h10_PloK.mbch +++ b/z_MBLegends/ext_data/mb2/character/h10_PloK.mbch @@ -16,13 +16,12 @@ ClassInfo forcepowers FP_SABER_OFFENSE,3|FP_LEVITATION,2|FP_PUSH,2|FP_PULL,2|FP_SEE,1|FP_BLIND,1|FP_LIGHTNING,1|FP_TELEPATHY,1|FP_DEADLYSIGHT,1|FP_SABERTHROW,1 maxhealth 140 - skilltimermod 1.5 - + skilltimermod 1.25 + rateOfFire_Melee .9 forcepool 130 forceregen 1.1 - + damageGiven 1.1 saberThrowDamage 40 - saberDamage 240 saberstyle SS_FAST|SS_STRONG saberDamageStyle SS_FAST,130|SS_STRONG,240 BPmultiplier 1.2 @@ -32,8 +31,9 @@ ClassInfo classflags CFL_NOPICKUPS - special2 EAS_FP_DEADLYSIGHT + special2 EAS_FP_DEADLYSIGHT special3 EAS_FP_BLIND + special4 EAS_FP_LIGHTNING saber1 saber_plo sabercolor 4 @@ -105,7 +105,7 @@ WeaponInfo0 isMinigun 0 Icon "models/weapons2/halo_melee/icon.png" WeaponName "Blast" - damageMod 4 + damageMod 3.9 clipsize 10 customAmmo -1 rateMod 8 @@ -138,6 +138,7 @@ WeaponInfo1 FlashSound3 "sound/effects/air_burst.mp3" Icon "gfx/mplevels/aliens3/aliens_claws.png" WeaponName "Cold Front" +damageMod .9 clipsize 96 customAmmo -1 rateMod 1.75 @@ -155,25 +156,26 @@ WeaponInfo1 } -description "Plo Koon [Jedi] +description "Plo Koon A hearty Jedi with the ability to manipulate the elements. ^2Weaponry: - Melee +-- 10% faster RoF - Lightsaber (Red/Blue) -- Saber/Blaster Defense (2) --- Saber Deflect (3) --- 14% less Red/8% more Blue DMG +-- Blaster Deflect (3) +-- 14% less Red/8% more Blue Dmg -- EX Saber Throw (1) ^3[CS1] ---- 33% more DMG --- Slap ^3[GB] +--- 33% more Dmg - Force Cold Front (Shotgun 1) -- Freezes on hit +-- 10% less Dmg -- 75% slower RoF - Force Blast (Minigun 2) -- Staggers/pushes on hit --- 300% more DMG +-- 290% more Dmg -- 700% slower RoF ^5Force Powers: @@ -181,13 +183,13 @@ A hearty Jedi with the ability to manipulate the elements. - Sandstorm (Push 2) - Fog (Pull 2) - Sense (1) -- Electric Judgment (Lightning 1) ^3[CS2] +- Electric Judgment (Lightning 1) ^3[CS4] - Blind (1) ^3[CS3] -- Grill (Deadly Sight 1) -- Mind Trick (1) ^3[CS4] +- Grill (Deadly Sight 1) ^3[CS2] +- Mind Trick (1) ^8Attributes: -- 50% slower skill CD +- 25% slower Skill Cd - Dexterity (1) - Healing (1) - Force Block/Focus (2)" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h10_Rosh.mbch b/z_MBLegends/ext_data/mb2/character/h10_Rosh.mbch index f45302a8b..0cab8d411 100644 --- a/z_MBLegends/ext_data/mb2/character/h10_Rosh.mbch +++ b/z_MBLegends/ext_data/mb2/character/h10_Rosh.mbch @@ -11,7 +11,7 @@ ClassInfo forcepowers FP_BLIND,1|FP_LEVITATION,3|FP_PULL,3|FP_PUSH,3|FP_SEE,2|FP_TELEPATHY,3|FP_LIGHTNING,1|FP_SABER_OFFENSE,3|FP_SABERTHROW,1 forcepool 110 forceregen 1.1 - + rateOfFire_Melee .9 maxhealth 125 maxarmor 25 speed 1.06 @@ -24,10 +24,10 @@ ClassInfo saberstyle SS_MEDIUM|SS_FAST|SS_STAFF saberDamageStyle SS_FAST,130|SS_MEDIUM,240|SS_STAFF,260 saberspecialDamage 1.25 - APmultiplier 1.4 + APmultiplier 1.45 BPmultiplier .75 - CSmultiplier 1.35 - + CSmultiplier 1.3 + ASMultiplier 1.05 classflags CFL_SEEING_STEALTH|CFL_DISMEMBERFRAGILE|CFL_NOPICKUPS saberStanceAnim BOTH_P7_S7_BL @@ -39,9 +39,8 @@ ClassInfo //RunForward BOTH_ALORA_SPIN //RunBackward BOTH_ALORA_SPIN - special2 EAS_FP_LIGHTNING + special4 EAS_FP_LIGHTNING special3 EAS_FP_BLIND - special4 EAS_FP_TELEPATHY model "rosh_penin" skin "default" @@ -49,34 +48,34 @@ ClassInfo uioverlay "gfx/icons/support" } -description "Rosh Penin [A Great Jedi] +description "Rosh Penin -Rosh has bizarre abilities which aid him in non-traditional battle techniques. Low defense, VERY HIGH offense. Taunting Sith will damage them. +A Great Jedi with bizarre battle techniques. Low defense, VERY HIGH offense. Taunting Sith will damage them. ^2Weaponry: - Melee +-- 10% faster RoF - Lightsaber (Staff/Blue/Yellow) -- Saber/Blaster Defense (1) -- Blaster Deflect (3) -- Chain Limit: 4 --- 25% more reach --- 8/35% more Blue DMG/special DMG --- 25% more Staff/Yellow special DMG +-- 25% more Reach +-- 8% more Blue Dmg +-- 125% Spec Dmg mult -- EX Saber Throw (1) ^3[CS1] ---- 66% more DMG --- Slap ^3[GB] +--- 66% more Dmg ^5Force Powers: - Jump (3) - Push (3) - Pull (3) - Sense (1) -- Lightning (1) ^3[CS2] +- Lightning (1) ^3[CS4] - Blind (1) ^3[CS3] -- Mind Trick (3) ^3[CS4] +- Mind Trick (3) ^8Attributes: -- 20% more KB taken +- 20% more Kb Taken - Bunny Hop (1) - Slow Faller - Healing (2) diff --git a/z_MBLegends/ext_data/mb2/character/h10_Starkiller.mbch b/z_MBLegends/ext_data/mb2/character/h10_Starkiller.mbch index c80e75666..cc8b86d3c 100644 --- a/z_MBLegends/ext_data/mb2/character/h10_Starkiller.mbch +++ b/z_MBLegends/ext_data/mb2/character/h10_Starkiller.mbch @@ -25,9 +25,9 @@ ClassInfo CSmultiplier 1.02 damageGiven 1.1 - + rateOfFire_melee 0.9 saberThrowDamage 50 - saberDamageStyle SS_DESANN,280 + saberDamageStyle SS_DESANN,280|SS_DUAL,260 saberstyle SS_DESANN saberSpecialDamage 1.25 saber1 saber_marek_legends_s @@ -56,22 +56,22 @@ ClassInfo special4 EAS_FP_LIGHTNING } -description "Galen Marek aka 'Starkiller' [Jedi] +description "Galen Marek aka 'Starkiller' -A Jedi/Sith hybrid sporting a strong combination of Force powers. +A Jedi/Sith hybrid sporting a strong combination of Force Powers. ^2Weaponry: - Melee +-- 10% faster RoF - Lightsaber -- Saber/Blaster Defense (1) -- Blaster Deflect (1) --- 125% special DMG mult --- 50% more KB +-- 125% Spec Dmg mult +-- 50% more Kb -- EX Saber Throw (3) ^3[CS1] ---- 66% more DMG --- Slap ^3[GB] +--- 66% more Dmg > Single (Purple) --- 30% less DMG +-- 30% less Dmg > Double (Dual) ^5Force Powers: diff --git a/z_MBLegends/ext_data/mb2/character/h1_NPrisoner.mbch b/z_MBLegends/ext_data/mb2/character/h1_NPrisoner.mbch index 492540713..be8b34d18 100644 --- a/z_MBLegends/ext_data/mb2/character/h1_NPrisoner.mbch +++ b/z_MBLegends/ext_data/mb2/character/h1_NPrisoner.mbch @@ -19,8 +19,8 @@ ClassInfo special1 EAS_HI_SPRINT special2 EAS_HI_DEX - special3 EAS_HI_DODGE - special4 EAS_HI_QUICKTOSS + special4 EAS_HI_DODGE + special3 EAS_HI_QUICKTOSS WP_BlasterPistolFlags HELD_SPEED WP_BlasterFlags HELD_SPEED @@ -95,7 +95,7 @@ WeaponInfo0 rateMod 0.95 } -description "Narkina 5 Prisoner [Clone Trooper] +description "Narkina 5 Prisoner 5-life inmates with only fists and grit at their side. Move as a group to secure victory. Stolen weapons deal 1.5x damage and grant a movement speed bonus. @@ -113,5 +113,5 @@ description "Narkina 5 Prisoner [Clone Trooper] ^3Abilities: - Sprint ^3[CS1] - Dex Roll ^3[CS2] -- Dodge (3) ^3[CS3] -- Quickthrow (3) ^3[CS4]" \ No newline at end of file +- Quickthrow (3) ^3[CS3] +- Dodge (3) ^3[CS4]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h1_OldRepET.mbch b/z_MBLegends/ext_data/mb2/character/h1_OldRepET.mbch index cab08ff19..68362c569 100644 --- a/z_MBLegends/ext_data/mb2/character/h1_OldRepET.mbch +++ b/z_MBLegends/ext_data/mb2/character/h1_OldRepET.mbch @@ -76,29 +76,29 @@ ClassInfo c_att_skill_1 MB_ATT_BP_MULTIPLIER c_att_names_1 "Saber BP (60/90/110%)" - c_att_ranks_1 2,3,5 + c_att_ranks_1 1,2,4 c_att_skill_2 MB_ATT_AP_MULTIPLIER c_att_names_2 "Saber AP (75/90/115%)" - c_att_ranks_2 2,3,5 + c_att_ranks_2 1,2,4 c_att_skill_3 MB_ATT_PISTOL c_att_names_3 "Old Republic Blaster Pistol" c_att_ranks_3 0,1,4 - c_att_descs_3 "Mag reload" + c_att_descs_3 "Mag Reload" c_att_skill_4 MB_ATT_E_22 c_att_names_4 "Heat Rifle (E-22)" c_att_ranks_4 6,1,6 - c_att_descs_4 "Ignites on hit, 25% less DMG, Mag reload" + c_att_descs_4 "Ignites on hit, 25% less Dmg, Mag Reload" c_att_skill_5 MB_ATT_FIRE_GRENADES - c_att_names_5 "Fire Grenades" - c_att_ranks_5 4,4 + c_att_names_5 "Fire Grenade" + c_att_ranks_5 4 c_att_skill_6 MB_ATT_CRYOBAN_GRENADES - c_att_names_6 "Cryo Grenades" - c_att_ranks_6 4,4 + c_att_names_6 "Cryo Grenade" + c_att_ranks_6 4 c_att_skill_7 MB_ATT_EE4 c_att_names_7 "O.R. Blaster Rifle (EE-4)" @@ -106,7 +106,7 @@ ClassInfo c_att_skill_8 MB_ATT_RESPAWNS c_att_names_8 "Reinforcements" - c_att_ranks_8 10,16 + c_att_ranks_8 10,14 c_att_descs_8 "1 default" c_att_skill_9 MB_ATT_ARMOUR @@ -176,7 +176,7 @@ WeaponInfo3 damageMod 0.75 } -description "Old Republic Defender [Clone Trooper] +description "Old Republic Defender 2-life units with purchase options including extra lives, elemental grenades, an incendiary Rifle, and upgraded Saber Defense. @@ -185,16 +185,13 @@ description "Old Republic Defender [Clone Trooper] - Vibrosaber -- Saber Defense (0) -- No Blaster Block --- 15% faster movement --- Slap ^3[GB] +-- 15% faster Movement > Vibrosword (Yellow) --- 5% less reach --- 45% less DMG +-- 5% less Reach > Vibrostaff (Staff) --- 19% more reach --- 50% less DMG +-- 19% more Reach - Old Republic Blaster Pistol (1) --- Mag reload +-- Mag Reload ^8Attributes: - Reinforcement (1) diff --git a/z_MBLegends/ext_data/mb2/character/h1_Rebel.mbch b/z_MBLegends/ext_data/mb2/character/h1_Rebel.mbch index dc724585e..e80e18f95 100644 --- a/z_MBLegends/ext_data/mb2/character/h1_Rebel.mbch +++ b/z_MBLegends/ext_data/mb2/character/h1_Rebel.mbch @@ -1,5 +1,5 @@ //Legends Mode character file - Created by Frenzy & Leos -//Customizable version - Created by iPod/Snackbar +//Customizable version - Created by iPod/SnacKbar ClassInfo { @@ -55,7 +55,7 @@ ClassInfo customblue_3 1 //def w model_4 "rebel" - skin_4 "desert" + skin_4 "Desert" uishader_4 "models/players/rebel/mb2_icon_desert" model_5 "gwethenea" @@ -131,7 +131,7 @@ ClassInfo customblue_16 1 //def w model_17 "jedi_tf" - skin_17 "diapassik_rgb" + skin_17 "Diapassik_rgb" uishader_17 "models/players/jedi_tf/mb2_icon_diapassik_rgb" userRGB_17 1 customred_17 1 @@ -166,8 +166,26 @@ WeaponInfo1 Icon "gfx/hud/w_icon_dh-17" WeaponName "DH-17 Blaster Rifle" } +WeaponInfo2 +{ + WeaponToReplace WP_FRAG_NADE + WeaponBasedOff WP_FRAG_NADE + NewWorldModel "models/weapons2/fraggrenade/thermal_w.glm" + NewViewModel "models/weapons2/fraggrenade/thermal_hand.md3" + MissileModel "models/weapons2/fraggrenade/thermal_proj.md3" + + MissileMissEffect "Grenades/EXP_Explosion" -description "Rebel Trooper [Soldier] + missileHitHumanEffect "Grenades/EXP_Explosion" + missileHitDroidEffect "Grenades/EXP_Explosion" + MissileEffect "repeater/projectile" + + Icon "gfx/hud/w_icon_fraggrenade" + WeaponName "Micro-Frag Grenade" +splashRadius 250 +altFireEnabled 0 +} +description "Rebel Trooper 5-life basic infantry units. @@ -177,15 +195,15 @@ description "Rebel Trooper [Soldier] -- No Saber/Blaster Block -- No Saber Training -- Staggers on hit --- 10% more KB --- 75/50% less DMG --- 50% less reach --- 33% more radius --- Slap ^3[GB] +-- 10% more Kb +-- 50% less Reach +-- 33% more Radius - DL-44 Blaster Pistol (2) - DH-17 Blaster Rifle (3) -- Frag Grenade (1) -- Concussion Grenade (1) +- Micro-Frag Grenade (1) +-- 28% less Splash Radius +-- Prim only +- V-59 Conc Grenade (1) ^8Attributes: - Reinforcements (4) diff --git a/z_MBLegends/ext_data/mb2/character/h1_RebelET.mbch b/z_MBLegends/ext_data/mb2/character/h1_RebelET.mbch index aade19ec9..976ac78db 100644 --- a/z_MBLegends/ext_data/mb2/character/h1_RebelET.mbch +++ b/z_MBLegends/ext_data/mb2/character/h1_RebelET.mbch @@ -12,7 +12,7 @@ ClassInfo rankHealth 60,80 maxArmor 0 - rankArmor 20,40,60 + rankArmor 20,40,55 forcepool 75 extralives 1 @@ -127,47 +127,45 @@ ClassInfo c_att_skill_2 MB_ATT_PLX1 c_att_names_2 "MiniMag PTL Launcher (PLX)" - c_att_ranks_2 16 - + c_att_ranks_2 17 + c_att_descs_2 "25% less dmg, 35% slower reload" + c_att_skill_3 MB_ATT_BASE_TD c_att_names_3 "Thermal Grenades" - c_att_ranks_3 1,1,1 + c_att_ranks_3 1,1 c_att_skill_4 MB_ATT_FRAGS - c_att_names_4 "Frag Grenades" - c_att_ranks_4 5,8 + c_att_names_4 "Frag Grenade" + c_att_ranks_4 5 c_att_skill_5 MB_ATT_SONIC_DETONATOR - c_att_names_5 "Sonic Detonators" - c_att_ranks_5 5,8 - + c_att_names_5 "Sonic Detonator" + c_att_ranks_5 5 + c_att_skill_6 MB_ATT_MICRO_GRENADES - c_att_names_6 "Concussion Grenades" - c_att_ranks_6 2,3,8 + c_att_names_6 "V-59 Conc Grenades" + c_att_ranks_6 2,3 - c_att_skill_7 MB_ATT_RESPAWNS - c_att_names_7 "Reinforcements" - c_att_ranks_7 16,14 + c_att_skill_7 MB_ATT_RESPAWNS + c_att_names_7 "Reinforcements" + c_att_ranks_7 16,10 c_att_descs_7 "1 default" - c_att_skill_8 MB_ATT_HEALTH - c_att_names_8 "Health (60/80)" - c_att_ranks_8 1,2 + + c_att_skill_8 MB_ATT_ASSEMBLE + c_att_names_8 "Assemble" + c_att_ranks_8 1,2,2 + + c_att_skill_9 MB_ATT_HEALTH + c_att_names_9 "HP (60/80)" + c_att_ranks_9 1,2 - c_att_skill_9 MB_ATT_ARMOUR - c_att_names_9 "Armor (20/40/60)" - c_att_ranks_9 3,3,3 + c_att_skill_10 MB_ATT_ARMOUR + c_att_names_10 "Armor (20/40/55)" + c_att_ranks_10 3,3,3 - c_att_skill_10 MB_ATT_BLAST_ARMOUR - c_att_names_10 "Blast Armor" - c_att_ranks_10 6 - c_att_skill_11 MB_ATT_DODGE c_att_names_11 "Dodge ^3[CS1]" c_att_ranks_11 1,3 - - c_att_skill_12 MB_ATT_ASSEMBLE - c_att_names_12 "Assemble" - c_att_ranks_12 1,2,2 } WeaponInfo0 @@ -178,6 +176,9 @@ WeaponInfo0 NewViewModel "models/weapons2/MiniMag_launcher/launcher.md3" Icon "gfx/hud/w_icon_MiniMag" WeaponName "MiniMag PTL Launcher" + Damagemod .75 + reloadTimeModifier 1.35 + flashSound0 "sound/weapons/upl/fire_rocket.wav" } WeaponInfo1 @@ -190,7 +191,7 @@ WeaponInfo1 WeaponName "DH-17 Blaster Rifle" } -description "Rebel Vanguard [Soldier] +description "Rebel Vanguard Units suited for mid-ranged combat and storming operations. diff --git a/z_MBLegends/ext_data/mb2/character/h1_SecurET.mbch b/z_MBLegends/ext_data/mb2/character/h1_SecurET.mbch index 667088829..4da19bdc2 100644 --- a/z_MBLegends/ext_data/mb2/character/h1_SecurET.mbch +++ b/z_MBLegends/ext_data/mb2/character/h1_SecurET.mbch @@ -1,5 +1,5 @@ //Legends Mode character file - Created by Frenzy & Leos -//Customizable version - Created by iPod/Snackbar +//Customizable version - Created by iPod/SnacKbar ClassInfo { @@ -87,7 +87,7 @@ ClassInfo c_att_skill_1 MB_ATT_PISTOL c_att_names_1 "Naboo S-5 Blaster Pistol" c_att_ranks_1 0,1,4 - c_att_descs_1 "10% faster RoF, 15% less DMG, 10% less FP DMG" + c_att_descs_1 "10% faster RoF, 15% less Dmg, 10% less FP Dmg" c_att_skill_2 MB_ATT_CR2 c_att_names_2 "CR-2 Heavy Blaster Pistol" c_att_ranks_2 6,3,4 @@ -95,26 +95,27 @@ ClassInfo c_att_skill_3 MB_ATT_CLONERIFLE c_att_names_3 "Sec Force Repeater (C. Rifle)" c_att_ranks_3 2,4,6 - c_att_descs_3 "10% faster RoF, 45% more velocity, 15% less DMG, 25% less FP DMG, -50% slower mag reload" + c_att_descs_3 "10% faster RoF, 45% more Velocity, 15% less Dmg, 25% less FP Dmg, +50% slower Mag Reload" + c_att_skill_4 MB_ATT_CLONEBLOBS - c_att_names_4 "> Repeater Concussion Blobs" - c_att_ranks_4 1,1,1 + c_att_names_4 "> Repeater Conc Blobs" + c_att_ranks_4 1,1 c_att_skill_5 MB_ATT_SONIC_DETONATOR - c_att_names_5 "Sonic Detonators" - c_att_ranks_5 4,4 + c_att_names_5 "Sonic Detonator" + c_att_ranks_5 4 c_att_skill_6 MB_ATT_CRYOBAN_GRENADES - c_att_names_6 "Cryo Grenades" - c_att_ranks_6 4,4 + c_att_names_6 "Cryo Grenade" + c_att_ranks_6 4 c_att_skill_7 MB_ATT_RESPAWNS c_att_names_7 "Reinforcements" c_att_ranks_7 10,20 c_att_descs_7 "1 default" c_att_skill_8 MB_ATT_HEALTH - c_att_names_8 "Health (65/80)" + c_att_names_8 "HP (65/80)" c_att_ranks_8 2,2 c_att_skill_9 MB_ATT_HEALING @@ -137,7 +138,7 @@ ClassInfo WeaponInfo0 { WeaponToReplace WP_BLASTER_PISTOL - WeaponBasedOff WP_BLASTER_PISTOL + WeaponBasedOff WP_MANDO_PISTOL NewWorldModel "models/weapons2/s5_heavy_pistol/model_w.GLM" NewViewModel "models/weapons2/s5_heavy_pistol/model.md3" Icon "gfx/hud/w_icon_s5pistol" @@ -199,7 +200,7 @@ WeaponInfo2 WeaponName "Shock Baton" } -description "Security Force [Clone Trooper] +description "Security Force Quick, versatile guards. Adept at disabling enemies. @@ -209,15 +210,13 @@ Quick, versatile guards. Adept at disabling enemies. -- No Saber/Blaster Block -- No Saber Training -- Staggers on hit --- 10% more KB --- 70/41% less DMG --- 50% less reach --- 33% more radius --- Slap ^3[GB] +-- 10% more Kb +-- 50% less Reach +-- 33% more Radius - Naboo S-5 Blaster Pistol (1) -- 10% faster RoF --- 15% less DMG --- 10% less FP DMG +-- 15% less Dmg +-- 10% less FP Dmg ^8Attributes: - Reinforcement (1) diff --git a/z_MBLegends/ext_data/mb2/character/h1_TORtroop.mbch b/z_MBLegends/ext_data/mb2/character/h1_TORtroop.mbch index ec827747a..8913661a8 100644 --- a/z_MBLegends/ext_data/mb2/character/h1_TORtroop.mbch +++ b/z_MBLegends/ext_data/mb2/character/h1_TORtroop.mbch @@ -1,20 +1,20 @@ ClassInfo { name "h1_TORtroop" -weapons WP_SABER|WP_MELEE|WP_THROWER -attributes MB_ATT_ASSEMBLE,3|MB_ATT_WOOKIE_STRENGTH,1|MB_ATT_FORCEBLOCK,1|MB_ATT_THROWER_LIGHTNING|MB_ATT_STRONGBLOBS,4|MB_ATT_CLONEBLOBS,4|MB_ATT_QUICKTHROW,1|MB_ATT_BLAST_ARMOUR,1|MB_ATT_WOOKIEE_FURY,1 +weapons WP_SABER|WP_THROWER +attributes MB_ATT_ASSEMBLE,3|MB_ATT_WOOKIE_STRENGTH,1|MB_ATT_FORCEBLOCK,1|MB_ATT_THROWER_LIGHTNING|MB_ATT_STRONGBLOBS,4|MB_ATT_CLONEBLOBS,4|MB_ATT_QUICKTHROW,1|MB_ATT_BLAST_ARMOUR,1 modelscale 1.02 resource RESOURCE_ENERGY forcepool 75 -forceregen 0.8 +forceregen .8 maxhealth 100 maxarmor 85 rankHealth 130 knockbacktaken 0.9 -rankKbTaken 0.6 +rankKbTaken .6 knockbackGiven 1.1 -damageTaken 0.95 -rankDmgTaken 0.75 +damageTaken .95 +rankDmgTaken .75 BPmultiplier 0 APmultiplier 1.10 ASmultiplier 1.15 @@ -66,7 +66,7 @@ customred_4 1 customgreen_4 1 customblue_4 1 isCustomBuild 1 -mbPoints 10 +mbPoints 11 hasCustomSpec 3 isOnlyOneSpec 1 customSpecName_1 "Gunnery" @@ -80,12 +80,12 @@ customSpecIcon_3 "gfx/2d/hud/hlp_defend" customSpecDesc_3 "Defense Specialist" c_att_skill_0 MB_ATT_RESPAWNS c_att_names_0 "Reinforcement" -c_att_ranks_0 6 +c_att_ranks_0 7 c_att_skill_1 MB_ATT_MINIGUN c_att_names_1 "Assault Cannon (Minigun)" c_att_ranks_1 3,0 -c_att_descs_1 "Ignites on hit, 50% more DMG, 25% more FP DMG, -35% less velocity, 95% slower RoF" +c_att_descs_1 "Ignites on hit, 50% more Dmg, 25% more FP Dmg, +35% less Velocity, 95% slower RoF" c_att_skill_2 MB_ATT_FRAGS c_att_names_2 "Frag Grenade" c_att_ranks_2 1 @@ -94,29 +94,28 @@ c_att_names_3 "Fire Grenades" c_att_ranks_3 1,1 c_att_skill_4 MB_ATT_FP_RAGE c_att_names_4 "Supercharge (Dark Rage)" -c_att_ranks_4 1,1,0 +c_att_ranks_4 1,1,1 c_att_skill_5 MB_ATT_HEALTH -c_att_names_5 "Health (130)" +c_att_names_5 "HP (130)" c_att_ranks_5 1 c_att_skill_6 MB_ATT_ARMOUR c_att_names_6 "Armor (100)" c_att_ranks_6 1 - c_att_skill_15 MB_ATT_RESPAWNS c_att_names_15 "Reinforcement" -c_att_ranks_15 6 +c_att_ranks_15 7 c_att_skill_16 MB_ATT_DC_CARBINE c_att_names_16 "Repeat. Blaster (DC Carbine)" c_att_ranks_16 3,0 -c_att_descs_16 "20% more velocity, 10% faster RoF, 10% less DMG/FP DMG" +c_att_descs_16 "20% more Velocity, 10% faster RoF, 10% less Dmg/FP Dmg" c_att_skill_17 MB_ATT_WESTARM5 c_att_names_17 "Pulse Grenade Launcher (M5)" c_att_ranks_17 1,0 -c_att_descs_17 "Prim fire: Single shot, 50% more DMG/FP DMG, 50% more velocity, -20% slower reload, Sec fire: 70% faster RoF" +c_att_descs_17 "Prim fire: Single shot, 50% more Dmg/FP Dmg, 50% more Velocity, +20% slower Reload, Sec fire: 70% faster RoF" c_att_skill_18 MB_ATT_ARC_RIFLE_GRENADELAUNCHER c_att_names_18 "> Launcher Pulse Grenades" -c_att_ranks_18 1,0,0 +c_att_ranks_18 1,1,0 c_att_skill_19 MB_ATT_FRAGS c_att_names_19 "Frag Grenades" c_att_ranks_19 1,1 @@ -124,7 +123,7 @@ c_att_skill_20 MB_ATT_FP_SEE c_att_names_20 "Radar Scanner (Sense)" c_att_ranks_20 1 c_att_skill_21 MB_ATT_HEALTH_REGEN_CAP -c_att_names_21 "Health Regen (5/.5s to 35)" +c_att_names_21 "HP Regen (5/.5s to 35)" c_att_ranks_21 1 c_att_skill_22 MB_ATT_BASESPEED c_att_names_22 "Speed (232)" @@ -132,14 +131,13 @@ c_att_ranks_22 1 c_att_skill_23 MB_ATT_DEXTERITY c_att_names_23 "Dexterity" c_att_ranks_23 0 - c_att_skill_30 MB_ATT_RESPAWNS c_att_names_30 "Reinforcement" -c_att_ranks_30 6 +c_att_ranks_30 7 c_att_skill_31 MB_ATT_CLONERIFLE c_att_names_31 "Stun Carbine (Clone Rifle)" c_att_ranks_31 3 -c_att_descs_31 "25% less DMG, 10% slower RoF, 50% more velocity, Conc/Ion Blobs (8)" +c_att_descs_31 "25% less Dmg, 10% slower RoF, 50% more Velocity, Conc/Ion Blobs (8)" c_att_skill_32 MB_ATT_FRAGS c_att_names_32 "Frag Grenade" c_att_ranks_32 1 @@ -153,14 +151,16 @@ c_att_skill_35 MB_ATT_ARMOUR_REGEN_CAP c_att_names_35 "Armor Regen Cap (70)" c_att_ranks_35 1 c_att_skill_36 MB_ATT_DMG_TAKEN_MULTIPLIER -c_att_names_36 "DMG Taken (75%)" +c_att_names_36 "Dmg Taken (75%)" c_att_ranks_36 1 c_att_skill_37 MB_ATT_KB_TAKEN_MULTIPLIER -c_att_names_37 "KB Taken (60%)" +c_att_names_37 "Kb Taken (60%)" c_att_ranks_37 1 +c_att_skill_38 MB_ATT_ENV_PROT +c_att_names_38 "Environmental Protection" +c_att_ranks_38 1 } -WeaponInfo0 -{ +WeaponInfo0{ WeaponToReplace WP_MINIGUN WeaponBasedOff WP_MINIGUN NewWorldModel "models/weapons2/z6_rotary/model.glm" @@ -179,14 +179,13 @@ WeaponName "Assault Cannon" customAmmo 600 isMinigun 1 FPMult 1.25 -velocityMod 0.65 +velocityMod .65 DamageMod 1.5 rateMod 1.95 } -WeaponInfo1 -{ +WeaponInfo1{ WeaponToReplace WP_DC_CARBINE -WeaponBasedOff WP_DC_CARBINE +WeaponBasedOff WP_CONCUSSION NewWorldModel "models/weapons2/jungleRifle/jungeRifle.glm" NewViewModel "models/weapons2/jungleRifle/jungeRifle_w.md3" Icon "gfx/hud/w_icon_junglerifle" @@ -194,33 +193,31 @@ WeaponName "Repeating Blaster Rifle" MuzzleEffect null customammo 540 velocityMod 1.2 -damagemod 0.9 -ratemod 0.9 -fpmult 0.9 +damagemod .9 +ratemod .9 +fpmult .9 } -WeaponInfo2 -{ +WeaponInfo2{ WeaponToReplace WP_THROWER -WeaponBasedOff WP_THROWER +WeaponBasedOff WP_MANDO_PISTOL NewWorldModel "models/weapons2/beamRIFLE/beamrifle_w.glm" -NewViewModel "models/weapons2/dummy/dummy.md3" +NewViewModel "models/weapons2/beamRIFLE/beamrifle.md3" +NewHandsModel "models/weapons2/beamRIFLE/beamrifle_hand.md3" Icon "gfx/hud/w_icon_beamrifle" WeaponName "Pulse Cannon" clipsize 50 customammo 150 ReloadTimeModifier 1.75 } -WeaponInfo3 -{ +WeaponInfo3{ WeaponToReplace WP_SABER WeaponBasedOff WP_SABER NewWorldModel "models/weapons2/vibroknife/model.glm" NewViewModel "models/weapons2/dummy/dummy.md3" Icon "gfx/hud/w_icon_prisonknife" -WeaponName "Jagged Vibroknife" +WeaponName "Vibroknife" } -WeaponInfo4 -{ +WeaponInfo4{ WeaponToReplace WP_CLONE_RIFLE WeaponBasedOff WP_CLONE_RIFLE Icon "gfx/hud/w_icon_el-16" @@ -232,13 +229,12 @@ AltMuzzleEffect "Blaster/MuzzleFlash01B" WeaponName "Stun Carbine" clipSize 20 ratemod 1.1 -DamageMod 0.75 +DamageMod .75 ReloadTimeModifier 1.3 customammo 380 velocitymod 1.5 } -WeaponInfo5 -{ +WeaponInfo5{ WeaponToReplace WP_M5 WeaponBasedOff WP_M5 NewWorldModel "models/weapons2/cw-w5/dc-15_ext_w.glm" @@ -247,61 +243,54 @@ Icon "gfx/hud/w_icon_cw-w5g" FlashSound0 "sound/weapons/dc17m/alt_fire.mp3" WeaponName "Pulse Grenade Launcher" clipSize 2 -ratemod 0.3 +ratemod .3 ReloadTimeModifier 1.2 DamageMod 1.5 fpmult 1.5 customammo 175 velocityMod 1.5 } -ForceInfo0 -{ +ForceInfo0{ ForceToReplace FP_SEE Icon "gfx/forcepowers/radar" ForcePowerName "Radar Scanner" StartSound "sound/ambience/kotor/consolebeep03.mp3" LoopSound "sound/ambience/cp_02_lp.wav" } -ForceInfo1 -{ +ForceInfo1{ ForceToReplace FP_PROTECT Icon "gfx/2d/shield" ForcePowerName "Energy Shield" } -ForceInfo2 -{ +ForceInfo2{ ForceToReplace FP_RAGE Icon "gfx/mp/new_f_icon_dk_rage" ForcePowerName "Supercharge" } -description "Old Republic Trooper [Clone Trooper] +description "Old Republic Trooper Durable multi-lifes with crowd control. ^2Weaponry: - Melee -- Jagged Vibroknife (Purple Saber) +- Vibroknife (Purple Saber) -- No Saber/Blaster Block -- Chain Limit: 4 --- 65% less DMG --- 50% less reach --- Slap ^3[GB] - Pulse Cannon (Lightning Thrower) --- 75% slower mag reload +-- 75% slower Mag Reload ^6Inventory: - Advanced Medpac ^3[CS4] ^8Attributes: - Reinforcement (1) -- 10% more/less KB given/taken +- 10% more/less Kb Given/Taken - Armor Regen: 2/s to 25 - Strength (1) - Blast Armor - Force Block (1) - Assemble (3) -- Fury (1) ^3Abilities: - Quickthrow (1) ^3[CS3]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h1_Talz.mbch b/z_MBLegends/ext_data/mb2/character/h1_Talz.mbch index 73144a992..f04d6b006 100644 --- a/z_MBLegends/ext_data/mb2/character/h1_Talz.mbch +++ b/z_MBLegends/ext_data/mb2/character/h1_Talz.mbch @@ -83,7 +83,7 @@ WeaponInfo1 MuzzleEffect null MissileModel "models/weapons2/dc_gabow/greenarrow_arrow.md3" MissileEffect "bow/whoosh" - MissileMissEffect "dc/explosion" + MissileMissEffect "Dc/explosion" MissileHitHumanEffect "bow/arrow_humandroid" MissileHitDroidEffect "bow/arrow_humandroid" clipSize 8 @@ -136,31 +136,29 @@ WeaponInfo2 selectSound "sound/player/footsteps/ice_walk2.mp3" } -description "Talz Native [Wookiee] +description "Talz Native Indigenous peoples with primitive weaponry. Fill your Resource bar with damage to unleash special moves. ^2Weaponry: - Melee --- Flat KB: 85 +-- Flat Kb: 85 -- 5% faster RoF - Talz Spear (All styles Saber) -- Freezes/poisons on hit -- No Saber/Blaster Block --- Saber DMG: 140 --- 200% special DMG mult --- 25% more reach --- 33% more radius +-- 200% Spec Dmg mult +-- 25% more Reach +-- 33% more Radius -- Saber Throw ^3[CS1] ---- 166% more DMG --- Slap ^3[GB] +--- 166% more Dmg - Snowballs (25) (Repeater) -- 25% slower RoF -- Sec only - Longbow and Arrows (T-21 3) -- Staggers/freezes/poisons on hit --- 35% faster shot swap --- 50% slower mag reload +-- 35% faster Shot Swap +-- 50% slower Mag Reload -- Prim only ^5Powers: @@ -168,8 +166,8 @@ Indigenous peoples with primitive weaponry. Fill your Resource bar with damage t ^8Attributes: - Reinforcement (1) -- 70% less KB taken -- 99% less KB given +- 70% less Kb Taken +- 99% less Kb Given - Dexterity (1) - Strength (1) - Fury (3) diff --git a/z_MBLegends/ext_data/mb2/character/h2_Carth.mbch b/z_MBLegends/ext_data/mb2/character/h2_Carth.mbch index 1843919c9..15891a2f4 100644 --- a/z_MBLegends/ext_data/mb2/character/h2_Carth.mbch +++ b/z_MBLegends/ext_data/mb2/character/h2_Carth.mbch @@ -4,7 +4,7 @@ ClassInfo { name "h2_Carth" weapons WP_MANDO_PISTOL|WP_MELEE|WP_CONC_NADE|WP_FRAG_NADE - attributes MB_ATT_FRAGS,2|MB_ATT_MANDO_PISTOL,3|MB_ATT_HEALING,2|MB_ATT_AMMO,3|MB_ATT_DASH,2|MB_ATT_QUICKTHROW,1|MB_ATT_DODGE,3|MB_ATT_MICRO_GRENADES,3|MB_ATT_SHIELD_RECHARGE,1|MB_ATT_BLAST_ARMOUR|MB_ATT_WOOKIE_STRENGTH,1 + attributes MB_ATT_FRAGS,3|MB_ATT_MANDO_PISTOL,3|MB_ATT_HEALING,2|MB_ATT_AMMO,3|MB_ATT_DASH,2|MB_ATT_QUICKTHROW,1|MB_ATT_DODGE,3|MB_ATT_MICRO_GRENADES,3|MB_ATT_SHIELD_RECHARGE,1|MB_ATT_BLAST_ARMOUR|MB_ATT_WOOKIE_STRENGTH,1 maxhealth 125 maxarmor 125 damageGiven 1.15 @@ -59,17 +59,17 @@ WeaponInfo0 ratemod 1.05 } -description "Carth Onasi [Hero] +description "Carth Onasi A speedy Dual Pistol wielder and grenadier with multiple forms of healing. ^2Weaponry: - Melee - Carth's Dual Blaster Pistols (WESTARs 3) --- 10% more FP DMG +-- 10% more FP Dmg -- 5% slower RoF -- Concussion Grenades (3) -- Frag Grenades (2) +- Frag Grenades (3) +- V-59 Conc Grenades (3) ^6Inventory: - Advanced Medpac ^3[CS4] diff --git a/z_MBLegends/ext_data/mb2/character/h2_Han.mbch b/z_MBLegends/ext_data/mb2/character/h2_Han.mbch index 2d03fec1c..031b96225 100644 --- a/z_MBLegends/ext_data/mb2/character/h2_Han.mbch +++ b/z_MBLegends/ext_data/mb2/character/h2_Han.mbch @@ -82,15 +82,15 @@ ClassInfo c_att_skill_0 MB_ATT_PISTOL c_att_names_0 "Han Solo's DL-44 Pistol" c_att_ranks_0 30,5,30 - c_att_descs_0 "100% more DMG, 20% more FP DMG, 20% more velocity, -20% slower RoF, 15% slower movement, 150% slower reload" + c_att_descs_0 "100% more Dmg, 20% more FP Dmg, 20% more Velocity, +20% slower RoF, 15% slower Movement, 150% slower Reload" c_att_skill_1 MB_ATT_FRAGS c_att_names_1 "Frag Grenades" c_att_ranks_1 10,10,10 c_att_skill_2 MB_ATT_MICRO_GRENADES - c_att_names_2 "Concussion Grenades" + c_att_names_2 "V-59 Conc Grenades" c_att_ranks_2 5,5,5 c_att_skill_3 MB_ATT_HEALING @@ -106,9 +106,9 @@ ClassInfo c_att_ranks_5 10,10,10 c_att_skill_6 MB_ATT_STM_MULTIPLIER - c_att_names_6 "Skill Cooldown (125%)" + c_att_names_6 "Skill Cd (125%)" c_att_ranks_6 5 - c_att_ranks_6 "100% default" + c_att_descs_6 "100% default" c_att_skill_7 MB_ATT_DODGE c_att_names_7 "Dodge ^3[CS1]" @@ -155,7 +155,7 @@ WeaponInfo0 animAttackWalk BOTH_ATTACK2 } -description "Han Solo [Hero] +description "Han Solo A scrappy class with custom options like a double-damage Pistol, a massive Energy pool, and Quickthrow Frag Grenades. diff --git a/z_MBLegends/ext_data/mb2/character/h2_JanO.mbch b/z_MBLegends/ext_data/mb2/character/h2_JanO.mbch index 98542cae1..88a1e3bf8 100644 --- a/z_MBLegends/ext_data/mb2/character/h2_JanO.mbch +++ b/z_MBLegends/ext_data/mb2/character/h2_JanO.mbch @@ -8,7 +8,7 @@ ClassInfo weapons WP_MELEE|WP_BLASTER|WP_FLECHETTE|WP_FRAG_NADE|WP_ROCKET_LAUNCHER|WP_THERMAL - attributes MB_ATT_BLASTER,2|MB_ATT_FRAGS,2|MB_ATT_AMMO,3|MB_ATT_HEALING,2|MB_ATT_DODGE,3|MB_ATT_QUICKTHROW,1|MB_ATT_DASH,2|MB_ATT_ROCKET_LAUNCHER|MB_ATT_FLOAT_HOP|MB_ATT_BUNNY_HOP,1|MB_ATT_FLECHETTE,2|MB_ATT_DEXTERITY,1 + attributes MB_ATT_BLASTER,2|MB_ATT_FRAGS,3|MB_ATT_AMMO,3|MB_ATT_HEALING,2|MB_ATT_DODGE,3|MB_ATT_QUICKTHROW,1|MB_ATT_DASH,2|MB_ATT_ROCKET_LAUNCHER|MB_ATT_FLOAT_HOP|MB_ATT_BUNNY_HOP,1|MB_ATT_FLECHETTE,2|MB_ATT_DEXTERITY,1 maxhealth 165 maxarmor 95 @@ -53,7 +53,7 @@ ClassInfo c_att_skill_0 MB_ATT_BASE_TD c_att_names_0 "Heavy Thermal Grenades" c_att_ranks_0 1,1,1 - c_att_descs_0 "Pushes on det, 100% more DMG" + c_att_descs_0 "Pushes on det, 100% more Dmg" c_att_skill_1 MB_ATT_POWER c_att_names_1 "Energy Pool (120/125/130)" @@ -118,23 +118,23 @@ WeaponInfo2 customammo 500 } -description "Jan Ors [Hero] +description "Jan Ors A nimble gunner with a unique projectile shotgun. ^2Weaponry: - Melee --- 15% faster movement +-- 15% faster Movement - DH-17 Blaster Pistol (Blaster Rifle 2) -- 10% faster RoF --- 10% faster reload +-- 10% faster Reload - FC-1 Flechette Launcher (2) --- 15% more DMG/FP DMG +-- 15% more Dmg/FP Dmg - PLX-2M Rocket Launcher (5) -- Staggers/pushes on det --- 15% more velocity --- Mag reload -- Frag Grenades (2) +-- 15% more Velocity +-- Mag Reload +- Frag Grenades (3) ^6Inventory: - Advanced Medpac ^3[CS4] diff --git a/z_MBLegends/ext_data/mb2/character/h2_JarJar.mbch b/z_MBLegends/ext_data/mb2/character/h2_JarJar.mbch index 5875b3562..a72f0f8d5 100644 --- a/z_MBLegends/ext_data/mb2/character/h2_JarJar.mbch +++ b/z_MBLegends/ext_data/mb2/character/h2_JarJar.mbch @@ -2,17 +2,17 @@ Classinfo { - name "h2_JarJar" + name "h2_JarJar" MBClass MB_CLASS_JEDI classNumberLimit 1 - weapons WP_MELEE|WP_SABER|WP_T21|WP_PULSE_NADE|WP_FLECHETTE + weapons WP_MELEE|WP_SABER|WP_T21|WP_PULSE_NADE|WP_UGL - attributes MB_ATT_BUNNY_HOP,2|MB_ATT_FLOAT_HOP|MB_ATT_HEALING,2|MB_ATT_DEXTERITY,3|MB_ATT_STAMINA,3|MB_ATT_ROSHTAUNT|MB_ATT_WATER_BREATHING|MB_ATT_FLIPKICK,3|MB_ATT_DASH_JUMP|MB_ATT_DASH,2|MB_ATT_DODGE,3|MB_ATT_T21,1|MB_ATT_BLAST_ARMOUR|MB_ATT_QUICKTHROW,3|MB_ATT_FLECHETTE,4 + attributes MB_ATT_BUNNY_HOP,2|MB_ATT_FLOAT_HOP|MB_ATT_HEALING,2|MB_ATT_DEXTERITY,3|MB_ATT_STAMINA,3|MB_ATT_ROSHTAUNT|MB_ATT_WATER_BREATHING|MB_ATT_FLIPKICK,3|MB_ATT_DASH_JUMP|MB_ATT_DASH,2|MB_ATT_DODGE,3|MB_ATT_T21,1|MB_ATT_BLAST_ARMOUR|MB_ATT_QUICKTHROW,3|MB_ATT_UGL|MB_ATT_UGL_BURST,4|MB_ATT_GETUPS,3 WP_MeleeFlags HELD_HIGHDAMAGE WP_SaberFlags HELD_KNOCKDOWN - WP_FlechetteFlags HELD_SLOW|HELD_PULSE|HELD_DISRUPTIFY|HELD_KNOCKBACK|HELD_KNOCKDOWN + WP_UGLFlags HELD_SLOW|HELD_DISRUPTIFY|HELD_HIGHDAMAGE WP_PulseNadeFlags HELD_DISRUPTIFY|HELD_HIGHDAMAGE WP_T21Flags HELD_LOWDAMAGE @@ -49,12 +49,12 @@ Classinfo skilltimermod 2.9 - hackRate 0.5 + hackRate 1.5 special1 EAS_HI_DODGE special2 EAS_HI_DEX - special3 EAS_HI_DASH - special4 EAS_HI_QUICKTHROW + special3 EAS_HI_QUICKTHROW + special4 EAS_HI_DASH uioverlay_r "gfx/icons/spec_infantry" uioverlay_l "gfx/icons/brawler" @@ -107,9 +107,11 @@ WeaponInfo0 WeaponInfo1 { WeaponToReplace WP_T21 - WeaponBasedOff WP_T21 + WeaponBasedOff WP_CONCUSSION NewWorldModel "models/weapons2/e5/e5_w.glm" - NewViewModel "models/weapons2/dummy/dummy.md3" + NewViewModel "models/weapons2/e5/e5.md3" + NewHandsModel "models/weapons2/e5/e5_hand.md3" + NewBarrelModel "models/weapons2/e5/e5_kitsu.md3" Icon "gfx/hud/w_icon_e5" WeaponName "Salvaged E-5 Blaster Rifle" FlashSound0 "sound/weapons/blasterMB/fire.mp3" @@ -121,8 +123,8 @@ WeaponInfo1 MissileEffect "blaster/Shot01R" altMuzzleEffect "Blaster/MuzzleFlash01R" altMissileEffect "blaster/Shot01R" - customAmmo 1008 - clipsize 144 + customAmmo 1092 + clipsize 156 reloadTimeModifier 0.75 hasAnimOverrides 1 animReadyNoAmmo BOTH_ARC_FORWARD_DIVE @@ -145,8 +147,8 @@ WeaponInfo2 WeaponInfo3 { - WeaponToReplace WP_FLECHETTE - WeaponBasedOff WP_FLECHETTE + WeaponToReplace WP_UGL + WeaponBasedOff WP_UGL FlashSound0 "sound/weapons/ballz/swing2.mp3" FlashSound1 "sound/weapons/ballz/swing2.mp3" FlashSound2 "sound/weapons/ballz/swing2.mp3" @@ -170,26 +172,23 @@ WeaponInfo3 altMuzzleEffect null altMissileEffect "grenades/glowempb" MissileEffect "grenades/glowempb" - primFireEnabled 0 WeaponName "Boomaload" Icon "gfx/hud/w_icon_booma" - clipSize 15 - customAmmo 5 - velocityMod 0 - damageMod 3 - rateMod 12.5 + velocityMod 1 + rateMod 6 SelectSound "sound/weapons/ballz/fall4.mp3" hasAnimOverrides 1 animReadyRun BOTH_HUGGER1 animReady BOTH_HUGGER1 animReadyWalk BOTH_HUGGER1 animReadyNoAmmo BOTH_HUGGER1 - animAttackRun BOTH_KYLE_MISS - animAttack BOTH_KYLE_MISS - animAttackWalk BOTH_KYLE_MISS + animAttackRun BOTH_SPINATTACK6 + animAttack BOTH_SPINATTACK6 + animAttackWalk BOTH_SPINATTACK6 + animCharge BOTH_COWER1 } -description "Jar Jar Binks [Jedi] +description "Jar Jar Binks Mesa, uh, clumsy... @@ -199,33 +198,29 @@ Mesa, uh, clumsy... - Grand Gungan Ticklers (Dual Saber) -- No Saber/Blaster Block -- Chain Limit: 1 --- Knocks down on hit --- 160% more KB --- 25% less reach --- 66% less DMG --- 200% special DMG mult --- 400% more radius -- Boomaload (1) (Flechette 4) --- Shocks/pushes/knocks down on det --- 200% more DMG --- 100% less velocity --- 1150% slower shot swap --- 15% slower movement --- Sec only +-- Trips on hit +-- 300% more Kb +-- 100/25% less L/R Reach +-- 200% Spec Dmg mult +-- 400% more Radius +- Boomaload (Burst UGL) +-- 100% more Dmg +-- 500% slower Shot Swap +-- 15% slower Movement - Salvaged E-5 Blaster Rifle (T-21 1) --- 25% faster reload --- 50% less DMG +-- 25% faster Reload +-- 50% less Dmg - Boomas (4) (Pulse Grenades) --- 100% more DMG +-- 100% more Dmg -- Prim only ^5Powers: - Jar Jar Jump (1) ^8Attributes: -- 190% slower skill CD +- 190% slower Skill Cd - 50% slower Hacking -- 50% more KB taken/given +- 50% more Kb Taken/Given - Bunny Hop (2) - Slow Faller - Stamina (3) @@ -234,11 +229,12 @@ Mesa, uh, clumsy... - Blast Armor - Healing (2) - Underwater Breathing +- Getup (3) ^3Abilities: -- Gungan Jive +- Gungan Jive (Toxic Taunt) - Flipkick (3) ^3[Contact Jump] - Dodge (3) ^3[CS1] - Dex Roll ^3[CS2] -- Dash/Dash Jump (2) ^3[CS3] -- Quickthrow (3) ^3[CS4]" \ No newline at end of file +- Quickthrow (3) ^3[CS3] +- Dash/Dash Jump (2) ^3[CS4]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h2_JynE.mbch b/z_MBLegends/ext_data/mb2/character/h2_JynE.mbch index 3584e45da..0c7e8e100 100644 --- a/z_MBLegends/ext_data/mb2/character/h2_JynE.mbch +++ b/z_MBLegends/ext_data/mb2/character/h2_JynE.mbch @@ -4,7 +4,8 @@ ClassInfo MBClass MB_CLASS_HERO classNumberLimit 1 weapons WP_MANDO_PISTOL|WP_MELEE|WP_SABER|WP_BOWCASTER|WP_SONIC_NADE|WP_DET_PACK - + + WP_SonicNadeFlags HELD_KNOCKBACK|HELD_PULSE WP_BowcasterFlags HELD_ALTRELOAD|HELD_PULSE|HELD_KNOCKBACK attributes MB_ATT_MANDO_PISTOL,2|MB_ATT_HEALING,2|MB_ATT_AMMO,3|MB_ATT_DODGE,3|MB_ATT_FLIPKICK,1|MB_ATT_DASH,2|MB_ATT_BOWCASTER,3|MB_ATT_SONIC_DETONATOR,2|MB_ATT_DET_PACK,3|MB_ATT_DEXTERITY,1 @@ -16,7 +17,8 @@ ClassInfo saber1 truncheon_legends saber2 a180_saber_legends saberstyle SS_DUAL|SS_TAVION - saberDamage 70 + saberDamage 120 + saberSpecialDamage 1.2 APmultiplier 1.25 CSmultiplier 1.1 ASmultiplier 1.15 @@ -51,8 +53,8 @@ ClassInfo special1 EAS_HI_DODGE special2 EAS_HI_DASH - special3 EAS_HI_MEDPAC_BIG - special4 EAS_HI_KICK + special3 EAS_HI_KICK + special4 EAS_HI_MEDPAC_BIG uioverlay "gfx/icons/spec_infantry" } @@ -71,8 +73,9 @@ WeaponInfo0 ClipSize 22 ReloadTimeModifier 0.9 damageMod 1.1 - CustomAmmo 820 + velocityMod 1.15 FPMult 1.1 + CustomAmmo 820 hasAnimOverrides 1 animStand BOTH_STAND1 animAttackRun BOTH_ATTACK2 @@ -99,8 +102,7 @@ WeaponInfo1 WeaponName "A180 Ion Attachment" ChargeEffect "gfx/effects/cloneFrontFlash" clipSize 4 - CustomAmmo 38 - ReloadTimeModifier 1.75 + CustomAmmo 38 FPMult 2.5 hasAnimOverrides 1 animStand BOTH_STAND1 @@ -123,8 +125,26 @@ WeaponInfo2 Icon "gfx/hud/w_icon_truncheon" WeaponName "Jyn's Truncheon" } - -description "Jyn Erso [Hero] +WeaponInfo3 +{ + WeaponToReplace WP_SONIC_NADE + WeaponBasedOff WP_SONIC_NADE + NewWorldModel "models/weapons2/b17polaritypulse/laser_trap_w.glm" + NewViewModel "models/weapons2/b17polaritypulse/laser_trap.md3" + MissileModel "models/weapons2/b17polaritypulse/laser_trap_proj.md3" + missileEffect "grenades/glowEMPB" + altmissileEffect "grenades/glowEMPB" + altMissileMissEffect "Grenades/EXP_Flash" + MissileMissEffect "Grenades/EXP_Flash" + altMissileHitHumanEffect "Grenades/EXP_Flash" + missileHitHumanEffect "Grenades/EXP_Flash" + altMissileHitDroidEffect "Grenades/EXP_Flash" + missileHitDroidEffect "Grenades/EXP_Flash" + altFireEnabled 0 + Icon "gfx/hud/w_icon_polarity" + WeaponName "Electro-Sonic Flashbangs" +} +description "Jyn Erso A damage/fire rate-boosted pistoleer with advanced movement capabilities and a shocking/displacing sidearm. @@ -134,22 +154,23 @@ A damage/fire rate-boosted pistoleer with advanced movement capabilities and a s - Jyn's Truncheon (Dual/Cyan Saber) -- No Saber/Blaster Block -- Chain Limit: 2 --- 10/20% more KB on L/R hands --- 73/41% less DMG --- 30% less reach --- Slap ^3[GB] +-- 10/20% more L/R Kb +-- 125% Spec Dmg mult +-- 30% less Reach - A180 Blaster Pistol (WESTAR 2) --- 10% more DMG/FP DMG --- 10% faster reload +-- 15% faster Velocity +-- 10% more Dmg/FP Dmg +-- 10% faster Reload - A180 Ion Attachment (Bowcaster 3) -- Shocks/pushes on hit --- 150% more FP DMG --- 75% slower mag reload -- Sonic Detonators (2) +-- 150% more FP Dmg +- Electro-Sonic Flashbangs (2) +-- Shocks/sonics/blinds/pushes on det +-- Prim only - Det Packs (3) ^6Inventory: -- Advanced Medpac ^3[CS3] +- Advanced Medpac ^3[CS4] - Electrobinoculars ^8Attributes: @@ -161,4 +182,4 @@ A damage/fire rate-boosted pistoleer with advanced movement capabilities and a s - Flipkick (1) ^3[Contact Jump] - Dodge (3) ^3[CS1] - Dash (2) ^3[CS2] -- Gunkick ^3[CS4]" \ No newline at end of file +- Gunkick ^3[CS3]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h2_Lando.mbch b/z_MBLegends/ext_data/mb2/character/h2_Lando.mbch index f8b42bd4d..5ae820955 100644 --- a/z_MBLegends/ext_data/mb2/character/h2_Lando.mbch +++ b/z_MBLegends/ext_data/mb2/character/h2_Lando.mbch @@ -5,7 +5,7 @@ ClassInfo classNumberLimit 1 weapons WP_MELEE|WP_MANDO_PISTOL|WP_EE3|WP_SABER|WP_FRAG_NADE - attributes MB_ATT_FP_SABER_DEFENSE,1|MB_ATT_SPY_DISGUISE,1|MB_ATT_MANDO_PISTOL,2|MB_ATT_EE3,3|MB_ATT_FRAGS,3|MB_ATT_AMMO,2|MB_ATT_SHIELD_RECHARGE,1|MB_ATT_HEALING,2|MB_ATT_QUICKTHROW,3|MB_ATT_DASH,2|MB_ATT_DODGE,3|MB_ATT_SABER_COMBO_NONE|MB_ATT_STAMINA,2 + attributes MB_ATT_FP_SABER_DEFENSE,1|MB_ATT_SPY_DISGUISE,1|MB_ATT_MANDO_PISTOL,2|MB_ATT_EE3,3|MB_ATT_FRAGS,3|MB_ATT_AMMO,2|MB_ATT_SHIELD_RECHARGE,1|MB_ATT_HEALING,2|MB_ATT_QUICKTHROW,3|MB_ATT_DASH,2|MB_ATT_DODGE,3|MB_ATT_SABER_COMBO_NONE|MB_ATT_STAMINA,2|MB_ATT_DEXTERITY,1 maxhealth 185 maxarmor 80 @@ -83,7 +83,7 @@ WeaponInfo1 WeaponName "Lando's E-11 Blaster Rifle" MissileEffect "Blaster/Shot01R" AltMissileEffect "Blaster/Shot01R" - customammo 777 + customammo 872 rateMod 0.75 damageMod 1.1 } @@ -111,7 +111,7 @@ WeaponInfo2 damagemod 1.1 ReloadTimeModifier 0.8 velocityMod 1.25 - customammo 777 + customammo 872 rateMod 0.75 hasAnimOverrides 1 animReadyRun TORSO_WEAPONREADY2 @@ -200,7 +200,7 @@ AltMuzzleEffect null } */ -description "Lando Calrissian [Hero] +description "Lando Calrissian A fast gunner/saberist with stealth abilities. @@ -210,25 +210,24 @@ A fast gunner/saberist with stealth abilities. -- Saber Defense (1) -- No Blaster Block -- No Saber Training --- 20% more KB --- 50% less DMG --- 10% less reach --- Slap ^3[GB] +-- 20% more Kb +-- 10% less Reach - S-5 Heavy Blaster Pistol (WESTAR 2) --- 10% more DMG/FP DMG +-- 10% more Dmg/FP Dmg -- 25% faster RoF --- 25% more velocity --- 20% faster reload +-- 25% more Velocity +-- 20% faster Reload - Gambler's Palm Smoke Grenades (3) (Frags) -- Obscures vision on det -- 40% faster RoF --- 99.9% less DMG +-- 99.9% less Dmg -- Quickthrow only - Lando's E-11 Blaster Rifle (EE-3 3) --- 10% more DMG +-- 10% more Dmg -- 25% faster RoF ^8Attributes: +- Dexterity (1) - Stamina (2) - Armor Regen (1) - Healing (2) diff --git a/z_MBLegends/ext_data/mb2/character/h2_Padme.mbch b/z_MBLegends/ext_data/mb2/character/h2_Padme.mbch index 54966ee8b..dbc22c6fa 100644 --- a/z_MBLegends/ext_data/mb2/character/h2_Padme.mbch +++ b/z_MBLegends/ext_data/mb2/character/h2_Padme.mbch @@ -7,7 +7,7 @@ ClassInfo classNumberLimit 1 weapons WP_A280|WP_MELEE|WP_PULSE_NADE|WP_CONC_NADE|WP_BLASTER_PISTOL - attributes MB_ATT_HEALING,2|MB_ATT_DASH,2|MB_ATT_A280,1|MB_ATT_AMMO,3|MB_ATT_RALLY,1|MB_ATT_PULSE_GRENADES,2|MB_ATT_MICRO_GRENADES,2|MB_ATT_DODGE,3|MB_ATT_PISTOL,3|MB_ATT_QUICKTHROW,3|MB_ATT_DEXTERITY,1|MB_ATT_ANTI_MT,2|MB_ATT_USE_DISTANCE,3|MB_ATT_DISP_BLOCK,3|MB_ATT_DISP_FORCE,2 + attributes MB_ATT_HEALING,2|MB_ATT_DASH,2|MB_ATT_A280,1|MB_ATT_AMMO,3|MB_ATT_RALLY,1|MB_ATT_PULSE_GRENADES,3|MB_ATT_MICRO_GRENADES,2|MB_ATT_DODGE,3|MB_ATT_PISTOL,3|MB_ATT_QUICKTHROW,3|MB_ATT_DEXTERITY,1|MB_ATT_ANTI_MT,2|MB_ATT_USE_DISTANCE,3|MB_ATT_DISP_BLOCK,3|MB_ATT_DISP_FORCE,2 maxhealth 180 maxarmor 85 @@ -22,7 +22,7 @@ baseSpeed 255 //rateOfFire 0.8 rateOfFire_Melee 0.9 - holdables HI_MEDPAC_BIG|HI_MEDPAC + holdables HI_MEDPAC_BIG classflags CFL_STATVIEWER @@ -118,7 +118,7 @@ WeaponInfo1 animAttackWalk BOTH_ATTACK2 } -description "Padme Naberrie Amidala Skywalker [Hero] +description "Padme Naberrie Amidala Skywalker A frontline/support gunner with multiple forms of self-healing. Powerful in proximity to friendly Saberists. @@ -126,23 +126,22 @@ A frontline/support gunner with multiple forms of self-healing. Powerful in prox - Melee -- 10% faster RoF - ELG-3A Diplomat's Pistol (3) --- 10% more DMG/FP DMG +-- 10% more Dmg/FP Dmg -- 20% faster RoF - Looted E-5 Blaster Rifle (A280 1) --- 10% more DMG +-- 10% more Dmg -- 20% faster RoF -- Pulse Grenades (2) -- Concussion Grenades (2) +- Pulse Grenades (3) +- V-59 Conc Grenades (2) ^5Powers: - Team Energize (1) ^6Inventory: -- Medpac - Advanced Medpac ^3[CS4] ^8Attributes: -- 5% more KB given +- 5% more Kb Given - Dexterity (1) - Healing (2) - Rally @@ -151,7 +150,7 @@ A frontline/support gunner with multiple forms of self-healing. Powerful in prox ^3Abilities: - BP/Resource Dispenser (3)/(2) ^3['Use' on ^3allies] --- +3 range +-- +3 Range - Dodge (3) ^3[CS1] - Dash (2) ^3[CS2] - Quickthrow (3) ^3[CS3]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h2_Panaka.mbch b/z_MBLegends/ext_data/mb2/character/h2_Panaka.mbch index ce5d9ee62..af9aa1229 100644 --- a/z_MBLegends/ext_data/mb2/character/h2_Panaka.mbch +++ b/z_MBLegends/ext_data/mb2/character/h2_Panaka.mbch @@ -9,7 +9,7 @@ ClassInfo weapons WP_CR2|WP_MELEE|WP_CONC_NADE|WP_FRAG_NADE|WP_SABER|WP_BLASTER_PISTOL - attributes MB_ATT_HEALING,2|MB_ATT_AMMO,3|MB_ATT_RALLY,1|MB_ATT_FRAGS,2|MB_ATT_MICRO_GRENADES,3|MB_ATT_DODGE,3||MB_ATT_QUICKTHROW,1|MB_ATT_DEXTERITY,1|MB_ATT_CR2,3|MB_ATT_GRAPPLE_HOOK,1|MB_ATT_PISTOL,3|MB_ATT_WOOKIEE_FURY,3|MB_ATT_DASH,2|MB_ATT_LIGHTS_BEACON + attributes MB_ATT_HEALING,2|MB_ATT_AMMO,3|MB_ATT_RALLY,1|MB_ATT_FRAGS,3|MB_ATT_MICRO_GRENADES,3|MB_ATT_DODGE,3|MB_ATT_QUICKTHROW,1|MB_ATT_DEXTERITY,1|MB_ATT_CR2,3|MB_ATT_GRAPPLE_HOOK,1|MB_ATT_PISTOL,3|MB_ATT_WOOKIEE_FURY,3|MB_ATT_DASH,2|MB_ATT_LIGHTS_BEACON saber1 slight_leg sabercolor 4 @@ -32,7 +32,7 @@ ClassInfo BPmultiplier 0 - forcepowers FP_RAGE,2|FP_PROTECT,2|FP_TEAM_FORCE,3 + forcepowers FP_RAGE,1|FP_PROTECT,1|FP_TEAM_FORCE,2 resource RESOURCE_RAGE forcepool 250 forceregen 0.01 @@ -68,7 +68,7 @@ ClassInfo WeaponInfo0 { WeaponToReplace WP_BLASTER_PISTOL - WeaponBasedOff WP_BLASTER_PISTOL + WeaponBasedOff WP_MANDO_PISTOL NewWorldModel "models/weapons2/s5_heavy_pistol/model_w.GLM" NewViewModel "models/weapons2/s5_heavy_pistol/model.md3" Icon "gfx/hud/w_icon_s5pistol" @@ -129,7 +129,7 @@ animAttackWalk BOTH_ATTACK2 animStand BOTH_MAND_PISTOL_READY } -description "Captain Quarsh Panaka [Hero] +description "Captain Quarsh Panaka A commander who builds resource through damage to bolster his allies and himself. @@ -137,23 +137,23 @@ A commander who builds resource through damage to bolster his allies and himself - Melee - Naboo S-5 Blaster Pistol (3) -- 15% faster RoF --- 10% more DMG/FP DMG +-- 10% more Dmg/FP Dmg - CR-2 Heavy Blaster Pistol (3) --- 10% more DMG/FP DMG -- Frag Grenades (2) -- Concussion Grenades (3) +-- 10% more Dmg/FP Dmg +- Frag Grenades (3) +- V-59 Conc Grenades (3) ^5Powers: -- Urban Energize (3) -- Urban Protect (2)^3* -- Urban Rage (2) +- Urban Energize (2) +- Urban Protect (1)^3* +- Urban Rage (1) ^6Inventory: - Advanced Medpac ^8Attributes: ^7- ^3*^7Security's Beacon (Shares Force Powers ^7with a targeted/nearby ally) -- 50% slower skill CD +- 50% slower Skill Cd - Fury (3) -- Resource Regen: 1/.1s to 15 -- 99% slower Resource Decay @@ -165,4 +165,4 @@ A commander who builds resource through damage to bolster his allies and himself - Dodge (3) ^3[CS1] - Dash (2) ^3[CS2] - Quickthrow (1) ^3[CS3] -- Grappling Hook (1) ^3[CS4]" \ No newline at end of file +- Grappling Hook (1) ^3[CS4 Melee]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h3_Arc.mbch b/z_MBLegends/ext_data/mb2/character/h3_Arc.mbch index 1a86aeea3..d9496044d 100644 --- a/z_MBLegends/ext_data/mb2/character/h3_Arc.mbch +++ b/z_MBLegends/ext_data/mb2/character/h3_Arc.mbch @@ -1,117 +1,116 @@ -//Legends Mode character file - Created by Frenzy & Leos ClassInfo { - name "h3_Arc" - weapons WP_MELEE - attributes MB_ATT_AMMO,3|MB_ATT_CLONE_PISTOL,1|MB_ATT_GRAPPLE_HOOK,1 + name "h3_Arc" + MBClass MB_CLASS_ARCTROOPER + classNumberLimit 3 + weapons WP_MELEE + attributes MB_ATT_AMMO,3|MB_ATT_CLONE_PISTOL,1|MB_ATT_GRAPPLE_HOOK,2 resource RESOURCE_STAMINA forcepool 115 + + rankDmgGiven 1.15 - maxhealth 85 - rankHealth 100,115 + maxhealth 85 + rankHealth 100,115,145 - MaxArmor 50 - rankArmor 65,80,125 + MaxArmor 50 + rankArmor 65,80,115 knockbackTaken 0.88 -skilltimerMod 0.9 - MBClass MB_CLASS_ARCTROOPER - extralives 1 - modelscale 1.02 - speed 1.02 - classNumberLimit 3 + + skilltimerMod 0.9 + rankSTM 0.75 + + speed 1.02 + holdables HI_MEDPAC - special1 EAS_HI_SPRINT - special2 EAS_HI_DEX - special3 EAS_HI_MEDPAC - special4 EAS_HI_GRAPPLEHOOK + special1 EAS_HI_SPRINT + special2 EAS_HI_DEX + special3 EAS_HI_MEDPAC + special4 EAS_HI_GRAPPLEHOOK saberStanceAnim BOTH_STAND9 tauntAnim BOTH_ENGAGETAUNT gloatAnim BOTH_TALKCOMM1START flourishAnim BOTH_VICTORY_FAST - meditateAnim BOTH_KNOCKDOWN4 + meditateAnim BOTH_KNOCKDOWN4 uioverlay_l "gfx/icons/heavy" uioverlay_r "gfx/icons/infantry" - - model "clonetrooper_p1" - skin "arc" - uishader "models/players/clonetrooper_p1/mb2_icon_arc" + modelscale 1.02 + model "clonetrooper_p1" + skin "arc" + uishader "models/players/clonetrooper_p1/mb2_icon_arc" userRGB 1 customred 0.709 customgreen 0.12 customblue 0.12 //def r - model_1 "clonetrooper_p2" - skin_1 "arc_rgb" - uishader_1 "models/players/clonetrooper_p2/mb2_icon_arc_rgb" + model_1 "clonetrooper_p2" + skin_1 "arc_rgb" + uishader_1 "models/players/clonetrooper_p2/mb2_icon_arc_rgb" userRGB_1 1 customred_1 0 customgreen_1 0.589 customblue_1 0.687 //defaults to Open light blue - //userRGB_1 1 - //customred_1 0.18 - //customgreen_1 0.355 - //customblue_1 0.55 //defaults to Open blue - model_2 "clonetrooper_p1" + model_2 "clonetrooper_p1" skin_2 "87" uishader_2 "models/players/clonetrooper_p1/mb2_icon_87" - model_3 "clonetrooper_p2" - skin_3 "87" + model_3 "clonetrooper_p2" + skin_3 "87" uishader_3 "models/players/clonetrooper_p2/mb2_icon_87" - model_4 "clonetrooper_p1" + model_4 "clonetrooper_p1" skin_4 "cobalt" uishader_4 "models/players/clonetrooper_p1/mb2_icon_cobalt" - model_5 "clonetrooper_p2" + model_5 "clonetrooper_p2" skin_5 "cobalt" uishader_5 "models/players/clonetrooper_p2/mb2_icon_cobalt" - model_6 "clonetrooper_p1" + model_6 "clonetrooper_p1" skin_6 "lambent" uishader_6 "models/players/clonetrooper_p1/mb2_icon_lambent" - model_7 "clonetrooper_p2" + model_7 "clonetrooper_p2" skin_7 "lambent" uishader_7 "models/players/clonetrooper_p2/mb2_icon_lambent" - model_8 "clonetrooper_p2" - skin_8 "327" + model_8 "clonetrooper_p2" + skin_8 "327" uishader_8 "models/players/clonetrooper_p2/mb2_icon_327" - model_9 "clonetrooper_p2" - skin_9 "shadow_arc" + model_9 "clonetrooper_p2" + skin_9 "shadow_arc" uishader_9 "models/players/clonetrooper_p2/mb2_icon_shadow_arc" - model_10 "clonetrooper_p2" - skin_10 "umbra" + model_10 "clonetrooper_p2" + skin_10 "umbra" uishader_10 "models/players/clonetrooper_p2/mb2_icon_umbra" - model_11 "clonetrooper_p2" - skin_11 "colt" + model_11 "clonetrooper_p2" + skin_11 "colt" uishader_11 "models/players/clonetrooper_p2/mb2_icon_colt" - model_12 "clonetrooper_p2" - skin_12 "blitz" + model_12 "clonetrooper_p2" + skin_12 "blitz" uishader_12 "models/players/clonetrooper_p2/mb2_icon_blitz" - model_13 "clonetrooper_p2" - skin_13 "hammer" + model_13 "clonetrooper_p2" + skin_13 "hammer" uishader_13 "models/players/clonetrooper_p2/mb2_icon_hammer" - model_14 "clonetrooper_p2" - skin_14 "havoc" + model_14 "clonetrooper_p2" + skin_14 "havoc" uishader_14 "models/players/clonetrooper_p2/mb2_icon_havoc" isCustomBuild 1 mbPoints 110 - hasCustomSpec 2 + hasCustomSpec 3 isOnlyOneSpec 1 customSpecName_1 "Grenade Launcher" customSpecIcon_1 "gfx/menus/alpha/icon_stats_EMP" @@ -119,6 +118,9 @@ skilltimerMod 0.9 customSpecName_2 "Scope" customSpecIcon_2 "gfx/menus/alpha/icon_weap_accuracy" customSpecDesc_2 "WESTAR-M5 Scope Addon" + customSpecName_3 "Null-class" + customSpecIcon_3 "gfx/2d/logos/mb_clonerepublic" + customSpecDesc_3 "The Amazing Flying ARC" c_att_skill_0 MB_ATT_CLONE_PISTOL c_att_names_0 "DC-15s/17 Clone Pistol" c_att_ranks_0 0,3,9 @@ -132,7 +134,7 @@ skilltimerMod 0.9 c_att_ranks_2 4,10 c_att_skill_3 MB_ATT_CLONEBLOBS - c_att_names_3 "> DC-15A Concussion Blobs" + c_att_names_3 "> DC-15A Conc Blobs" c_att_ranks_3 5,5,5 c_att_skill_4 MB_ATT_STRONGBLOBS @@ -149,36 +151,35 @@ skilltimerMod 0.9 c_att_skill_7 MB_ATT_PLX1 c_att_names_7 "PLX-1 Rocket Launcher" - c_att_ranks_7 10,20,30 + c_att_ranks_7 10,20 c_att_skill_8 MB_ATT_PULSE_GRENADES c_att_names_8 "Pulse Grenades" - c_att_ranks_8 10,10,10 + c_att_ranks_8 5,10 + + c_att_skill_9 MB_ATT_RESPAWNS + c_att_names_9 "Reinforcement" + c_att_ranks_9 0 - c_att_skill_9 MB_ATT_HEALTH - c_att_names_9 "Health (100/115)" - c_att_ranks_9 5,5 + c_att_skill_10 MB_ATT_HEALTH + c_att_names_10 "HP (100/115)" + c_att_ranks_10 5,5 - c_att_skill_10 MB_ATT_ARMOUR - c_att_names_10 "Armor (65/80/125)" - c_att_ranks_10 10,10,20 + c_att_skill_11 MB_ATT_ARMOUR + c_att_names_11 "Armor (65/80/115)" + c_att_ranks_11 10,10,20 - c_att_skill_11 MB_ATT_ASSEMBLE - c_att_names_11 "Assemble" - c_att_ranks_11 2,2,3 + c_att_skill_12 MB_ATT_ASSEMBLE + c_att_names_12 "Assemble" + c_att_ranks_12 2,2,3 - c_att_skill_12 MB_ATT_STAMINA - c_att_names_12 "Stamina ^3[CS1]" - c_att_ranks_12 5,5,5 + c_att_skill_13 MB_ATT_STAMINA + c_att_names_13 "Stamina ^3[CS1]" + c_att_ranks_13 5,5,5 - c_att_skill_13 MB_ATT_DEXTERITY - c_att_names_13 "Dexterity ^3[CS2]" - c_att_ranks_13 3,3,8 - - c_att_skill_14 MB_ATT_GRAPPLE_HOOK - c_att_names_14 "Grappling Hook ^3[CS4 Melee]" - c_att_ranks_14 0,2 - + c_att_skill_14 MB_ATT_DEXTERITY + c_att_names_14 "Dexterity ^3[CS2]" + c_att_ranks_14 3,3,7 c_att_skill_15 MB_ATT_CLONE_PISTOL @@ -194,7 +195,7 @@ skilltimerMod 0.9 c_att_ranks_17 4,10 c_att_skill_18 MB_ATT_CLONEBLOBS - c_att_names_18 "> DC-15A Concussion Blobs" + c_att_names_18 "> DC-15A Conc Blobs" c_att_ranks_18 5,5,5 c_att_skill_19 MB_ATT_STRONGBLOBS @@ -211,39 +212,90 @@ skilltimerMod 0.9 c_att_skill_22 MB_ATT_PLX1 c_att_names_22 "PLX-1 Rocket Launcher" - c_att_ranks_22 10,20,30 + c_att_ranks_22 10,20 c_att_skill_23 MB_ATT_PULSE_GRENADES c_att_names_23 "Pulse Grenades" - c_att_ranks_23 10,10,10 + c_att_ranks_23 5,10 + + c_att_skill_24 MB_ATT_RESPAWNS + c_att_names_24 "Reinforcement" + c_att_ranks_24 0 - c_att_skill_24 MB_ATT_HEALTH - c_att_names_24 "Health (100/115)" - c_att_ranks_24 5,5 + c_att_skill_25 MB_ATT_HEALTH + c_att_names_25 "HP (100/115)" + c_att_ranks_25 5,5 - c_att_skill_25 MB_ATT_ARMOUR - c_att_names_25 "Armor (65/80/125)" - c_att_ranks_25 10,10,20 + c_att_skill_26 MB_ATT_ARMOUR + c_att_names_26 "Armor (65/80/115)" + c_att_ranks_26 10,10,20 - c_att_skill_26 MB_ATT_ASSEMBLE - c_att_names_26 "Assemble" - c_att_ranks_26 2,2,3 + c_att_skill_27 MB_ATT_ASSEMBLE + c_att_names_27 "Assemble" + c_att_ranks_27 2,2,3 - c_att_skill_27 MB_ATT_STAMINA - c_att_names_27 "Stamina ^3[CS1]" - c_att_ranks_27 5,5,5 + c_att_skill_28 MB_ATT_STAMINA + c_att_names_28 "Stamina ^3[CS1]" + c_att_ranks_28 5,5,5 - c_att_skill_28 MB_ATT_DEXTERITY - c_att_names_28 "Dexterity ^3[CS2]" - c_att_ranks_28 3,3,8 + c_att_skill_29 MB_ATT_DEXTERITY + c_att_names_29 "Dexterity ^3[CS2]" + c_att_ranks_29 3,3,7 - c_att_skill_29 MB_ATT_GRAPPLE_HOOK - c_att_names_29 "Grappling Hook ^3[CS4 Melee]" - c_att_ranks_29 0,2 + c_att_skill_30 MB_ATT_WESTARM5 + c_att_names_30 "WESTAR-M5 Blaster Rifle" + c_att_ranks_30 0,0 + + c_att_skill_31 MB_ATT_ARC_RIFLE_GRENADELAUNCHER + c_att_names_31 "> M5 Pulse Grenade Addon" + c_att_ranks_31 0,0 + c_att_descs_31 "FOR THE LOVE OF GOD DON'T PICK SCOPE WITH THIS" + + c_att_skill_32 MB_ATT_ARC_RIFLE_SCOPE + c_att_names_32 "> M5 Scope Addon" + c_att_ranks_32 0 + c_att_descs_32 "FOR THE LOVE OF GOD DON'T PICK GL WITH THIS" + + c_att_skill_33 MB_ATT_PLX1 + c_att_names_33 "PLX-1 Rocket Launcher" + c_att_ranks_33 0,0,0 + + c_att_skill_34 MB_ATT_PULSE_GRENADES + c_att_names_34 "Pulse Grenades" + c_att_ranks_34 0,0,0 + + c_att_skill_35 MB_ATT_DMG_GIVEN_MULTIPLIER + c_att_names_35 "Dmg Given (115%)" + c_att_ranks_35 0 + + c_att_skill_36 MB_ATT_HEALTH + c_att_names_36 "HP (100/115/145)" + c_att_ranks_36 0,0,0 + + c_att_skill_37 MB_ATT_ARMOUR + c_att_names_37 "Armor (65/80/115)" + c_att_ranks_37 0,0,0 + + c_att_skill_38 MB_ATT_FLOAT_HOP + c_att_names_38 "Slow Faller" + c_att_ranks_38 0 + + c_att_skill_39 MB_ATT_STM_MULTIPLIER + c_att_names_39 "Skill Cd (125%)" + c_att_ranks_39 0 + c_att_descs_39 "110% default" + + c_att_skill_40 MB_ATT_STAMINA + c_att_names_40 "Stamina ^3[CS1]" + c_att_ranks_40 0,0,0 + + c_att_skill_41 MB_ATT_DEXTERITY + c_att_names_41 "Dexterity ^3[CS2]" + c_att_ranks_41 0,0,0 } -description "ARC Trooper [Clone Trooper] +description "ARC Trooper A highly versatile class that excels in close-to-mid-range combat. @@ -255,12 +307,11 @@ A highly versatile class that excels in close-to-mid-range combat. - Medpac ^3[CS3] ^8Attributes: -- Reinforcement (1) -- 10% faster skill CD -- 12% less KB taken +- 10% faster Skill Cd +- 12% less Kb Taken - Stamina (0) ^3Abilities: - Sprint ^3[CS1] - Limited Dex Roll ^3[CS2] -- Grappling Hook (1) ^3[CS4 Melee]" \ No newline at end of file +- Grappling Hook (2) ^3[CS4 Melee]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h3_Baze.mbch b/z_MBLegends/ext_data/mb2/character/h3_Baze.mbch index a311d93d6..a30f31fb3 100644 --- a/z_MBLegends/ext_data/mb2/character/h3_Baze.mbch +++ b/z_MBLegends/ext_data/mb2/character/h3_Baze.mbch @@ -10,7 +10,7 @@ ClassInfo WP_EE4Flags HELD_SLOW|HELD_AMMOREGEN WP_PLX1Flags HELD_SLOW|HELD_STUN|HELD_KNOCKBACK - attributes MB_ATT_AMMO,3|MB_ATT_SONIC_DETONATOR,2|MB_ATT_EE4,2|MB_ATT_QUICKTHROW,1|MB_ATT_FRAGS,1|MB_ATT_BESKAR,1|MB_ATT_PLX1,1|MB_ATT_SHIELD_RECHARGE,1 + attributes MB_ATT_AMMO,3|MB_ATT_SONIC_DETONATOR,2|MB_ATT_EE4,2|MB_ATT_QUICKTHROW,1|MB_ATT_FRAGS,2|MB_ATT_BESKAR,1|MB_ATT_PLX1,1|MB_ATT_SHIELD_RECHARGE,1|MB_ATT_DASH,1 maxhealth 140 maxarmor 140 @@ -42,7 +42,7 @@ ClassInfo WeaponInfo0 { WeaponToReplace WP_EE4 - WeaponBasedOff WP_T21 + WeaponBasedOff WP_CONCUSSION NewWorldModel "models/weapons2/mwc-35c/model_w.glm" NewViewModel "models/weapons2/mwc-35c/model.md3" Icon "gfx/hud/w_icon_mwc-35c" @@ -66,35 +66,36 @@ WeaponInfo1 WeaponName "HH-12 Rocket Launcher" FlashSound0 "sound/weapons/halo_rocket/fire.wav" ReloadTimeModifier 1 -damageMod 1.5 + damageMod 1.5 + missileEffect "atst/side_alt_shot" } -description "Baze Malbus [Hero] +description "Baze Malbus -A heavy gunner equipped with a massively powerful Repeating Cannon that regenerates ammo, and explosives. +A tanky gunner with a heavy suppression rifle and explosives. ^2Weaponry: - Melee - HH-12 Rocket Launcher (1) (PLX) -- Staggers/pushes on det --- 50% more DMG --- 15% slower movement -- Frag Grenade (1) +-- 50% more Dmg +-- 15% slower Movement +- Frag Grenade (2) - Sonic Detonators (2) - MWC-35c 'Staccato Lightning' Repeating Cannon (EE-4 2) -- Passive ammo regen -- 35% faster RoF --- 35% less FP DMG --- 15% slower movement +-- 35% less FP Dmg +-- 15% slower Movement ^8Attributes: -- 10% more KB given -- 20% less KB taken -- 50% slower skill CD +- 10% more Kb Given +- 20% less Kb Taken +- 50% slower Skill Cd - Armor Regen (1) - Beskar (1) - Physical Resist ^3Abilities: - Dash (1) ^3[CS2] -- Quickthrow (1) ^3[CS3]" +- Quickthrow (1) ^3[CS3]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h3_BossNass.mbch b/z_MBLegends/ext_data/mb2/character/h3_BossNass.mbch index 25de40fc4..efb900745 100644 --- a/z_MBLegends/ext_data/mb2/character/h3_BossNass.mbch +++ b/z_MBLegends/ext_data/mb2/character/h3_BossNass.mbch @@ -7,7 +7,7 @@ ClassInfo MBClass MB_CLASS_JEDI weapons WP_SABER|WP_MELEE|WP_CONCUSSION|WP_PULSE_NADE|WP_PLX1 - attributes MB_ATT_FP_SABER_DEFENSE,1|MB_ATT_HEALING,2|MB_ATT_RALLY|MB_ATT_WOOKIE_STRENGTH,2|MB_ATT_PULSE_GRENADES,2|MB_ATT_BLAST_ARMOUR,1|MB_ATT_DASH,1|MB_ATT_PLX1,3|MB_ATT_AMMO,3|MB_ATT_CONCUSSION,1|MB_ATT_GUN_DEFENSE,3|MB_ATT_WATER_BREATHING|MB_ATT_BUNNY_HOP,1|MB_ATT_DEFLECT,1|MB_ATT_INAIR_FORCE_REGEN + attributes MB_ATT_FP_SABER_DEFENSE,1|MB_ATT_HEALING,2|MB_ATT_RALLY|MB_ATT_WOOKIE_STRENGTH,1|MB_ATT_PULSE_GRENADES,2|MB_ATT_BLAST_ARMOUR,1|MB_ATT_DASH,1|MB_ATT_PLX1,3|MB_ATT_AMMO,3|MB_ATT_CONCUSSION,1|MB_ATT_GUN_DEFENSE,3|MB_ATT_WATER_BREATHING|MB_ATT_BUNNY_HOP,1|MB_ATT_DEFLECT,1|MB_ATT_INAIR_FORCE_REGEN saberMaxChain 1 saber1 bossnass_shield_legends_2 @@ -116,41 +116,39 @@ WeaponInfo3 animAttackWalk BOTH_T5_BL__R } -description "Boss Rugor Nass [Jedi] +description "Boss Rugor Nass A tanky rocketeer with a large protective Energy Shield and inherent aquatic respiration. ^2Weaponry: - Melee --- 15% slower movement +-- 15% slower Movement - Boss's Personal Energy Shield (Staff Saber) -- Saber Defense (1) -- Blaster Defense (3) -- Blaster Deflect (1) -- Chain Limit: 1 --- 10% more KB --- 73% less DMG --- Slap ^3[GB] +-- 10% more Kb > Broad Shield --- 12% more reach --- 500% more radius +-- 12% more Reach +-- 500% more Radius > Tower Shield --- 43% less reach --- 1100% more radius +-- 43% less Reach +-- 1100% more Radius - Salvaged E-60R Missile Launcher (6) (PLX) -- Staggers/pushes on det -- Reloads 2 rockets per clip --- 30% faster reload +-- 30% faster Reload - Boss's Big Bombad Boomas (2) (Pulse Grenades) --- 100% more DMG +-- 100% more Dmg - Broken Concussion Rifle (1) --- 60% slower mag reload +-- 60% slower Mag Reload -- Sec only ^8Attributes: -- 25% slower skill CD +- 25% slower Skill Cd - Bunny Hop (1) -- Strength (2) +- Strength (1) - Blast Armor - Physical Resist - Healing (2) diff --git a/z_MBLegends/ext_data/mb2/character/h3_Cander.mbch b/z_MBLegends/ext_data/mb2/character/h3_Cander.mbch index f5215ee5c..9d5cfefbf 100644 --- a/z_MBLegends/ext_data/mb2/character/h3_Cander.mbch +++ b/z_MBLegends/ext_data/mb2/character/h3_Cander.mbch @@ -73,17 +73,17 @@ ClassInfo c_att_skill_2 MB_ATT_CLONERIFLE c_att_names_2 "Repeating Blaster (C. Rifle)" c_att_ranks_2 5,15,30 - c_att_descs_2 "5% less FP DMG, 150% slower reload, 15% slower movement" + c_att_descs_2 "5% less FP Dmg, 150% slower Reload, 15% slower Movement" c_att_skill_3 MB_ATT_STRONGBLOBS c_att_names_3 "> Repeat. Blaster Ion Blobs" c_att_ranks_3 4,4,4 c_att_skill_4 MB_ATT_FRAGS c_att_names_4 "Frag Grenades" - c_att_ranks_4 8,8,8 + c_att_ranks_4 5,7,8 c_att_skill_5 MB_ATT_HEALTH - c_att_names_5 "Health (110/125/150)" + c_att_names_5 "HP (110/125/150)" c_att_ranks_5 3,5,6 c_att_skill_6 MB_ATT_HEALING @@ -107,7 +107,7 @@ ClassInfo c_att_ranks_10 10 c_att_skill_11 MB_ATT_KB_TAKEN_MULTIPLIER - c_att_names_11 "KB Taken (20%)" + c_att_names_11 "Kb Taken (20%)" c_att_ranks_11 2 c_att_descs_11 "80% default" @@ -119,9 +119,9 @@ ClassInfo WeaponInfo0 { WeaponToReplace WP_CLONE_RIFLE - WeaponBasedOff WP_CLONE_RIFLE + WeaponBasedOff WP_CONCUSSION NewWorldModel "models/weapons2/kotor_repeater/model_w.glm" - NewViewModel "models/weapons2/dummy/dummy.md3" + NewViewModel "models/weapons2/kotor_repeater/model.md3" Icon "gfx/hud/w_icon_kotor_repeater" WeaponName "Canderous' Repeating Blaster" MissileEffect "Blaster/Shot01R" @@ -157,7 +157,7 @@ WeaponInfo1 SelectSound "sound/weapons/blade/slash2.mp3" } -description "Canderous Ordo aka Mandalore the Preserver [Clone Trooper] +description "Canderous Ordo aka Mandalore the Preserver A tanky hybrid who can spec into Blaster and Saber skills. @@ -165,12 +165,11 @@ A tanky hybrid who can spec into Blaster and Saber skills. - Melee - Canderous' Vibroblade (Yellow/Red Saber) -- No Blaster Block --- 48% more reach --- 46% less Red DMG --- Slap ^3[GB] +-- 48% more Reach +-- 46% less Red Dmg ^8Attributes: -- 20% less KB taken +- 20% less Kb Taken - Stamina (0) - Strength (1) - Dexterity (1) diff --git a/z_MBLegends/ext_data/mb2/character/h3_Clone.mbch b/z_MBLegends/ext_data/mb2/character/h3_Clone.mbch index c6c3e6274..a1d16b4e8 100644 --- a/z_MBLegends/ext_data/mb2/character/h3_Clone.mbch +++ b/z_MBLegends/ext_data/mb2/character/h3_Clone.mbch @@ -12,7 +12,7 @@ ClassInfo resource RESOURCE_STAMINA forcepool 100 - modelscale 1.02 + modelscale 1.02 extralives 1 @@ -34,7 +34,7 @@ ClassInfo uioverlay_r "gfx/icons/infantry" model "clonetrooper_p1" -skin_ "shiny" +skin "shiny" uishader "models/players/clonetrooper_p1/mb2_icon_shiny" model_1 "clonetrooper_p1" @@ -114,7 +114,7 @@ uishader_8 "models/players/clonetrooper_p2/mb2_icon_shock_rgb" uishader_16 "models/players/clonetrooper_p2/mb2_icon_maceunit" model_17 "clonetrooper_p2" - skin_17 "doomunit" + skin_17 "Doomunit" uishader_17 "models/players/clonetrooper_p2/mb2_icon_doomunit" model_18 "clonetrooper_p2" @@ -126,7 +126,7 @@ uishader_8 "models/players/clonetrooper_p2/mb2_icon_shock_rgb" uishader_19 "models/players/clonetrooper_p2/mb2_icon_41_ranger" isCustomBuild 1 - mbPoints 50 + mbPoints 60 c_att_skill_0 MB_ATT_CLONE_PISTOL c_att_names_0 "DC-15s/17 Clone Pistol" @@ -142,30 +142,32 @@ uishader_8 "models/players/clonetrooper_p2/mb2_icon_shock_rgb" c_att_skill_3 MB_ATT_CLONEBLOBS c_att_names_3 "> Clone Rifle Conc Blobs" - c_att_ranks_3 2,2,2 + c_att_ranks_3 2,2 c_att_skill_4 MB_ATT_STRONGBLOBS c_att_names_4 "> Clone Rifle Ion Blobs" - c_att_ranks_4 2,2,2 + c_att_ranks_4 2,2 c_att_skill_5 MB_ATT_MINIGUN c_att_names_5 "Z-6 Rotary Cannon (Minigun)" c_att_ranks_5 10 - c_att_descs_5 "24% slower RoF, 5% more DMG, 10% more FP DMG" + c_att_descs_5 "38% faster RoF, 5% more Dmg, 10% more FP Dmg" + c_att_skill_6 MB_ATT_PLX1 c_att_names_6 "PLX-1 Rocket Launcher" - c_att_ranks_6 6,13 + c_att_ranks_6 6 c_att_skill_7 MB_ATT_PULSE_GRENADES - c_att_names_7 "Pulse Grenades" - c_att_ranks_7 4,5 + c_att_names_7 "Pulse Grenade" + c_att_ranks_7 4 c_att_skill_8 MB_ATT_RESPAWNS c_att_names_8 "Reinforcement" - c_att_ranks_8 20 + c_att_ranks_8 26 c_att_descs_8 "1 default" + c_att_skill_9 MB_ATT_HEALTH - c_att_names_9 "Health (80/100)" + c_att_names_9 "HP (80/100)" c_att_ranks_9 2,2 c_att_skill_10 MB_ATT_ARMOUR @@ -174,7 +176,7 @@ uishader_8 "models/players/clonetrooper_p2/mb2_icon_shock_rgb" c_att_skill_11 MB_ATT_ASSEMBLE c_att_names_11 "Assemble" - c_att_ranks_11 2,2,3 + c_att_ranks_11 1,2,2 c_att_skill_12 MB_ATT_DEXTERITY c_att_names_12 "Dexterity" @@ -206,12 +208,11 @@ WeaponInfo0 FPMult 1.1 damageMod 1.05 rateMod 0.62 - velocityMod .76 } -description "Clone Trooper [Clone Trooper] +description "Clone Trooper -A trooper characterized by heavier armor and weaponry choices compared to his peers, including extra lives, a Minigun, a Rocket Launcher, damage protection, and mobility options. +A trooper characterized by heavier armor and weaponry choices compared to his peers. ^2Weaponry: - Melee @@ -222,9 +223,8 @@ A trooper characterized by heavier armor and weaponry choices compared to his pe ^8Attributes: - Reinforcement (1) -- 10% less KB taken +- 10% less Kb Taken - Stamina (0) -- Assemble (3) ^3Abilities: - Sprint ^3[CS1]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h3_CloneCom.mbch b/z_MBLegends/ext_data/mb2/character/h3_CloneCom.mbch index 5bf8ea169..da71c0f24 100644 --- a/z_MBLegends/ext_data/mb2/character/h3_CloneCom.mbch +++ b/z_MBLegends/ext_data/mb2/character/h3_CloneCom.mbch @@ -4,11 +4,12 @@ name "h3_CloneCom" MBClass MB_CLASS_CLONETROOPER classNumberLimit 4 extralives 1 -weapons WP_BLASTER_PISTOL|WP_SABER|WP_THERMAL +weapons WP_BLASTER_PISTOL|WP_SABER|WP_FRAG_NADE +WP_UGLFlags HELD_KNOCKBACK WP_DCCarbineFlags HELD_ALTRELOAD WP_DisruptorFlags HELD_ALTRELOAD WP_FlechetteFlags HELD_ALTRELOAD -attributes MB_ATT_STAMINA,2|MB_ATT_PISTOL,1|MB_ATT_BASE_TD,2|MB_ATT_DEXTERITY,1|MB_ATT_BLAST_ARMOUR|MB_ATT_AMMO,3 +attributes MB_ATT_STAMINA,2|MB_ATT_PISTOL,1|MB_ATT_DEXTERITY,1|MB_ATT_BLAST_ARMOUR|MB_ATT_AMMO,3|MB_ATT_FRAGS,1 BPmultiplier 0 saber1 cc saberstyle SS_TAVION @@ -64,21 +65,18 @@ hasCustomSpec 3 isOnlyOneSpec 1 customSpecName_1 "Gunner" customSpecIcon_1 "gfx/menus/alpha/icon_weap_accuracy" -customSpecDesc_1 "" customSpecName_2 "Heavy" customSpecIcon_2 "gfx/menus/alpha/icon_weap_expdamagesplash" -customSpecDesc_2 "" customSpecName_3 "Wild Card" customSpecIcon_3 "gfx/menus/alpha/icon_weap_stun" -customSpecDesc_3 "" c_att_skill_0 MB_ATT_DC_CARBINE c_att_names_0 "DC-17m Blaster (DC Carbine)" c_att_ranks_0 0 -c_att_descs_0 "35% faster RoF, 10% less FP DMG, 25% slower mag reload" +c_att_descs_0 "35% faster RoF, 10% less FP Dmg, 25% slower Mag Reload" c_att_skill_1 MB_ATT_DISRUPTOR c_att_names_1 "DC-17m Sniper (Disruptor)" c_att_ranks_1 0 -c_att_descs_1 "120% more DMG/FP DMG, 10% slower RoF, 75% slower mag reload" +c_att_descs_1 "120% more Dmg/FP Dmg, 10% slower RoF, 75% slower Mag Reload" c_att_skill_2 MB_ATT_BASESPEED c_att_names_2 "Speed (200)" c_att_ranks_2 0 @@ -90,8 +88,8 @@ c_att_names_16 "Trad Wookiee Bowcaster" c_att_ranks_16 0,0,0 c_att_skill_17 MB_ATT_UGL c_att_names_17 "DC-17m Anti-Armor (UGL)" -c_att_ranks_17 0,0 -c_att_descs_17 "55% less DMG, 25% slower RoF" +c_att_ranks_17 0 +c_att_descs_17 "Pushes on det" c_att_skill_18 MB_ATT_MICRO_GRENADES c_att_names_18 "> DC-17m Rounds (6)" c_att_ranks_18 0 @@ -105,7 +103,7 @@ c_att_ranks_30 0 c_att_skill_31 MB_ATT_FLECHETTE c_att_names_31 "ACP Scatter Gun (Flechette)" c_att_ranks_31 0,0 -c_att_descs_31 "15% more DMG, 40% slower RoF, 60% slower mag reload" +c_att_descs_31 "15% more Dmg, 40% slower RoF, 60% slower Mag Reload" c_att_skill_32 MB_ATT_FP_PUSH c_att_names_32 "Repulsor Gauntlet (Push)" c_att_ranks_32 0 @@ -121,9 +119,9 @@ c_att_ranks_35 0 } WeaponInfo0{ WeaponToReplace WP_DC_CARBINE -WeaponBasedOff WP_DC_CARBINE +WeaponBasedOff WP_MANDO_PISTOL NewWorldModel "models/weapons2/DC-17m/blaster.glm" -NewViewModel "models/weapons2/dummy/dummy.md3" +NewViewModel "models/weapons2/DC-17m/blaster.md3" FlashSound0 "sound/weapons/dc17m/fire.wav" FlashSound1 "sound/weapons/dc17m/fire.wav" FlashSound2 "sound/weapons/dc17m/fire.wav" @@ -150,7 +148,7 @@ selectSound "sound/weapons/dc17m/select.mp3" } WeaponInfo1{ WeaponToReplace WP_DISRUPTOR -WeaponBasedOff WP_DISRUPTOR +WeaponBasedOff WP_MANDO_PISTOL NewWorldModel "models/weapons2/DC-17m/sniper.glm" NewViewModel "models/weapons2/DC-17m/sniper.md3" Icon "gfx/hud/w_icon_dc-17mS" @@ -171,7 +169,7 @@ selectSound "sound/weapons/dc17m/select.mp3" } WeaponInfo2{ WeaponToReplace WP_FLECHETTE -WeaponBasedOff WP_FLECHETTE +WeaponBasedOff WP_SHOTGUN NewWorldModel "models/weapons2/cp-50_repeater/cp-50_repeater_w.glm" NewViewModel "models/weapons2/cp-50_repeater/cp-50_repeater.md3" FlashSound0 "sound/weapons/acparray/fire.wav" @@ -186,7 +184,7 @@ altFireEnabled 0 } WeaponInfo3{ WeaponToReplace WP_UGL -WeaponBasedOff WP_UGL +WeaponBasedOff WP_MANDO_PISTOL NewWorldModel "models/weapons2/DC-17m/launcher.glm" NewViewModel "models/weapons2/DC-17m/launcher.md3" FlashSound0 "sound/weapons/upl/fire_mortar.wav" @@ -194,8 +192,6 @@ altFlashSound0 "sound/weapons/dc17m/alt_fire.wav" Icon "gfx/hud/w_icon_dc-17ml" WeaponName "DC-17m ICWS Anti-Armor Attachment" selectSound "sound/weapons/dc17m/select.mp3" -rateMod 1.25 -damageMod .45 hasAnimOverrides 1 animAttackWalk BOTH_ATTACK3 } @@ -217,16 +213,16 @@ selectSound "sound/chars/clone_rc/misc/gasp.mp3" } WeaponInfo5{ WeaponToReplace WP_BLASTER_PISTOL -WeaponBasedOff WP_BLASTER_PISTOL -NewWorldModel "models/weapons2/DC-15/dc-15_w.glm" -NewViewModel "models/weapons2/dummy/dummy.md3" +WeaponBasedOff WP_MANDO_PISTOL +NewWorldModel "models/weapons2/dc-15/dc-15_w.glm" +NewViewModel "models/weapons2/dc-15/dc-15.md3" +NewHandsModel "models/weapons2/dc-15/dc-15_hand.md3" Icon "gfx/hud/w_icon_clonepistol" WeaponName "DC-15s Side Arm Blaster" FlashSound0 "sound/weapons/delta_pistol/wep_GEN_pistolFire_MP.wav" AltFlashSound0 "sound/weapons/delta_pistol/wep_GEN_pistolFire_MP.wav" MuzzleEffect "Blaster/MuzzleFlash01B" MissileEffect "blaster/Shot01b" - ChargeEffect "gfx/effects/cloneFrontFlash" clipSize 15 ReloadTimeModifier 2 @@ -242,16 +238,8 @@ Icon "gfx/hud/w_icon_arc_shiv_short" WeaponName "Knuckle Plate Vibroblade" altFireEnabled 0 } -WeaponInfo7{ -WeaponToReplace WP_THERMAL -WeaponBasedOff WP_THERMAL -NewWorldModel "models/weapons2/thermal/thermal_w.glm" -NewViewModel "models/weapons2/thermal/thermal_hand.md3" -Icon "gfx/hud/w_thermal_grenade" -WeaponName "Hand Thermal Grenades" -damagemod 2.25 -} -description "Clone Commando [Clone Trooper] + +description "Clone Commando Adaptable 2-lifes with staying power. @@ -260,21 +248,18 @@ Adaptable 2-lifes with staying power. - Knuckle Plate Vibroblade (Cyan Saber) -- No Saber/Blaster Block -- Chain Limit: 1 --- 50% more KB --- 20% less DMG --- 57% less reach --- 33% more radius +-- 50% more Kb +-- 57% less Reach +-- 33% more Radius -- Prim only --- Slap ^3[GB] - DC-15s Side Arm Blaster (Pistol 1) -- 40% faster RoF --- 100% slower reload -- Hand Thermal Grenades (2) --- 125% more DMG +-- 100% slower Reload +- Frag Grenade (1) ^8Attributes: -- 15% less KB taken -- Health Regen: 1/s to 25 +- 15% less Kb Taken +- HP Regen: 1/s to 25 - Armor Regen: 2/s - Stamina (2) - Dexterity (1) diff --git a/z_MBLegends/ext_data/mb2/character/h3_CloneLead.mbch b/z_MBLegends/ext_data/mb2/character/h3_CloneLead.mbch index 80df8fb8a..c832cd4bb 100644 --- a/z_MBLegends/ext_data/mb2/character/h3_CloneLead.mbch +++ b/z_MBLegends/ext_data/mb2/character/h3_CloneLead.mbch @@ -23,7 +23,7 @@ ClassInfo BPmultiplier 0 saber1 Clone_Knife_Jagged saberstyle SS_TAVION - saberDamage 90 + saberDamage 100 knockbackTaken 0.85 @@ -72,7 +72,7 @@ ClassInfo uishader_8 "models/players/clonetrooper_p2/mb2_icon_327_deviss" model_9 "clonetrooper_p2" - skin_9 "doom" + skin_9 "Doom" uishader_9 "models/players/clonetrooper_p2/mb2_icon_doom" model_10 "clonetrooper_p2" @@ -99,7 +99,7 @@ ClassInfo c_att_skill_0 MB_ATT_CLONE_PISTOL c_att_names_0 "DC-15s/17 Clone Pistol(s)" - c_att_ranks_0 0,4,10 + c_att_ranks_0 0,3,9 c_att_skill_1 MB_ATT_DC_CARBINE c_att_names_1 "DC-15S Clone Carbine" @@ -111,19 +111,19 @@ ClassInfo c_att_skill_3 MB_ATT_CLONEBLOBS c_att_names_3 "> DC-15A Conc Blobs" - c_att_ranks_3 5,5,5 + c_att_ranks_3 4,5,5 c_att_skill_4 MB_ATT_STRONGBLOBS c_att_names_4 "> DC-15A Ion Blobs" - c_att_ranks_4 5,5,5 + c_att_ranks_4 4,5,5 c_att_skill_5 MB_ATT_FRAGS c_att_names_5 "Frag Grenades" - c_att_ranks_5 8,8,8 + c_att_ranks_5 5,7,8 c_att_skill_6 MB_ATT_PULSE_GRENADES c_att_names_6 "Pulse Grenades" - c_att_ranks_6 8,8,8 + c_att_ranks_6 5,7,8 c_att_skill_7 MB_ATT_HEALING c_att_names_7 "Healing" @@ -179,7 +179,7 @@ animReadyRun BOTH_DC15_IDLE animReady BOTH_DC15_IDLE } -description "Clone Leader [Clone Trooper] +description "Clone Leader A custom commander that can spec into a variety of weapons, damage protection, and advanced mobility options. @@ -187,13 +187,11 @@ A custom commander that can spec into a variety of weapons, damage protection, a - Melee - Jagged Vibroknife (Cyan Saber) -- No Saber/Blaster Block --- 25% less DMG --- 60% less reach --- Slap ^3[GB] +-- 60% less Reach - DC-15s Clone Pistol (1) ^8Attributes: -- 15% less KB taken +- 15% less Kb Taken - Stamina (0) - Rally diff --git a/z_MBLegends/ext_data/mb2/character/h3_CloneSpe.mbch b/z_MBLegends/ext_data/mb2/character/h3_CloneSpe.mbch index e789c3661..792f3f887 100644 --- a/z_MBLegends/ext_data/mb2/character/h3_CloneSpe.mbch +++ b/z_MBLegends/ext_data/mb2/character/h3_CloneSpe.mbch @@ -6,7 +6,7 @@ extralives 1 WP_EE4Flags HELD_ALTRELOAD WP_ShotgunFlags HELD_ALTRELOAD WP_StunBatonFlags HELD_FLAME -attributes MB_ATT_AMMO,3|MB_ATT_CLONE_PISTOL,2|MB_ATT_STAMINA,3|MB_ATT_DEXTERITY,1|MB_ATT_GRAPPLE_HOOK,2|MB_ATT_ASSEMBLE,1 +attributes MB_ATT_AMMO,3|MB_ATT_CLONE_PISTOL,2|MB_ATT_STAMINA,3|MB_ATT_DEXTERITY,1|MB_ATT_GRAPPLE_HOOK,2|MB_ATT_ASSEMBLE,1|MB_ATT_ENV_PROT,2 Forcepool 110 knockbacktaken .88 maxhealth 110 @@ -14,7 +14,6 @@ maxarmor 80 RankArmor 110 RankDmgGiven 1.2 basespeed 189 -classflags CFL_STRONGAGAINSTPHYSICAL holdables HI_MEDPAC special3 EAS_HI_MEDPAC special4 EAS_HI_GRAPPLEHOOK @@ -53,18 +52,18 @@ c_att_names_0 "DC-15S Clone Carbine" c_att_ranks_0 2,1,1 c_att_skill_1 MB_ATT_CLONERIFLE c_att_names_1 "DC-15A Clone Rifle" -c_att_ranks_1 4,6,18 +c_att_ranks_1 4,6 c_att_skill_2 MB_ATT_STRONGBLOBS c_att_names_2 "> DC-15A Ion Blobs" c_att_ranks_2 1,1,1 c_att_skill_3 MB_ATT_THROWER c_att_names_3 "BT X-42 Flamethrower" c_att_ranks_3 6 -c_att_descs_3 "80% more DMG" +c_att_descs_3 "80% more Dmg" c_att_skill_4 MB_ATT_MINIGUN c_att_names_4 "Chaingun (Minigun)" c_att_ranks_4 12 -c_att_descs_4 "130% more velocity, 17% faster RoF, 20% less DMG/FP DMG" +c_att_descs_4 "130% more Velocity, 17% faster RoF, 20% less Dmg/FP Dmg" c_att_skill_5 MB_ATT_PULSE_GRENADES c_att_names_5 "Pulse Grenades" c_att_ranks_5 3,3 @@ -72,7 +71,7 @@ c_att_skill_6 MB_ATT_SONIC_DETONATOR c_att_names_6 "Sonic Detonators" c_att_ranks_6 4,4 c_att_skill_7 MB_ATT_DMG_GIVEN_MULTIPLIER -c_att_names_7 "DMG Given (120%)" +c_att_names_7 "Dmg Given (120%)" c_att_ranks_7 3 c_att_skill_8 MB_ATT_ARMOUR c_att_names_8 "Armor (110)" @@ -95,10 +94,10 @@ c_att_ranks_19 2,4,1 c_att_skill_20 MB_ATT_EE4 c_att_names_20 "DC-15x Sniper Rifle (EE-4)" c_att_ranks_20 8,7 -c_att_descs_20 "110% more DMG/FP DMG, 120% more velocity, 150% slower RoF, -120% slower mag reload" +c_att_descs_20 "110% more Dmg/FP Dmg, 120% more Velocity, 150% slower RoF, +120% slower Mag Reload" c_att_skill_21 MB_ATT_MICRO_GRENADES -c_att_names_21 "Conc Grenades" +c_att_names_21 "V-59 Conc Grenades" c_att_ranks_21 2,2 c_att_skill_22 MB_ATT_FRAGS c_att_names_22 "Frag Grenades" @@ -109,7 +108,7 @@ c_att_ranks_23 0 c_att_skill_30 MB_ATT_STUN_BATON c_att_names_30 "F-187 Fusioncutter (Stun Baton)" c_att_ranks_30 2 -c_att_descs_30 "Ignites on hit, 80% faster RoF, 65% less DMG" +c_att_descs_30 "Ignites on hit, 80% faster RoF, 65% less Dmg" c_att_skill_31 MB_ATT_DC_CARBINE c_att_names_31 "DC-15S Clone Carbine" c_att_ranks_31 2,1,1 @@ -125,8 +124,9 @@ c_att_ranks_34 1,1,1 c_att_skill_35 MB_ATT_SHOTGUN c_att_names_35 "DP-23 Shotgun" c_att_ranks_35 10,8,4 -c_att_descs_35 "25% faster RoF, 35% less DMG, 20% slower mag reload, Prim only" -c_att_names_36 MB_ATT_FIRE_GRENADES +c_att_descs_35 "25% faster RoF, 35% less Dmg, 20% slower Mag Reload, Prim only" +c_att_skill_36 MB_ATT_FIRE_GRENADES +c_att_names_36 "Fire Grenade" c_att_ranks_36 0 c_att_skill_37 MB_ATT_DET_PACK c_att_names_37 "Det Packs" @@ -184,9 +184,9 @@ animStand BOTH_STAND2 } WeaponInfo2{ WeaponToReplace WP_EE4 -WeaponBasedOff WP_EE4 -NewWorldModel "models/weapons2/dlt-18_repeater/dlt-18_repeater_w.glm" -NewViewModel "models/weapons2/dummy/dummy.md3" + WeaponBasedOff WP_CONCUSSION + NewWorldModel "models/weapons2/dlt-18_repeater/dlt-18_repeater_w.glm" + NewViewModel "models/weapons2/dlt-18_repeater/dlt-18_repeater.md3" Icon "gfx/hud/w_icon_dlt-18" WeaponName "DC-15x Sniper Rifle" CustomAmmo 128 @@ -247,7 +247,7 @@ NewHandsModel "models/weapons2/fc_f187/f187_hand.md3" Icon "gfx/hud/w_icon_fc_f187_all" WeaponName "F-187 Fusioncutter" hasAnimOverrides 1 -animReadyNoAmmo BOTH_ATTACK2 +animReadyNoAmmo TORSO_WEAPONREADY0 animReadyRun TORSO_WEAPONREADY0 animReady TORSO_WEAPONREADY0 animReadyWalk TORSO_WEAPONREADY0 @@ -258,7 +258,7 @@ FlashSound0 "sound/weapons/fusioncutter/cutter_hit.mp3" rateMod .2 damageMod .35 } -description "Clone Specialist [Clone Trooper] +description "Clone Specialist Clones with niche expertise. @@ -271,10 +271,10 @@ Clones with niche expertise. ^8Attributes: - Reinforcement (1) -- 12% less KB taken +- 12% less Kb Taken - Stamina (3) - Dexterity (1) -- Physical Resist +- Environmental Protection (2) - Assemble (1) ^3Abilities: diff --git a/z_MBLegends/ext_data/mb2/character/h3_Delta.mbch b/z_MBLegends/ext_data/mb2/character/h3_Delta.mbch index 1af41f6d2..0bf6d66f7 100644 --- a/z_MBLegends/ext_data/mb2/character/h3_Delta.mbch +++ b/z_MBLegends/ext_data/mb2/character/h3_Delta.mbch @@ -6,9 +6,9 @@ ClassInfo MBClass MB_CLASS_CLONETROOPER classNumberLimit 1 - weapons WP_SABER|WP_MELEE|WP_DC_CARBINE|WP_DISRUPTOR|WP_BLASTER_PISTOL|WP_THERMAL|WP_CONC_NADE + weapons WP_SABER|WP_MELEE|WP_DC_CARBINE|WP_DISRUPTOR|WP_BLASTER_PISTOL|WP_UGL - attributes MB_ATT_DC_CARBINE,1|MB_ATT_AMMO,3|MB_ATT_STAMINA,3|MB_ATT_DEXTERITY,1|MB_ATT_BLAST_ARMOUR|MB_ATT_GRAPPLE_HOOK,2|MB_ATT_DASH,1|MB_ATT_PISTOL,1|MB_ATT_DISRUPTOR,1|MB_ATT_BASE_TD,2|MB_ATT_MICRO_GRENADES,4|MB_ATT_GRAPPLE_HOP + attributes MB_ATT_DC_CARBINE,1|MB_ATT_AMMO,3|MB_ATT_STAMINA,3|MB_ATT_DEXTERITY,1|MB_ATT_BLAST_ARMOUR|MB_ATT_GRAPPLE_HOOK,2|MB_ATT_PISTOL,1|MB_ATT_DISRUPTOR,1|MB_ATT_GRAPPLE_HOP|MB_ATT_UGL|MB_ATT_DASH,1|MB_ATT_QUICKTHROW,1 DamageTaken 0.9 knockbackTaken 0.8 @@ -30,7 +30,7 @@ ClassInfo saberDamage 120 saberSpecialDamage 1.67 saberMaxChain 1 - + WP_UGLFlags HELD_KNOCKBACK WP_DCCarbineFlags HELD_ALTRELOAD WP_DisruptorFlags HELD_ALTRELOAD WP_SaberFlags HELD_STUN @@ -40,9 +40,9 @@ ClassInfo forceregen 1.1 special1 EAS_HI_SPRINT - special2 EAS_HI_DEX - special3 EAS_HI_DASH - special4 EAS_HI_GRAPPLEHOOK + special2 EAS_HI_DASH + special3 EAS_HI_QUICKTHROW + meleespecial4 EAS_HI_GRAPPLEHOOK saberStanceAnim BOTH_STAND9 tauntAnim TORSO_HANDSIGNAL3 @@ -72,35 +72,39 @@ ClassInfo uishader_3 "models/players/clonerc2/mb2_icon_scorch" isCustomBuild 1 -mbPoints 2 - -c_att_skill_0 MB_ATT_PULSE_GRENADES -c_att_names_0 "Pulse Grenades" -c_att_ranks_0 1,0 -c_att_skill_1 MB_ATT_SONIC_DETONATOR -c_att_names_1 "Sonic Detonators" -c_att_ranks_1 1,0 - -c_att_skill_2 MB_ATT_UGL -c_att_names_2 "DC-17m Anti-Armor (UGL)" -c_att_ranks_2 2,0 -c_att_descs_2 "50% less DMG" +mbPoints 4 + +c_att_skill_0 MB_ATT_FRAGS +c_att_names_0 "Frag Grenades" +c_att_ranks_0 1,1 + +c_att_skill_1 MB_ATT_PULSE_GRENADES +c_att_names_1 "Pulse Grenades" +c_att_ranks_1 1,1 + +c_att_skill_2 MB_ATT_SONIC_DETONATOR +c_att_names_2 "Sonic Detonators" +c_att_ranks_2 1,1 + +c_att_skill_3 MB_ATT_MICRO_GRENADES +c_att_names_3 "Flashbang Grenades (Concs)" +c_att_ranks_3 1,1 } WeaponInfo0 { - WeaponToReplace WP_DC_CARBINE - WeaponBasedOff WP_DC_CARBINE - NewWorldModel "models/weapons2/DC-17m/blaster.glm" - NewViewModel "models/weapons2/dummy/dummy.md3" - FlashSound0 "sound/weapons/dc17m/fire.wav" - FlashSound1 "sound/weapons/dc17m/fire.wav" - FlashSound2 "sound/weapons/dc17m/fire.wav" - FlashSound3 "sound/weapons/dc17m/fire.wav" - AltFlashSound0 "sound/weapons/dc17m/fire.wav" +WeaponToReplace WP_DC_CARBINE +WeaponBasedOff WP_MANDO_PISTOL +NewWorldModel "models/weapons2/DC-17m/blaster.glm" +NewViewModel "models/weapons2/DC-17m/blaster.md3" + FlashSound0 "sound/weapons/dc17m/fire.wav" + FlashSound1 "sound/weapons/dc17m/fire.wav" + FlashSound2 "sound/weapons/dc17m/fire.wav" + FlashSound3 "sound/weapons/dc17m/fire.wav" + AltFlashSound0 "sound/weapons/dc17m/fire.wav" MuzzleEffect "Blaster/MuzzleFlash01B" MissileEffect "blaster/Shot01B" - hasAnimOverrides 1 + hasAnimOverrides 1 animReady TORSO_WEAPONIDLE3 animReadyRun TORSO_WEAPONIDLE3 animReadyWalk TORSO_WEAPONREADY3 @@ -109,10 +113,10 @@ WeaponInfo0 animAttackRun BOTH_ATTACK3 animAttackWalk BOTH_ATTACK3 animStand BOTH_STAND1 - Icon "gfx/hud/w_icon_dc-17mB" - WeaponName "DC-17m ICWS Blaster Attachment" - customAmmo 1260 - clipSize 120 + Icon "gfx/hud/w_icon_dc-17mB" + WeaponName "DC-17m ICWS Blaster Attachment" + customAmmo 1260 + clipSize 120 ReloadTimeModifier 1.25 altFireEnabled 0 rateMod 0.6 @@ -120,33 +124,33 @@ WeaponInfo0 } WeaponInfo1 -{ - WeaponToReplace WP_SABER - WeaponBasedOff WP_SABER +{ + WeaponToReplace WP_SABER + WeaponBasedOff WP_SABER NewWorldModel "models/weapons2/arc_shiv_short/shiv_short_w.glm" NewViewModel "models/weapons2/dummy/dummy.md3" - Icon "gfx/hud/w_icon_arc_shiv_short" + Icon "gfx/hud/w_icon_arc_shiv_short" WeaponName "Knuckle Plate Vibroblade" altFireEnabled 0 } WeaponInfo2 { - WeaponToReplace WP_DISRUPTOR - WeaponBasedOff WP_DISRUPTOR +WeaponToReplace WP_DISRUPTOR +WeaponBasedOff WP_MANDO_PISTOL NewWorldModel "models/weapons2/DC-17m/sniper.glm" NewViewModel "models/weapons2/DC-17m/sniper.md3" - Icon "gfx/hud/w_icon_dc-17mS" + Icon "gfx/hud/w_icon_dc-17mS" FlashSound0 "sound/weapons/RC_Sniper/fire.mp3" - altFlashSound0 "sound/weapons/RC_Sniper/fire.mp3" + altFlashSound0 "sound/weapons/RC_Sniper/fire.mp3" MuzzleEffect "Blaster/MuzzleFlash01B" altMuzzleEffect "Blaster/MuzzleFlash01B" WeaponName "DC-17m ICWS Sniper Attachment" clipSize 25 customAmmo 100 - damageMod 2.2 + damageMod 2.3 ReloadTimeModifier 1.75 - FPmult 2.2 + FPmult 2.3 rateMod 1.10 disruptorBeam1 "gfx/effects/disrupt_beam_blue" disruptorBeam2 "gfx/effects/disrupt_beam_blue" @@ -155,11 +159,12 @@ WeaponInfo2 WeaponInfo3 { - WeaponToReplace WP_BLASTER_PISTOL - WeaponBasedOff WP_BLASTER_PISTOL - NewWorldModel "models/weapons2/DC-15/dc-15_w.glm" - NewViewModel "models/weapons2/dummy/dummy.md3" - Icon "gfx/hud/w_icon_clonepistol" +WeaponToReplace WP_BLASTER_PISTOL +WeaponBasedOff WP_MANDO_PISTOL +NewWorldModel "models/weapons2/dc-15/dc-15_w.glm" +NewViewModel "models/weapons2/dc-15/dc-15.md3" +NewHandsModel "models/weapons2/dc-15/dc-15_hand.md3" + Icon "gfx/hud/w_icon_clonepistol" WeaponName "DC-15s Side Arm Blaster" FlashSound0 "sound/weapons/delta_pistol/wep_GEN_pistolFire_MP.wav" AltFlashSound0 "sound/weapons/delta_pistol/wep_GEN_pistolFire_MP.wav" @@ -175,7 +180,7 @@ WeaponInfo3 WeaponInfo4 { WeaponToReplace WP_UGL -WeaponBasedOff WP_UGL +WeaponBasedOff WP_MANDO_PISTOL NewWorldModel "models/weapons2/DC-17m/launcher.glm" NewViewModel "models/weapons2/DC-17m/launcher.md3" FlashSound0 "sound/weapons/upl/fire_mortar.wav" @@ -183,27 +188,26 @@ altFlashSound0 "sound/weapons/dc17m/alt_fire.wav" Icon "gfx/hud/w_icon_dc-17ml" WeaponName "DC-17m ICWS Anti-Armor Attachment" selectSound "sound/weapons/dc17m/select.mp3" -damageMod 0.5 } WeaponInfo5 { - WeaponToReplace WP_THERMAL - WeaponBasedOff WP_THERMAL - NewWorldModel "models/weapons2/thermal/thermal_w.glm" - NewViewModel "models/weapons2/thermal/thermal_hand.md3" - Icon "gfx/hud/w_thermal_grenade" - WeaponName "Hand Thermal Grenades" - altMissileMissEffect "Grenades/EXP_Explosion" - MissileMissEffect "Grenades/EXP_Explosion" - altMissileHitHumanEffect "Grenades/EXP_Explosion" - missileHitHumanEffect "Grenades/EXP_Explosion" - altMissileHitDroidEffect"Grenades/EXP_Explosion" - missileHitDroidEffect "Grenades/EXP_Explosion" - damagemod 2.5 + WeaponToReplace WP_CONC_NADE + WeaponBasedOff WP_CONC_NADE + NewWorldModel "models/weapons/Grenade_Concussion/model.glm" + NewViewModel "models/weapons/Grenade_Concussion/viewmodel.md3" + MissileModel "models/weapons/Grenade_Concussion/proj.md3" + altMissileMissEffect "Grenades/EXP_Flash" + MissileMissEffect "Grenades/EXP_Flash" + altMissileHitHumanEffect "Grenades/EXP_Flash" + missileHitHumanEffect "Grenades/EXP_Flash" + altMissileHitDroidEffect "Grenades/EXP_Flash" + missileHitDroidEffect "Grenades/EXP_Flash" + Icon "gfx/hud/w_icon_stungrenade" + WeaponName "Flashbang Grenades" } -description "Delta Squad Clone Commando [Clone Trooper] +description "Delta Squad Clone Commando A highly adaptable special ops unit. @@ -213,37 +217,35 @@ A highly adaptable special ops unit. -- No Saber/Blaster Block -- Chain Limit: 1 -- Staggers on hit --- 75% more KB --- 67% special DMG mult --- 57% less reach --- 33% more radius +-- 75% more Kb +-- 167% Spec Dmg mult +-- 57% less Reach +-- 33% more Radius -- Prim only --- Slap ^3[GB] - DC-15s Side Arm Blaster (Pistol 1) -- 40% faster RoF --- 100% slower reload +-- 100% slower Reload - DC-17m ICWS Blaster Attachment (DC Carbine 1) -- 40% faster RoF --- 25% slower mag reload +-- 25% slower Mag Reload - DC-17m ICWS Sniper Attachment (Disruptor 1) --- 120% more DMG/FP DMG +-- 130% more Dmg/FP Dmg -- 10% slower RoF --- 75% slower mag reload -- Hand Thermal Grenades (2) --- 150% more DMG -- Conc Grenades (4) +-- 75% slower Mag Reload +- DC-17m ICWS Anti-Armor Attachment (UGL) +-- Pushes on det ^8Attributes: -- 10% faster skill CD -- 20% less KB taken -- Health/Armor Regen: 2/s +- 10% faster Skill Cd +- 20% less Kb Taken +- HP/Armor Regen: 2/s - Stamina (3) - Dexterity (1) - Blast Armor ^3Abilities: - Sprint ^3[CS1] -- Dex Roll ^3[CS2] -- Dash (1) ^3[CS3] +- Dash (1) ^3[CS2] +- Quickthrow (1) ^3[CS3] - Grappling Hook/Hop (2) ^3[CS4 Melee] -- Retain momentum from first Grapple" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h3_Rex.mbch b/z_MBLegends/ext_data/mb2/character/h3_Rex.mbch index 2bf1e7379..af0a7d507 100644 --- a/z_MBLegends/ext_data/mb2/character/h3_Rex.mbch +++ b/z_MBLegends/ext_data/mb2/character/h3_Rex.mbch @@ -7,7 +7,7 @@ ClassInfo MBClass MB_CLASS_ARCTROOPER weapons WP_MELEE|WP_CLONE_PISTOL|WP_PULSE_NADE - attributes MB_ATT_AMMO,3|MB_ATT_RALLY|MB_ATT_CLONE_PISTOL,3|MB_ATT_HEALING,3|MB_ATT_ANTI_MT,1|MB_ATT_DEXTERITY,3|MB_ATT_PULSE_GRENADES,2|MB_ATT_STAMINA,3|MB_ATT_WOOKIE_STRENGTH,1|MB_ATT_BLAST_ARMOUR,1|MB_ATT_GRAPPLE_HOOK,1 + attributes MB_ATT_AMMO,3|MB_ATT_RALLY|MB_ATT_CLONE_PISTOL,3|MB_ATT_HEALING,3|MB_ATT_ANTI_MT,1|MB_ATT_DEXTERITY,3|MB_ATT_PULSE_GRENADES,3|MB_ATT_STAMINA,3|MB_ATT_WOOKIE_STRENGTH,1|MB_ATT_BLAST_ARMOUR,1|MB_ATT_GRAPPLE_HOOK,1 resource RESOURCE_STAMINA forcepool 150 @@ -74,7 +74,7 @@ WeaponInfo0 velocityMod 1.1 } -description "CT-7567 aka Captain 'Rex' [Hero] +description "CT-7567 aka Captain 'Rex' A hard-boiled leader with high mobility and powerful Dual Pistols. @@ -82,16 +82,16 @@ A hard-boiled leader with high mobility and powerful Dual Pistols. - Melee -- 10% faster RoF - Dual DC-17 Clone Pistols (4) --- 10% more velocity --- 10% slower mag reload -- Pulse Grenades (2) +-- 10% more Velocity +-- 10% slower Mag Reload +- Pulse Grenades (3) ^6Inventory: - Advanced Medpac ^3[CS3] ^8Attributes: -- 10% faster skill CD -- 15% less KB taken +- 10% faster Skill Cd +- 15% less Kb Taken - Strength (1) - Dexterity (3) - Stamina (3) @@ -103,4 +103,4 @@ A hard-boiled leader with high mobility and powerful Dual Pistols. ^3Abilities: - Sprint ^3[CS1] - Dex Roll ^3[CS2] -- Grappling Hook (1) ^3[CS4]" \ No newline at end of file +- Grappling Hook (1) ^3[CS4 Melee]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h4_Atton.mbch b/z_MBLegends/ext_data/mb2/character/h4_Atton.mbch index ac144cd73..aa1d1b8b2 100644 --- a/z_MBLegends/ext_data/mb2/character/h4_Atton.mbch +++ b/z_MBLegends/ext_data/mb2/character/h4_Atton.mbch @@ -2,13 +2,13 @@ ClassInfo { name "h4_Atton" classNumberLimit 1 -MBClass MB_CLASS_HERO +MBClass MB_CLASS_JEDI weapons WP_SABER WP_MandoPistolFlags HELD_DISRUPTIFY|HELD_ALTRELOAD WP_ClonePistolFlags HELD_PULSE|HELD_ALTRELOAD WP_EE4Flags HELD_FLAME|HELD_POISON|HELD_KNOCKBACK|HELD_ALTRELOAD|HELD_DISRUPTIFY -attributes MB_ATT_POISON_DART,2|MB_ATT_AMMO,3|MB_ATT_DEFLECT,1|MB_ATT_HEALING,2|MB_ATT_FORCEBLOCK,1|MB_ATT_FP_MIRALUKA -classflags CFL_SEEING_STEALTH|CFL_HEAVYMELEE|CFL_AKIMBOPISTOL3 +attributes MB_ATT_POISON_DART,2|MB_ATT_AMMO,3|MB_ATT_DEFLECT,1|MB_ATT_HEALING,2|MB_ATT_FORCEBLOCK,1|MB_ATT_FP_MIRALUKA|MB_ATT_GETUPS,3 +classflags CFL_SEEING_STEALTH|CFL_HEAVYMELEE|CFL_AKIMBOPISTOL3|CFL_NOPICKUPS maxhealth 100 maxarmor 50 basespeed 235 @@ -44,7 +44,8 @@ model_1 "jedipack_hb" skin_1 "atton" uishader_1 "models/players/jedipack_hb/mb2_icon_atton" special1 EAS_HI_POISON -special3 EAS_HI_DEX +special2 EAS_HI_DEX +special3 EAS_HI_DASH special4 EAS_FP_PROTECT flourishAnim BOTH_HAN_TAUNT isCustomBuild 1 @@ -61,11 +62,11 @@ c_att_skill_0 MB_ATT_CLONE_PISTOL c_att_names_0 "Verpine Ion (Clone) Pistol(s)" c_att_ranks_0 3,0,0 c_att_descs_0 "Shocks on hit, 50% more charged FP DMG, 50% less DMG, -20% slower RoF, 60% slower mag reload, Sec only" +20% slower RoF, 60% slower Mag Reload, Sec only" c_att_skill_1 MB_ATT_MANDO_PISTOL c_att_names_1 "Disintegrators (WESTARs)" c_att_ranks_1 3,0,0 -c_att_descs_1 "25% more velocity, 75% slower mag reload, Prim only" +c_att_descs_1 "25% more Velocity, 75% slower Mag Reload, Prim only" c_att_skill_2 MB_ATT_SONIC_DETONATOR c_att_names_2 "Sonic Detonators" c_att_ranks_2 1,1 @@ -73,19 +74,19 @@ c_att_skill_3 MB_ATT_EE4 c_att_names_3 "Charric (EE-4)" c_att_ranks_3 2,1,1 c_att_descs_3 "Ignites/poisons/pushes on hit, 20% more DMG, 40% more FP DMG, -80% slower RoF, 70% slower mag reload" +80% slower RoF, 70% slower Mag Reload" c_att_skill_4 MB_ATT_FP_RAGE c_att_names_4 "Rapid Shot (Dark Rage)" c_att_ranks_4 0,1,2 c_att_skill_5 MB_ATT_BASESPEED c_att_names_5 "Speed (250)" c_att_ranks_5 0 -c_att_skill_6 MB_ATT_DASH -c_att_names_6 "Dash ^3[CS2]" -c_att_ranks_6 2,0 -c_att_skill_7 MB_ATT_DEXTERITY -c_att_names_7 "Dexterity ^3[CS3]" -c_att_ranks_7 0,0 +c_att_skill_6 MB_ATT_DEXTERITY +c_att_names_6 "Dexterity ^3[CS2]" +c_att_ranks_6 0,0 +c_att_skill_7 MB_ATT_DASH +c_att_names_7 "Dash ^3[CS3]" +c_att_ranks_7 2,0 c_att_skill_15 MB_ATT_BP_MULTIPLIER c_att_names_15 "Saber BP (100/120%)" c_att_ranks_15 0,1 @@ -98,11 +99,11 @@ c_att_ranks_17 1 c_att_skill_18 MB_ATT_SS_REDSTYLE c_att_names_18 "Red Saber Style" c_att_ranks_18 1 -c_att_descs_18 "50% less DMG" +c_att_descs_18 "50% less Dmg" c_att_skill_19 MB_ATT_SS_PURPLESTYLE c_att_names_19 "Purple Saber Style" c_att_ranks_19 1 -c_att_descs_19 "35% less DMG" +c_att_descs_19 "35% less Dmg" c_att_skill_20 MB_ATT_FP_SABER_DEFENSE c_att_names_20 "Saber Defense" c_att_ranks_20 0,2 @@ -131,7 +132,7 @@ c_att_skill_28 MB_ATT_REGEN c_att_names_28 "Energy Regen (134%)" c_att_ranks_28 1 c_att_skill_30 MB_ATT_DMG_GIVEN_MULTIPLIER -c_att_names_30 "DMG Given (125%)" +c_att_names_30 "Dmg Given (125%)" c_att_ranks_30 2 c_att_descs_30 "Does not affect Saber" c_att_skill_31 MB_ATT_ROF_MELEE_MULTIPLIER @@ -149,9 +150,9 @@ c_att_ranks_34 0,0,4 c_att_skill_35 MB_ATT_HEALTH_REGEN_CAP c_att_names_35 "Heroic Resolve" c_att_ranks_35 0 -c_att_descs_35 "Improved Health Regen: 3/.34s to 50" +c_att_descs_35 "Improved HP Regen: 3/.34s to 50" c_att_skill_36 MB_ATT_KB_TAKEN_MULTIPLIER -c_att_names_36 "KB Taken (80%)" +c_att_names_36 "Kb Taken (80%)" c_att_ranks_36 0 c_att_skill_37 MB_ATT_REGEN c_att_names_37 "Energy Regen (134/200%)" @@ -160,12 +161,12 @@ c_att_skill_38 MB_ATT_FLIPKICK c_att_names_38 "Flipkick ^3[Contact Jump]" c_att_ranks_38 0,3 c_att_skill_39 MB_ATT_DEXTERITY -c_att_names_39 "Dexterity ^3[CS3]" +c_att_names_39 "Dexterity ^3[CS2]" c_att_ranks_39 0,0,2 } WeaponInfo0{ WeaponToReplace WP_CLONE_PISTOL -WeaponBasedOff WP_CLONE_PISTOL +WeaponBasedOff WP_BLASTER_PISTOL NewWorldModel "models/weapons2/kotor_ionpistol/kotor_ionpistol_w.glm" NewViewModel "models/weapons2/kotor_ionpistol/kotor_ionpistol.md3" Icon "gfx/hud/w_icon_kotor_ionpistol" @@ -173,8 +174,8 @@ WeaponName "Verpine Prototype Ion Pistols" FlashSound0 "sound/weapons/LPA_NN-14/fire.wav" AltFlashSound0 "sound/weapons/demp2/altfire_old.mp3" ChargeSound "sound/weapons/LPA_NN-14/charge.wav" -altMissileHitHumanEffect "SBD/Cortosis_blue" -altMissileHitDroidEffect "SBD/Cortosis_blue" +MissileHitHumanEffect "SBD/Cortosis_blue" +MissileHitDroidEffect "SBD/Cortosis_blue" ChargeEffect "gfx/effects/cloneFrontFlash" Clipsize 36 customAmmo 380 @@ -186,7 +187,7 @@ primFireEnabled 0 } WeaponInfo1{ WeaponToReplace WP_MANDO_PISTOL -WeaponBasedOff WP_MANDO_PISTOL +WeaponBasedOff WP_BLASTER_PISTOL NewWorldModel "models/weapons2/kotor_pistol1/pistol_w.GLM" NewViewModel "models/weapons2/kotor_pistol1/model.md3" Icon "gfx/hud/w_icon_disruptorpistols_dual" @@ -197,8 +198,9 @@ reloadtimeModifier 1.75 customammo 800 altfireenabled 0 MuzzleEffect "Blaster/MuzzleFlash01Y" -MissileEffect "blaster/Shot03Y" -altMissileEffect "Blaster/Shot04Y" +MissileEffect "Blaster/Shot02Y" +Missile3Effect "Blaster/Shot03Y" +AltMissileEffect "Blaster/Shot04Y" ChargeEffect "gfx/effects/yellow_bryarFrontFlash" FlashSound0 "sound/weapons/kotor/fire_power1.mp3" } @@ -239,7 +241,7 @@ animAttackRun BOTH_ATTACK2 animAttack BOTH_ATTACK2 animAttackWalk BOTH_ATTACK2 } -description "Atton 'Jaq' Rand [Hero] +description "Atton 'Jaq' Rand Pure Pazaak @@ -248,14 +250,12 @@ Pure Pazaak - Atton's Armament (Saber) -- Saber/Blaster Defense (0) -- Blaster Deflect (1) --- Blocking resists Force Powers --- Slap ^3[GB] > Lightsaber (Yellow) --- 45% less DMG +-- 45% less Dmg > Echani Melee (Dual/Cyan) --- 100% more KB --- 65/33% less DMG --- 50% less reach +-- 100% more Kb +-- 65/33% less Dmg +-- 50% less Reach ^5Force Powers: - Jump (2) @@ -268,7 +268,8 @@ Pure Pazaak - Intuition (Passive Sense 1) - Sense Immunity - Force Block (1) +- Getup (3) ^3Abilities: - Poison Darts (2) ^3[CS1 Melee] -- Limited Dex Roll ^3[CS3]" +- Limited Dex Roll ^3[CS2]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h4_Chir.mbch b/z_MBLegends/ext_data/mb2/character/h4_Chir.mbch index be44fbbf9..f24ca255e 100644 --- a/z_MBLegends/ext_data/mb2/character/h4_Chir.mbch +++ b/z_MBLegends/ext_data/mb2/character/h4_Chir.mbch @@ -96,7 +96,7 @@ WeaponInfo1 reloadTimeModifier 1.5 } -description "Chirrut Imwe [Jedi] +description "Chirrut Imwe A speedy and dexterous character with strong CQC and a hand cannon. Fast resource regen, many evasive options and heightened spiritual abilities. @@ -106,21 +106,19 @@ A speedy and dexterous character with strong CQC and a hand cannon. Fast resourc - Chirrut's Staff (Staff/Yellow Saber) -- Saber Defense (1) -- No Blaster Block --- 25% more reach --- 53/50% less DMG --- 33% more radius --- Slap ^3[GB] +-- 25% more Reach +-- 33% more Radius - Chirrut's Lightbow (T-21 1) -- Pushes on hit --- 75% more FP DMG --- 50% slower mag reload --- 15% slower movement +-- 75% more FP Dmg +-- 50% slower Mag Reload +-- 15% slower Movement ^8Attributes: -- 125% more KB given -- 10% faster skill CD +- 125% more Kb Given +- 10% faster Skill Cd - Resource Regen: 5/.001s to 35 -- Getups (3) +- Getup (3) - Dexterity (3) - Healing (2) - Force Block (3) diff --git a/z_MBLegends/ext_data/mb2/character/h4_Ewok.mbch b/z_MBLegends/ext_data/mb2/character/h4_Ewok.mbch index 60a26279e..43fef7d93 100644 --- a/z_MBLegends/ext_data/mb2/character/h4_Ewok.mbch +++ b/z_MBLegends/ext_data/mb2/character/h4_Ewok.mbch @@ -9,6 +9,8 @@ ClassInfo weapons WP_MELEE|WP_SABER|WP_T21|WP_REPEATER attributes MB_ATT_ASSEMBLE,2|MB_ATT_RESPAWNS,2|MB_ATT_HEALING,1|MB_ATT_DODGE,3|MB_ATT_DASH,2|MB_ATT_T21,1|MB_ATT_REPEATER|MB_ATT_GETUPS,2|MB_ATT_DEXTERITY,1 + + knockbackTaken 1.25 maxhealth 100 maxarmor 20 @@ -104,7 +106,7 @@ WeaponInfo1 MuzzleEffect null MissileModel "models/weapons2/dc_gabow/greenarrow_arrow.md3" MissileEffect "bow/whoosh" - MissileMissEffect "dc/explosion" + MissileMissEffect "Dc/explosion" MissileHitHumanEffect "bow/arrow_humandroid" MissileHitDroidEffect "bow/arrow_humandroid" rateMod 0.85 @@ -147,6 +149,7 @@ WeaponInfo2 FlashSound0 "sound/weapons/stone/fire.mp3" clipSize 25 customAmmo 125 + splashRadius 20 reloadTimeModifier 1.8 hasAnimOverrides 1 animReadyRun BOTH_TRIPLE3_DUALSTANCE @@ -171,33 +174,33 @@ WeaponInfo3 damageMod 0.75 } -description "Ewok [Hero] +description "Ewok 3-life archers and spear wielders of diminutive stature carrying powerful knockdown Stones. They thrive on ambushes and pack behavior. ^2Weaponry: -- Melee +- Melee -- 50% faster RoF --- 25% less DMG +-- 25% less Dmg - Ewok Spear (Staff/Yellow Saber) -- No Saber/Blaster Block --- 61/58% less DMG --- 200% special DMG mult --- 37/50% less reach --- 33% more radius --- Slap ^3[GB] +-- 200% Spec Dmg mult +-- 37/50% less Reach +-- 33% more Radius - Stones (6) (Repeater) --- Pushes on hit/knocks down on direct hit --- 80% slower mag reload +-- Pushes on det +-- 85% less Splash Radius +-- 80% slower Mag Reload -- Sec only - Bow and Arrows (T-21 1) -- Pushes/staggers on hit -- 15% faster RoF --- 50% less DMG --- Mag reload +-- 50% less Dmg +-- Mag Reload ^8Attributes: - Reinforcements (2) +- 25% more Kb Taken - Dexterity (1) - Getup (2) - Healing (1) diff --git a/z_MBLegends/ext_data/mb2/character/h4_Finn.mbch b/z_MBLegends/ext_data/mb2/character/h4_Finn.mbch index e00e1b48e..ee15333d8 100644 --- a/z_MBLegends/ext_data/mb2/character/h4_Finn.mbch +++ b/z_MBLegends/ext_data/mb2/character/h4_Finn.mbch @@ -86,7 +86,7 @@ WeaponInfo1 ratemod 0.90 } -description "FN-2187 aka 'Finn' [ARC Trooper] +description "FN-2187 aka 'Finn' A high-mobility gunner/saberist that can engage enemies at all ranges. @@ -94,14 +94,13 @@ A high-mobility gunner/saberist that can engage enemies at all ranges. - Melee - Lightsaber (Yellow/Red/Purple) -- Saber/Blaster Defense (1) --- 46/30% less Red/Purple DMG --- Slap ^3[GB] +-- 46/30% less Red/Purple Dmg - Glie-44 Blaster Pistol (Clone Pistol 2) --- 10% more DMG/FP DMG --- 10% more velocity +-- 10% more Dmg/FP Dmg +-- 10% more Velocity -- 10% faster RoF - EL-16 Blaster Rifle (M5 2 + Scope) --- 10% more velocity +-- 10% more Velocity -- 5% faster RoF - Frag Grenades (3) diff --git a/z_MBLegends/ext_data/mb2/character/h4_KirKanos.mbch b/z_MBLegends/ext_data/mb2/character/h4_KirKanos.mbch index dde378184..7c62f6a54 100644 --- a/z_MBLegends/ext_data/mb2/character/h4_KirKanos.mbch +++ b/z_MBLegends/ext_data/mb2/character/h4_KirKanos.mbch @@ -92,7 +92,7 @@ WeaponInfo1 SelectSound "s/w/v/swish1.wav" } -description "Kir Kanos [Jedi] +description "Kir Kanos A well-rounded gunner/Saberist who combines martial arts, stealth and explosives. @@ -102,19 +102,17 @@ A well-rounded gunner/Saberist who combines martial arts, stealth and explosives - ISP Double-Vibroblade D (Staff/Purple/Cyan Saber) -- Saber Defense (2) -- Blaster Defense (1) --- Saber DMG: 150 --- 120% special DMG mult --- 6% less reach --- Slap ^3[GB] +-- 120% Spec Dmg mult +-- 6% less Reach - Modified Guardsmen Blaster Pistol (3) --- 15% more DMG --- 25% more FP DMG +-- 15% more Dmg +-- 25% more FP Dmg -- Prim only --- Mag reload +-- Mag Reload - Det Packs (3) ^8Attributes: -- 10% less KB taken +- 10% less Kb Taken - Dexterity (3) - Healing (1) - Tracking Beacon diff --git a/z_MBLegends/ext_data/mb2/character/h4_Kyle.mbch b/z_MBLegends/ext_data/mb2/character/h4_Kyle.mbch index 2d95c9d92..21a536b0a 100644 --- a/z_MBLegends/ext_data/mb2/character/h4_Kyle.mbch +++ b/z_MBLegends/ext_data/mb2/character/h4_Kyle.mbch @@ -3,7 +3,7 @@ ClassInfo { name "h4_Kyle" - MBClass MB_CLASS_SITH //fp + MBClass MB_CLASS_SITH classNumberLimit 1 weapons WP_SABER|WP_MELEE|WP_STUN_BATON|WP_THERMAL @@ -19,17 +19,17 @@ ClassInfo maxarmor 0 rankArmor 20,50,100 - + //damageGiven 1.1 basespeed 238 - - saberDamageStyle SS_STRONG,280|SS_FAST,130 + rateOfFire_Melee .9 + saberDamageStyle SS_STRONG,280|SS_FAST,130|SS_MEDIUM,240 saberstyle SS_MEDIUM|SS_STRONG|SS_FAST saberThrowDamage 40 - + saberSpecialDamage 1.25 special1 EAS_FP_SABERTHROW - special2 EAS_NONE - //special3 EAS_FP_ABSORB - //special4 EAS_FP_PROTECT + special2 EAS_FP_PROTECT + //special3 EAS_FP_GRIP + //special4 EAS_FP_LIGHTNING uioverlay_r "gfx/icons/frontline" uioverlay_l "gfx/icons/hybrid" @@ -80,7 +80,7 @@ c_att_ranks_1 8,8,4 c_att_skill_2 MB_ATT_PISTOL c_att_names_2 "Kyle's Bryar (Blaster) Pistol" c_att_ranks_2 2,2,15 -c_att_descs_2 "20% more charged FP DMG, 20% less velocity" +c_att_descs_2 "20% more Charged FP Dmg, 20% less Velocity" c_att_skill_3 MB_ATT_BLASTER c_att_names_3 "E-11 Blaster Rifle" @@ -89,7 +89,7 @@ c_att_ranks_3 6,6 c_att_skill_4 MB_ATT_DET_PACK c_att_names_4 "Det Packs" c_att_ranks_4 2,2,2 -c_att_descs_4 "100% more DMG, DMG increases with rank" +c_att_descs_4 "100% more Dmg, Dmg increases with rank" c_att_skill_5 MB_ATT_FP_PUSH c_att_names_5 "Force Push" @@ -113,11 +113,11 @@ c_att_ranks_9 4,6 c_att_skill_10 MB_ATT_FP_ABSORB c_att_names_10 "Force Absorb" -c_att_ranks_10 4,4 +c_att_ranks_10 4,6 c_att_skill_11 MB_ATT_FP_PROTECT -c_att_names_11 "Force Protect" -c_att_ranks_11 4,4 +c_att_names_11 "Force Protect ^3[CS2]" +c_att_ranks_11 4,6 c_att_skill_12 MB_ATT_FP_SPEED c_att_names_12 "Force Speed" @@ -135,7 +135,7 @@ c_att_ranks_14 4,6,8 WeaponInfo0 { WeaponToReplace WP_BLASTER_PISTOL - WeaponBasedOff WP_BLASTER_PISTOL + WeaponBasedOff WP_MANDO_PISTOL NewWorldModel "models/weapons2/briar_pistol/briar_pistol_w.glm" NewViewModel "models/weapons2/briar_pistol/briar_pistol.md3" Icon "gfx/hud/w_icon_briar" @@ -148,6 +148,8 @@ WeaponInfo0 PowerupShotEffect "Blaster/Shot04Y" ChargeEffect "gfx/effects/yellow_bryarFrontFlash" ChargeSound "sound/weapons/leia_pistol/altcharge.mp3" + //FlashSound0 "sound/weapons/bryar/fire.mp3" + //altFlashSound0 "sound/weapons/bryar/alt_fire.mp3" //OverchargeEffect "Blaster/MuzzleFlash01Y" velocityMod 0.8 FPChargeMult 1.20 @@ -161,19 +163,20 @@ WeaponInfo0 animAttackWalk BOTH_ATTACK2 } -description "Kyle Katarn [Sith] +description "Kyle Katarn -A Force-sensitive mercenary with the ability to choose his own path. +A Force-sensitive mercenary who must choose his own path. ^2Weaponry: - Melee +-- 10% faster RoF - Lightsaber (Yellow/Red/Blue) -- Saber/Blaster Defense (0) -- Blaster Deflect (2) --- 46% less Red/8% more Blue DMG +-- 46% less Red/8% more Blue Dmg +-- 125% Spec Dmg mult -- EX Saber Throw (2) ^3[CS1] ---- 33% more DMG --- Slap ^3[GB] +--- 33% more Dmg - Thermal Grenades (2) - Stun Baton (3) diff --git a/z_MBLegends/ext_data/mb2/character/h4_MrB.mbch b/z_MBLegends/ext_data/mb2/character/h4_MrB.mbch index 9c00b2b22..6cb305e40 100644 --- a/z_MBLegends/ext_data/mb2/character/h4_MrB.mbch +++ b/z_MBLegends/ext_data/mb2/character/h4_MrB.mbch @@ -3,18 +3,20 @@ ClassInfo { name "h4_MrB" - MBClass MB_CLASS_MANDALORIAN + MBClass MB_CLASS_HERO classNumberLimit 1 weapons WP_SABER|WP_MELEE|WP_BOWCASTER|WP_FIRE_NADE - attributes MB_ATT_FP_SABER_DEFENSE,1|MB_ATT_FUELREGEN,3|MB_ATT_SHIELD_RECHARGE,1|MB_ATT_FORCEBLOCK,1|MB_ATT_DASH,2|MB_ATT_BOWCASTER,3|MB_ATT_AMMO,3|MB_ATT_FIRE_GRENADES,2|MB_ATT_FUEL,3|MB_ATT_BESKAR,3|MB_ATT_TRACKING_BEACON|MB_ATT_KNOCKDOWN_ROLL|MB_ATT_DEXTERITY,1 + attributes MB_ATT_FP_SABER_DEFENSE,1|MB_ATT_FUELREGEN,3|MB_ATT_SHIELD_RECHARGE,1|MB_ATT_FORCEBLOCK,1|MB_ATT_DASH,2|MB_ATT_BOWCASTER,3|MB_ATT_AMMO,3|MB_ATT_FIRE_GRENADES,3|MB_ATT_FUEL,3|MB_ATT_BESKAR,3|MB_ATT_TRACKING_BEACON|MB_ATT_KNOCKDOWN_ROLL|MB_ATT_DEXTERITY,1 - Speed 1.13 + baseSpeed 265 maxhealth 100 maxarmor 60 - - forceregen 1.75 - forcepool 60 + knockbackTaken .95 + skillTimerMod .9 + hackRate .9 + forceregen 1.85 + forcepool 70 forcepowers FP_LEVITATION,1|FP_SEE,1|FP_SABER_OFFENSE,3 saber1 "bones_shiv_legends" @@ -31,7 +33,7 @@ ClassInfo gloatAnim BOTH_VICTORY_FAST flourishAnim BOTH_FORCELEAP2_T__B_ - special1 EAS_FP_SEE + special1 EAS_NONE special2 EAS_HI_DASH modelscale 1.035 @@ -63,16 +65,18 @@ WeaponInfo1 FlashSound0 "sound/weapons/bx_e5/fire.mp3" AltFlashSound0 "sound/weapons/ee3/sniperfire.mp3" ChargeSound "sound/weapons/bowcaster/altcharge.mp3" +customAmmo 800 FPMult 1.3 + damageMod 1.1 velocityMod 1.1 hasAnimOverrides 1 - animReadyRun TORSO_WEAPONIDLE2 - animReady TORSO_WEAPONIDLE2 - animReadyWalk TORSO_WEAPONIDLE2 - animReadyNoAmmo BOTH_ATTACK2 - animAttackRun BOTH_ATTACK2 - animAttack BOTH_ATTACK2 - animAttackWalk BOTH_ATTACK2 + animReadyRun BOTH_WESTARM5_READY + animReady BOTH_DC15_READY + animReadyWalk BOTH_DC15_AIM_READY + animReadyNoAmmo BOTH_DC15_ATTACK + animAttackRun BOTH_WESTARM5_ATTACK + animAttack BOTH_DC15_ATTACK + animAttackWalk BOTH_DC15_AIM_ATTACK } ForceInfo0 @@ -84,7 +88,7 @@ ForceInfo0 LoopSound "sound/ambience/cp_02_lp.wav" } -description "Mister Bones [Mandalorian] +description "Mister Bones An agile class with a balanced outfit of tools and abilities. @@ -94,21 +98,23 @@ An agile class with a balanced outfit of tools and abilities. -- Saber Defense (1) -- No Blaster Block -- Blocking resists Force Powers --- 67% less Purple/8% more Cyan DMG --- 20% more KB --- 50% less reach --- 33% more radius --- Slap ^3[GB] +-- 20% more Kb +-- 50% less Reach +-- 33% more Radius - E-11s Long-Range Blaster (Bowcaster 3) --- 10% more velocity --- 30% more FP DMG -- Fire Grenades (2) +-- 10% more Velocity +-- 10% more Dmg +-- 30% more FP Dmg +- Fire Grenades (3) ^5Powers: - Hydraulic Legs (Jump 1) -- Radar Scanner (Sense 1) ^3[CS1] +- Radar Scanner (Sense 1) ^8Attributes: +- 10% faster Skill Cd +- 10% faster Hacking +- 5% less Kb Taken - Dexterity (1) - Knockdown Roll - Beskar (3) diff --git a/z_MBLegends/ext_data/mb2/character/h4_SenGuard.mbch b/z_MBLegends/ext_data/mb2/character/h4_SenGuard.mbch index acf5ca56c..54ba70742 100644 --- a/z_MBLegends/ext_data/mb2/character/h4_SenGuard.mbch +++ b/z_MBLegends/ext_data/mb2/character/h4_SenGuard.mbch @@ -14,7 +14,7 @@ ClassInfo forcepowers FP_SABER_OFFENSE,3 forcepool 80 - maxhealth 105 + maxhealth 115 maxarmor 80 special1 EAS_HI_SPRINT @@ -70,8 +70,8 @@ c_att_ranks_0 1,0 c_att_skill_1 MB_ATT_CLONERIFLE c_att_names_1 "Mk. II 'Paladin' Rifle (CR)" c_att_ranks_1 1,0 -c_att_descs_1 "4 Conc Blobs, 15% more DMG, 25% more FP DMG, -20% slower RoF, 15% slower movement, Mag reload" +c_att_descs_1 "4 Conc Blobs, 15% more Dmg, 25% more FP Dmg, +20% slower RoF, 15% slower Movement, Mag Reload" } WeaponInfo0 @@ -112,7 +112,7 @@ WeaponInfo1 selectSound "s/w/t/staffswing4.mp3" } -description "Senate Guard [Clone Trooper] +description "Republic Senate Guard 2-life anti-Sith hybrids who can cover and deny ground quickly. @@ -124,16 +124,14 @@ description "Senate Guard [Clone Trooper] -- Blaster Deflect (0) -- Chain Limit: 3 -- Staggers on hit --- 115% more KB --- 50% less Yellow DMG --- 30% less reach --- 167% more radius --- Slap ^3[GB] +-- 115% more Kb +-- 30% less Reach +-- 167% more Radius ^8Attributes: - Reinforcement (1) -- 10% more KB given -- 10% less KB taken +- 10% more Kb Given +- 10% less Kb Taken - Stamina (2) - Dexterity (1) - Armor Regen (1) diff --git a/z_MBLegends/ext_data/mb2/character/h5_AstroR2.mbch b/z_MBLegends/ext_data/mb2/character/h5_AstroR2.mbch index 8d96ee3f4..f405788d1 100644 --- a/z_MBLegends/ext_data/mb2/character/h5_AstroR2.mbch +++ b/z_MBLegends/ext_data/mb2/character/h5_AstroR2.mbch @@ -145,24 +145,24 @@ ForceInfo3 ForcePowerName "Electroshock Probe" } -description "Astromech Droid [Wookiee] +description "Astromech Droid A plucky support with numerous gadgets. ^2Weaponry: - Prod (Limited Melee) --- 15% slower movement +-- 15% slower Movement -- Sec only - Circular Saw (Staff Saber) -- No Saber/Blaster Block -- Chain Limit: 1 -- Staggers on hit --- 95% less DMG --- 50% less reach --- 66% more radius +-- 95% less Dmg +-- 50% less Reach +-- 66% more Radius - Flamethrower --- 150% slower ignition rate --- 50% slower mag reload +-- 150% slower RoI +-- 50% slower Mag Reload ^5Powers: - Steam Projector (Push 1) @@ -172,7 +172,7 @@ A plucky support with numerous gadgets. ^8Attributes: - 25% faster Hacking - Strength (2) -- Flat DMG Taken +- Base Dmg Taken - Cortosis (1) - Armor Regen (1) - Healing (2) @@ -182,7 +182,7 @@ A plucky support with numerous gadgets. ^3Abilities: - Armor/BP/Resource Dispenser (2) ^3['Use' ^3on allies] --- +1 range +-- +1 Range - Jet Boosters (Jetpack) - Headbutt (Flipkick 1) ^3[Contact Jump] - Mini-Blaster (Wrist Laser) ^3[CS1] diff --git a/z_MBLegends/ext_data/mb2/character/h5_BoKatan.mbch b/z_MBLegends/ext_data/mb2/character/h5_BoKatan.mbch index 12c69027c..fe83d765f 100644 --- a/z_MBLegends/ext_data/mb2/character/h5_BoKatan.mbch +++ b/z_MBLegends/ext_data/mb2/character/h5_BoKatan.mbch @@ -8,10 +8,10 @@ ClassInfo weapons WP_MELEE|WP_MANDO_PISTOL|WP_FRAG_NADE|WP_SABER - attributes MB_ATT_BESKAR,2|MB_ATT_FP_SABER_DEFENSE,1|MB_ATT_JETPACK|MB_ATT_AMMO,3|MB_ATT_MANDO_PISTOL,3|MB_ATT_FUEL,2|MB_ATT_WRISTLASER,1|MB_ATT_ROCKET,1|MB_ATT_POISON_DART,3|MB_ATT_FUELREGEN,1|MB_ATT_BUNNY_HOP,1|MB_ATT_FRAGS,1|MB_ATT_FORCEBLOCK,1|MB_ATT_HEALING,1 + attributes MB_ATT_BESKAR,2|MB_ATT_FP_SABER_DEFENSE,1|MB_ATT_JETPACK|MB_ATT_AMMO,3|MB_ATT_MANDO_PISTOL,3|MB_ATT_FUEL,2|MB_ATT_WRISTLASER,1|MB_ATT_ROCKET,1|MB_ATT_POISON_DART,3|MB_ATT_FUELREGEN,1|MB_ATT_BUNNY_HOP,1|MB_ATT_FRAGS,2|MB_ATT_FORCEBLOCK,1|MB_ATT_HEALING,1 - maxhealth 85 - maxarmor 145 + maxhealth 125 + maxarmor 125 rateoffire_melee 0.95 special1 EAS_HI_ROCKET @@ -23,7 +23,7 @@ ClassInfo saber1 legends_darksaber saberstyle SS_MEDIUM|SS_DESANN -saberDamageStyle SS_MEDIUM,200|SS_DESANN,240 + saberDamageStyle SS_MEDIUM,200|SS_DESANN,240 forcepowers FP_SABER_OFFENSE,1 APmultiplier 1.20 @@ -64,13 +64,14 @@ WeaponInfo1 AltMissileEffect "Blaster/Shot04Y" ChargeSound "sound/weapons/leia_pistol/altcharge.mp3" ChargeEffect "gfx/effects/yellow_bryarFrontFlash" + damageMod 1.1 fpmult 1.1 rateMod 1.1 } -description "Bo-Katan Kryze [Bounty Hunter] +description "Bo-Katan Kryze -A speedy Jetpack user who wields a Saber and Dual Pistols. Surprisingly tanky. +A quick and versatile Mandalorian with a tough suit of armor. ^2Weaponry: - Melee @@ -79,12 +80,11 @@ A speedy Jetpack user who wields a Saber and Dual Pistols. Surprisingly tanky. -- Saber Defense (1) -- No Blaster Block -- Blocking resists Force Powers --- 16/40% less Yellow/Purple DMG --- Slap ^3[GB] +-- 16/40% less Yellow/Purple Dmg - Dual WESTAR-35 Blaster Pistols (3) --- 10% more FP DMG +-- 10% more Dmg/FP Dmg -- 10% slower RoF -- Frag Grenade (1) +- Frag Grenades (2) ^8Attributes: - Bunny Hop (1) diff --git a/z_MBLegends/ext_data/mb2/character/h5_CloneJet.mbch b/z_MBLegends/ext_data/mb2/character/h5_CloneJet.mbch index 1af2aa3a9..9ec4c5bbb 100644 --- a/z_MBLegends/ext_data/mb2/character/h5_CloneJet.mbch +++ b/z_MBLegends/ext_data/mb2/character/h5_CloneJet.mbch @@ -131,7 +131,7 @@ WeaponInfo1 rateMod 1 } -description "Clone Jet Trooper [Clone Trooper] +description "Clone Jet Trooper 2-life Jetpack users who specialize in dealing disabling damage from the skies. @@ -139,13 +139,13 @@ description "Clone Jet Trooper [Clone Trooper] - Melee - Dual DC-17 Hand Blasters (WESTARs 3) - DC-15A Clone Rifle (1) --- Concussion Blobs (4) +-- Conc Blobs (4) -- Ion Blobs (6) - EMP Launcher (8) (Rocket Launcher) -- Shocks on det --- 15% more velocity --- 5% faster shot swap --- 40% slower mag reload +-- 15% more Velocity +-- 5% faster Shot Swap +-- 40% slower Mag Reload -- Prim only - Pulse Grenades (2) @@ -154,7 +154,7 @@ description "Clone Jet Trooper [Clone Trooper] ^8Attributes: - Reinforcement (1) -- 5% less KB taken +- 5% less Kb Taken - Assemble (3) ^3Abilities: diff --git a/z_MBLegends/ext_data/mb2/character/h5_Dash.mbch b/z_MBLegends/ext_data/mb2/character/h5_Dash.mbch index a82886fe6..84964887d 100644 --- a/z_MBLegends/ext_data/mb2/character/h5_Dash.mbch +++ b/z_MBLegends/ext_data/mb2/character/h5_Dash.mbch @@ -88,7 +88,7 @@ WeaponInfo1 velocityMod 1.15 } -description "Dash Rendar [Hero] +description "Dash Rendar A highly mobile Jetpacker with regenerating Fuel and a rapid-fire, low damage Pistol. @@ -97,18 +97,17 @@ A highly mobile Jetpacker with regenerating Fuel and a rapid-fire, low damage Pi -- 5% slower RoF - Dash's DL-44 Blaster Pistol (1) -- 57% faster RoF --- 15% less DMG +-- 15% less Dmg - PLX-2M Rocket Launcher (8) -- Staggers/pushes on hit --- 15% more velocity --- 50% slower mag reload +-- 15% more Velocity +-- 50% slower Mag Reload - Frag Grenades (3) ^8Attributes: -- Dash Jump - Bunny Hop (1) - Slow Faller -- 50% slower skill CD +- 50% slower Skill Cd - Blast Armor - Armor Regen (1) - Healing (1) @@ -117,4 +116,4 @@ A highly mobile Jetpacker with regenerating Fuel and a rapid-fire, low damage Pi ^3Abilities: - Jetpack - Wrist Flamethrower ^3[CS2] -- Dash (2) ^3[CS3]" \ No newline at end of file +- Dash/Dash Jump (2) ^3[CS3]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h5_DinMando.mbch b/z_MBLegends/ext_data/mb2/character/h5_DinMando.mbch index 75820f50b..abcbb0ad9 100644 --- a/z_MBLegends/ext_data/mb2/character/h5_DinMando.mbch +++ b/z_MBLegends/ext_data/mb2/character/h5_DinMando.mbch @@ -37,7 +37,7 @@ ClassInfo gloatAnim BOTH_VICTORY_FAST flourishAnim BOTH_STAND1_TALK3 - model "dindjarin" + model "Dindjarin" skin "jetpack" uishader "models/players/dindjarin/mb2_icon_jetpack" modelscale 1.01 @@ -61,7 +61,7 @@ ClassInfo c_att_skill_0 MB_ATT_PISTOL c_att_names_0 "IB-94 Blaster Pistol" c_att_ranks_0 0,1,3 - c_att_descs_0 "10% more DMG" + c_att_descs_0 "10% more Dmg" c_att_skill_1 MB_ATT_FRAGS c_att_names_1 "Frag Grenades" @@ -74,7 +74,7 @@ ClassInfo c_att_skill_3 MB_ATT_AMBAN c_att_names_3 "Amban Phase-Pulse Blaster" c_att_ranks_3 2,1,1 - c_att_descs_3 "25% more DMG/FP DMG, 20% more velocity" + c_att_descs_3 "25% more Dmg/FP Dmg, 20% more Velocity" c_att_skill_4 MB_ATT_ARMOUR c_att_names_4 "Armor (100/150/200)" @@ -85,7 +85,7 @@ ClassInfo c_att_ranks_5 2,1,2 c_att_skill_6 MB_ATT_KB_TAKEN_MULTIPLIER - c_att_names_6 "KB Taken (50/25%)" + c_att_names_6 "Kb Taken (50/25%)" c_att_ranks_6 2,1 c_att_descs_6 "80% default" @@ -128,7 +128,7 @@ ClassInfo c_att_skill_19 MB_ATT_PISTOL c_att_names_19 "IB-94 Blaster Pistol" c_att_ranks_19 0,1,3 - c_att_descs_19 "10% more DMG" + c_att_descs_19 "10% more Dmg" c_att_skill_20 MB_ATT_FRAGS c_att_names_20 "Frag Grenades" @@ -147,7 +147,7 @@ ClassInfo c_att_ranks_23 2,1,2 c_att_skill_24 MB_ATT_KB_TAKEN_MULTIPLIER - c_att_names_24 "KB Taken (50/25%)" + c_att_names_24 "Kb Taken (50/25%)" c_att_ranks_24 2,1 c_att_descs_24 "80% default" @@ -203,7 +203,7 @@ WeaponInfo2 FPMult 1.25 } -description "Din Djarin [Mandalorian] +description "Din Djarin A hybrid Melee fighter who can spec into weapons, Mandalorian abilities, damage protection, and Saber Defense. @@ -212,18 +212,16 @@ A hybrid Melee fighter who can spec into weapons, Mandalorian abilities, damage - Beskar Spear (Staff Saber) -- Saber Defense (0) -- No Blaster Block --- 25% more reach --- 50% less DMG --- 33% more radius --- Slap ^3[GB] +-- 25% more Reach +-- 33% more Radius - IB-94 Blaster Pistol (1) --- 10% more DMG +-- 10% more Dmg ^6Inventory: - Electrobinoculars ^8Attributes: -- 20% less KB taken +- 20% less Kb Taken - Fuel Regen (1) - Tracking Beacon diff --git a/z_MBLegends/ext_data/mb2/character/h5_NiteOwl.mbch b/z_MBLegends/ext_data/mb2/character/h5_NiteOwl.mbch index c3571dd1c..19d603ebe 100644 --- a/z_MBLegends/ext_data/mb2/character/h5_NiteOwl.mbch +++ b/z_MBLegends/ext_data/mb2/character/h5_NiteOwl.mbch @@ -5,7 +5,7 @@ ClassInfo name "h5_NiteOwl" classNumberLimit 2 MBClass MB_CLASS_MANDALORIAN - weapons WP_MELEE|WP_SONIC_NADE|WP_SABER|WP_SONIC_NADE + weapons WP_MELEE|WP_SONIC_NADE|WP_SABER attributes MB_ATT_JETPACK|MB_ATT_AMMO,3|MB_ATT_ROCKET,1|MB_ATT_WRISTLASER|MB_ATT_DEXTERITY,3|MB_ATT_FUEL,3|MB_ATT_BESKAR,2|MB_ATT_TRACKING_BEACON|MB_ATT_SONIC_DETONATOR,1|MB_ATT_BLAST_ARMOUR speed 1.10 @@ -22,7 +22,7 @@ ClassInfo uioverlay "gfx/icons/aerial" uishader "models/players/deathwatch/mb2_icon_default" - model "deathwatch" + model "Deathwatch" skin "default" model_1 "bokatan" skin_1 "rgb" @@ -55,24 +55,24 @@ ClassInfo c_att_skill_0 MB_ATT_PISTOL c_att_names_0 "DT-29 Six Shooter (Pistol)" c_att_ranks_0 2 - c_att_descs_0 "60% more DMG, 60% more FP DMG, 30% more velocity, + c_att_descs_0 "60% more Dmg, 60% more FP Dmg, 30% more Velocity, 30% slower RoF" c_att_skill_1 MB_ATT_CLONERIFLE c_att_names_1 "Concord. Repeater (C. Rifle)" c_att_ranks_1 3 - c_att_descs_1 "20% more DMG, 10% more FP DMG, 10% more velocity, -50% faster RoF, 5000% slower reload" + c_att_descs_1 "20% more Dmg, 10% more FP Dmg, 10% more Velocity, +50% faster RoF, 5000% slower Reload" c_att_skill_2 MB_ATT_DLT20A c_att_names_2 "GALAAR-15 Carbine (DLT)" c_att_ranks_2 1,2,0 - c_att_descs_2 "15% more FP DMG, 20% more velocity, 40% slower mag reload" + c_att_descs_2 "15% more FP Dmg, 20% more Velocity, 40% slower Mag Reload" c_att_skill_3 MB_ATT_PROJECTILE_RIFLE c_att_names_3 "Kingpin Projectile Rifle" c_att_ranks_3 5 - c_att_descs_3 "10% more FP DMG, 20% less DMG, 100% slower mag reload" + c_att_descs_3 "10% more FP Dmg, 10% less Dmg, 100% slower Mag Reload" c_att_skill_4 MB_ATT_RESPAWNS c_att_names_4 "Reinforcement" @@ -111,9 +111,11 @@ WeaponInfo0 WeaponInfo1 { WeaponToReplace WP_BLASTER_PISTOL - WeaponBasedOff WP_CLONE_PISTOL + WeaponBasedOff WP_MANDO_PISTOL NewWorldModel "models/weapons2/bp_dt29/dt29.glm" NewViewModel "models/weapons2/bp_dt29/dt29.md3" + NewHandsModel "models/weapons2/bp_dt29/dt29_hand.md3" + NewBarrelModel "models/weapons2/bp_dt29/dt29_barrel.md3" Icon "gfx/hud/w_icon_dt29" MuzzleEffect "Blaster/MuzzleFlash01B" AltMuzzleEffect "Blaster/MuzzleFlash01B" @@ -148,7 +150,8 @@ WeaponInfo2 NewWorldModel "models/weapons2/mandoAR/mandoAR.glm" NewViewModel "models/weapons2/mandoAR/mandoAR.md3" Icon "gfx/hud/w_icon_mandoAr" - WeaponName "Concordian Repeater" + WeaponName "Concordian Repeater" + MissileEffect "Blaster/Shot02Y" MuzzleEffect "Blaster/MuzzleFlash01Y" AltMuzzleEffect "Blaster/MuzzleFlash01Y" customAmmo 800 @@ -175,7 +178,7 @@ WeaponInfo3 FlashSound3 "sound/weapons/halo_beamrifle/fire3.mp3" CustomAmmo 30 clipsize 2 - damageMod 0.80 + damageMod 0.9 FPMult 1.1 ReloadTimeModifier 2 } @@ -189,7 +192,7 @@ WeaponInfo4 Icon "gfx/hud/w_icon_prisonknife" WeaponName "Vibroknife" } -description "Nite Owl Mandalorian [Mandalorian] +description "Nite Owl Mandalorian Eagle-eyed sharpshooters with Jetpacks. @@ -197,9 +200,7 @@ Eagle-eyed sharpshooters with Jetpacks. - Melee - Vibroknife (Cyan Saber) -- No Saber/Blaster Block --- 16% less DMG --- 60% less reach --- Slap ^3[GB] +-- 60% less Reach - Sonic Detonator (1) ^8Attributes: diff --git a/z_MBLegends/ext_data/mb2/character/h5_Paz.mbch b/z_MBLegends/ext_data/mb2/character/h5_Paz.mbch index e713ccc8c..25d45bb0c 100644 --- a/z_MBLegends/ext_data/mb2/character/h5_Paz.mbch +++ b/z_MBLegends/ext_data/mb2/character/h5_Paz.mbch @@ -20,13 +20,13 @@ ClassInfo saberDamage 110 resource RESOURCE_RAGE - resourceRegenCap 25 + resourceRegenCap 15 resourceRegenRate 250 resourceRegenAmount 1 forcepool 150 - forceregen 0.30 - - special1 EAS_FP_RAGE + forceregen 1 + special1 EAS_FP_RAGE + special4 EAS_FP_RAGE special2 EAS_NONE classflags CFL_STRONGAGAINSTPHYSICAL|CFL_BLOODYMELEE @@ -100,34 +100,31 @@ ForceInfo0 ForcePowerName "Last Stand" } -description "Paz Vizsla [Wookiee] +description "Paz Vizsla -A slow, Jetpack-equipped tank with a Minigun and high damage/knockback resistance. Can burn his Fuel for a short movement, attack speed, and defense boost. +A slow, Jetpack-equipped tank who converts damage into resource. ^2Weaponry: - Melee - Vibroknife/Personal Energy Shield (Purple Saber) -- Saber/Blaster Defense (3) --- No BP Regen --- 72% less DMG --- 60% less reach --- Slap ^3[GB] +-- 60% less Reach - M-55 Medium Repeating Blaster (Minigun 3) -- 2% slower RoF --- 8% less velocity --- 5% less DMG --- 15% less FP DMG --- 10% slower reload +-- 8% less Velocity +-- 5% less Dmg +-- 15% less FP Dmg +-- 10% slower Reload ^5Powers: -- Last Stand (Dark Rage 3) ^3[CS1] +- Last Stand (Dark Rage 3) ^3[CS1/4] ^8Attributes: -- 20% less KB given -- 80% less KB taken +- 20% less Kb Given +- 80% less Kb Taken - Fury (2) --- Resource Regen: 1/.25s to 25 --- 70% slower Resource Decay +-- Resource Regen: 1/.25s to 15 - Strength (2) - Beskar (3) - Blast Armor diff --git a/z_MBLegends/ext_data/mb2/character/h5_Skirata.mbch b/z_MBLegends/ext_data/mb2/character/h5_Skirata.mbch index e007cd388..8b6d3bc9b 100644 --- a/z_MBLegends/ext_data/mb2/character/h5_Skirata.mbch +++ b/z_MBLegends/ext_data/mb2/character/h5_Skirata.mbch @@ -6,9 +6,9 @@ ClassInfo MBClass MB_CLASS_BOUNTY_HUNTER classNumberLimit 1 - weapons WP_MELEE|WP_CLONE_PISTOL|WP_M5|WP_PULSE_NADE|WP_SABER + weapons WP_MELEE|WP_CLONE_PISTOL|WP_M5|WP_PULSE_NADE|WP_SABER|WP_FRAG_NADE - attributes MB_ATT_JETPACK|MB_ATT_AMMO,3|MB_ATT_CLONE_PISTOL,2|MB_ATT_WESTARM5,2|MB_ATT_DEXTERITY,3|MB_ATT_FUEL,3|MB_ATT_STAMINA,3|MB_ATT_ARC_RIFLE_SCOPE|MB_ATT_HEALING,2|MB_ATT_PULSE_GRENADES,2|MB_ATT_BLAST_ARMOUR|MB_ATT_TRACKING_DART,3|MB_ATT_BESKAR,3 + attributes MB_ATT_JETPACK|MB_ATT_AMMO,3|MB_ATT_CLONE_PISTOL,2|MB_ATT_WESTARM5,2|MB_ATT_DEXTERITY,3|MB_ATT_FUEL,3|MB_ATT_STAMINA,3|MB_ATT_ARC_RIFLE_SCOPE|MB_ATT_HEALING,2|MB_ATT_PULSE_GRENADES,2|MB_ATT_FRAGS,1|MB_ATT_BLAST_ARMOUR|MB_ATT_TRACKING_DART,3|MB_ATT_BESKAR,3 maxhealth 125 maxarmor 115 @@ -35,7 +35,7 @@ ClassInfo saberstyle SS_TAVION APmultiplier 1.25 BPmultiplier 0 - saberdamage 90 + saberdamage 100 saberStanceAnim BOTH_STAND9 flourishAnim BOTH_SHOWOFF_FAST @@ -106,7 +106,7 @@ WeaponInfo2 WeaponName "Knuckle Plate Vibroblade" } -description "Kal Skirata [Bounty Hunter] +description "Kal Skirata A dexterous Jetpack sniper focused on precision. @@ -114,24 +114,23 @@ A dexterous Jetpack sniper focused on precision. - Melee - Knuckle Plate Vibroblade (Cyan Saber) -- No Saber/Blaster Block --- 75% more KB --- 25% less DMG --- 57% less reach --- 33% more radius --- Slap ^3[GB] +-- 75% more Kb +-- 57% less Reach +-- 33% more Radius - DE-10 Blaster Pistol (2) --- 20% more DMG --- 35% more FP DMG +-- 20% more Dmg +-- 35% more FP Dmg -- 15% slower RoF - DC-17m Blaster Rifle (M5 2 + Scope) --- 25% more velocity --- 15% more FP DMG +-- 25% more Velocity +-- 15% more FP Dmg -- 15% slower RoF +- Frag Grenades (1) - Pulse Grenades (2) ^8Attributes: -- 8% more KB given -- 8% less KB taken +- 8% more Kb Given +- 8% less Kb Taken - Stamina (3) - Dexterity (3) - Blast Armor diff --git a/z_MBLegends/ext_data/mb2/character/h6_Andor.mbch b/z_MBLegends/ext_data/mb2/character/h6_Andor.mbch index 2486d9220..bf1d70a47 100644 --- a/z_MBLegends/ext_data/mb2/character/h6_Andor.mbch +++ b/z_MBLegends/ext_data/mb2/character/h6_Andor.mbch @@ -50,7 +50,7 @@ ClassInfo c_att_skill_0 MB_ATT_PISTOL c_att_names_0 "Modified Bryar Pistol" c_att_ranks_0 1,0,2 - c_att_descs_0 "50% more charged FP DMG" + c_att_descs_0 "50% more Charged FP Dmg" c_att_skill_1 MB_ATT_BLASTER c_att_names_1 "E-11 Blaster Rifle" @@ -115,16 +115,16 @@ customAmmo 740 ratemod 1.1 } -description "Cassian Andor [Hero] +description "Cassian Andor -A scrappy marksman with a powerful 2-shot Projectile Rifle and a heavy Pistol. +A scrappy marksman with a powerful 2-shot sniper rifle. ^2Weaponry: - Melee - Frag Grenades (2) - Projectile Rifle --- 2 shots per reload --- 30% faster reload +-- 2 shots per Reload +-- 30% faster Reload ^6Inventory: - Electrobinoculars ^3[CS4] diff --git a/z_MBLegends/ext_data/mb2/character/h6_Cross.mbch b/z_MBLegends/ext_data/mb2/character/h6_Cross.mbch index 5358e537a..18d3fbde9 100644 --- a/z_MBLegends/ext_data/mb2/character/h6_Cross.mbch +++ b/z_MBLegends/ext_data/mb2/character/h6_Cross.mbch @@ -19,7 +19,7 @@ ClassInfo BPmultiplier 0 saber1 cross_knife saberstyle SS_TAVION - saberdamage 90 + saberdamage 100 holdables HI_BINOCULARS @@ -86,7 +86,7 @@ WeaponInfo1 WeaponInfo2 { WeaponToReplace WP_EE4 - WeaponBasedOff WP_EE4 + WeaponBasedOff WP_MANDO_PISTOL NewWorldModel "models/weapons2/som3_rifle/som3_rifle_w.glm" NewViewModel "models/weapons2/som3_rifle/som3_rifle.md3" Icon "gfx/hud/w_icon_som3_rifle" @@ -178,7 +178,7 @@ WeaponInfo3 animAttackWalk BOTH_ATTACK2 } */ -description "CT-9904 aka 'Crosshair' [ARC Trooper] +description "CT-9904 aka 'Crosshair' A dexterous class with an all-in-one rifle. @@ -186,23 +186,21 @@ A dexterous class with an all-in-one rifle. - Melee - Crosshair's Vibroknife (Cyan Saber) -- No Saber/Blaster Block --- 25% less DMG --- 60% less reach --- Slap ^3[GB] +-- 60% less Reach - 773 Firepuncher Rifle Ricochet Config (Clone Pistol 2) --- 250% more DMG/FP DMG --- 82% more velocity --- 70% slower mag reload +-- 250% more Dmg/FP Dmg +-- 82% more Velocity +-- 70% slower Mag Reload -- Sec only - 773 Firepuncher Rifle Standard Config (EE-4 2) --- 60% more DMG/FP DMG --- 82% more velocity +-- 60% more Dmg/FP Dmg +-- 82% more Velocity -- 80% slower RoF --- 70% slower mag reload +-- 70% slower Mag Reload - 773 Firepuncher Rifle Pulse Config (Proj) -- Shocks on hit --- 10% more DMG/FP DMG/velocity --- 70% slower mag reload +-- 10% more Dmg/FP Dmg/Velocity +-- 70% slower Mag Reload - Frag Grenade (1) - Pulse Grenades (2) diff --git a/z_MBLegends/ext_data/mb2/character/h6_Mission.mbch b/z_MBLegends/ext_data/mb2/character/h6_Mission.mbch index ec42dd843..dd23a61a0 100644 --- a/z_MBLegends/ext_data/mb2/character/h6_Mission.mbch +++ b/z_MBLegends/ext_data/mb2/character/h6_Mission.mbch @@ -49,11 +49,10 @@ ClassInfo uioverlay "gfx/icons/scout" special1 EAS_HI_DODGE - special2 EAS_HI_TRACKER + special2 EAS_HI_KICK + meleespecial2 EAS_HI_TRACKER special3 EAS_HI_DASH - special4 EAS_HI_KICK - - respawnCustomTime 50000 + special4 EAS_HI_CLOAK } WeaponInfo0 @@ -126,42 +125,41 @@ WeaponInfo2 SelectSound "sound/weapons/blade/slash2.mp3" } -description "Mission Vao [Bounty Hunter] +description "Mission Vao A scrappy scout with Cloaking. ^2Weaponry: - Melee --- 15% faster movement +-- 15% faster Movement - Mission's Electro-Vibrosaber -- Saber Defense (1) -- No Blaster Block -- EX Saber Training (2) -- Chain Limit: 2 -- Shocks on hit --- Slap ^3[GB] > Electro-Vibroblade (Yellow/Blue) -- 5% more AS --- 40% less reach --- 50% less DMG +-- 40% less Reach +-- 50% less Dmg > Electro-Vibroknucklers (Dual/Cyan) -- 15% more AS --- 55% less reach --- 70% less DMG --- 100% more radius +-- 55% less Reach +-- 70% less Dmg +-- 100% more Radius - Modified Scout Enforcer (Clone Pistol 2) -- Poisons on hit --- 35% more FP DMG +-- 35% more FP Dmg - Jamoh Hogra's Carbine (Clone Rifle 1) --- 25% more DMG --- 10% more velocity --- 15% slower movement +-- 25% more Dmg +-- 10% more Velocity +-- 15% slower Movement -- Ion Blobs (8) - Pulse Grenades (2) - Cryo Grenades (2) ^6Inventory: -- Stealth Field Generator (Cloak) +- Stealth Field Generator (Cloak) ^3[CS4] ^8Attributes: - 10% faster Hacking @@ -171,6 +169,6 @@ A scrappy scout with Cloaking. ^3Abilities: - Dodge (3) ^3[CS1] +- Gunkick ^3[CS2] - Tracking Darts (8) ^3[CS2 Melee] -- Dash (1) ^3[CS3] -- Gunkick ^3[CS4]" \ No newline at end of file +- Dash (1) ^3[CS3]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h6_Nien.mbch b/z_MBLegends/ext_data/mb2/character/h6_Nien.mbch index b1bd21ffb..3f2666b45 100644 --- a/z_MBLegends/ext_data/mb2/character/h6_Nien.mbch +++ b/z_MBLegends/ext_data/mb2/character/h6_Nien.mbch @@ -36,7 +36,7 @@ ClassInfo saberstyle SS_MEDIUM saber1_1 nien_leg_s - sabercolor 0 + sabercolor_1 0 saberstyle_1 SS_MEDIUM holdables HI_CLOAK|HI_SENTRY_GUN|HI_STIMPACK @@ -57,8 +57,8 @@ ClassInfo special1 EAS_FP_SABERTHROW special2 EAS_HI_DASH - special3 EAS_HI_DODGE - special4 EAS_HI_QUICKTHROW + special4 EAS_HI_DODGE + special3 EAS_HI_QUICKTHROW } WeaponInfo0 @@ -136,7 +136,7 @@ damageMod .8 WeaponName "Frag Grenades" } */ -description "Nien Nunb [Jedi] +description "Nien Nunb A scrappy, evasive class with many explosives, a launching Saber, and gadgets. @@ -145,24 +145,22 @@ A scrappy, evasive class with many explosives, a launching Saber, and gadgets. - Nien's Wrench/Magna-Glove (Yellow Saber) -- No Saber/Blaster Block -- Chain Limit: 2 --- 125% more KB --- 50% less DMG --- 40% less reach --- 166% more radius +-- 125% more Kb +-- 40% less Reach +-- 166% more Radius -- Saber Throw ^3[CS1] ---- 166% more DMG --- Slap ^3[GB] +--- 166% more Dmg - DH-17 Blaster Pistol (Blaster Rifle 2) -- 20% faster RoF --- 20% less DMG +-- 20% less Dmg - Pulse Cannon (Disruptor 2) -- 25% faster RoF --- 25% more DMG --- 10% faster reload +-- 25% more Dmg +-- 10% faster Reload - Frag Grenades (3) - Trip Mines (3) - Pulse Grenades (3) -- Concussion Grenades (3) +- V-59 Conc Grenades (3) ^6Inventory: - Stimpak @@ -170,8 +168,8 @@ A scrappy, evasive class with many explosives, a launching Saber, and gadgets. - Cloaking Device ^8Attributes: -- 35% more KB taken -- 10% faster skill CD +- 35% more Kb Taken +- 10% faster Skill Cd - Getup (3) - Dexterity (1) - Battery Recharge (3) @@ -181,5 +179,5 @@ A scrappy, evasive class with many explosives, a launching Saber, and gadgets. ^3Abilities: - Dash (2) ^3[CS2] -- Dodge (3) ^3[CS3] -- Quickthrow (2) ^3[CS4]" \ No newline at end of file +- Quickthrow (2) ^3[CS3] +- Dodge (3) ^3[CS4]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h7_CloneAss.mbch b/z_MBLegends/ext_data/mb2/character/h7_CloneAss.mbch index 2698a18bd..acba5f163 100644 --- a/z_MBLegends/ext_data/mb2/character/h7_CloneAss.mbch +++ b/z_MBLegends/ext_data/mb2/character/h7_CloneAss.mbch @@ -77,7 +77,7 @@ customSpecDesc_2 "1-life" c_att_ranks_1 25 c_att_skill_2 MB_ATT_HEALTH - c_att_names_2 "Health (100/110)" + c_att_names_2 "HP (100/110)" c_att_ranks_2 2,2 c_att_skill_3 MB_ATT_ARMOUR @@ -134,7 +134,7 @@ customSpecDesc_2 "1-life" c_att_ranks_18 1,1,5 c_att_skill_19 MB_ATT_HEALTH - c_att_names_19 "Health (100/110)" + c_att_names_19 "HP (100/110)" c_att_ranks_19 2,2 c_att_skill_20 MB_ATT_ARMOUR @@ -184,7 +184,7 @@ WeaponInfo0 WeaponName "Assassin's Vibroshivs" } -description "Clone Assassin [ARC Trooper] +description "Clone Assassin A dexterous class with both stealth and combat-oriented custom options. @@ -194,10 +194,8 @@ A dexterous class with both stealth and combat-oriented custom options. -- Saber Defense (0) -- No Blaster Block -- Poisons on hit --- 53% less DMG --- 57% less reach --- 400% more radius --- Slap ^3[GB] +-- 57% less Reach +-- 400% more Radius ^6Inventory: - Cloaking Device diff --git a/z_MBLegends/ext_data/mb2/character/h7_HK47.mbch b/z_MBLegends/ext_data/mb2/character/h7_HK47.mbch index de7eb366d..36ab2594c 100644 --- a/z_MBLegends/ext_data/mb2/character/h7_HK47.mbch +++ b/z_MBLegends/ext_data/mb2/character/h7_HK47.mbch @@ -4,15 +4,15 @@ ClassInfo classNumberLimit 1 MBClass MB_CLASS_WOOKIE - weapons WP_SONIC_NADE|WP_FRAG_NADE|WP_MELEE|WP_T21|WP_EE4 + weapons WP_SONIC_NADE|WP_FRAG_NADE|WP_MELEE|WP_T21|WP_EE4|WP_TRIP_MINE - attributes MB_ATT_T21,3|MB_ATT_RECHARGE,3|MB_ATT_AMMO,3|MB_ATT_EE4,3|MB_ATT_FRAGS,2|MB_ATT_SONIC_DETONATOR,2|MB_ATT_POISON_DART,2|MB_ATT_FLAMETHROWER,1|MB_ATT_BESKAR,3|MB_ATT_BLAST_ARMOUR,1|MB_ATT_ANTI_MT,2|MB_ATT_TRACKING_BEACON + attributes MB_ATT_T21,3|MB_ATT_RECHARGE,3|MB_ATT_AMMO,3|MB_ATT_EE4,3|MB_ATT_FRAGS,2|MB_ATT_SONIC_DETONATOR,2|MB_ATT_POISON_DART,2|MB_ATT_BESKAR,3|MB_ATT_BLAST_ARMOUR,1|MB_ATT_ANTI_MT,2|MB_ATT_TRACKING_BEACON|MB_ATT_TRIP_MINES,3|MB_ATT_SHIELD_RECHARGE,1|MB_ATT_FLAMETHROWER,1 classflags CFL_SEEING_STEALTH knockbacktaken .85 - holdables HI_SENTRY_GUN //BASE? + //holdables HI_SENTRY_GUN //BASE? maxhealth 80 maxarmor 115 @@ -26,11 +26,10 @@ ClassInfo WP_T21Flags HELD_ALTRELOAD WP_EE4Flags HELD_DISRUPTIFY|HELD_ALTRELOAD + WP_TripMineFlags HELD_POISON|HELD_STUN special1 EAS_HI_POISON special2 EAS_HI_FLAME - special3 EAS_FP_SEE - special4 EAS_HI_SENTRY_GUN flourishAnim BOTH_STAND5TOAIM @@ -70,8 +69,8 @@ WeaponInfo0 Missile3Effect "Blaster/Shot04Y" AltMissileEffect "Blaster/Shot04Y" PowerupShotEffect "Blaster/Shot04Y" - FlashSound0 "sound/weapons/kotor/fire_med.wav" - AltFlashSound0 "sound/weapons/kotor/fire_power1.wav" + FlashSound0 "sound/weapons/kotor/fire_hvy.wav" + AltFlashSound0 "sound/weapons/kotor/fire_power2.wav" FPMult 1.3 clipsize 78 @@ -103,8 +102,21 @@ WeaponInfo1 rateMod 0.95 customAmmo 700 - FlashSound0 "sound/weapons/kotor/fire_power1.wav" - FlashSound0 "sound/weapons/kotor/fire_hvy.wav" + FlashSound0 "sound/weapons/kotor/fire_power1.wav" + altFlashSound0 "sound/weapons/kotor/fire_med.wav" +} + +WeaponInfo2 +{ + WeaponToReplace WP_TRIP_MINE + WeaponBasedOff WP_TRIP_MINE + NewWorldModel "models/weapons2/laser_trap/laser_trap_w.glm" + NewViewModel "models/weapons2/laser_trap/laser_trap.md3" + NewHandsModel "models/weapons2/laser_trap/laser_trap_hand.md3" + Icon "gfx/hud/w_icon_tripmine" + WeaponName "Dioxis Trip Mines" + customammo 3 + rateMod 0.9 } ForceInfo0 @@ -116,38 +128,39 @@ ForceInfo0 LoopSound "sound/ambience/cp_02_lp.wav" } -description "HK-series Assassin Droid [Wookiee] +description "HK-series Assassin Droid -A heavily armored long-range assassin, capable of sustained Wrist Flamethrower usage and equipped to terminate Force users. +A heavily armored assassin equipped to terminate Force users. ^2Weaponry: - Melee - Droid Assassin's Rifle (EE-4 3) --- 5% faster RoF --- 15% more FP DMG --- Mag reload -- Repeating Blaster Rifle (T-21 3) --- 15% more DMG --- 30% more FP DMG --- 25% more velocity +-- 15% more Dmg +-- 30% more FP Dmg +-- 25% more Velocity -- 25% slower RoF --- 25% slower mag reload +-- 25% slower Mag Reload +- Repeating Blaster Rifle (T-21 3) +-- 5% faster RoF +-- 15% more FP Dmg +-- Mag Reload - Frag Grenades (2) +- Dioxis Trip Mines (3) +-- Poisons/staggers on det +-- 10% faster RoF - Sonic Detonators (2) ^5Powers: -- Radar Scanner (Sense 1) ^3[CS3] - -^6Inventory: -- Assault Sentry ^3[CS4] +- Radar Scanner (Sense 1) ^8Attributes: - 15% faster Hacking -- 15% less KB taken +- 15% less Kb Taken - Strength (1) - Battery Recharge (3) - Beskar (3) - Blast Armor +- Armor Regen (1) - Anti-Mind Trick (2) - Sense Immunity - Tracking Beacon diff --git a/z_MBLegends/ext_data/mb2/character/h7_Hera.mbch b/z_MBLegends/ext_data/mb2/character/h7_Hera.mbch index 6c2942e72..96d28b196 100644 --- a/z_MBLegends/ext_data/mb2/character/h7_Hera.mbch +++ b/z_MBLegends/ext_data/mb2/character/h7_Hera.mbch @@ -13,7 +13,7 @@ ClassInfo MBClass MB_CLASS_HERO classNumberLimit 1 holdables HI_SHIELD|HI_EWEB|HI_SEEKER //BASE? -baseSpeed 260 + baseSpeed 260 modelscale 0.99 rateOfFire 0.9 // rateOfFire_Melee 0.9 @@ -65,10 +65,10 @@ WeaponInfo0 animCharge BOTH_PISTOL_ATTACK VelocityMod 1.15 rateMod 0.65 - damageMod 1.1 + damageMod 1.15 } -description "Hera Syndulla [Hero] +description "Hera Syndulla A dexterous and speedy commander with Quickthrow grenades and portable defensive utilities. Can repair her teammates' Armor. @@ -77,8 +77,8 @@ A dexterous and speedy commander with Quickthrow grenades and portable defensive -- 10% faster RoF - Blurrg-1120 Blaster Pistol (Clone Pistol 2) -- 35% faster RoF --- 15% more velocity --- 10% more DMG +-- 15% more Velocity +-- 15% more Dmg - Frag Grenade (1) - Pulse Grenades (3) @@ -95,7 +95,7 @@ A dexterous and speedy commander with Quickthrow grenades and portable defensive ^3Abilities: - Armor Dispenser (2) ^3['Use' on ^3allies] --- +1 range +-- +1 Range - Dodge (3) ^3[CS1] - Dex Roll ^3[CS2] - Quickthrow (1) ^3[CS3]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h7_Leia.mbch b/z_MBLegends/ext_data/mb2/character/h7_Leia.mbch index 3e433deb1..cf38aa7bd 100644 --- a/z_MBLegends/ext_data/mb2/character/h7_Leia.mbch +++ b/z_MBLegends/ext_data/mb2/character/h7_Leia.mbch @@ -18,14 +18,13 @@ ClassInfo speed 0.95 - holdables HI_MEDPAC_BIG|HI_MEDPAC + holdables HI_MEDPAC_BIG classflags CFL_STATVIEWER|CFL_NOPICKUPS special1 EAS_HI_DODGE special2 EAS_HI_KICK - special3 EAS_HI_MEDPAC - special4 EAS_HI_MEDPAC_BIG + special3 EAS_HI_MEDPAC_BIG flourishAnim BOTH_STAND5TOAIM bowAnim BOTH_SIT6 @@ -55,7 +54,7 @@ ClassInfo uishader_4 "models/players/boushh/mb2_icon_leia" model_5 "leia_SLAVE" - skin _5 "default" + skin_5 "default" uishader_5 "models/players/leia_slave/mb2_icon_default" model_6 "leia_endor" @@ -83,24 +82,23 @@ WeaponInfo0 FPChargeMult 1.2 } -description "Leia Skywalker Organa Solo [Jedi] +description "Leia Skywalker Organa Solo An agile commander/medic with slight Force sensitivity, grenades, and multiple healing options. ^2Weaponry: - Melee - Defender Sporting Pistol (3) --- 20% more charged FP DMG +-- 20% more Charged FP Dmg - E-11 Blaster Rifle (2) - Thermal Detonators (2) -- Concussion Grenades (3) +- V-59 Conc Grenades (3) ^5Force Powers: - Sense (2) ^6Inventory: -- Medpac ^3[CS3] -- Advanced Medpac ^3[CS4] +- Advanced Medpac ^3[CS3] ^8Attributes: - Healing (2) @@ -109,8 +107,8 @@ An agile commander/medic with slight Force sensitivity, grenades, and multiple h - Ally Stat Viewer ^3Abilities: -- Health/Armor Dispenser (3) ^3['Use' on allies] --- +1 range +- HP/Armor Dispenser (3) ^3['Use' on allies] +-- +1 Range - Flipkick (1) ^3[Contact Jump] - Dodge (2) ^3[CS1] - Gunkick ^3[CS2]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h7_Lobot.mbch b/z_MBLegends/ext_data/mb2/character/h7_Lobot.mbch index 0c9320e34..0e80836ee 100644 --- a/z_MBLegends/ext_data/mb2/character/h7_Lobot.mbch +++ b/z_MBLegends/ext_data/mb2/character/h7_Lobot.mbch @@ -6,7 +6,7 @@ ClassInfo weapons WP_MANDO_PISTOL|WP_MELEE|WP_CONC_NADE|WP_FRAG_NADE|WP_SABER - attributes MB_ATT_MICRO_GRENADES,2|MB_ATT_MANDO_PISTOL,2|MB_ATT_HEALING,2|MB_ATT_AMMO,3|MB_ATT_DODGE,3|MB_ATT_FRAGS,2|MB_ATT_DASH,2|MB_ATT_BLAST_ARMOUR|MB_ATT_SHIELD_RECHARGE,1|MB_ATT_FP_MIRALUKA,1|MB_ATT_FORCEBLOCK,1|MB_ATT_TRACKING_BEACON + attributes MB_ATT_MICRO_GRENADES,3|MB_ATT_MANDO_PISTOL,2|MB_ATT_HEALING,2|MB_ATT_AMMO,3|MB_ATT_DODGE,3|MB_ATT_FRAGS,2|MB_ATT_DASH,2|MB_ATT_BLAST_ARMOUR|MB_ATT_SHIELD_RECHARGE,1|MB_ATT_FP_MIRALUKA,1|MB_ATT_FORCEBLOCK,1|MB_ATT_TRACKING_BEACON baseSpeed 255 maxhealth 170 @@ -23,7 +23,7 @@ ClassInfo saberstyle SS_MEDIUM|SS_STRONG saber1_1 Wrench_Legends_2 - sabercolor 0 + sabercolor_1 0 saberstyle_1 SS_MEDIUM|SS_STRONG saberDamage 120 @@ -31,8 +31,8 @@ ClassInfo saberMaxChain 2 forcepowers FP_SEE,1 - forcepool 75 - forceregen 1.25 + forcepool 80 + forceregen 1.2 resource RESOURCE_ENERGY holdables HI_SENTRY_GUN|HI_SHIELD|HI_MEDPAC //BASE? @@ -78,9 +78,9 @@ WeaponInfo1 ChargeSound "sound/weapons/leia_pistol/altcharge.mp3" CustomAmmo 750 VelocityMod 1.15 - FPMult 1.15 + FPMult 1.2 rateMod 0.75 - damageMod 1.15 + damageMod 1.2 } ForceInfo0 @@ -121,7 +121,7 @@ ForceInfo0 animStand BOTH_STAND1 } */ -description "Lobot [Hero] +description "Lobot A speedy, damage-boosted Pistoleer with Grenades. @@ -131,18 +131,16 @@ A speedy, damage-boosted Pistoleer with Grenades. -- No Saber/Blaster Block -- Blocking resists Force Powers -- Chain Limit: 2 --- 125% more KB --- 50/76% less DMG --- 200% special DMG mult --- 40% less reach --- 167% more radius --- Slap ^3[GB] +-- 125% more Kb +-- 200% Spec Dmg mult +-- 40% less Reach +-- 167% more Radius - Relby-K23 'Stinger' Blaster Pistol (WESTAR 2) -- 25% faster RoF --- 15% more velocity --- 15% more DMG/FP DMG +-- 15% more Velocity +-- 20% more Dmg/FP Dmg - Frag Grenades (2) -- Concussion Grenades (2) +- V-59 Conc Grenades (3) ^6Inventory: - Medpac ^3[CS3] diff --git a/z_MBLegends/ext_data/mb2/character/h7_RebEngie.mbch b/z_MBLegends/ext_data/mb2/character/h7_RebEngie.mbch index 633471be6..0f6c6060d 100644 --- a/z_MBLegends/ext_data/mb2/character/h7_RebEngie.mbch +++ b/z_MBLegends/ext_data/mb2/character/h7_RebEngie.mbch @@ -34,7 +34,7 @@ ClassInfo sabercolor 0 saberstyle SS_TAVION saber1_1 reb_wrench_s - sabercolor 0 + sabercolor_1 0 saberstyle_1 SS_TAVION ASMultiplier 1.05 BPMultiplier 0 @@ -51,22 +51,22 @@ ClassInfo c_att_skill_0 MB_ATT_STUN_BATON c_att_names_0 "F-187 Fusioncutter (Stun Baton)" c_att_ranks_0 0 -c_att_descs_0 "Ignites on hit, 15% faster movement, 80% faster RoF, 65% less DMG" +c_att_descs_0 "Ignites on hit, 15% faster Movement, 80% faster RoF, 65% less Dmg" c_att_skill_1 MB_ATT_TRIP_MINES c_att_names_1 "Trip Mines" c_att_ranks_1 1,1,1 -c_att_descs_1 "15% faster movement" +c_att_descs_1 "15% faster Movement" c_att_skill_2 MB_ATT_PULSE_GRENADES c_att_names_2 "Pulse Grenade" c_att_ranks_2 1 -c_att_descs_2 "15% faster movement" +c_att_descs_2 "15% faster Movement" c_att_skill_3 MB_ATT_DET_PACK c_att_names_3 "Det Packs" c_att_ranks_3 1,1,1 -c_att_descs_3 "15% faster movement, DMG increases with rank" +c_att_descs_3 "15% faster Movement, Dmg increases with rank" uioverlay_l "gfx/icons/tactician" uioverlay_r "gfx/icons/infantry" @@ -123,9 +123,6 @@ WeaponInfo1 animAttackRun BOTH_ATTACK3 animAttack BOTH_ATTACK3 animAttackWalk BOTH_ATTACK3 - altMissileMissEffect "blobs/concussion" - altMissileHitHumanEffect "blobs/concussion" - altMissileHitDroidEffect "blobs/concussion" } WeaponInfo2 @@ -141,7 +138,7 @@ hasAnimOverrides 1 animReadyRun TORSO_WEAPONREADY0 animReady TORSO_WEAPONREADY0 animReadyWalk TORSO_WEAPONREADY0 -animReadyNoAmmo BOTH_ATTACK2 +animReadyNoAmmo TORSO_WEAPONREADY0 animAttackRun BOTH_ATTACK2 animAttack BOTH_ATTACK2 animAttackWalk BOTH_ATTACK2 @@ -161,25 +158,23 @@ WeaponInfo3 Icon "gfx/hud/w_icon_mwrench" WeaponName "Wrench" } -description "Rebel Engineer [Clone Trooper] +description "Rebel Engineer 2-life units with many Blobs, explosives, and turrets. ^2Weaponry: - Melee --- 15% faster movement +-- 15% faster Movement - Wrench (Cyan Saber) -- No Saber/Blaster Block -- No Saber Training --- 200% more KB --- 50% less DMG --- 40% less reach --- 167% more radius --- Slap ^3[GB] +-- 200% more Kb +-- 40% less Reach +-- 167% more Radius - DL-44 Blaster Pistol (2) -- 35% faster RoF --- 10% more charged FP DMG --- 10% less DMG +-- 10% more Charged FP Dmg +-- 10% less Dmg - DH-17 Blaster Carbine (Clone Rifle 1) -- Concussion/Ion Blobs (8) @@ -190,7 +185,7 @@ description "Rebel Engineer [Clone Trooper] ^8Attributes: - Reinforcement (1) -- 5% more KB given +- 5% more Kb Given - Getup (2) - Dexterity (1) - Assemble (3) diff --git a/z_MBLegends/ext_data/mb2/character/h7_RebSapper.mbch b/z_MBLegends/ext_data/mb2/character/h7_RebSapper.mbch index 0b55e2518..8485ca381 100644 --- a/z_MBLegends/ext_data/mb2/character/h7_RebSapper.mbch +++ b/z_MBLegends/ext_data/mb2/character/h7_RebSapper.mbch @@ -36,6 +36,7 @@ knockbackTaken 1.1 damageGiven 1.3 //IMPORTANT: This is to increase lightning and detpack damage by 30%. Set all other weapons' damageMod to the inverse, 1/damageGiven. (1/1.3 = 0.77) WP_MeleeFlags HELD_LOWDAMAGE|HELD_TRACKING WP_FragNadeFlags HELD_TRACKING +WP_DetPackFlags HELD_KNOCKBACK rateOfFire_Melee .8 modelscale 1.02 @@ -168,7 +169,7 @@ HandShader "gfx/effects/dekashield2" StartSound "sound/effects/woosh7.mp3" } -description "Rebel Sapper [Elite Trooper] +description "Rebel Sapper 2-life electronic saboteurs with damage-boosted gadgets. @@ -177,19 +178,20 @@ description "Rebel Sapper [Elite Trooper] -- Tracks on hit -- 20% faster RoF - DL-44 Blaster Pistol (2) --- 20% less DMG +-- 20% less Dmg - E-11 Blaster Carbine (CR-2 2) --- 10% more velocity --- 15% less DMG +-- 10% more Velocity +-- 15% less Dmg - Pulse Grenade Launcher (M5) -- 65% faster RoF -- Sec only - Tracker Grenade (1) (Frag) -- Tracks on hit --- 99.9% less DMG +-- 99.9% less Dmg -- Prim only - Pulse Grenades (2) - Det Packs (3) +-- Pushes on det -- 40% faster RoF ^5Powers: @@ -203,8 +205,8 @@ description "Rebel Sapper [Elite Trooper] ^8Attributes: - Reinforcement (1) - 15% faster Hacking -- 10% more KB taken -- 200% slower skill CD +- 10% more Kb Taken +- 200% slower Skill Cd - Resource Regen: 5/s - Dexterity (1) - Armor Regen: 2/s to 20 diff --git a/z_MBLegends/ext_data/mb2/character/h7_Scavenge.mbch b/z_MBLegends/ext_data/mb2/character/h7_Scavenge.mbch index d22291747..4287579b1 100644 --- a/z_MBLegends/ext_data/mb2/character/h7_Scavenge.mbch +++ b/z_MBLegends/ext_data/mb2/character/h7_Scavenge.mbch @@ -7,19 +7,19 @@ ClassInfo weapons WP_MELEE|WP_BLASTER|WP_TRIP_MINE|WP_PULSE_NADE|WP_FRAG_NADE|WP_STUN_BATON|WP_SABER - attributes MB_ATT_AMMO,3|MB_ATT_ASSEMBLE,2|MB_ATT_BLASTER,1|MB_ATT_DODGE,2|MB_ATT_DASH,1|MB_ATT_TRIP_MINES,1|MB_ATT_PULSE_GRENADES,1|MB_ATT_STUN_BATON,3|MB_ATT_SABER_COMBO_NONE + attributes MB_ATT_AMMO,3|MB_ATT_ASSEMBLE,2|MB_ATT_BLASTER,1|MB_ATT_DODGE,2|MB_ATT_DASH,1|MB_ATT_TRIP_MINES,1|MB_ATT_PULSE_GRENADES,1|MB_ATT_STUN_BATON,1|MB_ATT_SABER_COMBO_NONE maxhealth 70 - maxarmor 35 + maxarmor 30 - holdables HI_SEEKER|HI_MEDPAC|HI_SENTRY_GUN + holdables HI_SEEKER|HI_SENTRY_GUN modelscale 0.75 rateOfFire 1 rateOfFire_Melee 0.5 BPmultiplier 0 - + knockbackTaken 1.3 resource RESOURCE_ENERGY forcepool 65 @@ -29,14 +29,14 @@ ClassInfo extralives 2 classNumberLimit 4 - baseSpeed 262 + baseSpeed 260 saber1 Jawa_Wrench_Legends sabercolor 0 saberstyle SS_FAST saber1_1 Jawa_Wrench_Legends_2 - sabercolor1 0 + sabercolor_1 0 saberstyle_1 SS_FAST //saberMaxChain 1 @@ -44,8 +44,8 @@ ClassInfo special1 EAS_HI_DODGE special2 EAS_HI_DASH - special3 EAS_HI_MEDPAC - special4 EAS_HI_KICK + + special3 EAS_HI_KICK gloatAnim TORSO_SURRENDER_START flourishAnim BOTH_COWER1 @@ -139,7 +139,7 @@ WeaponInfo2 WeaponName "Short Wrench" } -description "Scavenger [Hero] +description "Scavenger 3-life midgets with munitions, gadgets, and an electric blaster. @@ -149,37 +149,35 @@ description "Scavenger [Hero] - Short Wrench (Blue Saber) -- No Saber/Blaster Block -- No Saber Training --- 200% more KB --- 58% less DMG --- 50% less reach --- 167% more radius --- Slap ^3[GB] +-- 200% more Kb +-- 50% less Reach +-- 167% more Radius - Ion Blaster (Rifle 1) -- Shocks on hit --- 30% more FP DMG --- 15% faster mag reload --- 20% less velocity +-- 30% more FP Dmg +-- 15% faster Mag Reload +-- 20% less Velocity -- 40% slower RoF - Stun Grenade (1) (Knockdown Frag) --- 50% less DMG +-- 50% less Dmg -- Sec only -- Detonates upon any contact -- Fully cooked nades are auto-thrown -- Cooking does not affect det. timer - Trip Mine (1) - Pulse Grenade (1) -- Stun Baton (3) +- Stun Baton (1) ^6Inventory: -- Medpac ^3[CS3] - Assault Sentry - Seeker Drone ^8Attributes: - Reinforcements (2) +- 30% more Kb Taken - Assemble (2) ^3Abilities: - Dodge (2) ^3[CS1] - Dash (1) ^3[CS2] -- Gunkick ^3[CS4]" \ No newline at end of file +- Gunkick ^3[CS3]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h7_Spy.mbch b/z_MBLegends/ext_data/mb2/character/h7_Spy.mbch index 17c1e75b2..e67de1a02 100644 --- a/z_MBLegends/ext_data/mb2/character/h7_Spy.mbch +++ b/z_MBLegends/ext_data/mb2/character/h7_Spy.mbch @@ -187,7 +187,7 @@ ForceInfo0 LoopSound "sound/ambience/cp_02_lp.wav" } -description "Rebel Spy [ARC Trooper] +description "Rebel Spy A 2-life custom class focused on cloak-and-dagger tactics. @@ -195,8 +195,7 @@ A 2-life custom class focused on cloak-and-dagger tactics. - Heavy Melee - Vibroknife (Cyan/Blue Saber) -- No Saber/Blaster Block --- 60% less reach --- Slap ^3[GB] +-- 60% less Reach ^6Inventory: - Medpac diff --git a/z_MBLegends/ext_data/mb2/character/h7_T3M4.mbch b/z_MBLegends/ext_data/mb2/character/h7_T3M4.mbch index 4c594c6df..f589e9451 100644 --- a/z_MBLegends/ext_data/mb2/character/h7_T3M4.mbch +++ b/z_MBLegends/ext_data/mb2/character/h7_T3M4.mbch @@ -80,7 +80,8 @@ WeaponInfo1 FlashSound1 "sound/weapons/kotor/fire_light.wav" FlashSound2 "sound/weapons/kotor/fire_light.wav" FlashSound3 "sound/weapons/kotor/fire_light.wav" - customammo 500 + customammo 600 +damageMod 1.1 } WeaponInfo2 @@ -119,24 +120,25 @@ ForceInfo0 ForcePowerName "Passive Radar Scanner" } -description "T3-M4 [Super Battle Droid] +description "T3-M4 A small, fast moving support class who can Hack into interfaces with superior speed. Outfitted with a disabling Ion Blaster and a freeze ray. ^2Weaponry: - Mounted Blaster (Arm Blaster 1) +-- 10% more Dmg -- Advanced Targeting ^3[Sec fire] - Ion Blaster (Clone Pistol 1) -- Shocks on hit --- 20% more FP DMG --- Mag reload +-- 20% more FP Dmg +-- Mag Reload - CryoBan Projector (Icethrower) --- 50% slower freeze rate --- 50% slower mag reload +-- 50% slower RoF +-- 50% slower Mag Reload ^8Attributes: -- Flat DMG Taken - Battery Recharge (3) +- Base Dmg Taken - Self-Repair (Armor Regen 1) - Passive Radar Scanner (Miraluka Vision 1) diff --git a/z_MBLegends/ext_data/mb2/character/h8_Chewie.mbch b/z_MBLegends/ext_data/mb2/character/h8_Chewie.mbch index 134e985cc..7f24d18f2 100644 --- a/z_MBLegends/ext_data/mb2/character/h8_Chewie.mbch +++ b/z_MBLegends/ext_data/mb2/character/h8_Chewie.mbch @@ -3,8 +3,8 @@ ClassInfo { name "h8_Chewie" - weapons WP_BOWCASTER|WP_SHOTGUN|WP_FRAG_NADE|WP_MELEE - attributes MB_ATT_BOWCASTER,3|MB_ATT_QUICKTHROW,1|MB_ATT_FRAGS,2|MB_ATT_WOOKIE_STRENGTH,2|MB_ATT_AMMO,3|MB_ATT_WOOKIE_HEALTH,3|MB_ATT_WOOKIEE_FURY,1|MB_ATT_SHOTGUN,2|MB_ATT_BLAST_ARMOUR|MB_ATT_TRACKING_BEACON + weapons WP_BOWCASTER|WP_SHOTGUN|WP_FRAG_NADE|WP_PULSE_NADE|WP_MELEE + attributes MB_ATT_BOWCASTER,3|MB_ATT_QUICKTHROW,1|MB_ATT_FRAGS,2|MB_ATT_PULSE_GRENADES,1|MB_ATT_WOOKIE_STRENGTH,2|MB_ATT_AMMO,3|MB_ATT_WOOKIE_HEALTH,3|MB_ATT_WOOKIEE_FURY,1|MB_ATT_SHOTGUN,2|MB_ATT_BLAST_ARMOUR|MB_ATT_TRACKING_BEACON maxhealth 500 maxarmor 100 modelscale 1.18 @@ -84,22 +84,23 @@ WeaponInfo1 FPChargeMult 1.1 } -description "Chewbacca aka 'Chewie' [Wookiee] +description "Chewbacca aka 'Chewie' -A high-health, high-power brawler/gunner hybrid that can bypass Saber Block with his shotgun spread. Resists Force Push/Pull. +A high-HP, high-power brawler/gunner hybrid that can bypass Saber Block with his shotgun spread. Resists Force Push/Pull. ^2Weaponry: - Melee -- 5% faster RoF - Wookiee Slugthrower (Shotgun 2) -- Staggers on hit --- Mag reload +-- Mag Reload - Chewbacca's Bowcaster (3) --- 10% more charged FP DMG +-- 10% more Charged FP Dmg - Frag Grenades (2) +- Pulse Grenade (1) ^8Attributes: -- 15% faster skill CD +- 15% faster Skill Cd - 10% faster Hacking - Strength (2) - Fury (1) diff --git a/z_MBLegends/ext_data/mb2/character/h8_K2SO.mbch b/z_MBLegends/ext_data/mb2/character/h8_K2SO.mbch index 8b06008bf..e3585198d 100644 --- a/z_MBLegends/ext_data/mb2/character/h8_K2SO.mbch +++ b/z_MBLegends/ext_data/mb2/character/h8_K2SO.mbch @@ -7,20 +7,18 @@ ClassInfo classNumberLimit 1 weapons WP_A280|WP_MELEE|WP_SABER - attributes MB_ATT_A280,2|MB_ATT_WOOKIE_HEALTH,3|MB_ATT_WOOKIE_STRENGTH,3|MB_ATT_AMMO,3|MB_ATT_BLAST_ARMOUR,1|MB_ATT_BESKAR,3|MB_ATT_ANTI_MT,2|MB_ATT_WOOKIEE_FURY,3|MB_ATT_RECHARGE,2 - armourRegenCap 100 - armourRegenAmount 1 - armourRegenRate 1500 + attributes MB_ATT_A280,2|MB_ATT_WOOKIE_HEALTH,3|MB_ATT_WOOKIE_STRENGTH,3|MB_ATT_AMMO,3|MB_ATT_BLAST_ARMOUR,1|MB_ATT_BESKAR,3|MB_ATT_ANTI_MT,2|MB_ATT_WOOKIEE_FURY,3|MB_ATT_RECHARGE,3|MB_ATT_SHIELD_RECHARGE,1 + maxhealth 210 maxarmor 200 basespeed 185 resource RESOURCE_BATTERY - forcepool 80 - forceregen 1 + forcepool 100 + forceregen 1.2 forcepowers FP_RAGE,3 - - special1 EAS_FP_RAGE + special1 EAS_FP_RAGE + special4 EAS_FP_RAGE special2 EAS_NONE //special3 EAS_HI_RECHARGE @@ -34,7 +32,7 @@ ClassInfo //damageTaken 0.8 knockbackGiven 1.1 - knockbackTaken 0.5 + knockbackTaken 0.2 saber1 k2melee_legends saberstyle SS_TAVION @@ -103,42 +101,42 @@ WeaponInfo1 altGore 1 } -description "K-2SO [Wookiee] +description "K-2SO An exceptionally sturdy tank with protection against multiple Force powers and damage types. Deals massive knockback. ^2Weaponry: - Limited Melee --- Flat KB: 150 --- 100% more DMG --- 15% slower movement +-- Flat Kb: 150 +-- 100% more Dmg +-- 15% slower Movement -- Grab/slap only - Droid Spankers (Cyan Saber) -- No Saber/Blaster Block -- Chain Limit: 1 --- Staggers/knocks down on hit --- 165% more KB --- 5% faster movement --- 200% special DMG mult --- 35% less reach --- 300% more radius --- Slap ^3[GB] +-- Staggers/trips on hit +-- 165% more Kb +-- 5% faster Movement +-- 200% Spec Dmg mult +-- 35% less Reach +-- 300% more Radius - SE-14r Light Repeating Blaster (A280 2) --- 15% more FP DMG +-- 15% more FP Dmg -- 45% slower RoF --- Mag reload +-- Mag Reload ^5Powers: -- Droid Rage (3) ^3[CS1] +- Droid Rage (3) ^3[CS1/4] ^8Attributes: -- Armor Regen: 1/1.5s to 100 -- 10% more KB given -- 50% less KB taken +- 10% more Kb Given +- 80% less Kb Taken - Fury (3) - Strength (3) +- Battery Recharge (3) - Beskar (3) - Blast Armor - Physical Resist +- Armor Regen (1) - Sense Immunity - Anti-Mind Trick (2)" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h8_NRSecDroid.mbch b/z_MBLegends/ext_data/mb2/character/h8_NRSecDroid.mbch index 337d643ef..b5f75d5ca 100644 --- a/z_MBLegends/ext_data/mb2/character/h8_NRSecDroid.mbch +++ b/z_MBLegends/ext_data/mb2/character/h8_NRSecDroid.mbch @@ -6,8 +6,8 @@ ClassInfo classNumberLimit 3 MBClass MB_CLASS_WOOKIE WP_SaberFlags HELD_PULSE - weapons WP_MELEE|WP_SABER|WP_THERMAL WP_ThermalFlags HELD_KNOCKBACK + weapons WP_MELEE|WP_SABER|WP_THERMAL attributes MB_ATT_ASSEMBLE,1|MB_ATT_AMMO,3 resource RESOURCE_BATTERY @@ -17,7 +17,7 @@ ClassInfo saberStyle SS_DESANN SaberDamage 70 APMultiplier 1.05 - ASMultiplier 0.9 + ASMultiplier 0.95 CSMultiplier 0.95 BPMultiplier 0 saberMaxChain 1 @@ -61,7 +61,7 @@ ClassInfo c_att_skill_1 MB_ATT_A280 c_att_names_1 "Modified DH-17 (A280)" - c_att_ranks_1 2,5,2 + c_att_ranks_1 2,4,2 c_att_skill_2 MB_ATT_BASE_TD c_att_names_2 "Heavy Thermal Grenades" @@ -69,7 +69,7 @@ ClassInfo c_att_skill_3 MB_ATT_FP_PULL c_att_names_3 "Magnetic (Force) Pull ^3[CS4]" - c_att_ranks_3 7 + c_att_ranks_3 6 c_att_skill_4 MB_ATT_RESPAWNS c_att_names_4 "Reinforcement" @@ -80,7 +80,7 @@ ClassInfo c_att_ranks_5 0,2,3 c_att_skill_6 MB_ATT_HEALTH - c_att_names_6 "Health (140/240/300)" + c_att_names_6 "HP (140/240/300)" c_att_ranks_6 3,6,15 c_att_skill_7 MB_ATT_ARMOUR @@ -155,10 +155,10 @@ ForceInfo0 Icon "gfx/forcepowers/push" ForcePowerName "Magnetic Pull" StartSound "sound/effects/woosh7.mp3" - HandShader "gfx/effects/dekashield2" + HandShader "gfx/effects/dekashield2" } -description "N5 Sentry Droid aka New Republic Security Droid [Wookiee] +description "N5 Sentry Droid aka New Republic Security Droid Tanky gunner/brawler hybrids who can spec into an extra life, many forms of damage protection, Wookiee attributes, and more. @@ -168,14 +168,12 @@ Tanky gunner/brawler hybrids who can spec into an extra life, many forms of dama -- No Saber/Blaster Block -- Chain Limit: 1 -- Shocks on hit --- 82% less DMG --- 40% less reach --- 166% more radius +-- 40% less Reach +-- 166% more Radius -- Prim only --- Slap ^3[GB] - Heavy Thermal Grenades (2) -- Pushes on det --- 150% more DMG +-- 150% more Dmg ^8Attributes: - Assemble (1) diff --git a/z_MBLegends/ext_data/mb2/character/h8_Tarfful.mbch b/z_MBLegends/ext_data/mb2/character/h8_Tarfful.mbch index 74626d265..1ff184fc8 100644 --- a/z_MBLegends/ext_data/mb2/character/h8_Tarfful.mbch +++ b/z_MBLegends/ext_data/mb2/character/h8_Tarfful.mbch @@ -59,7 +59,7 @@ WeaponInfo0 WeaponName "Ryyk Blade" } -description "Tarfful [Wookiee] +description "Tarfful A large tank with Fury, a deadly Ryyk Blade, and a Bowcaster. Immune to most knockdown and displacement moves. @@ -69,16 +69,14 @@ A large tank with Fury, a deadly Ryyk Blade, and a Bowcaster. Immune to most kno - Ryyk Blade (Purple Saber) -- Saber Defense (1) -- No Blaster Block --- 70% more KB --- 30% less DMG --- 33% more reach --- Slap ^3[GB] -- Trad Bowcaster (3) +-- 70% more Kb +-- 33% more Reach +- Traditional Bowcaster (3) - Frag Grenades (2) --- 50% less DMG +-- 50% less Dmg ^8Attributes: -- 10% faster skill CD +- 10% faster Skill Cd - Strength (3) - Fury (2) -- 10% slower Resource Decay diff --git a/z_MBLegends/ext_data/mb2/character/h8_Taunt.mbch b/z_MBLegends/ext_data/mb2/character/h8_Taunt.mbch index 534302f37..5e8573a97 100644 --- a/z_MBLegends/ext_data/mb2/character/h8_Taunt.mbch +++ b/z_MBLegends/ext_data/mb2/character/h8_Taunt.mbch @@ -110,19 +110,19 @@ velocityMod 0.8 selectSound "sound/chars/tauntaun/misc/chatter1.mp3" } -description "Wild Tauntaun [Wookiee] +description "Wild Tauntaun Frisky critters with fast feet. And I thought they smelled bad on the outside... ^2Weaponry: - Wild Beast (Limited Melee) -- Barge only --- 500% more DMG +-- 500% more Dmg - Freezing Spit (Shotgun 1) -- Freezes on hit --- 15% faster movement --- 30% less DMG --- 20% less velocity +-- 15% faster Movement +-- 30% less Dmg +-- 20% less Velocity ^5Powers: - Blubber (Protect 1) ^3[CS4] @@ -130,8 +130,8 @@ Frisky critters with fast feet. And I thought they smelled bad on the outside... ^8Attributes: - Reinforcement (1) - Bunny Hop (1) -- 20% faster skill CD -- 20% less KB taken +- 20% faster Skill Cd +- 20% less Kb Taken - 300% slower Hacking - Dexterity (2) - Stamina (2) @@ -139,7 +139,7 @@ Frisky critters with fast feet. And I thought they smelled bad on the outside... - Fury (3) - Healing (3) - Physical Resist -- Flat DMG Taken +- Base Dmg Taken - Smelly Guts (Acid Blood) ^3Abilities: diff --git a/z_MBLegends/ext_data/mb2/character/h8_WookWarr.mbch b/z_MBLegends/ext_data/mb2/character/h8_WookWarr.mbch index 6c5d8396c..e57d9b375 100644 --- a/z_MBLegends/ext_data/mb2/character/h8_WookWarr.mbch +++ b/z_MBLegends/ext_data/mb2/character/h8_WookWarr.mbch @@ -44,7 +44,7 @@ ClassInfo //rankModelScale 1.26,1.36,0.86 WP_RocketLauncherFlags HELD_ALTRELOAD|HELD_KNOCKBACK|HELD_SLOW WP_BowcasterFlags HELD_ALTRELOAD - + WP_TradBowcasterFlags HELD_ALTRELOAD gloatAnim BOTH_TUSKENTAUNT1 flourishAnim BOTH_VICTORY_FAST @@ -112,6 +112,7 @@ ClassInfo c_att_names_3 "Melee RoF (125%)" c_att_ranks_3 1 c_att_descs_3 "75% default" + c_att_skill_4 MB_ATT_PISTOL c_att_names_4 "Kashyyyk Side-Arm Pistol" c_att_ranks_4 0,0,1 @@ -120,20 +121,21 @@ ClassInfo c_att_skill_5 MB_ATT_BOWCASTER c_att_names_5 "Bowcaster" c_att_ranks_5 1,1,1 - c_att_descs_5 "No charge shots, Mag reload" + c_att_descs_5 "No charge shots, Mag Reload" c_att_skill_6 MB_ATT_TRAD_BOWCASTER c_att_names_6 "Traditional Bowcaster" c_att_ranks_6 1,1,1 + c_att_descs_6 "No charge shots, Mag Reload" c_att_skill_7 MB_ATT_ROCKET_LAUNCHER c_att_names_7 "Guided Rocket Launcher (10)" c_att_ranks_7 1 - c_att_descs_7 "Pushes on det, 50% slower RoF, 50% slower mag reload, -15% slower movement" + c_att_descs_7 "Pushes on det, 50% slower RoF, 50% slower Mag Reload, +15% slower Movement" c_att_skill_8 MB_ATT_DMG_GIVEN_MULTIPLIER - c_att_names_8 "DMG Given (115%)" + c_att_names_8 "Dmg Given (115%)" c_att_ranks_8 1 c_att_descs_8 "Does not affect Saber" @@ -155,31 +157,32 @@ ClassInfo c_att_ranks_12 1 c_att_skill_13 MB_ATT_STM_MULTIPLIER - c_att_names_13 "> Skill Cooldown (150%)" + c_att_names_13 "> Skill Cd (150%)" c_att_ranks_13 1 c_att_descs_13 "75% default" } WeaponInfo0 { - WeaponToReplace WP_BOWCASTER - WeaponBasedOff WP_BOWCASTER - NewWorldModel "models/weapons2/bowcaster/bowcaster_w.glm" - NewViewModel "models/weapons2/bowcaster/bowcaster.md3" - Icon "gfx/hud/w_icon_bowcaster" - WeaponName "Bowcaster" + WeaponToReplace WP_BOWCASTER + WeaponBasedOff WP_BOWCASTER + NewWorldModel "models/weapons2/bowcaster/bowcaster_w.glm" + NewViewModel "models/weapons2/bowcaster/bowcaster.md3" + Icon "gfx/hud/w_icon_bowcaster" + WeaponName "Bowcaster" clipsize 60 + customAmmo 800 AltFireEnabled 0 } WeaponInfo1 { - WeaponToReplace WP_BLASTER_PISTOL - WeaponBasedOff WP_BLASTER_PISTOL - NewWorldModel "models/weapons2/wsidearm/wsidearm.glm" - NewViewModel "models/weapons2/wsidearm/wsidearm.md3" - Icon "gfx/hud/w_icon_wsidearm" - WeaponName "Kashyyyk Side-Arm Blaster Pistol" + WeaponToReplace WP_BLASTER_PISTOL + WeaponBasedOff WP_BLASTER_PISTOL + NewWorldModel "models/weapons2/wsidearm/wsidearm.glm" + NewViewModel "models/weapons2/wsidearm/wsidearm.md3" + Icon "gfx/hud/w_icon_wsidearm" + WeaponName "Kashyyyk Side-Arm Blaster Pistol" AltFireEnabled 0 } @@ -195,12 +198,12 @@ WeaponInfo2 WeaponInfo3 { - WeaponToReplace WP_ROCKET_LAUNCHER - WeaponBasedOff WP_ROCKET_LAUNCHER - NewWorldModel "models/weapons2/wgrl/wgrl.glm" - NewViewModel "models/weapons2/wgrl/wgrl.md3" - Icon "gfx/hud/w_icon_wgrl" - WeaponName "Wookiee Guided Rocket Launcher" + WeaponToReplace WP_ROCKET_LAUNCHER + WeaponBasedOff WP_SHOTGUN + NewWorldModel "models/weapons2/wgrl/wgrl.glm" + NewViewModel "models/weapons2/wgrl/wgrl.md3" + Icon "gfx/hud/w_icon_wgrl" + WeaponName "Wookiee Guided Rocket Launcher" flashSound0 "sound/weapons/upl/fire_mortar.wav" flashSound1 "sound/weapons/upl/fire_mortar.wav" flashSound2 "sound/weapons/upl/fire_mortar.wav" @@ -227,18 +230,21 @@ WeaponInfo3 animAttackRun BOTH_PLX1_ATTACK animAttack BOTH_PLX1_ATTACK animAttackWalk BOTH_PLX1_ATTACK + animCharge BOTH_PLX1_ATTACK } WeaponInfo4 { - WeaponToReplace WP_TRAD_BOWCASTER - WeaponBasedOff WP_TRAD_BOWCASTER - NewWorldModel "models/weapons2/wbowcaster/wbowcaster3.glm" - NewViewModel "models/weapons2/wbowcaster/wbowcaster3.md3" - Icon "gfx/hud/w_icon_wbowcaster3" - WeaponName "Traditional Bowcaster" +WeaponToReplace WP_TRAD_BOWCASTER +WeaponBasedOff WP_BOWCASTER +NewWorldModel "models/weapons2/wbowcaster/wbowcaster3.glm" +NewViewModel "models/weapons2/wbowcaster/wbowcaster3.md3" +Icon "gfx/hud/w_icon_wbowcaster3" +WeaponName "Traditional Bowcaster" clipsize 60 + customAmmo 800 + AltFireEnabled 0 } -description "Wookiee Warrior [Wookiee] +description "Wookiee Warrior Tough 2-life units who can spec into Blasters, brawling, and Saber upgrades. Rage doubles as Blaster Defense. @@ -249,15 +255,13 @@ Tough 2-life units who can spec into Blasters, brawling, and Saber upgrades. Rag -- Saber Defense (0) -- Blaster Defense (3) -- Chain Limit: 3 --- 25% more reach --- 45% more KB --- 65/77% less DMG --- Slap ^3[GB] +-- 25% more Reach +-- 45% more Kb - Kashyyyk Side-Arm Blaster Pistol (2) -- Prim only - Det Packs (3) ^8Attributes: - Reinforcement (1) -- 25% slower skill CD +- 25% slower Skill Cd - Strength (1)" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h8_Wreck.mbch b/z_MBLegends/ext_data/mb2/character/h8_Wreck.mbch index 9eff4f877..a9e3c4e6c 100644 --- a/z_MBLegends/ext_data/mb2/character/h8_Wreck.mbch +++ b/z_MBLegends/ext_data/mb2/character/h8_Wreck.mbch @@ -6,13 +6,13 @@ ClassInfo MBClass MB_CLASS_WOOKIE classNumberLimit 1 weapons WP_MELEE|WP_DC_CARBINE|WP_DET_PACK|WP_TRIP_MINE|WP_THERMAL|WP_REAL_TD|WP_FRAG_NADE - attributes MB_ATT_WOOKIE_STRENGTH,2|MB_ATT_AMMO,3|MB_ATT_BLAST_ARMOUR|MB_ATT_HEALING,2|MB_ATT_DC_CARBINE,3|MB_ATT_WOOKIEE_FURY,1|MB_ATT_DET_PACK,4|MB_ATT_TRIP_MINES,4|MB_ATT_BASE_TD,6|MB_ATT_THERMALS,1|MB_ATT_FRAGS,2 + attributes MB_ATT_WOOKIE_STRENGTH,2|MB_ATT_AMMO,3|MB_ATT_BLAST_ARMOUR|MB_ATT_HEALING,2|MB_ATT_DC_CARBINE,3|MB_ATT_WOOKIEE_FURY,1|MB_ATT_DET_PACK,4|MB_ATT_TRIP_MINES,4|MB_ATT_BASE_TD,6|MB_ATT_THERMALS,1|MB_ATT_FRAGS,3 forcepool 100 resource RESOURCE_RAGE maxhealth 280 - maxarmor 180 + maxarmor 225 rateoffire_melee 1.10 rateoffire 0.75 @@ -25,7 +25,7 @@ ClassInfo bargeSoundOverride "sound/chars/wrecker/misc/taunt3.mp3" damageGiven 1.15 - damageTaken 0.9 + knockbackGiven 1.15 knockbackTaken 0.5 meleeknockback_flat 90 @@ -33,6 +33,11 @@ ClassInfo flourishAnim BOTH_STABDOWN_DUAL WP_DCCarbineFlags HELD_ALTRELOAD + WP_DetPackFlags HELD_KNOCKBACK|HELD_STUN|HELD_KNOCKDOWN + WP_TripMineFlags HELD_KNOCKBACK|HELD_STUN|HELD_KNOCKDOWN + WP_ThermalFlags HELD_KNOCKBACK|HELD_STUN|HELD_KNOCKDOWN + WP_RealTDFlags HELD_KNOCKBACK|HELD_STUN|HELD_KNOCKDOWN + WP_FragNadeFlags HELD_KNOCKBACK|HELD_STUN|HELD_KNOCKDOWN classflags CFL_STRONGAGAINSTPHYSICAL meleeMoves M_UPPERCUT|M_BLOCK|M_FBKICK|M_JUMPKICK|M_KATA|M_KICK|M_LEGSWEEP|M_PUNCH|M_RLKICK @@ -47,9 +52,9 @@ ClassInfo WeaponInfo0 { WeaponToReplace WP_DC_CARBINE - WeaponBasedOff WP_DC_CARBINE - NewWorldModel "models/weapons2/DC-17m/blaster.glm" - NewViewModel "models/weapons2/DC-17m/blaster.md3" +WeaponBasedOff WP_MANDO_PISTOL +NewWorldModel "models/weapons2/DC-17m/blaster.glm" +NewViewModel "models/weapons2/DC-17m/blaster.md3" FlashSound0 "sound/weapons/dc17m/fire.wav" FlashSound1 "sound/weapons/dc17m/fire.wav" FlashSound2 "sound/weapons/dc17m/fire.wav" @@ -94,8 +99,9 @@ WeaponInfo2 { WeaponToReplace WP_THERMAL WeaponBasedOff WP_THERMAL - NewWorldModel "models/weapons2/thermal/thermal_w.glm" - NewViewModel "models/weapons2/thermal/thermal_hand.md3" +NewWorldModel "models/weapons2/thermal/thermal_w.glm" +NewViewModel "models/weapons2/thermal/thermal.md3" +NewHandsModel "models/weapons2/thermal/thermal_hand.md3" Icon "gfx/hud/w_thermal_grenade" WeaponName "Heavy Thermal Grenades" altMissileMissEffect "Grenades/EXP_Explosion" @@ -107,28 +113,33 @@ WeaponInfo2 damagemod 2 } -description "CT-9903 aka 'Wrecker' [Wookiee] +description "CT-9903 aka 'Wrecker' A tanky Wookiee/gunner hybrid who specializes in mass destruction and area denial. Deploys explosives quickly. ^2Weaponry: - Melee --- Flat KB: 90 +-- Flat Kb: 90 -- 10% slower RoF - DC-17m Repeating Blaster Rifle (DC Carbine 3) --- 50% slower mag reload +-- 50% slower Mag Reload - Heavy Thermal Grenades (6) --- 100% more DMG -- Frag Grenades (2) +-- Staggers/pushes on det +-- 100% more Dmg +- Frag Grenades (3) +-- Staggers/pushes on det -- Prim only - Thermal Detonator (1) +-- Staggers/pushes/trips on det - Trip Mines (4) +-- Staggers/pushes/trips on det - Det Packs (4) +-- Staggers/pushes/trips on det ^8Attributes: -- 10% faster skill CD -- 15% more KB given -- 50% less KB taken +- 10% faster Skill Cd +- 15% more Kb Given +- 50% less Kb Taken - Strength (2) - Fury (1) - Healing (2) diff --git a/z_MBLegends/ext_data/mb2/character/h8_Zaal.mbch b/z_MBLegends/ext_data/mb2/character/h8_Zaal.mbch index eaea0a7cf..fd5bd70b1 100644 --- a/z_MBLegends/ext_data/mb2/character/h8_Zaal.mbch +++ b/z_MBLegends/ext_data/mb2/character/h8_Zaal.mbch @@ -96,26 +96,26 @@ WeaponInfo2 rateMod 1.25 } -description "Zaalbar aka 'Big Z' [Wookiee] +description "Zaalbar aka 'Big Z' -A jack-of-all-trades with a massive health pool, max Strength, choice of Vibrosaber, a stunning Pistol, and grenades. +A jack-of-all-trades with a massive HP pool, max Strength, choice of Vibrosaber, a stunning Pistol, and grenades. ^2Weaponry: - Melee - Vibrosaber -- Saber Defense (1) -- No Blaster Block --- 15% faster movement --- Slap ^3[GB] +-- 15% faster Movement > Vibroblade (Yellow) --- 48% more reach +-- 48% more Reach > Double Vibroswords (Dual) --- 5% more reach +-- 5% more Reach -- 5% faster AS - Sonic Pistol (1) -- Stuns on hit --- 50% more FP DMG --- 25% slower RoF/mag reload +-- 50% more FP Dmg +-- 25% slower RoF +-- 25% slower Mag Reload - Zaalbar's Bowcaster (3) -- 25% slower RoF - Pulse Grenades (3) diff --git a/z_MBLegends/ext_data/mb2/character/h9_Anakin.mbch b/z_MBLegends/ext_data/mb2/character/h9_Anakin.mbch index 7bb677d91..686ab2a05 100644 --- a/z_MBLegends/ext_data/mb2/character/h9_Anakin.mbch +++ b/z_MBLegends/ext_data/mb2/character/h9_Anakin.mbch @@ -15,6 +15,7 @@ ClassInfo speed 1.03 damageGiven 1.10 + rateOfFire_Melee .9 maxhealth 135 forcepool 120 forceregen 1.1 @@ -22,7 +23,7 @@ ClassInfo saberDamageStyle SS_STRONG,280|SS_DESANN,280|SS_MEDIUM,240 saberstyle SS_MEDIUM|SS_STRONG|SS_DESANN - saberSpecialDamage 1.25 + saberSpecialDamage 1.35 APmultiplier 1.2 BPmultiplier 1.1 ASmultiplier 1.15 @@ -80,21 +81,20 @@ ClassInfo sabercolor_1 4 } -description "Anakin Skywalker [Jedi] +description "Anakin Skywalker -A master of combat - possessing equally strong Lightsaber and Force abilities. Regains BP upon defeating enemies. +A master of combat - possessing equally strong Lightsaber and Force abilities. ^2Weaponry: - Melee +-- 10% faster RoF - Lightsaber (Yellow/Red/Purple) -- Saber Defense (3) --- Blaster Defense (2) --- Saber Deflect (2) --- 30/46% less Red/Purple DMG --- 125% special DMG mult +-- Blaster Defense/Deflect (2) +-- 30/46% less Red/Purple Dmg +-- 135% Spec Dmg mult -- EX Saber Throw (1) ^3[CS1] ---- 50% more DMG --- Slap ^3[GB] +--- 50% more Dmg ^5Force Powers: - Jump (3) diff --git a/z_MBLegends/ext_data/mb2/character/h9_JAcrobat.mbch b/z_MBLegends/ext_data/mb2/character/h9_JAcrobat.mbch index 91c069581..428e13f8b 100644 --- a/z_MBLegends/ext_data/mb2/character/h9_JAcrobat.mbch +++ b/z_MBLegends/ext_data/mb2/character/h9_JAcrobat.mbch @@ -13,12 +13,13 @@ ClassInfo speed 1.08 rateOfFire_Melee 0.88 - maxhealth 115 + maxhealth 125 forcepool 110 forceregen 1.2 - + damageGiven 1.1 saberstyle SS_DUAL|SS_FAST - saberDamageStyle SS_DUAL,200|SS_FAST,130 + saberDamageStyle SS_DUAL,220|SS_FAST,130 + saberSpecialDamage 1.35 saberThrowDamage 45 BPmultiplier 0.90 ASmultiplier 1.15 @@ -74,9 +75,9 @@ ClassInfo } -description "Jedi Acrobat [Jedi] +description "Jedi Acrobat -A speedy dual Lightsaber user that excels at flanking, ambushing, and aerial combat. +A speedster that excels at flanking, ambushing, and aerial combat. ^2Weaponry: - Melee @@ -86,10 +87,10 @@ A speedy dual Lightsaber user that excels at flanking, ambushing, and aerial com --- BP-Free Jumps -- Blaster Defense (2) -- Blaster Deflect (3) --- 23% less Dual/8% more Blue DMG +-- 15% less Dual/8% more Blue Dmg +-- 135% Spec Dmg mult -- Saber Throw ^3[CS1] ---- 50% more DMG --- Slap ^3[GB] +--- 50% more Dmg ^5Force Powers: - Jump (3) diff --git a/z_MBLegends/ext_data/mb2/character/h9_JBrute.mbch b/z_MBLegends/ext_data/mb2/character/h9_JBrute.mbch index ee241585e..8c3057f5e 100644 --- a/z_MBLegends/ext_data/mb2/character/h9_JBrute.mbch +++ b/z_MBLegends/ext_data/mb2/character/h9_JBrute.mbch @@ -2,20 +2,20 @@ ClassInfo { - name "h9_JBrute" + name "h9_JBrute" - MBClass MB_CLASS_JEDI + MBClass MB_CLASS_JEDI classNumberLimit 1 - weapons WP_MELEE|WP_SABER + weapons WP_MELEE|WP_SABER attributes MB_ATT_FORCEBLOCK,1|MB_ATT_DEFLECT,2|MB_ATT_FORCEFOCUS,1|MB_ATT_FP_REPULSE,3|MB_ATT_HEALING,1|MB_ATT_WOOKIE_STRENGTH,2|MB_ATT_GETUPS,3 - forcepowers FP_SABER_OFFENSE,3|FP_LEVITATION,2|FP_SABERTHROW,2|FP_PROTECT,1|FP_PUSH,1 + forcepowers FP_SABER_OFFENSE,3|FP_LEVITATION,2|FP_SABERTHROW,2|FP_PROTECT,1|FP_PUSH,1 - speed 0.97 + speed 0.97 - saber1 dual_2_legends + saber1 dual_2_legends sabercolor 4 saber1_1 dual_4_legends @@ -34,6 +34,7 @@ ClassInfo CSmultiplier 1.05 saberThrowDamage 70 saberDamageStyle SS_STAFF,280|SS_STRONG,320 + saberSpecialDamage 1.25 rankDmgGiven 1.5 forceregen 0.90 @@ -55,8 +56,8 @@ ClassInfo modelScale 1.18 uioverlay_r "gfx/icons/frontline" uioverlay_l "gfx/icons/brawler" - model "jedibrute" - skin "default" + model "jedibrute" + skin "default" uishader "models/players/jedibrute/mb2_icon_default" model_1 "jedi_chewy" @@ -110,10 +111,10 @@ ClassInfo c_att_skill_4 MB_ATT_SS_REDSTYLE c_att_names_4 "Red Saber Style" c_att_ranks_4 6 - c_att_descs_4 "38% less DMG" + c_att_descs_4 "38% less Dmg" c_att_skill_5 MB_ATT_DMG_GIVEN_MULTIPLIER - c_att_names_5 "DMG Given (150%)" + c_att_names_5 "Dmg Given (150%)" c_att_ranks_5 2 c_att_descs_5 "Does not affect Saber" @@ -126,11 +127,11 @@ ClassInfo c_att_ranks_7 1,2,3 c_att_skill_8 MB_ATT_POWER - c_att_names_8 "Force Pool (110/130/150)" + c_att_names_8 "FP (110/130/150)" c_att_ranks_8 2,4,4 c_att_skill_9 MB_ATT_HEALTH - c_att_names_9 "Health (200/250/300)" + c_att_names_9 "HP (200/250/300)" c_att_ranks_9 3,3,3 c_att_skill_10 MB_ATT_BLAST_ARMOUR @@ -138,11 +139,11 @@ ClassInfo c_att_ranks_10 3 c_att_skill_11 MB_ATT_KB_TAKEN_MULTIPLIER - c_att_names_11 "KB Taken (10%)" + c_att_names_11 "Kb Taken (10%)" c_att_ranks_11 2 } -description "Jedi Brute [Jedi] +description "Jedi Brute A large melee bruiser that wields a high-powered, long-reaching staff lightsaber. @@ -151,21 +152,21 @@ A large melee bruiser that wields a high-powered, long-reaching staff lightsaber - Lightsaber (Staff) -- Blaster Deflect (2) -- Chain Limit: 5 --- 43% more reach --- 7% more DMG --- 115% more KB +-- 43% more Reach +-- 7% more Dmg +-- 125% Spec Dmg mult +-- 115% more Kb -- EX Saber Throw (2) ^3[CS1] ---- 133% more DMG --- Slap ^3[GB] +--- 133% more Dmg ^5Force Powers: - Jump (2) - Push (1) -- Protect (1) ^3[CS4] - Repulse ^3[CS1 Melee] +- Protect (1) ^3[CS4] ^8Attributes: -- 25% slower skill CD +- 25% slower Skill Cd - Getup (3) - Strength (2) - Physical Resist diff --git a/z_MBLegends/ext_data/mb2/character/h9_JCrusader.mbch b/z_MBLegends/ext_data/mb2/character/h9_JCrusader.mbch index 57b2cc717..842e7a3d0 100644 --- a/z_MBLegends/ext_data/mb2/character/h9_JCrusader.mbch +++ b/z_MBLegends/ext_data/mb2/character/h9_JCrusader.mbch @@ -18,17 +18,16 @@ ClassInfo forcepool 125 forceregen 1.1 resource RESOURCE_FORCE - + rateOfFire_melee .9 APmultiplier 1.3 ASmultiplier 1.05 CSmultiplier 1.15 saberstyle SS_STRONG|SS_MEDIUM saberDamageStyle SS_STRONG,280|SS_MEDIUM,240 saberThrowDamage 40 - - special2 EAS_NONE + saberSpecialDamage 1.25 + special2 EAS_FP_ABSORB special3 EAS_FP_SPEED - special4 EAS_FP_ABSORB classflags CFL_NOPICKUPS @@ -43,8 +42,11 @@ ClassInfo saber1_2 saber_fisto sabercolor_2 3 - saber1_3 saber_revan + saber1_3 kotorsab sabercolor_3 4 + + saber1_4 saber_revan2 + sabercolor_4 5 uioverlay "gfx/icons/frontline" modelScale 1.06 @@ -93,27 +95,27 @@ ClassInfo uishader_10 "models/players/jedi_revan/mb2_icon_default" } -description "Jedi Crusader [Jedi] +description "Jedi Crusader An offense-oriented Jedi, characterized by powerful Lightsaber swings and solid Force abilities. ^2Weaponry: - Melee +-- 10% faster RoF - Lightsaber (Yellow/Red) -- Saber Defense (3) --- Blaster Defense (2) --- Saber Deflect (2) --- 46% less Red DMG +-- Blaster Defense/Deflect (2) +-- 46% less Red Dmg +-- 125% Spec Dmg mult -- Saber Throw ^3[CS1] ---- 33% more DMG --- Slap ^3[GB] +--- 33% more Dmg ^5Force Powers: - Jump (3) - Push (3) - Pull (2) - Sense (2) -- Absorb (3) ^3[CS4] +- Absorb (3) ^3[CS2] - Speed (3) ^3[CS3] ^8Attributes: diff --git a/z_MBLegends/ext_data/mb2/character/h9_JGladiator.mbch b/z_MBLegends/ext_data/mb2/character/h9_JGladiator.mbch index a52ce9efe..da41d4a08 100644 --- a/z_MBLegends/ext_data/mb2/character/h9_JGladiator.mbch +++ b/z_MBLegends/ext_data/mb2/character/h9_JGladiator.mbch @@ -3,35 +3,32 @@ ClassInfo { name "h9_JGladiator" + MBClass MB_CLASS_JEDI + classNumberLimit 1 weapons WP_SABER|WP_MELEE - attributes MB_ATT_DEFLECT,3|MB_ATT_FORCEBLOCK,2|MB_ATT_FORCEFOCUS,2|MB_ATT_GUN_DEFENSE,2|MB_ATT_FP_SABER_DEFENSE,3 - saberstyle SS_FAST|SS_TAVION + + attributes MB_ATT_DEFLECT,3|MB_ATT_FORCEBLOCK,2|MB_ATT_FORCEFOCUS,2|MB_ATT_GUN_DEFENSE,2|MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_HEALING,1 forcepowers FP_SABER_OFFENSE,3|FP_LEVITATION,3|FP_PUSH,2|FP_PULL,2|FP_PROTECT,2|FP_SEE,2|FP_SPEED,3|FP_SABERTHROW,2 maxhealth 145 forcepool 120 - MBClass MB_CLASS_JEDI - + forceregen 1.04 + rateOfFire_Melee .9 + damageGiven 1.1 //special1 EAS_FP_SABERTHROW special2 EAS_NONE special3 EAS_FP_SPEED special4 EAS_FP_PROTECT - classNumberLimit 1 - BPmultiplier 1.0 + saberMaxChain 4 APmultiplier 1.2 - CSmultiplier 1 - ASmultiplier 1 - modelscale 1.05 saberThrowDamage 40 - uioverlay "gfx/icons/frontline" - - classNumberLimit 1 + saberstyle SS_FAST|SS_TAVION + saberDamage 240 + saberSpecialDamage 1.25 + classflags CFL_NOPICKUPS - forceregen 1.04 - - saberMaxChain 4 saber1 saber_ki_adi_legends sabercolor 4 @@ -46,53 +43,53 @@ ClassInfo sabercolor_3 3 //flourishAnim BOTH_DEFLECTSLASH__R__L_FIN - + modelscale 1.05 + uioverlay "gfx/icons/frontline" model "Ki_Adi_VM" skin "default" uishader "models/players/Ki_Adi_VM/mb2_icon_default" - model_1 "shaakti" + model_1 "shaakti" skin_1 "default" - uishader_1 "models/players/Shaakti/mb2_icon_default" + uishader_1 "models/players/Shaakti/mb2_icon_default" - model_2 "coleman" + model_2 "coleman" skin_2 "default" uishader_2 "models/players/coleman/mb2_icon_default" - model_3 "coleman" + model_3 "coleman" skin_3 "robed" - uishader_3 "models/players/coleman/mb2_icon_robed" + uishader_3 "models/players/coleman/mb2_icon_robed" model_4 "eeth_koth" - skin_4 "saeseetiin" + skin_4 "saeseetiin" uishader_4 "models/players/eeth_koth/mb2_icon_saeseetiin" model_5 "eeth_koth" - skin_5 "saeseetiin_robed" + skin_5 "saeseetiin_robed" uishader_5 "models/players/eeth_koth/mb2_icon_saeseetiin_robed" - model_6 "foul_moudama" + model_6 "foul_moudama" skin_6 "default" uishader_6 "models/players/foul_moudama/mb2_icon_default" - - //respawncustomtime 50000 } -description "Jedi Gladiator [Jedi] +description "Jedi Gladiator -An offense-oriented Jedi with uniquely high-damage, extended-combo Cyan and Blue styles. +A rushdown Jedi with uniquely high-damage and extended-combo Fast saber styles. ^2Weaponry: - Melee +-- 10% faster RoF - Lightsaber (Cyan/Blue) -- Saber Defense (3) -- Blaster Defense (2) -- Blaster Deflect (3) -- Chain Limit: 4 --- 100% more DMG +-- 100% more Dmg +-- 125% Spec Dmg mult -- EX Saber Throw (2) ^3[CS1] ---- 33% more DMG --- Slap ^3[GB] +--- 33% more Dmg ^5Force Powers: - Jump (3) @@ -103,4 +100,5 @@ An offense-oriented Jedi with uniquely high-damage, extended-combo Cyan and Blue - Speed (3) ^3[CS3] ^8Attributes: +- Healing (1) - Force Block/Focus (2)" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h9_JKnight.mbch b/z_MBLegends/ext_data/mb2/character/h9_JKnight.mbch index f5e6ac4a1..c67098d60 100644 --- a/z_MBLegends/ext_data/mb2/character/h9_JKnight.mbch +++ b/z_MBLegends/ext_data/mb2/character/h9_JKnight.mbch @@ -217,7 +217,7 @@ ClassInfo c_att_ranks_5 4,2 c_att_skill_6 MB_ATT_POWER - c_att_names_6 "Force Pool (120)" + c_att_names_6 "FP (120)" c_att_ranks_6 8 c_att_skill_7 MB_ATT_FORCEBLOCK @@ -228,13 +228,13 @@ ClassInfo c_att_names_8 "Fast Saber Styles" c_att_ranks_8 4,0,2 c_att_descs_8 "Blue, Cyan, both -8% more DMG" +8% more Dmg" c_att_skill_9 MB_ATT_SABER_STRONG c_att_names_9 "Strong Saber Styles" c_att_ranks_9 4,0,2 c_att_descs_9 "Red, Purple, both -46/30% less Red/Purple DMG" +46/30% less Red/Purple Dmg" c_att_skill_10 MB_ATT_FP_SABER_DEFENSE c_att_names_10 "Saber Defense" @@ -253,7 +253,7 @@ ClassInfo c_att_ranks_13 2,2,2 } -description "Jedi Knight [Jedi] +description "Jedi Knight 2-life Jedi with customizable Force Powers and Lightsaber attributes. @@ -261,7 +261,6 @@ description "Jedi Knight [Jedi] - Melee - Lightsaber (Yellow) -- Saber Throw ^3[CS1] --- Slap ^3[GB] ^8Attributes: - Reinforcement (1) diff --git a/z_MBLegends/ext_data/mb2/character/h9_JSage.mbch b/z_MBLegends/ext_data/mb2/character/h9_JSage.mbch index a2e1661de..eb70e2814 100644 --- a/z_MBLegends/ext_data/mb2/character/h9_JSage.mbch +++ b/z_MBLegends/ext_data/mb2/character/h9_JSage.mbch @@ -8,23 +8,24 @@ Classinfo weapons WP_SABER|WP_MELEE - attributes MB_ATT_FORCEBLOCK,3|MB_ATT_DEFLECT,0|MB_ATT_FORCEFOCUS,2|MB_ATT_INAIR_FORCE_REGEN|MB_ATT_GUN_DEFENSE,1|MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_FLIPKICK,1|MB_ATT_BUNNY_HOP,1|MB_ATT_DEXTERITY,3 + attributes MB_ATT_FORCEBLOCK,3|MB_ATT_DEFLECT,0|MB_ATT_FORCEFOCUS,2|MB_ATT_INAIR_FORCE_REGEN|MB_ATT_GUN_DEFENSE,1|MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_FLIPKICK,1|MB_ATT_BUNNY_HOP,1|MB_ATT_DEXTERITY,3|MB_ATT_HEALING,1 forcepowers FP_SABER_OFFENSE,3|FP_PUSH,2|FP_PULL,3|FP_SEE,3|FP_PROTECT,1|FP_ABSORB,2|FP_SABERTHROW,2|FP_SPEED,3 APmultiplier 1.35 BPmultiplier 0.7 - CSmultiplier 1.2 - ASmultiplier 1.2 - + CSmultiplier 1.15 + ASmultiplier 1.15 + saberThrowDamage 40 saberstyle SS_STRONG saberDamageStyle SS_STRONG,280 - - maxhealth 65 + saberSpecialDamage 1.25 + maxhealth 60 forcepool 75 forceregen 1.45 - + rateOfFire_Melee .9 + damageGiven 1.1 //special1 EAS_FP_SABERTHROW game chooses spec1 if not defined, leave as is special2 EAS_FP_ABSORB special3 EAS_FP_SPEED @@ -79,22 +80,22 @@ Classinfo c_att_ranks_0 0,0,0 } -Description "Jedi Sage [Jedi] +Description "Jedi Sage -A small and fragile duelist/Force user. Relies on evasive, aggressive movement and Force power usage. +A glass cannon duelist and Force user with exceptional offensive and evasive skills. ^2Weaponry: - Melee +-- 10% faster RoF - Lightsaber (Red) -- Saber Defense (3) --- BP-Free Jumps -- Blaster Defense (1) --- 46% less DMG --- 30% less reach --- 26% less radius +-- 125% Spec Dmg mult +-- 30% less Reach +-- 26% less Radius -- EX Saber Throw (2) ^3[CS1] ---- 33% more DMG --- Slap ^3[GB] +--- 33% more Dmg ^5Force Powers: - Push (2) diff --git a/z_MBLegends/ext_data/mb2/character/h9_JSword.mbch b/z_MBLegends/ext_data/mb2/character/h9_JSword.mbch index 7ab1bc263..38553a043 100644 --- a/z_MBLegends/ext_data/mb2/character/h9_JSword.mbch +++ b/z_MBLegends/ext_data/mb2/character/h9_JSword.mbch @@ -7,14 +7,14 @@ ClassInfo MBClass MB_CLASS_JEDI weapons WP_SABER|WP_MELEE - attributes MB_ATT_DEFLECT,3|MB_ATT_FORCEBLOCK,2|MB_ATT_FORCEFOCUS,1|MB_ATT_GUN_DEFENSE,2|MB_ATT_INAIR_FORCE_REGEN|MB_ATT_FP_SABER_DEFENSE,3 + attributes MB_ATT_DEFLECT,3|MB_ATT_FORCEBLOCK,2|MB_ATT_FORCEFOCUS,1|MB_ATT_GUN_DEFENSE,2|MB_ATT_INAIR_FORCE_REGEN|MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_HEALING,1 forcepowers FP_SEE,1|FP_LEVITATION,3|FP_PUSH,2|FP_SABER_OFFENSE,3|FP_PULL,1|FP_SPEED,3|FP_PROTECT,1 maxhealth 135 forcepool 120 forceregen 1.04 - + rateOfFire_Melee .9 damageGiven 1.2 //special1 EAS_FP_SABERTHROW @@ -22,9 +22,9 @@ ClassInfo special3 EAS_FP_SPEED special4 EAS_FP_PROTECT - saberDamageStyle SS_STRONG,280|SS_DESANN,280|SS_FAST,160|SS_TAVION,160 + saberDamageStyle SS_STRONG,280|SS_DESANN,280|SS_FAST,160|SS_TAVION,160|SS_MEDIUM,240 saberstyle SS_MEDIUM - saberSpecialDamage 1.3 + saberSpecialDamage 1.35 saberThrowDamage 50 APmultiplier 1.25 BPmultiplier 1.25 @@ -42,7 +42,7 @@ ClassInfo skin_1 "old" uishader_1 "models/players/Cin_Drallig/mb2_icon_old" - model_2 "dooku_totj" + model_2 "Dooku_totj" skin_2 "default" uishader_2 "models/players/dooku_totj/mb2_icon_default" @@ -84,29 +84,29 @@ ClassInfo c_att_names_2 "Fast Saber Styles" c_att_ranks_2 0,0,0 c_att_descs_2 "Blue, Cyan, both -25% more DMG" +25% more Dmg" c_att_skill_3 MB_ATT_SABER_STRONG c_att_names_3 "Strong Saber Styles" c_att_ranks_3 0,0,0 c_att_descs_3 "Red, Purple, both -46/30% less Red/Purple DMG" +46/30% less Red/Purple Dmg" } -description "Jedi Swordmaster [Jedi] +description "Jedi Swordmaster -A master saberist that sacrifices Force abilities for unmatched dueling skills. +A duelist unmatched in his field. ^2Weaponry: - Melee +-- 10% faster RoF - Lightsaber (Yellow) -- Saber Defense (3) -- Blaster Defense (2) -- Blaster Deflect (3) --- 130% special DMG mult +-- 130% Spec Dmg mult -- Saber Throw ^3[CS1] ---- 66% more DMG --- Slap ^3[GB] +--- 66% more Dmg ^5Force Powers: - Jump (3) @@ -117,6 +117,7 @@ A master saberist that sacrifices Force abilities for unmatched dueling skills. - Speed (3) ^3[CS3] ^8Attributes: +- Healing (1) - Force Block (2) - Force Focus (1) - Aerial Force Regen" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h9_JYoung.mbch b/z_MBLegends/ext_data/mb2/character/h9_JYoung.mbch index edf461843..dca4220f4 100644 --- a/z_MBLegends/ext_data/mb2/character/h9_JYoung.mbch +++ b/z_MBLegends/ext_data/mb2/character/h9_JYoung.mbch @@ -23,10 +23,12 @@ ClassInfo //flourishAnim BOTH_COWER1 classflags CFL_NOPICKUPS speed 0.95 - + knockbackTaken 1.1 saberThrowDamage 35 saberstyle SS_MEDIUM|SS_FAST + rateOfFire_Melee .8 saberdamagestyle SS_MEDIUM,120|SS_FAST,120 + saberSpecialDamage 1.2 BPmultiplier 0.8 uioverlay_l "gfx/icons/frontline" @@ -66,20 +68,20 @@ ClassInfo sabercolor_2 2 } -description "Jedi Youngling [Jedi] +description "Jedi Youngling A tiny 3-life Jedi-in-training; they don't know what they're going to do. ^2Weaponry: - Melee +-- 20% faster RoF - Training Lightsaber (Yellow/Blue) -- Saber/Blaster Defense (1) -- Blaster Deflect (1) --- 50% less Yellow DMG --- 25% less reach +-- 120% Spec Dmg mult +-- 25% less Reach -- Saber Throw ^3[CS1] ---- 16% more DMG --- Slap ^3[GB] +--- 16% more Dmg ^5Force Powers: - Jump (2) @@ -92,5 +94,6 @@ A tiny 3-life Jedi-in-training; they don't know what they're going to do. ^8Attributes: - Reinforcements (2) +- 10% more Kb Taken - Force Block (2) - Assemble (2)" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h9_JediTG.mbch b/z_MBLegends/ext_data/mb2/character/h9_JediTG.mbch index e7b69def2..d04a8b542 100644 --- a/z_MBLegends/ext_data/mb2/character/h9_JediTG.mbch +++ b/z_MBLegends/ext_data/mb2/character/h9_JediTG.mbch @@ -17,16 +17,17 @@ ClassInfo forceregen 1 maxhealth 130 - maxarmor 40 - rankArmor 90 - + maxarmor 40 + rankArmor 90 + damageGiven 1.1 basespeed 210 //still slower than sith jugg at 213.8 - + rateOfFire_Melee .9 meleeSpecial1 EAS_FP_REPULSE special2 EAS_FP_DRAIN special3 EAS_FP_ABSORB special4 EAS_FP_PROTECT - + saberDamageStyle SS_STAFF,260|SS_DESANN,280 + saberSpecialDamage 1.25 saberstyle SS_STAFF|SS_DESANN saber1 saber_temple_guard_legends sabercolor 2 @@ -89,25 +90,26 @@ WeaponInfo0 selectSound "s/w/t/staffswing4.mp3" } -description "Jedi Temple Guard [Jedi] +description "Jedi Temple Guard Slow, defensively-oriented Jedi with self-buffing abilities. ^2Weaponry: - Melee +-- 10% faster RoF - Lightsaber Pike (Staff/Purple) -- Saber Defense (3) -- Blaster Defense/Deflect (2) --- 21% less reach --- Slap ^3[GB] +-- 30% less Purple Dmg +-- 21% less Reach ^5Force Powers: - Jump (1) - Push (1) - Sense (2) +- Repulse ^3[CS1 Melee] - Drain (1) ^3[CS2] - Absorb (1) ^3[CS3] -- Repulse ^3[CS1 Melee] - Protect (1) ^3[CS4] ^8Attributes: diff --git a/z_MBLegends/ext_data/mb2/character/h9_Windu.mbch b/z_MBLegends/ext_data/mb2/character/h9_Windu.mbch index 126223ec5..1b9604d9e 100644 --- a/z_MBLegends/ext_data/mb2/character/h9_Windu.mbch +++ b/z_MBLegends/ext_data/mb2/character/h9_Windu.mbch @@ -13,14 +13,13 @@ ClassInfo attributes MB_ATT_FORCEBLOCK,2|MB_ATT_DEFLECT,2|MB_ATT_FORCEFOCUS,2|MB_ATT_GUN_DEFENSE,2|MB_ATT_FP_SABER_DEFENSE,2|MB_ATT_HEALING,1 classflags CFL_HEAVYMELEE|CFL_NOPICKUPS - - special2 EAS_FP_GRIP - special3 EAS_FP_SPEED - special4 EAS_FP_ABSORB + special4 EAS_FP_SPEED + special3 EAS_FP_GRIP + special2 EAS_FP_ABSORB saberstyle SS_STRONG|SS_DESANN saberDamageStyle SS_DESANN,280|SS_STRONG,280 - saberSpecialDamage 1.25 + saberSpecialDamage 1.3 saberMaxChain 4 APmultiplier 1.2 BPmultiplier 1.2 @@ -29,7 +28,7 @@ ClassInfo saberThrowDamage 60 damageGiven 1.10 - + rateOfFire_Melee 0.9 knockbackTaken 0.25 forceregen 1.25 @@ -59,32 +58,31 @@ ClassInfo gloatAnim BOTH_HEADSHAKE } -description "Mace Windu [Jedi] +description "Mace Windu A powerful, versatile Jedi with an increased Lightsaber chain limit and a variety of Force Powers. ^2Weaponry: - Heavy Melee +-- 10% faster RoF - Lightsaber (Purple/Red) -- Saber/Blaster Defense (2) -- Blaster Deflect (2) -- Chain Limit: 4 --- 30/46% less Purple/Red DMG --- 125% special DMG mult +-- 130% Spec Dmg mult -- EX Saber Throw (3) ^3[CS1] ---- 100% more DMG --- Slap ^3[GB] +--- 100% more Dmg ^5Force Powers: - Jump (3) - Push (2) - Pull (2) - Sense (1) -- Grip (1) ^3[CS2] -- Absorb (1) ^3[CS4] -- Speed (2) ^3[CS3] +- Grip (1) ^3[CS3] +- Absorb (1) ^3[CS2] +- Speed (2) ^3[CS4] ^8Attributes: -- 75% less KB taken +- 75% less Kb Taken - Healing (1) - Force Block/Focus (2)" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/h9_Yarael.mbch b/z_MBLegends/ext_data/mb2/character/h9_Yarael.mbch index dbac1b864..6b11c7385 100644 --- a/z_MBLegends/ext_data/mb2/character/h9_Yarael.mbch +++ b/z_MBLegends/ext_data/mb2/character/h9_Yarael.mbch @@ -14,10 +14,10 @@ ClassInfo forcepowers FP_LEVITATION,2|FP_PUSH,2|FP_PULL,2|FP_TELEPATHY,3|FP_SEE,3 classflags CFL_NOPICKUPS - + rateOfFire_Melee .9 speed 1.02 damageGiven 1.12 - maxhealth 225 + maxhealth 230 forcepool 135 forceregen 1.10 @@ -27,6 +27,7 @@ ClassInfo CSmultiplier 1.02 saberstyle SS_FAST|SS_MEDIUM|SS_TAVION saberDamageStyle SS_FAST,130|SS_TAVION,130|SS_MEDIUM,240 + saberSpecialDamage 1.25 model "yarael" skin "default" @@ -46,18 +47,19 @@ ClassInfo special4 EAS_FP_TELEPATHY } -description "Yarael Poof [Jedi] +description "Yarael Poof An oversized Jedi with a Lightsaber to match, adept at high level psychic Force powers. ^2Weaponry: - Melee +-- 10% faster RoF - Lightsaber (Yellow/Cyan/Blue) -- Saber/Blaster Defense (2) -- Blaster Deflect (1) --- 8% more Fast DMG --- 27% more reach --- Slap ^3[GB] +-- 8% more Fast style Dmg +-- 125% Spec Dmg mult +-- 27% more Reach ^5Force Powers: - Jump (2) diff --git a/z_MBLegends/ext_data/mb2/character/v10_Jerec.mbch b/z_MBLegends/ext_data/mb2/character/v10_Jerec.mbch index d95cedc97..9463d0478 100644 --- a/z_MBLegends/ext_data/mb2/character/v10_Jerec.mbch +++ b/z_MBLegends/ext_data/mb2/character/v10_Jerec.mbch @@ -10,14 +10,15 @@ ClassInfo forcepowers FP_SABER_OFFENSE,3|FP_LEVITATION,3|FP_PUSH,2|FP_PULL,2|FP_DESTRUCTION,2|FP_SEE,2|FP_SABERTHROW,3|FP_DRAIN,1|FP_LIGHTNING,1 - attributes MB_ATT_DEFLECT,3|MB_ATT_FORCEBLOCK,3|MB_ATT_FP_MIRALUKA|MB_ATT_FP_REPULSE|MB_ATT_FORCEFOCUS,3|MB_ATT_GUN_DEFENSE,2|MB_ATT_FP_SABER_DEFENSE,3 + attributes MB_ATT_DEFLECT,3|MB_ATT_FORCEBLOCK,3|MB_ATT_FP_MIRALUKA|MB_ATT_FP_REPULSE|MB_ATT_FORCEFOCUS,3|MB_ATT_GUN_DEFENSE,2|MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_HEALING,1 maxhealth 135 forcepool 100 forceregen 1.04 resource RESOURCE_FORCE speed .97 - + rateOfFire_Melee .9 + damageGiven 1.1 special1 EAS_FP_SABERTHROW meleeSpecial1 EAS_FP_REPULSE special2 EAS_FP_DRAIN @@ -25,14 +26,14 @@ ClassInfo special4 EAS_FP_LIGHTNING classflags CFL_NOPICKUPS - + saberSpecialDamage 1.25 saber1 saber_jerec sabercolor 0 saberstyle SS_TAVION|SS_MEDIUM|SS_STRONG APmultiplier 1.05 BPmultiplier 1.3 saberThrowDamage 40 - saberDamageStyle SS_STRONG,280|SS_TAVION,130 + saberDamageStyle SS_STRONG,280|SS_TAVION,130|SS_MEDIUM,240 saberStanceAnim BOTH_STAND9 uioverlay "gfx/icons/support" @@ -61,30 +62,32 @@ ForceInfo0 //HandShader2Green 40 } -description "Jerec [Sith] +description "Jerec -A support Sith that can hurl explosive Force projectiles and boasts strong defenses. Also possesses Force Repulse and passive Sense. +A support Sith with perma-Sense and Force projectiles. ^2Weaponry: - Melee +-- 10% faster RoF - Lightsaber (Yellow/Red/Cyan) -- Saber Defense (3) -- Blaster Defense (2) -- Blaster Deflect (3) --- 46% less Red/8% more Cyan DMG +-- 46% less Red/8% more Cyan Dmg +-- 125% Spec Dmg mult -- EX Saber Throw (3) ^3[CS1] ---- 30% more DMG --- Slap ^3[GB] +--- 30% more Dmg ^5Force Powers: - Jump (3) - Push (2) - Pull (2) -- Drain (1) ^3[CS2] - Repulse ^3[CS1 Melee] +- Drain (1) ^3[CS2] - Destruction (2) ^3[CS3] - Lightning (1) ^3[CS4] ^8Attributes: +- Healing (1) - Miraluka Vision (2) - Force Block/Focus (3)" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/v10_Malak.mbch b/z_MBLegends/ext_data/mb2/character/v10_Malak.mbch index 2d666af73..bf1b84337 100644 --- a/z_MBLegends/ext_data/mb2/character/v10_Malak.mbch +++ b/z_MBLegends/ext_data/mb2/character/v10_Malak.mbch @@ -8,18 +8,20 @@ ClassInfo weapons WP_MELEE|WP_SABER - attributes MB_ATT_FORCEBLOCK,2|MB_ATT_FORCEFOCUS,2|MB_ATT_DEFLECT,3|MB_ATT_GUN_DEFENSE,3|MB_ATT_FP_SABER_DEFENSE,3 + attributes MB_ATT_FORCEBLOCK,2|MB_ATT_FORCEFOCUS,2|MB_ATT_DEFLECT,3|MB_ATT_GUN_DEFENSE,3|MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_HEALING,1 forcepowers FP_SABER_OFFENSE,3|FP_LEVITATION,3|FP_PUSH,3|FP_PULL,2|FP_SEE,1|FP_ABSORB,1|FP_PROTECT,2|FP_SABERTHROW,3 - maxhealth 190 + maxhealth 100 + maxarmour 45 resource RESOURCE_FORCE forcepool 125 forceregen 0.95 speed 0.96 - + damageGiven 1.1 + rateOfFire_Melee .9 APmultiplier 1.05 BPmultiplier 1.4 ASmultiplier 1 @@ -28,10 +30,10 @@ ClassInfo saber1 saber_malak_legends sabercolor 0 saberstyle SS_MEDIUM|SS_DESANN|SS_TAVION - saberDamageStyle SS_DESANN,280|SS_TAVION,130 - - special2 EAS_NONE - special3 EAS_FP_ABSORB + saberDamageStyle SS_DESANN,280|SS_TAVION,130|SS_MEDIUM,240 + saberSpecialDamage 1.25 + + special2 EAS_FP_ABSORB special4 EAS_FP_PROTECT classflags CFL_NOPICKUPS @@ -50,29 +52,31 @@ ClassInfo uioverlay "gfx/icons/support" } -description "Darth Malak [Sith] +description "Darth Malak -A tanky support class that prioritizes a strong defense and gunner assistance. Regains BP upon defeating enemies. +A tanky support class that prioritizes a strong defense and gunner assistance. ^2Weaponry: - Melee +-- 10% faster RoF - Lightsaber (Yellow/Purple/Cyan) -- Saber/Blaster Defense (3) -- Blaster Deflect (3) --- 30% less Purple/8% more Cyan DMG --- 15% more reach --- 10% less radius +-- 30% less Purple/8% more Cyan Dmg +-- 125% Spec Dmg Mult +-- 15% more Reach +-- 10% less Radius -- EX Saber Throw (3) ^3[CS1] ---- 33% more DMG --- Slap ^3[GB] +--- 33% more Dmg ^5Force Powers: - Jump (3) - Push (3) - Pull (2) - Sense (1) -- Absorb (1) ^3[CS3] +- Absorb (1) ^3[CS2] - Protect (2) ^3[CS4] ^8Attributes: +- Healing (1) - Force Block/Focus (2)" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/v10_Nihilus.mbch b/z_MBLegends/ext_data/mb2/character/v10_Nihilus.mbch index 69a408577..f51632cb1 100644 --- a/z_MBLegends/ext_data/mb2/character/v10_Nihilus.mbch +++ b/z_MBLegends/ext_data/mb2/character/v10_Nihilus.mbch @@ -7,9 +7,12 @@ ClassInfo classNumberLimit 1 weapons WP_SABER|WP_MELEE - attributes MB_ATT_FP_SABER_DEFENSE,2|MB_ATT_FORCEBLOCK,3|MB_ATT_FORCEFOCUS,2|MB_ATT_GUN_DEFENSE,2 + attributes MB_ATT_FP_SABER_DEFENSE,2|MB_ATT_FORCEBLOCK,3|MB_ATT_FORCEFOCUS,2|MB_ATT_GUN_DEFENSE,2|MB_ATT_HEALING,1 - forcepowers FP_SABER_OFFENSE,3|FP_DRAIN,3|FP_LEVITATION,3|FP_PUSH,2|FP_PULL,2|FP_LIGHTNING,2|FP_GRIP,1|FP_DEADLYSIGHT,2|FP_SEE,3|FP_ABSORB,1 + forcepowers FP_SABER_OFFENSE,3|FP_DRAIN,3|FP_LEVITATION,3|FP_PUSH,2|FP_PULL,2|FP_LIGHTNING,2|FP_GRIP,1|FP_DEADLYSIGHT,1|FP_SEE,3|FP_ABSORB,1 + + rateOfFire_Melee 0.9 + damageGiven 1.1 maxhealth 135 forcepool 125 @@ -21,7 +24,8 @@ ClassInfo saber1 saber_nihilus_legends sabercolor 0 - saberDamageStyle SS_DESANN,280 + saberDamageStyle SS_DESANN,280|SS_MEDIUM,240 + saberSpecialDamage 1.25 saberstyle SS_MEDIUM|SS_DESANN APmultiplier 1.05 BPmultiplier 1.1 @@ -49,18 +53,19 @@ ForceInfo0 StartSound "sound/chars/darthnihilus/misc/victory1.mp3" } -description "Darth Nihilus [Sith] +description "Darth Nihilus -An offensive support Sith with crowd control abilities. Among his many Force Powers, he has the ability to Drain player resource pools to heal himself, and a voice that heavily damages on hit. +An offensive support Sith with crowd control abilities. ^2Weaponry: - Melee +-- 10% faster RoF - Lightsaber (Yellow/Purple) -- Saber/Blaster Defense (2) --- 30% less Purple DMG --- 10% more reach --- 10% less radius --- Slap ^3[GB] +-- 30% less Purple Dmg +-- 125% Spec Dmg mult +-- 10% more Reach +-- 10% less Radius ^5Force Powers: - Jump (3) @@ -70,9 +75,10 @@ An offensive support Sith with crowd control abilities. Among his many Force Pow - Lightning (2) ^3[CS4] - Drain (3) ^3[CS2] - Grip (1) ^3[CS3] -- Deadly Speech (Deadly Sight 2) ^3[CS1] +- Deadly Speech (Deadly Sight 1) ^3[CS1] - Absorb (1) ^8Attributes: +- Healing (1) - Force Block (3) - Force Focus (2)" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/v10_Palp.mbch b/z_MBLegends/ext_data/mb2/character/v10_Palp.mbch index 76ff3aa6c..fa07d404f 100644 --- a/z_MBLegends/ext_data/mb2/character/v10_Palp.mbch +++ b/z_MBLegends/ext_data/mb2/character/v10_Palp.mbch @@ -8,7 +8,7 @@ Classinfo weapons WP_MELEE|WP_SABER WP_MeleeFlags HELD_SPEED - attributes MB_ATT_FP_SABER_DEFENSE,2|MB_ATT_FORCEBLOCK,3|MB_ATT_FORCEFOCUS,3|MB_ATT_DEFLECT,0|MB_ATT_GUN_DEFENSE,1|MB_ATT_DEXTERITY,3 + attributes MB_ATT_FP_SABER_DEFENSE,2|MB_ATT_FORCEBLOCK,3|MB_ATT_FORCEFOCUS,3|MB_ATT_DEFLECT,0|MB_ATT_GUN_DEFENSE,1|MB_ATT_DEXTERITY,3|MB_ATT_HEALING,1 forcepowers FP_SABER_OFFENSE,2|FP_LIGHTNING,3|FP_PUSH,3|FP_PULL,3|FP_LEVITATION,3|FP_SEE,3|FP_GRIP,3 @@ -23,7 +23,8 @@ Classinfo forceregen 1.40 speed 0.99 - + damageGiven 1.1 + rateOfFire_Melee .9 APmultiplier 1.35 BPmultiplier 0.95 ASmultiplier 1.02 @@ -75,7 +76,7 @@ Classinfo uishader_7 "models/players/palpatine_tros/mb2_icon_default" model_8 "palpatine" - skin_8 "darkempire" + skin_8 "Darkempire" uishader_8 "models/players/palpatine/mb2_icon_darkempire" flourishAnim BOTH_FORCE_PROTECT_FAST @@ -84,25 +85,24 @@ Classinfo //WalkForward BOTH_FORCE_2HANDEDLIGHTNING_HOLD } -Description "Darth Sidious [Sith] +Description "Darth Sidious -A powerful but relatively frail Sith with fast Force regeneration and potent Dark Side abilities, including a corkscrew special. +A powerful but relatively frail Sith with fast Force regen and potent dark side abilities, including a corkscrew special. ^2Weaponry: - Melee --- 15% faster movement +-- 10% faster RoF +-- 15% faster Movement - Lightsaber -- Saber Defense (2) -- Blaster Defense (1) --- 186% special DMG mult +-- 186% Spec Dmg mult -- Saber Throw ^3[CS1] ---- 33% more DMG --- Slap ^3[GB] +--- 33% more Dmg > Single (Red) -- 10% more AS --- 46% less DMG > Double (Dual) --- 5% faster movement +-- 5% faster Movement ^5Force Powers: - Jump (3) @@ -113,5 +113,6 @@ A powerful but relatively frail Sith with fast Force regeneration and potent Dar - Grip (3) ^3[CS3] ^8Attributes: +- Healing (1) - Dexterity (3) - Force Block/Focus (3)" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/v10_Ragnos.mbch b/z_MBLegends/ext_data/mb2/character/v10_Ragnos.mbch index 3e65596ee..8fd2e4f34 100644 --- a/z_MBLegends/ext_data/mb2/character/v10_Ragnos.mbch +++ b/z_MBLegends/ext_data/mb2/character/v10_Ragnos.mbch @@ -131,7 +131,7 @@ WeaponInfo1 animAttackZoomRun BOTH_FORCE_2HANDEDLIGHTNING //BOTH_GUNGAN_TAUNT selectSound "sound/chars/ragnos/misc/confuse3.mp3" } */ -Description "Marka Ragnos [Wookiee] +Description "Marka Ragnos A flying hybrid class that combines Melee brawling abilities and dark side powers. @@ -142,12 +142,10 @@ A flying hybrid class that combines Melee brawling abilities and dark side power -- Blaster Deflect (1) -- BP-Free Jumps -- Shocks on hit --- 150% more KB --- 69% less DMG --- 200% special DMG mult --- 45% less reach --- 33% more radius --- Slap ^3[GB] +-- 150% more Kb +-- 200% Spec Dmg mult +-- 45% less Reach +-- 33% more Radius - Force Incinerate (Shotgun 1) -- Ignites on hit -- Fires focused blasts while hovering diff --git a/z_MBLegends/ext_data/mb2/character/v10_SForce.mbch b/z_MBLegends/ext_data/mb2/character/v10_SForce.mbch index f7f2b6e3f..624074a97 100644 --- a/z_MBLegends/ext_data/mb2/character/v10_SForce.mbch +++ b/z_MBLegends/ext_data/mb2/character/v10_SForce.mbch @@ -65,7 +65,7 @@ WeaponInfo0 WeaponName "Martial Arts" } -description "Sith Forcemaster [Sith] +description "Sith Forcemaster Dark Side masters who forego the use of a Lightsaber in favor of martial arts and Force proficiency. @@ -76,12 +76,10 @@ Dark Side masters who forego the use of a Lightsaber in favor of martial arts an -- No Blaster Block -- Blocking resists Force Powers -- BP-Free Jumps --- 75% more KB --- 61% less DMG --- 160% special DMG mult --- 40% less reach --- 167% more radius --- Slap ^3[GB] +-- 75% more Kb +-- 160% Spec Dmg mult +-- 40% less Reach +-- 167% more Radius ^5Force Powers: - Jump (3) diff --git a/z_MBLegends/ext_data/mb2/character/v10_Tavion.mbch b/z_MBLegends/ext_data/mb2/character/v10_Tavion.mbch index 13c90f80a..5823eead9 100644 --- a/z_MBLegends/ext_data/mb2/character/v10_Tavion.mbch +++ b/z_MBLegends/ext_data/mb2/character/v10_Tavion.mbch @@ -8,30 +8,32 @@ ClassInfo weapons WP_SABER|WP_MELEE - attributes MB_ATT_RALLY,1|MB_ATT_DEFLECT,2|MB_ATT_FORCEBLOCK,2|MB_ATT_FORCEFOCUS,2|MB_ATT_GUN_DEFENSE,2|MB_ATT_BUNNY_HOP,1|MB_ATT_FLOAT_HOP|MB_ATT_FP_SABER_DEFENSE,1 + attributes MB_ATT_RALLY,1|MB_ATT_DEFLECT,2|MB_ATT_FORCEBLOCK,2|MB_ATT_FORCEFOCUS,2|MB_ATT_GUN_DEFENSE,2|MB_ATT_BUNNY_HOP,1|MB_ATT_FLOAT_HOP|MB_ATT_FP_SABER_DEFENSE,1|MB_ATT_HEALING,1 saber1 tavion_legends saber1_1 sith_sword_legends sabercolor 1 sabercolor_1 0 - saberstyle SS_MEDIUM|SS_TAVION - //s + saberstyle SS_MEDIUM + saberStyle_1 SS_TAVION + saberSpecialDamage 1.25 + saberDamageStyle SS_MEDIUM,260|SS_TAVION,130 APMultiplier 1.15 BPMultiplier 1.2 ASmultiplier 1 CSmultiplier 1.1 saberThrowDamage 40 - forcepowers FP_SABER_OFFENSE,3|FP_PUSH,2|FP_PULL,2|FP_SEE,1|FP_SABERTHROW,3|FP_LIGHTNING,1|FP_TEAM_FORCE,3|FP_DRAIN,2 + forcepowers FP_SABER_OFFENSE,3|FP_PUSH,2|FP_PULL,2|FP_SEE,1|FP_SABERTHROW,3|FP_LIGHTNING,1|FP_TEAM_FORCE,2|FP_DRAIN,2 forcepool 110 forceregen 1.04 resource RESOURCE_FORCE - maxhealth 120 + maxhealth 125 speed 1.05 damageGiven 1.10 - + rateOfFire_Melee .9 classflags CFL_NOPICKUPS|CFL_STATVIEWER special2 EAS_FP_DRAIN @@ -73,28 +75,29 @@ WeaponInfo0 WeaponName "Ragnos' Saber" } -description "Tavion Axmis [Sith] +description "Tavion Axmis -A Dark Jedi that can wield either a slow but powerful extended-reach Lightsaber-scepter, or a weaker but faster Sith Sword. Can Rally and Energize her allies. +A support that can act as a team anchor while also holding her own. ^2Weaponry: - Melee -- Ragnos' Saber (Yellow/Cyan) +-- 10% faster RoF +- Ragnos' Saber -- Saber Defense (1) -- Blaster Defense/Deflect (2) +-- 125% Spec Dmg mult -- EX Saber Throw (3) ^3[CS1] ---- 33% more DMG --- Slap ^3[GB] -> Scepter of Ragnos --- 50% more reach --- 15% more DMG +--- 33% more Dmg +> Scepter of Ragnos (Yellow) +-- 8% more Dmg +-- 50% more Reach -- 10% less AS --- 33% less radius -> Sith Sword --- 5% faster movement +-- 33% less Radius +> Sith Sword (Cyan) +-- 8% more Dmg -- 10% more AS --- 10% less DMG --- 8% less reach +-- 5% faster Movement +-- 8% less Reach ^5Force Powers: - Push (2) @@ -102,9 +105,10 @@ A Dark Jedi that can wield either a slow but powerful extended-reach Lightsaber- - Sense (1) - Lightning (1) ^3[CS4] - Drain (2) ^3[CS2] -- Team Energize (3) ^3[CS3] +- Team Energize (2) ^3[CS3] ^8Attributes: +- Healing (1) - Bunny Hop (1) - Slow Faller - Rally diff --git a/z_MBLegends/ext_data/mb2/character/v10_Traya.mbch b/z_MBLegends/ext_data/mb2/character/v10_Traya.mbch index e4af92e0f..68dee66e7 100644 --- a/z_MBLegends/ext_data/mb2/character/v10_Traya.mbch +++ b/z_MBLegends/ext_data/mb2/character/v10_Traya.mbch @@ -7,16 +7,14 @@ ClassInfo weapons WP_MELEE|WP_SABER forcepowers FP_LEVITATION,1|FP_SEE,3|FP_SABER_OFFENSE,3|FP_SABERTHROW,2|FP_TELEPATHY,1|FP_GRIP,1|FP_PUSH,1|FP_PULL,1 - attributes MB_ATT_FORCEBLOCK,2|MB_ATT_FORCEFOCUS,2|MB_ATT_DEFLECT,1|MB_ATT_DISP_HEALTH,2|MB_ATT_USE_DISTANCE,7|MB_ATT_HEALING,3|MB_ATT_FP_REPULSE|MB_ATT_GUN_DEFENSE,1|MB_ATT_FP_SABER_DEFENSE,1 + attributes MB_ATT_FORCEBLOCK,2|MB_ATT_FORCEFOCUS,2|MB_ATT_DEFLECT,1|MB_ATT_DISP_HEALTH,3|MB_ATT_USE_DISTANCE,7|MB_ATT_HEALING,3|MB_ATT_FP_REPULSE|MB_ATT_GUN_DEFENSE,1|MB_ATT_FP_SABER_DEFENSE,1 resource RESOURCE_FORCE - damageGiven 0.90 - - maxhealth 95 + maxhealth 105 speed .94 - skilltimermod 1.5 - + skilltimermod 1.4 + rateOfFire_Melee .9 classflags CFL_STATVIEWER|CFL_NOPICKUPS special1 EAS_FP_SABERTHROW @@ -36,7 +34,7 @@ ClassInfo saberstyle SS_TAVION|SS_DESANN saberDamageStyle SS_TAVION,130|SS_DESANN,200 saberThrowDamage 40 - + saberSpecialDamage 1.25 uioverlay_r "gfx/icons/support" uioverlay_l "gfx/icons/medic" model "kreia" @@ -89,10 +87,10 @@ ClassInfo c_att_skill_8 MB_ATT_FP_TEAM_HEAL c_att_names_8 "Force Team Heal" - c_att_ranks_8 0,5,5 + c_att_ranks_8 0,5 c_att_skill_9 MB_ATT_POWER - c_att_names_9 "Force Pool (120/140)" + c_att_names_9 "FP (120/140)" c_att_ranks_9 7,7 c_att_skill_10 MB_ATT_REGEN @@ -100,36 +98,36 @@ ClassInfo c_att_ranks_10 5,9 } -description "Darth Traya [Sith] +description "Darth Traya -A defensive support class that can use AOE powers to supply teammates with health. +A medic with strong support skills. ^2Weaponry: - Melee - Lightsaber (Cyan/Purple) -- Saber/Blaster Defense (1) -- Blaster Deflect (1) --- 8% more Cyan/50% less Purple DMG +-- 8% more Cyan/50% less Purple Dmg +-- 125% Spec Dmg mult -- EX Saber Throw (3) ^3[CS1] ---- 33% more DMG --- Slap ^3[GB] +--- 33% more Dmg ^5Force Powers: - Jump (1) - Push (1) - Pull (1) -- Sense (3) +- Sense (3) - Mind Trick (1) - Repulse ^3[CS1 Melee] - Grip (1) ^3[CS3] - Team Heal (1) ^8Attributes: -- 50% slower skill CD +- 40% slower Skill Cd - Healing (3) - Ally Stat Viewer - Force Block/Focus (2) ^3Abilities: -- Health Dispenser (2) ^3['Use' on ^3allies] --- +7 range" \ No newline at end of file +- HP Dispenser (3) ^3['Use' on ^3allies] +-- +7 Range" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/v1_B1.mbch b/z_MBLegends/ext_data/mb2/character/v1_B1.mbch index d3c1df6c9..5ceb37bbb 100644 --- a/z_MBLegends/ext_data/mb2/character/v1_B1.mbch +++ b/z_MBLegends/ext_data/mb2/character/v1_B1.mbch @@ -153,8 +153,8 @@ ClassInfo c_att_skill_3 MB_ATT_WESTARM5 c_att_names_3 "E-5s Sniper Rifle (M5)" c_att_ranks_3 15 - c_att_descs_3 "50% faster RoF, 45% more velocity, 25% less DMG, -50% less FP DMG, 50% slower reload" + c_att_descs_3 "50% faster RoF, 45% more Velocity, 25% less Dmg, +50% less FP Dmg, 50% slower Reload" c_att_skill_4 MB_ATT_ARC_RIFLE_SCOPE c_att_names_4 "> E-5s Scope Upgrade" @@ -163,10 +163,10 @@ ClassInfo c_att_skill_5 MB_ATT_PLX1 c_att_names_5 "E-60R Missile Launcher (PLX)" c_att_ranks_5 22 - + c_att_descs_5 "25% less dmg, 35% slower reload" c_att_skill_6 MB_ATT_FRAGS - c_att_names_6 "Frag Grenades" - c_att_ranks_6 5,8 + c_att_names_6 "Frag Grenade" + c_att_ranks_6 5 c_att_skill_7 MB_ATT_RESPAWNS c_att_names_7 "Reinforcements" @@ -174,7 +174,7 @@ ClassInfo c_att_descs_7 "2 default" c_att_skill_8 MB_ATT_HEALTH - c_att_names_8 "Health (35/50)" + c_att_names_8 "HP (35/50)" c_att_ranks_8 1,3 c_att_skill_9 MB_ATT_ARMOUR @@ -198,6 +198,8 @@ WeaponInfo0 NewViewModel "models/weapons2/e60r_launcher/e60r_launcher.md3" Icon "gfx/hud/w_icon_e60r_launcher" WeaponName "E-60R Missile Launcher" + Damagemod .75 + reloadTimeModifier 1.35 } WeaponInfo1 @@ -231,13 +233,13 @@ WeaponInfo2 AltMissileModel "models/weapons2/oldfraggrenade/thermal_proj.md3" altMissileMissEffect "grenades/EXP_alt" Icon "gfx/hud/w_icon_oldfraggrenade" - WeaponName "Frag Grenades" + WeaponName "Frag Grenade" } WeaponInfo3 { WeaponToReplace WP_M5 - WeaponBasedOff WP_BLASTER + WeaponBasedOff WP_PLX1 NewWorldModel "models/weapons2/som3_rifle/som3_rifle_w.glm" NewViewModel "models/weapons2/dummy/dummy.md3" Icon "gfx/hud/w_icon_som3_rifle" @@ -266,7 +268,7 @@ WeaponInfo3 clipsize 36 customAmmo 360 } -description "B1-series Battle Droid [Soldier] +description "B1-series Battle Droid Mass-produced, fragile combatants with superior reinforcement potential. @@ -275,7 +277,7 @@ Mass-produced, fragile combatants with superior reinforcement potential. ^8Attributes: - Reinforcements (2) -- 10% less KB given -- 10% more KB taken +- 10% less Kb Given +- 10% more Kb Taken - Battery Recharge (2) - Assemble (1)" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/v1_ImpComm.mbch b/z_MBLegends/ext_data/mb2/character/v1_ImpComm.mbch index d1dde11b8..617194d05 100644 --- a/z_MBLegends/ext_data/mb2/character/v1_ImpComm.mbch +++ b/z_MBLegends/ext_data/mb2/character/v1_ImpComm.mbch @@ -13,7 +13,7 @@ ClassInfo rankHealth 60,80 maxArmor 0 - rankArmor 20,40,60 + rankArmor 20,40,55 forcepool 75 extralives 1 @@ -82,7 +82,7 @@ ClassInfo uishader_12 "models/players/Shoretrooper/mb2_icon_tank" model_13 "mudtrooper" - skin_13 "driver" + skin_13 "Driver" uishader_13 "models/players/mudtrooper/mb2_icon_driver" model_14 "swamptrooper" @@ -110,61 +110,44 @@ ClassInfo c_att_skill_3 MB_ATT_PLX1 c_att_names_3 "MiniMag PTL Launcher (PLX)" - c_att_ranks_3 16 - + c_att_ranks_3 17 + c_att_descs_3 "25% less dmg, 35% slower Reload" + c_att_skill_4 MB_ATT_FRAGS - c_att_names_4 "Frag Grenades" - c_att_ranks_4 5,8 + c_att_names_4 "Frag Grenade" + c_att_ranks_4 5 c_att_skill_5 MB_ATT_FIRE_GRENADES - c_att_names_5 "Fire Grenades" - c_att_ranks_5 5,8 + c_att_names_5 "Fire Grenade" + c_att_ranks_5 5 c_att_skill_6 MB_ATT_MICRO_GRENADES - c_att_names_6 "Concussion Grenades" - c_att_ranks_6 2,3,8 + c_att_names_6 "V-59 Conc Grenades" + c_att_ranks_6 2,3 c_att_skill_7 MB_ATT_RESPAWNS c_att_names_7 "Reinforcements" - c_att_ranks_7 16,14 + c_att_ranks_7 16,10 c_att_descs_7 "1 default" - c_att_skill_8 MB_ATT_HEALTH - c_att_names_8 "Health (60/80)" - c_att_ranks_8 1,2 + + c_att_skill_8 MB_ATT_ASSEMBLE + c_att_names_8 "Assemble" + c_att_ranks_8 1,2,2 + + c_att_skill_9 MB_ATT_HEALTH + c_att_names_9 "HP (60/80)" + c_att_ranks_9 1,2 - c_att_skill_9 MB_ATT_ARMOUR - c_att_names_9 "Armor (20/40/60)" - c_att_ranks_9 3,3,3 - - c_att_skill_10 MB_ATT_BLAST_ARMOUR - c_att_names_10 "Blast Armor" - c_att_ranks_10 6 + c_att_skill_10 MB_ATT_ARMOUR + c_att_names_10 "Armor (20/40/55)" + c_att_ranks_10 3,3,3 c_att_skill_11 MB_ATT_DODGE c_att_names_11 "Dodge ^3[CS1]" c_att_ranks_11 1,3 - - c_att_skill_12 MB_ATT_ASSEMBLE - c_att_names_12 "Assemble" - c_att_ranks_12 1,2,2 } WeaponInfo0 -{ - WeaponToReplace MB_ATT_DLT20A - WeaponBasedOff MB_ATT_DLT20A - NewWorldModel "models/weapons2/dlt20a/dlt20a_w.glm" - NewViewModel "models/weapons2/dlt20a/dlt20a.md3" - Icon "gfx/hud/w_icon_DLT20a" - WeaponName "DLT-20A Blaster" - MuzzleEffect "Blaster/MuzzleFlash01R" - AltMuzzleEffect "Blaster/MuzzleFlash01R" - MissileEffect "Blaster/Shot01R" - AltMissileEffect "Blaster/Shot01R" - Missile3Effect "Blaster/Shot01R" -} - -WeaponInfo1 { WeaponToReplace WP_BLASTER_PISTOL WeaponBasedOff WP_BLASTER_PISTOL @@ -177,7 +160,7 @@ WeaponInfo1 ChargeSound "sound/weapons/leia_pistol/altcharge.mp3" } -WeaponInfo2 +WeaponInfo1 { WeaponToReplace WP_FRAG_NADE WeaponBasedOff WP_FRAG_NADE @@ -187,10 +170,10 @@ WeaponInfo2 AltMissileModel "models/weapons2/Stormi_TD/stormiTD_proj.md3" altMissileMissEffect "grenades/EXP_alt" Icon "gfx/hud/w_icon_StormiTD" - WeaponName "Frag Grenades" + WeaponName "Frag Grenade" } -WeaponInfo3 +WeaponInfo2 { WeaponToReplace WP_PLX1 WeaponBasedOff WP_ROCKET_LAUNCHER @@ -198,9 +181,12 @@ WeaponInfo3 NewViewModel "models/weapons2/MiniMag_launcher/launcher.md3" Icon "gfx/hud/w_icon_MiniMag" WeaponName "MiniMag PTL Launcher" + flashSound0 "sound/weapons/upl/fire_rocket.wav" +reloadTimeModifier 1.35 +damageMod .75 } -description "Imperial Infantry [Soldier] +description "Imperial Infantry A soldier who can spec into extra lives, a variety of weapons, damage protection, and more. Suited for mid-ranged combat and storming operations. diff --git a/z_MBLegends/ext_data/mb2/character/v1_ImpSold.mbch b/z_MBLegends/ext_data/mb2/character/v1_ImpSold.mbch index ca652c016..6f800c9c1 100644 --- a/z_MBLegends/ext_data/mb2/character/v1_ImpSold.mbch +++ b/z_MBLegends/ext_data/mb2/character/v1_ImpSold.mbch @@ -67,40 +67,36 @@ ClassInfo uishader_6 "models/players/mudtrooper/mb2_icon_security" model_7 "mudtrooper" - skin_7 "security2" - uishader_7 "models/players/mudtrooper/mb2_icon_security2" + skin_7 "garrison" + uishader_7 "models/players/mudtrooper/mb2_icon_garrison" model_8 "mudtrooper" skin_8 "tactician" uishader_8 "models/players/mudtrooper/mb2_icon_tactician" - model_9 "imperial_garrison" - skin_9 "default" - uishader_9 "models/players/imperial_garrison/mb2_icon_default" + model_9 "imperial_narkina" + skin_9 "default" + uishader_9 "models/players/imperial_narkina/mb2_icon_default" - model_10 "imperial_narkina" + model_10 "preoxmo" skin_10 "default" - uishader_10 "models/players/imperial_narkina/mb2_icon_default" + uishader_10 "models/players/preoxmo/mb2_icon_default" - model_11 "preoxmo" + model_11 "mudtrooper" skin_11 "default" - uishader_11 "models/players/preoxmo/mb2_icon_default" + uishader_11 "models/players/mudtrooper/mb2_icon_default" model_12 "mudtrooper" - skin_12 "default" - uishader_12 "models/players/mudtrooper/mb2_icon_default" + skin_12 "clean" + uishader_12 "models/players/mudtrooper/mb2_icon_clean" - model_13 "mudtrooper" - skin_13 "clean" - uishader_13 "models/players/mudtrooper/mb2_icon_clean" + model_13 "imperial_army" + skin_13 "atdp" + uishader_13 "models/players/imperial_army/mb2_icon_atdp" - model_14 "imperial_army" - skin_14 "atdp" - uishader_14 "models/players/imperial_army/mb2_icon_atdp" - - model_15 "imperial_worker" - skin_15 "default" - uishader_15 "models/players/imperial_worker/mb2_icon_default" + model_14 "imperial_worker" + skin_14 "default" + uishader_14 "models/players/imperial_worker/mb2_icon_default" //respawncustomtime 10000 } @@ -127,8 +123,26 @@ WeaponInfo1 altFlashSound0 "sound/weapons/SE-14c/fire.mp3" ChargeSound "sound/weapons/leia_pistol/altcharge.mp3" } +WeaponInfo2 +{ + WeaponToReplace WP_FRAG_NADE + WeaponBasedOff WP_FRAG_NADE + NewWorldModel "models/weapons2/fraggrenade/thermal_w.glm" + NewViewModel "models/weapons2/fraggrenade/thermal_hand.md3" + MissileModel "models/weapons2/fraggrenade/thermal_proj.md3" + + MissileMissEffect "Grenades/EXP_Explosion" -description "Imperial Conscript [Soldier] + missileHitHumanEffect "Grenades/EXP_Explosion" + missileHitDroidEffect "Grenades/EXP_Explosion" + MissileEffect "repeater/projectile" + + Icon "gfx/hud/w_icon_fraggrenade" + WeaponName "Micro-Frag Grenade" +splashRadius 250 +altFireEnabled 0 +} +description "Imperial Conscript 5-life basic infantry units. @@ -138,15 +152,15 @@ description "Imperial Conscript [Soldier] -- No Saber/Blaster Block -- No Saber Training -- Staggers on hit --- 10% more KB --- 75/50% less DMG --- 50% less reach --- 33% more radius --- Slap ^3[GB] +-- 10% more Kb +-- 50% less Reach +-- 33% more Radius - SE-14C Blaster Pistol (2) - E-11 Blaster Rifle (3) -- Frag Grenade (1) -- Concussion Grenade (1) +- Micro-Frag Grenade (1) +-- 28% less Splash Radius +-- Prim only +- V-59 Conc Grenade (1) ^8Attributes: - Reinforcements (4) diff --git a/z_MBLegends/ext_data/mb2/character/v1_NTroop.mbch b/z_MBLegends/ext_data/mb2/character/v1_NTroop.mbch index c9f636dba..14ecfa2a7 100644 --- a/z_MBLegends/ext_data/mb2/character/v1_NTroop.mbch +++ b/z_MBLegends/ext_data/mb2/character/v1_NTroop.mbch @@ -86,24 +86,23 @@ WeaponName "Feign Death" primFireEnabled 0 altfireEnabled 1 } -description "Night Trooper [Commander] +description "Night Trooper 4-life undead infantry units equipped with blaster rifles, stronger melee, and damage reduction. ^2Weaponry: - Melee --- 50% more DMG +-- 50% more Dmg -- 20% slower swings - Feign Death (Saber) -- No Saber/Blaster Block -- Sec only --- Slap ^3[GB] - E-11 Blaster Rifle (2) ^8Attributes: - Reinforcements (3) -- 50% less KB taken +- 50% less Kb Taken - 5% slower Hacking -- Health Regen: 1/0.5s +- HP Regen: 1/0.5s - Resource Regen: 4/10s - Assemble (1)" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/v1_ORSithTr.mbch b/z_MBLegends/ext_data/mb2/character/v1_ORSithTr.mbch index 75b4fb3be..3e9947849 100644 --- a/z_MBLegends/ext_data/mb2/character/v1_ORSithTr.mbch +++ b/z_MBLegends/ext_data/mb2/character/v1_ORSithTr.mbch @@ -92,11 +92,11 @@ ClassInfo c_att_skill_1 MB_ATT_BP_MULTIPLIER c_att_names_1 "Saber BP (60/90/110%)" - c_att_ranks_1 2,3,5 + c_att_ranks_1 1,2,4 c_att_skill_2 MB_ATT_AP_MULTIPLIER c_att_names_2 "Saber AP (75/90/115%)" - c_att_ranks_2 2,3,5 + c_att_ranks_2 1,2,4 c_att_skill_3 MB_ATT_PISTOL c_att_names_3 "Sith Blaster Pistol" @@ -105,15 +105,15 @@ ClassInfo c_att_skill_4 MB_ATT_CLONERIFLE c_att_names_4 "Sith Carbine (Clone Rifle)" c_att_ranks_4 2,4,10 - c_att_descs_4 "10% faster RoF, 10% faster mag reload, 15% less DMG, -10% less FP DMG" + c_att_descs_4 "10% faster RoF, 10% faster Mag Reload, 15% less Dmg, +10% less FP Dmg" c_att_skill_5 MB_ATT_FIRE_GRENADES - c_att_names_5 "Fire Grenades" - c_att_ranks_5 4,4 + c_att_names_5 "Fire Grenade" + c_att_ranks_5 4 c_att_skill_6 MB_ATT_CRYOBAN_GRENADES - c_att_names_6 "Cryo Grenades" - c_att_ranks_6 4,4 + c_att_names_6 "Cryo Grenade" + c_att_ranks_6 4 c_att_skill_7 MB_ATT_EE4 c_att_names_7 "Sith Blaster Rifle (EE-4)" @@ -121,7 +121,7 @@ ClassInfo c_att_skill_8 MB_ATT_RESPAWNS c_att_names_8 "Reinforcements" - c_att_ranks_8 10,16 + c_att_ranks_8 10,14 c_att_descs_8 "1 default" c_att_skill_9 MB_ATT_ARMOUR c_att_names_9 "Armor (15/35/60)" @@ -203,7 +203,7 @@ WeaponInfo3 animCharge BOTH_PISTOL_ATTACK } -description "Sith Trooper [Clone Trooper] +description "Sith Trooper 2-life units with purchase options including extra lives, elemental Grenades, a rapid-fire Carbine, and upgraded Saber Defense. @@ -212,16 +212,13 @@ description "Sith Trooper [Clone Trooper] - Vibrosaber -- Saber Defense (0) -- No Blaster Block --- 15% faster movement --- Slap ^3[GB] +-- 15% faster Movement > Vibrosword (Yellow) --- 5% less reach --- 45% less DMG +-- 5% less Reach > Vibrostaff (Staff) --- 19% more reach --- 50% less DMG +-- 19% more Reach - Sith Blaster Pistol (1) --- Mag reload +-- Mag Reload ^8Attributes: - Reinforcement (1) diff --git a/z_MBLegends/ext_data/mb2/character/v1_TORagent.mbch b/z_MBLegends/ext_data/mb2/character/v1_TORagent.mbch index a7c429d34..3a3d20bc3 100644 --- a/z_MBLegends/ext_data/mb2/character/v1_TORagent.mbch +++ b/z_MBLegends/ext_data/mb2/character/v1_TORagent.mbch @@ -4,8 +4,8 @@ name "v1_TORagent" classNumberLimit 4 extralives 1 MBClass MB_CLASS_BOUNTY_HUNTER -weapons WP_SABER|WP_BLASTER_PISTOL|WP_THERMAL -attributes MB_ATT_AMMO,3|MB_ATT_PISTOL,2|MB_ATT_HEALING,1|MB_ATT_DEXTERITY,2|MB_ATT_DODGE,3|MB_ATT_STAMINA,3|MB_ATT_FORCEBLOCK,1|MB_ATT_BASE_TD,2|MB_ATT_SABER_COMBO,1 +weapons WP_SABER|WP_MANDO_PISTOL|WP_THERMAL +attributes MB_ATT_AMMO,3|MB_ATT_MANDO_PISTOL,2|MB_ATT_DEXTERITY,2|MB_ATT_DODGE,3|MB_ATT_STAMINA,3|MB_ATT_FORCEBLOCK,1|MB_ATT_BASE_TD,2|MB_ATT_SABER_COMBO,1 maxhealth 100 maxarmor 80 BPmultiplier 0 @@ -23,16 +23,16 @@ rankKbGiven 1.3 basespeed 220 rankbasespeed 237 WP_SaberFlags HELD_PULSE|HELD_POISON -WP_FragNadeFlags HELD_PULSE|HELD_POISON|HELD_KNOCKDOWN|HELD_LOWDAMAGE +WP_FragNadeFlags HELD_POISON WP_DLT20AFlags HELD_ALTRELOAD WP_DEMP2Flags HELD_POISON|HELD_ALTRELOAD|HELD_STUN uioverlay_r "gfx/icons/infantry" uioverlay_l "gfx/icons/spec_infantry" uioverlay_c "gfx/icons/tactician" -holdables HI_MEDPAC|HI_SEEKER|HI_CLOAK|HI_STIMPACK +holdables HI_MEDPAC|HI_BASESEEKER|HI_CLOAK|HI_STIMPACK saber1 Legends_Knife_Jagged saberstyle SS_TAVION -rankSaberDamage 144 +rankSaberDamage 140 ArmourRegenCap 10 ArmourRegenRate 500 ArmourRegenAmount 1 @@ -58,7 +58,7 @@ model_4 "sithtrooper_tor" skin_4 "yavin" uishader_4 "models/players/sithtrooper_tor/mb2_icon_yavin" isCustomBuild 1 -mbPoints 10 +mbPoints 13 hasCustomSpec 3 isOnlyOneSpec 1 customSpecName_1 "Marksmanship" @@ -70,86 +70,78 @@ customSpecDesc_2 "Poison Expert" customSpecName_3 "Concealment" customSpecIcon_3 "gfx/menus/alpha/icon_playermodel" customSpecDesc_3 "Stealth Operative" -c_att_skill_0 MB_ATT_RESPAWNS -c_att_names_0 "Reinforcement" -c_att_ranks_0 6 -c_att_descs_0 "1 default" -c_att_skill_1 MB_ATT_DLT20A -c_att_names_1 "Sith Sniper Rifle (DLT20A)" -c_att_ranks_1 3,1,0 -c_att_descs_1 "Prim fire: Hitscan, 10% more DMG, 10% more FP DMG, -20% slower RoF, 70% slower mag reload" -c_att_skill_2 MB_ATT_TRIP_MINES -c_att_names_2 "Trip Mine" -c_att_ranks_2 1 -c_att_skill_3 MB_ATT_FIRE_GRENADES -c_att_names_3 "Fire Grenade" -c_att_ranks_3 1 -c_att_skill_4 MB_ATT_SONIC_DETONATOR -c_att_names_4 "Sonic Detonator" -c_att_ranks_4 1 -c_att_skill_5 MB_ATT_ROF_MULTIPLIER -c_att_names_5 "RoF (120%)" -c_att_ranks_5 1 -c_att_skill_6 MB_ATT_KB_GIVEN_MULTIPLIER -c_att_names_6 "KB Given (130%)" -c_att_ranks_6 1 -c_att_skill_7 MB_ATT_ANTI_MT -c_att_names_7 "Anti-Mind Trick" -c_att_ranks_7 1 +c_att_skill_0 MB_ATT_DLT20A +c_att_names_0 "Sith Sniper Rifle (DLT20A)" +c_att_ranks_0 3,2,0 +c_att_descs_0 "Prim fire: Hitscan, 10% more Dmg, 10% more FP Dmg, +25% slower RoF, 25% faster Velocity, 70% slower Mag Reload" +c_att_skill_1 MB_ATT_TRIP_MINES +c_att_names_1 "Trip Mine" +c_att_ranks_1 2,3 +c_att_skill_2 MB_ATT_FIRE_GRENADES +c_att_names_2 "Fire Grenades" +c_att_ranks_2 2,3 +c_att_skill_3 MB_ATT_SONIC_DETONATOR +c_att_names_3 "Sonic Detonators" +c_att_ranks_3 2,3 +c_att_skill_4 MB_ATT_ROF_MULTIPLIER +c_att_names_4 "RoF (120%)" +c_att_ranks_4 2 +c_att_skill_5 MB_ATT_KB_GIVEN_MULTIPLIER +c_att_names_5 "Kb Given (130%)" +c_att_ranks_5 1 +c_att_skill_6 MB_ATT_POISON_DART +c_att_names_6 "Poison Dart ^3[CS4 Melee]" +c_att_ranks_6 1 c_att_skill_15 MB_ATT_RESPAWNS c_att_names_15 "Reinforcement" -c_att_ranks_15 6 +c_att_ranks_15 8 c_att_descs_15 "1 default" c_att_skill_16 MB_ATT_CR2 c_att_names_16 "Sith Blaster Rifle (CR-2)" -c_att_ranks_16 2,1,0 +c_att_ranks_16 2,1,1 c_att_skill_17 MB_ATT_DEMP2 c_att_names_17 "Poison Launcher (DEMP2)" -c_att_ranks_17 2 -c_att_descs_17 "Poisons/staggers on hit, 50% more velocity, 80% faster RoF, -25% more DMG, 25% more FP DMG, 20% slower mag reload" +c_att_ranks_17 3 +c_att_descs_17 "Poisons/staggers on hit, 50% more Velocity, 80% faster RoF, +25% more Dmg, 25% more FP Dmg, 25% slower Mag Reload" c_att_skill_18 MB_ATT_FRAGS -c_att_names_18 "Corrosive Stun Grenade (Frag)" -c_att_ranks_18 1 -c_att_descs_18 "Shocks/poisons/knocks down on det, 50% less DMG" +c_att_names_18 "Corrosive Grenades (Frags)" +c_att_ranks_18 1,1 +c_att_descs_18 "Poisons on det, 75% less Dmg" c_att_skill_19 MB_ATT_HEALING c_att_names_19 "Healing" -c_att_ranks_19 0,1 +c_att_ranks_19 1 c_att_skill_20 MB_ATT_BASESPEED c_att_names_20 "Speed (237)" c_att_ranks_20 1 c_att_skill_21 MB_ATT_POISON_DART c_att_names_21 "Poison Darts ^3[CS4 Melee]" -c_att_ranks_21 1,1,0 -c_att_skill_30 MB_ATT_RESPAWNS -c_att_names_30 "Reinforcement" -c_att_ranks_30 6 -c_att_descs_30 "1 default" -c_att_skill_31 MB_ATT_SABER_DAMAGE -c_att_names_31 "Saber DMG (144)" -c_att_ranks_31 1 -c_att_descs_31 "120 default" -c_att_skill_32 MB_ATT_FP_SABER_DEFENSE -c_att_names_32 "Saber Defense" -c_att_ranks_32 0 -c_att_skill_33 MB_ATT_BP_MULTIPLIER -c_att_names_33 "Saber BP (75%)" -c_att_ranks_33 2 -c_att_skill_34 MB_ATT_SABER_MAXCHAIN -c_att_names_34 "Saber Chain Limit (3/4)" -c_att_ranks_34 1,1 -c_att_skill_35 MB_ATT_ARMOUR_REGEN_CAP -c_att_names_35 "Armor Regen Cap (25)" -c_att_ranks_35 1 -c_att_descs_35 "10 default" -c_att_skill_36 MB_ATT_DEXTERITY -c_att_names_36 "Dexterity" -c_att_ranks_36 0,0,1 -c_att_skill_37 MB_ATT_POWER -c_att_names_37 "Resource (Unlocks Abilities)" -c_att_ranks_37 3 -c_att_descs_37 "Unlocks Stamina (3)/Sprint ^3[CS1]^7, Dexterity/Dex Roll ^3[CS2]^7, +c_att_ranks_21 1,1,1 +c_att_skill_30 MB_ATT_SABER_DAMAGE +c_att_names_30 "Saber Dmg (140)" +c_att_ranks_30 2 +c_att_descs_30 "120 default" +c_att_skill_31 MB_ATT_FP_SABER_DEFENSE +c_att_names_31 "Saber Defense" +c_att_ranks_31 0 +c_att_skill_32 MB_ATT_BP_MULTIPLIER +c_att_names_32 "Saber BP (75%)" +c_att_ranks_32 3 +c_att_skill_33 MB_ATT_SABER_MAXCHAIN +c_att_names_33 "Saber Chain Limit (3/4)" +c_att_ranks_33 1,1 +c_att_skill_34 MB_ATT_ARMOUR_REGEN_CAP +c_att_names_34 "Armor Regen Cap (25)" +c_att_ranks_34 2 +c_att_descs_34 "10 default" +c_att_skill_35 MB_ATT_DEXTERITY +c_att_names_35 "Dexterity" +c_att_ranks_35 0,0,1 +c_att_skill_36 MB_ATT_POWER +c_att_names_36 "Resource (Unlocks Abilities)" +c_att_ranks_36 5 +c_att_descs_36 "^7Unlocks Stamina (3)/Sprint ^3[CS1]^7, Dexterity/Dex Roll ^3[CS2]^7, Dodge (3) ^3[CS3]^7, Cloak" } WeaponInfo0{ @@ -167,43 +159,41 @@ NewWorldModel "models/weapons2/dlt-18_repeater/dlt-18_repeater_w.glm" NewViewModel "models/weapons2/dlt-18_repeater/dlt-18_repeater.md3" Icon "gfx/hud/w_icon_dlt-18" WeaponName "Sith Sniper Rifle" -MuzzleEffect "Blaster/MuzzleFlash01B" MissileEffect "halo_smg/projectile" MissileMissEffect "halo_smg/wall_impact" -AltMuzzleEffect "Blaster/MuzzleFlash01B" -AltMissileEffect "Blaster/Shot02B" FlashSound0 "sound/weapons/EL-16/fire.wav" AltFlashSound0 "sound/weapons/EL-16/alt_fire.wav" -customAmmo 360 +customAmmo 380 primHitscanShot 1 primHitscanTracer 10 primGore 1 -clipSize 30 +clipSize 40 FPMult 1.1 ratemod 1.25 damageMod 1.1 +velocityMod 1.25 ReloadTimeModifier 1.7 } WeaponInfo2{ WeaponToReplace WP_CR2 -WeaponBasedOff WP_CR2 +WeaponBasedOff WP_CONCUSSION NewWorldModel "models/weapons2/relby_v10/model_w.glm" -NewViewModel "models/weapons2/dummy/dummy.md3" +NewViewModel "models/weapons2/relby_v10/model.md3" Icon "gfx/hud/w_icon_relby_v10" WeaponName "Sith Blaster Rifle" customAmmo 650 } WeaponInfo3{ WeaponToReplace WP_DEMP2 -WeaponBasedOff WP_DEMP2 +WeaponBasedOff WP_MANDO_PISTOL NewWorldModel "models/weapons2/CR-1_cannon/rifle_w.glm" NewViewModel "models/weapons2/CR-1_cannon/rifle.md3" Icon "gfx/hud/w_icon_CR1_blastCannon" WeaponName "Poison Launcher" FlashSound0 "sound/weapons/cp-50_repeater/fire.wav" -MissileMissEffect "noghri_stick/flesh_impact" -MissileHitHumanEffect "noghri_stick/flesh_impact" -MissileHitDroidEffect "noghri_stick/flesh_impact" +MissileMissEffect "noghri_stick/flesh_impact" +MissileHitHumanEffect "noghri_stick/flesh_impact" +MissileHitDroidEffect "noghri_stick/flesh_impact" MissileEffect "sonic_pistol/projectile" MuzzleEffect "Blaster/MuzzleFlash01G" FPMult 1.25 @@ -212,7 +202,7 @@ damageMod 1.25 customammo 50 ratemod 0.2 velocityMod 1.5 -ReloadTimeModifier 1.2 +ReloadTimeModifier 1.25 AltFireEnabled 0 } WeaponInfo4{ @@ -221,19 +211,18 @@ WeaponBasedOff WP_THERMAL NewWorldModel "models/weapons/Grenade_Concussion/model.glm" NewViewModel "models/weapons/Grenade_Concussion/viewmodel.md3" Icon "gfx/hud/w_icon_stungrenade" -WeaponName "Corrosive Stun Grenade" +WeaponName "Corrosive Grenades" MissileModel "models/weapons/Grenade_Concussion/proj.md3" -MissileMissEffect "noghri_stick/flesh_impact" +MissileMissEffect "slime_explosion_new" MissileEffect "sonic_pistol/projectile" altMissileModel "models/weapons/Grenade_Concussion/proj.md3" -altMissileMissEffect "noghri_stick/flesh_impact" +altMissileMissEffect "slime_explosion_new" altMissileEffect "sonic_pistol/projectile" - -ratemod 1.5 +damageMod 0.25 } WeaponInfo5{ -WeaponToReplace WP_BLASTER_PISTOL -WeaponBasedOff WP_BLASTER_PISTOL +WeaponToReplace WP_MANDO_PISTOL +WeaponBasedOff WP_MANDO_PISTOL NewWorldModel "models/weapons2/kotor_bpistol3/kotor_bpistol3_w.glm" NewViewModel "models/weapons2/kotor_bpistol3/kotor_bpistol3.md3" Icon "gfx/hud/w_icon_kotor_bpistol3" @@ -244,7 +233,7 @@ WeaponName "Sith Blaster Pistol" clipSize 20 FPChargeMult 1.25 } -description "Sith Operative [Bounty Hunter] +description "Sith Operative Multi-life elite troopers. @@ -257,17 +246,16 @@ Multi-life elite troopers. -- EX Saber Training (1) -- Shocks/poisons on hit - Sith Blaster Pistol (2) --- 25% more charged FP DMG +-- 25% more Charged FP Dmg - Thermal Grenades (2) ^6Inventory: - Medpac -- Seeker Drone +- Defense Seeker - Stimpak ^8Attributes: - Reinforcement (1) - Armor Regen: 1/.5s to 10 -- Healing (1) - Force Block (1) - Dexterity (2)" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/v1_Talz.mbch b/z_MBLegends/ext_data/mb2/character/v1_Talz.mbch index 5e992d2e3..f5640a7fc 100644 --- a/z_MBLegends/ext_data/mb2/character/v1_Talz.mbch +++ b/z_MBLegends/ext_data/mb2/character/v1_Talz.mbch @@ -87,7 +87,7 @@ WeaponInfo1 MuzzleEffect null MissileModel "models/weapons2/dc_gabow/greenarrow_arrow.md3" MissileEffect "bow/whoosh" - MissileMissEffect "dc/explosion" + MissileMissEffect "Dc/explosion" MissileHitHumanEffect "bow/arrow_humandroid" MissileHitDroidEffect "bow/arrow_humandroid" clipSize 8 @@ -140,29 +140,28 @@ WeaponInfo2 selectSound "sound/player/footsteps/ice_walk2.mp3" } -description "Talz Traitor [Wookiee] +description "Talz Traitor Indigenous peoples with primitive weaponry. Fill your Resource bar with damage to unleash special moves. ^2Weaponry: - Melee --- Flat KB: 85 +-- Flat Kb: 85 - Talz Spear (All styles Saber) -- Freezes/poisons on hit -- No Saber/Blaster Block --- Saber DMG: 140 --- Saber special DMG: 280 --- 25% more reach --- 33% more radius +-- Saber Dmg: 140 +-- Saber Spec Dmg: 280 +-- 25% more Reach +-- 33% more Radius -- Saber Throw ^3[CS1] ---- 133% more DMG --- Slap ^3[GB] +--- 133% more Dmg - Snowballs (30) (Repeater) -- 25% slower RoF - Longbow and Arrows (T-21 3) -- Staggers/freezes/poisons on hit --- 25% faster shot swap --- 50% slower mag reload +-- 25% faster Shot Swap +-- 50% slower Mag Reload -- Prim only ^5Powers: @@ -170,8 +169,8 @@ Indigenous peoples with primitive weaponry. Fill your Resource bar with damage t ^8Attributes: - Reinforcement (1) -- 70% less KB taken -- 99% less KB given +- 70% less Kb Taken +- 99% less Kb Given - Dexterity (1) - Strength (1) - Fury (3) diff --git a/z_MBLegends/ext_data/mb2/character/v1_Thug.mbch b/z_MBLegends/ext_data/mb2/character/v1_Thug.mbch index 7b8dd6c88..07f0c0ea0 100644 --- a/z_MBLegends/ext_data/mb2/character/v1_Thug.mbch +++ b/z_MBLegends/ext_data/mb2/character/v1_Thug.mbch @@ -145,15 +145,16 @@ ClassInfo c_att_skill_7 MB_ATT_FRAGS c_att_names_7 "Cheap Frag Grenades" c_att_ranks_7 2,2 - c_att_descs_7 "50% less DMG, Prim only" + c_att_descs_7 "50% less Dmg, 14% less Splash Radius, Prim only" + c_att_skill_8 MB_ATT_TRIP_MINES c_att_names_8 "Trip Mines" - c_att_ranks_8 2,2,2 + c_att_ranks_8 2,2 c_att_skill_9 MB_ATT_DET_PACK c_att_names_9 "Det Packs" - c_att_ranks_9 2,2,2 - c_att_descs_9 "DMG increases with rank" + c_att_ranks_9 2,2 + c_att_descs_9 "Dmg increases with rank" c_att_skill_10 MB_ATT_RESPAWNS c_att_names_10 "Reinforcements" c_att_ranks_10 10,22 @@ -206,7 +207,8 @@ WeaponInfo2 WeaponToReplace WP_FRAG_NADE WeaponBasedOff WP_FRAG_NADE NewWorldModel "models/weapons2/fraggrenade/thermal_w.glm" - NewViewModel "models/weapons2/fraggrenade/thermal_hand.md3" + NewHandsModel "models/weapons2/fraggrenade/thermal_hand.md3" + NewViewModel "models/weapons2/fraggrenade/thermal.md3" MissileModel "models/weapons2/fraggrenade/thermal_proj.md3" altMissileMissEffect "Grenades/EXP_Explosion" @@ -218,10 +220,11 @@ WeaponInfo2 Icon "gfx/hud/w_icon_fraggrenade" WeaponName "Cheap Frag Grenades" + splashRadius 300 altFireEnabled 0 } -description "Mercenary Thug [Clone Trooper] +description "Mercenary Thug A multi-life hybrid brawler that can spec into Sabering upgrades, melee, explosives and abilities. @@ -232,19 +235,17 @@ A multi-life hybrid brawler that can spec into Sabering upgrades, melee, explosi -- No Blaster Block -- Chain Limit: 2 -- Poisons on hit --- 45% less DMG --- 33% more radius --- Slap ^3[GB] +-- 33% more Radius > BD-1 Cutter Vibroaxe --- 20% more KB --- 10% less reach +-- 20% more Kb +-- 10% less Reach > BD-1 Cutter Short Vibroaxe --- 15% more KB +-- 15% more Kb -- 15% more AS --- 40% less reach +-- 40% less Reach - Two-shot Bowcaster (1) --- 100% more DMG --- Mag reload +-- 100% more Dmg +-- Mag Reload ^8Attributes: - Reinforcement (1) diff --git a/z_MBLegends/ext_data/mb2/character/v1_Undead.mbch b/z_MBLegends/ext_data/mb2/character/v1_Undead.mbch index e3a65d0eb..b3e850514 100644 --- a/z_MBLegends/ext_data/mb2/character/v1_Undead.mbch +++ b/z_MBLegends/ext_data/mb2/character/v1_Undead.mbch @@ -43,7 +43,7 @@ ClassInfo special1 EAS_FP_RAGE special2 EAS_HI_BARGE special3 EAS_FP_HEAL - + special4 EAS_FP_RAGE hackRate 4 disableGunBash 1 rateOfFire 101 @@ -175,21 +175,21 @@ WeaponInfo1 damageMod 0.8 } -description "Undead Trooper [Wookiee] +description "Undead Trooper Brains........................ ^2Weaponry: - Zombie Melee --- 75% less DMG +-- 75% less Dmg -- Grab/slap only - Deadly Squeeze (Stun Baton 1) -- Poisons/staggers on hit --- 80% less DMG +-- 80% less Dmg -- 97% faster RoF ^5Powers: -- Bio-Frenzy (Dark Rage 3) ^3[CS1] +- Bio-Frenzy (Dark Rage 3) ^3[CS1/4] - Corpse Feast (Heal 3) ^3[CS3] ^8Attributes: @@ -198,11 +198,11 @@ Brains........................ - No Gunbash - Fury (3) -- 100% faster Resource decay -- 99% less KB taken/given -- 20% slower skill CD +- 99% less Kb Taken/Given +- 20% slower Skill Cd - 300% slower Hacking - Healing (1) --- Starting Health: 5 +-- Starting HP: 5 - Rally - Assemble (1) - Getup (0) diff --git a/z_MBLegends/ext_data/mb2/character/v2_Calo.mbch b/z_MBLegends/ext_data/mb2/character/v2_Calo.mbch index dca017ae9..0743b6dd3 100644 --- a/z_MBLegends/ext_data/mb2/character/v2_Calo.mbch +++ b/z_MBLegends/ext_data/mb2/character/v2_Calo.mbch @@ -83,17 +83,17 @@ WeaponInfo1 WeaponName "Calo's Flashbang Grenades" } -description "Calo Nord [Bounty Hunter] +description "Calo Nord -A class carrying Heavy Dual Pistols, multiple explosives and multiple forms of health restoration. +A class carrying Heavy Dual Pistols, multiple explosives and multiple forms of HP restoration. ^2Weaponry: - Melee - Dual Mandalorian Heavy Pistols (WESTARs 3) -- 5% less RoF --- 10% more FP DMG +-- 10% more FP Dmg - Calo's Flashbang Grenades (3) (Concs) --- Blind everyone +-- Blinds on det - Thermal Detonator (1) ^6Inventory: diff --git a/z_MBLegends/ext_data/mb2/character/v2_FlameTr.mbch b/z_MBLegends/ext_data/mb2/character/v2_FlameTr.mbch index bb3147494..5c520a01f 100644 --- a/z_MBLegends/ext_data/mb2/character/v2_FlameTr.mbch +++ b/z_MBLegends/ext_data/mb2/character/v2_FlameTr.mbch @@ -10,10 +10,10 @@ Classinfo weapons WP_MELEE|WP_THROWER|WP_FIRE_NADE|WP_UGL|WP_DLT20A - WP_GrenadeLauncherFlags HELD_EXPLOSIVE + WP_UGLFlags HELD_EXPLOSIVE|HELD_KNOCKBACK //WP_ThrowerFlags HELD_FLAME - attributes MB_ATT_AMMO,3|MB_ATT_FIRE_GRENADES,3|MB_ATT_BLAST_ARMOUR,1|MB_ATT_ASSEMBLE,2|MB_ATT_DODGE,3|MB_ATT_SHIELD_RECHARGE,1|MB_ATT_DEXTERITY,1|MB_ATT_UGL,3|MB_ATT_DLT20A,2|MB_ATT_WRISTLASER + attributes MB_ATT_AMMO,3|MB_ATT_FIRE_GRENADES,3|MB_ATT_BLAST_ARMOUR,1|MB_ATT_ASSEMBLE,2|MB_ATT_DODGE,3|MB_ATT_SHIELD_RECHARGE,1|MB_ATT_DEXTERITY,1|MB_ATT_UGL|MB_ATT_DLT20A,2|MB_ATT_WRISTLASER|MB_ATT_ENV_PROT,2 maxhealth 80 maxarmor 80 @@ -84,26 +84,22 @@ animReadyNoAmmo BOTH_ATTACK3 animAttackRun BOTH_ATTACK3 animAttack BOTH_ATTACK3 animAttackWalk BOTH_ATTACK3 -altfireenabled 0 -velocityMod 0.7 damageMod 2 } -Description "Flame Trooper [Mandalorian] +Description "Flame Trooper A 2-life class specializing in incendiary support. Launched Grenades deal bonus damage. ^2Weaponry: - Melee - CR-24 Flame Rifle (Flamethrower) --- 30% slower mag reload +-- 30% slower Mag Reload - DLT-20A Blaster Rifle (2) - Fire Grenades (3) -- Modified Grenade Launcher (UGL 3) --- Bonus explosive DMG on det --- 100% more DMG --- 30% less velocity --- Prim only +- Modified Grenade Launcher (UGL) +-- Overblasts/pushes on det +-- 100% more Dmg ^6Inventory: - Assault Sentry ^3[CS4] @@ -111,8 +107,9 @@ A 2-life class specializing in incendiary support. Launched Grenades deal bonus ^8Attributes: - Reinforcement (1) -- 10% less KB taken +- 10% less Kb Taken - Dexterity (1) +- Environmental Protection (2) - Blast Armor - Armor Regen (1) - Assemble (2) diff --git a/z_MBLegends/ext_data/mb2/character/v2_Greedo.mbch b/z_MBLegends/ext_data/mb2/character/v2_Greedo.mbch index fcda6c4dd..eeef400cc 100644 --- a/z_MBLegends/ext_data/mb2/character/v2_Greedo.mbch +++ b/z_MBLegends/ext_data/mb2/character/v2_Greedo.mbch @@ -44,15 +44,15 @@ ClassInfo c_att_skill_0 MB_ATT_PISTOL c_att_names_0 "Greedo's DT-12 Blaster Pistol" c_att_ranks_0 30,5,30 - c_att_descs_0 "100% more DMG, 20% more FP DMG, 20% more velocity, -20.5% slower RoF, 15% slower movement, 150% slower reload" + c_att_descs_0 "100% more Dmg, 20% more FP Dmg, 20% more Velocity, +20.5% slower RoF, 15% slower Movement, 150% slower Reload" c_att_skill_1 MB_ATT_FRAGS c_att_names_1 "Frag Grenades" c_att_ranks_1 10,10,10 c_att_skill_2 MB_ATT_MICRO_GRENADES - c_att_names_2 "Concussion Grenades" + c_att_names_2 "V-59 Conc Grenades" c_att_ranks_2 5,5,5 c_att_skill_3 MB_ATT_HEALING @@ -68,9 +68,9 @@ ClassInfo c_att_ranks_5 10,10,10 c_att_skill_6 MB_ATT_STM_MULTIPLIER - c_att_names_6 "Skill Cooldown (125%)" + c_att_names_6 "Skill Cd (125%)" c_att_ranks_6 5 - c_att_ranks_6 "100% default" + c_att_descs_6 "100% default" c_att_skill_7 MB_ATT_DODGE c_att_names_7 "Dodge ^3[CS1]" @@ -88,9 +88,9 @@ ClassInfo WeaponInfo0 { WeaponToReplace WP_BLASTER_PISTOL - WeaponBasedOff WP_BLASTER_PISTOL + WeaponBasedOff WP_MANDO_PISTOL NewWorldModel "models/weapons/KYD-21_Pistol/model.glm" - NewViewModel "models/weapons2/dummy/dummy.md3" + NewViewModel "models/weapons/KYD-21_Pistol/model.md3" FlashSound0 "sound/weapons/KYD-21/fire.mp3" altFlashSound0 "sound/weapons/KYD-21/fire.mp3" Icon "gfx/hud/w_icon_kyd-21" @@ -118,7 +118,7 @@ WeaponInfo0 animCharge BOTH_MAND_PISTOL_ATTACK } -description "Greedo [Hero] +description "Greedo A scrappy class with custom options like a double-damage Pistol, a massive Energy pool, and Quickthrow Frag Grenades. diff --git a/z_MBLegends/ext_data/mb2/character/v2_Hondo.mbch b/z_MBLegends/ext_data/mb2/character/v2_Hondo.mbch index 04a443879..374b8884d 100644 --- a/z_MBLegends/ext_data/mb2/character/v2_Hondo.mbch +++ b/z_MBLegends/ext_data/mb2/character/v2_Hondo.mbch @@ -54,7 +54,7 @@ ClassInfo c_att_skill_0 MB_ATT_PISTOL c_att_names_0 "Weequay Blaster Pistol" c_att_ranks_0 1,1 - c_att_descs_0 "25% more DMG/FP DMG, 10% faster reload" + c_att_descs_0 "25% more Dmg/FP Dmg, 10% faster Reload" c_att_skill_1 MB_ATT_WESTARM5 c_att_names_1 "Modified E-5 Blaster Rifle" @@ -125,9 +125,9 @@ WeaponInfo2 WeaponInfo3 { WeaponToReplace WP_BLASTER_PISTOL - WeaponBasedOff WP_BLASTER_PISTOL + WeaponBasedOff WP_MANDO_PISTOL NewWorldModel "models/weapons2/cb_pistol/pistol_w.glm" - NewViewModel "models/weapons2/dummy/dummy.md3" + NewViewModel "models/weapons2/cb_pistol/pistol_w.md3" Icon "gfx/hud/w_icon_cb_pistol" FlashSound0 "sound/weapons/han_pistol/fire.mp3" altFlashSound0 "sound/weapons/han_pistol/alt_fire.mp3" @@ -155,7 +155,7 @@ WeaponInfo3 ReloadTimeModifier 0.9 } -description "Hondo Ohnaka [ARC Trooper] +description "Hondo Ohnaka A reckless, mobile hybrid with a one-tap Shotgun and a Grappling Hook. @@ -165,18 +165,17 @@ A reckless, mobile hybrid with a one-tap Shotgun and a Grappling Hook. -- Saber Defense (1) --- BP-Free Jumps -- No Blaster Block --- Slap ^3[GB] > Hondo's Vibrocutlass (Yellow/Cyan) --- 18% more KB --- 16% less Yellow DMG --- 35% less reach +-- 18% more Kb +-- 16% less Yellow Dmg +-- 35% less Reach > Hondo's Electrostaff (Staff) --- 3% more KB --- 57% less DMG --- 6% less reach +-- 3% more Kb +-- 57% less Dmg +-- 6% less Reach - ACP Array Gun (Shotgun 2) --- 100% more DMG --- 5% faster mag reload +-- 100% more Dmg +-- 5% faster Mag Reload - Pulse Grenades (3) ^6Inventory: diff --git a/z_MBLegends/ext_data/mb2/character/v2_KMonkeyL.mbch b/z_MBLegends/ext_data/mb2/character/v2_KMonkeyL.mbch index be2435f08..e60d14ec9 100644 --- a/z_MBLegends/ext_data/mb2/character/v2_KMonkeyL.mbch +++ b/z_MBLegends/ext_data/mb2/character/v2_KMonkeyL.mbch @@ -5,13 +5,14 @@ ClassInfo MBClass MB_CLASS_SITH classNumberLimit 4 extralives 2 - weapons WP_MELEE|WP_BLASTER|WP_FRAG_NADE + weapons WP_MELEE|WP_REPEATER|WP_FRAG_NADE +WP_RepeaterFlags HELD_ALTRELOAD - attributes MB_ATT_AMMO,1|MB_ATT_BLASTER,1|MB_ATT_ASSEMBLE,2|MB_ATT_ROSHTAUNT|MB_ATT_DEXTERITY,1|MB_ATT_FRAGS,1|MB_ATT_STAMINA,2|MB_ATT_GRAPPLE_HOP|MB_ATT_WOOKIE_STRENGTH,1|MB_ATT_DASH,1 + attributes MB_ATT_AMMO,1|MB_ATT_REPEATER|MB_ATT_ASSEMBLE,2|MB_ATT_ROSHTAUNT|MB_ATT_DEXTERITY,1|MB_ATT_FRAGS,1|MB_ATT_STAMINA,2|MB_ATT_GRAPPLE_HOP|MB_ATT_WOOKIE_STRENGTH,1|MB_ATT_DASH,1 maxhealth 90 - forcepool 120 + forcepool 115 forceregen 1.25 forcepowers FP_SEE,1|FP_LEVITATION,2 resource RESOURCE_STAMINA @@ -19,10 +20,10 @@ ClassInfo rateOfFire_Melee .9 skilltimermod 1.5 - + knockbackTaken 1.35 baseSpeed 195 -classFlags CFL_NOPICKUPS + classFlags CFL_NOPICKUPS rageSoundOverride "sound/chars/salaciouscrumb/misc/rageactivate.mp3" bargeSoundOverride "sound/chars/salaciouscrumb/misc/pain100.mp3" @@ -60,15 +61,44 @@ classFlags CFL_NOPICKUPS c_att_ranks_1 1 c_att_descs_1 "Retain momentum from first Grapple" } +WeaponInfo0 +{ + WeaponToReplace WP_REPEATER + WeaponBasedOff WP_REPEATER + NewWorldModel "models/weapons2/heavy_repeater/heavy_repeater_w.glm" + NewViewModel "models/weapons2/heavy_repeater/heavy_repeater.md3" + NewHandsModel "models/weapons2/heavy_repeater/heavy_repeater_hand.md3" + NewBarrelModel "models/weapons2/heavy_repeater/heavy_repeater_barrel.md3" + Icon "gfx/doom_wpicons/w_icon_repeater" + WeaponName "Foraged Imperial Heavy Repeater" + MuzzleEffect "Blaster/MuzzleFlash01Y" + AltFlashSound0 null + AltMuzzleEffect null + FlashSound0 "sound/weapons/repeater/fire_old.wav" + altMissileMissEffect "repeater/concussion" + altfireenabled 0 + clipSize 20 + ReloadTimeModifier 1.5 + damageMod 1.4 + Ratemod 3.2 + hasAnimOverrides 1 + animReadyRun BOTH_WESTARM5_IDLE + animReady BOTH_WESTARM5_IDLE + animStand BOTH_WOOKIEE_RAGE_STAND -description "Kowakian Monkey-Lizard [Sith] +} +description "Kowakian Monkey-Lizard Small and agile 3-life creatures with many mobility options. Taunting within range of a Jedi will deal them minor damage. ^2Weaponry: - Melee -- 10% faster RoF -- E-11 Blaster Rifle (1) +- Foraged Imperial Heavy Repeater +-- 40% more Dmg +-- 220% slower RoF +-- 50% slower Mag Reload +-- Prim only - Frag Grenade (1) ^5Powers: @@ -77,7 +107,8 @@ Small and agile 3-life creatures with many mobility options. Taunting within ran ^8Attributes: - Reinforcements (2) -- 50% slower skill CD +- 35% more Kb Taken +- 50% slower Skill Cd - Stamina (2) - Dexterity (1) - Strength (1) diff --git a/z_MBLegends/ext_data/mb2/character/v3_Bossk.mbch b/z_MBLegends/ext_data/mb2/character/v3_Bossk.mbch index 50e26bad5..2cd92d246 100644 --- a/z_MBLegends/ext_data/mb2/character/v3_Bossk.mbch +++ b/z_MBLegends/ext_data/mb2/character/v3_Bossk.mbch @@ -38,16 +38,15 @@ ClassInfo gloatAnim BOTH_TUSKENTAUNT1 tauntAnim BOTH_ENGAGETAUNT - SPECIAL1 EAS_HI_SPRINT - SPECIAL2 EAS_HI_DEX - SPECIAL3 EAS_FP_SEE + special1 EAS_HI_SPRINT + special2 EAS_HI_DEX //SPECIAL4 EAS_HI_MEDPAC } WeaponInfo0 { WeaponToReplace WP_BOWCASTER - WeaponBasedOff WP_BOWCASTER + WeaponBasedOff WP_CONCUSSION NewWorldModel "models/weapons2/relby_v10/model_w.glm" NewViewModel "models/weapons2/relby_v10/model.md3" Icon "gfx/hud/w_icon_relby_v10" @@ -87,7 +86,7 @@ ForceInfo0 ForcePowerName "Hunter Vision" } -description "Bossk'wassak'Cradossk aka Bossk [ARC Trooper] +description "Bossk'wassak'Cradossk aka Bossk A dexterous hunter with enhanced poison shots. @@ -97,13 +96,13 @@ A dexterous hunter with enhanced poison shots. -- 10% faster RoF - Relby-v10 Targeting Rifle (Bowcaster 3) -- Poisons on hit --- 10% more charged FP DMG --- 20% less DMG --- Mag reload +-- 10% more Charged FP Dmg +-- 20% less Dmg +-- Mag Reload - Fire Grenades (3) ^5Powers: -- Hunter Vision (Sense 1) ^3[CS3] +- Hunter Vision (Sense 1) ^8Attributes: - Bunny Hop (1) diff --git a/z_MBLegends/ext_data/mb2/character/v3_DeathTr.mbch b/z_MBLegends/ext_data/mb2/character/v3_DeathTr.mbch index 14d589053..5d89fe751 100644 --- a/z_MBLegends/ext_data/mb2/character/v3_DeathTr.mbch +++ b/z_MBLegends/ext_data/mb2/character/v3_DeathTr.mbch @@ -91,7 +91,7 @@ WeaponInfo1 rateMod 0.65 } -description "Death Trooper [ARC Trooper] +description "Death Trooper A dexterous 2-life class with a suppression Rifle and multiple offensive tools. @@ -99,16 +99,16 @@ A dexterous 2-life class with a suppression Rifle and multiple offensive tools. - Melee - SE-14C Blaster Pistol (2) -- 35% faster RoF --- 20% less DMG +-- 20% less Dmg - DLT-19D Blaster Rifle (EE-4 2) -- 35% faster RoF --- 25% less FP DMG --- 15% slower movement +-- 25% less FP Dmg +-- 15% slower Movement - Frag Grenades (2) ^8Attributes: - Reinforcement (1) -- 12% less KB taken +- 12% less Kb Taken - Stamina (3) - Dexterity (1) - Strength (1) diff --git a/z_MBLegends/ext_data/mb2/character/v3_FOMarsh.mbch b/z_MBLegends/ext_data/mb2/character/v3_FOMarsh.mbch index 979db9243..4b11c7525 100644 --- a/z_MBLegends/ext_data/mb2/character/v3_FOMarsh.mbch +++ b/z_MBLegends/ext_data/mb2/character/v3_FOMarsh.mbch @@ -103,7 +103,7 @@ WeaponInfo2 WeaponName "Quicksilver Spear" } -description "First Order Marshal [ARC Trooper] +description "First Order Marshal A hybrid melee/gunner commander with Beskar armor resistance, a spear, and rapid firing guns. @@ -113,22 +113,20 @@ A hybrid melee/gunner commander with Beskar armor resistance, a spear, and rapid - Quicksilver Spear (Staff Saber) -- Saber Defense (2) -- No Blaster Block --- 50% less DMG --- 33% more radius --- Slap ^3[GB] +-- 33% more Radius - SE-44C Blaster Pistol (1) -- 40% faster RoF --- 15% more DMG/FP DMG --- 100% slower reload +-- 15% more Dmg/FP Dmg +-- 100% slower Reload - F-11D Blaster Rifle (DC Carbine 1) -- 40% faster RoF --- 35% less DMG/FP DMG --- 40% slower mag reload +-- 35% less Dmg/FP Dmg +-- 40% slower Mag Reload - Frag Grenades (2) - Fire Grenade (1) ^8Attributes: -- 20% more/less KB given/taken +- 20% more/less Kb Given/Taken - Strength (1) - Stamina (2) - Dexterity (1) diff --git a/z_MBLegends/ext_data/mb2/character/v3_HeavyStorm.mbch b/z_MBLegends/ext_data/mb2/character/v3_HeavyStorm.mbch index 31f394fa4..f6a627273 100644 --- a/z_MBLegends/ext_data/mb2/character/v3_HeavyStorm.mbch +++ b/z_MBLegends/ext_data/mb2/character/v3_HeavyStorm.mbch @@ -78,7 +78,7 @@ ClassInfo rankArmourRegenCap 40 isCustomBuild 1 - mbPoints 50 + mbPoints 60 c_att_skill_0 MB_ATT_BLASTER c_att_names_0 "E-11 Blaster Rifle" @@ -91,25 +91,27 @@ ClassInfo c_att_skill_2 MB_ATT_MINIGUN c_att_names_2 "Z-6 Rotary Cannon (Minigun)" c_att_ranks_2 10 - c_att_descs_2 "24% slower RoF, 5% more DMG, 10% more FP DMG" + c_att_descs_2 "24% slower RoF, 5% more Dmg, 10% more FP Dmg" + c_att_skill_3 MB_ATT_PLX1 c_att_names_3 "MiniMag PTL Launcher (PLX)" - c_att_ranks_3 6,13 + c_att_ranks_3 6 c_att_skill_4 MB_ATT_FRAGS - c_att_names_4 "Frag Grenades" - c_att_ranks_4 6,7 + c_att_names_4 "Frag Grenade" + c_att_ranks_4 6 c_att_skill_5 MB_ATT_FIRE_GRENADES - c_att_names_5 "Fire Grenades" - c_att_ranks_5 4,5 + c_att_names_5 "Fire Grenade" + c_att_ranks_5 4 c_att_skill_6 MB_ATT_RESPAWNS c_att_names_6 "Reinforcement" - c_att_ranks_6 20 + c_att_ranks_6 26 c_att_descs_6 "1 default" + c_att_skill_7 MB_ATT_HEALTH - c_att_names_7 "Health (80/100)" + c_att_names_7 "HP (80/100)" c_att_ranks_7 2,2 c_att_skill_8 MB_ATT_ARMOUR @@ -122,7 +124,7 @@ ClassInfo c_att_skill_10 MB_ATT_ASSEMBLE c_att_names_10 "Assemble" - c_att_ranks_10 2,2,3 + c_att_ranks_10 1,2,2 c_att_skill_11 MB_ATT_DEXTERITY c_att_names_11 "Dexterity" @@ -155,12 +157,12 @@ WeaponInfo0 WeaponName "Z-6 Rotary Blaster Cannon" customammo 900 clipSize 300 - isMinigun 1 altFireEnabled 1 FPMult 1.1 damageMod 1.05 rateMod 0.62 velocityMod .76 +isMinigun 1 } WeaponInfo1 @@ -199,7 +201,7 @@ WeaponInfo3 WeaponName "Frag Grenades" } -description "Heavy Stormtrooper [Clone Trooper] +description "Heavy Stormtrooper A slow, but heavily armed soldier specializing in suppression and area denial. @@ -212,7 +214,7 @@ A slow, but heavily armed soldier specializing in suppression and area denial. ^8Attributes: - Reinforcement (1) -- 10% less KB taken +- 10% less Kb Taken - Stamina (0) - Armor Regen: 1/.5s to 20 diff --git a/z_MBLegends/ext_data/mb2/character/v3_IG88.mbch b/z_MBLegends/ext_data/mb2/character/v3_IG88.mbch index a37204032..c77b34308 100644 --- a/z_MBLegends/ext_data/mb2/character/v3_IG88.mbch +++ b/z_MBLegends/ext_data/mb2/character/v3_IG88.mbch @@ -10,10 +10,10 @@ ClassInfo WP_AmbanFlags HELD_DISRUPTIFY|HELD_FLAME|HELD_SONIC WP_MeleeFlags HELD_SLOW - attributes MB_ATT_AMBAN,1|MB_ATT_RECHARGE,3|MB_ATT_THERMALS,1|MB_ATT_BESKAR,3|MB_ATT_MANDO_PISTOL,3|MB_ATT_AMMO,3|MB_ATT_BLAST_ARMOUR|MB_ATT_WOOKIE_STRENGTH,2|MB_ATT_SHIELD_RECHARGE,1|MB_ATT_SONIC_DETONATOR,2|MB_ATT_ANTI_MT,2|MB_ATT_TRACKING_BEACON|MB_ATT_SABER_COMBO_NONE|MB_ATT_CORTOSIS,1|MB_ATT_MAGNETIC_PLATING + attributes MB_ATT_AMBAN,1|MB_ATT_RECHARGE,3|MB_ATT_THERMALS,1|MB_ATT_BESKAR,3|MB_ATT_MANDO_PISTOL,3|MB_ATT_AMMO,3|MB_ATT_BLAST_ARMOUR|MB_ATT_WOOKIE_STRENGTH,2|MB_ATT_SHIELD_RECHARGE,1|MB_ATT_SONIC_DETONATOR,2|MB_ATT_ANTI_MT,2|MB_ATT_TRACKING_BEACON|MB_ATT_SABER_COMBO_NONE|MB_ATT_CORTOSIS,1|MB_ATT_MAGNETIC_PLATING|MB_ATT_THROWER_POISON - special2 EAS_NONE - special1 EAS_FP_SEE + special1 EAS_NONE + special2 EAS_HI_POISONTHROWER maxhealth 80 maxarmor 80 @@ -109,7 +109,7 @@ animWalkAttackL BOTH_ALORA_SPIN WeaponInfo2 { WeaponToReplace WP_AMBAN - WeaponBasedOff WP_PROJ + WeaponBasedOff WP_SHOTGUN NewWorldModel "models/weapons2/dlt20a/dlt20a_w.glm" NewViewModel "models/weapons2/dummy/dummy.md3" AltMuzzleEffect "Blaster/MuzzleFlash01Y" @@ -135,39 +135,37 @@ ForceInfo0 LoopSound "sound/ambience/cp_02_lp.wav" } -description "IG-series Assassin Droid [Wookiee] +description "IG-series Assassin Droid A sturdy and heavily armored gunner. ^2Weaponry: - Melee --- 15% slower movement +-- 15% slower Movement - Droid Slappers (Red Saber) -- No Saber/Blaster Block -- No Saber Training --- 150% more KB --- 75% less DMG --- 200% special DMG mult --- 35% less reach --- 300% more radius --- Slap ^3[GB] +-- 150% more Kb +-- 200% Spec Dmg mult +-- 35% less Reach +-- 300% more Radius - Dual Blaster Rifles (WESTARs 4) -- 35% slower RoF --- 10% less DMG --- 15% less FP DMG +-- 10% less Dmg +-- 15% less FP Dmg - Thermal Detonator (1) - Sonic Detonators (2) - Pulse Cannon (Amban Rifle 1) -- Ignites/stuns on hit --- 20% more velocity --- 50% more FP DMG +-- 20% more Velocity +-- 50% more FP Dmg ^5Powers: -- Radar Scanner (Sense 1) ^3[CS1] +- Radar Scanner (Sense 1) ^8Attributes: - 25% faster Hacking -- 20% less KB taken +- 20% less Kb Taken - Strength (2) - Beskar (3) - Blast Armor @@ -175,4 +173,7 @@ A sturdy and heavily armored gunner. - Armor Regen (1) - Sense Immunity - Anti-Mind Trick (2) -- Tracking Beacon" \ No newline at end of file +- Tracking Beacon + +^3Abilities: +- Wrist Poisonthrower ^3[CS2]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/v3_Trando.mbch b/z_MBLegends/ext_data/mb2/character/v3_Trando.mbch index 9897322bb..58adc6e9f 100644 --- a/z_MBLegends/ext_data/mb2/character/v3_Trando.mbch +++ b/z_MBLegends/ext_data/mb2/character/v3_Trando.mbch @@ -11,9 +11,9 @@ saberstyle SS_DESANN saberDamage 120 rankAS 1.3 BPMultiplier 0 -maxhealth 230 -rankHealth 255 -maxarmor 25 +maxhealth 225 +rankHealth 275 +maxarmor 10 rateOfFire_Melee .9 rankROFMelee .65 forceregen .01 @@ -61,15 +61,15 @@ c_att_ranks_0 0 c_att_skill_1 MB_ATT_REPEATER c_att_names_1 "ACP Repeater" c_att_ranks_1 0 -c_att_descs_1 "100% more velocity, 45% less DMG/FP DMG, 10% slower RoF, -Mag reload, Prim only" +c_att_descs_1 "100% more Velocity, 45% less Dmg/FP Dmg, 10% slower RoF, +Mag Reload, Prim only" c_att_skill_2 MB_ATT_TRIP_MINES c_att_names_2 "Trip Mine" c_att_ranks_2 0 c_att_skill_3 MB_ATT_PROJECTILE_RIFLE c_att_names_3 "Hunting Rifle (Proj)" c_att_ranks_3 0 -c_att_descs_3 "30% less DMG" +c_att_descs_3 "30% less Dmg" c_att_skill_4 MB_ATT_BASESPEED c_att_names_4 "Speed (213)" c_att_ranks_4 0 @@ -82,15 +82,15 @@ c_att_ranks_15 0,0 c_att_skill_16 MB_ATT_DC_CARBINE c_att_names_16 "Heavy Repeater (DC Carbine)" c_att_ranks_16 0 -c_att_descs_16 "55% faster RoF, 40% less DMG/FP DMG, 170% slower mag reload, -15% slower movement" +c_att_descs_16 "55% faster RoF, 40% less Dmg/FP Dmg, 170% slower Mag Reload, +15% slower Movement" c_att_skill_17 MB_ATT_CONCUSSION c_att_names_17 "LJ-50 Conc Rifle" c_att_ranks_17 0,0,0 -c_att_descs_17 "80% less velocity, 80% slower RoF, 80% slower mag reload, -15% slower movement, Prim only" +c_att_descs_17 "80% less Velocity, 80% slower RoF, 80% slower Mag Reload, +15% slower Movement, Prim only" c_att_skill_18 MB_ATT_HEALTH -c_att_names_18 "Health (255)" +c_att_names_18 "HP (275)" c_att_ranks_18 0 c_att_skill_19 MB_ATT_BLAST_ARMOR c_att_names_19 "Blast Armor" @@ -101,12 +101,12 @@ c_att_ranks_30 0 c_att_skill_31 MB_ATT_SHOTGUN c_att_names_31 "Electronet Launcher (Shotgun)" c_att_ranks_31 0 -c_att_descs_31 "Shocks/freezes/staggers/pushes on hit, 80% faster shot swap, -50% less DMG, 14900% slower reload" +c_att_descs_31 "Shocks/freezes/staggers/pushes on hit, 80% faster Shot Swap, +50% less Dmg, 14900% slower Reload" c_att_skill_32 MB_ATT_AMBAN c_att_names_32 "Slave Prod (Amban)" c_att_ranks_32 0,0,0 -c_att_descs_32 "15% faster movement, No ammo" +c_att_descs_32 "15% faster Movement, No ammo" c_att_skill_33 MB_ATT_BASESPEED c_att_names_33 "Speed (225)" c_att_ranks_33 0,0 @@ -117,11 +117,12 @@ c_att_ranks_34 0,0 WeaponInfo0 { WeaponToReplace WP_FLECHETTE -WeaponBasedOff WP_FLECHETTE -NewWorldModel "models/weapons2/cp-50_repeater/cp-50_repeater_w.glm" -NewViewModel "models/weapons2/cp-50_repeater/cp-50_repeater.md3" +WeaponBasedOff WP_SHOTGUN +NewWorldModel "models/weapons2/junglerifle/jungeRifle.glm" +NewViewModel "models/weapons2/junglerifle/jungeRifle.md3" +NewHandsModel "models/weapons2/junglerifle/jungeRifle_hand.md3" +Icon "gfx/hud/w_icon_junglerifle" FlashSound0 "sound/weapons/acparray/fire.wav" -Icon "gfx/hud/w_icon_cp-50_repeater" WeaponName "ACP Scatter Gun" clipSize 40 customAmmo 360 @@ -143,9 +144,9 @@ WeaponInfo2 { WeaponToReplace WP_REPEATER WeaponBasedOff WP_REPEATER -NewWorldModel "models/weapons2/sherruck_blaster/sher_rifle_w.glm" -NewViewModel "models/weapons2/sherruck_blaster/sher_rifle.md3" -Icon "gfx/hud/w_icon_sherruck" +NewWorldModel "models/weapons2/cp-50_repeater/cp-50_repeater_w.glm" +NewViewModel "models/weapons2/cp-50_repeater/cp-50_repeater.md3" +Icon "gfx/hud/w_icon_cp-50_repeater" WeaponName "ACP Repeater" flashSound0 "sound/weapons/ArrayACP/fire.wav" MissileModel null @@ -204,7 +205,7 @@ animStand BOTH_STAND2 } WeaponInfo5{ WeaponToReplace WP_CONCUSSION -WeaponBasedOff WP_CONCUSSION +WeaponBasedOff WP_MANDO_PISTOL NewWorldModel "models/weapons2/lj-50_concussion/lj-50_concussion_w.glm" NewViewModel "models/weapons2/lj-50_concussion/lj-50_concussion.md3" Icon "gfx/hud/w_icon_lj-50_concussion" @@ -220,10 +221,9 @@ velocityMod .2 WeaponInfo6{ WeaponToReplace WP_SHOTGUN WeaponBasedOff WP_SHOTGUN -NewWorldModel "models/weapons2/junglerifle/jungeRifle.glm" -NewViewModel "models/weapons2/junglerifle/jungeRifle.md3" -NewHandsModel "models/weapons2/junglerifle/jungeRifle_hand.md3" -Icon "gfx/hud/w_icon_junglerifle" +NewWorldModel "models/weapons2/sherruck_blaster/sher_rifle_w.glm" +NewViewModel "models/weapons2/sherruck_blaster/sher_rifle.md3" +Icon "gfx/hud/w_icon_sherruck" WeaponName "Electronet Launcher" MuzzleEffect "sbd/cortosis_orange" MissileEffect "electronet/shot" @@ -247,7 +247,7 @@ WeaponName "Slave Prod" clipsize -1 CustomAmmo -1 } -description "Trandoshan Fiend [Wookiee] +description "Trandoshan Fiend Hiss @@ -257,14 +257,12 @@ Hiss -- No Saber/Blaster Block -- No Saber Training -- Poisons on hit --- 5% faster movement --- 70% less DMG --- 25% less reach --- Slap ^3[GB] +-- 5% faster Movement +-- 25% less Reach - ACP Scatter Gun (Flechette 2) --- 15% more DMG +-- 15% more Dmg -- 40% slower RoF --- 60% slower mag reload +-- 60% slower Mag Reload - Frag Grenade (1) - Sonic Detonator (1) diff --git a/z_MBLegends/ext_data/mb2/character/v4_BX.mbch b/z_MBLegends/ext_data/mb2/character/v4_BX.mbch index a6f1d1f1f..ec7661d7d 100644 --- a/z_MBLegends/ext_data/mb2/character/v4_BX.mbch +++ b/z_MBLegends/ext_data/mb2/character/v4_BX.mbch @@ -6,12 +6,12 @@ ClassInfo saber1 Vibro_bx_legends saberstyle SS_MEDIUM attributes MB_ATT_AMMO,3|MB_ATT_FP_SABER_DEFENSE,1|MB_ATT_FLIPKICK,1|MB_ATT_DASH,1|MB_ATT_RECHARGE,3 - classflags CFL_HEAVYMELEE|CFL_BPFREEJUMPS + classflags CFL_HEAVYMELEE|CFL_BPFREEJUMPS|CFL_DISMEMBERFRAGILE classNumberLimit 3 knockbackTaken 0.8 modelscale 1.035 basespeed 195 - rankbasespeed 210,230,265 + rankbasespeed 214,235,258 maxhealth 60 rankHealth 75,100,110 maxarmor 20 @@ -62,7 +62,7 @@ ClassInfo skin_7 "bscapt" uishader_7 "models/players/bxdroid/mb2_icon_bscapt" model_8 "bxdroid" - skin_8 "dip" + skin_8 "Dip" uishader_8 "models/players/bxdroid/mb2_icon_dip" model_9 "bxdroid" skin_9 "proto" @@ -117,7 +117,7 @@ c_att_names_6 "E-5 Blaster (EE-4)" c_att_ranks_6 2,5,8 c_att_skill_7 MB_ATT_HEALTH -c_att_names_7 "Health (75/100/110)" +c_att_names_7 "HP (75/100/110)" c_att_ranks_7 2,4,3 c_att_skill_8 MB_ATT_ARMOUR @@ -129,11 +129,11 @@ c_att_names_9 "Beskar" c_att_ranks_9 3,2,5 c_att_skill_10 MB_ATT_BASESPEED -c_att_names_10 "Speed (210/230/265)" +c_att_names_10 "Speed (214/235/258)" c_att_ranks_10 2,3,4 c_att_skill_11 MB_ATT_STM_MULTIPLIER -c_att_names_11 "Skill CD (100/110/120%)" +c_att_names_11 "Skill Cd (100/110/120%)" c_att_ranks_11 4,2,2 c_att_descs_11 "75% default" c_att_skill_12 MB_ATT_DODGE @@ -182,7 +182,7 @@ c_att_names_22 "Assemble" c_att_ranks_22 1,1 c_att_skill_23 MB_ATT_HEALTH -c_att_names_23 "Health (75/100)" +c_att_names_23 "HP (75/100)" c_att_ranks_23 3,4 c_att_skill_24 MB_ATT_ARMOUR @@ -194,11 +194,11 @@ c_att_names_25 "Beskar" c_att_ranks_25 3,2 c_att_skill_26 MB_ATT_BASESPEED -c_att_names_26 "Speed (210/230/265)" +c_att_names_26 "Speed (214/235/258)" c_att_ranks_26 1,2,4 c_att_skill_27 MB_ATT_STM_MULTIPLIER -c_att_names_27 "Skill CD (100/110/120%)" +c_att_names_27 "Skill Cd (100/110/120%)" c_att_ranks_27 4,2,2 c_att_descs_27 "75% default" c_att_skill_28 MB_ATT_DODGE @@ -235,7 +235,7 @@ c_att_names_35 "Assemble" c_att_ranks_35 1,1 c_att_skill_36 MB_ATT_HEALTH -c_att_names_36 "Health (75/100)" +c_att_names_36 "HP (75/100)" c_att_ranks_36 3,4 c_att_skill_37 MB_ATT_ARMOUR @@ -247,11 +247,11 @@ c_att_names_38 "Beskar" c_att_ranks_38 3 c_att_skill_39 MB_ATT_BASESPEED -c_att_names_39 "Speed (210/230/265)" +c_att_names_39 "Speed (214/235/258)" c_att_ranks_39 2,3,6 c_att_skill_40 MB_ATT_STM_MULTIPLIER -c_att_names_40 "Skill CD (100/110/120%)" +c_att_names_40 "Skill Cd (100/110/120%)" c_att_ranks_40 4,2,2 c_att_descs_40 "75% default" c_att_skill_41 MB_ATT_DODGE @@ -286,7 +286,7 @@ WeaponInfo1 customAmmo 750 clipSize 50 } -description "BX-series Commando Droid [ARC Trooper] +description "BX-series Commando Droid A customizable, agile class with a balanced outfit of tools and abilities. @@ -297,16 +297,14 @@ A customizable, agile class with a balanced outfit of tools and abilities. --- BP-Free Jumps -- No Blaster Block -- Chain Limit: 3 --- 50% less DMG --- 38% less reach --- Slap ^3[GB] +-- 38% less Reach ^5Powers: - Hydraulic Legs (Jump 1) ^8Attributes: -- 20% less KB taken -- 25% slower skill CD +- 20% less Kb Taken +- 25% slower Skill Cd - Battery Recharge (3) ^3Abilities: diff --git a/z_MBLegends/ext_data/mb2/character/v4_CarnorJax.mbch b/z_MBLegends/ext_data/mb2/character/v4_CarnorJax.mbch index 05ba00aeb..25611eb67 100644 --- a/z_MBLegends/ext_data/mb2/character/v4_CarnorJax.mbch +++ b/z_MBLegends/ext_data/mb2/character/v4_CarnorJax.mbch @@ -32,7 +32,7 @@ classFlags CFL_NOPICKUPS rateOfFire_Melee 0.85 speed 1.00 saberDamage 150 -saberSpecialDamage 1.2 + saberSpecialDamage 1.2 saber1 ispdvba saberstyle SS_STAFF|SS_DESANN|SS_TAVION APmultiplier 1.05 @@ -48,9 +48,10 @@ saberSpecialDamage 1.2 saberStanceAnim BOTH_TAVION_STANCE walkForward BOTH_WALK2 - special1 EAS_FP_SEE - special2 EAS_HI_DEX - special3 EAS_HI_DASH + special1 EAS_NONE + special2 EAS_HI_DEX + //special3 EAS_FP_GRIP + special4 EAS_HI_DASH //respawncustomtime 50000 @@ -66,7 +67,7 @@ saberSpecialDamage 1.2 c_att_ranks_1 1,1 c_att_skill_2 MB_ATT_FP_GRIP - c_att_names_2 "Force Grip ^3[CS4]" + c_att_names_2 "Force Grip ^3[CS3]" c_att_ranks_2 1,1 } @@ -106,7 +107,7 @@ WeaponInfo1 } -description "Carnor Jax [Sith] +description "Carnor Jax A well-rounded gunner/Saberist who combines martial arts and Force usage. @@ -116,21 +117,19 @@ A well-rounded gunner/Saberist who combines martial arts and Force usage. - ISP Double-Vibroblade A (Staff/Purple/Cyan Saber) -- Saber Defense (2) -- Blaster Defense (1) --- Saber DMG: 150 --- 120% special DMG mult --- 6% less reach --- Slap ^3[GB] +-- 120% Spec Dmg mult +-- 6% less Reach - Modified Guardsmen Blaster Pistol (3) --- 15% more DMG --- 25% more FP DMG +-- 15% more Dmg +-- 25% more FP Dmg -- Prim only --- Mag reload +-- Mag Reload ^5Force Powers: -- Sense (1) ^3[CS1] +- Sense (1) ^8Attributes: -- 10% less KB taken +- 10% less Kb Taken - Dexterity (2) - Knockdown Roll - Healing (1) @@ -140,4 +139,4 @@ A well-rounded gunner/Saberist who combines martial arts and Force usage. ^3Abilities: - Flipkick (1) ^3[Contact Jump] - Dex Roll ^3[CS2] -- Dash (1) ^3[CS3]" \ No newline at end of file +- Dash (1) ^3[CS4]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/v4_MagnaG.mbch b/z_MBLegends/ext_data/mb2/character/v4_MagnaG.mbch index 21d311f99..1069fff93 100644 --- a/z_MBLegends/ext_data/mb2/character/v4_MagnaG.mbch +++ b/z_MBLegends/ext_data/mb2/character/v4_MagnaG.mbch @@ -6,11 +6,14 @@ ClassInfo classNumberLimit 2 extralives 1 - weapons WP_MELEE|WP_SABER|WP_EE3|WP_PLX1 + weapons WP_MELEE|WP_SABER|WP_EE3 + WP_SaberFlags HELD_PULSE - WP_PLX1Flags HELD_POISON|HELD_EXPLOSIVE|HELD_TRACKING + WP_RocketLauncherFlags HELD_POISON|HELD_TRACKING|HELD_STUN|HELD_ALTRELOAD + WP_PLX1Flags HELD_LOWDAMAGE + - attributes MB_ATT_FP_SABER_DEFENSE,1|MB_ATT_GUN_DEFENSE,1|MB_ATT_MAGNETIC_PLATING,1|MB_ATT_FORCEBLOCK,2|MB_ATT_EE3,3|MB_ATT_AMMO,3|MB_ATT_ASSEMBLE,3|MB_ATT_ANTI_MT,2|MB_ATT_SABER_COMBO,1|MB_ATT_DEFLECT,0|MB_ATT_TRACKING_BEACON|MB_ATT_PLX1,1|MB_ATT_DASH,1|MB_ATT_DEXTERITY,2|MB_ATT_GRAPPLE_HOOK,1 + attributes MB_ATT_FP_SABER_DEFENSE,1|MB_ATT_GUN_DEFENSE,1|MB_ATT_MAGNETIC_PLATING,1|MB_ATT_FORCEBLOCK,2|MB_ATT_EE3,3|MB_ATT_AMMO,3|MB_ATT_ASSEMBLE,3|MB_ATT_ANTI_MT,2|MB_ATT_SABER_COMBO,1|MB_ATT_DEFLECT,0|MB_ATT_TRACKING_BEACON|MB_ATT_DASH,1|MB_ATT_DEXTERITY,2|MB_ATT_GRAPPLE_HOOK,1 forcepowers FP_LEVITATION,2 @@ -39,7 +42,7 @@ ClassInfo special1 EAS_NONE special2 EAS_HI_DASH - special4 EAS_HI_KICK + special3 EAS_HI_KICK meleespecial4 EAS_HI_GRAPPLEHOOK deathAnim BOTH_SBD_DEATH1 @@ -66,6 +69,19 @@ ClassInfo model_4 "magnaguard" skin_4 "bedlam_cape" uishader_4 "models/players/magnaguard/mb2_icon_bedlam_cape" + + isCustomBuild 1 + mbPoints 1 + + c_att_skill_0 MB_ATT_ROCKET_LAUNCHER + c_att_names_0 "RD-4 Rocket Launcher (2)" + c_att_ranks_0 1 + c_att_descs_0 "Poisons/tracks/staggers on det, 25% less DMG, 35% slower Mag Reload" + + c_att_skill_1 MB_ATT_PLX1 + c_att_names_1 "RPS-6 Rocket Launcher (PLX)" + c_att_ranks_1 1 + c_att_descs_1 "50% less DMG" } WeaponInfo0 @@ -104,17 +120,17 @@ WeaponInfo1 animAttack BOTH_ATTACK2 animAttackWalk BOTH_ATTACK2 } + WeaponInfo2 { - WeaponToReplace WP_PLX1 - WeaponBasedOff WP_PLX1 - NewWorldModel "models/weapons2/e60r_launcher/e60r_launcher_w.glm" - NewViewModel "models/weapons2/e60r_launcher/e60r_launcher.md3" - Icon "gfx/hud/w_icon_e60r_launcher" - WeaponName "Bulldog Radiation Launcher" - reloadTimeModifier 0.6 - damageMod 0.1 - rateMod 0.35 +WeaponToReplace WP_ROCKET_LAUNCHER +WeaponBasedOff WP_ROCKET_LAUNCHER +Icon "gfx/hud/w_icon_upl" +NewWorldModel "models/weapons2/upl/upl_w.glm" +NewViewModel "models/weapons2/upl/upl.md3" +NewHandsModel "models/weapons2/upl/upl_hand.md3" +NewBarrelModel "models/weapons2/upl/upl_barrel.md3" +WeaponName "RD-4 Radiation Rocket Launcher" flashSound0 "sound/weapons/upl/fire_radiation.wav" altFlashSound0 "sound/weapons/upl/fire_radiation.wav" MuzzleEffect "noghri_stick/flesh_impact" @@ -127,8 +143,26 @@ altFlashSound0 "sound/weapons/upl/fire_radiation.wav" altMissileHitDroidEffect "slime_explosion_new" altMissileHitHumanEffect "slime_explosion_new" altMissileEffect "hutt/toxic_breath" + customAmmo 1 + clipSize 1 + damageMod 0.75 + reloadTimeModifier 1.35 } -description "IG-100 MagnaGuard [Sith] + +WeaponInfo3 +{ + WeaponToReplace WP_PLX1 + WeaponBasedOff WP_PLX1 + NewWorldModel "models/weapons2/e60r_launcher/e60r_launcher_w.glm" + NewViewModel "models/weapons2/e60r_launcher/e60r_launcher.md3" + Icon "gfx/hud/w_icon_e60r_launcher" + WeaponName "RPS-6 Rocket Launcher" +flashSound0 "sound/weapons/upl/fire_rocket.wav" +altFlashSound0 "sound/weapons/upl/fire_rocket.wav" +} + + +description "IG-100 MagnaGuard Mobile hybrids with high dueling stats and Armor Regen. @@ -139,16 +173,9 @@ Mobile hybrids with high dueling stats and Armor Regen. --- BP-Free Jumps -- EX Saber Training (1) -- Shocks on hit --- 3% more KB --- 6% less reach --- 76% less DMG --- Slap ^3[GB] -- Bulldog Radiation Launcher (1) --- Poisons/tracks on hit --- Bonus explosive DMG --- 40% faster reload --- 65% faster shot swap --- 90% less DMG +-- 3% more Kb +-- 6% less Reach +-- 76% less Dmg - Modified E-5 Blaster Rifle (EE-3 3) ^5Powers: @@ -156,7 +183,7 @@ Mobile hybrids with high dueling stats and Armor Regen. ^8Attributes: - Reinforcement (1) -- 50% slower skill CD +- 50% slower Skill Cd - Dexterity (2) - Magnetic Plating - Physical Resist @@ -167,5 +194,5 @@ Mobile hybrids with high dueling stats and Armor Regen. ^3Abilities: - Dash (1) ^3[CS2] -- Gunkick ^3[CS4] +- Gunkick ^3[CS3] - Grappling Hook (1) ^3[CS4 Melee]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/v4_Mara.mbch b/z_MBLegends/ext_data/mb2/character/v4_Mara.mbch index 2a0a1c73d..78e7fafc2 100644 --- a/z_MBLegends/ext_data/mb2/character/v4_Mara.mbch +++ b/z_MBLegends/ext_data/mb2/character/v4_Mara.mbch @@ -31,9 +31,11 @@ ClassInfo saber1_1 saber_mara_legends2 sabercolor_1 5 saberstyle SS_FAST|SS_MEDIUM - saberDamageStyle SS_FAST,130 + saberSpecialDamage 1.25 + saberDamageStyle SS_FAST,130|SS_MEDIUM,240 saberThrowDamage 40 - + damageGiven 1.1 + rateOfFire_Melee .9 basespeed 225 gloatAnim BOTH_SHOWOFF_FAST @@ -90,21 +92,22 @@ animReady TORSO_WEAPONIDLE2 animStand BOTH_STAND9 } -description "Mara Jade [Sith] +description "Mara Jade A Sith/pistoleer hybrid that rewards flanking, skirmishing, and swapping between weapons and Force powers. ^2Weaponry: - Melee +-- 10% faster RoF - Lightsaber (Yellow/Blue) -- Saber/Blaster Defense (2) -- Blaster Deflect (2) --- 8% more Blue DMG +-- 8% more Blue Dmg +-- 125% Spec Dmg mult -- EX Saber Throw (1) ^3[CS1] ---- 33% more DMG --- Slap ^3[GB] +--- 33% more Dmg - Hold-out Blaster Pistol (3) --- 20% less velocity +-- 20% less Velocity - Thermal Grenades (4) - Sonic Detonator (1) diff --git a/z_MBLegends/ext_data/mb2/character/v4_PurgeTr.mbch b/z_MBLegends/ext_data/mb2/character/v4_PurgeTr.mbch index 148d60387..24625a149 100644 --- a/z_MBLegends/ext_data/mb2/character/v4_PurgeTr.mbch +++ b/z_MBLegends/ext_data/mb2/character/v4_PurgeTr.mbch @@ -17,10 +17,10 @@ ClassInfo forcepool 100 maxhealth 80 - rankHealth 100,120 + rankHealth 100,115 MaxArmor 20 - rankArmor 50,80,120 + rankArmor 50,80,115 forcepowers FP_SABER_OFFENSE,3 @@ -99,11 +99,11 @@ baseSpeed 200 c_att_descs_2 "10% slower RoF" c_att_skill_3 MB_ATT_CLONEBLOBS - c_att_names_3 "> DC-15A Concussion Blobs" + c_att_names_3 "> DC-15A Conc Blobs" c_att_ranks_3 1,1,1 c_att_skill_4 MB_ATT_MICRO_GRENADES - c_att_names_4 "Concussion Grenades" + c_att_names_4 "V-59 Conc Grenades" c_att_ranks_4 2,2,2 c_att_skill_5 MB_ATT_RESPAWNS @@ -111,11 +111,11 @@ baseSpeed 200 c_att_ranks_5 25 c_att_skill_6 MB_ATT_HEALTH - c_att_names_6 "Health (100/120)" + c_att_names_6 "HP (100/115)" c_att_ranks_6 2,2 c_att_skill_7 MB_ATT_ARMOUR - c_att_names_7 "Armor (50/80/120)" + c_att_names_7 "Armor (50/80/115)" c_att_ranks_7 3,4,5 c_att_skill_8 MB_ATT_CORTOSIS @@ -165,7 +165,7 @@ WeaponInfo1 rateMod 1.1 } -description "Purge Trooper [Clone Trooper] +description "Purge Trooper Dexterous Melee/gunner hybrids who can spec into anti-Jedi tools, damage protection, Electro-Weapon upgrades, and advanced mobility options. @@ -174,16 +174,14 @@ Dexterous Melee/gunner hybrids who can spec into anti-Jedi tools, damage protect - Electrosaber -- Saber Defense (1) -- No Blaster Block --- 53% less DMG --- Slap ^3[GB] > Imperial Electrostaff (Staff) -- 15% more AS --- 3% more KB --- 6% less reach +-- 3% more Kb +-- 6% less Reach > Double Electrobatons (Dual) -- 10% more AS --- 2% more KB --- 60% less reach +-- 2% more Kb +-- 60% less Reach ^8Attributes: - Stamina (0) diff --git a/z_MBLegends/ext_data/mb2/character/v4_RoyalPr.mbch b/z_MBLegends/ext_data/mb2/character/v4_RoyalPr.mbch index 59d916416..ecd9bec09 100644 --- a/z_MBLegends/ext_data/mb2/character/v4_RoyalPr.mbch +++ b/z_MBLegends/ext_data/mb2/character/v4_RoyalPr.mbch @@ -63,12 +63,12 @@ ClassInfo c_att_skill_1 MB_ATT_SHOTGUN c_att_names_1 "ARC Caster (Shotgun)" c_att_ranks_1 1 - c_att_descs_1 "Shocks on hit, 75% less velocity, 75% slower mag reload" + c_att_descs_1 "Shocks on hit, 75% less Velocity, 75% slower Mag Reload" c_att_skill_2 MB_ATT_T21 c_att_names_2 "T-21 Heavy Blaster" c_att_ranks_2 1,0 - c_att_descs_2 "Sec only, Mag reload" + c_att_descs_2 "Sec only, Mag Reload" //respawncustomtime 30000 } @@ -86,7 +86,7 @@ WeaponInfo0 WeaponInfo1 { WeaponToReplace WP_SHOTGUN - WeaponBasedOff WP_BLASTER + WeaponBasedOff WP_CONCUSSION NewWorldModel "models/weapons2/arc_caster/arc_caster_w.glm" NewViewModel "models/weapons2/arc_caster/model.md3" Icon "gfx/hud/w_icon_arc_caster" @@ -143,25 +143,23 @@ WeaponInfo3 primfireenabled 0 } -description "Emperor's Royal Guard [Sith] +description "Emperor's Royal Guard Mobile 2-lifes with a Saber and Force Block. ^2Weaponry: - Melee --- 15% faster movement +-- 15% faster Movement - Imperial Force Pike (Yellow/Purple Saber) -- Saber/Blaster Defense (1) --- BP Regen: 4/.4s -- Chain Limit: 3 -- Staggers on hit --- 15% more KB --- 50/70% less DMG --- 30% less reach --- 167% more radius --- Slap ^3[GB] +-- 15% more Kb +-- 30% less Reach +-- 167% more Radius - Guardsmen Blaster Pistol (1) --- Mag reload +-- Mag Reload ^8Attributes: - Reinforcement (1) diff --git a/z_MBLegends/ext_data/mb2/character/v5_Boba.mbch b/z_MBLegends/ext_data/mb2/character/v5_Boba.mbch index 61dc734f9..073e3d294 100644 --- a/z_MBLegends/ext_data/mb2/character/v5_Boba.mbch +++ b/z_MBLegends/ext_data/mb2/character/v5_Boba.mbch @@ -7,7 +7,7 @@ ClassInfo classNumberLimit 1 weapons WP_MELEE|WP_SHOTGUN|WP_SONIC_NADE|WP_CONCUSSION|WP_EE3 - attributes MB_ATT_BESKAR,2|MB_ATT_SHOTGUN,2|MB_ATT_EE3,3|MB_ATT_FRAGS,1|MB_ATT_FUEL,3|MB_ATT_JETPACK,1|MB_ATT_ROCKET,1|MB_ATT_AMMO,3|MB_ATT_BLAST_ARMOUR,1|MB_ATT_FLAMETHROWER,1|MB_ATT_WRISTLASER,1|MB_ATT_HEALING,2|MB_ATT_SONIC_DETONATOR,1|MB_ATT_WHISTLINGBIRD,1|MB_ATT_TRACKING_BEACON|MB_ATT_CONCUSSION,3 + attributes MB_ATT_BESKAR,2|MB_ATT_SHOTGUN,2|MB_ATT_EE3,3|MB_ATT_FRAGS,2|MB_ATT_FUEL,3|MB_ATT_JETPACK,1|MB_ATT_ROCKET,1|MB_ATT_AMMO,3|MB_ATT_BLAST_ARMOUR,1|MB_ATT_FLAMETHROWER,1|MB_ATT_WRISTLASER,1|MB_ATT_HEALING,2|MB_ATT_SONIC_DETONATOR,1|MB_ATT_WHISTLINGBIRD,1|MB_ATT_TRACKING_BEACON|MB_ATT_CONCUSSION,3 skilltimerMod 4 @@ -66,21 +66,20 @@ ClassInfo WeaponInfo0 { WeaponToReplace WP_SHOTGUN - WeaponBasedOff WP_BLASTER_PISTOL + WeaponBasedOff WP_SHOTGUN NewWorldModel "models/weapons/FWG-5_FlechettePistol/model.glm" NewViewModel "models/weapons/FWG-5_FlechettePistol/model.md3" Icon "gfx/hud/w_icon_flechettepistol" FlashSound0 "sound/weapons/flechette/fire.mp3" WeaponName "FWG-5 Flechette Pistol" hasAnimOverrides 1 - animReadyRun BOTH_MAND_PISTOL_READY - animReady BOTH_MAND_PISTOL_READY - animReadyWalk BOTH_MAND_PISTOL_READY - animReadyNoAmmo BOTH_MAND_PISTOL_ATTACK - animAttackRun BOTH_MAND_PISTOL_ATTACK - animAttack BOTH_MAND_PISTOL_ATTACK - animAttackWalk BOTH_MAND_PISTOL_ATTACK - animStand BOTH_MAND_PISTOL_READY + animReadyRun TORSO_WEAPONIDLE2 + animReady TORSO_WEAPONIDLE2 + animReadyWalk TORSO_WEAPONIDLE2 + animReadyNoAmmo BOTH_ATTACK2 + animAttackRun BOTH_ATTACK2 + animAttack BOTH_ATTACK2 + animAttackWalk BOTH_ATTACK2 clipsize 24 customAmmo 84 AltFireEnabled 0 @@ -129,7 +128,7 @@ WeaponInfo2 customAmmo 800 } -description "Boba Fett [Bounty Hunter] +description "Boba Fett A versatile Jetpack gunner with an arsenal of Mandalorian abilities. @@ -138,14 +137,14 @@ A versatile Jetpack gunner with an arsenal of Mandalorian abilities. - EE-3 Carbine Rifle (3) - FWG-5 Flechette Pistol (Shotgun 2) -- Fires focused blasts while hovering --- 10% less FP DMG --- 40% slower mag reload +-- 10% less FP Dmg +-- 40% slower Mag Reload - Wrist Rockets (5) (Conc Rifle 3) --- Staggers/pushes on hit --- 75% less velocity --- 40% slower mag reload +-- Staggers/pushes on det +-- 75% less Velocity +-- 40% slower Mag Reload - Sonic Detonator (1) -- Frag Grenade (1) +- Frag Grenades (2) ^8Attributes: - Beskar (2) diff --git a/z_MBLegends/ext_data/mb2/character/v5_Cad.mbch b/z_MBLegends/ext_data/mb2/character/v5_Cad.mbch index 82d64fc25..953c110c1 100644 --- a/z_MBLegends/ext_data/mb2/character/v5_Cad.mbch +++ b/z_MBLegends/ext_data/mb2/character/v5_Cad.mbch @@ -20,8 +20,8 @@ ClassInfo WP_FragNadeFlags HELD_KNOCKDOWN special1 EAS_HI_SPRINT special2 EAS_HI_DEX - special3 EAS_HI_DODGE - special4 EAS_HI_QUICKTHROW + special4 EAS_HI_DODGE + special3 EAS_HI_QUICKTHROW model "cadbane" skin "default" @@ -90,7 +90,7 @@ WeaponInfo1 altMissileMissEffect "grenades/EXP_alt" } -description "Cad Bane [ARC Trooper] +description "Cad Bane A Jetboots-equipped, dexterous dual pistoleer with Quickthrow Stun Grenades. @@ -98,7 +98,7 @@ A Jetboots-equipped, dexterous dual pistoleer with Quickthrow Stun Grenades. - Melee -- 5% faster RoF - Dual LL-30 Blaster Pistols (Clone Pistols 3) --- 5% more velocity +-- 5% more Velocity - Stun Grenades (3) (Frags) -- Sec only -- Detonates upon any contact @@ -116,5 +116,5 @@ A Jetboots-equipped, dexterous dual pistoleer with Quickthrow Stun Grenades. - Jetboots (Jetpack) - Sprint ^3[CS1] - Dex Roll ^3[CS2] -- Dodge (3) ^3[CS3] -- Quickthrow (3) ^3[CS4]" \ No newline at end of file +- Quickthrow (3) ^3[CS3] +- Dodge (3) ^3[CS4]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/v5_DarkTr.mbch b/z_MBLegends/ext_data/mb2/character/v5_DarkTr.mbch index 07aa24036..7f29479e4 100644 --- a/z_MBLegends/ext_data/mb2/character/v5_DarkTr.mbch +++ b/z_MBLegends/ext_data/mb2/character/v5_DarkTr.mbch @@ -30,11 +30,11 @@ ClassInfo uioverlay_r "gfx/icons/aerial" uioverlay_c "gfx/icons/brawler" uioverlay_l "gfx/icons/heavy" - model "darktrooper_p3" + model "Darktrooper_p3" skin "default" uishader "models/players/DarkTrooper_p3/mb2_icon_default" - model_1 "darktrooper_p0" + model_1 "Darktrooper_p0" skin_1 "default" uishader_1 "models/players/DarkTrooper_p0/mb2_icon_default" @@ -49,10 +49,9 @@ ClassInfo WeaponInfo0 { WeaponToReplace WP_BOWCASTER - WeaponBasedOff WP_ROCKET_LAUNCHER + WeaponBasedOff WP_SHOTGUN NewWorldModel "models/weapons2/assault_cannon/model_w.glm" - NewViewModel "models/weapons2/dummy/dummy.md3" - NewHandsModel "models/weapons2/merr_sonn/merr_sonn_hand.md3" + NewViewModel "models/weapons2/assault_cannon/model.md3" Icon "gfx/hud/w_icon_DTAC" WeaponName "Assault Cannon" FlashSound0 "sound/weapons/assault_cannon/fire.mp3" @@ -69,8 +68,8 @@ animCharge BOTH_WESTARM5_ATTACK CustomAmmo 800 MuzzleEffect "blaster/MuzzleFlash01B" AltMuzzleEffect "blaster/MuzzleFlash01B" - MissileEffect "demp2/projectile" - AltMissileEffect "demp2/projectile" + MissileEffect "Demp2/projectile" + AltMissileEffect "Demp2/projectile" ChargeEffect "gfx/effects/cloneFrontFlash" damageMod 1.1 rateMod 0.95 @@ -79,9 +78,9 @@ animCharge BOTH_WESTARM5_ATTACK WeaponInfo1 { WeaponToReplace WP_ROCKET_LAUNCHER - WeaponBasedOff WP_ROCKET_LAUNCHER + WeaponBasedOff WP_MANDO_PISTOL NewWorldModel "models/weapons2/assault_cannon/model_w.glm" - NewViewModel "models/weapons2/dummy/dummy.md3" + NewViewModel "models/weapons2/assault_cannon/model.md3" Icon "gfx/hud/w_icon_DTAC_rocket" WeaponName "Assault Cannon Rocket Attachment" hasAnimOverrides 1 @@ -98,7 +97,7 @@ animAttackWalk BOTH_PLX1_ATTACK rateMod 1.25 } -description "Dark Trooper [Wookiee] +description "Dark Trooper A Jetpack-equipped tank with a high-powered Assault Cannon and Rocket Launcher. @@ -106,22 +105,22 @@ A Jetpack-equipped tank with a high-powered Assault Cannon and Rocket Launcher. - Melee - Assault Cannon (Bowcaster 3) -- 5% faster RoF --- 10% more DMG +-- 10% more Dmg - Assault Cannon Rocket Attachment (12) (RL) -- Pushes on hit --- 25% more velocity +-- 25% more Velocity -- 25% slower RoF --- 60% slower mag reload +-- 60% slower Mag Reload -- Homing Rockets ^3[Hold Sec ^3fire] ^8Attributes: -- 10% more KB given -- 10% less KB taken +- 10% more Kb Given +- 10% less Kb Taken - Strength (2) - Beskar (3) - Blast Armor - Physical Resist -- Flat DMG Taken +- Base Dmg Taken ^3Abilities: - Jetpack" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/v5_Durge.mbch b/z_MBLegends/ext_data/mb2/character/v5_Durge.mbch index 51f4a5880..26e0d5a13 100644 --- a/z_MBLegends/ext_data/mb2/character/v5_Durge.mbch +++ b/z_MBLegends/ext_data/mb2/character/v5_Durge.mbch @@ -10,10 +10,10 @@ ClassInfo weapons WP_MELEE|WP_MANDO_PISTOL|WP_SBD|WP_SABER attributes MB_ATT_HEALING,2|MB_ATT_SHIELD_RECHARGE,2|MB_ATT_MANDO_PISTOL,3|MB_ATT_BLAST_ARMOUR|MB_ATT_CORTOSIS,1|MB_ATT_FUEL,3|MB_ATT_JETPACK|MB_ATT_AMMO,3|MB_ATT_FLAMETHROWER|MB_ATT_WOOKIE_STRENGTH,2|MB_ATT_FIREPOWER,3|MB_ATT_DEFLECT,0|MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_GUN_DEFENSE,1|MB_ATT_WOOKIEE_FURY,1 - maxhealth 120 - maxarmor 105 + maxhealth 125 + maxarmor 125 blockRegenRate 999999 - classflags CFL_DISMEMBERFRAGILE|CFL_STRONGAGAINSTPHYSICAL|CFL_BLOODYMELEE|CFL_NOLOCATIONALDAMAGE + classflags CFL_DISMEMBERFRAGILE|CFL_STRONGAGAINSTPHYSICAL|CFL_BLOODYMELEE WP_MeleeFlags HELD_SLOW @@ -36,7 +36,7 @@ ClassInfo saber2 durgeshield_leg saberstyle SS_DUAL - model "durge" + model "Durge" skin "jetpack" uishader "models/players/durge/mb2_icon_default" uioverlay_r "gfx/icons/aerial" @@ -64,8 +64,9 @@ WeaponInfo0 altFlashSound0 "sound/weapons/se-44c/alt_fire.wav" ChargeSound "sound/weapons/leia_pistol/altcharge.mp3" FPMult 1.30 - customAmmo 725 + customAmmo 800 rateMod 1.15 + damageGiven 1.1 } WeaponInfo1 @@ -131,20 +132,20 @@ A tanky dual pistoleer/brawler class equipped with a Jetpack and tools meant for ^2Weaponry: - Melee --- 15% slower movement +-- 15% slower Movement - Durge's Personal Energy Shields (Dual Saber) -- Saber Defense (3) --- No BP Regen -- Blaster Defense (1) --- 12% less reach --- 66% more radius +-- 12% less Reach +-- 66% more Radius -- Sec only --- Slap ^3[GB] - Durge's Blaster Pistols (WESTARs 3) --- 30% more FP DMG +-- 10% more Dmg +-- 30% more FP Dmg -- 15% slower RoF - Flechette Gatling Gauntlet (Arm Blaster 3) --- 50% more FP DMG +-- 50% more FP Dmg -- Prim only ^5Powers: @@ -153,12 +154,11 @@ A tanky dual pistoleer/brawler class equipped with a Jetpack and tools meant for - Anti-Force Field (Absorb 2) ^3[CS4] ^8Attributes: -- 15% less KB taken +- 15% less Kb Taken - Strength (2) - Blast Armor - Cortosis (1) - Physical Resist -- Flat DMG Taken - Armor Regen (2) - Healing (2) - Fury (1) diff --git a/z_MBLegends/ext_data/mb2/character/v5_Geonos.mbch b/z_MBLegends/ext_data/mb2/character/v5_Geonos.mbch index 0c0fe17b1..e94f67fca 100644 --- a/z_MBLegends/ext_data/mb2/character/v5_Geonos.mbch +++ b/z_MBLegends/ext_data/mb2/character/v5_Geonos.mbch @@ -96,7 +96,7 @@ WeaponInfo1 WeaponName "Geonosian Static Pike" } -description "Geonosian Warrior [ARC Trooper] +description "Geonosian Warrior A flight-capable, 2-life dexterous gunner with a Sonic stun Blaster and electric spear. @@ -107,19 +107,17 @@ A flight-capable, 2-life dexterous gunner with a Sonic stun Blaster and electric -- No Blaster Block -- No Saber Training -- Shocks on hit --- 105% more KB --- 61/75% less DMG --- 200% special DMG mult --- 25/6% less reach --- 33% more radius --- Slap ^3[GB] +-- 105% more Kb +-- 200% Spec Dmg mult +-- 25/6% less Reach +-- 33% more Radius - Geonosian Sonic Blaster (Bowcaster 1) -- Stuns on hit --- 25% more FP DMG --- 25% less velocity --- Mag reload +-- 25% more FP Dmg +-- 25% less Velocity +-- Mag Reload -- Prim only -- Concussion Grenades (2) +- V-59 Conc Grenades (2) ^8Attributes: - Reinforcement (1) diff --git a/z_MBLegends/ext_data/mb2/character/v5_ImpArmCom.mbch b/z_MBLegends/ext_data/mb2/character/v5_ImpArmCom.mbch index c0e11b004..3e2dad27c 100644 --- a/z_MBLegends/ext_data/mb2/character/v5_ImpArmCom.mbch +++ b/z_MBLegends/ext_data/mb2/character/v5_ImpArmCom.mbch @@ -19,13 +19,13 @@ ClassInfo saber1 Legends_Knife_Jagged saberstyle SS_TAVION - saberDamage 90 + saberDamage 100 BPmultiplier 0 special1 EAS_HI_FLAME special2 EAS_HI_WRIST - + special3 EAS_NONE uioverlay_l "gfx/icons/aerial" uioverlay_r "gfx/icons/infantry" uioverlay_c "gfx/icons/spec_infantry" @@ -81,7 +81,7 @@ WeaponInfo1 FPMult 1.2 } -description "Imperial Armored Commando [Bounty Hunter] +description "Imperial Armored Commando 2-life Mandos with an EE-4 and Beskar. @@ -89,11 +89,9 @@ description "Imperial Armored Commando [Bounty Hunter] - Melee - Jagged Vibroknife (Cyan Saber) -- No Saber/Blaster Block --- 25% less DMG --- 60% less reach --- Slap ^3[GB] +-- 60% less Reach - EC-17 Holdout Blaster Pistol (2) --- 20% more FP DMG +-- 20% more FP Dmg - Fire Grenade (1) - EE-4 Carbine Rifle (3) diff --git a/z_MBLegends/ext_data/mb2/character/v5_Jango.mbch b/z_MBLegends/ext_data/mb2/character/v5_Jango.mbch index 0d657aada..56fb177f1 100644 --- a/z_MBLegends/ext_data/mb2/character/v5_Jango.mbch +++ b/z_MBLegends/ext_data/mb2/character/v5_Jango.mbch @@ -7,7 +7,7 @@ ClassInfo classNumberLimit 1 weapons WP_MANDO_PISTOL|WP_PROJ|WP_FRAG_NADE - attributes MB_ATT_BESKAR,3|MB_ATT_POISON_DART,3|MB_ATT_QUICKTHROW,1|MB_ATT_HEALING,2|MB_ATT_FRAGS,1|MB_ATT_WRISTLASER|MB_ATT_MANDO_PISTOL,3|MB_ATT_FLAMETHROWER,1|MB_ATT_FUEL,3|MB_ATT_AMMO,3|MB_ATT_JETPACK,1|MB_ATT_ROCKET,1|MB_ATT_BLAST_ARMOUR,1|MB_ATT_PROJECTILE_RIFLE,1|MB_ATT_TRACKING_BEACON + attributes MB_ATT_BESKAR,3|MB_ATT_POISON_DART,3|MB_ATT_QUICKTHROW,1|MB_ATT_HEALING,2|MB_ATT_FRAGS,2|MB_ATT_WRISTLASER|MB_ATT_MANDO_PISTOL,3|MB_ATT_FLAMETHROWER,1|MB_ATT_FUEL,3|MB_ATT_AMMO,3|MB_ATT_JETPACK,1|MB_ATT_ROCKET,1|MB_ATT_BLAST_ARMOUR,1|MB_ATT_PROJECTILE_RIFLE,1|MB_ATT_TRACKING_BEACON basespeed 234 maxhealth 125 @@ -64,20 +64,20 @@ WeaponInfo0 animStand BOTH_STAND1 //lower } -description "Jango Fett [Mandalorian] +description "Jango Fett A Jetpack user with Dual Pistols, a powerful hitscan Sniper Rifle, damage resistances, and a slew of offensive gadgets. ^2Weaponry: - Melee - WESTAR-34 Blaster Pistols (3) -- Frag Grenade (1) +- Frag Grenades (2) - Jango's Projectile Rifle -- Hitscan rounds ^8Attributes: -- 10% more KB given -- 10% less KB taken +- 10% more Kb Given +- 10% less Kb Taken - Beskar (3) - Blast Armor - Healing (2) diff --git a/z_MBLegends/ext_data/mb2/character/v5_JumpTr.mbch b/z_MBLegends/ext_data/mb2/character/v5_JumpTr.mbch index 3dca86d64..3bf8645bd 100644 --- a/z_MBLegends/ext_data/mb2/character/v5_JumpTr.mbch +++ b/z_MBLegends/ext_data/mb2/character/v5_JumpTr.mbch @@ -6,12 +6,12 @@ ClassInfo MBClass MB_CLASS_WOOKIE classNumberLimit 2 extralives 1 - weapons WP_MELEE|WP_REPEATER|WP_ROCKET_LAUNCHER + weapons WP_MELEE|WP_ROCKET_LAUNCHER WP_RocketLauncherFlags HELD_ALTRELOAD|HELD_STUN|HELD_KNOCKBACK WP_RepeaterFlags HELD_ALTRELOAD - attributes MB_ATT_REPEATER,2|MB_ATT_BLAST_ARMOUR,1|MB_ATT_AMMO,3|MB_ATT_JETPACK,1|MB_ATT_WOOKIE_STRENGTH,1|MB_ATT_FUEL,3|MB_ATT_ASSEMBLE,3|MB_ATT_ROCKET_LAUNCHER + attributes MB_ATT_BLAST_ARMOUR,1|MB_ATT_AMMO,3|MB_ATT_JETPACK,1|MB_ATT_WOOKIE_STRENGTH,1|MB_ATT_FUEL,3|MB_ATT_ASSEMBLE,3|MB_ATT_ROCKET_LAUNCHER maxhealth 120 maxarmor 105 @@ -20,6 +20,12 @@ ClassInfo forcepool 100 flourishAnim BOTH_WOOKIEE_RAGE_MELEE1 + special1 EAS_HI_NONE + + bargeSoundOverride "null" + + skilltimerMod 1.2 + knockbackTaken 0.85 meleeMoves M_UPPERCUT|M_BLOCK|M_FBKICK|M_JUMPKICK|M_KATA|M_KICK|M_LEGSWEEP|M_PUNCH|M_RLKICK @@ -53,7 +59,28 @@ ClassInfo model_5 "stormie" skin_5 "jetcom_legacy" - uishader_5 "models/players/stormie/mb2_icon_jetcom_legacy" + uishader_5 "models/players/stormie/mb2_icon_jetcom_legacy" + +isCustomBuild 1 +mbPoints 6 + +c_att_skill_0 MB_ATT_BLASTER +c_att_names_0 "E-11 Blaster Rifle" +c_att_ranks_0 3,0,0 +c_att_skill_1 MB_ATT_CLONERIFLE +c_att_names_1 "DLT-19 Blaster Rifle (CR)" +c_att_ranks_1 3,0 +c_att_descs_1 "10% more Dmg" +c_att_skill_2 MB_ATT_STRONGBLOBS +c_att_names_2 "> DLT-19 Ion Blobs" +c_att_ranks_2 3,0,0 +c_att_skill_3 MB_ATT_REPEATER +c_att_names_3 "Imperial Heavy Repeater" +c_att_ranks_3 6,0 +c_att_descs_3 "5% less Dmg, 25% less FP Dmg, 20% slower RoF, 15% slower Mag Reload" +c_att_skill_4 MB_ATT_WOOKIEE_FURY +c_att_names_4 "Shoulder Barge ^3[CS2 Melee]" +c_att_ranks_4 3 } WeaponInfo0 @@ -99,25 +126,45 @@ WeaponInfo1 velocityMod 1.15 } -description "Imperial Jumptrooper [Wookiee] +WeaponInfo2 +{ +WeaponToReplace WP_CLONE_RIFLE +WeaponBasedOff WP_CLONE_RIFLE +NewWorldModel "models/weapons2/DLT-19_HeavyBlaster/model_scope.glm" +NewViewModel "models/weapons2/dummy/dummy.md3" +Icon "gfx/hud/w_icon_dlt19scoped" +WeaponName "DLT-19 Heavy Blaster Rifle" +FlashSound0 "sound/weapons/DLT19/fire.wav" +MuzzleEffect "Blaster/MuzzleFlash01R" +MissileEffect "Blaster/Shot01R" +customAmmo 600 +damageMod 1.1 +hasAnimOverrides 1 +animReadyRun BOTH_DC15_IDLE +animReady BOTH_DC15_IDLE +animReadyWalk BOTH_DC15_READY +animReadyNoAmmo BOTH_DC15_ATTACK +animAttackRun BOTH_DC15_ATTACK +animAttack BOTH_DC15_ATTACK +animAttackWalk BOTH_DC15_ATTACK +animStand BOTH_STAND1 +} + +description "Imperial Jumptrooper A 2-life Jetpack user with a unique suppression Repeater and a micro-Rocket Launcher. ^2Weaponry: - Melee -- Imperial Heavy Repeater --- 20% slower RoF --- 5% less DMG --- 25% less FP DMG --- 15% slower mag reload - PLX-2M Rocket Launcher (6) -- Staggers/pushes on det --- 15% more velocity --- 50% slower mag reload +-- 15% more Velocity +-- 50% slower Mag Reload ^8Attributes: - Reinforcement (1) -- 15% less KB taken +- 20% slower Skill Cd +- 15% less Kb Taken - Strength (1) - Blast Armor - Assemble (3) diff --git a/z_MBLegends/ext_data/mb2/character/v5_MaulMando.mbch b/z_MBLegends/ext_data/mb2/character/v5_MaulMando.mbch index 6ecfcead2..b5a4c1acf 100644 --- a/z_MBLegends/ext_data/mb2/character/v5_MaulMando.mbch +++ b/z_MBLegends/ext_data/mb2/character/v5_MaulMando.mbch @@ -31,7 +31,7 @@ ClassInfo gloatAnim BOTH_VICTORY_FAST flourishAnim BOTH_VICTORY_FAST - model "deathwatch" + model "Deathwatch" skin "mauldalorian" uishader "models/players/deathwatch/mb2_icon_mauldalorian" uioverlay "gfx/icons/aerial" @@ -56,22 +56,22 @@ ClassInfo c_att_skill_0 MB_ATT_MANDO_PISTOL c_att_names_0 "DX-13 Pistol(s) (WESTARs)" c_att_ranks_0 2,0,1 - c_att_descs_0 "20% faster RoF, 20% more velocity, 10% more FP DMG, -10% less DMG, Mag reload" + c_att_descs_0 "20% faster RoF, 20% more Velocity, 10% more FP Dmg, +10% less Dmg, Mag Reload" c_att_skill_1 MB_ATT_MINIGUN c_att_names_1 "Vornax Cannon (Minigun)" c_att_ranks_1 5,0 - c_att_descs_1 "Ignites/staggers/pushes on hit, 300% more DMG/FP DMG, -788% slower RoF, 24% less velocity, 100% slower mag reload" + c_att_descs_1 "Ignites/staggers/pushes on hit, 300% more Dmg/FP Dmg, +788% slower RoF, 24% less Velocity, 100% slower Mag Reload" c_att_skill_2 MB_ATT_A280 c_att_names_2 "Concordian Rifle (A280)" c_att_ranks_2 1,2,0 - c_att_descs_2 "25% more FP DMG, 25% more velocity, 25% slower RoF, -40% slower mag reload" + c_att_descs_2 "25% more FP Dmg, 25% more Velocity, 25% slower RoF, +40% slower Mag Reload" c_att_skill_3 MB_ATT_EE3 c_att_names_3 "Sundari Repeater (EE-3)" c_att_ranks_3 2,0,1 - c_att_descs_3 "30% faster RoF, 20% more velocity, 40% slower mag reload" + c_att_descs_3 "30% faster RoF, 20% more Velocity, 40% slower Mag Reload" c_att_skill_4 MB_ATT_RESPAWNS c_att_names_4 "Reinforcement" c_att_ranks_4 2 @@ -201,7 +201,7 @@ WeaponInfo4 rateMod 0.7 velocityMod 1.2 } -description "Mandalorian Super Commando [Mandalorian] +description "Mandalorian Super Commando Enforcers with brutal burst fire/area control. @@ -210,11 +210,9 @@ Enforcers with brutal burst fire/area control. - Mandalorian Personal Energy Shield (Cyan Saber) -- Saber Defense (0) -- Blaster Defense (3) --- 150% more KB --- 50% less DMG --- 12% less reach --- 66% more radius --- Slap ^3[GB] +-- 150% more Kb +-- 12% less Reach +-- 66% more Radius - Fire Grenade (1) ^5Powers: diff --git a/z_MBLegends/ext_data/mb2/character/v5_Watto.mbch b/z_MBLegends/ext_data/mb2/character/v5_Watto.mbch index bf44dce31..8466f2127 100644 --- a/z_MBLegends/ext_data/mb2/character/v5_Watto.mbch +++ b/z_MBLegends/ext_data/mb2/character/v5_Watto.mbch @@ -83,6 +83,8 @@ WeaponInfo0 animAttackWalk BOTH_VS_ATF_G animStand BOTH_STAND1 customAmmo 600 +damageMod 1.1 +fpmult 1.1 ChargeSound "sound/weapons/leia_pistol/altcharge.mp3" } @@ -131,7 +133,7 @@ WeaponInfo2 velocityMod 0 } -description "Watto [Mandalorian] +description "Watto A dexterous, Flight-capable grenadier who specializes in placing traps for his enemies and raining down hell from the sky. @@ -140,21 +142,20 @@ A dexterous, Flight-capable grenadier who specializes in placing traps for his e - Folded Pit Droid (Yellow/Red/Purple Saber) -- No Saber/Blaster Block -- Chain Limit: 2 --- 150% more KB --- 50/76/70% less DMG --- 200% special DMG mult --- 57% less reach --- 300% more radius --- Slap ^3[GB] +-- 150% more Kb +-- 200% Spec Dmg mult +-- 57% less Reach +-- 300% more Radius - DL-44 Blaster Pistol (2) +-- 10% more Dmg/FP Dmg - Busted Parts (Flechette 3) --- 100% more FP DMG --- 100% less velocity --- Mag reload +-- 100% more FP Dmg +-- 100% less Velocity +-- Mag Reload -- Sec only - Frag Grenades (3) - Trip Mines (3) -- Concussion Grenades (2) +- V-59 Conc Grenades (2) ^6Inventory: - Seeker Drone ^3[CS2] diff --git a/z_MBLegends/ext_data/mb2/character/v6_Aurra.mbch b/z_MBLegends/ext_data/mb2/character/v6_Aurra.mbch index 58b30d954..4cb52a6d1 100644 --- a/z_MBLegends/ext_data/mb2/character/v6_Aurra.mbch +++ b/z_MBLegends/ext_data/mb2/character/v6_Aurra.mbch @@ -69,7 +69,7 @@ WeaponInfo0 WeaponInfo1 { WeaponToReplace WP_PROJ - WeaponBasedOff WP_PROJ + WeaponBasedOff WP_CONCUSSION NewWorldModel "models/weapons2/czerka_adventurer_rifle/model_w.glm" NewViewModel "models/weapons2/czerka_adventurer_rifle/model.md3" Icon "gfx/hud/w_icon_czerka_adventurer" @@ -80,7 +80,7 @@ WeaponInfo1 CustomAmmo 8 } -description "Aurra Sing [Sith] +description "Aurra Sing A versatile Sith/gunner hybrid. @@ -90,11 +90,9 @@ A versatile Sith/gunner hybrid. -- Saber/Blaster Defense (1) -- Blaster Deflect (2) -- Blocking resists Force Powers --- 50% less Yellow DMG --- Slap ^3[GB] - Aurra's Dual Pistols (Clone Pistols 3) - Czerka Adventurer Slugthrower Rifle (Proj) --- Mag reload +-- Mag Reload ^5Force Powers: - Jump (2) diff --git a/z_MBLegends/ext_data/mb2/character/v6_Dengar.mbch b/z_MBLegends/ext_data/mb2/character/v6_Dengar.mbch index d67559401..1fcecf0b3 100644 --- a/z_MBLegends/ext_data/mb2/character/v6_Dengar.mbch +++ b/z_MBLegends/ext_data/mb2/character/v6_Dengar.mbch @@ -23,8 +23,7 @@ ClassInfo WP_CloneRifleFlags HELD_ALTRELOAD WP_MeleeFlags HELD_SPEED WP_SaberFlags HELD_FLAME - WP_StickyLauncherFlags HELD_ALTRELOAD - //WP_MGLFlags + WP_MGLFlags HELD_ALTRELOAD WP_DCCarbineFlags HELD_ALTRELOAD|HELD_PULSE|HELD_KNOCKBACK|HELD_STUN @@ -44,8 +43,9 @@ ClassInfo special1 EAS_HI_SPRINT special2 EAS_HI_KICK + special3 EAS_HI_KICK modelscale 1.01 - model "dengar" + model "Dengar" skin "default" uishader "models/players/dengar/mb2_icon_default" uioverlay_l "gfx/icons/scout" @@ -61,25 +61,26 @@ ClassInfo c_att_skill_1 MB_ATT_DC_CARBINE c_att_names_1 "Modded Riot Gun (DC Carbine)" c_att_ranks_1 1,0 - c_att_descs_1 "Shocks/pushes/staggers on hit, 400% more DMG/FP DMG, -100% slower RoF, 20% less velocity, 30% slower mag reload, Sec only" + c_att_descs_1 "Shocks/pushes/staggers on hit, 400% more Dmg/FP Dmg, +100% slower RoF, 20% less Velocity, 30% slower Mag Reload, Sec only" c_att_skill_2 MB_ATT_CLONERIFLE c_att_names_2 "DLT-19 Blaster Rifle (CR)" c_att_ranks_2 1,0 - c_att_descs_2 "10% more DMG, 10% faster RoF, Mag reload" + c_att_descs_2 "10% more Dmg, 10% faster RoF, Mag Reload" c_att_skill_3 MB_ATT_WESTARM5 c_att_names_3 "Valken-38x Blaster Rifle (M5)" c_att_ranks_3 1,0 - c_att_descs_3 "50% more DMG/FP DMG, 100% slower RoF, Sec fire: Scope" + c_att_descs_3 "50% more Dmg/FP Dmg, 100% slower RoF, Sec fire: Scope" } -WeaponInfo0{ +WeaponInfo0 +{ WeaponToReplace WP_CLONE_RIFLE - WeaponBasedOff WP_CLONE_RIFLE + WeaponBasedOff WP_CONCUSSION NewWorldModel "models/weapons2/DLT-19_HeavyBlaster/model_scope.glm" - NewViewModel "models/weapons2/dummy/dummy.md3" + NewViewModel "models/weapons2/DLT-19_HeavyBlaster/riflescoped.glm" Icon "gfx/hud/w_icon_dlt19scoped" WeaponName "DLT-19 Heavy Blaster Rifle" FlashSound0 "sound/weapons/DLT19/fire.wav" @@ -104,8 +105,9 @@ WeaponInfo1 { WeaponToReplace WP_CONC_NADE WeaponBasedOff WP_CONC_NADE - NewWorldModel "models/weapons2/thermal/thermal_w.glm" - NewViewModel "models/weapons2/thermal/thermal_hand.md3" +NewWorldModel "models/weapons2/thermal/thermal_w.glm" +NewViewModel "models/weapons2/thermal/thermal.md3" +NewHandsModel "models/weapons2/thermal/thermal_hand.md3" Icon "gfx/hud/w_thermal_grenade" MissileModel "models/weapons2/thermal/thermal_proj.md3" AltMissileModel "models/weapons2/thermal/thermal_proj.md3" @@ -135,7 +137,7 @@ WeaponInfo1 WeaponInfo2 { WeaponToReplace WP_M5 - WeaponBasedOff WP_M5 + WeaponBasedOff WP_CONCUSSION NewWorldModel "models/weapons2/dlt-18_repeater/dlt-18_repeater_w.glm" NewViewModel "models/weapons2/dlt-18_repeater/dlt-18_repeater.md3" Icon "gfx/hud/w_icon_dlt-18" @@ -177,7 +179,7 @@ WeaponInfo3{ rateMod 1 clipSize 3 customAmmo 15 - altFireEnabled 0 + altFireEnabled 1 hasAnimOverrides 1 animReadyRun BOTH_THERMAL_READY2 animReady BOTH_THERMAL_READY2 @@ -198,7 +200,7 @@ WeaponName "Dengar's Fire Blade" } WeaponInfo5{ WeaponToReplace WP_DC_CARBINE -WeaponBasedOff WP_DC_CARBINE +WeaponBasedOff WP_MANDO_PISTOL NewWorldModel "models/weapons2/t-21/t-21_w.glm" NewViewModel "models/weapons2/t-21/t-21.md3" Icon "gfx/hud/w_icon_t-21" @@ -222,7 +224,7 @@ animAttackWalk BOTH_ATTACK3 } WeaponInfo6{ WeaponToReplace WP_SHOTGUN -WeaponBasedOff WP_BLASTER_PISTOL +WeaponBasedOff WP_SHOTGUN NewWorldModel "models/weapons/FWG-5_FlechettePistol/model.glm" NewViewModel "models/weapons/FWG-5_FlechettePistol/model.md3" Icon "gfx/hud/w_icon_flechettepistol" @@ -244,30 +246,28 @@ animAttackRun BOTH_ATTACK2 animAttack BOTH_ATTACK2 animAttackWalk BOTH_ATTACK2 } -description "Dengar [Bounty Hunter] +description "Dengar A ruthless assault class who likes to bring his bounties in cold. ^2Weaponry: - Melee -- 20% faster RoF --- 15% faster movement +-- 15% faster Movement - Dengar's Fire Blade (Cyan Saber) -- No Saber/Blaster Block -- Ignites on hit --- 62% less range --- 33% more radius --- Slap ^3[GB] +-- 62% less Reach +-- 33% more Radius - Smoke Grenades (2) (Conc Grenades) -- Obscures vision on det -- 40% faster RoF --- 99.9% less DMG -- Sticky Bombs (6) (MGL 1) --- Prim only --- Mag reload +-- 99.9% less Dmg +- Sticky Bombs (6) (MGL) +-- Mag Reload ^8Attributes: -- 10% less KB taken +- 10% less Kb Taken - Strength (1) - Stamina (1) - Dexterity (1) @@ -280,4 +280,4 @@ A ruthless assault class who likes to bring his bounties in cold. ^3Abilities: - Sprint ^3[CS1] -- Gunkick ^3[CS2]" \ No newline at end of file +- Gunkick ^3[CS2/3]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/v6_MercSh.mbch b/z_MBLegends/ext_data/mb2/character/v6_MercSh.mbch index 1edd9d8a8..39f267b16 100644 --- a/z_MBLegends/ext_data/mb2/character/v6_MercSh.mbch +++ b/z_MBLegends/ext_data/mb2/character/v6_MercSh.mbch @@ -12,10 +12,9 @@ ClassInfo basespeed 245 special1 EAS_HI_POISON - special2 EAS_HI_TRACKER - special3 EAS_FP_SEE - special4 EAS_HI_KICK - + special2 EAS_HI_KICK + meleespecial2 EAS_HI_TRACKER + special3 EAS_HI_KICK flourishAnim BOTH_STAND5TOAIM bowAnim BOTH_MAND_FLAME_ATTACK maxhealth 145 @@ -66,7 +65,7 @@ c_att_names_0 "Disruptor Rifle Ammo (600)" c_att_ranks_0 0,0,1 c_att_skill_1 MB_ATT_CLONEBLOBS -c_att_names_1 "DLT-19 (CR) Concussion Blobs" +c_att_names_1 "DLT-19 (CR) Conc Blobs" c_att_ranks_1 0,0,1 c_att_skill_2 MB_ATT_STRONGBLOBS @@ -92,7 +91,7 @@ c_att_ranks_6 1 c_att_skill_7 MB_ATT_MICRO_GRENADES c_att_names_7 "Smoke Grenades (Concs)" c_att_ranks_7 1,0,0 -c_att_descs_7 "Obscures vision on det, 99.9% less DMG, 40% faster RoF" +c_att_descs_7 "Obscures vision on det, 99.9% less Dmg, 40% faster RoF" c_att_skill_8 MB_ATT_POISON_DART c_att_names_8 "Poison Darts ^3[CS1 Melee]" @@ -103,9 +102,9 @@ c_att_ranks_8 1,1 WeaponInfo0 { WeaponToReplace WP_CLONE_RIFLE - WeaponBasedOff WP_CLONE_RIFLE + WeaponBasedOff WP_CONCUSSION NewWorldModel "models/weapons2/DLT-19_HeavyBlaster/model_scope.glm" - NewViewModel "models/weapons2/dummy/dummy.md3" + NewViewModel "models/weapons2/DLT-19_HeavyBlaster/riflescoped.glm" Icon "gfx/hud/w_icon_dlt19scoped" WeaponName "DLT-19 Heavy Blaster Rifle" FlashSound0 "sound/weapons/DLT19/fire.wav" @@ -130,8 +129,9 @@ WeaponInfo1 { WeaponToReplace WP_CONC_NADE WeaponBasedOff WP_CONC_NADE - NewWorldModel "models/weapons2/thermal/thermal_w.glm" - NewViewModel "models/weapons2/thermal/thermal_hand.md3" +NewWorldModel "models/weapons2/thermal/thermal_w.glm" +NewViewModel "models/weapons2/thermal/thermal.md3" +NewHandsModel "models/weapons2/thermal/thermal_hand.md3" Icon "gfx/hud/w_thermal_grenade" MissileModel "models/weapons2/thermal/thermal_proj.md3" AltMissileModel "models/weapons2/thermal/thermal_proj.md3" @@ -166,7 +166,7 @@ ForceInfo0 LoopSound "sound/ambience/cp_02_lp.wav" } -description "Mercenary Shooter [Bounty Hunter] +description "Mercenary Shooter A suppressive fire class with rifles and area-control tools. @@ -175,12 +175,12 @@ A suppressive fire class with rifles and area-control tools. - Disruptor Rifle (2) - DLT-19 Heavy Blaster Rifle (Clone Rifle 2) -- Concussion/Ion Blobs (2) --- 10% more DMG +-- 10% more Dmg -- 8% faster RoF --- Mag reload +-- Mag Reload ^5Powers: -- Infrared Motion Sensor (Sense 3) ^3[CS3] +- Infrared Motion Sensor (Sense 3) ^8Attributes: - Resource Regen: 70/25s @@ -190,5 +190,5 @@ A suppressive fire class with rifles and area-control tools. - Tracking Beacon ^3Abilities: -- Tracking Darts (8) ^3[CS2 Melee] -- Gunkick ^3[CS2 Gun/CS4]" \ No newline at end of file +- Gunkick ^3[CS2/3] +- Tracking Darts (8) ^3[CS2 Melee]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/v6_ScoutTr.mbch b/z_MBLegends/ext_data/mb2/character/v6_ScoutTr.mbch index 5d3c956f3..6f007bb1c 100644 --- a/z_MBLegends/ext_data/mb2/character/v6_ScoutTr.mbch +++ b/z_MBLegends/ext_data/mb2/character/v6_ScoutTr.mbch @@ -10,7 +10,7 @@ ClassInfo MBClass MB_CLASS_HERO classNumberLimit 3 maxhealth 80 - RankHealth 90,100 + RankHealth 100 maxarmor 75 ArmourRegenRate 1000 ArmourRegenCap 50 @@ -31,8 +31,6 @@ ClassInfo RankSaberDamage 100 extralives 1 holdables HI_MEDPAC - skilltimermod 3 - rankSTM 2,1 rateOfFire_Melee 0.95 //tauntAnim BOTH_SCEPTER_HOLD gloatAnim TORSO_HANDSIGNAL4 @@ -105,7 +103,7 @@ ClassInfo c_att_ranks_3 1,1,1 c_att_skill_4 MB_ATT_SABER_DAMAGE - c_att_names_4 "Saber DMG (100)" + c_att_names_4 "Saber Dmg (100)" c_att_ranks_4 1 c_att_skill_5 MB_ATT_PISTOL @@ -133,6 +131,10 @@ ClassInfo c_att_skill_10 MB_ATT_DEXTERITY c_att_names_10 "Dexterity ^3[CS3]" c_att_ranks_10 0,0,1 + + c_att_skill_11 MB_ATT_DASH + c_att_names_11 "Dash ^3[CS3]" + c_att_ranks_11 5 c_att_skill_15 MB_ATT_PISTOL c_att_names_15 "EC-17 Hold-Out Pistol" @@ -140,24 +142,24 @@ ClassInfo c_att_skill_16 MB_ATT_BLASTER c_att_names_16 "E-11 Blaster Rifle" - c_att_ranks_16 1,1,2 + c_att_ranks_16 1,1,1 c_att_skill_17 MB_ATT_T21 c_att_names_17 "T-21 Heavy Blaster" - c_att_ranks_17 2,2,1 - c_att_descs_17 "10% more DMG, 10% more FP DMG, 10% slower RoF" + c_att_ranks_17 1,2,1 + c_att_descs_17 "10% more Dmg, 10% more FP Dmg, 10% slower RoF" c_att_skill_18 MB_ATT_MICRO_GRENADES - c_att_names_18 "Concussion Grenades" - c_att_ranks_18 1,1,1 + c_att_names_18 "V-59 Conc Grenades" + c_att_ranks_18 1,1 c_att_skill_19 MB_ATT_THERMALS c_att_names_19 "Thermal Detonator" c_att_ranks_19 2 c_att_skill_20 MB_ATT_HEALTH - c_att_names_20 "Health (90/100)" - c_att_ranks_20 0,0 + c_att_names_20 "HP (100)" + c_att_ranks_20 1 c_att_skill_21 MB_ATT_BASESPEED c_att_names_21 "Speed (190)" @@ -171,21 +173,17 @@ ClassInfo c_att_names_23 "RoF (100/110%)" c_att_ranks_23 1,1 - c_att_skill_24 MB_ATT_STM_MULTIPLIER - c_att_names_24 "Skill CD (50/100%)" - c_att_ranks_24 1,1 + c_att_skill_24 MB_ATT_POWER + c_att_names_24 "Stamina Pool (100)" + c_att_ranks_24 0 - c_att_skill_25 MB_ATT_POWER - c_att_names_25 "Stamina Pool (100)" - c_att_ranks_25 0 + c_att_skill_25 MB_ATT_STAMINA + c_att_names_25 "Stamina ^3[CS1]" + c_att_ranks_25 0,0,1 - c_att_skill_26 MB_ATT_STAMINA - c_att_names_26 "Stamina ^3[CS1]" - c_att_ranks_26 0,0,1 - - c_att_skill_27 MB_ATT_DASH - c_att_names_27 "Dash ^3[CS4]" - c_att_ranks_27 0,0 + c_att_skill_26 MB_ATT_DASH + c_att_names_26 "Dash ^3[CS3]" + c_att_ranks_26 2,0 c_att_skill_30 MB_ATT_PISTOL c_att_names_30 "EC-17 Hold-Out Pistol" @@ -198,8 +196,8 @@ ClassInfo c_att_skill_32 MB_ATT_EE4 c_att_names_32 "DLT-20A Sniper Config (EE-4)" c_att_ranks_32 2,2 - c_att_descs_32 "50% more DMG, 50% more FP DMG, 100% more velocity, -50% slower RoF, 10000% slower reload" + c_att_descs_32 "50% more Dmg, 50% more FP Dmg, 100% more Velocity, +50% slower RoF, 16500% slower Reload" c_att_skill_33 MB_ATT_SONIC_DETONATOR c_att_names_33 "Sonic Detonators" @@ -210,26 +208,22 @@ ClassInfo c_att_ranks_34 9 c_att_descs_34 "1 default" - c_att_skill_35 MB_ATT_HEALTH - c_att_names_35 "Health (90)" + c_att_skill_35 MB_ATT_DMG_GIVEN_MULTIPLIER + c_att_names_35 "Dmg Given (110%)" c_att_ranks_35 1 + c_att_descs_35 "Does not affect Saber" - c_att_skill_36 MB_ATT_DMG_GIVEN_MULTIPLIER - c_att_names_36 "DMG Given (110%)" - c_att_ranks_36 2 - c_att_descs_36 "Does not affect Saber" - - c_att_skill_37 MB_ATT_STM_MULTIPLIER - c_att_names_37 "Skill CD (50%)" - c_att_ranks_37 1 + c_att_skill_36 MB_ATT_POWER + c_att_names_36 "Stamina Pool (100)" + c_att_ranks_36 0 - c_att_skill_38 MB_ATT_POWER - c_att_names_38 "Stamina Pool (100)" - c_att_ranks_38 0 + c_att_skill_37 MB_ATT_STAMINA + c_att_names_37 "Stamina ^3[CS1]" + c_att_ranks_37 0,0,1 - c_att_skill_39 MB_ATT_STAMINA - c_att_names_39 "Stamina ^3[CS1]" - c_att_ranks_39 0,0,1 + c_att_skill_38 MB_ATT_DASH + c_att_names_38 "Dash ^3[CS3]" + c_att_ranks_38 2 } WeaponInfo0 { @@ -250,12 +244,12 @@ Icon "gfx/hud/w_icon_scout_pistol" WeaponName "EC-17 Hold-out Blaster Pistol" ChargeSound "sound/weapons/leia_pistol/altcharge.mp3" clipSize 24 -customAmmo 480 +customAmmo 500 } WeaponInfo2 { WeaponToReplace WP_EE4 -WeaponBasedOff WP_EE4 +WeaponBasedOff WP_CONCUSSION NewWorldModel "models/weapons2/dlt20a/dlt20a_w.glm" NewViewModel "models/weapons2/dlt20a/dlt20a.md3" Icon "gfx/hud/w_icon_DLT20a" @@ -269,7 +263,7 @@ ratemod 1.5 fpmult 1.5 damagemod 1.5 Velocitymod 2 -ReloadTimeModifier 101 +ReloadTimeModifier 166 } WeaponInfo3 { @@ -294,7 +288,7 @@ Icon "gfx/hud/w_icon_E11" WeaponName "E-11 Blaster Rifle" customAmmo 660 } -description "Imperial Scout Trooper [Hero] +description "Imperial Scout Trooper A customizable scout class. @@ -303,22 +297,18 @@ A customizable scout class. -- 5% faster RoF - Riot Gear (Cyan Saber) -- Saber/Blaster Defense (0) --- 10/2% more KB on L/R hands --- 37% less DMG --- 60% less reach --- Slap ^3[GB] +-- 10/2% more Kb on L/R hands +-- 60% less Reach ^6Inventory: - Medpac ^3[CS4] ^8Attributes: - Reinforcement (1) -- 200% slower skill CD - Stamina (2) - Assemble (2) - Dexterity (1) ^3Abilities: - Sprint ^3[CS1] -- Dex Roll ^3[CS2] -- Dash (1) ^3[CS3]" \ No newline at end of file +- Dex Roll ^3[CS2]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/v6_Tusk.mbch b/z_MBLegends/ext_data/mb2/character/v6_Tusk.mbch index e0aa6ba78..83fa4ce87 100644 --- a/z_MBLegends/ext_data/mb2/character/v6_Tusk.mbch +++ b/z_MBLegends/ext_data/mb2/character/v6_Tusk.mbch @@ -83,9 +83,9 @@ WeaponInfo0 WeaponInfo1 { WeaponToReplace WP_CLONE_PISTOL - WeaponBasedOff WP_MANDO_PISTOL + WeaponBasedOff WP_BLASTER_PISTOL NewWorldModel "models/weapons2/tusken_pistol_sar/tusken_pistol_w.glm" - NewViewModel "models/weapons2/tusken_pistol_sar/tusken_pistol.md3" + NewViewModel "models/weapons2/dummy/dummy.md3" Icon "gfx/hud/w_icon_tuskenpistol_dual" altFireEnabled 0 WeaponName "Dual Projectile Pistols" @@ -122,7 +122,7 @@ animWalkAttackL BOTH_MAND_DUAL_PISTOLS_ATTACK_L WeaponInfo2 { WeaponToReplace WP_PROJ - WeaponBasedOff WP_PROJ + WeaponBasedOff WP_DISRUPTOR NewWorldModel "models/weapons2/tusken_sniper/model_w.glm" NewViewModel "models/weapons2/tusken_sniper/model.md3" FlashSound0 "sound/weapons/tusken_cycler/fire.wav" @@ -131,10 +131,10 @@ WeaponInfo2 CustomAmmo 15 clipsize 1 ReloadTimeModifier 1.35 - damageMod .75 + damageMod .9 } -description "Tusken Raider [Wookiee] +description "Tusken Raider A 2-life class with a unique blend of Melee weapons, slug-based guns, and Wookiee characteristics. @@ -143,29 +143,27 @@ A 2-life class with a unique blend of Melee weapons, slug-based guns, and Wookie - Gaffi Stick (Staff/Yellow Saber) -- No Saber/Blaster Block -- No Saber Training --- 15% faster movement --- 50/45% less DMG --- 200% special DMG mult --- Slap ^3[GB] +-- 15% faster Movement +-- 200% Spec Dmg mult > Tusken Gaffi Stick -- 14% more AS --- 20% more KB +-- 20% more Kb > Chieftain's Gaffi Stick --- 30% more reach --- 25% more KB +-- 30% more Reach +-- 25% more Kb -- 7% less AS - Dual Projectile Pistols (Clone Pistols 3) -- Hitscan rounds -- 6% faster RoF --- 15% less DMG --- 10% less FP DMG --- Mag reload +-- 15% less Dmg +-- 10% less FP Dmg +-- Mag Reload -- Prim only -- Concussion Grenades (2) +- V-59 Conc Grenades (2) - Tusken Cycler Projectile Rifle -- Staggers on hit --- 25% less DMG --- 35% slower mag reload +-- 10% less Dmg +-- 35% slower Mag Reload ^8Attributes: - Reinforcement (1) diff --git a/z_MBLegends/ext_data/mb2/character/v6_Zam.mbch b/z_MBLegends/ext_data/mb2/character/v6_Zam.mbch index 859ad9da4..6d7476b61 100644 --- a/z_MBLegends/ext_data/mb2/character/v6_Zam.mbch +++ b/z_MBLegends/ext_data/mb2/character/v6_Zam.mbch @@ -6,7 +6,7 @@ ClassInfo weapons WP_BLASTER_PISTOL|WP_REAL_TD|WP_PROJ - attributes MB_ATT_PROJECTILE_RIFLE,1|MB_ATT_PISTOL,3|MB_ATT_AMMO,3|MB_ATT_THERMALS,1|MB_ATT_POISON_DART,4|MB_ATT_HEALING,3|MB_ATT_SPY_DISGUISE,3|MB_ATT_DODGE,3|MB_ATT_TRACKING_DART,4 + attributes MB_ATT_PROJECTILE_RIFLE,1|MB_ATT_PISTOL,3|MB_ATT_AMMO,3|MB_ATT_THERMALS,1|MB_ATT_POISON_DART,4|MB_ATT_HEALING,2|MB_ATT_SPY_DISGUISE,3|MB_ATT_DODGE,3|MB_ATT_TRACKING_DART,4 maxhealth 125 maxarmor 125 @@ -21,9 +21,9 @@ ClassInfo rateOfFire 0.93 // special1 EAS_HI_POISON - special2 EAS_HI_TRACKER + special2 EAS_HI_KICK + meleespecial2 EAS_HI_TRACKER special3 EAS_HI_DODGE - special4 EAS_HI_KICK flourishAnim BOTH_STAND10_TALK1 @@ -44,7 +44,7 @@ ClassInfo WeaponInfo0 { WeaponToReplace WP_PROJ - WeaponBasedOff WP_PROJ + WeaponBasedOff WP_CONCUSSION NewWorldModel "models/weapons2/zamrifle_fa/model_w.glm" NewViewModel "models/weapons2/zamrifle_fa/model.md3" Icon "gfx/hud/w_icon_zamriflelegends" @@ -87,30 +87,29 @@ animReady TORSO_WEAPONIDLE2 fpmult 1.1 } -description "Zam Wesell [Bounty Hunter] +description "Zam Wesell -A class that can don the appearance of the enemy, who also possesses a double-shot Projectile Rifle, a Thermal Detonator, and Darts. +An assassin that can don the appearance of the enemy. Possesses a 2-shot sniper rifle. ^2Weaponry: - Melee - KYD-21 Blaster Pistol (3) --- 10% more DMG --- 10% more FP DMG +-- 10% more Dmg/FP Dmg -- 7% slower RoF - KiSteer 1284 Projectile Rifle --- 2 shots per reload --- 30% faster reload +-- 2 shots per Reload +-- 30% faster Reload - Thermal Detonator (1) ^6Inventory: - Electrobinoculars ^8Attributes: -- Healing (3) +- Healing (2) ^3Abilities: - Shapeshift (Disguise 3) ^3[Toggle Melee] - Poison Darts (4) ^3[CS1 Melee] +- Gunkick ^3[CS2] - Tracking Darts (8) ^3[CS2 Melee] -- Dodge (3) ^3[CS3] -- Gunkick ^3[CS4]" \ No newline at end of file +- Dodge (3) ^3[CS3]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/v7_Enoch.mbch b/z_MBLegends/ext_data/mb2/character/v7_Enoch.mbch index 4a9a4abd9..7b099a055 100644 --- a/z_MBLegends/ext_data/mb2/character/v7_Enoch.mbch +++ b/z_MBLegends/ext_data/mb2/character/v7_Enoch.mbch @@ -3,7 +3,7 @@ ClassInfo name "v7_Enoch" MBClass MB_CLASS_COMMANDER classNumberLimit 1 - weapons WP_MELEE|WP_FRAG_NADE||WP_BLASTER + weapons WP_MELEE|WP_FRAG_NADE|WP_BLASTER attributes MB_ATT_BLASTER,3|MB_ATT_EE3,3|MB_ATT_AMMO,3|MB_ATT_RALLY,1|MB_ATT_LIGHTS_BEACON|MB_ATT_FRAGS,3|MB_ATT_SPAWNER,1|MB_ATT_BESKAR,3|MB_ATT_BLAST_ARMOUR,1|MB_ATT_DEXTERITY,1|MB_ATT_GETUPS,2|MB_ATT_WOOKIE_STRENGTH,1|MB_ATT_RECHARGE,1 @@ -101,7 +101,7 @@ WeaponInfo2 ratemod 0.8 } -description "Captain Enoch [Commander] +description "Captain Enoch A tanky commander that can bolster allies. @@ -109,7 +109,7 @@ A tanky commander that can bolster allies. - Melee - E-11 Blaster Rifle (3) - SE-14C Blaster Rifle (EE-3 3) --- 10% more FP DMG +-- 10% more FP Dmg - Frag Grenades (3) -- 20% faster RoF -- Sec only @@ -124,14 +124,14 @@ A tanky commander that can bolster allies. - Seeker Drone (Support Beacon) ^3[CS2] ^8Attributes: -- 75% slower skill CD -- 50% less KB taken +- 75% slower Skill Cd +- 50% less Kb Taken - Strength (1) - Dexterity (1) - Battery Recharge (1) - Getup (2) ^9- ^3*^9Dark's Beacon (Shares Force Powers with ^9a targeted/nearby ally) -- Health Regen: 1/.5s +- HP Regen: 1/.5s - Armor Regen: 1/2s to 5 - Beskar (3) - Blast Armor diff --git a/z_MBLegends/ext_data/mb2/character/v7_ImpAgent.mbch b/z_MBLegends/ext_data/mb2/character/v7_ImpAgent.mbch index 7dde81f3e..abb9fb00f 100644 --- a/z_MBLegends/ext_data/mb2/character/v7_ImpAgent.mbch +++ b/z_MBLegends/ext_data/mb2/character/v7_ImpAgent.mbch @@ -26,7 +26,7 @@ ClassInfo saber1 Legends_Knife_Spy forcepowers FP_SABER_OFFENSE,3 saberstyle SS_TAVION|SS_FAST - saberDamage 90 + saberDamage 100 //WP_BlasterPistolFlags HELD_POISON @@ -34,7 +34,8 @@ ClassInfo holdables HI_CLOAK special1 EAS_HI_WRIST - special2 EAS_HI_TRACKER + meleespecial2 EAS_HI_TRACKER + special2 EAS_HI_KICK special3 EAS_HI_DASH special4 EAS_HI_CLOAK @@ -80,13 +81,13 @@ uishader_5 "models/players/saboteur/mb2_icon_default" c_att_skill_0 MB_ATT_PISTOL c_att_names_0 "Assassin Blaster Pistol" c_att_ranks_0 2,1,3 - c_att_descs_0 "Prim fire: Hitscan, 25% more velocity, 50% more charged FP DMG, -35% less DMG, 25% slower RoF, 25% slower reload" + c_att_descs_0 "Prim fire: Hitscan, 25% more Velocity, 50% more Charged FP Dmg, +35% less Dmg, 25% slower RoF, 25% slower Reload" c_att_skill_1 MB_ATT_DC_CARBINE c_att_names_1 "E-11 Stun Carbine" c_att_ranks_1 3,2 - c_att_descs_1 "10% more DMG, 30% more FP DMG, 25% slower RoF" + c_att_descs_1 "10% more Dmg, 30% more FP Dmg, 25% slower RoF" c_att_skill_2 MB_ATT_DISRUPTOR c_att_names_2 "Disruptor Rifle" @@ -137,7 +138,7 @@ uishader_5 "models/players/saboteur/mb2_icon_default" WeaponInfo0 { WeaponToReplace WP_BLASTER_PISTOL - WeaponBasedOff WP_BLASTER_PISTOL + WeaponBasedOff WP_CONCUSSION NewWorldModel "models/weapons2/Relby-K23/model_w.GLM" NewViewModel "models/weapons2/Relby-K23/pistol.MD3" Icon "gfx/hud/w_icon_relby_k23" @@ -203,7 +204,7 @@ ForceInfo0 LoopSound "sound/ambience/cp_02_lp.wav" } -description "Imperial Agent [Bounty Hunter] +description "Imperial Agent Mid-ranged elite soldiers who can Disguise themselves and Cloak. @@ -211,9 +212,7 @@ Mid-ranged elite soldiers who can Disguise themselves and Cloak. - Heavy Melee - Jagged Vibroknife (Cyan/Blue Saber) -- No Saber/Blaster Block --- 25% less DMG --- 60% less reach --- Slap ^3[GB] +-- 60% less Reach ^6Inventory: - Cloaking Device ^3[CS4] @@ -224,6 +223,6 @@ Mid-ranged elite soldiers who can Disguise themselves and Cloak. - Tracking Beacon ^3Abilities: +- Gunkick ^3[CS2] - Tracking Darts (2) ^3[CS2 Melee] -- Gunkick ^3[CS2 Gun] - Dash (1) ^3[CS3]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/v7_ImpSpec.mbch b/z_MBLegends/ext_data/mb2/character/v7_ImpSpec.mbch index db6227555..bd7f8b0bb 100644 --- a/z_MBLegends/ext_data/mb2/character/v7_ImpSpec.mbch +++ b/z_MBLegends/ext_data/mb2/character/v7_ImpSpec.mbch @@ -33,7 +33,7 @@ ClassInfo sabercolor 0 saberstyle SS_TAVION saber1_1 reb_wrench_s - sabercolor 0 + sabercolor_1 0 saberstyle_1 SS_TAVION ASMultiplier 1.05 BPMultiplier 0 @@ -50,22 +50,22 @@ ClassInfo c_att_skill_0 MB_ATT_STUN_BATON c_att_names_0 "F-187 Fusioncutter (Stun Baton)" c_att_ranks_0 0 -c_att_descs_0 "Ignites on hit, 15% faster movement, 80% faster RoF, 65% less DMG" +c_att_descs_0 "Ignites on hit, 15% faster Movement, 80% faster RoF, 65% less Dmg" c_att_skill_1 MB_ATT_TRIP_MINES c_att_names_1 "Trip Mines" c_att_ranks_1 1,1,1 -c_att_descs_1 "15% faster movement" +c_att_descs_1 "15% faster Movement" c_att_skill_2 MB_ATT_PULSE_GRENADES c_att_names_2 "Pulse Grenade" c_att_ranks_2 1 -c_att_descs_2 "15% faster movement" +c_att_descs_2 "15% faster Movement" c_att_skill_3 MB_ATT_DET_PACK c_att_names_3 "Det Packs" c_att_ranks_3 1,1,1 -c_att_descs_3 "15% faster movement, DMG increases with rank" +c_att_descs_3 "15% faster Movement, Dmg increases with rank" uioverlay_l "gfx/icons/tactician" uioverlay_r "gfx/icons/infantry" @@ -128,9 +128,6 @@ WeaponInfo1 animAttackRun BOTH_ATTACK3 animAttack BOTH_ATTACK3 animAttackWalk BOTH_ATTACK3 - altMissileMissEffect "blobs/concussion" - altMissileHitHumanEffect "blobs/concussion" - altMissileHitDroidEffect "blobs/concussion" } WeaponInfo2 { @@ -145,7 +142,7 @@ hasAnimOverrides 1 animReadyRun TORSO_WEAPONREADY0 animReady TORSO_WEAPONREADY0 animReadyWalk TORSO_WEAPONREADY0 -animReadyNoAmmo BOTH_ATTACK2 +animReadyNoAmmo TORSO_WEAPONREADY0 animAttackRun BOTH_ATTACK2 animAttack BOTH_ATTACK2 animAttackWalk BOTH_ATTACK2 @@ -165,25 +162,23 @@ WeaponInfo3 Icon "gfx/hud/w_icon_mwrench" WeaponName "Wrench" } -description "Imperial Specialist [Clone Trooper] +description "Imperial Specialist 2-life units with many Blobs, explosives, and turrets. ^2Weaponry: - Melee --- 15% faster movement +-- 15% faster Movement - Wrench (Cyan Saber) -- No Saber/Blaster Block -- No Saber Training --- 200% more KB --- 50% less DMG --- 40% less reach --- 167% more radius --- Slap ^3[GB] +-- 200% more Kb +-- 40% less Reach +-- 167% more Radius - SE-14C Blaster Pistol (2) -- 35% faster RoF --- 10% more charged FP DMG --- 10% less DMG +-- 10% more Charged FP Dmg +-- 10% less Dmg - E-11 Blaster Carbine (Clone Rifle 1) -- Concussion/Ion Blobs (8) @@ -194,7 +189,7 @@ description "Imperial Specialist [Clone Trooper] ^8Attributes: - Reinforcement (1) -- 5% more KB given +- 5% more Kb Given - Getup (2) - Dexterity (1) - Assemble (3) diff --git a/z_MBLegends/ext_data/mb2/character/v7_Krennic.mbch b/z_MBLegends/ext_data/mb2/character/v7_Krennic.mbch index 051c855c5..7fcd60393 100644 --- a/z_MBLegends/ext_data/mb2/character/v7_Krennic.mbch +++ b/z_MBLegends/ext_data/mb2/character/v7_Krennic.mbch @@ -4,23 +4,24 @@ ClassInfo MBClass MB_CLASS_BOUNTY_HUNTER classNumberLimit 1 - weapons WP_BLASTER_PISTOL|WP_MELEE|WP_FRAG_NADE|WP_CRYO_NADE|WP_FIRE_NADE + weapons WP_BLASTER_PISTOL|WP_MELEE|WP_FRAG_NADE|WP_CRYO_NADE|WP_PULSE_NADE WP_BlasterPistolFlags HELD_ALTRELOAD|HELD_STUN + WP_PulseNadeFlags HELD_STUN|HELD_POISON - attributes MB_ATT_PISTOL,3|MB_ATT_AMMO,3|MB_ATT_RALLY,1|MB_ATT_DODGE,3|MB_ATT_HEALING,2|MB_ATT_CRYOBAN_GRENADES,2|MB_ATT_FRAGS,2|MB_ATT_FIRE_GRENADES,2|MB_ATT_QUICKTHROW,3 + attributes MB_ATT_PISTOL,3|MB_ATT_AMMO,3|MB_ATT_RALLY,1|MB_ATT_DODGE,3|MB_ATT_HEALING,2|MB_ATT_CRYOBAN_GRENADES,2|MB_ATT_FRAGS,2|MB_ATT_QUICKTHROW,1|MB_ATT_PULSE_GRENADES,2 + + forcepowers FP_TEAM_FORCE,1 maxhealth 125 maxarmor 125 - damageGiven 1.35 - baseSpeed 255 resource RESOURCE_ENERGY - forcepool 100 + forcepool 110 - holdables HI_SENTRY_GUN|HI_SHIELD + holdables HI_SENTRY_GUN|HI_SHIELD|HI_MEDPAC knockbackGiven 1.10 @@ -34,7 +35,7 @@ ClassInfo special1 EAS_HI_DODGE special2 EAS_HI_KICK special3 EAS_HI_QUICKTHROW - special4 EAS_HI_SENTRY_GUN + special4 EAS_HI_MEDPAC WalkForward BOTH_WALK6 WalkBackward BOTH_WALK6 @@ -53,13 +54,14 @@ WeaponInfo0 Icon "gfx/hud/w_icon_dt29" WeaponName "Krennic's DT-29 Blaster Pistol" ClipSize 18 - CustomAmmo 750 + CustomAmmo 810 FlashSound0 "sound/weapons/Glie-44/fire.wav" - altFlashSound0 "sound/weapons/Glie-44/fire.wav" + altFlashSound0 "sound/weapons/Glie-44/alt_fire.wav" ChargeSound "sound/weapons/leia_pistol/altcharge.mp3" FPMult 1.35 - rateMod 1.15 - //ReloadTimeModifier 1.25 +damageMod 1.35 + rateMod 1.25 + ReloadTimeModifier 1.3 hasAnimOverrides 1 animReadyRun BOTH_MAND_PISTOL_READY animReady BOTH_MAND_PISTOL_READY @@ -69,7 +71,7 @@ animAttackRun BOTH_MAND_PISTOL_ATTACK animAttack BOTH_MAND_PISTOL_ATTACK animAttackWalk BOTH_MAND_PISTOL_ATTACK animCharge BOTH_MAND_PISTOL_ATTACK -animStand BOTH_MAND_PISTOL_ATTACK +animStand BOTH_MAND_PISTOL_READY } WeaponInfo1 @@ -84,32 +86,54 @@ WeaponInfo1 Icon "gfx/hud/w_icon_StormiTD" WeaponName "Frag Grenades" } +WeaponInfo2 +{ + WeaponToReplace WP_PULSE_NADE + WeaponBasedOff WP_PULSE_NADE + NewWorldModel "models/weapons2/kes_pgren/laser_trap_w.glm" + NewViewModel "models/weapons2/kes_pgren/laser_trap.md3" + MissileModel "models/weapons2/kes_pgren/laser_trap_proj.md3" + missileEffect "hutt/toxic_breath" + altmissileEffect "hutt/toxic_breath" + altMissileMissEffect "noghri_stick/flesh_impact" + MissileMissEffect "noghri_stick/flesh_impact" + altMissileHitHumanEffect "noghri_stick/flesh_impact" + missileHitHumanEffect "noghri_stick/flesh_impact" + altMissileHitDroidEffect "noghri_stick/flesh_impact" + missileHitDroidEffect "noghri_stick/flesh_impact" + Icon "gfx/hud/w_icon_rpgren" + WeaponName "Electro-Dioxis Grenades" +} +description "Director Orson Krennic -description "Director Orson Krennic [Bounty Hunter] - -A speedy, damage-boosted commander with a staggering Pistol, multiple Grenades, and gadgets. +A speedy commander with a staggering Pistol, multiple Grenades, and gadgets. ^2Weaponry: - Melee - Krennic's DT-29 Blaster Pistol (3) -- Staggers on hit --- 35% more FP DMG --- 15% slower RoF --- Mag reload +-- 35% more Dmg/FP Dmg +-- 25% slower RoF +-- 30% slower Mag Reload - Frag Grenades (2) -- Fire Grenades (2) +- Electro-Dioxis Grenades (2) (Pulses) +-- Poisons/staggers on hit - Cryo Grenades (2) +^5Powers: +- Team Energize (1) + ^6Inventory: -- Assault Sentry ^3[CS4] +- Assault Sentry - Forcefield +- Medpac ^3[CS4] ^8Attributes: -- 10% more KB given +- 10% more Kb Given - Healing (2) - Rally ^3Abilities: - Dodge (3) ^3[CS1] - Gunkick ^3[CS2] -- Quickthrow (3) ^3[CS3]" \ No newline at end of file +- Quickthrow (1) ^3[CS3]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/v7_Mouse.mbch b/z_MBLegends/ext_data/mb2/character/v7_Mouse.mbch index 6434ce3fa..977ad3ffa 100644 --- a/z_MBLegends/ext_data/mb2/character/v7_Mouse.mbch +++ b/z_MBLegends/ext_data/mb2/character/v7_Mouse.mbch @@ -10,7 +10,7 @@ ClassInfo attributes MB_ATT_WOOKIEE_FURY,3|MB_ATT_GETUPS,0|MB_ATT_STUN_BATON,1|MB_ATT_DISP_ARMOR,1|MB_ATT_DISP_FORCE,1|MB_ATT_DISP_BLOCK,1|MB_ATT_USE_DISTANCE,1|MB_ATT_FP_SABER_DEFENSE,0|MB_ATT_EE3,1|MB_ATT_FLECHETTE,1 BPmultiplier 0 - saber1 mouse_alarm //can surf damage due to KB + saber1 mouse_alarm //can surf damage due to Kb saberstyle SS_STAFF sabercolor 0 @@ -266,44 +266,44 @@ animStand BOTH_CONSOLE1 selectSound "sound/chars/mouse/misc/mouse_lp.wav" } */ -description "MSE-6-series 'Mouse' Repair Droid [Wookiee] +description "MSE-6-series 'Mouse' Repair Droid Tiny, easily startled maintenance and patrol units. ^2Weaponry: - Patrol Module (Melee) --- 200% more DMG +-- 200% more Dmg -- Barge only - Data Probe (Stun Baton 1) -- 20% slower RoF - Explosive Pellets (Flechette 1) -- 80% faster RoF --- 100% less velocity --- 10% slower mag reload +-- 100% less Velocity +-- 10% slower Mag Reload -- Sec only - Cleaning Module (EE-3 1) -- Pushes on hit -- Passive ammo regen -- 85% faster RoF --- 75% less DMG/FP DMG --- 45% less velocity +-- 75% less Dmg/FP Dmg +-- 45% less Velocity ^5Powers: -- Radar Scanner (Sense 3) ^3[CS1] +- Radar Scanner (Sense 3) ^8Attributes: -- 100% more KB taken -- 20% faster skill CD +- 100% more Kb Taken +- 20% faster Skill Cd - 10% faster Hacking - Getup (0) - Fury (3) -- Starting Resource: 150 -- 99% slower Resource Decay -- Flat DMG Taken +- Base Dmg Taken - Ally Stat Viewer - No Gunbash ^3Abilities: - Armor/BP/Resource Dispenser (1) ^3['Use' ^3on allies] --- +1 range +-- +1 Range - Trip (Barge) ^3[CS2]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/v7_Noghri.mbch b/z_MBLegends/ext_data/mb2/character/v7_Noghri.mbch index 76066cfa2..5780aedb0 100644 --- a/z_MBLegends/ext_data/mb2/character/v7_Noghri.mbch +++ b/z_MBLegends/ext_data/mb2/character/v7_Noghri.mbch @@ -43,7 +43,7 @@ ClassInfo holdables HI_CLOAK model "noghri" - skin "deathcomm" + skin "Deathcomm" uishader "gfx/hud/fa_icons/mb2_icon_warnoghri" uioverlay_l "gfx/icons/tactician" @@ -72,13 +72,13 @@ c_att_ranks_0 15 c_att_skill_1 MB_ATT_PISTOL c_att_names_1 "Disruptor Pistol" c_att_ranks_1 5 -c_att_descs_1 "120% more DMG/FP DMG, 75% more velocity, 50% slower RoF, -1500% slower reload" +c_att_descs_1 "120% more Dmg/FP Dmg, 75% more Velocity, 50% slower RoF, +1500% slower Reload" c_att_skill_2 MB_ATT_BOWCASTER c_att_names_2 "Stokhli Spray Stick (Bowcaster)" c_att_ranks_2 5 -c_att_descs_2 "Poisons/staggers on hit, 25% more DMG, 100% more FP DMG, -50% less velocity, 50% slower RoF, 40% slower mag reload" +c_att_descs_2 "Poisons/staggers on hit, 25% more Dmg, 100% more FP Dmg, +50% less Velocity, 50% slower RoF, 40% slower Mag Reload" c_att_skill_3 MB_ATT_T21 c_att_names_3 "T-21 Heavy Blaster" c_att_ranks_3 4,4,2 @@ -92,7 +92,7 @@ c_att_names_5 "Reinforcement" c_att_ranks_5 25 c_att_skill_6 MB_ATT_HEALTH -c_att_names_6 "Health (120/140)" +c_att_names_6 "HP (120/140)" c_att_ranks_6 2,2 c_att_skill_7 MB_ATT_HEALING @@ -201,7 +201,7 @@ Icon "gfx/marvel/spidersense" ForcePowerName "Hunter Sense" } -description "Noghri Death Commando [Bounty Hunter] +description "Noghri Death Commando Fast Saber/gunner hybrids with Cloak. Start with reduced resource which can be 'overcharged' through damage dealt. @@ -213,8 +213,7 @@ Fast Saber/gunner hybrids with Cloak. Start with reduced resource which can be ' -- No Blaster Block -- Chain Limit: 4 -- Poisons on hit --- 18% less reach --- Slap ^3[GB] +-- 18% less Reach ^6Inventory: - Cloaking Device diff --git a/z_MBLegends/ext_data/mb2/character/v7_Reelo.mbch b/z_MBLegends/ext_data/mb2/character/v7_Reelo.mbch index c13bc8660..66ebdab50 100644 --- a/z_MBLegends/ext_data/mb2/character/v7_Reelo.mbch +++ b/z_MBLegends/ext_data/mb2/character/v7_Reelo.mbch @@ -10,7 +10,7 @@ ClassInfo WP_RocketLauncherFlags HELD_ALTRELOAD|HELD_KNOCKBACK WP_ThrowerFlags HELD_ALTRELOAD - attributes MB_ATT_FRAGS,1|MB_ATT_PULSE_GRENADES,2|MB_ATT_BLASTER,2|MB_ATT_ROCKET_LAUNCHER|MB_ATT_BLAST_ARMOUR,1|MB_ATT_WOOKIE_STRENGTH,2|MB_ATT_DISRUPTOR,2|MB_ATT_THROWER_ICE,3|MB_ATT_TRIP_MINES,2|MB_ATT_AMMO,3|MB_ATT_HEALING,2|MB_ATT_RALLY + attributes MB_ATT_FRAGS,2|MB_ATT_PULSE_GRENADES,2|MB_ATT_BLASTER,2|MB_ATT_ROCKET_LAUNCHER|MB_ATT_BLAST_ARMOUR,1|MB_ATT_WOOKIE_STRENGTH,2|MB_ATT_DISRUPTOR,2|MB_ATT_THROWER_ICE,3|MB_ATT_TRIP_MINES,2|MB_ATT_AMMO,3|MB_ATT_HEALING,2|MB_ATT_RALLY resource RESOURCE_ENERGY forcepool 0 @@ -74,12 +74,13 @@ WeaponInfo0 WeaponInfo1 { WeaponToReplace WP_THROWER - WeaponBasedOff WP_THROWER + WeaponBasedOff WP_CONCUSSION NewWorldModel "models/weapons/CarboniteRifle/model.glm" NewViewModel "models/weapons/CarboniteRifle/model.md3" Icon "gfx/hud/w_icon_carboniterifle" WeaponName "Carbonite Rifle" ReloadTimeModifier 2 +customAmmo 700 clipsize 100 hasAnimOverrides 1 animReady BOTH_WESTARM5_READY @@ -125,6 +126,7 @@ WeaponInfo3 NewBarrelModel "models/weapons2/disruptor/disruptor_barrel.md3" Icon "gfx/hud/w_icon_disruptor" WeaponName "Tenloss DXR-6 Disruptor Rifle" +customAmmo 700 hasAnimOverrides 1 animReady BOTH_WESTARM5_READY animReadyRun BOTH_WESTARM5_READY @@ -136,7 +138,7 @@ WeaponInfo3 animStand BOTH_WESTARM5_READY } -description "Reelo Baruk [Wookiee] +description "Reelo Baruk A criminal kingpin armed to the teeth with various weapons. Cannot be knocked down by Force Push/Pull. @@ -147,15 +149,13 @@ A criminal kingpin armed to the teeth with various weapons. Cannot be knocked do -- Sec only - Tenloss DXR-6 Disruptor Rifle (2) - Carbonite Rifle (Icethrower) --- Slows/freezes on hit --- No DMG --- 100% slower mag reload +-- 100% slower Mag Reload - Overcharged PLX-2M Rocket Launcher (10) -- Pushes on det -- 70% faster RoF --- 40% less DMG --- 100% slower mag reload -- Frag Grenade (1) +-- 40% less Dmg +-- 100% slower Mag Reload +- Frag Grenades (2) - Trip Mines (2) - Pulse Grenades (2) @@ -163,7 +163,7 @@ A criminal kingpin armed to the teeth with various weapons. Cannot be knocked do - Portable E-Web Cannon ^3[CS1] ^8Attributes: -- 50% slower skill CD +- 50% slower Skill Cd - Strength (2) - Blast Armor - Healing (2) diff --git a/z_MBLegends/ext_data/mb2/character/v7_Tarkin.mbch b/z_MBLegends/ext_data/mb2/character/v7_Tarkin.mbch index d6a9320ef..01503acaf 100644 --- a/z_MBLegends/ext_data/mb2/character/v7_Tarkin.mbch +++ b/z_MBLegends/ext_data/mb2/character/v7_Tarkin.mbch @@ -10,7 +10,7 @@ ClassInfo attributes MB_ATT_PISTOL,3|MB_ATT_AMMO,3|MB_ATT_RALLY,1|MB_ATT_DODGE,3|MB_ATT_HEALING,2|MB_ATT_WOOKIEE_FURY,3|MB_ATT_PLX1,1|MB_ATT_LIGHTS_BEACON|MB_ATT_FIRE_GRENADES,2|MB_ATT_MICRO_GRENADES,2|MB_ATT_SPAWNER,1 - forcepowers FP_PROTECT,2|FP_TEAM_FORCE,3 + forcepowers FP_PROTECT,1|FP_TEAM_FORCE,2 maxhealth 170 maxarmor 90 @@ -50,7 +50,7 @@ ClassInfo WeaponInfo0 { WeaponToReplace WP_BLASTER_PISTOL - WeaponBasedOff WP_BLASTER_PISTOL + WeaponBasedOff WP_MANDO_PISTOL NewWorldModel "models/weapons2/imp_pistol/pistol_w.glm" NewViewModel "models/weapons2/imp_pistol/pistol_fpv.md3" Icon "gfx/hud/w_icon_imp_pistol" @@ -111,7 +111,7 @@ WeaponInfo1 SelectSound "sound/chars/Tarkin/misc/gloat1.mp3" } -description "Grand Moff Wilhuff Tarkin [Commander] +description "Grand Moff Wilhuff Tarkin A support gunner who builds resource through damage to bolster his allies and himself. @@ -120,20 +120,20 @@ A support gunner who builds resource through damage to bolster his allies and hi -- 5% slower RoF - Tarkin's Blaster Pistol (3) -- Pushes on hit --- 15% more DMG/FP DMG --- 15% more velocity +-- 15% more Dmg/FP Dmg +-- 15% more Velocity -- 15% slower RoF - Test Fire (1) (PLX) -- Ignites/pushes/staggers on det --- 75% more DMG --- 500% slower reload --- 15% slower movement +-- 75% more Dmg +-- 500% slower Reload +-- 15% slower Movement - Fire Grenades (2) -- Concussion Grenades (2) +- V-59 Conc Grenades (2) ^5Powers: -- Team Energize (3) -- Protect (2)^3* +- Team Energize (2) +- Protect (1)^3* ^6Inventory: - Defense Seeker ^3[CS2] @@ -143,7 +143,7 @@ A support gunner who builds resource through damage to bolster his allies and hi ^8Attributes: ^9- ^3*^9Dark's Beacon (Shares Force Powers with ^9a targeted/nearby ally) -- 50% slower skill CD +- 50% slower Skill Cd - Fury (3) -- Resource Regen: 1/.1s to 10 -- 99% slower Resource Decay diff --git a/z_MBLegends/ext_data/mb2/character/v7_Thrawn.mbch b/z_MBLegends/ext_data/mb2/character/v7_Thrawn.mbch index 8ce3ca66d..beced1317 100644 --- a/z_MBLegends/ext_data/mb2/character/v7_Thrawn.mbch +++ b/z_MBLegends/ext_data/mb2/character/v7_Thrawn.mbch @@ -21,12 +21,11 @@ ClassInfo speed 0.95 rateoffire_melee 0.9 - holdables HI_MEDPAC_BIG|HI_MEDPAC|HI_SEEKER|HI_BINOCULARS + holdables HI_MEDPAC_BIG|HI_SEEKER|HI_BINOCULARS special1 EAS_HI_DODGE special2 EAS_HI_TRACKER - special3 EAS_HI_MEDPAC - special4 EAS_HI_MEDPAC_BIG + special3 EAS_HI_MEDPAC_BIG WalkForward BOTH_WALK6 WalkBackward BOTH_WALK6 @@ -85,7 +84,7 @@ WeaponInfo0 FPChargeMult 1.2 } -description "Mitth'raw'nuruodo aka Grand Admiral Thrawn [Sith] +description "Mitth'raw'nuruodo aka Grand Admiral Thrawn An agile, pistol-wielding commander/medic hybrid with Force power resistance. @@ -93,7 +92,7 @@ An agile, pistol-wielding commander/medic hybrid with Force power resistance. - Melee -- 10% faster RoF - Thrawn's Blaster Pistol (3) --- 20% more charged FP DMG +-- 20% more Charged FP Dmg - Frag Grenades (2) - Fire Grenade (1) - Sonic Detonators (2) @@ -103,8 +102,7 @@ An agile, pistol-wielding commander/medic hybrid with Force power resistance. ^6Inventory: - Electrobinoculars -- Medpac ^3[CS3] -- Advanced Medpac ^3[CS4] +- Advanced Medpac ^3[CS3] - Seeker Drone ^8Attributes: @@ -113,8 +111,8 @@ An agile, pistol-wielding commander/medic hybrid with Force power resistance. - Tactical Acumen (Ally Stat Viewer) ^3Abilities: -- Health/Armor Dispenser (3) ^3['Use' on allies] --- +1 range +- HP/Armor Dispenser (3) ^3['Use' on allies] +-- +1 Range - Flipkick (1) ^3[Contact Jump] - Dodge (2) ^3[CS1] - Tracking Darts (4) ^3[CS2 Melee]" diff --git a/z_MBLegends/ext_data/mb2/character/v7_Veers.mbch b/z_MBLegends/ext_data/mb2/character/v7_Veers.mbch index 8b1ecd463..37d3220b0 100644 --- a/z_MBLegends/ext_data/mb2/character/v7_Veers.mbch +++ b/z_MBLegends/ext_data/mb2/character/v7_Veers.mbch @@ -12,7 +12,7 @@ ClassInfo maxhealth 125 maxarmor 125 - holdables HI_MEDPAC_BIG|HI_MEDPAC|HI_BINOCULARS|HI_SPAWNER + holdables HI_MEDPAC_BIG|HI_BINOCULARS|HI_SPAWNER classflags CFL_STATVIEWER basespeed 250 @@ -32,9 +32,10 @@ ClassInfo uioverlay_l "gfx/2d/hud/hlp_defend" special1 EAS_HI_DODGE - special2 EAS_HI_DASH - special3 EAS_HI_TRACKER - special4 EAS_HI_KICK + special2 EAS_HI_KICK + meleespecial2 EAS_HI_TRACKER + special3 EAS_HI_DASH + special4 EAS_HI_MEDPAC_BIG gloatAnim BOTH_TALKCOMM1START flourishAnim TORSO_HANDSIGNAL3 @@ -116,7 +117,7 @@ animAttackWalk BOTH_WESTARM5_ATTACK altFireEnabled 0 } -description "General Maximillian Veers [Commander] +description "General Maximillian Veers A supportive gunner who can mark enemies for death, repair his troops' armor, and deploy a Probe Droid to carry out his bidding. @@ -124,23 +125,22 @@ A supportive gunner who can mark enemies for death, repair his troops' armor, an - Melee - SE-14C Blaster Pistol (2) -- 33% faster RoF --- 33% slower reload +-- 33% slower Reload - Modified EE-4 Carbine Rifle (DLT-20A 3) -- 33% faster RoF --- 20% less FP DMG +-- 20% less FP Dmg - Sonic Detonators (2) - Fire Grenades (2) - CryoBan Gun (EE-3 1) -- Freezes on hit --- 90% faster shot swap --- 50% less velocity --- 40% slower mag reload +-- 90% faster Shot Swap +-- 50% less Velocity +-- 40% slower Mag Reload -- Prim only ^6Inventory: - Probe Droid (Support Beacon) -- Medpac -- Advanced Medpac +- Advanced Medpac ^3[CS4] - Electrobinoculars ^8Attributes: @@ -151,8 +151,8 @@ A supportive gunner who can mark enemies for death, repair his troops' armor, an ^3Abilities: - Armor Dispenser (2) ^3['Use' on ^3allies] --- +1 range +-- +1 Range - Dodge (3) ^3[CS1] -- Dash (2) ^3[CS2] -- Tracking Darts (8) ^3[CS3 Melee] -- Gunkick ^3[CS4]" \ No newline at end of file +- Gunkick ^3[CS2] +- Tracking Darts (8) ^3[CS2 Melee] +- Dash (2) ^3[CS3]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/v7_WatTam.mbch b/z_MBLegends/ext_data/mb2/character/v7_WatTam.mbch index e12991320..42637805b 100644 --- a/z_MBLegends/ext_data/mb2/character/v7_WatTam.mbch +++ b/z_MBLegends/ext_data/mb2/character/v7_WatTam.mbch @@ -183,7 +183,7 @@ ForceInfo0 StartSound "sound/ambience/kotor/consolebeep03.mp3" LoopSound "sound/ambience/cp_02_lp.wav" } -description "Wat Tambor [Bounty Hunter] +description "Wat Tambor Utilizes experimental tech. @@ -191,23 +191,23 @@ Utilizes experimental tech. - Limited Melee - RA-EV Glove Blaster (Pistol 1) -- Ignites on hit --- 50% more DMG/FP DMG --- 25% less velocity --- 25% slower mag reload +-- 50% more Dmg/FP Dmg +-- 25% less Velocity +-- 25% slower Mag Reload - DEMP2 (1) -- Pushes on hit - Prototype S/D Organic Decimator Droids (2) (RL) --- Decimates on hit --- 60% more DMG --- 75% less velocity --- 100% slower mag reload +-- Decimates on det +-- 60% more Dmg +-- 75% less Velocity +-- 100% slower Mag Reload -- Sec only - Liquid Detonite (2) (Repeater) --- Poisons/tracks on det/knocks down on direct hit --- Mag reload +-- Poisons/tracks on det +-- Mag Reload -- Sec only - Concussion Rifle (1) --- 100% slower reload +-- 100% slower Reload -- Sec only ^5Powers: @@ -229,5 +229,5 @@ Utilizes experimental tech. ^3Abilities: - Armor/BP/Resource Dispenser (2) ^3['Use' ^3on allies] --- +1 range +-- +1 Range - Tracking Darts (6) ^3[CS2 Melee]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/v7_Zuck.mbch b/z_MBLegends/ext_data/mb2/character/v7_Zuck.mbch index 06683ba4a..6989fa1dc 100644 --- a/z_MBLegends/ext_data/mb2/character/v7_Zuck.mbch +++ b/z_MBLegends/ext_data/mb2/character/v7_Zuck.mbch @@ -63,7 +63,7 @@ WeaponInfo0 WeaponInfo1 { WeaponToReplace WP_T21 - WeaponBasedOff WP_T21 + WeaponBasedOff WP_CONCUSSION NewWorldModel "models/weapons/W-90_Concussion/w-90_w.glm" NewViewModel "models/weapons/W-90_Concussion/w-90.md3" MuzzleEffect "concussion/muzzle_flash" @@ -170,7 +170,7 @@ ForceInfo0 ForcePowerName "Findsman Precognition" } -description "Zuckuss [Sith] +description "Zuckuss A hunter focused on disruption. @@ -181,23 +181,21 @@ A hunter focused on disruption. -- No Blaster Block -- No Saber Training -- Shocks/tracks on hit --- 105% more KB --- 53/50/70% less DMG --- 16/33% less reach --- Slap ^3[GB] +-- 105% more Kb +-- 16/33% less Reach - GRS-1 Snare Rifle (DEMP2 1) -- Shocks/freezes/staggers/tracks on hit --- 65% faster shot swap --- 350% more FP DMG --- 4400% slower reload +-- 65% faster Shot Swap +-- 350% more FP Dmg +-- 4400% slower Reload - Ammonia Bombs (8) (Flechette 4) -- Poisons/tracks on det --- 75% less DMG +-- 75% less Dmg -- Sec only - W-90 Concussion Rifle (T-21 1) -- Pushes on hit -- 25% faster RoF --- 85% more FP DMG +-- 85% more FP Dmg - Trip Mines (3) ^8Attributes: diff --git a/z_MBLegends/ext_data/mb2/character/v8_Burg.mbch b/z_MBLegends/ext_data/mb2/character/v8_Burg.mbch index e5f48d319..e43866994 100644 --- a/z_MBLegends/ext_data/mb2/character/v8_Burg.mbch +++ b/z_MBLegends/ext_data/mb2/character/v8_Burg.mbch @@ -53,9 +53,9 @@ WeaponInfo0 customammo 650 } -description "Burg [Wookiee] +description "Burg -A large brawler with high health, dual pistols and Fury. +A large brawler with high HP, dual pistols and Fury. ^2Weaponry: - Melee @@ -64,7 +64,7 @@ A large brawler with high health, dual pistols and Fury. - Frag Grenades (2) ^8Attributes: -- 10% faster skill CD +- 10% faster Skill Cd - Strength (3) - Fury (2) - Blast Armor diff --git a/z_MBLegends/ext_data/mb2/character/v8_Galak.mbch b/z_MBLegends/ext_data/mb2/character/v8_Galak.mbch index 1d5498f16..7f2217ddd 100644 --- a/z_MBLegends/ext_data/mb2/character/v8_Galak.mbch +++ b/z_MBLegends/ext_data/mb2/character/v8_Galak.mbch @@ -38,7 +38,7 @@ ClassInfo uioverlay_r "gfx/icons/heavy" uioverlay_l "gfx/icons/tactician" modelscale 1.33 - model "doomgalak" + model "Doomgalak" skin "default" uishader "models/players/doompack/Galak" } @@ -84,7 +84,7 @@ ForceInfo0 HandShader "gfx/effects/dekashield2" } -description "Admiral Galak Fyyar [Super Battle Droid] +description "Admiral Galak Fyyar A large, tanky anti-Jedi class with an overshield that shocks and pushes away enemies. @@ -92,7 +92,7 @@ A large, tanky anti-Jedi class with an overshield that shocks and pushes away en - Heavy Melee - Repeater Arm Blaster (2) -- Advanced Targeting ^3[Sec fire] --- 20% less DMG/FP DMG +-- 20% less Dmg/FP Dmg -- Passive ammo regen -- Heavy Cannon ^3[Toggle ^3mode] diff --git a/z_MBLegends/ext_data/mb2/character/v8_GamoPig.mbch b/z_MBLegends/ext_data/mb2/character/v8_GamoPig.mbch index 7ea0a1bda..024456d27 100644 --- a/z_MBLegends/ext_data/mb2/character/v8_GamoPig.mbch +++ b/z_MBLegends/ext_data/mb2/character/v8_GamoPig.mbch @@ -19,7 +19,7 @@ ClassInfo maxhealth 300 maxarmor 50 - skilltimerMod 0.5 + skilltimerMod 0.4 speed 1.09 resource RESOURCE_FORCE @@ -95,38 +95,36 @@ WeaponInfo2 damagemod 2.5 } -description "Gamorrean Guard [Wookiee] +description "Gamorrean Guard Versatile 2-life gunners with Strength and a heavy Saber. ^2Weaponry: - Melee --- 15% slower movement +-- 15% slower Movement - Gamorrean Saber (Red/Yellow) -- No Saber/Blaster Block -- Chain Limit: 2 -- Staggers on hit --- 61/16% less DMG --- Slap ^3[GB] > Gamorrean Axe -- 15% more AS --- 20% more KB --- 50% less reach --- 100% more radius +-- 20% more Kb +-- 50% less Reach +-- 100% more Radius > Gamorrean Bardiche --- 15% more reach --- 25% more KB +-- 15% more Reach +-- 25% more Kb -- 5% less AS --- 67% more radius +-- 67% more Radius - Modified E-11 Blaster Rifle (A280 3) - Heavy Thermal Grenades (2) -- Pushes on det --- 150% more DMG +-- 150% more Dmg ^8Attributes: - Reinforcement (1) -- 50% faster skill CD -- 15% less KB taken +- 60% faster Skill Cd +- 15% less Kb Taken - Strength (2) - Blast Armor - Physical Resist diff --git a/z_MBLegends/ext_data/mb2/character/v8_HuttW.mbch b/z_MBLegends/ext_data/mb2/character/v8_HuttW.mbch index 1c8ac8b17..2b75f01ff 100644 --- a/z_MBLegends/ext_data/mb2/character/v8_HuttW.mbch +++ b/z_MBLegends/ext_data/mb2/character/v8_HuttW.mbch @@ -63,7 +63,7 @@ WeaponInfo0 WeaponName "Hutt Bardiche" } -description "Hutt Warrior [Wookiee] +description "Hutt Warrior A tanky brawler class with innate Strength and resistances. Wields a long Bardiche that can displace enemies. Taunting within range of a Jedi will deal them minor damage. @@ -72,25 +72,24 @@ A tanky brawler class with innate Strength and resistances. Wields a long Bardic -- 12% slower RoF - Hutt Bardiche (Red Saber) -- No Saber/Blaster Block --- Surface hits deal splash KB/KD ---- Splash radius: 130 ---- Splash DMG: 25 ---- Splash KB: 100 --- 46% less DMG --- 38% more reach --- 67% more radius --- Slap ^3[GB] +-- Pushes/trips on surface hit +--- Splash Radius: 130 +--- Splash Dmg: 25 +--- Splash Kb: 100 +-- 100% more Kb +-- 38% more Reach +-- 67% more Radius ^8Attributes: -- 50% less KB taken +- 50% less Kb Taken - Strength (3) - Fury (3) -- Flat DMG Taken +- Base Dmg Taken - Blast Armor - Physical Resist - Healing (1) - Anti-Mind Trick (2) -- Rally +- Rally - Acid Blood ^3Abilities: diff --git a/z_MBLegends/ext_data/mb2/character/v8_SBD.mbch b/z_MBLegends/ext_data/mb2/character/v8_SBD.mbch index d420c3021..bf6f41136 100644 --- a/z_MBLegends/ext_data/mb2/character/v8_SBD.mbch +++ b/z_MBLegends/ext_data/mb2/character/v8_SBD.mbch @@ -11,7 +11,7 @@ ClassInfo //special2 EAS_HI_SBD_ZOOM maxhealth 120 - rankHealth 180,240,330 + rankHealth 180,240,300 MaxArmor 0 rankArmor 5,10,20 @@ -70,7 +70,7 @@ ClassInfo uishader_7 "models/players/sbd/mb2_icon_cw" model_8 "SBD" - skin_8 "dolovite" + skin_8 "Dolovite" uishader_8 "models/players/sbd/mb2_icon_dolovite" model_9 "SBD" @@ -120,7 +120,7 @@ ClassInfo c_att_skill_2 MB_ATT_SBD_CANNON c_att_names_2 "Heavy Cannon" c_att_ranks_2 10 - c_att_descs_2 "Toggle Arm Blaster, Knocks down on hit, Hold to fire" + c_att_descs_2 "Toggle Arm Blaster, Trips on hit, Hold to fire" c_att_skill_3 MB_ATT_RESPAWNS c_att_names_3 "Reinforcement" c_att_ranks_3 30 @@ -130,7 +130,7 @@ ClassInfo c_att_ranks_4 5 c_att_skill_5 MB_ATT_HEALTH - c_att_names_5 "Health (180/240/330)" + c_att_names_5 "HP (180/240/300)" c_att_ranks_5 10,10,15 c_att_skill_6 MB_ATT_ARMOUR @@ -186,7 +186,7 @@ ClassInfo //ReloadTimeModifier 6 //} -description "B2-series Super Battle Droid [Super Battle Droid] +description "B2-series Super Battle Droid A slow moving battle droid that must strike a balance between firepower, protection, and close range brawling. @@ -195,8 +195,7 @@ A slow moving battle droid that must strike a balance between firepower, protect - Arm Blaster (0) -- Low Power Mode ^3[CS1] -- Advanced Targeting ^3[Sec fire] --- Slap ^3[GB] ^8Attributes: -- 15% less KB taken +- 15% less Kb Taken - Battery Recharge (2)" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/v8_Snoova.mbch b/z_MBLegends/ext_data/mb2/character/v8_Snoova.mbch index 0acd0637f..126900d68 100644 --- a/z_MBLegends/ext_data/mb2/character/v8_Snoova.mbch +++ b/z_MBLegends/ext_data/mb2/character/v8_Snoova.mbch @@ -54,7 +54,7 @@ ClassInfo WeaponInfo0 { WeaponToReplace WP_CLONE_RIFLE - WeaponBasedOff WP_CLONE_RIFLE + WeaponBasedOff WP_CONCUSSION NewWorldModel "models/weapons2/DLT-19_HeavyBlaster/model_scope.glm" NewViewModel "models/weapons2/DLT-19_HeavyBlaster/riflescoped.md3" Icon "gfx/hud/w_icon_dlt19scoped" @@ -77,7 +77,7 @@ WeaponInfo1 selectSound "s/w/t/staffswing4.mp3" } -description "Snoova [Wookiee] +description "Snoova A large tank with Fury, a deadly Vibroaxe, and a heavy blaster rifle. Resists most knockdown and displacement moves. @@ -88,9 +88,7 @@ A large tank with Fury, a deadly Vibroaxe, and a heavy blaster rifle. Resists mo -- Saber Defense (1) -- No Blaster Block -- Chain Limit: 2 --- 30/46% less DMG --- 10% less reach --- Slap ^3[GB] +-- 10% less Reach - DLT-19 Heavy Blaster Rifle (Clone Rifle 2) -- 10% faster RoF @@ -98,8 +96,8 @@ A large tank with Fury, a deadly Vibroaxe, and a heavy blaster rifle. Resists mo - Advanced Medpac ^3[CS3] ^8Attributes: -- 10% less KB taken -- 5% faster skill CD +- 10% less Kb Taken +- 5% faster Skill Cd - 5% slower Resource Decay - Strength (2) - Fury (2) diff --git a/z_MBLegends/ext_data/mb2/character/v8_Wampa.mbch b/z_MBLegends/ext_data/mb2/character/v8_Wampa.mbch index 6aea0da3e..d5336624e 100644 --- a/z_MBLegends/ext_data/mb2/character/v8_Wampa.mbch +++ b/z_MBLegends/ext_data/mb2/character/v8_Wampa.mbch @@ -7,12 +7,12 @@ ClassInfo MBClass MB_CLASS_WOOKIE classNumberLimit 3 weapons WP_MELEE|WP_STUN_BATON - attributes MB_ATT_WOOKIE_STRENGTH,3|MB_ATT_WOOKIEE_FURY,3|MB_ATT_STUN_BATON,1|MB_ATT_HEALING,3|MB_ATT_BLAST_ARMOUR + attributes MB_ATT_WOOKIE_STRENGTH,3|MB_ATT_WOOKIEE_FURY,3|MB_ATT_STUN_BATON,1|MB_ATT_HEALING,2|MB_ATT_BLAST_ARMOUR WP_StunBatonFlags HELD_SPEED // WP_MeleeFlags HELD_FREEZE - maxhealth 250 + maxhealth 240 classflags CFL_STRONGAGAINSTPHYSICAL|CFL_NOLOCATIONALDAMAGE|CFL_NODISMEMBER|CFL_BLOODYMELEE|CFL_NOPICKUPS //humanoidSkeleton 1 @@ -26,10 +26,10 @@ ClassInfo resourceRegenCap 45 healthRegenAmount 5 - healthRegenRate 18000 + healthRegenRate 20000 healthRegenCap 250 - DamageTaken 0.4 + DamageTaken 0.5 knockbackTaken 0.2 skillTimerMod 0.6 @@ -38,7 +38,7 @@ ClassInfo special1 EAS_FP_RAGE special2 EAS_HI_BARGE //special3 eas_hi_ice - + special4 EAS_FP_RAGE hackRate 5 meleeMoves M_BLOCK @@ -124,37 +124,36 @@ clipSize 50 reloadTimeModifier 2 } */ -description "Wild Wampa [Wookiee] +description "Wild Wampa A feral animal looking for its next meal. Not a particularly picky eater. ^2Weaponry: - Wild Beast (Limited Melee) --- 600% more DMG +-- 600% more Dmg -- Barge only - Claws (Stun Baton 1) --- 200% more DMG --- 15% faster movement +-- 200% more Dmg +-- 15% faster Movement -- 140% slower RoF ^5Powers: -- Dark Rage (3) ^3[CS1] +- Dark Rage (3) ^3[CS1/4] ^8Attributes: -- 40% faster skill CD -- 80% less KB taken +- 40% faster Skill Cd +- 80% less Kb Taken - 400% slower Hacking - No Gunbash - No weapon pickups - Strength (3) - Fury (3) -- 35% slower Resource Decay -- Healing (3) --- Extra Health Regen: 5/18s -- Flat DMG Taken +- Healing (2) +-- Extra HP Regen: 5/20s +- Base Dmg Taken - Blast Armor - Physical Resist -- Healing (3) ^3Abilities: - Lunge (Barge) ^3[CS2 Melee]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/v9_Grievous.mbch b/z_MBLegends/ext_data/mb2/character/v9_Grievous.mbch index 75ac67786..962cd9404 100644 --- a/z_MBLegends/ext_data/mb2/character/v9_Grievous.mbch +++ b/z_MBLegends/ext_data/mb2/character/v9_Grievous.mbch @@ -23,7 +23,7 @@ saberSpecialDamage 2 APMultiplier 1.2 BPMultiplier 0.7 ASmultiplier 1.05 - CSmultiplier 1.6 + CSmultiplier 1.5 blockRegenAmount 2 blockRegenRate 400 blockRegenCap 100 @@ -33,7 +33,7 @@ saberSpecialDamage 2 maxhealth 75 maxarmor 60 - basespeed 255 + basespeed 193 resource RESOURCE_STAMINA forcepool 120 @@ -43,9 +43,9 @@ saberSpecialDamage 2 bowAnim BOTH_REACHFORSABER1 saberStanceAnim BOTH_WOOKIEE_RAGE_STAND_IDLE - Classflags CFL_BLOODYMELEE|CFL_STRONGAGAINSTPHYSICAL|CFL_NOPICKUPS + Classflags CFL_BLOODYMELEE|CFL_STRONGAGAINSTPHYSICAL|CFL_NOPICKUPS // - special1 EAS_NONE + special1 EAS_HI_SPRINT special2 EAS_HI_DASH special4 EAS_HI_GRAPPLEHOOK @@ -111,7 +111,7 @@ animCharge BOTH_ATTACK2 damageMod 0.5 } */ -Description "General Grievous [Sith] +Description "General Grievous A speedy, resilient commander with 4 Lightsabers. Excels at close-range encounters as well as quick escapes. @@ -123,17 +123,15 @@ A speedy, resilient commander with 4 Lightsabers. Excels at close-range encounte -- Blaster Defense (1) -- EX Saber Training (2) -- Chain Limit: 6 --- 50% less DMG --- 200% special DMG mult --- Slap ^3[GB] +-- 200% Spec Dmg mult - DT-57 'Annihilator' Blaster (Pistol 2) --- 10% more DMG/FP DMG +-- 10% more Dmg/FP Dmg ^5Powers: - Cyber Jump (1) ^8Attributes: -- 30% less KB taken +- 30% less Kb Taken - Stamina (3) - Dexterity (3) - Strength (1) @@ -145,5 +143,6 @@ A speedy, resilient commander with 4 Lightsabers. Excels at close-range encounte - Force Block (2) ^3Abilities: +- Sprint ^3[CS1] - Dash (1) ^3[CS2] - Grappling Hook (1) ^3[CS4 Melee]" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/v9_Inquis.mbch b/z_MBLegends/ext_data/mb2/character/v9_Inquis.mbch index 7f7406f47..9b3f40871 100644 --- a/z_MBLegends/ext_data/mb2/character/v9_Inquis.mbch +++ b/z_MBLegends/ext_data/mb2/character/v9_Inquis.mbch @@ -8,7 +8,7 @@ ClassInfo weapons WP_SABER|WP_MELEE|WP_FRAG_NADE - attributes MB_ATT_SABER_FAST,2|MB_ATT_DEFLECT,2|MB_ATT_FORCEBLOCK,3|MB_ATT_FORCEFOCUS,2|MB_ATT_GUN_DEFENSE,2|MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_TRACKING_BEACON + attributes MB_ATT_SABER_FAST,2|MB_ATT_DEFLECT,2|MB_ATT_FORCEBLOCK,3|MB_ATT_FORCEFOCUS,2|MB_ATT_GUN_DEFENSE,2|MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_TRACKING_BEACON|MB_ATT_HEALING,1 forcepowers FP_SABER_OFFENSE,2|FP_LEVITATION,3|FP_PUSH,2|FP_SEE,2|FP_SABERTHROW,3 @@ -23,20 +23,22 @@ ClassInfo rankBP 1.20 rankAS 1.15 rankCS 1.15 -saberDamageStyle SS_STAFF,260|SS_TAVION,130 - + saberDamageStyle SS_STAFF,260|SS_TAVION,130 + saberSpecialDamage 1.25 maxhealth 100 - maxarmor 10 - + maxarmor 15 + rateOfFire_Melee .9 damageGiven 1.1 basespeed 225 rankBaseSpeed 240 saberThrowDamage 30 - RanksaberThrowDamage 50 + RanksaberThrowDamage 60 - special2 EAS_FP_DRAIN + special2 EAS_FP_DRAIN + //special3 EAS_FP_GRIP + special4 EAS_FP_SPEED uioverlay "gfx/icons/frontline" model "GI_rebels" @@ -62,7 +64,7 @@ saberDamageStyle SS_STAFF,260|SS_TAVION,130 mbPoints 60 c_att_skill_0 MB_ATT_SABERTHROW_DAMAGE -c_att_names_0 "Saber Throw DMG (50)" +c_att_names_0 "Saber Throw Dmg (60)" c_att_ranks_0 5 c_att_skill_1 MB_ATT_BP_MULTIPLIER @@ -84,7 +86,7 @@ c_att_ranks_4 15 c_att_skill_5 MB_ATT_FRAGS c_att_names_5 "Flashbang Grenades (Frags)" c_att_ranks_5 5,5 -c_att_descs_5 "Blind everyone, Sec only" +c_att_descs_5 "Blinds on det, Sec only" c_att_skill_6 MB_ATT_FP_PULL c_att_names_6 "Force Pull" @@ -99,7 +101,7 @@ c_att_names_8 "Force Grip ^3[CS3]" c_att_ranks_8 5,5 c_att_skill_9 MB_ATT_FP_SPEED -c_att_names_9 "Force Speed" +c_att_names_9 "Force Speed ^3[CS4]" c_att_ranks_9 5,5 c_att_skill_10 MB_ATT_BASESPEED @@ -127,20 +129,21 @@ WeaponInfo0 primFireEnabled 0 } -description "Inquisitor [Sith] +description "Sith Inquisitor -A customizable Sith designed to hunt down Jedi. Can spec into Force Powers, improved dueling stats, Saber Throw damage, and more. +A customizable Sith designed to hunt down Jedi. ^2Weaponry: - Melee +-- 10% faster RoF - Lightsaber (Staff/Cyan) -- Saber Defense (3) -- Blaster Defense/Deflect (2) --- 25% more reach --- 8% more Cyan DMG --- 43% less radius +-- 25% more Reach +-- 8% more Cyan Dmg +-- 125% Spec Dmg mult +-- 43% less Radius -- EX Saber Throw (3) ^3[CS1] --- Slap ^3[GB] ^5Force Powers: - Jump (3) @@ -148,6 +151,7 @@ A customizable Sith designed to hunt down Jedi. Can spec into Force Powers, impr - Sense (2) ^8Attributes: +- Healing (1) - Force Block (3) - Force Focus (2) - Tracking Beacon" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/v9_Kylo.mbch b/z_MBLegends/ext_data/mb2/character/v9_Kylo.mbch index 3efa01212..095637044 100644 --- a/z_MBLegends/ext_data/mb2/character/v9_Kylo.mbch +++ b/z_MBLegends/ext_data/mb2/character/v9_Kylo.mbch @@ -5,18 +5,18 @@ ClassInfo classNumberLimit 1 weapons WP_SABER|WP_MELEE - attributes MB_ATT_DEFLECT,2|MB_ATT_FORCEBLOCK,2|MB_ATT_FORCEFOCUS,2|MB_ATT_GUN_DEFENSE,2|MB_ATT_LIGHTS_BEACON|MB_ATT_FP_SABER_DEFENSE,3 + attributes MB_ATT_DEFLECT,2|MB_ATT_FORCEBLOCK,2|MB_ATT_FORCEFOCUS,2|MB_ATT_GUN_DEFENSE,2|MB_ATT_LIGHTS_BEACON|MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_HEALING,1 - forcepowers FP_SABER_OFFENSE,3|FP_LEVITATION,2|FP_PUSH,2|FP_GRIP,2|FP_SEE,1|FP_PROTECT,2|FP_SABERTHROW,1 + forcepowers FP_SABER_OFFENSE,3|FP_LEVITATION,2|FP_PUSH,2|FP_GRIP,2|FP_SEE,1|FP_PROTECT,1|FP_SABERTHROW,1 - maxhealth 125 + maxhealth 130 forcepool 110 speed 1.05 skilltimermod 1.5 classflags CFL_NOPICKUPS - + saberSpecialDamage 1.25 saberThrowDamage 40 saberMaxChain 4 saber1 saber_kylo_legends @@ -25,7 +25,7 @@ ClassInfo saberDamage 240 BPmultiplier 1.05 APmultiplier 1.15 - + rateOfFire_Melee .9 damageGiven 1.1 special2 EAS_NONE @@ -68,37 +68,38 @@ ClassInfo uishader_6 "models/players/kylo_ren/mb2_icon_tlj_nomaska" model_7 "kylo_ren" - skin_7 "tlj_nomaskb" - uishader_7 "models/players/kylo_ren/mb2_icon_tlj_nomaskb" + skin_7 "tlj_nomasKb" + uishader_7 "models/players/kylo_ren/mb2_icon_tlj_nomasKb" model_8 "ben_swolo" skin_8 "default" uishader_8 "models/players/ben_swolo/mb2_icon_default" } -description "Kylo Ren [Sith] +description "Kylo Ren -An attack/support-oriented Sith sporting a unique high-damage and extended-combo Cyan style, and the ability to share Force Protect with allies. +A flexible Sith sporting a unique high-damage/extended-combo Cyan style, and the ability to share Force Protect with allies. ^2Weaponry: - Melee +-- 10% faster RoF - Lightsaber (Cyan) -- Saber Defense (3) -- Blaster Defense/Deflect (2) -- Chain Limit: 4 --- 100% more DMG +-- 125% Spec Dmg mult -- EX Saber Throw (1) ^3[CS1] ---- 33% more DMG --- Slap ^3[GB] +--- 33% more Dmg ^5Force Powers: - Jump (2) - Push (2) - Sense (1) - Grip (2) ^3[CS3] -- Protect (2) ^3[CS4*] +- Protect (1)^3* ^3[CS4] ^8Attributes: -- 50% slower skill CD +- 50% slower Skill Cd ^9- ^3*^9Dark's Beacon (Shares Force Powers with ^9a targeted/nearby ally) +- Healing (1) - Force Block/Focus (2)" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/v9_Maul.mbch b/z_MBLegends/ext_data/mb2/character/v9_Maul.mbch index 1ec45a1bc..cf4d48cd7 100644 --- a/z_MBLegends/ext_data/mb2/character/v9_Maul.mbch +++ b/z_MBLegends/ext_data/mb2/character/v9_Maul.mbch @@ -21,7 +21,8 @@ ClassInfo speed 1.07 damageGiven 1.1 - + rateOfFire_Melee .9 + saberSpecialDamage 1.25 saberDamageStyle SS_STAFF,260|SS_DESANN,280 saberstyle SS_STAFF|SS_DESANN BPmultiplier 1.18 @@ -43,7 +44,7 @@ ClassInfo saberStanceAnim BOTH_TRIPLE3_STAFFSTANCE special2 EAS_NONE - special4 EAS_FP_GRIP + special3 EAS_FP_GRIP uioverlay "gfx/icons/frontline" @@ -96,28 +97,29 @@ ClassInfo uishader_11 "models/players/maul_rebels/mb2_icon_noshirt_hood" } -description "Maul [Sith] +description "Maul A highly aggressive Sith that excels in flanking due to enhanced movement and swings. ^2Weaponry: - Heavy Melee +-- 10% faster RoF - Lightsaber (Staff/Purple) -- Saber Defense (3) -- Blaster Defense (2) -- Blaster Deflect (2) --- 18% more reach --- 30% less Purple DMG +-- 18% more Reach +-- 30% less Purple Dmg +-- 125% Spec Dmg mult -- EX Saber Throw (1) ^3[CS1] ---- 33% more DMG --- Slap ^3[GB] +--- 33% more Dmg ^5Force Powers: - Jump (3) - Push (2) - Pull (2) - Sense (1) -- Grip (2) ^3[CS4] +- Grip (2) ^3[CS3] ^8Attributes: - Healing (1) diff --git a/z_MBLegends/ext_data/mb2/character/v9_Pong.mbch b/z_MBLegends/ext_data/mb2/character/v9_Pong.mbch index 52f86537c..4682b1e2f 100644 --- a/z_MBLegends/ext_data/mb2/character/v9_Pong.mbch +++ b/z_MBLegends/ext_data/mb2/character/v9_Pong.mbch @@ -8,7 +8,7 @@ ClassInfo WP_MeleeFlags HELD_SPEED attributes MB_ATT_WOOKIE_STRENGTH,1|MB_ATT_DEFLECT,1|MB_ATT_FORCEBLOCK,1|MB_ATT_GUN_DEFENSE,3|MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_FP_REPULSE,3|MB_ATT_FORCEFOCUS,1|MB_ATT_DEXTERITY,3|MB_ATT_HEALING,1 - forcepowers FP_LEVITATION,3|FP_PUSH,3|FP_PULL,3|FP_SABERTHROW,2| + forcepowers FP_LEVITATION,3|FP_PUSH,3|FP_PULL,3|FP_SABERTHROW,2 forcepool 130 forceregen 1.15 @@ -64,22 +64,22 @@ ClassInfo } -description "Pong Krell [Sith] +description "Pong Krell A dark sider with two double-bladed Lightsabers and strong Melee skills. Dispatches gunners with ease. ^2Weaponry: - Melee --- 15% faster movement +-- 15% faster Movement - Staff Lightsabers (Dual) -- Saber/Blaster Defense (3) -- Blaster Deflect (1) --- 25% more reach --- 5% more DMG --- 10% more KB --- 33% more radius +-- 25% more Reach +-- 5% more Dmg +-- 10% more Kb +-- 33% more Radius -- EX Saber Throw (2) ^3[CS1] ---- 66% more DMG +--- 66% more Dmg -- Slap ^3[GB] ^5Force Powers: @@ -89,7 +89,7 @@ A dark sider with two double-bladed Lightsabers and strong Melee skills. Dispatc - Repulse ^3[CS4 Melee] ^8Attributes: -- 75% less KB taken +- 75% less Kb Taken - Dexterity (3) - Strength (1) - Healing (1) diff --git a/z_MBLegends/ext_data/mb2/character/v9_SAcolyte.mbch b/z_MBLegends/ext_data/mb2/character/v9_SAcolyte.mbch index cdec8c3aa..b090b232a 100644 --- a/z_MBLegends/ext_data/mb2/character/v9_SAcolyte.mbch +++ b/z_MBLegends/ext_data/mb2/character/v9_SAcolyte.mbch @@ -73,7 +73,7 @@ ClassInfo uishader_11 "models/players/cultist_female/mb2_icon_blue" model_12 "reborn" - skin_12 "darkjedi" + skin_12 "Darkjedi" uishader_12 "models/players/reborn/mb2_icon_darkjedi" model_13 "sith_assassin" @@ -139,7 +139,7 @@ ClassInfo c_att_ranks_5 2,4 c_att_skill_6 MB_ATT_POWER - c_att_names_6 "Force Pool (120)" + c_att_names_6 "FP (120)" c_att_ranks_6 8 c_att_skill_7 MB_ATT_FORCEBLOCK @@ -150,13 +150,13 @@ ClassInfo c_att_names_8 "Fast Saber Styles" c_att_ranks_8 4,0,2 c_att_descs_8 "Blue, Cyan, both -8% more DMG" +8% more Dmg" c_att_skill_9 MB_ATT_SABER_STRONG c_att_names_9 "Strong Saber Styles" c_att_ranks_9 4,0,2 c_att_descs_9 "Red, Purple, both -46/30% less Red/Purple DMG" +46/30% less Red/Purple Dmg" c_att_skill_10 MB_ATT_FP_SABER_DEFENSE c_att_names_10 "Saber Defense" @@ -175,7 +175,7 @@ ClassInfo c_att_ranks_13 2,2,2 } -description "Dark Acolyte [Sith] +description "Dark Acolyte 2-life Sith with customizable Force Powers and Lightsaber attributes. @@ -183,7 +183,6 @@ description "Dark Acolyte [Sith] - Melee - Lightsaber (Yellow) -- Saber Throw ^3[CS1] --- Slap ^3[GB] ^8Attributes: - Reinforcement (1) diff --git a/z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch b/z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch index ef913f6c9..ad9544e7d 100644 --- a/z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch +++ b/z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch @@ -10,20 +10,22 @@ ClassInfo forcepowers FP_LEVITATION,3|FP_SEE,2|FP_SPEED,3|FP_PULL,2|FP_SABERTHROW,3|FP_GRIP,3|FP_SABER_OFFENSE,2|FP_TELEPATHY,1 - maxhealth 115 + maxhealth 125 forcepool 110 forceregen 1.07 saberstyle SS_DUAL - saberDamageStyle SS_DUAL,200|SS_FAST,130 - BPmultiplier 0.7 + saberSpecialDamage 1.35 + saberDamageStyle SS_DUAL,220|SS_FAST,130 + BPmultiplier 0.8 APmultiplier 1 - ASmultiplier 1.18 + ASmultiplier 1.15 CSmultiplier 1.05 saberThrowDamage 40 speed 1.07 rateOfFire_Melee 0.88 + damageGiven 1.1 classflags CFL_SEEING_STEALTH|CFL_NOPICKUPS @@ -49,11 +51,11 @@ ClassInfo skin_3 "default" uishader_3 "models/players/boc_aseca/mb2_icon_default" - model_4 "darthtalon" + model_4 "Darthtalon" skin_4 "default" uishader_4 "models/players/darthtalon/mb2_icon_default" - model_5 "darthcognus" + model_5 "Darthcognus" skin_5 "default" uishader_5 "models/players/darthcognus/mb2_icon_default" @@ -73,7 +75,7 @@ ClassInfo saber2color_2 0 } -description "Sith Assassin [Sith] +description "Sith Assassin A fast Sith with Force Sense immunity, meant to surprise unsuspecting enemies. Lacks the blocking power for sustained duels. @@ -84,10 +86,10 @@ A fast Sith with Force Sense immunity, meant to surprise unsuspecting enemies. L -- Saber Defense (3) -- Blaster Defense (1) -- Blaster Deflect (3) --- 23% less Dual/8% more Blue DMG +-- 15% less Dual/8% more Blue Dmg +-- 135% Spec Dmg mult -- EX Saber Throw (3) ^3[CS1] ---- 33% more DMG --- Slap ^3[GB] +--- 33% more Dmg ^5Force Powers: - Jump (3) diff --git a/z_MBLegends/ext_data/mb2/character/v9_SDuel.mbch b/z_MBLegends/ext_data/mb2/character/v9_SDuel.mbch index 27e62e96a..4b21defdf 100644 --- a/z_MBLegends/ext_data/mb2/character/v9_SDuel.mbch +++ b/z_MBLegends/ext_data/mb2/character/v9_SDuel.mbch @@ -31,7 +31,8 @@ ClassInfo saberSpecialDamage 2.5 saberThrowDamage 50 rankSaberMaxChain 5 - + damageGiven 1.1 +rateOfFire_Melee .9 classflags CFL_NOPICKUPS bowAnim BOTH_CROUCH3 @@ -43,23 +44,23 @@ ClassInfo modelscale 1.067 uioverlay "gfx/icons/frontline" - model "dooku" + model "Dooku" skin "default" uishader "models/players/dooku/mb2_icon_default" - model_1 "dooku" + model_1 "Dooku" skin_1 "nocape" uishader_1 "models/players/dooku/mb2_icon_nocape" - model_2 "dooku_dr" + model_2 "Dooku_dr" skin_2 "default" uishader_2 "models/players/dooku_dr/mb2_icon_default" - model_3 "dooku_pyjama" + model_3 "Dooku_pyjama" skin_3 "default" uishader_3 "models/players/dooku_pyjama/mb2_icon_default" - model_4 "darthkrayt2" + model_4 "Darthkrayt2" skin_4 "default" uishader_4 "models/players/darthkrayt2/mb2_icon_default" @@ -83,31 +84,28 @@ ClassInfo c_att_skill_2 MB_ATT_SABER_FAST c_att_names_2 "Fast Saber Styles" c_att_ranks_2 0,0,0 - c_att_descs_2 "Blue, Cyan, both -33% more DMG, 166% more Saber special DMG" + c_att_descs_2 "Blue, Cyan, both" c_att_skill_3 MB_ATT_SABER_STRONG c_att_names_3 "Strong Saber Styles" c_att_ranks_3 0,0,0 - c_att_descs_3 "Red, Purple, both -69/60% less DMG, 38/20% less Saber special DMG" + c_att_descs_3 "Red, Purple, both" } -description "Sith Duelist [Sith] +description "Sith Duelist -A master Saberist with unmatched dueling skills. Regains BP upon defeating enemies. +A master Saberist with unmatched dueling skills. ^2Weaponry: - Melee +-- 10% faster RoF - Lightsaber (Yellow) -- Saber Defense (3) --- BP Regen: 4/.25s -- Blaster Defense (2) -- Blaster Deflect (3) --- 33% less Yellow DMG --- 200% special DMG mult +-- 250% Spec Dmg mult -- Saber Throw ^3[CS1] ---- 66% more DMG --- Slap ^3[GB] +--- 66% more Dmg ^5Force Powers: - Jump (2) diff --git a/z_MBLegends/ext_data/mb2/character/v9_SJugger.mbch b/z_MBLegends/ext_data/mb2/character/v9_SJugger.mbch index 2e6bb88c0..99933208a 100644 --- a/z_MBLegends/ext_data/mb2/character/v9_SJugger.mbch +++ b/z_MBLegends/ext_data/mb2/character/v9_SJugger.mbch @@ -15,14 +15,14 @@ ClassInfo APmultiplier 1.15 BPmultiplier 1.35 saberThrowDamage 40 - + saberSpecialDamage 1.25 forcepowers FP_SABER_OFFENSE,3|FP_LEVITATION,3|FP_LIGHTNING,2|FP_PUSH,2|FP_PULL,2|FP_SABERTHROW,2|FP_SEE,1 maxhealth 145 - maxarmor 80 + maxarmor 60 forcepool 130 - forceregen 1.07 - + forceregen 1.05 + rateOfFire_Melee .9 damageGiven 1.12 speed 0.95 @@ -57,42 +57,42 @@ ClassInfo skin "default" uishader "models/players/desann/mb2_icon_default" - model_1 "darthbane" + model_1 "Darthbane" skin_1 "default" uishader_1 "models/players/darthbane/mb2_icon_default" - model_2 "darthbane" + model_2 "Darthbane" skin_2 "cape" uishader_2 "models/players/darthbane/mb2_icon_cape" - model_3 "darthmalgus" + model_3 "Darthmalgus" skin_3 "default" uishader_3 "models/players/darthmalgus/mb2_icon_default" - model_4 "darthmalgus" + model_4 "Darthmalgus" skin_4 "hood" uishader_4 "models/players/darthmalgus/mb2_icon_hood" - model_5 "darthwyyrlok" + model_5 "Darthwyyrlok" skin_5 "default" uishader_5 "models/players/darthwyyrlok/mb2_icon_default" } -description "Sith Juggernaut [Sith] +description "Sith Juggernaut -A massive, tanky Sith with high-powered and long-reaching Lightsaber attacks. Resists Force Push/Pull and cannot be knocked back by blaster fire. +A massive, tanky Sith with high-powered and long-reaching Lightsaber attacks. ^2Weaponry: - Melee +-- 10% faster RoF - Lightsaber (Red/Purple) -- Saber/Blaster Defense (2) -- Blaster Deflect (2) --- 46/30% less Red/Purple DMG --- 25% more reach --- 33% more radius +-- 125% Spec Dmg mult +-- 25% more Reach +-- 33% more Radius -- EX Saber Throw (2) ^3[CS1] ---- 33% more DMG --- Slap ^3[GB] +--- 33% more Dmg ^5Force Powers: - Jump (3) diff --git a/z_MBLegends/ext_data/mb2/character/v9_SWarr.mbch b/z_MBLegends/ext_data/mb2/character/v9_SWarr.mbch index fc17e6b4a..fd27332a4 100644 --- a/z_MBLegends/ext_data/mb2/character/v9_SWarr.mbch +++ b/z_MBLegends/ext_data/mb2/character/v9_SWarr.mbch @@ -13,12 +13,11 @@ ClassInfo speed 1.03 damageGiven 1.10 - + rateOfFire_Melee .9 maxhealth 135 forcepool 120 resource RESOURCE_FORCE forceregen 1.1 - saberThrowDamage 45 saberstyle SS_MEDIUM|SS_STRONG|SS_DESANN saberDamageStyle SS_STRONG,280|SS_DESANN,280|SS_MEDIUM,240 @@ -26,7 +25,7 @@ ClassInfo BPmultiplier 1.15 ASmultiplier 1.1 CSmultiplier 1.15 - + saberSpecialDamage 1.35 classflags CFL_NOPICKUPS special2 EAS_NONE @@ -40,44 +39,49 @@ ClassInfo uioverlay "gfx/icons/frontline" modelscale 1.01 - model "revan" - skin "default" - uishader "models/players/revan/mb2_icon_default" + model "revan" + skin "default" + uishader "models/players/revan/mb2_icon_default" model_1 "freedon_nadd" - skin_1 "default" + skin_1 "default" uishader_1 "models/players/freedon_nadd/mb2_icon_default" - model_2 "darthcaedus" - skin_2 "default" - uishader_2 "models/players/darthcaedus/mb2_icon_default" + model_2 "anakin2" + skin_2 "srobehup" + uishader_2 "models/players/anakin2/mb2_icon_srobehup" + + model_3 "Darthcaedus" + skin_3 "default" + uishader_3 "models/players/darthcaedus/mb2_icon_default" - saber1 saber_revan + saber1 saber_revan sabercolor 0 - saber1_1 saber_revan2 - sabercolor_1 5 + saber1_1 saber_kshrt + sabercolor_1 0 - saber1_2 saber_kshrt - sabercolor_2 0 + saber1_2 Vader_legends1 + sabercolor_2 0 - saber1_3 saber_jacen - sabercolor_3 0 + saber1_3 saber_jacen + sabercolor_3 0 } -description "Sith Warrior [Sith] +description "Sith Warrior -A master of combat - possessing equally strong Lightsaber and Force abilities. Regains BP upon defeating enemies. +A master of combat - possessing equally strong Lightsaber and Force abilities. ^2Weaponry: - Melee +-- 10% faster RoF - Lightsaber (Yellow/Red/Purple) -- Saber Defense (3) -- Blaster Defense/Deflect (2) --- 46/30% less Red/Purple DMG +-- 46/30% less Red/Purple Dmg +-- 135% Spec Dmg mult -- EX Saber Throw (1) ^3[CS1] ---- 50% more DMG --- Slap ^3[GB] +--- 50% more Dmg ^5Force Powers: - Jump (3) diff --git a/z_MBLegends/ext_data/mb2/character/v9_Savage.mbch b/z_MBLegends/ext_data/mb2/character/v9_Savage.mbch index 846249b18..703cd2d21 100644 --- a/z_MBLegends/ext_data/mb2/character/v9_Savage.mbch +++ b/z_MBLegends/ext_data/mb2/character/v9_Savage.mbch @@ -23,7 +23,7 @@ ClassInfo saberThrowDamage 70 saberDamageStyle SS_STAFF,280|SS_STRONG,320 rankDmgGiven 1.5 - + saberSpecialDamage 1.25 forceregen 0.90 resource RESOURCE_FORCE @@ -99,10 +99,10 @@ ClassInfo c_att_skill_4 MB_ATT_SS_REDSTYLE c_att_names_4 "Red Saber Style" c_att_ranks_4 6 - c_att_descs_4 "38% less DMG" + c_att_descs_4 "38% less Dmg" c_att_skill_5 MB_ATT_DMG_GIVEN_MULTIPLIER - c_att_names_5 "DMG Given (150%)" + c_att_names_5 "Dmg Given (150%)" c_att_ranks_5 2 c_att_descs_5 "Does not affect Saber" @@ -115,11 +115,11 @@ ClassInfo c_att_ranks_7 1,2,3 c_att_skill_8 MB_ATT_POWER - c_att_names_8 "Force Pool (110/130/150)" + c_att_names_8 "FP (110/130/150)" c_att_ranks_8 2,4,4 c_att_skill_9 MB_ATT_HEALTH - c_att_names_9 "Health (200/250/300)" + c_att_names_9 "HP (200/250/300)" c_att_ranks_9 3,3,3 c_att_skill_10 MB_ATT_BLAST_ARMOUR @@ -127,11 +127,11 @@ ClassInfo c_att_ranks_10 3 c_att_skill_11 MB_ATT_KB_TAKEN_MULTIPLIER - c_att_names_11 "KB Taken (10%)" + c_att_names_11 "Kb Taken (10%)" c_att_ranks_11 2 } -description "Savage Opress [Sith] +description "Savage Opress A large melee bruiser that wields a high-powered, long-reaching staff Lightsaber. @@ -140,21 +140,20 @@ A large melee bruiser that wields a high-powered, long-reaching staff Lightsaber - Lightsaber (Staff) -- Blaster Deflect (2) -- Chain Limit: 5 --- 43% more reach --- 7% more DMG --- 115% more KB +-- 43% more Reach +-- 125% Spec Dmg mult +-- 115% more Kb -- EX Saber Throw (2) ^3[CS1] ---- 133% more DMG --- Slap ^3[GB] +--- 133% more Dmg ^5Force Powers: - Jump (2) - Push (1) -- Dark Rage (3) ^3[CS4] - Repulse ^3[CS1 Melee] +- Dark Rage (3) ^3[CS4] ^8Attributes: -- 25% slower skill CD +- 25% slower Skill Cd - Getup (3) - Strength (2) - Physical Resist diff --git a/z_MBLegends/ext_data/mb2/character/v9_ShadowG.mbch b/z_MBLegends/ext_data/mb2/character/v9_ShadowG.mbch index 70eb9f31c..7690e10c1 100644 --- a/z_MBLegends/ext_data/mb2/character/v9_ShadowG.mbch +++ b/z_MBLegends/ext_data/mb2/character/v9_ShadowG.mbch @@ -14,16 +14,17 @@ ClassInfo resource RESOURCE_FORCE forcepool 100 forceregen 1.02 - + rateOfFire_Melee .9 + damageGiven 1.1 maxhealth 100 maxarmor 25 rankArmor 80 speed 1.02 -classFlags CFL_NOPICKUPS + classFlags CFL_NOPICKUPS meleespecial1 EAS_FP_REPULSE special2 EAS_FP_SPEED - + saberSpecialDamage 1.25 saberdamage 240 saberstyle SS_DESANN saber1 lightsaber_pike_legends @@ -43,11 +44,11 @@ classFlags CFL_NOPICKUPS saberstanceAnim BOTH_SPEAR_STANCE isCustomBuild 1 - mbPoints 4 + mbPoints 7 c_att_skill_0 MB_ATT_RESPAWNS c_att_names_0 "Reinforcement" - c_att_ranks_0 1 + c_att_ranks_0 3 c_att_skill_1 MB_ATT_FP_SABER_DEFENSE c_att_names_1 "Saber Defense" @@ -60,7 +61,7 @@ classFlags CFL_NOPICKUPS c_att_skill_3 MB_ATT_PISTOL c_att_names_3 "Heavy Guardsmen Pistol" c_att_ranks_3 1 - c_att_descs_3 "25% more DMG, 25% slower RoF" + c_att_descs_3 "25% more Dmg, 25% slower RoF" c_att_skill_4 MB_ATT_FP_PUSH c_att_names_4 "Force Push" @@ -76,7 +77,7 @@ classFlags CFL_NOPICKUPS c_att_skill_7 MB_ATT_ARMOUR c_att_names_7 "Armor (80)" - c_att_ranks_7 1 + c_att_ranks_7 2 c_att_descs_7 "25 default" } @@ -106,24 +107,24 @@ WeaponInfo1 hasAnimOverrides 1 animStand BOTH_STAND5 } -description "Emperor's Shadow Guard [Sith] +description "Emperor's Shadow Guard Force users with high flexibility. ^2Weaponry: - Melee +-- 10% faster Rof - Lightsaber Pike (Purple) -- Saber/Blaster Defense (1) -- Blaster Deflect (1) --- 40% less DMG --- 10% less reach --- Slap ^3[GB] +-- 125% Spec Dmg mult +-- 10% less Reach ^5Force Powers: - Jump (3) - Push (1) -- Speed (3) ^3[CS2] - Repulse ^3[CS1 Melee] +- Speed (3) ^3[CS2] ^8Attributes: - Healing (1) diff --git a/z_MBLegends/ext_data/mb2/character/v9_Sion.mbch b/z_MBLegends/ext_data/mb2/character/v9_Sion.mbch index 97250a905..fe0e894e8 100644 --- a/z_MBLegends/ext_data/mb2/character/v9_Sion.mbch +++ b/z_MBLegends/ext_data/mb2/character/v9_Sion.mbch @@ -10,26 +10,35 @@ ClassInfo WP_SaberFlags HELD_HEAL - attributes MB_ATT_FORCEFOCUS,2|MB_ATT_DEFLECT,3|MB_ATT_FORCEBLOCK,3|MB_ATT_BLAST_ARMOUR,1|MB_ATT_GUN_DEFENSE,2|MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_WOOKIEE_FURY,3 + attributes MB_ATT_DEFLECT,1|MB_ATT_FORCEBLOCK,3|MB_ATT_BLAST_ARMOUR,1|MB_ATT_GUN_DEFENSE,2|MB_ATT_FP_SABER_DEFENSE,2|MB_ATT_WOOKIEE_FURY,3|MB_ATT_WOOKIE_STRENGTH,1|MB_ATT_ENV_PROT,3 - forcepowers FP_LEVITATION,3|FP_PUSH,2|FP_SABER_OFFENSE,1|FP_DRAIN,2|FP_GRIP,1|FP_SABERTHROW,1|FP_RAGE,2 + forcepowers FP_LEVITATION,3|FP_PUSH,1|FP_SABER_OFFENSE,1|FP_DRAIN,2|FP_GRIP,1|FP_SABERTHROW,1|FP_RAGE,3 maxhealth 135 - forcepool 125 - forceRegen 0.5 + maxarmor 15 + forcepool 120 + + knockbackTaken 0.85 + + powerups PW_POISON resource RESOURCE_RAGE resourceRegenAmount 1 resourceRegenRate 150 - resourceRegenCap 125 - - BPmultiplier 1.15 - APmultiplier 1.15 + resourceRegenCap 120 + + //healthRegenCap 10 + //healthRegenAmount 10 + //healthRegenRate 1 +rateOfFire_Melee .9 + BPmultiplier 1.1 + APmultiplier 1.2 CSmultiplier 1.05 ASmultiplier 1.05 + saberSpecialDamage 1.25 saberThrowDamage 40 saberDamageStyle SS_FAST,130|SS_MEDIUM,240 - saber1 saber_sion + saber1 saber_sion_l sabercolor 0 saberstyle SS_MEDIUM|SS_FAST @@ -37,9 +46,9 @@ ClassInfo special3 EAS_FP_GRIP special4 EAS_FP_RAGE - classflags CFL_NOPICKUPS + classflags CFL_NOPICKUPS|CFL_BLOODYMELEE - baseSpeed 233 + baseSpeed 231 damageGiven 1.10 flourishAnim BOTH_STAND_INJURED_IDLE @@ -48,39 +57,41 @@ ClassInfo bowAnim BOTH_INJURED_TO_COLLAPSED modelscale 1.03 - model "darthsion" + model "Darthsion" skin "default" uishader "models/players/darthsion/mb2_icon_default" uioverlay "gfx/icons/frontline" } -description "Darth Sion [Sith] +description "Darth Sion -A Sith that can drain resource pools from others to heal himself, and possesses high Lightsaber and Force defenses. +A Sith consumed with Rage. Difficult to kill. ^2Weaponry: - Melee +-- 10% faster RoF - Lightsaber (Yellow/Blue) --- Saber Defense (3) +-- Saber Defense (2) -- Blaster Defense (2) --- Blaster Deflect (3) +-- Blaster Deflect (1) -- Self-heals on equip --- 8% more Blue DMG +-- 8% more Blue Dmg +-- 125% Spec Dmg mult -- EX Saber Throw (1) ^3[CS1] ---- 33% more DMG --- Slap ^3[GB] +--- 33% more Dmg ^5Force Powers: - Jump (3) -- Push (2) +- Push (1) - Drain (2) ^3[CS2] - Grip (1) ^3[CS3] -- Dark Rage (2) ^3[CS4] +- Dark Rage (3) ^3[CS4] ^8Attributes: -- Blast Armor -- Force Block (3) -- Force Focus (2) +- 15% less Kb Taken - Fury (3) -- Resource Regen: 1/.15s --- 50% slower Resource Decay" \ No newline at end of file +- Strength (1) +- Environmental Protection (3) +- Blast Armor +- Force Block (3)" \ No newline at end of file diff --git a/z_MBLegends/ext_data/mb2/character/v9_Vader.mbch b/z_MBLegends/ext_data/mb2/character/v9_Vader.mbch index 106e5434b..7c0a09d6e 100644 --- a/z_MBLegends/ext_data/mb2/character/v9_Vader.mbch +++ b/z_MBLegends/ext_data/mb2/character/v9_Vader.mbch @@ -8,7 +8,7 @@ ClassInfo weapons WP_SABER|WP_MELEE|WP_SBD - attributes MB_ATT_GUN_DEFENSE,3|MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_DEFLECT,3|MB_ATT_FORCEBLOCK,2|MB_ATT_MAGNETIC_PLATING,1|MB_ATT_HEALING,1|MB_ATT_FORCEFOCUS,3|MB_ATT_CORTOSIS,1|MB_ATT_BLAST_ARMOUR|MB_ATT_WOOKIE_STRENGTH,1|MB_ATT_FLOAT_HOP,1|MB_ATT_GETUPS,3|MB_ATT_BESKAR,2 + attributes MB_ATT_GUN_DEFENSE,3|MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_DEFLECT,3|MB_ATT_FORCEBLOCK,2|MB_ATT_MAGNETIC_PLATING,1|MB_ATT_HEALING,1|MB_ATT_FORCEFOCUS,3|MB_ATT_CORTOSIS,1|MB_ATT_BLAST_ARMOUR|MB_ATT_WOOKIE_STRENGTH,1|MB_ATT_FLOAT_HOP,1|MB_ATT_GETUPS,3|MB_ATT_BESKAR,2|MB_ATT_ENV_PROT,3 forcepowers FP_SABER_OFFENSE,3|FP_PUSH,3|FP_PULL,2|FP_GRIP,3|FP_SEE,2|FP_SABERTHROW,3 @@ -57,23 +57,23 @@ ClassInfo uioverlay "gfx/icons/frontline" modelscale 1.09 - model "darthvader" + model "Darthvader" skin "legends" uishader "models/players/darthvader/mb2_icon_default" - model_1 "darthvader" + model_1 "Darthvader" skin_1 "breather" uishader_1 "models/players/darthvader/mb2_icon_breather" - model_2 "darthvader" + model_2 "Darthvader" skin_2 "tv" uishader_2 "models/players/darthvader/mb2_icon_tv" - model_3 "darthvader" + model_3 "Darthvader" skin_3 "damaged" uishader_3 "models/players/darthvader/mb2_icon_damaged" - //model_4 "darthvader" + //model_4 "Darthvader" //skin_4 "infinities" //uishader_4 "models/players/darthvader/mb2_icon_infinities" } @@ -103,9 +103,9 @@ WeaponInfo0 animReadyNoAmmo BOTH_STAND10 animStand BOTH_STAND5 } -description "Darth Vader [Sith] +description "Darth Vader -A tanky saberist with strong defense and offense, at the cost of mobility. Regains BP upon defeating enemies. +A tanky saberist with strong defense and offense, at the cost of mobility. ^2Weaponry: - Melee @@ -114,25 +114,24 @@ A tanky saberist with strong defense and offense, at the cost of mobility. Regai -- Saber/Blaster Defense (3) -- Blaster Deflect (3) -- Chain Limit: 4 --- 10% more reach --- 30/46% less Purple/Red DMG --- 125% special DMG mult +-- 10% more Reach +-- 125% Spec Dmg mult -- EX Saber Throw (3) ^3[CS1] ---- 50% more DMG --- Slap ^3[GB] +--- 50% more Dmg ^5Force Powers: - Push (3) - Pull (2) - Sense (2) - Vader's Grip (3) ^3[CS3] --- 12% more DMG +-- 12% more Dmg ^8Attributes: -- 95% less KB taken +- 95% less Kb Taken - Getup (3) - Slow Faller - Strength (1) +- Environmental Protection (3) - Beskar (2) - Blast Armor - Magnetic Plating diff --git a/z_MBLegends/ext_data/mb2/character/v9_Ventres.mbch b/z_MBLegends/ext_data/mb2/character/v9_Ventres.mbch index f967526eb..d92299571 100644 --- a/z_MBLegends/ext_data/mb2/character/v9_Ventres.mbch +++ b/z_MBLegends/ext_data/mb2/character/v9_Ventres.mbch @@ -10,10 +10,10 @@ ClassInfo forcepowers FP_PUSH,2|FP_LEVITATION,3|FP_SEE,2|FP_SPEED,3|FP_PULL,2|FP_SABERTHROW,3|FP_GRIP,2|FP_SABER_OFFENSE,2|FP_TELEPATHY,1 - maxhealth 120 + maxhealth 125 forcepool 120 forceregen 1.04 - resource resource_force + resource RESOURCE_FORCE saber1 saber_asajj_legacy sabercolor 0 @@ -34,14 +34,14 @@ ClassInfo saberstyle_3 SS_DUAL saber2_3 starblades_legl saber2color_3 0 - + saberSpecialDamage 1.25 BPmultiplier 1.1 APmultiplier 1 ASmultiplier 1.10 CSmultiplier 1.15 saberThrowDamage 90 - saberDamageStyle SS_FAST,130 - + saberDamageStyle SS_FAST,130 + damagegiven 1.1 basespeed 247 rateOfFire_Melee 0.88 @@ -65,7 +65,7 @@ ClassInfo uishader_1 "models/players/asajj_cw/mb2_icon_default" } -description "Asajj Ventress [Sith] +description "Asajj Ventress A fast Sith who can wield unique Starblades designed for massive throw damage, as well as Dual or Staff sabers. @@ -75,17 +75,17 @@ A fast Sith who can wield unique Starblades designed for massive throw damage, a - Asajj's Lightsabers -- Saber/Blaster Defense (2) -- Blaster Deflect (1) --- Slap ^3[GB] +-- 125% Spec Dmg mult > Double (Dual/Blue) --- 8% less/more DMG +-- 8% less/more Dmg > Staff (Staff/Blue) --- 8% less/more DMG +-- 8% less/more Dmg > Starblades (Dual) --- 25% less reach +-- 25% less Reach -- 10% less AS --- 55% less DMG +-- 55% less Dmg -- EX Saber Throw (3) ^3[CS1] ---- 200% more DMG +--- 200% more Dmg ^5Force Powers: - Jump (3) diff --git a/z_MBLegends/ext_data/npcs/yarael_poof.npc b/z_MBLegends/ext_data/npcs/yarael_poof.npc index e6fee8f3a..078b9c144 100644 --- a/z_MBLegends/ext_data/npcs/yarael_poof.npc +++ b/z_MBLegends/ext_data/npcs/yarael_poof.npc @@ -49,7 +49,7 @@ yarael_poof yawSpeed 120 walkSpeed 45 runSpeed 229.5 - health 225 + health 230 dismemberProbHead 20 dismemberProbArms 20 dismemberProbLegs 20 diff --git a/z_MBLegends/ext_data/sabers/saber_legends_other.sab b/z_MBLegends/ext_data/sabers/saber_legends_other.sab index 581f2dc97..d090debc6 100644 --- a/z_MBLegends/ext_data/sabers/saber_legends_other.sab +++ b/z_MBLegends/ext_data/sabers/saber_legends_other.sab @@ -577,6 +577,7 @@ bardiche_jabba_legends bounceOnWalls 1 idleInBack 1 damageScale 0.8 + knockbackScale 1 splashRadius 130 splashDamage 25 splashKnockback 100 diff --git a/z_MBLegends/ext_data/sabers/saber_legends_other5.sab b/z_MBLegends/ext_data/sabers/saber_legends_other5.sab index 3dd231a52..006cc9193 100644 --- a/z_MBLegends/ext_data/sabers/saber_legends_other5.sab +++ b/z_MBLegends/ext_data/sabers/saber_legends_other5.sab @@ -1032,7 +1032,7 @@ ispdvbd saberRadius2 3 saberStyle staff singleBladeStyle dual - blasterBlocking 0 + blasterBlocking 1 twoHanded 1 throwable 0 singleBladeThrowable 0 @@ -1085,7 +1085,7 @@ ispdvba saberRadius2 3 saberStyle staff singleBladeStyle dual - blasterBlocking 0 + blasterBlocking 1 twoHanded 1 throwable 0 singleBladeThrowable 0 diff --git a/z_MBLegends/ext_data/sabers/saber_legends_other6.sab b/z_MBLegends/ext_data/sabers/saber_legends_other6.sab index 2a29bde3a..8d4e6348f 100644 --- a/z_MBLegends/ext_data/sabers/saber_legends_other6.sab +++ b/z_MBLegends/ext_data/sabers/saber_legends_other6.sab @@ -747,7 +747,7 @@ jarjar_leg noClashFlare 1 trailStyle 1 noIdleEffect 1 - knockbackScale 1.6 + knockbackScale 3 noManualDeactivate 1 noDismemberment 0 blockEffect "melee_weap/block" diff --git a/z_MBLegends/ext_data/sabers/saber_legends_other7.sab b/z_MBLegends/ext_data/sabers/saber_legends_other7.sab index 740916d0f..f226255c7 100644 --- a/z_MBLegends/ext_data/sabers/saber_legends_other7.sab +++ b/z_MBLegends/ext_data/sabers/saber_legends_other7.sab @@ -294,4 +294,19 @@ cc_legj jumpAtkRightMove LS_NONE useGoreConfig 1 disarmable 0 +} + +saber_sion_l +{ + name "Darth Sion (KOTOR II)" + saberType SABER_SINGLE + saberModel "models/weapons2/saber_plasma/saber_sion.glm" + soundOn "sound/weapons/saber_plasma/rd_saberon.wav" + soundOff "sound/weapons/saber_plasma/rd_saberoff.wav" + soundLoop "sound/weapons/saber/saberhum3.wav" + saberLength 40 + saberColor red +lungeAtkMove LS_PURPLE_DFA +jumpAtkRightMove LS_A_FLIP_SLASH +jumpAtkLeftMove LS_CYAN_DFA } \ No newline at end of file