Rogiel/l2jserver2
1
0
Fork 0
mirror of https://github.com/Rogiel/l2jserver2 synced 2025-12-11 09:42:54 +00:00
Code Releases Activity

Calculator engine improved

Browse Source 
Signed-off-by: Rogiel <rogiel@rogiel.com>
This commit is contained in:
Rogiel Sulzbach
2011-05-31 00:03:04 -03:00
parent ae3007559f
commit 7d4d9114e5
92 changed files with 1368 additions and 1318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/java/com/l2jserver/model/template/ItemTemplate.java
View File

@@ -22,14 +22,16 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.l2jserver.model.id.template.ItemTemplateID;
import com.l2jserver.model.template.calculator.ItemPhysicalDamageActorCalculator;
import com.l2jserver.model.template.calculator.ItemSetActorCalculator;
import com.l2jserver.model.world.Item;
import com.l2jserver.model.world.actor.stat.StatType;
import com.l2jserver.util.jaxb.ItemTemplateIDAdapter;
/**
@@ -74,6 +76,10 @@ public class ItemTemplate extends AbstractTemplate<Item> {
protected StatAttribute physicalDamage;
@XmlElement(name = "magicalDamage")
protected StatAttribute magicalDamage;
@XmlElement(name = "criticalChance")
protected StatAttribute criticalChance;
@XmlElement(name = "physicalAttackSpeed")
protected StatAttribute physicalAttackSpeed;
}
@XmlElement(name = "stats")
@@ -95,7 +101,9 @@ public class ItemTemplate extends AbstractTemplate<Item> {
protected StatSet set;
public static class StatSet {
@XmlAttribute(name = "order")
protected int order;
@XmlValue
protected double value;
/**
@@ -172,33 +180,41 @@ public class ItemTemplate extends AbstractTemplate<Item> {
/**
* @return the physical damage
*/
public ItemPhysicalDamageActorCalculator getPhysicalDamage() {
public ItemSetActorCalculator getPhysicalDamage() {
if (stats == null)
return null;
return new ItemPhysicalDamageActorCalculator(stats.physicalDamage.set);
if (stats.physicalDamage == null)
return null;
return new ItemSetActorCalculator(stats.physicalDamage.set,
StatType.POWER_ATTACK);
}
/**
* @return the magical damage
*/
public StatAttribute getMagicalDamage() {
public ItemSetActorCalculator getMagicalDamage() {
if (stats == null)
return null;
return stats.magicalDamage;
if (stats.magicalDamage == null)
return null;
return new ItemSetActorCalculator(stats.magicalDamage.set,
StatType.MAGIC_ATTACK);
}
/*
* (non-Javadoc)
*
* @see com.l2jserver.model.template.AbstractTemplate#getID()
/**
* @return the magical damage
*/
public ItemSetActorCalculator getCriticalChance() {
if (stats == null)
return null;
if (stats.criticalChance == null)
return null;
return new ItemSetActorCalculator(stats.criticalChance.set,
StatType.CRITICAL_RATE);
}
@Override
public ItemTemplateID getID() {
return id;
}
// @Override
// public ItemTemplateID getID() {
// return (ItemTemplateID) super.getID();
// }
}

23
src/main/java/com/l2jserver/model/template/calculator/ItemPhysicalDamageActorCalculator.java → src/main/java/com/l2jserver/model/template/calculator/ItemSetActorCalculator.java
View File

@@ -19,20 +19,23 @@ package com.l2jserver.model.template.calculator;
import com.l2jserver.model.template.ActorTemplate;
import com.l2jserver.model.template.ItemTemplate.StatAttribute.StatSet;
import com.l2jserver.model.world.Actor;
import com.l2jserver.model.world.actor.calculator.ActorCalculator;
import com.l2jserver.model.world.actor.calculator.ActorCalculatorFunction;
import com.l2jserver.model.world.actor.calculator.ActorFormula;
import com.l2jserver.model.world.actor.stat.StatType;
/**
* @author <a href="http://www.rogiel.com">Rogiel</a>
*
*/
public class ItemPhysicalDamageActorCalculator extends ActorCalculator {
public ItemPhysicalDamageActorCalculator(final StatSet set) {
super(new ActorCalculatorFunction(set.getOrder()) {
@Override
protected double calculate(Actor a, ActorTemplate<?> t, double value) {
return set.getValue();
}
});
public class ItemSetActorCalculator extends ActorFormula {
private final StatSet set;
public ItemSetActorCalculator(StatSet set, StatType type) {
super(set.getOrder(), type);
this.set = set;
}
@Override
protected double calculate(Actor a, ActorTemplate<?> t, double value) {
return set.getValue();
}
}