swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-10-05 21:12:59 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/SWG-Source/dsrc

Browse Source 
merging new files
merging new files
This commit is contained in:
IrishDarkshadow
2019-10-09 18:10:55 -04:00
parent db4bd018c9 250d9fcb1e
commit 81ec37dcaa
3 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/datatables/item/master_item/item_stats.tab
+1
View File
@@ -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
sku.0/sys.server/compiled/game/script/ai/imperial_presence/harass.java
+1
View File
@@ -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
{
sku.0/sys.server/compiled/game/script/library/jedi.java
+13 -22
View File
@@ -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
{