swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-09-27 13:13:10 -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/player/player_instance.java
+38 -67
View File
@@ -357,13 +357,11 @@ public class player_instance extends script.base_script
{
obj_id[] players = getGroupMemberIds(groupId);
CustomerServiceLog("instance-" + instance_name, "GROUP LIST");
for (int i = 0; i < players.length; i++)
{
if (players[i] == self)
{
for (obj_id player : players) {
if (player == self) {
continue;
}
CustomerServiceLog("instance-" + instance_name, "Member: " + getPlayerName(players[i]));
CustomerServiceLog("instance-" + instance_name, "Member: " + getPlayerName(player));
}
}
}
@@ -379,13 +377,11 @@ public class player_instance extends script.base_script
{
obj_id[] players = getGroupMemberIds(groupId);
CustomerServiceLog("instance-" + instance_name, "GROUP LIST");
for (int i = 0; i < players.length; i++)
{
if (players[i] == self)
{
for (obj_id player : players) {
if (player == self) {
continue;
}
CustomerServiceLog("instance-" + instance_name, "Member: " + getPlayerName(players[i]));
CustomerServiceLog("instance-" + instance_name, "Member: " + getPlayerName(player));
}
}
}
@@ -489,17 +485,14 @@ public class player_instance extends script.base_script
addSUIDataItem(pid, sui.LISTBOX_DATASOURCE, "" + idx);
setSUIProperty(pid, sui.LISTBOX_DATASOURCE + "." + idx, sui.PROP_TEXT, "Group Members In Range");
idx++;
for (int i = 0; i < members.length; i++)
{
if (!isIdValid(members[i]) || !exists(members[i]))
{
for (obj_id member : members) {
if (!isIdValid(member) || !exists(member)) {
continue;
}
if (!isPlayer(members[i]) || members[i] == self)
{
if (!isPlayer(member) || member == self) {
continue;
}
String playerName = getPlayerFullName(members[i]);
String playerName = getPlayerFullName(member);
prose_package namePackage = new prose_package();
namePackage.stringId = new string_id("instance", "gold_text");
namePackage.actor.set(playerName);
@@ -507,30 +500,24 @@ public class player_instance extends script.base_script
addSUIDataItem(pid, sui.LISTBOX_DATASOURCE, "" + idx);
setSUIProperty(pid, sui.LISTBOX_DATASOURCE + "." + idx, sui.PROP_TEXT, playerName);
idx++;
dictionary[] groupMemberInstanceData = instance.getAllLockoutData(members[i]);
if (groupMemberInstanceData == null || groupMemberInstanceData.length == 0)
{
dictionary[] groupMemberInstanceData = instance.getAllLockoutData(member);
if (groupMemberInstanceData == null || groupMemberInstanceData.length == 0) {
addSUIDataItem(pid, sui.LISTBOX_DATASOURCE, "" + idx);
setSUIProperty(pid, sui.LISTBOX_DATASOURCE + "." + idx, sui.PROP_TEXT, "No Instance Data");
idx++;
}
else
{
for (int q = 0; q < groupMemberInstanceData.length; q++)
{
if (groupMemberInstanceData[q] == null)
{
} else {
for (dictionary groupMemberInstanceDatum : groupMemberInstanceData) {
if (groupMemberInstanceDatum == null) {
continue;
}
int time = groupMemberInstanceData[q].getInt("time");
obj_id instance_id = groupMemberInstanceData[q].getObjId("instance_id");
obj_id owner = groupMemberInstanceData[q].getObjId("owner");
String instance_name = groupMemberInstanceData[q].getString("instance_name");
int startTime = groupMemberInstanceData[q].getInt("start_time");
int time = groupMemberInstanceDatum.getInt("time");
obj_id instance_id = groupMemberInstanceDatum.getObjId("instance_id");
obj_id owner = groupMemberInstanceDatum.getObjId("owner");
String instance_name = groupMemberInstanceDatum.getString("instance_name");
int startTime = groupMemberInstanceDatum.getInt("start_time");
int timeToClose = startTime + instance.getInstanceDuration(instance_name) - getGameTime();
String xxTimeToClose = getCalendarTimeStringLocal(getCalendarTime() + timeToClose);
if (timeToClose < 0)
{
if (timeToClose < 0) {
timeToClose = 0;
}
String raidId = getRaidId("" + startTime, "" + instance_id, "" + owner);
@@ -538,12 +525,9 @@ public class player_instance extends script.base_script
boolean bClose = false;
boolean bMatch = false;
String passedId = getPassedId(listId, instance_name);
if (!passedId.equals("") && raidId.equals(passedId))
{
if (!passedId.equals("") && raidId.equals(passedId)) {
bMatch = true;
}
else
{
} else {
bMatch = false;
}
int timeDifference = time - getCalendarTime();
@@ -551,31 +535,24 @@ public class player_instance extends script.base_script
String xxTimeString = getCalendarTimeStringLocal(getCalendarTime() + timeDifference);
prose_package statusProse = new prose_package();
String closeString = "";
if (timeToClose == 0)
{
if (timeToClose == 0) {
bClose = true;
closeString = "Instance Closed";
}
else
{
} else {
bClose = false;
closeString = utils.formatTimeVerbose(timeToClose);
}
prose_package pp = new prose_package();
if (bClose && bMatch)
{
if (bClose && bMatch) {
pp.stringId = new string_id("instance", "close_same");
}
if (bClose && !bMatch)
{
if (bClose && !bMatch) {
pp.stringId = new string_id("instance", "close_different");
}
if (!bClose && bMatch)
{
if (!bClose && bMatch) {
pp.stringId = new string_id("instance", "open_same");
}
if (!bClose && !bMatch)
{
if (!bClose && !bMatch) {
pp.stringId = new string_id("instance", "open_different");
}
String instanceName = "@" + new string_id("instance", instance_name);
@@ -613,17 +590,14 @@ public class player_instance extends script.base_script
obj_id[] members = getGroupMemberIds(groupId);
if (members != null || members.length > 0)
{
for (int i = 0; i < members.length; i++)
{
if (!isIdValid(members[i]) || !exists(members[i]))
{
for (obj_id member : members) {
if (!isIdValid(member) || !exists(member)) {
continue;
}
if (!isPlayer(members[i]) || members[i] == self)
{
if (!isPlayer(member) || member == self) {
continue;
}
concatenatedAtrocity += getUnflaggedInstancesString(members[i]);
concatenatedAtrocity += getUnflaggedInstancesString(member);
concatenatedAtrocity += "\n";
}
}
@@ -679,17 +653,14 @@ public class player_instance extends script.base_script
{
return "";
}
for (int i = 0; i < listId.size(); i++)
{
if (((String)listId.get(i)).equals(""))
{
for (Object o : listId) {
if (((String) o).equals("")) {
continue;
}
String[] parse = split(((String)listId.get(i)), '-');
String[] parse = split(((String) o), '-');
String passedName = parse[0];
String passedId = parse[1];
if (passedName.equals(instance_name))
{
if (passedName.equals(instance_name)) {
return passedId;
}
}
@@ -723,7 +694,7 @@ public class player_instance extends script.base_script
float multiplier = utils.stringToFloat(getConfigSetting("GameServer", "heroicTokenBonus"));
if (multiplier > 1)
{
count = (int)((float)count * (float)multiplier);
count = (int)(count * (float)multiplier);
}
if (tokenIndex < 0 || tokenIndex >= trial.HEROIC_TOKENS.length)
{