MBII · Defiant88 · Feb 20, 2026 · Jan 19, 2026 · Jan 19, 2026 · Jan 19, 2026
diff --git a/03_MovieGameMappack/Ext_Data/MB2/character/VR_mgs1_psychomantis.mbch b/03_MovieGameMappack/Ext_Data/MB2/character/VR_mgs1_psychomantis.mbch
@@ -15,8 +15,8 @@ ClassInfo
 	speed       1.2
 	classNumberLimit	1
 	classflags		CFL_MIRALUKA
-	jetpackThrustEffect	"force/pushblur"
-	jetpackIdleEffect		"force/pushblur"
+	jetpackThrustEffect	"gfx/effects/dekashield2" 
+	jetpackIdleEffect		"gfx/effects/dekashield2" 
 	jetpackJetTag		"*r_leg_foot"
 	jetpackJet2Tag		"*l_leg_foot"
 	jetpackJetOffset		"0, 0, 21"

diff --git a/MBAssets3/ext_data/mb2/character/duel_uta_grievous.mbch b/MBAssets3/ext_data/mb2/character/duel_uta_grievous.mbch
@@ -11,7 +11,7 @@ Classinfo
 	forcepool			10
 	classflags			CFL_FASTFORCEREGEN
 	model				"grievous"
-	skin				"worn_nocape"
+	skin				"nocape"
 	uishader			"models/players/grievous/mb2_icon_nocape"
 	MBclass				MB_CLASS_ARCTROOPER
 	modelscale			1.1

