swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-08-02 02:15:48 -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/theme_park/controller_initialize.java
+10 -18
View File
@@ -14,14 +14,12 @@ public class controller_initialize extends script.base_script
public int OnInitialize(obj_id self) throws InterruptedException
{
location selfLoc = getLocation(self);
obj_id objects[] = getObjectsInRange(selfLoc, .1f);
obj_id objects[] = getObjectsInRange(selfLoc, 0.1f);
boolean exists = false;
if (objects != null || objects.length > 0)
{
for (int i = 0; i < objects.length; i++)
{
if ((getTemplateName(objects[i])).equals(CONTROLLER))
{
for (obj_id object : objects) {
if ((getTemplateName(object)).equals(CONTROLLER)) {
exists = true;
}
}
@@ -62,9 +60,8 @@ public class controller_initialize extends script.base_script
return;
}
String[] scripts = split(scriptString, ';');
for (int q = 0; q < scripts.length; q++)
{
attachScript(subject, scripts[q]);
for (String script : scripts) {
attachScript(subject, script);
}
}
public void setObjVarString(obj_id newObject, String objVarString) throws InterruptedException
@@ -87,24 +84,19 @@ public class controller_initialize extends script.base_script
String[] nameValueSplit = split(data, '=');
String name = nameValueSplit[0];
String value = nameValueSplit[1];
if (type.equals("int"))
{
if (type.equals("int")) {
setObjVar(newObject, name, utils.stringToInt(value));
}
if (type.equals("float"))
{
if (type.equals("float")) {
setObjVar(newObject, name, utils.stringToFloat(value));
}
if (type.equals("string"))
{
if (type.equals("string")) {
setObjVar(newObject, name, value);
}
if (type.equals("boolean") && (value.equals("true") || value.equals("1")))
{
if (type.equals("boolean") && (value.equals("true") || value.equals("1"))) {
setObjVar(newObject, name, true);
}
if (type.equals("boolean") && (value.equals("false") || value.equals("0")))
{
if (type.equals("boolean") && (value.equals("false") || value.equals("0"))) {
setObjVar(newObject, name, false);
}
}