BuffRecipient window now updates properly

This commit is contained in:
Waverunner
2013-11-17 13:21:09 -05:00
parent 472933acb0
commit b6921a7dc9
12 changed files with 469 additions and 267 deletions
+11
View File
@@ -22,6 +22,7 @@
package resources.objects;
import java.nio.ByteOrder;
import java.util.Vector;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
@@ -31,6 +32,7 @@ import main.NGECore;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.buffer.SimpleBufferAllocator;
import resources.common.BuffBuilder;
import resources.objects.creature.CreatureObject;
import com.sleepycat.persist.model.NotPersistent;
@@ -67,6 +69,7 @@ public class Buff implements IListObject {
@NotPersistent
private ScheduledFuture<?> removalTask;
private int stacks = 1;
private Vector<BuffBuilder> builtBuffs;
public Buff(String buffName, long ownerId) {
@@ -417,4 +420,12 @@ public class Buff implements IListObject {
this.stacks = stacks;
}
public Vector<BuffBuilder> getBuiltBuffs() {
return builtBuffs;
}
public void setBuiltBuffs(Vector<BuffBuilder> builtBuffs) {
this.builtBuffs = builtBuffs;
}
}
+11 -11
View File
@@ -23,17 +23,17 @@ package resources.objects;
public class BuffItem {
private String skillName;
private int unknown;
private int amount;
private int invested;
private int bonusAmount; // expertise bonus (50%*4 = 200) which would then result in bonusAmount + (maxTimesApplied * affectAmount) = result
public BuffItem() {
}
public BuffItem(String skillName, int unknown, int amount) {
public BuffItem(String skillName, int invested, int amount) {
this.skillName = skillName;
this.unknown = unknown;
this.amount = amount;
this.invested = invested;
this.bonusAmount = amount;
}
public String getSkillName() {
@@ -44,19 +44,19 @@ public class BuffItem {
this.skillName = skillName;
}
public int getUnknown() {
return unknown;
public int getInvested() {
return invested;
}
public void setUnknown(int unknown) {
this.unknown = unknown;
public void setInvested(int invested) {
this.invested = invested;
}
public int getAmount() {
return amount;
return bonusAmount;
}
public void setAmount(int amount) {
this.amount = amount;
this.bonusAmount = amount;
}
}
@@ -101,7 +101,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
// CREO6
private byte combatFlag = 0;
private short level = 1;
private short level = 90;
private int grantedHealth = 0;
private String currentAnimation;
private String moodAnimation;