projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-14 00:02:07 -04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
CharonInferar
2014-08-17 13:30:28 +02:00
parent a52d01652c dcb9ee561c
commit 400a72eb7c
38 changed files with 1868 additions and 2944 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/mobiles/corellia/worrmp.py
+1 -1
View File
@@ -30,7 +30,7 @@ def addTemplate(core):
mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
templates = Vector()
templates.add('object/mobile/shared_worrt.iff')
templates.add('object/mobile/shared_worrt_hue.iff')
mobileTemplate.setTemplates(templates)
weaponTemplates = Vector()
scripts/mobiles/dantooine/kunga_tribe_member.py → scripts/mobiles/dantooine/kunga_tribesman.py
+2 -2
View File
@@ -10,7 +10,7 @@ from java.util import Vector
def addTemplate(core):
mobileTemplate = MobileTemplate()
mobileTemplate.setCreatureName('kunga_tribe_member')
mobileTemplate.setCreatureName('kunga_tribesman')
mobileTemplate.setLevel(71)
mobileTemplate.setDifficulty(Difficulty.NORMAL)
@@ -47,5 +47,5 @@ def addTemplate(core):
lootGroupChance_2 = 35
mobileTemplate.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2)
core.spawnService.addMobileTemplate('kunga_tribe_member', mobileTemplate)
core.spawnService.addMobileTemplate('kunga_tribesman', mobileTemplate)
scripts/mobiles/dynamicgroups/kunga_central_group_1.py
+1 -1
View File
@@ -17,7 +17,7 @@ def addDynamicGroup(core):
mobileTemplates.add('kunga_scout')
mobileTemplates.add('kunga_shaman')
mobileTemplates.add('kunga_soothsayer')
mobileTemplates.add('kunga_tribe_member')
mobileTemplates.add('kunga_tribesman')
mobileTemplates.add('kunga_warrior')
dynamicGroup.setMobiles(mobileTemplates)
dynamicGroup.setGroupMembersNumber(-3)
scripts/mobiles/naboo/chuba.py
+1 -1
View File
@@ -30,7 +30,7 @@ def addTemplate(core):
mobileTemplate.setOptionsBitmask(128)
templates = Vector()
templates.add('object/mobile/shared_chuba.iff')
templates.add('object/mobile/shared_chuba_hue.iff')
mobileTemplate.setTemplates(templates)
weaponTemplates = Vector()
scripts/mobiles/tatooine/harmony_worrt.py
+1 -1
View File
@@ -24,7 +24,7 @@ def addTemplate(core):
mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
templates = Vector()
templates.add('object/mobile/shared_worrt.iff')
templates.add('object/mobile/shared_worrt_hue.iff')
mobileTemplate.setTemplates(templates)
weaponTemplates = Vector()
scripts/mobiles/tatooine/mountain_worrt.py
+1 -1
View File
@@ -30,7 +30,7 @@ def addTemplate(core):
mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
templates = Vector()
templates.add('object/mobile/shared_worrt.iff')
templates.add('object/mobile/shared_worrt_hue.iff')
mobileTemplate.setTemplates(templates)
weaponTemplates = Vector()
scripts/mobiles/tatooine/sewer_worrt.py
+1 -1
View File
@@ -30,7 +30,7 @@ def addTemplate(core):
mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
templates = Vector()
templates.add('object/mobile/shared_worrt.iff')
templates.add('object/mobile/shared_worrt_hue.iff')
mobileTemplate.setTemplates(templates)
weaponTemplates = Vector()
scripts/mobiles/tatooine/worrt.py
+1 -1
View File
@@ -30,7 +30,7 @@ def addTemplate(core):
mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
templates = Vector()
templates.add('object/mobile/shared_worrt.iff')
templates.add('object/mobile/shared_worrt_hue.iff')
mobileTemplate.setTemplates(templates)
weaponTemplates = Vector()
scripts/mobiles/tatooine/worrt_gutbuster.py
+1 -1
View File
@@ -30,7 +30,7 @@ def addTemplate(core):
mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
templates = Vector()
templates.add('object/mobile/shared_worrt.iff')
templates.add('object/mobile/shared_worrt_hue.iff')
mobileTemplate.setTemplates(templates)
weaponTemplates = Vector()
src/protocol/swg/CreateClientPathMessage.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class CreateClientPathMessage extends SWGMessage {
}
buffer.flip();
StringUtilities.printBytes(buffer.array());
//StringUtilities.printBytes(buffer.array());
return buffer;
}
src/protocol/swg/LoginClusterStatus.java
-3
View File
@@ -22,9 +22,6 @@
package protocol.swg;
import java.nio.ByteOrder;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.TimeZone;
import main.NGECore;
src/protocol/swg/objectControllerObjects/ShowLootBox.java
-2
View File
@@ -23,11 +23,9 @@ package protocol.swg.objectControllerObjects;
import java.nio.ByteOrder;
import java.util.ArrayList;
import java.util.Vector;
import org.apache.mina.core.buffer.IoBuffer;
import engine.resources.objects.SWGObject;
import protocol.swg.ObjControllerMessage;
public class ShowLootBox extends ObjControllerObject {
src/resources/buffs/Buff.java
+339 -244
View File
@@ -21,8 +21,6 @@
******************************************************************************/
package resources.buffs;
import java.io.Serializable;
import java.nio.ByteOrder;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
@@ -30,50 +28,43 @@ import java.util.concurrent.TimeUnit;
import main.NGECore;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.buffer.SimpleBufferAllocator;
import resources.objects.creature.CreatureObject;
import com.sleepycat.persist.model.NotPersistent;
import engine.clientdata.ClientFileManager;
import engine.clientdata.visitors.DatatableVisitor;
import engine.resources.objects.Delta;
import engine.resources.common.CRC;
import engine.resources.objects.IDelta;
import engine.resources.objects.SWGObject;
public class Buff implements IDelta, Serializable {
public class Buff extends Delta {
private static final long serialVersionUID = 1L;
@NotPersistent
private transient static SimpleBufferAllocator bufferPool = new SimpleBufferAllocator();
private String group1, group2;
private int priority;
private float duration;
private String buffName;
private long ownerId;
private String effect1Name, effect2Name, effect3Name, effect4Name, effect5Name;
private String group1 = "", group2 = "";
private int priority = 0;
private float duration = 0;
private String buffName = "";
private long ownerId = 0;
private String effect1Name = "", effect2Name = "", effect3Name = "", effect4Name = "", effect5Name = "";
private float effect1Value, effect2Value, effect3Value, effect4Value, effect5Value;
private String callback;
private String particleEffect;
private boolean isDebuff;
private boolean removeOnDeath;
private boolean isRemovableByPlayer;
private int maxStacks;
private boolean isPersistent;
private boolean removeOnRespec;
private boolean aiRemoveOnEndCombat;
private boolean decayOnPvPDeath;
private long startTime;
private int totalPlayTime;
private String callback = "";
private String particleEffect = "";
private boolean isDebuff = false;
private boolean removeOnDeath = false;
private boolean isRemovableByPlayer = false;
private int maxStacks = 0;
private boolean isPersistent = false;
private boolean removeOnRespec = false;
private boolean aiRemoveOnEndCombat = false;
private boolean decayOnPvPDeath = false;
private long startTime = 0;
private int totalPlayTime = 0;
private byte decayCounter = 0;
@NotPersistent
private transient ScheduledFuture<?> removalTask;
private int stacks = 1;
private long groupBufferId;
private int buffCRC;
private long groupBufferId = 0;
public Buff(Buff baseBuff, long ownerId) {
this.buffName = baseBuff.getBuffName();
this.buffCRC = baseBuff.getBuffCRC();
this.group1 = baseBuff.getGroup1();
this.group2 = baseBuff.getGroup2();
this.priority = baseBuff.getPriority();
@@ -100,398 +91,502 @@ public class Buff implements IDelta, Serializable {
this.decayOnPvPDeath = baseBuff.isDecayOnPvPDeath();
}
/*public Buff(String buffName, long ownerId) {
public Buff(String buffName, long ownerId) {
this.buffName = buffName;
this.ownerId = ownerId;
this.buffCRC = CRC.StringtoCRC(buffName);
DatatableVisitor visitor;
try {
visitor = ClientFileManager.loadFile("datatables/buff/buff.iff", DatatableVisitor.class);
for(int i = 0; i < visitor.getRowCount(); i++) {
if(visitor.getObject(i, 0) != null)
if(((String) visitor.getObject(i, 0)).equalsIgnoreCase(buffName)) {
group1 = (String) visitor.getObject(i, 1);
group2 = (String) visitor.getObject(i, 2);
priority = (int) visitor.getObject(i, 4);
duration = (Float) visitor.getObject(i, 6);
effect1Name = (String) visitor.getObject(i, 7);
effect1Value = (Float) visitor.getObject(i, 8);
effect2Name = (String) visitor.getObject(i, 9);
effect2Value = (Float) visitor.getObject(i, 10);
effect3Name = (String) visitor.getObject(i, 11);
effect3Value = (Float) visitor.getObject(i, 12);
effect4Name = (String) visitor.getObject(i, 13);
effect4Value = (Float) visitor.getObject(i, 14);
effect5Name = (String) visitor.getObject(i, 15);
effect5Value = (Float) visitor.getObject(i, 16);
callback = (String) visitor.getObject(i, 18);
particleEffect = (String) visitor.getObject(i, 19);
isDebuff = (Boolean) visitor.getObject(i, 22);
removeOnDeath = (Integer) visitor.getObject(i, 25) != 0;
isRemovableByPlayer = (Integer) visitor.getObject(i, 26) != 0;
maxStacks = (Integer) visitor.getObject(i, 28);
isPersistent = (Integer) visitor.getObject(i, 29) != 0;
removeOnRespec = (Integer) visitor.getObject(i, 31) != 0;
aiRemoveOnEndCombat = (Integer) visitor.getObject(i, 32) != 0;
decayOnPvPDeath = (Integer) visitor.getObject(i, 33) != 0;
for (int i = 0; i < visitor.getRowCount(); i++) {
if (visitor.getObject(i, 0) != null) {
if (((String) visitor.getObject(i, 0)).equalsIgnoreCase(buffName)) {
group1 = (String) visitor.getObject(i, 1);
group2 = (String) visitor.getObject(i, 2);
priority = (int) visitor.getObject(i, 4);
duration = (Float) visitor.getObject(i, 6);
effect1Name = (String) visitor.getObject(i, 7);
effect1Value = (Float) visitor.getObject(i, 8);
effect2Name = (String) visitor.getObject(i, 9);
effect2Value = (Float) visitor.getObject(i, 10);
effect3Name = (String) visitor.getObject(i, 11);
effect3Value = (Float) visitor.getObject(i, 12);
effect4Name = (String) visitor.getObject(i, 13);
effect4Value = (Float) visitor.getObject(i, 14);
effect5Name = (String) visitor.getObject(i, 15);
effect5Value = (Float) visitor.getObject(i, 16);
callback = (String) visitor.getObject(i, 18);
particleEffect = (String) visitor.getObject(i, 19);
isDebuff = (Boolean) visitor.getObject(i, 22);
removeOnDeath = (Integer) visitor.getObject(i, 25) != 0;
isRemovableByPlayer = (Integer) visitor.getObject(i, 26) != 0;
maxStacks = (Integer) visitor.getObject(i, 28);
isPersistent = (Integer) visitor.getObject(i, 29) != 0;
removeOnRespec = (Integer) visitor.getObject(i, 31) != 0;
aiRemoveOnEndCombat = (Integer) visitor.getObject(i, 32) != 0;
decayOnPvPDeath = (Integer) visitor.getObject(i, 33) != 0;
}
}
}
} catch (InstantiationException | IllegalAccessException e) {
e.printStackTrace();
}
}*/
public Buff() { }
}
@Override
public void init(SWGObject object) {
// TODO Auto-generated method stub
public Buff() {
}
@Override
public byte[] getBytes() {
IoBuffer buffer = bufferPool.allocate(28, false).order(ByteOrder.LITTLE_ENDIAN);
buffer.putInt(CRC.StringtoCRC(buffName.toLowerCase()));
if(duration > 0) {
buffer.putInt((int) (totalPlayTime + getRemainingDuration()));
buffer.putInt(0);
buffer.putInt((int) duration);
} else {
buffer.putInt(-1);
buffer.putInt(0);
buffer.putInt(0);
synchronized(objectMutex) {
IoBuffer buffer = createBuffer(24);
if (duration > 0) {
buffer.putInt((int) (totalPlayTime + getRemainingDuration()));
buffer.putInt(0);
buffer.putInt((int) duration);
} else {
buffer.putInt(-1);
buffer.putInt(0);
buffer.putInt(0);
}
buffer.putLong(ownerId);
buffer.putInt(stacks);
buffer.flip();
return buffer.array();
}
buffer.putLong(ownerId);
buffer.putInt(stacks); // stacks
buffer.flip();
return buffer.array();
}
public String getGroup1() {
return group1;
synchronized(objectMutex) {
return group1;
}
}
public void setGroup1(String group1) {
this.group1 = group1;
synchronized(objectMutex) {
this.group1 = group1;
}
}
public String getGroup2() {
synchronized(objectMutex) {
return group2;
}
}
public void setGroup2(String group2) {
synchronized(objectMutex) {
this.group2 = group2;
}
}
public int getPriority() {
return priority;
synchronized(objectMutex) {
return priority;
}
}
public void setPriority(int priority) {
this.priority = priority;
synchronized(objectMutex) {
this.priority = priority;
}
}
public float getDuration() {
return duration;
synchronized(objectMutex) {
return duration;
}
}
public void setDuration(float duration) {
this.duration = duration;
synchronized(objectMutex) {
this.duration = duration;
}
}
public String getBuffName() {
return buffName;
synchronized(objectMutex) {
return buffName;
}
}
public void setBuffName(String buffName) {
this.buffName = buffName;
synchronized(objectMutex) {
this.buffName = buffName;
}
}
public long getOwnerId() {
return ownerId;
synchronized(objectMutex) {
return ownerId;
}
}
public void setOwnerId(long ownerId) {
this.ownerId = ownerId;
synchronized(objectMutex) {
this.ownerId = ownerId;
}
}
public String getEffect1Name() {
return effect1Name;
synchronized(objectMutex) {
return effect1Name;
}
}
public void setEffect1Name(String effect1Name) {
this.effect1Name = effect1Name;
synchronized(objectMutex) {
this.effect1Name = effect1Name;
}
}
public String getEffect2Name() {
return effect2Name;
synchronized(objectMutex) {
return effect2Name;
}
}
public void setEffect2Name(String effect2Name) {
this.effect2Name = effect2Name;
synchronized(objectMutex) {
this.effect2Name = effect2Name;
}
}
public String getEffect3Name() {
return effect3Name;
synchronized(objectMutex) {
return effect3Name;
}
}
public void setEffect3Name(String effect3Name) {
this.effect3Name = effect3Name;
synchronized(objectMutex) {
this.effect3Name = effect3Name;
}
}
public String getEffect4Name() {
return effect4Name;
synchronized(objectMutex) {
return effect4Name;
}
}
public void setEffect4Name(String effect4Name) {
this.effect4Name = effect4Name;
synchronized(objectMutex) {
this.effect4Name = effect4Name;
}
}
public String getEffect5Name() {
return effect5Name;
synchronized(objectMutex) {
return effect5Name;
}
}
public void setEffect5Name(String effect5Name) {
this.effect5Name = effect5Name;
synchronized(objectMutex) {
this.effect5Name = effect5Name;
}
}
public float getEffect1Value() {
return effect1Value;
synchronized(objectMutex) {
return effect1Value;
}
}
public void setEffect1Value(float effect1Value) {
this.effect1Value = effect1Value;
synchronized(objectMutex) {
this.effect1Value = effect1Value;
}
}
public float getEffect2Value() {
return effect2Value;
synchronized(objectMutex) {
return effect2Value;
}
}
public void setEffect2Value(float effect2Value) {
this.effect2Value = effect2Value;
synchronized(objectMutex) {
this.effect2Value = effect2Value;
}
}
public float getEffect3Value() {
return effect3Value;
synchronized(objectMutex) {
return effect3Value;
}
}
public void setEffect3Value(float effect3Value) {
this.effect3Value = effect3Value;
synchronized(objectMutex) {
this.effect3Value = effect3Value;
}
}
public float getEffect4Value() {
return effect4Value;
synchronized(objectMutex) {
return effect4Value;
}
}
public void setEffect4Value(float effect4Value) {
this.effect4Value = effect4Value;
synchronized(objectMutex) {
this.effect4Value = effect4Value;
}
}
public float getEffect5Value() {
return effect5Value;
synchronized(objectMutex) {
return effect5Value;
}
}
public void setEffect5Value(float effect5Value) {
this.effect5Value = effect5Value;
synchronized(objectMutex) {
this.effect5Value = effect5Value;
}
}
public String getCallback() {
return callback;
synchronized(objectMutex) {
return callback;
}
}
public void setCallback(String callback) {
this.callback = callback;
synchronized(objectMutex) {
this.callback = callback;
}
}
public String getParticleEffect() {
return particleEffect;
synchronized(objectMutex) {
return particleEffect;
}
}
public void setParticleEffect(String particleEffect) {
this.particleEffect = particleEffect;
synchronized(objectMutex) {
this.particleEffect = particleEffect;
}
}
public boolean isDebuff() {
return isDebuff;
synchronized(objectMutex) {
return isDebuff;
}
}
public void setDebuff(boolean isDebuff) {
this.isDebuff = isDebuff;
synchronized(objectMutex) {
this.isDebuff = isDebuff;
}
}
public boolean isRemoveOnDeath() {
return removeOnDeath;
synchronized(objectMutex) {
return removeOnDeath;
}
}
public void setRemoveOnDeath(boolean removeOnDeath) {
this.removeOnDeath = removeOnDeath;
synchronized(objectMutex) {
this.removeOnDeath = removeOnDeath;
}
}
public boolean isRemovableByPlayer() {
return isRemovableByPlayer;
synchronized(objectMutex) {
return isRemovableByPlayer;
}
}
public void setRemovableByPlayer(boolean isRemovableByPlayer) {
this.isRemovableByPlayer = isRemovableByPlayer;
synchronized(objectMutex) {
this.isRemovableByPlayer = isRemovableByPlayer;
}
}
public int getMaxStacks() {
return maxStacks;
synchronized(objectMutex) {
return maxStacks;
}
}
public void setMaxStacks(int maxStacks) {
this.maxStacks = maxStacks;
synchronized(objectMutex) {
this.maxStacks = maxStacks;
}
}
public boolean isPersistent() {
return isPersistent;
synchronized(objectMutex) {
return isPersistent;
}
}
public void setPersistent(boolean isPersistent) {
this.isPersistent = isPersistent;
synchronized(objectMutex) {
this.isPersistent = isPersistent;
}
}
public boolean isRemoveOnRespec() {
return removeOnRespec;
synchronized(objectMutex) {
return removeOnRespec;
}
}
public void setRemoveOnRespec(boolean removeOnRespec) {
this.removeOnRespec = removeOnRespec;
synchronized(objectMutex) {
this.removeOnRespec = removeOnRespec;
}
}
public boolean isAiRemoveOnEndCombat() {
return aiRemoveOnEndCombat;
synchronized(objectMutex) {
return aiRemoveOnEndCombat;
}
}
public void setAiRemoveOnEndCombat(boolean aiRemoveOnEndCombat) {
this.aiRemoveOnEndCombat = aiRemoveOnEndCombat;
synchronized(objectMutex) {
this.aiRemoveOnEndCombat = aiRemoveOnEndCombat;
}
}
public boolean isDecayOnPvPDeath() {
return decayOnPvPDeath;
synchronized(objectMutex) {
return decayOnPvPDeath;
}
}
public void setDecayOnPvPDeath(boolean decayOnPvPDeath) {
this.decayOnPvPDeath = decayOnPvPDeath;
synchronized(objectMutex) {
this.decayOnPvPDeath = decayOnPvPDeath;
}
}
public void setStartTime() {
this.startTime = System.currentTimeMillis();
synchronized(objectMutex) {
this.startTime = System.currentTimeMillis();
}
}
public long getStartTime() {
return startTime;
synchronized(objectMutex) {
return startTime;
}
}
public int getRemainingDuration() {
long currentTime = System.currentTimeMillis();
long timeDiff = (currentTime - startTime) / 1000;
int remaining = (int) (duration - timeDiff);
for(int i = 0; i < decayCounter; i++) {
remaining /= 2;
synchronized(objectMutex) {
long currentTime = System.currentTimeMillis();
long timeDiff = (currentTime - startTime) / 1000;
int remaining = (int) (duration - timeDiff);
for (int i = 0; i < decayCounter; i++) {
remaining /= 2;
}
return remaining;
}
return remaining;
}
public int getTotalPlayTime() {
return totalPlayTime;
synchronized(objectMutex) {
return totalPlayTime;
}
}
public void setTotalPlayTime(int totalPlayTime) {
this.totalPlayTime = totalPlayTime;
synchronized(objectMutex) {
this.totalPlayTime = totalPlayTime;
}
}
public byte getDecayCounter() {
return decayCounter;
synchronized(objectMutex) {
return decayCounter;
}
}
public void incDecayCounter() {
this.decayCounter++;
synchronized(objectMutex) {
this.decayCounter++;
}
}
public ScheduledFuture<?> getRemovalTask() {
return removalTask;
}
public void setRemovalTask(ScheduledFuture<?> removalTask) {
this.removalTask = removalTask;
}
public void updateRemovalTask() {
if(removalTask == null)
if (removalTask == null) {
return;
}
removalTask.cancel(true);
final NGECore core = NGECore.getInstance();
final CreatureObject owner = (CreatureObject) core.objectService.getObject(getOwnerId());
if(owner == null)
if (owner == null) {
return;
}
ScheduledFuture<?> task = Executors.newScheduledThreadPool(1).schedule(new Runnable() {
@Override
public void run() {
try {
core.buffService.removeBuffFromCreature(owner, Buff.this);
} catch (Exception e) {
e.printStackTrace();
}
}
}, (long) getRemainingDuration(), TimeUnit.SECONDS);
setRemovalTask(task);
}
public int getStacks() {
return stacks;
synchronized(objectMutex) {
return stacks;
}
}
public void setStacks(int stacks) {
this.stacks = stacks;
synchronized(objectMutex) {
this.stacks = stacks;
}
}
public boolean isGroupBuff() {
return effect1Name == null ? false : effect1Name.equals("group");
}
public long getGroupBufferId() {
return groupBufferId;
}
public void setGroupBufferId(long groupBufferId) {
this.groupBufferId = groupBufferId;
}
public String getGroup2() {
return group2;
}
public void setGroup2(String group2) {
this.group2 = group2;
}
public int getBuffCRC() {
return buffCRC;
synchronized(objectMutex) {
return effect1Name.equals("group");
}
}
public void setBuffCRC(int buffCRC) {
this.buffCRC = buffCRC;
public long getGroupBufferId() {
synchronized(objectMutex) {
return groupBufferId;
}
}
public void setGroupBufferId(long groupBufferId) {
synchronized(objectMutex) {
this.groupBufferId = groupBufferId;
}
}
}
src/resources/buffs/BuffList.java
+91
View File
@@ -0,0 +1,91 @@
/*******************************************************************************
* 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.buffs;
import java.util.Map.Entry;
import org.apache.mina.core.buffer.IoBuffer;
import engine.resources.objects.Delta;
import resources.objects.SWGMap;
public class BuffList extends Delta {
private static final long serialVersionUID = 1L;
private SWGMap<Integer, Buff> list;
public BuffList(SWGMap<Integer, Buff> list) {
this.list = list;
}
public BuffList() {
}
public SWGMap<Integer, Buff> getList() {
synchronized(objectMutex) {
return list;
}
}
public byte[] getBytes() {
int size = 8 + ((list.size() > 0) ? 4 : 0);
for (Buff buff : list.values().toArray(new Buff[] { })) {
size += (25 + ((buff.getBuffName().equals("")) ? 0 : 4));
}
IoBuffer buffer = createBuffer(size);
buffer.putInt(list.size());
buffer.putInt(list.getUpdateCounter());
for (Entry<Integer, Buff> entry : list.entrySet()) {
int crc = entry.getKey();
Buff buff = entry.getValue();
buffer.put(getBoolean(!buff.getBuffName().equals("")));
if (!buff.getBuffName().equals("")) {
buffer.putInt(0);
}
buffer.putInt(crc);
if (buff.getDuration() > 0) {
buffer.putInt((int) (buff.getTotalPlayTime() + buff.getRemainingDuration()));
buffer.putInt(0);
buffer.putInt((int) buff.getDuration());
} else {
buffer.putInt(-1);
buffer.putInt(0);
if (buff.getBuffName().equals("")) {
buffer.putInt(0);
} else {
buffer.putInt(-1);
}
}
buffer.putLong(buff.getOwnerId());
}
if (list.size() > 0) {
buffer.putInt(1);
}
return buffer.array();
}
}
src/resources/equipment/Equipment.java
+96
View File
@@ -0,0 +1,96 @@
/*******************************************************************************
* 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.equipment;
import main.NGECore;
import org.apache.mina.core.buffer.IoBuffer;
import engine.resources.common.CRC;
import engine.resources.objects.Delta;
import engine.resources.objects.SWGObject;
import resources.objects.tangible.TangibleObject;
import resources.objects.weapon.WeaponObject;
public class Equipment extends Delta {
private static final long serialVersionUID = 1L;
private long objectId;
public Equipment(SWGObject object) {
this.objectId = ((object instanceof TangibleObject) ? object.getObjectID() : 0);
}
public Equipment() {
}
public SWGObject getObject() {
synchronized(objectMutex) {
return NGECore.getInstance().objectService.getObject(objectId);
}
}
public long getObjectId() {
synchronized(objectMutex) {
return objectId;
}
}
public byte[] getBytes() {
if (!(getObject() instanceof TangibleObject)) {
if (getObject() == null) {
System.err.println("Serious error: Equipment object is null in objectList.");
} else {
System.err.println("Serious error: Equipment object isn't a TangibleObject");
}
}
TangibleObject object = (TangibleObject) getObject();
synchronized(objectMutex) {
int size = 19 + object.getCustomization ().length;
if (object instanceof WeaponObject) {
size += ((WeaponObject) object).getBaseline(3).getBaseline().array().length;
size += ((WeaponObject) object).getBaseline(6).getBaseline().array().length;
}
IoBuffer buffer = createBuffer(size);
buffer.putShort((short) object.getCustomization().length);
buffer.put(object.getCustomization());
buffer.putInt(object.getArrangementId());
buffer.putLong(object.getObjectID());
buffer.putInt(CRC.StringtoCRC(object.getTemplate()));
buffer.put(getBoolean((object instanceof WeaponObject)));
if (object instanceof WeaponObject) {
buffer.put(((WeaponObject) object).getBaseline(3).getBaseline().array());
buffer.put(((WeaponObject) object).getBaseline(6).getBaseline().array());
}
buffer.flip();
return buffer.array();
}
}
}
src/resources/group/GroupInviteInfo.java
+77
View File
@@ -0,0 +1,77 @@
/*******************************************************************************
* 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.group;
import org.apache.mina.core.buffer.IoBuffer;
import engine.resources.common.AString;
import engine.resources.objects.Delta;
public class GroupInviteInfo extends Delta {
private static final long serialVersionUID = 1L;
private long senderId;
private AString senderName;
private long inviteCounter;
public GroupInviteInfo(long senderId, String senderName) {
this.senderId = senderId;
this.senderName = new AString(senderName);
inviteCounter = 0;
}
public GroupInviteInfo() {
}
public long getSenderId() {
synchronized(objectMutex) {
return senderId;
}
}
public String getSenderName() {
synchronized(objectMutex) {
return senderName.get();
}
}
public void setSender(long senderId, String senderName) {
synchronized(objectMutex) {
this.senderId = senderId;
this.senderName = new AString(senderName);
inviteCounter++;
}
}
public byte[] getBytes() {
synchronized(objectMutex) {
IoBuffer buffer = createBuffer(16 + senderName.getBytes().length);
buffer.putLong(senderId);
buffer.put(senderName.getBytes());
buffer.putLong(inviteCounter);
return buffer.array();
}
}
}
src/resources/objects/creature/CreatureMessageBuilder.java
-1135
View File
File diff suppressed because it is too large Load Diff
src/resources/objects/creature/CreatureObject.java
+1134 -1468
View File
File diff suppressed because it is too large Load Diff
src/resources/objects/player/PlayerObject.java
+1 -1
View File
@@ -1052,7 +1052,7 @@ public class PlayerObject extends IntangibleObject implements Serializable {
default:
if (getContainer() != null && getContainer().getClient() != null) {
getContainer().getClient().getSession().write(getBaseline(viewType).createDelta(updateType, buffer.array()));
StringUtilities.printBytes(getBaseline(viewType).createDelta(updateType, buffer.array()).array());
//StringUtilities.printBytes(getBaseline(viewType).createDelta(updateType, buffer.array()).array());
}
}
}
src/services/AdminService.java
+2 -2
View File
@@ -44,7 +44,7 @@ public class AdminService implements INetworkDispatch {
PreparedStatement preparedStatement;
try {
preparedStatement = NGECore.getInstance().getDatabase1().preparedStatement("SELECT * FROM accounts WHERE id=" + id + "");
preparedStatement = core.getDatabase1().preparedStatement("SELECT * FROM accounts WHERE id=" + id + "");
ResultSet resultSet = preparedStatement.executeQuery();
if(resultSet.next())
accessLevel = resultSet.getString("accessLevel");
@@ -60,7 +60,7 @@ public class AdminService implements INetworkDispatch {
PreparedStatement preparedStatement;
try {
preparedStatement = NGECore.getInstance().getDatabase1().preparedStatement("SELECT * FROM accounts WHERE id=" + id + "");
preparedStatement = core.getDatabase1().preparedStatement("SELECT * FROM accounts WHERE id=" + id + "");
ResultSet resultSet = preparedStatement.executeQuery();
if(resultSet.next())
accountName = resultSet.getString("user");
src/services/BuffService.java
+7 -6
View File
@@ -43,7 +43,6 @@ import resources.objects.player.PlayerObject;
import main.NGECore;
import engine.clientdata.ClientFileManager;
import engine.clientdata.visitors.DatatableVisitor;
import engine.resources.common.CRC;
import engine.resources.objects.SWGObject;
import engine.resources.service.INetworkDispatch;
import engine.resources.service.INetworkRemoteEvent;
@@ -114,6 +113,7 @@ public class BuffService implements INetworkDispatch {
}
// Here the necessary checks must be placed to prevent buffs from the same buff group (e.g. Buff D) being stacked!
// ^ These checks are already performed in doAddBuff, unless they were removed.
if(buff.isGroupBuff()) {
addGroupBuff(buffer, buffName, buffer);
@@ -135,6 +135,8 @@ public class BuffService implements INetworkDispatch {
//TODO fix this -- !! this is wrong - I can buff from 5,5 in cantina someone sitting at 20,20 in the universe/planet !!! - accross the galaxy/planet
//cause get position is relative to creature system of coordinates - when one's outside and other inside
//if you must use getPosition() check for isInCell first for both or something like that
// ^The above bug should be fixed in command service. The checks below shouldn't really even be in this service.
if (target.getPosition().getDistance(buffer.getPosition()) > 20) {
return null;
}
@@ -165,7 +167,7 @@ public class BuffService implements INetworkDispatch {
for (final Buff otherBuff : target.getBuffList()) {
for (final Buff otherBuff : target.getBuffList().values()) {
if (buff.getGroup1().equals(otherBuff.getGroup1()))
if (buff.getPriority() >= otherBuff.getPriority()) {
if (buff.getBuffName().equals(otherBuff.getBuffName()))
@@ -270,7 +272,7 @@ public class BuffService implements INetworkDispatch {
@SuppressWarnings("unused")
public void removeBuffFromCreature(CreatureObject creature, Buff buff)
{
if(!creature.getBuffList().contains(buff))
if(!creature.getBuffList().containsValue(buff))
{
return;
}
@@ -371,7 +373,7 @@ public class BuffService implements INetworkDispatch {
// copy to array for thread safety
for(final Buff buff : creature.getBuffList().get().toArray(new Buff[] { })) {
for(final Buff buff : creature.getBuffList().values().toArray(new Buff[] { })) {
if (buff.getRemovalTask() != null) { continue; }
@@ -403,7 +405,7 @@ public class BuffService implements INetworkDispatch {
public boolean hasBuff(final CreatureObject creature, String buffName) {
for(final Buff buff : creature.getBuffList().get().toArray(new Buff[] { })) {
for(final Buff buff : creature.getBuffList().values().toArray(new Buff[] { })) {
if (buff.getBuffName().contains(buffName)) { return true; }
}
return false;
@@ -502,7 +504,6 @@ public class BuffService implements INetworkDispatch {
String name = (String) visitor.getObject(i, 0);
buff.setBuffName(name);
buff.setBuffCRC(CRC.StringtoCRC(name));
buff.setGroup1((String) visitor.getObject(i, 1));
buff.setGroup2((String) visitor.getObject(i, 2));
buff.setPriority((int) visitor.getObject(i, 4));
src/services/ConnectionService.java
+2 -2
View File
@@ -344,9 +344,9 @@ public class ConnectionService implements INetworkDispatch {
object.setAttachment("disconnectTask", null);
try {
List<ScheduledFuture<?>> schedulers = core.playerService.getSchedulers().get(object.getObjectID());
Map<String, ScheduledFuture<?>> schedulers = core.playerService.getSchedulers().get(object.getObjectID());
if(schedulers != null) {
schedulers.forEach(s -> s.cancel(true));
schedulers.forEach((s, thread) -> thread.cancel(true));
schedulers.clear();
}
core.playerService.getSchedulers().remove(object.getObjectID());
src/services/EntertainmentService.java
+11 -9
View File
@@ -688,12 +688,14 @@ public class EntertainmentService implements INetworkDispatch {
}
public void startPerformance(CreatureObject actor, int performanceId, int performanceCounter, String skillName, boolean isDance) {
actor.setPerformanceId(performanceId, isDance);
actor.setPerformanceId((isDance) ? 0 : performanceId);
actor.setPerformanceCounter(performanceCounter);
actor.setCurrentAnimation(skillName);
actor.setPerformanceType(isDance);
actor.startPerformance();
if (!actor.isPerforming()) {
actor.setPerforming(true);
}
}
public void startPerformanceExperience(final CreatureObject entertainer) {
@@ -722,13 +724,13 @@ public class EntertainmentService implements INetworkDispatch {
}
public void startSpectating(final CreatureObject spectator, final CreatureObject performer, boolean spectateType) {
public void startSpectating(final CreatureObject spectator, final CreatureObject performer, String spectateType) {
// visual
if (spectator.getPerformanceWatchee() == performer && spectateType)
if (spectator.getPerformanceWatchee() == performer && spectateType.equals("dance"))
spectator.getPerformanceWatchee().removeSpectator(spectator);
// music
else if (spectator.getPerformanceListenee() == performer && !spectateType)
else if (spectator.getPerformanceListenee() == performer && spectateType.equals("musci"))
spectator.getPerformanceListenee().removeSpectator(spectator);
spectator.setPerformanceWatchee(performer);
@@ -739,7 +741,7 @@ public class EntertainmentService implements INetworkDispatch {
try {
if (spectator.getWorldPosition().getDistance2D(performer.getWorldPosition()) > (float) 70) {
if(((performer.getPerformanceType()) ? "dance" : "music").equals("dance")) {
if(performer.getPerformanceType().equals("dance")) {
spectator.setPerformanceWatchee(null);
spectator.sendSystemMessage("You stop watching " + performer.getCustomName() + " because " + performer.getCustomName()
+ " is out of range.", (byte) 0);
@@ -770,7 +772,7 @@ public class EntertainmentService implements INetworkDispatch {
handleInspirationTicks(spectator, performer);
}
if(spectateType)
if(spectateType.equals("dance"))
spectator.sendSystemMessage("You start watching " + performer.getCustomName() + ".", (byte) 0);
else
spectator.sendSystemMessage("You start listening to " + performer.getCustomName() + ".", (byte) 0);
@@ -778,7 +780,7 @@ public class EntertainmentService implements INetworkDispatch {
}
public void performFlourish(final CreatureObject performer, int flourish) {
// FIXME There wasn't a limit on flourishes; they just queued up.
if (performer.getFlourishCount() > 0 || performer.isPerformingFlourish()) {
performer.sendSystemMessage("@performance:flourish_wait_self", (byte) 0);
return;
@@ -814,7 +816,7 @@ public class EntertainmentService implements INetworkDispatch {
if(pEffect == null)
return false;
String performance = (performer.getPerformanceType()) ? "dance" : "music";
String performance = performer.getPerformanceType();
if(performer.isPerformingEffect()) {
performer.sendSystemMessage("@performance:effect_wait_self", (byte) 0);
src/services/GroupService.java
+2 -2
View File
@@ -209,7 +209,7 @@ public class GroupService implements INetworkDispatch {
// loop until we find a member other than ourself
for(SWGObject otherMember : group.getMemberList()) {
if(otherMember != member) {
for(Buff buff : ((CreatureObject) otherMember).getBuffList().get()) {
for(Buff buff : ((CreatureObject) otherMember).getBuffList().values()) {
if(buff.isGroupBuff() && otherMember.getPlanet() == member.getPlanet() && otherMember.getWorldPosition().getDistance2D(member.getWorldPosition()) <= 80) {
core.buffService.addBuffToCreature((CreatureObject) otherMember, buff.getBuffName(), member);
}
@@ -221,7 +221,7 @@ public class GroupService implements INetworkDispatch {
}
public void removeGroupBuffs(CreatureObject member) {
for(Buff buff : new ArrayList<Buff>(member.getBuffList().get())) {
for(Buff buff : new ArrayList<Buff>(member.getBuffList().values())) {
if(buff.isGroupBuff() && buff.getGroupBufferId() != member.getObjectID()) {
core.buffService.removeBuffFromCreature(member, buff);
}
src/services/LootService.java
+1 -1
View File
@@ -242,7 +242,7 @@ public class LootService implements INetworkDispatch {
if (droppedItem.getAttachment("LootItemName").toString().contains("Loot Chest")){
lootedObject.playEffectObject("appearance/pt_rare_chest.prt", "");
requester.playMusicSelf("sound/rare_loot_chest.snd", requester.getObjectID(),1,false);
requester.playMusic("sound/rare_loot_chest.snd", requester.getObjectID(),1,false);
}
}
src/services/PlayerService.java
+68 -34
View File
@@ -75,6 +75,7 @@ import resources.datatables.GcwRank;
import resources.datatables.Options;
import resources.datatables.PlayerFlags;
import resources.datatables.Professions;
import resources.equipment.Equipment;
import resources.datatables.AdminTag;
import resources.guild.Guild;
import resources.objects.building.BuildingObject;
@@ -111,7 +112,7 @@ public class PlayerService implements INetworkDispatch {
private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
private float xpMultiplier;
protected final Object objectMutex = new Object();
private ConcurrentHashMap<Long, List<ScheduledFuture<?>>> schedulers = new ConcurrentHashMap<Long, List<ScheduledFuture<?>>>();
private ConcurrentHashMap<Long, Map<String, ScheduledFuture<?>>> schedulers = new ConcurrentHashMap<Long, Map<String, ScheduledFuture<?>>>();
public PlayerService(final NGECore core) {
this.core = core;
@@ -124,20 +125,32 @@ public class PlayerService implements INetworkDispatch {
if(schedulers.get(creature.getObjectID()) != null)
return;
List<ScheduledFuture<?>> scheduleList = new ArrayList<ScheduledFuture<?>>();
Map<String, ScheduledFuture<?>> scheduleList = new ConcurrentHashMap<String, ScheduledFuture<?>>();
scheduleList.add(scheduler.scheduleAtFixedRate(() -> {
scheduleList.put("serverTime", scheduler.scheduleAtFixedRate(() -> {
try {
if (creature == null || creature.getClient() == null || creature.getClient().getSession() == null) {
//scheduleList.get("serverTime").cancel(true);
return;
}
ServerTimeMessage time = new ServerTimeMessage(core.getGalacticTime() / 1000);
IoBuffer packet = time.serialize();
creature.getClient().getSession().write(packet);
} catch (Exception e) {
e.printStackTrace();
}
}, 45, 45, TimeUnit.SECONDS));
scheduleList.add(scheduler.scheduleAtFixedRate(() -> {
scheduleList.put("gcwUpdate", scheduler.scheduleAtFixedRate(() -> {
try {
if (creature == null || creature.getClient() == null || creature.getClient().getSession() == null) {
//scheduleList.get("gcwUpdate").cancel(true);
return;
}
PlayerObject player = (PlayerObject) creature.getSlottedObject("ghost");
player.setTotalPlayTime((int) (player.getTotalPlayTime() + ((System.currentTimeMillis() - player.getLastPlayTimeUpdate()) / 1000)));
player.setLastPlayTimeUpdate(System.currentTimeMillis());
@@ -189,9 +202,14 @@ public class PlayerService implements INetworkDispatch {
}
}, 30, 30, TimeUnit.SECONDS));
scheduleList.add(scheduler.scheduleAtFixedRate(() -> {
scheduleList.put("stealthCheck", scheduler.scheduleAtFixedRate(() -> {
try {
if (creature.isInStealth() && !creature.getOption(Options.INVULNERABLE) && core.adminService.getAccessLevelFromDB(creature.getClient().getAccountId()) == null) {
if (creature == null || creature.getClient() == null || creature.getClient().getSession() == null) {
//scheduleList.get("stealthCheck").cancel(true);
return;
}
if (creature.isCloaked() && !creature.getOption(Options.INVULNERABLE) && core.adminService.getAccessLevelFromDB(creature.getClient().getAccountId()) == null) {
List<SWGObject> objects = core.simulationService.get(creature.getPlanet(), creature.getPosition().x, creature.getPosition().z, 64);
for (SWGObject object : objects) {
@@ -209,7 +227,7 @@ public class PlayerService implements INetworkDispatch {
camoflauge -= (64 - creature.getPosition().getDistance(observer.getPosition()));
if (new Random(camoflauge).nextInt() == camoflauge) {
creature.setInStealth(false);
creature.setCloaked(false);
}
}
}
@@ -222,8 +240,13 @@ public class PlayerService implements INetworkDispatch {
}
}, 15, 15, TimeUnit.SECONDS));
scheduleList.add(scheduler.scheduleAtFixedRate(() -> {
scheduleList.put("action", scheduler.scheduleAtFixedRate(() -> {
try {
if (creature == null || creature.getClient() == null || creature.getClient().getSession() == null) {
//scheduleList.get("action").cancel(true);
return;
}
if(creature.getAction() < creature.getMaxAction() && creature.getPosture() != 14) {
if(!creature.isInCombat())
creature.setAction(creature.getAction() + (15 + creature.getLevel() * 5));
@@ -235,8 +258,13 @@ public class PlayerService implements INetworkDispatch {
}
}, 0, 1000, TimeUnit.MILLISECONDS));
scheduleList.add(scheduler.scheduleAtFixedRate(() -> {
scheduleList.put("health", scheduler.scheduleAtFixedRate(() -> {
try {
if (creature == null || creature.getClient() == null || creature.getClient().getSession() == null) {
//scheduleList.get("health").cancel(true);
return;
}
if(creature.getHealth() < creature.getMaxHealth() && !creature.isInCombat() && creature.getPosture() != 13 && creature.getPosture() != 14)
creature.setHealth(creature.getHealth() + (36 + creature.getLevel() * 4));
} catch (Exception e) {
@@ -244,8 +272,13 @@ public class PlayerService implements INetworkDispatch {
}
}, 0, 1000, TimeUnit.MILLISECONDS));
scheduleList.add(scheduler.scheduleAtFixedRate(() -> {
scheduleList.put("awareness", scheduler.scheduleAtFixedRate(() -> {
try {
if (creature == null || creature.getClient() == null || creature.getClient().getSession() == null) {
//scheduleList.get("awareness").cancel(true);
return;
}
long[] ids = creature.getAwareObjects().stream().mapToLong(SWGObject::getObjectID).toArray();
for(int i = 0; i < ids.length; i++) {
for(int j = 0; j < ids.length; j++) {
@@ -662,7 +695,7 @@ public class PlayerService implements INetworkDispatch {
creature.setTurnRadius(1);
if(pvpDeath) {
List<Buff> buffs = new ArrayList<Buff>(creature.getBuffList().get());
List<Buff> buffs = new ArrayList<Buff>(creature.getBuffList().values());
buffs.stream().filter(Buff::isDecayOnPvPDeath).forEach(Buff::incDecayCounter);
creature.updateAllBuffs();
}
@@ -754,38 +787,39 @@ public class PlayerService implements INetworkDispatch {
public void resetLevel(CreatureObject creature, boolean unequipItems) {
PlayerObject player = (PlayerObject) creature.getSlottedObject("ghost");
SWGObject inventory = creature.getSlottedObject("inventory");
if (unequipItems) {
try {
for (Long equipmentId : new ArrayList<Long>(creature.getEquipmentList())) {
SWGObject equipment = core.objectService.getObject(equipmentId);
for (Equipment equipmentObject : new ArrayList<Equipment>(creature.getEquipmentList())) {
SWGObject equipment = core.objectService.getObject(equipmentObject.getObjectId());
if (equipment == null || equipment.getTemplate().startsWith("object/tangible/hair/")) {
continue;
}
switch (equipment.getTemplate()) {
case "object/tangible/inventory/shared_character_inventory.iff":
case "object/tangible/inventory/shared_appearance_inventory.iff":
case "object/tangible/datapad/shared_character_datapad.iff":
case "object/tangible/bank/shared_character_bank.iff":
case "object/tangible/mission_bag/shared_mission_bag.iff":
case "object/weapon/creature/shared_creature_default_weapon.iff":
continue;
default:
creature.transferTo(creature, inventory, equipment);
case "object/tangible/inventory/shared_character_inventory.iff":
case "object/tangible/inventory/shared_appearance_inventory.iff":
case "object/tangible/datapad/shared_character_datapad.iff":
case "object/tangible/bank/shared_character_bank.iff":
case "object/tangible/mission_bag/shared_mission_bag.iff":
case "object/weapon/creature/shared_creature_default_weapon.iff":
continue;
default:
creature.transferTo(creature, inventory, equipment);
}
}
} catch (Exception e) {
e.printStackTrace();
}
}
//for (SWGObject equipment : creature.getAppearanceEquipmentList()) {
//core.equipmentService.unequip(creature, equipment);
//}
for (Buff buff : creature.getBuffList().get().toArray(new Buff[] { })) {
for (Buff buff : creature.getBuffList().values().toArray(new Buff[] { })) {
if (buff.isRemoveOnRespec()) {
core.buffService.removeBuffFromCreature(creature, buff);
}
@@ -820,7 +854,7 @@ public class PlayerService implements INetworkDispatch {
String xpType = ((player.getProfession().contains("entertainer")) ? "entertainer" : ((player.getProfession().contains("trader")) ? "crafting" : "combat_general"));
player.setXp(xpType, 0);
creature.setXpBarValue(0);
creature.setDisplayXp(0);
player.setProfessionWheelPosition("");
@@ -876,7 +910,7 @@ public class PlayerService implements INetworkDispatch {
String xpType = ((player.getProfession().contains("entertainer")) ? "entertainer" : ((player.getProfession().contains("trader")) ? "crafting" : "combat_general"));
player.setXp(xpType, experience);
creature.setXpBarValue(experience);
creature.setDisplayXp(experience);
// 2. Add the relevant health/action and expertise points.
@@ -1061,7 +1095,7 @@ public class PlayerService implements INetworkDispatch {
experience += ((experience * experienceBonus) / 100);
// 1. Add the experience.
if (experience > 0 && !creature.isStationary()) {
if (experience > 0 && !creature.isPerforming()) {
creature.showFlyText(OutOfBand.ProsePackage("@base_player:prose_flytext_xp", experience), 2.5f, new RGB(180, 60, 240), 1, true);
}
@@ -1072,7 +1106,7 @@ public class PlayerService implements INetworkDispatch {
}
player.setXp(xpType, experience);
creature.setXpBarValue(experience);
creature.setDisplayXp(experience);
// 2. See if they need to level up.
for (int i = 0; i < experienceTable.getRowCount(); i++) {
@@ -1453,8 +1487,8 @@ public class PlayerService implements INetworkDispatch {
actor.sendSystemMessage("@unity:decline", (byte) 0);
proposer.sendSystemMessage("@unity:declined", (byte) 0);
actor.setAttachment("proposer", null);
for(Long objId : proposer.getEquipmentList()) {
SWGObject obj = core.objectService.getObject(objId);
for(Equipment equipment : proposer.getEquipmentList()) {
SWGObject obj = core.objectService.getObject(equipment.getObjectId());
if(obj != null && obj.getAttachment("unity") != null) {
obj.setAttachment("unity", null);
break;
@@ -1562,7 +1596,7 @@ public class PlayerService implements INetworkDispatch {
}
public Map<Long, List<ScheduledFuture<?>>> getSchedulers() {
public Map<Long, Map<String, ScheduledFuture<?>>> getSchedulers() {
return schedulers;
}
src/services/SkillService.java
+1 -1
View File
@@ -407,7 +407,7 @@ public class SkillService implements INetworkDispatch {
List<String> skills = new ArrayList<String>(creature.getSkills());
skills.stream().filter(s -> s.contains("expertise")).forEach(s -> removeSkill(creature, s));
creature.getBuffList().stream().forEach(buff -> creature.removeBuff(buff));
creature.getBuffList().values().stream().forEach(buff -> creature.removeBuff(buff));
}
public void sendRespecWindow(CreatureObject creature) {
src/services/ai/AIActor.java
+1 -1
View File
@@ -185,7 +185,7 @@ public class AIActor {
try {
if (AIactive){
// this is difficult, should NPC not fight when no player is near? || creature.getObservers().isEmpty()
if(creature == null || creature.getFactionStatus()!=FactionStatus.Combatant || creature.isInCombat())
if(creature == null || creature.getFactionStatus()!=FactionStatus.Combatant || creature.getObservers().isEmpty() || creature.isInCombat())
return;
if(this.getFollowObject() != null){ // Don't search if actor has valid target
CreatureObject addedCreature = null;
src/services/ai/LairActor.java
+1 -1
View File
@@ -122,7 +122,7 @@ public class LairActor {
break;
case 3:
if (bossTemplate!=null && ! bossSpawned){
CreatureObject boss = (CreatureObject)NGECore.getInstance().spawnService.spawnCreature(bossTemplate, lairObject.getPlanet().getName(), 0L, lairObject.getPosition().x + 3, lairObject.getPosition().y, lairObject.getPosition().z, lairObject.getOrientation().w, lairObject.getOrientation().x, lairObject.getOrientation().y,lairObject.getOrientation().z,-1);
//CreatureObject boss = (CreatureObject)NGECore.getInstance().spawnService.spawnCreature(bossTemplate, lairObject.getPlanet().getName(), 0L, lairObject.getPosition().x + 3, lairObject.getPosition().y, lairObject.getPosition().z, lairObject.getOrientation().w, lairObject.getOrientation().x, lairObject.getOrientation().y,lairObject.getOrientation().z,-1);
bossSpawned = true;
}
return;
src/services/ai/states/AttackState.java
+5 -3
View File
@@ -195,14 +195,16 @@ public class AttackState extends AIState {
if (target instanceof CreatureObject){
CreatureObject targetCreature = (CreatureObject) target;
if(targetCreature.getPosture() == 13 || targetCreature.getPosture() == 14 || targetCreature.isInStealth()) {
if(targetCreature.getPosture() == 13 || targetCreature.getPosture() == 14 || targetCreature.isCloaked()) {
actor.setFollowObject(actor.getHighestDamageDealer());
target = (CreatureObject) actor.getFollowObject();
if(target == null)
{
creature.setLookAtTarget(0);
creature.setIntendedTarget(0);
if (creature.getLookAtTarget() != 0) {
creature.setLookAtTarget(0);
creature.setIntendedTarget(0);
}
}
actor.setFollowObject(null);
src/services/ai/states/TurretAttackState.java
+1 -1
View File
@@ -139,7 +139,7 @@ public class TurretAttackState extends TurretAIState {
if (target instanceof CreatureObject){
CreatureObject targetCreature = (CreatureObject) target;
if(targetCreature.getPosture() == 13 || targetCreature.getPosture() == 14 || targetCreature.isInStealth()) {
if(targetCreature.getPosture() == 13 || targetCreature.getPosture() == 14 || targetCreature.isCloaked()) {
actor.setFollowObject(actor.getHighestDamageDealer());
target = (CreatureObject) actor.getFollowObject();
src/services/combat/CombatService.java
+3 -3
View File
@@ -906,11 +906,11 @@ public class CombatService implements INetworkDispatch {
private boolean attemptCombat(CreatureObject attacker, TangibleObject target) {
if (attacker.isInStealth()) {
attacker.setInStealth(false);
if (attacker.isCloaked()) {
attacker.setCloaked(false);
if (attacker.getPlayerObject() != null && attacker.getPlayerObject().getProfession().equals("spy_1a")) {
attacker.setRadarVisible(true);
attacker.setVisibleOnRadar(true);
}
}
src/services/command/CommandService.java
+1 -3
View File
@@ -23,8 +23,6 @@ package services.command;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.nio.ByteOrder;
import java.util.Map;
@@ -36,7 +34,6 @@ import java.util.concurrent.ScheduledExecutorService;
import main.NGECore;
import org.apache.commons.io.FileUtils;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.session.IoSession;
@@ -546,6 +543,7 @@ public class CommandService implements INetworkDispatch {
TangibleObject targetObject = (TangibleObject) target;
// FIXME Attacks will work on allies without this
// if (!targetObject.isAttackableBy(actor)) {
// return false;
// }
src/services/equipment/BonusSetTemplate.java
+3 -2
View File
@@ -29,6 +29,7 @@ import org.python.core.Py;
import org.python.core.PyObject;
import engine.resources.objects.SWGObject;
import resources.equipment.Equipment;
import resources.objects.creature.CreatureObject;
public class BonusSetTemplate
@@ -55,9 +56,9 @@ public class BonusSetTemplate
public int getWornTemplateCount(CreatureObject creature)
{
int wornItems = 0;
for (Long itemId : creature.getEquipmentList().get())
for (Equipment equipment : creature.getEquipmentList().get())
{
SWGObject item = NGECore.getInstance().objectService.getObject(itemId);
SWGObject item = NGECore.getInstance().objectService.getObject(equipment.getObjectId());
if(item == null)
continue;
if(requiredWornItems.contains(item.getTemplate()) || requiredWornItems.contains(item.getStfName())) wornItems++;
src/services/equipment/EquipmentService.java
+3 -2
View File
@@ -39,6 +39,7 @@ import org.python.core.Py;
import org.python.core.PyObject;
import resources.datatables.FactionStatus;
import resources.equipment.Equipment;
import resources.objects.creature.CreatureObject;
import main.NGECore;
import engine.resources.container.Traverser;
@@ -324,9 +325,9 @@ public class EquipmentService implements INetworkDispatch {
int wornArmourPieces = 0, forceProtection = 0;
Map<String, Float> protection = new TreeMap<String, Float>();
for(Long itemId : new ArrayList<Long>(creature.getEquipmentList()))
for(Equipment equipment : new ArrayList<Equipment>(creature.getEquipmentList()))
{
SWGObject item = core.objectService.getObject(itemId);
SWGObject item = core.objectService.getObject(equipment.getObjectId());
if(item == null)
continue;
Map<String, Object> attributes = new TreeMap<String, Object>(item.getAttributes());
src/services/housing/HousingService.java
+2 -2
View File
@@ -897,8 +897,8 @@ public class HousingService implements INetworkDispatch {
// possibly sending the same delta multiple times
if (((CreatureObject) owner).getLookAtTarget() != itemList.get(i).getObjectID());
((CreatureObject)owner).setLookAtTarget(itemList.get(i).getObjectID());
if (((CreatureObject) owner).getTargetId() != itemList.get(i).getObjectID());
((CreatureObject)owner).setTargetId(itemList.get(i).getObjectID());
if (((CreatureObject) owner).getIntendedTarget() != itemList.get(i).getObjectID());
((CreatureObject)owner).setIntendedTarget(itemList.get(i).getObjectID());
if (((CreatureObject) owner).getIntendedTarget() != itemList.get(i).getObjectID());
((CreatureObject)owner).setIntendedTarget(itemList.get(i).getObjectID());
}
src/services/pet/MountService.java
+1 -1
View File
@@ -438,7 +438,7 @@ public class MountService implements INetworkDispatch {
return;
}
if (rider.isInStealth()) {
if (rider.isCloaked()) {
rider.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:no_mount_stealth"), DisplayType.Broadcast);
return;
}
src/services/pet/PetService.java
+4 -4
View File
@@ -450,7 +450,7 @@ public class PetService implements INetworkDispatch {
return;
}
if (rider.isInStealth()) {
if (rider.isCloaked()) {
rider.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:no_mount_stealth"), DisplayType.Broadcast);
return;
}
@@ -763,7 +763,7 @@ public class PetService implements INetworkDispatch {
AIActor aiActor = (AIActor) mount.getAttachment("AI");
aiActor.destroyActor();
player.setPet(0L);
owner.setCalledPet(null);
owner.setCalledPet(null);
core.objectService.destroyObject((Long) pcd.getAttachment("companion_RefId"));
pcd.setAttachment("companion_RefId", null);
}
@@ -989,11 +989,11 @@ public class PetService implements INetworkDispatch {
datapad.add(pcd);
if (target.getOption(Options.AGGRESSIVE))
target.removeOption(Options.AGGRESSIVE);
target.setOptions(Options.AGGRESSIVE, false);
target.setAttachment("tamed", 1);
actor.setCalledPet(target);
actor.setCalledPet(target);
target.setFaction(actor.getFaction());
target.setFactionStatus(actor.getFactionStatus());
target.setOwnerId(actor.getObjectID());