Java 11.0.2 migration (#32)

* 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
@@ -58,7 +58,7 @@ public class space_create extends script.base_script
setObjVar(objShip, "xp.intXP", intXP);
String strShipt = dctShipInfo.getString("strShip");
setShipTypeName(objShip, strShipt);
if (strShipt.indexOf("tier") > -1)
if (strShipt.contains("tier"))
{
int index = strShipt.lastIndexOf("_");
if (index > -1)
@@ -126,9 +126,8 @@ public class space_create extends script.base_script
if (script != null && script.length() > 0)
{
String[] scriptArray = split(script, ',');
for (int i = 0; i < scriptArray.length; i++)
{
attachScript(objShip, scriptArray[i]);
for (String s : scriptArray) {
attachScript(objShip, s);
}
}
String cargo_type = dctShipInfo.getString("cargo");
@@ -244,11 +243,9 @@ public class space_create extends script.base_script
{
return null;
}
for (int intI = 0; intI < objContents.length; intI++)
{
if (hasObjVar(objContents[intI], "loot.intCredits"))
{
return objContents[intI];
for (obj_id objContent : objContents) {
if (hasObjVar(objContent, "loot.intCredits")) {
return objContent;
}
}
return null;
@@ -286,7 +283,7 @@ public class space_create extends script.base_script
}
else
{
transform trTest = space_utils.getRandomPositionInSphere(trSpawnLocation, 0f, fltDistance, true);
transform trTest = space_utils.getRandomPositionInSphere(trSpawnLocation, 0.0f, fltDistance, true);
objShip = space_create._createShip(strShipType, trTest, objCell, hyperspace);
}
if (!isIdValid(objShip))
@@ -364,7 +361,7 @@ public class space_create extends script.base_script
}
setObjVar(objShip, "ship.pilotType", strPilot);
}
if (strPilot.indexOf("tier") > -1)
if (strPilot.contains("tier"))
{
int index = strPilot.lastIndexOf("_");
if (index > -1)