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

Merge pull request #220 from Ziggeh/master

Browse Source 
Fixed some officer buffs and a permanent buff duration issue
This commit is contained in:
Waverunner
2014-03-22 22:20:14 -04:00
parent ca1ff0b98f b6f89c1139
commit d841de2fa0
43 changed files with 86 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/buffs/of_buff_def_1.py
+4
View File
@@ -1,6 +1,10 @@
import sys
def setup(core, actor, buff):
if actor.getSkillMod('expertise_aura_maintain'):
buff.setDuration(-1)
return
return
def add(core, actor, buff):
scripts/buffs/of_charge_1.py
+2
View File
@@ -1,6 +1,8 @@
import sys
def setup(core, actor, buff):
if actor.getSkillMod('expertise_buff_duration_line_of_group_buff'):
buff.setDuration(buff.getDuration() + actor.getSkillModBase('expertise_buff_duration_line_of_group_buff'))
return
def add(core, actor, buff):
scripts/buffs/of_deb_def_1.py
+3
View File
@@ -1,6 +1,9 @@
import sys
def setup(core, actor, buff):
if actor.getSkillMod('expertise_aura_maintain'):
if actor.getSkillModBase('expertise_aura_maintain') > 0:
buff.setDuration(-1)
return
def add(core, actor, buff):
scripts/buffs/of_deb_def_2.py
+3
View File
@@ -1,6 +1,9 @@
import sys
def setup(core, actor, buff):
if actor.getSkillMod('expertise_aura_maintain'):
if actor.getSkillModBase('expertise_aura_maintain') > 0:
buff.setDuration(-1)
return
def add(core, actor, buff):
scripts/buffs/of_deb_def_3.py
+3
View File
@@ -1,6 +1,9 @@
import sys
def setup(core, actor, buff):
if actor.getSkillMod('expertise_aura_maintain'):
if actor.getSkillModBase('expertise_aura_maintain') > 0:
buff.setDuration(-1)
return
def add(core, actor, buff):
scripts/buffs/of_deb_def_4.py
+3
View File
@@ -1,6 +1,9 @@
import sys
def setup(core, actor, buff):
if actor.getSkillMod('expertise_aura_maintain'):
if actor.getSkillModBase('expertise_aura_maintain') > 0:
buff.setDuration(-1)
return
def add(core, actor, buff):
scripts/buffs/of_deb_def_5.py
+3
View File
@@ -1,6 +1,9 @@
import sys
def setup(core, actor, buff):
if actor.getSkillMod('expertise_aura_maintain'):
if actor.getSkillModBase('expertise_aura_maintain') > 0:
buff.setDuration(-1)
return
def add(core, actor, buff):
scripts/buffs/of_deb_def_6.py
+3
View File
@@ -1,6 +1,9 @@
import sys
def setup(core, actor, buff):
if actor.getSkillMod('expertise_aura_maintain'):
if actor.getSkillModBase('expertise_aura_maintain') > 0:
buff.setDuration(-1)
return
def add(core, actor, buff):
scripts/buffs/of_deb_def_7.py
+3
View File
@@ -1,6 +1,9 @@
import sys
def setup(core, actor, buff):
if actor.getSkillMod('expertise_aura_maintain'):
if actor.getSkillModBase('expertise_aura_maintain') > 0:
buff.setDuration(-1)
return
def add(core, actor, buff):
scripts/buffs/of_deb_def_8.py
+3
View File
@@ -1,6 +1,9 @@
import sys
def setup(core, actor, buff):
if actor.getSkillMod('expertise_aura_maintain'):
if actor.getSkillModBase('expertise_aura_maintain') > 0:
buff.setDuration(-1)
return
def add(core, actor, buff):
scripts/buffs/of_drillmaster_1.py
+3
View File
@@ -1,6 +1,9 @@
import sys
def setup(core, actor, buff):
if actor.getSkillMod('expertise_aura_maintain'):
if actor.getSkillModBase('expertise_aura_maintain') > 2:
buff.setDuration(-1)
return
def add(core, actor, buff):
scripts/buffs/of_focus_fire_1.py
+3
View File
@@ -1,6 +1,9 @@
import sys
def setup(core, actor, buff):
if actor.getSkillMod('expertise_aura_maintain'):
if actor.getSkillModBase('expertise_aura_maintain') > 1:
buff.setDuration(-1)
return
def add(core, actor, buff):
scripts/buffs/of_focus_fire_2.py
+3
View File
@@ -1,6 +1,9 @@
import sys
def setup(core, actor, buff):
if actor.getSkillMod('expertise_aura_maintain'):
if actor.getSkillModBase('expertise_aura_maintain') > 1:
buff.setDuration(-1)
return
def add(core, actor, buff):
scripts/buffs/of_focus_fire_3.py
+3
View File
@@ -1,6 +1,9 @@
import sys
def setup(core, actor, buff):
if actor.getSkillMod('expertise_aura_maintain'):
if actor.getSkillModBase('expertise_aura_maintain') > 1:
buff.setDuration(-1)
return
def add(core, actor, buff):
scripts/buffs/of_focus_fire_4.py
+3
View File
@@ -1,6 +1,9 @@
import sys
def setup(core, actor, buff):
if actor.getSkillMod('expertise_aura_maintain'):
if actor.getSkillModBase('expertise_aura_maintain') > 1:
buff.setDuration(-1)
return
def add(core, actor, buff):
scripts/buffs/of_focus_fire_5.py
+3
View File
@@ -1,6 +1,9 @@
import sys
def setup(core, actor, buff):
if actor.getSkillMod('expertise_aura_maintain'):
if actor.getSkillModBase('expertise_aura_maintain') > 1:
buff.setDuration(-1)
return
def add(core, actor, buff):
scripts/buffs/of_focus_fire_6.py
+3
View File
@@ -1,6 +1,9 @@
import sys
def setup(core, actor, buff):
if actor.getSkillMod('expertise_aura_maintain'):
if actor.getSkillModBase('expertise_aura_maintain') > 1:
buff.setDuration(-1)
return
def add(core, actor, buff):
scripts/buffs/of_scatter_1.py
+2
View File
@@ -1,6 +1,8 @@
import sys
def setup(core, actor, buff):
if actor.getSkillMod('expertise_buff_duration_line_of_group_buff'):
buff.setDuration(buff.getDuration() + actor.getSkillModBase('expertise_buff_duration_line_of_group_buff'))
return
def add(core, actor, buff):
scripts/commands/of_buff_def_1.py
+1 -4
View File
@@ -4,9 +4,6 @@ def setup(core, actor, buff):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'of_buff_def_1')
group = core.objectService.getObject(actor.getGroupId())
for creature in group.getMemberList():
core.buffService.addBuffToCreature(creature, 'of_buff_def_1')
core.buffService.addGroupBuff(actor, 'of_buff_def_1')
return
scripts/commands/of_buff_def_2.py
+1 -4
View File
@@ -4,9 +4,6 @@ def setup(core, actor, buff):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'of_buff_def_2')
group = core.objectService.getObject(actor.getGroupId())
for creature in group.getMemberList():
core.buffService.addBuffToCreature(creature, 'of_buff_def_2')
core.buffService.addGroupBuff(actor, 'of_buff_def_2')
return
scripts/commands/of_buff_def_3.py
+1 -4
View File
@@ -4,9 +4,6 @@ def setup(core, actor, buff):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'of_buff_def_3')
group = core.objectService.getObject(actor.getGroupId())
for creature in group.getMemberList():
core.buffService.addBuffToCreature(creature, 'of_buff_def_3')
core.buffService.addGroupBuff(actor, 'of_buff_def_3')
return
scripts/commands/of_buff_def_4.py
+1 -4
View File
@@ -4,9 +4,6 @@ def setup(core, actor, buff):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'of_buff_def_4')
group = core.objectService.getObject(actor.getGroupId())
for creature in group.getMemberList():
core.buffService.addBuffToCreature(creature, 'of_buff_def_4')
core.buffService.addGroupBuff(actor, 'of_buff_def_4')
return
scripts/commands/of_buff_def_5.py
+1 -4
View File
@@ -4,9 +4,6 @@ def setup(core, actor, buff):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'of_buff_def_5')
group = core.objectService.getObject(actor.getGroupId())
for creature in group.getMemberList():
core.buffService.addBuffToCreature(creature, 'of_buff_def_5')
core.buffService.addGroupBuff(actor, 'of_buff_def_5')
return
scripts/commands/of_buff_def_6.py
+1 -4
View File
@@ -4,9 +4,6 @@ def setup(core, actor, buff):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'of_buff_def_6')
group = core.objectService.getObject(actor.getGroupId())
for creature in group.getMemberList():
core.buffService.addBuffToCreature(creature, 'of_buff_def_6')
core.buffService.addGroupBuff(actor, 'of_buff_def_6')
return
scripts/commands/of_buff_def_7.py
+1 -4
View File
@@ -4,9 +4,6 @@ def setup(core, actor, buff):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'of_buff_def_7')
group = core.objectService.getObject(actor.getGroupId())
for creature in group.getMemberList():
core.buffService.addBuffToCreature(creature, 'of_buff_def_7')
core.buffService.addGroupBuff(actor, 'of_buff_def_7')
return
scripts/commands/of_buff_def_8.py
+1 -4
View File
@@ -4,9 +4,6 @@ def setup(core, actor, buff):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'of_buff_def_8')
group = core.objectService.getObject(actor.getGroupId())
for creature in group.getMemberList():
core.buffService.addBuffToCreature(creature, 'of_buff_def_8')
core.buffService.addGroupBuff(actor, 'of_buff_def_8')
return
scripts/commands/of_buff_def_9.py
+1 -4
View File
@@ -4,9 +4,6 @@ def setup(core, actor, buff):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'of_buff_def_9')
group = core.objectService.getObject(actor.getGroupId())
for creature in group.getMemberList():
core.buffService.addBuffToCreature(creature, 'of_buff_def_9')
core.buffService.addGroupBuff(actor, 'of_buff_def_9')
return
scripts/commands/of_charge_1.py
+1 -1
View File
@@ -4,6 +4,6 @@ def setup(core, actor, buff):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'of_charge_1')
core.buffService.addGroupBuff(actor, 'of_charge_1')
return
scripts/commands/of_drillmaster_1.py
+1 -1
View File
@@ -4,6 +4,6 @@ def setup(core, actor, buff):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'of_drillmaster_1')
core.buffService.addGroupBuff(actor, 'of_drillmaster_1')
return
scripts/commands/of_focus_fire_1.py
+1 -6
View File
@@ -4,11 +4,6 @@ def setup(core, actor, buff):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'of_focus_fire_1')
group = core.objectService.getObject(actor.getGroupId())
if group is not None:
for creature in group.getMemberList():
core.buffService.addBuffToCreature(creature, 'of_focus_fire_1')
return
core.buffService.addGroupBuff(actor, 'of_focus_fire_1')
return
scripts/commands/of_focus_fire_2.py
+1 -6
View File
@@ -4,11 +4,6 @@ def setup(core, actor, buff):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'of_focus_fire_2')
group = core.objectService.getObject(actor.getGroupId())
if group is not None:
for creature in group.getMemberList():
core.buffService.addBuffToCreature(creature, 'of_focus_fire_2')
return
core.buffService.addGroupBuff(actor, 'of_focus_fire_2')
return
scripts/commands/of_focus_fire_3.py
+1 -6
View File
@@ -4,11 +4,6 @@ def setup(core, actor, buff):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'of_focus_fire_3')
group = core.objectService.getObject(actor.getGroupId())
if group is not None:
for creature in group.getMemberList():
core.buffService.addBuffToCreature(creature, 'of_focus_fire_3')
return
core.buffService.addGroupBuff(actor, 'of_focus_fire_3')
return
scripts/commands/of_focus_fire_4.py
+3 -2
View File
@@ -4,5 +4,6 @@ def setup(core, actor, buff):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'of_focus_fire_1')
return
core.buffService.addGroupBuff(actor, 'of_focus_fire_4')
return
scripts/commands/of_focus_fire_5.py
+3 -2
View File
@@ -4,5 +4,6 @@ def setup(core, actor, buff):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'of_focus_fire_1')
return
core.buffService.addGroupBuff(actor, 'of_focus_fire_5')
return
scripts/commands/of_focus_fire_6.py
+3 -2
View File
@@ -4,5 +4,6 @@ def setup(core, actor, buff):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'of_focus_fire_1')
return
core.buffService.addGroupBuff(actor, 'of_focus_fire_6')
return
scripts/commands/of_inspiration_1.py
+1 -1
View File
@@ -4,6 +4,6 @@ def setup(core, actor, buff):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'of_inspiration_1')
core.buffService.addGroupBuff(actor, 'of_inspiration_1')
return
scripts/commands/of_inspiration_2.py
+1 -1
View File
@@ -4,6 +4,6 @@ def setup(core, actor, buff):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'of_inspiration_2')
core.buffService.addGroupBuff(actor, 'of_inspiration_2')
return
scripts/commands/of_inspiration_3.py
+1 -1
View File
@@ -4,6 +4,6 @@ def setup(core, actor, buff):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'of_inspiration_3')
core.buffService.addGroupBuff(actor, 'of_inspiration_3')
return
scripts/commands/of_inspiration_4.py
+1 -1
View File
@@ -4,6 +4,6 @@ def setup(core, actor, buff):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'of_inspiration_4')
core.buffService.addGroupBuff(actor, 'of_inspiration_4')
return
scripts/commands/of_inspiration_5.py
+1 -1
View File
@@ -4,6 +4,6 @@ def setup(core, actor, buff):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'of_inspiration_5')
core.buffService.addGroupBuff(actor, 'of_inspiration_5')
return
scripts/commands/of_inspiration_6.py
+1 -1
View File
@@ -4,6 +4,6 @@ def setup(core, actor, buff):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'of_inspiration_6')
core.buffService.addGroupBuff(actor, 'of_inspiration_6')
return
scripts/commands/of_scatter_1.py
+1 -1
View File
@@ -4,6 +4,6 @@ def setup(core, actor, buff):
return
def run(core, actor, target, commandString):
core.buffService.addBuffToCreature(actor, 'of_scatter_1')
core.buffService.addGroupBuff(actor, 'of_scatter_1')
return
src/services/BuffService.java
+3 -4
View File
@@ -97,10 +97,9 @@ public class BuffService implements INetworkDispatch {
} else {
buff.setStacks(buff.getMaxStacks());
}
if (otherBuff.getRemainingDuration() > buff.getDuration() && otherBuff.getStacks() >= otherBuff.getMaxStacks()) {
return null;
}
if (buff.getDuration() != -1.0)
if (otherBuff.getRemainingDuration() > buff.getDuration() && otherBuff.getStacks() >= otherBuff.getMaxStacks())
return null;
}
removeBuffFromCreature(creature, otherBuff);