Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/entity
In directory vz-cvs-4.sog:/tmp/cvs-serv28006/src/games/stendhal/server/entity
Modified Files:
GuidedEntity.java RPEntity.java
Log Message:
remove modifier concept for now
Index: GuidedEntity.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/GuidedEntity.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** GuidedEntity.java 19 Nov 2011 14:42:01 -0000 1.41
--- GuidedEntity.java 20 Nov 2011 13:47:17 -0000 1.42
***************
*** 14,23 ****
import games.stendhal.server.core.pathfinder.Node;
import games.stendhal.server.core.pathfinder.Path;
- import games.stendhal.server.entity.modifier.AttributeModifier;
- import games.stendhal.server.entity.modifier.GuidedEntityModifierHandler;
- import games.stendhal.server.entity.modifier.ModifiedAttributeUpdater;
import java.awt.geom.Rectangle2D;
- import java.util.Date;
import java.util.List;
--- 14,19 ----
***************
*** 27,31 ****
* An entity that has speed/direction and is guided via a Path.
*/
! public abstract class GuidedEntity extends ActiveEntity implements ModifiedAttributeUpdater {
protected double baseSpeed;
--- 23,27 ----
* An entity that has speed/direction and is guided via a Path.
*/
! public abstract class GuidedEntity extends ActiveEntity {
protected double baseSpeed;
***************
*** 35,39 ****
public Registrator pathnotifier = new Registrator();
- private final GuidedEntityModifierHandler modifierHandler;
/**
--- 31,34 ----
***************
*** 43,47 ****
baseSpeed = 0;
guide.guideMe(this);
- modifierHandler = new GuidedEntityModifierHandler(this);
}
--- 38,41 ----
***************
*** 56,60 ****
baseSpeed = 0;
guide.guideMe(this);
- modifierHandler = new GuidedEntityModifierHandler(this);
update();
}
--- 50,53 ----
***************
*** 70,81 ****
*/
public final double getBaseSpeed() {
! return modifierHandler.modifySpeed(this.baseSpeed);
}
- public void addSpeedModifier(Date expire, double modifier) {
- AttributeModifier am = AttributeModifier.createSpeedModifier(expire, modifier);
- modifierHandler.addModifier(am);
- }
-
//
// GuidedEntity
--- 63,69 ----
*/
public final double getBaseSpeed() {
! return this.baseSpeed;
}
//
// GuidedEntity
***************
*** 284,292 ****
clearPath();
}
-
- public void updateModifiedAttributes() {
- //implement here update mechanism if an attribute needs to be transfered in a
- //modified state to the client
- }
}
--- 272,275 ----
Index: RPEntity.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/RPEntity.java,v
retrieving revision 1.369
retrieving revision 1.370
diff -C2 -d -r1.369 -r1.370
*** RPEntity.java 20 Nov 2011 13:22:04 -0000 1.369
--- RPEntity.java 20 Nov 2011 13:47:17 -0000 1.370
***************
*** 15,19 ****
import games.stendhal.common.Constants;
- import games.stendhal.common.EquipActionConsts;
import games.stendhal.common.Level;
import games.stendhal.common.Rand;
--- 15,18 ----
***************
*** 21,25 ****
import games.stendhal.common.grammar.Grammar;
import games.stendhal.common.parser.WordList;
- import games.stendhal.server.actions.equip.DropAction;
import games.stendhal.server.core.engine.GameEvent;
import games.stendhal.server.core.engine.ItemLogger;
--- 20,23 ----
***************
*** 31,35 ****
import games.stendhal.server.core.events.TutorialNotifier;
import games.stendhal.server.entity.creature.Creature;
- import games.stendhal.server.entity.item.CaptureTheFlagFlag;
import games.stendhal.server.entity.item.Corpse;
import games.stendhal.server.entity.item.Item;
--- 29,32 ----
***************
*** 37,43 ****
import games.stendhal.server.entity.item.StackableItem;
import games.stendhal.server.entity.mapstuff.portal.Portal;
- import games.stendhal.server.entity.modifier.AttributeModifier;
- import games.stendhal.server.entity.modifier.ModifiedAttributeUpdater;
- import games.stendhal.server.entity.modifier.RPEntityModifierHandler;
import games.stendhal.server.entity.player.Player;
import games.stendhal.server.entity.slot.EntitySlot;
--- 34,37 ----
***************
*** 47,51 ****
import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
- import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
--- 41,44 ----
***************
*** 58,62 ****
import marauroa.common.game.Definition;
import marauroa.common.game.Definition.Type;
- import marauroa.common.game.RPAction;
import marauroa.common.game.RPClass;
import marauroa.common.game.RPObject;
--- 51,54 ----
***************
*** 67,78 ****
import marauroa.server.game.db.DAORegister;
import org.apache.log4j.Logger;
! public abstract class RPEntity extends GuidedEntity implements ModifiedAttributeUpdater {
- private static final String ATTR_DEF_MODIFIED = "modified_def";
-
- private static final String ATTR_MODIFIED_BASE_HP = "modified_base_hp";
-
private static final float WEAPON_DEF_MULTIPLIER = 4.0f;
--- 59,72 ----
import marauroa.server.game.db.DAORegister;
+ //XXX sjt temp, while i figure out general droppable mechanism
+ import games.stendhal.common.EquipActionConsts;
+ import games.stendhal.server.entity.item.CaptureTheFlagFlag;
+ import games.stendhal.server.actions.equip.DropAction;
+ import marauroa.common.game.RPAction;
+
import org.apache.log4j.Logger;
! public abstract class RPEntity extends GuidedEntity {
private static final float WEAPON_DEF_MULTIPLIER = 4.0f;
***************
*** 120,125 ****
private int base_mana;
-
- private RPEntityModifierHandler modifierHandler;
/**
--- 114,117 ----
***************
*** 210,215 ****
entity.addAttribute("base_hp", Type.SHORT);
- byte flags = (byte)(Definition.PRIVATE|Definition.VOLATILE);
- entity.addAttribute(ATTR_MODIFIED_BASE_HP, Type.INT, flags);
entity.addAttribute("hp", Type.SHORT);
--- 202,205 ----
***************
*** 217,226 ****
entity.addAttribute("atk_xp", Type.INT, Definition.PRIVATE);
entity.addAttribute("def", Type.SHORT, Definition.PRIVATE);
- entity.addAttribute(ATTR_DEF_MODIFIED, Type.SHORT, flags);
entity.addAttribute("def_xp", Type.INT, Definition.PRIVATE);
entity.addAttribute("atk_item", Type.INT,
! flags);
entity.addAttribute("def_item", Type.INT,
! flags);
entity.addAttribute("risk", Type.BYTE, Definition.VOLATILE); // obsolete, do not use
--- 207,215 ----
entity.addAttribute("atk_xp", Type.INT, Definition.PRIVATE);
entity.addAttribute("def", Type.SHORT, Definition.PRIVATE);
entity.addAttribute("def_xp", Type.INT, Definition.PRIVATE);
entity.addAttribute("atk_item", Type.INT,
! (byte) (Definition.PRIVATE | Definition.VOLATILE));
entity.addAttribute("def_item", Type.INT,
! (byte) (Definition.PRIVATE | Definition.VOLATILE));
entity.addAttribute("risk", Type.BYTE, Definition.VOLATILE); // obsolete, do not use
***************
*** 255,259 ****
enemiesThatGiveFightXP = new WeakHashMap<RPEntity, Integer>();
totalDamageReceived = 0;
- modifierHandler = new RPEntityModifierHandler(this);
}
--- 244,247 ----
***************
*** 265,269 ****
enemiesThatGiveFightXP = new WeakHashMap<RPEntity, Integer>();
totalDamageReceived = 0;
- modifierHandler = new RPEntityModifierHandler(this);
}
--- 253,256 ----
***************
*** 698,714 ****
setAtkXP(atk_xp + 1);
}
-
- private void setInitialDef(final int def) {
- this.def = def;
- put("def", def);
- }
public void setDef(final int def) {
! this.setInitialDef(def);
! this.updateModifiedAttributes();
}
public int getDef() {
! return this.modifierHandler.modifyDef(def);
}
--- 685,696 ----
setAtkXP(atk_xp + 1);
}
public void setDef(final int def) {
! this.def = def;
! put("def", def);
}
public int getDef() {
! return def;
}
***************
*** 724,733 ****
// Handle level changes
final int newLevel = Level.getLevel(def_xp);
! final int levels = newLevel - (def - 10);
// In case we level up several levels at a single time.
for (int i = 0; i < Math.abs(levels); i++) {
! setInitialDef(this.def + (int) Math.signum(levels) * 1);
! new GameEvent(getName(), "def", Integer.toString(this.def)).raise();
}
}
--- 706,715 ----
// Handle level changes
final int newLevel = Level.getLevel(def_xp);
! final int levels = newLevel - (getDef() - 10);
// In case we level up several levels at a single time.
for (int i = 0; i < Math.abs(levels); i++) {
! setDef(this.def + (int) Math.signum(levels) * 1);
! new GameEvent(getName(), "def", Integer.toString(getDef())).raise();
}
}
***************
*** 762,770 ****
*/
public void setBaseHP(final int newhp) {
- setInitialBaseHP(newhp);
- this.updateModifiedAttributes();
- }
-
- private void setInitialBaseHP(final int newhp) {
this.base_hp = newhp;
try {
--- 744,747 ----
***************
*** 781,804 ****
*/
public int getBaseHP() {
! return this.modifierHandler.modifyHp(base_hp);
! }
!
! /**
! * Add a temporal base hp modifier to the entity
! * @param expire
! * @param modifier
! */
! public void addBaseHpModifier(Date expire, double modifier) {
! this.modifierHandler.addModifier(AttributeModifier.createHpModifier(expire, modifier));
! }
!
! /**
! * Add a temporal def modifier to the entity
! * @param expire
! * @param modifier
! */
!
! public void addDefModifier(Date expire, double modifier) {
! this.modifierHandler.addModifier(AttributeModifier.createDefModifier(expire, modifier));
}
--- 758,762 ----
*/
public int getBaseHP() {
! return base_hp;
}
***************
*** 2715,2732 ****
return null;
}
-
- public void updateModifiedAttributes() {
- //base hp
- updateModifiedBaseHP(getBaseHP());
- //def
- this.put(ATTR_DEF_MODIFIED, getDef());
- super.updateModifiedAttributes();
- }
-
- private void updateModifiedBaseHP(int modifiedValue) {
- this.put(ATTR_MODIFIED_BASE_HP, modifiedValue);
- //on change of the base hp the base hp may fall below the current hp
- this.setHP(Math.min(this.getHP(), this.getBaseHP()));
- }
-
}
--- 2673,2675 ----
|
