swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-08-27 16:56: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/systems/spawning/spawn_base.java
+7 -7
View File
@@ -571,7 +571,7 @@ public class spawn_base extends script.base_script
dctParams.put("intNumToSpawn", params.getInt("intNumToSpawn"));
dctParams.put("strTemplateToSpawn", params.getString("strBuildingType"));
dctParams.put("strTemplate", params.getString("strTemplate"));
float fltSize = getLocationSize((float)params.getInt("intSize"));
float fltSize = getLocationSize(params.getInt("intSize"));
utils.setScriptVar(self, "dctSpawnInfo", dctParams);
requestLocation(self, "spawnLocation", locSpawnLocation, 100.0f, fltSize, true, false);
}
@@ -596,25 +596,25 @@ public class spawn_base extends script.base_script
}
public float getLocationSize(float fltLocation) throws InterruptedException
{
if (fltLocation < 32f)
if (fltLocation < 32.0f)
{
return 32f;
return 32.0f;
}
else if (fltLocation >= 32 && fltLocation <= 48)
{
return 48f;
return 48.0f;
}
else if (fltLocation >= 48 && fltLocation <= 64)
{
return 64f;
return 64.0f;
}
else if (fltLocation >= 64 && fltLocation <= 80)
{
return 80f;
return 80.0f;
}
else
{
return 96f;
return 96.0f;
}
}
public boolean isGalaticCivilWarWinner(int faction, int threshold, int imperialScore) throws InterruptedException