swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-07-13 22:01:04 -04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
IrishDarkshadow
2019-12-23 19:26:52 -05:00
parent 9b5cd88c07 4443afc9dc
commit 3fcfcfc106
30 changed files with 1684 additions and 1653 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/script/library/utils.java
+8 -18
View File
@@ -78,7 +78,7 @@ public class utils extends script.base_script
public static final String BAZAAR_SCRIPT = "terminal.bazaar";
public static int clipRange(int iValue, int iClipMin, int iClipMax) throws InterruptedException
{
return (iValue < iClipMin) ? iClipMin : (iValue > iClipMax) ? iClipMax : iValue;
return (iValue < iClipMin) ? iClipMin : Math.min(iValue, iClipMax);
}
public static location getRandomAwayLocation(location pos, float fMinRadius, float fMaxRadius) throws InterruptedException
{
@@ -143,10 +143,7 @@ public class utils extends script.base_script
if (isIdValid(armor))
{
String template = getTemplateName(armor);
if (template.endsWith("armor_mandalorian_belt.iff") || template.endsWith("armor_mandalorian_bicep_l.iff") || template.endsWith("armor_mandalorian_bicep_r.iff") || template.endsWith("armor_mandalorian_bracer_l.iff") || template.endsWith("armor_mandalorian_bracer_r.iff") || template.endsWith("armor_mandalorian_chest_plate.iff") || template.endsWith("armor_mandalorian_helmet.iff") || template.endsWith("armor_mandalorian_leggings.iff") || template.endsWith("armor_mandalorian_shoes.iff") || template.endsWith("armor_mandalorian_gloves.iff"))
{
return true;
}
return template.endsWith("armor_mandalorian_belt.iff") || template.endsWith("armor_mandalorian_bicep_l.iff") || template.endsWith("armor_mandalorian_bicep_r.iff") || template.endsWith("armor_mandalorian_bracer_l.iff") || template.endsWith("armor_mandalorian_bracer_r.iff") || template.endsWith("armor_mandalorian_chest_plate.iff") || template.endsWith("armor_mandalorian_helmet.iff") || template.endsWith("armor_mandalorian_leggings.iff") || template.endsWith("armor_mandalorian_shoes.iff") || template.endsWith("armor_mandalorian_gloves.iff");
}
return false;
}
@@ -4795,30 +4792,20 @@ public class utils extends script.base_script
if (intServerSpawnLimit > 0)
{
if (intNumCreatures > intServerSpawnLimit)
{
return false;
}
return intNumCreatures <= intServerSpawnLimit;
}
else
{
if (intNumPlayers < 200000)
{
if (intNumCreatures > 5000)
{
return false;
}
return intNumCreatures <= 5000;
}
else
{
float fltRatio = (intNumCreatures / intNumPlayers);
if (fltRatio > 10)
{
return false;
}
return !(fltRatio > 10.0f);
}
}
return true;
}
public static String formatTimeVerbose(int seconds) throws InterruptedException
{
@@ -7224,4 +7211,7 @@ public class utils extends script.base_script
}
return intNumCreatures;
}
public static boolean inDebugMode() throws InterruptedException {
return (utils.getIntConfigSetting("GameServer", "debugMode") == 1);
}
}