Merge pull request #130 from Ziggeh/master

Fixed stackable buffs, Bounty Hunter expertise and the healing potency for LSJ

scripts/commands/combat/bh_dm_1.py

@@ -0,0 +1,8 @@
+import sys
+
+def setup(core, actor, target, command):
+	if actor.getSkillMod('expertise_cooldown_line_dm'):
+		command.setCooldown(command.getCooldown() - (actor.getSkillMod('expertise_cooldown_line_dm').getBase()/10))
+	return
+def run(core, actor, target, commandString):
+	return

scripts/commands/combat/bh_dm_2.py

@@ -0,0 +1,8 @@
+import sys
+
+def setup(core, actor, target, command):
+	if actor.getSkillMod('expertise_cooldown_line_dm'):
+		command.setCooldown(command.getCooldown() - (actor.getSkillMod('expertise_cooldown_line_dm').getBase()/10))
+	return
+def run(core, actor, target, commandString):
+	return

scripts/commands/combat/bh_dm_3.py

@@ -0,0 +1,8 @@
+import sys
+
+def setup(core, actor, target, command):
+	if actor.getSkillMod('expertise_cooldown_line_dm'):
+		command.setCooldown(command.getCooldown() - (actor.getSkillMod('expertise_cooldown_line_dm').getBase()/10))
+	return
+def run(core, actor, target, commandString):
+	return

scripts/commands/combat/bh_dm_4.py

@@ -0,0 +1,8 @@
+import sys
+
+def setup(core, actor, target, command):
+	if actor.getSkillMod('expertise_cooldown_line_dm'):
+		command.setCooldown(command.getCooldown() - (actor.getSkillMod('expertise_cooldown_line_dm').getBase()/10))
+	return
+def run(core, actor, target, commandString):
+	return

scripts/commands/combat/bh_dm_5.py

@@ -0,0 +1,8 @@
+import sys
+
+def setup(core, actor, target, command):
+	if actor.getSkillMod('expertise_cooldown_line_dm'):
+		command.setCooldown(command.getCooldown() - (actor.getSkillMod('expertise_cooldown_line_dm').getBase()/10))
+	return
+def run(core, actor, target, commandString):
+	return

scripts/commands/combat/bh_dm_6.py

@@ -0,0 +1,8 @@
+import sys
+
+def setup(core, actor, target, command):
+	if actor.getSkillMod('expertise_cooldown_line_dm'):
+		command.setCooldown(command.getCooldown() - (actor.getSkillMod('expertise_cooldown_line_dm').getBase()/10))
+	return
+def run(core, actor, target, commandString):
+	return

scripts/commands/combat/bh_dm_7.py

@@ -0,0 +1,8 @@
+import sys
+
+def setup(core, actor, target, command):
+	if actor.getSkillMod('expertise_cooldown_line_dm'):
+		command.setCooldown(command.getCooldown() - (actor.getSkillMod('expertise_cooldown_line_dm').getBase()/10))
+	return
+def run(core, actor, target, commandString):
+	return

scripts/commands/combat/bh_dm_8.py

@@ -0,0 +1,8 @@
+import sys
+
+def setup(core, actor, target, command):
+	if actor.getSkillMod('expertise_cooldown_line_dm'):
+		command.setCooldown(command.getCooldown() - (actor.getSkillMod('expertise_cooldown_line_dm').getBase()/10))
+	return
+def run(core, actor, target, commandString):
+	return

scripts/commands/combat/bh_dm_crit_1.py

@@ -0,0 +1,9 @@
+import sys
+
+def setup(core, actor, target, command):
+	if actor.getSkillMod('expertise_cooldown_line_dm_crit'):
+		command.setCooldown(command.getCooldown() - (actor.getSkillMod('expertise_cooldown_line_dm_crit').getBase()/10))
+	return
+	
+def run(core, actor, target, commandString):
+	return

scripts/commands/combat/bh_dm_crit_2.py

@@ -0,0 +1,9 @@
+import sys
+
+def setup(core, actor, target, command):
+	if actor.getSkillMod('expertise_cooldown_line_dm_crit'):
+		command.setCooldown(command.getCooldown() - (actor.getSkillMod('expertise_cooldown_line_dm_crit').getBase()/10))
+	return
+	
+def run(core, actor, target, commandString):
+	return

scripts/commands/combat/bh_dm_crit_3.py

@@ -0,0 +1,9 @@
+import sys
+
+def setup(core, actor, target, command):
+	if actor.getSkillMod('expertise_cooldown_line_dm_crit'):
+		command.setCooldown(command.getCooldown() - (actor.getSkillMod('expertise_cooldown_line_dm_crit').getBase()/10))
+	return
+
+def run(core, actor, target, commandString):
+	return

scripts/commands/combat/bh_dm_crit_4.py

@@ -0,0 +1,9 @@
+import sys
+
+def setup(core, actor, target, command):
+	if actor.getSkillMod('expertise_cooldown_line_dm_crit'):
+		command.setCooldown(command.getCooldown() - (actor.getSkillMod('expertise_cooldown_line_dm_crit').getBase()/10))
+	return
+
+def run(core, actor, target, commandString):
+	return

scripts/commands/combat/bh_dm_crit_5.py

