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

Java 11.0.2 migration (#32)

Browse Source 
* Code compiles - execution NOT tested

* updating gitignore

* Removed intellij settings files

* Removed more intellij files

* Added exclusion for JDK classes.

* Fixed purchasing script for vendors that have listed coin types.

* Updated script to not kick off until the entire preload is complete.

* adds static name entry for Solo movie poster and tcg9 vendor entry

* clean up empty and orphaned object templates

* adds placeholder black market (static) spawns

* corrects entries for the video game table to correctly set it in tcg series 2 and remove series 1 console errors

* Updated gitignore and removed intellij project files

* Fixed appearance reference for thranta payroll and kashyyyk door, added skipLosCheck objvar due to cannit see issue. Requires updated src

* Fixed appearance and template for terminal (#2)

* Fixed appearance and template for terminal (#3)

* Fixed appearance and template for terminal (#4)

* Deleted another faulty/orphaned object template

* Fixed gcw ranks option on frog. Only issue is that it doesn't award the officer commands or badges.

* Fixed some unneeded java 11 changes
This commit is contained in:
Tekaoh
2019-04-18 18:31:52 -05:00
committed by GitHub
parent a4298e618f
commit 5c2e112349
1815 changed files with 36918 additions and 49649 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/script/library/create.java
+13 -15
View File
@@ -495,9 +495,8 @@ public class create extends script.base_script
ranged_int_custom_var[] c = hue.getPalcolorVars(creature);
if (c != null)
{
for (int i = 0; i < c.length; i++)
{
c[i].setValue(huevar);
for (ranged_int_custom_var ranged_int_custom_var : c) {
ranged_int_custom_var.setValue(huevar);
}
}
}
@@ -590,7 +589,7 @@ public class create extends script.base_script
dictionary primDat = weapons.getWeaponDat(primaryWeapon);
if (primDat != null)
{
weapons.setWeaponAttributes(primaryWeapon, primDat, 1f);
weapons.setWeaponAttributes(primaryWeapon, primDat, 1.0f);
}
setWeaponAttackSpeed(primaryWeapon, primarySpeed);
setWeaponMaxDamage(primaryWeapon, priMaxDamage);
@@ -613,7 +612,7 @@ public class create extends script.base_script
dictionary secDat = weapons.getWeaponDat(secondaryWeapon);
if (secDat != null)
{
weapons.setWeaponAttributes(secondaryWeapon, secDat, 1f);
weapons.setWeaponAttributes(secondaryWeapon, secDat, 1.0f);
}
setWeaponAttackSpeed(secondaryWeapon, secondarySpeed);
setWeaponMaxDamage(secondaryWeapon, secMaxDamage);
@@ -805,7 +804,7 @@ public class create extends script.base_script
int level = 0;
{
level = (int)(((statLevel * 6) + (dmgLevel * 6) + (toHitLevel * 2) + (armorLevel * 4)) / 18f);
level = (int)(((statLevel * 6) + (dmgLevel * 6) + (toHitLevel * 2) + (armorLevel * 4)) / 18.0f);
}
return level;
}
@@ -826,9 +825,8 @@ public class create extends script.base_script
return;
}
String[] scriptArray = split(scriptList, ',');
for (int i = 0; i < scriptArray.length; i++)
{
attachScript(creature, scriptArray[i]);
for (String s : scriptArray) {
attachScript(creature, s);
}
}
public static boolean initializeArmor(obj_id creature, dictionary creatureDict) throws InterruptedException
@@ -910,7 +908,7 @@ public class create extends script.base_script
{
intDifference = 1;
}
float fltPercent = (float)(intPlayerDifficulty / intDifference);
float fltPercent = (intPlayerDifficulty / intDifference);
fltPercent = fltPercent * 100;
int intIndex = (int)(fltPercent / 20);
intIndex = intIndex - 1;
@@ -1049,23 +1047,23 @@ public class create extends script.base_script
public static void randomlyNameCreature(obj_id npc, String creatureName) throws InterruptedException
{
String templateName = getTemplateName(npc);
if (templateName.indexOf("stormtrooper") != -1)
if (templateName.contains("stormtrooper"))
{
nameStormTrooper(npc);
}
if (templateName.indexOf("swamp_trooper") != -1)
if (templateName.contains("swamp_trooper"))
{
nameSwampTrooper(npc);
}
if (templateName.indexOf("scout_trooper") != -1)
if (templateName.contains("scout_trooper"))
{
nameScoutTrooper(npc);
}
if (templateName.indexOf("tie_fighter") != -1)
if (templateName.contains("tie_fighter"))
{
nameImperialPilot(npc);
}
if (templateName.indexOf("dark_trooper") != -1)
if (templateName.contains("dark_trooper"))
{
nameDarkTrooper(npc);
}