diff --git a/sku.0/sys.server/compiled/game/datatables/item/master_item/item_stats.tab b/sku.0/sys.server/compiled/game/datatables/item/master_item/item_stats.tab index e9532873e..18d4b6aeb 100755 --- a/sku.0/sys.server/compiled/game/datatables/item/master_item/item_stats.tab +++ b/sku.0/sys.server/compiled/game/datatables/item/master_item/item_stats.tab @@ -1104,6 +1104,7 @@ item_color_crystal_02_09 int:jedi.crystal.stats.color=9,int:jedi.crystal.stats item_color_crystal_02_10 int:jedi.crystal.stats.color=10,int:jedi.crystal.stats.level=-1 index_color_1=10 item_color_crystal_02_11 int:jedi.crystal.stats.color=11,int:jedi.crystal.stats.level=-1 index_color_1=11 item_color_crystal_02_12 int:jedi.crystal.stats.color=12,int:jedi.crystal.stats.level=-1 index_color_1=12 +item_crystal_allyas_exile_01 int:jedi.crystal.stats.color=12,int:jedi.crystal.stats.level=-1 index_color_1=0 item_color_crystal_02_13 int:jedi.crystal.stats.color=13,int:jedi.crystal.stats.level=-1 index_color_1=13 item_color_crystal_02_14 int:jedi.crystal.stats.color=14,int:jedi.crystal.stats.level=-1 index_color_1=14 item_color_crystal_02_15 int:jedi.crystal.stats.color=15,int:jedi.crystal.stats.level=-1 index_color_1=15 @@ -1119,33 +1120,35 @@ item_color_crystal_02_24 int:jedi.crystal.stats.color=24,int:jedi.crystal.stat item_color_crystal_02_25 int:jedi.crystal.stats.color=25,int:jedi.crystal.stats.level=-1 index_color_1=25 item_color_crystal_02_26 int:jedi.crystal.stats.color=26,int:jedi.crystal.stats.level=-1 index_color_1=26 item_color_crystal_02_27 int:jedi.crystal.stats.color=27,int:jedi.crystal.stats.level=-1 index_color_1=27 +item_crystal_allyas_redemption_01 int:jedi.crystal.stats.color=27,int:jedi.crystal.stats.level=-1 index_color_1=27 item_color_crystal_02_28 int:jedi.crystal.stats.color=28,int:jedi.crystal.stats.level=-1 index_color_1=28 item_color_crystal_02_29 int:jedi.crystal.stats.color=29,int:jedi.crystal.stats.level=-1 index_color_1=29 item_color_crystal_02_30 int:jedi.crystal.stats.color=30,int:jedi.crystal.stats.level=-1 index_color_1=30 -item_crystal_tyranus_cunning_01 int:jedi.crystal.stats.color=31,int:jedi.crystal.stats.level=-1 index_color_1=1 -item_crystal_allyas_exile_01 int:jedi.crystal.stats.color=12,int:jedi.crystal.stats.level=-1 index_color_1=0 -item_crystal_allyas_redemption_01 int:jedi.crystal.stats.color=27,int:jedi.crystal.stats.level=-1 index_color_1=27 -item_power_crystal_04_01 int:jedi.crystal.stats.min_dmg=1,int:jedi.crystal.stats.max_dmg=2,int:jedi.crystal.stats.quality=0,int:jedi.crystal.stats.level=-1 index_color_1=32 -item_power_crystal_04_02 int:jedi.crystal.stats.min_dmg=2,int:jedi.crystal.stats.max_dmg=3,int:jedi.crystal.stats.quality=0,int:jedi.crystal.stats.level=-1 index_color_1=32 -item_power_crystal_04_03 int:jedi.crystal.stats.min_dmg=3,int:jedi.crystal.stats.max_dmg=4,int:jedi.crystal.stats.quality=1,int:jedi.crystal.stats.level=-1 index_color_1=32 -item_power_crystal_04_04 int:jedi.crystal.stats.min_dmg=4,int:jedi.crystal.stats.max_dmg=5,int:jedi.crystal.stats.quality=1,int:jedi.crystal.stats.level=-1 index_color_1=32 -item_power_crystal_04_05 int:jedi.crystal.stats.min_dmg=5,int:jedi.crystal.stats.max_dmg=6,int:jedi.crystal.stats.quality=1,int:jedi.crystal.stats.level=-1 index_color_1=32 -item_power_crystal_04_06 int:jedi.crystal.stats.min_dmg=6,int:jedi.crystal.stats.max_dmg=7,int:jedi.crystal.stats.quality=2,int:jedi.crystal.stats.level=-1 index_color_1=32 -item_power_crystal_04_07 int:jedi.crystal.stats.min_dmg=7,int:jedi.crystal.stats.max_dmg=8,int:jedi.crystal.stats.quality=2,int:jedi.crystal.stats.level=-1 index_color_1=32 -item_power_crystal_04_08 int:jedi.crystal.stats.min_dmg=8,int:jedi.crystal.stats.max_dmg=9,int:jedi.crystal.stats.quality=2,int:jedi.crystal.stats.level=-1 index_color_1=32 -item_power_crystal_04_09 int:jedi.crystal.stats.min_dmg=9,int:jedi.crystal.stats.max_dmg=10,int:jedi.crystal.stats.quality=3,int:jedi.crystal.stats.level=-1 index_color_1=32 -item_power_crystal_04_10 int:jedi.crystal.stats.min_dmg=10,int:jedi.crystal.stats.max_dmg=11,int:jedi.crystal.stats.quality=3,int:jedi.crystal.stats.level=-1 index_color_1=32 -item_power_crystal_04_11 int:jedi.crystal.stats.min_dmg=11,int:jedi.crystal.stats.max_dmg=12,int:jedi.crystal.stats.quality=3,int:jedi.crystal.stats.level=-1 index_color_1=32 -item_power_crystal_04_12 int:jedi.crystal.stats.min_dmg=12,int:jedi.crystal.stats.max_dmg=13,int:jedi.crystal.stats.quality=4,int:jedi.crystal.stats.level=-1 index_color_1=32 -item_power_crystal_04_13 int:jedi.crystal.stats.min_dmg=13,int:jedi.crystal.stats.max_dmg=14,int:jedi.crystal.stats.quality=4,int:jedi.crystal.stats.level=-1 index_color_1=32 -item_power_crystal_04_14 int:jedi.crystal.stats.min_dmg=14,int:jedi.crystal.stats.max_dmg=15,int:jedi.crystal.stats.quality=4,int:jedi.crystal.stats.level=-1 index_color_1=32 -item_power_crystal_04_15 int:jedi.crystal.stats.min_dmg=15,int:jedi.crystal.stats.max_dmg=16,int:jedi.crystal.stats.quality=5,int:jedi.crystal.stats.level=-1 index_color_1=32 -item_power_crystal_04_16 int:jedi.crystal.stats.min_dmg=16,int:jedi.crystal.stats.max_dmg=17,int:jedi.crystal.stats.quality=5,int:jedi.crystal.stats.level=-1 index_color_1=32 -item_power_crystal_04_17 int:jedi.crystal.stats.min_dmg=17,int:jedi.crystal.stats.max_dmg=18,int:jedi.crystal.stats.quality=5,int:jedi.crystal.stats.level=-1 index_color_1=32 -item_power_crystal_04_18 int:jedi.crystal.stats.min_dmg=18,int:jedi.crystal.stats.max_dmg=19,int:jedi.crystal.stats.quality=6,int:jedi.crystal.stats.level=-1 index_color_1=32 -item_power_crystal_04_19 int:jedi.crystal.stats.min_dmg=19,int:jedi.crystal.stats.max_dmg=20,int:jedi.crystal.stats.quality=6,int:jedi.crystal.stats.level=-1 index_color_1=32 -item_power_crystal_04_20 int:jedi.crystal.stats.min_dmg=20,int:jedi.crystal.stats.max_dmg=22,int:jedi.crystal.stats.quality=6,int:jedi.crystal.stats.level=-1 index_color_1=32 -item_power_crystal_04_21 int:jedi.crystal.stats.min_dmg=23,int:jedi.crystal.stats.max_dmg=25,int:jedi.crystal.stats.quality=7,int:jedi.crystal.stats.level=-1 index_color_1=32 +item_crystal_tyranus_cunning_01 int:jedi.crystal.stats.color=32,int:jedi.crystal.stats.level=-1 index_color_1=1 +item_crystal_mauls_vengeance_01 int:jedi.crystal.stats.color=33,int:jedi.crystal.stats.level=-1 index_color_1=33 +item_crystal_quigons_devotion_01 int:jedi.crystal.stats.color=34,int:jedi.crystal.stats.level=-1 index_color_1=34 +item_crystal_trial_tano_01 int:jedi.crystal.stats.color=35,int:jedi.crystal.stats.level=-1 index_color_1=35 +item_power_crystal_04_01 int:jedi.crystal.stats.min_dmg=1,int:jedi.crystal.stats.max_dmg=2,int:jedi.crystal.stats.quality=0,int:jedi.crystal.stats.level=-1 index_color_1=31 +item_power_crystal_04_02 int:jedi.crystal.stats.min_dmg=2,int:jedi.crystal.stats.max_dmg=3,int:jedi.crystal.stats.quality=0,int:jedi.crystal.stats.level=-1 index_color_1=31 +item_power_crystal_04_03 int:jedi.crystal.stats.min_dmg=3,int:jedi.crystal.stats.max_dmg=4,int:jedi.crystal.stats.quality=1,int:jedi.crystal.stats.level=-1 index_color_1=31 +item_power_crystal_04_04 int:jedi.crystal.stats.min_dmg=4,int:jedi.crystal.stats.max_dmg=5,int:jedi.crystal.stats.quality=1,int:jedi.crystal.stats.level=-1 index_color_1=31 +item_power_crystal_04_05 int:jedi.crystal.stats.min_dmg=5,int:jedi.crystal.stats.max_dmg=6,int:jedi.crystal.stats.quality=1,int:jedi.crystal.stats.level=-1 index_color_1=31 +item_power_crystal_04_06 int:jedi.crystal.stats.min_dmg=6,int:jedi.crystal.stats.max_dmg=7,int:jedi.crystal.stats.quality=2,int:jedi.crystal.stats.level=-1 index_color_1=31 +item_power_crystal_04_07 int:jedi.crystal.stats.min_dmg=7,int:jedi.crystal.stats.max_dmg=8,int:jedi.crystal.stats.quality=2,int:jedi.crystal.stats.level=-1 index_color_1=31 +item_power_crystal_04_08 int:jedi.crystal.stats.min_dmg=8,int:jedi.crystal.stats.max_dmg=9,int:jedi.crystal.stats.quality=2,int:jedi.crystal.stats.level=-1 index_color_1=31 +item_power_crystal_04_09 int:jedi.crystal.stats.min_dmg=9,int:jedi.crystal.stats.max_dmg=10,int:jedi.crystal.stats.quality=3,int:jedi.crystal.stats.level=-1 index_color_1=31 +item_power_crystal_04_10 int:jedi.crystal.stats.min_dmg=10,int:jedi.crystal.stats.max_dmg=11,int:jedi.crystal.stats.quality=3,int:jedi.crystal.stats.level=-1 index_color_1=31 +item_power_crystal_04_11 int:jedi.crystal.stats.min_dmg=11,int:jedi.crystal.stats.max_dmg=12,int:jedi.crystal.stats.quality=3,int:jedi.crystal.stats.level=-1 index_color_1=31 +item_power_crystal_04_12 int:jedi.crystal.stats.min_dmg=12,int:jedi.crystal.stats.max_dmg=13,int:jedi.crystal.stats.quality=4,int:jedi.crystal.stats.level=-1 index_color_1=31 +item_power_crystal_04_13 int:jedi.crystal.stats.min_dmg=13,int:jedi.crystal.stats.max_dmg=14,int:jedi.crystal.stats.quality=4,int:jedi.crystal.stats.level=-1 index_color_1=31 +item_power_crystal_04_14 int:jedi.crystal.stats.min_dmg=14,int:jedi.crystal.stats.max_dmg=15,int:jedi.crystal.stats.quality=4,int:jedi.crystal.stats.level=-1 index_color_1=31 +item_power_crystal_04_15 int:jedi.crystal.stats.min_dmg=15,int:jedi.crystal.stats.max_dmg=16,int:jedi.crystal.stats.quality=5,int:jedi.crystal.stats.level=-1 index_color_1=31 +item_power_crystal_04_16 int:jedi.crystal.stats.min_dmg=16,int:jedi.crystal.stats.max_dmg=17,int:jedi.crystal.stats.quality=5,int:jedi.crystal.stats.level=-1 index_color_1=31 +item_power_crystal_04_17 int:jedi.crystal.stats.min_dmg=17,int:jedi.crystal.stats.max_dmg=18,int:jedi.crystal.stats.quality=5,int:jedi.crystal.stats.level=-1 index_color_1=31 +item_power_crystal_04_18 int:jedi.crystal.stats.min_dmg=18,int:jedi.crystal.stats.max_dmg=19,int:jedi.crystal.stats.quality=6,int:jedi.crystal.stats.level=-1 index_color_1=31 +item_power_crystal_04_19 int:jedi.crystal.stats.min_dmg=19,int:jedi.crystal.stats.max_dmg=20,int:jedi.crystal.stats.quality=6,int:jedi.crystal.stats.level=-1 index_color_1=31 +item_power_crystal_04_20 int:jedi.crystal.stats.min_dmg=20,int:jedi.crystal.stats.max_dmg=22,int:jedi.crystal.stats.quality=6,int:jedi.crystal.stats.level=-1 index_color_1=31 +item_power_crystal_04_21 int:jedi.crystal.stats.min_dmg=23,int:jedi.crystal.stats.max_dmg=25,int:jedi.crystal.stats.quality=7,int:jedi.crystal.stats.level=-1 index_color_1=31 item_npe_dance_prop_l_entertainer_02_01 int:nocert=1 item_npe_dance_prop_r_entertainer_02_01 int:nocert=1 item_npe_necklace_protection_02_01 agility_modified=3 diff --git a/sku.0/sys.server/compiled/game/datatables/item/master_item/master_item.tab b/sku.0/sys.server/compiled/game/datatables/item/master_item/master_item.tab index e6096e90d..c4315cbfe 100755 --- a/sku.0/sys.server/compiled/game/datatables/item/master_item/master_item.tab +++ b/sku.0/sys.server/compiled/game/datatables/item/master_item/master_item.tab @@ -8535,3 +8535,7 @@ armor_mandalorian_dwb_helmet object/tangible/wearables/armor/mandalorian/armor_m armor_mandalorian_dwb_leggings object/tangible/wearables/armor/mandalorian/armor_mandalorian_leggings.iff armor 90 4 item.special.nomove 2 1 Mandalorian Armor Leggings Mandalorian Armor Leggings item_tcg_loot_reward_series9_ep9d object/tangible/tcg/series9/painting_posters_ep9d.iff 4 item.special.nomove The Rise Of Skywalker The theatrical poster for Star Wars - The Rise Of Skywalker item_tcg_loot_reward_series9_ep9e object/tangible/tcg/series9/painting_posters_ep9e.iff 4 item.special.nomove The Rise Of Skywalker The IMAX movie poster for Star Wars - The Rise Of Skywalker +item_power_crystal_04_21 object/tangible/component/weapon/lightsaber/lightsaber_module_force_crystal.iff 4 systems.jedi.jedi_saber_component 1 Power Crystal A Force Crystal, used by Jedi in their lightsabers.||This crystal must be tuned by a Jedi before use. Once tuned this crystal becomes a focusing crystal and can only be used in a lightsaber by the Jedi who tuned it. +item_crystal_mauls_vengeance_01 object/tangible/component/weapon/lightsaber/lightsaber_module_force_crystal.iff 2 systems.jedi.jedi_saber_component 1 Maul's Vengeance A Force Color Crystal, used by Jedi in their lightsabers.||This color crystal must be tuned by a Jedi before use. Once tuned this color crystal becomes a focusing crystal and can only be used in a lightsaber by the Jedi who tuned it. +item_crystal_quigons_devotion_01 object/tangible/component/weapon/lightsaber/lightsaber_module_force_crystal.iff 2 systems.jedi.jedi_saber_component 1 Qui-Gon's Devotion A Force Color Crystal, used by Jedi in their lightsabers.||This color crystal must be tuned by a Jedi before use. Once tuned this color crystal becomes a focusing crystal and can only be used in a lightsaber by the Jedi who tuned it. +item_crystal_trial_tano_01 object/tangible/component/weapon/lightsaber/lightsaber_module_force_crystal.iff 2 systems.jedi.jedi_saber_component,item.special.nomove 1 Trial Of Tano A Force Color Crystal, used by Jedi in their lightsabers.||This color crystal must be tuned by a Jedi before use. Once tuned this color crystal becomes a focusing crystal and can only be used in a lightsaber by the Jedi who tuned it. diff --git a/sku.0/sys.server/compiled/game/datatables/jedi/crystal_color_damage.tab b/sku.0/sys.server/compiled/game/datatables/jedi/crystal_color_damage.tab index e94f154a0..3f022bca6 100755 --- a/sku.0/sys.server/compiled/game/datatables/jedi/crystal_color_damage.tab +++ b/sku.0/sys.server/compiled/game/datatables/jedi/crystal_color_damage.tab @@ -12,7 +12,7 @@ i "e(none=0,cold=64,heat=32,acid=128,electric=256)[none]" f c 9 electric 0.02 10 heat 0.02 11 heat 0.02 -12 heat 0.05 Maul's Vengence +12 heat 0.05 Allya's Exile 13 heat 0.04 Kun's Blood 14 acid 0.06 Bondara's Folly 15 acid 0.04 Ulric's Redemption @@ -27,8 +27,25 @@ i "e(none=0,cold=64,heat=32,acid=128,electric=256)[none]" f c 24 electric 0.04 Quintessence of the Force 25 acid 0.04 Dawn of Dagobah 26 electric 0.04 Horn's Future -27 acid 0.04 Qui-gon's Devotion +27 acid 0.04 Allya's Redemption 28 cold 0.06 Kenobi's Legacy 29 heat 0.06 Sunrider's Destiny 30 acid 0.04 Kit's Ferocity -31 heat 0.06 Cunning of Tyranus +32 heat 0.06 Cunning of Tyranus +33 heat 0.05 Maul's Vengeance +34 acid 0.04 Qui-gon's Devotion +35 electric 0.06 Trial Of Tano +36 cold 0.01 unused +37 cold 0.01 unused +38 cold 0.01 unused +39 cold 0.01 unused +40 cold 0.01 unused +41 cold 0.01 unused +42 cold 0.01 unused +43 cold 0.01 unused +44 cold 0.01 unused +45 cold 0.01 unused +46 cold 0.01 unused +47 cold 0.01 unused +48 cold 0.01 unused + diff --git a/sku.0/sys.server/compiled/game/script/library/jedi.java b/sku.0/sys.server/compiled/game/script/library/jedi.java index 625ea224c..59441848b 100755 --- a/sku.0/sys.server/compiled/game/script/library/jedi.java +++ b/sku.0/sys.server/compiled/game/script/library/jedi.java @@ -1393,7 +1393,7 @@ public class jedi extends script.base_script { int color = getIntObjVar(saber, VAR_SABER_BASE + "." + VAR_COLOR); int colorRow = dataTableSearchColumnForInt(color, "color", JEDI_CRYSTAL_COLOR_TABLE); - if (color > 31 || colorRow < 0) + if (color == 31 || colorRow < 0) { setWeaponElementalType(saber, DAMAGE_NONE); setWeaponElementalValue(saber, 0);