From 5a99c8a5694e096ef5f3ae09cc92f000c5f6dce6 Mon Sep 17 00:00:00 2001 From: Dark <52303455+ResurgenceDark@users.noreply.github.com> Date: Wed, 9 Oct 2019 11:46:09 -0500 Subject: [PATCH 1/3] Adding Perfect Power Crystal Added to item_stats.tab --- .../compiled/game/datatables/item/master_item/item_stats.tab | 1 + 1 file changed, 1 insertion(+) 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 7445cb223..ef5358657 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 @@ -1145,6 +1145,7 @@ item_power_crystal_04_17 int:jedi.crystal.stats.min_dmg=17,int:jedi.crystal.st 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 From 9774583ecb5a7ebc459b0a8e6e7a18bb33bc56a3 Mon Sep 17 00:00:00 2001 From: Dark <52303455+ResurgenceDark@users.noreply.github.com> Date: Wed, 9 Oct 2019 11:59:24 -0500 Subject: [PATCH 2/3] Continued Adding Perfect Crystals Added to jedi.java --- .../compiled/game/script/library/jedi.java | 35 +++++++------------ 1 file changed, 13 insertions(+), 22 deletions(-) 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 e4df22124..59441848b 100755 --- a/sku.0/sys.server/compiled/game/script/library/jedi.java +++ b/sku.0/sys.server/compiled/game/script/library/jedi.java @@ -69,6 +69,7 @@ public class jedi extends script.base_script public static final int CRYSTAL_SELECT = 4; public static final int CRYSTAL_PREMIUM = 5; public static final int CRYSTAL_FLAWLESS = 6; + public static final int CRYSTAL_PERFECT = 7; public static final int MIN_CRYSTAL_TUNE_PLAYER_LEVEL = 20; public static final int MIN_NON_FR_JEDI_BOUNTY = 25000; public static final int PER_JEDI_SKILL_PT_COST = 1000; @@ -1597,33 +1598,22 @@ public class jedi extends script.base_script } public static int getCrystalQuality(int level) throws InterruptedException { - if (level < 40) - { + if (level < 40) { return CRYSTAL_POOR; - } - else if (level < 70) - { + } else if (level < 70) { return CRYSTAL_FAIR; - } - else if (level < 100) - { + } else if (level < 100) { return CRYSTAL_GOOD; - } - else if (level < 140) - { + } else if (level < 140) { return CRYSTAL_QUALITY; - } - else if (level < 220) - { + } else if (level < 220) { return CRYSTAL_SELECT; - } - else if (level < 330) - { + } else if (level < 330) { return CRYSTAL_PREMIUM; - } - else - { + } else if (level < 490) { return CRYSTAL_FLAWLESS; + } else { + return CRYSTAL_PERFECT; } } public static int getStaticCrystalQuality(int level) throws InterruptedException @@ -1644,10 +1634,11 @@ public class jedi extends script.base_script return CRYSTAL_PREMIUM; case 6: return CRYSTAL_FLAWLESS; + case 7: + return CRYSTAL_PERFECT; default: - break; + return CRYSTAL_GOOD; } - return CRYSTAL_GOOD; } public static boolean forceCreateColorCrystal(obj_id player, int color) throws InterruptedException { From f911a6827715d7573766d2d1af42d5ddf8b6c29a Mon Sep 17 00:00:00 2001 From: Cekis Date: Wed, 9 Oct 2019 17:06:49 -0400 Subject: [PATCH 3/3] Fixed Mos Eisley Harassment --- .../compiled/game/script/ai/imperial_presence/harass.java | 1 + 1 file changed, 1 insertion(+) diff --git a/sku.0/sys.server/compiled/game/script/ai/imperial_presence/harass.java b/sku.0/sys.server/compiled/game/script/ai/imperial_presence/harass.java index f2741e9d3..9e5067d05 100755 --- a/sku.0/sys.server/compiled/game/script/ai/imperial_presence/harass.java +++ b/sku.0/sys.server/compiled/game/script/ai/imperial_presence/harass.java @@ -390,6 +390,7 @@ public class harass extends script.base_script } removeTriggerVolume(VOL_DETAIN); utils.removeScriptVarTree(self, SCRIPTVAR_HARASS_BASE); + utils.removeObjVar(self, "ai.persistantFollowing"); } public void volDetainBreach(obj_id self, obj_id who) throws InterruptedException {