projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-04 19:12:50 -04:00
Code Issues Projects Releases Wiki Activity

Added GCW tokens and rank progression

Browse Source 
- GCW tokens are now granted for invasions
- GCW points correctly translate to GCW rank progression
- Temp fixed GCW next update timer
- Ensured thread termination of spawners
- Prepared InvasionService in terms of timing for TestServer-deployment
This commit is contained in:
CharonInferar
2014-08-02 23:25:23 +02:00
parent 5981efda9f
commit c2342c0d7b
8 changed files with 293 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/PlayerService.java
+46
View File
@@ -37,9 +37,11 @@ import java.util.concurrent.TimeUnit;
import java.util.function.Predicate;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.session.IoSession;
import protocol.swg.CharacterSheetResponseMessage;
import protocol.swg.ClientIdMsg;
import protocol.swg.ClientMfdStatusUpdateMessage;
@@ -68,6 +70,8 @@ import resources.common.ProsePackage;
import resources.common.SpawnPoint;
import resources.datatables.DisplayType;
import resources.datatables.FactionStatus;
import resources.datatables.Factions;
import resources.datatables.GcwRank;
import resources.datatables.Options;
import resources.datatables.PlayerFlags;
import resources.datatables.Professions;
@@ -137,6 +141,48 @@ public class PlayerService implements INetworkDispatch {
player.setTotalPlayTime((int) (player.getTotalPlayTime() + ((System.currentTimeMillis() - player.getLastPlayTimeUpdate()) / 1000)));
player.setLastPlayTimeUpdate(System.currentTimeMillis());
core.collectionService.checkExplorationRegions(creature);
// GCW rank progress
if (creature.getFaction().equals("rebel") || creature.getFaction().equals("imperial")){
int oldrank = player.getCurrentRank();
//int oldprogress = (int) ((player.getRankProgress() > 100) ? 100 : player.getRankProgress());
int oldprogress = 0;
int oldpoints = player.getGcwPoints();
int newrank = oldrank;
int newprogress = oldprogress;
int oldranktotal = 0;
int oldrankprogress = 0;
int newranktotal = 0;
int newrankprogress = 0;
oldrankprogress = oldprogress * 50;
oldranktotal = 5000 * (oldrank - 1) + oldrankprogress;
newprogress = (int) core.gcwService.helper(oldpoints, oldrank);
if (newprogress < -2000) {
newprogress = -2000;
}
newranktotal = oldranktotal + newprogress;
if (oldrank == GcwRank.LIEUTENANT && newprogress < 0 && newranktotal < 30000) {
newranktotal = 29999;
}
newrank = oldrank;
if (newrank > GcwRank.GENERAL) {
newrank = GcwRank.GENERAL;
newranktotal = 12 * 5000 - 1;
}
newrankprogress = newranktotal - (newrank - 1) * 5000;
newprogress = newrankprogress * 100 / 5000;
player.setRankProgress((float) Math.floor(newprogress));
}
} catch (Exception e) {
e.printStackTrace();
}