swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-10-07 23:13:17 -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/quest/task/ground/spawn.java
+6 -6
View File
@@ -34,8 +34,8 @@ public class spawn extends script.quest.task.ground.base_task
public static final String objvarOnCreatureCount = "quest.count";
public static final String taskType = "spawn";
public static final String dot = ".";
public static final float cleanupTime = 300.f;
public static final float cleanupRetryTime = 60.f;
public static final float cleanupTime = 300.0f;
public static final float cleanupRetryTime = 60.0f;
public static final String scriptSpawnOnCreature = "quest.task.ground.spawn_on_creature";
public static final String scriptSpawnOnShip = "quest.task.ground.spawn_on_ship";
public int OnTaskActivated(obj_id self, int questCrc, int taskId) throws InterruptedException
@@ -66,7 +66,7 @@ public class spawn extends script.quest.task.ground.base_task
{
String baseObjVar = groundquests.getBaseObjVar(self, taskType, questGetQuestName(questCrc), taskId);
float playerPlayedTimeWhenTimerEnds = getFloatObjVar(self, baseObjVar + "." + objvarPlayedTimeEnd);
float timeLeft = playerPlayedTimeWhenTimerEnds - (float)getPlayerPlayedTime(self);
float timeLeft = playerPlayedTimeWhenTimerEnds - getPlayerPlayedTime(self);
if (timeLeft > 1)
{
messageTo(self, "messageStartQuestSpawn", params, timeLeft, true);
@@ -225,12 +225,12 @@ public class spawn extends script.quest.task.ground.base_task
for (int i = 0; i < count; ++i)
{
transform gloc = getTransform_o2w(space_transition.getContainingShip(player));
float dist = rand(700.f, 800.f);
float dist = rand(700.0f, 800.0f);
vector n = ((gloc.getLocalFrameK_p()).normalize()).multiply(dist);
gloc = gloc.move_p(n);
gloc = gloc.yaw_l(3.14f);
vector vi = ((gloc.getLocalFrameI_p()).normalize()).multiply(rand(-150.f, 150.f));
vector vj = ((gloc.getLocalFrameJ_p()).normalize()).multiply(rand(-150.f, 150.f));
vector vi = ((gloc.getLocalFrameI_p()).normalize()).multiply(rand(-150.0f, 150.0f));
vector vj = ((gloc.getLocalFrameJ_p()).normalize()).multiply(rand(-150.0f, 150.0f));
vector vd = vi.add(vj);
gloc = gloc.move_p(vd);
obj_id newship = space_create.createShipHyperspace(shipType, gloc);