From 8e6451149f84a8f65d68046fa977344df4506624 Mon Sep 17 00:00:00 2001
From: shrine-engie <sweatbeetledickweed@gmail.com>
Date: Fri, 13 Feb 2026 12:44:30 -0500
Subject: [PATCH 01/82] desc

---
 z_MBLegends/ext_data/mb2/character/h4_Atton.mbch  | 4 ++--
 z_MBLegends/ext_data/mb2/character/v4_MagnaG.mbch | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/h4_Atton.mbch b/z_MBLegends/ext_data/mb2/character/h4_Atton.mbch
index aa1d1b8b2..e5e0abbae 100644
--- a/z_MBLegends/ext_data/mb2/character/h4_Atton.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h4_Atton.mbch
@@ -61,7 +61,7 @@ customSpecIcon_3 "gfx/menus/alpha/icon_weap_stun"
 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,
+c_att_descs_0 "Shocks on hit, 50% more charged FP Dmg, 50% less Dmg,
 20% slower RoF, 60% slower Mag Reload, Sec only"
 c_att_skill_1	MB_ATT_MANDO_PISTOL
 c_att_names_1	"Disintegrators (WESTARs)"
@@ -73,7 +73,7 @@ c_att_ranks_2	1,1
 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,
+c_att_descs_3 "Ignites/poisons/pushes on hit, 20% more Dmg, 40% more FP Dmg,
 80% slower RoF, 70% slower Mag Reload"
 c_att_skill_4	MB_ATT_FP_RAGE
 c_att_names_4	"Rapid Shot (Dark Rage)"
diff --git a/z_MBLegends/ext_data/mb2/character/v4_MagnaG.mbch b/z_MBLegends/ext_data/mb2/character/v4_MagnaG.mbch
index 1069fff93..50efd9a00 100644
--- a/z_MBLegends/ext_data/mb2/character/v4_MagnaG.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v4_MagnaG.mbch
@@ -76,12 +76,12 @@ ClassInfo
 	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_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"
+ c_att_descs_1 "50% less Dmg"
 }
 
 WeaponInfo0

From b4458b7dd07abbdcaff933b44d48089374cdd1f4 Mon Sep 17 00:00:00 2001
From: shrine-engie <sweatbeetledickweed@gmail.com>
Date: Fri, 13 Feb 2026 12:44:36 -0500
Subject: [PATCH 02/82] Update v10_Malak.mbch

Armor fix
---
 z_MBLegends/ext_data/mb2/character/v10_Malak.mbch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v10_Malak.mbch b/z_MBLegends/ext_data/mb2/character/v10_Malak.mbch
index bf1b84337..3efbedf31 100644
--- a/z_MBLegends/ext_data/mb2/character/v10_Malak.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v10_Malak.mbch
@@ -13,7 +13,7 @@ ClassInfo
 	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		100
- maxarmour  45
+ maxarmor  45
 
 	resource RESOURCE_FORCE
 	forcepool			125

From 67ad2c4f53103f52905c1f141523337a8046c742 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Sat, 14 Feb 2026 11:08:05 +0100
Subject: [PATCH 03/82] v6_ScoutTr description

---
 z_MBLegends/ext_data/mb2/character/v6_ScoutTr.mbch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v6_ScoutTr.mbch b/z_MBLegends/ext_data/mb2/character/v6_ScoutTr.mbch
index 6f007bb1c..adef2bc61 100644
--- a/z_MBLegends/ext_data/mb2/character/v6_ScoutTr.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v6_ScoutTr.mbch
@@ -129,7 +129,7 @@ ClassInfo
 	c_att_ranks_9	0,0,2
 
 	c_att_skill_10	MB_ATT_DEXTERITY
-	c_att_names_10	"Dexterity ^3[CS3]"
+	c_att_names_10	"Dexterity ^3[CS2]"
 	c_att_ranks_10	0,0,1
 	
 	c_att_skill_11	MB_ATT_DASH

From 02f3c25df0e784ffdf18e21272513904e8b3b95c Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Sat, 14 Feb 2026 11:09:49 +0100
Subject: [PATCH 04/82] v3_IG88 nerf

Actually removed cortosis and mag plating. Given more battery with special regen, but 30% more damageTaken so you should try to keep the battery high.

If he turns out too weak now (probably will be), then increase his battery, reduce damageTaken by 10% or increase health a little.
---
 .../ext_data/mb2/character/v3_IG88.mbch        | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v3_IG88.mbch b/z_MBLegends/ext_data/mb2/character/v3_IG88.mbch
index c77b34308..c202f64a0 100644
--- a/z_MBLegends/ext_data/mb2/character/v3_IG88.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v3_IG88.mbch
@@ -10,7 +10,7 @@ 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|MB_ATT_THROWER_POISON
+	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_THROWER_POISON
 
 	special1 EAS_NONE
 	special2	EAS_HI_POISONTHROWER
@@ -23,9 +23,16 @@ ClassInfo
 
 	classflags			CFL_SEEING_STEALTH|CFL_AKIMBOPISTOL3|CFL_STRONGAGAINSTPHYSICAL
 
-	forcepool		40
+	forcepool		80
 	forcepowers FP_SEE,1
  resource RESOURCE_BATTERY
+ 
+ forceregen 0.01
+ 	resourceRegenRate 10000
+    resourceRegenCap 80
+    resourceRegenAmount 10
+	
+	DamageTaken 1.3
 
 	saber1 				droidmelee_legends
 	saberstyle			SS_STRONG
@@ -50,15 +57,14 @@ ClassInfo
 	model	"IG88"
 	skin		"default"
 	uishader	"models/players/IG88/mb2_icon_default"
-		
+
 	model_1	"IG88"
 	skin_1		"ig88b"
 	uishader_1	"models/players/IG88/mb2_icon_ig88b"
-		
+
 	model_2	"IG88"
 	skin_2		"ig88c"
 	uishader_2	"models/players/IG88/mb2_icon_ig88c"
-	
 }
 
 WeaponInfo0
@@ -166,6 +172,8 @@ A sturdy and heavily armored gunner.
 ^8Attributes:
 - 25% faster Hacking
 - 20% less Kb Taken
+- Recharge (3)
+-- Resource Regen: 10/10s
 - Strength (2)
 - Beskar (3)
 - Blast Armor

From a3afea7ddc258d1af39c51112b2e19fee1bc89df Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Sat, 14 Feb 2026 11:13:17 +0100
Subject: [PATCH 05/82] v7_ImpAgent dual knives

Duals for imp spies because knives are funny so 2 knives are double funny. Still has access to cyan stance anyway.
Also 1 point of the pistol.
---
 z_MBLegends/ext_data/mb2/character/v7_ImpAgent.mbch | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v7_ImpAgent.mbch b/z_MBLegends/ext_data/mb2/character/v7_ImpAgent.mbch
index abb9fb00f..eb3db53f1 100644
--- a/z_MBLegends/ext_data/mb2/character/v7_ImpAgent.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v7_ImpAgent.mbch
@@ -24,8 +24,10 @@ ClassInfo
 
 	BPmultiplier    0
 	saber1			Legends_Knife_Spy
+	saber2	Legends_Knife_Spy
+	
 	forcepowers     FP_SABER_OFFENSE,3
-	saberstyle		SS_TAVION|SS_FAST
+	saberstyle		SS_TAVION|SS_DUAL
 	saberDamage 	100
 
 	//WP_BlasterPistolFlags	HELD_POISON
@@ -80,7 +82,7 @@ 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_ranks_0	1,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"
 
@@ -192,7 +194,7 @@ WeaponInfo2
 	NewWorldModel	"models/weapons2/vibroknife/model.glm"
 	NewViewModel	"models/weapons2/dummy/dummy.md3"
 	Icon	"gfx/hud/w_icon_prisonknife"
-	WeaponName	"Jagged Vibroknife"
+	WeaponName	"Dual Vibroknifes"
 }
 
 ForceInfo0
@@ -210,7 +212,7 @@ Mid-ranged elite soldiers who can Disguise themselves and Cloak.
 
 ^2Weaponry:
 - Heavy Melee
-- Jagged Vibroknife (Cyan/Blue Saber)
+- Dual Vibroknifes (Cyan/Dual Sabers)
 -- No Saber/Blaster Block
 -- 60% less Reach
 

From 2ce303882a848a93c682b7e1b198738ef7d8a426 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Sat, 14 Feb 2026 11:21:43 +0100
Subject: [PATCH 06/82] ImpAgent to Kubaz

Since they are split now, imp agent will just be the kubaz. Saboteur and trooper skins are a new class.
---
 .../{v7_ImpAgent.mbch => v7_Kubaz.mbch}        | 18 +++---------------
 .../ext_data/mb2/teamconfig/LEG_Evil.mbtc      |  2 +-
 2 files changed, 4 insertions(+), 16 deletions(-)
 rename z_MBLegends/ext_data/mb2/character/{v7_ImpAgent.mbch => v7_Kubaz.mbch} (92%)

diff --git a/z_MBLegends/ext_data/mb2/character/v7_ImpAgent.mbch b/z_MBLegends/ext_data/mb2/character/v7_Kubaz.mbch
similarity index 92%
rename from z_MBLegends/ext_data/mb2/character/v7_ImpAgent.mbch
rename to z_MBLegends/ext_data/mb2/character/v7_Kubaz.mbch
index eb3db53f1..a87e1c7e6 100644
--- a/z_MBLegends/ext_data/mb2/character/v7_ImpAgent.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v7_Kubaz.mbch
@@ -1,7 +1,7 @@
 //Legends Mode character file - Created by Frenzy & Leos
 ClassInfo
 {
-	name			"v7_ImpAgent"
+	name			"v7_Kubaz"
 	MBClass			MB_CLASS_BOUNTY_HUNTER
 	classNumberLimit	2
 	extralives			1
@@ -65,18 +65,6 @@ model_2		"tie_pilot"
 skin_2		"kubazb"
 uishader_2	"models/players/tie_pilot/mb2_icon_kubazb"
 
-model_3		"stormie"
-skin_3		"shadow"
-uishader_3	"models/players/stormie/mb2_icon_shadow"
-
-model_4 	"stormie"
-skin_4 		"vader"
-uishader_4	"models/players/stormie/mb2_icon_vader"
-
-model_5		"saboteur" 				
-skin_5		"default"					
-uishader_5	"models/players/saboteur/mb2_icon_default"
-
 	isCustomBuild	1
 	mbPoints	50
 
@@ -206,9 +194,9 @@ ForceInfo0
 	LoopSound "sound/ambience/cp_02_lp.wav"
 }
 
-description	"Imperial Agent
+description	"Kubaz Spy
 
-Mid-ranged elite soldiers who can Disguise themselves and Cloak.
+Versatile assassins who can Disguise themselves and Cloak.
 
 ^2Weaponry:
 - Heavy Melee
diff --git a/z_MBLegends/ext_data/mb2/teamconfig/LEG_Evil.mbtc b/z_MBLegends/ext_data/mb2/teamconfig/LEG_Evil.mbtc
index 5479858cc..ad32a59da 100644
--- a/z_MBLegends/ext_data/mb2/teamconfig/LEG_Evil.mbtc
+++ b/z_MBLegends/ext_data/mb2/teamconfig/LEG_Evil.mbtc
@@ -62,7 +62,7 @@ SubclassesForClass3
 	Subclass3	"v6_Zam"
 	Subclass4	"v6_Dengar"
 	Subclass5	"v6_MercSh"
-	Subclass6	"v7_ImpAgent"
+	Subclass6	"v7_Kubaz"
 	Subclass7	"v7_ImpSpec"
 	Subclass8	"v7_Noghri"
 	Subclass9	"v7_WatTam"

From d5bb2a827a8168c7832b1094d131f945af83146e Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Sat, 14 Feb 2026 11:25:26 +0100
Subject: [PATCH 07/82] New class: Imp saboteur

Split from impAgent kind of. These are more troopers then actual spies.
Lots of base jka inspiration here. Can be played 2 or 3 lives.
Also slightly WIP, icon and name for the specs are not done.
---
 .../ext_data/mb2/character/v7_Saboteur.mbch   | 266 ++++++++++++++++++
 .../ext_data/mb2/teamconfig/LEG_Evil.mbtc     |  21 +-
 2 files changed, 277 insertions(+), 10 deletions(-)
 create mode 100644 z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch

diff --git a/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch b/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch
new file mode 100644
index 000000000..3a6e9cabe
--- /dev/null
+++ b/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch
@@ -0,0 +1,266 @@
+ClassInfo
+{
+	name			"v7_Saboteur"
+	MBClass			MB_CLASS_CLONETROOPER
+	classNumberLimit	2
+	extralives			1
+	weapons			WP_MELEE|WP_MANDO_PISTOL
+
+	attributes		MB_ATT_AMMO,3|MB_ATT_MANDO_PISTOL,2|MB_ATT_GETUPS,2|MB_ATT_STAMINA,1
+
+	maxhealth		80
+	RankHealth		100
+	MaxArmor		40
+	rankArmor		60,80,100
+	
+	rankDmgGiven 1.1
+	
+	basespeed 230
+
+	//ArmourRegenCap 25
+	ArmourRegenRate	1000
+
+	rankArmourRegenAmount 25
+
+	resource	RESOURCE_STAMINA
+	forcepool 60
+	forceregen		0.5
+	rankForcepool 80,100,120
+
+	holdables		HI_CLOAK
+	
+	WP_DEMP2Flags HELD_ALTRELOAD|HELD_PULSE
+
+	special1 EAS_HI_DODGE
+	special2 EAS_NONE
+	special3 EAS_HI_CLOAK
+	special4	EAS_HI_GRAPPLEHOOK
+
+	uioverlay_l "gfx/icons/tactician"
+	uioverlay_c "gfx/icons/spec_infantry"
+	uioverlay_r "gfx/icons/infantry"
+
+	gloatAnim TORSO_HANDSIGNAL4
+	flourishanim	BOTH_STAND5TOAIM
+
+model	"saboteur" 				
+skin	"default"					
+uishader	"models/players/saboteur/mb2_icon_default"
+
+model_1	"saboteur" 				
+skin_1	"plate"					
+uishader_1	"models/players/saboteur/mb2_icon_plate"
+
+model_2	"stormie"
+skin_2	"shadow"
+uishader_2	"models/players/stormie/mb2_icon_shadow"
+
+model_3	"stormie"
+skin_3	"vader"
+uishader_3	"models/players/stormie/mb2_icon_vader"
+
+	isCustomBuild	1
+	mbPoints	50
+	
+hasCustomSpec 2
+isOnlyOneSpec 1
+customSpecName_1 "name"
+customSpecIcon_1 "gfx/menus/alpha/icon_weap_accuracy"
+customSpecDesc_1 ""
+customSpecName_2 "Commando"
+customSpecIcon_2 "gfx/menus/alpha/icon_weap_poison"
+customSpecDesc_2 ""
+
+	c_att_skill_0	MB_ATT_BLASTER
+	c_att_names_0	"E-11 Blaster Rifle"
+	c_att_ranks_0	2,2,4
+	
+	c_att_skill_1	MB_ATT_DISRUPTOR
+	c_att_names_1	"Disruptor Rifle"
+	c_att_ranks_1	2,6
+
+	c_att_skill_2	MB_ATT_FLECHETTE
+	c_att_names_2	"FC-1 Flechette Launcher"
+	c_att_ranks_2	5
+	c_att_descs_2 	"10% more Dmg, 10% more FP Dmg, 21000% slower Reload"
+	
+	c_att_skill_3	MB_ATT_DEMP2
+	c_att_names_3	"DEMP2"
+	c_att_ranks_3	6
+	c_att_descs_3 	"Shocks on hit, 20% more Velocity, 20% less RoF,
+10% more Dmg, 20% more FP Dmg, 30% slower Mag Reload"
+
+	c_att_skill_4	MB_ATT_BASE_TD
+	c_att_names_4	"Thermal Grenades"
+	c_att_ranks_4	1,1
+
+	c_att_skill_5	MB_ATT_TRIP_MINES
+	c_att_names_5	"Trip Mines"
+	c_att_ranks_5	2,2
+
+	c_att_skill_6	MB_ATT_RESPAWNS
+	c_att_names_6	"Reinforcement"
+	c_att_ranks_6	25
+	c_att_descs_6 "1 default"
+	
+	c_att_skill_7	MB_ATT_ARMOUR
+	c_att_names_7	"Armor (60/80)"
+	c_att_ranks_7	4,4
+
+	c_att_skill_8	MB_ATT_ARMOUR_REGEN_AMOUNT
+	c_att_names_8	"> Armor Regen (1/1s to 25)"
+	c_att_ranks_8	4
+
+	c_att_skill_9	MB_ATT_POWER
+	c_att_names_9	"Stamina pool (80/100)"
+	c_att_ranks_9	2,2
+
+	c_att_skill_10 MB_ATT_DEXTERITY
+	c_att_names_10	"Dexterity"
+	c_att_ranks_10	1
+
+	c_att_skill_11	MB_ATT_GRAPPLE_HOOK
+	c_att_names_11	"Grappling Hook ^3[CS4 Melee]"
+	c_att_ranks_11	1
+
+	c_att_skill_12	MB_ATT_DODGE
+	c_att_names_12	"Dodge ^3[CS1]"
+	c_att_ranks_12	0,1
+	
+
+	c_att_skill_15	MB_ATT_MANDO_PISTOL
+	c_att_names_15	"Dual DL-44 Pistols"
+	c_att_ranks_15	0,0,6
+
+	c_att_skill_16	MB_ATT_BLASTER
+	c_att_names_16	"E-11 Blaster Rifle"
+	c_att_ranks_16	1,2,3
+	
+	c_att_skill_17	MB_ATT_DISRUPTOR
+	c_att_names_17	"Disruptor Rifle"
+	c_att_ranks_17	2,6
+
+	c_att_skill_18	MB_ATT_FLECHETTE
+	c_att_names_18	"FC-1 Flechette Launcher"
+	c_att_ranks_18	4,5
+	c_att_descs_18 	"10% more Dmg, 10% more FP Dmg, 21000% slower Reload"
+
+	c_att_skill_19	MB_ATT_DEMP2
+	c_att_names_19	"DEMP2"
+	c_att_ranks_19	5
+	c_att_descs_19 	"Shocks on hit, 20% more Velocity, 20% less RoF,
+10% more Dmg, 20% more FP Dmg, 30% slower Mag Reload"
+
+	c_att_skill_20	MB_ATT_BASE_TD
+	c_att_names_20	"Thermal Grenades"
+	c_att_ranks_20	1,1,1
+
+	c_att_skill_21	MB_ATT_TRIP_MINES
+	c_att_names_21	"Trip Mines"
+	c_att_ranks_21	2,2,2
+
+	c_att_skill_22	MB_ATT_DMG_GIVEN_MULTIPLIER
+	c_att_names_22	"Dmg Given (110%)"
+	c_att_ranks_22	4
+
+	c_att_skill_23	MB_ATT_HEALTH
+	c_att_names_23	"HP (100)"
+	c_att_ranks_23	2
+	
+	c_att_skill_24	MB_ATT_ARMOUR
+	c_att_names_24	"Armor (60/80/100)"
+	c_att_ranks_24	4,4,4
+
+	c_att_skill_25	MB_ATT_ARMOUR_REGEN_AMOUNT
+	c_att_names_25	"> Armor Regen (1/1s to 25)"
+	c_att_ranks_25	4
+
+	c_att_skill_26	MB_ATT_POWER
+	c_att_names_26	"Stamina Pool (80/100/120)"
+	c_att_ranks_26	2,2,2
+
+	c_att_skill_27	MB_ATT_DEXTERITY
+	c_att_names_27	"Dexterity"
+	c_att_ranks_27	1,1
+
+	c_att_skill_28	MB_ATT_GRAPPLE_HOOK
+	c_att_names_28	"Grappling Hook ^3[CS4 Melee]"
+	c_att_ranks_28	1,3
+
+	c_att_skill_29	MB_ATT_DODGE
+	c_att_names_29	"Dodge ^3[CS1]"
+	c_att_ranks_29	0,1,1
+}
+
+WeaponInfo0
+{
+	WeaponToReplace	WP_MANDO_PISTOL
+	WeaponBasedOff	WP_MANDO_PISTOL
+	NewWorldModel	"models/weapons2/blaster_three/blaster_pistol_w.glm"  	
+	NewViewModel	"models/weapons2/blaster_three/blaster_pistol.md3" 
+	Icon			"gfx/hud/w_icon_blaster_pistol_3"
+	FlashSound0		"sound/weapons/han_pistol/fire.mp3"  
+	altFlashSound0	"sound/weapons/han_pistol/alt_fire.mp3"
+	WeaponName		"DL-44 Heavy Blaster Pistol"
+	ChargeSound 	"sound/weapons/leia_pistol/altcharge.mp3"
+	FPChargeMult     1.2
+	rateMod 0.95
+	customammo 750
+}
+
+WeaponInfo1
+{
+	WeaponToReplace 	WP_FLECHETTE
+	WeaponBasedOff 		WP_FLECHETTE
+	NewWorldModel		"models/weapons2/golan_arms/golan_arms_w.glm"
+	NewViewModel		"models/weapons2/golan_arms/golan_arms.md3"
+	NewBarrelModel		"models/weapons2/golan_arms/golan_arms_barrel.md3"
+	NewHandsModel		"models/weapons2/golan_arms/golan_arms_hand.md3"
+	Icon				"gfx/hud/w_icon_golancr1"
+    FlashSound0			"sound/weapons/flechette/fire.mp3"  			
+	WeaponName 			"FC-1 Flechette Launcher"
+	MuzzleEffect 		"Blaster/MuzzleFlash01Y"
+	customAmmo           750
+	clipsize             15
+	damageMod 1.1
+	fpmult 1.1
+	ReloadTimeModifier 20
+}
+
+WeaponInfo2
+{
+	WeaponToReplace 	WP_DEMP2
+	WeaponBasedOff 		WP_DEMP2
+	NewWorldModel		"models/weapons2/demp2/demp2_w.glm"
+	NewViewModel		"models/weapons2/demp2/demp2.md3"
+	NewHandsModel		"models/weapons2/demp2/demp2_hand.md3"
+	Icon				"gfx/hud/w_icon_basedemp2"
+	WeaponName			"DEMP2"
+	FPMult 1.2
+	clipSize 6
+	damageMod 1.1
+	customammo 36
+	ratemod 1.2
+	velocityMod 1.2
+	ReloadTimeModifier 1.3
+}
+
+description	"Imperial Saboteur
+
+Elite soldiers with cloak.
+
+^2Weaponry:
+- Melee
+- EC-17 Holdout Blaster Pistol (2)
+-- 20% more Charged FP Dmg
+-- 5% faster RoF
+
+^6Inventory:
+- Cloaking Device ^3[CS3]
+
+^8Attributes:
+- Reinforcement (1)
+- Getup (2)
+
+^3Abilities:
+- Dodge (1) ^3[CS1]"
\ No newline at end of file
diff --git a/z_MBLegends/ext_data/mb2/teamconfig/LEG_Evil.mbtc b/z_MBLegends/ext_data/mb2/teamconfig/LEG_Evil.mbtc
index ad32a59da..fee20d9ff 100644
--- a/z_MBLegends/ext_data/mb2/teamconfig/LEG_Evil.mbtc
+++ b/z_MBLegends/ext_data/mb2/teamconfig/LEG_Evil.mbtc
@@ -63,16 +63,17 @@ SubclassesForClass3
 	Subclass4	"v6_Dengar"
 	Subclass5	"v6_MercSh"
 	Subclass6	"v7_Kubaz"
-	Subclass7	"v7_ImpSpec"
-	Subclass8	"v7_Noghri"
-	Subclass9	"v7_WatTam"
-	Subclass10	"v7_Tarkin"
-	Subclass11	"v7_Krennic"
-	Subclass12	"v7_Veers"
-	Subclass13	"v7_Zuck"
-	Subclass14	"v7_Enoch"
-	Subclass15	"v7_Thrawn"
-	Subclass16	"v7_Reelo"
+	Subclass7	"v7_Saboteur"
+	Subclass8	"v7_ImpSpec"
+	Subclass9	"v7_Noghri"
+	Subclass10	"v7_WatTam"
+	Subclass11	"v7_Tarkin"
+	Subclass12	"v7_Krennic"
+	Subclass13	"v7_Veers"
+	Subclass14	"v7_Zuck"
+	Subclass15	"v7_Enoch"
+	Subclass16	"v7_Thrawn"
+	Subclass17	"v7_Reelo"
 }
 
 SubclassesForClass4

From 594881af56f819eed918a16a4d2645fc8a8a8540 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Sat, 14 Feb 2026 23:17:37 +0100
Subject: [PATCH 08/82] v5_JumpTr cr3 fix

E11 + cr = cr3. Fixed now.
---
 z_MBLegends/ext_data/mb2/character/v5_JumpTr.mbch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v5_JumpTr.mbch b/z_MBLegends/ext_data/mb2/character/v5_JumpTr.mbch
index 3bf8645bd..8dde90961 100644
--- a/z_MBLegends/ext_data/mb2/character/v5_JumpTr.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v5_JumpTr.mbch
@@ -66,21 +66,21 @@ 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_ranks_0	4,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_ranks_1	4,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_ranks_2	2,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
+c_att_ranks_4	2
 }
 
 WeaponInfo0

From 08e3a72f4db281e013442a464260fa2997d73878 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Sun, 15 Feb 2026 13:03:27 +0100
Subject: [PATCH 09/82] v3_IG88 update

Slightly less damagetaken and more battery to keep him closer to what he is supposed to be.
He basically has the damage reduction he was supposed to have already but has to manage battery better.
---
 z_MBLegends/ext_data/mb2/character/v3_IG88.mbch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v3_IG88.mbch b/z_MBLegends/ext_data/mb2/character/v3_IG88.mbch
index c202f64a0..d89037235 100644
--- a/z_MBLegends/ext_data/mb2/character/v3_IG88.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v3_IG88.mbch
@@ -23,7 +23,7 @@ ClassInfo
 
 	classflags			CFL_SEEING_STEALTH|CFL_AKIMBOPISTOL3|CFL_STRONGAGAINSTPHYSICAL
 
-	forcepool		80
+	forcepool		90
 	forcepowers FP_SEE,1
  resource RESOURCE_BATTERY
  
@@ -32,7 +32,7 @@ ClassInfo
     resourceRegenCap 80
     resourceRegenAmount 10
 	
-	DamageTaken 1.3
+	DamageTaken 1.2
 
 	saber1 				droidmelee_legends
 	saberstyle			SS_STRONG

From e20b54d97378f9e8215c18f92ef9faa1cd47d322 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Sun, 15 Feb 2026 13:05:10 +0100
Subject: [PATCH 10/82] h3_Cander env protection option

---
 .../ext_data/mb2/character/h3_Cander.mbch     | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/h3_Cander.mbch b/z_MBLegends/ext_data/mb2/character/h3_Cander.mbch
index 9d5cfefbf..39e92b80b 100644
--- a/z_MBLegends/ext_data/mb2/character/h3_Cander.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h3_Cander.mbch
@@ -106,14 +106,18 @@ ClassInfo
 	c_att_names_10	"Cortosis"
 	c_att_ranks_10	10
 	
-	c_att_skill_11	MB_ATT_KB_TAKEN_MULTIPLIER
-	c_att_names_11	"Kb Taken (20%)"
-	c_att_ranks_11	2
- c_att_descs_11 "80% default"
-	
-	c_att_skill_12	MB_ATT_STAMINA
-	c_att_names_12	"Stamina ^3[CS1]"
-	c_att_ranks_12	5,5,5
+	c_att_skill_11	MB_ATT_ENV_PROT
+	c_att_names_11	"Environmental Protection"
+	c_att_ranks_11	5
+	
+	c_att_skill_12	MB_ATT_KB_TAKEN_MULTIPLIER
+	c_att_names_12	"Kb Taken (20%)"
+	c_att_ranks_12	2
+ c_att_descs_12 "80% default"
+	
+	c_att_skill_13	MB_ATT_STAMINA
+	c_att_names_13	"Stamina ^3[CS1]"
+	c_att_ranks_13	5,5,5
 }
 
 WeaponInfo0

From 6f8fdba0b8885fb6e5fcdc5d443bcd85d392ca37 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Sun, 15 Feb 2026 13:06:32 +0100
Subject: [PATCH 11/82] v5_DarkTr env protection

---
 z_MBLegends/ext_data/mb2/character/v5_DarkTr.mbch | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v5_DarkTr.mbch b/z_MBLegends/ext_data/mb2/character/v5_DarkTr.mbch
index 7f29479e4..c16d9d4a3 100644
--- a/z_MBLegends/ext_data/mb2/character/v5_DarkTr.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v5_DarkTr.mbch
@@ -9,7 +9,7 @@ ClassInfo
 	
 	weapons 	WP_MELEE|WP_BOWCASTER|WP_ROCKET_LAUNCHER
 	
-	attributes 	MB_ATT_BLAST_ARMOUR,1|MB_ATT_AMMO,3|MB_ATT_JETPACK,1|MB_ATT_FUEL,3|MB_ATT_ROCKET_LAUNCHER|MB_ATT_BOWCASTER,3|MB_ATT_WOOKIE_STRENGTH,2|MB_ATT_BESKAR,3
+	attributes 	MB_ATT_BLAST_ARMOUR,1|MB_ATT_AMMO,3|MB_ATT_JETPACK,1|MB_ATT_FUEL,3|MB_ATT_ROCKET_LAUNCHER|MB_ATT_BOWCASTER,3|MB_ATT_WOOKIE_STRENGTH,2|MB_ATT_BESKAR,3|MB_ATT_ENV_PROT,1
 	
 	maxhealth 	200
 	maxarmor			290
@@ -117,6 +117,7 @@ A Jetpack-equipped tank with a high-powered Assault Cannon and Rocket Launcher.
 - 10% more Kb Given
 - 10% less Kb Taken
 - Strength (2)
+- Environmental Protection (1)
 - Beskar (3)
 - Blast Armor
 - Physical Resist

From 0be640c30b57dcc73322e45ed43a32e8e602f59a Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Sun, 15 Feb 2026 13:32:05 +0100
Subject: [PATCH 12/82] h3_CloneSpe flamethrower nerf

Less insane damage.
---
 z_MBLegends/ext_data/mb2/character/h3_CloneSpe.mbch | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/h3_CloneSpe.mbch b/z_MBLegends/ext_data/mb2/character/h3_CloneSpe.mbch
index 792f3f887..2de227556 100644
--- a/z_MBLegends/ext_data/mb2/character/h3_CloneSpe.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h3_CloneSpe.mbch
@@ -59,7 +59,7 @@ 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 "50% more Dmg"
 c_att_skill_4	MB_ATT_MINIGUN
 c_att_names_4	"Chaingun (Minigun)"
 c_att_ranks_4	12
@@ -172,7 +172,7 @@ Icon	"gfx/hud/w_icon_mgun"
 WeaponName "BT X-42 Flamethrower"
 customAmmo 900
 clipsize 150
-Damagemod 1.8
+Damagemod 1.5
 hasAnimOverrides 1
 animReadyRun BOTH_MINIGUN_READY
 animReady BOTH_MINIGUN_READY
@@ -184,9 +184,9 @@ animStand BOTH_STAND2
 }
 WeaponInfo2{
 WeaponToReplace WP_EE4
-	WeaponBasedOff   WP_CONCUSSION
-	NewWorldModel "models/weapons2/dlt-18_repeater/dlt-18_repeater_w.glm"
-	NewViewModel  "models/weapons2/dlt-18_repeater/dlt-18_repeater.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

From c2ab08d3e38dc9b19a7811b0e3454e211f790876 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Sun, 15 Feb 2026 14:02:27 +0100
Subject: [PATCH 13/82] V7_Reelo Dash fix

---
 z_MBLegends/ext_data/mb2/character/v7_Reelo.mbch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v7_Reelo.mbch b/z_MBLegends/ext_data/mb2/character/v7_Reelo.mbch
index 66ebdab50..0c7cae9e0 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,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
+	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|MB_ATT_DASH,1
 	
 	resource RESOURCE_ENERGY
 	forcepool 0

From 2217f02a9074088fa468d4250866aab935a622eb Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Sun, 15 Feb 2026 14:25:44 +0100
Subject: [PATCH 14/82] v7_Saboteur

Less spammy flechette.
Slightly more demp2 fp drain but slower reload.
Slightly better icon/name for first spec?
Fixed armor regen.
---
 .../ext_data/mb2/character/v7_Saboteur.mbch   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch b/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch
index 3a6e9cabe..32bc22703 100644
--- a/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch
@@ -20,7 +20,7 @@ ClassInfo
 	//ArmourRegenCap 25
 	ArmourRegenRate	1000
 
-	rankArmourRegenAmount 25
+	rankArmourRegenCap 25
 
 	resource	RESOURCE_STAMINA
 	forcepool 60
@@ -64,8 +64,8 @@ uishader_3	"models/players/stormie/mb2_icon_vader"
 	
 hasCustomSpec 2
 isOnlyOneSpec 1
-customSpecName_1 "name"
-customSpecIcon_1 "gfx/menus/alpha/icon_weap_accuracy"
+customSpecName_1 "Soldier"
+customSpecIcon_1 "gfx/menus/alpha/icon_playermodel"
 customSpecDesc_1 ""
 customSpecName_2 "Commando"
 customSpecIcon_2 "gfx/menus/alpha/icon_weap_poison"
@@ -88,7 +88,7 @@ customSpecDesc_2 ""
 	c_att_names_3	"DEMP2"
 	c_att_ranks_3	6
 	c_att_descs_3 	"Shocks on hit, 20% more Velocity, 20% less RoF,
-10% more Dmg, 20% more FP Dmg, 30% slower Mag Reload"
+10% more Dmg, 25% more FP Dmg, 10000% slower Mag Reload"
 
 	c_att_skill_4	MB_ATT_BASE_TD
 	c_att_names_4	"Thermal Grenades"
@@ -143,13 +143,13 @@ customSpecDesc_2 ""
 	c_att_skill_18	MB_ATT_FLECHETTE
 	c_att_names_18	"FC-1 Flechette Launcher"
 	c_att_ranks_18	4,5
-	c_att_descs_18 	"10% more Dmg, 10% more FP Dmg, 21000% slower Reload"
+	c_att_descs_18 	"10% more Dmg, 10% more FP Dmg, 10000% slower Reload"
 
 	c_att_skill_19	MB_ATT_DEMP2
 	c_att_names_19	"DEMP2"
 	c_att_ranks_19	5
 	c_att_descs_19 	"Shocks on hit, 20% more Velocity, 20% less RoF,
-10% more Dmg, 20% more FP Dmg, 30% slower Mag Reload"
+10% more Dmg, 25% more FP Dmg, 40% slower Mag Reload"
 
 	c_att_skill_20	MB_ATT_BASE_TD
 	c_att_names_20	"Thermal Grenades"
@@ -220,11 +220,11 @@ WeaponInfo1
     FlashSound0			"sound/weapons/flechette/fire.mp3"  			
 	WeaponName 			"FC-1 Flechette Launcher"
 	MuzzleEffect 		"Blaster/MuzzleFlash01Y"
-	customAmmo           750
+	customAmmo           540
 	clipsize             15
 	damageMod 1.1
 	fpmult 1.1
-	ReloadTimeModifier 20
+	ReloadTimeModifier 99
 }
 
 WeaponInfo2
@@ -236,13 +236,13 @@ WeaponInfo2
 	NewHandsModel		"models/weapons2/demp2/demp2_hand.md3"
 	Icon				"gfx/hud/w_icon_basedemp2"
 	WeaponName			"DEMP2"
-	FPMult 1.2
+	FPMult 1.25
 	clipSize 6
 	damageMod 1.1
 	customammo 36
 	ratemod 1.2
 	velocityMod 1.2
-	ReloadTimeModifier 1.3
+	ReloadTimeModifier 1.4
 }
 
 description	"Imperial Saboteur

From 71314a8ec0604a596f5081049e6bed127043d361 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Sun, 15 Feb 2026 16:35:36 +0100
Subject: [PATCH 15/82] h6_Andor fixes

Removes e11 weaponinfo to make sure it has default RoF. Transfers global RoF to pistol/proj instead. Adds ammo 5 for e11 to get almost the same amount.
Actually removes pistol by default. Renamed it a bit for lore.
---
 .../ext_data/mb2/character/h6_Andor.mbch      | 28 ++++++-------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/h6_Andor.mbch b/z_MBLegends/ext_data/mb2/character/h6_Andor.mbch
index bf1d70a47..42efb4a3d 100644
--- a/z_MBLegends/ext_data/mb2/character/h6_Andor.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h6_Andor.mbch
@@ -1,8 +1,8 @@
 ClassInfo
 {
 	name  "h6_Andor"
-	weapons WP_BLASTER_PISTOL|WP_PROJ|WP_FRAG_NADE
-	attributes  MB_ATT_PROJECTILE_RIFLE,1|MB_ATT_PISTOL,3|MB_ATT_AMMO,3|MB_ATT_FRAGS,2|MB_ATT_HEALING,3|MB_ATT_QUICKTHROW,2|MB_ATT_DASH,2|MB_ATT_DODGE,3|MB_ATT_TRACKING_BEACON
+	weapons WP_PROJ|WP_FRAG_NADE
+	attributes  MB_ATT_PROJECTILE_RIFLE,1|MB_ATT_AMMO,5|MB_ATT_FRAGS,2|MB_ATT_HEALING,3|MB_ATT_QUICKTHROW,2|MB_ATT_DASH,2|MB_ATT_DODGE,3|MB_ATT_TRACKING_BEACON
 	maxhealth 			170
 	maxarmor  			90
 	MBclass		MB_CLASS_HERO
@@ -14,7 +14,7 @@ ClassInfo
 	classNumberLimit 		1
 	holdables		HI_BINOCULARS
 	
-	rateOfFire    0.93
+	rateOfFire    1
  baseSpeed 255
 
 	model "cassian"
@@ -48,14 +48,13 @@ ClassInfo
 	mbPoints		5
 
 	c_att_skill_0	MB_ATT_PISTOL
-	c_att_names_0	"Modified Bryar Pistol"
+	c_att_names_0	"MW-20 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, 7% faster RoF"
 
 	c_att_skill_1	MB_ATT_BLASTER
 	c_att_names_1	"E-11 Blaster Rifle"
 	c_att_ranks_1	1,2,2
-	c_att_descs_1 "10% slower RoF"
 
 	c_att_skill_2	MB_ATT_POWER
 	c_att_names_2	"Energy Pool (110)"
@@ -79,6 +78,7 @@ WeaponInfo0
 	customAmmo	25
 	clipSize     2
 	ReloadTimeModifier 0.7
+	ratemod 0.93
 }
 
 WeaponInfo1
@@ -89,10 +89,11 @@ WeaponInfo1
 	NewViewModel		"models/weapons2/briar_pistol/briar_pistol.md3"
 	Icon				"gfx/hud/w_icon_briar"
 	ChargeSound			"sound/weapons/leia_pistol/altcharge.mp3"
-	WeaponName			"Modified Bryar Pistol"
+	WeaponName			"MW-20 Bryar Pistol"
 	customAmmo 500
 	clipSize 21
 	FPChargeMult	1.5
+	ratemod 0.93
 	hasAnimOverrides 1
 	animReadyRun BOTH_PISTOL_IDLE
 	animReady BOTH_PISTOL_IDLE
@@ -103,18 +104,6 @@ WeaponInfo1
 	animCharge BOTH_PISTOL_ATTACK
 }
 
-WeaponInfo2
-{
-WeaponToReplace	WP_BLASTER
-WeaponBasedOff	WP_BLASTER
-NewWorldModel	"models/weapons2/blaster_r/blaster_w.glm"
-NewViewModel	"models/weapons2/blaster_r/blaster.md3"
-Icon	"gfx/hud/w_icon_E11"
-WeaponName	"E-11 Blaster Rifle"
-customAmmo	740
-ratemod 1.1
-}
-
 description	"Cassian Andor 
 
 A scrappy marksman with a powerful 2-shot sniper rifle.
@@ -124,6 +113,7 @@ A scrappy marksman with a powerful 2-shot sniper rifle.
 - Frag Grenades (2)
 - Projectile Rifle
 -- 2 shots per Reload
+-- 7% faster RoF
 -- 30% faster Reload
 
 ^6Inventory:

From 4df76a796f19e090c6370665e779a753a4c5fbe4 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Sun, 15 Feb 2026 16:45:58 +0100
Subject: [PATCH 16/82] h5_BoKatan very small ammo increase

+50 ammo for pistols.
---
 z_MBLegends/ext_data/mb2/character/h5_BoKatan.mbch | 1 +
 1 file changed, 1 insertion(+)

diff --git a/z_MBLegends/ext_data/mb2/character/h5_BoKatan.mbch b/z_MBLegends/ext_data/mb2/character/h5_BoKatan.mbch
index fe83d765f..5939f43ec 100644
--- a/z_MBLegends/ext_data/mb2/character/h5_BoKatan.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h5_BoKatan.mbch
@@ -67,6 +67,7 @@ WeaponInfo1
  damageMod 1.1
 	fpmult	1.1
 	rateMod 1.1
+	customammo 750
 }
 
 description	"Bo-Katan Kryze 

From b51718648baa9ac7030fc9ca7d0e1028ca426ac3 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Sun, 15 Feb 2026 18:22:48 +0100
Subject: [PATCH 17/82] v5_Boba fix

Removes hidden skilltimermod.
---
 z_MBLegends/ext_data/mb2/character/v5_Boba.mbch | 2 --
 1 file changed, 2 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v5_Boba.mbch b/z_MBLegends/ext_data/mb2/character/v5_Boba.mbch
index 073e3d294..7334ae5fb 100644
--- a/z_MBLegends/ext_data/mb2/character/v5_Boba.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v5_Boba.mbch
@@ -9,8 +9,6 @@ ClassInfo
 
 	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
-
 	maxhealth		125
 	maxarmor			125
 

From a56ea566655e51cfe6f209cec9e3432d42f0542d Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Sun, 15 Feb 2026 18:41:33 +0100
Subject: [PATCH 18/82] v5_JumpTr fuel regen fix

Regens 1 fuel per minute now.
Also knockbacktaken reduction.
---
 z_MBLegends/ext_data/mb2/character/v5_JumpTr.mbch | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v5_JumpTr.mbch b/z_MBLegends/ext_data/mb2/character/v5_JumpTr.mbch
index 8dde90961..640433736 100644
--- a/z_MBLegends/ext_data/mb2/character/v5_JumpTr.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v5_JumpTr.mbch
@@ -18,6 +18,7 @@ ClassInfo
 
 	resource			RESOURCE_FUEL
 	forcepool 100
+	forceregen 0.01
 	flourishAnim BOTH_WOOKIEE_RAGE_MELEE1
 	
 	special1 EAS_HI_NONE
@@ -26,7 +27,7 @@ ClassInfo
 
 	skilltimerMod 1.2
 
-	knockbackTaken 0.85
+	knockbackTaken 0.8
 
 	meleeMoves M_UPPERCUT|M_BLOCK|M_FBKICK|M_JUMPKICK|M_KATA|M_KICK|M_LEGSWEEP|M_PUNCH|M_RLKICK
 	
@@ -164,7 +165,7 @@ A 2-life Jetpack user with a unique suppression Repeater and a micro-Rocket Laun
 ^8Attributes:
 - Reinforcement (1)
 - 20% slower Skill Cd
-- 15% less Kb Taken
+- 20% less Kb Taken
 - Strength (1)
 - Blast Armor
 - Assemble (3)

From 9f4f7fd33cdc99827bdcf942720f1d9962b815d4 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Mon, 16 Feb 2026 09:11:16 +0100
Subject: [PATCH 19/82] v7_Saboteur stamina rebalance

Less max pool, more regen. Slightly cheaper for 2 life variant.
---
 z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch b/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch
index 32bc22703..d6c718315 100644
--- a/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch
@@ -23,9 +23,9 @@ ClassInfo
 	rankArmourRegenCap 25
 
 	resource	RESOURCE_STAMINA
-	forcepool 60
-	forceregen		0.5
-	rankForcepool 80,100,120
+	forcepool 40
+	forceregen		0.8
+	rankForcepool 60,80,100
 
 	holdables		HI_CLOAK
 	
@@ -112,7 +112,7 @@ customSpecDesc_2 ""
 	c_att_ranks_8	4
 
 	c_att_skill_9	MB_ATT_POWER
-	c_att_names_9	"Stamina pool (80/100)"
+	c_att_names_9	"Stamina pool (60/80)"
 	c_att_ranks_9	2,2
 
 	c_att_skill_10 MB_ATT_DEXTERITY
@@ -176,8 +176,8 @@ customSpecDesc_2 ""
 	c_att_ranks_25	4
 
 	c_att_skill_26	MB_ATT_POWER
-	c_att_names_26	"Stamina Pool (80/100/120)"
-	c_att_ranks_26	2,2,2
+	c_att_names_26	"Stamina Pool (60/80/100)"
+	c_att_ranks_26	1,2,3
 
 	c_att_skill_27	MB_ATT_DEXTERITY
 	c_att_names_27	"Dexterity"

From 4fb2a18b71db13e7e414a04e63de8ff692fd0ce2 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Mon, 16 Feb 2026 10:26:23 +0100
Subject: [PATCH 20/82] v7_Saboteur default regen

---
 z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch b/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch
index d6c718315..3c27f4b9c 100644
--- a/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch
@@ -24,7 +24,7 @@ ClassInfo
 
 	resource	RESOURCE_STAMINA
 	forcepool 40
-	forceregen		0.8
+	forceregen		1
 	rankForcepool 60,80,100
 
 	holdables		HI_CLOAK

From a300f71baa7fbc4044bb4a16bfb954de92c6cc13 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Mon, 16 Feb 2026 11:15:47 +0100
Subject: [PATCH 21/82] v7_Kubaz rework

Battery -> stamina
Armor regen removed for normal armor.
Poison pistol restored and damage is now correct.
Added grapple hook, grapple hop, bhop, flipkick.
Dash is now buyable instead of default
Cloak is now buyable instead of default. Disguise is cheaper.
2 life variant slightly buffed by having more points.
---
 .../ext_data/mb2/character/v7_Kubaz.mbch      | 99 ++++++++++---------
 1 file changed, 54 insertions(+), 45 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v7_Kubaz.mbch b/z_MBLegends/ext_data/mb2/character/v7_Kubaz.mbch
index a87e1c7e6..b009bd068 100644
--- a/z_MBLegends/ext_data/mb2/character/v7_Kubaz.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v7_Kubaz.mbch
@@ -7,20 +7,20 @@ ClassInfo
 	extralives			1
 	weapons			WP_MELEE|WP_SABER
 
-	attributes		MB_ATT_AMMO,3|MB_ATT_TRACKING_BEACON|MB_ATT_TRACKING_DART,1
+	attributes		MB_ATT_AMMO,3|MB_ATT_TRACKING_BEACON|MB_ATT_TRACKING_DART,1|MB_ATT_GRAPPLE_HOP|MB_ATT_BUNNY_HOP,1|MB_ATT_FLOAT_HOP|MB_ATT_FLIPKICK,1
 
 	maxhealth		90
-	MaxArmor		5
-	rankArmor		10,15,20
+	MaxArmor		10
+	rankArmor		15,60,90
 
 	//ArmourRegenCap 20
-	ArmourRegenRate	20000
+	//ArmourRegenRate	1000
 
-	rankArmourRegenAmount 20
+	//rankArmourRegenAmount 1
 
-	resource	RESOURCE_BATTERY
-	forcepool 65
-	forceregen		2.65
+	resource	RESOURCE_STAMINA
+	forcepool 100
+	forceregen		1
 
 	BPmultiplier    0
 	saber1			Legends_Knife_Spy
@@ -30,7 +30,7 @@ ClassInfo
 	saberstyle		SS_TAVION|SS_DUAL
 	saberDamage 	100
 
-	//WP_BlasterPistolFlags	HELD_POISON
+	WP_BlasterPistolFlags	HELD_POISON
 
 	classflags		CFL_HEAVYMELEE|CFL_SEEING_STEALTH
 	holdables		HI_CLOAK
@@ -39,7 +39,7 @@ ClassInfo
 	meleespecial2 EAS_HI_TRACKER
  special2 EAS_HI_KICK
 	special3	EAS_HI_DASH
-	special4 EAS_HI_CLOAK
+	special4	EAS_HI_GRAPPLEHOOK
 
 	uioverlay_l "gfx/icons/tactician"
 	uioverlay_c "gfx/icons/spec_infantry"
@@ -52,7 +52,6 @@ ClassInfo
 	flourishAnim BOTH_SPINATTACK7
 	saberStanceAnim BOTH_STAND9
 
-
 model		"tie_pilot"
 skin		"garindan"
 uishader	"models/players/tie_pilot/mb2_icon_garindan"
@@ -66,13 +65,13 @@ skin_2		"kubazb"
 uishader_2	"models/players/tie_pilot/mb2_icon_kubazb"
 
 	isCustomBuild	1
-	mbPoints	50
+	mbPoints	55
 
 	c_att_skill_0	MB_ATT_PISTOL
 	c_att_names_0	"Assassin Blaster Pistol"
 	c_att_ranks_0	1,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, Poisons on hit, 25% more Velocity,
+50% more Charged FP Dmg, 40% less Dmg, 25% slower RoF"
 
 	c_att_skill_1	MB_ATT_DC_CARBINE
 	c_att_names_1	"E-11 Stun Carbine"
@@ -93,36 +92,45 @@ uishader_2	"models/players/tie_pilot/mb2_icon_kubazb"
 
 	c_att_skill_5	MB_ATT_RESPAWNS
 	c_att_names_5	"Reinforcement"
-	c_att_ranks_5	20
+	c_att_ranks_5	25
 	c_att_descs_5 "1 default"
 	
 	c_att_skill_6	MB_ATT_ARMOUR
-	c_att_names_6	"Armor (10/15/20)"
-	c_att_ranks_6	1,2,3
-
-	c_att_skill_7	MB_ATT_ARMOUR_REGEN_AMOUNT
-	c_att_names_7	"> Armor Regen (20/20s)"
-	c_att_ranks_7	5
-
-	c_att_skill_8	MB_ATT_RECHARGE
-	c_att_names_8	"Battery Recharge"
-	c_att_ranks_8	2,2,6
-
-	c_att_skill_9	MB_ATT_SPY_DISGUISE
-	c_att_names_9	"Disguise ^3[Toggle Melee]"
-	c_att_ranks_9	3,3,3
+	c_att_names_6	"Armor (30/60/90)"
+	c_att_ranks_6	2,3,3
 
-	c_att_skill_10	MB_ATT_WRISTLASER
-	c_att_names_10	"Wrist Laser ^3[CS1]"
-	c_att_ranks_10	5
+	c_att_skill_7	MB_ATT_DEXTERITY
+	c_att_names_7	"Dexterity"
+	c_att_ranks_7	2,1,4
 
-	c_att_skill_11	MB_ATT_TRACKING_DART
-	c_att_names_11	"Tracking Darts ^3[CS2 Melee]"
-	c_att_ranks_11	0,2,2
-
-	c_att_skill_12	MB_ATT_DASH
-	c_att_names_12	"Dash ^3[CS3]"
-	c_att_ranks_12	0,1
+	c_att_skill_8	MB_ATT_STAMINA
+	c_att_names_8	"Stamina"
+	c_att_ranks_8	4
+	
+	c_att_skill_9 MB_ATT_CLOAK
+	c_att_names_9 "Cloak"
+	c_att_ranks_9 6
+
+	c_att_skill_10	MB_ATT_SPY_DISGUISE
+	c_att_names_10	"Disguise ^3[Toggle Melee]"
+	c_att_ranks_10	2,2,2
+
+	c_att_skill_11	MB_ATT_WRISTLASER
+	c_att_names_11	"Wrist Laser ^3[CS1]"
+	c_att_ranks_11	4
+
+	c_att_skill_12	MB_ATT_TRACKING_DART
+	c_att_names_12	"Tracking Darts ^3[CS2 Melee]"
+	c_att_ranks_12	0,2,2
+
+	c_att_skill_13	MB_ATT_DASH
+	c_att_names_13	"Dash ^3[CS3]"
+	c_att_ranks_13	2,1
+
+	c_att_skill_14	MB_ATT_GRAPPLE_HOOK
+	c_att_names_14	"Grap. Hook/Hop ^3[CS4 Melee]"
+	c_att_ranks_14	1,3
+	c_att_descs_14 	"Retain momentum from first Grapple"
 }
 
 WeaponInfo0
@@ -140,7 +148,7 @@ WeaponInfo0
 	primHitscanTracer	10
 	primGore	1
 Velocitymod 1.25
-	Damagemod 0.55
+	Damagemod 0.6
 	ratemod 1.25
 	FPChargeMult	1.5
 	reloadTimeModifier 1.25
@@ -204,15 +212,16 @@ Versatile assassins who can Disguise themselves and Cloak.
 -- No Saber/Blaster Block
 -- 60% less Reach
 
-^6Inventory:
-- Cloaking Device ^3[CS4]
-
 ^8Attributes:
 - Reinforcement (1)
+- Bunny Hop (1)
+- Slow Faller
+- Grapple Hop
+- Stamina (0)
 - Sense Immunity
 - Tracking Beacon
 
 ^3Abilities:
+- Flipkick (1) ^3[Contact Jump]
 - Gunkick ^3[CS2]
-- Tracking Darts (2) ^3[CS2 Melee]
-- Dash (1) ^3[CS3]"
\ No newline at end of file
+- Tracking Darts (2) ^3[CS2 Melee]"
\ No newline at end of file

From fedf7ef5497f1a75c906050426a78d20e72f4499 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Mon, 16 Feb 2026 12:02:02 +0100
Subject: [PATCH 22/82] v7_Saboteur battery update

Swaps stamina for old battery.
Recalculated armor due to battery DR.
Removed grapple hook.
Added flash nades with qt3 (will not knockdown).
---
 .../ext_data/mb2/character/v7_Saboteur.mbch   | 179 ++++++++++--------
 1 file changed, 100 insertions(+), 79 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch b/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch
index 3c27f4b9c..a4f2c320d 100644
--- a/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch
@@ -5,36 +5,33 @@ ClassInfo
 	classNumberLimit	2
 	extralives			1
 	weapons			WP_MELEE|WP_MANDO_PISTOL
-
-	attributes		MB_ATT_AMMO,3|MB_ATT_MANDO_PISTOL,2|MB_ATT_GETUPS,2|MB_ATT_STAMINA,1
+	attributes		MB_ATT_AMMO,3|MB_ATT_MANDO_PISTOL,2|MB_ATT_GETUPS,2|MB_ATT_STAMINA,1|MB_ATT_QUICKTHROW,3
 
 	maxhealth		80
 	RankHealth		100
-	MaxArmor		40
-	rankArmor		60,80,100
-	
+	MaxArmor		10
+	rankArmor		20,30,45
+
 	rankDmgGiven 1.1
-	
 	basespeed 230
 
 	//ArmourRegenCap 25
 	ArmourRegenRate	1000
-
 	rankArmourRegenCap 25
 
-	resource	RESOURCE_STAMINA
-	forcepool 40
-	forceregen		1
+	resource	RESOURCE_BATTERY
+	forcepool 65
+	forceregen		2.65
 	rankForcepool 60,80,100
 
 	holdables		HI_CLOAK
-	
+
 	WP_DEMP2Flags HELD_ALTRELOAD|HELD_PULSE
 
 	special1 EAS_HI_DODGE
 	special2 EAS_NONE
-	special3 EAS_HI_CLOAK
-	special4	EAS_HI_GRAPPLEHOOK
+	special3 EAS_HI_QUICKTOSS
+	special4	EAS_HI_CLOAK
 
 	uioverlay_l "gfx/icons/tactician"
 	uioverlay_c "gfx/icons/spec_infantry"
@@ -61,7 +58,7 @@ uishader_3	"models/players/stormie/mb2_icon_vader"
 
 	isCustomBuild	1
 	mbPoints	50
-	
+
 hasCustomSpec 2
 isOnlyOneSpec 1
 customSpecName_1 "Soldier"
@@ -74,7 +71,7 @@ customSpecDesc_2 ""
 	c_att_skill_0	MB_ATT_BLASTER
 	c_att_names_0	"E-11 Blaster Rifle"
 	c_att_ranks_0	2,2,4
-	
+
 	c_att_skill_1	MB_ATT_DISRUPTOR
 	c_att_names_1	"Disruptor Rifle"
 	c_att_ranks_1	2,6
@@ -83,50 +80,51 @@ customSpecDesc_2 ""
 	c_att_names_2	"FC-1 Flechette Launcher"
 	c_att_ranks_2	5
 	c_att_descs_2 	"10% more Dmg, 10% more FP Dmg, 21000% slower Reload"
-	
+
 	c_att_skill_3	MB_ATT_DEMP2
 	c_att_names_3	"DEMP2"
 	c_att_ranks_3	6
 	c_att_descs_3 	"Shocks on hit, 20% more Velocity, 20% less RoF,
 10% more Dmg, 25% more FP Dmg, 10000% slower Mag Reload"
 
-	c_att_skill_4	MB_ATT_BASE_TD
-	c_att_names_4	"Thermal Grenades"
-	c_att_ranks_4	1,1
-
-	c_att_skill_5	MB_ATT_TRIP_MINES
-	c_att_names_5	"Trip Mines"
-	c_att_ranks_5	2,2
-
-	c_att_skill_6	MB_ATT_RESPAWNS
-	c_att_names_6	"Reinforcement"
-	c_att_ranks_6	25
-	c_att_descs_6 "1 default"
-	
-	c_att_skill_7	MB_ATT_ARMOUR
-	c_att_names_7	"Armor (60/80)"
-	c_att_ranks_7	4,4
-
-	c_att_skill_8	MB_ATT_ARMOUR_REGEN_AMOUNT
-	c_att_names_8	"> Armor Regen (1/1s to 25)"
-	c_att_ranks_8	4
-
-	c_att_skill_9	MB_ATT_POWER
-	c_att_names_9	"Stamina pool (60/80)"
-	c_att_ranks_9	2,2
-
-	c_att_skill_10 MB_ATT_DEXTERITY
-	c_att_names_10	"Dexterity"
-	c_att_ranks_10	1
-
-	c_att_skill_11	MB_ATT_GRAPPLE_HOOK
-	c_att_names_11	"Grappling Hook ^3[CS4 Melee]"
+	c_att_skill_4	MB_ATT_FRAGS
+	c_att_names_4	"Flashbang Grenades (Frags)"
+	c_att_ranks_4	2,2
+	c_att_descs_4 "Blinds on det, Sec only. 99.9% less Dmg, 40% faster RoF"
+
+	c_att_skill_5	MB_ATT_BASE_TD
+	c_att_names_5	"Thermal Grenades"
+	c_att_ranks_5	1,1
+
+	c_att_skill_6	MB_ATT_TRIP_MINES
+	c_att_names_6	"Trip Mines"
+	c_att_ranks_6	2,2
+
+	c_att_skill_7	MB_ATT_RESPAWNS
+	c_att_names_7	"Reinforcement"
+	c_att_ranks_7	25
+	c_att_descs_7 "1 default"
+
+	c_att_skill_8	MB_ATT_ARMOUR
+	c_att_names_8	"Armor (20/30)"
+	c_att_ranks_8	3,4
+
+	c_att_skill_9	MB_ATT_ARMOUR_REGEN_AMOUNT
+	c_att_names_9	"> Armor Regen (1/1s to 10)"
+	c_att_ranks_9	5
+
+	c_att_skill_10	MB_ATT_RECHARGE
+	c_att_names_10	"Battery Recharge"
+	c_att_ranks_10	2,2
+
+	c_att_skill_11 MB_ATT_DEXTERITY
+	c_att_names_11	"Dexterity"
 	c_att_ranks_11	1
 
 	c_att_skill_12	MB_ATT_DODGE
 	c_att_names_12	"Dodge ^3[CS1]"
 	c_att_ranks_12	0,1
-	
+
 
 	c_att_skill_15	MB_ATT_MANDO_PISTOL
 	c_att_names_15	"Dual DL-44 Pistols"
@@ -135,7 +133,7 @@ customSpecDesc_2 ""
 	c_att_skill_16	MB_ATT_BLASTER
 	c_att_names_16	"E-11 Blaster Rifle"
 	c_att_ranks_16	1,2,3
-	
+
 	c_att_skill_17	MB_ATT_DISRUPTOR
 	c_att_names_17	"Disruptor Rifle"
 	c_att_ranks_17	2,6
@@ -151,41 +149,42 @@ customSpecDesc_2 ""
 	c_att_descs_19 	"Shocks on hit, 20% more Velocity, 20% less RoF,
 10% more Dmg, 25% more FP Dmg, 40% slower Mag Reload"
 
-	c_att_skill_20	MB_ATT_BASE_TD
-	c_att_names_20	"Thermal Grenades"
-	c_att_ranks_20	1,1,1
+	c_att_skill_20	MB_ATT_FRAGS
+	c_att_names_20	"Flashbang Grenades (Frags)"
+	c_att_ranks_20	2,2,2
+	c_att_descs_20 "Blinds on det, Sec only. 99.9% less Dmg, 40% faster RoF"
+
+	c_att_skill_21	MB_ATT_BASE_TD
+	c_att_names_21	"Thermal Grenades"
+	c_att_ranks_21	1,1,1
 
-	c_att_skill_21	MB_ATT_TRIP_MINES
-	c_att_names_21	"Trip Mines"
-	c_att_ranks_21	2,2,2
+	c_att_skill_22	MB_ATT_TRIP_MINES
+	c_att_names_22	"Trip Mines"
+	c_att_ranks_22	2,2,2
 
-	c_att_skill_22	MB_ATT_DMG_GIVEN_MULTIPLIER
-	c_att_names_22	"Dmg Given (110%)"
-	c_att_ranks_22	4
+	c_att_skill_23	MB_ATT_DMG_GIVEN_MULTIPLIER
+	c_att_names_23	"Dmg Given (110%)"
+	c_att_ranks_23	4
 
-	c_att_skill_23	MB_ATT_HEALTH
-	c_att_names_23	"HP (100)"
-	c_att_ranks_23	2
-	
-	c_att_skill_24	MB_ATT_ARMOUR
-	c_att_names_24	"Armor (60/80/100)"
-	c_att_ranks_24	4,4,4
+	c_att_skill_24	MB_ATT_HEALTH
+	c_att_names_24	"HP (100)"
+	c_att_ranks_24	2
 
-	c_att_skill_25	MB_ATT_ARMOUR_REGEN_AMOUNT
-	c_att_names_25	"> Armor Regen (1/1s to 25)"
-	c_att_ranks_25	4
+	c_att_skill_25	MB_ATT_ARMOUR
+	c_att_names_25	"Armor (20/30/45)"
+	c_att_ranks_25	2,3,4
 
-	c_att_skill_26	MB_ATT_POWER
-	c_att_names_26	"Stamina Pool (60/80/100)"
-	c_att_ranks_26	1,2,3
+	c_att_skill_26	MB_ATT_ARMOUR_REGEN_AMOUNT
+	c_att_names_26	"> Armor Regen (1/1s to 25)"
+	c_att_ranks_26	5
 
-	c_att_skill_27	MB_ATT_DEXTERITY
-	c_att_names_27	"Dexterity"
-	c_att_ranks_27	1,1
+	c_att_skill_27	MB_ATT_RECHARGE
+	c_att_names_27	"Battery Recharge"
+	c_att_ranks_27	2,2,6
 
-	c_att_skill_28	MB_ATT_GRAPPLE_HOOK
-	c_att_names_28	"Grappling Hook ^3[CS4 Melee]"
-	c_att_ranks_28	1,3
+	c_att_skill_28	MB_ATT_DEXTERITY
+	c_att_names_28	"Dexterity"
+	c_att_ranks_28	1,1
 
 	c_att_skill_29	MB_ATT_DODGE
 	c_att_names_29	"Dodge ^3[CS1]"
@@ -245,6 +244,27 @@ WeaponInfo2
 	ReloadTimeModifier 1.4
 }
 
+WeaponInfo3
+{	
+	WeaponToReplace	WP_FRAG_NADE
+	WeaponBasedOff	WP_FRAG_NADE
+	NewWorldModel	"models/weapons/Grenade_Concussion/model.glm"
+	NewViewModel	"models/weapons/Grenade_Concussion/viewmodel.md3"
+	MissileModel "models/weapons/Grenade_Concussion/proj.md3"
+	altMissileModel "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"
+	primFireEnabled			0
+	damagemod 0.001
+	ratemod 0.6
+}
+
 description	"Imperial Saboteur
 
 Elite soldiers with cloak.
@@ -256,11 +276,12 @@ Elite soldiers with cloak.
 -- 5% faster RoF
 
 ^6Inventory:
-- Cloaking Device ^3[CS3]
+- Cloaking Device ^3[CS4]
 
 ^8Attributes:
 - Reinforcement (1)
 - Getup (2)
 
 ^3Abilities:
-- Dodge (1) ^3[CS1]"
\ No newline at end of file
+- Dodge (1) ^3[CS1]
+- Quickthrow (3) ^3[CS3]"
\ No newline at end of file

From 588a846cc529bc25d46b530eaaf05edaed984cc0 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Mon, 16 Feb 2026 14:10:15 +0100
Subject: [PATCH 23/82] v1_TORagent rework

-5 armor.
Class has access to 75 stamina by default. Dodge 3 and dex roll only. Concealment gets access to cloak and more dex. Sprint removed. Concealment gets the same speed upgrade as lethality.
Blue style added to knife.
Poison nades now apply tracking.
Speed pointbuy reduced by 2 points.
Disguise added for concealment
---
 .../ext_data/mb2/character/v1_TORagent.mbch   | 67 +++++++++++--------
 1 file changed, 39 insertions(+), 28 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v1_TORagent.mbch b/z_MBLegends/ext_data/mb2/character/v1_TORagent.mbch
index 3a3d20bc3..1e18250ca 100644
--- a/z_MBLegends/ext_data/mb2/character/v1_TORagent.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v1_TORagent.mbch
@@ -3,41 +3,41 @@ ClassInfo
 name	"v1_TORagent"
 classNumberLimit 4
 extralives 1
-MBClass MB_CLASS_BOUNTY_HUNTER
+MBClass MB_CLASS_HERO
 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
+attributes MB_ATT_AMMO,3|MB_ATT_MANDO_PISTOL,2|MB_ATT_DEXTERITY,1|MB_ATT_DODGE,3|MB_ATT_STAMINA,1|MB_ATT_FORCEBLOCK,1|MB_ATT_BASE_TD,2|MB_ATT_SABER_COMBO,1
 maxhealth 100
-maxarmor	80
+maxarmor	75
 BPmultiplier	0
 rankBP	0.75
 APmultiplier	1.3
 CSmultiplier	1.1
 saberMaxChain 2
-rankSaberMaxChain 3,4
+rankSaberMaxChain 4
 resource RESOURCE_STAMINA
-forcepool 0
-rankForcepool 50
+forcepool 75
+forceregen .75
 rankROF .8
 rateOfFire_Melee .91
 rankKbGiven 1.3
 basespeed 220
-rankbasespeed	237
+rankbasespeed	235
 WP_SaberFlags	HELD_PULSE|HELD_POISON
-WP_FragNadeFlags HELD_POISON
+WP_FragNadeFlags HELD_POISON|HELD_TRACKING
 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_BASESEEKER|HI_CLOAK|HI_STIMPACK
+holdables HI_MEDPAC|HI_BASESEEKER|HI_STIMPACK
 saber1	Legends_Knife_Jagged
-saberstyle	SS_TAVION
+saberstyle	SS_TAVION|SS_FAST
 rankSaberDamage	140
 ArmourRegenCap 10
 ArmourRegenRate	500
 ArmourRegenAmount 1
 rankArmourRegenCap 25
-special1 EAS_HI_SPRINT
+special1 EAS_NONE
 special2 EAS_HI_DEX
 special3 EAS_HI_DODGE
 special4 EAS_HI_POISON
@@ -108,12 +108,12 @@ c_att_descs_17 	"Poisons/staggers on hit, 50% more Velocity, 80% faster RoF,
 c_att_skill_18 MB_ATT_FRAGS
 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_descs_18 "Poisons/tracks on det, 75% less Dmg"
 c_att_skill_19 MB_ATT_HEALING
 c_att_names_19 "Healing"
 c_att_ranks_19 1
 c_att_skill_20 MB_ATT_BASESPEED
-c_att_names_20 "Speed (237)"
+c_att_names_20 "Speed (235)"
 c_att_ranks_20 1
 c_att_skill_21 MB_ATT_POISON_DART
 c_att_names_21 "Poison Darts ^3[CS4 Melee]"
@@ -127,22 +127,29 @@ 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_ranks_32 2
 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_names_33 "Saber Chain Limit (4)"
+c_att_ranks_33 2
 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"
+c_att_skill_35 MB_ATT_BASESPEED
+c_att_names_35 "Speed (235)"
+c_att_ranks_35 2
+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_CLOAK
+c_att_names_37 "Cloak"
+c_att_ranks_37 2
+c_att_skill_38	MB_ATT_SPY_DISGUISE
+c_att_names_38	"Disguise ^3[Toggle Melee]"
+c_att_ranks_38	1,1,0
+c_att_skill_39	MB_ATT_POISON_DART
+c_att_names_39	"Poison Dart ^3[CS4 Melee]"
+c_att_ranks_39	1
 }
 WeaponInfo0{
 WeaponToReplace WP_SABER
@@ -203,7 +210,6 @@ customammo 50
 ratemod 0.2
 velocityMod 1.5
 ReloadTimeModifier 1.25
-AltFireEnabled 0
 }
 WeaponInfo4{
 WeaponToReplace WP_FRAG_NADE
@@ -235,12 +241,12 @@ FPChargeMult	1.25
 }
 description "Sith Operative 
 
-Multi-life elite troopers.
+Multi-life elite troopers specializing in assassination.
 
 ^2Weaponry:
 - Melee
 -- 9% faster RoF
-- Acidic Vibroknife (Cyan Saber)
+- Acidic Vibroknife (Cyan/Blue Saber)
 -- No Blaster Block
 -- Chain Limit: 2
 -- EX Saber Training (1)
@@ -258,4 +264,9 @@ Multi-life elite troopers.
 - Reinforcement (1)
 - Armor Regen: 1/.5s to 10
 - Force Block (1)
-- Dexterity (2)"
\ No newline at end of file
+- Stamina (1)
+- Dexterity (1)
+
+^3Abilities:
+- Dex roll ^3[CS2]
+- Dodge (3) ^3[CS3]"
\ No newline at end of file

From 30a1601127fbbe6bec272505cb58911c16fd9ec4 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Mon, 16 Feb 2026 21:24:48 +0100
Subject: [PATCH 24/82] h7_Lobot description

---
 z_MBLegends/ext_data/mb2/character/h7_Lobot.mbch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/z_MBLegends/ext_data/mb2/character/h7_Lobot.mbch b/z_MBLegends/ext_data/mb2/character/h7_Lobot.mbch
index 0e80836ee..2b7b4cc28 100644
--- a/z_MBLegends/ext_data/mb2/character/h7_Lobot.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h7_Lobot.mbch
@@ -144,7 +144,7 @@ A speedy, damage-boosted Pistoleer with Grenades.
 
 ^6Inventory:
 - Medpac ^3[CS3]
-- Forcefield ^4[CS4]
+- Forcefield ^3[CS4]
 - Assault Sentry
 
 ^8Attributes:

From 513276692921910f655d25360b38d205c09840fe Mon Sep 17 00:00:00 2001
From: shrine-engie <sweatbeetledickweed@gmail.com>
Date: Mon, 16 Feb 2026 17:07:18 -0500
Subject: [PATCH 25/82] Update yarael_poof.npc

Supposedly Yellow works better. let's see it
---
 z_MBLegends/ext_data/npcs/yarael_poof.npc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/z_MBLegends/ext_data/npcs/yarael_poof.npc b/z_MBLegends/ext_data/npcs/yarael_poof.npc
index 078b9c144..ebf3baa1c 100644
--- a/z_MBLegends/ext_data/npcs/yarael_poof.npc
+++ b/z_MBLegends/ext_data/npcs/yarael_poof.npc
@@ -15,7 +15,7 @@ yarael_poof
 	Pbchance 40
 	MBchance 4
 	SBchance 70
-	saberStyle	1
+	saberStyle	2
 	FP_HEAL			0
 	FP_LEVITATION	2
 	FP_SPEED		0

From dc05de874de33d44d8ffa821605abc4e85066c0d Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Tue, 17 Feb 2026 14:43:56 +0100
Subject: [PATCH 26/82] h7_HK47 str1 fix

---
 z_MBLegends/ext_data/mb2/character/h7_HK47.mbch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/z_MBLegends/ext_data/mb2/character/h7_HK47.mbch b/z_MBLegends/ext_data/mb2/character/h7_HK47.mbch
index 36ab2594c..fb2cee04a 100644
--- a/z_MBLegends/ext_data/mb2/character/h7_HK47.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h7_HK47.mbch
@@ -6,7 +6,7 @@ ClassInfo
 
  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_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
+ 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|MB_ATT_WOOKIE_STRENGTH,1
 	
  classflags      	CFL_SEEING_STEALTH
 

From 95174f4157934ef0fae42ebbdf456b8b4b760e23 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Tue, 17 Feb 2026 19:19:01 +0100
Subject: [PATCH 27/82] h2_JynE ion rifle rework

Now based on clone rifle and has only 8 ion blobs with more velocity that also knockback
---
 .../ext_data/mb2/character/h2_JynE.mbch       | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/h2_JynE.mbch b/z_MBLegends/ext_data/mb2/character/h2_JynE.mbch
index 0c7e8e100..8d77160fa 100644
--- a/z_MBLegends/ext_data/mb2/character/h2_JynE.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h2_JynE.mbch
@@ -3,12 +3,12 @@ ClassInfo
 	name  	"h2_JynE"
 	MBClass 		MB_CLASS_HERO
 	classNumberLimit	1
-	weapons 			WP_MANDO_PISTOL|WP_MELEE|WP_SABER|WP_BOWCASTER|WP_SONIC_NADE|WP_DET_PACK
+	weapons 			WP_MANDO_PISTOL|WP_MELEE|WP_SABER|WP_CLONE_RIFLE|WP_SONIC_NADE|WP_DET_PACK
 
  WP_SonicNadeFlags HELD_KNOCKBACK|HELD_PULSE
-	WP_BowcasterFlags  HELD_ALTRELOAD|HELD_PULSE|HELD_KNOCKBACK
+	WP_CloneRifleFlags  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
+	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_CLONERIFLE,2|MB_ATT_SONIC_DETONATOR,2|MB_ATT_DET_PACK,3|MB_ATT_DEXTERITY,1|MB_ATT_STRONGBLOBS,4
 	
 	forcepowers 	FP_SABER_OFFENSE,3
 	maxhealth 150
@@ -30,7 +30,7 @@ ClassInfo
 	skin  		"default"
 	uishader  	"models/players/jynerso/mb2_icon_default"
 
-	model_1 		"jyn_impgunner"
+	model_1 	"jyn_impgunner"
 	skin_1 		"default"
 	uishader_1 	"models/players/jyn_impgunner/mb2_icon_default"
 	
@@ -73,7 +73,7 @@ WeaponInfo0
 	ClipSize 			22
 	ReloadTimeModifier 	0.9
 	damageMod 1.1
- velocityMod 1.15
+	velocityMod 1.15
 	FPMult 				1.1
 	CustomAmmo			820
 	hasAnimOverrides 1
@@ -88,22 +88,20 @@ WeaponInfo0
 }
 WeaponInfo1
 {
-	WeaponToReplace 	WP_BOWCASTER
-	WeaponBasedOff  	WP_BOWCASTER
+WeaponToReplace	WP_CLONE_RIFLE
+WeaponBasedOff	WP_MANDO_PISTOL
 	NewWorldModel 		"models/weapons2/a180/a180_ion.glm"
 	NewViewModel		"models/weapons2/a180/model_ion.md3"
-	MissileEffect		 "rockets/MissilePulse" 
-	AltMissileEffect     "rockets/MissilePulse"
-	MuzzleEffect			"blaster/MuzzleFlash01B"
-	AltMuzzleEffect			"blaster/MuzzleFlash01B"
-	FlashSound0			"sound/weapons/rocket/alt_fire.mp3" 
-	AltFlashSound0			"sound/weapons/rocket/alt_fire.mp3" 	
+	AltMuzzleEffect		"blaster/MuzzleFlash01B"
+	AltFlashSound0		"sound/weapons/rocket/alt_fire.mp3" 	
 	Icon  				"gfx/hud/w_icon_a180_ion"
 	WeaponName  		"A180 Ion Attachment"
-	ChargeEffect		"gfx/effects/cloneFrontFlash"
-	clipSize 			4
-	CustomAmmo 		38
-	FPMult 				2.5
+	AltChargeEffect		"gfx/effects/cloneFrontFlash"
+	clipSize 		1
+	customammo 8
+	velocitymod 2.5
+	primFireEnabled	0
+	DamageMod 1.25
 	hasAnimOverrides 1
 	animStand BOTH_STAND1
 	animReadyRun TORSO_WEAPONREADY3
@@ -115,7 +113,6 @@ WeaponInfo1
 	AnimReadyNoAmmo BOTH_WESTARM5_ATTACK
 animCharge BOTH_WESTARM5_ATTACK
 }
-
 WeaponInfo2
 {
 	WeaponToReplace		WP_SABER			
@@ -161,9 +158,12 @@ A damage/fire rate-boosted pistoleer with advanced movement capabilities and a s
 -- 15% faster Velocity
 -- 10% more Dmg/FP Dmg
 -- 10% faster Reload
-- A180 Ion Attachment (Bowcaster 3)
--- Shocks/pushes on hit
--- 150% more FP Dmg
+- A180 Ion Attachment (Clone Rifle 2)
+-- Ion blobs (3)
+-- Pushes on hit
+-- 125% more Dmg
+-- 250% more velocity
+-- Alt only
 - Electro-Sonic Flashbangs (2)
 -- Shocks/sonics/blinds/pushes on det
 -- Prim only

From 389e82f39a591283905a334318ba90dc2917fae1 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Tue, 17 Feb 2026 19:36:14 +0100
Subject: [PATCH 28/82] v6_ScoutTr pistol charge mult

---
 z_MBLegends/ext_data/mb2/character/v6_ScoutTr.mbch | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/z_MBLegends/ext_data/mb2/character/v6_ScoutTr.mbch b/z_MBLegends/ext_data/mb2/character/v6_ScoutTr.mbch
index adef2bc61..7c3bd59b7 100644
--- a/z_MBLegends/ext_data/mb2/character/v6_ScoutTr.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v6_ScoutTr.mbch
@@ -109,6 +109,7 @@ ClassInfo
 	c_att_skill_5	MB_ATT_PISTOL
 	c_att_names_5	"EC-17 Hold-Out Pistol"
 	c_att_ranks_5	2,0
+	c_att_descs_5 "10% more charged FP drain"
 
 	c_att_skill_6	MB_ATT_PULSE_GRENADES
 	c_att_names_6	"Pulse Grenades"
@@ -139,6 +140,7 @@ ClassInfo
 	c_att_skill_15	MB_ATT_PISTOL
 	c_att_names_15	"EC-17 Hold-Out Pistol"
 	c_att_ranks_15	0,0,2
+	c_att_descs_15 "10% more charged FP drain"
 
 	c_att_skill_16	MB_ATT_BLASTER
 	c_att_names_16	"E-11 Blaster Rifle"
@@ -188,6 +190,7 @@ ClassInfo
 	c_att_skill_30	MB_ATT_PISTOL
 	c_att_names_30	"EC-17 Hold-Out Pistol"
 	c_att_ranks_30	0,0,2
+	c_att_descs_30 "10% more charged FP drain"
 
 	c_att_skill_31	MB_ATT_E_22
 	c_att_names_31	"E-22 Rec. Blaster Rifle"
@@ -245,6 +248,7 @@ WeaponName	"EC-17 Hold-out Blaster Pistol"
 ChargeSound	"sound/weapons/leia_pistol/altcharge.mp3"
 clipSize 24
 customAmmo 500
+FPChargeMult	1.1
 }
 WeaponInfo2
 {

From 58a7dfb3ba79c46af22e3ef9163d81784168c8a2 Mon Sep 17 00:00:00 2001
From: shrine-engie <sweatbeetledickweed@gmail.com>
Date: Tue, 17 Feb 2026 17:02:33 -0500
Subject: [PATCH 29/82] Update h1_Talz.mbch

Don't really like the combo potential even for when freeze gets fixed.

Removed freeze from Spear
Decreased splash radius from Snowballs to 0
---
 z_MBLegends/ext_data/mb2/character/h1_Talz.mbch | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/h1_Talz.mbch b/z_MBLegends/ext_data/mb2/character/h1_Talz.mbch
index f04d6b006..09ac1eafd 100644
--- a/z_MBLegends/ext_data/mb2/character/h1_Talz.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h1_Talz.mbch
@@ -8,7 +8,7 @@ ClassInfo
 
 	weapons			WP_MELEE|WP_SABER|WP_REPEATER|WP_T21
 
- WP_SaberFlags HELD_POISON|HELD_FREEZE
+ WP_SaberFlags HELD_POISON
 	WP_T21Flags			HELD_ALTRELOAD|HELD_STUN|HELD_POISON|HELD_FREEZE
 
 	attributes		MB_ATT_ASSEMBLE,1|MB_ATT_WOOKIE_STRENGTH,1|MB_ATT_WOOKIEE_FURY,3|MB_ATT_REPEATER|MB_ATT_T21,3|MB_ATT_GETUPS,2|MB_ATT_HEALING,2|MB_ATT_DEXTERITY,1
@@ -76,7 +76,7 @@ WeaponInfo1
 	NewWorldModel 	"models/weapons2/bow/bowcaster_w.glm"
 	NewViewModel 		"models/weapons2/bow/bowcaster.md3"
 	Icon 			"gfx/hud/w_icon_bow"
-	WeaponName 		"Longbow and Arrows"
+	WeaponName 		"Longbow"
 	FlashSound0 		"sound/300/wpn_bow_fire_01.wav"
 	FlashSound1 		"sound/300/wpn_bow_fire_02.wav"
 	FlashSound2 		"sound/300/wpn_bow_fire_03.wav"
@@ -133,6 +133,7 @@ WeaponInfo2
 	animAttackWalk BOTH_THERMAL_THROW2
 	animStand BOTH_TRIPLE3_DUALSTANCE
  rateMod 1.25
+ splashRadius 0
  selectSound "sound/player/footsteps/ice_walk2.mp3"
 }
 
@@ -145,7 +146,7 @@ Indigenous peoples with primitive weaponry. Fill your Resource bar with damage t
 -- Flat Kb: 85
 -- 5% faster RoF
 - Talz Spear (All styles Saber)
--- Freezes/poisons on hit
+-- Poisons on hit
 -- No Saber/Blaster Block
 -- 200% Spec Dmg mult
 -- 25% more Reach
@@ -153,9 +154,10 @@ Indigenous peoples with primitive weaponry. Fill your Resource bar with damage t
 -- Saber Throw ^3[CS1]
 --- 166% more Dmg
 - Snowballs (25) (Repeater)
+-- 100% less Splash Radius
 -- 25% slower RoF
 -- Sec only
-- Longbow and Arrows (T-21 3)
+- Longbow (T-21 3)
 -- Staggers/freezes/poisons on hit
 -- 35% faster Shot Swap
 -- 50% slower Mag Reload

From 9d26bcc6c4dc3486601c00a7d0c7e93482efce95 Mon Sep 17 00:00:00 2001
From: shrine-engie <sweatbeetledickweed@gmail.com>
Date: Tue, 17 Feb 2026 17:02:49 -0500
Subject: [PATCH 30/82] descs

---
 z_MBLegends/ext_data/mb2/character/h3_Arc.mbch  | 4 ++--
 z_MBLegends/ext_data/mb2/character/h4_Ewok.mbch | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/h3_Arc.mbch b/z_MBLegends/ext_data/mb2/character/h3_Arc.mbch
index d9496044d..e9c0fe03a 100644
--- a/z_MBLegends/ext_data/mb2/character/h3_Arc.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h3_Arc.mbch
@@ -250,12 +250,12 @@ ClassInfo
 	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_descs_31		"When combined with the below, equips 2 Pulses and a Scope"
 
 	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_descs_32	"When combined with the above, equips 2 Pulses and a Scope"
 
  c_att_skill_33		MB_ATT_PLX1
 	c_att_names_33		"PLX-1 Rocket Launcher"
diff --git a/z_MBLegends/ext_data/mb2/character/h4_Ewok.mbch b/z_MBLegends/ext_data/mb2/character/h4_Ewok.mbch
index 43fef7d93..dc6dea975 100644
--- a/z_MBLegends/ext_data/mb2/character/h4_Ewok.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h4_Ewok.mbch
@@ -99,7 +99,7 @@ WeaponInfo1
 	NewWorldModel 	"models/weapons2/bow/bowcaster_w.glm"
 	NewViewModel 		"models/weapons2/bow/bowcaster.md3"
 	Icon 			"gfx/hud/w_icon_bow"
-	WeaponName 		"Bow and Arrows"
+	WeaponName 		"Bow"
 	FlashSound0 		"sound/300/wpn_bow_fire_01.wav"
 	FlashSound1 		"sound/300/wpn_bow_fire_02.wav"
 	FlashSound2 		"sound/300/wpn_bow_fire_03.wav"
@@ -192,7 +192,7 @@ description "Ewok
 -- 85% less Splash Radius
 -- 80% slower Mag Reload
 -- Sec only
-- Bow and Arrows (T-21 1)
+- Bow (T-21 1)
 -- Pushes/staggers on hit
 -- 15% faster RoF
 -- 50% less Dmg

From 577ecfc7609d68c15237ebb0d794248ee7e47bed Mon Sep 17 00:00:00 2001
From: shrine-engie <sweatbeetledickweed@gmail.com>
Date: Tue, 17 Feb 2026 18:13:50 -0500
Subject: [PATCH 31/82] Update v7_Tarkin.mbch

Tarkin now holds a datapad for Test fire
---
 z_MBLegends/ext_data/mb2/character/v7_Tarkin.mbch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v7_Tarkin.mbch b/z_MBLegends/ext_data/mb2/character/v7_Tarkin.mbch
index 01503acaf..3407b3be1 100644
--- a/z_MBLegends/ext_data/mb2/character/v7_Tarkin.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v7_Tarkin.mbch
@@ -80,9 +80,9 @@ animCharge BOTH_PISTOL_ATTACK
 WeaponInfo1
 {
 	WeaponToReplace	WP_PLX1
-	WeaponBasedOff	WP_PLX1
-	NewWorldModel	"models/weapons2/dummyblaster/model.glm"
-	NewViewModel	"models/weapons2/dummy/dummy.md3"
+	WeaponBasedOff	WP_MANDO_PISTOL
+	NewWorldModel	"models/items/datapad.glm"
+	NewViewModel "models/items/datapad.md3"
 	Icon		"gfx/hud/w_icon_realTD"
 	WeaponName	"Test Fire"
 	FlashSound0	null

From 32b665539875751a085fa1736f6c620fe5504f8a Mon Sep 17 00:00:00 2001
From: shrine-engie <sweatbeetledickweed@gmail.com>
Date: Tue, 17 Feb 2026 21:12:45 -0500
Subject: [PATCH 32/82] minor spy fixes

---
 .../ext_data/mb2/character/v7_Kubaz.mbch      |  4 +-
 .../ext_data/mb2/character/v7_Saboteur.mbch   | 50 +++++++++----------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v7_Kubaz.mbch b/z_MBLegends/ext_data/mb2/character/v7_Kubaz.mbch
index b009bd068..8b2df4afe 100644
--- a/z_MBLegends/ext_data/mb2/character/v7_Kubaz.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v7_Kubaz.mbch
@@ -190,7 +190,7 @@ WeaponInfo2
 	NewWorldModel	"models/weapons2/vibroknife/model.glm"
 	NewViewModel	"models/weapons2/dummy/dummy.md3"
 	Icon	"gfx/hud/w_icon_prisonknife"
-	WeaponName	"Dual Vibroknifes"
+	WeaponName	"Dual Vibroknives"
 }
 
 ForceInfo0
@@ -208,7 +208,7 @@ Versatile assassins who can Disguise themselves and Cloak.
 
 ^2Weaponry:
 - Heavy Melee
-- Dual Vibroknifes (Cyan/Dual Sabers)
+- Dual Vibroknives (Dual/Cyan Sabers)
 -- No Saber/Blaster Block
 -- 60% less Reach
 
diff --git a/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch b/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch
index a4f2c320d..0f7ed097e 100644
--- a/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch
@@ -4,7 +4,7 @@ ClassInfo
 	MBClass			MB_CLASS_CLONETROOPER
 	classNumberLimit	2
 	extralives			1
-	weapons			WP_MELEE|WP_MANDO_PISTOL
+	weapons			WP_MELEE|WP_MANDO_PISTOL|WP_THERMAL
 	attributes		MB_ATT_AMMO,3|MB_ATT_MANDO_PISTOL,2|MB_ATT_GETUPS,2|MB_ATT_STAMINA,1|MB_ATT_QUICKTHROW,3
 
 	maxhealth		80
@@ -87,14 +87,14 @@ customSpecDesc_2 ""
 	c_att_descs_3 	"Shocks on hit, 20% more Velocity, 20% less RoF,
 10% more Dmg, 25% more FP Dmg, 10000% slower Mag Reload"
 
-	c_att_skill_4	MB_ATT_FRAGS
-	c_att_names_4	"Flashbang Grenades (Frags)"
-	c_att_ranks_4	2,2
-	c_att_descs_4 "Blinds on det, Sec only. 99.9% less Dmg, 40% faster RoF"
+	c_att_skill_4	MB_ATT_BASE_TD
+	c_att_names_4	"Thermal Grenades"
+	c_att_ranks_4	1,1
 
-	c_att_skill_5	MB_ATT_BASE_TD
-	c_att_names_5	"Thermal Grenades"
-	c_att_ranks_5	1,1
+	c_att_skill_5	MB_ATT_FRAGS
+	c_att_names_5	"Flashbang Grenades (Frags)"
+	c_att_ranks_5	2,2
+	c_att_descs_5 "Blinds on det, Sec only. 99.9% less Dmg, 40% faster RoF"
 
 	c_att_skill_6	MB_ATT_TRIP_MINES
 	c_att_names_6	"Trip Mines"
@@ -138,25 +138,25 @@ customSpecDesc_2 ""
 	c_att_names_17	"Disruptor Rifle"
 	c_att_ranks_17	2,6
 
-	c_att_skill_18	MB_ATT_FLECHETTE
-	c_att_names_18	"FC-1 Flechette Launcher"
-	c_att_ranks_18	4,5
-	c_att_descs_18 	"10% more Dmg, 10% more FP Dmg, 10000% slower Reload"
-
-	c_att_skill_19	MB_ATT_DEMP2
-	c_att_names_19	"DEMP2"
-	c_att_ranks_19	5
-	c_att_descs_19 	"Shocks on hit, 20% more Velocity, 20% less RoF,
+	c_att_skill_18	MB_ATT_DEMP2
+	c_att_names_18	"DEMP2"
+	c_att_ranks_18	5
+	c_att_descs_18 	"Shocks on hit, 20% more Velocity, 20% less RoF,
 10% more Dmg, 25% more FP Dmg, 40% slower Mag Reload"
 
-	c_att_skill_20	MB_ATT_FRAGS
-	c_att_names_20	"Flashbang Grenades (Frags)"
-	c_att_ranks_20	2,2,2
-	c_att_descs_20 "Blinds on det, Sec only. 99.9% less Dmg, 40% faster RoF"
+	c_att_skill_19	MB_ATT_FLECHETTE
+	c_att_names_19	"FC-1 Flechette Launcher"
+	c_att_ranks_19	4,5
+	c_att_descs_19 	"10% more Dmg, 10% more FP Dmg, 10000% slower Reload"
+
+	c_att_skill_20	MB_ATT_BASE_TD
+	c_att_names_20	"Thermal Grenades"
+	c_att_ranks_20	1,1,1
 
-	c_att_skill_21	MB_ATT_BASE_TD
-	c_att_names_21	"Thermal Grenades"
-	c_att_ranks_21	1,1,1
+	c_att_skill_21	MB_ATT_FRAGS
+	c_att_names_21	"Flashbang Grenades (Frags)"
+	c_att_ranks_21	2,2,2
+	c_att_descs_21 "Blinds on det, Sec only. 99.9% less Dmg, 40% faster RoF"
 
 	c_att_skill_22	MB_ATT_TRIP_MINES
 	c_att_names_22	"Trip Mines"
@@ -267,7 +267,7 @@ WeaponInfo3
 
 description	"Imperial Saboteur
 
-Elite soldiers with cloak.
+Elite soldiers with Cloak.
 
 ^2Weaponry:
 - Melee

From 38c047846dbd112acc7138b0248adc234958ee89 Mon Sep 17 00:00:00 2001
From: shrine-engie <sweatbeetledickweed@gmail.com>
Date: Tue, 17 Feb 2026 21:27:48 -0500
Subject: [PATCH 33/82] Update h8_Wreck.mbch

Probably reaching the upper limits of single class grenade spam, but, you know... it's fun

Frags 3 > 4
Thermal Detonators 1 > 2
Added 100% more Dmg to trip Mines
---
 z_MBLegends/ext_data/mb2/character/h8_Wreck.mbch | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/h8_Wreck.mbch b/z_MBLegends/ext_data/mb2/character/h8_Wreck.mbch
index a9e3c4e6c..d9c3d7464 100644
--- a/z_MBLegends/ext_data/mb2/character/h8_Wreck.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h8_Wreck.mbch
@@ -6,7 +6,7 @@ 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,3
+	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,2|MB_ATT_FRAGS,4
 	
 	forcepool 	100
 	resource	RESOURCE_RAGE
@@ -34,7 +34,7 @@ ClassInfo
 	
 	WP_DCCarbineFlags	HELD_ALTRELOAD
  WP_DetPackFlags HELD_KNOCKBACK|HELD_STUN|HELD_KNOCKDOWN
- WP_TripMineFlags HELD_KNOCKBACK|HELD_STUN|HELD_KNOCKDOWN
+ WP_TripMineFlags HELD_KNOCKBACK|HELD_STUN|HELD_KNOCKDOWN|HELD_HIGHDAMAGE
  WP_ThermalFlags HELD_KNOCKBACK|HELD_STUN|HELD_KNOCKDOWN
  WP_RealTDFlags HELD_KNOCKBACK|HELD_STUN|HELD_KNOCKDOWN
  WP_FragNadeFlags HELD_KNOCKBACK|HELD_STUN|HELD_KNOCKDOWN
@@ -113,7 +113,7 @@ NewHandsModel "models/weapons2/thermal/thermal_hand.md3"
 	damagemod 2
 }
 
-description	"CT-9903 aka 'Wrecker' 
+description	"CT-9903 aka 'Wrecker'
 
 A tanky Wookiee/gunner hybrid who specializes in mass destruction and area denial. Deploys explosives quickly.
 
@@ -124,15 +124,16 @@ A tanky Wookiee/gunner hybrid who specializes in mass destruction and area denia
 - DC-17m Repeating Blaster Rifle (DC Carbine 3)
 -- 50% slower Mag Reload
 - Heavy Thermal Grenades (6)
--- Staggers/pushes on det
+-- Staggers/pushes/trips on det
 -- 100% more Dmg
-- Frag Grenades (3)
--- Staggers/pushes on det
+- Frag Grenades (4)
+-- Staggers/pushes/trips on det
 -- Prim only
-- Thermal Detonator (1)
+- Thermal Detonators (2)
 -- Staggers/pushes/trips on det
 - Trip Mines (4)
 -- Staggers/pushes/trips on det
+-- 100% more Dmg
 - Det Packs (4)
 -- Staggers/pushes/trips on det
 

From 131dcf2559aa1bbce818aabd65476c7d97bd031a Mon Sep 17 00:00:00 2001
From: shrine-engie <sweatbeetledickweed@gmail.com>
Date: Tue, 17 Feb 2026 21:31:59 -0500
Subject: [PATCH 34/82] Update v9_SJugger.mbch

Guy's big, this makes sense.
---
 z_MBLegends/ext_data/mb2/character/v9_SJugger.mbch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v9_SJugger.mbch b/z_MBLegends/ext_data/mb2/character/v9_SJugger.mbch
index 99933208a..e79a974b3 100644
--- a/z_MBLegends/ext_data/mb2/character/v9_SJugger.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v9_SJugger.mbch
@@ -8,7 +8,7 @@ ClassInfo
 	
 	weapons		WP_SABER|WP_MELEE
 
-	attributes	MB_ATT_FORCEBLOCK,1|MB_ATT_DEFLECT,2|MB_ATT_FORCEFOCUS,1|MB_ATT_WOOKIE_STRENGTH,2|MB_ATT_HEALING,1|MB_ATT_GUN_DEFENSE,2|MB_ATT_FP_SABER_DEFENSE,2|MB_ATT_GETUPS,3
+	attributes	MB_ATT_FORCEBLOCK,1|MB_ATT_DEFLECT,2|MB_ATT_FORCEFOCUS,1|MB_ATT_WOOKIE_STRENGTH,2|MB_ATT_HEALING,1|MB_ATT_GUN_DEFENSE,2|MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_GETUPS,3
 
  saberDamageStyle SS_DESANN,280|SS_STRONG,280
 	saberstyle	SS_DESANN|SS_STRONG
@@ -86,8 +86,8 @@ A massive, tanky Sith with high-powered and long-reaching Lightsaber attacks.
 - Melee
 -- 10% faster RoF
 - Lightsaber (Red/Purple)
--- Saber/Blaster Defense (2)
--- Blaster Deflect (2)
+-- Saber Defense (3)
+-- Blaster Defense/Deflect (2)
 -- 125% Spec Dmg mult
 -- 25% more Reach
 -- 33% more Radius

From fc298e7b153f588c9589cf03d7abffec1e2b4061 Mon Sep 17 00:00:00 2001
From: shrine-engie <sweatbeetledickweed@gmail.com>
Date: Tue, 17 Feb 2026 23:30:22 -0500
Subject: [PATCH 35/82] Update h2_JynE.mbch

---
 z_MBLegends/ext_data/mb2/character/h2_JynE.mbch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/h2_JynE.mbch b/z_MBLegends/ext_data/mb2/character/h2_JynE.mbch
index 8d77160fa..fae9e2bd2 100644
--- a/z_MBLegends/ext_data/mb2/character/h2_JynE.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h2_JynE.mbch
@@ -159,11 +159,11 @@ A damage/fire rate-boosted pistoleer with advanced movement capabilities and a s
 -- 10% more Dmg/FP Dmg
 -- 10% faster Reload
 - A180 Ion Attachment (Clone Rifle 2)
--- Ion blobs (3)
+-- Ion Blobs (8)
 -- Pushes on hit
 -- 125% more Dmg
--- 250% more velocity
--- Alt only
+-- 250% more Velocity
+-- Sec only
 - Electro-Sonic Flashbangs (2)
 -- Shocks/sonics/blinds/pushes on det
 -- Prim only

From f0648798d9e5e0e7f74009b4b8699efd64af26b8 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Wed, 18 Feb 2026 11:41:07 +0100
Subject: [PATCH 36/82] v7_Saboteur description

Changed this to a DL-44 a while ago.
---
 z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch b/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch
index 0f7ed097e..4fef8af8f 100644
--- a/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch
@@ -271,7 +271,7 @@ Elite soldiers with Cloak.
 
 ^2Weaponry:
 - Melee
-- EC-17 Holdout Blaster Pistol (2)
+- DL-44 Heavy Blaster Pistol (2)
 -- 20% more Charged FP Dmg
 -- 5% faster RoF
 

From 6e2a3b4032bf129e988ba314705745ce13db59b9 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Wed, 18 Feb 2026 11:44:04 +0100
Subject: [PATCH 37/82] v6_MercSh blob description

---
 z_MBLegends/ext_data/mb2/character/v6_MercSh.mbch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v6_MercSh.mbch b/z_MBLegends/ext_data/mb2/character/v6_MercSh.mbch
index 39f267b16..0ba17a59a 100644
--- a/z_MBLegends/ext_data/mb2/character/v6_MercSh.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v6_MercSh.mbch
@@ -174,7 +174,7 @@ A suppressive fire class with rifles and area-control tools.
 - Melee
 - Disruptor Rifle (2)
 - DLT-19 Heavy Blaster Rifle (Clone Rifle 2)
--- Concussion/Ion Blobs (2)
+-- Concussion/Ion Blobs (4)
 -- 10% more Dmg
 -- 8% faster RoF
 -- Mag Reload

From 4f8b45dd47a2cdd1d38b6e7b4bb86e12465b593c Mon Sep 17 00:00:00 2001
From: nomad-marshall <180602055+nomad-marshall@users.noreply.github.com>
Date: Wed, 18 Feb 2026 10:42:49 -0500
Subject: [PATCH 38/82] imp armored commando WL fix

currently, because this class is BH, once the wrist laser is expended it never comes back and CS2 is permastuck to the flamer

by changing the class to mando and leaving flamer on CS1, that issue is fixed and it retains the intended behavior of being able to flamer+WL at the same time, comes with proper UI display of flamer+wl ammo (entire reason this was made BH is because there wasnt UI support at the time) and remains consistent with the rest of the classes that have these abilities
---
 z_MBLegends/ext_data/mb2/character/v5_ImpArmCom.mbch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v5_ImpArmCom.mbch b/z_MBLegends/ext_data/mb2/character/v5_ImpArmCom.mbch
index 3e2dad27c..44edc7920 100644
--- a/z_MBLegends/ext_data/mb2/character/v5_ImpArmCom.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v5_ImpArmCom.mbch
@@ -3,7 +3,7 @@
 ClassInfo
 {
 	name				"v5_ImpArmCom"
-	MBClass			MB_CLASS_BOUNTY_HUNTER
+	MBClass			MB_CLASS_MANDALORIAN
 	extralives		1
 	classNumberLimit	4
 
@@ -24,7 +24,7 @@ ClassInfo
 	BPmultiplier		0
 
 	special1 EAS_HI_FLAME
-	special2 EAS_HI_WRIST
+	special2 
  special3 EAS_NONE
 	uioverlay_l "gfx/icons/aerial"
 	uioverlay_r "gfx/icons/infantry"
@@ -83,7 +83,7 @@ WeaponInfo1
 
 description	"Imperial Armored Commando 
 
-2-life Mandos with an EE-4 and Beskar.
+2-life Mandos with an EE-4 and Beskar 3.
 
 ^2Weaponry:
 - Melee
@@ -102,4 +102,4 @@ description	"Imperial Armored Commando
 ^3Abilities:
 - Jetpack
 - Wrist Flamethrower ^3[CS1]
-- Wrist Laser ^3[CS2]"
\ No newline at end of file
+- Wrist Laser ^3[CS2]"

From bb086769848544888c869e4bbb20ff7786d0d8af Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Wed, 18 Feb 2026 18:19:38 +0100
Subject: [PATCH 39/82] h9_JediTG cost changes

Slightly better costs. Armor is worth more, drain is worth less.
---
 z_MBLegends/ext_data/mb2/character/h9_JediTG.mbch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/h9_JediTG.mbch b/z_MBLegends/ext_data/mb2/character/h9_JediTG.mbch
index d04a8b542..782099751 100644
--- a/z_MBLegends/ext_data/mb2/character/h9_JediTG.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h9_JediTG.mbch
@@ -47,11 +47,11 @@ ClassInfo
 	walkForward 		BOTH_WALK2
 
 isCustomBuild	1
-mbPoints	10
+mbPoints	13
 
 	c_att_skill_0	MB_ATT_RESPAWNS
 	c_att_names_0	"Reinforcement"
-	c_att_ranks_0	4
+	c_att_ranks_0	7
 
 	c_att_skill_1	MB_ATT_FP_LEVITATION
 	c_att_names_1	"Force Jump"
@@ -63,7 +63,7 @@ mbPoints	10
 
 	c_att_skill_3	MB_ATT_FP_DRAIN
 	c_att_names_3	"Force Drain ^3[CS2]"
-	c_att_ranks_3	0,4,4
+	c_att_ranks_3	0,1,2
 
 	c_att_skill_4	MB_ATT_FP_ABSORB
 	c_att_names_4	"Force Absorb ^3[CS3]"
@@ -75,7 +75,7 @@ mbPoints	10
 
 	c_att_skill_6	MB_ATT_ARMOUR
 	c_att_names_6	"Armor (90)"
-	c_att_ranks_6	1
+	c_att_ranks_6	3
 	c_att_descs_6	"40 default"
 }
 

From 27ea2cda5285ce3daac8e0d6d11f54c596bde7ec Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Wed, 18 Feb 2026 18:33:06 +0100
Subject: [PATCH 40/82] Default jedi/sith melee RoF option

Adds option to buy same melee RoF as other jedi/sith.
---
 .../ext_data/mb2/character/h9_JKnight.mbch    | 97 ++++++++++---------
 .../ext_data/mb2/character/v9_SAcolyte.mbch   | 96 +++++++++---------
 2 files changed, 104 insertions(+), 89 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/h9_JKnight.mbch b/z_MBLegends/ext_data/mb2/character/h9_JKnight.mbch
index c67098d60..d54964b9b 100644
--- a/z_MBLegends/ext_data/mb2/character/h9_JKnight.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h9_JKnight.mbch
@@ -13,9 +13,12 @@ ClassInfo
 	forcepowers	FP_SABER_OFFENSE,3
 	classflags CFL_NOPICKUPS
 	special2 EAS_NONE
-		
+
 	forcepool	100
 	rankForcepool 120
+
+	rateOfFire_Melee 1
+	rankROFMelee   0.95,0.9
 	
 	uioverlay_l "gfx/icons/frontline"
 	uioverlay_r "gfx/icons/infantry"
@@ -192,65 +195,69 @@ ClassInfo
 	isCustomBuild		1
 	mbPoints			80
 	
-	c_att_skill_0	MB_ATT_FP_LEVITATION
-	c_att_names_0	"Force Jump"
-	c_att_ranks_0	0,2,4
+	c_att_skill_0	MB_ATT_ROF_MELEE_MULTIPLIER
+	c_att_names_0	"Melee RoF (105/110%)"
+	c_att_ranks_0	1,1
 	
-	c_att_skill_1	MB_ATT_FP_PUSH
-	c_att_names_1	"Force Push"
-	c_att_ranks_1	4,4
-
-	c_att_skill_2	MB_ATT_FP_PULL
-	c_att_names_2	"Force Pull"
+	c_att_skill_1	MB_ATT_FP_LEVITATION
+	c_att_names_1	"Force Jump"
+	c_att_ranks_1	0,2,4
+	
+	c_att_skill_2	MB_ATT_FP_PUSH
+	c_att_names_2	"Force Push"
 	c_att_ranks_2	4,4
+
+	c_att_skill_3	MB_ATT_FP_PULL
+	c_att_names_3	"Force Pull"
+	c_att_ranks_3	4,4
 	
-	c_att_skill_3	MB_ATT_FP_SEE
-	c_att_names_3	"Force Sense"
-	c_att_ranks_3	2,2
+	c_att_skill_4	MB_ATT_FP_SEE
+	c_att_names_4	"Force Sense"
+	c_att_ranks_4	2,2
 	
-	c_att_skill_4	MB_ATT_FP_TELEPATHY
-	c_att_names_4	"Force Mind Trick ^3[CS4]"
-	c_att_ranks_4	6,2
+	c_att_skill_5	MB_ATT_FP_TELEPATHY
+	c_att_names_5	"Force Mind Trick ^3[CS4]"
+	c_att_ranks_5	6,2
 	
-	c_att_skill_5	MB_ATT_FP_SPEED
-	c_att_names_5	"Force Speed ^3[CS3]"
-	c_att_ranks_5	4,2
+	c_att_skill_6	MB_ATT_FP_SPEED
+	c_att_names_6	"Force Speed ^3[CS3]"
+	c_att_ranks_6	4,2
 	
-	c_att_skill_6	MB_ATT_POWER
-	c_att_names_6	"FP (120)"
-	c_att_ranks_6	8
+	c_att_skill_7	MB_ATT_POWER
+	c_att_names_7	"FP (120)"
+	c_att_ranks_7	8
 		
-	c_att_skill_7	MB_ATT_FORCEBLOCK
-	c_att_names_7	"Force Block"
-	c_att_ranks_7	4,6,4
+	c_att_skill_8	MB_ATT_FORCEBLOCK
+	c_att_names_8	"Force Block"
+	c_att_ranks_8	4,6,4
 	
-	c_att_skill_8	MB_ATT_SABER_FAST
-	c_att_names_8	"Fast Saber Styles"
-	c_att_ranks_8	4,0,2
- c_att_descs_8 "Blue, Cyan, both
+	c_att_skill_9	MB_ATT_SABER_FAST
+	c_att_names_9	"Fast Saber Styles"
+	c_att_ranks_9	4,0,2
+ c_att_descs_9 "Blue, Cyan, both
 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
+	c_att_skill_10	MB_ATT_SABER_STRONG
+	c_att_names_10	"Strong Saber Styles"
+	c_att_ranks_10	4,0,2
+ c_att_descs_10 "Red, Purple, both
 46/30% less Red/Purple Dmg"
 
-	c_att_skill_10	MB_ATT_FP_SABER_DEFENSE
-	c_att_names_10	"Saber Defense"
-	c_att_ranks_10	6,6
+	c_att_skill_11	MB_ATT_FP_SABER_DEFENSE
+	c_att_names_11	"Saber Defense"
+	c_att_ranks_11	6,6
 	
-	c_att_skill_11	MB_ATT_GUN_DEFENSE
-	c_att_names_11	"Blaster Defense"
-	c_att_ranks_11	8,8	
+	c_att_skill_12	MB_ATT_GUN_DEFENSE
+	c_att_names_12	"Blaster Defense"
+	c_att_ranks_12	8,8	
 	
-	c_att_skill_12	MB_ATT_DEFLECT
-	c_att_names_12	"Blaster Deflect"
-	c_att_ranks_12	4,4
+	c_att_skill_13	MB_ATT_DEFLECT
+	c_att_names_13	"Blaster Deflect"
+	c_att_ranks_13	4,4
 
-	c_att_skill_13	MB_ATT_FP_SABERTHROW
-	c_att_names_13	"Saber Throw ^3[CS1]"
-	c_att_ranks_13	2,2,2
+	c_att_skill_14	MB_ATT_FP_SABERTHROW
+	c_att_names_14	"Saber Throw ^3[CS1]"
+	c_att_ranks_14	2,2,2
 }
 
 description	"Jedi Knight 
diff --git a/z_MBLegends/ext_data/mb2/character/v9_SAcolyte.mbch b/z_MBLegends/ext_data/mb2/character/v9_SAcolyte.mbch
index b090b232a..b5ddc5c10 100644
--- a/z_MBLegends/ext_data/mb2/character/v9_SAcolyte.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v9_SAcolyte.mbch
@@ -17,6 +17,10 @@ ClassInfo
 	
 	forcepool		100
 	rankForcepool 120
+
+	rateOfFire_Melee 1
+	rankROFMelee   0.95,0.9
+
 	customred			0.784
 	customgreen			0
 	customblue			0
@@ -113,66 +117,70 @@ ClassInfo
 	isCustomBuild		1
 
 	mbPoints			80
+
+	c_att_skill_0	MB_ATT_ROF_MELEE_MULTIPLIER
+	c_att_names_0	"Melee RoF (105/110%)"
+	c_att_ranks_0	1,1
 	
-	c_att_skill_0	MB_ATT_FP_LEVITATION
-	c_att_names_0	"Force Jump"
-	c_att_ranks_0	0,2,4
-	
-	c_att_skill_1	MB_ATT_FP_PUSH
-	c_att_names_1	"Force Push"
-	c_att_ranks_1	4,4
+	c_att_skill_1	MB_ATT_FP_LEVITATION
+	c_att_names_1	"Force Jump"
+	c_att_ranks_1	0,2,4
 
-	c_att_skill_2	MB_ATT_FP_PULL
-	c_att_names_2	"Force Pull"
+	c_att_skill_2	MB_ATT_FP_PUSH
+	c_att_names_2	"Force Push"
 	c_att_ranks_2	4,4
+
+	c_att_skill_3	MB_ATT_FP_PULL
+	c_att_names_3	"Force Pull"
+	c_att_ranks_3	4,4
 	
-	c_att_skill_3	MB_ATT_FP_SEE
-	c_att_names_3	"Force Sense"
-	c_att_ranks_3	2,2
+	c_att_skill_4	MB_ATT_FP_SEE
+	c_att_names_4	"Force Sense"
+	c_att_ranks_4	2,2
 	
-	c_att_skill_4	MB_ATT_FP_LIGHTNING
-	c_att_names_4	"Force Lightning ^3[CS4]"
-	c_att_ranks_4	4,6
+	c_att_skill_5	MB_ATT_FP_LIGHTNING
+	c_att_names_5	"Force Lightning ^3[CS4]"
+	c_att_ranks_5	4,6
 	
-	c_att_skill_5	MB_ATT_FP_GRIP
-	c_att_names_5	"Force Grip ^3[CS3]"
-	c_att_ranks_5	2,4
+	c_att_skill_6	MB_ATT_FP_GRIP
+	c_att_names_6	"Force Grip ^3[CS3]"
+	c_att_ranks_6	2,4
 	
-	c_att_skill_6	MB_ATT_POWER
-	c_att_names_6	"FP (120)"
-	c_att_ranks_6	8
+	c_att_skill_7	MB_ATT_POWER
+	c_att_names_7	"FP (120)"
+	c_att_ranks_7	8
 
-	c_att_skill_7	MB_ATT_FORCEBLOCK
-	c_att_names_7	"Force Block"
-	c_att_ranks_7	4,6,4
+	c_att_skill_8	MB_ATT_FORCEBLOCK
+	c_att_names_8	"Force Block"
+	c_att_ranks_8	4,6,4
 	
-	c_att_skill_8	MB_ATT_SABER_FAST
-	c_att_names_8	"Fast Saber Styles"
-	c_att_ranks_8	4,0,2
- c_att_descs_8 "Blue, Cyan, both
+	c_att_skill_9	MB_ATT_SABER_FAST
+	c_att_names_9	"Fast Saber Styles"
+	c_att_ranks_9	4,0,2
+ c_att_descs_9 "Blue, Cyan, both
 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
+	c_att_skill_10	MB_ATT_SABER_STRONG
+	c_att_names_10	"Strong Saber Styles"
+	c_att_ranks_10	4,0,2
+ c_att_descs_10 "Red, Purple, both
 46/30% less Red/Purple Dmg"
 
-	c_att_skill_10	MB_ATT_FP_SABER_DEFENSE
-	c_att_names_10	"Saber Defense"
-	c_att_ranks_10	6,6
+	c_att_skill_11	MB_ATT_FP_SABER_DEFENSE
+	c_att_names_11	"Saber Defense"
+	c_att_ranks_11	6,6
 	
-	c_att_skill_11	MB_ATT_GUN_DEFENSE
-	c_att_names_11	"Blaster Defense"
-	c_att_ranks_11	8,8	
+	c_att_skill_12	MB_ATT_GUN_DEFENSE
+	c_att_names_12	"Blaster Defense"
+	c_att_ranks_12	8,8	
 	
-	c_att_skill_12	MB_ATT_DEFLECT
-	c_att_names_12	"Blaster Deflect"
-	c_att_ranks_12	4,4
+	c_att_skill_13	MB_ATT_DEFLECT
+	c_att_names_13	"Blaster Deflect"
+	c_att_ranks_13	4,4
 
-	c_att_skill_13	MB_ATT_FP_SABERTHROW
-	c_att_names_13	"Saber Throw ^3[CS1]"
-	c_att_ranks_13	2,2,2
+	c_att_skill_14	MB_ATT_FP_SABERTHROW
+	c_att_names_14	"Saber Throw ^3[CS1]"
+	c_att_ranks_14	2,2,2
 }
 
 description	"Dark Acolyte 

From 6a45cec93f38a572b68c0fc576382b863200cb0e Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Thu, 19 Feb 2026 15:41:07 +0100
Subject: [PATCH 41/82] h3_BossNass melee held_slow remove

No reason for him to be slower in melee now that his str2 is gone.
---
 z_MBLegends/ext_data/mb2/character/h3_BossNass.mbch | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/h3_BossNass.mbch b/z_MBLegends/ext_data/mb2/character/h3_BossNass.mbch
index efb900745..dc4eddc49 100644
--- a/z_MBLegends/ext_data/mb2/character/h3_BossNass.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h3_BossNass.mbch
@@ -23,7 +23,7 @@ ClassInfo
 	resource RESOURCE_FORCE
 	classflags	CFL_BLOODYMELEE|CFL_STRONGAGAINSTPHYSICAL|CFL_NOPICKUPS
 	
-	WP_MeleeFlags HELD_SLOW
+	//WP_MeleeFlags HELD_SLOW
 	WP_PulseNadeFlags HELD_HIGHDAMAGE
 	WP_ConcussionFlags HELD_ALTRELOAD
  WP_PLX1Flags HELD_STUN|HELD_KNOCKBACK
@@ -122,7 +122,6 @@ A tanky rocketeer with a large protective Energy Shield and inherent aquatic res
 
 ^2Weaponry:
 - Melee
--- 15% slower Movement
 - Boss's Personal Energy Shield (Staff Saber)
 -- Saber Defense (1)
 -- Blaster Defense (3)

From dd56e31657576fa5511051d8d925a0dff7ac8670 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Thu, 19 Feb 2026 16:27:55 +0100
Subject: [PATCH 42/82] v7_Noghri dual spec and point costs

This is a nerf to 2 life noghri and a buff to 1 life noghri.
1 Life noghri get less max health and speed, as intended (who ever takes less then the max before?)
Pistol made a bit more expensive. Taking defense and a reinforcement leaves you will less other options (probably the noghri stick and something like health or speed only).
Whistling birds 2 unlocked for 1 lifes to get a bit more out of that (makes sense since 1 life automatically has half the birds a 2 life would have in total).
Slightly more max hp for 1 lifes to make them worth it too (and works better with heal break point).
---
 .../ext_data/mb2/character/v7_Noghri.mbch     | 122 +++++++++++++-----
 1 file changed, 91 insertions(+), 31 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v7_Noghri.mbch b/z_MBLegends/ext_data/mb2/character/v7_Noghri.mbch
index 5780aedb0..474b6958e 100644
--- a/z_MBLegends/ext_data/mb2/character/v7_Noghri.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v7_Noghri.mbch
@@ -7,7 +7,7 @@ ClassInfo
 	attributes	MB_ATT_FP_SABER_DEFENSE,0|MB_ATT_DEXTERITY,1|MB_ATT_AMMO,3|MB_ATT_WOOKIEE_FURY,3|MB_ATT_BUNNY_HOP,1
 
 	maxhealth	100
-	rankhealth 120,140
+	rankhealth 120,150
 	
 	maxarmor	60
 	rankarmor 80
@@ -65,18 +65,27 @@ ClassInfo
 	isCustomBuild	1
 	mbPoints	50
 	
+hasCustomSpec 2
+isOnlyOneSpec 1
+customSpecName_1 "Assassin"
+customSpecIcon_1 "gfx/menus/alpha/icon_weap_crouch"
+customSpecDesc_1 "Potential 2-life"
+customSpecName_2 "Elite"
+customSpecIcon_2 "gfx/menus/alpha/icon_saberdual"
+customSpecDesc_2 "1-life"
+	
 c_att_skill_0	MB_ATT_FP_SABER_DEFENSE
 c_att_names_0	"Saber Defense"
-c_att_ranks_0	15
+c_att_ranks_0	16
 
 c_att_skill_1	MB_ATT_PISTOL
 c_att_names_1	"Disruptor Pistol"
-c_att_ranks_1	5
+c_att_ranks_1	8
 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_ranks_2	6
 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
@@ -85,47 +94,98 @@ c_att_ranks_3	4,4,2
 
 c_att_skill_4	MB_ATT_FP_SEE
 c_att_names_4	"Hunter (Force) Sense"
-c_att_ranks_4	5
+c_att_ranks_4	4
 
 c_att_skill_5	MB_ATT_RESPAWNS
 c_att_names_5	"Reinforcement"
-c_att_ranks_5	25
+c_att_ranks_5	26
 
 c_att_skill_6	MB_ATT_HEALTH
-c_att_names_6	"HP (120/140)"
-c_att_ranks_6 	2,2
+c_att_names_6	"HP (120)"
+c_att_ranks_6 	2
 
-c_att_skill_7 	MB_ATT_HEALING
-c_att_names_7 	"Healing"
+c_att_skill_7	MB_ATT_BASESPEED
+c_att_names_7	"Speed (240)"
 c_att_ranks_7 	2
 
-c_att_skill_8	MB_ATT_ARMOUR
-c_att_names_8	"Armor (80)"
-c_att_ranks_8	4
+c_att_skill_8	MB_ATT_KNOCKDOWN_ROLL
+c_att_names_8	"Knockdown Roll"
+c_att_ranks_8	10
+
+c_att_skill_9 	MB_ATT_FLIPKICK
+c_att_names_9 	"Flipkick ^3[Contact Jump]"
+c_att_ranks_9	4
+
+c_att_skill_10	MB_ATT_WHISTLINGBIRD
+c_att_names_10	"Whistling Birds ^3[CS1]"
+c_att_ranks_10	4
+
+c_att_skill_11	MB_ATT_DEXTERITY
+c_att_names_11	"Dexterity ^3[CS2]"
+c_att_ranks_11 	0,0,4
+
+c_att_skill_12 	MB_ATT_POISON_DART
+c_att_names_12 	"Poison Darts ^3[CS3 Melee]"
+c_att_ranks_12 	2,2
+
+
+c_att_skill_15	MB_ATT_FP_SABER_DEFENSE
+c_att_names_15	"Saber Defense"
+c_att_ranks_15	15
+
+c_att_skill_16	MB_ATT_PISTOL
+c_att_names_16	"Disruptor Pistol"
+c_att_ranks_16	6
+c_att_descs_16 "120% more Dmg/FP Dmg, 75% more Velocity, 50% slower RoF, 
+1500% slower Reload"
+c_att_skill_17	MB_ATT_BOWCASTER
+c_att_names_17	"Stokhli Spray Stick (Bowcaster)"
+c_att_ranks_17	5
+c_att_descs_17 "Poisons/staggers on hit, 25% more Dmg, 100% more FP Dmg,
+50% less Velocity, 50% slower RoF, 40% slower Mag Reload"
+c_att_skill_18	MB_ATT_T21
+c_att_names_18	"T-21 Heavy Blaster"
+c_att_ranks_18	3,3,2
+
+c_att_skill_19	MB_ATT_FP_SEE
+c_att_names_19	"Hunter (Force) Sense"
+c_att_ranks_19	4
+
+c_att_skill_20	MB_ATT_HEALTH
+c_att_names_20	"HP (120/150)"
+c_att_ranks_20	1,2
+
+c_att_skill_21	MB_ATT_HEALING
+c_att_names_21	"Healing"
+c_att_ranks_21	2
+
+c_att_skill_22	MB_ATT_ARMOUR
+c_att_names_22	"Armor (80)"
+c_att_ranks_22	2
 
-c_att_skill_9	MB_ATT_BASESPEED
-c_att_names_9	"Speed (240/260)"
-c_att_ranks_9 	2,4
+c_att_skill_23	MB_ATT_BASESPEED
+c_att_names_23	"Speed (240/260)"
+c_att_ranks_23	2,4
 
-c_att_skill_10	MB_ATT_KNOCKDOWN_ROLL
-c_att_names_10	"Knockdown Roll"
-c_att_ranks_10	8
+c_att_skill_24	MB_ATT_KNOCKDOWN_ROLL
+c_att_names_24	"Knockdown Roll"
+c_att_ranks_24	10
 
-c_att_skill_11 	MB_ATT_FLIPKICK
-c_att_names_11 	"Flipkick ^3[Contact Jump]"
-c_att_ranks_11	4
+c_att_skill_25 	MB_ATT_FLIPKICK
+c_att_names_25 	"Flipkick ^3[Contact Jump]"
+c_att_ranks_25	4
 
-c_att_skill_12	MB_ATT_WHISTLINGBIRD
-c_att_names_12	"Whistling Birds ^3[CS1]"
-c_att_ranks_12	4
+c_att_skill_26	MB_ATT_WHISTLINGBIRD
+c_att_names_26	"Whistling Birds ^3[CS1]"
+c_att_ranks_26	3,3
 
-c_att_skill_13	MB_ATT_DEXTERITY
-c_att_names_13	"Dexterity ^3[CS2]"
-c_att_ranks_13 	0,0,4
+c_att_skill_27	MB_ATT_DEXTERITY
+c_att_names_27	"Dexterity ^3[CS2]"
+c_att_ranks_27 	0,0,4
 
-c_att_skill_14 	MB_ATT_POISON_DART
-c_att_names_14 	"Poison Darts ^3[CS3 Melee]"
-c_att_ranks_14 	2,2,2
+c_att_skill_28 	MB_ATT_POISON_DART
+c_att_names_28 	"Poison Darts ^3[CS3 Melee]"
+c_att_ranks_28 	2,2,2
 }
 
 WeaponInfo0

From 5b6870809bcc5f83659aa138fe3229821d30526f Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Thu, 19 Feb 2026 16:36:26 +0100
Subject: [PATCH 43/82] v7_Reelo -Melee RoF

---
 z_MBLegends/ext_data/mb2/character/v7_Reelo.mbch | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/z_MBLegends/ext_data/mb2/character/v7_Reelo.mbch b/z_MBLegends/ext_data/mb2/character/v7_Reelo.mbch
index 0c7cae9e0..ea4f61a9c 100644
--- a/z_MBLegends/ext_data/mb2/character/v7_Reelo.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v7_Reelo.mbch
@@ -19,6 +19,8 @@ ClassInfo
 	maxarmor		125
 	holdables     HI_EWEB
 
+	rateOfFire_Melee 1.1
+
 	special1	EAS_HI_EWEB
 	special2 EAS_HI_DASH
 	
@@ -144,6 +146,7 @@ A criminal kingpin armed to the teeth with various weapons. Cannot be knocked do
 
 ^2Weaponry:
 - Melee
+-- 10% slower RoF
 - Overcharged E-11 Blaster Rifle (2)
 -- 15% faster RoF
 -- Sec only

From 5320cd4e6981646109ac4a38fdb6383fb46b65ba Mon Sep 17 00:00:00 2001
From: shrine-engie <sweatbeetledickweed@gmail.com>
Date: Thu, 19 Feb 2026 23:46:07 -0500
Subject: [PATCH 44/82] Increases heavy style damage

---
 z_MBLegends/ext_data/mb2/character/h10_JTradition.mbch | 4 ++--
 z_MBLegends/ext_data/mb2/character/h10_LukeSky.mbch    | 4 ++--
 z_MBLegends/ext_data/mb2/character/h10_Starkiller.mbch | 4 ++--
 z_MBLegends/ext_data/mb2/character/h3_Cander.mbch      | 4 ++--
 z_MBLegends/ext_data/mb2/character/h4_Finn.mbch        | 4 ++--
 z_MBLegends/ext_data/mb2/character/h4_Kyle.mbch        | 4 ++--
 z_MBLegends/ext_data/mb2/character/h8_Tarfful.mbch     | 2 +-
 z_MBLegends/ext_data/mb2/character/h9_Anakin.mbch      | 4 ++--
 z_MBLegends/ext_data/mb2/character/h9_JBrute.mbch      | 4 ++--
 z_MBLegends/ext_data/mb2/character/h9_JCrusader.mbch   | 4 ++--
 z_MBLegends/ext_data/mb2/character/h9_JKnight.mbch     | 4 ++--
 z_MBLegends/ext_data/mb2/character/h9_JSage.mbch       | 2 +-
 z_MBLegends/ext_data/mb2/character/h9_JSword.mbch      | 4 ++--
 z_MBLegends/ext_data/mb2/character/h9_JediTG.mbch      | 4 ++--
 z_MBLegends/ext_data/mb2/character/h9_Windu.mbch       | 2 +-
 z_MBLegends/ext_data/mb2/character/v10_Jerec.mbch      | 4 ++--
 z_MBLegends/ext_data/mb2/character/v10_Malak.mbch      | 4 ++--
 z_MBLegends/ext_data/mb2/character/v10_Nihilus.mbch    | 4 ++--
 z_MBLegends/ext_data/mb2/character/v10_Palp.mbch       | 2 +-
 z_MBLegends/ext_data/mb2/character/v8_HuttW.mbch       | 2 +-
 z_MBLegends/ext_data/mb2/character/v9_Maul.mbch        | 4 ++--
 z_MBLegends/ext_data/mb2/character/v9_SAcolyte.mbch    | 4 ++--
 z_MBLegends/ext_data/mb2/character/v9_SJugger.mbch     | 2 +-
 z_MBLegends/ext_data/mb2/character/v9_SWarr.mbch       | 4 ++--
 z_MBLegends/ext_data/mb2/character/v9_Savage.mbch      | 4 ++--
 z_MBLegends/ext_data/mb2/character/v9_Vader.mbch       | 2 +-
 26 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/h10_JTradition.mbch b/z_MBLegends/ext_data/mb2/character/h10_JTradition.mbch
index 82e250160..24eac5c9f 100644
--- a/z_MBLegends/ext_data/mb2/character/h10_JTradition.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h10_JTradition.mbch
@@ -19,7 +19,7 @@ ClassInfo
  rateOfFire_Melee 0.9
  damageGiven 1.1
 	saberstyle		SS_MEDIUM|SS_STRONG|SS_TAVION
-	saberDamageStyle SS_TAVION,130|SS_STRONG,280|SS_MEDIUM,240
+	saberDamageStyle SS_TAVION,130|SS_STRONG,300|SS_MEDIUM,240
 	BPmultiplier	0.9
 	APmultiplier	0.7
 	ASmultiplier 	0.97
@@ -67,7 +67,7 @@ A master who eschews dueling prowess for strong Force powers and excellent defen
 - Lightsaber (Yellow/Red/Cyan)
 -- Saber Defense (2)
 -- Blaster Defense/Deflect (3)
--- 46% less Red/8% more Cyan Dmg
+-- 42% less Red/8% more Cyan Dmg
 -- 125% Spec Dmg mult
 -- EX Saber Throw (2) ^3[CS1]
 --- 33% more Dmg
diff --git a/z_MBLegends/ext_data/mb2/character/h10_LukeSky.mbch b/z_MBLegends/ext_data/mb2/character/h10_LukeSky.mbch
index 73678f67f..a2b2efd6b 100644
--- a/z_MBLegends/ext_data/mb2/character/h10_LukeSky.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h10_LukeSky.mbch
@@ -25,7 +25,7 @@ ClassInfo
 	forceregen 1.05
 
  saberSpecialDamage 1.25
-	saberDamageStyle SS_FAST,130|SS_STRONG,280|SS_MEDIUM,240
+	saberDamageStyle SS_FAST,130|SS_STRONG,300|SS_MEDIUM,240
 	saberstyle			SS_FAST|SS_MEDIUM|SS_STRONG
 	saberThrowDamage 40
 	BPmultiplier		1.3
@@ -180,7 +180,7 @@ A defensive duelist/support who can share his Force Powers with allies.
 -- Saber Defense (3)
 -- Blaster Defense (2)
 -- Blaster Deflect (3)
--- 46% less Red/8% more Blue Dmg
+-- 42% less Red/8% more Blue Dmg
 -- 125% Spec Dmg mult
 -- EX Saber Throw (2) ^3[CS1]
 --- 33% more Dmg
diff --git a/z_MBLegends/ext_data/mb2/character/h10_Starkiller.mbch b/z_MBLegends/ext_data/mb2/character/h10_Starkiller.mbch
index cc8b86d3c..5e29fa309 100644
--- a/z_MBLegends/ext_data/mb2/character/h10_Starkiller.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h10_Starkiller.mbch
@@ -27,7 +27,7 @@ ClassInfo
  damageGiven 1.1
  rateOfFire_melee 0.9
 	saberThrowDamage 50
- saberDamageStyle SS_DESANN,280|SS_DUAL,260
+ saberDamageStyle SS_DESANN,300|SS_DUAL,260
  saberstyle SS_DESANN
  saberSpecialDamage 1.25
  saber1 saber_marek_legends_s
@@ -71,7 +71,7 @@ A Jedi/Sith hybrid sporting a strong combination of Force Powers.
 -- EX Saber Throw (3) ^3[CS1]
 --- 66% more Dmg
 > Single (Purple)
--- 30% less Dmg
+-- 25% less Dmg
 > Double (Dual)
 
 ^5Force Powers:
diff --git a/z_MBLegends/ext_data/mb2/character/h3_Cander.mbch b/z_MBLegends/ext_data/mb2/character/h3_Cander.mbch
index 39e92b80b..e81fe1d89 100644
--- a/z_MBLegends/ext_data/mb2/character/h3_Cander.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h3_Cander.mbch
@@ -28,7 +28,7 @@ ClassInfo
 
 	saber1				"vibroblade_canderous_legends"
 	saberstyle  		SS_MEDIUM|SS_STRONG
-	saberDamageStyle SS_STRONG,280
+	saberDamageStyle SS_STRONG,300
 
 	classflags		CFL_STRONGAGAINSTPHYSICAL
 
@@ -170,7 +170,7 @@ A tanky hybrid who can spec into Blaster and Saber skills.
 - Canderous' Vibroblade (Yellow/Red Saber)
 -- No Blaster Block
 -- 48% more Reach
--- 46% less Red Dmg
+-- 42% less Red Dmg
 
 ^8Attributes:
 - 20% less Kb Taken
diff --git a/z_MBLegends/ext_data/mb2/character/h4_Finn.mbch b/z_MBLegends/ext_data/mb2/character/h4_Finn.mbch
index ee15333d8..7248f0d1c 100644
--- a/z_MBLegends/ext_data/mb2/character/h4_Finn.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h4_Finn.mbch
@@ -20,7 +20,7 @@ ClassInfo
 	saber1			saber_finn_legends
 	sabercolor		4
 	saberstyle		SS_MEDIUM|SS_STRONG|SS_DESANN
- saberDamageStyle SS_STRONG,280|SS_DESANN,280
+ saberDamageStyle SS_STRONG,300|SS_DESANN,300
 	APmultiplier	1.20
 
 	forcepowers		FP_SABER_OFFENSE,1|FP_SEE,1
@@ -94,7 +94,7 @@ 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
+-- 42/25% less Red/Purple Dmg
 - Glie-44 Blaster Pistol (Clone Pistol 2)
 -- 10% more Dmg/FP Dmg
 -- 10% more Velocity
diff --git a/z_MBLegends/ext_data/mb2/character/h4_Kyle.mbch b/z_MBLegends/ext_data/mb2/character/h4_Kyle.mbch
index 21a536b0a..d9dbf8f49 100644
--- a/z_MBLegends/ext_data/mb2/character/h4_Kyle.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h4_Kyle.mbch
@@ -22,7 +22,7 @@ ClassInfo
 	//damageGiven 1.1
 	basespeed		238
  rateOfFire_Melee .9
- saberDamageStyle SS_STRONG,280|SS_FAST,130|SS_MEDIUM,240
+ saberDamageStyle SS_STRONG,300|SS_FAST,130|SS_MEDIUM,240
 	saberstyle		SS_MEDIUM|SS_STRONG|SS_FAST
 	saberThrowDamage 40
  saberSpecialDamage 1.25
@@ -173,7 +173,7 @@ A Force-sensitive mercenary who must choose his own path.
 - Lightsaber (Yellow/Red/Blue)
 -- Saber/Blaster Defense (0)
 -- Blaster Deflect (2)
--- 46% less Red/8% more Blue Dmg
+-- 42% less Red/8% more Blue Dmg
 -- 125% Spec Dmg mult
 -- EX Saber Throw (2) ^3[CS1]
 --- 33% more Dmg
diff --git a/z_MBLegends/ext_data/mb2/character/h8_Tarfful.mbch b/z_MBLegends/ext_data/mb2/character/h8_Tarfful.mbch
index 1ff184fc8..cbcd9fe42 100644
--- a/z_MBLegends/ext_data/mb2/character/h8_Tarfful.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h8_Tarfful.mbch
@@ -13,7 +13,7 @@ ClassInfo
 	
 	saber1	ryyk_A_legends
  saberstyle	SS_DESANN
- saberDamageStyle SS_DESANN,280
+ saberDamageStyle SS_DESANN,300
 	APmultiplier   1.5
 	BPmultiplier 	.75
 	
diff --git a/z_MBLegends/ext_data/mb2/character/h9_Anakin.mbch b/z_MBLegends/ext_data/mb2/character/h9_Anakin.mbch
index 686ab2a05..b7e98b917 100644
--- a/z_MBLegends/ext_data/mb2/character/h9_Anakin.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h9_Anakin.mbch
@@ -21,7 +21,7 @@ ClassInfo
 	forceregen	1.1
 	resource RESOURCE_FORCE
 
- saberDamageStyle SS_STRONG,280|SS_DESANN,280|SS_MEDIUM,240
+ saberDamageStyle SS_STRONG,300|SS_DESANN,300|SS_MEDIUM,240
 	saberstyle		SS_MEDIUM|SS_STRONG|SS_DESANN
  saberSpecialDamage 1.35
 	APmultiplier		1.2
@@ -91,7 +91,7 @@ A master of combat - possessing equally strong Lightsaber and Force abilities.
 - Lightsaber (Yellow/Red/Purple)
 -- Saber Defense (3)
 -- Blaster Defense/Deflect (2)
--- 30/46% less Red/Purple Dmg
+-- 42/25% less Red/Purple Dmg
 -- 135% Spec Dmg mult
 -- EX Saber Throw (1) ^3[CS1]
 --- 50% more Dmg
diff --git a/z_MBLegends/ext_data/mb2/character/h9_JBrute.mbch b/z_MBLegends/ext_data/mb2/character/h9_JBrute.mbch
index 8c3057f5e..abbe8fbb2 100644
--- a/z_MBLegends/ext_data/mb2/character/h9_JBrute.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h9_JBrute.mbch
@@ -33,7 +33,7 @@ ClassInfo
 	ASmultiplier		.95
 	CSmultiplier	1.05
 	saberThrowDamage	70
- saberDamageStyle SS_STAFF,280|SS_STRONG,320
+ saberDamageStyle SS_STAFF,280|SS_STRONG,360
  saberSpecialDamage 1.25
 	rankDmgGiven 1.5 
 
@@ -111,7 +111,7 @@ 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  "30% less Dmg"
 
 	c_att_skill_5		MB_ATT_DMG_GIVEN_MULTIPLIER
 	c_att_names_5		"Dmg Given (150%)"
diff --git a/z_MBLegends/ext_data/mb2/character/h9_JCrusader.mbch b/z_MBLegends/ext_data/mb2/character/h9_JCrusader.mbch
index 842e7a3d0..bf71378b0 100644
--- a/z_MBLegends/ext_data/mb2/character/h9_JCrusader.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h9_JCrusader.mbch
@@ -23,7 +23,7 @@ ClassInfo
 	ASmultiplier 	1.05
 	CSmultiplier 	1.15
 	saberstyle			SS_STRONG|SS_MEDIUM
-	saberDamageStyle SS_STRONG,280|SS_MEDIUM,240
+	saberDamageStyle SS_STRONG,300|SS_MEDIUM,240
 	saberThrowDamage 40
  saberSpecialDamage 1.25
 	special2 EAS_FP_ABSORB
@@ -105,7 +105,7 @@ An offense-oriented Jedi, characterized by powerful Lightsaber swings and solid
 - Lightsaber (Yellow/Red)
 -- Saber Defense (3)
 -- Blaster Defense/Deflect (2)
--- 46% less Red Dmg
+-- 42% less Red Dmg
 -- 125% Spec Dmg mult
 -- Saber Throw ^3[CS1]
 --- 33% more Dmg
diff --git a/z_MBLegends/ext_data/mb2/character/h9_JKnight.mbch b/z_MBLegends/ext_data/mb2/character/h9_JKnight.mbch
index d54964b9b..5c1cad6ab 100644
--- a/z_MBLegends/ext_data/mb2/character/h9_JKnight.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h9_JKnight.mbch
@@ -5,7 +5,7 @@ ClassInfo
 	name		"h9_JKnight"
 	weapons		WP_MELEE|WP_SABER
 	attributes	MB_ATT_FORCEFOCUS,1|MB_ATT_FP_SABER_DEFENSE,0|MB_ATT_GUN_DEFENSE,0|MB_ATT_DEFLECT,0|MB_ATT_SABER_MEDIUM,2
- saberDamageStyle SS_STRONG,280|SS_DESANN,280|SS_FAST,130|SS_TAVION,130
+ saberDamageStyle SS_STRONG,300|SS_DESANN,300|SS_FAST,130|SS_TAVION,130
 	extralives	1
 
 	MBClass		MB_CLASS_JEDI
@@ -241,7 +241,7 @@ ClassInfo
 	c_att_names_10	"Strong Saber Styles"
 	c_att_ranks_10	4,0,2
  c_att_descs_10 "Red, Purple, both
-46/30% less Red/Purple Dmg"
+42/25% less Red/Purple Dmg"
 
 	c_att_skill_11	MB_ATT_FP_SABER_DEFENSE
 	c_att_names_11	"Saber Defense"
diff --git a/z_MBLegends/ext_data/mb2/character/h9_JSage.mbch b/z_MBLegends/ext_data/mb2/character/h9_JSage.mbch
index eb70e2814..0e3c794bd 100644
--- a/z_MBLegends/ext_data/mb2/character/h9_JSage.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h9_JSage.mbch
@@ -19,7 +19,7 @@ Classinfo
  
 	saberThrowDamage 40
 	saberstyle		SS_STRONG
- saberDamageStyle SS_STRONG,280
+ saberDamageStyle SS_STRONG,300
  saberSpecialDamage 1.25
 	maxhealth			60
 	forcepool			75
diff --git a/z_MBLegends/ext_data/mb2/character/h9_JSword.mbch b/z_MBLegends/ext_data/mb2/character/h9_JSword.mbch
index 38553a043..a7c542aa9 100644
--- a/z_MBLegends/ext_data/mb2/character/h9_JSword.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h9_JSword.mbch
@@ -22,7 +22,7 @@ ClassInfo
 	special3		EAS_FP_SPEED
 	special4 	EAS_FP_PROTECT
 
- saberDamageStyle SS_STRONG,280|SS_DESANN,280|SS_FAST,160|SS_TAVION,160|SS_MEDIUM,240
+ saberDamageStyle SS_STRONG,300|SS_DESANN,300|SS_FAST,160|SS_TAVION,160|SS_MEDIUM,240
 	saberstyle		SS_MEDIUM
  saberSpecialDamage 1.35
  saberThrowDamage 50
@@ -90,7 +90,7 @@ ClassInfo
 	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"
+42/25% less Red/Purple Dmg"
 }
 
 description	"Jedi Swordmaster
diff --git a/z_MBLegends/ext_data/mb2/character/h9_JediTG.mbch b/z_MBLegends/ext_data/mb2/character/h9_JediTG.mbch
index 782099751..0cf5d9bc6 100644
--- a/z_MBLegends/ext_data/mb2/character/h9_JediTG.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h9_JediTG.mbch
@@ -26,7 +26,7 @@ ClassInfo
  special2 EAS_FP_DRAIN
  special3 EAS_FP_ABSORB
  special4 EAS_FP_PROTECT
- saberDamageStyle SS_STAFF,260|SS_DESANN,280
+ saberDamageStyle SS_STAFF,260|SS_DESANN,300
  saberSpecialDamage 1.25
 	saberstyle	SS_STAFF|SS_DESANN
 	saber1		saber_temple_guard_legends
@@ -100,7 +100,7 @@ Slow, defensively-oriented Jedi with self-buffing abilities.
 - Lightsaber Pike (Staff/Purple)
 -- Saber Defense (3)
 -- Blaster Defense/Deflect (2)
--- 30% less Purple Dmg
+-- 25% less Purple Dmg
 -- 21% less Reach
 
 ^5Force Powers:
diff --git a/z_MBLegends/ext_data/mb2/character/h9_Windu.mbch b/z_MBLegends/ext_data/mb2/character/h9_Windu.mbch
index 1b9604d9e..ab32dfa8a 100644
--- a/z_MBLegends/ext_data/mb2/character/h9_Windu.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h9_Windu.mbch
@@ -18,7 +18,7 @@ ClassInfo
 	special2 EAS_FP_ABSORB
 
 	saberstyle		SS_STRONG|SS_DESANN
-	saberDamageStyle SS_DESANN,280|SS_STRONG,280
+	saberDamageStyle SS_STRONG,300|SS_DESANN,300
  saberSpecialDamage 1.3
 	saberMaxChain 4
 	APmultiplier	1.2
diff --git a/z_MBLegends/ext_data/mb2/character/v10_Jerec.mbch b/z_MBLegends/ext_data/mb2/character/v10_Jerec.mbch
index 9463d0478..ebd7a9a8e 100644
--- a/z_MBLegends/ext_data/mb2/character/v10_Jerec.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v10_Jerec.mbch
@@ -33,7 +33,7 @@ ClassInfo
 	APmultiplier		1.05
 	BPmultiplier		1.3
 	saberThrowDamage 40
- saberDamageStyle SS_STRONG,280|SS_TAVION,130|SS_MEDIUM,240
+ saberDamageStyle SS_STRONG,300|SS_TAVION,130|SS_MEDIUM,240
  saberStanceAnim BOTH_STAND9
 
 	uioverlay "gfx/icons/support"
@@ -73,7 +73,7 @@ A support Sith with perma-Sense and Force projectiles.
 -- Saber Defense (3)
 -- Blaster Defense (2)
 -- Blaster Deflect (3)
--- 46% less Red/8% more Cyan Dmg
+-- 42% less Red/8% more Cyan Dmg
 -- 125% Spec Dmg mult
 -- EX Saber Throw (3) ^3[CS1]
 --- 30% more Dmg
diff --git a/z_MBLegends/ext_data/mb2/character/v10_Malak.mbch b/z_MBLegends/ext_data/mb2/character/v10_Malak.mbch
index 3efbedf31..c40f8a444 100644
--- a/z_MBLegends/ext_data/mb2/character/v10_Malak.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v10_Malak.mbch
@@ -30,7 +30,7 @@ ClassInfo
 	saber1				saber_malak_legends
 	sabercolor			0
 	saberstyle			SS_MEDIUM|SS_DESANN|SS_TAVION
- saberDamageStyle SS_DESANN,280|SS_TAVION,130|SS_MEDIUM,240
+ saberDamageStyle SS_DESANN,300|SS_TAVION,130|SS_MEDIUM,240
 	saberSpecialDamage 1.25
 
 	special2 EAS_FP_ABSORB
@@ -62,7 +62,7 @@ A tanky support class that prioritizes a strong defense and gunner assistance.
 - Lightsaber (Yellow/Purple/Cyan)
 -- Saber/Blaster Defense (3)
 -- Blaster Deflect (3)
--- 30% less Purple/8% more Cyan Dmg
+-- 25% less Purple/8% more Cyan Dmg
 -- 125% Spec Dmg Mult
 -- 15% more Reach
 -- 10% less Radius
diff --git a/z_MBLegends/ext_data/mb2/character/v10_Nihilus.mbch b/z_MBLegends/ext_data/mb2/character/v10_Nihilus.mbch
index f51632cb1..425ba75a8 100644
--- a/z_MBLegends/ext_data/mb2/character/v10_Nihilus.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v10_Nihilus.mbch
@@ -24,7 +24,7 @@ ClassInfo
 
 	saber1				saber_nihilus_legends
 	sabercolor			0
- saberDamageStyle SS_DESANN,280|SS_MEDIUM,240
+ saberDamageStyle SS_DESANN,300|SS_MEDIUM,240
  saberSpecialDamage 1.25
 	saberstyle			SS_MEDIUM|SS_DESANN
 	APmultiplier		1.05
@@ -62,7 +62,7 @@ An offensive support Sith with crowd control abilities.
 -- 10% faster RoF
 - Lightsaber (Yellow/Purple)
 -- Saber/Blaster Defense (2)
--- 30% less Purple Dmg
+-- 25% less Purple Dmg
 -- 125% Spec Dmg mult
 -- 10% more Reach
 -- 10% less Radius
diff --git a/z_MBLegends/ext_data/mb2/character/v10_Palp.mbch b/z_MBLegends/ext_data/mb2/character/v10_Palp.mbch
index fa07d404f..da763f89e 100644
--- a/z_MBLegends/ext_data/mb2/character/v10_Palp.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v10_Palp.mbch
@@ -29,7 +29,7 @@ Classinfo
 	BPmultiplier	0.95
 	ASmultiplier 1.02
  saberThrowDamage 40
- saberDamageStyle SS_STRONG,280
+ saberDamageStyle SS_STRONG,300
 	saberSpecialDamage 1.86
 	saber1		saber_sidious_legacy
 	sabercolor	0
diff --git a/z_MBLegends/ext_data/mb2/character/v8_HuttW.mbch b/z_MBLegends/ext_data/mb2/character/v8_HuttW.mbch
index 2b75f01ff..cc5ca06f2 100644
--- a/z_MBLegends/ext_data/mb2/character/v8_HuttW.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v8_HuttW.mbch
@@ -30,7 +30,7 @@ ClassInfo
 	BPmultiplier		0
 	saber1 bardiche_jabba_legends
 	saberstyle SS_STRONG
- saberDamageStyle SS_STRONG,280
+ saberDamageStyle SS_STRONG,300
 
 	special1	EAS_HI_FURY
 special2 EAS_HI_BARGE
diff --git a/z_MBLegends/ext_data/mb2/character/v9_Maul.mbch b/z_MBLegends/ext_data/mb2/character/v9_Maul.mbch
index cf4d48cd7..f3e3b7241 100644
--- a/z_MBLegends/ext_data/mb2/character/v9_Maul.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v9_Maul.mbch
@@ -23,7 +23,7 @@ ClassInfo
 	damageGiven  1.1
  rateOfFire_Melee .9
  saberSpecialDamage 1.25
-	saberDamageStyle SS_STAFF,260|SS_DESANN,280
+	saberDamageStyle SS_STAFF,260|SS_DESANN,300
 	saberstyle SS_STAFF|SS_DESANN
 	BPmultiplier		1.18
 	APmultiplier		1.18
@@ -109,7 +109,7 @@ A highly aggressive Sith that excels in flanking due to enhanced movement and sw
 -- Blaster Defense (2)
 -- Blaster Deflect (2)
 -- 18% more Reach
--- 30% less Purple Dmg
+-- 25% less Purple Dmg
 -- 125% Spec Dmg mult
 -- EX Saber Throw (1) ^3[CS1]
 --- 33% more Dmg
diff --git a/z_MBLegends/ext_data/mb2/character/v9_SAcolyte.mbch b/z_MBLegends/ext_data/mb2/character/v9_SAcolyte.mbch
index b5ddc5c10..08d475d89 100644
--- a/z_MBLegends/ext_data/mb2/character/v9_SAcolyte.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v9_SAcolyte.mbch
@@ -13,7 +13,7 @@ ClassInfo
 	classflags CFL_NOPICKUPS
 	special2 EAS_NONE
 
- saberDamageStyle SS_STRONG,280|SS_DESANN,280|SS_FAST,130|SS_TAVION,130
+ saberDamageStyle SS_STRONG,300|SS_DESANN,300|SS_FAST,130|SS_TAVION,130
 	
 	forcepool		100
 	rankForcepool 120
@@ -164,7 +164,7 @@ ClassInfo
 	c_att_names_10	"Strong Saber Styles"
 	c_att_ranks_10	4,0,2
  c_att_descs_10 "Red, Purple, both
-46/30% less Red/Purple Dmg"
+42/25% less Red/Purple Dmg"
 
 	c_att_skill_11	MB_ATT_FP_SABER_DEFENSE
 	c_att_names_11	"Saber Defense"
diff --git a/z_MBLegends/ext_data/mb2/character/v9_SJugger.mbch b/z_MBLegends/ext_data/mb2/character/v9_SJugger.mbch
index e79a974b3..f27792cce 100644
--- a/z_MBLegends/ext_data/mb2/character/v9_SJugger.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v9_SJugger.mbch
@@ -10,7 +10,7 @@ ClassInfo
 
 	attributes	MB_ATT_FORCEBLOCK,1|MB_ATT_DEFLECT,2|MB_ATT_FORCEFOCUS,1|MB_ATT_WOOKIE_STRENGTH,2|MB_ATT_HEALING,1|MB_ATT_GUN_DEFENSE,2|MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_GETUPS,3
 
- saberDamageStyle SS_DESANN,280|SS_STRONG,280
+ saberDamageStyle SS_STRONG,300|SS_DESANN,300
 	saberstyle	SS_DESANN|SS_STRONG
 	APmultiplier	1.15
 	BPmultiplier	1.35
diff --git a/z_MBLegends/ext_data/mb2/character/v9_SWarr.mbch b/z_MBLegends/ext_data/mb2/character/v9_SWarr.mbch
index fd27332a4..18af7ecf0 100644
--- a/z_MBLegends/ext_data/mb2/character/v9_SWarr.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v9_SWarr.mbch
@@ -20,7 +20,7 @@ ClassInfo
 	forceregen  1.1
 	saberThrowDamage 45
 	saberstyle		SS_MEDIUM|SS_STRONG|SS_DESANN
- saberDamageStyle SS_STRONG,280|SS_DESANN,280|SS_MEDIUM,240
+ saberDamageStyle SS_STRONG,300|SS_DESANN,300|SS_MEDIUM,240
 	APmultiplier		1.2
 	BPmultiplier		1.15
 	ASmultiplier 		1.1
@@ -78,7 +78,7 @@ A master of combat - possessing equally strong Lightsaber and Force abilities.
 - Lightsaber (Yellow/Red/Purple)
 -- Saber Defense (3)
 -- Blaster Defense/Deflect (2)
--- 46/30% less Red/Purple Dmg
+-- 42/25% less Red/Purple Dmg
 -- 135% Spec Dmg mult
 -- EX Saber Throw (1) ^3[CS1]
 --- 50% more Dmg
diff --git a/z_MBLegends/ext_data/mb2/character/v9_Savage.mbch b/z_MBLegends/ext_data/mb2/character/v9_Savage.mbch
index 703cd2d21..9667fe6b1 100644
--- a/z_MBLegends/ext_data/mb2/character/v9_Savage.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v9_Savage.mbch
@@ -21,7 +21,7 @@ ClassInfo
 	ASmultiplier		.95
 	CSmultiplier	1.05
 	saberThrowDamage	70
- saberDamageStyle SS_STAFF,280|SS_STRONG,320
+ saberDamageStyle SS_STAFF,280|SS_STRONG,360
 	rankDmgGiven 1.5 
  saberSpecialDamage 1.25
 	forceregen			0.90
@@ -99,7 +99,7 @@ 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  "30% less Dmg"
 	
 	c_att_skill_5		MB_ATT_DMG_GIVEN_MULTIPLIER
 	c_att_names_5		"Dmg Given (150%)"
diff --git a/z_MBLegends/ext_data/mb2/character/v9_Vader.mbch b/z_MBLegends/ext_data/mb2/character/v9_Vader.mbch
index 7c0a09d6e..4f4ef0f9e 100644
--- a/z_MBLegends/ext_data/mb2/character/v9_Vader.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v9_Vader.mbch
@@ -41,7 +41,7 @@ ClassInfo
 	CSMultiplier		1
 	saberMaxChain 4
 	saberstyle			SS_DESANN|SS_STRONG
-	saberDamageStyle SS_DESANN,280|SS_STRONG,280
+	saberDamageStyle SS_DESANN,300|SS_STRONG,300
  saberSpecialDamage 1.25
 	saber1				  Vader_legends1
 	sabercolor			0

From 07a2693e31d1c188fba524202d7c23123460f9da Mon Sep 17 00:00:00 2001
From: Unguided <buektomi@gmail.com>
Date: Fri, 20 Feb 2026 21:27:41 +0100
Subject: [PATCH 45/82] HK47

removed HK-50 and 51 skin variants
---
 z_MBLegends/ext_data/mb2/character/h7_HK47.mbch | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/h7_HK47.mbch b/z_MBLegends/ext_data/mb2/character/h7_HK47.mbch
index fb2cee04a..218d0ecd8 100644
--- a/z_MBLegends/ext_data/mb2/character/h7_HK47.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h7_HK47.mbch
@@ -45,14 +45,6 @@ ClassInfo
 	model_1		"hk47"
 	skin_1			"hk47_old"
 	uishader_1		"models/players/hk47/mb2_icon_hk47_old"
-
-	model_2		"hk47"
-	skin_2			"HK50"
-	uishader_2		"models/players/hk47/mb2_icon_hk50"
-	
-	model_3		"hk47"
-	skin_3			"hk51"
-	uishader_3		"models/players/hk47/mb2_icon_hk51"
 }
 
 WeaponInfo0
@@ -128,7 +120,7 @@ ForceInfo0
 	LoopSound "sound/ambience/cp_02_lp.wav"
 }
 
-description "HK-series Assassin Droid 
+description "HK-47 Assassin Droid 
 
 A heavily armored assassin equipped to terminate Force users. 
 

From 8fd6bb0f56427034c1d4acd4ca6c88c52bad64b9 Mon Sep 17 00:00:00 2001
From: Unguided <buektomi@gmail.com>
Date: Sat, 21 Feb 2026 17:58:25 +0100
Subject: [PATCH 46/82] moved Darth Krayt to Sith Assassin and Darth Talon to
 Sith Warrior

---
 .../ext_data/mb2/character/v9_SAssass.mbch    | 24 +++++++++----------
 .../ext_data/mb2/character/v9_SDuel.mbch      |  7 ------
 .../ext_data/mb2/character/v9_SWarr.mbch      |  9 ++++++-
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch b/z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch
index ad9544e7d..4b1c42a13 100644
--- a/z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch
@@ -51,27 +51,27 @@ ClassInfo
 	skin_3		"default"
 	uishader_3	"models/players/boc_aseca/mb2_icon_default"
 	
-	model_4	"Darthtalon"
+	model_4	"darthcognus"
 	skin_4		"default"
-	uishader_4	"models/players/darthtalon/mb2_icon_default"
+	uishader_4	"models/players/darthcognus/mb2_icon_default"
 	
-	model_5	"Darthcognus"
+	model_5	"darthkrayt2"
 	skin_5		"default"
-	uishader_5	"models/players/darthcognus/mb2_icon_default"
+	uishader_5	"models/players/darthkrayt2/mb2_icon_default"
 		
-	saber1			alora_legends
+	saber1		alora_legends
 	sabercolor		0
-	saber2			alora_legends
+	saber2		alora_legends
 	saber2color	0
 	
-	saber1_1			saber_boc_legends
-	sabercolor_1		5
-	saber2_1			saber_boc_legends
+	saber1_1		saber_boc_legends
+	sabercolor_1	5
+	saber2_1		saber_boc_legends
 	saber2color_1	5
 	
-	saber1_2			saber_talon
-	sabercolor_2		0
-	saber2_2			saber_talon2
+	saber1_2		saber_talon
+	sabercolor_2	0
+	saber2_2		saber_asharad
 	saber2color_2	0
 }
 
diff --git a/z_MBLegends/ext_data/mb2/character/v9_SDuel.mbch b/z_MBLegends/ext_data/mb2/character/v9_SDuel.mbch
index 4b21defdf..d4157fdc2 100644
--- a/z_MBLegends/ext_data/mb2/character/v9_SDuel.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v9_SDuel.mbch
@@ -59,16 +59,9 @@ rateOfFire_Melee .9
 	model_3	"Dooku_pyjama"
 	skin_3		"default"
 	uishader_3	 "models/players/dooku_pyjama/mb2_icon_default"
-	
-	model_4	"Darthkrayt2"
-	skin_4		"default"
-	uishader_4	"models/players/darthkrayt2/mb2_icon_default"
 
 	saber1		saber_dooku_legacy
 	sabercolor		0
-
-	saber1_1		saber_asharad
-	sabercolor_1	0
 	
 	isCustomBuild		1
 	mbPoints			2
diff --git a/z_MBLegends/ext_data/mb2/character/v9_SWarr.mbch b/z_MBLegends/ext_data/mb2/character/v9_SWarr.mbch
index 18af7ecf0..9a61919af 100644
--- a/z_MBLegends/ext_data/mb2/character/v9_SWarr.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v9_SWarr.mbch
@@ -51,9 +51,13 @@ ClassInfo
 	skin_2		"srobehup"
 	uishader_2	"models/players/anakin2/mb2_icon_srobehup"
 	
-	model_3		"Darthcaedus"
+	model_3		"darthcaedus"
 	skin_3		"default"
 	uishader_3	"models/players/darthcaedus/mb2_icon_default"
+	
+	model_4		"darthtalon"
+	skin_4		"default"
+	uishader_4	"models/players/darthtalon/mb2_icon_default"
 
 	saber1		saber_revan
 	sabercolor		0
@@ -66,6 +70,9 @@ ClassInfo
 	
 	saber1_3		saber_jacen
 	sabercolor_3	0
+	
+	saber1_4		saber_talon
+	sabercolor_4	0
 }
 
 description	"Sith Warrior 

From 5c61fbca53045df03125bf4b45eb58a8d9cae752 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Sat, 21 Feb 2026 18:20:41 +0100
Subject: [PATCH 47/82] h9_Windu update

Speed 3 restored at the cost of 50% knockbackTaken reduction. Not like you need knockback immunity on him anyway.
---
 z_MBLegends/ext_data/mb2/character/h9_Windu.mbch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/h9_Windu.mbch b/z_MBLegends/ext_data/mb2/character/h9_Windu.mbch
index ab32dfa8a..bcb83c6a3 100644
--- a/z_MBLegends/ext_data/mb2/character/h9_Windu.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h9_Windu.mbch
@@ -8,7 +8,7 @@ ClassInfo
 
 	weapons			WP_MELEE|WP_SABER
 
-	forcepowers		FP_SABER_OFFENSE,3|FP_LEVITATION,3|FP_PUSH,2|FP_PULL,2|FP_ABSORB,1|FP_GRIP,1|FP_SEE,1|FP_SPEED,2|FP_SABERTHROW,3
+	forcepowers		FP_SABER_OFFENSE,3|FP_LEVITATION,3|FP_PUSH,2|FP_PULL,2|FP_ABSORB,1|FP_GRIP,1|FP_SEE,1|FP_SPEED,3|FP_SABERTHROW,3
 
 	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
 
@@ -29,7 +29,7 @@ ClassInfo
 
 	damageGiven     1.10
  rateOfFire_Melee 0.9
-	knockbackTaken 0.25
+	knockbackTaken 0.75
 
 	forceregen 1.25
 	forcepool		110
@@ -80,9 +80,9 @@ A powerful, versatile Jedi with an increased Lightsaber chain limit and a variet
 - Sense (1)
 - Grip (1) ^3[CS3]
 - Absorb (1) ^3[CS2]
-- Speed (2) ^3[CS4]
+- Speed (3) ^3[CS4]
 
 ^8Attributes:
-- 75% less Kb Taken
+- 25% less Kb Taken
 - Healing (1)
 - Force Block/Focus (2)"
\ No newline at end of file

From e05fb4fd33f4d8ca60dc37ba7e06793d07299522 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Sat, 21 Feb 2026 20:23:19 +0100
Subject: [PATCH 48/82] Env protection update

Adds more enviromental protection to a number of classes at level 1. For SBD it's a buy option.
---
 .../ext_data/mb2/character/h5_AstroR2.mbch       |  5 +++--
 z_MBLegends/ext_data/mb2/character/h5_Paz.mbch   |  3 ++-
 z_MBLegends/ext_data/mb2/character/h8_Wreck.mbch |  3 ++-
 .../ext_data/mb2/character/v10_Ragnos.mbch       |  3 ++-
 z_MBLegends/ext_data/mb2/character/v3_IG88.mbch  |  3 ++-
 z_MBLegends/ext_data/mb2/character/v5_Durge.mbch |  3 ++-
 z_MBLegends/ext_data/mb2/character/v8_Burg.mbch  |  3 ++-
 z_MBLegends/ext_data/mb2/character/v8_SBD.mbch   | 16 ++++++++++------
 8 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/h5_AstroR2.mbch b/z_MBLegends/ext_data/mb2/character/h5_AstroR2.mbch
index f405788d1..1f77d1f60 100644
--- a/z_MBLegends/ext_data/mb2/character/h5_AstroR2.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h5_AstroR2.mbch
@@ -12,7 +12,7 @@ ClassInfo
 	WP_SaberFlags HELD_STUN
  WP_ThrowerFlags HELD_ALTRELOAD
 
- attributes	MB_ATT_JETPACK,1|MB_ATT_WRISTLASER,1|MB_ATT_FP_MIRALUKA,1|MB_ATT_WOOKIE_STRENGTH,2|MB_ATT_DISP_BLOCK,2|MB_ATT_DISP_FORCE,2|MB_ATT_DISP_ARMOR,2|MB_ATT_THROWER_FLAME|MB_ATT_USE_DISTANCE,1|MB_ATT_FUELREGEN,2|MB_ATT_FLIPKICK,1|MB_ATT_HEALING,2|MB_ATT_CORTOSIS,1|MB_ATT_SHIELD_RECHARGE,1
+ attributes	MB_ATT_JETPACK,1|MB_ATT_WRISTLASER,1|MB_ATT_FP_MIRALUKA,1|MB_ATT_WOOKIE_STRENGTH,2|MB_ATT_DISP_BLOCK,2|MB_ATT_DISP_FORCE,2|MB_ATT_DISP_ARMOR,2|MB_ATT_THROWER_FLAME|MB_ATT_USE_DISTANCE,1|MB_ATT_FUELREGEN,2|MB_ATT_FLIPKICK,1|MB_ATT_HEALING,2|MB_ATT_CORTOSIS,1|MB_ATT_SHIELD_RECHARGE,1|MB_ATT_ENV_PROT,1
 	
 	forcepowers	FP_SEE,1|FP_PUSH,1|FP_SPEED,3|FP_LIGHTNING,1
 
@@ -172,7 +172,8 @@ A plucky support with numerous gadgets.
 ^8Attributes:
 - 25% faster Hacking
 - Strength (2)
-- Base Dmg Taken 
+- Base Dmg Taken
+- Environmental Protection (1)
 - Cortosis (1)
 - Armor Regen (1)
 - Healing (2)
diff --git a/z_MBLegends/ext_data/mb2/character/h5_Paz.mbch b/z_MBLegends/ext_data/mb2/character/h5_Paz.mbch
index 25d45bb0c..8ee0017a8 100644
--- a/z_MBLegends/ext_data/mb2/character/h5_Paz.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h5_Paz.mbch
@@ -5,7 +5,7 @@ ClassInfo
 	name 			"h5_Paz"
 	MBClass 			MB_CLASS_WOOKIE
 	weapons 			WP_MELEE|WP_MINIGUN|WP_SABER
-	attributes 		MB_ATT_HEALING,1|MB_ATT_BLAST_ARMOUR,1|MB_ATT_AMMO,3|MB_ATT_JETPACK,1|MB_ATT_WOOKIE_STRENGTH,2|MB_ATT_BESKAR,3|MB_ATT_MINIGUN,3|MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_GUN_DEFENSE,3|MB_ATT_DEFLECT,0|MB_ATT_WOOKIEE_FURY,2
+	attributes 		MB_ATT_HEALING,1|MB_ATT_BLAST_ARMOUR,1|MB_ATT_AMMO,3|MB_ATT_JETPACK,1|MB_ATT_WOOKIE_STRENGTH,2|MB_ATT_BESKAR,3|MB_ATT_MINIGUN,3|MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_GUN_DEFENSE,3|MB_ATT_DEFLECT,0|MB_ATT_WOOKIEE_FURY,2|MB_ATT_ENV_PROT,1
 	
 	forcepowers FP_RAGE,3
 	
@@ -126,6 +126,7 @@ A slow, Jetpack-equipped tank who converts damage into resource.
 - Fury (2)
 -- Resource Regen: 1/.25s to 15
 - Strength (2)
+- Environmental Protection (1)
 - Beskar (3)
 - Blast Armor
 - Physical Resist
diff --git a/z_MBLegends/ext_data/mb2/character/h8_Wreck.mbch b/z_MBLegends/ext_data/mb2/character/h8_Wreck.mbch
index d9c3d7464..e51943090 100644
--- a/z_MBLegends/ext_data/mb2/character/h8_Wreck.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h8_Wreck.mbch
@@ -6,7 +6,7 @@ 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,2|MB_ATT_FRAGS,4
+	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,2|MB_ATT_FRAGS,4|MB_ATT_ENV_PROT,1
 	
 	forcepool 	100
 	resource	RESOURCE_RAGE
@@ -144,6 +144,7 @@ A tanky Wookiee/gunner hybrid who specializes in mass destruction and area denia
 - Strength (2)
 - Fury (1)
 - Healing (2)
+- Environmental Protection (1)
 - Blast Armor
 - Physical Resist
 
diff --git a/z_MBLegends/ext_data/mb2/character/v10_Ragnos.mbch b/z_MBLegends/ext_data/mb2/character/v10_Ragnos.mbch
index 8fd2e4f34..add68e24b 100644
--- a/z_MBLegends/ext_data/mb2/character/v10_Ragnos.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v10_Ragnos.mbch
@@ -8,7 +8,7 @@ Classinfo
 	classNumberLimit  	1
 	weapons		WP_MELEE|WP_SABER|WP_SHOTGUN
 	
-	attributes	MB_ATT_FP_SABER_DEFENSE,1|MB_ATT_GUN_DEFENSE,1|MB_ATT_FORCEBLOCK,1|MB_ATT_WOOKIE_STRENGTH,2|MB_ATT_DEFLECT,1|MB_ATT_JETPACK,1|MB_ATT_CORTOSIS,1|MB_ATT_WATER_BREATHING|MB_ATT_FLOAT_HOP|MB_ATT_BUNNY_HOP,1|MB_ATT_FORCEFOCUS,1|MB_ATT_SHOTGUN,1|MB_ATT_WOOKIEE_FURY,1
+	attributes	MB_ATT_FP_SABER_DEFENSE,1|MB_ATT_GUN_DEFENSE,1|MB_ATT_FORCEBLOCK,1|MB_ATT_WOOKIE_STRENGTH,2|MB_ATT_DEFLECT,1|MB_ATT_JETPACK,1|MB_ATT_CORTOSIS,1|MB_ATT_WATER_BREATHING|MB_ATT_FLOAT_HOP|MB_ATT_BUNNY_HOP,1|MB_ATT_FORCEFOCUS,1|MB_ATT_SHOTGUN,1|MB_ATT_WOOKIEE_FURY,1|MB_ATT_ENV_PROT,1
 	
 	forcepowers		FP_LIGHTNING,3|FP_PUSH,3|FP_PULL,3|FP_GRIP,3|FP_DRAIN,3|FP_SEE,2|FP_SABER_OFFENSE,3|FP_RAGE,3|FP_ABSORB,2|FP_LEVITATION,2
 
@@ -164,6 +164,7 @@ A flying hybrid class that combines Melee brawling abilities and dark side power
 
 ^8Attributes:
 - Strength (2)
+- Environmental Protection (1)
 - Cortosis (1)
 - Physical Resist
 - Underwater Breathing
diff --git a/z_MBLegends/ext_data/mb2/character/v3_IG88.mbch b/z_MBLegends/ext_data/mb2/character/v3_IG88.mbch
index d89037235..04c13d838 100644
--- a/z_MBLegends/ext_data/mb2/character/v3_IG88.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v3_IG88.mbch
@@ -10,7 +10,7 @@ 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_THROWER_POISON
+	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_THROWER_POISON|MB_ATT_ENV_PROT,1
 
 	special1 EAS_NONE
 	special2	EAS_HI_POISONTHROWER
@@ -175,6 +175,7 @@ A sturdy and heavily armored gunner.
 - Recharge (3)
 -- Resource Regen: 10/10s
 - Strength (2)
+- Environmental Protection (1)
 - Beskar (3)
 - Blast Armor
 - Physical Resist
diff --git a/z_MBLegends/ext_data/mb2/character/v5_Durge.mbch b/z_MBLegends/ext_data/mb2/character/v5_Durge.mbch
index 26e0d5a13..adca365c2 100644
--- a/z_MBLegends/ext_data/mb2/character/v5_Durge.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v5_Durge.mbch
@@ -8,7 +8,7 @@ ClassInfo
 	classNumberLimit	1
 	
 	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
+	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|MB_ATT_ENV_PROT,1
 	
 	maxhealth		125
 	maxarmor			125
@@ -156,6 +156,7 @@ A tanky dual pistoleer/brawler class equipped with a Jetpack and tools meant for
 ^8Attributes:
 - 15% less Kb Taken
 - Strength (2)
+- Environmental Protection (1)
 - Blast Armor
 - Cortosis (1)
 - Physical Resist
diff --git a/z_MBLegends/ext_data/mb2/character/v8_Burg.mbch b/z_MBLegends/ext_data/mb2/character/v8_Burg.mbch
index e43866994..0f9b41f70 100644
--- a/z_MBLegends/ext_data/mb2/character/v8_Burg.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v8_Burg.mbch
@@ -8,7 +8,7 @@ ClassInfo
 
 	weapons 			WP_MANDO_PISTOL|WP_MELEE|WP_FRAG_NADE
 
-	attributes  		MB_ATT_WOOKIE_HEALTH,3|MB_ATT_WOOKIE_STRENGTH,3|MB_ATT_WOOKIEE_FURY,2|MB_ATT_FRAGS,2|MB_ATT_BLAST_ARMOUR,1|MB_ATT_MANDO_PISTOL,3|MB_ATT_QUICKTHROW,1|MB_ATT_TRACKING_BEACON
+	attributes  		MB_ATT_WOOKIE_HEALTH,3|MB_ATT_WOOKIE_STRENGTH,3|MB_ATT_WOOKIEE_FURY,2|MB_ATT_FRAGS,2|MB_ATT_BLAST_ARMOUR,1|MB_ATT_MANDO_PISTOL,3|MB_ATT_QUICKTHROW,1|MB_ATT_TRACKING_BEACON|MB_ATT_ENV_PROT,1
 
  maxhealth 400
  maxarmor 150
@@ -67,6 +67,7 @@ A large brawler with high HP, dual pistols and Fury.
 - 10% faster Skill Cd
 - Strength (3)
 - Fury (2)
+- Environmental Protection (1)
 - Blast Armor
 - Tracking Beacon
 
diff --git a/z_MBLegends/ext_data/mb2/character/v8_SBD.mbch b/z_MBLegends/ext_data/mb2/character/v8_SBD.mbch
index bf6f41136..71656912f 100644
--- a/z_MBLegends/ext_data/mb2/character/v8_SBD.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v8_SBD.mbch
@@ -157,13 +157,17 @@ ClassInfo
 	c_att_names_11	"Cortosis"
 	c_att_ranks_11	10
 
-	c_att_skill_12	MB_ATT_RADAR
-	c_att_names_12	"Adv. Radar (LPM Sense)"
+	c_att_skill_12	MB_ATT_ENV_PROT
+	c_att_names_12	"Environmental Protection"
 	c_att_ranks_12	5
-	c_att_descs_12 "Active during Low Power Mode"
-	c_att_skill_13	MB_ATT_ANTI_MT
-	c_att_names_13	"Adv. Logic (Anti-MT)"
-	c_att_ranks_13	5,5
+
+	c_att_skill_13	MB_ATT_RADAR
+	c_att_names_13	"Adv. Radar (LPM Sense)"
+	c_att_ranks_13	5
+	c_att_descs_13 "Active during Low Power Mode"
+	c_att_skill_14	MB_ATT_ANTI_MT
+	c_att_names_14	"Adv. Logic (Anti-MT)"
+	c_att_ranks_14	5,5
 }
 
 //WeaponInfo0

From dcbd5551ab322fb538f01b50fa3431d8a3370cdb Mon Sep 17 00:00:00 2001
From: Unguided <buektomi@gmail.com>
Date: Sat, 21 Feb 2026 21:41:35 +0100
Subject: [PATCH 49/82] Barriss expansion, Bastila tweaks

---
 .../players/barriss_offee/model_academy.skin  | 135 +++++++
 .../barriss_offee/model_academy_dmg.skin      | 135 +++++++
 .../players/barriss_offee/model_cloak.skin    | 135 +++++++
 .../players/barriss_offee/model_default.skin  | 129 ++++++-
 .../players/barriss_offee/model_inq.skin      | 135 +++++++
 .../players/barriss_offee/model_inq_nh.skin   | 135 +++++++
 .../players/barriss_offee/model_nocape.skin   | 135 +++++++
 .../players/barriss_offee/model_old.skin      | 135 +++++++
 .../barriss_offee/model_old_caped.skin        | 135 +++++++
 .../players/barriss_offee/model_prisoner.skin | 135 +++++++
 .../players/barriss_offee/modeldata.cfg       |  20 ++
 .../players/barriss_offee/saberauth.cfg       |  40 +++
 .../models/players/bastila/model_default.skin |   2 +
 .../models/players/bastila/model_sith.skin    |   6 +-
 .../models/players/bastila/model_yellow.skin  |   4 +-
 MBAssets3/shaders/barriss_offee.shader        | 330 ++++++++++++++++++
 16 files changed, 1728 insertions(+), 18 deletions(-)
 create mode 100644 MBAssets3/models/players/barriss_offee/model_academy.skin
 create mode 100644 MBAssets3/models/players/barriss_offee/model_academy_dmg.skin
 create mode 100644 MBAssets3/models/players/barriss_offee/model_cloak.skin
 create mode 100644 MBAssets3/models/players/barriss_offee/model_inq.skin
 create mode 100644 MBAssets3/models/players/barriss_offee/model_inq_nh.skin
 create mode 100644 MBAssets3/models/players/barriss_offee/model_nocape.skin
 create mode 100644 MBAssets3/models/players/barriss_offee/model_old.skin
 create mode 100644 MBAssets3/models/players/barriss_offee/model_old_caped.skin
 create mode 100644 MBAssets3/models/players/barriss_offee/model_prisoner.skin

diff --git a/MBAssets3/models/players/barriss_offee/model_academy.skin b/MBAssets3/models/players/barriss_offee/model_academy.skin
new file mode 100644
index 000000000..4664bdaa9
--- /dev/null
+++ b/MBAssets3/models/players/barriss_offee/model_academy.skin
@@ -0,0 +1,135 @@
+head,*off
+head_p,*off
+head_ds,*off
+head_tunic,*off
+head_eyes_mouth,models/players/barriss_offee/mouth_eyes.tga
+head_lashes,models/players/common/lashes.tga
+head_hair,*off
+head_back,*off
+head_back2,*off
+head_hood,*off
+hood,*off
+
+hips,*off
+hips_belt,*off
+hips_skirt,*off
+skirt,*off
+l_leg,*off
+r_leg,*off
+
+torso,*off
+scarf,*off
+torso_cloak,*off
+cloak,*off
+
+r_arm,*off
+r_hand,models/players/barriss_offee/hands.tga
+
+l_arm,*off
+l_hand,models/players/barriss_offee/hands.tga
+wristguard,*off
+
+head_hair_old,*off
+torso_old,*off
+torso_old_cape,*off
+torso_old_caped,*off
+l_arm_old,*off
+l_arm_old_caped,*off
+r_arm_old,*off
+r_arm_old_caped,*off
+hips_belt_old,*off
+hips_old,*off
+legs_old,*off
+l_leg_old,*off
+r_leg_old,*off
+
+head_tunic_p,*off
+torso_p,*off
+torso_p_neck,*off
+r_arm_p,*off
+r_hand_p_wrist,*off
+l_arm_p,*off
+l_hand_p_wrist,*off
+hips_p,*off
+hips_p_torso,*off
+r_leg_p,*off
+l_leg_p,*off
+
+head_tunic_helmet,*off
+helmet,*off
+torso_inq,*off
+torso_inq_armor,*off
+r_shoulder_pad,*off
+l_shoulder_pad,*off
+wristguard_inq,*off
+hips_inq,*off
+hips_belt_inq,*off
+r_leg_inq,*off
+l_leg_inq,*off
+
+head_ac,models/players/barriss_offee/head_academy.tga
+head_hair_ac,models/players/barriss_offee/hair_ac.tga
+head_hair_ac_t,models/players/barriss_offee/hair_ac.tga
+torso_ac,models/players/barriss_offee/body_academy.tga
+torso_neck_ac,models/players/barriss_offee/head_academy.tga
+l_arm_ac,models/players/barriss_offee/body_academy.tga
+r_arm_ac,models/players/barriss_offee/body_academy.tga
+hips_ac,models/players/barriss_offee/legs_academy.tga
+hips_belt_ac,models/players/barriss_offee/body_academy.tga
+l_leg_ac,models/players/barriss_offee/legs_academy.tga
+r_leg_ac,models/players/barriss_offee/legs_academy.tga
+
+torso_old_cap_hips_off,*off
+torso_old_cap_r_arm_off,*off
+torso_old_cap_l_arm_off,*off
+l_arm_old_cap_torso_off,*off
+r_arm_old_cap_torso_off,*off
+l_leg_old_cap_hips_off,*off
+r_leg_old_cap_hips_off,*off
+hips_old_cap_torso_off,*off
+hips_old_cap_r_leg_off,*off
+hips_old_cap_l_leg_off,*off
+
+torso_ac_cap_hips_off,models/players/stormtrooper/caps.tga
+torso_ac_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torso_ac_cap_l_arm_off,models/players/stormtrooper/caps.tga
+l_arm_ac_cap_torso_off,models/players/stormtrooper/caps.tga
+r_arm_ac_cap_torso_off,models/players/stormtrooper/caps.tga
+l_leg_ac_cap_hips_off,models/players/stormtrooper/caps.tga
+r_leg_ac_cap_hips_off,models/players/stormtrooper/caps.tga
+hips_ac_cap_torso_off,models/players/stormtrooper/caps.tga
+hips_ac_cap_r_leg_off,models/players/stormtrooper/caps.tga
+hips_ac_cap_l_leg_off,models/players/stormtrooper/caps.tga
+
+torso_p_cap_head_off,models/players/stormtrooper/caps.tga
+torso_p_cap_hips_off,*off
+torso_p_cap_r_arm_off,*off
+torso_p_cap_l_arm_off,*off
+l_hand_p_cap_l_arm_off,models/players/stormtrooper/caps.tga
+l_arm_p_cap_l_hand_off,models/players/stormtrooper/caps.tga
+l_arm_p_cap_torso_off,*off
+r_hand_p_cap_r_arm_off,models/players/stormtrooper/caps.tga
+r_arm_p_cap_torso_off,*off
+r_arm_p_cap_r_hand_off,models/players/stormtrooper/caps.tga
+l_leg_p_cap_hips_off,*off
+r_leg_p_cap_hips_off,*off
+hips_p_cap_torso_off,*off
+hips_p_cap_r_leg_off,*off
+hips_p_cap_l_leg_off,*off
+
+head_cap_torso_off,models/players/stormtrooper/caps.tga
+torso_cap_head_off,*off
+torso_cap_hips_off,*off
+torso_cap_r_arm_off,*off
+torso_cap_l_arm_off,*off
+l_hand_cap_l_arm_off,*off
+l_arm_cap_l_hand_off,*off
+l_arm_cap_torso_off,*off
+r_hand_cap_r_arm_off,*off
+r_arm_cap_torso_off,*off
+r_arm_cap_r_hand_off,*off
+l_leg_cap_hips_off,*off
+r_leg_cap_hips_off,*off
+hips_cap_torso_off,*off
+hips_cap_l_leg_off,*off
+hips_cap_r_leg_off,*off
\ No newline at end of file
diff --git a/MBAssets3/models/players/barriss_offee/model_academy_dmg.skin b/MBAssets3/models/players/barriss_offee/model_academy_dmg.skin
new file mode 100644
index 000000000..b154dc123
--- /dev/null
+++ b/MBAssets3/models/players/barriss_offee/model_academy_dmg.skin
@@ -0,0 +1,135 @@
+head,*off
+head_p,*off
+head_ds,*off
+head_tunic,*off
+head_eyes_mouth,models/players/common/mouth_eyes14.tga
+head_lashes,models/players/common/lashes.tga
+head_hair,*off
+head_back,*off
+head_back2,*off
+head_hood,*off
+hood,*off
+
+hips,*off
+hips_belt,*off
+hips_skirt,*off
+skirt,*off
+l_leg,*off
+r_leg,*off
+
+torso,*off
+scarf,*off
+torso_cloak,*off
+cloak,*off
+
+r_arm,*off
+r_hand,models/players/barriss_offee/hands.tga
+
+l_arm,*off
+l_hand,models/players/barriss_offee/hands.tga
+wristguard,*off
+
+head_hair_old,*off
+torso_old,*off
+torso_old_cape,*off
+torso_old_caped,*off
+l_arm_old,*off
+l_arm_old_caped,*off
+r_arm_old,*off
+r_arm_old_caped,*off
+hips_belt_old,*off
+hips_old,*off
+legs_old,*off
+l_leg_old,*off
+r_leg_old,*off
+
+head_tunic_p,*off
+torso_p,*off
+torso_p_neck,*off
+r_arm_p,*off
+r_hand_p_wrist,*off
+l_arm_p,*off
+l_hand_p_wrist,*off
+hips_p,*off
+hips_p_torso,*off
+r_leg_p,*off
+l_leg_p,*off
+
+head_tunic_helmet,*off
+helmet,*off
+torso_inq,*off
+torso_inq_armor,*off
+r_shoulder_pad,*off
+l_shoulder_pad,*off
+wristguard_inq,*off
+hips_inq,*off
+hips_belt_inq,*off
+r_leg_inq,*off
+l_leg_inq,*off
+
+head_ac,models/players/barriss_offee/head_academy_dmg.tga
+head_hair_ac,models/players/barriss_offee/hair_ac.tga
+head_hair_ac_t,models/players/barriss_offee/hair_ac.tga
+torso_ac,models/players/barriss_offee/body_academy.tga
+torso_neck_ac,models/players/barriss_offee/head_academy.tga
+l_arm_ac,models/players/barriss_offee/body_academy.tga
+r_arm_ac,models/players/barriss_offee/body_academy.tga
+hips_ac,models/players/barriss_offee/legs_academy.tga
+hips_belt_ac,models/players/barriss_offee/body_academy.tga
+l_leg_ac,models/players/barriss_offee/legs_academy.tga
+r_leg_ac,models/players/barriss_offee/legs_academy.tga
+
+torso_old_cap_hips_off,*off
+torso_old_cap_r_arm_off,*off
+torso_old_cap_l_arm_off,*off
+l_arm_old_cap_torso_off,*off
+r_arm_old_cap_torso_off,*off
+l_leg_old_cap_hips_off,*off
+r_leg_old_cap_hips_off,*off
+hips_old_cap_torso_off,*off
+hips_old_cap_r_leg_off,*off
+hips_old_cap_l_leg_off,*off
+
+torso_ac_cap_hips_off,models/players/stormtrooper/caps.tga
+torso_ac_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torso_ac_cap_l_arm_off,models/players/stormtrooper/caps.tga
+l_arm_ac_cap_torso_off,models/players/stormtrooper/caps.tga
+r_arm_ac_cap_torso_off,models/players/stormtrooper/caps.tga
+l_leg_ac_cap_hips_off,models/players/stormtrooper/caps.tga
+r_leg_ac_cap_hips_off,models/players/stormtrooper/caps.tga
+hips_ac_cap_torso_off,models/players/stormtrooper/caps.tga
+hips_ac_cap_r_leg_off,models/players/stormtrooper/caps.tga
+hips_ac_cap_l_leg_off,models/players/stormtrooper/caps.tga
+
+torso_p_cap_head_off,models/players/stormtrooper/caps.tga
+torso_p_cap_hips_off,*off
+torso_p_cap_r_arm_off,*off
+torso_p_cap_l_arm_off,*off
+l_hand_p_cap_l_arm_off,models/players/stormtrooper/caps.tga
+l_arm_p_cap_l_hand_off,models/players/stormtrooper/caps.tga
+l_arm_p_cap_torso_off,*off
+r_hand_p_cap_r_arm_off,models/players/stormtrooper/caps.tga
+r_arm_p_cap_torso_off,*off
+r_arm_p_cap_r_hand_off,models/players/stormtrooper/caps.tga
+l_leg_p_cap_hips_off,*off
+r_leg_p_cap_hips_off,*off
+hips_p_cap_torso_off,*off
+hips_p_cap_r_leg_off,*off
+hips_p_cap_l_leg_off,*off
+
+head_cap_torso_off,models/players/stormtrooper/caps.tga
+torso_cap_head_off,*off
+torso_cap_hips_off,*off
+torso_cap_r_arm_off,*off
+torso_cap_l_arm_off,*off
+l_hand_cap_l_arm_off,*off
+l_arm_cap_l_hand_off,*off
+l_arm_cap_torso_off,*off
+r_hand_cap_r_arm_off,*off
+r_arm_cap_torso_off,*off
+r_arm_cap_r_hand_off,*off
+l_leg_cap_hips_off,*off
+r_leg_cap_hips_off,*off
+hips_cap_torso_off,*off
+hips_cap_l_leg_off,*off
+hips_cap_r_leg_off,*off
\ No newline at end of file
diff --git a/MBAssets3/models/players/barriss_offee/model_cloak.skin b/MBAssets3/models/players/barriss_offee/model_cloak.skin
new file mode 100644
index 000000000..0b4ed9baa
--- /dev/null
+++ b/MBAssets3/models/players/barriss_offee/model_cloak.skin
@@ -0,0 +1,135 @@
+head,models/players/barriss_offee/head.tga
+head_p,*off
+head_ds,*off
+head_tunic,models/players/barriss_offee/head_tunic.tga
+head_eyes_mouth,models/players/barriss_offee/mouth_eyes.tga
+head_lashes,models/players/common/lashes.tga
+head_hair,*off
+head_back,*off
+head_back2,*off
+head_hood,*off
+hood,models/players/barriss_offee/cloak.tga
+
+hips,models/players/barriss_offee/hips.tga
+hips_belt,models/players/barriss_offee/belt.tga
+hips_skirt,*off
+skirt,models/players/barriss_offee/skirt.tga
+l_leg,models/players/barriss_offee/legs.tga
+r_leg,models/players/barriss_offee/legs.tga
+
+torso,models/players/barriss_offee/torso.tga
+scarf,models/players/barriss_offee/cloak.tga
+torso_cloak,*off
+cloak,models/players/barriss_offee/cloak.tga
+
+r_arm,models/players/barriss_offee/torso.tga
+r_hand,models/players/barriss_offee/hands.tga
+
+l_arm,models/players/barriss_offee/torso.tga
+l_hand,models/players/barriss_offee/hands.tga
+wristguard,models/players/barriss_offee/wristguard.tga
+
+head_hair_old,*off
+torso_old,*off
+torso_old_cape,*off
+torso_old_caped,*off
+l_arm_old,*off
+l_arm_old_caped,*off
+r_arm_old,*off
+r_arm_old_caped,*off
+hips_belt_old,*off
+hips_old,*off
+legs_old,*off
+l_leg_old,*off
+r_leg_old,*off
+
+head_tunic_p,*off
+torso_p,*off
+torso_p_neck,*off
+r_arm_p,*off
+r_hand_p_wrist,*off
+l_arm_p,*off
+l_hand_p_wrist,*off
+hips_p,*off
+hips_p_torso,*off
+r_leg_p,*off
+l_leg_p,*off
+
+head_tunic_helmet,*off
+helmet,*off
+torso_inq,*off
+torso_inq_armor,*off
+r_shoulder_pad,*off
+l_shoulder_pad,*off
+wristguard_inq,*off
+hips_inq,*off
+hips_belt_inq,*off
+r_leg_inq,*off
+l_leg_inq,*off
+
+head_ac,*off
+head_hair_ac,*off
+head_hair_ac_t,*off
+torso_ac,*off
+torso_neck_ac,*off
+l_arm_ac,*off
+r_arm_ac,*off
+hips_ac,*off
+hips_belt_ac,*off
+l_leg_ac,*off
+r_leg_ac,*off
+
+torso_old_cap_hips_off,*off
+torso_old_cap_r_arm_off,*off
+torso_old_cap_l_arm_off,*off
+l_arm_old_cap_torso_off,*off
+r_arm_old_cap_torso_off,*off
+l_leg_old_cap_hips_off,*off
+r_leg_old_cap_hips_off,*off
+hips_old_cap_torso_off,*off
+hips_old_cap_r_leg_off,*off
+hips_old_cap_l_leg_off,*off
+
+torso_ac_cap_hips_off,*off
+torso_ac_cap_r_arm_off,*off
+torso_ac_cap_l_arm_off,*off
+l_arm_ac_cap_torso_off,*off
+r_arm_ac_cap_torso_off,*off
+l_leg_ac_cap_hips_off,*off
+r_leg_ac_cap_hips_off,*off
+hips_ac_cap_torso_off,*off
+hips_ac_cap_r_leg_off,*off
+hips_ac_cap_l_leg_off,*off
+
+torso_p_cap_head_off,*off
+torso_p_cap_hips_off,*off
+torso_p_cap_r_arm_off,*off
+torso_p_cap_l_arm_off,*off
+l_hand_p_cap_l_arm_off,*off
+l_arm_p_cap_l_hand_off,*off
+l_arm_p_cap_torso_off,*off
+r_hand_p_cap_r_arm_off,*off
+r_arm_p_cap_torso_off,*off
+r_arm_p_cap_r_hand_off,*off
+l_leg_p_cap_hips_off,*off
+r_leg_p_cap_hips_off,*off
+hips_p_cap_torso_off,*off
+hips_p_cap_r_leg_off,*off
+hips_p_cap_l_leg_off,*off
+
+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_r_arm_off,models/players/stormtrooper/caps.tga
+torso_cap_l_arm_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_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
+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
diff --git a/MBAssets3/models/players/barriss_offee/model_default.skin b/MBAssets3/models/players/barriss_offee/model_default.skin
index 24716a0e5..bba4678c8 100644
--- a/MBAssets3/models/players/barriss_offee/model_default.skin
+++ b/MBAssets3/models/players/barriss_offee/model_default.skin
@@ -1,23 +1,125 @@
 head,models/players/barriss_offee/head.tga
+head_p,*off
+head_ds,*off
+head_back,models/players/barriss_offee/head.tga
+head_back2,*off
+head_tunic,*off
 head_eyes_mouth,models/players/common/mouth_eyes14.tga
 head_lashes,models/players/common/lashes.tga
-head_cap_torso_off,models/players/stormtrooper/caps.tga
+head_hair,*off
+head_hood,models/players/barriss_offee/cape.tga
+hood,*off
 
+hips,*off
 hips_belt,models/players/barriss_offee/belt.tga
-torso_cloak,models/players/barriss_offee/cloak.tga
-head_hood,models/players/barriss_offee/hood.tga
-
-torso,models/players/barriss_offee/torso.tga
-r_arm,models/players/barriss_offee/torso.tga
-l_arm,models/players/barriss_offee/torso.tga
-r_arm_sleeve,models/players/barriss_offee/torso.tga
-l_arm_sleeve,models/players/barriss_offee/torso.tga
+hips_skirt,models/players/barriss_offee/hips_cw.tga
+skirt,*off
+l_leg,models/players/barriss_offee/legs.tga
+r_leg,models/players/barriss_offee/legs.tga
+
+torso,models/players/barriss_offee/torso_cw.tga
+scarf,models/players/barriss_offee/cloak.tga
+torso_cloak,models/players/barriss_offee/cape.tga
+cloak,*off
+
+r_arm,models/players/barriss_offee/torso_cw.tga
 r_hand,models/players/barriss_offee/hands.tga
+
+l_arm,models/players/barriss_offee/torso_cw.tga
 l_hand,models/players/barriss_offee/hands.tga
+wristguard,*off
+
+head_hair_old,*off
+torso_old,*off
+torso_old_cape,*off
+torso_old_caped,*off
+l_arm_old,*off
+l_arm_old_caped,*off
+r_arm_old,*off
+r_arm_old_caped,*off
+hips_belt_old,*off
+hips_old,*off
+legs_old,*off
+l_leg_old,*off
+r_leg_old,*off
+
+head_tunic_p,*off
+torso_p,*off
+torso_p_neck,*off
+r_arm_p,*off
+r_hand_p_wrist,*off
+l_arm_p,*off
+l_hand_p_wrist,*off
+hips_p,*off
+hips_p_torso,*off
+r_leg_p,*off
+l_leg_p,*off
+
+head_tunic_helmet,*off
+helmet,*off
+torso_inq,*off
+torso_inq_armor,*off
+r_shoulder_pad,*off
+l_shoulder_pad,*off
+wristguard_inq,*off
+hips_inq,*off
+hips_belt_inq,*off
+r_leg_inq,*off
+l_leg_inq,*off
+
+head_ac,*off
+head_hair_ac,*off
+head_hair_ac_t,*off
+torso_ac,*off
+torso_neck_ac,*off
+l_arm_ac,*off
+r_arm_ac,*off
+hips_ac,*off
+hips_belt_ac,*off
+l_leg_ac,*off
+r_leg_ac,*off
 
+torso_old_cap_hips_off,*off
+torso_old_cap_r_arm_off,*off
+torso_old_cap_l_arm_off,*off
+l_arm_old_cap_torso_off,*off
+r_arm_old_cap_torso_off,*off
+l_leg_old_cap_hips_off,*off
+r_leg_old_cap_hips_off,*off
+hips_old_cap_torso_off,*off
+hips_old_cap_r_leg_off,*off
+hips_old_cap_l_leg_off,*off
+
+torso_ac_cap_hips_off,*off
+torso_ac_cap_r_arm_off,*off
+torso_ac_cap_l_arm_off,*off
+l_arm_ac_cap_torso_off,*off
+r_arm_ac_cap_torso_off,*off
+l_leg_ac_cap_hips_off,*off
+r_leg_ac_cap_hips_off,*off
+hips_ac_cap_torso_off,*off
+hips_ac_cap_r_leg_off,*off
+hips_ac_cap_l_leg_off,*off
+
+torso_p_cap_head_off,*off
+torso_p_cap_hips_off,*off
+torso_p_cap_r_arm_off,*off
+torso_p_cap_l_arm_off,*off
+l_hand_p_cap_l_arm_off,*off
+l_arm_p_cap_l_hand_off,*off
+l_arm_p_cap_torso_off,*off
+r_hand_p_cap_r_arm_off,*off
+r_arm_p_cap_torso_off,*off
+r_arm_p_cap_r_hand_off,*off
+l_leg_p_cap_hips_off,*off
+r_leg_p_cap_hips_off,*off
+hips_p_cap_torso_off,*off
+hips_p_cap_r_leg_off,*off
+hips_p_cap_l_leg_off,*off
+
+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_r_arm_off,models/players/stormtrooper/caps.tga
 torso_cap_l_arm_off,models/players/stormtrooper/caps.tga
 l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga
@@ -28,9 +130,6 @@ 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
 r_leg_cap_hips_off,models/players/stormtrooper/caps.tga
-
 hips_cap_torso_off,models/players/stormtrooper/caps.tga
-
-hips,models/players/barriss_offee/hips.tga
-l_leg,models/players/barriss_offee/legs.tga
-r_leg,models/players/barriss_offee/legs.tga
+hips_cap_l_leg_off,models/players/stormtrooper/caps.tga
+hips_cap_r_leg_off,models/players/stormtrooper/caps.tga
diff --git a/MBAssets3/models/players/barriss_offee/model_inq.skin b/MBAssets3/models/players/barriss_offee/model_inq.skin
new file mode 100644
index 000000000..2389a9b2f
--- /dev/null
+++ b/MBAssets3/models/players/barriss_offee/model_inq.skin
@@ -0,0 +1,135 @@
+head,*off
+head_p,*off
+head_ds,*off
+head_tunic,*off
+head_eyes_mouth,*off
+head_lashes,*off
+head_hair,*off
+head_back,*off
+head_back2,*off
+head_hood,*off
+hood,*off
+
+hips,*off
+hips_belt,*off
+hips_skirt,*off
+skirt,*off
+l_leg,*off
+r_leg,*off
+
+torso,*off
+scarf,*off
+torso_cloak,*off
+cloak,*off
+
+r_arm,*off
+r_hand,models/players/barriss_offee/hands_inq.tga
+
+l_arm,*off
+l_hand,models/players/barriss_offee/hands_inq.tga
+wristguard,*off
+
+head_hair_old,*off
+torso_old,*off
+torso_old_cape,*off
+torso_old_caped,*off
+l_arm_old,*off
+l_arm_old_caped,*off
+r_arm_old,*off
+r_arm_old_caped,*off
+hips_belt_old,*off
+hips_old,*off
+legs_old,*off
+l_leg_old,*off
+r_leg_old,*off
+
+head_tunic_p,*off
+torso_p,*off
+torso_p_neck,models/players/barriss_offee/head_tunic_inq.tga
+r_arm_p,models/players/barriss_offee/torso_inq.tga
+r_hand_p_wrist,models/players/barriss_offee/torso_inq.tga
+l_arm_p,models/players/barriss_offee/torso_inq.tga
+l_hand_p_wrist,models/players/barriss_offee/torso_inq.tga
+hips_p,*off
+hips_p_torso,*off
+r_leg_p,*off
+l_leg_p,*off
+
+head_tunic_helmet,models/players/barriss_offee/head_tunic_inq.tga
+helmet,models/players/barriss_offee/helmet.tga
+torso_inq,models/players/barriss_offee/torso_inq.tga
+torso_inq_armor,models/players/barriss_offee/body_inq.tga
+r_shoulder_pad,models/players/barriss_offee/body_inq.tga
+l_shoulder_pad,models/players/barriss_offee/body_inq.tga
+wristguard_inq,models/players/barriss_offee/body_inq.tga
+hips_inq,models/players/barriss_offee/body_inq.tga
+hips_belt_inq,models/players/barriss_offee/belt_inq.tga
+r_leg_inq,models/players/barriss_offee/boots_inq.tga
+l_leg_inq,models/players/barriss_offee/boots_inq.tga
+
+head_ac,*off
+head_hair_ac,*off
+head_hair_ac_t,*off
+torso_ac,*off
+torso_neck_ac,*off
+l_arm_ac,*off
+r_arm_ac,*off
+hips_ac,*off
+hips_belt_ac,*off
+l_leg_ac,*off
+r_leg_ac,*off
+
+torso_old_cap_hips_off,*off
+torso_old_cap_r_arm_off,*off
+torso_old_cap_l_arm_off,*off
+l_arm_old_cap_torso_off,*off
+r_arm_old_cap_torso_off,*off
+l_leg_old_cap_hips_off,*off
+r_leg_old_cap_hips_off,*off
+hips_old_cap_torso_off,*off
+hips_old_cap_r_leg_off,*off
+hips_old_cap_l_leg_off,*off
+
+torso_ac_cap_hips_off,*off
+torso_ac_cap_r_arm_off,*off
+torso_ac_cap_l_arm_off,*off
+l_arm_ac_cap_torso_off,*off
+r_arm_ac_cap_torso_off,*off
+l_leg_ac_cap_hips_off,*off
+r_leg_ac_cap_hips_off,*off
+hips_ac_cap_torso_off,*off
+hips_ac_cap_r_leg_off,*off
+hips_ac_cap_l_leg_off,*off
+
+torso_p_cap_head_off,models/players/stormtrooper/caps.tga
+torso_p_cap_hips_off,models/players/stormtrooper/caps.tga
+torso_p_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torso_p_cap_l_arm_off,models/players/stormtrooper/caps.tga
+l_hand_p_cap_l_arm_off,models/players/stormtrooper/caps.tga
+l_arm_p_cap_l_hand_off,models/players/stormtrooper/caps.tga
+l_arm_p_cap_torso_off,models/players/stormtrooper/caps.tga
+r_hand_p_cap_r_arm_off,models/players/stormtrooper/caps.tga
+r_arm_p_cap_torso_off,models/players/stormtrooper/caps.tga
+r_arm_p_cap_r_hand_off,models/players/stormtrooper/caps.tga
+l_leg_p_cap_hips_off,models/players/stormtrooper/caps.tga
+r_leg_p_cap_hips_off,models/players/stormtrooper/caps.tga
+hips_p_cap_torso_off,models/players/stormtrooper/caps.tga
+hips_p_cap_r_leg_off,models/players/stormtrooper/caps.tga
+hips_p_cap_l_leg_off,models/players/stormtrooper/caps.tga
+
+head_cap_torso_off,models/players/stormtrooper/caps.tga
+torso_cap_head_off,*off
+torso_cap_hips_off,*off
+torso_cap_r_arm_off,*off
+torso_cap_l_arm_off,*off
+l_hand_cap_l_arm_off,*off
+l_arm_cap_l_hand_off,*off
+l_arm_cap_torso_off,*off
+r_hand_cap_r_arm_off,*off
+r_arm_cap_torso_off,*off
+r_arm_cap_r_hand_off,*off
+l_leg_cap_hips_off,*off
+r_leg_cap_hips_off,*off
+hips_cap_torso_off,*off
+hips_cap_l_leg_off,*off
+hips_cap_r_leg_off,*off
diff --git a/MBAssets3/models/players/barriss_offee/model_inq_nh.skin b/MBAssets3/models/players/barriss_offee/model_inq_nh.skin
new file mode 100644
index 000000000..0f5a0bb69
--- /dev/null
+++ b/MBAssets3/models/players/barriss_offee/model_inq_nh.skin
@@ -0,0 +1,135 @@
+head,*off
+head_p,*off
+head_ds,models/players/barriss_offee/head_inq.tga
+head_tunic,*off
+head_eyes_mouth,models/players/barriss_offee/mouth_eyes.tga
+head_lashes,models/players/common/lashes.tga
+head_hair,*off
+head_back,*off
+head_back2,*off
+head_hood,*off
+hood,*off
+
+hips,*off
+hips_belt,*off
+hips_skirt,*off
+skirt,*off
+l_leg,*off
+r_leg,*off
+
+torso,*off
+scarf,*off
+torso_cloak,*off
+cloak,*off
+
+r_arm,*off
+r_hand,models/players/barriss_offee/hands_inq.tga
+
+l_arm,*off
+l_hand,models/players/barriss_offee/hands_inq.tga
+wristguard,*off
+
+head_hair_old,*off
+torso_old,*off
+torso_old_cape,*off
+torso_old_caped,*off
+l_arm_old,*off
+l_arm_old_caped,*off
+r_arm_old,*off
+r_arm_old_caped,*off
+hips_belt_old,*off
+hips_old,*off
+legs_old,*off
+l_leg_old,*off
+r_leg_old,*off
+
+head_tunic_p,models/players/barriss_offee/head_tunic_inq.tga
+torso_p,*off
+torso_p_neck,models/players/barriss_offee/head_tunic_inq.tga
+r_arm_p,models/players/barriss_offee/torso_inq.tga
+r_hand_p_wrist,models/players/barriss_offee/torso_inq.tga
+l_arm_p,models/players/barriss_offee/torso_inq.tga
+l_hand_p_wrist,models/players/barriss_offee/torso_inq.tga
+hips_p,*off
+hips_p_torso,*off
+r_leg_p,*off
+l_leg_p,*off
+
+head_tunic_helmet,*off
+helmet,*off
+torso_inq,models/players/barriss_offee/torso_inq.tga
+torso_inq_armor,models/players/barriss_offee/body_inq.tga
+r_shoulder_pad,models/players/barriss_offee/body_inq.tga
+l_shoulder_pad,models/players/barriss_offee/body_inq.tga
+wristguard_inq,models/players/barriss_offee/body_inq.tga
+hips_inq,models/players/barriss_offee/body_inq.tga
+hips_belt_inq,models/players/barriss_offee/belt_inq.tga
+r_leg_inq,models/players/barriss_offee/boots_inq.tga
+l_leg_inq,models/players/barriss_offee/boots_inq.tga
+
+head_ac,*off
+head_hair_ac,*off
+head_hair_ac_t,*off
+torso_ac,*off
+torso_neck_ac,*off
+l_arm_ac,*off
+r_arm_ac,*off
+hips_ac,*off
+hips_belt_ac,*off
+l_leg_ac,*off
+r_leg_ac,*off
+
+torso_old_cap_hips_off,*off
+torso_old_cap_r_arm_off,*off
+torso_old_cap_l_arm_off,*off
+l_arm_old_cap_torso_off,*off
+r_arm_old_cap_torso_off,*off
+l_leg_old_cap_hips_off,*off
+r_leg_old_cap_hips_off,*off
+hips_old_cap_torso_off,*off
+hips_old_cap_r_leg_off,*off
+hips_old_cap_l_leg_off,*off
+
+torso_ac_cap_hips_off,*off
+torso_ac_cap_r_arm_off,*off
+torso_ac_cap_l_arm_off,*off
+l_arm_ac_cap_torso_off,*off
+r_arm_ac_cap_torso_off,*off
+l_leg_ac_cap_hips_off,*off
+r_leg_ac_cap_hips_off,*off
+hips_ac_cap_torso_off,*off
+hips_ac_cap_r_leg_off,*off
+hips_ac_cap_l_leg_off,*off
+
+torso_p_cap_head_off,models/players/stormtrooper/caps.tga
+torso_p_cap_hips_off,models/players/stormtrooper/caps.tga
+torso_p_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torso_p_cap_l_arm_off,models/players/stormtrooper/caps.tga
+l_hand_p_cap_l_arm_off,models/players/stormtrooper/caps.tga
+l_arm_p_cap_l_hand_off,models/players/stormtrooper/caps.tga
+l_arm_p_cap_torso_off,models/players/stormtrooper/caps.tga
+r_hand_p_cap_r_arm_off,models/players/stormtrooper/caps.tga
+r_arm_p_cap_torso_off,models/players/stormtrooper/caps.tga
+r_arm_p_cap_r_hand_off,models/players/stormtrooper/caps.tga
+l_leg_p_cap_hips_off,models/players/stormtrooper/caps.tga
+r_leg_p_cap_hips_off,models/players/stormtrooper/caps.tga
+hips_p_cap_torso_off,models/players/stormtrooper/caps.tga
+hips_p_cap_r_leg_off,models/players/stormtrooper/caps.tga
+hips_p_cap_l_leg_off,models/players/stormtrooper/caps.tga
+
+head_cap_torso_off,models/players/stormtrooper/caps.tga
+torso_cap_head_off,*off
+torso_cap_hips_off,*off
+torso_cap_r_arm_off,*off
+torso_cap_l_arm_off,*off
+l_hand_cap_l_arm_off,*off
+l_arm_cap_l_hand_off,*off
+l_arm_cap_torso_off,*off
+r_hand_cap_r_arm_off,*off
+r_arm_cap_torso_off,*off
+r_arm_cap_r_hand_off,*off
+l_leg_cap_hips_off,*off
+r_leg_cap_hips_off,*off
+hips_cap_torso_off,*off
+hips_cap_l_leg_off,*off
+hips_cap_r_leg_off,*off
diff --git a/MBAssets3/models/players/barriss_offee/model_nocape.skin b/MBAssets3/models/players/barriss_offee/model_nocape.skin
new file mode 100644
index 000000000..1c9408945
--- /dev/null
+++ b/MBAssets3/models/players/barriss_offee/model_nocape.skin
@@ -0,0 +1,135 @@
+head,models/players/barriss_offee/head.tga
+head_p,*off
+head_ds,*off
+head_tunic,models/players/barriss_offee/head_tunic.tga
+head_eyes_mouth,models/players/barriss_offee/mouth_eyes.tga
+head_lashes,models/players/common/lashes.tga
+head_hair,models/players/barriss_offee/hair.tga
+head_back,*off
+head_back2,models/players/barriss_offee/head.tga
+head_hood,*off
+hood,*off
+
+hips,models/players/barriss_offee/hips.tga
+hips_belt,models/players/barriss_offee/belt.tga
+hips_skirt,*off
+skirt,models/players/barriss_offee/skirt.tga
+l_leg,models/players/barriss_offee/legs.tga
+r_leg,models/players/barriss_offee/legs.tga
+
+torso,models/players/barriss_offee/torso.tga
+scarf,*off
+torso_cloak,*off
+cloak,*off
+
+r_arm,models/players/barriss_offee/torso.tga
+r_hand,models/players/barriss_offee/hands.tga
+
+l_arm,models/players/barriss_offee/torso.tga
+l_hand,models/players/barriss_offee/hands.tga
+wristguard,models/players/barriss_offee/wristguard.tga
+
+head_hair_old,*off
+torso_old,*off
+torso_old_cape,*off
+torso_old_caped,*off
+l_arm_old,*off
+l_arm_old_caped,*off
+r_arm_old,*off
+r_arm_old_caped,*off
+hips_belt_old,*off
+hips_old,*off
+legs_old,*off
+l_leg_old,*off
+r_leg_old,*off
+
+head_tunic_p,*off
+torso_p,*off
+torso_p_neck,*off
+r_arm_p,*off
+r_hand_p_wrist,*off
+l_arm_p,*off
+l_hand_p_wrist,*off
+hips_p,*off
+hips_p_torso,*off
+r_leg_p,*off
+l_leg_p,*off
+
+head_tunic_helmet,*off
+helmet,*off
+torso_inq,*off
+torso_inq_armor,*off
+r_shoulder_pad,*off
+l_shoulder_pad,*off
+wristguard_inq,*off
+hips_inq,*off
+hips_belt_inq,*off
+r_leg_inq,*off
+l_leg_inq,*off
+
+head_ac,*off
+head_hair_ac,*off
+head_hair_ac_t,*off
+torso_ac,*off
+torso_neck_ac,*off
+l_arm_ac,*off
+r_arm_ac,*off
+hips_ac,*off
+hips_belt_ac,*off
+l_leg_ac,*off
+r_leg_ac,*off
+
+torso_old_cap_hips_off,*off
+torso_old_cap_r_arm_off,*off
+torso_old_cap_l_arm_off,*off
+l_arm_old_cap_torso_off,*off
+r_arm_old_cap_torso_off,*off
+l_leg_old_cap_hips_off,*off
+r_leg_old_cap_hips_off,*off
+hips_old_cap_torso_off,*off
+hips_old_cap_r_leg_off,*off
+hips_old_cap_l_leg_off,*off
+
+torso_ac_cap_hips_off,*off
+torso_ac_cap_r_arm_off,*off
+torso_ac_cap_l_arm_off,*off
+l_arm_ac_cap_torso_off,*off
+r_arm_ac_cap_torso_off,*off
+l_leg_ac_cap_hips_off,*off
+r_leg_ac_cap_hips_off,*off
+hips_ac_cap_torso_off,*off
+hips_ac_cap_r_leg_off,*off
+hips_ac_cap_l_leg_off,*off
+
+torso_p_cap_head_off,*off
+torso_p_cap_hips_off,*off
+torso_p_cap_r_arm_off,*off
+torso_p_cap_l_arm_off,*off
+l_hand_p_cap_l_arm_off,*off
+l_arm_p_cap_l_hand_off,*off
+l_arm_p_cap_torso_off,*off
+r_hand_p_cap_r_arm_off,*off
+r_arm_p_cap_torso_off,*off
+r_arm_p_cap_r_hand_off,*off
+l_leg_p_cap_hips_off,*off
+r_leg_p_cap_hips_off,*off
+hips_p_cap_torso_off,*off
+hips_p_cap_r_leg_off,*off
+hips_p_cap_l_leg_off,*off
+
+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_r_arm_off,models/players/stormtrooper/caps.tga
+torso_cap_l_arm_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_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
+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
diff --git a/MBAssets3/models/players/barriss_offee/model_old.skin b/MBAssets3/models/players/barriss_offee/model_old.skin
new file mode 100644
index 000000000..841f4376c
--- /dev/null
+++ b/MBAssets3/models/players/barriss_offee/model_old.skin
@@ -0,0 +1,135 @@
+head,*off
+head_p,*off
+head_ds,*off
+head_tunic,*off
+head_eyes_mouth,models/players/barriss_offee/mouth_eyes.tga
+head_lashes,models/players/common/lashes.tga
+head_hair,*off
+head_back,*off
+head_back2,*off
+head_hood,*off
+hood,*off
+
+hips,*off
+hips_belt,*off
+hips_skirt,*off
+skirt,*off
+l_leg,*off
+r_leg,*off
+
+torso,*off
+scarf,*off
+torso_cloak,*off
+cloak,*off
+
+r_arm,*off
+r_hand,models/players/barriss_offee/hands.tga
+
+l_arm,*off
+l_hand,models/players/barriss_offee/hands.tga
+wristguard,*off
+
+head_hair_old,models/players/barriss_offee/hair_old.tga
+torso_old,models/players/barriss_offee/body_old.tga
+torso_old_cape,*off
+torso_old_caped,*off
+l_arm_old,models/players/barriss_offee/body_old.tga
+l_arm_old_caped,*off
+r_arm_old,models/players/barriss_offee/body_old.tga
+r_arm_old_caped,*off
+hips_belt_old,models/players/barriss_offee/cape_old.tga
+hips_old,models/players/barriss_offee/body_old.tga
+legs_old,models/players/barriss_offee/legs_old.tga
+l_leg_old,models/players/barriss_offee/legs_old.tga
+r_leg_old,models/players/barriss_offee/legs_old.tga
+
+head_tunic_p,*off
+torso_p,*off
+torso_p_neck,*off
+r_arm_p,*off
+r_hand_p_wrist,*off
+l_arm_p,*off
+l_hand_p_wrist,*off
+hips_p,*off
+hips_p_torso,*off
+r_leg_p,*off
+l_leg_p,*off
+
+head_tunic_helmet,*off
+helmet,*off
+torso_inq,*off
+torso_inq_armor,*off
+r_shoulder_pad,*off
+l_shoulder_pad,*off
+wristguard_inq,*off
+hips_inq,*off
+hips_belt_inq,*off
+r_leg_inq,*off
+l_leg_inq,*off
+
+head_ac,models/players/barriss_offee/head_old.tga
+head_hair_ac,*off
+head_hair_ac_t,*off
+torso_ac,*off
+torso_neck_ac,models/players/barriss_offee/head_old.tga
+l_arm_ac,*off
+r_arm_ac,*off
+hips_ac,*off
+hips_belt_ac,*off
+l_leg_ac,*off
+r_leg_ac,*off
+
+torso_old_cap_hips_off,models/players/stormtrooper/caps.tga
+torso_old_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torso_old_cap_l_arm_off,models/players/stormtrooper/caps.tga
+l_arm_old_cap_torso_off,models/players/stormtrooper/caps.tga
+r_arm_old_cap_torso_off,models/players/stormtrooper/caps.tga
+l_leg_old_cap_hips_off,models/players/stormtrooper/caps.tga
+r_leg_old_cap_hips_off,models/players/stormtrooper/caps.tga
+hips_old_cap_torso_off,models/players/stormtrooper/caps.tga
+hips_old_cap_r_leg_off,models/players/stormtrooper/caps.tga
+hips_old_cap_l_leg_off,models/players/stormtrooper/caps.tga
+
+torso_ac_cap_hips_off,*off
+torso_ac_cap_r_arm_off,*off
+torso_ac_cap_l_arm_off,*off
+l_arm_ac_cap_torso_off,*off
+r_arm_ac_cap_torso_off,*off
+l_leg_ac_cap_hips_off,*off
+r_leg_ac_cap_hips_off,*off
+hips_ac_cap_torso_off,*off
+hips_ac_cap_r_leg_off,*off
+hips_ac_cap_l_leg_off,*off
+
+torso_p_cap_head_off,models/players/stormtrooper/caps.tga
+torso_p_cap_hips_off,*off
+torso_p_cap_r_arm_off,*off
+torso_p_cap_l_arm_off,*off
+l_hand_p_cap_l_arm_off,models/players/stormtrooper/caps.tga
+l_arm_p_cap_l_hand_off,models/players/stormtrooper/caps.tga
+l_arm_p_cap_torso_off,*off
+r_hand_p_cap_r_arm_off,models/players/stormtrooper/caps.tga
+r_arm_p_cap_torso_off,*off
+r_arm_p_cap_r_hand_off,models/players/stormtrooper/caps.tga
+l_leg_p_cap_hips_off,*off
+r_leg_p_cap_hips_off,*off
+hips_p_cap_torso_off,*off
+hips_p_cap_r_leg_off,*off
+hips_p_cap_l_leg_off,*off
+
+head_cap_torso_off,models/players/stormtrooper/caps.tga
+torso_cap_head_off,*off
+torso_cap_hips_off,*off
+torso_cap_r_arm_off,*off
+torso_cap_l_arm_off,*off
+l_hand_cap_l_arm_off,*off
+l_arm_cap_l_hand_off,*off
+l_arm_cap_torso_off,*off
+r_hand_cap_r_arm_off,*off
+r_arm_cap_torso_off,*off
+r_arm_cap_r_hand_off,*off
+l_leg_cap_hips_off,*off
+r_leg_cap_hips_off,*off
+hips_cap_torso_off,*off
+hips_cap_l_leg_off,*off
+hips_cap_r_leg_off,*off
\ No newline at end of file
diff --git a/MBAssets3/models/players/barriss_offee/model_old_caped.skin b/MBAssets3/models/players/barriss_offee/model_old_caped.skin
new file mode 100644
index 000000000..d37447698
--- /dev/null
+++ b/MBAssets3/models/players/barriss_offee/model_old_caped.skin
@@ -0,0 +1,135 @@
+head,*off
+head_p,*off
+head_ds,*off
+head_tunic,*off
+head_eyes_mouth,models/players/barriss_offee/mouth_eyes_hooded.tga
+head_lashes,models/players/common/lashes.tga
+head_hair,*off
+head_back,*off
+head_back2,*off
+head_hood,*off
+hood,*off
+
+hips,*off
+hips_belt,*off
+hips_skirt,*off
+skirt,*off
+l_leg,*off
+r_leg,*off
+
+torso,*off
+scarf,*off
+torso_cloak,*off
+cloak,*off
+
+r_arm,*off
+r_hand,models/players/barriss_offee/hands.tga
+
+l_arm,*off
+l_hand,models/players/barriss_offee/hands.tga
+wristguard,*off
+
+head_hair_old,*off
+torso_old,*off
+torso_old_cape,models/players/barriss_offee/cape_old.tga
+torso_old_caped,models/players/barriss_offee/body_old.tga
+l_arm_old,*off
+l_arm_old_caped,models/players/barriss_offee/body_old.tga
+r_arm_old,*off
+r_arm_old_caped,models/players/barriss_offee/body_old.tga
+hips_belt_old,models/players/barriss_offee/cape_old.tga
+hips_old,models/players/barriss_offee/body_old.tga
+legs_old,models/players/barriss_offee/legs_old.tga
+l_leg_old,models/players/barriss_offee/legs_old.tga
+r_leg_old,models/players/barriss_offee/legs_old.tga
+
+head_tunic_p,*off
+torso_p,*off
+torso_p_neck,*off
+r_arm_p,*off
+r_hand_p_wrist,*off
+l_arm_p,*off
+l_hand_p_wrist,*off
+hips_p,*off
+hips_p_torso,*off
+r_leg_p,*off
+l_leg_p,*off
+
+head_tunic_helmet,*off
+helmet,*off
+torso_inq,*off
+torso_inq_armor,*off
+r_shoulder_pad,*off
+l_shoulder_pad,*off
+wristguard_inq,*off
+hips_inq,*off
+hips_belt_inq,*off
+r_leg_inq,*off
+l_leg_inq,*off
+
+head_ac,models/players/barriss_offee/head_old_hooded.tga
+head_hair_ac,*off
+head_hair_ac_t,*off
+torso_ac,*off
+torso_neck_ac,models/players/barriss_offee/head_old_hooded.tga
+l_arm_ac,*off
+r_arm_ac,*off
+hips_ac,*off
+hips_belt_ac,*off
+l_leg_ac,*off
+r_leg_ac,*off
+
+torso_old_cap_hips_off,models/players/stormtrooper/caps.tga
+torso_old_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torso_old_cap_l_arm_off,models/players/stormtrooper/caps.tga
+l_arm_old_cap_torso_off,models/players/stormtrooper/caps.tga
+r_arm_old_cap_torso_off,models/players/stormtrooper/caps.tga
+l_leg_old_cap_hips_off,models/players/stormtrooper/caps.tga
+r_leg_old_cap_hips_off,models/players/stormtrooper/caps.tga
+hips_old_cap_torso_off,models/players/stormtrooper/caps.tga
+hips_old_cap_r_leg_off,models/players/stormtrooper/caps.tga
+hips_old_cap_l_leg_off,models/players/stormtrooper/caps.tga
+
+torso_ac_cap_hips_off,*off
+torso_ac_cap_r_arm_off,*off
+torso_ac_cap_l_arm_off,*off
+l_arm_ac_cap_torso_off,*off
+r_arm_ac_cap_torso_off,*off
+l_leg_ac_cap_hips_off,*off
+r_leg_ac_cap_hips_off,*off
+hips_ac_cap_torso_off,*off
+hips_ac_cap_r_leg_off,*off
+hips_ac_cap_l_leg_off,*off
+
+torso_p_cap_head_off,models/players/stormtrooper/caps.tga
+torso_p_cap_hips_off,*off
+torso_p_cap_r_arm_off,*off
+torso_p_cap_l_arm_off,*off
+l_hand_p_cap_l_arm_off,models/players/stormtrooper/caps.tga
+l_arm_p_cap_l_hand_off,models/players/stormtrooper/caps.tga
+l_arm_p_cap_torso_off,*off
+r_hand_p_cap_r_arm_off,models/players/stormtrooper/caps.tga
+r_arm_p_cap_torso_off,*off
+r_arm_p_cap_r_hand_off,models/players/stormtrooper/caps.tga
+l_leg_p_cap_hips_off,*off
+r_leg_p_cap_hips_off,*off
+hips_p_cap_torso_off,*off
+hips_p_cap_r_leg_off,*off
+hips_p_cap_l_leg_off,*off
+
+head_cap_torso_off,models/players/stormtrooper/caps.tga
+torso_cap_head_off,*off
+torso_cap_hips_off,*off
+torso_cap_r_arm_off,*off
+torso_cap_l_arm_off,*off
+l_hand_cap_l_arm_off,*off
+l_arm_cap_l_hand_off,*off
+l_arm_cap_torso_off,*off
+r_hand_cap_r_arm_off,*off
+r_arm_cap_torso_off,*off
+r_arm_cap_r_hand_off,*off
+l_leg_cap_hips_off,*off
+r_leg_cap_hips_off,*off
+hips_cap_torso_off,*off
+hips_cap_l_leg_off,*off
+hips_cap_r_leg_off,*off
\ No newline at end of file
diff --git a/MBAssets3/models/players/barriss_offee/model_prisoner.skin b/MBAssets3/models/players/barriss_offee/model_prisoner.skin
new file mode 100644
index 000000000..726438409
--- /dev/null
+++ b/MBAssets3/models/players/barriss_offee/model_prisoner.skin
@@ -0,0 +1,135 @@
+head,*off
+head_p,models/players/barriss_offee/head_p.tga
+head_ds,*off
+head_tunic,*off
+head_eyes_mouth,models/players/barriss_offee/mouth_eyes.tga
+head_lashes,models/players/common/lashes.tga
+head_hair,*off
+head_back,*off
+head_back2,*off
+head_hood,*off
+hood,*off
+
+hips,*off
+hips_belt,*off
+hips_skirt,*off
+skirt,*off
+l_leg,*off
+r_leg,*off
+
+torso,*off
+scarf,*off
+torso_cloak,*off
+cloak,*off
+
+r_arm,*off
+r_hand,models/players/barriss_offee/hands.tga
+
+l_arm,*off
+l_hand,models/players/barriss_offee/hands.tga
+wristguard,*off
+
+head_hair_old,*off
+torso_old,*off
+torso_old_cape,*off
+torso_old_caped,*off
+l_arm_old,*off
+l_arm_old_caped,*off
+r_arm_old,*off
+r_arm_old_caped,*off
+hips_belt_old,*off
+hips_old,*off
+legs_old,*off
+l_leg_old,*off
+r_leg_old,*off
+
+head_tunic_p,models/players/barriss_offee/head_tunic_p.tga
+torso_p,models/players/barriss_offee/torso_p.tga
+torso_p_neck,models/players/barriss_offee/head_tunic_p.tga
+r_arm_p,models/players/barriss_offee/torso_p.tga
+r_hand_p_wrist,models/players/barriss_offee/torso_p.tga
+l_arm_p,models/players/barriss_offee/torso_p.tga
+l_hand_p_wrist,models/players/barriss_offee/torso_p.tga
+hips_p,models/players/barriss_offee/legs_p.tga
+hips_p_torso,models/players/barriss_offee/torso_p.tga
+r_leg_p,models/players/barriss_offee/boots_p.tga
+l_leg_p,models/players/barriss_offee/boots_p.tga
+
+head_tunic_helmet,*off
+helmet,*off
+torso_inq,*off
+torso_inq_armor,*off
+r_shoulder_pad,*off
+l_shoulder_pad,*off
+wristguard_inq,*off
+hips_inq,*off
+hips_belt_inq,*off
+r_leg_inq,*off
+l_leg_inq,*off
+
+head_ac,*off
+head_hair_ac,*off
+head_hair_ac_t,*off
+torso_ac,*off
+torso_neck_ac,*off
+l_arm_ac,*off
+r_arm_ac,*off
+hips_ac,*off
+hips_belt_ac,*off
+l_leg_ac,*off
+r_leg_ac,*off
+
+torso_old_cap_hips_off,*off
+torso_old_cap_r_arm_off,*off
+torso_old_cap_l_arm_off,*off
+l_arm_old_cap_torso_off,*off
+r_arm_old_cap_torso_off,*off
+l_leg_old_cap_hips_off,*off
+r_leg_old_cap_hips_off,*off
+hips_old_cap_torso_off,*off
+hips_old_cap_r_leg_off,*off
+hips_old_cap_l_leg_off,*off
+
+torso_ac_cap_hips_off,*off
+torso_ac_cap_r_arm_off,*off
+torso_ac_cap_l_arm_off,*off
+l_arm_ac_cap_torso_off,*off
+r_arm_ac_cap_torso_off,*off
+l_leg_ac_cap_hips_off,*off
+r_leg_ac_cap_hips_off,*off
+hips_ac_cap_torso_off,*off
+hips_ac_cap_r_leg_off,*off
+hips_ac_cap_l_leg_off,*off
+
+torso_p_cap_head_off,models/players/stormtrooper/caps.tga
+torso_p_cap_hips_off,models/players/stormtrooper/caps.tga
+torso_p_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torso_p_cap_l_arm_off,models/players/stormtrooper/caps.tga
+l_hand_p_cap_l_arm_off,models/players/stormtrooper/caps.tga
+l_arm_p_cap_l_hand_off,models/players/stormtrooper/caps.tga
+l_arm_p_cap_torso_off,models/players/stormtrooper/caps.tga
+r_hand_p_cap_r_arm_off,models/players/stormtrooper/caps.tga
+r_arm_p_cap_torso_off,models/players/stormtrooper/caps.tga
+r_arm_p_cap_r_hand_off,models/players/stormtrooper/caps.tga
+l_leg_p_cap_hips_off,models/players/stormtrooper/caps.tga
+r_leg_p_cap_hips_off,models/players/stormtrooper/caps.tga
+hips_p_cap_torso_off,models/players/stormtrooper/caps.tga
+hips_p_cap_r_leg_off,models/players/stormtrooper/caps.tga
+hips_p_cap_l_leg_off,models/players/stormtrooper/caps.tga
+
+head_cap_torso_off,models/players/stormtrooper/caps.tga
+torso_cap_head_off,*off
+torso_cap_hips_off,*off
+torso_cap_r_arm_off,*off
+torso_cap_l_arm_off,*off
+l_hand_cap_l_arm_off,*off
+l_arm_cap_l_hand_off,*off
+l_arm_cap_torso_off,*off
+r_hand_cap_r_arm_off,*off
+r_arm_cap_torso_off,*off
+r_arm_cap_r_hand_off,*off
+l_leg_cap_hips_off,*off
+r_leg_cap_hips_off,*off
+hips_cap_torso_off,*off
+hips_cap_l_leg_off,*off
+hips_cap_r_leg_off,*off
diff --git a/MBAssets3/models/players/barriss_offee/modeldata.cfg b/MBAssets3/models/players/barriss_offee/modeldata.cfg
index a22301656..e7103cf2f 100644
--- a/MBAssets3/models/players/barriss_offee/modeldata.cfg
+++ b/MBAssets3/models/players/barriss_offee/modeldata.cfg
@@ -6,6 +6,26 @@ sounds_default
 barriss_offee
 f
 
+sounds_academy
+barriss_offee_rogue
+f
+
+sounds_academy_dmg
+barriss_offee_rogue
+f
+
+sounds_inq
+barriss_offee_inq
+f
+
+sounds_inq_nh
+barriss_offee_rogue
+f
+
+sounds_nocape
+barriss_offee_rogue
+f
+
 // trueview
 offsetX	"1.5"
 
diff --git a/MBAssets3/models/players/barriss_offee/saberauth.cfg b/MBAssets3/models/players/barriss_offee/saberauth.cfg
index 27cc0d299..2fa3ebb63 100644
--- a/MBAssets3/models/players/barriss_offee/saberauth.cfg
+++ b/MBAssets3/models/players/barriss_offee/saberauth.cfg
@@ -5,3 +5,43 @@ saber_barriss
 0.6277
 saber_luminara
 0.3333
+
+sabers_inq
+saber_inquisitor6_single
+1.0
+saber_inquisitor6
+1.0
+none
+1.0
+
+sabers_inq_nh
+saber_inquisitor6_single
+1.0
+saber_inquisitor6
+1.0
+none
+1.0
+
+sabers_academy
+saber_inquisitor6_single
+1.0
+saber_inquisitor6
+1.0
+none
+1.0
+
+sabers_academy_dmg
+saber_inquisitor6_single
+1.0
+saber_inquisitor6
+1.0
+none
+1.0
+
+sabers_nocape
+saber_asajj2
+0.8500
+saber_asajj2
+0.8500
+saber_asajj2
+0.8500
\ 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 0482ab73b..06e17e6b1 100644
--- a/MBAssets3/models/players/bastila/model_default.skin
+++ b/MBAssets3/models/players/bastila/model_default.skin
@@ -18,6 +18,8 @@ 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_layers_b,*off
+hips_layers_b,*off
 
 r_leg_cap_hips_off,models/players/stormtrooper/caps.tga
 l_leg_cap_hips_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 eb1e857d2..609607c7e 100644
--- a/MBAssets3/models/players/bastila/model_sith.skin
+++ b/MBAssets3/models/players/bastila/model_sith.skin
@@ -16,8 +16,10 @@ 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
+torso_layers,*off
+hips_layers,*off
+torso_layers_b,models/players/bastila/layers_sith.tga
+hips_layers_b,models/players/bastila/layers_sith.tga
 
 r_leg_cap_hips_off,models/players/stormtrooper/caps.tga
 l_leg_cap_hips_off,models/players/stormtrooper/caps.tga
diff --git a/MBAssets3/models/players/bastila/model_yellow.skin b/MBAssets3/models/players/bastila/model_yellow.skin
index efd6ea4a9..1fbbe5341 100644
--- a/MBAssets3/models/players/bastila/model_yellow.skin
+++ b/MBAssets3/models/players/bastila/model_yellow.skin
@@ -15,9 +15,11 @@ 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_augment,*off
 torso_layers,models/players/bastila/layers.tga
 hips_layers,models/players/bastila/layers.tga
+torso_layers_b,*off
+hips_layers_b,*off
 
 r_leg_cap_hips_off,models/players/stormtrooper/caps.tga
 l_leg_cap_hips_off,models/players/stormtrooper/caps.tga
diff --git a/MBAssets3/shaders/barriss_offee.shader b/MBAssets3/shaders/barriss_offee.shader
index 13fe0923f..8bd861ed6 100644
--- a/MBAssets3/shaders/barriss_offee.shader
+++ b/MBAssets3/shaders/barriss_offee.shader
@@ -7,3 +7,333 @@ models/players/barriss_offee/cloak
 		rgbGen lightingDiffuse
 	}
 }
+
+models/players/barriss_offee/cape
+{
+	cull	disable
+	{
+		map models/players/barriss_offee/cape
+		depthWrite
+		rgbGen lightingDiffuse
+	}
+}
+
+models/players/barriss_offee/body_inq
+{
+        nopicmip
+    {
+        map models/players/barriss_offee/body_inq
+        depthWrite
+        rgbGen lightingDiffuse
+    }
+    {  
+        map models/players/barriss_offee/body_inq_spec
+		blendFunc GL_SRC_ALPHA GL_ONE
+		alphaGen lightingSpecular
+                detail
+    }
+    {
+        map models/players/barriss_offee/body_inq_glow
+		blendFunc GL_SRC_ALPHA GL_ONE
+                rgbGen lightingDiffuse
+		glow
+                rgbGen identityLighting
+                detail
+    }
+}
+
+models/players/barriss_offee/belt
+{
+    {
+        map models/players/barriss_offee/belt
+        rgbGen lightingDiffuse
+    }
+    {
+        map models/players/barriss_offee/belt_spec
+        blendFunc GL_SRC_ALPHA GL_ONE
+        alphaGen lightingSpecular
+		detail
+    }
+}
+
+models/players/barriss_offee/belt_inq
+{
+    {
+        map models/players/barriss_offee/belt_inq
+        rgbGen lightingDiffuse
+    }
+    {
+        map models/players/barriss_offee/belt_inq_spec
+        blendFunc GL_SRC_ALPHA GL_ONE
+        alphaGen lightingSpecular
+		detail
+    }
+}
+
+models/players/barriss_offee/body_academy
+{
+    {
+        map models/players/barriss_offee/body_academy
+        rgbGen lightingDiffuse
+    }
+    {
+        map models/players/barriss_offee/body_academy_spec
+        blendFunc GL_SRC_ALPHA GL_ONE
+        alphaGen lightingSpecular
+		detail
+    }
+}
+
+models/players/barriss_offee/body_old
+{
+    {
+        map models/players/barriss_offee/body_old
+        rgbGen lightingDiffuse
+    }
+    {
+        map models/players/barriss_offee/body_old_spec
+        blendFunc GL_SRC_ALPHA GL_ONE
+        alphaGen lightingSpecular
+		detail
+    }
+}
+
+models/players/barriss_offee/boots_inq
+{
+    {
+        map models/players/barriss_offee/boots_inq
+        rgbGen lightingDiffuse
+    }
+    {
+        map models/players/barriss_offee/boots_inq_spec
+        blendFunc GL_SRC_ALPHA GL_ONE
+        alphaGen lightingSpecular
+		detail
+    }
+}
+
+models/players/barriss_offee/cape_old
+{
+    {
+        map models/players/barriss_offee/cape_old
+        rgbGen lightingDiffuse
+    }
+    {
+        map models/players/barriss_offee/cape_old_spec
+        blendFunc GL_SRC_ALPHA GL_ONE
+        alphaGen lightingSpecular
+		detail
+    }
+}
+
+models/players/barriss_offee/helmet
+{
+    {
+        map models/players/barriss_offee/helmet
+        rgbGen lightingDiffuse
+    }
+    {
+        map models/players/barriss_offee/helmet_spec
+        blendFunc GL_SRC_ALPHA GL_ONE
+        alphaGen lightingSpecular
+		detail
+    }
+}
+
+models/players/barriss_offee/legs_academy
+{
+    {
+        map models/players/barriss_offee/legs_academy
+        rgbGen lightingDiffuse
+    }
+    {
+        map models/players/barriss_offee/legs_academy_spec
+        blendFunc GL_SRC_ALPHA GL_ONE
+        alphaGen lightingSpecular
+		detail
+    }
+}
+
+models/players/barriss_offee/legs_old
+{
+    {
+        map models/players/barriss_offee/legs_old
+        rgbGen lightingDiffuse
+    }
+    {
+        map models/players/barriss_offee/legs_old_spec
+        blendFunc GL_SRC_ALPHA GL_ONE
+        alphaGen lightingSpecular
+		detail
+    }
+}
+
+models/players/barriss_offee/legs
+{
+    {
+        map models/players/barriss_offee/legs
+        rgbGen lightingDiffuse
+    }
+    {
+        map models/players/barriss_offee/legs_spec
+        blendFunc GL_SRC_ALPHA GL_ONE
+        alphaGen lightingSpecular
+		detail
+    }
+}
+
+models/players/barriss_offee/wristguard
+{
+    {
+        map models/players/barriss_offee/wristguard
+        rgbGen lightingDiffuse
+    }
+    {
+        map models/players/barriss_offee/wristguard_spec
+        blendFunc GL_SRC_ALPHA GL_ONE
+        alphaGen lightingSpecular
+		detail
+    }
+}
+
+models/players/barriss_offee/hair
+{
+    {
+        map models/players/barriss_offee/hair
+        rgbGen lightingDiffuse
+    }
+    {
+        map models/players/barriss_offee/hair_spec
+        blendFunc GL_SRC_ALPHA GL_ONE
+        alphaGen lightingSpecular
+		detail
+    }
+}
+
+models/players/barriss_offee/hair_ac
+{
+    {
+        map models/players/barriss_offee/hair_ac
+        rgbGen lightingDiffuse
+    }
+    {
+        map models/players/barriss_offee/hair_ac_spec
+        blendFunc GL_SRC_ALPHA GL_ONE
+        alphaGen lightingSpecular
+		detail
+    }
+}
+
+models/players/barriss_offee/hair_old
+{
+    {
+        map models/players/barriss_offee/hair_old
+        rgbGen lightingDiffuse
+    }
+    {
+        map models/players/barriss_offee/hair_old_spec
+        blendFunc GL_SRC_ALPHA GL_ONE
+        alphaGen lightingSpecular
+		detail
+    }
+}
+
+models/players/barriss_offee/head
+{
+    {
+        map models/players/barriss_offee/head
+        rgbGen lightingDiffuse
+    }
+    {
+        map models/players/barriss_offee/head_spec
+        blendFunc GL_SRC_ALPHA GL_ONE
+        alphaGen lightingSpecular
+		detail
+    }
+}
+
+models/players/barriss_offee/head_academy
+{
+    {
+        map models/players/barriss_offee/head_academy
+        rgbGen lightingDiffuse
+    }
+    {
+        map models/players/barriss_offee/head_academy_spec
+        blendFunc GL_SRC_ALPHA GL_ONE
+        alphaGen lightingSpecular
+		detail
+    }
+}
+
+models/players/barriss_offee/head_academy_dmg
+{
+    {
+        map models/players/barriss_offee/head_academy_dmg
+        rgbGen lightingDiffuse
+    }
+    {
+        map models/players/barriss_offee/head_academy_spec
+        blendFunc GL_SRC_ALPHA GL_ONE
+        alphaGen lightingSpecular
+		detail
+    }
+}
+
+models/players/barriss_offee/head_inq
+{
+    {
+        map models/players/barriss_offee/head_inq
+        rgbGen lightingDiffuse
+    }
+    {
+        map models/players/barriss_offee/head_inq_spec
+        blendFunc GL_SRC_ALPHA GL_ONE
+        alphaGen lightingSpecular
+		detail
+    }
+}
+
+models/players/barriss_offee/head_p
+{
+    {
+        map models/players/barriss_offee/head_p
+        rgbGen lightingDiffuse
+    }
+    {
+        map models/players/barriss_offee/head_p_spec
+        blendFunc GL_SRC_ALPHA GL_ONE
+        alphaGen lightingSpecular
+		detail
+    }
+}
+
+models/players/barriss_offee/head_old
+{
+    {
+        map models/players/barriss_offee/head_old
+        rgbGen lightingDiffuse
+    }
+    {
+        map models/players/barriss_offee/head_old_spec
+        blendFunc GL_SRC_ALPHA GL_ONE
+        alphaGen lightingSpecular
+		detail
+    }
+}
+
+models/players/barriss_offee/head_old_hooded
+{
+    {
+        map models/players/barriss_offee/head_old_hooded
+        rgbGen lightingDiffuse
+    }
+    {
+        map models/players/barriss_offee/head_old_h_spec
+        blendFunc GL_SRC_ALPHA GL_ONE
+        alphaGen lightingSpecular
+		detail
+    }
+}
+
+

From e0663f672fe068805d0c48a0fa130f0d001af6d4 Mon Sep 17 00:00:00 2001
From: Unguided <buektomi@gmail.com>
Date: Sat, 21 Feb 2026 21:43:43 +0100
Subject: [PATCH 50/82] saberauth edits for Krayt/Maladi/Wyyrlok

---
 MBAssets3/models/players/darthkrayt/saberauth.cfg   | 6 +++---
 MBAssets3/models/players/darthkrayt2/saberauth.cfg  | 6 +++---
 MBAssets3/models/players/darthmaladi/saberauth.cfg  | 6 +++---
 MBAssets3/models/players/darthwyyrlok/saberauth.cfg | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/MBAssets3/models/players/darthkrayt/saberauth.cfg b/MBAssets3/models/players/darthkrayt/saberauth.cfg
index 88da04552..f7c23324d 100644
--- a/MBAssets3/models/players/darthkrayt/saberauth.cfg
+++ b/MBAssets3/models/players/darthkrayt/saberauth.cfg
@@ -1,7 +1,7 @@
 all_sabers
-saber_asharad
+saber_talon
 1.0
-saber_asharad
+saber_talon
 1.0
-saber_asharad2
+saber_asharad
 1.0
\ No newline at end of file
diff --git a/MBAssets3/models/players/darthkrayt2/saberauth.cfg b/MBAssets3/models/players/darthkrayt2/saberauth.cfg
index 88da04552..f7c23324d 100644
--- a/MBAssets3/models/players/darthkrayt2/saberauth.cfg
+++ b/MBAssets3/models/players/darthkrayt2/saberauth.cfg
@@ -1,7 +1,7 @@
 all_sabers
-saber_asharad
+saber_talon
 1.0
-saber_asharad
+saber_talon
 1.0
-saber_asharad2
+saber_asharad
 1.0
\ No newline at end of file
diff --git a/MBAssets3/models/players/darthmaladi/saberauth.cfg b/MBAssets3/models/players/darthmaladi/saberauth.cfg
index b0da8af19..df13f4d9a 100644
--- a/MBAssets3/models/players/darthmaladi/saberauth.cfg
+++ b/MBAssets3/models/players/darthmaladi/saberauth.cfg
@@ -1,7 +1,7 @@
 all_sabers
-saber_nobushi
+saber_talon
 1.0
-saber_nobushi
+saber_talon
 1.0
-saber_nobushi
+saber_talon2
 1.0
\ No newline at end of file
diff --git a/MBAssets3/models/players/darthwyyrlok/saberauth.cfg b/MBAssets3/models/players/darthwyyrlok/saberauth.cfg
index 512d2a226..fbd45d59c 100644
--- a/MBAssets3/models/players/darthwyyrlok/saberauth.cfg
+++ b/MBAssets3/models/players/darthwyyrlok/saberauth.cfg
@@ -1,7 +1,7 @@
 all_sabers
-tyrant
+saber_talon
 1.0
-tyrant
+saber_talon
 1.0
-tyrant
+saber_talon2
 1.0
\ No newline at end of file

From efbf7a38456152cbfbdb29ed50ee0d761c8b4a4e Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Sun, 22 Feb 2026 16:08:50 +0100
Subject: [PATCH 51/82] v6_ScoutTr slight rework

Rework to balance the class more and make it more fun to play and add more options.

Shield trooper:
Dash removed completely.
More options such as blast armor and armor regen added for tankyness to fullfill their role of mobile tank better again.
Speed pointbuy added for if you don't want to be more tanky.
Saber damage pointbuy added to choice how much damage you want to do.
Overal it's buffed somewhat and you pick between speed, damage, defense and utility a bit more.

Commando:
Added A280 rifle because imps lack those.
Slight increase in speed pointbuy. Dex 2 option added. 120 Stam pool option added.

Sharpshooter:
Can no longer take both 3 lives and the sniper rifle. Added extra stamina pool and dash 2 option for 2 life builds that do not pick the sniper. E22 build slightly buffed, as well as 3 life builds in general.

Also: Added ammo 4 which applies to A280 and E22. E11 got 20 more ammo instead.
Saber damage by default: 75 > 60. Only the melee focused trooper should be able to really kill people easily with the shock baton.
---
 .../ext_data/mb2/character/v6_ScoutTr.mbch    | 463 +++++++++---------
 1 file changed, 239 insertions(+), 224 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v6_ScoutTr.mbch b/z_MBLegends/ext_data/mb2/character/v6_ScoutTr.mbch
index 7c3bd59b7..a895482e9 100644
--- a/z_MBLegends/ext_data/mb2/character/v6_ScoutTr.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v6_ScoutTr.mbch
@@ -1,232 +1,247 @@
 ClassInfo
 {
-	name	"v6_ScoutTr"
-	weapons	WP_MELEE|WP_SABER
-	resource	RESOURCE_STAMINA
-	forcepool	75
-	forceregen	1.1
-	rankforcepool	100
-	attributes	MB_ATT_ASSEMBLE,2|MB_ATT_GUN_DEFENSE,0|MB_ATT_DEFLECT,0|MB_ATT_AMMO,3|MB_ATT_DEXTERITY,1|MB_ATT_STAMINA,2
-	MBClass	MB_CLASS_HERO
-	classNumberLimit	3
-	maxhealth	80
-	RankHealth 100
-	maxarmor	75
-	ArmourRegenRate	1000
-	ArmourRegenCap	50
-	rankArmourRegenAmount 2
-	basespeed 187
-	RankBaseSpeed 190
-	DamageGiven 1
-	RankDmgGiven 1.1
-	rateOfFire	1.1
-	rankROF 1,0.9
-	CSmultiplier	1.05
-	ASmultiplier	0.94
-	rankAS	1,1.06,1.12
-	APmultiplier 0.75
-	BPmultiplier 0
-	rankBP	1.15
-	saberDamage 75
-	RankSaberDamage 100
-	extralives	1
-	holdables	HI_MEDPAC
-	rateOfFire_Melee	0.95
-	//tauntAnim BOTH_SCEPTER_HOLD
-	gloatAnim	TORSO_HANDSIGNAL4
-	flourishAnim	BOTH_STAND5STARTLEDLOOKLEFT
-	saberStanceAnim	BOTH_ROSH_HEAL
-	saberstyle 	SS_TAVION
-	saber1	riot_baton_p_legends
-	saber2	riot_shield_legends
-	saber1_1	riot_baton_b_legends
-	saber2_1	riot_shield_legends
-	saber1_2	riot_baton_o_legends
-	saber2_2	riot_shield_legends
-	uioverlay_c "gfx/icons/scout"
-	uioverlay_r "gfx/icons/infantry"
-	uioverlay_l "gfx/icons/spec_infantry"
-	model	"scouttrooper"
-	skin	"default"
-	uishader	"models/players/scouttrooper/mb2_icon_default"
-	model_1	"scouttrooper"
-	skin_1	"captain_rgb"
-	uishader_1	"models/players/scouttrooper/mb2_icon_captain_rgb"
-	userRGB_1 1
-	customred_1 1
-	customgreen_1	1
-	customblue_1 1
-	model_2	"scouttrooper"
-	skin_2	"swamp"
-	uishader_2	"models/players/scouttrooper/mb2_icon_swamp"
-	model_3	"scouttrooper"
-	skin_3	"swamp2"
-	uishader_3	"models/players/scouttrooper/mb2_icon_swamp2"
-	model_4	"scouttrooper"
-	skin_4	"novaofficer"
-	uishader_4	"models/players/scouttrooper/mb2_icon_novaofficer"
-	model_5	"scouttrooper"
-	skin_5	"commando"
-	uishader_5	"models/players/scouttrooper/mb2_icon_commando"
-	special1	EAS_HI_SPRINT
-	special2	EAS_HI_DEX
-	special3	EAS_HI_DASH
-	special4	EAS_HI_MEDPAC
-	isCustomBuild	1
-	mbPoints	13
-	hasCustomSpec 3
-	isOnlyOneSpec 1
-	customSpecName_1 "Shield Trooper"
-	customSpecIcon_1 "gfx/2d/hud/hlp_defend"
-	customSpecDesc_1 "Mobile tank melee specialist"
-	customSpecName_2 "Commando"
-	customSpecIcon_2 "gfx/menus/alpha/icon_weap_poison"
-	customSpecDesc_2 "Assault specialist"
-	customSpecName_3 "Sharpshooter"
-	customSpecIcon_3 "gfx/menus/alpha/icon_weap_accuracy"
-	customSpecDesc_3 "Sniper"
-
-	c_att_skill_0	MB_ATT_FP_SABER_DEFENSE
-	c_att_names_0	"Saber Defense"
-	c_att_ranks_0	0,2
-
-	c_att_skill_1	MB_ATT_GUN_DEFENSE
-	c_att_names_1	"Blaster Defense"
-	c_att_ranks_1	0,1,2
-
-	c_att_skill_2 MB_ATT_BP_MULTIPLIER
-	c_att_names_2 "Saber BP (115%)"
-	c_att_ranks_2 0
-
-	c_att_skill_3	MB_ATT_AS_MULTIPLIER
-	c_att_names_3	"Saber AS (100/106/112%)"
-	c_att_ranks_3	1,1,1
-
-	c_att_skill_4 MB_ATT_SABER_DAMAGE
-	c_att_names_4 "Saber Dmg (100)"
-	c_att_ranks_4 1
-
-	c_att_skill_5	MB_ATT_PISTOL
-	c_att_names_5	"EC-17 Hold-Out Pistol"
-	c_att_ranks_5	2,0
-	c_att_descs_5 "10% more charged FP drain"
-
-	c_att_skill_6	MB_ATT_PULSE_GRENADES
-	c_att_names_6	"Pulse Grenades"
-	c_att_ranks_6	1,1
-
-	c_att_skill_7	MB_ATT_RESPAWNS
-	c_att_names_7	"Reinforcement"
-	c_att_ranks_7	9
-	c_att_descs_7 "1 default"
-
-	c_att_skill_8	MB_ATT_FORCEBLOCK
-	c_att_names_8	"Force Block"
-	c_att_ranks_8	1
-	c_att_descs_8 "Blocking resists Force Powers"
-
-	c_att_skill_9	MB_ATT_STAMINA
-	c_att_names_9	"Stamina ^3[CS1]"
-	c_att_ranks_9	0,0,2
-
-	c_att_skill_10	MB_ATT_DEXTERITY
-	c_att_names_10	"Dexterity ^3[CS2]"
-	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"
-	c_att_ranks_15	0,0,2
-	c_att_descs_15 "10% more charged FP drain"
-
-	c_att_skill_16	MB_ATT_BLASTER
-	c_att_names_16	"E-11 Blaster Rifle"
-	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	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	"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	"HP (100)"
-	c_att_ranks_20	1
-
-	c_att_skill_21 MB_ATT_BASESPEED
-	c_att_names_21 "Speed (190)"
-	c_att_ranks_21 0
-
-	c_att_skill_22	MB_ATT_ARMOUR_REGEN_AMOUNT
-	c_att_names_22	"Armor Regen (2/s to 50)"
-	c_att_ranks_22	3
-
-	c_att_skill_23	MB_ATT_ROF_MULTIPLIER
-	c_att_names_23	"RoF (100/110%)"
-	c_att_ranks_23 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_STAMINA
-	c_att_names_25	"Stamina ^3[CS1]"
-	c_att_ranks_25	0,0,1
-
-	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"
-	c_att_ranks_30	0,0,2
-	c_att_descs_30 "10% more charged FP drain"
-
-	c_att_skill_31	MB_ATT_E_22
-	c_att_names_31	"E-22 Rec. Blaster Rifle"
-	c_att_ranks_31	2,0,2
-
-	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,
+name	"v6_ScoutTr"
+weapons	WP_MELEE|WP_SABER
+resource	RESOURCE_STAMINA
+forcepool	80
+forceregen	1.1
+rankforcepool	100,120
+attributes	MB_ATT_ASSEMBLE,2|MB_ATT_GUN_DEFENSE,0|MB_ATT_DEFLECT,0|MB_ATT_AMMO,4|MB_ATT_DEXTERITY,1|MB_ATT_STAMINA,2
+MBClass	MB_CLASS_HERO
+classNumberLimit	3
+maxhealth	80
+RankHealth 100
+maxarmor	75
+ArmourRegenRate	1000
+ArmourRegenCap	50
+rankArmourRegenAmount 2
+basespeed 187
+RankBaseSpeed 192,195
+DamageGiven 1
+RankDmgGiven 1.1
+rateOfFire	1.1
+rankROF 1,0.9
+CSmultiplier	1.05
+ASmultiplier	0.94
+rankAS	1,1.06,1.12
+APmultiplier 0.75
+BPmultiplier 0
+rankBP	1.15
+saberDamage 60
+RankSaberDamage 80,100,120
+extralives	1
+holdables	HI_MEDPAC
+rateOfFire_Melee	0.95
+gloatAnim	TORSO_HANDSIGNAL4
+flourishAnim	BOTH_STAND5STARTLEDLOOKLEFT
+saberStanceAnim	BOTH_ROSH_HEAL
+saberstyle 	SS_TAVION
+saber1	riot_baton_p_legends
+saber2	riot_shield_legends
+saber1_1	riot_baton_b_legends
+saber2_1	riot_shield_legends
+saber1_2	riot_baton_o_legends
+saber2_2	riot_shield_legends
+uioverlay_c "gfx/icons/scout"
+uioverlay_r "gfx/icons/infantry"
+uioverlay_l "gfx/icons/spec_infantry"
+model	"scouttrooper"
+skin	"default"
+uishader	"models/players/scouttrooper/mb2_icon_default"
+model_1	"scouttrooper"
+skin_1	"captain_rgb"
+uishader_1	"models/players/scouttrooper/mb2_icon_captain_rgb"
+userRGB_1 1
+customred_1 1
+customgreen_1	1
+customblue_1 1
+model_2	"scouttrooper"
+skin_2	"swamp"
+uishader_2	"models/players/scouttrooper/mb2_icon_swamp"
+model_3	"scouttrooper"
+skin_3	"swamp2"
+uishader_3	"models/players/scouttrooper/mb2_icon_swamp2"
+model_4	"scouttrooper"
+skin_4	"novaofficer"
+uishader_4	"models/players/scouttrooper/mb2_icon_novaofficer"
+model_5	"scouttrooper"
+skin_5	"commando"
+uishader_5	"models/players/scouttrooper/mb2_icon_commando"
+special1	EAS_HI_SPRINT
+special2	EAS_HI_DEX
+special3	EAS_HI_DASH
+special4	EAS_HI_MEDPAC
+isCustomBuild	1
+mbPoints	20
+hasCustomSpec 3
+isOnlyOneSpec 1
+customSpecName_1 "Shield Trooper"
+customSpecIcon_1 "gfx/2d/hud/hlp_defend"
+customSpecDesc_1 "Mobile tank melee specialist"
+customSpecName_2 "Commando"
+customSpecIcon_2 "gfx/menus/alpha/icon_weap_poison"
+customSpecDesc_2 "Assault specialist"
+customSpecName_3 "Sharpshooter"
+customSpecIcon_3 "gfx/menus/alpha/icon_weap_accuracy"
+customSpecDesc_3 "Sniper"
+
+c_att_skill_0	MB_ATT_FP_SABER_DEFENSE
+c_att_names_0	"Saber Defense"
+c_att_ranks_0	0,2
+
+c_att_skill_1	MB_ATT_GUN_DEFENSE
+c_att_names_1	"Blaster Defense"
+c_att_ranks_1	0,1,2
+
+c_att_skill_2 MB_ATT_BP_MULTIPLIER
+c_att_names_2 "Saber BP (115%)"
+c_att_ranks_2 1
+
+c_att_skill_3	MB_ATT_AS_MULTIPLIER
+c_att_names_3	"Saber AS (100/106/112%)"
+c_att_ranks_3	1,1,1
+
+c_att_skill_4 MB_ATT_SABER_DAMAGE
+c_att_names_4 "Saber Dmg (80,100,120)"
+c_att_ranks_4 1,1,1
+
+c_att_skill_5	MB_ATT_PISTOL
+c_att_names_5	"EC-17 Hold-Out Pistol"
+c_att_ranks_5	2,0
+c_att_descs_5 "10% more charged FP drain"
+
+c_att_skill_6	MB_ATT_PULSE_GRENADES
+c_att_names_6	"Pulse Grenades"
+c_att_ranks_6	1,1
+
+c_att_skill_7	MB_ATT_RESPAWNS
+c_att_names_7	"Reinforcement"
+c_att_ranks_7	10
+c_att_descs_7 "1 default"
+
+c_att_skill_8	MB_ATT_SHIELD_RECHARGE
+c_att_names_8	"Armor Regen"
+c_att_ranks_8	2
+
+c_att_skill_9 MB_ATT_BASESPEED
+c_att_names_9 "Speed (192/195)"
+c_att_ranks_9 1,1
+
+c_att_skill_10	MB_ATT_FORCEBLOCK
+c_att_names_10	"Force Block"
+c_att_ranks_10	1
+c_att_descs_10 "Blocking resists Force Powers"
+
+c_att_skill_11	MB_ATT_BLAST_ARMOUR
+c_att_names_11	"Blast Armor"
+c_att_ranks_11	2
+
+c_att_skill_12	MB_ATT_STAMINA
+c_att_names_12	"Stamina ^3[CS1]"
+c_att_ranks_12	0,0,2
+
+c_att_skill_13	MB_ATT_DEXTERITY
+c_att_names_13	"Dexterity ^3[CS2]"
+c_att_ranks_13	0,0,1
+
+c_att_skill_15	MB_ATT_PISTOL
+c_att_names_15	"EC-17 Hold-Out Pistol"
+c_att_ranks_15	0,0,3
+c_att_descs_15 "10% more charged FP drain"
+
+c_att_skill_16	MB_ATT_BLASTER
+c_att_names_16	"E-11 Blaster Rifle"
+c_att_ranks_16	1,1,2
+
+c_att_skill_17	MB_ATT_A280
+c_att_names_17	"A280 Blaster Rifle"
+c_att_ranks_17	3,2,0
+
+c_att_skill_18	MB_ATT_T21
+c_att_names_18	"T-21 Heavy Blaster"
+c_att_ranks_18	1,3,1
+c_att_descs_18 "10% more Dmg, 10% more FP Dmg, 10% slower RoF"
+
+c_att_skill_19	MB_ATT_MICRO_GRENADES
+c_att_names_19	"V-59 Conc Grenades"
+c_att_ranks_19	1,1
+
+c_att_skill_20	MB_ATT_THERMALS
+c_att_names_20	"Thermal Detonator"
+c_att_ranks_20	2
+
+c_att_skill_21	MB_ATT_HEALTH
+c_att_names_21	"HP (100)"
+c_att_ranks_21	1
+
+c_att_skill_22 MB_ATT_BASESPEED
+c_att_names_22 "Speed (192)"
+c_att_ranks_22 1
+
+c_att_skill_23	MB_ATT_ARMOUR_REGEN_AMOUNT
+c_att_names_23	"Armor Regen (2/s to 50)"
+c_att_ranks_23	3
+
+c_att_skill_24	MB_ATT_ROF_MULTIPLIER
+c_att_names_24	"RoF (100/110%)"
+c_att_ranks_24 2,2
+
+c_att_skill_25	MB_ATT_POWER
+c_att_names_25	"Stamina Pool (100/120)"
+c_att_ranks_25	1,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_DEXTERITY
+c_att_names_27	"Dexterity ^3[CS2]"
+c_att_ranks_27	0,1
+
+c_att_skill_28	MB_ATT_DASH
+c_att_names_28	"Dash ^3[CS3]"
+c_att_ranks_28	2,0
+
+c_att_skill_30	MB_ATT_PISTOL
+c_att_names_30	"EC-17 Hold-Out Pistol"
+c_att_ranks_30	0,0,2
+c_att_descs_30 "10% more charged FP drain"
+
+c_att_skill_31	MB_ATT_E_22
+c_att_names_31	"E-22 Rec. Blaster Rifle"
+c_att_ranks_31	2,0,2
+
+c_att_skill_32	MB_ATT_EE4
+c_att_names_32	"DLT-20A Sniper Config (EE-4)"
+c_att_ranks_32	10,0
+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"
-	c_att_ranks_33	2,2
+c_att_skill_33	MB_ATT_SONIC_DETONATOR
+c_att_names_33	"Sonic Detonators"
+c_att_ranks_33	2,2
 
-	c_att_skill_34	MB_ATT_RESPAWNS
-	c_att_names_34	"Reinforcement"
-	c_att_ranks_34	9
-	c_att_descs_34 "1 default"
+c_att_skill_34	MB_ATT_RESPAWNS
+c_att_names_34	"Reinforcement"
+c_att_ranks_34	11
+c_att_descs_34 "1 default"
 
-	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_35	MB_ATT_DMG_GIVEN_MULTIPLIER
+c_att_names_35	"Dmg Given (110%)"
+c_att_ranks_35	2
+c_att_descs_35 "Does not affect Saber"
 
-	c_att_skill_36	MB_ATT_POWER
-	c_att_names_36	"Stamina Pool (100)"
-	c_att_ranks_36	0
+c_att_skill_36	MB_ATT_POWER
+c_att_names_36	"Stamina Pool (100/120)"
+c_att_ranks_36	1,3
 
-	c_att_skill_37	MB_ATT_STAMINA
-	c_att_names_37	"Stamina ^3[CS1]"
-	c_att_ranks_37	0,0,1
+c_att_skill_37	MB_ATT_STAMINA
+c_att_names_37	"Stamina ^3[CS1]"
+c_att_ranks_37	0,0,1
 
-	c_att_skill_38	MB_ATT_DASH
-	c_att_names_38	"Dash ^3[CS3]"
-	c_att_ranks_38	2
+c_att_skill_38	MB_ATT_DASH
+c_att_names_38	"Dash ^3[CS3]"
+c_att_ranks_38	2,1
 }
 WeaponInfo0
 {
@@ -268,6 +283,7 @@ fpmult 1.5
 damagemod 1.5
 Velocitymod 2
 ReloadTimeModifier 166
+customammo 600
 }
 WeaponInfo3
 {
@@ -277,10 +293,10 @@ NewWorldModel	"models/weapons2/t-21/t-21_w.glm"
 NewViewModel	"models/weapons2/t-21/t-21.md3"
 Icon	"gfx/hud/w_icon_t-21"
 WeaponName	"T-21 Heavy Blaster"
-customAmmo 850
 damagemod 1.1
 ratemod 1.1
 fpmult 1.1
+customammo 850
 }
 WeaponInfo4
 {
@@ -290,9 +306,9 @@ NewWorldModel	"models/weapons2/blaster_r/blaster_w.glm"
 NewViewModel	"models/weapons2/blaster_r/blaster.md3"
 Icon	"gfx/hud/w_icon_E11"
 WeaponName	"E-11 Blaster Rifle"
-customAmmo	660
+customAmmo	680
 }
-description	"Imperial Scout Trooper 
+description	"Imperial Scout Trooper
 
 A customizable scout class.
 
@@ -301,7 +317,6 @@ A customizable scout class.
 -- 5% faster RoF
 - Riot Gear (Cyan Saber)
 -- Saber/Blaster Defense (0)
--- 10/2% more Kb on L/R hands
 -- 60% less Reach
 
 ^6Inventory:

From fcf52512b66105e375452a5249f1ac7bdddbc0ab Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Sun, 22 Feb 2026 16:31:44 +0100
Subject: [PATCH 52/82] h7_Hera bhop

Bhop and 5% KB given to make her slightly less boring maybe.
---
 z_MBLegends/ext_data/mb2/character/h7_Hera.mbch | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/h7_Hera.mbch b/z_MBLegends/ext_data/mb2/character/h7_Hera.mbch
index 96d28b196..c8541cb39 100644
--- a/z_MBLegends/ext_data/mb2/character/h7_Hera.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h7_Hera.mbch
@@ -4,7 +4,7 @@ ClassInfo
 {
 	name				"h7_Hera"
 	weapons				WP_MELEE|WP_PULSE_NADE|WP_FRAG_NADE|WP_CLONE_PISTOL
-	attributes			MB_ATT_DISP_ARMOR,2|MB_ATT_PULSE_GRENADES,3|MB_ATT_DEXTERITY,3|MB_ATT_DODGE,3|MB_ATT_HEALING,2|MB_ATT_AMMO,3|MB_ATT_QUICKTHROW,1|MB_ATT_FRAGS,1|MB_ATT_RALLY,1|MB_ATT_USE_DISTANCE,1|MB_ATT_CLONE_PISTOL,2
+	attributes			MB_ATT_DISP_ARMOR,2|MB_ATT_PULSE_GRENADES,3|MB_ATT_DEXTERITY,3|MB_ATT_DODGE,3|MB_ATT_HEALING,2|MB_ATT_AMMO,3|MB_ATT_QUICKTHROW,1|MB_ATT_FRAGS,1|MB_ATT_RALLY,1|MB_ATT_USE_DISTANCE,1|MB_ATT_CLONE_PISTOL,2|MB_ATT_FLOAT_HOP|MB_ATT_BUNNY_HOP,1
 	maxhealth			170
 	maxarmor			90
 	model				"hera"
@@ -21,7 +21,9 @@ ClassInfo
 	forcepool			100
 	classflags			CFL_STATVIEWER
 	RESOURCE			RESOURCE_ENERGY
-		
+
+	knockbackGiven 1.05
+
 //WP_BlasterFlags HELD_KNOCKBACK
 	
 	special1		EAS_HI_DODGE
@@ -88,6 +90,9 @@ A dexterous and speedy commander with Quickthrow grenades and portable defensive
 - Portable E-Web Cannon
 
 ^8Attributes:
+- 5% more Kb Given
+- Bunny Hop (1)
+- Slow Faller
 - Dexterity (3)
 - Healing (2)
 - Rally 

From 81c1740020f81a909b5b9e019590d68f925bed24 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Sun, 22 Feb 2026 18:54:05 +0100
Subject: [PATCH 53/82] h3_BossNass 1 hit kill rocket removal

Removes insane knockback from rockets that one shot almost anything due to knockback+knockdown. Fb1 added instead which only functions if he is actively blocking.
---
 z_MBLegends/ext_data/mb2/character/h3_BossNass.mbch | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/h3_BossNass.mbch b/z_MBLegends/ext_data/mb2/character/h3_BossNass.mbch
index dc4eddc49..c150b5405 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,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
+	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|MB_ATT_FORCEBLOCK,1
 	
 	saberMaxChain 	1
 	saber1		   bossnass_shield_legends_2
@@ -26,7 +26,7 @@ ClassInfo
 	//WP_MeleeFlags HELD_SLOW
 	WP_PulseNadeFlags HELD_HIGHDAMAGE
 	WP_ConcussionFlags HELD_ALTRELOAD
- WP_PLX1Flags HELD_STUN|HELD_KNOCKBACK
+ WP_PLX1Flags HELD_STUN
 
 	saberStanceAnim  	BOTH_SABERSTAFF_STANCE
 	RunForward   	BOTH_RUN_DUAL
@@ -135,7 +135,7 @@ A tanky rocketeer with a large protective Energy Shield and inherent aquatic res
 -- 43% less Reach
 -- 1100% more Radius
 - Salvaged E-60R Missile Launcher (6) (PLX)
--- Staggers/pushes on det
+-- Staggers on det
 -- Reloads 2 rockets per clip
 -- 30% faster Reload
 - Boss's Big Bombad Boomas (2) (Pulse Grenades)
@@ -152,6 +152,7 @@ A tanky rocketeer with a large protective Energy Shield and inherent aquatic res
 - Physical Resist
 - Healing (2)
 - Rally
+- Force Block (1)
 - Underwater Breathing
 - Aerial Resource Regen
 

From fad16263307acffafa81dcb5ce0bed06e32f9460 Mon Sep 17 00:00:00 2001
From: NPC315 <npcplace@gmail.com>
Date: Wed, 25 Feb 2026 10:09:57 -0600
Subject: [PATCH 54/82] Switching spawner to MB_ATT

Switching spawner to MB_ATT. Also interrogator on Tarkin?
---
 z_MBLegends/ext_data/mb2/character/h9_Yarael.mbch | 4 ++--
 z_MBLegends/ext_data/mb2/character/v7_Enoch.mbch  | 8 +++++---
 z_MBLegends/ext_data/mb2/character/v7_Tarkin.mbch | 6 ++++--
 z_MBLegends/ext_data/mb2/character/v7_Veers.mbch  | 8 +++++---
 z_MBLegends/ext_data/mb2/character/v7_WatTam.mbch | 6 +++---
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/h9_Yarael.mbch b/z_MBLegends/ext_data/mb2/character/h9_Yarael.mbch
index 6b11c7385..b30be386b 100644
--- a/z_MBLegends/ext_data/mb2/character/h9_Yarael.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h9_Yarael.mbch
@@ -9,7 +9,7 @@ ClassInfo
 	
 	weapons			WP_SABER|WP_MELEE
 	
-	attributes		MB_ATT_FP_SABER_DEFENSE,2|MB_ATT_FORCEFOCUS,2|MB_ATT_FORCEBLOCK,2|MB_ATT_HEALING,2|MB_ATT_DEFLECT,1|MB_ATT_GUN_DEFENSE,2|MB_ATT_SPAWNER,3|MB_ATT_ANTI_MT,2
+	attributes		MB_ATT_SPAWNER,1|MB_ATT_FP_SABER_DEFENSE,2|MB_ATT_FORCEFOCUS,2|MB_ATT_FORCEBLOCK,2|MB_ATT_HEALING,2|MB_ATT_DEFLECT,1|MB_ATT_GUN_DEFENSE,2|MB_ATT_SPAWNER,3|MB_ATT_ANTI_MT,2
 	
 	forcepowers		FP_LEVITATION,2|FP_PUSH,2|FP_PULL,2|FP_TELEPATHY,3|FP_SEE,3
 	
@@ -35,7 +35,7 @@ ClassInfo
 	uioverlay 	"gfx/icons/frontline"
 	modelscale 	1.34
 
-	holdables HI_SPAWNER
+	spawnerNPC "yarael_poof"
 	
 	gloatAnim BOTH_HEADSHAKE
 	
diff --git a/z_MBLegends/ext_data/mb2/character/v7_Enoch.mbch b/z_MBLegends/ext_data/mb2/character/v7_Enoch.mbch
index 7b099a055..6203c7801 100644
--- a/z_MBLegends/ext_data/mb2/character/v7_Enoch.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v7_Enoch.mbch
@@ -5,7 +5,9 @@ ClassInfo
 	classNumberLimit  	1
 	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
+	attributes 			MB_ATT_SPAWNER,1|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
+
+	spawnerNPC "remote_imp"
 
 	forcepowers FP_PROTECT,1|FP_TEAM_FORCE,1|FP_SEE,1
 
@@ -36,9 +38,9 @@ ClassInfo
 
 	skilltimermod 1.75
 
- classflags CFL_STATVIEWER
+	classflags CFL_STATVIEWER
 
-	holdables 			HI_SPAWNER|HI_SENTRY_GUN
+	holdables 			HI_SENTRY_GUN
 
 	modelscale 0.99
 	model		"enoch"
diff --git a/z_MBLegends/ext_data/mb2/character/v7_Tarkin.mbch b/z_MBLegends/ext_data/mb2/character/v7_Tarkin.mbch
index 01503acaf..094b8b114 100644
--- a/z_MBLegends/ext_data/mb2/character/v7_Tarkin.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v7_Tarkin.mbch
@@ -8,7 +8,7 @@ ClassInfo
 	WP_PLX1Flags HELD_SLOW|HELD_KNOCKBACK|HELD_STUN|HELD_FLAME
 	WP_BlasterPistolFlags	HELD_KNOCKBACK	
 
-	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
+	attributes 			MB_ATT_SPAWNER,1|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,1|FP_TEAM_FORCE,2
 
@@ -27,7 +27,9 @@ ClassInfo
 
 	skilltimermod 1.5
 
-	holdables 			HI_SHIELD|HI_MEDPAC_BIG|HI_SPAWNER|HI_BASESEEKER
+	holdables 			HI_SHIELD|HI_MEDPAC_BIG|HI_BASESEEKER
+	
+	spawnerNPC "interrogator"
 
 	modelscale  1.015
 	model		"tarkin"
diff --git a/z_MBLegends/ext_data/mb2/character/v7_Veers.mbch b/z_MBLegends/ext_data/mb2/character/v7_Veers.mbch
index 37d3220b0..1561e0f1e 100644
--- a/z_MBLegends/ext_data/mb2/character/v7_Veers.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v7_Veers.mbch
@@ -7,14 +7,16 @@ ClassInfo
 	MBClass		MB_CLASS_COMMANDER
 	weapons		WP_MELEE|WP_SONIC_NADE|WP_FIRE_NADE|WP_BLASTER_PISTOL|WP_EE3
 
-	attributes	MB_ATT_DISP_ARMOR,2|MB_ATT_BLAST_ARMOUR,1|MB_ATT_DODGE,3|MB_ATT_SONIC_DETONATOR,2|MB_ATT_DLT20A,3|MB_ATT_RALLY,1|MB_ATT_FUEL,3|MB_ATT_FLAMETHROWER|MB_ATT_FIRE_GRENADES,2|MB_ATT_DASH,2|MB_ATT_AMMO,3|MB_ATT_TRACKING_DART,4|MB_ATT_EE3,1|MB_ATT_PISTOL,2|MB_ATT_USE_DISTANCE,1|MB_ATT_SPAWNER,3|MB_ATT_DEXTERITY,1
+	attributes	MB_ATT_SPAWNER,1|MB_ATT_DISP_ARMOR,2|MB_ATT_BLAST_ARMOUR,1|MB_ATT_DODGE,3|MB_ATT_SONIC_DETONATOR,2|MB_ATT_DLT20A,3|MB_ATT_RALLY,1|MB_ATT_FUEL,3|MB_ATT_FLAMETHROWER|MB_ATT_FIRE_GRENADES,2|MB_ATT_DASH,2|MB_ATT_AMMO,3|MB_ATT_TRACKING_DART,4|MB_ATT_EE3,1|MB_ATT_PISTOL,2|MB_ATT_USE_DISTANCE,1|MB_ATT_SPAWNER,3|MB_ATT_DEXTERITY,1
 
 	maxhealth	125
 	maxarmor		125
 
-	holdables	HI_MEDPAC_BIG|HI_BINOCULARS|HI_SPAWNER
+	holdables	HI_MEDPAC_BIG|HI_BINOCULARS
 	classflags		CFL_STATVIEWER
-
+	
+	spawnerNPC "probe"
+	
 	basespeed 250
 	
 	resource		RESOURCE_ENERGY
diff --git a/z_MBLegends/ext_data/mb2/character/v7_WatTam.mbch b/z_MBLegends/ext_data/mb2/character/v7_WatTam.mbch
index 42637805b..fdc435063 100644
--- a/z_MBLegends/ext_data/mb2/character/v7_WatTam.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v7_WatTam.mbch
@@ -13,16 +13,16 @@ ClassInfo
 	WP_BlasterPistolFlags HELD_DISRUPTIFY|HELD_FLAME|HELD_ALTRELOAD
 	WP_ConcussionFlags HELD_ALTRELOAD
 	
-	attributes	MB_ATT_HEALING,1|MB_ATT_TRACKING_DART,3|MB_ATT_RALLY|MB_ATT_SHIELD_RECHARGE,1|MB_ATT_ROCKET_LAUNCHER,1|MB_ATT_DEMP2,1|MB_ATT_PISTOL,1|MB_ATT_CONCUSSION,1|MB_ATT_DISP_FORCE,2|MB_ATT_DISP_ARMOR,2|MB_ATT_DISP_BLOCK,2|MB_ATT_USE_DISTANCE,1|MB_ATT_GETUPS,2|MB_ATT_REPEATER
+	attributes	MB_ATT_SPAWNER,1|MB_ATT_HEALING,1|MB_ATT_TRACKING_DART,3|MB_ATT_RALLY|MB_ATT_SHIELD_RECHARGE,1|MB_ATT_ROCKET_LAUNCHER,1|MB_ATT_DEMP2,1|MB_ATT_PISTOL,1|MB_ATT_CONCUSSION,1|MB_ATT_DISP_FORCE,2|MB_ATT_DISP_ARMOR,2|MB_ATT_DISP_BLOCK,2|MB_ATT_USE_DISTANCE,1|MB_ATT_GETUPS,2|MB_ATT_REPEATER
 
 	maxhealth 125
 	maxarmor	125
 	basespeed  230
 	damageGiven 1.1
 
-	holdables	HI_SHIELD|HI_SPAWNER|HI_MEDPAC_BIG|HI_SEEKER|HI_BASESEEKER
+	holdables	HI_SHIELD|HI_MEDPAC_BIG|HI_SEEKER|HI_BASESEEKER
 
- spawnerNPC "remote_imp"
+	spawnerNPC "remote_imp"
 
 	classflags		CFL_STATVIEWER
 

From 2f3ab778686625b74d5e7b6780f597314b5b0aef Mon Sep 17 00:00:00 2001
From: NPC315 <npcplace@gmail.com>
Date: Wed, 25 Feb 2026 11:01:09 -0600
Subject: [PATCH 55/82] For got to update description

For got to update description
---
 z_MBLegends/ext_data/mb2/character/v7_Tarkin.mbch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v7_Tarkin.mbch b/z_MBLegends/ext_data/mb2/character/v7_Tarkin.mbch
index 094b8b114..add14bb07 100644
--- a/z_MBLegends/ext_data/mb2/character/v7_Tarkin.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v7_Tarkin.mbch
@@ -139,7 +139,7 @@ A support gunner who builds resource through damage to bolster his allies and hi
 
 ^6Inventory:
 - Defense Seeker ^3[CS2]
-- Imperial Remote (Support Beacon)
+- Interrogator Droid (Support Beacon)
 - Forcefield ^3[CS4]
 - Advanced Medpac ^3[CS3]
 

From 3aace24962bc3d55158e23ad4bd4db1f5486a63c Mon Sep 17 00:00:00 2001
From: Unguided <buektomi@gmail.com>
Date: Thu, 26 Feb 2026 00:03:11 +0100
Subject: [PATCH 56/82] Tat_RSniper modelpath fix

---
 MBAssets3/ext_data/mb2/character/Tat_RSniper.mbch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MBAssets3/ext_data/mb2/character/Tat_RSniper.mbch b/MBAssets3/ext_data/mb2/character/Tat_RSniper.mbch
index 14a701950..954809daf 100644
--- a/MBAssets3/ext_data/mb2/character/Tat_RSniper.mbch
+++ b/MBAssets3/ext_data/mb2/character/Tat_RSniper.mbch
@@ -13,8 +13,8 @@ ClassInfo
 	holdables 		HI_CLOAK
 	forcepool       05
 	model				"gwethenea"
-	skin				"rebel_tan"
-	uishader			"models/players/gwethenea/mb2_icon_rebel_tan"
+	skin				"rebel"
+	uishader			"models/players/gwethenea/mb2_icon_rebel"
 	MBClass			MB_CLASS_ARCTROOPER
 	classNumberLimit	1
 	

From 280f4d4405e8adcd0692841455332a8d40c2e911 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Thu, 26 Feb 2026 12:18:11 +0100
Subject: [PATCH 57/82] v3_IG88 pointbuy rework

IG88 gets a pointbuy with battery pool and 3 weapons. Battery is required to get more damage reduction or use sense or the poison thrower more often. So taking guns lowers his battery basically. 1 new gun was added based on the E22
---
 .../ext_data/mb2/character/v3_IG88.mbch       | 87 +++++++++++++++----
 1 file changed, 68 insertions(+), 19 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v3_IG88.mbch b/z_MBLegends/ext_data/mb2/character/v3_IG88.mbch
index 04c13d838..905647569 100644
--- a/z_MBLegends/ext_data/mb2/character/v3_IG88.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v3_IG88.mbch
@@ -5,12 +5,13 @@ ClassInfo
 	name					"v3_IG88"
 	MBClass					MB_CLASS_WOOKIE
 	classNumberLimit		1
-	weapons					WP_SABER|WP_MANDO_PISTOL|WP_THERMAL|WP_AMBAN|WP_SONIC_NADE|WP_MELEE
+	weapons					WP_SABER|WP_MANDO_PISTOL|WP_THERMAL|WP_SONIC_NADE|WP_MELEE
 
-	WP_AmbanFlags			HELD_DISRUPTIFY|HELD_FLAME|HELD_SONIC
-	WP_MeleeFlags			HELD_SLOW
+	WP_AmbanFlags	HELD_DISRUPTIFY|HELD_FLAME|HELD_SONIC
+	WP_MeleeFlags	HELD_SLOW
+	WP_E22Flags		HELD_POISON|HELD_ALTRELOAD
 
-	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_THROWER_POISON|MB_ATT_ENV_PROT,1
+	attributes				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_ENV_PROT,1
 
 	special1 EAS_NONE
 	special2	EAS_HI_POISONTHROWER
@@ -23,16 +24,17 @@ ClassInfo
 
 	classflags			CFL_SEEING_STEALTH|CFL_AKIMBOPISTOL3|CFL_STRONGAGAINSTPHYSICAL
 
-	forcepool		90
+	forcepool		25
+	rankForcepool 40,65,90
 	forcepowers FP_SEE,1
  resource RESOURCE_BATTERY
  
  forceregen 0.01
  	resourceRegenRate 10000
-    resourceRegenCap 80
+    resourceRegenCap 90
     resourceRegenAmount 10
 	
-	DamageTaken 1.2
+	DamageTaken 1
 
 	saber1 				droidmelee_legends
 	saberstyle			SS_STRONG
@@ -65,17 +67,39 @@ ClassInfo
 	model_2	"IG88"
 	skin_2		"ig88c"
 	uishader_2	"models/players/IG88/mb2_icon_ig88c"
+
+	isCustomBuild	1
+	mbPoints	3
+	
+c_att_skill_0	MB_ATT_POWER
+c_att_names_0	"Battery Pool (40/65/90)"
+c_att_ranks_0	1,1,1
+
+c_att_skill_1	MB_ATT_E_22
+c_att_names_1	"DAS-430 (E-22)"
+c_att_ranks_1	1,0,0
+c_att_descs_1 "Prim fire: Hitscan, Poisons on hit, 25% more FP Dmg,
+25% faster RoF, 20% slower Mag Reload"
+
+c_att_skill_2	MB_ATT_AMBAN
+c_att_names_2	"Pulse Cannon"
+c_att_ranks_2	1
+c_att_descs_2 "Ignites/stuns on hit,50% more FP Dmg, 20% more Velocity"
+
+c_att_skill_3	MB_ATT_THROWER_POISON
+c_att_names_3	"Wrist Poison Thrower ^3[CS2]"
+c_att_ranks_3	1
 }
 
 WeaponInfo0
 {
 	WeaponToReplace WP_SABER
 	WeaponBasedOff  WP_SABER
-	NewWorldModel		"models/weapons2/dummyblaster/model.glm"
-	NewViewModel		"models/weapons2/dummy/dummy.md3"
+	NewWorldModel	"models/weapons2/dummyblaster/model.glm"
+	NewViewModel	"models/weapons2/dummy/dummy.md3"
 	Icon			"models/weapons2/halo_melee/icon.png"
 	WeaponName		"Droid Slappers"
-	primGore			1
+	primGore		1
 	altGore			1
 }
 
@@ -107,7 +131,7 @@ animRunAttackL BOTH_DUAL_PISTOLS_ATTACK_L
 animWalkAttackR BOTH_ALORA_SPIN
 animWalkAttackL BOTH_ALORA_SPIN
 	selectSound "sound/movers/objects/place_object.mp3"
-		MissileEffect			"Blaster/Shot01R"
+	MissileEffect			"Blaster/Shot01R"
 	altMissileEffect		"Blaster/Shot01R"
 	PowerupShotEffect "blaster/Shot04R"
 }
@@ -132,6 +156,38 @@ WeaponInfo2
 	selectSound "sound/movers/objects/place_object.mp3"
 }
 
+WeaponInfo3
+{
+	WeaponToReplace	WP_E_22
+	WeaponBasedOff	WP_E_22
+	NewWorldModel	"models/weapons2/blaster_r/blaster_w.glm"
+	NewViewModel	"models/weapons2/blaster_r/blaster.md3"
+	Icon	"gfx/hud/w_icon_E11"
+	WeaponName		"DAS-430 Neural Inhibitor"
+	AltMuzzleEffect	"Blaster/MuzzleFlash01G"
+	AltFlashSound0	"sound/weapons/spy_pistol/fire.wav"
+	AltMissileEffect	"Blaster/Shot11G"
+	AltMissile3Effect	"Blaster/Shot03G"
+	FlashSound0	"sound/weapons/silencedpistol/fire.wav"
+	primHitscanShot 1
+	primHitscanTracer	10
+	primGore	1
+	clipSize  16
+	customAmmo 400
+	FPmult 1.25
+	rateMod 0.75
+	reloadTimeModifier 1.2
+	hasAnimOverrides 1
+	animReadyRun BOTH_MAND_PISTOL_READY
+	animReady BOTH_MAND_PISTOL_READY
+	animReadyWalk BOTH_MAND_PISTOL_READY
+animReadyNoAmmo BOTH_MAND_PISTOL_ATTACK
+	animAttackRun BOTH_ATTACK2
+	animAttack BOTH_ATTACK2
+	animAttackWalk  BOTH_MAND_PISTOL_ATTACK 
+ animStand BOTH_STAND9
+}
+
 ForceInfo0
 {
 	ForceToReplace FP_SEE
@@ -161,10 +217,6 @@ A sturdy and heavily armored gunner.
 -- 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
 
 ^5Powers:
 - Radar Scanner (Sense 1)
@@ -182,7 +234,4 @@ A sturdy and heavily armored gunner.
 - Armor Regen (1)
 - Sense Immunity
 - Anti-Mind Trick (2)
-- Tracking Beacon
-
-^3Abilities:
-- Wrist Poisonthrower ^3[CS2]"
\ No newline at end of file
+- Tracking Beacon"
\ No newline at end of file

From 98af0a55fa4ef6b35aa67807a58d599e8870f1ea Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Thu, 26 Feb 2026 12:23:56 +0100
Subject: [PATCH 58/82] h1_TORtroop ammo

Since the lightning thrower no longer shares ammo with clone rifle or m5.
---
 z_MBLegends/ext_data/mb2/character/h1_TORtroop.mbch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/h1_TORtroop.mbch b/z_MBLegends/ext_data/mb2/character/h1_TORtroop.mbch
index 8913661a8..dcfb17ecc 100644
--- a/z_MBLegends/ext_data/mb2/character/h1_TORtroop.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h1_TORtroop.mbch
@@ -231,7 +231,7 @@ clipSize 20
 ratemod 1.1
 DamageMod .75
 ReloadTimeModifier	1.3
-customammo 380
+customammo 400
 velocitymod 1.5
 }
 WeaponInfo5{
@@ -247,7 +247,7 @@ ratemod .3
 ReloadTimeModifier	1.2
 DamageMod 1.5
 fpmult 1.5
-customammo 175
+customammo 75
 velocityMod 1.5
 }
 ForceInfo0{

From 7d2822567595c4f29b13b8ef619310487d766ffb Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Thu, 26 Feb 2026 12:30:36 +0100
Subject: [PATCH 59/82] v2_FlameTr ammo

Ammo change for now since i'm probably not getting to reworking it for the patch. This keeps the DLT ammo to what it previously was since it was sharing flame rifle ammo and trust me a 2 life class with a DLT needs it. Flame rifle has slightly less ammo but does not need it since DLT isn't draining it anymore.
---
 z_MBLegends/ext_data/mb2/character/v2_FlameTr.mbch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v2_FlameTr.mbch b/z_MBLegends/ext_data/mb2/character/v2_FlameTr.mbch
index 5c520a01f..28a7591be 100644
--- a/z_MBLegends/ext_data/mb2/character/v2_FlameTr.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v2_FlameTr.mbch
@@ -13,7 +13,7 @@ Classinfo
  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|MB_ATT_DLT20A,2|MB_ATT_WRISTLASER|MB_ATT_ENV_PROT,2
+	attributes	MB_ATT_AMMO,4|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
@@ -57,7 +57,7 @@ WeaponInfo0
 	NewViewModel	"models/weapons2/CR-24_flamerifle/rifle.md3"		
 	Icon	"gfx/hud/w_icon_cr-24_flamerifle"
 	WeaponName "CR-24 Flame Rifle"
-	customAmmo 750
+	customAmmo 700
 	clipsize 140
 	ReloadTimeModifier 1.30
 }

From 66327dd7c90576e12573ea7d9e9bce47e036f136 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Thu, 26 Feb 2026 13:14:21 +0100
Subject: [PATCH 60/82] v4_RoyalPr description

Apparently forgot this some time ago?
---
 z_MBLegends/ext_data/mb2/character/v4_RoyalPr.mbch | 1 +
 1 file changed, 1 insertion(+)

diff --git a/z_MBLegends/ext_data/mb2/character/v4_RoyalPr.mbch b/z_MBLegends/ext_data/mb2/character/v4_RoyalPr.mbch
index ecd9bec09..6c3b869ca 100644
--- a/z_MBLegends/ext_data/mb2/character/v4_RoyalPr.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v4_RoyalPr.mbch
@@ -149,6 +149,7 @@ Mobile 2-lifes with a Saber and Force Block.
 
 ^2Weaponry:
 - Melee
+-- 7% faster RoF
 -- 15% faster Movement
 - Imperial Force Pike (Yellow/Purple Saber)
 -- Saber/Blaster Defense (1)

From 1870b2a7e35b7180d7ebfb4ef0490c6565b43a38 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Thu, 26 Feb 2026 13:15:41 +0100
Subject: [PATCH 61/82] v5_Cad melee RoF

Just slightly more.
---
 z_MBLegends/ext_data/mb2/character/v5_Cad.mbch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v5_Cad.mbch b/z_MBLegends/ext_data/mb2/character/v5_Cad.mbch
index 953c110c1..ee2788214 100644
--- a/z_MBLegends/ext_data/mb2/character/v5_Cad.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v5_Cad.mbch
@@ -12,7 +12,7 @@ ClassInfo
 	speed		1.05
 	modelscale   1.03
 	rateOfFire   0.90
-	rateoffire_melee	0.95
+	rateoffire_melee 0.93
 	
 	resource RESOURCE_STAMINA
 	forcepool 100
@@ -96,7 +96,7 @@ A Jetboots-equipped, dexterous dual pistoleer with Quickthrow Stun Grenades.
 
 ^2Weaponry:
 - Melee
--- 5% faster RoF
+-- 7% faster RoF
 - Dual LL-30 Blaster Pistols (Clone Pistols 3)
 -- 5% more Velocity
 - Stun Grenades (3) (Frags)

From ae4890b0760c3bf7c3f5182132fe748aa9b74b7d Mon Sep 17 00:00:00 2001
From: Unguided <buektomi@gmail.com>
Date: Thu, 26 Feb 2026 15:43:01 +0100
Subject: [PATCH 62/82] Slender FA skin fixes

---
 .../Models/Players/jedi/model_joe_three.skin                | 6 +++---
 03_MovieGameMappack/Models/Players/jedi/model_sle_surv.skin | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/03_MovieGameMappack/Models/Players/jedi/model_joe_three.skin b/03_MovieGameMappack/Models/Players/jedi/model_joe_three.skin
index d464f54ca..2d60c0bfa 100644
--- a/03_MovieGameMappack/Models/Players/jedi/model_joe_three.skin
+++ b/03_MovieGameMappack/Models/Players/jedi/model_joe_three.skin
@@ -26,9 +26,9 @@ l_arma_cap_torso_off,models/players/stormtrooper/caps.tga
 torsoa_cap_l_arm_off,models/players/stormtrooper/caps.tga
 torsoa_cap_r_arm_off,models/players/stormtrooper/caps.tga
 head,models/players/averagejoe/torso_blue.tga
-heada,models/players/sguard/head_master.tga
-heada_face,models/players/sguard/face_master.tga
-heada_eyes_mouth,models/players/sguard/mouth_eyes.tga
+heada,models/players/jedi/head_master.tga
+heada_face,models/players/jedi/face_master.tga
+heada_eyes_mouth,models/players/common/mouth_eyes2.tga
 headb,*off
 headb_face,*off
 headb_eyes_mouth,*off
diff --git a/03_MovieGameMappack/Models/Players/jedi/model_sle_surv.skin b/03_MovieGameMappack/Models/Players/jedi/model_sle_surv.skin
index ac427f895..5e631fde3 100644
--- a/03_MovieGameMappack/Models/Players/jedi/model_sle_surv.skin
+++ b/03_MovieGameMappack/Models/Players/jedi/model_sle_surv.skin
@@ -29,9 +29,9 @@ head,models/players/sguard/torso.tga
 heada,*off
 heada_face,*off
 heada_eyes_mouth,*off
-headb,models/players/sguard/head_02.tga
-headb_face,models/players/sguard/face_02.tga
-headb_eyes_mouth,models/players/sguard/mouth_eyes.tga
+headb,models/players/jedi/head_02.tga
+headb_face,models/players/jedi/face_02.tga
+headb_eyes_mouth,models/players/common/mouth_eyes.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
\ No newline at end of file

From af19f8d6258274f779a754afe479a666c2e684e0 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Thu, 26 Feb 2026 17:43:09 +0100
Subject: [PATCH 63/82] v6_ScoutTr sniper RoF nerf

Note: Class also has an innate 10% less RoF.
---
 z_MBLegends/ext_data/mb2/character/v6_ScoutTr.mbch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v6_ScoutTr.mbch b/z_MBLegends/ext_data/mb2/character/v6_ScoutTr.mbch
index a895482e9..c93e598ac 100644
--- a/z_MBLegends/ext_data/mb2/character/v6_ScoutTr.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v6_ScoutTr.mbch
@@ -215,7 +215,7 @@ c_att_skill_32	MB_ATT_EE4
 c_att_names_32	"DLT-20A Sniper Config (EE-4)"
 c_att_ranks_32	10,0
 c_att_descs_32 "50% more Dmg, 50% more FP Dmg, 100% more Velocity,
-50% slower RoF, 16500% slower Reload"
+75% slower RoF, 16500% slower Reload"
 
 c_att_skill_33	MB_ATT_SONIC_DETONATOR
 c_att_names_33	"Sonic Detonators"
@@ -278,7 +278,7 @@ MissileEffect	"Blaster/Shot01R"
 Missile3Effect	"Blaster/Shot01R"
 clipsize	12
 FlashSound0 "sound/weapons/Glie-44/alt_fire.wav"
-ratemod 1.5
+ratemod 1.75
 fpmult 1.5
 damagemod 1.5
 Velocitymod 2

From f42433934fd297a12132a9bc9afa481250e14d56 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Thu, 26 Feb 2026 17:45:19 +0100
Subject: [PATCH 64/82] NEW CLASS: Cal Kestis

New (somewhat hybrid) Jedi class with options between Saber and Force specs, and can buy a pistol. Has 4 different sabers.
---
 .../ext_data/mb2/character/h9_CalK.mbch       | 257 ++++++++++++++++++
 .../ext_data/mb2/teamconfig/LEG_Good.mbtc     |   1 +
 .../ext_data/sabers/saber_legends_other7.sab  | 108 +++++++-
 3 files changed, 365 insertions(+), 1 deletion(-)
 create mode 100644 z_MBLegends/ext_data/mb2/character/h9_CalK.mbch

diff --git a/z_MBLegends/ext_data/mb2/character/h9_CalK.mbch b/z_MBLegends/ext_data/mb2/character/h9_CalK.mbch
new file mode 100644
index 000000000..37f42f2e3
--- /dev/null
+++ b/z_MBLegends/ext_data/mb2/character/h9_CalK.mbch
@@ -0,0 +1,257 @@
+//Legends Mode character file
+
+ClassInfo
+{
+	name			"h9_CalK"
+	weapons			WP_SABER|WP_MELEE
+
+	attributes		MB_ATT_FP_SABER_DEFENSE,0|MB_ATT_GUN_DEFENSE,0|MB_ATT_DEFLECT,0|MB_ATT_FLOAT_HOP
+	holdables       HI_MEDPAC_BIG|HI_MEDPAC
+
+	forcepowers		FP_SABER_OFFENSE,3|FP_LEVITATION,3
+
+	maxhealth		100
+	rankhealth		120,140,160
+
+	forcepool	90
+	rankForcepool 100,120
+
+	resource		resource_force
+	forceregen   	1.00
+	
+	rateOfFire_Melee 0.9
+
+	saberSpecialDamage 1.25
+	saberThrowDamage 40
+	saberDamageStyle SS_TAVION,130|SS_MEDIUM,240|SS_DUAL,240|SS_STAFF,240|SS_STRONG,300
+
+	uioverlay_r "gfx/icons/frontline"
+	uioverlay_l "gfx/icons/hybrid"
+	
+	//noGunbash		1
+	
+	APmultiplier	    1.0
+	BPmultiplier     	1.0
+	ASmultiplier	    1.0
+	CSmultiplier		1.0
+	
+	modelscale          1.0
+	MBClass				MB_CLASS_JEDI
+	classNumberLimit  	1
+	
+	classflags CFL_NOPICKUPS
+
+	special2 EAS_NONE
+
+	isCustomBuild	1
+	mbPoints	80
+	hasCustomSpec 2
+	isOnlyOneSpec 1
+
+	customSpecName_1 "Combat Focus"
+	customSpecIcon_1 "gfx/menus/alpha/icon_stats_armor"
+	customSpecDesc_1 ""
+	customSpecName_2 "Force Attunement"
+	customSpecIcon_2 "gfx/menus/alpha/icon_weap_stun"
+	customSpecDesc_2 ""
+
+	model		"CalKestis"
+	skin		"default"
+	uishader	"models/players/CalKestis/mb2_icon_default"
+	
+	model_1		"CalKestis"
+	skin_1		"poncho"
+	uishader_1	"models/players/CalKestis/mb2_icon_poncho"
+
+	saber1		saber_cal_legends
+	sabercolor		4
+	saberstyle		SS_MEDIUM|SS_TAVION
+
+	saber1_1			saber_cal_staff_legends
+	sabercolor_1			4
+	saberstyle_1			SS_STAFF|SS_MEDIUM
+
+	saber1_2			saber_cal3b_legends
+	sabercolor_2		4
+	saber2_2		saber_cal3_offhand_legends
+	saber2color_2		4
+	saberstyle_2		SS_DUAL|SS_MEDIUM
+
+	saber1_3		saber_cal3_crossguard_legends
+	sabercolor_3		4
+	saberstyle_3		SS_STRONG
+
+	//respawncustomtime  50000
+
+c_att_skill_0       MB_ATT_FP_SABER_DEFENSE
+c_att_names_0       "Saber Defense"
+c_att_ranks_0       6,6,4
+
+c_att_skill_1       MB_ATT_GUN_DEFENSE
+c_att_names_1       "Blaster Defense"
+c_att_ranks_1       4,6,8
+
+c_att_skill_2       MB_ATT_DEFLECT
+c_att_names_2       "Saber Deflect"
+c_att_ranks_2       4,4,2
+
+c_att_skill_3		MB_ATT_FP_SABERTHROW
+c_att_names_3		"Saber Throw"
+c_att_ranks_3		2,2,2
+	
+c_att_skill_4       MB_ATT_PISTOL
+c_att_names_4       "Blaster Pistol"
+c_att_ranks_4       3,1,14
+c_att_descs_4 "20% more charged FP drain"
+
+c_att_skill_5       MB_ATT_FP_PUSH
+c_att_names_5       "Force Push"
+c_att_ranks_5       4,4
+
+c_att_skill_6       MB_ATT_FP_PULL
+c_att_names_6       "Force Pull"
+c_att_ranks_6       4,4
+
+c_att_skill_7      	MB_ATT_FP_SEE
+c_att_names_7       "Force Sense"
+c_att_ranks_7       4
+
+c_att_skill_8       MB_ATT_FP_RAGE
+c_att_names_8       "Force Rage"
+c_att_ranks_8       4,4,4
+
+c_att_skill_9       MB_ATT_FP_GRIP
+c_att_names_9       "Force Grip"
+c_att_ranks_9       4,6
+
+c_att_skill_10      MB_ATT_FORCEBLOCK
+c_att_names_10      "Force Block"
+c_att_ranks_10      4,6,4
+
+c_att_skill_11      MB_ATT_FORCEFOCUS
+c_att_names_11      "Force Focus"
+c_att_ranks_11      6,8
+
+c_att_skill_12		MB_ATT_POWER
+c_att_names_12		"Force Pool (100)"
+c_att_ranks_12		2
+	
+c_att_skill_13		MB_ATT_HEALTH
+c_att_names_13		"Health (120/140/160)"
+c_att_ranks_13		4,4,4
+
+c_att_skill_15       MB_ATT_FP_SABER_DEFENSE
+c_att_names_15      "Saber Defense"
+c_att_ranks_15       6,6
+
+c_att_skill_16       MB_ATT_GUN_DEFENSE
+c_att_names_16       "Blaster Defense"
+c_att_ranks_16       8
+
+c_att_skill_17		MB_ATT_FP_SABERTHROW
+c_att_names_17		"Saber Throw"
+c_att_ranks_17		2,2,2
+	
+c_att_skill_18      MB_ATT_PISTOL
+c_att_names_18      "Blaster Pistol"
+c_att_ranks_18      3,1,14
+c_att_descs_18 "20% more charged FP drain"
+
+c_att_skill_19       MB_ATT_FP_PUSH
+c_att_names_19       "Force Push"
+c_att_ranks_19       2,4,6
+
+c_att_skill_20       MB_ATT_FP_PULL
+c_att_names_20       "Force Pull"
+c_att_ranks_20       2,4,6
+
+c_att_skill_21       MB_ATT_FP_SEE
+c_att_names_21       "Force Sense"
+c_att_ranks_21       2,4,6
+
+c_att_skill_22       MB_ATT_FP_RAGE
+c_att_names_22       "Force Rage"
+c_att_ranks_22       4,6
+
+c_att_skill_23       MB_ATT_FP_GRIP
+c_att_names_23       "Force Grip"
+c_att_ranks_23       4,6,8
+
+c_att_skill_24      MB_ATT_FORCEBLOCK
+c_att_names_24      "Force Block"
+c_att_ranks_24      4,6,4
+
+c_att_skill_25      MB_ATT_FORCEFOCUS
+c_att_names_25      "Force Focus"
+c_att_ranks_25      4,8,10
+
+c_att_skill_26		MB_ATT_POWER
+c_att_names_26		"Force Pool (100/120)"
+c_att_ranks_26		2,4
+	
+c_att_skill_27		MB_ATT_HEALTH
+c_att_names_27		"Health (120/140)"
+c_att_ranks_27		5,5	
+}
+
+WeaponInfo0
+{
+	WeaponToReplace		WP_BLASTER_PISTOL
+	WeaponBasedOff		WP_BLASTER_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"
+	WeaponName		"Blaster Pistol"
+	MissileEffect    "blaster/shot03b"
+	Missile3Effect   	 "blaster/shot10b"
+	ChargeSound 	"sound/weapons/leia_pistol/altcharge.mp3"
+	FlashSound0		"sound/weapons/LPA_NN-14/fire.wav"
+	altFlashSound0	"sound/weapons/han_pistol/alt_fire.mp3"
+	//AltMissileEffect	"blaster/Shot07R"
+	AltMuzzleEffect		"Blaster/MuzzleFlash01R"
+	hasAnimOverrides 1
+	animReady TORSO_WEAPONIDLE2
+	animReadyWalk TORSO_WEAPONIDLE2
+	animReadyNoAmmo BOTH_ATTACK2 
+	animAttack BOTH_ATTACK2 
+	animAttackWalk BOTH_ATTACK2
+
+	customammo		300
+	FPchargeMult 1.2
+}
+
+description	"Cal Kestis [Jedi]
+
+A Jedi with bacta stims, multiple lightsaber and forcepower customization options, and if needed a blaster pistol.
+
+^2Weaponry:
+- Melee
+-- 10% faster RoF
+- Lightsaber
+-- Saber/Blaster Defense (0)
+-- 8% more Blue Dmg
+-- 125% Spec Dmg mult
+-- Saber Throw ^3[CS1]
+--- 33% more DMG
+-- Slap ^3[CS2]
+> Staff(Staff/Yellow)
+-- 8% Faster AS
+> Dual Lightsabers(Dual/Yellow)
+-- 8% Faster AS
+> Crossguard Lightsaber(Red)
+-- 20% Longer Reach
+-- 10% Slower AS
+> Single (Yellow/Cyan)
+
+^6Inventory:
+- Bacta Stim (Gradual 50 HP)
+- Heavy Bacta Stim
+
+^5Force Powers:
+- Jump (3)
+
+^8Attributes:
+- Slow Faller"
diff --git a/z_MBLegends/ext_data/mb2/teamconfig/LEG_Good.mbtc b/z_MBLegends/ext_data/mb2/teamconfig/LEG_Good.mbtc
index 82226854a..721bc640f 100644
--- a/z_MBLegends/ext_data/mb2/teamconfig/LEG_Good.mbtc
+++ b/z_MBLegends/ext_data/mb2/teamconfig/LEG_Good.mbtc
@@ -101,6 +101,7 @@ SubclassesForClass5
 	Subclass9	"h9_JSword"
 	Subclass10	"h9_JAcrobat"
 	Subclass11	"h9_JBrute"
+	Subclass12	"h9_CalK"
 }
 
 SubclassesForClass6
diff --git a/z_MBLegends/ext_data/sabers/saber_legends_other7.sab b/z_MBLegends/ext_data/sabers/saber_legends_other7.sab
index f226255c7..9debaef55 100644
--- a/z_MBLegends/ext_data/sabers/saber_legends_other7.sab
+++ b/z_MBLegends/ext_data/sabers/saber_legends_other7.sab
@@ -1,4 +1,3 @@
-
 reb_wrench_p
 {
 	name		"Power Wrench"
@@ -309,4 +308,111 @@ saber_sion_l
 lungeAtkMove LS_PURPLE_DFA
 jumpAtkRightMove LS_A_FLIP_SLASH
 jumpAtkLeftMove LS_CYAN_DFA
+}
+
+saber_cal_staff_legends
+{
+    name		"Kestis SaberStaff"
+    saberType   SABER_STAFF
+    saberModel  "models/weapons2/saber_plasma/saber_cal_staff.glm"
+	soundLoop	"s/w/s/dm_hum.wav"
+	soundOn		"s/w/s/on.wav"
+	soundOff		"s/w/s/off.wav"
+	spinsound	"s/w/s/spin.wav"
+	hitSound1	"s/w/s/hit1.mp3"
+	hitSound2	"s/w/s/hit2.mp3"
+	hitSound3	"s/w/s/hit3.mp3"
+	bounceSound1	"s/w/s/bounce1.mp3"	
+	bounceSound2	"s/w/s/bounce2.mp3"
+	bounceSound3	"s/w/s/bounce3.mp3"
+    numBlades   2
+    saberLength 32
+    saberStyle	staff
+	throwable	1
+    singleBladeStyle    medium
+	twoHanded		1
+	animSpeedScale 	1.08
+}
+
+saber_cal3_crossguard_legends
+{
+	name		"Kestis Crossguard Saber"
+	saberType	SABER_SINGLE
+	saberModel	"models/weapons2/saber_plasma/saber_cal3_crossguard.glm"
+	soundLoop	"s/w/s/dm_hum.wav"
+	soundOn		"s/w/s/on.wav"
+	soundOff	"s/w/s/off.wav"
+	spinsound	"s/w/s/spin.wav"
+	hitSound1	"s/w/s/hit1.mp3"
+	hitSound2	"s/w/s/hit2.mp3"
+	hitSound3	"s/w/s/hit3.mp3"
+	bounceSound1	"s/w/s/bounce1.mp3"	
+	bounceSound2	"s/w/s/bounce2.mp3"
+	bounceSound3	"s/w/s/bounce3.mp3"
+	saberLength		48
+	saberLength2	3
+	saberLength3	3
+	saberRadius		3.6
+	saberRadius2	1
+	saberRadius3	1
+	trailStyle2		2
+	trailStyle3		2
+	numblades		3
+	AnimSpeedScale 	0.90
+}
+
+saber_cal3b_legends
+{
+	name		"Kestis Dual Lightsabers"
+	saberType	SABER_SINGLE
+	saberModel	"models/weapons2/saber_plasma/saber_cal3.glm"
+	soundLoop	"s/w/s/dm_hum.wav"
+	soundOn		"s/w/s/on.wav"
+	soundOff	"s/w/s/off.wav"
+	spinsound	"s/w/s/spin.wav"
+	hitSound1	"s/w/s/hit1.mp3"
+	hitSound2	"s/w/s/hit2.mp3"
+	hitSound3	"s/w/s/hit3.mp3"
+	bounceSound1	"s/w/s/bounce1.mp3"	
+	bounceSound2	"s/w/s/bounce2.mp3"
+	bounceSound3	"s/w/s/bounce3.mp3"
+	saberLength 40
+	animSpeedScale 	1.08
+}
+
+saber_cal3_offhand_legends
+{
+	name		"Kestis Single Blade"
+	saberType	SABER_SINGLE
+	saberModel	"models/weapons2/saber_plasma/saber_cal3_offhand.glm"
+	soundLoop	"s/w/s/dm_hum.wav"
+	soundOn		"s/w/s/on.wav"
+	soundOff	"s/w/s/off.wav"
+	spinsound	"s/w/s/spin.wav"
+	hitSound1	"s/w/s/hit1.mp3"
+	hitSound2	"s/w/s/hit2.mp3"
+	hitSound3	"s/w/s/hit3.mp3"
+	bounceSound1	"s/w/s/bounce1.mp3"	
+	bounceSound2	"s/w/s/bounce2.mp3"
+	bounceSound3	"s/w/s/bounce3.mp3"
+	saberLength 28
+	animSpeedScale 	1.08
+}
+
+saber_cal_legends
+{
+	name  		"Cal Kestis (JFO)"
+	saberType 	SABER_SINGLE
+	saberModel  "models/weapons2/saber_plasma/saber_cal.glm"
+	soundLoop	"s/w/s/dm_hum.wav"
+	soundOn		"s/w/s/on.wav"
+	soundOff	"s/w/s/off.wav"
+	spinsound	"s/w/s/spin.wav"
+	hitSound1	"s/w/s/hit1.mp3"
+	hitSound2	"s/w/s/hit2.mp3"
+	hitSound3	"s/w/s/hit3.mp3"
+	bounceSound1	"s/w/s/bounce1.mp3"	
+	bounceSound2	"s/w/s/bounce2.mp3"
+	bounceSound3	"s/w/s/bounce3.mp3"
+	saberLength 40
 }
\ No newline at end of file

From 82354cb43aa086e8f2c8da7f5dc9e2cde8f5ed55 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Thu, 26 Feb 2026 17:58:33 +0100
Subject: [PATCH 65/82] v9_SJugger beskar

Allows them to survive a saber hit again, which they need due to their size. Armor slightly lowered instead.
---
 z_MBLegends/ext_data/mb2/character/v9_SJugger.mbch | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v9_SJugger.mbch b/z_MBLegends/ext_data/mb2/character/v9_SJugger.mbch
index f27792cce..b1db82a01 100644
--- a/z_MBLegends/ext_data/mb2/character/v9_SJugger.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v9_SJugger.mbch
@@ -8,7 +8,7 @@ ClassInfo
 	
 	weapons		WP_SABER|WP_MELEE
 
-	attributes	MB_ATT_FORCEBLOCK,1|MB_ATT_DEFLECT,2|MB_ATT_FORCEFOCUS,1|MB_ATT_WOOKIE_STRENGTH,2|MB_ATT_HEALING,1|MB_ATT_GUN_DEFENSE,2|MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_GETUPS,3
+	attributes	MB_ATT_FORCEBLOCK,1|MB_ATT_DEFLECT,2|MB_ATT_FORCEFOCUS,1|MB_ATT_WOOKIE_STRENGTH,2|MB_ATT_HEALING,1|MB_ATT_GUN_DEFENSE,2|MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_GETUPS,3|MB_ATT_BESKAR,1
 
  saberDamageStyle SS_STRONG,300|SS_DESANN,300
 	saberstyle	SS_DESANN|SS_STRONG
@@ -19,7 +19,7 @@ ClassInfo
 	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		60
+	maxarmor		50
 	forcepool	130
 	forceregen 1.05
 	rateOfFire_Melee .9
@@ -105,4 +105,5 @@ A massive, tanky Sith with high-powered and long-reaching Lightsaber attacks.
 - Strength (2)
 - Getup (3)
 - Healing (1)
+- Beskar (1)
 - Force Block/Focus (1)"
\ No newline at end of file

From d3448a03de6e843fab36e95b132e649da988b12d Mon Sep 17 00:00:00 2001
From: leonssz <leonsxvojtech@gmail.com>
Date: Thu, 26 Feb 2026 19:08:07 +0100
Subject: [PATCH 66/82] FA Fixes and description updates to few MGM maps

---
 .../Ext_Data/MB2/character/allies_bar.mbch    | 14 +++--
 .../Ext_Data/MB2/character/allies_medic.mbch  | 21 ++++---
 .../Ext_Data/MB2/character/allies_sg.mbch     | 17 ++---
 .../Ext_Data/MB2/character/allies_sniper.mbch | 15 ++---
 .../Ext_Data/MB2/character/allies_sold.mbch   | 14 +++--
 .../Ext_Data/MB2/character/allies_sold2.mbch  | 39 +++---------
 .../Ext_Data/MB2/character/axis_medic.mbch    | 21 ++++---
 .../Ext_Data/MB2/character/axis_mg42.mbch     | 43 +++----------
 .../Ext_Data/MB2/character/axis_sg.mbch       | 17 ++---
 .../Ext_Data/MB2/character/axis_sniper.mbch   | 15 ++---
 .../Ext_Data/MB2/character/axis_sold.mbch     | 14 +++--
 .../Ext_Data/MB2/character/axis_sold2.mbch    | 16 ++---
 .../Ext_Data/MB2/character/fc_elite.mbch      | 12 +++-
 .../Ext_Data/MB2/character/fc_shredder.mbch   | 15 ++++-
 .../Ext_Data/MB2/character/fc_sold.mbch       | 11 +++-
 .../Ext_Data/MB2/character/fc_sold2.mbch      | 11 +++-
 .../Ext_Data/MB2/character/fc_sold3.mbch      | 15 +++--
 .../Ext_Data/MB2/character/lswj_anakin.mbch   | 37 ++++++-----
 .../MB2/character/lswj_clone_arc2.mbch        | 15 +++--
 .../MB2/character/lswj_clone_captain.mbch     | 18 +++---
 .../MB2/character/lswj_clone_ep2.mbch         | 17 ++---
 .../Ext_Data/MB2/character/lswj_han.mbch      | 14 +++--
 .../MB2/character/lswj_handmaiden.mbch        | 35 +++++------
 .../Ext_Data/MB2/character/lswj_jedi.mbch     | 37 +++++------
 .../Ext_Data/MB2/character/lswj_jolee.mbch    | 41 ++++++------
 .../Ext_Data/MB2/character/lswj_kyle.mbch     | 46 +++++++-------
 .../Ext_Data/MB2/character/lswj_lando.mbch    | 14 +++--
 .../Ext_Data/MB2/character/lswj_luke6.mbch    | 39 ++++++------
 .../Ext_Data/MB2/character/lswj_obi1.mbch     | 42 ++++++-------
 .../Ext_Data/MB2/character/lswj_oldben.mbch   | 39 ++++++------
 .../Ext_Data/MB2/character/lswj_windu.mbch    | 37 +++++------
 .../Ext_Data/MB2/character/lswj_wookiee.mbch  | 17 ++---
 .../Ext_Data/MB2/character/lsws_boba.mbch     | 30 ++++-----
 .../Ext_Data/MB2/character/lsws_dooku.mbch    | 44 +++++++------
 .../Ext_Data/MB2/character/lsws_imperial.mbch | 13 ++--
 .../Ext_Data/MB2/character/lsws_jango.mbch    | 25 ++++----
 .../Ext_Data/MB2/character/lsws_jerec.mbch    | 43 +++++++------
 .../Ext_Data/MB2/character/lsws_malak.mbch    | 37 ++++++-----
 .../Ext_Data/MB2/character/lsws_marek.mbch    | 45 +++++++-------
 .../Ext_Data/MB2/character/lsws_maul.mbch     | 35 +++++------
 .../Ext_Data/MB2/character/lsws_maw.mbch      | 45 +++++++-------
 .../MB2/character/lsws_palpatine.mbch         | 44 +++++++------
 .../MB2/character/lsws_sandtrooper.mbch       | 14 +++--
 .../Ext_Data/MB2/character/lsws_sion.mbch     | 44 ++++++-------
 .../Ext_Data/MB2/character/lsws_sith.mbch     | 37 +++++------
 .../MB2/character/lsws_stormtrooper.mbch      | 14 +++--
 .../Ext_Data/MB2/character/lsws_vader.mbch    | 41 ++++++------
 .../Ext_Data/MB2/character/lsws_ventress.mbch | 35 +++++------
 .../Ext_Data/MB2/character/lsws_yun.mbch      | 40 ++++++------
 .../Ext_Data/MB2/character/mfm_doomimp.mbch   | 62 +++----------------
 .../Ext_Data/MB2/character/mfm_werewolf.mbch  | 18 +++---
 .../Ext_Data/MB2/character/mfm_zombie.mbch    | 21 +++----
 .../Ext_Data/MB2/character/mfm_zombiec.mbch   | 14 +++--
 .../Ext_Data/MB2/character/mfm_zombies.mbch   | 23 +++----
 .../MB2/character/mfs_survivor11.mbch         | 34 +++++-----
 .../MB2/character/mfs_survivor12.mbch         | 25 ++++++--
 .../MB2/character/mfs_survivor13.mbch         | 25 ++++++--
 .../MB2/character/mfs_survivor21.mbch         | 31 +++++++---
 .../MB2/character/mfs_survivor22.mbch         | 38 ++++++------
 .../MB2/character/mfs_survivor23.mbch         | 33 +++++++---
 .../MB2/character/mfs_survivor31.mbch         | 29 ++++++---
 .../Ext_Data/MB2/character/samt_bomonk.mbch   | 17 +++--
 .../Ext_Data/MB2/character/samt_bow.mbch      | 45 +++-----------
 .../Ext_Data/MB2/character/samt_hayabusa.mbch | 47 ++++----------
 .../Ext_Data/MB2/character/samt_ibuki.mbch    | 24 +++----
 .../Ext_Data/MB2/character/samt_katana.mbch   | 17 +++--
 .../MB2/character/samt_meleemonk.mbch         | 10 ++-
 .../MB2/character/samt_mitsurugi.mbch         | 18 +++---
 .../Ext_Data/MB2/character/samt_naginta.mbch  | 18 +++---
 .../Ext_Data/MB2/character/samt_ninja.mbch    | 24 +++----
 .../Ext_Data/MB2/character/samt_nodachi.mbch  | 15 +++--
 .../Ext_Data/MB2/character/samu_bomonk.mbch   | 17 +++--
 .../Ext_Data/MB2/character/samu_bow.mbch      | 45 +++-----------
 .../Ext_Data/MB2/character/samu_katana.mbch   | 17 +++--
 .../MB2/character/samu_mastermonk.mbch        | 14 ++---
 .../MB2/character/samu_meleemonk.mbch         | 10 +--
 .../Ext_Data/MB2/character/samu_naginta.mbch  | 18 +++---
 .../Ext_Data/MB2/character/samu_ninja.mbch    | 24 +++----
 .../Ext_Data/MB2/character/samu_nodachi.mbch  | 15 +++--
 .../MB2/character/samu_samanosuke.mbch        | 18 +++---
 .../Ext_Data/MB2/character/samu_shinobi.mbch  | 24 +++----
 .../Ext_Data/MB2/character/sles_1.mbch        |  5 +-
 .../Ext_Data/MB2/character/sles_11.mbch       |  5 +-
 .../Ext_Data/MB2/character/sles_2.mbch        |  5 +-
 .../Ext_Data/MB2/character/sles_21.mbch       |  8 ++-
 .../Ext_Data/MB2/character/sles_3.mbch        |  8 ++-
 .../Ext_Data/MB2/character/sles_4.mbch        |  5 +-
 .../Ext_Data/MB2/character/sles_5.mbch        |  8 ++-
 .../MB2/character/slesm_slenderman.mbch       | 23 +++----
 .../Ext_Data/MB2/character/tmnt_Leo.mbch      |  8 ++-
 .../Ext_Data/MB2/character/tmnt_don.mbch      |  8 ++-
 .../Ext_Data/MB2/character/tmnt_mike.mbch     |  8 ++-
 .../Ext_Data/MB2/character/tmnt_raph.mbch     |  8 ++-
 .../Ext_Data/MB2/character/tmnt_splinter.mbch |  8 ++-
 94 files changed, 1100 insertions(+), 1141 deletions(-)

diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/allies_bar.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/allies_bar.mbch
index 14d9fb7cf..0efcf7256 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/allies_bar.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/allies_bar.mbch
@@ -64,10 +64,12 @@ WeaponInfo1
 
 description	"Soldier (BAR)
 
-Weaponry:
-Colt Pistol
-BAR
+^2Weaponry:
+- Colt Pistol
+- BAR
 
-Attributes:
-Armour (3)
-Ammo (3)"
\ No newline at end of file
+^8Attributes:
+- Armour (3)
+- Ammo (3)
+- Stamina (2) ^3[CS1]
+- Assemble (1)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/allies_medic.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/allies_medic.mbch
index 27f0a227e..ab1ff3c2a 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/allies_medic.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/allies_medic.mbch
@@ -4,7 +4,7 @@ ClassInfo
 {
 	name			"allies_medic"
 	weapons			WP_MELEE|WP_BLASTER_PISTOL|WP_FRAG_NADE
-	attributes		MB_ATT_PISTOL,3|MB_ATT_FRAGS,1|MB_ATT_DODGE,3|MB_ATT_ARMOUR,3|MB_ATT_RALLY,1|MB_ATT_AMMO,3|MB_ATT_DISP_HEALTH,3|MB_ATT_DISP_AMMO,3
+	attributes		MB_ATT_PISTOL,3|MB_ATT_FRAGS,1|MB_ATT_DODGE,3|MB_ATT_ARMOUR,3|MB_ATT_RALLY,1|MB_ATT_AMMO,3|MB_ATT_DISP_HEALTH,3|MB_ATT_SUPPLYDROP
 	maxhealth		80
 	maxarmor		80
 	model			"ww2"
@@ -51,13 +51,14 @@ WeaponInfo1
 
 description	"Soldier (Medic)
 
-Weaponry:
-Colt Pistol
-Grenade
+^2Weaponry:
+- Colt Pistol
+- Frag Grenade
 
-Attributes:
-Armour (3)
-Ammo (3)
-Ammo Dispenser
-Med Kit
-Rally"
\ No newline at end of file
+^8Attributes:
+- Armour (3)
+- Ammo (3)
+- Dodge (3) ^3[CS1]
+- Ammobag ^3[USE]
+- Medic (3) ^3[USE on teammate]
+- Rally (1)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/allies_sg.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/allies_sg.mbch
index 71b284eb8..3fa324bf2 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/allies_sg.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/allies_sg.mbch
@@ -75,12 +75,13 @@ WeaponInfo2
 
 description	"Soldier (Shotgun)
 
-Weaponry:
-Colt Pistol
-Shotgun
-Grenade
+^2Weaponry:
+- Colt Pistol
+- Shotgun
+- Frag Grenade
 
-Attributes:
-Armour (3)
-Ammo (3)
-Assemble"
\ No newline at end of file
+^8Attributes:
+- Armour (3)
+- Ammo (3)
+- Stamina (2) ^3[CS1]
+- Assemble (1)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/allies_sniper.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/allies_sniper.mbch
index b8f6e4feb..1e3c6ba75 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/allies_sniper.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/allies_sniper.mbch
@@ -52,11 +52,12 @@ WeaponInfo1
 
 description	"Soldier (Sniper)
 
-Weaponry:
-Colt Pistol
-Sniper Rifle
+^2Weaponry:
+- Colt Pistol
+- Sniper Rifle
 
-Attributes:
-Armour (3)
-Ammo (3)
-Assemble"
\ No newline at end of file
+^8Attributes:
+- Armour (3)
+- Ammo (3)
+- Stamina (2) ^3[CS1]
+- Assemble (1)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/allies_sold.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/allies_sold.mbch
index 366114938..49d9b046f 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/allies_sold.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/allies_sold.mbch
@@ -63,10 +63,12 @@ WeaponInfo1
 
 description	"Soldier (Thompson)
 
-Weaponry:
-Colt Pistol
-Thompson
+^2Weaponry:
+- Colt Pistol
+- Thompson
 
-Attributes:
-Armour (3)
-Ammo (3)"
\ No newline at end of file
+^8Attributes:
+- Armour (3)
+- Ammo (3)
+- Stamina (2) ^3[CS1]
+- Assemble (1)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/allies_sold2.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/allies_sold2.mbch
index faa75dc8e..fcd796eeb 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/allies_sold2.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/allies_sold2.mbch
@@ -74,37 +74,16 @@ WeaponInfo2
 	altFireEnabled 		0   					
 }
 
-WeaponInfo3
-{
-	WeaponToReplace		WP_BLASTER
-	WeaponBasedOff		WP_DISRUPTOR
-	NewWorldModel		"models/weapons2/disruptor/rifle_w.glm"  	
-	NewViewModel		"models/weapons2/disruptor/rifle.md3"   	
-	MuzzleEffect		"halo_pistol/Muzzle_Flash"
-	AltMuzzleEffect		"halo_pistol/altmuzzle_flash"
-	MissileEffect		"halo_pistol/shot"
-	AltMissileEffect	"halo_pistol/shot"
-	MissileMissEffect "halo_smg/wall_impact"
-	FlashSound0		"sound/weapons/garand/fire.mp3"  			
-	AltFlashSound0		"sound/weapons/garand/fire.mp3"
-	Icon			"gfx/hud/w_icon_ww2sniper" 				
-	WeaponName		"M1 Garand"    					
-	customAmmo		500
-	primHitscanShot		1
-	primHitscanTracer	5
-	altHitscanShot		1
-	altHitscanTracer	5
-	primGore		1
-	altGore			1
-}
 
 description	"Soldier (M1 Garand)
 
-Weaponry:
-Colt Pistol
-M1 Garand
-Frag Grenade
+^2Weaponry:
+- Colt Pistol
+- M1 Garand
+- Frag Grenade
 
-Attributes:
-Armour (3)
-Ammo (3)"
\ No newline at end of file
+^8Attributes:
+- Armour (3)
+- Ammo (3)
+- Stamina (2) ^3[CS1]
+- Assemble (1)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/axis_medic.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/axis_medic.mbch
index 8354e586e..a09330ff4 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/axis_medic.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/axis_medic.mbch
@@ -4,7 +4,7 @@ ClassInfo
 {
 	name			"axis_medic"
 	weapons			WP_MELEE|WP_BLASTER_PISTOL|WP_FRAG_NADE
-	attributes		MB_ATT_PISTOL,3|MB_ATT_FRAGS,1|MB_ATT_DODGE,3|MB_ATT_ARMOUR,3|MB_ATT_RALLY,1|MB_ATT_AMMO,3|MB_ATT_DISP_HEALTH,3|MB_ATT_DISP_AMMO,3
+	attributes		MB_ATT_PISTOL,3|MB_ATT_FRAGS,1|MB_ATT_DODGE,3|MB_ATT_ARMOUR,3|MB_ATT_RALLY,1|MB_ATT_AMMO,3|MB_ATT_DISP_HEALTH,3|MB_ATT_SUPPLYDROP
 	maxhealth		80
 	maxarmor		80
 	model			"ww2"
@@ -52,13 +52,14 @@ WeaponInfo1
 
 description	"Soldier (Medic)
 
-Weaponry:
-Colt Pistol
-Grenade
+^2Weaponry:
+- Colt Pistol
+- Frag Grenade
 
-Attributes:
-Armour (3)
-Ammo (3)
-Ammo Dispenser
-Med Kit
-Rally"
\ No newline at end of file
+^8Attributes:
+- Armour (3)
+- Ammo (3)
+- Dodge (3) ^3[CS1]
+- Medic (3) ^3[USE on teammate]
+- Ammobag ^3[USE]
+- Rally (1)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/axis_mg42.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/axis_mg42.mbch
index 501954bb2..99e109e33 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/axis_mg42.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/axis_mg42.mbch
@@ -13,6 +13,7 @@ ClassInfo
 	MBClass			MB_CLASS_ELITETROOPER
 	extralives		1
 	classnumberlimit	2
+	special1 EAS_HI_SPRINT
 }
 
 WeaponInfo0
@@ -77,39 +78,15 @@ WeaponInfo2
 	altFireEnabled 		0   					
 }
 
-WeaponInfo3
-{
-	WeaponToReplace		WP_BLASTER
-	WeaponBasedOff		WP_FLECHETTE
-	NewWorldModel		"models/weapons2/mg42/mg42.glm"  	
-	NewViewModel		"models/weapons2/mg42/mg42.md3"
-	NewHandsModel		"models/weapons2/golan_arms/golan_arms_hand.md3"
-	MuzzleEffect		"halo_smg/Muzzle_Flash"
-	MissileEffect		"halo_smg/projectile"
-	MissileMissEffect "halo_smg/wall_impact"
-	altMuzzleEffect		"halo_smg/Muzzle_Flash"
-	altMissileEffect		"halo_smg/projectile"
-	altMissileMissEffect "halo_smg/wall_impact"
-	FlashSound0		"sound/weapons/mg42/fire.mp3"  			
-	AltFlashSound0		"sound/weapons/mg42/fire.mp3"
-	Icon			"gfx/hud/w_icon_mg42" 				
-	WeaponName		"MG-42"    					
-	customAmmo		500
-	primHitscanShot		1
-	primHitscanTracer	5
-	altHitscanShot		1
-	altHitscanTracer	5
-	primGore		1
-	altGore			1
-}
-
 description	"Soldier (MG42)
 
-Weaponry:
-Colt Pistol
-MG42
-Frag Grenade
+^2Weaponry:
+- Colt Pistol
+- MG42
+- Frag Grenade
 
-Attributes:
-Armour (3)
-Ammo (3)"
\ No newline at end of file
+^8Attributes:
+- Armour (3)
+- Ammo (3)
+- Stamina (2) ^3[CS1]
+- Assemble (1)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/axis_sg.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/axis_sg.mbch
index 95536f3cf..9f3bff77c 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/axis_sg.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/axis_sg.mbch
@@ -75,12 +75,13 @@ WeaponInfo2
 
 description	"Soldier (Shotgun)
 
-Weaponry:
-Colt Pistol
-Shotgun
-Grenade
+^2Weaponry:
+- Colt Pistol
+- Shotgun
+- Frag Grenade
 
-Attributes:
-Armour (3)
-Ammo (3)
-Assemble"
\ No newline at end of file
+^8Attributes:
+- Armour (3)
+- Ammo (3)
+- Stamina (2) ^3[CS1]
+- Assemble (1)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/axis_sniper.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/axis_sniper.mbch
index 538e12719..b06601230 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/axis_sniper.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/axis_sniper.mbch
@@ -53,11 +53,12 @@ WeaponInfo1
 
 description	"Soldier (Sniper)
 
-Weaponry:
-Colt Pistol
-Sniper Rifle
+^2Weaponry:
+- Colt Pistol
+- Sniper Rifle
 
-Attributes:
-Armour (3)
-Ammo (3)
-Assemble"
\ No newline at end of file
+^8Attributes:
+- Armour (3)
+- Ammo (3)
+- Stamina (2) ^3[CS1]
+- Assemble (1)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/axis_sold.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/axis_sold.mbch
index 29c3cb1fb..855950ce4 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/axis_sold.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/axis_sold.mbch
@@ -63,10 +63,12 @@ WeaponInfo1
 
 description	"Soldier (MP44)
 
-Weaponry:
-Colt Pistol
-MP44
+^2Weaponry:
+- Colt Pistol
+- MP44
 
-Attributes:
-Armour (3)
-Ammo (3)"
\ No newline at end of file
+^8Attributes:
+- Armour (3)
+- Ammo (3)
+- Stamina (2) ^3[CS1]
+- Assemble (1)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/axis_sold2.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/axis_sold2.mbch
index 03ba5c9ce..fd9de8d0e 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/axis_sold2.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/axis_sold2.mbch
@@ -101,11 +101,13 @@ WeaponInfo3
 
 description	"Soldier (KAR98)
 
-Weaponry:
-Colt Pistol
-Kar 98
-Frag Grenade
+^2Weaponry:
+- Colt Pistol
+- Kar 98
+- Frag Grenade
 
-Attributes:
-Armour (3)
-Ammo (3)"
\ No newline at end of file
+^8Attributes:
+- Armour (3)
+- Ammo (3)
+- Stamina (2) ^3[CS1]
+- Assemble (1)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/fc_elite.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/fc_elite.mbch
index 3a996a9b5..7508c06a0 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/fc_elite.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/fc_elite.mbch
@@ -7,7 +7,7 @@ ClassInfo
 	saber1		Katana
 	saberstyle		SS_MEDIUM
 	forcepowers		FP_SABER_OFFENSE,2|FP_SABER_DEFENSE,2|FP_LEVITATION,1
-	attributes		MB_ATT_FP_SABER_DEFENSE,2|MB_ATT_GUN_DEFENSE,2|MB_ATT_POISON_DART,2
+	attributes		MB_ATT_FP_SABER_DEFENSE,2|MB_ATT_POISON_DART,2|MB_ATT_GUN_DEFENSE,1
 	maxhealth		60
 	maxarmor		50
 	model			"cultist" 				//this is optional, if it's here it forces the model to this.
@@ -17,6 +17,8 @@ ClassInfo
 	forcepool 		25
 	forceregen 		6
 	classNumberLimit	2
+	meleespecial1 EAS_HI_POISON
+	special1HUD HUD_POISONDART
 }
 
 WeaponInfo0
@@ -31,5 +33,9 @@ WeaponInfo0
 
 description	"Foot Clan Elite
 
-Weaponry:
-Sword"
\ No newline at end of file
+^2Weaponry:
+- Sword
+
+^8Attributes:
+- Saber Defense (2)
+- Poison Dart (2) ^3[CS1 M]"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/fc_shredder.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/fc_shredder.mbch
index fe2242394..31ea528f7 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/fc_shredder.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/fc_shredder.mbch
@@ -4,7 +4,7 @@ ClassInfo
 {
 	name			"fc_shredder"
 	weapons		WP_SABER|WP_MELEE
-	attributes		MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_GUN_DEFENSE,2|MB_ATT_WOOKIE_STRENGTH,3|MB_ATT_WOOKIEE_FURY,1
+	attributes		MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_WOOKIE_STRENGTH,3|MB_ATT_GUN_DEFENSE,1|MB_ATT_WOOKIEE_FURY,1
 	saber1		pred_wrist
 	saber2		pred_wrist
 	saberstyle 		SS_DUAL|SS_TAVION|SS_DESANN
@@ -19,6 +19,8 @@ ClassInfo
 	forceregen 		6
 	classNumberLimit	1
 	modelscale		1.2
+	meleespecial1 EAS_HI_FURY
+	meleespecial2 EAS_HI_BARGE
 }
 
 WeaponInfo0
@@ -33,5 +35,12 @@ WeaponInfo0
 
 description	"Shredder
 
-Weaponry:
-Wrist Blade"
\ No newline at end of file
+^2Weaponry:
+- Wrist Blade
+
+^8Attributes:
+- Saber Defense (3)
+- Force Jump (2)
+- Strength (3)
+- Barge (1) ^3[CS1 M]
+- Fury (1) ^3[CS1 M]"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/fc_sold.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/fc_sold.mbch
index c4b7c7e6d..ea526679e 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/fc_sold.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/fc_sold.mbch
@@ -17,6 +17,7 @@ ClassInfo
 	uishader		"models/players/cultist/icon_default"
 	MBClass		MB_CLASS_SOLDIER
 	extralives		4
+	special2 EAS_MELEE
 }
 
 WeaponInfo0
@@ -31,5 +32,11 @@ WeaponInfo0
 
 description	"Foot Clan Soldier
 
-Weaponry:
-Sai"
\ No newline at end of file
+^2Weaponry:
+- Sai
+
+^8Attributes:
+- Saber Defense (1)
+- Dexterity (1)
+- Stamina (1)
+- Close Combat Training (1)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/fc_sold2.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/fc_sold2.mbch
index 7619f1dd5..7340fbd92 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/fc_sold2.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/fc_sold2.mbch
@@ -17,6 +17,7 @@ ClassInfo
 	uishader		"models/players/cultist/icon_blue"
 	MBClass		MB_CLASS_SOLDIER
 	extralives		4
+	special2 EAS_MELEE
 }
 
 WeaponInfo0
@@ -31,5 +32,11 @@ WeaponInfo0
 
 description	"Foot Clan Soldier 2
 
-Weaponry:
-Stick"
\ No newline at end of file
+^2Weaponry:
+- Stick
+
+^8Attributes:
+- Saber Defense (1)
+- Dexterity (1)
+- Stamina (1)
+- Close Combat Training (1)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/fc_sold3.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/fc_sold3.mbch
index 1924bf36d..a5548edb4 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/fc_sold3.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/fc_sold3.mbch
@@ -6,7 +6,7 @@ ClassInfo
 	weapons				WP_MELEE|WP_BOWCASTER|WP_SABER
 	saber1				sai
 	saberstyle			SS_MEDIUM
-	attributes		MB_ATT_FP_SABER_DEFENSE,1|MB_ATT_GUN_DEFENSE,1|MB_ATT_BOWCASTER,1|MB_ATT_DEXTERITY,1|MB_ATT_STAMINA,1|MB_ATT_CCTRAINING,1
+	attributes			MB_ATT_FP_SABER_DEFENSE,1|MB_ATT_GUN_DEFENSE,1|MB_ATT_BOWCASTER,1|MB_ATT_DEXTERITY,1|MB_ATT_STAMINA,1|MB_ATT_CCTRAINING,1
 	forcepowers			FP_SABER_DEFENSE,1
 	bpmultiplier		0.2
 	forcepool			10
@@ -20,6 +20,7 @@ ClassInfo
 	classNumberLimit 		1
 	extralives			1
 	WP_BOWCASTERFlags	HELD_FLAME
+	special2 EAS_MELEE
 }
 
 WeaponInfo0
@@ -56,6 +57,12 @@ WeaponInfo1
 
 description				"Footclan Archer
 
-Weaponry: 
-Sai
-Bow & Burning Arrows"
\ No newline at end of file
+^2Weaponry: 
+- Sai
+- Bow & Burning Arrows
+
+^8Attributes:
+- Saber Defense (1)
+- Dexterity (1)
+- Stamina (1)
+- Close Combat Training (1)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_anakin.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_anakin.mbch
index ee18eb8d8..02066a1e7 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_anakin.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_anakin.mbch
@@ -7,7 +7,7 @@ ClassInfo
 	saber1			lego_single
 	sabercolor		4
 	saberstyle		SS_Fast|SS_Medium
-	forcepowers		FP_SABER_OFFENSE,3|FP_SABER_DEFENSE,3|FP_LEVITATION,3|FP_GRIP,2|FP_SEE,2
+	forcepowers		FP_SABER_OFFENSE,3|FP_SABER_DEFENSE,3|FP_LEVITATION,3|FP_GRIP,2|FP_SEE,2|FP_SABERTHROW,2
 	maxhealth		100
 	APmultiplier	1.2
 	model			"legoguy"
@@ -18,6 +18,8 @@ ClassInfo
 	modelscale  0.5
 	classflags  CFL_BPFREEJUMPS
 	attributes		MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_GUN_DEFENSE,2|MB_ATT_FORCEFOCUS,1|MB_ATT_GRAPPLE_HOOK,3|MB_ATT_FORCEBLOCK,2
+	meleespecial1 EAS_HI_GRAPPLEHOOK
+	special3 EAS_FP_GRIP
 }
 
 WeaponInfo0
@@ -42,21 +44,18 @@ WeaponInfo1
 
 description	"Anakin Skywalker
 
-Weaponry:
-Lightsaber
-
-Saber Attributes:
-Yellow / Blue Styles
-Saber Offense (3)
-Saber Defense (3)
-
-Force Powers:
-Force Jump (3)
-Force Grip (2)  
-Force Block (2)
-Force Focus (1)
-Force Sense (2)
-
-Attributes:
-BP Free Jumps
-Grapple Hook"
\ No newline at end of file
+^2Weaponry:
+- Lightsaber
+
+^8Attributes:
+- Yellow / Blue Styles
+- Saber Defense (3)
+- Blaster Defense (2)
+- Saber Throw (2) ^3[CS1]
+- Force Jump (3)
+- Force Grip (2) ^3[CS3]
+- Force Block (2)
+- Force Focus (1)
+- Force Sense (2)
+- Grapple Hook (3) ^3[CS1 M]
+- BP Free Jumps"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_clone_arc2.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_clone_arc2.mbch
index 880911175..1c65faf6a 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_clone_arc2.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_clone_arc2.mbch
@@ -14,6 +14,7 @@ ClassInfo
 	classNumberLimit	1
 	classflags		CFL_AKIMBOPISTOL3|CFL_BPFREEJUMPS
 	modelscale  0.5
+	meleespecial3 EAS_HI_GRAPPLEHOOK
 }
 
 WeaponInfo0
@@ -38,10 +39,12 @@ WeaponInfo1
 
 description	"Arc Trooper
 
-Weaponry:
-Dual Clone Pistol (3)
+^2Weaponry:
+- Dual Clone Pistol (3)
 
-Attributes:
-Grapple Hook
-Dexterity (3)
-Stamina (3)"
\ No newline at end of file
+^8Attributes:
+- Grapple Hook (3) ^3[CS3 M]
+- Dexterity (3) ^3[CS2]
+- Stamina (3) ^3[CS1]
+- Armour (3)
+- Ammo (3)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_clone_captain.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_clone_captain.mbch
index d28d76906..2f120b874 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_clone_captain.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_clone_captain.mbch
@@ -4,7 +4,7 @@ ClassInfo
 {
 	name			"lswj_clone_captain"
 	weapons			WP_CLONE_PISTOL|WP_CLONE_RIFLE|WP_MELEE
-	attributes		MB_ATT_CLONERIFLE,2|MB_ATT_AMMO,3|MB_ATT_HEALING,1|MB_ATT_PISTOL,1|MB_ATT_STAMINA,1|MB_ATT_GRAPPLE_HOOK,3
+	attributes		MB_ATT_CLONERIFLE,2|MB_ATT_AMMO,3|MB_ATT_CLONE_PISTOL,2|MB_ATT_HEALING,1|MB_ATT_STAMINA,1|MB_ATT_GRAPPLE_HOOK,3
 	maxhealth		100
 	model			"legoguy"
 	skin			"clone_captain"
@@ -13,6 +13,7 @@ ClassInfo
 	classNumberLimit	1
 	modelscale  0.5
   classflags  CFL_BPFREEJUMPS
+  meleeSpecial3 EAS_HI_GRAPPLEHOOK
 }
 
 WeaponInfo0
@@ -47,11 +48,12 @@ WeaponInfo2
 
 description	"Clone Captain
 
-Weaponry:
-Clone Pistol	(1)
-Clone Rifle		(2)
+^2Weaponry:
+- Clone Pistol (2)
+- Clone Rifle (2)
 
-Attributes:
-Stamina 	(1)
-Healing		(1)
-Grapple Hook"
\ No newline at end of file
+^8Attributes:
+- Stamina (1) ^3[CS1]
+- Healing (1)
+- Grapple Hook (3) ^3[CS3 M]
+- Ammo (3)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_clone_ep2.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_clone_ep2.mbch
index 32b344a4b..d5a06f488 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_clone_ep2.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_clone_ep2.mbch
@@ -4,7 +4,7 @@ ClassInfo
 {
 	name			"lswj_clone_ep2"
 	weapons			WP_CLONE_RIFLE|WP_CLONE_PISTOL|WP_MELEE
-	attributes		MB_ATT_PISTOL,1|MB_ATT_CLONERIFLE,1|MB_ATT_BLASTER,1|MB_ATT_ARMOUR,2|MB_ATT_AMMO,2|MB_ATT_GRAPPLE_HOOK,3
+	attributes		MB_ATT_CLONE_PISTOL,1|MB_ATT_CLONERIFLE,1|MB_ATT_ARMOUR,2|MB_ATT_AMMO,2|MB_ATT_GRAPPLE_HOOK,3
 	maxhealth		100
 	maxarmor		30
 	model			"legoguy"
@@ -14,6 +14,7 @@ ClassInfo
 	MBClass			MB_CLASS_CLONETROOPER
 	modelscale  0.5
   classflags  CFL_BPFREEJUMPS
+  meleeSpecial1 EAS_HI_GRAPPLEHOOK
 }
 
 WeaponInfo0
@@ -49,10 +50,12 @@ WeaponInfo2
 
 description	"Clone Trooper
 
-Weaponry:
-Clone Pistol (1)
-Clone Rifle (1)
+^2Weaponry:
+- Clone Pistol (1)
+- Clone Rifle (1)
 
-Attributes:
-Reinforcements (2)
-Grapple Hook"
\ No newline at end of file
+^8Attributes:
+- Reinforcements (2)
+- Grapple Hook (3) ^3[CS1 M]
+- Ammo (2)
+- Armour (2)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_han.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_han.mbch
index ab6f83c56..7d37a86ce 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_han.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_han.mbch
@@ -41,10 +41,12 @@ WeaponInfo1
 
 description	"Han Solo
 
-Weaponry:
-Blaster Pistol (3)  
+^2Weaponry:
+- Blaster Pistol (3)  
 
-Attributes:
-Heal (2)
-Dodge (3) ^3[CS2]
-Grapple Hook ^3[CS1]"
\ No newline at end of file
+^8Attributes:
+- Healing (2)
+- Dodge (3) ^3[CS2]
+- Grapple Hook (3) ^3[CS1 M]
+- Ammo (3)
+- Armour (3)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_handmaiden.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_handmaiden.mbch
index 61bcf8347..86bcf90bc 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_handmaiden.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_handmaiden.mbch
@@ -19,7 +19,7 @@ ClassInfo
   classflags  CFL_BPFREEJUMPS
 	attributes		MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_GUN_DEFENSE,2|MB_ATT_FORCEFOCUS,1|MB_ATT_GRAPPLE_HOOK,3|MB_ATT_FORCEBLOCK,3
 	resource	resource_force
-	special1	EAS_HI_GRAPPLEHOOK
+	meleespecial1	EAS_HI_GRAPPLEHOOK
 }
 
 WeaponInfo0
@@ -44,21 +44,18 @@ WeaponInfo1
 
 description	"Handmaiden
 
-Weaponry:
-Lightsaber Staff
-
-Saber Attributes:
-Staff Style Only
-Saber Offense 	(3)
-Saber Defense 	(3)
-
-Force Powers:
-Force Push		(2)
-Force Speed		(3)
-Force Jump		(3)
-Force Block		(3)
-Force Focus 	(1)
-
-Attributes:
-Grapple Hook ^3[CS1]
-BP Free Jumps"
\ No newline at end of file
+^2Weaponry:
+- Lightsaber Staff
+
+^8Attributes:
+- Staff Style Only
+- Saber Defense (3)
+- Blaster Defense (2)
+- Saber Throw (0) ^3[CS1]
+- Force Push (2)
+- Force Speed (3) ^3[CS3]
+- Force Jump (3)
+- Force Block (3)
+- Force Focus (1)
+- Grapple Hook (3) ^3[CS1 M]
+- BP Free Jumps"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_jedi.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_jedi.mbch
index 6981a8c22..dd6b0e827 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_jedi.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_jedi.mbch
@@ -17,7 +17,7 @@ ClassInfo
 	modelscale  	0.5
 	attributes		MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_GUN_DEFENSE,2|MB_ATT_FORCEFOCUS,1|MB_ATT_GRAPPLE_HOOK,3|MB_ATT_DEFLECT,2|MB_ATT_FORCEBLOCK,3
 	resource		resource_force
-	special1	EAS_HI_GRAPPLEHOOK
+	meleespecial1	EAS_HI_GRAPPLEHOOK
 }
 
 WeaponInfo0
@@ -42,22 +42,19 @@ WeaponInfo1
 
 description	"Jedi
 
-Weaponry:
-Lightsaber
-
-Saber Attributes:
-Yellow / Red Styles
-Saber Offense 	(3)
-Saber Defense 	(3)
-Saber Deflect 	(2)
-Attack-Defend 	(Q3)
-
-Force Powers:
-Force Jump		(3)
-Forse Sense 	(1)
-Force Block		(3)
-Force Focus 	(1)
-
-Attributes:
-Grapple Hook ^3[CS1]
-BP Free Jumps"
\ No newline at end of file
+^2Weaponry:
+- Lightsaber
+
+^8Attributes:
+- Yellow / Red Styles
+- Saber Defense (3)
+- Blaster Defense (2)
+- Blaster Deflect (2)
+- Saber Throw (0) ^3[CS1]
+- Attack-Defend (Q3)
+- Force Jump (3)
+- Forse Sense (1)
+- Force Block (3)
+- Force Focus (1)
+- Grapple Hook (3) ^3[CS1 M]
+- BP Free Jumps"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_jolee.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_jolee.mbch
index bac86654c..d91b0244d 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_jolee.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_jolee.mbch
@@ -7,7 +7,7 @@ ClassInfo
 	saber1			lego_single
 	sabercolor		3
 	saberstyle		SS_FAST|SS_MEDIUM|SS_STRONG
-	forcepowers		FP_SABER_OFFENSE,3|FP_SABER_DEFENSE,3|FP_LEVITATION,3|FP_PUSH,3|FP_PULL,2|FP_SEE,2
+	forcepowers		FP_SABER_OFFENSE,3|FP_SABER_DEFENSE,3|FP_LEVITATION,3|FP_PUSH,3|FP_PULL,2|FP_SEE,2|FP_SABERTHROW,2
 	maxhealth		120
 	maxarmor		0
 	model			"legoguy"
@@ -19,7 +19,7 @@ ClassInfo
 	modelscale  0.5
 	attributes		MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_GUN_DEFENSE,2|MB_ATT_FORCEFOCUS,1|MB_ATT_GRAPPLE_HOOK,3|MB_ATT_DEFLECT,2|MB_ATT_FORCEBLOCK,2
 		resource		resource_force
-	special1	EAS_HI_GRAPPLEHOOK
+	meleespecial1	EAS_HI_GRAPPLEHOOK
 }
 
 WeaponInfo0
@@ -44,24 +44,21 @@ WeaponInfo1
 
 description	"Jolee Bindo
 
-Weaponry:
-Lightsaber
+^2Weaponry:
+- Lightsaber
 
-Saber Attributes:
-Blue / Red / Yellow Styles
-Saber Offense 	(3)
-Saber Defense 	(3)
-Saber Deflect 	(2)
-Attack-Defend 	(Q3)
-
-Force Powers:
-Force Jump 		(3)
-Force Push 		(3)
-Force Pull 		(2)
-Force Sense 	(2)
-Force Block 	(2)
-Force Focus 	(1)
-
-Attributes:
-BP Free Jumps
-Grapple Hook ^3[CS1]"
\ No newline at end of file
+^8Attributes:
+- Blue / Red / Yellow Styles
+- Saber Defense (3)
+- Saber Throw (2) ^3[CS1]
+- Blaster Defense (2)
+- Blaster Deflect (2)
+- Attack-Defend (Q3)
+- Force Jump (3)
+- Force Push (3)
+- Force Pull (2)
+- Force Sense (2)
+- Force Block (2)
+- Force Focus (1)
+- Grapple Hook (3) ^3[CS1 M]
+- BP Free Jumps"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_kyle.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_kyle.mbch
index 6732ee219..616465045 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_kyle.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_kyle.mbch
@@ -8,7 +8,7 @@ ClassInfo
 	sabercolor		4
 	saberstyle		SS_FAST|SS_MEDIUM
 	attributes		MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_GUN_DEFENSE,2|MB_ATT_FORCEFOCUS,1|MB_ATT_PISTOL,2|MB_ATT_ARMOUR,3|MB_ATT_AMMO,3|MB_ATT_GRAPPLE_HOOK,3|MB_ATT_FORCEBLOCK,3|MB_ATT_DEFLECT,2
-	forcepowers		FP_LEVITATION,3|FP_PUSH,2|FP_PULL,3|FP_SEE,1|FP_TELEPATHY,2|FP_SPEED,3|FP_SABER_OFFENSE,2|FP_SABER_DEFENSE,3
+	forcepowers		FP_LEVITATION,3|FP_PUSH,2|FP_PULL,3|FP_SEE,1|FP_TELEPATHY,2|FP_SPEED,3|FP_SABER_OFFENSE,2|FP_SABER_DEFENSE,3|FP_SABERTHROW,2
 	maxhealth		100
 	maxarmor		80
 	forceregen		2.0
@@ -20,7 +20,7 @@ ClassInfo
 	modelscale  0.5
   classflags  CFL_BPFREEJUMPS
   	resource		resource_force
-	special1	EAS_HI_GRAPPLEHOOK
+	meleespecial1	EAS_HI_GRAPPLEHOOK
 }
 
 WeaponInfo0
@@ -63,27 +63,23 @@ WeaponInfo2
 
 description	"Kyle Katarn
 
-Weaponry:
-Lightsaber
-Bryar Pistol (2)
+^2Weaponry:
+- Lightsaber
+- Bryar Pistol (2)
 
-Saber Attributes:
-Blue / Yellow Styles
-Saber Offense (2)
-Saber Defense (3)
-Saber Deflect (2)
-
-Force Powers:
-Force Jump (3)
-Force Push (2)
-Force Pull (3)
-Force Sense (1)
-Mind Trick (2)
-Force Speed (3)
-Force Block (3)
-Force Focus (1)
-Force Regen (2x)
-
-Attributes:
-BP Free Jumps
-Grapple Hook ^3[CS1]"
\ No newline at end of file
+^8Attributes:
+- Blue / Yellow Styles
+- Saber Throw (2) [^3CS1]
+- Saber Defense (3)
+- Blaster Defense (2)
+- Blaster Deflect (2)
+- Force Jump (3)
+- Force Push (2)
+- Force Pull (3)
+- Force Sense (1)
+- Force Mindtrick (2) ^3[CS4]
+- Force Speed (3) ^3[CS3]
+- Force Block (3)
+- Force Focus (1)
+- Grapple Hook (3) ^3[CS1 M]
+- BP Free Jumps""
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_lando.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_lando.mbch
index 50753efd0..08f630041 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_lando.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_lando.mbch
@@ -41,10 +41,12 @@ WeaponInfo1
 
 description	"Lando Calrissian
 
-Weaponry:
-Blaster (3)
+^2Weaponry:
+- Blaster (3)
 
-Attributes:
-Dodge (2) ^3[CS2]
-Heal (3)
-Grapple Hook ^3[CS1]"
\ No newline at end of file
+^8Attributes:
+- Dodge (2) ^3[CS2]
+- Healing (3)
+- Grapple Hook (3) ^3[CS1 M]
+- Ammo (3)
+- Armour (2)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_luke6.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_luke6.mbch
index 6ac18224c..882c7c86b 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_luke6.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_luke6.mbch
@@ -7,7 +7,7 @@ ClassInfo
 	saber1			lego_single
 	sabercolor		3
 	saberstyle		SS_FAST|SS_MEDIUM
-	forcepowers		FP_SABER_OFFENSE,3|FP_SABER_DEFENSE,3|FP_LEVITATION,3|FP_PUSH,3|FP_PULL,2|FP_TELEPATHY,2
+	forcepowers		FP_SABER_OFFENSE,3|FP_SABER_DEFENSE,3|FP_LEVITATION,3|FP_PUSH,3|FP_PULL,2|FP_TELEPATHY,2|FP_SABERTHROW,1
 	maxhealth		100
 	maxarmor		0
 	model			"legoguy"
@@ -19,7 +19,7 @@ ClassInfo
   classflags  CFL_BPFREEJUMPS
 	attributes		MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_GUN_DEFENSE,2|MB_ATT_FORCEFOCUS,1|MB_ATT_GRAPPLE_HOOK,3|MB_ATT_DEFLECT,1|MB_ATT_FORCEBLOCK,1
 		resource		resource_force
-	special1	EAS_HI_GRAPPLEHOOK
+	meleespecial1	EAS_HI_GRAPPLEHOOK
 }
 
 WeaponInfo0
@@ -44,22 +44,19 @@ WeaponInfo1
 
 description	"Luke Skywalker
 
-Weaponry:
-Lightsaber
-
-Saber Attributes:
-Saber Offense (3)
-Saber Defense (3)
-Saber Deflect (1)
-
-Force Powers:
-Force Jump (2)
-Force Push (3)
-Force Pull (2)
-Mind Trick (2)
-Force Focus (1)
-Force Block (1)
-
-Attributes:
-BP Free Jumps
-Grapple Hook ^3[CS1]"
\ No newline at end of file
+^2Weaponry:
+- Lightsaber
+
+^8Attributes:
+- Saber Defense (3)
+- Blaster Defense (2)
+- Blaster Deflect (1)
+- Saber Throw (1) ^3[CS1]
+- Force Jump (2)
+- Force Push (3)
+- Force Pull (2)
+- Force Mindtrick (2) ^3[CS4]
+- Force Focus (1)
+- Force Block (1)
+- Grapple Hook (3) ^3[CS1 M]
+- BP Free Jumps"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_obi1.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_obi1.mbch
index 5e02a9e1a..7a2451603 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_obi1.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_obi1.mbch
@@ -7,7 +7,7 @@ ClassInfo
 	saber1			lego_single
 	sabercolor		4
 	saberstyle		SS_FAST|SS_MEDIUM
-	forcepowers		FP_SABER_OFFENSE,2|FP_SABER_DEFENSE,3|FP_LEVITATION,3|FP_PUSH,3|FP_SEE,2|FP_SPEED,2
+	forcepowers		FP_SABER_OFFENSE,2|FP_SABER_DEFENSE,3|FP_LEVITATION,3|FP_PUSH,3|FP_SEE,2|FP_SPEED,2|FP_SABERTHROW,2
 	maxhealth		110
 	maxarmor		0
 	forcepool		110
@@ -22,7 +22,7 @@ ClassInfo
 	modelscale  0.5
 	attributes		MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_GUN_DEFENSE,2|MB_ATT_FORCEFOCUS,1|MB_ATT_GRAPPLE_HOOK,3|MB_ATT_FORCEBLOCK,2|MB_ATT_DEFLECT,3
 		resource		resource_force
-	special1	EAS_HI_GRAPPLEHOOK
+	meleespecial1	EAS_HI_GRAPPLEHOOK
 }
 
 WeaponInfo0
@@ -47,25 +47,21 @@ WeaponInfo1
 
 description	"Obi-Wan Kenobi
 
-Weaponry:
-Lightsaber
+^2Weaponry:
+- Lightsaber
 
-Saber Attributes:
-Blue / Yellow Styles
-Saber Offense (2)
-Saber Defense (3)
-Saber Deflect (3)
-Attack-Defend (Q3)
-
-Force Powers:
-Force Jump (3)
-Force Push (3)
-Force Sense (2)
-Force Speed (2)
-Force Focus (1)
-Force Block (2)
-Force Regen (2.5x)
-
-Attributes:
-Grapple Hook ^3[CS1]
-BP Free Jumps"
\ No newline at end of file
+^8Attributes:
+- Blue / Yellow Styles
+- Saber Defense (3)
+- Blaster Defense (2)
+- Blaster Deflect (3)
+- Attack-Defend (Q3)
+- Saber Throw (2) ^3[CS1]
+- Force Jump (3)
+- Force Push (3)
+- Force Sense (2)
+- Force Speed (2) ^3[CS3]
+- Force Focus (1)
+- Force Block (2)
+- Grapple Hook (3) ^3[CS1 M]
+- BP Free Jumps"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_oldben.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_oldben.mbch
index 4dd1cc6e9..69ca3e02d 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_oldben.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_oldben.mbch
@@ -7,7 +7,7 @@ ClassInfo
 	saber1			lego_single
 	sabercolor		4
 	saberstyle		SS_FAST|SS_MEDIUM
-	forcepowers		FP_SABER_OFFENSE,2|FP_SABER_DEFENSE,3|FP_LEVITATION,2|FP_PUSH,3|FP_TELEPATHY,3
+	forcepowers		FP_SABER_OFFENSE,2|FP_SABER_DEFENSE,3|FP_LEVITATION,2|FP_PUSH,3|FP_TELEPATHY,3|FP_SABERTHROW,1
 	maxhealth		125
 	model			"legoguy"
 	skin			"oldben"
@@ -18,7 +18,7 @@ ClassInfo
 	modelscale  0.5
 	attributes		MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_GUN_DEFENSE,2|MB_ATT_FORCEFOCUS,1|MB_ATT_GRAPPLE_HOOK,3|MB_ATT_DEFLECT,3|MB_ATT_FORCEBLOCK,3
 		resource		resource_force
-	special1	EAS_HI_GRAPPLEHOOK
+	meleespecial1	EAS_HI_GRAPPLEHOOK
 }
 
 WeaponInfo0
@@ -43,22 +43,19 @@ WeaponInfo1
 
 description	"Old Ben Kenobi
 
-Weaponry:
-Lightsaber
-
-Saber Attributes:
-Blue / Yellow Styles
-Saber Offense (2)
-Saber Defense (3)
-Saber Deflect (3)
-
-Force Powers:
-Force Jump (2)
-Force Push (3)
-Mind Trick (3)
-Force Block (3)
-Force Focus (1)
-
-Attributes:
-BP Free Jumps
-Grapple Hook ^3[CS1]"
\ No newline at end of file
+^2Weaponry:
+- Lightsaber
+
+^8Attributes:
+- Blue / Yellow Styles
+- Saber Defense (3)
+- Saber Throw (1) ^3[CS1]
+- Blaster Defense (2)
+- Blaster Deflect (3)
+- Force Jump (2)
+- Force Push (3)
+- Force Mindtrick (3) ^3[CS4]
+- Force Block (3)
+- Force Focus (1)
+- Grapple Hook (3) ^3[CS1 M]
+- BP Free Jumps"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_windu.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_windu.mbch
index 9f70d5b7f..6d9503d59 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_windu.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_windu.mbch
@@ -9,7 +9,7 @@ Classinfo
 	saberstyle		SS_Fast|SS_Medium|SS_Strong
 	APmultiplier		1.65
 	BPmultiplier		1.9
-	forcepowers		FP_SABER_OFFENSE,3|FP_SABER_DEFENSE,3|FP_LEVITATION,3|FP_PUSH,3
+	forcepowers		FP_SABER_OFFENSE,3|FP_SABER_DEFENSE,3|FP_LEVITATION,3|FP_PUSH,3|FP_SABERTHROW,3
 	maxhealth		200
 	classflags		CFL_HASQ3|CFL_BPFREEJUMPS
 	model			"legoguy"
@@ -20,7 +20,7 @@ Classinfo
 	modelscale  0.5
 	attributes		MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_GUN_DEFENSE,2|MB_ATT_FORCEFOCUS,1|MB_ATT_GRAPPLE_HOOK,3|MB_ATT_FORCEBLOCK,2
 		resource		resource_force
-	special1	EAS_HI_GRAPPLEHOOK
+	meleespecial1	EAS_HI_GRAPPLEHOOK
 }
 
 WeaponInfo0
@@ -45,21 +45,18 @@ WeaponInfo1
 
 Description 	"Mace Windu
 
-Weaponry:
-Lightsaber
-
-Saber Attributes:
-Blue / Yellow / Red Styles
-Saber Offense (3)
-Saber Defense (3)
-Attack-Defense (Q3)
-
-Force Powers:
-Force Jump (3)
-Force Push (3)
-Force Focus (1)
-Force Block (2)
-
-Attributes:
-BP Free Jumps
-Grapple Hook ^3[CS1]"
\ No newline at end of file
+^2Weaponry:
+- Lightsaber
+
+^8Attributes:
+- Blue / Yellow / Red Styles
+- Saber Defense (3)
+- Blaster Defense (2)
+- Attack-Defense (Q3)
+- Saber Throw (3) ^3[CS1]
+- Force Jump (3)
+- Force Push (3)
+- Force Focus (1)
+- Force Block (2)
+- Grapple Hook (3) ^3[CS1 M]
+- BP Free Jumps"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_wookiee.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_wookiee.mbch
index c938149fb..db790407b 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lswj_wookiee.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lswj_wookiee.mbch
@@ -17,7 +17,7 @@ ClassInfo
   forcepool	100
   forceregen	1
   	resource		resource_energy
-	special1	EAS_HI_GRAPPLEHOOK
+	meleespecial1	EAS_HI_GRAPPLEHOOK
 }
 
 WeaponInfo0
@@ -52,11 +52,12 @@ WeaponInfo2
 
 description	"Wookiee
 
-Weaponry:
-Pistol (2)
-Bowcaster (3)
+^2Weaponry:
+- Pistol (2)
+- Bowcaster (3)
 
-Attributes:
-Wookiee Health (2)
-Wookiee Strength (2)
-Grapple Hook ^£[CS1]"
\ No newline at end of file
+^8Attributes:
+- Wookiee Health (2)
+- Wookiee Strength (2)
+- Grapple Hook (3) ^3[CS1 M]
+- Ammo (3)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_boba.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_boba.mbch
index 49dafe97e..48efd16af 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_boba.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_boba.mbch
@@ -3,8 +3,8 @@
 ClassInfo
 {
 	name			"lsws_boba"
-	weapons			WP_BLASTER_PISTOL|WP_EE4|WP_MELEE
-	attributes		MB_ATT_FUELREGEN,3|MB_ATT_PISTOL,2|MB_ATT_EE4,2|MB_ATT_ARMOUR,3|MB_ATT_AMMO,3|MB_ATT_FLAMETHROWER,2|MB_ATT_JETPACK,1|MB_ATT_FUEL,3|MB_ATT_ROCKET,1
+	weapons			WP_MANDO_PISTOL|WP_EE4|WP_MELEE
+	attributes		MB_ATT_FUELREGEN,3|MB_ATT_MANDO_PISTOL,2|MB_ATT_WRISTLASER|MB_ATT_EE4,2|MB_ATT_ARMOUR,3|MB_ATT_AMMO,3|MB_ATT_FLAMETHROWER,2|MB_ATT_JETPACK,1|MB_ATT_FUEL,3|MB_ATT_ROCKET,1
 	maxhealth		100
 	maxarmor		100
 	model			"legoguy"
@@ -17,8 +17,8 @@ ClassInfo
 
 WeaponInfo0
 {
-	WeaponToReplace		WP_BLASTER_PISTOL
-	WeaponBasedOff		WP_BLASTER_PISTOL
+	WeaponToReplace		WP_MANDO_PISTOL
+	WeaponBasedOff		WP_MANDO_PISTOL
 	NewWorldModel		"models/weapons2/lego_blaster/blaster_w.glm"
 	NewViewModel		"models/weapons2/lego_blaster/blaster.md3"
 	Icon			"gfx/mplevels/legosw/icon_blaster"
@@ -48,14 +48,16 @@ WeaponInfo2
 
 description			"Boba Fett
 
-Weaponry:
-Blaster Pistol (2)
-Bounty Hunter Rifle (EE-4) (2)
-Flamethrower
-Wrist Laser
-Rocket
+^2Weaponry:
+- Mando Pistol (2)
+- Bounty Hunter Rifle (EE-4) (2)
 
-Attributes:
-Jetpack
-Fuel (3)
-Fuel Regen (3)"
\ No newline at end of file
+^8Attributes:
+- Flamethrower (2) ^3[CS2]
+- Wrist Laser ^3[CS2]
+- Rocket ^3[CS1]
+- Jetpack
+- Fuel (3)
+- Fuel Regen (3)
+- Ammo (3)
+- Armour (3)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_dooku.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_dooku.mbch
index 187c87ed1..b43047ba2 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_dooku.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_dooku.mbch
@@ -7,7 +7,7 @@ ClassInfo
 	saber1			lego_single_dooku
 	sabercolor		0
 	saberstyle		SS_FAST|SS_MEDIUM|SS_STRONG
-	forcepowers 	FP_LEVITATION,3|FP_PUSH,3|FP_PULL,2|FP_SEE,2|FP_GRIP,3|FP_SABER_OFFENSE,3|FP_SABER_DEFENSE,3
+	forcepowers 	FP_LEVITATION,3|FP_PUSH,3|FP_PULL,2|FP_SEE,2|FP_GRIP,3|FP_SABER_OFFENSE,3|FP_SABER_DEFENSE,3|FP_SABERTHROW,2
 	maxhealth		150
 	model			"legoguy"
 	skin			"dooku"
@@ -17,8 +17,9 @@ ClassInfo
 	modelscale  0.5
   classflags  CFL_BPFREEJUMPS
 	attributes		MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_GUN_DEFENSE,2|MB_ATT_FORCEFOCUS,1|MB_ATT_GRAPPLE_HOOK,3|MB_ATT_FORCEBLOCK,3|MB_ATT_DEFLECT,1
-		resource		resource_force
-	special1	EAS_HI_GRAPPLEHOOK
+	resource		resource_force
+	meleespecial1	EAS_HI_GRAPPLEHOOK
+	special3 EAS_FP_GRIP
 }
 
 WeaponInfo0
@@ -43,24 +44,21 @@ WeaponInfo1
 
 description	"Count Dooku
 
-Weaponry:
-Lightsaber
+^2Weaponry:
+- Lightsaber
 
-Saber Attributes:
-Blue / Yellow / Red Styles
-Saber Offense (3)
-Saber Defense (3)
-Saber Deflect (1)
-
-Force Powers:
-Force Jump (3)
-Force Push (3)
-Force Pull (2)
-Force Sense (2)
-Force Grip (3)
-Force Block (3)
-Force Focus (1)
-
-Attributes:
-BP Free Jumps
-Grapple Hook ^3[CS1]"
\ No newline at end of file
+^8Attributes:
+- Blue / Yellow / Red Styles
+- Saber Throw (2) ^3[CS1]
+- Saber Defense (3)
+- Blaster Defense (2)
+- Blaster Deflect (1)
+- Force Jump (3)
+- Force Push (3)
+- Force Pull (2)
+- Force Sense (2)
+- Force Grip (3) ^3[CS3]
+- Force Block (3)
+- Force Focus (1)
+- Grapple Hook (3) ^3[CS1 M]
+- BP Free Jumps"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_imperial.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_imperial.mbch
index 5d7810937..f4da0a063 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_imperial.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_imperial.mbch
@@ -17,7 +17,7 @@ ClassInfo
 	forceregen	1
   classflags  CFL_BPFREEJUMPS
   	resource		resource_energy
-	special1	EAS_HI_GRAPPLEHOOK
+	meleespecial1	EAS_HI_GRAPPLEHOOK
 }
 
 WeaponInfo0
@@ -52,9 +52,10 @@ WeaponInfo2
 
 description	"Imperial Officer
 
-Weaponry:
-Blaster Pistol (2)
-Blaster (3)
+^2Weaponry:
+- Blaster Pistol (2)
+- Blaster (3)
 
-Attributes:
-Grapple Hook ^3[CS1]"
\ No newline at end of file
+^8Attributes:
+- Grapple Hook (3) ^3[CS1 M]
+- Ammo (2)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_jango.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_jango.mbch
index 919e32a24..0bb1a1da6 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_jango.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_jango.mbch
@@ -3,8 +3,8 @@
 ClassInfo
 {
 	name			"lsws_jango"
-	weapons			WP_BRYAR_OLD
-	attributes		MB_ATT_FUELREGEN,3|MB_ATT_PISTOL,3|MB_ATT_FLAMETHROWER,1|MB_ATT_FUEL,3|MB_ATT_AMMO,3|MB_ATT_JETPACK,1|MB_ATT_ROCKET,1
+	weapons			WP_MANDO_PISTOL
+	attributes		MB_ATT_FUELREGEN,3|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
 	maxhealth		100
 	maxarmor		100
 	model			"legoguy"
@@ -17,8 +17,8 @@ ClassInfo
 
 WeaponInfo0
 {
-	WeaponToReplace		WP_BRYAR_OLD
-	WeaponBasedOff		WP_BRYAR_OLD
+	WeaponToReplace		WP_MANDO_PISTOL
+	WeaponBasedOff		WP_MANDO_PISTOL
 	NewWorldModel		"models/weapons2/lego_blaster/blaster_w.glm"
 	NewViewModel		"models/weapons2/lego_blaster/blaster.md3"
 	NewHandsModel		"models/weapons2/blaster_r/blaster_hand.md3"
@@ -38,12 +38,13 @@ WeaponInfo1
 
 description	"Jango Fett
 
-Weaponry:
-Blaster Pistols	(3)
-Rocket
-Flamethrower
+^2Weaponry:
+- Mando Pistols	(3)
 
-Attributes:
-Jetpack
-Fuel	(3)
-Fueld Regen (3)"
\ No newline at end of file
+^8Attributes:
+- Rocket ^3[CS1]
+- Flamethrower (1) ^3[CS2]
+- Jetpack
+- Fuel (3)
+- Fueld Regen (3)
+- Ammo (3)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_jerec.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_jerec.mbch
index f57853bf7..9ca14275e 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_jerec.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_jerec.mbch
@@ -7,7 +7,7 @@ ClassInfo
 	saber1			lego_single
 	sabercolor		0
 	saberstyle		SS_Fast|SS_Medium|SS_Strong
-	forcepowers		FP_LEVITATION,3|FP_PUSH,3|FP_LIGHTNING,3|FP_DESTRUCTION,3|FP_SABER_OFFENSE,3|FP_SABER_DEFENSE,3|FP_SEE,3
+	forcepowers		FP_LEVITATION,3|FP_PUSH,3|FP_LIGHTNING,3|FP_DESTRUCTION,3|FP_SABER_OFFENSE,3|FP_SABER_DEFENSE,3|FP_SEE,3|FP_SABERTHROW,2
 	maxhealth		100
 	forcepool		150
 	model			"legoguy"
@@ -19,7 +19,9 @@ ClassInfo
 	modelscale  0.5
 	attributes		MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_GUN_DEFENSE,2|MB_ATT_FORCEFOCUS,1|MB_ATT_GRAPPLE_HOOK,3|MB_ATT_FORCEBLOCK,3|MB_ATT_DEFLECT,2|MB_ATT_FP_MIRALUKA
 		resource		resource_force
-	special1	EAS_HI_GRAPPLEHOOK
+	meleespecial1	EAS_HI_GRAPPLEHOOK
+	special4 EAS_FP_LIGHTNING
+	special3 EAS_FP_DESTRUCTION
 }
 
 WeaponInfo0
@@ -44,24 +46,21 @@ WeaponInfo1
 
 description	"Jerec
 
-Weaponry:
-Lightsaber
+^2Weaponry:
+- Lightsaber
 
-Saber Attributes:
-Blue / Red / Yellow Styles
-Saber Offense (3)
-Saber Defense (3)
-Saber Deflect (2)
-
-Force Powers:
-Force Jump		(3)
-Force Push		(3)
-Force Lightning	(3)
-Force Destruction (3)
-Force Focus 	(1)
-Force Block		(3)
-
-Attributes:
-Miraluka Vision (Perma Sense 3)
-Grapple Hook ^3[CS1]
-BP Free Jumps"
\ No newline at end of file
+^8Attributes:
+- Blue / Red / Yellow Styles
+- Saber Defense (3)
+- Blaster Deflect (2)
+- Blaster Defense (2)
+- Saber Throw (2) ^3[CS1]
+- Force Jump (3)
+- Force Push (3)
+- Force Lightning (3) ^3[CS4]
+- Force Destruction (3) ^3[CS3]
+- Force Focus  (1)
+- Force Block (3)
+- Miraluka Vision (Perma Sense 3)
+- Grapple Hook (3) ^3[CS1 M]
+- BP Free Jumps"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_malak.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_malak.mbch
index de672a8da..9238c2baa 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_malak.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_malak.mbch
@@ -19,7 +19,9 @@ ClassInfo
 	modelscale  0.5
 	attributes		MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_GUN_DEFENSE,2|MB_ATT_FORCEFOCUS,1|MB_ATT_GRAPPLE_HOOK,3|MB_ATT_FORCEBLOCK,1
 		resource		resource_force
-	special1	EAS_HI_GRAPPLEHOOK
+	meleespecial1	EAS_HI_GRAPPLEHOOK
+	special3 EAS_FP_GRIP
+	special4 EAS_FP_LIGHTNING
 }
 
 WeaponInfo0
@@ -44,22 +46,19 @@ WeaponInfo1
 
 description	"Darth Malak
 
-Weaponry:
-Lightsaber
+^2Weaponry:
+- Lightsaber
 
-Saber Attributes:
-Yellow / Red Styles
-Saber Offense (3)
-Saber Defense (3)
-
-Force Powers:
-Force Jump (3)
-Force Push (3)
-Force Grip (2)
-Force Lightning (3)
-Force Block (1)
-Force Focus (1)
-
-Attributes:
-BP Free Jumps
-Grapple Hook ^3[CS1]"
\ No newline at end of file
+^8Attributes:
+- Yellow / Red Styles
+- Saber Defense (3)
+- Blaster Defense (2)
+- Saber Throw (3) ^3[CS1]
+- Force Jump (3)
+- Force Push (3)
+- Force Grip (2) ^3[CS3]
+- Force Lightning (3) ^3[CS4]
+- Force Block (1)
+- Force Focus (1)
+- Grapple Hook (3) ^3[CS1 M]
+- BP Free Jumps"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_marek.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_marek.mbch
index 5a6b4b938..a52d5a1dd 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_marek.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_marek.mbch
@@ -7,7 +7,7 @@ ClassInfo
 	saber1			lego_reverse
 	sabercolor		0
 	saberstyle		ss_staff|SS_Tavion
-	forcepowers		FP_LEVITATION,3|FP_PUSH,3|FP_SEE,3|FP_GRIP,3|FP_LIGHTNING,3|FP_SABER_OFFENSE,3|FP_SABER_DEFENSE,3
+	forcepowers		FP_LEVITATION,3|FP_PUSH,3|FP_SEE,3|FP_GRIP,3|FP_LIGHTNING,3|FP_SABER_OFFENSE,3|FP_SABER_DEFENSE,3|FP_SABERTHROW,1
 	maxhealth		150
 	model			"legoguy"
 	skin			"marek"
@@ -19,7 +19,9 @@ ClassInfo
 	modelscale  0.5
 	attributes		MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_GUN_DEFENSE,2|MB_ATT_FORCEFOCUS,1|MB_ATT_GRAPPLE_HOOK,3|MB_ATT_FORCEBLOCK,3|MB_ATT_DEFLECT,3
 		resource		resource_force
-	special1	EAS_HI_GRAPPLEHOOK
+	meleespecial1	EAS_HI_GRAPPLEHOOK
+	special3 EAS_FP_GRIP
+	special4 EAS_FP_LIGHTNING
 }
 
 WeaponInfo0
@@ -44,25 +46,22 @@ WeaponInfo1
 
 description	"Galen Marek
 
-Weaponry:
-Lightsaber
+^2Weaponry:
+- Lightsaber
 
-Saber Attributes:
-Staff / Cyan Styles
-Saber Offense (3)
-Saber Defense (3)
-Saber Deflect (3)
-Attack-Defend (Q3)
-
-Force Powers:
-Force Jump (3)
-Force Push (3)
-Force Sense (3)
-Force Grip (3)
-Force Lightning (3)
-Force Block (3)
-Force Focus (1)
-
-Attributes:
-BP Free Jumps
-Grapple Hook ^3[CS1]"
\ No newline at end of file
+^8Attributes:
+- Staff / Cyan Styles
+- Saber Defense (3)
+- Blaster Defense (2)
+- Blaster Deflect (3)
+- Attack-Defend (Q3)
+- Saber Throw (1) ^3[CS1]
+- Force Jump (3)
+- Force Push (3)
+- Force Sense (3)
+- Force Grip (3) ^3[CS3]
+- Force Lightning (3) ^3[CS4]
+- Force Block (3)
+- Force Focus (1)
+- Grapple Hook (3) ^3[CS1 M]
+- BP Free Jumps"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_maul.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_maul.mbch
index 78f7e52b9..7984fb1cc 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_maul.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_maul.mbch
@@ -20,7 +20,7 @@ ClassInfo
 	classflags  CFL_BPFREEJUMPS
 	attributes		MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_GUN_DEFENSE,2|MB_ATT_FORCEFOCUS,1|MB_ATT_GRAPPLE_HOOK,3|MB_ATT_FORCEBLOCK,3
 		resource		resource_force
-	special1	EAS_HI_GRAPPLEHOOK
+	meleespecial1	EAS_HI_GRAPPLEHOOK
 }
 
 WeaponInfo0
@@ -46,21 +46,18 @@ WeaponInfo1
 
 description	"Darth Maul
 
-Weaponry:
-Lightsaber Staff
-
-Saber Attributes:
-Staff Style Only
-Saber Offense (3)
-Saber Defense (3)
-
-Force Powers:
-Force Jump (3)
-Force Push (3)
-Force Pull (2)
-Force Block (3)
-Force Focus (1)
-
-Attributes:
-BP Free Jumps
-Grapple Hook ^3[CS1]"
\ No newline at end of file
+^2Weaponry:
+- Lightsaber Staff
+
+^8Attributes:
+- Staff Style Only
+- Saber Defense (3)
+- Blaster Defense (2)
+- Saber Throw (0) ^3[CS1]
+- Force Jump (3)
+- Force Push (3)
+- Force Pull (2)
+- Force Block (3)
+- Force Focus (1)
+- Grapple Hook (3) ^3[CS1 M]
+- BP Free Jumps"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_maw.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_maw.mbch
index 57efa66dd..5ea2e98a2 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_maw.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_maw.mbch
@@ -19,7 +19,8 @@ ClassInfo
 	modelscale  0.5
 	attributes		MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_GUN_DEFENSE,2|MB_ATT_FORCEFOCUS,1|MB_ATT_GRAPPLE_HOOK,3|MB_ATT_DEFLECT,1|MB_ATT_FORCEBLOCK,3
 		resource		resource_force
-	special1	EAS_HI_GRAPPLEHOOK
+	meleespecial1	EAS_HI_GRAPPLEHOOK
+	special3 EAS_FP_GRIP
 }
 
 WeaponInfo0
@@ -44,27 +45,23 @@ WeaponInfo1
 
 description	"Maw
 
-Weaponry:
-Lightsaber
+^2Weaponry:
+- Lightsaber
 
-Saber Attributes:
-Yellow / Red Styles
-Saber Offense (3)
-Saber Defense (3)
-Saber Deflect (1)
-Attack-Defend (Q3)
-
-Force Powers:
-Force Jump (3)
-Force Push (3)
-Force Pull (2)
-Force Grip (2)
-Force Block (3)
-Force Focus (1)
-Force Regen (1.5x)
-
-Attributes:
-Heavy Melee
-Resistant to Melee
-BP Free Jumps
-Grapple Hook ^3[CS1]"
\ No newline at end of file
+^8Attributes:
+- Yellow / Red Styles
+- Saber Defense (3)
+- Blaster Defense (2)
+- Blaster Deflect (1)
+- Saber Throw (0) ^3[CS1]
+- Attack-Defend (Q3)
+- Force Jump (3)
+- Force Push (3)
+- Force Pull (2)
+- Force Grip (2) ^3[CS3]
+- Force Block (3)
+- Force Focus (1)
+- Grapple Hook (3) ^3[CS1 M]
+- Heavy Melee
+- Resistant to Melee
+- BP Free Jumps"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_palpatine.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_palpatine.mbch
index 4345feab5..e714825c5 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_palpatine.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_palpatine.mbch
@@ -23,7 +23,9 @@ Classinfo
 	modelscale  0.5
 	attributes		MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_GUN_DEFENSE,2|MB_ATT_FORCEFOCUS,1|MB_ATT_GRAPPLE_HOOK,3|MB_ATT_FORCEBLOCK,
 		resource		resource_force
-	special1	EAS_HI_GRAPPLEHOOK
+	meleespecial1	EAS_HI_GRAPPLEHOOK
+	special3 EAS_FP_GRIP
+	special4 EAS_FP_LIGHTNING
 }
 
 WeaponInfo0
@@ -49,26 +51,22 @@ WeaponInfo1
 Description 	"Chancellor Palpatine
 
 
-Weaponry:
-Lightsaber
+^2Weaponry:
+- Lightsaber
 
-Saber Attributes:
-Blue / Red / Yellow Styles
-Saber Offense (3)
-Saber Defense (3)
-Attack-Defend (Q3)
-
-Force Powers:
-Force Jump (3)
-Force Push (3)
-Force Pull (3)
-Force Sense (3)
-Force Grip (3)
-Force Lightning (3)
-Force Block (2)
-Force Focus (1)
-Force Regen (2x)
-
-Attributes:
-BP Free Jumps
-Grapple Hook ^3[CS1]"
\ No newline at end of file
+^8Attributes:
+- Blue / Red / Yellow Styles
+- Saber Defense (3)
+- Blaster Defense (2)
+- Attack-Defend (Q3)
+- Saber Throw (0) ^3[CS1]
+- Force Jump (3)
+- Force Push (3)
+- Force Pull (3)
+- Force Sense (3)
+- Force Grip (3) ^3[CS3]
+- Force Lightning (3) ^3[CS4]
+- Force Block (2)
+- Force Focus (1)
+- Grapple Hook (3) ^3[CS1 M]
+- BP Free Jumps"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_sandtrooper.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_sandtrooper.mbch
index 674a8a0d4..0ab47c762 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_sandtrooper.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_sandtrooper.mbch
@@ -54,10 +54,12 @@ WeaponInfo2
 
 description	"Sandtrooper
 
-Weaponry:
-Blaster Pistol (2)
-Blaster (2)
+^2Weaponry:
+- Blaster Pistol (2)
+- Blaster (2)
 
-Attributes:
-Grapple Hook ^3[CS1]
-Reinforcements (1)"
\ No newline at end of file
+^8Attributes:
+- Grapple Hook (3) ^3[CS1 M]
+- Reinforcements (1)
+- Ammo (2)
+- Armour (3)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_sion.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_sion.mbch
index bd5176023..497150f89 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_sion.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_sion.mbch
@@ -9,7 +9,7 @@ Classinfo
 	saberstyle		SS_Medium|SS_Desann|SS_Strong
 	APmultiplier		1.15
 	BPmultiplier		1.15
-	forcepowers		FP_SABER_OFFENSE,3|FP_SABER_DEFENSE,3|FP_GRIP,3|FP_PUSH,3|FP_LEVITATION,3|FP_SEE,3
+	forcepowers		FP_SABER_OFFENSE,3|FP_SABER_DEFENSE,3|FP_GRIP,3|FP_PUSH,3|FP_LEVITATION,3|FP_SEE,3|FP_SABERTHROW,1
 	maxhealth		100
 	speed			1.0
 	forcepool		150
@@ -22,7 +22,8 @@ Classinfo
 	modelscale  0.5
 	attributes		MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_GUN_DEFENSE,2|MB_ATT_FORCEFOCUS,1|MB_ATT_GRAPPLE_HOOK,3|MB_ATT_FORCEBLOCK,2
 		resource		resource_force
-	special1	EAS_HI_GRAPPLEHOOK
+	meleespecial1	EAS_HI_GRAPPLEHOOK
+	special3 EAS_FP_GRIP
 }
 
 WeaponInfo0
@@ -47,26 +48,21 @@ WeaponInfo1
 
 Description 	"Darth Sion
 
-Weaponry:
-Lightsaber
+^2Weaponry:
+- Lightsaber
 
-Saber Attributes:
-Yellow / Purple / Red Styles
-Saber Offense (3)
-Saber Defense (3)
-Attack-Defend (Q3)
-
-Force Powers:
-Force Jump (3)
-Force Push (3)
-Force Sense (3)
-Force Grip (3)
-Force Focus (1)
-Force Block (2)
-
-Attributes:
-Fast Force Regen
-Grapple Hook ^3[CS1]
-BP Free Jumps
-
-Darth Sion, the Lord of Pain, was a Sith Lord who lived in the time of the Old Sith Wars. As a Sith Marauder in the Great Sith War, Sion fought for Exar Kun's Sith Empire until the day he was struck down. Rather than die, though, Sion found that by calling on his pain, anger, and hatred, he could rise from certain death and achieve immortality, at the cost of all-consuming agony. With a body fractured and decomposing, but held together by the dark side of the Force, Sion survived the Great Sith War."
\ No newline at end of file
+^8Attributes:
+- Yellow / Purple / Red Styles
+- Saber Defense (3)
+- Blaster Defense (2)
+- Saber Throw (1) ^3[CS1]
+- Attack-Defend (Q3)
+- Force Jump (3)
+- Force Push (3)
+- Force Sense (3)
+- Force Grip (3) ^3[CS3]
+- Force Focus (1)
+- Force Block (2)
+- Fast Force Regen
+- Grapple Hook (3) ^3[CS1 M]
+- BP Free Jumps"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_sith.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_sith.mbch
index 813425185..d094fe015 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_sith.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_sith.mbch
@@ -17,7 +17,7 @@ ClassInfo
 	modelscale  0.5
 	attributes		MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_GUN_DEFENSE,2|MB_ATT_FORCEFOCUS,1|MB_ATT_GRAPPLE_HOOK,3|MB_ATT_DEFLECT,2|MB_ATT_FORCEBLOCK,3
 		resource		resource_force
-	special1	EAS_HI_GRAPPLEHOOK
+	meleespecial1	EAS_HI_GRAPPLEHOOK
 }
 
 WeaponInfo0
@@ -42,22 +42,19 @@ WeaponInfo1
 
 description	"Dark Jedi
 
-Weaponry:
-Lightsaber
-
-Saber Attributes:
-Yellow / Red Styles
-Saber Offense (3)
-Saber Defense (3)
-Saber Deflect (2)
-Attack-Defend (Q3)
-
-Force Powers:
-Force Jump (3)
-Force Sense (1)
-Force Focus (1)
-Force Block (3)
-
-Attributes:
-BP Free Jumps
-Grapple Hook ^3[CS1]"
\ No newline at end of file
+^2Weaponry:
+- Lightsaber
+
+^8Attributes:
+- Yellow / Red Styles
+- Saber Defense (3)
+- Saber Throw (0) ^3[CS1]
+- Blaster Defense (2)
+- Blaster Deflect (2)
+- Attack-Defend (Q3)
+- Force Jump (3)
+- Force Sense (1)
+- Force Focus (1)
+- Force Block (3)
+- Grapple Hook (3) ^3[CS1 M]
+- BP Free Jumps"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_stormtrooper.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_stormtrooper.mbch
index 97cbfaa7f..e5030eeb4 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_stormtrooper.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_stormtrooper.mbch
@@ -52,10 +52,12 @@ WeaponInfo2
 
 description	"Stormtrooper
 
-Weaponry:
-Blaster Pistol (2)
-Blaster (3)
+^2Weaponry:
+- Blaster Pistol (2)
+- Blaster (3)
 
-Attributes:
-Reinforcements (2)
-Grapple Hook ^3[CS1]"
\ No newline at end of file
+^8Attributes:
+- Reinforcements (2)
+- Grapple Hook (3) ^3[CS1 M]
+- Ammo (2)
+- Armour (2)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_vader.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_vader.mbch
index 865ce5657..78597181c 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_vader.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_vader.mbch
@@ -7,7 +7,7 @@ ClassInfo
 	saber1			lego_single
 	sabercolor		0
 	saberstyle		SS_MEDIUM|SS_STRONG
-	forcepowers		FP_SABER_OFFENSE,3|FP_SABER_DEFENSE,3|FP_LEVITATION,3|FP_PUSH,2|FP_PULL,2|FP_GRIP,3
+	forcepowers		FP_SABER_OFFENSE,3|FP_SABER_DEFENSE,3|FP_LEVITATION,3|FP_PUSH,2|FP_PULL,2|FP_GRIP,3|FP_SABERTHROW,2
 	maxhealth		100
 	maxarmor		50
 	model			"legoguy"
@@ -19,7 +19,7 @@ ClassInfo
 	classflags  CFL_BPFREEJUMPS
 	attributes		MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_GUN_DEFENSE,2|MB_ATT_FORCEFOCUS,1|MB_ATT_GRAPPLE_HOOK,3|MB_ATT_DEFLECT,2|MB_ATT_FORCEBLOCK,3
 		resource		resource_force
-	special1	EAS_HI_GRAPPLEHOOK
+	meleespecial1	EAS_HI_GRAPPLEHOOK
 }
 
 WeaponInfo0
@@ -44,23 +44,20 @@ WeaponInfo1
 
 description	"Darth Vader
 
-Weaponry:
-Lightsaber
-
-Saber Attributes:
-Yellow / Red Styles
-Saber Offense (3)
-Saber Defense (3)
-Saber Deflect (2)
-
-Forcepowers:
-Force Jump (1)
-Force Push (2)
-Force Pull (2)
-Force Grip (3)
-Force Focus (1)
-Force Block (3)
-
-Attributes:
-BP Free Jumps
-Grapple Hook ^3[CS1]"
\ No newline at end of file
+^2Weaponry:
+- Lightsaber
+
+^8Attributes:
+- Yellow / Red Styles
+- Saber Defense (3)
+- Blaster Deflect (2)
+- Blaster Defense (2)
+- Saber Throw (2) ^3[CS1]
+- Force Jump (1)
+- Force Push (2)
+- Force Pull (2)
+- Force Grip (3) ^3[CS3]
+- Force Focus (1)
+- Force Block (3)
+- Grapple Hook (3) ^3[CS1 M]
+- BP Free Jumps"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_ventress.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_ventress.mbch
index c6dc1648b..cbb95da5d 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_ventress.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_ventress.mbch
@@ -20,7 +20,7 @@ ClassInfo
 	classflags  CFL_BPFREEJUMPS
 	attributes		MB_ATT_FP_SABER_DEFENSE,3|MB_ATT_GUN_DEFENSE,2|MB_ATT_FORCEFOCUS,1|MB_ATT_GRAPPLE_HOOK,3|MB_ATT_FORCEBLOCK,2
 		resource		resource_force
-	special1	EAS_HI_GRAPPLEHOOK
+	meleespecial1	EAS_HI_GRAPPLEHOOK
 }
 
 WeaponInfo0
@@ -45,21 +45,18 @@ WeaponInfo1
 
 description	"Asajj Ventress
 
-Weaponry:
-Dual Lightsabers
-
-Saber Attributes:
-Dual Style Only
-Saber Offense		(3)
-Saber Defense		(3)
-
-Force Powers:
-Force Jump		(3)
-Force Push		(3)
-Force Sense		(3)
-Force Block		(2)
-Force Focus 	(1)
-
-Attributes:
-BP Free Jumps
-Grapple Hook ^3[CS1]"
\ No newline at end of file
+^2Weaponry:
+- Dual Lightsabers
+
+^8Attributes:
+- Dual Style Only
+- Saber Defense (3)
+- Blaster Defense (2)
+- Saber Throw (0) ^3[CS1]
+- Force Jump (3)
+- Force Push (3)
+- Force Sense (3)
+- Force Block (2)
+- Force Focus (1)
+- Grapple Hook (3) ^3[CS1 M]
+- BP Free Jumps"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_yun.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_yun.mbch
index 81d720f4f..8419bd498 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/lsws_yun.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/lsws_yun.mbch
@@ -7,7 +7,7 @@ ClassInfo
 	saber1			lego_single
 	sabercolor		2
 	saberstyle		SS_FAST|SS_MEDIUM
-	forcepowers		FP_LEVITATION,2|FP_PUSH,2|FP_SEE,1|FP_BLIND,2|FP_SABER_OFFENSE,2|FP_SABER_DEFENSE,2
+	forcepowers		FP_LEVITATION,2|FP_PUSH,2|FP_SEE,1|FP_BLIND,2|FP_SABER_OFFENSE,2|FP_SABER_DEFENSE,2|FP_SABERTHROW,1
 	maxhealth		100
 	maxarmor		0
 	model			"legoguy"
@@ -19,7 +19,8 @@ ClassInfo
 	modelscale  0.5
 	attributes		MB_ATT_FP_SABER_DEFENSE,2|MB_ATT_GUN_DEFENSE,2|MB_ATT_FORCEFOCUS,1|MB_ATT_GRAPPLE_HOOK,3|MB_ATT_FORCEBLOCK,1|MB_ATT_DEFLECT,1
 		resource		resource_force
-	special1	EAS_HI_GRAPPLEHOOK
+	meleespecial1	EAS_HI_GRAPPLEHOOK
+	special3 EAS_FP_BLIND
 }
 
 WeaponInfo0
@@ -44,23 +45,20 @@ WeaponInfo1
 
 description	"Yun
 
-Weaponry:
-Lightsaber
+^2Weaponry:
+- Lightsaber
 
-Saber Attributes:
-Yellow / Blue Styles
-Saber Offense (2)
-Saber Defense (2)
-Saber Deflect (1)
-
-Force Powers:
-Force Jump (2)
-Force Push (2)
-Force Blinding (2)
-Force Sense (1)
-Force Block (1)
-Force Focus (1)
-
-Attributes:
-BP Free Jumps
-Grapple Hook ^3[CS1]"
\ No newline at end of file
+^8Attributes:
+- Yellow / Blue Styles
+- Saber Defense (2)
+- Blaster Defense (2)
+- Blaster Deflect (1)
+- Saber Throw (1) ^3[CS1]
+- Force Jump (2)
+- Force Push (2)
+- Force Blinding (2) ^3[CS3]
+- Force Sense (1)
+- Force Block (1)
+- Force Focus (1)
+- Grapple Hook (3) ^3[CS1 M]
+- BP Free Jumps"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/mfm_doomimp.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/mfm_doomimp.mbch
index 37238fea4..c41ed3232 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/mfm_doomimp.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/mfm_doomimp.mbch
@@ -6,8 +6,8 @@ ClassInfo
 	weapons			WP_MELEE|WP_T21|
 	attributes		MB_ATT_HEALING,1|MB_ATT_RALLY,1|MB_ATT_T21,1|
 	forcepowers		FP_SEE,3|
-  forcepool 20
-  forceregen  0.5
+  forcepool 25
+  forceregen  1
 	maxhealth		125
 	model			"doomimp"
 	skin			"default"
@@ -37,35 +37,16 @@ WeaponInfo0
 }
 
 WeaponInfo1
-{
-	WeaponToReplace		WP_SABER
-	WeaponBasedOff		WP_SABER  
-  NewWorldModel		"models/weapons2/dummy/dummy.glm"
-  NewViewModel		"models/weapons2/dummy/dummy.md3"
-  Icon			"gfx/mplevels/monster_forest/doomimp"
-	WeaponName		"^7Melee"
-}
-
-WeaponInfo2
 {
 	WeaponToReplace		WP_T21
 	WeaponBasedOff		WP_T21
   NewWorldModel		"models/weapons2/dummy/dummy.glm"
   NewViewModel		"models/weapons2/dummy/dummy.md3"
   Icon			"gfx/mplevels/monster_forest/doomimp"
-	MuzzleEffect		"firegrenade/shot"
-	AltMuzzleEffect		"firegrenade/shot"
-	MissileEffect		"firegrenade/shot"
-	Missile3Effect		"firegrenade/shot"
-	AltMissileEffect	"firegrenade/shot"
-	PowerupShotEffect	"firegrenade/shot"
-	ChargeEffect		"firegrenade/shot"
-	OverchargeEffect	"firegrenade/shot"
 	MissileMissEffect "firegrenade/prim_explode"
 	altMissileMissEffect "firegrenade/prim_explode"
 	FlashSound0		"Sound/chars/doomimp/misc/fireball1.wav"
 	FlashSound1		"Sound/chars/doomimp/misc/fireball2.wav"
-	ChargeEffect		"firegrenade/shot"
 	ChargeSound 		"Sound/chars/doomimp/misc/fireball_loop.wav"
 	WeaponName		"^7Fireballs""
 	customAmmo		40
@@ -76,35 +57,6 @@ WeaponInfo2
   firingAnim  BOTH_SUPERPUSH
 }
 
-WeaponInfo3
-{
-	WeaponToReplace		WP_BLASTER
-	WeaponBasedOff		WP_BLASTER
-  NewWorldModel		"models/weapons2/dummy/dummy.glm"
-  NewViewModel		"models/weapons2/dummy/dummy.md3"
-  Icon			"gfx/mplevels/monster_forest/doomimp"
-	MuzzleEffect		"firegrenade/shot"
-	AltMuzzleEffect		"firegrenade/shot"
-	MissileEffect		"firegrenade/shot"
-	Missile3Effect		"firegrenade/shot"
-	AltMissileEffect	"firegrenade/shot"
-	PowerupShotEffect	"firegrenade/shot"
-	ChargeEffect		"firegrenade/shot"
-	OverchargeEffect	"firegrenade/shot"
-	MissileMissEffect "firegrenade/prim_explode"
-	altMissileMissEffect "firegrenade/prim_explode"
-	FlashSound0		"Sound/chars/doomimp/misc/fireball1.wav"
-	FlashSound1		"Sound/chars/doomimp/misc/fireball2.wav"
-	ChargeEffect		"firegrenade/shot"
-	ChargeSound 		"Sound/chars/doomimp/misc/fireball_loop.wav"
-	WeaponName		"^7Fireballs""
-	customAmmo		40
-	clipSize  40
-	primGore		1
-	altGore			1
-	idleAnim BOTH_MELEE_STAND2 
-  firingAnim  BOTH_SUPERPUSH
-}
 
 ForceInfo0
 {
@@ -115,8 +67,10 @@ ForceInfo0
 
 description	"Doom Imp
 
-Weaponry:
-Claws
+^2Weaponry:
+- Claws
 
-Attributes:
-Self Healing (3)"
\ No newline at end of file
+^8Attributes:
+- Self Healing (1)
+- Rally (1)
+- Sense (3)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/mfm_werewolf.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/mfm_werewolf.mbch
index 89a8bfe57..763e66c5a 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/mfm_werewolf.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/mfm_werewolf.mbch
@@ -9,8 +9,8 @@ ClassInfo
 	saberstyle		SS_DUAL
 	attributes		MB_ATT_HEALING,1|MB_ATT_WOOKIE_STRENGTH,3|MB_ATT_HEALING,1|MB_ATT_RALLY,1|
 	forcepowers		FP_LEVITATION,3|FP_SABER_OFFENSE,3|FP_SEE,3|
-  forcepool 20
-  forceregen  2	
+  forcepool 30
+  forceregen  1
 	maxhealth		150
 	model			"werewolf_v2"
 	skin			"default"
@@ -56,10 +56,12 @@ ForceInfo0
 
 description	"Werewolf
 
-Weaponry:
-Melee
-Claws
+^2Weaponry:
+- Melee
+- Claws
 
-Attributes:
-Self Healing (1)
-Strength (3)"
\ No newline at end of file
+^8Attributes:
+- Self Healing (1)
+- Strength (3)
+- Rally (1)
+- Sense (3)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/mfm_zombie.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/mfm_zombie.mbch
index 1b340f5f4..a3dfd6bfe 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/mfm_zombie.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/mfm_zombie.mbch
@@ -8,8 +8,8 @@ ClassInfo
 	maxhealth		70
 	model			"re_zombie"
   forcepowers FP_SEE,3
-  forcepool 20
-  forceregen  0.5
+  forcepool 25
+  forceregen  1
 	skin			"default"
 	uishader		"gfx/mplevels/monster_forest/mf_zombie"
 	MBClass			MB_CLASS_ELITETROOPER
@@ -35,15 +35,6 @@ WeaponInfo0
 	altFireEnabled 0
 }
 
-WeaponInfo1
-{
-	WeaponToReplace		WP_SABER
-	WeaponBasedOff		WP_SABER  
-  NewWorldModel		"models/weapons2/dummy/dummy.glm"
-  NewViewModel		"models/weapons2/dummy/dummy.md3"
-  Icon			"gfx/mplevels/revil/icon_zmelee"
-	WeaponName		"^7Melee"
-}
 
 ForceInfo0
 {
@@ -54,5 +45,9 @@ ForceInfo0
 
 description	"Zombie
 
-Weaponry:
-Melee"
\ No newline at end of file
+^2Weaponry:
+- Melee
+
+^8Attributes:
+- Self Healing (1)
+- Sense (3)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/mfm_zombiec.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/mfm_zombiec.mbch
index 2b9522112..e2eacdffd 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/mfm_zombiec.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/mfm_zombiec.mbch
@@ -9,8 +9,8 @@ ClassInfo
 	saberstyle		SS_DUAL
 	attributes		MB_ATT_HEALING,3|MB_ATT_RALLY,1
 	forcepowers		FP_SABER_OFFENSE,3|FP_SEE,3
-  forcepool 20
-  forceregen  0.5
+  forcepool 25
+  forceregen  1
 	maxhealth		125
 	model			"re_zombie2"
 	skin			"defaultc"
@@ -51,8 +51,10 @@ ForceInfo0
 
 description	"Crimson Head
 
-Weaponry:
-Claws
+^2Weaponry:
+- Claws
 
-Attributes:
-Self Healing (3)"
\ No newline at end of file
+^8Attributes:
+- Self Healing (3)
+- Rally (1)
+- Sense (3)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/mfm_zombies.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/mfm_zombies.mbch
index 9c3350e48..c0c6a0fbb 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/mfm_zombies.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/mfm_zombies.mbch
@@ -7,8 +7,8 @@ ClassInfo
 	maxhealth		80
 	attributes  MB_ATT_WOOKIE_STRENGTH,1|MB_ATT_HEALING,1
   forcepowers FP_SEE,3
-  forcepool 20
-  forceregen  0.5
+  forcepool 25
+  forceregen  1
 	model			"re_zombie2"
 	skin			"default"
 	uishader		"gfx/mplevels/monster_forest/mf_zombie2"
@@ -36,15 +36,6 @@ WeaponInfo0
 	firingAnim  BOTH_BURSTMISS
 }
 
-WeaponInfo1
-{
-	WeaponToReplace		WP_SABER
-	WeaponBasedOff		WP_SABER  
-  NewWorldModel		"models/weapons2/dummy/dummy.glm"
-  NewViewModel		"models/weapons2/dummy/dummy.md3"
-  Icon			"gfx/mplevels/revil/icon_zmelee"
-	WeaponName		"^7Melee"
-}
 
 ForceInfo0
 {
@@ -55,6 +46,10 @@ ForceInfo0
 
 description	"Strong Zombie
 
-Weaponry:
-Melee
-Strength (1)"
\ No newline at end of file
+^2Weaponry:
+- Melee
+
+^8Attributes:
+- Strength (1)
+- Self Healing (1)
+- Sense (3)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/mfs_survivor11.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/mfs_survivor11.mbch
index 5aadead68..e99b4a53c 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/mfs_survivor11.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/mfs_survivor11.mbch
@@ -1,7 +1,7 @@
 ClassInfo
 {
 	name  "mfs_survivor11"
-	weapons WP_MELEE|WP_BLASTER_PISTOL|WP_T21
+	weapons WP_MELEE|WP_BLASTER_PISTOL|WP_T21|WP_SABER
 	attributes MB_ATT_PISTOL,1|MB_ATT_T21,2
 	maxhealth 50
 	maxarmor  50
@@ -10,6 +10,10 @@ ClassInfo
 	uishader  "gfx/mplevels/monster_forest/mf_urban"
 	MBClass MB_CLASS_ELITETROOPER
 	classflags  CFL_STRONGAGAINSTPHYSICAL|
+	saber1			saber_knife
+	saberstyle		SS_TAVION
+	BPmultiplier 0
+	forcepool 0
 }
 
 WeaponInfo0
@@ -81,24 +85,18 @@ WeaponInfo2
 
 WeaponInfo3
 {
-	WeaponToReplace		WP_BLASTER
-	WeaponBasedOff		WP_BLASTER
-  NewWorldModel		"models/weapons2/dummy/dummy.glm"
-  NewViewModel		"models/weapons2/dummy/dummy.md3"
-  Icon			"gfx/aliens3/null"
-	MuzzleEffect		"assault_rifle/muzzle_flash"
-	MissileEffect		"assault_rifle/shot"
-	MissileMissEffect "halo_smg/wall_impact"
-	altMuzzleEffect		"assault_rifle/muzzle_flash"
-	altMissileEffect		"assault_rifle/shot"
-	altMissileMissEffect "halo_smg/wall_impact"
-	idleAnim  BOTH_DC15_READY
-	firingAnim  BOTH_DC15_ATTACK
+	WeaponToReplace		WP_SABER					//Required: Weapon Slot of weapon you're replacing
+	WeaponBasedOff		WP_SABER					//Required: For future use, should be the same as WeaponToReplace
+	NewWorldModel		"models/weapons2/saber_knife/saber_w.glm"  	//Required: New 3rd person/dropped weapon model
+	NewViewModel		"models/weapons2/dummy/dummy.md3" 	  	//Required: New 1st person weapon model
+	NewHandsModel 		"models/weapons2/dummy/dummy.md3"
+	Icon			"gfx/hud/w_icon_knife" 	//Required: Weapon change icon
+	WeaponName		"^7Knife"    					//Required: Weapon change display name
 }
 
 description	"CT MP5
 
-Weapons:
-Knife
-USP
-MP5"
\ No newline at end of file
+^2Weaponry:
+- Knife
+- USP
+- MP5"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/mfs_survivor12.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/mfs_survivor12.mbch
index 041171b14..c042874a4 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/mfs_survivor12.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/mfs_survivor12.mbch
@@ -1,7 +1,7 @@
 ClassInfo
 {
 	name  "mfs_survivor12"
-	weapons WP_MELEE|WP_BLASTER_PISTOL|WP_BLASTER
+	weapons WP_MELEE|WP_BLASTER_PISTOL|WP_BLASTER|WP_SABER
 	attributes MB_ATT_PISTOL,1|MB_ATT_BLASTER,3
 	maxhealth 50
 	maxarmor  50
@@ -10,6 +10,10 @@ ClassInfo
 	uishader  "gfx/mplevels/monster_forest/mf_urban"
 	MBClass MB_CLASS_ELITETROOPER
 	classflags  CFL_STRONGAGAINSTPHYSICAL|
+	saber1			saber_knife
+	saberstyle		SS_TAVION
+	BPmultiplier 0
+	forcepool 0
 }
 
 WeaponInfo0
@@ -80,9 +84,20 @@ WeaponInfo2
 	firingAnim  BOTH_DC15_ATTACK
 }
 
+WeaponInfo3
+{
+	WeaponToReplace		WP_SABER					//Required: Weapon Slot of weapon you're replacing
+	WeaponBasedOff		WP_SABER					//Required: For future use, should be the same as WeaponToReplace
+	NewWorldModel		"models/weapons2/saber_knife/saber_w.glm"  	//Required: New 3rd person/dropped weapon model
+	NewViewModel		"models/weapons2/dummy/dummy.md3" 	  	//Required: New 1st person weapon model
+	NewHandsModel 		"models/weapons2/dummy/dummy.md3"
+	Icon			"gfx/hud/w_icon_knife" 	//Required: Weapon change icon
+	WeaponName		"^7Knife"    					//Required: Weapon change display name
+}
+
 description	"CT M4A1
 
-Weapons:
-Knife
-USP
-M4A1"
\ No newline at end of file
+^2Weaponry:
+- Knife
+- USP
+- M4A1"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/mfs_survivor13.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/mfs_survivor13.mbch
index a88e9d542..7eb16968d 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/mfs_survivor13.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/mfs_survivor13.mbch
@@ -1,7 +1,7 @@
 ClassInfo
 {
 	name  "mfs_survivor13"
-	weapons WP_MELEE|WP_BLASTER_PISTOL|WP_SHOTGUN
+	weapons WP_MELEE|WP_BLASTER_PISTOL|WP_SHOTGUN|WP_SABER
 	attributes MB_ATT_PISTOL,1|MB_ATT_SHOTGUN,2
 	maxhealth 50
 	maxarmor  50
@@ -10,6 +10,10 @@ ClassInfo
 	uishader  "gfx/mplevels/monster_forest/mf_urban"
 	MBClass MB_CLASS_ELITETROOPER
 	classflags  CFL_STRONGAGAINSTPHYSICAL
+	saber1			saber_knife
+	saberstyle		SS_TAVION
+	BPmultiplier 0
+	forcepool 0
 }
 
 WeaponInfo0
@@ -75,9 +79,20 @@ WeaponInfo2
 	firingAnim  BOTH_DC15_ATTACK
 }
 
+WeaponInfo3
+{
+	WeaponToReplace		WP_SABER					//Required: Weapon Slot of weapon you're replacing
+	WeaponBasedOff		WP_SABER					//Required: For future use, should be the same as WeaponToReplace
+	NewWorldModel		"models/weapons2/saber_knife/saber_w.glm"  	//Required: New 3rd person/dropped weapon model
+	NewViewModel		"models/weapons2/dummy/dummy.md3" 	  	//Required: New 1st person weapon model
+	NewHandsModel 		"models/weapons2/dummy/dummy.md3"
+	Icon			"gfx/hud/w_icon_knife" 	//Required: Weapon change icon
+	WeaponName		"^7Knife"    					//Required: Weapon change display name
+}
+
 description	"CT XM1014
 
-Weapons:
-Knife
-USP
-XM1014"
\ No newline at end of file
+^2Weaponry:
+- Knife
+- USP
+- XM1014"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/mfs_survivor21.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/mfs_survivor21.mbch
index 57ad9f96d..2189fa086 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/mfs_survivor21.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/mfs_survivor21.mbch
@@ -1,8 +1,8 @@
 ClassInfo
 {
 	name  "mfs_survivor21"
-	weapons WP_MELEE|WP_BLASTER_PISTOL|WP_SHOTGUN
-	attributes MB_ATT_PISTOL,3|MB_ATT_SHOTGUN,3|MB_ATT_DISP_AMMO,3
+	weapons WP_MELEE|WP_BLASTER_PISTOL|WP_SHOTGUN|WP_SABER
+	attributes MB_ATT_PISTOL,3|MB_ATT_SHOTGUN,3|MB_ATT_SUPPLYDROP
 	maxhealth 50
 	maxarmor  50
 	model "sas"
@@ -11,6 +11,10 @@ ClassInfo
 	MBClass MB_CLASS_ELITETROOPER
 	classflags  CFL_STRONGAGAINSTPHYSICAL
 	classNumberLimit	1
+	saber1			saber_knife
+	saberstyle		SS_TAVION
+	BPmultiplier 0
+	forcepool 0
 }
 
 WeaponInfo0
@@ -76,12 +80,23 @@ WeaponInfo2
 	firingAnim  BOTH_DC15_ATTACK
 }
 
+WeaponInfo3
+{
+	WeaponToReplace		WP_SABER					//Required: Weapon Slot of weapon you're replacing
+	WeaponBasedOff		WP_SABER					//Required: For future use, should be the same as WeaponToReplace
+	NewWorldModel		"models/weapons2/saber_knife/saber_w.glm"  	//Required: New 3rd person/dropped weapon model
+	NewViewModel		"models/weapons2/dummy/dummy.md3" 	  	//Required: New 1st person weapon model
+	NewHandsModel 		"models/weapons2/dummy/dummy.md3"
+	Icon			"gfx/hud/w_icon_knife" 	//Required: Weapon change icon
+	WeaponName		"^7Knife"    					//Required: Weapon change display name
+}
+
 description	"CT M3 Super 90
 
-Weapons:
-Knife
-Deagle
-M3 Super 90
+^2Weaponry:
+- Knife
+- Deagle
+- M3 Super 90
 
-Attributes:
-Ammobag"
\ No newline at end of file
+^8Attributes:
+- Ammobag ^3[USE]"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/mfs_survivor22.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/mfs_survivor22.mbch
index ecb5b6af1..e2c6730db 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/mfs_survivor22.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/mfs_survivor22.mbch
@@ -1,8 +1,8 @@
 ClassInfo
 {
 	name  "mfs_survivor22"
-	weapons WP_MELEE|WP_BLASTER_PISTOL|WP_T21
-	attributes MB_ATT_PISTOL,1|MB_ATT_T21,3|MB_ATT_DISP_AMMO,3
+	weapons WP_MELEE|WP_BLASTER_PISTOL|WP_T21|WP_SABER
+	attributes MB_ATT_PISTOL,1|MB_ATT_T21,3|MB_ATT_SUPPLYDROP
 	maxhealth 50
 	maxarmor  50
 	model "sas"
@@ -11,6 +11,10 @@ ClassInfo
 	MBClass MB_CLASS_ELITETROOPER
 	classflags  CFL_STRONGAGAINSTPHYSICAL|
 	classNumberLimit	1
+	saber1			saber_knife
+	saberstyle		SS_TAVION
+	BPmultiplier 0
+	forcepool 0
 }
 
 WeaponInfo0
@@ -82,25 +86,21 @@ WeaponInfo2
 
 WeaponInfo3
 {
-	WeaponToReplace		WP_BLASTER
-	WeaponBasedOff		WP_BLASTER
-  NewWorldModel		"models/weapons2/dummy/dummy.glm"
-  NewViewModel		"models/weapons2/dummy/dummy.md3"
-  Icon			"gfx/aliens3/null"
-	MuzzleEffect		"battle_rifle/Muzzle_Flash"
-	AltMuzzleEffect		"battle_rifle/Muzzle_Flash"
-	MissileEffect		"battle_rifle/shot"
-	AltMissileEffect	"battle_rifle/shot"
-	MissileMissEffect "halo_smg/wall_impact"
-	altMissileMissEffect "halo_smg/wall_impact"
+	WeaponToReplace		WP_SABER					//Required: Weapon Slot of weapon you're replacing
+	WeaponBasedOff		WP_SABER					//Required: For future use, should be the same as WeaponToReplace
+	NewWorldModel		"models/weapons2/saber_knife/saber_w.glm"  	//Required: New 3rd person/dropped weapon model
+	NewViewModel		"models/weapons2/dummy/dummy.md3" 	  	//Required: New 1st person weapon model
+	NewHandsModel 		"models/weapons2/dummy/dummy.md3"
+	Icon			"gfx/hud/w_icon_knife" 	//Required: Weapon change icon
+	WeaponName		"^7Knife"    					//Required: Weapon change display name
 }
 
 description	"CT AUG
 
-Weapons:
-Knife
-FiveSeven
-AUG
+^2Weaponry:^7
+- Knife
+- FiveSeven
+- AUG
 
-Attributes:
-Ammobag"
\ No newline at end of file
+^8Attributes:^7
+- Ammobag ^3[USE]"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/mfs_survivor23.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/mfs_survivor23.mbch
index 1a281c1e9..39c59634a 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/mfs_survivor23.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/mfs_survivor23.mbch
@@ -1,16 +1,20 @@
 ClassInfo
 {
 	name  		"mfs_survivor23"
-	weapons 		WP_MELEE|WP_BRYAR_OLD|WP_A280
-	attributes 		MB_ATT_PISTOL,3|MB_ATT_A280,3|MB_ATT_DISP_AMMO,3
+	weapons 		WP_MELEE|WP_BRYAR_OLD|WP_A280|WP_SABER
+	attributes 		MB_ATT_PISTOL,3|MB_ATT_A280,3|MB_ATT_SUPPLYDROP
 	maxhealth 		50
-	maxarmor  			50
+	maxarmor  		50
 	model 			"sas"
 	skin  			"css_urban"
 	uishader  		"gfx/mplevels/monster_forest/mf_urban_blue"
 	MBClass 		MB_CLASS_ELITETROOPER
 	classflags  		CFL_STRONGAGAINSTPHYSICAL
 	classNumberLimit	1
+	saber1			saber_knife
+	saberstyle		SS_TAVION
+	BPmultiplier 0
+	forcepool 0
 }
 
 WeaponInfo0
@@ -85,6 +89,17 @@ WeaponInfo2
 	firingAnim  BOTH_DC15_ATTACK
 }
 
+WeaponInfo3
+{
+	WeaponToReplace		WP_SABER					//Required: Weapon Slot of weapon you're replacing
+	WeaponBasedOff		WP_SABER					//Required: For future use, should be the same as WeaponToReplace
+	NewWorldModel		"models/weapons2/saber_knife/saber_w.glm"  	//Required: New 3rd person/dropped weapon model
+	NewViewModel		"models/weapons2/dummy/dummy.md3" 	  	//Required: New 1st person weapon model
+	NewHandsModel 		"models/weapons2/dummy/dummy.md3"
+	Icon			"gfx/hud/w_icon_knife" 	//Required: Weapon change icon
+	WeaponName		"^7Knife"    					//Required: Weapon change display name
+}
+
 WeaponInfo3
 {
 	WeaponToReplace		WP_BLASTER
@@ -102,10 +117,10 @@ WeaponInfo3
 
 description	"T SG552
 
-Weapons:
-Knife
-Elites
-SG552
+^2Weaponry:
+- Knife
+- Elites
+- SG552
 
-Attributes:
-Ammobag"
\ No newline at end of file
+^8Attributes:
+- Ammobag ^3[USE]"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/mfs_survivor31.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/mfs_survivor31.mbch
index 9e3aa980c..5e9d823d0 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/mfs_survivor31.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/mfs_survivor31.mbch
@@ -1,7 +1,7 @@
 ClassInfo
 {
 	name  "mfs_survivor31"
-	weapons WP_MELEE|WP_BLASTER_PISTOL|WP_CLONE_RIFLE
+	weapons WP_MELEE|WP_BLASTER_PISTOL|WP_CLONE_RIFLE|WP_SABER
 	attributes MB_ATT_PISTOL,1|MB_ATT_CLONERIFLE,3|MB_ATT_DISP_HEALTH,3
 	maxhealth 50
 	maxarmor  50
@@ -11,6 +11,10 @@ ClassInfo
 	MBClass MB_CLASS_ELITETROOPER
 	classflags  CFL_STRONGAGAINSTPHYSICAL|
 	classNumberLimit	1
+	saber1			saber_knife
+	saberstyle		SS_TAVION
+	BPmultiplier 0
+	forcepool 0
 }
 
 WeaponInfo0
@@ -76,12 +80,23 @@ WeaponInfo2
 	firingAnim  BOTH_DC15_ATTACK
 }
 
+WeaponInfo3
+{
+	WeaponToReplace		WP_SABER					//Required: Weapon Slot of weapon you're replacing
+	WeaponBasedOff		WP_SABER					//Required: For future use, should be the same as WeaponToReplace
+	NewWorldModel		"models/weapons2/saber_knife/saber_w.glm"  	//Required: New 3rd person/dropped weapon model
+	NewViewModel		"models/weapons2/dummy/dummy.md3" 	  	//Required: New 1st person weapon model
+	NewHandsModel 		"models/weapons2/dummy/dummy.md3"
+	Icon			"gfx/hud/w_icon_knife" 	//Required: Weapon change icon
+	WeaponName		"^7Knife"    					//Required: Weapon change display name
+}
+
 description	"CT M249
 
-Weapons:
-Knife
-P228
-M249
+^2Weaponry:
+- Knife
+- P228
+- M249
 
-Attributes:
-Medic"
\ No newline at end of file
+^8Attributes:
+- Medic ^3[USE on teammate]"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/samt_bomonk.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/samt_bomonk.mbch
index 8c000e65b..70a3253ce 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/samt_bomonk.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/samt_bomonk.mbch
@@ -6,7 +6,7 @@ ClassInfo
 	weapons		WP_MELEE|WP_SABER
   saber1  SHOGUN_BO
   saberstyle  SS_STAFF|SS_DESANN
-  forcepowers FP_LEVITATION,1|FP_SABER_OFFENSE,2
+  forcepowers FP_LEVITATION,1|FP_SABER_OFFENSE,3
   attributes	MB_ATT_FP_SABER_DEFENSE,2
   forcepool 35
 	maxhealth		100
@@ -42,12 +42,11 @@ WeaponInfo1
 
 description	"Bo Warrior Monk
 
-Weapon:
-Melee
-Bo
+^2Weaponry:
+- Melee
+- Bo
 
-Attributes:
-Staff / Purple Styles
-Acrobatics (1)
-Offense (2)
-Defense (2)"
\ No newline at end of file
+^8Attributes:
+- Staff / Purple Styles
+- Force Jump (1)
+- Saber Defense (2)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/samt_bow.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/samt_bow.mbch
index 48b88ccda..4a89ec038 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/samt_bow.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/samt_bow.mbch
@@ -7,7 +7,7 @@ ClassInfo
 	attributes		MB_ATT_FP_SABER_DEFENSE,2|MB_ATT_GUN_DEFENSE,2|MB_ATT_T21,1
   saber1  SHOGUN_WAKIZASHI
   saberstyle  SS_TAVION
-  forcepowers FP_LEVITATION,1|FP_SABER_OFFENSE,2|FP_SABER_DEFENSE,2
+  forcepowers FP_LEVITATION,1|FP_SABER_OFFENSE,3|FP_SABER_DEFENSE,2
   forcepool 35
 	maxhealth		80
 	maxarmor		50
@@ -65,40 +65,15 @@ WeaponInfo2
   firingAnim  BOTH_PLX1_ATTACK
 }
 
-WeaponInfo3
-{
-	WeaponToReplace WP_BLASTER
-	WeaponBasedOff  WP_BOWCASTER
-	NewWorldModel "models/weapons2/bow/bowcaster_w.glm"
-	NewViewModel  "models/weapons2/bow/bowcaster.md3"
-  Icon			"gfx/mplevels/samurai/bow"
-	WeaponName  "^7Bow"
-	MuzzleEffect  "halo_smg/rings"
-	AltMuzzleEffect "halo_smg/rings"
-	MissileModel  "models/weapons2/dc_gabow/greenarrow_arrow.md3"
-	MissileEffect "halo_smg/rings"
-	MissileMissEffect "dc/explosion"
-	AltMissileModel  "models/weapons2/dc_gabow/greenarrow_arrow.md3"
-	AltMissileEffect "halo_smg/rings"
-	AltMissileMissEffect "dc/explosion"
-	FlashSound0 "sound/300/wpn_bow_fire_01.wav"
-	FlashSound1 "sound/300/wpn_bow_fire_02.wav"
-	FlashSound2 "sound/300/wpn_bow_fire_03.wav"
-	customAmmo		10
-	altFireEnabled 		0
-	idleAnim BOTH_MAND_PISTOL_READY 
-  firingAnim  BOTH_PLX1_ATTACK
-}
-
 description	"Bow Samurai
 
-Weapon:
-Melee
-Katana
-Bow
+^2Weaponry:
+- Melee
+- Katana
+- Bow
 
-Attributes:
-Cyan Style Only
-Acrobaics (1)
-Offence (2)
-Defence (2)"
\ No newline at end of file
+^8Attributes:
+- Cyan Style Only
+- Force Jump (1)
+- Saber Defense (2)
+- Blaster Defense (2)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/samt_hayabusa.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/samt_hayabusa.mbch
index 8930bbdb4..39cc156fd 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/samt_hayabusa.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/samt_hayabusa.mbch
@@ -81,42 +81,17 @@ WeaponInfo3
   firingAnim  BOTH_PLX1_ATTACK
 }
 
-WeaponInfo4
-{
-	WeaponToReplace WP_BLASTER
-	WeaponBasedOff  WP_BOWCASTER
-	NewWorldModel "models/weapons2/bow/bowcaster_w.glm"
-	NewViewModel  "models/weapons2/bow/bowcaster.md3"
-  Icon			"gfx/mplevels/samurai/bow"
-	WeaponName  "^7Bow"
-	MuzzleEffect  "halo_smg/rings"
-	AltMuzzleEffect "halo_smg/rings"
-	MissileModel  "models/weapons2/dc_gabow/greenarrow_arrow.md3"
-	MissileEffect "halo_smg/rings"
-	MissileMissEffect "dc/explosion"
-	AltMissileModel  "models/weapons2/dc_gabow/greenarrow_arrow.md3"
-	AltMissileEffect "halo_smg/rings"
-	AltMissileMissEffect "dc/explosion"
-	FlashSound0 "sound/300/wpn_bow_fire_01.wav"
-	FlashSound1 "sound/300/wpn_bow_fire_02.wav"
-	FlashSound2 "sound/300/wpn_bow_fire_03.wav"
-	customAmmo		10
-	altFireEnabled 		0
-	idleAnim BOTH_MAND_PISTOL_READY 
-  firingAnim  BOTH_PLX1_ATTACK
-}
-
 description	"Hayabusa
 
-Weapon:
-Melee
-Katana
-1 Smoke Bomb
-Bow
+^2Weaponry:
+- Melee
+- Katana
+- 1 Smoke Bomb
+- Bow
 
-Attributes:
-Yellow / Cyan / Blue Styles
-Acrobatics (1)
-Offence (3)
-Defence (3)
-Deflect (2)"
\ No newline at end of file
+^8Attributes:
+- Yellow / Cyan / Blue Styles
+- Force Jump (1)
+- Saber Defense (3)
+- Blaster Defense (2)
+- Blaster Deflect (2)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/samt_ibuki.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/samt_ibuki.mbch
index 5e537354a..622d949c6 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/samt_ibuki.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/samt_ibuki.mbch
@@ -19,6 +19,8 @@ ClassInfo
 	classNumberLimit  1
   APmultiplier  1.2
   BPmultiplier  1.1
+  meleespecial1 EAS_HI_POISON
+  special1HUD HUD_POISONDART
 }
 
 WeaponInfo0
@@ -58,15 +60,15 @@ WeaponInfo2
 
 description	"Ibuki
 
-Weapon:
-Melee
-Katana
-1 Smoke Bomb
-3 Poison Darts
+^2Weaponry:
+- Melee
+- Katana
+- 1 Smoke Bomb
 
-Attributes:
-Yellow / Cyan / Blue Styles
-Acrobatics (1)
-Offence (3)
-Defence (3)
-Deflect (2)"
\ No newline at end of file
+^8Attributes:
+- Yellow / Cyan / Blue Styles
+- Force Jump (1)
+- Saber Defense (3)
+- Blaster Defense (2)
+- Blaster Deflect (2)
+- Poison Darts (3) ^3[CS1 M]"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/samt_katana.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/samt_katana.mbch
index a7b71bf65..baa059f66 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/samt_katana.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/samt_katana.mbch
@@ -6,7 +6,7 @@ ClassInfo
 	weapons		WP_MELEE|WP_SABER
   saber1  SHOGUN_SHINOBIGATANA
   saberstyle  SS_MEDIUM
-  forcepowers FP_LEVITATION,1|FP_SABER_OFFENSE,2|FP_SABER_DEFENSE,3
+  forcepowers FP_LEVITATION,1|FP_SABER_OFFENSE,3|FP_SABER_DEFENSE,3
   attributes	MB_ATT_FP_SABER_DEFENSE,3
   forcepool 35
 	maxhealth		80
@@ -39,12 +39,11 @@ WeaponInfo1
 
 description	"Katana Samurai
 
-Weapon:
-Melee
-Katana
+^2Weaponry:
+- Melee
+- Katana
 
-Attributes::
-Yellow Style Only
-Acrobatics (1)
-Offence (2)
-Defence (3)"
\ No newline at end of file
+^8Attributes:
+- Yellow Style Only
+- Force Jump (1)
+- Saber Defense (3)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/samt_meleemonk.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/samt_meleemonk.mbch
index 7f2df46c8..0bf42b8f1 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/samt_meleemonk.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/samt_meleemonk.mbch
@@ -15,8 +15,6 @@ ClassInfo
 	classflags  CFL_HEAVYMELEE
 	classNumberLimit  2
 	speed 1.1
-  APmultiplier  1.2
-  BPmultiplier  0.5
 }
 
 WeaponInfo0
@@ -31,8 +29,8 @@ WeaponInfo0
 
 description	"Melee Warrior Monk
 
-Weapon:
-Heavy Melee
+^2Weaponry:
+- Heavy Melee
 
-Attributes:
-Acrobatics (1)"
\ No newline at end of file
+^8Attributes:
+- Force Jump (1)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/samt_mitsurugi.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/samt_mitsurugi.mbch
index f18d64da9..8f94d537a 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/samt_mitsurugi.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/samt_mitsurugi.mbch
@@ -45,13 +45,13 @@ WeaponInfo1
 
 description	"Mitsurugi
 
-Weapon:
-Heavy Melee
-Katana
+^2Weaponry:
+- Heavy Melee
+- Katana
 
-Attributes:
-All Single Styles
-Acrobatics (1)
-Offence (3)
-Defence (3)
-Deflect (2)"
\ No newline at end of file
+^8Attributes:
+- All Single Styles
+- Force Jump (1)
+- Saber Defense (3)
+- Blaster Defense (2)
+- Blaster Deflect (2)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/samt_naginta.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/samt_naginta.mbch
index 0d322918e..6869a8786 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/samt_naginta.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/samt_naginta.mbch
@@ -43,13 +43,13 @@ WeaponInfo1
 
 description	"Naginta Samurai
 
-Weapon:
-Melee
-Katana
+^2Weaponry:
+- Melee
+- Katana
 
-Attributes:
-Yellow / Red Styles
-Acrobatics (1)
-Offence (3)
-Defence (3)
-Deflect (1)"
\ No newline at end of file
+^8Attributes:
+- Yellow / Red Styles
+- Force Jump (1)
+- Saber Defense (3)
+- Blaster Defense (2)
+- Blaster Deflect (1)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/samt_ninja.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/samt_ninja.mbch
index 27bff5ef5..30d11a67c 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/samt_ninja.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/samt_ninja.mbch
@@ -7,7 +7,7 @@ ClassInfo
 	attributes		MB_ATT_FP_SABER_DEFENSE,2|MB_ATT_GUN_DEFENSE,2|MB_ATT_FRAGS,1|MB_ATT_POISON_DART,2
   saber1  SHOGUN_SHIRASAYA
   saberstyle  SS_MEDIUM|SS_TAVION|SS_FAST
-  forcepowers FP_LEVITATION,1|FP_SABER_OFFENSE,2|FP_SABER_DEFENSE,2
+  forcepowers FP_LEVITATION,1|FP_SABER_OFFENSE,3|FP_SABER_DEFENSE,2
   forcepool 35
 	maxhealth		100
 	maxarmor		40
@@ -19,6 +19,8 @@ ClassInfo
 	classNumberLimit  2
   APmultiplier  1.05
   BPmultiplier  0.95
+  meleespecial1 EAS_HI_POISON
+  special1HUD HUD_POISONDART
 }
 
 WeaponInfo0
@@ -58,14 +60,14 @@ WeaponInfo2
 
 description	"Ninja
 
-Weapon:
-Melee
-Katana
-1 Smoke Bomb
-2 Poison Darts
+^2Weaponry:
+- Melee
+- Katana
+- 1 Smoke Bomb
 
-Attributes:
-Yellow / Cyan / Blue Styles
-Acrobatics (1)
-Offence (2)
-Defence (2)"
\ No newline at end of file
+^8Attributes:
+- Yellow / Cyan / Blue Styles
+- Force Jump (1)
+- Saber Defense (2)
+- Blaster Defense (2)
+- Poison Darts (2) ^3[CS1 M]"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/samt_nodachi.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/samt_nodachi.mbch
index 4d31f8c0d..912a04f12 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/samt_nodachi.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/samt_nodachi.mbch
@@ -43,12 +43,11 @@ WeaponInfo1
 
 description	"No-Dachi Samurai
 
-Weapon:
-Melee
-Katana
+^2Weaponry:
+- Melee
+- Katana
 
-Attributes:
-All Single Styles
-Acrobatics (1)
-Offence (3)
-Defence (1)"
\ No newline at end of file
+^8Attributes:
+- All Single Styles
+- Force Jump (1)
+- Saber Defense (1)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/samu_bomonk.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/samu_bomonk.mbch
index d9249fb1b..7e0b7ad06 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/samu_bomonk.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/samu_bomonk.mbch
@@ -6,7 +6,7 @@ ClassInfo
 	weapons		WP_MELEE|WP_SABER
   saber1  SHOGUN_BO
   saberstyle  SS_STAFF|SS_DESANN
-  forcepowers FP_LEVITATION,1|FP_SABER_OFFENSE,2
+  forcepowers FP_LEVITATION,1|FP_SABER_OFFENSE,3
     attributes	MB_ATT_FP_SABER_DEFENSE,2
   forcepool 35
 	maxhealth		100
@@ -42,12 +42,11 @@ WeaponInfo1
 
 description	"Bo Warrior Monk
 
-Weapon:
-Melee
-Bo
+^2Weaponry:
+- Melee
+- Bo
 
-Attributes:
-Staff / Purple Styles
-Acrobatics (1)
-Offence (2)
-Defence (2)"
\ No newline at end of file
+^8Attributes:
+- Staff / Purple Styles
+- Force Jump (1)
+- Saber Defense (2)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/samu_bow.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/samu_bow.mbch
index 3cd9cccb5..cfc672206 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/samu_bow.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/samu_bow.mbch
@@ -7,7 +7,7 @@ ClassInfo
 	attributes		MB_ATT_FP_SABER_DEFENSE,2|MB_ATT_GUN_DEFENSE,2|MB_ATT_T21,1
   saber1  SHOGUN_WAKIZASHI
   saberstyle  SS_TAVION
-  forcepowers FP_LEVITATION,1|FP_SABER_OFFENSE,2|FP_SABER_DEFENSE,2
+  forcepowers FP_LEVITATION,1|FP_SABER_OFFENSE,3|FP_SABER_DEFENSE,2
   forcepool 35
 	maxhealth		80
 	maxarmor		50
@@ -65,40 +65,15 @@ WeaponInfo2
   firingAnim  BOTH_PLX1_ATTACK
 }
 
-WeaponInfo3
-{
-	WeaponToReplace WP_BLASTER
-	WeaponBasedOff  WP_BOWCASTER
-	NewWorldModel "models/weapons2/bow/bowcaster_w.glm"
-	NewViewModel  "models/weapons2/bow/bowcaster.md3"
-  Icon			"gfx/mplevels/samurai/bow"
-	WeaponName  "^7Bow"
-	MuzzleEffect  "halo_smg/rings"
-	AltMuzzleEffect "halo_smg/rings"
-	MissileModel  "models/weapons2/dc_gabow/greenarrow_arrow.md3"
-	MissileEffect "halo_smg/rings"
-	MissileMissEffect "dc/explosion"
-	AltMissileModel  "models/weapons2/dc_gabow/greenarrow_arrow.md3"
-	AltMissileEffect "halo_smg/rings"
-	AltMissileMissEffect "dc/explosion"
-	FlashSound0 "sound/300/wpn_bow_fire_01.wav"
-	FlashSound1 "sound/300/wpn_bow_fire_02.wav"
-	FlashSound2 "sound/300/wpn_bow_fire_03.wav"
-	customAmmo		10
-	altFireEnabled 		0
-	idleAnim BOTH_MAND_PISTOL_READY 
-  firingAnim  BOTH_PLX1_ATTACK
-}
-
 description	"Bow Samurai
 
-Weapon:
-Melee
-Katana
-Bow
+^2Weaponry:
+- Melee
+- Katana
+- Bow
 
-Attributes:
-Cyan Style Only
-Acrobatics (1)
-Offence (2)
-Defence (2)"
\ No newline at end of file
+^8Attributes:
+- Cyan Style Only
+- Force Jump (1)
+- Saber Defense (2)
+- Blaster Defense (2)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/samu_katana.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/samu_katana.mbch
index 60d8f0d08..1f101b794 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/samu_katana.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/samu_katana.mbch
@@ -6,7 +6,7 @@ ClassInfo
 	weapons		WP_MELEE|WP_SABER
   saber1  SHOGUN_SHINOBIGATANA
   saberstyle  SS_MEDIUM
-  forcepowers FP_LEVITATION,1|FP_SABER_OFFENSE,2|FP_SABER_DEFENSE,3
+  forcepowers FP_LEVITATION,1|FP_SABER_OFFENSE,3|FP_SABER_DEFENSE,3
   attributes	MB_ATT_FP_SABER_DEFENSE,3
   forcepool 35
 	maxhealth		80
@@ -39,12 +39,11 @@ WeaponInfo1
 
 description	"Katana Samurai
 
-Weapon:
-Melee
-Katana
+^2Weaponry:
+- Melee
+- Katana
 
-Attributes
-Yellow Style Only
-Acrobatics (1)
-Offence (2)
-Defence (3)"
\ No newline at end of file
+^8Attributes:
+- Yellow Style Only
+- Force Jump (1)
+- Saber Defense (3)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/samu_mastermonk.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/samu_mastermonk.mbch
index 7a803e600..26656fd6a 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/samu_mastermonk.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/samu_mastermonk.mbch
@@ -43,11 +43,11 @@ WeaponInfo1
 
 description	"Master Warrior Monk
 
-Weapon:
-Melee
-Advanced Martial Arts
+^2Weaponry:
+- Melee
+- Advanced Martial Arts
 
-Attributes:
-Dual Style Only (Martial Arts)
-Acrobatics (1)
-Heavy Melee"
\ No newline at end of file
+^8Attributes:
+- Dual Style Only (Martial Arts)
+- Force Jump (1)
+- Heavy Melee"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/samu_meleemonk.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/samu_meleemonk.mbch
index 63ef6128a..c9135c019 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/samu_meleemonk.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/samu_meleemonk.mbch
@@ -31,9 +31,9 @@ WeaponInfo0
 
 description	"Melee Warrior Monk
 
-Weapon:
-Melee
+^2Weaponry:
+- Melee
 
-Attributes:
-Acrobatics (1)
-Heavy Melee"
\ No newline at end of file
+^8Attributes:
+- Force Jump (1)
+- Heavy Melee"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/samu_naginta.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/samu_naginta.mbch
index 7c1974fbd..7de160add 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/samu_naginta.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/samu_naginta.mbch
@@ -43,13 +43,13 @@ WeaponInfo1
 
 description	"Naginta Samurai
 
-Weapon:
-Melee
-Katana
+^2Weaponry:
+- Melee
+- Katana
 
-Attributes:
-Yellow / Red Styles
-Acrobatics (1)
-Offence (3)
-Defence (3)
-Deflect (1)"
\ No newline at end of file
+^8Attributes:
+- Yellow / Red Styles
+- Force Jump (1)
+- Saber Defense (3)
+- Blaster Defense (2)
+- Blaster Deflect (1)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/samu_ninja.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/samu_ninja.mbch
index 262dcf12e..5585da6b4 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/samu_ninja.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/samu_ninja.mbch
@@ -7,7 +7,7 @@ ClassInfo
 	attributes		MB_ATT_FP_SABER_DEFENSE,2|MB_ATT_GUN_DEFENSE,2|MB_ATT_FRAGS,1|MB_ATT_POISON_DART,2
   saber1  SHOGUN_SHIRASAYA
   saberstyle  SS_MEDIUM|SS_TAVION|SS_FAST
-  forcepowers FP_LEVITATION,1|FP_SABER_OFFENSE,2|FP_SABER_DEFENSE,2
+  forcepowers FP_LEVITATION,1|FP_SABER_OFFENSE,3|FP_SABER_DEFENSE,2
   forcepool 35
 	maxhealth		100
 	maxarmor		40
@@ -19,6 +19,8 @@ ClassInfo
 	classNumberLimit  2
   APmultiplier  1.05
   BPmultiplier  0.95
+  meleespecial1 EAS_HI_POISON
+  special1HUD HUD_POISONDART
 }
 
 WeaponInfo0
@@ -58,14 +60,14 @@ WeaponInfo2
 
 description	"Ninja
 
-Weapon:
-Melee
-Katana
-1 Smoke Bomb
-2 Poison Darts
+^2Weaponry:
+- Melee
+- Katana
+- 1 Smoke Bomb
 
-Attributes:
-Yellow / Cyan / Blue Styles
-Acrobatics (1)
-Offence (2)
-Defence (2)"
\ No newline at end of file
+^8Attributes:
+- Yellow / Cyan / Blue Styles
+- Force Jump (1)
+- Saber Defense (2)
+- Blaster Defense (2)
+- Poison Darts (2) ^3[CS1 M]"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/samu_nodachi.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/samu_nodachi.mbch
index 1d5d9230f..52ba73aa5 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/samu_nodachi.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/samu_nodachi.mbch
@@ -43,12 +43,11 @@ WeaponInfo1
 
 description	"No-Dachi Samurai
 
-Weapon:
-Melee
-Katana
+^2Weaponry:
+- Melee
+- Katana
 
-Attributes:
-All Single Styles
-Acrobatics (1)
-Offense (3)
-Defense (1)"
\ No newline at end of file
+^8Attributes:
+- All Single Styles
+- Force Jump (1)
+- Saber Defense (1)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/samu_samanosuke.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/samu_samanosuke.mbch
index c109d3a6d..c241278b5 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/samu_samanosuke.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/samu_samanosuke.mbch
@@ -42,13 +42,13 @@ WeaponInfo1
 
 description	"Samanosuke
 
-Weapon:
-Melee
-Katana
+^2Weaponry:
+- Melee
+- Katana
 
-Attributes:
-All Single Styles
-Acrobatics (1)
-Offence (3)
-Defence (3)
-Deflect (2)"
\ No newline at end of file
+^8Attributes:
+- All Single Styles
+- Force Jump (1)
+- Saber Defense (3)
+- Blaster Defense (2)
+- Blaster Deflect (2)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/samu_shinobi.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/samu_shinobi.mbch
index 1cd18c9ba..ae59b1f3e 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/samu_shinobi.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/samu_shinobi.mbch
@@ -19,6 +19,8 @@ ClassInfo
 	classNumberLimit  1
 	APmultiplier  1.2
 	BPmultiplier  1.1
+	meleespecial1 EAS_HI_POISON
+	special1HUD HUD_POISONDART
 }
 
 WeaponInfo0
@@ -58,15 +60,15 @@ WeaponInfo2
 
 description	"Shinobi
 
-Weapon:
-Melee
-Katana
-2 Smoke Bombs
-3 Poison Dart
+^2Weaponry:
+- Melee
+- Katana
+- 2 Smoke Bombs
 
-Attributes:
-Yellow / Blue / Cyan Styles
-Acrobatics (1)
-Offence (3)
-Defence (3)
-Deflect (2)"
\ No newline at end of file
+^8Attributes:
+- Yellow / Blue / Cyan Styles
+- Force Jump (1)
+- Saber Defense (3)
+- Blaster Defense (2)
+- Blaster Deflect (2)
+- Poison Darts (3) ^3[CS1 M]"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/sles_1.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/sles_1.mbch
index b2fbee2d6..f80305525 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/sles_1.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/sles_1.mbch
@@ -39,4 +39,7 @@ WeaponInfo1
 	altFireEnabled 		0
 }
 
-description	"Survivor"
\ No newline at end of file
+description	"Survivor
+
+^8Attributes:
+- Stamina (2) ^3[CS1]"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/sles_11.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/sles_11.mbch
index 2e1a0b383..f3e2f997c 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/sles_11.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/sles_11.mbch
@@ -39,4 +39,7 @@ WeaponInfo1
 	altFireEnabled 		0
 }
 
-description	"Survivor"
\ No newline at end of file
+description	"Survivor
+
+^8Attributes:
+- Stamina (2) ^3[CS1]"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/sles_2.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/sles_2.mbch
index c64379019..163ff1635 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/sles_2.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/sles_2.mbch
@@ -39,4 +39,7 @@ WeaponInfo1
 	altFireEnabled 		0
 }
 
-description	"Survivor"
\ No newline at end of file
+description	"Survivor
+
+^8Attributes:
+- Stamina (2) ^3[CS1]"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/sles_21.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/sles_21.mbch
index 09d3ee6dc..1e686c65c 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/sles_21.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/sles_21.mbch
@@ -15,6 +15,7 @@ ClassInfo
 	speed 			1.1
 	saber1			flashlight
 	sabercolor		0.1
+	BPmultiplier 0
 }
 
 WeaponInfo0
@@ -43,5 +44,8 @@ WeaponInfo1
 
 description	"Survivor
 
-Tools:
-Flashlight"
\ No newline at end of file
+^2Tools:
+- Flashlight
+
+^8Attributes:
+- Stamina (2) ^3[CS1]"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/sles_3.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/sles_3.mbch
index e5922fa8d..88530d96d 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/sles_3.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/sles_3.mbch
@@ -15,6 +15,7 @@ ClassInfo
 	speed 			1.1
 	saber1			flashlight
 	sabercolor		0.1
+	BPmultiplier 0
 }
 
 WeaponInfo0
@@ -43,5 +44,8 @@ WeaponInfo1
 
 description	"Survivor
 
-Tools:
-Flashlight"
\ No newline at end of file
+^2Tools:
+- Flashlight
+
+^8Attributes:
+- Stamina (2) ^3[CS1]"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/sles_4.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/sles_4.mbch
index 9160f3145..8e1cd5906 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/sles_4.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/sles_4.mbch
@@ -39,4 +39,7 @@ WeaponInfo1
 	altFireEnabled 		0
 }
 
-description	"Survivor"
\ No newline at end of file
+description	"Survivor
+
+^8Attributes:
+- Stamina (2) ^3[CS1]""
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/sles_5.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/sles_5.mbch
index e5221db3c..b2baf239c 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/sles_5.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/sles_5.mbch
@@ -15,6 +15,7 @@ ClassInfo
 	speed 			1.1
 	saber1			flashlight
 	sabercolor		0.1
+	BPmultiplier 0
 }
 
 WeaponInfo0
@@ -43,5 +44,8 @@ WeaponInfo1
 
 description	"Survivor
 
-Tools:
-Flashlight"
\ No newline at end of file
+^2Tools:
+- Flashlight
+
+^8Attributes:
+- Stamina (2) ^3[CS1]"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/slesm_slenderman.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/slesm_slenderman.mbch
index b8583394b..04d185a53 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/slesm_slenderman.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/slesm_slenderman.mbch
@@ -4,7 +4,7 @@ ClassInfo
 {
 	name			"slem_slenderman"
 	weapons		WP_MELEE
-	attribute	MB_ATT_FP_MIRALUKA
+	attributes	MB_ATT_FP_MIRALUKA
 	forcepowers FP_TELEPATHY,3|FP_SEE,3
 	forcepool 100
 	forceregen	1
@@ -32,17 +32,6 @@ WeaponInfo0
 	altFireEnabled 		0
 }
 
-WeaponInfo1
-{
-	WeaponToReplace		WP_SABER
-	WeaponBasedOff		WP_SABER  
-  NewWorldModel		"models/weapons2/dummy/dummy.glm"
-  NewViewModel		"models/weapons2/dummy/dummy.md3"
-  Icon			"gfx/mplevels/revil/null"
-	WeaponName		""
-	primFireEnabled 		0
-	altFireEnabled 		0
-}
 
 ForceInfo0
 {
@@ -51,4 +40,12 @@ ForceInfo0
 	ForcePowerName	"Mind Trick"
 }
 
-description	"Slender Man"
\ No newline at end of file
+description	"Slender Man
+
+^2Weaponry:
+- Melee
+
+^8Attributes:
+- Sense (3)
+-- Miraluka
+- Mindtrick (3)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/tmnt_Leo.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/tmnt_Leo.mbch
index 659e17c0b..b515c7945 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/tmnt_Leo.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/tmnt_Leo.mbch
@@ -31,5 +31,9 @@ WeaponInfo0
 
 description	"Leo
 
-Weaponry:
-Katana x2"
\ No newline at end of file
+^2Weaponry:
+- Katana x2
+
+^8Attributes:
+- Saber Defense (3)
+- Force Jump (1)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/tmnt_don.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/tmnt_don.mbch
index be3442e93..04d724463 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/tmnt_don.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/tmnt_don.mbch
@@ -30,5 +30,9 @@ WeaponInfo0
 
 description	"Donatello
 
-Weaponry:
-Wooden Pole"
\ No newline at end of file
+^2Weaponry:
+- Wooden Pole
+
+^8Attributes:
+- Saber Defense (3)
+- Force Jump (1)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/tmnt_mike.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/tmnt_mike.mbch
index 60590268b..41d6c09ce 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/tmnt_mike.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/tmnt_mike.mbch
@@ -30,5 +30,9 @@ WeaponInfo0
 
 description	"Mike
 
-Weaponry:
-Nunchuck"
\ No newline at end of file
+^2Weaponry:
+- Nunchuck
+
+^8Attributes:
+- Saber Defense (3)
+- Force Jump (1)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/tmnt_raph.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/tmnt_raph.mbch
index 2d94f16a5..264ae1d19 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/tmnt_raph.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/tmnt_raph.mbch
@@ -31,5 +31,9 @@ WeaponInfo0
 
 description	"Raphael
 
-Weaponry:
-Sai x2"
\ No newline at end of file
+^2Weaponry:
+- Sai x2
+
+^8Attributes:
+- Saber Defense (3)
+- Force Jump (1)"
\ No newline at end of file
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/tmnt_splinter.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/tmnt_splinter.mbch
index bf94d36d3..cf400faa5 100644
--- a/03_MovieGameMappack/Ext_Data/MB2/character/tmnt_splinter.mbch
+++ b/03_MovieGameMappack/Ext_Data/MB2/character/tmnt_splinter.mbch
@@ -31,5 +31,9 @@ WeaponInfo0
 
 description	"Splinter
 
-Weaponry:
-Stick"
\ No newline at end of file
+^2Weaponry:
+- Stick
+
+^8Attributes:
+- Saber Defense (3)
+- Force Jump (1)"
\ No newline at end of file

From 32e07bcbf1d12ce1c5e9f47775d8a44ccf308e3b Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Thu, 26 Feb 2026 22:28:36 +0100
Subject: [PATCH 67/82] h3_Arc null spec p2

Adds p2 for null arcs
---
 .../ext_data/mb2/character/h3_Arc.mbch        | 80 ++++++++++---------
 1 file changed, 42 insertions(+), 38 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/h3_Arc.mbch b/z_MBLegends/ext_data/mb2/character/h3_Arc.mbch
index e9c0fe03a..a0d050ef8 100644
--- a/z_MBLegends/ext_data/mb2/character/h3_Arc.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h3_Arc.mbch
@@ -243,56 +243,60 @@ ClassInfo
 	c_att_ranks_29		3,3,7
 
 
-	c_att_skill_30		MB_ATT_WESTARM5
-	c_att_names_30		"WESTAR-M5 Blaster Rifle"
-	c_att_ranks_30		0,0
+	c_att_skill_30	MB_ATT_CLONE_PISTOL
+	c_att_names_30	"DC-15s/17 Clone Pistol"
+	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_skill_31		MB_ATT_WESTARM5
+	c_att_names_31		"WESTAR-M5 Blaster Rifle"
 	c_att_ranks_31		0,0
-	c_att_descs_31		"When combined with the below, equips 2 Pulses and a Scope"
 
-	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	"When combined with the above, equips 2 Pulses and a Scope"
+	c_att_skill_32		MB_ATT_ARC_RIFLE_GRENADELAUNCHER
+	c_att_names_32		"> M5 Pulse Grenade Addon"
+	c_att_ranks_32		0,0
+	c_att_descs_32		"When combined with the below, equips 2 Pulses and a Scope"
 
- 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_33		MB_ATT_ARC_RIFLE_SCOPE
+	c_att_names_33		"> M5 Scope Addon"
+	c_att_ranks_33		0
+	c_att_descs_33	"When combined with the above, equips 2 Pulses and a Scope"
 
-	c_att_skill_35		MB_ATT_DMG_GIVEN_MULTIPLIER
-	c_att_names_35		"Dmg Given (115%)"
-	c_att_ranks_35		0
+ c_att_skill_34		MB_ATT_PLX1
+	c_att_names_34		"PLX-1 Rocket Launcher"
+	c_att_ranks_34		0,0,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_35		MB_ATT_PULSE_GRENADES
+	c_att_names_35		"Pulse Grenades"
+	c_att_ranks_35		0,0,0
+
+	c_att_skill_36		MB_ATT_DMG_GIVEN_MULTIPLIER
+	c_att_names_36		"Dmg Given (115%)"
+	c_att_ranks_36		0
 	
-	c_att_skill_37		MB_ATT_ARMOUR
-	c_att_names_37		"Armor (65/80/115)"
+	c_att_skill_37		MB_ATT_HEALTH
+	c_att_names_37		"HP (100/115/145)"
 	c_att_ranks_37		0,0,0
+	
+	c_att_skill_38		MB_ATT_ARMOUR
+	c_att_names_38		"Armor (65/80/115)"
+	c_att_ranks_38		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_FLOAT_HOP
+ c_att_names_39 "Slow Faller"
+ c_att_ranks_39 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_STM_MULTIPLIER
+	c_att_names_40 "Skill Cd (125%)"
+	c_att_ranks_40	0
+	c_att_descs_40 "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_STAMINA
+	c_att_names_41		"Stamina ^3[CS1]"
+	c_att_ranks_41 	0,0,0
 	
-	c_att_skill_41		MB_ATT_DEXTERITY
-	c_att_names_41		"Dexterity ^3[CS2]"
-	c_att_ranks_41		0,0,0
+	c_att_skill_42		MB_ATT_DEXTERITY
+	c_att_names_42		"Dexterity ^3[CS2]"
+	c_att_ranks_42		0,0,0
 }
 
 description	"ARC Trooper

From 9e0759477817235c054550fccedb588b295c4cb7 Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Fri, 27 Feb 2026 19:20:35 +0100
Subject: [PATCH 68/82] HUD tracking update

---
 z_MBLegends/ext_data/mb2/character/h1_SecurET.mbch    | 3 +++
 z_MBLegends/ext_data/mb2/character/h2_Carth.mbch      | 3 +++
 z_MBLegends/ext_data/mb2/character/h2_Han.mbch        | 3 +++
 z_MBLegends/ext_data/mb2/character/h2_JynE.mbch       | 3 +++
 z_MBLegends/ext_data/mb2/character/h2_Padme.mbch      | 3 +++
 z_MBLegends/ext_data/mb2/character/h2_Panaka.mbch     | 2 ++
 z_MBLegends/ext_data/mb2/character/h3_Arc.mbch        | 3 +++
 z_MBLegends/ext_data/mb2/character/h3_Baze.mbch       | 3 +++
 z_MBLegends/ext_data/mb2/character/h3_BossNass.mbch   | 3 +++
 z_MBLegends/ext_data/mb2/character/h3_Cander.mbch     | 3 +++
 z_MBLegends/ext_data/mb2/character/h3_CloneCom.mbch   | 2 ++
 z_MBLegends/ext_data/mb2/character/h3_Delta.mbch      | 3 +++
 z_MBLegends/ext_data/mb2/character/h4_KirKanos.mbch   | 3 +++
 z_MBLegends/ext_data/mb2/character/h5_AstroR2.mbch    | 4 ++++
 z_MBLegends/ext_data/mb2/character/h5_BoKatan.mbch    | 3 +++
 z_MBLegends/ext_data/mb2/character/h5_Skirata.mbch    | 3 +++
 z_MBLegends/ext_data/mb2/character/h6_Cross.mbch      | 3 +++
 z_MBLegends/ext_data/mb2/character/h6_Mission.mbch    | 3 +++
 z_MBLegends/ext_data/mb2/character/h6_Nien.mbch       | 3 +++
 z_MBLegends/ext_data/mb2/character/h7_CloneAss.mbch   | 3 +++
 z_MBLegends/ext_data/mb2/character/h7_HK47.mbch       | 3 +++
 z_MBLegends/ext_data/mb2/character/h7_Hera.mbch       | 3 +++
 z_MBLegends/ext_data/mb2/character/h7_Lobot.mbch      | 3 +++
 z_MBLegends/ext_data/mb2/character/h7_RebSapper.mbch  | 3 +++
 z_MBLegends/ext_data/mb2/character/h7_Spy.mbch        | 3 +++
 z_MBLegends/ext_data/mb2/character/h8_Chewie.mbch     | 3 +++
 z_MBLegends/ext_data/mb2/character/h8_Zaal.mbch       | 3 +++
 z_MBLegends/ext_data/mb2/character/v1_B1.mbch         | 3 +++
 z_MBLegends/ext_data/mb2/character/v1_TORagent.mbch   | 2 ++
 z_MBLegends/ext_data/mb2/character/v2_Calo.mbch       | 3 +++
 z_MBLegends/ext_data/mb2/character/v2_FlameTr.mbch    | 3 +++
 z_MBLegends/ext_data/mb2/character/v2_Greedo.mbch     | 3 +++
 z_MBLegends/ext_data/mb2/character/v3_FOMarsh.mbch    | 3 +++
 z_MBLegends/ext_data/mb2/character/v3_HeavyStorm.mbch | 5 ++++-
 z_MBLegends/ext_data/mb2/character/v3_Trando.mbch     | 2 ++
 z_MBLegends/ext_data/mb2/character/v4_BX.mbch         | 2 ++
 z_MBLegends/ext_data/mb2/character/v4_PurgeTr.mbch    | 3 +++
 z_MBLegends/ext_data/mb2/character/v5_Boba.mbch       | 3 +++
 z_MBLegends/ext_data/mb2/character/v5_ImpArmCom.mbch  | 3 +++
 z_MBLegends/ext_data/mb2/character/v5_JumpTr.mbch     | 3 +++
 z_MBLegends/ext_data/mb2/character/v5_Watto.mbch      | 4 +++-
 z_MBLegends/ext_data/mb2/character/v6_Aurra.mbch      | 4 +++-
 z_MBLegends/ext_data/mb2/character/v7_Krennic.mbch    | 3 +++
 z_MBLegends/ext_data/mb2/character/v7_Noghri.mbch     | 3 +++
 z_MBLegends/ext_data/mb2/character/v7_Reelo.mbch      | 3 +++
 z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch   | 3 +++
 z_MBLegends/ext_data/mb2/character/v7_Tarkin.mbch     | 3 +++
 z_MBLegends/ext_data/mb2/character/v7_Thrawn.mbch     | 3 +++
 48 files changed, 141 insertions(+), 3 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/h1_SecurET.mbch b/z_MBLegends/ext_data/mb2/character/h1_SecurET.mbch
index 4da19bdc2..8d64260d9 100644
--- a/z_MBLegends/ext_data/mb2/character/h1_SecurET.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h1_SecurET.mbch
@@ -19,6 +19,9 @@ ClassInfo
 	special1		EAS_HI_SPRINT
 	special2 	EAS_NONE
 	special4		EAS_HI_GRAPPLEHOOK
+
+	special1HUD HUD_CONCBLOB
+	special2HUD HUD_SONICNADE
 	
 	saber1			soldierbaton_legends
 	forcepowers 		FP_SABER_OFFENSE,3
diff --git a/z_MBLegends/ext_data/mb2/character/h2_Carth.mbch b/z_MBLegends/ext_data/mb2/character/h2_Carth.mbch
index 15891a2f4..aa81d89b4 100644
--- a/z_MBLegends/ext_data/mb2/character/h2_Carth.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h2_Carth.mbch
@@ -16,6 +16,9 @@ ClassInfo
 	
 	resource RESOURCE_ENERGY
 	forcepool 120
+
+	special1HUD HUD_FRAGNADE
+	special2HUD HUD_CONCNADE
 	
 	holdables       HI_MEDPAC_BIG
 	
diff --git a/z_MBLegends/ext_data/mb2/character/h2_Han.mbch b/z_MBLegends/ext_data/mb2/character/h2_Han.mbch
index 031b96225..6faa798c0 100644
--- a/z_MBLegends/ext_data/mb2/character/h2_Han.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h2_Han.mbch
@@ -25,6 +25,9 @@ ClassInfo
 	forceregen		2
 
  rankSTM 0.75
+ 
+ 	special1HUD HUD_FRAGNADE
+	special2HUD HUD_CONCNADE
 
 	bargeSoundOverride	"sound/chars/han_anh/misc/victory1.mp3"
 
diff --git a/z_MBLegends/ext_data/mb2/character/h2_JynE.mbch b/z_MBLegends/ext_data/mb2/character/h2_JynE.mbch
index fae9e2bd2..b22be84a0 100644
--- a/z_MBLegends/ext_data/mb2/character/h2_JynE.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h2_JynE.mbch
@@ -13,6 +13,9 @@ ClassInfo
 	forcepowers 	FP_SABER_OFFENSE,3
 	maxhealth 150
 	maxarmor  110
+	
+	special1HUD HUD_SONICNADE
+	special2HUD HUD_IONBLOB
 
 	saber1	truncheon_legends
 	saber2     a180_saber_legends
diff --git a/z_MBLegends/ext_data/mb2/character/h2_Padme.mbch b/z_MBLegends/ext_data/mb2/character/h2_Padme.mbch
index dbc22c6fa..f6997dd7c 100644
--- a/z_MBLegends/ext_data/mb2/character/h2_Padme.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h2_Padme.mbch
@@ -19,6 +19,9 @@ ClassInfo
 
 baseSpeed 255
 
+special1HUD HUD_PULSENADE
+special2HUD HUD_CONCNADE
+
 	//rateOfFire				0.8
 	rateOfFire_Melee	0.9
 
diff --git a/z_MBLegends/ext_data/mb2/character/h2_Panaka.mbch b/z_MBLegends/ext_data/mb2/character/h2_Panaka.mbch
index af9aa1229..30a0a9e3f 100644
--- a/z_MBLegends/ext_data/mb2/character/h2_Panaka.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h2_Panaka.mbch
@@ -31,6 +31,8 @@ ClassInfo
 	maxarmor	 90
 
 	BPmultiplier		0
+	special1HUD HUD_FRAGNADE
+	special2HUD HUD_CONCNADE
 	
 	forcepowers FP_RAGE,1|FP_PROTECT,1|FP_TEAM_FORCE,2
 	resource RESOURCE_RAGE
diff --git a/z_MBLegends/ext_data/mb2/character/h3_Arc.mbch b/z_MBLegends/ext_data/mb2/character/h3_Arc.mbch
index a0d050ef8..47a9324b8 100644
--- a/z_MBLegends/ext_data/mb2/character/h3_Arc.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h3_Arc.mbch
@@ -20,6 +20,9 @@ ClassInfo
 	
 	knockbackTaken 0.88
 
+	special1HUD HUD_CONCBLOB
+	special2HUD HUD_IONBLOB
+
  skilltimerMod 0.9
 	rankSTM 0.75
 
diff --git a/z_MBLegends/ext_data/mb2/character/h3_Baze.mbch b/z_MBLegends/ext_data/mb2/character/h3_Baze.mbch
index a30f31fb3..feee4f2fe 100644
--- a/z_MBLegends/ext_data/mb2/character/h3_Baze.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h3_Baze.mbch
@@ -22,6 +22,9 @@ ClassInfo
 
  knockbackTaken 0.8
  knockbackGiven 1.1
+ 
+ 	special1HUD HUD_FRAGNADE
+	special2HUD HUD_SONICNADE
 
 	speed       			0.92
 
diff --git a/z_MBLegends/ext_data/mb2/character/h3_BossNass.mbch b/z_MBLegends/ext_data/mb2/character/h3_BossNass.mbch
index c150b5405..30f17535a 100644
--- a/z_MBLegends/ext_data/mb2/character/h3_BossNass.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h3_BossNass.mbch
@@ -36,6 +36,9 @@ ClassInfo
 	special1		EAS_NONE
 	special2		EAS_HI_DASH
 
+	special1HUD HUD_PULSENADE
+	special2HUD HUD_PLX1ROCKETS
+
 	modelScale   1.10	
 	uioverlay "gfx/icons/heavy"
 	model	"bossnass"
diff --git a/z_MBLegends/ext_data/mb2/character/h3_Cander.mbch b/z_MBLegends/ext_data/mb2/character/h3_Cander.mbch
index e81fe1d89..09b700a4e 100644
--- a/z_MBLegends/ext_data/mb2/character/h3_Cander.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h3_Cander.mbch
@@ -38,6 +38,9 @@ ClassInfo
 	knockbackTaken		.80
 	rankKbTaken			.20
 	
+	special1HUD HUD_IONBLOB
+	special2HUD HUD_FRAGNADE
+	
 	gloatAnim   BOTH_VICTORY_FAST
 
 	uioverlay_r "gfx/icons/heavy"
diff --git a/z_MBLegends/ext_data/mb2/character/h3_CloneCom.mbch b/z_MBLegends/ext_data/mb2/character/h3_CloneCom.mbch
index da71c0f24..71c6f172e 100644
--- a/z_MBLegends/ext_data/mb2/character/h3_CloneCom.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h3_CloneCom.mbch
@@ -9,6 +9,8 @@ WP_UGLFlags HELD_KNOCKBACK
 WP_DCCarbineFlags HELD_ALTRELOAD
 WP_DisruptorFlags HELD_ALTRELOAD
 WP_FlechetteFlags HELD_ALTRELOAD
+special1HUD HUD_FRAGNADE
+special2HUD HUD_CONCNADE
 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
diff --git a/z_MBLegends/ext_data/mb2/character/h3_Delta.mbch b/z_MBLegends/ext_data/mb2/character/h3_Delta.mbch
index 0bf6d66f7..3c3b6a162 100644
--- a/z_MBLegends/ext_data/mb2/character/h3_Delta.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h3_Delta.mbch
@@ -25,6 +25,9 @@ ClassInfo
 	ASmultiplier 	1.25
 	BPmultiplier	0
 	
+	special1HUD HUD_FRAGNADE
+	special2HUD HUD_PULSENADE
+	
 	basespeed 203
 	
 	saberDamage 120
diff --git a/z_MBLegends/ext_data/mb2/character/h4_KirKanos.mbch b/z_MBLegends/ext_data/mb2/character/h4_KirKanos.mbch
index 7c62f6a54..cecd7ced1 100644
--- a/z_MBLegends/ext_data/mb2/character/h4_KirKanos.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h4_KirKanos.mbch
@@ -19,6 +19,9 @@ ClassInfo
 	forcepool		135
 	forceregen		1.2
 	
+	special1HUD HUD_TRACKINGDART
+	special2HUD HUD_SONICNADE
+	
 	model 			"kir_kanos"
 	skin  			"default"
 	uishader  		"models/players/kir_kanos/mb2_icon_default"
diff --git a/z_MBLegends/ext_data/mb2/character/h5_AstroR2.mbch b/z_MBLegends/ext_data/mb2/character/h5_AstroR2.mbch
index 1f77d1f60..fa9c12059 100644
--- a/z_MBLegends/ext_data/mb2/character/h5_AstroR2.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h5_AstroR2.mbch
@@ -39,6 +39,10 @@ ClassInfo
 	hackRate 0.80
 	basespeed	215
 	disableGunBash 1
+
+	special1HUD HUD_FRAGNADE
+	special2HUD HUD_WRISTLASER
+	
 	
 	resource		RESOURCE_FUEL
 	forcepool	45
diff --git a/z_MBLegends/ext_data/mb2/character/h5_BoKatan.mbch b/z_MBLegends/ext_data/mb2/character/h5_BoKatan.mbch
index 5939f43ec..475e395db 100644
--- a/z_MBLegends/ext_data/mb2/character/h5_BoKatan.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h5_BoKatan.mbch
@@ -29,6 +29,9 @@ ClassInfo
 	APmultiplier		1.20
 	BPmultiplier 	1.1
 
+	special1HUD HUD_POISONDART
+	special2HUD HUD_WRISTLASER
+
 	
 	modelscale  1.01
 	model		"BoKatan"
diff --git a/z_MBLegends/ext_data/mb2/character/h5_Skirata.mbch b/z_MBLegends/ext_data/mb2/character/h5_Skirata.mbch
index 8b6d3bc9b..674e87632 100644
--- a/z_MBLegends/ext_data/mb2/character/h5_Skirata.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h5_Skirata.mbch
@@ -37,6 +37,9 @@ ClassInfo
 	BPmultiplier		0
 	saberdamage 100
 	saberStanceAnim	BOTH_STAND9
+
+	special1HUD HUD_FRAGNADE
+	special2HUD HUD_PULSENADE
 	
 	flourishAnim BOTH_SHOWOFF_FAST
 	
diff --git a/z_MBLegends/ext_data/mb2/character/h6_Cross.mbch b/z_MBLegends/ext_data/mb2/character/h6_Cross.mbch
index 18d3fbde9..c38439119 100644
--- a/z_MBLegends/ext_data/mb2/character/h6_Cross.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h6_Cross.mbch
@@ -15,6 +15,9 @@ ClassInfo
 	forcepool 	115
  forceRegen 1.15
 	resource		RESOURCE_STAMINA
+
+	special1HUD HUD_FRAGNADE
+	special2HUD HUD_PULSENADE
 	
 	BPmultiplier	0
 	saber1		cross_knife
diff --git a/z_MBLegends/ext_data/mb2/character/h6_Mission.mbch b/z_MBLegends/ext_data/mb2/character/h6_Mission.mbch
index dd23a61a0..9bccc2de9 100644
--- a/z_MBLegends/ext_data/mb2/character/h6_Mission.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h6_Mission.mbch
@@ -29,6 +29,9 @@ ClassInfo
 	
 	rateOfFire			0.8
 	
+	special1HUD HUD_TRACKINGDART
+	special2HUD HUD_IONBLOB
+	
 	modelscale 		0.85
 	model	"mission_new"
 	skin		"default"
diff --git a/z_MBLegends/ext_data/mb2/character/h6_Nien.mbch b/z_MBLegends/ext_data/mb2/character/h6_Nien.mbch
index 3f2666b45..dc7b059d0 100644
--- a/z_MBLegends/ext_data/mb2/character/h6_Nien.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h6_Nien.mbch
@@ -25,6 +25,9 @@ ClassInfo
 
 	knockbackTaken 1.35
 	
+	special1HUD HUD_FRAGNADE
+	special2HUD HUD_PULSENADE
+	
 	ASmultiplier 1.15
 	APmultiplier	1.2
 	BPmultiplier	0
diff --git a/z_MBLegends/ext_data/mb2/character/h7_CloneAss.mbch b/z_MBLegends/ext_data/mb2/character/h7_CloneAss.mbch
index acba5f163..5704475b3 100644
--- a/z_MBLegends/ext_data/mb2/character/h7_CloneAss.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h7_CloneAss.mbch
@@ -45,6 +45,9 @@ ClassInfo
 	uioverlay_l "gfx/icons/tactician"
 	uioverlay_r "gfx/icons/infantry"
 	
+	special1HUD HUD_POISONDART
+	special2HUD HUD_FRAGNADE
+	
 	MBClass			MB_CLASS_ARCTROOPER
 	modelscale      	1.02
 	speed			1.07
diff --git a/z_MBLegends/ext_data/mb2/character/h7_HK47.mbch b/z_MBLegends/ext_data/mb2/character/h7_HK47.mbch
index 218d0ecd8..773f61981 100644
--- a/z_MBLegends/ext_data/mb2/character/h7_HK47.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h7_HK47.mbch
@@ -24,6 +24,9 @@ ClassInfo
  forcepowers  	FP_SEE,1
 	hackRate 0.86
 	
+	special1HUD HUD_POISONDART
+	special2HUD HUD_FRAGNADE
+	
 	WP_T21Flags	HELD_ALTRELOAD	
 	WP_EE4Flags	HELD_DISRUPTIFY|HELD_ALTRELOAD
  WP_TripMineFlags HELD_POISON|HELD_STUN
diff --git a/z_MBLegends/ext_data/mb2/character/h7_Hera.mbch b/z_MBLegends/ext_data/mb2/character/h7_Hera.mbch
index c8541cb39..e97ef2c99 100644
--- a/z_MBLegends/ext_data/mb2/character/h7_Hera.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h7_Hera.mbch
@@ -24,6 +24,9 @@ ClassInfo
 
 	knockbackGiven 1.05
 
+	special1HUD HUD_FRAGNADE
+	special2HUD HUD_PULSENADE
+
 //WP_BlasterFlags HELD_KNOCKBACK
 	
 	special1		EAS_HI_DODGE
diff --git a/z_MBLegends/ext_data/mb2/character/h7_Lobot.mbch b/z_MBLegends/ext_data/mb2/character/h7_Lobot.mbch
index 2b7b4cc28..bbf4bad47 100644
--- a/z_MBLegends/ext_data/mb2/character/h7_Lobot.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h7_Lobot.mbch
@@ -18,6 +18,9 @@ ClassInfo
 	CSMultiplier 		1.2
 	BPmultiplier		0
 
+	special1HUD HUD_FRAGNADE
+	special2HUD HUD_CONCNADE
+
 	saber1		Wrench_Legends
 	sabercolor	0
 	saberstyle	SS_MEDIUM|SS_STRONG
diff --git a/z_MBLegends/ext_data/mb2/character/h7_RebSapper.mbch b/z_MBLegends/ext_data/mb2/character/h7_RebSapper.mbch
index 8485ca381..d777075fa 100644
--- a/z_MBLegends/ext_data/mb2/character/h7_RebSapper.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h7_RebSapper.mbch
@@ -30,6 +30,9 @@ armourRegenCap  20
 basespeed 215
 damageTaken 1
 
+special1HUD HUD_FRAGNADE
+special2HUD HUD_PULSENADE
+
 hackRate 0.86
 knockbackTaken 1.1
 
diff --git a/z_MBLegends/ext_data/mb2/character/h7_Spy.mbch b/z_MBLegends/ext_data/mb2/character/h7_Spy.mbch
index e67de1a02..f28ee249c 100644
--- a/z_MBLegends/ext_data/mb2/character/h7_Spy.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h7_Spy.mbch
@@ -28,6 +28,9 @@ ClassInfo
 	classflags 	CFL_HEAVYMELEE|CFL_SEEING_STEALTH
 	holdables	HI_CLOAK|HI_MEDPAC
 
+	special1HUD HUD_SONICNADE
+	special2HUD HUD_TRACKINGDART
+
 	speed  1.03
 	
 	uioverlay_l "gfx/icons/tactician"
diff --git a/z_MBLegends/ext_data/mb2/character/h8_Chewie.mbch b/z_MBLegends/ext_data/mb2/character/h8_Chewie.mbch
index 7f24d18f2..5614cca5f 100644
--- a/z_MBLegends/ext_data/mb2/character/h8_Chewie.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h8_Chewie.mbch
@@ -27,6 +27,9 @@ ClassInfo
 	WP_ShotgunFlags 	HELD_ALTRELOAD|HELD_STUN
 	//WP_BowcasterFlags 	HELD_SPEED
 	
+	special1HUD HUD_FRAGNADE
+	special2HUD HUD_PULSENADE
+	
 	uioverlay "gfx/icons/brawler"
 	
 	meleeMoves M_UPPERCUT|M_BLOCK|M_FBKICK|M_JUMPKICK|M_KATA|M_KICK|M_LEGSWEEP|M_PUNCH|M_RLKICK
diff --git a/z_MBLegends/ext_data/mb2/character/h8_Zaal.mbch b/z_MBLegends/ext_data/mb2/character/h8_Zaal.mbch
index fd5bd70b1..75b30e609 100644
--- a/z_MBLegends/ext_data/mb2/character/h8_Zaal.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h8_Zaal.mbch
@@ -23,6 +23,9 @@ ClassInfo
 	BPmultiplier	0.95
 	saber1			vibroblade_zaalbar_legends	
 	saberstyle 		SS_MEDIUM
+
+	special1HUD HUD_FIRENADE
+	special2HUD HUD_PULSENADE
 	
 	saber1_1			vibrosword_zaalbar_legends
 	saber2_1			vibrosword_zaalbar_legends
diff --git a/z_MBLegends/ext_data/mb2/character/v1_B1.mbch b/z_MBLegends/ext_data/mb2/character/v1_B1.mbch
index 5ceb37bbb..10e326bcc 100644
--- a/z_MBLegends/ext_data/mb2/character/v1_B1.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v1_B1.mbch
@@ -23,6 +23,9 @@ ClassInfo
 	resource	 RESOURCE_BATTERY
 
 	damageGiven	1
+
+	special1HUD HUD_FRAGNADE
+	special2HUD HUD_PLX1ROCKETS
 	
 	classflags CFL_DISMEMBERFRAGILE
 	
diff --git a/z_MBLegends/ext_data/mb2/character/v1_TORagent.mbch b/z_MBLegends/ext_data/mb2/character/v1_TORagent.mbch
index 1e18250ca..2b27a760e 100644
--- a/z_MBLegends/ext_data/mb2/character/v1_TORagent.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v1_TORagent.mbch
@@ -22,6 +22,8 @@ rateOfFire_Melee .91
 rankKbGiven 1.3
 basespeed 220
 rankbasespeed	235
+special1HUD HUD_POISONDART
+special2HUD HUD_FRAGNADE
 WP_SaberFlags	HELD_PULSE|HELD_POISON
 WP_FragNadeFlags HELD_POISON|HELD_TRACKING
 WP_DLT20AFlags HELD_ALTRELOAD
diff --git a/z_MBLegends/ext_data/mb2/character/v2_Calo.mbch b/z_MBLegends/ext_data/mb2/character/v2_Calo.mbch
index 0743b6dd3..efe4215b9 100644
--- a/z_MBLegends/ext_data/mb2/character/v2_Calo.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v2_Calo.mbch
@@ -17,6 +17,9 @@ ClassInfo
 	resource RESOURCE_ENERGY
 	forcepool 120
 	
+	special1HUD HUD_TRACKINGDART
+	special2HUD HUD_CONCNADE
+	
 	holdables	HI_MEDPAC_BIG
 	
 	modelscale      	0.93
diff --git a/z_MBLegends/ext_data/mb2/character/v2_FlameTr.mbch b/z_MBLegends/ext_data/mb2/character/v2_FlameTr.mbch
index 28a7591be..588ffcc80 100644
--- a/z_MBLegends/ext_data/mb2/character/v2_FlameTr.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v2_FlameTr.mbch
@@ -21,6 +21,9 @@ Classinfo
 	knockbacktaken .9
 	speed  1.06
 	
+	special1HUD HUD_FIRENADE
+	special2HUD HUD_WRISTLASER
+	
 	resource		RESOURCE_ENERGY
 	forcepool	100
 	
diff --git a/z_MBLegends/ext_data/mb2/character/v2_Greedo.mbch b/z_MBLegends/ext_data/mb2/character/v2_Greedo.mbch
index eeef400cc..0f4e4e753 100644
--- a/z_MBLegends/ext_data/mb2/character/v2_Greedo.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v2_Greedo.mbch
@@ -28,6 +28,9 @@ ClassInfo
 	
 	special1	EAS_HI_DODGE
  special4 EAS_HI_BARGE
+ 
+ 	special1HUD HUD_FRAGNADE
+	special2HUD HUD_CONCNADE
 
 	idleAnim BOTH_SCEPTER_HOLD
 	flourishAnim BOTH_SCEPTER_HOLD
diff --git a/z_MBLegends/ext_data/mb2/character/v3_FOMarsh.mbch b/z_MBLegends/ext_data/mb2/character/v3_FOMarsh.mbch
index 4b11c7525..b2fc88ab9 100644
--- a/z_MBLegends/ext_data/mb2/character/v3_FOMarsh.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v3_FOMarsh.mbch
@@ -27,6 +27,9 @@ ClassInfo
 	CSmultiplier	1.1
 	ASmultiplier	1.1
 	BPmultiplier 	0.9
+
+	special1HUD HUD_FRAGNADE
+	special2HUD HUD_FIRENADE
 	
 	classflags CFL_HEAVYMELEE
 		
diff --git a/z_MBLegends/ext_data/mb2/character/v3_HeavyStorm.mbch b/z_MBLegends/ext_data/mb2/character/v3_HeavyStorm.mbch
index f6a627273..15559272f 100644
--- a/z_MBLegends/ext_data/mb2/character/v3_HeavyStorm.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v3_HeavyStorm.mbch
@@ -14,9 +14,12 @@ ClassInfo
 	
 	maxhealth		60
 	rankHealth		80,100
-		
+
 	maxArmor 		40
 	rankArmor		80
+
+	special1HUD HUD_FRAGNADE
+	special2HUD HUD_FIRENADE
 	
 	resource RESOURCE_STAMINA
 	forcepool 100
diff --git a/z_MBLegends/ext_data/mb2/character/v3_Trando.mbch b/z_MBLegends/ext_data/mb2/character/v3_Trando.mbch
index 58adc6e9f..c63f2c767 100644
--- a/z_MBLegends/ext_data/mb2/character/v3_Trando.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v3_Trando.mbch
@@ -28,6 +28,8 @@ RunForward BOTH_WOOKIEE_RAGE_RUN
 special2 EAS_HI_TRACKER
 special1 EAS_FP_SEE
 special3 EAS_FP_HEAL
+special1HUD HUD_FRAGNADE
+special2HUD HUD_TRACKINGDART
 model "trandoshan"
 skin	"merc"
 uishader	"models/players/trandoshan/mb2_icon_merc"
diff --git a/z_MBLegends/ext_data/mb2/character/v4_BX.mbch b/z_MBLegends/ext_data/mb2/character/v4_BX.mbch
index ec7661d7d..0ff9cf2fd 100644
--- a/z_MBLegends/ext_data/mb2/character/v4_BX.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v4_BX.mbch
@@ -36,6 +36,8 @@ ClassInfo
 	uioverlay_l "gfx/icons/spec_infantry"
 	uioverlay_c "gfx/icons/hybrid"
 	gloatAnim BOTH_FJSS_TL_BR
+	special1HUD HUD_FRAGNADE
+	special2HUD HUD_FIRENADE
 
 	model			"bxdroid"
 	skin			"default"
diff --git a/z_MBLegends/ext_data/mb2/character/v4_PurgeTr.mbch b/z_MBLegends/ext_data/mb2/character/v4_PurgeTr.mbch
index 24625a149..b3ef68ee3 100644
--- a/z_MBLegends/ext_data/mb2/character/v4_PurgeTr.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v4_PurgeTr.mbch
@@ -36,6 +36,9 @@ baseSpeed 200
 	
 	CSmultiplier     	1.10
 	
+	special1HUD HUD_CONCBLOB
+	special2HUD HUD_CONCNADE
+	
 	tauntAnim 		BOTH_VICTORY_FAST
 	gloatAnim       	BOTH_VICTORY_FAST
 	flourishAnim  	BOTH_VICTORY_FAST
diff --git a/z_MBLegends/ext_data/mb2/character/v5_Boba.mbch b/z_MBLegends/ext_data/mb2/character/v5_Boba.mbch
index 7334ae5fb..196448a3f 100644
--- a/z_MBLegends/ext_data/mb2/character/v5_Boba.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v5_Boba.mbch
@@ -20,6 +20,9 @@ ClassInfo
 	basespeed	225
 
 	rateoffire			0.8
+	
+	special1HUD HUD_WHISTLINGBIRDS
+	special2HUD HUD_WRISTLASER
 
 	WP_ShotgunFlags     HELD_ALTRELOAD|HELD_DISRUPTIFY
 	WP_ConcussionFlags HELD_SLOWPROJ|HELD_KNOCKBACK|HELD_ALTRELOAD|HELD_STUN
diff --git a/z_MBLegends/ext_data/mb2/character/v5_ImpArmCom.mbch b/z_MBLegends/ext_data/mb2/character/v5_ImpArmCom.mbch
index 44edc7920..30a8a0c04 100644
--- a/z_MBLegends/ext_data/mb2/character/v5_ImpArmCom.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v5_ImpArmCom.mbch
@@ -23,6 +23,9 @@ ClassInfo
 
 	BPmultiplier		0
 
+	special1HUD HUD_FIRENADE
+	special2HUD HUD_WRISTLASER
+
 	special1 EAS_HI_FLAME
 	special2 
  special3 EAS_NONE
diff --git a/z_MBLegends/ext_data/mb2/character/v5_JumpTr.mbch b/z_MBLegends/ext_data/mb2/character/v5_JumpTr.mbch
index 640433736..dfe74468d 100644
--- a/z_MBLegends/ext_data/mb2/character/v5_JumpTr.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v5_JumpTr.mbch
@@ -28,6 +28,9 @@ ClassInfo
 	skilltimerMod 1.2
 
 	knockbackTaken 0.8
+	
+	special1HUD HUD_FRAGNADE
+	special2HUD HUD_IONBLOB
 
 	meleeMoves M_UPPERCUT|M_BLOCK|M_FBKICK|M_JUMPKICK|M_KATA|M_KICK|M_LEGSWEEP|M_PUNCH|M_RLKICK
 	
diff --git a/z_MBLegends/ext_data/mb2/character/v5_Watto.mbch b/z_MBLegends/ext_data/mb2/character/v5_Watto.mbch
index 8466f2127..70e820b9c 100644
--- a/z_MBLegends/ext_data/mb2/character/v5_Watto.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v5_Watto.mbch
@@ -25,7 +25,9 @@ ClassInfo
 	special2 EAS_HI_SEEKER
 	special3 EAS_HI_DODGE
 
-	
+	special1HUD HUD_FRAGNADE
+	special2HUD HUD_CONCNADE
+
 	saberDamage 120
 	saberSpecialDamage 2
 	saberMaxChain 2
diff --git a/z_MBLegends/ext_data/mb2/character/v6_Aurra.mbch b/z_MBLegends/ext_data/mb2/character/v6_Aurra.mbch
index 4cb52a6d1..45a80f4db 100644
--- a/z_MBLegends/ext_data/mb2/character/v6_Aurra.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v6_Aurra.mbch
@@ -33,7 +33,9 @@ ClassInfo
 	special2	EAS_NONE
 	special3 EAS_FP_SPEED
 	special4 EAS_FP_PROTECT
-
+	
+	special1HUD HUD_POISONDART
+	special2HUD HUD_FRAGNADE
 
 	bowAnim BOTH_HAN_TAUNT
 	flourishAnim BOTH_STAND10_TALK2
diff --git a/z_MBLegends/ext_data/mb2/character/v7_Krennic.mbch b/z_MBLegends/ext_data/mb2/character/v7_Krennic.mbch
index 7fcd60393..65d8ecd56 100644
--- a/z_MBLegends/ext_data/mb2/character/v7_Krennic.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v7_Krennic.mbch
@@ -17,6 +17,9 @@ ClassInfo
 	maxarmor  			125
 
  baseSpeed 255
+ 
+ 	special1HUD HUD_FRAGNADE
+	special2HUD HUD_PULSENADES
 	
 	resource		RESOURCE_ENERGY
 	forcepool			110
diff --git a/z_MBLegends/ext_data/mb2/character/v7_Noghri.mbch b/z_MBLegends/ext_data/mb2/character/v7_Noghri.mbch
index 474b6958e..8322bd87d 100644
--- a/z_MBLegends/ext_data/mb2/character/v7_Noghri.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v7_Noghri.mbch
@@ -27,6 +27,9 @@ ClassInfo
 	
 	rateOfFire_Melee	0.88
 
+	special1HUD HUD_POISONDART
+	special2HUD HUD_WHISTLINGBIRDS
+
 	saber1      vibrokhopesh
 	saberstyle  SS_TAVION	
 	saberMaxChain 4
diff --git a/z_MBLegends/ext_data/mb2/character/v7_Reelo.mbch b/z_MBLegends/ext_data/mb2/character/v7_Reelo.mbch
index ea4f61a9c..d6e321f9b 100644
--- a/z_MBLegends/ext_data/mb2/character/v7_Reelo.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v7_Reelo.mbch
@@ -29,6 +29,9 @@ ClassInfo
 	meleeMoves M_UPPERCUT|M_BLOCK|M_FBKICK|M_JUMPKICK|M_KATA|M_KICK|M_LEGSWEEP|M_PUNCH|M_RLKICK
 
 	flourishanim	BOTH_STAND5TOAIM
+
+	special1HUD HUD_FRAGNADE
+	special2HUD HUD_PULSENADE
 	
 	uioverlay_l "gfx/icons/tactician"
 	uioverlay_r "gfx/icons/heavy"
diff --git a/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch b/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch
index 4fef8af8f..0976277c7 100644
--- a/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v7_Saboteur.mbch
@@ -15,6 +15,9 @@ ClassInfo
 	rankDmgGiven 1.1
 	basespeed 230
 
+	special1HUD HUD_FRAGNADE
+	special2HUD HUD_CONCNADE
+
 	//ArmourRegenCap 25
 	ArmourRegenRate	1000
 	rankArmourRegenCap 25
diff --git a/z_MBLegends/ext_data/mb2/character/v7_Tarkin.mbch b/z_MBLegends/ext_data/mb2/character/v7_Tarkin.mbch
index 3407b3be1..7b9c4a489 100644
--- a/z_MBLegends/ext_data/mb2/character/v7_Tarkin.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v7_Tarkin.mbch
@@ -17,6 +17,9 @@ ClassInfo
 
 	basespeed			197
 	rateOfFire_Melee 1.05
+	
+	special1HUD HUD_FIRENADE
+	special2HUD HUD_CONCNADE
 
 	resource RESOURCE_RAGE
 	forcepool 250
diff --git a/z_MBLegends/ext_data/mb2/character/v7_Thrawn.mbch b/z_MBLegends/ext_data/mb2/character/v7_Thrawn.mbch
index beced1317..c5d245eaa 100644
--- a/z_MBLegends/ext_data/mb2/character/v7_Thrawn.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v7_Thrawn.mbch
@@ -20,6 +20,9 @@ ClassInfo
  damageTaken 0.9
 	speed			0.95
  rateoffire_melee	0.9
+ 
+ 	special1HUD HUD_SONICNADE
+	special2HUD HUD_TRACKINGDART
 
 	holdables 			HI_MEDPAC_BIG|HI_SEEKER|HI_BINOCULARS
 

From 92b1b23011c1d209c497179e51063976d5a0169a Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Fri, 27 Feb 2026 19:23:35 +0100
Subject: [PATCH 69/82] v7_Kubaz HUD tracking

---
 z_MBLegends/ext_data/mb2/character/v7_Kubaz.mbch | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/z_MBLegends/ext_data/mb2/character/v7_Kubaz.mbch b/z_MBLegends/ext_data/mb2/character/v7_Kubaz.mbch
index 8b2df4afe..e1c62f092 100644
--- a/z_MBLegends/ext_data/mb2/character/v7_Kubaz.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v7_Kubaz.mbch
@@ -30,6 +30,9 @@ ClassInfo
 	saberstyle		SS_TAVION|SS_DUAL
 	saberDamage 	100
 
+	special1HUD HUD_TRACKINGDART
+	special2HUD HUD_WRISTLASER
+
 	WP_BlasterPistolFlags	HELD_POISON
 
 	classflags		CFL_HEAVYMELEE|CFL_SEEING_STEALTH

From c31b33f17fa192c8283261ba369c118ac880a6de Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Sun, 1 Mar 2026 10:16:45 +0100
Subject: [PATCH 70/82] v9_Grievous description

Not much of a commander of he can't rally.
---
 z_MBLegends/ext_data/mb2/character/v9_Grievous.mbch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v9_Grievous.mbch b/z_MBLegends/ext_data/mb2/character/v9_Grievous.mbch
index 962cd9404..10326a842 100644
--- a/z_MBLegends/ext_data/mb2/character/v9_Grievous.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v9_Grievous.mbch
@@ -113,7 +113,7 @@ animCharge  BOTH_ATTACK2
 
 Description "General Grievous 
 
-A speedy, resilient commander with 4 Lightsabers. Excels at close-range encounters as well as quick escapes.
+A speedy, resilient saberist with 4 Lightsabers. Excels at close-range encounters as well as quick escapes.
 
 ^2Weaponry:
 - Melee

From 2994ce27cdd2830d0ee73d66c271789ef87a989b Mon Sep 17 00:00:00 2001
From: Unguided <buektomi@gmail.com>
Date: Sun, 1 Mar 2026 15:59:52 +0100
Subject: [PATCH 71/82] Barriss/Bastila updates

---
 .../players/barriss_offee/model_cloak.skin    | 117 +++---------------
 .../players/barriss_offee/model_default.skin  | 117 +++---------------
 .../players/barriss_offee/model_nocape.skin   | 116 ++---------------
 .../players/barriss_offee/modeldata.cfg       |  16 ---
 .../players/barriss_offee/saberauth.cfg       |  32 -----
 .../barriss_offee_ac/model_default.skin       |  35 ++++++
 .../players/barriss_offee_ac/model_dmg.skin   |  35 ++++++
 .../players/barriss_offee_ac/modeldata.cfg    |  18 +++
 .../players/barriss_offee_ac/saberauth.cfg    |   7 ++
 .../barriss_offee_inq/model_default.skin      |  45 +++++++
 .../players/barriss_offee_inq/model_nh.skin   |  45 +++++++
 .../barriss_offee_inq/model_prisoner.skin     |  45 +++++++
 .../players/barriss_offee_inq/modeldata.cfg   |  26 ++++
 .../players/barriss_offee_inq/saberauth.cfg   |   7 ++
 .../barriss_offee_old/model_caped.skin        |  38 ++++++
 .../barriss_offee_old/model_default.skin      |  38 ++++++
 .../players/barriss_offee_old/modeldata.cfg   |  18 +++
 .../players/barriss_offee_old/saberauth.cfg   |   7 ++
 .../models/players/bastila/model_default.skin |   5 +-
 .../models/players/bastila/model_goth.skin    |  36 ++++++
 .../models/players/bastila/model_sith.skin    |  13 +-
 .../models/players/bastila/model_undead.skin  |  36 ++++++
 .../models/players/bastila/model_yellow.skin  |   5 +-
 .../models/players/bastila/modeldata.cfg      |   8 ++
 .../models/players/bastila/saberauth.cfg      |  16 +++
 .../players/bastila_sith/model_default.skin   |  38 ++++++
 .../models/players/bastila_sith/modeldata.cfg |  18 +++
 .../models/players/bastila_sith/saberauth.cfg |   8 ++
 MBAssets3/shaders/barriss_offee.shader        |  11 ++
 29 files changed, 583 insertions(+), 373 deletions(-)
 create mode 100644 MBAssets3/models/players/barriss_offee_ac/model_default.skin
 create mode 100644 MBAssets3/models/players/barriss_offee_ac/model_dmg.skin
 create mode 100644 MBAssets3/models/players/barriss_offee_ac/modeldata.cfg
 create mode 100644 MBAssets3/models/players/barriss_offee_ac/saberauth.cfg
 create mode 100644 MBAssets3/models/players/barriss_offee_inq/model_default.skin
 create mode 100644 MBAssets3/models/players/barriss_offee_inq/model_nh.skin
 create mode 100644 MBAssets3/models/players/barriss_offee_inq/model_prisoner.skin
 create mode 100644 MBAssets3/models/players/barriss_offee_inq/modeldata.cfg
 create mode 100644 MBAssets3/models/players/barriss_offee_inq/saberauth.cfg
 create mode 100644 MBAssets3/models/players/barriss_offee_old/model_caped.skin
 create mode 100644 MBAssets3/models/players/barriss_offee_old/model_default.skin
 create mode 100644 MBAssets3/models/players/barriss_offee_old/modeldata.cfg
 create mode 100644 MBAssets3/models/players/barriss_offee_old/saberauth.cfg
 create mode 100644 MBAssets3/models/players/bastila/model_goth.skin
 create mode 100644 MBAssets3/models/players/bastila/model_undead.skin
 create mode 100644 MBAssets3/models/players/bastila_sith/model_default.skin
 create mode 100644 MBAssets3/models/players/bastila_sith/modeldata.cfg
 create mode 100644 MBAssets3/models/players/bastila_sith/saberauth.cfg

diff --git a/MBAssets3/models/players/barriss_offee/model_cloak.skin b/MBAssets3/models/players/barriss_offee/model_cloak.skin
index 0b4ed9baa..84b6ac536 100644
--- a/MBAssets3/models/players/barriss_offee/model_cloak.skin
+++ b/MBAssets3/models/players/barriss_offee/model_cloak.skin
@@ -1,6 +1,4 @@
 head,models/players/barriss_offee/head.tga
-head_p,*off
-head_ds,*off
 head_tunic,models/players/barriss_offee/head_tunic.tga
 head_eyes_mouth,models/players/barriss_offee/mouth_eyes.tga
 head_lashes,models/players/common/lashes.tga
@@ -29,107 +27,20 @@ l_arm,models/players/barriss_offee/torso.tga
 l_hand,models/players/barriss_offee/hands.tga
 wristguard,models/players/barriss_offee/wristguard.tga
 
-head_hair_old,*off
-torso_old,*off
-torso_old_cape,*off
-torso_old_caped,*off
-l_arm_old,*off
-l_arm_old_caped,*off
-r_arm_old,*off
-r_arm_old_caped,*off
-hips_belt_old,*off
-hips_old,*off
-legs_old,*off
-l_leg_old,*off
-r_leg_old,*off
-
-head_tunic_p,*off
-torso_p,*off
-torso_p_neck,*off
-r_arm_p,*off
-r_hand_p_wrist,*off
-l_arm_p,*off
-l_hand_p_wrist,*off
-hips_p,*off
-hips_p_torso,*off
-r_leg_p,*off
-l_leg_p,*off
-
-head_tunic_helmet,*off
-helmet,*off
-torso_inq,*off
-torso_inq_armor,*off
-r_shoulder_pad,*off
-l_shoulder_pad,*off
-wristguard_inq,*off
-hips_inq,*off
-hips_belt_inq,*off
-r_leg_inq,*off
-l_leg_inq,*off
-
-head_ac,*off
-head_hair_ac,*off
-head_hair_ac_t,*off
-torso_ac,*off
-torso_neck_ac,*off
-l_arm_ac,*off
-r_arm_ac,*off
-hips_ac,*off
-hips_belt_ac,*off
-l_leg_ac,*off
-r_leg_ac,*off
-
-torso_old_cap_hips_off,*off
-torso_old_cap_r_arm_off,*off
-torso_old_cap_l_arm_off,*off
-l_arm_old_cap_torso_off,*off
-r_arm_old_cap_torso_off,*off
-l_leg_old_cap_hips_off,*off
-r_leg_old_cap_hips_off,*off
-hips_old_cap_torso_off,*off
-hips_old_cap_r_leg_off,*off
-hips_old_cap_l_leg_off,*off
-
-torso_ac_cap_hips_off,*off
-torso_ac_cap_r_arm_off,*off
-torso_ac_cap_l_arm_off,*off
-l_arm_ac_cap_torso_off,*off
-r_arm_ac_cap_torso_off,*off
-l_leg_ac_cap_hips_off,*off
-r_leg_ac_cap_hips_off,*off
-hips_ac_cap_torso_off,*off
-hips_ac_cap_r_leg_off,*off
-hips_ac_cap_l_leg_off,*off
-
-torso_p_cap_head_off,*off
-torso_p_cap_hips_off,*off
-torso_p_cap_r_arm_off,*off
-torso_p_cap_l_arm_off,*off
-l_hand_p_cap_l_arm_off,*off
-l_arm_p_cap_l_hand_off,*off
-l_arm_p_cap_torso_off,*off
-r_hand_p_cap_r_arm_off,*off
-r_arm_p_cap_torso_off,*off
-r_arm_p_cap_r_hand_off,*off
-l_leg_p_cap_hips_off,*off
-r_leg_p_cap_hips_off,*off
-hips_p_cap_torso_off,*off
-hips_p_cap_r_leg_off,*off
-hips_p_cap_l_leg_off,*off
-
-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_r_arm_off,models/players/stormtrooper/caps.tga
-torso_cap_l_arm_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
+hips_cap_torso_off,models/players/stormtrooper/caps.tga
+hips_cap_r_leg_off,models/players/stormtrooper/caps.tga
+hips_cap_l_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
 l_arm_cap_torso_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
+l_arm_cap_l_hand_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
-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
+l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga
+r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torso_cap_hips_off,models/players/stormtrooper/caps.tga
+torso_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torso_cap_l_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
+
diff --git a/MBAssets3/models/players/barriss_offee/model_default.skin b/MBAssets3/models/players/barriss_offee/model_default.skin
index bba4678c8..850197b74 100644
--- a/MBAssets3/models/players/barriss_offee/model_default.skin
+++ b/MBAssets3/models/players/barriss_offee/model_default.skin
@@ -1,6 +1,4 @@
 head,models/players/barriss_offee/head.tga
-head_p,*off
-head_ds,*off
 head_back,models/players/barriss_offee/head.tga
 head_back2,*off
 head_tunic,*off
@@ -29,107 +27,20 @@ l_arm,models/players/barriss_offee/torso_cw.tga
 l_hand,models/players/barriss_offee/hands.tga
 wristguard,*off
 
-head_hair_old,*off
-torso_old,*off
-torso_old_cape,*off
-torso_old_caped,*off
-l_arm_old,*off
-l_arm_old_caped,*off
-r_arm_old,*off
-r_arm_old_caped,*off
-hips_belt_old,*off
-hips_old,*off
-legs_old,*off
-l_leg_old,*off
-r_leg_old,*off
-
-head_tunic_p,*off
-torso_p,*off
-torso_p_neck,*off
-r_arm_p,*off
-r_hand_p_wrist,*off
-l_arm_p,*off
-l_hand_p_wrist,*off
-hips_p,*off
-hips_p_torso,*off
-r_leg_p,*off
-l_leg_p,*off
-
-head_tunic_helmet,*off
-helmet,*off
-torso_inq,*off
-torso_inq_armor,*off
-r_shoulder_pad,*off
-l_shoulder_pad,*off
-wristguard_inq,*off
-hips_inq,*off
-hips_belt_inq,*off
-r_leg_inq,*off
-l_leg_inq,*off
-
-head_ac,*off
-head_hair_ac,*off
-head_hair_ac_t,*off
-torso_ac,*off
-torso_neck_ac,*off
-l_arm_ac,*off
-r_arm_ac,*off
-hips_ac,*off
-hips_belt_ac,*off
-l_leg_ac,*off
-r_leg_ac,*off
-
-torso_old_cap_hips_off,*off
-torso_old_cap_r_arm_off,*off
-torso_old_cap_l_arm_off,*off
-l_arm_old_cap_torso_off,*off
-r_arm_old_cap_torso_off,*off
-l_leg_old_cap_hips_off,*off
-r_leg_old_cap_hips_off,*off
-hips_old_cap_torso_off,*off
-hips_old_cap_r_leg_off,*off
-hips_old_cap_l_leg_off,*off
-
-torso_ac_cap_hips_off,*off
-torso_ac_cap_r_arm_off,*off
-torso_ac_cap_l_arm_off,*off
-l_arm_ac_cap_torso_off,*off
-r_arm_ac_cap_torso_off,*off
-l_leg_ac_cap_hips_off,*off
-r_leg_ac_cap_hips_off,*off
-hips_ac_cap_torso_off,*off
-hips_ac_cap_r_leg_off,*off
-hips_ac_cap_l_leg_off,*off
-
-torso_p_cap_head_off,*off
-torso_p_cap_hips_off,*off
-torso_p_cap_r_arm_off,*off
-torso_p_cap_l_arm_off,*off
-l_hand_p_cap_l_arm_off,*off
-l_arm_p_cap_l_hand_off,*off
-l_arm_p_cap_torso_off,*off
-r_hand_p_cap_r_arm_off,*off
-r_arm_p_cap_torso_off,*off
-r_arm_p_cap_r_hand_off,*off
-l_leg_p_cap_hips_off,*off
-r_leg_p_cap_hips_off,*off
-hips_p_cap_torso_off,*off
-hips_p_cap_r_leg_off,*off
-hips_p_cap_l_leg_off,*off
-
-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_r_arm_off,models/players/stormtrooper/caps.tga
-torso_cap_l_arm_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
+hips_cap_torso_off,models/players/stormtrooper/caps.tga
+hips_cap_r_leg_off,models/players/stormtrooper/caps.tga
+hips_cap_l_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
 l_arm_cap_torso_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
+l_arm_cap_l_hand_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
-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
+l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga
+r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torso_cap_hips_off,models/players/stormtrooper/caps.tga
+torso_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torso_cap_l_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
+
diff --git a/MBAssets3/models/players/barriss_offee/model_nocape.skin b/MBAssets3/models/players/barriss_offee/model_nocape.skin
index 1c9408945..b6855a7ca 100644
--- a/MBAssets3/models/players/barriss_offee/model_nocape.skin
+++ b/MBAssets3/models/players/barriss_offee/model_nocape.skin
@@ -1,6 +1,4 @@
 head,models/players/barriss_offee/head.tga
-head_p,*off
-head_ds,*off
 head_tunic,models/players/barriss_offee/head_tunic.tga
 head_eyes_mouth,models/players/barriss_offee/mouth_eyes.tga
 head_lashes,models/players/common/lashes.tga
@@ -29,107 +27,19 @@ l_arm,models/players/barriss_offee/torso.tga
 l_hand,models/players/barriss_offee/hands.tga
 wristguard,models/players/barriss_offee/wristguard.tga
 
-head_hair_old,*off
-torso_old,*off
-torso_old_cape,*off
-torso_old_caped,*off
-l_arm_old,*off
-l_arm_old_caped,*off
-r_arm_old,*off
-r_arm_old_caped,*off
-hips_belt_old,*off
-hips_old,*off
-legs_old,*off
-l_leg_old,*off
-r_leg_old,*off
-
-head_tunic_p,*off
-torso_p,*off
-torso_p_neck,*off
-r_arm_p,*off
-r_hand_p_wrist,*off
-l_arm_p,*off
-l_hand_p_wrist,*off
-hips_p,*off
-hips_p_torso,*off
-r_leg_p,*off
-l_leg_p,*off
-
-head_tunic_helmet,*off
-helmet,*off
-torso_inq,*off
-torso_inq_armor,*off
-r_shoulder_pad,*off
-l_shoulder_pad,*off
-wristguard_inq,*off
-hips_inq,*off
-hips_belt_inq,*off
-r_leg_inq,*off
-l_leg_inq,*off
-
-head_ac,*off
-head_hair_ac,*off
-head_hair_ac_t,*off
-torso_ac,*off
-torso_neck_ac,*off
-l_arm_ac,*off
-r_arm_ac,*off
-hips_ac,*off
-hips_belt_ac,*off
-l_leg_ac,*off
-r_leg_ac,*off
-
-torso_old_cap_hips_off,*off
-torso_old_cap_r_arm_off,*off
-torso_old_cap_l_arm_off,*off
-l_arm_old_cap_torso_off,*off
-r_arm_old_cap_torso_off,*off
-l_leg_old_cap_hips_off,*off
-r_leg_old_cap_hips_off,*off
-hips_old_cap_torso_off,*off
-hips_old_cap_r_leg_off,*off
-hips_old_cap_l_leg_off,*off
-
-torso_ac_cap_hips_off,*off
-torso_ac_cap_r_arm_off,*off
-torso_ac_cap_l_arm_off,*off
-l_arm_ac_cap_torso_off,*off
-r_arm_ac_cap_torso_off,*off
-l_leg_ac_cap_hips_off,*off
-r_leg_ac_cap_hips_off,*off
-hips_ac_cap_torso_off,*off
-hips_ac_cap_r_leg_off,*off
-hips_ac_cap_l_leg_off,*off
-
-torso_p_cap_head_off,*off
-torso_p_cap_hips_off,*off
-torso_p_cap_r_arm_off,*off
-torso_p_cap_l_arm_off,*off
-l_hand_p_cap_l_arm_off,*off
-l_arm_p_cap_l_hand_off,*off
-l_arm_p_cap_torso_off,*off
-r_hand_p_cap_r_arm_off,*off
-r_arm_p_cap_torso_off,*off
-r_arm_p_cap_r_hand_off,*off
-l_leg_p_cap_hips_off,*off
-r_leg_p_cap_hips_off,*off
-hips_p_cap_torso_off,*off
-hips_p_cap_r_leg_off,*off
-hips_p_cap_l_leg_off,*off
-
-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_r_arm_off,models/players/stormtrooper/caps.tga
-torso_cap_l_arm_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
+hips_cap_torso_off,models/players/stormtrooper/caps.tga
+hips_cap_r_leg_off,models/players/stormtrooper/caps.tga
+hips_cap_l_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
 l_arm_cap_torso_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
+l_arm_cap_l_hand_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
-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
+l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga
+r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torso_cap_hips_off,models/players/stormtrooper/caps.tga
+torso_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torso_cap_l_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
diff --git a/MBAssets3/models/players/barriss_offee/modeldata.cfg b/MBAssets3/models/players/barriss_offee/modeldata.cfg
index e7103cf2f..80a7b4305 100644
--- a/MBAssets3/models/players/barriss_offee/modeldata.cfg
+++ b/MBAssets3/models/players/barriss_offee/modeldata.cfg
@@ -6,22 +6,6 @@ sounds_default
 barriss_offee
 f
 
-sounds_academy
-barriss_offee_rogue
-f
-
-sounds_academy_dmg
-barriss_offee_rogue
-f
-
-sounds_inq
-barriss_offee_inq
-f
-
-sounds_inq_nh
-barriss_offee_rogue
-f
-
 sounds_nocape
 barriss_offee_rogue
 f
diff --git a/MBAssets3/models/players/barriss_offee/saberauth.cfg b/MBAssets3/models/players/barriss_offee/saberauth.cfg
index 2fa3ebb63..71c893570 100644
--- a/MBAssets3/models/players/barriss_offee/saberauth.cfg
+++ b/MBAssets3/models/players/barriss_offee/saberauth.cfg
@@ -6,38 +6,6 @@ saber_barriss
 saber_luminara
 0.3333
 
-sabers_inq
-saber_inquisitor6_single
-1.0
-saber_inquisitor6
-1.0
-none
-1.0
-
-sabers_inq_nh
-saber_inquisitor6_single
-1.0
-saber_inquisitor6
-1.0
-none
-1.0
-
-sabers_academy
-saber_inquisitor6_single
-1.0
-saber_inquisitor6
-1.0
-none
-1.0
-
-sabers_academy_dmg
-saber_inquisitor6_single
-1.0
-saber_inquisitor6
-1.0
-none
-1.0
-
 sabers_nocape
 saber_asajj2
 0.8500
diff --git a/MBAssets3/models/players/barriss_offee_ac/model_default.skin b/MBAssets3/models/players/barriss_offee_ac/model_default.skin
new file mode 100644
index 000000000..ded88f88e
--- /dev/null
+++ b/MBAssets3/models/players/barriss_offee_ac/model_default.skin
@@ -0,0 +1,35 @@
+head,models/players/barriss_offee/head_academy.tga
+head_hair,models/players/barriss_offee/hair_ac.tga
+head_hair_t,models/players/barriss_offee/hair_ac.tga
+head_eyes_mouth,models/players/barriss_offee/mouth_eyes.tga
+head_lashes,models/players/common/lashes.tga
+
+r_hand,models/players/barriss_offee/hands.tga
+l_hand,models/players/barriss_offee/hands.tga
+
+torso,models/players/barriss_offee/body_academy.tga
+torso_neck,models/players/barriss_offee/head_academy.tga
+l_arm,models/players/barriss_offee/body_academy.tga
+r_arm,models/players/barriss_offee/body_academy.tga
+hips,models/players/barriss_offee/legs_academy.tga
+hips_belt,models/players/barriss_offee/body_academy.tga
+l_leg,models/players/barriss_offee/legs_academy.tga
+r_leg,models/players/barriss_offee/legs_academy.tga
+
+hips_cap_torso_off,models/players/stormtrooper/caps.tga
+hips_cap_r_leg_off,models/players/stormtrooper/caps.tga
+hips_cap_l_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
+l_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+r_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga
+r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga
+l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga
+r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torso_cap_hips_off,models/players/stormtrooper/caps.tga
+torso_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torso_cap_l_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
+
diff --git a/MBAssets3/models/players/barriss_offee_ac/model_dmg.skin b/MBAssets3/models/players/barriss_offee_ac/model_dmg.skin
new file mode 100644
index 000000000..8eccbf058
--- /dev/null
+++ b/MBAssets3/models/players/barriss_offee_ac/model_dmg.skin
@@ -0,0 +1,35 @@
+head,models/players/barriss_offee/head_academy_dmg.tga
+head_hair,models/players/barriss_offee/hair_ac.tga
+head_hair_t,models/players/barriss_offee/hair_ac.tga
+head_eyes_mouth,models/players/barriss_offee/mouth_eyes.tga
+head_lashes,models/players/common/lashes.tga
+
+r_hand,models/players/barriss_offee/hands.tga
+l_hand,models/players/barriss_offee/hands.tga
+
+torso,models/players/barriss_offee/body_academy.tga
+torso_neck,models/players/barriss_offee/head_academy_dmg.tga
+l_arm,models/players/barriss_offee/body_academy.tga
+r_arm,models/players/barriss_offee/body_academy.tga
+hips,models/players/barriss_offee/legs_academy.tga
+hips_belt,models/players/barriss_offee/body_academy.tga
+l_leg,models/players/barriss_offee/legs_academy.tga
+r_leg,models/players/barriss_offee/legs_academy.tga
+
+hips_cap_torso_off,models/players/stormtrooper/caps.tga
+hips_cap_r_leg_off,models/players/stormtrooper/caps.tga
+hips_cap_l_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
+l_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+r_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga
+r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga
+l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga
+r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torso_cap_hips_off,models/players/stormtrooper/caps.tga
+torso_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torso_cap_l_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
+
diff --git a/MBAssets3/models/players/barriss_offee_ac/modeldata.cfg b/MBAssets3/models/players/barriss_offee_ac/modeldata.cfg
new file mode 100644
index 000000000..091bb1186
--- /dev/null
+++ b/MBAssets3/models/players/barriss_offee_ac/modeldata.cfg
@@ -0,0 +1,18 @@
+// breath
+breathes "1"
+
+// soundsets
+sounds_default
+barriss_offee_rogue
+f
+
+// 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/barriss_offee_ac/saberauth.cfg b/MBAssets3/models/players/barriss_offee_ac/saberauth.cfg
new file mode 100644
index 000000000..992ea56ff
--- /dev/null
+++ b/MBAssets3/models/players/barriss_offee_ac/saberauth.cfg
@@ -0,0 +1,7 @@
+all_sabers
+saber_inquisitor6_single
+1.0
+saber_inquisitor6
+1.0
+none
+1.0
\ No newline at end of file
diff --git a/MBAssets3/models/players/barriss_offee_inq/model_default.skin b/MBAssets3/models/players/barriss_offee_inq/model_default.skin
new file mode 100644
index 000000000..2f646a392
--- /dev/null
+++ b/MBAssets3/models/players/barriss_offee_inq/model_default.skin
@@ -0,0 +1,45 @@
+head,*off
+head_eyes_mouth,*off
+head_lashes,*off
+head_tunic,*off
+head_tunic_helmet,models/players/barriss_offee/head_tunic_inq.tga
+helmet,models/players/barriss_offee/helmet.tga
+
+r_hand,models/players/barriss_offee/hands_inq.tga
+l_hand,models/players/barriss_offee/hands_inq.tga
+
+torso_neck,models/players/barriss_offee/head_tunic_inq.tga
+r_arm,models/players/barriss_offee/torso_inq.tga
+r_hand_wrist,models/players/barriss_offee/torso_inq.tga
+l_arm,models/players/barriss_offee/torso_inq.tga
+l_hand_wrist,models/players/barriss_offee/torso_inq.tga
+
+torso,models/players/barriss_offee/torso_inq.tga
+torso_armor,models/players/barriss_offee/body_inq.tga
+torso_shoulder_pad,models/players/barriss_offee/body_inq.tga
+wristguard,models/players/barriss_offee/body_inq.tga
+hips,models/players/barriss_offee/body_inq.tga
+hips_belt,models/players/barriss_offee/belt_inq.tga
+r_leg,models/players/barriss_offee/boots_inq.tga
+l_leg,models/players/barriss_offee/boots_inq.tga
+
+hips_p,*off
+hips_p_torso,*off
+torso_p,*off
+
+hips_cap_torso_off,models/players/stormtrooper/caps.tga
+hips_cap_r_leg_off,models/players/stormtrooper/caps.tga
+hips_cap_l_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
+l_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+r_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga
+r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga
+l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga
+r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torso_cap_hips_off,models/players/stormtrooper/caps.tga
+torso_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torso_cap_l_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
diff --git a/MBAssets3/models/players/barriss_offee_inq/model_nh.skin b/MBAssets3/models/players/barriss_offee_inq/model_nh.skin
new file mode 100644
index 000000000..081d8997c
--- /dev/null
+++ b/MBAssets3/models/players/barriss_offee_inq/model_nh.skin
@@ -0,0 +1,45 @@
+head,models/players/barriss_offee/head_inq.tga
+head_eyes_mouth,models/players/barriss_offee/mouth_eyes.tga
+head_lashes,models/players/common/lashes.tga
+head_tunic,models/players/barriss_offee/head_tunic_inq.tga
+head_tunic_helmet,*off
+helmet,*off
+
+r_hand,models/players/barriss_offee/hands_inq.tga
+l_hand,models/players/barriss_offee/hands_inq.tga
+
+torso_neck,*off
+r_arm,models/players/barriss_offee/torso_inq.tga
+r_hand_wrist,models/players/barriss_offee/torso_inq.tga
+l_arm,models/players/barriss_offee/torso_inq.tga
+l_hand_wrist,models/players/barriss_offee/torso_inq.tga
+
+torso,models/players/barriss_offee/torso_inq.tga
+torso_armor,models/players/barriss_offee/body_inq.tga
+torso_shoulder_pad,models/players/barriss_offee/body_inq.tga
+wristguard,models/players/barriss_offee/body_inq.tga
+hips,models/players/barriss_offee/body_inq.tga
+hips_belt,models/players/barriss_offee/belt_inq.tga
+r_leg,models/players/barriss_offee/boots_inq.tga
+l_leg,models/players/barriss_offee/boots_inq.tga
+
+hips_p,*off
+hips_p_torso,*off
+torso_p,*off
+
+hips_cap_torso_off,models/players/stormtrooper/caps.tga
+hips_cap_r_leg_off,models/players/stormtrooper/caps.tga
+hips_cap_l_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
+l_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+r_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga
+r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga
+l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga
+r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torso_cap_hips_off,models/players/stormtrooper/caps.tga
+torso_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torso_cap_l_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
diff --git a/MBAssets3/models/players/barriss_offee_inq/model_prisoner.skin b/MBAssets3/models/players/barriss_offee_inq/model_prisoner.skin
new file mode 100644
index 000000000..d224b79c4
--- /dev/null
+++ b/MBAssets3/models/players/barriss_offee_inq/model_prisoner.skin
@@ -0,0 +1,45 @@
+head,models/players/barriss_offee/head_p.tga
+head_eyes_mouth,models/players/barriss_offee/mouth_eyes.tga
+head_lashes,models/players/common/lashes.tga
+head_tunic,models/players/barriss_offee/head_tunic_p.tga
+head_tunic_helmet,*off
+helmet,*off
+
+r_hand,models/players/barriss_offee/hands.tga
+l_hand,models/players/barriss_offee/hands.tga
+
+torso_neck,models/players/barriss_offee/head_tunic_p.tga
+r_arm,models/players/barriss_offee/torso_p.tga
+r_hand_wrist,models/players/barriss_offee/torso_p.tga
+l_arm,models/players/barriss_offee/torso_p.tga
+l_hand_wrist,models/players/barriss_offee/torso_p.tga
+
+torso,*off
+torso_armor,*off
+torso_shoulder_pad,*off
+wristguard,*off
+hips,*off
+hips_belt,*off
+r_leg,models/players/barriss_offee/boots_p.tga
+l_leg,models/players/barriss_offee/boots_p.tga
+
+hips_p,models/players/barriss_offee/legs_p.tga
+hips_p_torso,models/players/barriss_offee/torso_p.tga
+torso_p,models/players/barriss_offee/torso_p.tga
+
+hips_cap_torso_off,models/players/stormtrooper/caps.tga
+hips_cap_r_leg_off,models/players/stormtrooper/caps.tga
+hips_cap_l_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
+l_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+r_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga
+r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga
+l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga
+r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torso_cap_hips_off,models/players/stormtrooper/caps.tga
+torso_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torso_cap_l_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
diff --git a/MBAssets3/models/players/barriss_offee_inq/modeldata.cfg b/MBAssets3/models/players/barriss_offee_inq/modeldata.cfg
new file mode 100644
index 000000000..6b78dd4e5
--- /dev/null
+++ b/MBAssets3/models/players/barriss_offee_inq/modeldata.cfg
@@ -0,0 +1,26 @@
+// breath
+breathes "1"
+
+// soundsets
+sounds_default
+barriss_offee_inq
+f
+
+sounds_nh
+barriss_offee_rogue
+f
+
+sounds_prisoner
+barriss_offee
+f
+
+// 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/barriss_offee_inq/saberauth.cfg b/MBAssets3/models/players/barriss_offee_inq/saberauth.cfg
new file mode 100644
index 000000000..992ea56ff
--- /dev/null
+++ b/MBAssets3/models/players/barriss_offee_inq/saberauth.cfg
@@ -0,0 +1,7 @@
+all_sabers
+saber_inquisitor6_single
+1.0
+saber_inquisitor6
+1.0
+none
+1.0
\ No newline at end of file
diff --git a/MBAssets3/models/players/barriss_offee_old/model_caped.skin b/MBAssets3/models/players/barriss_offee_old/model_caped.skin
new file mode 100644
index 000000000..c9ad60317
--- /dev/null
+++ b/MBAssets3/models/players/barriss_offee_old/model_caped.skin
@@ -0,0 +1,38 @@
+head,models/players/barriss_offee/head_old_hooded.tga
+head_hair,*off
+head_eyes_mouth,models/players/barriss_offee/mouth_eyes_hooded.tga
+head_lashes,models/players/common/lashes.tga
+head_cape,models/players/barriss_offee/cape_old.tga
+torso_neck_ac,models/players/barriss_offee/head_old.tga
+
+torso,*off
+torso_cape,models/players/barriss_offee/cape_old.tga
+torso_caped,models/players/barriss_offee/body_old.tga
+l_arm,*off
+l_arm_caped,models/players/barriss_offee/body_old.tga
+r_arm,*off
+r_arm_caped,models/players/barriss_offee/body_old.tga
+r_hand,models/players/barriss_offee/hands.tga
+l_hand,models/players/barriss_offee/hands.tga
+hips_belt,models/players/barriss_offee/cape_old.tga
+hips,models/players/barriss_offee/body_old.tga
+hips_legs,models/players/barriss_offee/legs_old.tga
+l_leg,models/players/barriss_offee/legs_old.tga
+r_leg,models/players/barriss_offee/legs_old.tga
+
+hips_cap_torso_off,models/players/stormtrooper/caps.tga
+hips_cap_r_leg_off,models/players/stormtrooper/caps.tga
+hips_cap_l_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
+l_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+r_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga
+r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga
+l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga
+r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torso_cap_hips_off,models/players/stormtrooper/caps.tga
+torso_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torso_cap_l_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/barriss_offee_old/model_default.skin b/MBAssets3/models/players/barriss_offee_old/model_default.skin
new file mode 100644
index 000000000..f2d92796d
--- /dev/null
+++ b/MBAssets3/models/players/barriss_offee_old/model_default.skin
@@ -0,0 +1,38 @@
+head,models/players/barriss_offee/head_old.tga
+head_hair,models/players/barriss_offee/hair_old.tga
+head_eyes_mouth,models/players/barriss_offee/mouth_eyes.tga
+head_lashes,models/players/common/lashes.tga
+head_cape,*off
+torso_neck_ac,models/players/barriss_offee/head_old.tga
+
+torso,models/players/barriss_offee/body_old.tga
+torso_cape,*off
+torso_caped,*off
+l_arm,models/players/barriss_offee/body_old.tga
+l_arm_caped,*off
+r_arm,models/players/barriss_offee/body_old.tga
+r_arm_caped,*off
+r_hand,models/players/barriss_offee/hands.tga
+l_hand,models/players/barriss_offee/hands.tga
+hips_belt,models/players/barriss_offee/cape_old.tga
+hips,models/players/barriss_offee/body_old.tga
+hips_legs,models/players/barriss_offee/legs_old.tga
+l_leg,models/players/barriss_offee/legs_old.tga
+r_leg,models/players/barriss_offee/legs_old.tga
+
+hips_cap_torso_off,models/players/stormtrooper/caps.tga
+hips_cap_r_leg_off,models/players/stormtrooper/caps.tga
+hips_cap_l_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
+l_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+r_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga
+r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga
+l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga
+r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torso_cap_hips_off,models/players/stormtrooper/caps.tga
+torso_cap_r_arm_off,models/players/stormtrooper/caps.tga
+torso_cap_l_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/barriss_offee_old/modeldata.cfg b/MBAssets3/models/players/barriss_offee_old/modeldata.cfg
new file mode 100644
index 000000000..155065472
--- /dev/null
+++ b/MBAssets3/models/players/barriss_offee_old/modeldata.cfg
@@ -0,0 +1,18 @@
+// breath
+breathes "1"
+
+// soundsets
+sounds_default
+barriss_offee
+f
+
+// 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/barriss_offee_old/saberauth.cfg b/MBAssets3/models/players/barriss_offee_old/saberauth.cfg
new file mode 100644
index 000000000..4b3d627ed
--- /dev/null
+++ b/MBAssets3/models/players/barriss_offee_old/saberauth.cfg
@@ -0,0 +1,7 @@
+all_sabers
+saber_barriss
+0.6277
+saber_barriss
+0.6277
+saber_luminara
+0.3333
\ 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 06e17e6b1..e49a66198 100644
--- a/MBAssets3/models/players/bastila/model_default.skin
+++ b/MBAssets3/models/players/bastila/model_default.skin
@@ -3,11 +3,10 @@ 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_eyes_mouth,models/players/bastila/mouth_eyes.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
@@ -18,8 +17,6 @@ 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_layers_b,*off
-hips_layers_b,*off
 
 r_leg_cap_hips_off,models/players/stormtrooper/caps.tga
 l_leg_cap_hips_off,models/players/stormtrooper/caps.tga
diff --git a/MBAssets3/models/players/bastila/model_goth.skin b/MBAssets3/models/players/bastila/model_goth.skin
new file mode 100644
index 000000000..0aaaac0db
--- /dev/null
+++ b/MBAssets3/models/players/bastila/model_goth.skin
@@ -0,0 +1,36 @@
+head,models/players/bastila/head_goth.tga
+head_back,models/players/bastila/hair_goth.tga
+head_hair,*off
+head_hair_b,models/players/bastila/hair_goth.tga
+head_hairtie,models/players/bastila/hairtie.tga
+head_eyes_mouth,models/players/bastila/mouth_eyes.tga
+head_neckpiece,models/players/bastila/extras_sith.tga
+hips,models/players/bastila/body_sith.tga
+hips_belt,models/players/bastila/extras_sith.tga
+l_arm,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
+
+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/bastila/model_sith.skin b/MBAssets3/models/players/bastila/model_sith.skin
index 609607c7e..0ebb5c4b4 100644
--- a/MBAssets3/models/players/bastila/model_sith.skin
+++ b/MBAssets3/models/players/bastila/model_sith.skin
@@ -1,13 +1,12 @@
 head,models/players/bastila/head_sith.tga
-head_back,models/players/bastila/hair_sith.tga
+head_back,models/players/bastila/hair2.tga
 head_hair,*off
-head_hair_b,models/players/bastila/hair_sith.tga
+head_hair_b,models/players/bastila/hair2.tga
 head_hairtie,models/players/bastila/hairtie.tga
-head_eyes_mouth,models/players/common/mouth_eyes8.tga
+head_eyes_mouth,models/players/freedon_nadd/mouth_eyes.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/boots_hands_sith.tga
 l_leg,models/players/bastila/boots_hands_sith.tga
@@ -16,10 +15,8 @@ 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,*off
-hips_layers,*off
-torso_layers_b,models/players/bastila/layers_sith.tga
-hips_layers_b,models/players/bastila/layers_sith.tga
+torso_layers,models/players/bastila/layers_sith.tga
+hips_layers,models/players/bastila/layers_sith.tga
 
 r_leg_cap_hips_off,models/players/stormtrooper/caps.tga
 l_leg_cap_hips_off,models/players/stormtrooper/caps.tga
diff --git a/MBAssets3/models/players/bastila/model_undead.skin b/MBAssets3/models/players/bastila/model_undead.skin
new file mode 100644
index 000000000..1bf346de7
--- /dev/null
+++ b/MBAssets3/models/players/bastila/model_undead.skin
@@ -0,0 +1,36 @@
+head,models/players/bastila/head_undead.tga
+head_back,models/players/bastila/hair2.tga
+head_hair,*off
+head_hair_b,models/players/bastila/hair2.tga
+head_hairtie,models/players/bastila/hairtie.tga
+head_eyes_mouth,models/players/common/mouth_eyes10.tga
+head_neckpiece,models/players/bastila/extras_sith.tga
+hips,models/players/bastila/body_sith.tga
+hips_belt,models/players/bastila/extras_sith.tga
+l_arm,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
+
+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/bastila/model_yellow.skin b/MBAssets3/models/players/bastila/model_yellow.skin
index 1fbbe5341..6e1d33308 100644
--- a/MBAssets3/models/players/bastila/model_yellow.skin
+++ b/MBAssets3/models/players/bastila/model_yellow.skin
@@ -3,11 +3,10 @@ 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_eyes_mouth,models/players/bastila/mouth_eyes.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
@@ -18,8 +17,6 @@ torso,models/players/bastila/body.tga
 torso_augment,*off
 torso_layers,models/players/bastila/layers.tga
 hips_layers,models/players/bastila/layers.tga
-torso_layers_b,*off
-hips_layers_b,*off
 
 r_leg_cap_hips_off,models/players/stormtrooper/caps.tga
 l_leg_cap_hips_off,models/players/stormtrooper/caps.tga
diff --git a/MBAssets3/models/players/bastila/modeldata.cfg b/MBAssets3/models/players/bastila/modeldata.cfg
index aac6f8661..19a7896e9 100644
--- a/MBAssets3/models/players/bastila/modeldata.cfg
+++ b/MBAssets3/models/players/bastila/modeldata.cfg
@@ -10,6 +10,14 @@ sounds_sith
 bastila_sith
 f
 
+sounds_goth
+bastila_sith
+f
+
+sounds_undead
+bastila_sith
+f
+
 // trueview
 offsetX	"1.5"
 
diff --git a/MBAssets3/models/players/bastila/saberauth.cfg b/MBAssets3/models/players/bastila/saberauth.cfg
index 7a8fc0963..2991663c3 100644
--- a/MBAssets3/models/players/bastila/saberauth.cfg
+++ b/MBAssets3/models/players/bastila/saberauth.cfg
@@ -12,4 +12,20 @@ kotorsab
 saber_bastila
 1.0
 none
+1.0
+
+sabers_goth
+kotorsab
+1.0
+saber_bastila
+1.0
+none
+1.0
+
+sabers_undead
+kotorsab
+1.0
+saber_bastila
+1.0
+none
 1.0
\ No newline at end of file
diff --git a/MBAssets3/models/players/bastila_sith/model_default.skin b/MBAssets3/models/players/bastila_sith/model_default.skin
new file mode 100644
index 000000000..76a455bad
--- /dev/null
+++ b/MBAssets3/models/players/bastila_sith/model_default.skin
@@ -0,0 +1,38 @@
+head,models/players/bastila/head2.tga
+head_back,models/players/bastila/hair2.tga
+head_hair,*off
+head_hair_b,models/players/bastila/hair2.tga
+head_hairtie,models/players/bastila/hairtie.tga
+head_eyes_mouth,models/players/exar_kun/mouth_eyes.tga
+
+torso,models/players/bastila_sith/torsoOfficer.tga
+torso_parts,models/players/bastila_sith/bodyOfficer.tga
+l_arm,models/players/bastila_sith/torsoOfficer.tga
+l_wrist,models/players/bastila_sith/bodyOfficer.tga
+l_hand,models/players/bastila_sith/torsoOfficer.tga
+r_arm,models/players/bastila_sith/torsoOfficer.tga
+r_wrist,models/players/bastila_sith/bodyOfficer.tga
+r_hand,models/players/bastila_sith/torsoOfficer.tga
+
+hips,models/players/bastila_sith/body_tav.tga
+l_leg,models/players/bastila_sith/boots_tav.tga
+r_leg,models/players/bastila_sith/boots_tav.tga
+hips_belt,models/players/bastila_sith/boots_tav.tga
+hips_robe,models/players/bastila_sith/robe_tav.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_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
+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
\ No newline at end of file
diff --git a/MBAssets3/models/players/bastila_sith/modeldata.cfg b/MBAssets3/models/players/bastila_sith/modeldata.cfg
new file mode 100644
index 000000000..17a4371a2
--- /dev/null
+++ b/MBAssets3/models/players/bastila_sith/modeldata.cfg
@@ -0,0 +1,18 @@
+// breath
+breathes "1"
+
+// soundsets
+sounds_default
+bastila_sith
+f
+
+// 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/bastila_sith/saberauth.cfg b/MBAssets3/models/players/bastila_sith/saberauth.cfg
new file mode 100644
index 000000000..337b0b7d6
--- /dev/null
+++ b/MBAssets3/models/players/bastila_sith/saberauth.cfg
@@ -0,0 +1,8 @@
+all_sabers
+kotorsab
+1.0
+saber_bastila
+1.0
+none
+1.0
+
diff --git a/MBAssets3/shaders/barriss_offee.shader b/MBAssets3/shaders/barriss_offee.shader
index 8bd861ed6..03ca6af63 100644
--- a/MBAssets3/shaders/barriss_offee.shader
+++ b/MBAssets3/shaders/barriss_offee.shader
@@ -18,6 +18,16 @@ models/players/barriss_offee/cape
 	}
 }
 
+models/players/barriss_offee/skirt
+{
+	cull	disable
+	{
+		map models/players/barriss_offee/skirt
+		depthWrite
+		rgbGen lightingDiffuse
+	}
+}
+
 models/players/barriss_offee/body_inq
 {
         nopicmip
@@ -114,6 +124,7 @@ models/players/barriss_offee/boots_inq
 
 models/players/barriss_offee/cape_old
 {
+	cull	disable
     {
         map models/players/barriss_offee/cape_old
         rgbGen lightingDiffuse

From 8a3d21e398edbf0bb4f6c4421bc6a81c7240b474 Mon Sep 17 00:00:00 2001
From: Unguided <buektomi@gmail.com>
Date: Sun, 1 Mar 2026 16:09:24 +0100
Subject: [PATCH 72/82] added Inquisitor Barriss to v9_Inquis / TCW Barriss to
 h10_JHeal / rogue Barriss to v9_SAssass

---
 .../ext_data/mb2/character/h10_JHeal.mbch     | 40 ++++++++++---------
 .../ext_data/mb2/character/v9_Inquis.mbch     |  4 ++
 .../ext_data/mb2/character/v9_SAssass.mbch    |  9 +++++
 3 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/h10_JHeal.mbch b/z_MBLegends/ext_data/mb2/character/h10_JHeal.mbch
index d532d3507..2b8432e14 100644
--- a/z_MBLegends/ext_data/mb2/character/h10_JHeal.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h10_JHeal.mbch
@@ -24,34 +24,38 @@ ClassInfo
 	model	"barriss_offee"
 	skin		"default"
 	uishader		"models/players/barriss_offee/mb2_icon_default"
+
+	model_1	"barriss_offee"
+	skin_1		"cloak"
+	uishader_1		"models/players/barriss_offee/mb2_icon_cloak"
 	
 	model_2	"adigallia"
 	skin_2		"robed"
 	uishader_2	"models/players/adigallia/mb2_icon_robed"
 	
-	model_1 	"adigallia"
-	skin_1		"default"
-	uishader_1 	"models/players/adigallia/mb2_icon_default"
-	
-	model_3	"jedipack_hb"
-	skin_3		"zhar"
-	uishader_3	"models/players/jedipack_hb/mb2_icon_zhar"
+	model_3 	"adigallia"
+	skin_3		"default"
+	uishader_3 	"models/players/adigallia/mb2_icon_default"
 	
-	model_4	"rey"
-	skin_4		"default"
-	uishader_4	"models/players/rey/mb2_icon_default"
+	model_4	"jedipack_hb"
+	skin_4		"zhar"
+	uishader_4	"models/players/jedipack_hb/mb2_icon_zhar"
 	
 	model_5	"rey"
-	skin_5		"jedi"
-	uishader_5	"models/players/rey/mb2_icon_jedi"
+	skin_5		"default"
+	uishader_5	"models/players/rey/mb2_icon_default"
+	
+	model_6	"rey"
+	skin_6		"jedi"
+	uishader_6	"models/players/rey/mb2_icon_jedi"
 	
-	model_6	"cade"
-	skin_6		"default"
-	uishader_6	"models/players/cade/mb2_icon_default"
+	model_7	"cade"
+	skin_7		"default"
+	uishader_7	"models/players/cade/mb2_icon_default"
 	
-	model_7	"jedipack_hb"
-	skin_7		"mical"
-	uishader_7	"models/players/jedipack_hb/mb2_icon_mical"
+	model_8	"jedipack_hb"
+	skin_8		"mical"
+	uishader_8	"models/players/jedipack_hb/mb2_icon_mical"
 	
 	saber1			  saber_barriss_legends
 	sabercolor		  4
diff --git a/z_MBLegends/ext_data/mb2/character/v9_Inquis.mbch b/z_MBLegends/ext_data/mb2/character/v9_Inquis.mbch
index 9b3f40871..ee3a68db8 100644
--- a/z_MBLegends/ext_data/mb2/character/v9_Inquis.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v9_Inquis.mbch
@@ -53,6 +53,10 @@ ClassInfo
 	skin_2			"default"
 	uishader_2		"models/players/tenthbrother/mb2_icon_default"
 
+	model_3		"barriss_offee_inq"
+	skin_3			"default"
+	uishader_3		"models/players/barriss_offee_inq/mb2_icon_default"
+
 	saber1				saber_inquisitor_legends
 	sabercolor			0
 
diff --git a/z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch b/z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch
index 4b1c42a13..2f579ad38 100644
--- a/z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch
@@ -58,6 +58,10 @@ ClassInfo
 	model_5	"darthkrayt2"
 	skin_5		"default"
 	uishader_5	"models/players/darthkrayt2/mb2_icon_default"
+	
+	model_6	"barriss_offee"
+	skin_6		"nocape"
+	uishader_6	"models/players/barriss_offee/mb2_icon_nocape"
 		
 	saber1		alora_legends
 	sabercolor		0
@@ -73,6 +77,11 @@ ClassInfo
 	sabercolor_2	0
 	saber2_2		saber_asharad
 	saber2color_2	0
+	
+	saber1_3		saber_asajj_legacy
+	sabercolor	0_3
+	saber2_3		saber_asajj2_legacy
+	saber2color_3	0	
 }
 
 description "Sith Assassin

From b071f4ee870fa4386166ea0469998f5c8e5ef9dd Mon Sep 17 00:00:00 2001
From: Cinder66 <veraver706@gmail.com>
Date: Tue, 3 Mar 2026 08:20:15 +0100
Subject: [PATCH 73/82] h3_Rex description

---
 z_MBLegends/ext_data/mb2/character/h3_Rex.mbch | 1 +
 1 file changed, 1 insertion(+)

diff --git a/z_MBLegends/ext_data/mb2/character/h3_Rex.mbch b/z_MBLegends/ext_data/mb2/character/h3_Rex.mbch
index af0a7d507..8f41f0f9b 100644
--- a/z_MBLegends/ext_data/mb2/character/h3_Rex.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h3_Rex.mbch
@@ -95,6 +95,7 @@ A hard-boiled leader with high mobility and powerful Dual Pistols.
 - Strength (1)
 - Dexterity (3)
 - Stamina (3)
+- Healing (3)
 - Blast Armor
 - Physical Resist
 - Anti-Mind Trick (1)

From 71ee7f91f80ac999dc21045d38c5e873a39d95f4 Mon Sep 17 00:00:00 2001
From: Unguided <buektomi@gmail.com>
Date: Tue, 3 Mar 2026 08:32:52 +0100
Subject: [PATCH 74/82] re-added Jolee to JApostate (forgot to do it when
 modelpath change happened)

---
 z_MBLegends/ext_data/mb2/character/h10_JApostate.mbch | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/z_MBLegends/ext_data/mb2/character/h10_JApostate.mbch b/z_MBLegends/ext_data/mb2/character/h10_JApostate.mbch
index 105b76e54..72969af31 100644
--- a/z_MBLegends/ext_data/mb2/character/h10_JApostate.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h10_JApostate.mbch
@@ -45,12 +45,19 @@ ClassInfo
 	model_2		"gwethenea"
 	skin_2		"jedihood"
 	uishader_2	"models/players/gwethenea/mb2_icon_jedihood"
+	
+	model_3		"jolee"
+	skin_3		"default"
+	uishader_3	"models/players/jolee/mb2_icon_default"
 		
-	saber1			saber_visas
+	saber1		saber_visas
 	sabercolor		5	
 	
 	saber1_1	kotorsab
 	sabercolor_1	3
+	
+	saber1_2	saber_jolee
+	sabercolor_2	3
 }
 
 description	"Jedi Apostate

From e242e5ba31d8c3451ee9612a2366f84c75dc4e74 Mon Sep 17 00:00:00 2001
From: Unguided <buektomi@gmail.com>
Date: Tue, 3 Mar 2026 08:34:54 +0100
Subject: [PATCH 75/82] RotJ Luke 'robedown' swapped to 'robeup' (the brown
 caped skin) on community request

---
 z_MBLegends/ext_data/mb2/character/h10_LukeSky.mbch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/h10_LukeSky.mbch b/z_MBLegends/ext_data/mb2/character/h10_LukeSky.mbch
index a2b2efd6b..8578e4cc3 100644
--- a/z_MBLegends/ext_data/mb2/character/h10_LukeSky.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h10_LukeSky.mbch
@@ -53,8 +53,8 @@ skin_2       "fd"
 uishader_2   "models/players/luke_rotj/mb2_icon_fd"
 
 model_3      "luke_rotj"
-skin_3       "robedown"
-uishader_3   "models/players/luke_rotj/mb2_icon_robedown"
+skin_3       "robeup"
+uishader_3   "models/players/luke_rotj/mb2_icon_robeup"
 
 model_4      "luke_rotj"
 skin_4       "endor"

From bb6a6b8bd0881ecd61b24ff4969e4ea4485f5594 Mon Sep 17 00:00:00 2001
From: Unguided <buektomi@gmail.com>
Date: Wed, 4 Mar 2026 00:35:23 +0100
Subject: [PATCH 76/82] updated models readme

---
 MBII Maps-Models Credits.txt | 254 ++++++++++++++++++++---------------
 1 file changed, 142 insertions(+), 112 deletions(-)

diff --git a/MBII Maps-Models Credits.txt b/MBII Maps-Models Credits.txt
index edb5e3145..984bae10a 100644
--- a/MBII Maps-Models Credits.txt	
+++ b/MBII Maps-Models Credits.txt	
@@ -507,8 +507,6 @@ This pack includes the following models and skins:
 
 =====================================================================
 
-==================
-
 Dragoan, KhorneSyrup:
 * B1 Battledroid - https://jkhub.org/files/file/3772-battle-droid-ultimate-mod/
 
@@ -521,8 +519,9 @@ DT85:
 * Stormtrooper - First Order - https://jkhub.org/files/file/2387-dt-stormtrooper-ep7/
 * Luke Skywalker - The Force Awakens - https://jkhub.org/files/file/2535-dt-luke-ep7/
 
-DT85, Unguided (aliens kitbash, some textures):
+DT85, Unguided (aliens kitbash):
 * Rebel Commando
+* Rebel Alderaanian Heavy Trooper
 
 Frost:
 * Naboo Guard
@@ -542,7 +541,7 @@ Kahzmat:
 Lervish:
 * BX Commando Droid
 * Droideka
-* Kreia / Darth Traya
+* Kreia/Traya (edited by Swagmaster)
 * Visas Marr
 
 Liberty Ashford:
@@ -557,7 +556,6 @@ Major Clod:
 Mars Marshall:
 * Aurra Sing - https://jkhub.org/files/file/639-aurra-sing-vm/
 * ClonesPac
-* General Grievous - http://jediknight2.filefront.com/file/General_Grievous;43470
 * Magna Guard - https://jkhub.org/files/file/600-magnaguard-vm/
 * Younglings - https://jkhub.org/files/file/603-younglings-vm/
 * Zam Wesell - https://jkhub.org/files/file/575-zam-wesell-vme/
@@ -584,15 +582,15 @@ Scerendo:
 * Rey - https://jkhub.org/files/file/2903-rey-of-jakku-the-last-jedi/
 * Supreme Leader Snoke
 
-MonsoonTide, Pahricida, Mat Gaunt:
-* Rebel Guerilla
-
 Scerendo, P4kistan:
 * Sith Technician (TROS)
 
 Scerendo, Swegmaster:
 * Jedi Female (Sevrance Tann, Naat Reath)
 
+MonsoonTide, Pahricida, Mat Gaunt:
+* Rebel Guerilla
+
 =Someone=:
 * Antilles (aka Desert Rebel)
 
@@ -608,8 +606,8 @@ Toshi:
 * Luke Skywalker Ep. VI - https://jkhub.org/files/file/1663-toshis-rotj-luke-skywalker/
 * Yoda - https://jkhub.org/files/file/1005-toshis-yoda/
 
-HapSlash, Infinity Blade, Frost (mb2 face):
-* Anakin Ep. III - https://jkhub.org/files/file/1120-hs-anakin-skywalker/
+HapSlash, Infinity Blade, Frost (mb2 face for ep3 skin):
+* Anakin Ep. II-III - https://jkhub.org/files/file/1120-hs-anakin-skywalker/
 
 Kualan, yeyo JK:
 * Adi Gallia - https://jkhub.org/files/file/2196-adi-gallia/
@@ -623,8 +621,8 @@ Spanki, HapSlash:
 LucasArts, Kualan
 * Bail Organa - https://jkhub.org/files/file/2946-galactic-senators-pack/
 
-Kualan
-* Barriss Offee (face texture by EXE Noob)
+MikCZ, Kualan, Noob:
+* Barriss Offee 
 
 Jeff, Peneke Development team (Lod Creation + Optimization):
 * Bespin Chewbacca
@@ -677,7 +675,7 @@ HapSlash, Kualan, LucasArts, lervish
 ZanderNao, Phazzar, OCD2:
 * Moralo Eval - https://jkhub.org/files/file/4386-phindian-moralo-eval/
 
-HapSlash, yeyo JK, Tompa9, Jedinoob124:
+HapSlash, MikCZ, yeyo JK, Tompa9, Jedinoob124:
 * Obi-Wan Kenobi Episode 1 - https://jkhub.org/files/file/3454-obi-wan-kenobi-from-episode-i/
 
 HapSlash, Tompa9, yeyo JK, Maestro Obi, Elek Andor:
@@ -691,8 +689,9 @@ DT85, Plasma:
 
 Toshi (Alejandro Argandona), Frost:
 * Palpatine - https://jkhub.org/files/file/1007-supreme-chancellor-palpatine/
+* General Grievous
 
-Toshi (Alejandro Argandona), ViceK, Vitez, GP Channel: 
+Toshi (Alejandro Argandona), ViceK, Vitez, GP: 
 * Palpatine (Emperor / Sidious) - https://jkhub.org/files/file/2099-the-emperor-episode-6/
 
 Mars Marshall, MisterPunch, KMan, RJW_ca, =Someone=:
@@ -722,13 +721,13 @@ Chairwalker, redsaurus:
 Lervish, Kestrel (soundpack), Swagmaster (some sounds):
 * Han Solo - The Force Awakens - https://jkhub.org/files/file/2588-old-han-ep7/
 
-Hapslash, Some0ne, Kualan, Lervish, Plasma, EXE Noob (TRoS helmet):
+Hapslash, Some0ne, Kualan, Lervish, Plasma, Noob (TRoS helmet):
 * Kylo Ren - https://jkhub.org/files/file/2977-kylo-ren-tfa-tlj/
 
 Doughnuts, Scerendo:
 * Rey (Dark Vision)
 
-GP Channel (textures only):
+GP (textures):
 * Palpatine (TROS)
 * Jaden Korr remaster - https://jkhub.org/files/file/3622-jaden-korr-remastered-from-movie-duels-10/
 
@@ -738,7 +737,7 @@ PreFXDesigns, Doughnuts (additional helmet variants):
 PreFXDesigns
 * Jedi Revan - https://jkhub.org/files/file/3512-jedi-knight-revan-by-prefxdesigns/
 
-Cadellin, Cerez, Kazi (some sounds):
+MikCZ, Cadellin, Cerez, Kazi (some sounds):
 * Ahsoka Tano - https://jkhub.org/files/file/2411-ahsoka-tano/
 
 Hirman, GoodOl'Ben (improved):
@@ -769,10 +768,10 @@ Doughnuts:
 * Second Sister
 * Din Djarin
 
-LucasArts, Toshi, Swagmaster, GP channel, Tompa9:
+LucasArts, Toshi, Swagmaster, GP, Tompa9:
 * Luke Skywalker - The Mandalorian
 
-Tompa9, GP Channel, HapSlash, Swegmaster
+Tompa9, GP, HapSlash, Swegmaster
 * Bultar Swan - https://jkhub.org/files/file/3114-bultar-swan/
 
 ZanderNao:
@@ -797,7 +796,7 @@ Jeff:
 GP, Swegmaster:
 * OWK Kenobi
 
-EXE Noob, DT85, Swegmaster:
+Noob, DT85, Swegmaster:
 * Shirtless Maul
 
 DT85, Mat Gaunt:
@@ -815,14 +814,11 @@ Good Ol' Ben:
 * Alora Reskin
 
 Tompa9, Leaversa, HapSlash, Toshi:
-* Anakin Skywalker CW
+* Anakin Skywalker CW03
 
 ACiDuS, Duncan_10158:
 * Bronze Droideka
 
-Bioware - Circa, swegmaster (Improved weighting)
-* Bastila Shan - https://jkhub.org/files/file/2909-bastila-shan/
-
 Mars Marshall, HapSlash, =Someone=:
 * Commander Keller
 
@@ -881,7 +877,7 @@ BIOWARE:
 
 Slaughter:
 * Darth Tiras - https://jkhub.org/files/file/997-darth-tiras/
-* Lord Agathon / Pale Reborn - https://jkhub.org/files/file/999-lord-agathon/
+* Lord Agathon (Pale Reborn) - https://jkhub.org/files/file/999-lord-agathon/
 * Rovas Galen (Swamptrooper) - https://jkhub.org/files/file/998-rovas-galen/
 
 Infinity Blade:
@@ -891,9 +887,12 @@ Tyrael64:
 * Ootyr, Rodian Bounty Hunter - https://mrwonko.de/jk3files/Jedi%20Academy/Skins/Others/57905/
 
 swegmaster, AshuraDX, HapSlash, Kitsu-Nesh'Kaa#7699 (LOD fix):
-* Obi-Wan Kenobi CW
+* Obi-Wan Kenobi CW03
 * Mace Windu CW
 
+swegmaster, GP, Unguided, AshuraDX, HapSlash:
+* Obi-Wan Kenobi TCW
+
 Major Clod:
 * Wookiee Player Model v1.0 - http://jediknight.filefront.com/file.info?ID=3349
 
@@ -971,10 +970,7 @@ ShenLong Kazama, HapSlash:
 * A'Sharad Hett - https://jkhub.org/files/file/1892-slk-asharad-hett/
 
 Omega, Unguided (optimization):
-* Darth Krayt (Yuuzhan Vong armor)
-
-DT85, Unguided:
-* Sariss
+* Darth Krayt (Vong armor)
 
 Mat Gaunt:
 * 4-LOM
@@ -1016,56 +1012,6 @@ Mat Gaunt, Unguided:
 * Ithorian Civilian - https://jkhub.org/files/file/3950-ithorian-civilian/
 * Mudtrooper
 
-EXE Noob (textures only):
-* BX Commando Droid (all skins except default)
-* Captain Cardinal
-* Clone Trooper 87th Sentinel Corps
-* Clone Trooper Cobalt Hero
-* Clone Trooper Lament Seeker
-* Clone Trooper "Rancor" Battallion
-* CT-5555 "Fives" (helmeted/unhelmeted)
-* Captain Fordo
-* Captain Grey
-* Captain Keeli
-* Clone Nemec
-* Commander Cody (Phase 1)
-* Commander Gree (Phase 2)
-* Commando Gregor/Urban/Camouflage
-* Droideka (Bedlam)
-* Gold First Order "Pyre" Stormtrooper 
-* Imperial Weapons Technician (Rebels)
-* Magnaguard (Bedlam)
-* SBD (Bedlam)
-* Sith Empire Trooper (Hazmat/Hoth/Korriban/Yavin)
-* TFA Stormtrooper Executioner
-* TFA Stormtrooper Finn
-
-Unguided (kitbash only):
-* Abednedo Resistance Pilot
-* Cade Skywalker
-* Han Solo (Hoth)
-* Imperial Officer (male/female)
-* Luke Skywalker (Ceremonial) - https://jkhub.org/files/file/3951-ceremonial-luke-skywalker/
-* Luke Skywalker (Dark Empire)
-* Luke Skywalker (Heir to the Empire)
-* Luke Skywalker (Hoth)
-* Luke Skywalker (Grand Master)
-* Luke Skywalker (Shadows of the Empire)
-* Rebel Alderaanian Heavy Trooper
-* Rebel Grenadier
-* Rebel Guerilla (female)
-* Rebel Pilot (female)
-* Rebel Vanguard
-* Sith Pureblood
-* Sullustan Rebel Pilot
-* TIE Pilot (male/female)
-
-Unguided, P4kistan:
-* Rebel Pathfinder
-
-Frenzy, Unguided:
-* Zabrak Female Elite Trooper
-
 Luckxzs:
 * Chagrian species
 https://jkhub.org/files/file/2695-chagrians/
@@ -1096,7 +1042,7 @@ Swegmaster:
 
 Mongol the Unwise:
 * Sith Eradicator
-* Sith Empire Trooper (logo fix by EXE Noob)
+* Sith Empire Trooper (logo fix by Noob)
 * Kao Cen Darach (textured by GP)
 
 Noodle:
@@ -1104,6 +1050,7 @@ Noodle:
 * Nightbrother - https://jkhub.org/files/file/4313-nightbrother/
 * Nightsister - https://jkhub.org/files/file/3877-nightsister/
 * Nightsister Zombie - https://jkhub.org/files/file/3749-nightsister-zombie/
+* Nightsister Mother - https://jkhub.org/files/file/4449-nightsister-anyssa/
 * Sio Bibble - https://jkhub.org/files/file/4089-sio-bibble/
 * Tholothian Smuggler - https://jkhub.org/forums/topic/8690-noodles-wip-zone/page/8/?tab=comments#comment-160943
 * Togruta Male - https://jkhub.org/files/file/4407-male-togruta-wabashitosh-talo/
@@ -1116,10 +1063,8 @@ https://jkhub.org/files/file/2647-beachtrooper/
 VarsityPuppet
 * Ajunta Pall - https://deadlystream.com/files/file/1276-spectral-ajunta-pall-canonical-appearance/
 
-Seth Holloway (face textures only):
-* Jolee Bindo
-* Juhani
-* Young Canderous
+Seth Holloway (face texture):
+* Young Canderous 
 
 Vioxini
 * Babu Frik
@@ -1130,7 +1075,56 @@ Omega, Noob:
 Plasma, Tompa, DT85, GP, Khaimer, MikCZ
 * Crime Lord Maul - https://jkhub.org/files/file/4324-maul-tcw-crimson-dawn/
 
-EXE Noob, Unguided:
+Unguided, Frenzy:
+* Zabrak Female Elite Trooper
+
+Unguided, Vade Parvis:
+* TIE Pilot (male/female)
+* Rebel Vanguard
+
+Unguided, HapSlash:
+* Rebel Guerilla (female)
+
+Unguided, HapSlash, Spanki:
+* Sith Pureblood
+
+Unguided, Toshi, Raven Soft:
+* Luke Skywalker (Hoth)
+
+Unguided, Toshi, GP, Mat Gaunt:
+* Luke Skywalker (Shadows of the Empire)
+
+Unguided, DT85, HapSlash:
+* Luke Skywalker (Heir to the Empire)
+* Luke Skywalker (Grand Master)
+* Cade Skywalker
+* Sariss
+
+Unguided, Scerendo:
+* Sullustan Rebel Pilot
+
+Unguided, Scerendo, HapSlash:
+* Imperial Officer (male/female)
+* Rebel Pilot (female)
+
+Unguided, Scerendo, Mat Gaunt:
+* Han Solo (Hoth)
+* Resistance Trooper
+
+Unguided, Scerendo, Toshi:
+* Luke Skywalker (Ceremonial) - https://jkhub.org/files/file/3951-ceremonial-luke-skywalker/
+
+Unguided, Scerendo, P4kistan:
+* Abednedo Resistance Pilot
+* Rebel Pathfinder
+
+Unguided, Toshi, Brawl:
+* Luke Skywalker (Dark Empire)
+
+Unguided, GP, Hellkobra:
+* Starkiller (TFU)
+
+Noob, Unguided:
 * Anakin Skywalker "Nelvaan Trials" - https://jkhub.org/files/file/4183-the-six-swole-pack/
 * Ben Swolo - https://jkhub.org/files/file/4183-the-six-swole-pack/
 * Dagan Gera
@@ -1146,53 +1140,57 @@ EXE Noob, Unguided:
 * Narkina Guard
 * Narkina Garrison Trooper
 * Narkina Prisoner
+* Uthar Wynn
 
 GP, Unguided:
+* Bastila Shan
 * Bos Aseca - https://jkhub.org/files/file/3962-boc-aseca/
 * Cal Kestis
 * Darth Bane - https://sketchfab.com/3d-models/star-wars-darth-bane-head-d738a94edce348f8a4f8e1c4d0df75a8
 * Darth Maladi - https://jkhub.org/files/file/3949-the-one-sith-pack-darth-krayt-darth-wyyrlok-darth-maladi/
 * Freedon Nadd - https://jkhub.org/files/file/3944-tales-of-the-sith-pack/
 * Gallius Rax
-* Republic Officer
-* Sith Officer
+* Jolee Bindo
 * Jorak Uln
-* Yuthura Ban 
-
-GP, EXE Noob, Unguided:
-* Uthar Wynn
+* Old Republic Officer skin
+* Sith Officer skin
+* Yuthura Ban
 
 OCD2, Mat Gaunt:
 * Iden Versio
 
+OCD2, Unguided:
+* Rebel Grenadier
+
 OCD2, Omega:
 * Undead Deathtrooper
 
-OCD2, Kitsu-Nesh'Kaa:
-* Captain Enoch
-* Gungan Warriors/Tarpals/Kleef
-* Lanupa Guard
-* Rebel Honor Guard
-
-OCD2, EXE Noob:
+OCD2, Noob:
+* The Armorer
+* Darth Momin
 * First Order Radar Technician
+* ND-5
 * Nighttroopers
 * Nightwind Assassin
 * Preox Morlana Corpo
-* Sabine Wren (jedi)
+* Qimir
+* Sabine Wren (jedi training gear)
+* Sidon Ithano
 * Temple Guard (Rebels)
 * Tenth Brother
+* Thirteenth Sister
+* Tualon Yaluna
+
+OCD2, Mat Gaunt, Noob:
+* Clone Force 99 aka Bad Batch 
 
-OCD2, EXE Noob, Unguided:
+OCD2, Noob, Unguided:
 * Imperial Trenchcoat
 * Luke Skywalker w/ "Yoda in basket"
 * Luke Skywalker w/ "Grogu in basket"
 * New Republic Marine
 * Old Republic Trooper
 
-OCD2, Mat Gaunt, EXE Noob:
-* Clone Force 99 aka Bad Batch 
-
 OCD2, GP, Unguided:
 * Baylan Skoll
 * Czerka Corporation
@@ -1202,19 +1200,20 @@ OCD2, GP, Unguided:
 * Jod Na Nawood
 * Luthen Rael
 * Rebel Magma Trooper
-* Resistance Trooper
 * Shin Hati
 * Tobias Beckett
 
-OCD2, Kitsu-Nesh'Kaa, Unguided:
-* Rebel Partisans
+OCD2, Noob, GP, Unguided:
+* Guavian Death Gang
 
-OCD2, Kitsu-Nesh'Kaa, EXE Noob, Unguided:
-* Mission Vao
-* Hera Syndulla
+OCD2, Kitsu-Nesh'Kaa:
+* Captain Enoch
+* Gungan Warriors/Tarpals/Kleef
+* Lanupa Guard
+* Rebel Honor Guard
 
-OCD2, EXE Noob, GP, Unguided:
-* Guavian Death Gang
+OCD2, Kitsu-Nesh'Kaa, Unguided:
+* Rebel Partisan
 
 OCD2, Kitsu-Nesh'Kaa, GP, Unguided:
 * Saw Gerrera
@@ -1232,6 +1231,37 @@ Kitsu-Nesh'Kaa:
 * Royal Guard's pike
 * Carnor Jax' staff
 
+Kitsu-Nesh'Kaa, Noob, Unguided:
+* Mission Vao
+
+Kitsu-Nesh'Kaa, OCD2, Noob, Unguided:
+* Hera Syndulla
+
+eSpark, Unguided (helmet mesh edit):
+* Final Order Trooper - https://jkhub.org/files/file/3636-sith-trooper/
+
+ChalklYne:
+* Ice Spider - https://jkhub.org/files/file/3801-mandalorian-ice-spider-krykna/
+
+Noob (textures only):
+* BX Commando Droid (all skins except default)
+* Captain Cardinal
+* Clone Troopers [21st Nova Corps, 41st Ranger Platoon, 41st Fireball, 87th Sentinel Corps, 91st Recon Division, 212th Boil/Waxer, 501st Kix/Appo Cobalt Hero, Lament Seeker, Nemec, Rancor Battallion, Umbra]
+* CT-5555 "Fives" (helmeted/unhelmeted)
+* Captain Fordo
+* Captain Grey
+* Captain Keeli
+* Commander Cody (Phase 1)
+* Commander Gree (Phase 2)
+* Commando Gregor/Urban/Camouflage
+* Droideka (Bedlam)
+* Gold First Order "Pyre" Stormtrooper 
+* Imperial Weapons Technician (Rebels)
+* Magnaguard (Bedlam)
+* SBD (Bedlam)
+* Sith Empire Trooper (Hazmat/Hoth/Korriban/Yavin)
+* TFA Stormtrooper Executioner
+* TFA Stormtrooper Finn
 
 ========================================
 

From 951ab6aad1342716ee6565697434b7820f9ffcf2 Mon Sep 17 00:00:00 2001
From: Unguided <buektomi@gmail.com>
Date: Wed, 4 Mar 2026 16:45:58 +0100
Subject: [PATCH 77/82] icon fix in SAssassin

---
 .../ext_data/mb2/character/v9_SAssass.mbch    | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch b/z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch
index 2f579ad38..3af62221a 100644
--- a/z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch
@@ -55,13 +55,13 @@ ClassInfo
 	skin_4		"default"
 	uishader_4	"models/players/darthcognus/mb2_icon_default"
 	
-	model_5	"darthkrayt2"
-	skin_5		"default"
-	uishader_5	"models/players/darthkrayt2/mb2_icon_default"
+	model_5	"barriss_offee"
+	skin_5		"nocape"
+	uishader_5	"models/players/barriss_offee/mb2_icon_nocape_sith"
 	
-	model_6	"barriss_offee"
-	skin_6		"nocape"
-	uishader_6	"models/players/barriss_offee/mb2_icon_nocape"
+	model_6	"darthkrayt2"
+	skin_6		"default"
+	uishader_6	"models/players/darthkrayt2/mb2_icon_default"
 		
 	saber1		alora_legends
 	sabercolor		0
@@ -73,15 +73,15 @@ ClassInfo
 	saber2_1		saber_boc_legends
 	saber2color_1	5
 	
-	saber1_2		saber_talon
-	sabercolor_2	0
-	saber2_2		saber_asharad
-	saber2color_2	0
+	saber1_2		saber_asajj_legacy
+	sabercolor	0_2
+	saber2_2		saber_asajj2_legacy
+	saber2color_2	0	
 	
-	saber1_3		saber_asajj_legacy
-	sabercolor	0_3
-	saber2_3		saber_asajj2_legacy
-	saber2color_3	0	
+	saber1_3		saber_talon
+	sabercolor_3	0
+	saber2_3		saber_asharad
+	saber2color_3	0
 }
 
 description "Sith Assassin

From 6c89a00476f20e5c812b289f8e248c5b2d308e06 Mon Sep 17 00:00:00 2001
From: Unguided <buektomi@gmail.com>
Date: Thu, 5 Mar 2026 11:32:13 +0100
Subject: [PATCH 78/82] Ahsoka/Sith Bastila/Ep1 Obi finalized

---
 .../models/players/ahsoka/model_default.skin  | 14 +++-
 .../models/players/ahsoka/model_eva.skin      | 37 +++++++++
 .../models/players/ahsoka/model_mortis.skin   | 37 +++++++++
 .../models/players/ahsoka/model_padawan.skin  | 37 +++++++++
 .../models/players/ahsoka/model_tcw.skin      | 37 +++++++++
 .../models/players/ahsoka/model_totj.skin     | 37 +++++++++
 MBAssets3/models/players/ahsoka/saberauth.cfg | 10 ++-
 .../players/bastila_sith/model_default.skin   | 28 +++----
 .../models/players/bastila_sith/model_ds.skin | 38 +++++++++
 .../players/obiwan_ep1/model_default.skin     | 65 +++++++--------
 .../players/obiwan_ep1/model_hooded.skin      | 83 +++++++++----------
 .../players/obiwan_ep1/model_robed.skin       | 81 +++++++++---------
 MBAssets3/shaders/ahsoka.shader               | 75 ++++++++++++++++-
 MBAssets3/shaders/barriss_offee.shader        | 11 ---
 14 files changed, 442 insertions(+), 148 deletions(-)
 create mode 100644 MBAssets3/models/players/ahsoka/model_eva.skin
 create mode 100644 MBAssets3/models/players/ahsoka/model_mortis.skin
 create mode 100644 MBAssets3/models/players/ahsoka/model_padawan.skin
 create mode 100644 MBAssets3/models/players/ahsoka/model_tcw.skin
 create mode 100644 MBAssets3/models/players/ahsoka/model_totj.skin
 create mode 100644 MBAssets3/models/players/bastila_sith/model_ds.skin

diff --git a/MBAssets3/models/players/ahsoka/model_default.skin b/MBAssets3/models/players/ahsoka/model_default.skin
index f8d610b29..a5f7ccd33 100644
--- a/MBAssets3/models/players/ahsoka/model_default.skin
+++ b/MBAssets3/models/players/ahsoka/model_default.skin
@@ -1,21 +1,29 @@
 head,models/players/ahsoka/ahsoka.tga
-head_eyes_mouth,models/players/ahsoka/ahsoka.tga
-torso,models/players/ahsoka/cull.tga
+head_mouth_eyes,models/players/ahsoka/ahsoka.tga
+torso,models/players/ahsoka/ahsoka.tga
+torso_belt,*off
 l_arm,models/players/ahsoka/ahsoka.tga
 r_arm,models/players/ahsoka/ahsoka.tga
 l_hand,models/players/ahsoka/ahsoka.tga
 r_hand,models/players/ahsoka/ahsoka.tga
 hips,models/players/ahsoka/ahsoka.tga
-hips_skirt,models/players/ahsoka/cull.tga
+hips2,*off
+hips_flap,*off
+hips_skirt,models/players/ahsoka/ahsoka.tga
+hips_skirt_belts,models/players/ahsoka/ahsoka.tga
+hips_skirt_padawan,*off
 hips_pouch,models/players/ahsoka/pouch.tga
 l_leg,models/players/ahsoka/ahsoka.tga
 r_leg,models/players/ahsoka/ahsoka.tga
+l_shoulder,*off
+r_shoulder,*off
 
 r_leg_cap_hips_off,models/players/stormtrooper/caps.tga
 l_leg_cap_hips_off,models/players/stormtrooper/caps.tga
 hips_cap_r_leg_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
+hips2_cap_torso_off,*off
 torso_cap_hips_off,models/players/stormtrooper/caps.tga
 torso_cap_head_off,models/players/stormtrooper/caps.tga
 head_cap_torso_off,models/players/stormtrooper/caps.tga
diff --git a/MBAssets3/models/players/ahsoka/model_eva.skin b/MBAssets3/models/players/ahsoka/model_eva.skin
new file mode 100644
index 000000000..4de66c15e
--- /dev/null
+++ b/MBAssets3/models/players/ahsoka/model_eva.skin
@@ -0,0 +1,37 @@
+head,models/players/ahsoka/ahsoka_eva.tga
+head_mouth_eyes,models/players/ahsoka/ahsoka_eva.tga
+torso,models/players/ahsoka/ahsoka_eva.tga
+torso_belt,models/players/ahsoka/belt.tga
+l_arm,models/players/ahsoka/ahsoka_eva.tga
+r_arm,models/players/ahsoka/ahsoka_eva.tga
+l_hand,models/players/ahsoka/ahsoka_eva.tga
+r_hand,models/players/ahsoka/ahsoka_eva.tga
+hips,*off
+hips2,models/players/ahsoka/ahsoka_eva.tga
+hips_flap,models/players/ahsoka/ahsoka_eva.tga
+hips_skirt,*off
+hips_skirt_padawan,*off
+hips_skirt_belts,*off
+hips_pouch,*off
+l_leg,models/players/ahsoka/ahsoka_eva.tga
+r_leg,models/players/ahsoka/ahsoka_eva.tga
+l_shoulder,*off
+r_shoulder,*off
+
+r_leg_cap_hips_off,models/players/stormtrooper/caps.tga
+l_leg_cap_hips_off,models/players/stormtrooper/caps.tga
+hips_cap_r_leg_off,models/players/stormtrooper/caps.tga
+hips_cap_l_leg_off,models/players/stormtrooper/caps.tga
+hips_cap_torso_off,*off
+hips2_cap_torso_off,models/players/stormtrooper/caps.tga
+torso_cap_hips_off,models/players/stormtrooper/caps.tga
+torso_cap_head_off,models/players/stormtrooper/caps.tga
+head_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
+l_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+r_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga
+r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga
+l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga
+r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga
\ No newline at end of file
diff --git a/MBAssets3/models/players/ahsoka/model_mortis.skin b/MBAssets3/models/players/ahsoka/model_mortis.skin
new file mode 100644
index 000000000..2c6b1bacd
--- /dev/null
+++ b/MBAssets3/models/players/ahsoka/model_mortis.skin
@@ -0,0 +1,37 @@
+head,models/players/ahsoka/ahsoka_mortis.tga
+head_mouth_eyes,models/players/ahsoka/ahsoka_mortis.tga
+torso,models/players/ahsoka/ahsoka_mortis.tga
+torso_belt,*off
+l_arm,models/players/ahsoka/ahsoka_mortis.tga
+r_arm,models/players/ahsoka/ahsoka_mortis.tga
+l_hand,models/players/ahsoka/ahsoka_mortis.tga
+r_hand,models/players/ahsoka/ahsoka_mortis.tga
+hips,models/players/ahsoka/ahsoka_mortis.tga
+hips2,*off
+hips_flap,*off
+hips_skirt,models/players/ahsoka/ahsoka_mortis.tga
+hips_skirt_belts,*off
+hips_skirt_padawan,*off
+hips_pouch,models/players/ahsoka/pouch_tcw.tga
+l_leg,models/players/ahsoka/ahsoka_mortis.tga
+r_leg,models/players/ahsoka/ahsoka_mortis.tga
+l_shoulder,*off
+r_shoulder,*off
+
+r_leg_cap_hips_off,models/players/stormtrooper/caps.tga
+l_leg_cap_hips_off,models/players/stormtrooper/caps.tga
+hips_cap_r_leg_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
+hips2_cap_torso_off,*off
+torso_cap_hips_off,models/players/stormtrooper/caps.tga
+torso_cap_head_off,models/players/stormtrooper/caps.tga
+head_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
+l_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+r_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga
+r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga
+l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga
+r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga
\ No newline at end of file
diff --git a/MBAssets3/models/players/ahsoka/model_padawan.skin b/MBAssets3/models/players/ahsoka/model_padawan.skin
new file mode 100644
index 000000000..11b14a3ef
--- /dev/null
+++ b/MBAssets3/models/players/ahsoka/model_padawan.skin
@@ -0,0 +1,37 @@
+head,models/players/ahsoka/ahsoka_padawan.tga
+head_mouth_eyes,models/players/ahsoka/ahsoka_padawan.tga
+torso,models/players/ahsoka/ahsoka_padawan.tga
+torso_belt,*off
+l_arm,models/players/ahsoka/ahsoka_padawan.tga
+r_arm,models/players/ahsoka/ahsoka_padawan.tga
+l_hand,models/players/ahsoka/ahsoka_padawan.tga
+r_hand,models/players/ahsoka/ahsoka_padawan.tga
+hips,models/players/ahsoka/ahsoka_padawan.tga
+hips2,*off
+hips_flap,*off
+hips_skirt,*off
+hips_skirt_belts,*off
+hips_skirt_padawan,models/players/ahsoka/ahsoka_padawan.tga
+hips_pouch,*off
+l_leg,models/players/ahsoka/ahsoka_padawan.tga
+r_leg,models/players/ahsoka/ahsoka_padawan.tga
+l_shoulder,*off
+r_shoulder,*off
+
+r_leg_cap_hips_off,models/players/stormtrooper/caps.tga
+l_leg_cap_hips_off,models/players/stormtrooper/caps.tga
+hips_cap_r_leg_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
+hips2_cap_torso_off,*off
+torso_cap_hips_off,models/players/stormtrooper/caps.tga
+torso_cap_head_off,models/players/stormtrooper/caps.tga
+head_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
+l_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+r_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga
+r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga
+l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga
+r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga
\ No newline at end of file
diff --git a/MBAssets3/models/players/ahsoka/model_tcw.skin b/MBAssets3/models/players/ahsoka/model_tcw.skin
new file mode 100644
index 000000000..1d8887de9
--- /dev/null
+++ b/MBAssets3/models/players/ahsoka/model_tcw.skin
@@ -0,0 +1,37 @@
+head,models/players/ahsoka/ahsoka_tcw.tga
+head_mouth_eyes,models/players/ahsoka/ahsoka_tcw.tga
+torso,models/players/ahsoka/ahsoka_tcw.tga
+torso_belt,*off
+l_arm,models/players/ahsoka/ahsoka_tcw.tga
+r_arm,models/players/ahsoka/ahsoka_tcw.tga
+l_hand,models/players/ahsoka/ahsoka_tcw.tga
+r_hand,models/players/ahsoka/ahsoka_tcw.tga
+hips,models/players/ahsoka/ahsoka_tcw.tga
+hips2,*off
+hips_flap,*off
+hips_skirt,models/players/ahsoka/ahsoka_tcw.tga
+hips_skirt_padawan,*off
+hips_skirt_belts,*off
+hips_pouch,models/players/ahsoka/pouch_tcw.tga
+l_leg,models/players/ahsoka/ahsoka_tcw.tga
+r_leg,models/players/ahsoka/ahsoka_tcw.tga
+l_shoulder,*off
+r_shoulder,*off
+
+r_leg_cap_hips_off,models/players/stormtrooper/caps.tga
+l_leg_cap_hips_off,models/players/stormtrooper/caps.tga
+hips_cap_r_leg_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
+hips2_cap_torso_off,*off
+torso_cap_hips_off,models/players/stormtrooper/caps.tga
+torso_cap_head_off,models/players/stormtrooper/caps.tga
+head_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
+l_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+r_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga
+r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga
+l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga
+r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga
\ No newline at end of file
diff --git a/MBAssets3/models/players/ahsoka/model_totj.skin b/MBAssets3/models/players/ahsoka/model_totj.skin
new file mode 100644
index 000000000..2c15d58a9
--- /dev/null
+++ b/MBAssets3/models/players/ahsoka/model_totj.skin
@@ -0,0 +1,37 @@
+head,models/players/ahsoka/ahsoka_totj.tga
+head_mouth_eyes,models/players/ahsoka/ahsoka_totj.tga
+torso,models/players/ahsoka/ahsoka_totj.tga
+torso_belt,*off
+l_arm,models/players/ahsoka/ahsoka_totj.tga
+r_arm,models/players/ahsoka/ahsoka_totj.tga
+l_hand,models/players/ahsoka/ahsoka_totj.tga
+r_hand,models/players/ahsoka/ahsoka_totj.tga
+hips,models/players/ahsoka/ahsoka_totj.tga
+hips2,*off
+hips_flap,*off
+hips_skirt,models/players/ahsoka/ahsoka_totj.tga
+hips_skirt_padawan,*off
+hips_skirt_belts,*off
+hips_pouch,models/players/ahsoka/pouch_tcw.tga
+l_leg,models/players/ahsoka/ahsoka_totj.tga
+r_leg,models/players/ahsoka/ahsoka_totj.tga
+l_shoulder,models/players/ahsoka/shoulders.tga
+r_shoulder,models/players/ahsoka/shoulders.tga
+
+r_leg_cap_hips_off,models/players/stormtrooper/caps.tga
+l_leg_cap_hips_off,models/players/stormtrooper/caps.tga
+hips_cap_r_leg_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
+hips2_cap_torso_off,*off
+torso_cap_hips_off,models/players/stormtrooper/caps.tga
+torso_cap_head_off,models/players/stormtrooper/caps.tga
+head_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
+l_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+r_arm_cap_torso_off,models/players/stormtrooper/caps.tga
+l_arm_cap_l_hand_off,models/players/stormtrooper/caps.tga
+r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga
+l_hand_cap_l_arm_off,models/players/stormtrooper/caps.tga
+r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga
\ No newline at end of file
diff --git a/MBAssets3/models/players/ahsoka/saberauth.cfg b/MBAssets3/models/players/ahsoka/saberauth.cfg
index 60dc4cd06..011bca9ec 100644
--- a/MBAssets3/models/players/ahsoka/saberauth.cfg
+++ b/MBAssets3/models/players/ahsoka/saberauth.cfg
@@ -4,4 +4,12 @@ saber_ahsoka
 saber_ahsoka
 0.3333
 saber_ahsoka2
-0.2650
\ No newline at end of file
+0.2650
+
+sabers_mortis
+saber_ahsoka
+1.0
+saber_ahsoka
+1.0
+saber_ahsoka2
+1.0
\ No newline at end of file
diff --git a/MBAssets3/models/players/bastila_sith/model_default.skin b/MBAssets3/models/players/bastila_sith/model_default.skin
index 76a455bad..82f5bb44c 100644
--- a/MBAssets3/models/players/bastila_sith/model_default.skin
+++ b/MBAssets3/models/players/bastila_sith/model_default.skin
@@ -3,22 +3,22 @@ head_back,models/players/bastila/hair2.tga
 head_hair,*off
 head_hair_b,models/players/bastila/hair2.tga
 head_hairtie,models/players/bastila/hairtie.tga
-head_eyes_mouth,models/players/exar_kun/mouth_eyes.tga
+head_eyes_mouth,models/players/bastila/mouth_eyes.tga
 
-torso,models/players/bastila_sith/torsoOfficer.tga
-torso_parts,models/players/bastila_sith/bodyOfficer.tga
-l_arm,models/players/bastila_sith/torsoOfficer.tga
-l_wrist,models/players/bastila_sith/bodyOfficer.tga
-l_hand,models/players/bastila_sith/torsoOfficer.tga
-r_arm,models/players/bastila_sith/torsoOfficer.tga
-r_wrist,models/players/bastila_sith/bodyOfficer.tga
-r_hand,models/players/bastila_sith/torsoOfficer.tga
+torso,models/players/bastila_sith/torso.tga
+torso_parts,models/players/bastila_sith/torso_parts.tga
+l_arm,models/players/bastila_sith/torso.tga
+l_wrist,models/players/bastila_sith/torso_parts.tga
+l_hand,models/players/bastila_sith/torso.tga
+r_arm,models/players/bastila_sith/torso.tga
+r_wrist,models/players/bastila_sith/torso_parts.tga
+r_hand,models/players/bastila_sith/torso.tga
 
-hips,models/players/bastila_sith/body_tav.tga
-l_leg,models/players/bastila_sith/boots_tav.tga
-r_leg,models/players/bastila_sith/boots_tav.tga
-hips_belt,models/players/bastila_sith/boots_tav.tga
-hips_robe,models/players/bastila_sith/robe_tav.tga
+hips,models/players/bastila_sith/hips.tga
+l_leg,models/players/bastila_sith/boots.tga
+r_leg,models/players/bastila_sith/boots.tga
+hips_belt,models/players/bastila_sith/boots.tga
+hips_robe,models/players/bastila_sith/robe.tga
 
 r_hand_cap_r_arm_off,models/players/stormtrooper/caps.tga
 r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga
diff --git a/MBAssets3/models/players/bastila_sith/model_ds.skin b/MBAssets3/models/players/bastila_sith/model_ds.skin
new file mode 100644
index 000000000..cb34550a1
--- /dev/null
+++ b/MBAssets3/models/players/bastila_sith/model_ds.skin
@@ -0,0 +1,38 @@
+head,models/players/bastila/head_sith.tga
+head_back,models/players/bastila/hair2.tga
+head_hair,*off
+head_hair_b,models/players/bastila/hair2.tga
+head_hairtie,models/players/bastila/hairtie.tga
+head_eyes_mouth,models/players/freedon_nadd/mouth_eyes.tga
+
+torso,models/players/bastila_sith/torso.tga
+torso_parts,models/players/bastila_sith/torso_parts.tga
+l_arm,models/players/bastila_sith/torso.tga
+l_wrist,models/players/bastila_sith/torso_parts.tga
+l_hand,models/players/bastila_sith/torso.tga
+r_arm,models/players/bastila_sith/torso.tga
+r_wrist,models/players/bastila_sith/torso_parts.tga
+r_hand,models/players/bastila_sith/torso.tga
+
+hips,models/players/bastila_sith/hips.tga
+l_leg,models/players/bastila_sith/boots.tga
+r_leg,models/players/bastila_sith/boots.tga
+hips_belt,models/players/bastila_sith/boots.tga
+hips_robe,models/players/bastila_sith/robe.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_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
+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
\ No newline at end of file
diff --git a/MBAssets3/models/players/obiwan_ep1/model_default.skin b/MBAssets3/models/players/obiwan_ep1/model_default.skin
index 2ccb368a9..9245938b4 100644
--- a/MBAssets3/models/players/obiwan_ep1/model_default.skin
+++ b/MBAssets3/models/players/obiwan_ep1/model_default.skin
@@ -1,21 +1,21 @@
-head,models/players/obiwan_ep1/head_face.tga
-head_hair3,models/players/obiwan_ep1/head_face.tga
-head_e2braid,models/players/obiwan_ep1/hairextras.tga
-head_e2tail,models/players/obiwan_ep1/hairextras.tga
+head,models/players/obiwan_ep1/head_face
+head_face,models/players/obiwan_ep1/head_face
+head_hair,models/players/obiwan_ep1/hair
+head_hair_hup,*off
 head_eyes,models/players/obiwan_ep1/mouth_eyes.tga
 
-hips,models/players/obiwan_ep1/hips.tga
-hips_legs,models/players/obiwan_ep1/boots.tga
-r_leg,models/players/obiwan_ep1/boots.tga
-l_leg,models/players/obiwan_ep1/boots.tga
-torso,models/players/obiwan_ep1/torso.tga
-hips_belt,models/players/obiwan_ep1/torso.tga
-r_arm,models/players/obiwan_ep1/arms.tga
-r_hand,models/players/obiwan_ep1/arms.tga
-l_arm,models/players/obiwan_ep1/arms.tga
-l_hand,models/players/obiwan_ep1/arms.tga
-l_shoulder,models/players/obiwan_ep1/arms.tga
-r_shoulder,models/players/obiwan_ep1/arms.tga
+hips,models/players/obiwan_ep1/hips
+hips_legs,models/players/obiwan_ep1/boots
+r_leg,models/players/obiwan_ep1/boots
+l_leg,models/players/obiwan_ep1/boots
+torso,models/players/obiwan_ep1/torso
+hips_belt,models/players/obiwan_ep1/torso
+r_arm,models/players/obiwan_ep1/arms
+r_hand,models/players/obiwan_ep1/arms
+l_arm,models/players/obiwan_ep1/arms
+l_hand,models/players/obiwan_ep1/arms
+l_shoulder,models/players/obiwan_ep1/arms
+r_shoulder,models/players/obiwan_ep1/arms
 
 hips2,*off
 hips_belt2,*off
@@ -32,7 +32,6 @@ r_arm_robe,*off
 l_arm_robe,*off
 head_robe_hood,*off
 
-
 hips_robecap_torso,*off
 torso_robecap_head,*off
 torso_robecap_hips,*off
@@ -41,19 +40,19 @@ r_shoulder_robecap,*off
 r_arm_robecap,*off
 l_arm_robecap,*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
+r_leg_cap_hips_off,models/players/stormtrooper/caps
+l_leg_cap_hips_off,models/players/stormtrooper/caps
+l_hand_cap_l_arm_off,models/players/stormtrooper/caps
+l_arm_cap_l_hand_off,models/players/stormtrooper/caps
+l_arm_cap_torso_off,models/players/stormtrooper/caps
+r_arm_cap_r_hand_off,models/players/stormtrooper/caps
+r_arm_cap_torso_off,models/players/stormtrooper/caps
+r_hand_cap_r_arm_off,models/players/stormtrooper/caps
+torso_cap_head_off,models/players/stormtrooper/caps
+torso_cap_hips_off,models/players/stormtrooper/caps
+torso_cap_l_arm_off,models/players/stormtrooper/caps
+torso_cap_r_arm_off,models/players/stormtrooper/caps
+hips_cap_l_leg_off,models/players/stormtrooper/caps
+hips_cap_torso_off,models/players/stormtrooper/caps
+hips_cap_r_leg_off,models/players/stormtrooper/caps
+head_cap_torso_off,models/players/stormtrooper/caps
diff --git a/MBAssets3/models/players/obiwan_ep1/model_hooded.skin b/MBAssets3/models/players/obiwan_ep1/model_hooded.skin
index c02a8827c..bdedfea1d 100644
--- a/MBAssets3/models/players/obiwan_ep1/model_hooded.skin
+++ b/MBAssets3/models/players/obiwan_ep1/model_hooded.skin
@@ -1,59 +1,58 @@
-head,models/players/obiwan_ep3/head_face_hood.tga
-head_hair3,*off
-head_e2braid,models/players/obiwan_ep3/hairextras.tga
-head_e2tail,*off
-head_eyes,models/players/obiwan_ep3/mouth_eyes_hood.tga
+head,models/players/obiwan_ep1/head_face_hup
+head_face,models/players/obiwan_ep1/head_face_hup
+head_hair,*off
+head_hair_hup,models/players/obiwan_ep1/hair_hup.tga
+head_eyes,models/players/obiwan_ep1/mouth_eyes.tga
 
 hips,*off
-hips_legs,models/players/obiwan_ep3/boots.tga
-r_leg,models/players/obiwan_ep3/boots.tga
-l_leg,models/players/obiwan_ep3/boots.tga
+hips_legs,models/players/obiwan_ep1/boots
+r_leg,models/players/obiwan_ep1/boots
+l_leg,models/players/obiwan_ep1/boots
 torso,*off
 hips_belt,*off
 r_arm,*off
-r_hand,models/players/obiwan_ep3/arms.tga
+r_hand,models/players/obiwan_ep1/arms
 l_arm,*off
-l_hand,models/players/obiwan_ep3/arms.tga
+l_hand,models/players/obiwan_ep1/arms
 l_shoulder,*off
 r_shoulder,*off
 
-hips2,models/players/obiwan_ep3/hips.tga
-hips_belt2,models/players/obiwan_ep3/torso.tga
-torso2,models/players/obiwan_ep3/torso.tga
-r_arm2,models/players/obiwan_ep3/arms.tga
-l_arm2,models/players/obiwan_ep3/arms.tga
+hips2,models/players/obiwan_ep1/hips
+hips_belt2,models/players/obiwan_ep1/torso
+torso2,models/players/obiwan_ep1/torso
+r_arm2,models/players/obiwan_ep1/arms
+l_arm2,models/players/obiwan_ep1/arms
 
-torso_robe,models/players/obiwan_ep3/robe.tga
-hips_robe,models/players/obiwan_ep3/robe.tga
-l_shoulder_robe,models/players/obiwan_ep3/robe-parts.tga
-r_shoulder_robe,models/players/obiwan_ep3/robe-parts.tga
+torso_robe,models/players/obiwan_ep3/robe
+hips_robe,models/players/obiwan_ep3/robe
+l_shoulder_robe,models/players/obiwan_ep3/robe-parts
+r_shoulder_robe,models/players/obiwan_ep3/robe-parts
 torso_robe_hood,*off
-r_arm_robe,models/players/obiwan_ep3/robe-parts.tga
-l_arm_robe,models/players/obiwan_ep3/robe-parts.tga
-head_robe_hood,models/players/obiwan_ep3/robe-parts.tga
+r_arm_robe,models/players/obiwan_ep3/robe-parts
+l_arm_robe,models/players/obiwan_ep3/robe-parts
+head_robe_hood,models/players/obiwan_ep3/robe-parts
 
+hips_robecap_torso,models/players/obiwan_ep3/robe-caps
+torso_robecap_head,models/players/obiwan_ep3/robe-caps
+torso_robecap_hips,models/players/obiwan_ep3/robe-caps
+l_shoulder_robecap,models/players/stormtrooper/caps
+r_shoulder_robecap,models/players/stormtrooper/caps
+r_arm_robecap,models/players/stormtrooper/caps
+l_arm_robecap,models/players/stormtrooper/caps
 
-hips_robecap_torso,models/players/obiwan_ep3/robe-caps.tga
-torso_robecap_head,models/players/obiwan_ep3/robe-caps.tga
-torso_robecap_hips,models/players/obiwan_ep3/robe-caps.tga
-l_shoulder_robecap,models/players/obiwan_ep3/robe-caps.tga
-r_shoulder_robecap,models/players/obiwan_ep3/robe-caps.tga
-r_arm_robecap,models/players/obiwan_ep3/robe-caps.tga
-l_arm_robecap,models/players/obiwan_ep3/robe-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
+r_leg_cap_hips_off,models/players/stormtrooper/caps
+l_leg_cap_hips_off,models/players/stormtrooper/caps
+l_hand_cap_l_arm_off,models/players/stormtrooper/caps
+l_arm_cap_l_hand_off,models/players/stormtrooper/caps
 l_arm_cap_torso_off,*off
-r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga
+r_arm_cap_r_hand_off,models/players/stormtrooper/caps
 r_arm_cap_torso_off,*off
-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
+r_hand_cap_r_arm_off,models/players/stormtrooper/caps
+torso_cap_head_off,models/players/stormtrooper/caps
+torso_cap_hips_off,models/players/stormtrooper/caps
 torso_cap_l_arm_off,*off
 torso_cap_r_arm_off,*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
-head_cap_torso_off,models/players/stormtrooper/caps.tga
+hips_cap_l_leg_off,models/players/stormtrooper/caps
+hips_cap_torso_off,models/players/stormtrooper/caps
+hips_cap_r_leg_off,models/players/stormtrooper/caps
+head_cap_torso_off,models/players/stormtrooper/caps
diff --git a/MBAssets3/models/players/obiwan_ep1/model_robed.skin b/MBAssets3/models/players/obiwan_ep1/model_robed.skin
index 9545bfe9b..6a626aa75 100644
--- a/MBAssets3/models/players/obiwan_ep1/model_robed.skin
+++ b/MBAssets3/models/players/obiwan_ep1/model_robed.skin
@@ -1,59 +1,58 @@
-head,models/players/obiwan_ep1/head_face.tga
-head_hair3,models/players/obiwan_ep1/head_face.tga
-head_e2braid,models/players/obiwan_ep1/hairextras.tga
-head_e2tail,models/players/obiwan_ep1/hairextras.tga
+head,models/players/obiwan_ep1/head_face
+head_face,models/players/obiwan_ep1/head_face
+head_hair,models/players/obiwan_ep1/hair
+head_hair_hup,*off
 head_eyes,models/players/obiwan_ep1/mouth_eyes.tga
 
 hips,*off
-hips_legs,models/players/obiwan_ep1/boots.tga
-r_leg,models/players/obiwan_ep1/boots.tga
-l_leg,models/players/obiwan_ep1/boots.tga
+hips_legs,models/players/obiwan_ep1/boots
+r_leg,models/players/obiwan_ep1/boots
+l_leg,models/players/obiwan_ep1/boots
 torso,*off
 hips_belt,*off
 r_arm,*off
-r_hand,models/players/obiwan_ep1/arms.tga
+r_hand,models/players/obiwan_ep1/arms
 l_arm,*off
-l_hand,models/players/obiwan_ep1/arms.tga
+l_hand,models/players/obiwan_ep1/arms
 l_shoulder,*off
 r_shoulder,*off
 
-hips2,models/players/obiwan_ep1/hips.tga
-hips_belt2,models/players/obiwan_ep1/torso.tga
-torso2,models/players/obiwan_ep1/torso.tga
-r_arm2,models/players/obiwan_ep1/arms.tga
-l_arm2,models/players/obiwan_ep1/arms.tga
+hips2,models/players/obiwan_ep1/hips
+hips_belt2,models/players/obiwan_ep1/torso
+torso2,models/players/obiwan_ep1/torso
+r_arm2,models/players/obiwan_ep1/arms
+l_arm2,models/players/obiwan_ep1/arms
 
-torso_robe,models/players/obiwan_ep3/robe.tga
-hips_robe,models/players/obiwan_ep3/robe.tga
-l_shoulder_robe,models/players/obiwan_ep3/robe-parts.tga
-r_shoulder_robe,models/players/obiwan_ep3/robe-parts.tga
-torso_robe_hood,models/players/obiwan_ep3/robe-parts.tga
-r_arm_robe,models/players/obiwan_ep3/robe-parts.tga
-l_arm_robe,models/players/obiwan_ep3/robe-parts.tga
+torso_robe,models/players/obiwan_ep3/robe
+hips_robe,models/players/obiwan_ep3/robe
+l_shoulder_robe,models/players/obiwan_ep3/robe-parts
+r_shoulder_robe,models/players/obiwan_ep3/robe-parts
+torso_robe_hood,models/players/obiwan_ep3/robe-parts
+r_arm_robe,models/players/obiwan_ep3/robe-parts
+l_arm_robe,models/players/obiwan_ep3/robe-parts
 head_robe_hood,*off
 
+hips_robecap_torso,models/players/obiwan_ep3/robe-caps
+torso_robecap_head,models/players/obiwan_ep3/robe-caps
+torso_robecap_hips,models/players/obiwan_ep3/robe-caps
+l_shoulder_robecap,models/players/stormtrooper/caps
+r_shoulder_robecap,models/players/stormtrooper/caps
+r_arm_robecap,models/players/stormtrooper/caps
+l_arm_robecap,models/players/stormtrooper/caps
 
-hips_robecap_torso,models/players/obiwan_ep3/robe-caps.tga
-torso_robecap_head,models/players/obiwan_ep3/robe-caps.tga
-torso_robecap_hips,models/players/obiwan_ep3/robe-caps.tga
-l_shoulder_robecap,models/players/obiwan_ep3/robe-caps.tga
-r_shoulder_robecap,models/players/obiwan_ep3/robe-caps.tga
-r_arm_robecap,models/players/obiwan_ep3/robe-caps.tga
-l_arm_robecap,models/players/obiwan_ep3/robe-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
+r_leg_cap_hips_off,models/players/stormtrooper/caps
+l_leg_cap_hips_off,models/players/stormtrooper/caps
+l_hand_cap_l_arm_off,models/players/stormtrooper/caps
+l_arm_cap_l_hand_off,models/players/stormtrooper/caps
 l_arm_cap_torso_off,*off
-r_arm_cap_r_hand_off,models/players/stormtrooper/caps.tga
+r_arm_cap_r_hand_off,models/players/stormtrooper/caps
 r_arm_cap_torso_off,*off
-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
+r_hand_cap_r_arm_off,models/players/stormtrooper/caps
+torso_cap_head_off,models/players/stormtrooper/caps
+torso_cap_hips_off,models/players/stormtrooper/caps
 torso_cap_l_arm_off,*off
 torso_cap_r_arm_off,*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
-head_cap_torso_off,models/players/stormtrooper/caps.tga
+hips_cap_l_leg_off,models/players/stormtrooper/caps
+hips_cap_torso_off,models/players/stormtrooper/caps
+hips_cap_r_leg_off,models/players/stormtrooper/caps
+head_cap_torso_off,models/players/stormtrooper/caps
diff --git a/MBAssets3/shaders/ahsoka.shader b/MBAssets3/shaders/ahsoka.shader
index f5b4d330a..9462d9ad1 100644
--- a/MBAssets3/shaders/ahsoka.shader
+++ b/MBAssets3/shaders/ahsoka.shader
@@ -12,11 +12,52 @@ models/players/ahsoka/ahsoka
 	}
 }
 
-models/players/ahsoka/cull
+models/players/ahsoka/ahsoka_eva
 {
-	cull twosided
 	{
-		map models/players/ahsoka/ahsoka
+		map models/players/ahsoka/ahsoka_eva
+		rgbGen lightingDiffuse
+	}
+	{
+		map models/players/ahsoka/ahsoka-spec2
+		blendFunc GL_SRC_ALPHA GL_ONE
+		alphaGen lightingSpecular
+	detail
+	}
+}
+
+models/players/ahsoka/ahsoka_mortis
+{
+	{
+		map models/players/ahsoka/ahsoka_mortis
+		rgbGen lightingDiffuse
+	}
+	{
+		map models/players/ahsoka/ahsoka-spec
+		blendFunc GL_SRC_ALPHA GL_ONE
+		alphaGen lightingSpecular
+	detail
+	}
+}
+
+models/players/ahsoka/ahsoka_padawan
+{
+	{
+		map models/players/ahsoka/ahsoka_padawan
+		rgbGen lightingDiffuse
+	}
+	{
+		map models/players/ahsoka/ahsoka-spec2
+		blendFunc GL_SRC_ALPHA GL_ONE
+		alphaGen lightingSpecular
+	detail
+	}
+}
+
+models/players/ahsoka/ahsoka_tcw
+{
+	{
+		map models/players/ahsoka/ahsoka_tcw
 		rgbGen lightingDiffuse
 	}
 	{
@@ -27,6 +68,20 @@ models/players/ahsoka/cull
 	}
 }
 
+models/players/ahsoka/ahsoka_totj
+{
+	{
+		map models/players/ahsoka/ahsoka_totj
+		rgbGen lightingDiffuse
+	}
+	{
+		map models/players/ahsoka/ahsoka-spec3
+		blendFunc GL_SRC_ALPHA GL_ONE
+		alphaGen lightingSpecular
+	detail
+	}
+}
+
 models/players/ahsoka/pouch
 {
 	{
@@ -39,4 +94,18 @@ models/players/ahsoka/pouch
 		alphaGen lightingSpecular
 	detail
 	}
+}
+
+models/players/ahsoka/pouch_tcw
+{
+	{
+		map models/players/ahsoka/pouch_tcw
+		rgbGen lightingDiffuse
+	}
+	{
+		map models/players/ahsoka/pouch-spec
+		blendFunc GL_SRC_ALPHA GL_ONE
+		alphaGen lightingSpecular
+	detail
+	}
 }
\ No newline at end of file
diff --git a/MBAssets3/shaders/barriss_offee.shader b/MBAssets3/shaders/barriss_offee.shader
index 03ca6af63..8bd861ed6 100644
--- a/MBAssets3/shaders/barriss_offee.shader
+++ b/MBAssets3/shaders/barriss_offee.shader
@@ -18,16 +18,6 @@ models/players/barriss_offee/cape
 	}
 }
 
-models/players/barriss_offee/skirt
-{
-	cull	disable
-	{
-		map models/players/barriss_offee/skirt
-		depthWrite
-		rgbGen lightingDiffuse
-	}
-}
-
 models/players/barriss_offee/body_inq
 {
         nopicmip
@@ -124,7 +114,6 @@ models/players/barriss_offee/boots_inq
 
 models/players/barriss_offee/cape_old
 {
-	cull	disable
     {
         map models/players/barriss_offee/cape_old
         rgbGen lightingDiffuse

From 558fb691342ffa6fd3dc2d0ce8c862fe00544d0e Mon Sep 17 00:00:00 2001
From: Unguided <buektomi@gmail.com>
Date: Thu, 5 Mar 2026 12:25:04 +0100
Subject: [PATCH 79/82] hilt path fix in SAssassin

---
 z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch b/z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch
index 3af62221a..9ceb62b98 100644
--- a/z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch
@@ -73,14 +73,14 @@ ClassInfo
 	saber2_1		saber_boc_legends
 	saber2color_1	5
 	
-	saber1_2		saber_asajj_legacy
+	saber1_2		saber_asajj2_legacy
 	sabercolor	0_2
 	saber2_2		saber_asajj2_legacy
 	saber2color_2	0	
 	
-	saber1_3		saber_talon
+	saber1_3		saber_asharad
 	sabercolor_3	0
-	saber2_3		saber_asharad
+	saber2_3		saber_talon
 	saber2color_3	0
 }
 

From bd59216111c09ab2cced053e227fa0cdd9f36afa Mon Sep 17 00:00:00 2001
From: Unguided <buektomi@gmail.com>
Date: Thu, 5 Mar 2026 12:55:45 +0100
Subject: [PATCH 80/82] +1 Ahsoka variant in JAcrobat

---
 .../ext_data/mb2/character/h9_JAcrobat.mbch      | 16 ++++++++++------
 .../ext_data/mb2/character/v9_SAssass.mbch       |  4 ++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/h9_JAcrobat.mbch b/z_MBLegends/ext_data/mb2/character/h9_JAcrobat.mbch
index 428e13f8b..f77bf12e9 100644
--- a/z_MBLegends/ext_data/mb2/character/h9_JAcrobat.mbch
+++ b/z_MBLegends/ext_data/mb2/character/h9_JAcrobat.mbch
@@ -40,13 +40,17 @@ ClassInfo
 	skin			"default"
 	uishader		"models/players/ahsoka/mb2_icon_default"
 	
-	model_1		"aayla"
-	skin_1		"default"
-	uishader_1	"models/players/aayla/mb2_icon_default"
-
-	model_2		"serraketo"
+	model_1		"ahsoka"
+	skin_1			"padawan"
+	uishader_1		"models/players/ahsoka/mb2_icon_padawan"
+	
+	model_2		"aayla"
 	skin_2		"default"
-	uishader_2	"models/players/serraketo/mb2_icon_default"
+	uishader_2	"models/players/aayla/mb2_icon_default"
+
+	model_3		"serraketo"
+	skin_3		"default"
+	uishader_3	"models/players/serraketo/mb2_icon_default"
 	
 	saber1			saber_ahsoka_legends
 	sabercolor		3
diff --git a/z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch b/z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch
index 9ceb62b98..299c36256 100644
--- a/z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch
@@ -73,8 +73,8 @@ ClassInfo
 	saber2_1		saber_boc_legends
 	saber2color_1	5
 	
-	saber1_2		saber_asajj2_legacy
-	sabercolor	0_2
+	saber1_2		saber_asajj_legacy
+	sabercolor	_2            0
 	saber2_2		saber_asajj2_legacy
 	saber2color_2	0	
 	

From 52de6b7aec38580b1e1acbe867b1407f313ca3e0 Mon Sep 17 00:00:00 2001
From: Unguided <buektomi@gmail.com>
Date: Thu, 5 Mar 2026 13:24:08 +0100
Subject: [PATCH 81/82] f*** it, removing rogue Barriss from SAssassin as her
 saberhilts get broken for reason unknown

---
 .../ext_data/mb2/character/v9_SAssass.mbch    | 23 ++++++-------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch b/z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch
index 299c36256..0f0b2382a 100644
--- a/z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch
+++ b/z_MBLegends/ext_data/mb2/character/v9_SAssass.mbch
@@ -55,13 +55,9 @@ ClassInfo
 	skin_4		"default"
 	uishader_4	"models/players/darthcognus/mb2_icon_default"
 	
-	model_5	"barriss_offee"
-	skin_5		"nocape"
-	uishader_5	"models/players/barriss_offee/mb2_icon_nocape_sith"
-	
-	model_6	"darthkrayt2"
-	skin_6		"default"
-	uishader_6	"models/players/darthkrayt2/mb2_icon_default"
+	model_5	"darthkrayt2"
+	skin_5		"default"
+	uishader_5	"models/players/darthkrayt2/mb2_icon_default"
 		
 	saber1		alora_legends
 	sabercolor		0
@@ -73,15 +69,10 @@ ClassInfo
 	saber2_1		saber_boc_legends
 	saber2color_1	5
 	
-	saber1_2		saber_asajj_legacy
-	sabercolor	_2            0
-	saber2_2		saber_asajj2_legacy
-	saber2color_2	0	
-	
-	saber1_3		saber_asharad
-	sabercolor_3	0
-	saber2_3		saber_talon
-	saber2color_3	0
+	saber1_2		saber_asharad
+	sabercolor_2	0
+	saber2_2		saber_talon
+	saber2color_2	0
 }
 
 description "Sith Assassin

From 2e582bfff2878427d9ff8c5ff254f2ad11dc2130 Mon Sep 17 00:00:00 2001
From: leonssz <leonsxvojtech@gmail.com>
Date: Sat, 7 Mar 2026 13:43:04 +0100
Subject: [PATCH 82/82] remove red stagger from UI

---
 .../abilities/mb_ability_strongstyles.menu    | 59 -------------------
 1 file changed, 59 deletions(-)

diff --git a/MBAssets3/ui/mb/alpha/game/abilities/mb_ability_strongstyles.menu b/MBAssets3/ui/mb/alpha/game/abilities/mb_ability_strongstyles.menu
index 752f080b7..f37bcd33f 100644
--- a/MBAssets3/ui/mb/alpha/game/abilities/mb_ability_strongstyles.menu
+++ b/MBAssets3/ui/mb/alpha/game/abilities/mb_ability_strongstyles.menu
@@ -140,18 +140,6 @@
 			decoration
 		}
 
-		itemDef
-		{
-			name				bg4
-			group				none
-			style				WINDOW_STYLE_FILLED
-			rect				3 186 103 14
-			forecolor			1 1 1 1
-			backcolor			1 1 1 0.15
-			visible				1
-			decoration
-		}
-
 		itemDef
 		{
 			name				offenseRating
@@ -374,24 +362,6 @@
 			decoration
 		}
 
-				itemDef
-		{
-			name				redPerk3
-			group				Stats
-			style				WINDOW_STYLE_TEXT_RGB1
-			text				"Staggers on 2nd bodyhit in a combo"
-			rect 				6 276 20 14
-			textalign			ITEM_ALIGN_LEFT
-			textalignx			8
-			textaligny			-2
-			font				6
-			textscale			0.1
-			forecolor			1 1 1 1
-			visible				1
-			cvarTest "ui_help_performance"
-			showCvar {"1"}
-			decoration
-		}
 
 // =================================
 // ============= PURPLE ==============
@@ -602,34 +572,5 @@
 			decoration
 		}
 
-
-		itemDef
-		{
-			name				NoteDesc_Background
-			group				none
-			style				WINDOW_STYLE_FILLED
-			rect				3 276 103 14
-			forecolor			1 1 1 1
-			backcolor			1 1 1 0.15
-			visible				1
-			cvarTest "ui_help_performance"
-			showCvar {"1"}
-			decoration
-		}
-
-		itemDef
-		{
-			name				NoteIcon
-			group				none
-			style				WINDOW_STYLE_SHADER
-			rect				6 280 5 6
-			forecolor			1 1 1 1
-			background			"gfx/menus/Alpha/Icon_Weap_Point"
-			visible				1
-			cvarTest "ui_help_performance"
-			showCvar {"1"}
-			decoration
-		}
-
 	}
 }