swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-10-21 12:03:08 -04:00
Code Issues Projects Releases Wiki Activity

Deprecate Feature Bits & Subscription Bits

Browse Source
This commit is contained in:
AconiteGodOfSWG
2021-08-15 05:42:30 -04:00
parent 8a2b1bf0e8
commit 2394d6210a
95 changed files with 142 additions and 748 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/script/library/space_transition.java
+6 -20
View File
@@ -368,21 +368,12 @@ public class space_transition extends script.base_script
}
public static boolean isPlayerBelowShipLimit(obj_id player) throws InterruptedException
{
int count = countShipControlDevicesForPlayer(player);
int limit = SHIP_LIMIT_MAX;
if (features.hasEpisode3Expansion(player))
{
limit = SHIP_LIMIT_EXPANSION;
}
final int count = countShipControlDevicesForPlayer(player);
if (count < 0)
{
return false;
}
if (count >= limit)
{
return false;
}
return true;
return count < SHIP_LIMIT_EXPANSION;
}
public static obj_id findPilotSlotObjectForShip(obj_id pilot, obj_id ship) throws InterruptedException
{
@@ -1156,15 +1147,10 @@ public class space_transition extends script.base_script
location playerLoc = getLocation(player);
for (obj_id passenger : passengers) {
if (passenger != player) {
if (features.isSpaceEdition(passenger)) {
startIndex = space_transition.getNextStartIndex(shipStartLocations, startIndex);
if (startIndex <= shipStartLocations.size()) {
passengersToWarp = utils.addElement(passengersToWarp, passenger);
passengerStartIndexes = utils.addElement(passengerStartIndexes, startIndex);
}
} else {
string_id strSpam = new string_id("space/space_interaction", "no_space_expansion");
sendSystemMessage(passenger, strSpam);
startIndex = space_transition.getNextStartIndex(shipStartLocations, startIndex);
if (startIndex <= shipStartLocations.size()) {
passengersToWarp = utils.addElement(passengersToWarp, passenger);
passengerStartIndexes = utils.addElement(passengerStartIndexes, startIndex);
}
}
}