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

Merge remote-tracking branch 'origin/master' into DantooineSpawns

Browse Source
This commit is contained in:
CharonInferar
2014-05-19 15:57:26 +02:00
parent 16f82b50a6 7a94d4438b
commit ac1128b00d
60 changed files with 1654 additions and 1525 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ngengine_public.jar
BIN
View File
Binary file not shown.
scripts/commands/dismissgroupmember.py
+10
View File
@@ -0,0 +1,10 @@
import sys
def setup():
return
def run(core, actor, target, commandString):
if actor and target:
core.groupService.handleGroupKick(actor, target)
return
scripts/commands/pvp.py
+7
View File
@@ -14,6 +14,9 @@ def run(core, actor, target, commandString):
if actor.getPvpStatus(PvpStatus.GoingOvert) or actor.getPvpStatus(PvpStatus.GoingCovert):
actor.sendSystemMessage('@faction_recruiter:pvp_status_changing', 0)
return
if core.gcwService.isInPvpZone(actor):
actor.sendSystemMessage('@gcw:pvp_advanced_region_cannot_go_covert', 0)
return
if commandString != '' and commandString != faction:
if commandString == 'rebel' or commandString == 'imperial' or commandString == 'neutral':
@@ -60,6 +63,8 @@ def run(core, actor, target, commandString):
actor.sendSystemMessage('@faction_recruiter:covert_to_overt', 0)
actor.setPvpStatus(PvpStatus.GoingOvert, True)
time.sleep(30)
if core.gcwService.isInPvpZone(actor):
return
actor.setFactionStatus(FactionStatus.SpecialForces)
actor.setPvpStatus(PvpStatus.GoingOvert, False)
actor.sendSystemMessage('@faction_recruiter:overt_complete', 0)
@@ -70,6 +75,8 @@ def run(core, actor, target, commandString):
actor.sendSystemMessage('@faction_recruiter:overt_to_covert', 0)
actor.setPvpStatus(PvpStatus.GoingCovert, True)
time.sleep(300)
if core.gcwService.isInPvpZone(actor):
return
actor.setFactionStatus(FactionStatus.Combatant)
actor.setPvpStatus(PvpStatus.GoingCovert, False)
actor.sendSystemMessage('@faction_recruiter:covert_complete', 0)
scripts/commands/transferitemmisc.py
+2 -2
View File
@@ -28,7 +28,7 @@ def run(core, actor, target, commandString):
if target.isLootItem():
target.setLootItem(0)
actor.sendSystemMessage('You looted ' + target.getStf().getStfValue() + ' from corpse.', 0)
actor.sendSystemMessage('You looted ' + target.getObjectName().getStfValue() + ' from corpse.', 0)
if actorContainer != None and (container.getTemplate() == "object/cell/shared_cell.iff") & core.housingService.getPermissions(actor, actorContainer):
target.getContainer().transferTo(actor, container, target)
@@ -95,4 +95,4 @@ def run(core, actor, target, commandString):
#core.scriptService.callScript(path, 'unequip', module, core, actor, target)
core.equipmentService.unequip(actor, target)
return
return
scripts/mobiles/dantooine/dark_jedi_master.py
+26
View File
@@ -42,6 +42,32 @@ def addTemplate(core):
attacks = Vector()
mobileTemplate.setDefaultAttack('saberHit')
mobileTemplate.setAttacks(attacks)
lootPoolNames_1 = ['Junk']
lootPoolChances_1 = [100]
lootGroupChance_1 = 65
mobileTemplate.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1)
lootPoolNames_2 = ['jedi_relic_1']
lootPoolChances_2 = [100]
lootGroupChance_2 = 85
mobileTemplate.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2)
lootPoolNames_3 = ['powercrystals_hiq']
lootPoolChances_3 = [100]
lootGroupChance_3 = 12
mobileTemplate.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3)
lootPoolNames_4 = ['random_stat_jewelry']
lootPoolChances_4 = [100]
lootGroupChance_4 = 8
mobileTemplate.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4)
lootPoolNames_5 = ['sithholocrons']
lootPoolChances_5 = [100]
lootGroupChance_5 = 3
mobileTemplate.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5)
core.spawnService.addMobileTemplate('dark_jedi_master', mobileTemplate)
scripts/mobiles/tatooine/bocatt.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("bocatt")
mobileTemplate.setAssistRange(12)
mobileTemplate.setStalker(True)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_bocatt.iff')
scripts/mobiles/tatooine/bull_ronto.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("ronto")
mobileTemplate.setAssistRange(0)
mobileTemplate.setStalker(False)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_ronto.iff')
scripts/mobiles/tatooine/cannibal_dewback.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("dewback cannibal")
mobileTemplate.setAssistRange(10)
mobileTemplate.setStalker(True)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_dewback.iff')
scripts/mobiles/tatooine/canyon_krayt_dragon.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("krayt dragon")
mobileTemplate.setAssistRange(36)
mobileTemplate.setStalker(True)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_canyon_krayt_dragon.iff')
scripts/mobiles/tatooine/death_kreetle.py
+1
View File
@@ -25,6 +25,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("uber kreetle")
mobileTemplate.setAssistRange(6)
mobileTemplate.setStalker(False)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_kreetle.iff')
scripts/mobiles/tatooine/desert_squill.py
+2 -1
View File
@@ -26,7 +26,8 @@ def addTemplate(core):
mobileTemplate.setHideAmount(3)
mobileTemplate.setSocialGroup("squill")
mobileTemplate.setAssistRange(10)
mobileTemplate.setStalker(False)
mobileTemplate.setStalker(False)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_squill.iff')
scripts/mobiles/tatooine/diseased_bocatt.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("bocatt")
mobileTemplate.setAssistRange(10)
mobileTemplate.setStalker(True)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_bocatt.iff')
scripts/mobiles/tatooine/dragonet.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("dragonet")
mobileTemplate.setAssistRange(10)
mobileTemplate.setStalker(True)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_dune_lizard.iff')
scripts/mobiles/tatooine/dune_lizard.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("dune lizard")
mobileTemplate.setAssistRange(10)
mobileTemplate.setStalker(True)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_dune_lizard.iff')
scripts/mobiles/tatooine/feral_bantha.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("bantha")
mobileTemplate.setAssistRange(6)
mobileTemplate.setStalker(False)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_bantha_hue.iff')
scripts/mobiles/tatooine/giant_canyon_krayt_dragon.py
+1 -2
View File
@@ -27,8 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("krayt dragon")
mobileTemplate.setAssistRange(34)
mobileTemplate.setStalker(True)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_canyon_krayt_dragon.iff')
scripts/mobiles/tatooine/giant_sand_beetle.py
+1
View File
@@ -25,6 +25,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("giant sand beetle")
mobileTemplate.setAssistRange(10)
mobileTemplate.setStalker(False)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_giant_sand_beetle.iff')
scripts/mobiles/tatooine/giant_worrt.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("worrt")
mobileTemplate.setAssistRange(6)
mobileTemplate.setStalker(False)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_giant_worrt.iff')
scripts/mobiles/tatooine/gorg.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("gorg")
mobileTemplate.setAssistRange(10)
mobileTemplate.setStalker(False)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_gorg.iff')
scripts/mobiles/tatooine/grand_krayt_dragon.py
+1 -2
View File
@@ -27,8 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("krayt dragon")
mobileTemplate.setAssistRange(24)
mobileTemplate.setStalker(True)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_canyon_krayt_dragon.iff')
scripts/mobiles/tatooine/greater_desert_womprat.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("womprat")
mobileTemplate.setAssistRange(6)
mobileTemplate.setStalker(True)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_greater_desert_womp_rat.iff')
scripts/mobiles/tatooine/grizzled_dewback.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("dewback")
mobileTemplate.setAssistRange(10)
mobileTemplate.setStalker(False)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_dewback.iff')
scripts/mobiles/tatooine/juvenile_canyon_krayt_dragon.py
+1 -2
View File
@@ -27,8 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("krayt dragon")
mobileTemplate.setAssistRange(24)
mobileTemplate.setStalker(False)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_krayt_dragon.iff')
scripts/mobiles/tatooine/krayt_dragon.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("krayt dragon")
mobileTemplate.setAssistRange(24)
mobileTemplate.setStalker(False)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_krayt_dragon.iff')
scripts/mobiles/tatooine/krayt_dragon_ancient.py
+1 -2
View File
@@ -27,8 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("krayt dragon")
mobileTemplate.setAssistRange(36)
mobileTemplate.setStalker(True)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_krayt_dragon.iff')
scripts/mobiles/tatooine/mountain_squill.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("squill")
mobileTemplate.setAssistRange(10)
mobileTemplate.setStalker(True)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_mountain_squill.iff')
scripts/mobiles/tatooine/mountain_worrt.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("mountain worrt")
mobileTemplate.setAssistRange(0)
mobileTemplate.setStalker(False)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_worrt.iff')
scripts/mobiles/tatooine/mutant_womprat.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("womprat")
mobileTemplate.setAssistRange(6)
mobileTemplate.setStalker(False)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_womp_rat.iff')
scripts/mobiles/tatooine/overkreetle.py
+1
View File
@@ -25,6 +25,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("uber kreetle")
mobileTemplate.setAssistRange(6)
mobileTemplate.setStalker(False)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_kreetle.iff')
scripts/mobiles/tatooine/scyk.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("scyk")
mobileTemplate.setAssistRange(10)
mobileTemplate.setStalker(True)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_scyk.iff')
scripts/mobiles/tatooine/swarming_lesser_dewback.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("dewback")
mobileTemplate.setAssistRange(10)
mobileTemplate.setStalker(True)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_swarming_lesser_dewback.iff')
scripts/mobiles/tatooine/variegated_womprat.py
+1 -1
View File
@@ -27,7 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("variegated womprat")
mobileTemplate.setAssistRange(6)
mobileTemplate.setStalker(False)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_variegated_womp_rat.iff')
scripts/pvpzones.py
+9
View File
@@ -0,0 +1,9 @@
import sys
def addZones(core):
gcwService = core.gcwService
gcwService.addPvPZone('rori', 5318, 5680, 400)
scripts/skillMods/expertise_stance_saber_block.py
+2
View File
@@ -1,8 +1,10 @@
import sys
def add(core, actor, skillMod, value):
core.skillModService.addSkillMod(actor, 'display_only_parry', skillMod.getBase() * 100)
return
def deduct(core, actor, skillMod, value):
core.skillModService.deductSkillMod(actor, 'display_only_parry', skillMod.getBase() * 100)
return
src/main/NGECore.java
+3 -1
View File
@@ -524,7 +524,9 @@ public class NGECore {
List<CreatureObject> deletedObjects = new ArrayList<CreatureObject>();
while(cursor.hasNext()) {
SWGObject creature = (SWGObject) cursor.next();
Object next = cursor.next();
if (next == null) continue;
SWGObject creature = (SWGObject) next;
if(!characterService.playerExists(creature.getObjectID()) && creature instanceof CreatureObject)
deletedObjects.add((CreatureObject) creature);
}
src/resources/datatables/Citizenship.java
+31
View File
@@ -0,0 +1,31 @@
/*******************************************************************************
* Copyright (c) 2013 <Project SWG>
*
* This File is part of NGECore2.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Using NGEngine to work with NGECore2 is making a combined work based on NGEngine.
* Therefore all terms and conditions of the GNU Lesser General Public License cover the combination.
******************************************************************************/
package resources.datatables;
public class Citizenship {
public static final byte Homeless = 0;
public static final byte Citizen = 1;
public static final byte Militia = 2;
public static final byte Mayor = 3;
}
src/resources/datatables/GcwType.java
+31
View File
@@ -0,0 +1,31 @@
/*******************************************************************************
* Copyright (c) 2013 <Project SWG>
*
* This File is part of NGECore2.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Using NGEngine to work with NGECore2 is making a combined work based on NGEngine.
* Therefore all terms and conditions of the GNU Lesser General Public License cover the combination.
******************************************************************************/
package resources.datatables;
public class GcwType {
public static final byte Generic = 0;
public static final byte Enemy = 1;
public static final byte Player = 2;
public static final byte Zone = 3;
}
src/resources/gcw/RegionDefender.java
+98
View File
@@ -0,0 +1,98 @@
/*******************************************************************************
* Copyright (c) 2013 <Project SWG>
*
* This File is part of NGECore2.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Using NGEngine to work with NGECore2 is making a combined work based on NGEngine.
* Therefore all terms and conditions of the GNU Lesser General Public License cover the combination.
******************************************************************************/
package resources.gcw;
import org.apache.mina.core.buffer.IoBuffer;
import engine.resources.common.AString;
import engine.resources.objects.Baseline;
import engine.resources.objects.Delta;
public class RegionDefender extends Delta {
private static final long serialVersionUID = 1L;
private AString region;
private byte byte1 = 0;
private byte byte2 = 0;
public RegionDefender(String region, byte byte1, byte byte2) {
this.region = new AString(region);
this.byte1 = byte1;
this.byte2 = byte2;
}
public RegionDefender(String region) {
this.region = new AString(region);
}
public RegionDefender() {
this.region = new AString();
}
public String getRegion() {
synchronized(objectMutex) {
return region.get();
}
}
public void setRegion(String region) {
synchronized(objectMutex) {
this.region = new AString(region);
}
}
public byte getByte1() {
synchronized(objectMutex) {
return byte1;
}
}
public void setByte1(byte byte1) {
synchronized(objectMutex) {
this.byte1 = byte1;
}
}
public byte getByte2() {
synchronized(objectMutex) {
return byte2;
}
}
public void setByte2(byte byte2) {
synchronized(objectMutex) {
this.byte2 = byte2;
}
}
public byte[] getBytes() {
synchronized(objectMutex) {
IoBuffer buffer = Baseline.createBuffer(region.getBytes().length + 2);
buffer.put(region.getBytes());
buffer.put(byte1);
buffer.put(byte2);
return buffer.array();
}
}
}
src/resources/objects/tool/SurveyTool.java → src/resources/harvest/SurveyTool.java
+1 -16
View File
@@ -19,16 +19,13 @@
* Using NGEngine to work with NGECore2 is making a combined work based on NGEngine.
* Therefore all terms and conditions of the GNU Lesser General Public License cover the combination.
******************************************************************************/
package resources.objects.tool;
package resources.harvest;
import java.io.Serializable;
import java.util.Vector;
import main.NGECore;
import com.sleepycat.persist.model.NotPersistent;
import com.sleepycat.persist.model.Persistent;
import engine.resources.scene.Planet;
import engine.resources.scene.Point3D;
import engine.resources.scene.Quaternion;
@@ -40,8 +37,6 @@ import resources.objects.tangible.TangibleObject;
/**
* @author Charon
*/
@Persistent(version=0)
public class SurveyTool extends TangibleObject implements Serializable {
private static final long serialVersionUID = 1L;
@@ -51,25 +46,15 @@ public class SurveyTool extends TangibleObject implements Serializable {
private Long tanoID=0L;
private byte SurveyRangeSetting=0;
@NotPersistent
private transient String surveyEffectString="";
@NotPersistent
private transient String sampleEffectString="";
@NotPersistent
private transient boolean currentlySurveying=false;
@NotPersistent
private transient boolean currentlySampling=false;
@NotPersistent
private transient boolean currentlyCoolingDown=false;
@NotPersistent
private transient boolean exceptionalState=false;
@NotPersistent
private transient boolean recoveryMode=false;
@NotPersistent
private transient Long lastSurveyTime=0L;
@NotPersistent
private transient Long lastSampleTime=0L;
@NotPersistent
private transient Long recoveryTime=10L;
public static byte MineralSurveyDevice = 1;
src/resources/objects/building/BuildingObject.java
+1 -1
View File
@@ -88,7 +88,7 @@ public class BuildingObject extends TangibleObject implements IPersistent, Seria
@Override
public Baseline getOtherVariables() {
Baseline baseline = super.getOtherVariables();
baseline.put("maintainanceAmount", (float) 0);
baseline.put("maintenanceAmount", (float) 0);
baseline.put("baseMaintenanceRate", 0);
baseline.put("deedTemplate", "");
baseline.put("residency", false);
src/resources/objects/guild/GuildObject.java
-1
View File
@@ -34,7 +34,6 @@ import resources.gcw.CurrentServerGCWZonePercent;
import resources.gcw.OtherServerGCWZonePercent;
import resources.guild.Guild;
import resources.objects.ObjectMessageBuilder;
import resources.objects.SWGList;
import resources.objects.SWGMap;
import resources.objects.SWGMultiMap;
import resources.objects.SWGSet;
src/resources/objects/player/PlayerMessageBuilder.java
+2 -633
View File
@@ -21,16 +21,10 @@
******************************************************************************/
package resources.objects.player;
import java.nio.ByteOrder;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import org.apache.mina.core.buffer.IoBuffer;
import engine.resources.objects.Builder;
import resources.objects.intangible.IntangibleMessageBuilder;
import resources.objects.waypoint.WaypointObject;
public class PlayerMessageBuilder extends IntangibleMessageBuilder {
@@ -42,633 +36,6 @@ public class PlayerMessageBuilder extends IntangibleMessageBuilder {
super();
}
public IoBuffer buildBaseline3() {
PlayerObject player = (PlayerObject) object;
IoBuffer buffer = bufferPool.allocate(100, false).order(ByteOrder.LITTLE_ENDIAN);
buffer.setAutoExpand(true);
buffer.putShort((short) 0x14);
buffer.putFloat(1);
buffer.put(getAsciiString("string_id_table"));
buffer.putInt(0); // spacer
buffer.putShort((short) 0);
buffer.putInt(0); // custom name
buffer.putInt(0); // volume
buffer.putInt(0); // generic int
buffer.putInt(4); // flag bitmask list size
buffer.putInt(player.getFlagBitmask());
buffer.putInt(0);
buffer.putInt(0);
buffer.putInt(0);
buffer.putInt(4); // profile bitmask list size
buffer.putInt(0);
buffer.putInt(0);
buffer.putInt(0);
buffer.putInt(0);
if(player.getTitle() == null || player.getTitle().length() < 1)
buffer.putShort((short) 0);
else
buffer.put(getAsciiString(player.getTitle()));
buffer.putInt(0); // born date - Needs to be in yyymmdd format - Stored as epoch time of character create
buffer.putInt(player.getTotalPlayTime()); // total play time?
buffer.putInt(player.getProfessionIcon());
buffer.put(getAsciiString(player.getProfession()));
buffer.putInt(0); // GCW
buffer.putInt(0); // PvP Kills
buffer.putLong(0); // Lifetime GCW
buffer.putInt(0); // Lifetime PvP Kills
buffer.putInt(player.getCollections().length);
buffer.putInt(player.getHighestSetBit());
buffer.put(player.getCollections());
buffer.putInt(0); // Unknown, part of one delta, maybe a list
buffer.putInt(0); // Unknown, part of one delta, maybe a list
buffer.put((byte) ((player.isShowBackpack()) ? 1 : 0));
buffer.put((byte) ((player.isShowHelmet()) ? 1 : 0));
int size = buffer.position();
buffer = bufferPool.allocate(size, false).put(buffer.array(), 0, size);
buffer.flip();
buffer = createBaseline("PLAY", (byte) 3, buffer, size);
return buffer;
}
public IoBuffer buildBaseline6() {
PlayerObject player = (PlayerObject) object;
IoBuffer buffer = bufferPool.allocate(100, false).order(ByteOrder.LITTLE_ENDIAN);
buffer.setAutoExpand(true);
buffer.putShort((short) 0x11);
buffer.putInt((short) 0x43);
buffer.put(getAsciiString("string_id_table"));
buffer.putInt(0); // probably stringId
buffer.putShort((short) 0); // detailedDescription
buffer.put(player.getGodLevel());
buffer.putInt(0); // unk
buffer.putInt(0); // unk
buffer.putInt(0); // unk
buffer.putInt(0); // unk
buffer.putInt(0); // unk
if(player.getHome() == null || player.getHome().length() < 1) {
buffer.putShort((short) 0);
} else {
buffer.put(getAsciiString(player.getHome()));
}
buffer.putInt(0); // unk
buffer.put((byte) 0); // unk
buffer.putInt(0); // unk
buffer.putInt(0); // unk
buffer.putInt(0); // unk
buffer.putInt(0); // unk
buffer.putInt(0); // unk
buffer.putInt(0); // unk
int size = buffer.position();
buffer = bufferPool.allocate(size, false).put(buffer.array(), 0, size);
buffer.flip();
buffer = createBaseline("PLAY", (byte) 6, buffer, size);
return buffer;
}
public IoBuffer buildBaseline8() {
PlayerObject player = (PlayerObject) object;
IoBuffer buffer = bufferPool.allocate(100, false).order(ByteOrder.LITTLE_ENDIAN);
buffer.setAutoExpand(true);
buffer.putShort((short) 0x09);
if(player.getXpList().isEmpty()) {
buffer.putInt(0);
buffer.putInt(player.getXpListUpdateCounter());
} else {
buffer.putInt(player.getXpList().size());
buffer.putInt(player.getXpListUpdateCounter());
// no need for locking here, concurrent hash map iterator wont throw concurrency exceptions and multiple thread access at zone in is unlikely to occur for the PlayerObject
for(Entry<String, Integer> entry : player.getXpList().entrySet()) {
buffer.put((byte) 0);
buffer.put(getAsciiString(entry.getKey()));
buffer.putInt(entry.getValue());
}
}
if(player.getWaypoints().isEmpty()) {
buffer.putInt(0);
buffer.putInt(0);
} else {
buffer.putInt(player.getWaypoints().size());
buffer.putInt(0);
synchronized(player.getWaypoints()) {
for(WaypointObject waypoint : player.getWaypoints()) {
buffer.put((byte) 0);
buffer.putLong(waypoint.getObjectID());
buffer.putInt(waypoint.getCellId());
buffer.putFloat(waypoint.getPosition().x);
buffer.putFloat(waypoint.getPosition().y);
buffer.putFloat(waypoint.getPosition().z);
buffer.putLong(waypoint.getLocationNetworkId());
buffer.putInt(waypoint.getPlanetCRC());
buffer.put(getUnicodeString(waypoint.getName()));
buffer.putLong(waypoint.getObjectID());
buffer.put(waypoint.getColor());
buffer.put((byte) (waypoint.isActive() ? 1 : 0));
}
}
}
buffer.putInt(0); // Current force power ?
buffer.putInt(0); // Max force power ?
buffer.putInt(0); // Current FS Quest List size ?
buffer.putInt(0); // Current FS Quest List update counter ?
buffer.putInt(0); // Completed FS Quest List size ?
buffer.putInt(0); // Completed FS Quest List update counter ?
buffer.putInt(0); // Quest Journal List size ?
buffer.putInt(0); // Quest Journal List update counter ?
buffer.putInt(0); // unk
buffer.put(getAsciiString(player.getProfessionWheelPosition()));
int size = buffer.position();
buffer = bufferPool.allocate(size, false).put(buffer.array(), 0, size);
buffer.flip();
buffer = createBaseline("PLAY", (byte) 8, buffer, size);
return buffer;
}
public IoBuffer buildBaseline9() {
PlayerObject player = (PlayerObject) object;
IoBuffer buffer = bufferPool.allocate(100, false).order(ByteOrder.LITTLE_ENDIAN);
buffer.setAutoExpand(true);
buffer.putShort((short) 0x1F);
buffer.putInt(0); // ExperimentationFlag?
buffer.putInt(0); // CraftingStage?
buffer.putLong(0); // Nearest Crafting Station id ?
buffer.putInt(0); // Draft Schematic List Size
buffer.putInt(0); // Draft Schematic List update counter
buffer.putInt(0); // ExperimentationPoints?
buffer.putInt(0); // CraftingStage?
buffer.putInt(8); // unk
buffer.putInt(0); // unk
if(player.getFriendList().isEmpty()) {
buffer.putInt(0);
buffer.putInt(0);
} else {
buffer.putInt(player.getFriendList().size());
buffer.putInt(player.getFriendListUpdateCounter());
synchronized(player.getFriendList()) {
for(String friend : player.getFriendList()) {
buffer.put(getAsciiString(friend));
}
}
}
if(player.getIgnoreList().isEmpty()) {
buffer.putInt(0);
buffer.putInt(0);
} else {
buffer.putInt(player.getIgnoreList().size());
buffer.putInt(player.getIgnoreListUpdateCounter());
synchronized(player.getIgnoreList()) {
for(String ignored : player.getIgnoreList()) {
buffer.put(getAsciiString(ignored));
}
}
}
buffer.putInt(1);
buffer.putInt(0); // Current stomach unused in NGE
buffer.putInt(0x64); // Max stomach unused in NGE
buffer.putInt(0); // Current drink unused in NGE
buffer.putInt(0x64); // Max drink unused in NGE
buffer.putInt(0); // Current consumable unused in NGE
buffer.putInt(0x64); // Max consumable unused in NGE
buffer.putInt(0);
buffer.putInt(0);
buffer.putInt(0);
buffer.putInt(0);
buffer.putInt(0);
buffer.putInt(0);
buffer.putInt(0);
buffer.putInt(0);
buffer.putInt(0);
buffer.putInt(0);
buffer.putInt(0);
buffer.putInt(0);
buffer.putInt(0);
buffer.putInt(0);
buffer.putInt(0);
buffer.putInt(0);
buffer.putInt(0);
buffer.putInt(0);
buffer.putInt(0);
buffer.putInt(0);
buffer.putInt(0);
buffer.putInt(0); // jedi state???
buffer.putShort((short) 0);
int size = buffer.position();
buffer = bufferPool.allocate(size, false).put(buffer.array(), 0, size);
buffer.flip();
buffer = createBaseline("PLAY", (byte) 9, buffer, size);
return buffer;
}
public IoBuffer buildTitleDelta(String title) {
IoBuffer buffer = bufferPool.allocate(4 + getAsciiString(title).length, false).order(ByteOrder.LITTLE_ENDIAN);
buffer.put(getAsciiString(title));
int size = buffer.position();
buffer.flip();
buffer = createDelta("PLAY", (byte) 3, (short) 1, (short) 0x07, buffer, size + 4);
return buffer;
}
public IoBuffer buildProfessionIconDelta(int professionIcon) {
IoBuffer buffer = bufferPool.allocate(4, false).order(ByteOrder.LITTLE_ENDIAN);
buffer.putInt(professionIcon);
int size = buffer.position();
buffer.flip();
buffer = createDelta("PLAY", (byte) 3, (short) 1, (short) 0x0A, buffer, size + 4);
return buffer;
}
public IoBuffer buildCollectionsDelta(byte[] collections, int highestSetBit) {
IoBuffer buffer = bufferPool.allocate(8 + collections.length, false).order(ByteOrder.LITTLE_ENDIAN);
buffer.putInt(collections.length);
buffer.putInt(highestSetBit);
for (byte collection : collections) buffer.put(collection);
int size = buffer.position();
buffer.flip();
buffer = createDelta("PLAY", (byte) 3, (short) 1, (short) 16, buffer, size + 4);
return buffer;
}
public IoBuffer buildXPListDelta(String type, int amount, boolean alreadyExists) {
PlayerObject player = (PlayerObject) object;
player.setXpListUpdateCounter(player.getXpListUpdateCounter() + 1);
IoBuffer result = bufferPool.allocate(15 + type.length(), false).order(ByteOrder.LITTLE_ENDIAN);
result.putInt(1);
result.putInt(player.getXpListUpdateCounter());
result.put((byte) ((alreadyExists) ? 2 : 0));
result.put(getAsciiString(type));
result.putInt(amount);
int size = result.position();
result.flip();
result = createDelta("PLAY", (byte) 8, (short) 1, (short) 0, result, size + 4);
return result;
}
public IoBuffer buildProfessionWheelPositionDelta(String professionWheelPosition) {
IoBuffer buffer = bufferPool.allocate(2 + professionWheelPosition.length(), false).order(ByteOrder.LITTLE_ENDIAN);
buffer.put(getAsciiString(professionWheelPosition));
int size = buffer.position();
buffer.flip();
buffer = createDelta("PLAY", (byte) 8, (short) 1, (short) 8, buffer, size + 4);
return buffer;
}
public IoBuffer buildWaypointAddDelta(WaypointObject waypoint) {
PlayerObject player = (PlayerObject) object;
IoBuffer buffer = bufferPool.allocate(59 + waypoint.getName().length() * 2, false).order(ByteOrder.LITTLE_ENDIAN);
buffer.setAutoExpand(true);
int nextCounter = player.getWaypointListUpdateCounter() + 1;
player.setWaypointListUpdateCounter(nextCounter);
buffer.putInt(1);
buffer.putInt(player.getWaypointListUpdateCounter());
buffer.put((byte) 0); // updateType (SubType)
buffer.putLong(waypoint.getObjectID());
buffer.putInt(waypoint.getCellId());
buffer.putFloat(waypoint.getPosition().x);
buffer.putFloat(waypoint.getPosition().y);
buffer.putFloat(waypoint.getPosition().z);
buffer.putLong(0); // networklocationId
buffer.putInt(waypoint.getPlanetCRC());
buffer.put(getUnicodeString(waypoint.getName()));
buffer.putLong(waypoint.getObjectID());
buffer.put((byte) waypoint.getColor());
if (waypoint.isActive()) { buffer.put((byte) 1); }
else { buffer.put((byte) 0); }
int size = buffer.position();
buffer.flip();
buffer = createDelta("PLAY", (byte) 8, (short) 1, (short) 1, buffer, size + 4);
//System.out.println("WaypointAdd: " + buffer.getHexDump());
return buffer;
}
public IoBuffer buildWaypointRemoveDelta(WaypointObject waypoint) {
IoBuffer buffer = bufferPool.allocate(59 + waypoint.getName().length() * 2, false).order(ByteOrder.LITTLE_ENDIAN);
PlayerObject player = (PlayerObject) object;
int nextCounter = player.getWaypointListUpdateCounter() + 1;
player.setWaypointListUpdateCounter(nextCounter);
buffer.putInt(1);
buffer.putInt(player.getWaypointListUpdateCounter());
buffer.put((byte) 1); // updateType (SubType)
buffer.putLong(waypoint.getObjectID());
buffer.putInt(waypoint.getCellId());
buffer.putFloat(waypoint.getPosition().x);
buffer.putFloat(waypoint.getPosition().y);
buffer.putFloat(waypoint.getPosition().z);
buffer.putLong(0); // networklocationId
buffer.putInt(waypoint.getPlanetCRC());
buffer.put(getUnicodeString(waypoint.getName()));
buffer.putLong(waypoint.getObjectID());
buffer.put((byte) waypoint.getColor());
if (waypoint.isActive()) { buffer.put((byte) 1); }
else { buffer.put((byte) 0); }
int size = buffer.position();
buffer.flip();
buffer = createDelta("PLAY", (byte) 8, (short) 1, (short) 1, buffer, size + 4);
return buffer;
}
public IoBuffer buildWaypointUpdateDelta(WaypointObject waypoint) {
IoBuffer buffer = bufferPool.allocate(59 + waypoint.getName().length() * 2, false).order(ByteOrder.LITTLE_ENDIAN);
PlayerObject player = (PlayerObject) object;
int nextCounter = player.getWaypointListUpdateCounter() + 1;
player.setWaypointListUpdateCounter(nextCounter);
buffer.putInt(1);
buffer.putInt(player.getWaypointListUpdateCounter());
buffer.put((byte) 2); // updateType (SubType)
buffer.putLong(waypoint.getObjectID());
buffer.putInt(waypoint.getCellId());
buffer.putFloat(waypoint.getPosition().x);
buffer.putFloat(waypoint.getPosition().y);
buffer.putFloat(waypoint.getPosition().z);
buffer.putLong(0); // networklocationId << cluster system I guess?
buffer.putInt(waypoint.getPlanetCRC());
buffer.put(getUnicodeString(waypoint.getName()));
buffer.putLong(waypoint.getObjectID());
buffer.put((byte) waypoint.getColor());
if (waypoint.isActive()) { buffer.put((byte) 1); }
else { buffer.put((byte) 0); } // isActive. Activates automatically when created.
int size = buffer.position();
buffer.flip();
buffer = createDelta("PLAY", (byte) 8, (short) 1, (short) 1, buffer, size + 4);
return buffer;
}
public IoBuffer buildTotalPlayTimeDelta(int totalPlayTime) {
IoBuffer buffer = bufferPool.allocate(4, false).order(ByteOrder.LITTLE_ENDIAN);
buffer.putInt(totalPlayTime);
int size = buffer.position();
buffer.flip();
buffer = createDelta("PLAY", (byte) 3, (short) 1, (short) 0x09, buffer, size + 4);
return buffer;
}
public IoBuffer buildFriendAddDelta(List<String> friends) {
IoBuffer buffer = bufferPool.allocate(13 + (friends.size() * 2), false).order(ByteOrder.LITTLE_ENDIAN);
buffer.setAutoExpand(true);
PlayerObject player = (PlayerObject) object;
buffer.putInt(1);
buffer.putInt(player.getFriendListUpdateCounter());
buffer.put((byte) 3); // updateType (SubType)
buffer.putShort((short) (player.getFriendList().size()));
for (String f : friends) {
buffer.put(getAsciiString(f));
}
int size = buffer.position();
buffer.flip();
buffer = createDelta("PLAY", (byte) 9, (short) 1, (short) 7, buffer, size + 4);
return buffer;
}
public IoBuffer buildFriendRemoveDelta(List<String> friends) {
IoBuffer buffer = bufferPool.allocate(13 + (friends.size() * 2), false).order(ByteOrder.LITTLE_ENDIAN);
PlayerObject player = (PlayerObject) object;
buffer.putInt(1);
buffer.putInt(player.getFriendListUpdateCounter());
buffer.put((byte) 3); // updateType (SubType)
buffer.putShort((short) friends.size());
for (String f : friends) {
buffer.put(getAsciiString(f));
}
int size = buffer.position();
buffer.flip();
buffer = createDelta("PLAY", (byte) 9, (short) 1, (short) 7, buffer, size + 4);
return buffer;
}
public IoBuffer buildIgnoreAddDelta(List<String> ignoreList) {
IoBuffer buffer = bufferPool.allocate(13 + (ignoreList.size() * 2) , false).order(ByteOrder.LITTLE_ENDIAN);
buffer.setAutoExpand(true);
PlayerObject player = (PlayerObject) object;
buffer.putInt(1);
buffer.putInt(player.getIgnoreListUpdateCounter());
buffer.put((byte) 3); // updateType (SubType)
buffer.putShort((short) ignoreList.size());
for (String ignore : ignoreList) {
buffer.put(getAsciiString(ignore));
}
int size = buffer.position();
buffer.flip();
buffer = createDelta("PLAY", (byte) 9, (short) 1, (short) 8, buffer, size + 4);
return buffer;
}
public IoBuffer buildIgnoreRemoveDelta(List<String> ignoreList) {
IoBuffer buffer = bufferPool.allocate(13 + (ignoreList.size() * 2) , false).order(ByteOrder.LITTLE_ENDIAN);
buffer.setAutoExpand(true);
PlayerObject player = (PlayerObject) object;
buffer.putInt(1);
buffer.putInt(player.getIgnoreListUpdateCounter());
buffer.put((byte) 3); // updateType (SubType)
buffer.putShort((short) ignoreList.size());
for (String ignore : ignoreList) {
buffer.put(getAsciiString(ignore));
}
int size = buffer.position();
buffer.flip();
buffer = createDelta("PLAY", (byte) 9, (short) 1, (short) 8, buffer, size + 4);
return buffer;
}
public IoBuffer buildFlagBitmask(int bitmask) {
IoBuffer buffer = bufferPool.allocate(20, false).order(ByteOrder.LITTLE_ENDIAN);
buffer.putInt(4);
buffer.putInt(bitmask);
buffer.putInt(0);
buffer.putInt(0);
buffer.putInt(0);
int size = buffer.position();
buffer.flip();
buffer = createDelta("PLAY", (byte) 3, (short) 1, (short) 5, buffer, size + 4);
return buffer;
}
public IoBuffer buildShowBackpackDelta(boolean showBackpack) {
IoBuffer buffer = bufferPool.allocate(1, false).order(ByteOrder.LITTLE_ENDIAN);
buffer.put((byte) (showBackpack ? 1 : 0));
int size = buffer.position();
buffer.flip();
buffer = createDelta("PLAY", (byte) 3, (short) 1, (short) 18, buffer, size + 4);
return buffer;
}
public IoBuffer buildShowHelmetDelta(boolean showHelmet) {
IoBuffer buffer = bufferPool.allocate(1, false).order(ByteOrder.LITTLE_ENDIAN);
buffer.put((byte) (showHelmet ? 1 : 0));
int size = buffer.position();
buffer.flip();
buffer = createDelta("PLAY", (byte) 3, (short) 1, (short) 19, buffer, size + 4);
return buffer;
}
public IoBuffer buildGodLevelDelta(byte godLevel) {
IoBuffer buffer = bufferPool.allocate(1, false).order(ByteOrder.LITTLE_ENDIAN);
buffer.put(godLevel);
int size = buffer.position();
buffer.flip();
buffer = createDelta("PLAY", (byte) 6, (short) 1, (short) 0x02, buffer, size + 4);
return buffer;
}
@Override
public void buildBaseline3(Map<Integer, Builder> baselineBuilders, Map<Integer, Builder> deltaBuilders) {
super.buildBaseline3(baselineBuilders, deltaBuilders);
@@ -679,10 +46,12 @@ public class PlayerMessageBuilder extends IntangibleMessageBuilder {
super.buildBaseline6(baselineBuilders, deltaBuilders);
}
@Override
public void buildBaseline8(Map<Integer, Builder> baselineBuilders, Map<Integer, Builder> deltaBuilders) {
super.buildBaseline8(baselineBuilders, deltaBuilders);
}
@Override
public void buildBaseline9(Map<Integer, Builder> baselineBuilders, Map<Integer, Builder> deltaBuilders) {
super.buildBaseline9(baselineBuilders, deltaBuilders);
}
src/resources/objects/player/PlayerObject.java
+835 -785
View File
File diff suppressed because it is too large Load Diff
src/services/BuffService.java
+7 -6
View File
@@ -149,15 +149,15 @@ public class BuffService implements INetworkDispatch {
}
}
if(FileUtilities.doesFileExist("scripts/buffs/" + buffName + ".py")) core.scriptService.callScript("scripts/buffs/", buffName, "add", core, target, buff);
/* if(FileUtilities.doesFileExist("scripts/buffs/" + buffName + ".py")) core.scriptService.callScript("scripts/buffs/", buffName, "add", core, target, buff);
else
{
{ */
if(buff.getEffect1Name().length() > 0) core.skillModService.addSkillMod(target, buff.getEffect1Name(), (int) buff.getEffect1Value());
if(buff.getEffect2Name().length() > 0) core.skillModService.addSkillMod(target, buff.getEffect2Name(), (int) buff.getEffect2Value());
if(buff.getEffect3Name().length() > 0) core.skillModService.addSkillMod(target, buff.getEffect3Name(), (int) buff.getEffect3Value());
if(buff.getEffect4Name().length() > 0) core.skillModService.addSkillMod(target, buff.getEffect4Name(), (int) buff.getEffect4Value());
if(buff.getEffect5Name().length() > 0) core.skillModService.addSkillMod(target, buff.getEffect5Name(), (int) buff.getEffect5Value());
}
// }
target.addBuff(buff);
@@ -216,15 +216,16 @@ public class BuffService implements INetworkDispatch {
dot.getTask().cancel(true);
creature.removeDot(dot);
}
if(FileUtilities.doesFileExist("scripts/buffs/" + buff.getBuffName() + ".py")) core.scriptService.callScript("scripts/buffs/", buff.getBuffName(), "remove", core, creature, buff);
/* if(FileUtilities.doesFileExist("scripts/buffs/" + buff.getBuffName() + ".py")) core.scriptService.callScript("scripts/buffs/", buff.getBuffName(), "remove", core, creature, buff);
else
{
{*/
if(buff.getEffect1Name().length() > 0) core.skillModService.deductSkillMod(creature, buff.getEffect1Name(), (int) buff.getEffect1Value());
if(buff.getEffect2Name().length() > 0) core.skillModService.deductSkillMod(creature, buff.getEffect2Name(), (int) buff.getEffect2Value());
if(buff.getEffect1Name().length() > 0) core.skillModService.deductSkillMod(creature, buff.getEffect3Name(), (int) buff.getEffect3Value());
if(buff.getEffect1Name().length() > 0) core.skillModService.deductSkillMod(creature, buff.getEffect4Name(), (int) buff.getEffect4Value());
if(buff.getEffect1Name().length() > 0) core.skillModService.deductSkillMod(creature, buff.getEffect5Name(), (int) buff.getEffect5Value());
}
// }
if (!buff.getCallback().equals("none") && !buff.getCallback().equals("")) {
if (FileUtilities.doesFileExist("scripts/buffs/" + buff.getBuffName() + ".py")) {
src/services/DevService.java
+1 -1
View File
@@ -36,11 +36,11 @@ import resources.common.FileUtilities;
import resources.common.Opcodes;
import resources.common.SpawnPoint;
import resources.datatables.WeaponType;
import resources.harvest.SurveyTool;
import resources.objects.building.BuildingObject;
import resources.objects.creature.CreatureObject;
import resources.objects.player.PlayerObject;
import resources.objects.tangible.TangibleObject;
import resources.objects.tool.SurveyTool;
import resources.objects.weapon.WeaponObject;
import services.sui.SUIWindow;
import services.sui.SUIService.ListBoxType;
src/services/GroupService.java
+57 -11
View File
@@ -26,6 +26,8 @@ import java.util.List;
import java.util.Map;
import resources.buffs.Buff;
import resources.common.OutOfBand;
import resources.common.ProsePackage;
import resources.objects.creature.CreatureObject;
import resources.objects.group.GroupObject;
import services.chat.ChatRoom;
@@ -45,6 +47,7 @@ public class GroupService implements INetworkDispatch {
core.commandService.registerCommand("join");
core.commandService.registerCommand("disband");
core.commandService.registerCommand("decline");
core.commandService.registerCommand("dismissgroupmember");
}
@Override
@@ -74,7 +77,7 @@ public class GroupService implements INetworkDispatch {
}
if(memberGroupId != 0) {
leader.sendSystemMessage(member.getCustomName() + " is already in a group.", (byte) 0);
leader.sendSystemMessage(OutOfBand.ProsePackage("TT", member.getObjectID(), "@group:already_grouped"), (byte) 0);
return;
}
@@ -96,16 +99,16 @@ public class GroupService implements INetworkDispatch {
}
if(member.getInviteSenderId() != 0 && member.getInviteSenderId() != leader.getObjectID()) {
leader.sendSystemMessage(member.getCustomName() + " is considering joining another group.", (byte) 0);
leader.sendSystemMessage(OutOfBand.ProsePackage("TT", member.getObjectID(), "@group:considering_other_group"), (byte) 0);
return;
}
if(member.getInviteSenderId() != 0 && member.getInviteSenderId() == leader.getObjectID()) {
leader.sendSystemMessage(member.getCustomName() + " has already been invited to join your group.", (byte) 0);
leader.sendSystemMessage(OutOfBand.ProsePackage("TT", member.getObjectID(), "@group:considering_your_group"), (byte) 0);
return;
}
leader.sendSystemMessage("You invite " + member.getCustomName() + " to join the group.", (byte) 0);
leader.sendSystemMessage(OutOfBand.ProsePackage("TT", member.getObjectID(), "@group:invite_leader"), (byte) 0);
member.setInviteCounter(member.getInviteCounter() + 1);
member.setInviteSenderId(leader.getObjectId());
member.setInviteSenderName(leader.getCustomName());
@@ -121,11 +124,9 @@ public class GroupService implements INetworkDispatch {
invited.setInviteCounter(invited.getInviteCounter() + 1);
invited.setInviteSenderId(0);
invited.setInviteSenderName("");
invited.sendSystemMessage("You decline to join " + leader.getCustomName() + "'s group.", (byte) 0);
invited.sendSystemMessage(OutOfBand.ProsePackage("TT", leader.getObjectID(), "@group:decline_self"), (byte) 0);
invited.updateGroupInviteInfo();
leader.sendSystemMessage(invited.getCustomName() + " declines to join your group.", (byte) 0);
invited.sendSystemMessage(OutOfBand.ProsePackage("TT", invited.getObjectID(), "@group:decline_leader"), (byte) 0);
}
@@ -245,11 +246,11 @@ public class GroupService implements INetworkDispatch {
creature.setGroupId(0);
creature.makeUnaware(group);
core.chatService.leaveChatRoom(creature, group.getChatRoomId());
creature.sendSystemMessage("You have left the group.", (byte) 0);
creature.sendSystemMessage("@group:removed", (byte) 0);
for(SWGObject member : memberList) {
CreatureObject creature2 = (CreatureObject) member;
creature2.sendSystemMessage(creature.getCustomName() + " has left the group.", (byte) 0);
creature2.sendSystemMessage(OutOfBand.ProsePackage("TU", creature.getObjectID(), "@group:other_left_prose"), (byte) 0);
}
removeGroupBuffs(creature);
@@ -272,7 +273,7 @@ public class GroupService implements INetworkDispatch {
creature2.makeUnaware(group);
core.chatService.leaveChatRoom(creature2, group.getChatRoomId());
creature2.sendSystemMessage("The group has been disbanded.", (byte) 0);
creature.sendSystemMessage("@group:disbanded", (byte) 0);
removeGroupBuffs((CreatureObject) member);
@@ -285,4 +286,49 @@ public class GroupService implements INetworkDispatch {
public void handleGroupDisband(CreatureObject creature) {
handleGroupDisband(creature, true);
}
public void removedFromGroup(GroupObject group, CreatureObject creature) {
removeFromGroup(group, creature, false);
}
public void removeFromGroup(GroupObject group, CreatureObject creature, boolean kicked) {
group.removeMember(creature);
creature.setInviteCounter(creature.getInviteCounter() + 1);
creature.setInviteSenderId(0);
creature.setInviteSenderName("");
creature.updateGroupInviteInfo();
creature.setGroupId(0);
creature.makeUnaware(group);
core.chatService.leaveChatRoom(creature, group.getChatRoomId());
creature.sendSystemMessage("@group:removed", (byte) 0);
for(SWGObject member : group.getMemberList()) {
CreatureObject creature2 = (CreatureObject) member;
creature2.sendSystemMessage(OutOfBand.ProsePackage("TU", creature.getObjectID(), "@group:other_left_prose"), (byte) 0);
}
removeGroupBuffs(creature);
if(group.getMemberList().size() <= 1 && kicked)
handleGroupDisband((CreatureObject) group.getGroupLeader());
}
public void handleGroupKick(CreatureObject leader, CreatureObject member) {
GroupObject group = (GroupObject) core.objectService.getObject(leader.getGroupId());
if(group == null || member.getGroupId() == 0 || member.getGroupId() != group.getObjectID())
return;
if(group.getGroupLeader() != leader) {
leader.sendSystemMessage("@group:must_be_leader", (byte) 0);
return;
}
removeFromGroup(group, member, true);
}
}
src/services/PlayerService.java
+1
View File
@@ -924,6 +924,7 @@ public class PlayerService implements INetworkDispatch {
}
player.setXp(xpType, experience);
creature.setXpBarValue(experience);
// 2. See if they need to level up.
for (int i = 0; i < experienceTable.getRowCount(); i++) {
src/services/SimulationService.java
+5 -1
View File
@@ -193,7 +193,9 @@ public class SimulationService implements INetworkDispatch {
ODBCursor cursor = core.getSWGObjectODB().getCursor();
while(cursor.hasNext()) {
SWGObject building = core.objectService.getObject(((SWGObject) cursor.next()).getObjectID());
Object next = cursor.next();
if (next == null) continue;
SWGObject building = core.objectService.getObject(((SWGObject) next).getObjectID());
if(building == null || (!(building instanceof BuildingObject) && !(building instanceof HarvesterObject)))
continue;
if(building.getAttachment("hasLoadedServerTemplate") == null)
@@ -405,6 +407,7 @@ public class SimulationService implements INetworkDispatch {
}
checkForCollidables(object);
object.setAttachment("lastValidPosition", object.getPosition());
MoveEvent event = new MoveEvent();
event.object = object;
object.getEventBus().publish(event);
@@ -470,6 +473,7 @@ public class SimulationService implements INetworkDispatch {
object.notifyObservers(utm, false);
checkForCollidables(object);
object.setAttachment("lastValidPosition", object.getPosition());
}
src/services/StaticService.java
+4 -1
View File
@@ -98,7 +98,10 @@ public class StaticService implements INetworkDispatch {
public SWGObject spawnObject(String template, String planetName, long cellId, float x, float y, float z, float qW, float qX, float qY, float qZ) {
return spawnObject(template, planetName, cellId, x, y, z, qW, qX, qY, qZ, -1);
}
public SWGObject spawnObject(String template, String planetName, SWGObject cell, float x, float y, float z, float qW, float qX, float qY, float qZ, int respawnTime) {
return spawnObject(template, planetName, ((cell == null) ? 0L : cell.getObjectID()), x, y, z, qW, qX, qY, qZ, respawnTime);
}
public SWGObject spawnObject(String template, String planetName, long cellId, float x, float y, float z, float qW, float qX, float qY, float qZ, int respawnTime) {
Planet planet = core.terrainService.getPlanetByName(planetName);
src/services/SurveyService.java
+1 -1
View File
@@ -31,13 +31,13 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import protocol.swg.PlayClientEffectLocMessage;
import resources.harvest.SurveyTool;
import resources.objects.creature.CreatureObject;
import resources.objects.player.PlayerObject;
import resources.objects.resource.GalacticResource;
import resources.objects.resource.ResourceContainerObject;
import resources.objects.resource.ResourceRoot;
import resources.objects.tangible.TangibleObject;
import resources.objects.tool.SurveyTool;
import services.sui.SUIWindow;
import services.sui.SUIWindow.SUICallback;
import services.sui.SUIWindow.Trigger;
src/services/ai/AIService.java
+55 -3
View File
@@ -26,12 +26,14 @@ import java.util.Map.Entry;
import java.util.Random;
import java.util.Vector;
import resources.datatables.Difficulty;
import resources.datatables.FactionStatus;
import resources.datatables.GcwType;
import resources.objects.creature.CreatureObject;
import resources.objects.group.GroupObject;
import resources.objects.player.PlayerObject;
import engine.resources.objects.SWGObject;
import engine.resources.scene.Point3D;
import main.NGECore;
public class AIService {
@@ -109,5 +111,55 @@ public class AIService {
return baseXP;
}
public void awardGcw(AIActor actor) {
CreatureObject npc = actor.getCreature();
if (core.factionService.isPvpFaction(npc.getFaction())) {
int gcwPoints = 5;
if (npc.getDifficulty() == Difficulty.ELITE) {
gcwPoints *= 2;
}
if (npc.getDifficulty() == Difficulty.BOSS) {
gcwPoints *= 5;
}
//gcwPoints = actor.getMobileTemplate().getGcwPoints(); // We might want to make this get set in mobile templates if it was different for different npcs ie. assault squads.
for (CreatureObject player : actor.getDamageMap().keySet()) {
if (player.getGroupId() == 0) {
if (player.getFaction().length() > 0 && player.getFactionStatus() > FactionStatus.OnLeave) {
if ((npc.getLevel() / player.getLevel() * 100) < 86) {
continue;
}
core.gcwService.addGcwPoints(player, gcwPoints, GcwType.Enemy);
}
} else {
for (SWGObject object : ((GroupObject) core.objectService.getObject(player.getGroupId())).getMemberList()) {
CreatureObject member = (CreatureObject) object;
if (member == null) {
continue;
}
if (npc.getPlanet().getName().equals(member.getPlanet().getName()) && npc.getPosition().getDistance(member.getPosition()) > 300) {
continue;
}
if ((npc.getLevel() / member.getLevel() * 100) < 86) {
continue;
}
if (member.getFaction().length() > 0 && member.getFactionStatus() > FactionStatus.OnLeave) {
core.gcwService.addGcwPoints(member, gcwPoints, GcwType.Enemy);
}
}
}
}
}
}
}
src/services/ai/states/DeathState.java
+1
View File
@@ -31,6 +31,7 @@ public class DeathState extends AIState {
@Override
public byte onEnter(AIActor actor) {
NGECore.getInstance().aiService.awardExperience(actor);
NGECore.getInstance().aiService.awardGcw(actor);
actor.getCreature().setAttachment("radial_filename", "npc/corpse");
//NGECore.getInstance().scriptService.callScript("scripts/radial/npc/corpse", "", "createRadial", NGECore.getInstance(), actor.getCreature().getKiller(), actor.getCreature(), new Vector<RadialOptions>());
NGECore.getInstance().lootService.DropLoot((CreatureObject)(actor.getCreature().getKiller()),(TangibleObject)(actor.getCreature()));
src/services/bazaar/BazaarService.java
-1
View File
@@ -38,7 +38,6 @@ import engine.resources.service.INetworkDispatch;
import engine.resources.service.INetworkRemoteEvent;
import resources.common.Opcodes;
import resources.common.OutOfBand;
import resources.common.ProsePackage;
import resources.datatables.DisplayType;
import resources.objects.building.BuildingObject;
import resources.objects.creature.CreatureObject;
src/services/combat/CombatService.java
+18 -25
View File
@@ -45,6 +45,7 @@ import resources.buffs.DamageOverTime;
import resources.common.FileUtilities;
import resources.common.OutOfBand;
import resources.datatables.DisplayType;
import resources.datatables.FactionStatus;
import resources.datatables.Options;
import resources.datatables.Elemental;
import resources.datatables.Posture;
@@ -242,7 +243,7 @@ public class CombatService implements INetworkDispatch {
if(!(obj instanceof TangibleObject) || obj == attacker)
continue;
if(obj instanceof CreatureObject && (((CreatureObject) obj).getPosture() == 13 || ((CreatureObject) obj).getPosture() == 14))
if(obj instanceof CreatureObject && (((CreatureObject) obj).getPosture() == Posture.Incapacitated || ((CreatureObject) obj).getPosture() == Posture.Dead))
continue;
if(command.getAttackType() == 0 && !isInConeAngle(attacker, obj, (int) command.getConeLength(), (int) command.getConeWidth(), dirX, dirZ))
@@ -316,7 +317,7 @@ public class CombatService implements INetworkDispatch {
if(!(obj instanceof TangibleObject) || obj == attacker)
continue;
if(obj instanceof CreatureObject && (((CreatureObject) obj).getPosture() == 13 || ((CreatureObject) obj).getPosture() == 14))
if(obj instanceof CreatureObject && (((CreatureObject) obj).getPosture() == Posture.Incapacitated || ((CreatureObject) obj).getPosture() == Posture.Dead))
continue;
if(command.getAttackType() == 0 && !isInConeAngle(attacker, obj, (int) command.getConeLength(), (int) command.getConeWidth(), dirX, dirZ))
@@ -805,7 +806,7 @@ public class CombatService implements INetworkDispatch {
if(core.mountService.isMounted(target)) core.mountService.dismount(target, (CreatureObject) target.getContainer());
target.setHealth(1);
target.setPosture((byte) 13);
target.setPosture(Posture.Incapacitated);
target.setTurnRadius(0);
target.setSpeedMultiplierBase(0);
}
@@ -816,7 +817,7 @@ public class CombatService implements INetworkDispatch {
if(target.getPosture() != 13)
return;
target.setPosture((byte) 0);
target.setPosture(Posture.Upright);
target.setTurnRadius(1);
target.setSpeedMultiplierBase(1);
@@ -833,7 +834,7 @@ public class CombatService implements INetworkDispatch {
} else if(target.getHealth() - damage <= 0 && target.getAttachment("AI") != null) {
synchronized(target.getMutex()) {
target.setHealth(0);
target.setPosture((byte) 14);
target.setPosture(Posture.Dead);
}
attacker.removeDefender(target);
target.removeDefender(attacker);
@@ -901,7 +902,7 @@ public class CombatService implements INetworkDispatch {
} else {
if(target.getFactionStatus() == 0)
if(target.getFactionStatus() == FactionStatus.OnLeave)
return true;
return false;
@@ -990,7 +991,7 @@ public class CombatService implements INetworkDispatch {
if(!(obj instanceof CreatureObject))
continue;
if(obj instanceof CreatureObject && (((CreatureObject) obj).getPosture() == 14))
if(obj instanceof CreatureObject && (((CreatureObject) obj).getPosture() == Posture.Dead))
continue;
if(!core.simulationService.checkLineOfSight(target, obj))
@@ -1008,7 +1009,7 @@ public class CombatService implements INetworkDispatch {
public void deathblowPlayer(CreatureObject attacker, CreatureObject target) {
target.stopIncapTask();
target.setIncapTask(null);
target.setPosture((byte) 14);
target.setPosture(Posture.Dead);
if (target.getSlottedObject("ghost") != null && attacker.getSlottedObject("ghost") != null) {
boolean bountyWindow = true;
@@ -1149,11 +1150,11 @@ public class CombatService implements INetworkDispatch {
CreatureObject creature = (CreatureObject) owner;
if(eventType != 0 || creature.getPosture() != 14)
if(eventType != 0 || creature.getPosture() != Posture.Dead)
return;
synchronized(creature.getMutex()) {
creature.setPosture((byte) 0);
creature.setPosture(Posture.Upright);
creature.setTurnRadius(1);
creature.setSpeedMultiplierBase(1);
creature.setHealth(creature.getHealth() + 4000);
@@ -1178,7 +1179,7 @@ public class CombatService implements INetworkDispatch {
if(!(obj instanceof CreatureObject))
continue;
if(obj instanceof CreatureObject && (((CreatureObject) obj).getPosture() != 14))
if(obj instanceof CreatureObject && (((CreatureObject) obj).getPosture() != Posture.Dead))
continue;
if(!attemptHeal(medic, (CreatureObject) obj))
@@ -1247,29 +1248,21 @@ public class CombatService implements INetworkDispatch {
return;
if(target.getSkillMod("expertise_dot_absorption_all") != null)
damage *= (1 - target.getSkillMod("expertise_dot_absorption_all").getBase() / 100);
damage *= (1 - target.getSkillModBase("expertise_dot_absorption_all") / 100);
switch(dot.getType()) {
case "acid":
baseArmor = target.getSkillMod("acid").getBase();
case "heat":
baseArmor = target.getSkillMod("heat").getBase();
case "cold":
baseArmor = target.getSkillMod("cold").getBase();
case "electricity":
baseArmor = target.getSkillMod("electricity").getBase();
case "energy":
baseArmor = target.getSkillMod("energy").getBase();
case "kinetic":
baseArmor = target.getSkillMod("electricity").getBase();
baseArmor = target.getSkillModBase("electricity"); // Is this a mistake or is it legitimate?
case "poison":
baseArmor = target.getSkillMod("acid").getBase();
baseArmor = target.getSkillModBase("acid");
case "disease": // disease damages action in nge
baseArmor = 0;
case "bleeding": // elemental type unknown
case "fire":
baseArmor = target.getSkillMod("heat").getBase();
baseArmor = target.getSkillModBase("heat");
default:
baseArmor = target.getSkillModBase(dot.getType());
}
src/services/gcw/FactionService.java
+57 -19
View File
@@ -47,7 +47,9 @@ import resources.objects.creature.CreatureObject;
import resources.objects.mission.MissionObject;
import resources.objects.player.PlayerObject;
import resources.objects.tangible.TangibleObject;
import engine.clientdata.ClientFileManager;
import engine.clientdata.StfTable;
import engine.clientdata.visitors.DatatableVisitor;
import engine.clients.Client;
import engine.resources.common.CRC;
import engine.resources.service.INetworkDispatch;
@@ -352,28 +354,58 @@ public class FactionService implements INetworkDispatch {
return pvpBitmask;
}
// temp fix until calculatePvpStatus is fixed
/*
public int calculatePvpStatus(CreatureObject player, TangibleObject target) {
if(target.getSlottedObject("ghost") != null) {
if(!player.getFaction().equals(target.getFaction()) && player.getFactionStatus() == FactionStatus.SpecialForces && ((CreatureObject) target).getFactionStatus() == FactionStatus.SpecialForces)
return 55;
else if(core.combatService.areInDuel(player, (CreatureObject) target))
return 55;
else
return 0x14;
} else {
if(target.getAttachment("AI") != null)
return PvpStatus.Attackable;
else
return 0;
public boolean isPvpFaction(String faction) {
if (!isFaction(faction)) {
return false;
}
try {
DatatableVisitor PvpFactions = ClientFileManager.loadFile("datatables/player/pvp_factions.iff", DatatableVisitor.class);
for (int i = 0; i < PvpFactions.getRowCount(); i++) {
if (PvpFactions.getObject(i, 0) != null) {
if (((String) PvpFactions.getObject(i, 0)).equals(faction)) {
return true;
}
}
}
} catch (InstantiationException | IllegalAccessException e) {
e.printStackTrace();
}
return false;
}
public void join(CreatureObject actor, String faction) {
if (actor.getPvpBitmask() == PvpStatus.GoingCovert) {
actor.sendSystemMessage("@faction_recruiter:pvp_status_changing", DisplayType.Broadcast);
return;
}
if (actor.getPvpBitmask() == PvpStatus.GoingOvert) {
actor.sendSystemMessage("@faction_recruiter:pvp_status_changing", DisplayType.Broadcast);
return;
}
if (actor.getFaction().length() > 0) {
actor.sendSystemMessage("@faction_recruiter:resign_on_leave", DisplayType.Broadcast);
return;
}
scheduler.schedule(() -> {
actor.setFaction(faction);
actor.setFactionStatus(FactionStatus.Combatant);
actor.setPvpBitmask(0);
PlayerObject player = ((PlayerObject) actor.getSlottedObject("ghost"));
if (player != null) {
player.resetGcwPoints();
player.resetPvpKills();
player.setCurrentRank(1);
}
actor.updatePvpStatus();
}, 1, TimeUnit.SECONDS);
}
*/
public void changeFactionStatus(CreatureObject actor, int factionStatus) {
long time = 1;
@@ -464,6 +496,12 @@ public class FactionService implements INetworkDispatch {
actor.setPvpBitmask(0);
actor.setFactionStatus(FactionStatus.OnLeave);
actor.setFaction("");
PlayerObject player = ((PlayerObject) actor.getSlottedObject("ghost"));
if (player != null) {
player.resetGcwPoints();
player.resetPvpKills();
player.setCurrentRank(0);
}
actor.updatePvpStatus();
actor.sendSystemMessage("@faction_recruiter:resign_complete", DisplayType.Broadcast);
}, time, TimeUnit.SECONDS);
src/services/gcw/GCWService.java
+312 -3
View File
@@ -25,11 +25,14 @@ import java.math.BigDecimal;
import java.math.MathContext;
import java.nio.ByteOrder;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
@@ -42,28 +45,42 @@ import org.python.google.common.collect.Multimap;
import protocol.swg.GcwGroupsRsp;
import protocol.swg.GcwRegionsReq;
import protocol.swg.GcwRegionsRsp;
import resources.common.Opcodes;
import resources.common.OutOfBand;
import resources.common.collidables.CollidableCircle;
import resources.datatables.DisplayType;
import resources.datatables.FactionStatus;
import resources.datatables.GcwType;
import resources.gcw.CurrentServerGCWZoneHistory;
import resources.gcw.CurrentServerGCWZonePercent;
import resources.gcw.OtherServerGCWZonePercent;
import resources.objects.creature.CreatureObject;
import resources.objects.guild.GuildObject;
import resources.objects.player.PlayerObject;
import main.NGECore;
import engine.clients.Client;
import engine.resources.database.ODBCursor;
import engine.resources.objects.SWGObject;
import engine.resources.scene.Planet;
import engine.resources.scene.Point2D;
import engine.resources.scene.Point3D;
import engine.resources.service.INetworkDispatch;
import engine.resources.service.INetworkRemoteEvent;
public class GCWService implements INetworkDispatch {
private NGECore core;
private GuildObject object;
private static final int[] MOD2 = { 10250, 7250, 7250, 6750, 6750, 6750, 6750, 6750, 6750, 6750, 6750, 6750 };
private static final int[] DECAY1 = { 0, 0, 0, 0, 0, 0, 2727, 2744, 2769, 2799, 2823, 2857 };
private static final int[] DECAY2 = { 0, 0, 0, 0, 0, 0, 6000, 6500, 7200, 8200, 9600, 12000 };
private static final int[] CONST2 = { 0, 0, 0, 0, 0, 0, 12200, 12200, 12900, 14100, 16200, 18700 };
private static final int[] CONST4 = { 0, 0, 0, 0, 0, 0, 1950, 3550, 5600, 7800, 9350, 11100 };
private Map<String, Map<String, CurrentServerGCWZonePercent>> zoneMap() { return object.getZoneMap(); }
private Map<Planet, List<PvPZone>> pvpZones = new ConcurrentHashMap<Planet, List<PvPZone>>();
private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
@@ -79,6 +96,8 @@ public class GCWService implements INetworkDispatch {
private void afterInitialisation() {
try {
core.scriptService.callScript("scripts/", "gcwzones", "addZones", core);
core.scriptService.callScript("scripts/", "pvpzones", "addZones", core);
updateNextUpdateTime();
} catch (Exception e) {
e.printStackTrace();
}
@@ -285,6 +304,63 @@ public class GCWService implements INetworkDispatch {
}
}
}, 2, 2, TimeUnit.DAYS);
scheduler.scheduleAtFixedRate(new Runnable() {
@Override public void run() { gcwUpdate(); }
private void gcwUpdate() {
long nextUpdateTime = calculateNextUpdateTime();
ODBCursor cursor = core.getSWGObjectODB().getCursor();
while (cursor.hasNext()) {
SWGObject object = (SWGObject) cursor.next();
if (object == null) {
continue;
}
if (core.objectService.getObject(object.getObjectID()) == null) {
object = core.objectService.getObject(object.getObjectID());
}
if (!(object instanceof CreatureObject)) {
continue;
}
CreatureObject creature = (CreatureObject) object;
if (creature.getSlottedObject("ghost") == null) {
continue;
}
PlayerObject player = (PlayerObject) creature.getSlottedObject("ghost");
// TODO update statistics
if (core.factionService.isPvpFaction(creature.getFaction())) {
updateGcwRank(creature);
player.addLifetimeGcwPoints(player.getGcwPoints());
player.addLifetimePvpKills(player.getPvpKills());
player.resetGcwPoints();
player.resetPvpKills();
if (creature.getFaction().equals("rebel") && player.getCurrentRank() > player.getHighestRebelRank()) {
player.setHighestRebelRank(player.getCurrentRank());
}
if (creature.getFaction().equals("imperial") && player.getCurrentRank() > player.getHighestImperialRank()) {
player.setHighestImperialRank(player.getCurrentRank());
}
player.setNextUpdateTime((int) nextUpdateTime);
}
}
cursor.close();
}
}, (calculateNextUpdateTime() - System.currentTimeMillis()), 604800000, TimeUnit.MILLISECONDS);
}
public void addZone(String planet, String zone, float x, float z, float radius, int weight, int type) {
@@ -365,6 +441,118 @@ public class GCWService implements INetworkDispatch {
}
}
public void addGcwPoints(CreatureObject actor, int gcwPoints, byte gcwType) {
if (actor == null) {
return;
}
if (!core.factionService.isPvpFaction(actor.getFaction())) {
return;
}
if (actor.getSlottedObject("ghost") == null) {
return;
}
PlayerObject player = (PlayerObject) actor.getSlottedObject("ghost");
String planet = actor.getPlanet().getName();
String prefix = ((planet.startsWith("space")) ? (planet + "_space") : planet);
switch (gcwType) {
case GcwType.Enemy:
adjustZone(planet, prefix + "_pve", actor.getFaction(), gcwPoints);
actor.sendSystemMessage(OutOfBand.ProsePackage("@gcw:gcw_rank_generic_point_grant", gcwPoints), DisplayType.Broadcast);
break;
case GcwType.Player:
adjustZone(planet, prefix + "_pvp", actor.getFaction(), gcwPoints);
//actor.sendSystemMessage(OutOfBand.ProsePackage("@gcw:gcw_rank_pvp_kill_point_grant", gcwPoints), DisplayType.Broadcast); // Put this msg after this function is used rather than inside function
break;
}
String zone = getCurrentGcwRegion(actor);
if (zone != null) {
adjustZone(planet, zone, actor.getFaction(), gcwPoints);
}
player.setGcwPoints(player.getGcwPoints() + gcwPoints);
}
/* Ported from javascript.
* Written for us by Hendrik of http://swg.activeframe.de.
*/
private double helper(int points, int rank) {
int faktor = points / (MOD2[rank-1] - 250 * rank);
int rt = points / (1 + faktor) - DECAY1[rank-1];
if (rank >= 7) {
if (points > DECAY2[rank-1] && rt > 0) {
rt = rt * (((17 - rank) / (14 - rank)) + (CONST2[rank-1] / (points - CONST4[rank-1])));
}
}
return Math.floor(rt);
}
/* Ported from javascript.
* Written for us by Hendrik of http://swg.activeframe.de.
*/
public void updateGcwRank(CreatureObject actor) {
if (actor == null) {
return;
}
if (actor.getFaction().length() == 0) {
return;
}
if (actor.getSlottedObject("ghost") == null) {
return;
}
PlayerObject player = (PlayerObject) actor.getSlottedObject("ghost");
int oldrank = player.getCurrentRank();
int oldprogress = (int) ((player.getRankProgress() > 100) ? 100 : player.getRankProgress());
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) helper(oldpoints, oldrank);
if (newprogress < -2000) {
newprogress = -2000;
}
newranktotal = oldranktotal + newprogress;
if (oldrank == 7 && newprogress < 0 && newranktotal < 30000) {
newranktotal = 29999;
}
newrank = (int) (Math.floor(newranktotal / 5000) + 1);
if (newrank > 12) {
newrank = 12;
newranktotal = 12 * 5000 - 1;
}
newrankprogress = newranktotal - (newrank - 1) * 5000;
newprogress = newrankprogress * 100 / 5000;
player.setCurrentRank(newrank);
player.setRankProgress((float) Math.floor(newprogress));
}
public List<SWGObject> getSFPlayers() {
List<SWGObject> flagged = new ArrayList<SWGObject>();
@@ -388,6 +576,108 @@ public class GCWService implements INetworkDispatch {
return flagged;
}
public String getCurrentGcwRegion(CreatureObject actor) {
try {
String planet = actor.getPlanet().getName();
if (zoneMap().containsKey(planet)) {
for (String zoneName : zoneMap().get(planet).keySet()) {
CurrentServerGCWZonePercent zone = zoneMap().get(planet).get(zoneName).clone();
if (zone.getRadius() > 0) {
List<SWGObject> objects = core.simulationService.get(core.terrainService.getPlanetByName(planet), zone.getPosition().x, zone.getPosition().z, (int) zone.getRadius());
if (objects.contains(actor)) {
return zoneName;
}
}
}
}
} catch (Exception e) {
return null;
}
return null;
}
public long calculateNextUpdateTime() {
Calendar c = Calendar.getInstance();
Date now = new Date();
c.setTime(now);
int weekday = c.get(Calendar.DAY_OF_WEEK);
if (weekday != Calendar.THURSDAY) {
int days = ((Calendar.WEDNESDAY - weekday + 2) % 7);
c.add(Calendar.DAY_OF_YEAR, days);
} else if (c.get(Calendar.HOUR_OF_DAY) >= 7) {
c.add(Calendar.DAY_OF_YEAR, 7);
}
c.set(Calendar.HOUR_OF_DAY, 7);
c.set(Calendar.MINUTE, 0);
c.set(Calendar.SECOND, 0);
c.set(Calendar.MILLISECOND, 0);
return c.getTimeInMillis();
}
public void updateNextUpdateTime() {
ODBCursor cursor = core.getSWGObjectODB().getCursor();
while (cursor.hasNext()) {
SWGObject object = (SWGObject) cursor.next();
if (object == null) {
continue;
}
if (core.objectService.getObject(object.getObjectID()) == null) {
object = core.objectService.getObject(object.getObjectID());
}
if (!(object instanceof CreatureObject)) {
continue;
}
CreatureObject creature = (CreatureObject) object;
if (creature.getSlottedObject("ghost") == null) {
continue;
}
PlayerObject player = (PlayerObject) creature.getSlottedObject("ghost");
player.setNextUpdateTime((int) calculateNextUpdateTime());
}
cursor.close();
}
public long calculateResetTime() {
Calendar c = Calendar.getInstance();
Date now = new Date();
c.setTime(now);
int weekday = c.get(Calendar.DAY_OF_WEEK);
if (weekday != Calendar.THURSDAY) {
int days = ((Calendar.WEDNESDAY - weekday + 2) % 7);
c.add(Calendar.DAY_OF_YEAR, days);
} else if (c.get(Calendar.HOUR_OF_DAY) >= 7) {
c.add(Calendar.DAY_OF_YEAR, 7);
}
c.set(Calendar.HOUR_OF_DAY, 7);
c.set(Calendar.MINUTE, 0);
c.set(Calendar.SECOND, 0);
c.set(Calendar.MILLISECOND, 0);
return c.getTimeInMillis();
}
public void insertOpcodes(Map<Integer, INetworkRemoteEvent> swgOpcodes, Map<Integer, INetworkRemoteEvent> objControllerOpcodes) {
swgOpcodes.put(Opcodes.GcwRegionsReq, new INetworkRemoteEvent() {
@@ -421,6 +711,25 @@ public class GCWService implements INetworkDispatch {
}
public void addPvPZone(String planetName, float x, float z, float radius) {
Planet planet = core.terrainService.getPlanetByName(planetName);
if(planet == null)
return;
if(pvpZones.get(planet) == null)
pvpZones.put(planet, new ArrayList<PvPZone>());
CollidableCircle area = new CollidableCircle(new Point3D(x, 0, z), radius, planet);
PvPZone zone = new PvPZone(planet, area);
pvpZones.get(planet).add(zone);
core.simulationService.addCollidable(area, x, z);
}
public boolean isInPvpZone(CreatureObject actor) {
List<PvPZone> zones = pvpZones.get(actor.getPlanet());
if(zones == null)
return false;
return zones.stream().anyMatch(z -> z.getArea().doesCollide(actor));
}
@Override
public void shutdown() {
src/services/gcw/PvPZone.java
+44
View File
@@ -21,16 +21,23 @@
******************************************************************************/
package services.gcw;
import main.NGECore;
import net.engio.mbassy.listener.Handler;
import resources.common.collidables.AbstractCollidable;
import resources.common.collidables.AbstractCollidable.EnterEvent;
import resources.common.collidables.AbstractCollidable.ExitEvent;
import resources.datatables.FactionStatus;
import resources.datatables.PvpStatus;
import resources.objects.creature.CreatureObject;
import engine.resources.scene.Planet;
import engine.resources.scene.Point3D;
public class PvPZone {
private Planet planet;
private AbstractCollidable area;
private NGECore core = NGECore.getInstance();
public PvPZone(Planet planet, AbstractCollidable area) {
this.planet = planet;
@@ -54,14 +61,51 @@ public class PvPZone {
this.area = area;
}
public void warpBack(CreatureObject actor) {
if (core.mountService.isMounted(actor)) {
actor = (CreatureObject) actor.getContainer();
}
core.simulationService.teleport(actor, (Point3D) actor.getAttachment("lastValidPosition"), actor.getOrientation(), actor.getParentId());
}
@Handler
public void onEnter(EnterEvent event) {
CreatureObject actor = (CreatureObject) event.object;
if(!actor.getFaction().equals("rebel") && !actor.getFaction().equals("imperial")) {
actor.sendSystemMessage("@gcw:pvp_advanced_region_not_allowed", (byte) 0);
warpBack(actor);
return;
}
if(actor.getLevel() < 75) {
actor.sendSystemMessage("@gcw:pvp_advanced_region_level_low", (byte) 0);
warpBack(actor);
return;
}
if(actor.getPvpStatus(PvpStatus.GoingCovert) || actor.getPvpStatus(PvpStatus.GoingOvert)) {
actor.setPvpStatus(PvpStatus.GoingCovert, false);
actor.setPvpStatus(PvpStatus.GoingOvert, false);
actor.sendSystemMessage("@gcw:pvp_advanced_region_faction_type_change_cancel", (byte) 0);
}
actor.setFactionStatus(FactionStatus.SpecialForces);
actor.updatePvpStatus();
actor.sendSystemMessage("@gcw:pvp_advanced_region_entered", (byte) 0);
}
@Handler
public void onExit(ExitEvent event) {
CreatureObject actor = (CreatureObject) event.object;
actor.setFactionStatus(FactionStatus.OnLeave);
actor.updatePvpStatus();
actor.sendSystemMessage("@gcw:pvp_advanced_region_exited", (byte) 0);
}
src/services/object/ObjectService.java
+1 -1
View File
@@ -48,6 +48,7 @@ import java.util.concurrent.atomic.AtomicLong;
import resources.common.*;
import resources.datatables.Options;
import resources.datatables.PlayerFlags;
import resources.harvest.SurveyTool;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.session.IoSession;
@@ -118,7 +119,6 @@ import resources.objects.resource.ResourceContainerObject;
import resources.objects.resource.ResourceRoot;
import resources.objects.staticobject.StaticObject;
import resources.objects.tangible.TangibleObject;
import resources.objects.tool.SurveyTool;
import resources.objects.waypoint.WaypointObject;
import resources.objects.weapon.WeaponObject;
import services.ai.AIActor;
src/services/spawn/MobileTemplate.java
+2 -1
View File
@@ -21,6 +21,7 @@
******************************************************************************/
package services.spawn;
import java.util.ArrayList;
import java.util.List;
import java.util.Vector;
@@ -59,7 +60,7 @@ public class MobileTemplate implements Cloneable {
private String meatType, milkType, boneType, hideType;
private int meatAmount, milkAmount, boneAmount, hideAmount;
private int respawnTime = 0;
private List<LootGroup> lootGroups;
private List<LootGroup> lootGroups = new ArrayList<LootGroup>();
public Vector<String> getTemplates() {
src/services/spawn/SpawnService.java
+2 -2
View File
@@ -100,7 +100,7 @@ public class SpawnService {
creature.setWeaponId(mobileTemplate.getCustomWeapon().getObjectID());
}*/
if(mobileTemplate.getLootGroups() != null)
if(mobileTemplate.getLootGroups() != null && !mobileTemplate.getLootGroups().isEmpty())
creature.setLootGroups(mobileTemplate.getLootGroups());
creature.setOptionsBitmask(mobileTemplate.getOptionsBitmask());
@@ -118,7 +118,7 @@ public class SpawnService {
level = mobileTemplate.getLevel();
}
if (mobileTemplate.getMinLevel()!=0 && mobileTemplate.getMaxLevel()!=0){
if (mobileTemplate.getMinLevel()!=0 && mobileTemplate.getMaxLevel()!=0 && level == -1){
level = (short) (mobileTemplate.getMinLevel() + (new Random().nextInt(mobileTemplate.getMaxLevel()-mobileTemplate.getMinLevel())));
creature.setLevel(level);
}