swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-09-29 15:12:58 -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/timer.java
+6 -10
View File
@@ -29,7 +29,7 @@ public class timer extends script.quest.task.ground.base_task
maxTime = temp;
}
float timerLength = rand(minTime, maxTime);
float playerPlayedTimeWhenTimerEnds = (float)getPlayerPlayedTime(self) + timerLength;
float playerPlayedTimeWhenTimerEnds = getPlayerPlayedTime(self) + timerLength;
groundquests.questOutputDebugInfo(self, questCrc, taskId, taskType, "OnTaskActivated", "Setting timer for " + timerLength + " seconds.");
dictionary params = new dictionary();
params.put("questcrc", questCrc);
@@ -51,7 +51,7 @@ public class timer extends script.quest.task.ground.base_task
{
String baseObjVar = groundquests.getBaseObjVar(self, taskType, questGetQuestName(questCrc), taskId);
float playerPlayedTimeWhenTimerEnds = getFloatObjVar(self, baseObjVar + dot + timeObjVar);
float timeLeft = playerPlayedTimeWhenTimerEnds - (float)getPlayerPlayedTime(self);
float timeLeft = playerPlayedTimeWhenTimerEnds - getPlayerPlayedTime(self);
if (timeLeft <= 0)
{
questCompleteTask(questCrc, taskId, self);
@@ -104,17 +104,13 @@ public class timer extends script.quest.task.ground.base_task
String questCrcString = (String)keys.nextElement();
int questCrc = utils.stringToInt(questCrcString);
int[] tasksForCurrentQuest = tasks.getIntArray(questCrcString);
for (int i = 0; i < tasksForCurrentQuest.length; ++i)
{
int taskId = tasksForCurrentQuest[i];
for (int taskId : tasksForCurrentQuest) {
String baseObjVar = groundquests.getBaseObjVar(self, taskType, questGetQuestName(questCrc), taskId);
float playerPlayedTimeWhenTimerEnds = getFloatObjVar(self, baseObjVar + dot + timeObjVar);
if ((float)getPlayerPlayedTime(self) < playerPlayedTimeWhenTimerEnds)
{
if (getPlayerPlayedTime(self) < playerPlayedTimeWhenTimerEnds) {
int isVisible = groundquests.getTaskIntDataEntry(questCrc, taskId, dataTableColumnVisible);
if (isVisible != 0)
{
questSetQuestTaskTimer(self, questGetQuestName(questCrc), taskId, "quest/groundquests:timer_timertext", (int)playerPlayedTimeWhenTimerEnds);
if (isVisible != 0) {
questSetQuestTaskTimer(self, questGetQuestName(questCrc), taskId, "quest/groundquests:timer_timertext", (int) playerPlayedTimeWhenTimerEnds);
}
}
}