diff --git a/MBAssets3/ext_data/npcs/BDroidRed.npc b/MBAssets3/ext_data/npcs/BDroidRed.npc
diff --git a/MBAssets3/ext_data/npcs/BDroidYel.npc b/MBAssets3/ext_data/npcs/BDroidYel.npc
diff --git a/MBAssets3/ext_data/npcs/Lando.npc b/MBAssets3/ext_data/npcs/Lando.npc
@@ -1,4 +1,4 @@
-//NNN: JKO npc for cinimatics
+//NNN: JKO npc for cutscenes on ns_hideout and ns_starpad
 Lando
 {
 	playerModel	lando

diff --git a/MBAssets3/ext_data/npcs/Mark4.npc b/MBAssets3/ext_data/npcs/Mark4.npc
@@ -1,6 +1,7 @@
 m4droid
 {
 	playermodel		m4droid
+	MBClass		11
 	weapon			WP_BOT_LASER
 	headYawRangeLeft	180
 	headYawRangeRight	180

diff --git a/MBAssets3/ext_data/npcs/alora.npc b/MBAssets3/ext_data/npcs/alora.npc
@@ -3,6 +3,7 @@
 alora
 {
 	playerModel	alora
+	MBClass		5
 	rank		lt
 	saber		single_4
 	saberColor	red
@@ -62,6 +63,7 @@ alora_dual
 {
 //	playerModel	alora2
 	playerModel	alora
+	MBClass		5
 	rank		commander
 	saber		single_4
 	saberColor	red
@@ -76,7 +78,7 @@ alora_dual
 	forcePowerMax	200
 	Pbchance 40
 	MBchance 4
-	SBchance 70
+	SBchance 80
 	saberStyle		6
 	health			500
 	FP_HEAL			0

diff --git a/MBAssets3/ext_data/npcs/assassin_droid.npc b/MBAssets3/ext_data/npcs/assassin_droid.npc
@@ -1,7 +1,8 @@
-//NNN: Seen in JKA t2_rogue, setup with regenerating armor for now and the mb2 galak_shield, given EE-4 to be more dangerous
+//NNN: Seen in JKA t2_rogue and vjun3, setup with regenerating armor for now and the mb2 galak_shield, given EE-4 to be more dangerous
 assassin_droid
 {
 	playerModel assassin_droid
+	MBClass		11
 	weapon		WP_BLASTER
 	//MB_ATT_BLASTER 3
 	//altFire 1
@@ -11,7 +12,7 @@ assassin_droid
 	MB_ATT_SHIELD_RECHARGE2 1
 	//NPCAI_SHOCK_FIELD 1 //Doesn't work, stil uses CLASS_ASSASSIN_DROID to action
 	health		200
-	armor        100
+	armor        40
 	MB_ATT_WOOKIE_STRENGTH 3
 	headPitchRangeDown 30
 	FL_NO_KNOCKBACK 1

diff --git a/MBAssets3/ext_data/npcs/atst.npc b/MBAssets3/ext_data/npcs/atst.npc
@@ -1,7 +1,8 @@
-//NNN: Has custom AI and weapons, currently attacks don't have the correct muzzels
+//NNN: Has custom AI and weapons, currently attacks don't have the correct muzzels. Only seen in t2_dpred.
 atst
 {
 	playerModel	atst
+	MBClass		11
 	weapon		WP_ATST_MAIN
 	weapon		WP_ATST_SIDE
 //	headModel	atst

diff --git a/MBAssets3/ext_data/npcs/b-wing_mini.npc b/MBAssets3/ext_data/npcs/b-wing_mini.npc
@@ -1,4 +1,3 @@
-
 //NOTE: for vehicle-class NPCs, the playerModel key is actually their entry in the vehicles.dat
 
 b-wing_mini

diff --git a/MBAssets3/ext_data/npcs/bartender.npc b/MBAssets3/ext_data/npcs/bartender.npc
@@ -1,4 +1,4 @@
-//NNN: The JKO bartender on NarShadda
+//NNN: The JKO bartender on ns_streets
 Bartender
 {
 	playerModel	chiss

diff --git a/MBAssets3/ext_data/npcs/bespincop.npc b/MBAssets3/ext_data/npcs/bespincop.npc
@@ -1,4 +1,4 @@
-//NNN: Used in JKO Bespin levels as allies that assist the player, the spawner between default and 2 is randomized so there's a bit of variety
+//NNN: Used in JKO bespin_streets level as allies that assist the player, the spawner between default and 2 is randomized so there's a bit of variety
 BespinCop
 {
 	playerModel bespin_cop

diff --git a/MBAssets3/ext_data/npcs/boba_fett.npc b/MBAssets3/ext_data/npcs/boba_fett.npc
@@ -2,6 +2,7 @@
 boba_fett
 {
 	playerModel	boba_fett
+	MBClass		13
 	altFire		1
 	weapon		WP_MELEE
 	weapon		WP_DISRUPTOR

diff --git a/MBAssets3/ext_data/npcs/chewie.npc b/MBAssets3/ext_data/npcs/chewie.npc
@@ -3,6 +3,7 @@ chewie
 {
 	playerModel		chewbacca
 	//altFire			0
+	MBClass		10
 	weapon			WP_BOWCASTER
 	MB_ATT_BOWCASTER 3
 	FP_HEAL			0

diff --git a/MBAssets3/ext_data/npcs/cultist.npc b/MBAssets3/ext_data/npcs/cultist.npc
@@ -2,6 +2,7 @@
 cultist
 {
 	playerModel	cultist
+	MBClass		5
 	weapon	WP_BLASTER
 	MB_ATT_BLASTER 3
 	altFire 1

diff --git a/MBAssets3/ext_data/npcs/cultist_destroyer.npc b/MBAssets3/ext_data/npcs/cultist_destroyer.npc
@@ -1,9 +1,10 @@
-//NNN: This is supposed to be a cultist zealot who would charge the player chanting until blowing themself up with force destruction, maybe using rage to close the distance
+//NNN: This is supposed to be a cultist zealot who would charge the player chanting until blowing themself up with force destruction, maybe using force dark rage to close the distance
 //NNN: Doesn't work currently, will need a lot of work code side
 cultist_destroyer
 {
 	playerModel	cultist
 	customSkin	red
+	MBClass		5
 	weapon	WP_MELEE
 	RESOURCE_FORCE 1
 	forcePowerMax	200

diff --git a/MBAssets3/ext_data/npcs/cultist_mage.npc b/MBAssets3/ext_data/npcs/cultist_mage.npc
@@ -3,6 +3,7 @@ cultist_lightning
 {
 	playerModel	cultist
 	customSkin	blue
+	MBClass		5
 	weapon		WP_MELEE
 	MB_ATT_FORCEBLOCK 3
 	FP_LEVITATION	3
@@ -43,6 +44,7 @@ cultist_drain
 {
 	playerModel	cultist
 	customSkin	red
+	MBClass		5
 	weapon		WP_MELEE
 	MB_ATT_FORCEBLOCK 3
 	FP_LEVITATION	3
@@ -82,6 +84,7 @@ cultist_drain
 cultist_grip
 {
 	playerModel	cultist
+	MBClass		5
 	weapon		WP_MELEE
 	MB_ATT_FORCEBLOCK 3
 	FP_LEVITATION	3
@@ -123,6 +126,7 @@ cultist_push //NNN: Should be a combined push/pull/repulse/superpush eventually
 {
 	playerModel	reborn_concept
 	customSkin	force
+	MBClass		5
 	weapon		WP_MELEE
 	MB_ATT_FORCEBLOCK 3
 	FP_LEVITATION	3
@@ -162,6 +166,7 @@ cultist_pull
 {
 	playerModel	reborn_concept
 	customSkin	force
+	MBClass		5
 	weapon		WP_MELEE
 	MB_ATT_FORCEBLOCK 3
 	FP_LEVITATION	3
@@ -202,6 +207,7 @@ cultist_destruction
 {
 	playerModel	reborn_concept
 	customSkin	force
+	MBClass		5
 	weapon		WP_MELEE
 	MB_ATT_FORCEBLOCK 3
 	FP_LEVITATION	3
@@ -242,6 +248,7 @@ cultist_blind
 {
 	playerModel	reborn_concept
 	customSkin	force
+	MBClass		5
 	weapon		WP_MELEE
 	MB_ATT_FORCEBLOCK 3
 	FP_LEVITATION	3
@@ -282,6 +289,7 @@ cultist_sight
 {
 	playerModel	reborn_concept
 	customSkin	force
+	MBClass		5
 	weapon		WP_MELEE
 	MB_ATT_FORCEBLOCK 3
 	FP_LEVITATION	3
@@ -322,6 +330,7 @@ cultist_heal
 {
 	playerModel	reborn_concept
 	customSkin	force
+	MBClass		5
 	weapon		WP_MELEE
 	MB_ATT_FORCEBLOCK 3
 	FP_LEVITATION	3
@@ -362,6 +371,7 @@ cultist_teamheal
 {
 	playerModel	reborn_concept
 	customSkin	force
+	MBClass		5
 	weapon		WP_MELEE
 	MB_ATT_FORCEBLOCK 3
 	FP_LEVITATION	3
@@ -402,6 +412,7 @@ cultist_teamforce
 {
 	playerModel	reborn_concept
 	customSkin	force
+	MBClass		5
 	weapon		WP_MELEE
 	MB_ATT_FORCEBLOCK 3
 	FP_LEVITATION	3
@@ -442,6 +453,7 @@ cultist_speed
 {
 	playerModel	reborn_concept
 	customSkin	force
+	MBClass		5
 	weapon		WP_MELEE
 	MB_ATT_FORCEBLOCK 3
 	FP_LEVITATION	3
@@ -482,6 +494,7 @@ cultist_rage
 {
 	playerModel	reborn_concept
 	customSkin	force
+	MBClass		5
 	weapon		WP_MELEE
 	MB_ATT_FORCEBLOCK 3
 	FP_LEVITATION	3
@@ -522,6 +535,7 @@ cultist_mt
 {
 	playerModel	reborn_concept
 	customSkin	force
+	MBClass		5
 	weapon		WP_MELEE
 	MB_ATT_FORCEBLOCK 3
 	FP_LEVITATION	3
@@ -562,6 +576,7 @@ cultist_protect
 {
 	playerModel	reborn_concept
 	customSkin	force
+	MBClass		5
 	weapon		WP_MELEE
 	MB_ATT_FORCEBLOCK 3
 	FP_LEVITATION	3
@@ -602,6 +617,7 @@ cultist_absorb
 {
 	playerModel	reborn_concept
 	customSkin	force
+	MBClass		5
 	weapon		WP_MELEE
 	MB_ATT_FORCEBLOCK 3
 	FP_LEVITATION	3

diff --git a/MBAssets3/ext_data/npcs/cultist_saber.npc b/MBAssets3/ext_data/npcs/cultist_saber.npc
@@ -4,6 +4,7 @@ cultist_saber
 {
 	playerModel	cultist
 	customSkin	brown
+	MBClass		5
 	saber		reborn
 	weapon	WP_SABER
 	//MB_ATT_FORCEBLOCK 1
@@ -46,6 +47,7 @@ cultist_saber_throw
 {
 	playerModel	cultist
 	customSkin	brown
+	MBClass		5
 	saber		reborn
 	weapon	WP_SABER
 	//MB_ATT_FORCEBLOCK 1
@@ -89,6 +91,7 @@ cultist_saber_med
 {
 	playerModel	cultist
 	customSkin	brown
+	MBClass		5
 	saber		reborn
 	weapon	WP_SABER
 	//MB_ATT_FORCEBLOCK 1
@@ -132,6 +135,7 @@ cultist_saber_med_throw
 {
 	playerModel	cultist
 	customSkin	brown
+	MBClass		5
 	saber		reborn
 	weapon	WP_SABER
 	//MB_ATT_FORCEBLOCK 1
@@ -176,6 +180,7 @@ cultist_saber_strong
 {
 	playerModel	cultist
 	customSkin	brown
+	MBClass		5
 	saber		reborn
 	weapon	WP_SABER
 	//MB_ATT_FORCEBLOCK 1
@@ -219,6 +224,7 @@ cultist_saber_strong_throw
 {
 	playerModel	cultist
 	customSkin	brown
+	MBClass		5
 	saber		reborn
 	weapon	WP_SABER
 	//MB_ATT_FORCEBLOCK 1
@@ -263,6 +269,7 @@ cultist_saber_all
 {
 	playerModel	cultist
 	customSkin	brown
+	MBClass		5
 	saber		reborn
 	weapon	WP_SABER
 	//MB_ATT_FORCEBLOCK 1
@@ -309,6 +316,7 @@ cultist_saber_all_throw
 {
 	playerModel	cultist
 	customSkin	brown
+	MBClass		5
 	saber		reborn
 	weapon	WP_SABER
 	//MB_ATT_FORCEBLOCK 1
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		//NOTE: for vehicle-class NPCs, the playerModel key is actually their entry in the vehicles.dat

		b-wing_mini
Expand Down