@@ -0,0 +1,9 @@
+import sys
+
+def setup(core, actor, target, command):
+	if actor.getSkillMod('expertise_cooldown_line_dm_crit'):
+		command.setCooldown(command.getCooldown() - (actor.getSkillMod('expertise_cooldown_line_dm_crit').getBase()/10))
+	return
+
+def run(core, actor, target, commandString):
+	return

scripts/commands/combat/bh_dm_crit_6.py

@@ -0,0 +1,9 @@
+import sys
+
+def setup(core, actor, target, command):
+	if actor.getSkillMod('expertise_cooldown_line_dm_crit'):
+		command.setCooldown(command.getCooldown() - (actor.getSkillMod('expertise_cooldown_line_dm_crit').getBase()/10))
+	return
+
+def run(core, actor, target, commandString):
+	return

scripts/commands/combat/bh_dm_crit_7.py

@@ -0,0 +1,9 @@
+import sys
+
+def setup(core, actor, target, command):
+	if actor.getSkillMod('expertise_cooldown_line_dm_crit'):
+		command.setCooldown(command.getCooldown() - (actor.getSkillMod('expertise_cooldown_line_dm_crit').getBase()/10))
+	return
+
+def run(core, actor, target, commandString):
+	return

scripts/commands/combat/bh_dm_crit_8.py

@@ -0,0 +1,9 @@
+import sys
+
+def setup(core, actor, target, command):
+	if actor.getSkillMod('expertise_cooldown_line_dm_crit'):
+		command.setCooldown(command.getCooldown() - (actor.getSkillMod('expertise_cooldown_line_dm_crit').getBase()/10))
+	return
+
+def run(core, actor, target, commandString):
+	return

scripts/commands/combat/bh_sh_0.py

@@ -0,0 +1,8 @@
+import sys
+
+def setup(core, actor, target, command):
+	if actor.getSkillMod('expertise_cooldown_line_sh'):
+		command.setCooldown(command.getCooldown() - (actor.getSkillMod('expertise_cooldown_line_sh').getBase()/10))
+	return
+def run(core, actor, target, commandString):
+	return

scripts/commands/combat/bh_sh_1.py

@@ -0,0 +1,8 @@
+import sys
+
+def setup(core, actor, target, command):
+	if actor.getSkillMod('expertise_cooldown_line_sh'):
+		command.setCooldown(command.getCooldown() - (actor.getSkillMod('expertise_cooldown_line_sh').getBase()/10))
+	return
+def run(core, actor, target, commandString):
+	return

scripts/commands/combat/bh_sh_2.py

@@ -0,0 +1,8 @@
+import sys
+
+def setup(core, actor, target, command):
+	if actor.getSkillMod('expertise_cooldown_line_sh'):
+		command.setCooldown(command.getCooldown() - (actor.getSkillMod('expertise_cooldown_line_sh').getBase()/10))
+	return
+def run(core, actor, target, commandString):
+	return

scripts/commands/combat/bh_sh_3.py

@@ -0,0 +1,8 @@
+import sys
+
+def setup(core, actor, target, command):
+	if actor.getSkillMod('expertise_cooldown_line_sh'):
+		command.setCooldown(command.getCooldown() - (actor.getSkillMod('expertise_cooldown_line_sh').getBase()/10))
+	return
+def run(core, actor, target, commandString):
+	return

src/services/BuffService.java

@@ -66,7 +66,7 @@ public class BuffService implements INetworkDispatch {
 			//System.out.println("Buff script doesnt exist for: " + buffName);
 			return;
 		}*/
-		
+
 		final Buff buff = new Buff(buffName, creature.getObjectID());
 		if(buff.isGroupBuff()) {
 			addGroupBuff(creature, buffName);
@@ -92,6 +92,8 @@ public class BuffService implements INetworkDispatch {
                         			if(creature.getDotByBuff(otherBuff) != null)	// reset duration when theres a dot stack
                         				creature.getDotByBuff(otherBuff).setStartTime(buff.getStartTime());
                         			
+                        		} else {
+                        			buff.setStacks(buff.getMaxStacks());
                         		}
                         	
                                 if (otherBuff.getRemainingDuration() > buff.getDuration() && otherBuff.getStacks() >= otherBuff.getMaxStacks()) {

src/services/combat/CombatService.java

@@ -887,8 +887,9 @@ public class CombatService implements INetworkDispatch {
 			healPotency += healer.getSkillMod("expertise_healing_line_sm_heal").getBase();
 		if(healer.getSkillMod("expertise_healing_line_sp_heal") != null)
 			healPotency += healer.getSkillMod("expertise_healing_line_sp_heal").getBase();
-		if(healer.getSkillMod("expertise_stance_healing_line_fs_heal") != null)
-			healPotency += healer.getSkillMod("expertise_stance_healing_line_fs_heal").getBase();
+		if(healer.hasBuff("fs_buff_def_1_1"))
+			if(healer.getSkillMod("expertise_stance_healing_line_fs_heal") != null)
+				healPotency += healer.getSkillMod("expertise_stance_healing_line_fs_heal").getBase();
 		if(healPotency > 0)
 			healAmount += ((healAmount * healPotency) / 100);
 		if(target.getSkillMod("expertise_healing_reduction") != null)