Merge pull request #8 from ProjectSWGCore/master

pull

accesslevels/cs.txt

@@ -0,0 +1,95 @@
+goto
+findobject
+teleport
+teleportto
+invulnerable
+kill
+setspeed
+planetwarp
+harmfull
+harmless
+object
+searchcorpse
+giveitem
+sethue
+editbank
+editbankaccount
+editappearance
+editstats
+snoop
+wipeitems
+findplayer
+findobject
+findobjectbytemplate
+findcreature
+getgametime
+getplayerid
+getstationname
+grantbadge
+grantbadgearea
+granttitle
+revokebadge
+revoketitle
+gmrevive
+getrank
+setfaction
+settef
+setfactionstanding
+setrank
+killplayer
+teleporttarget
+planetwarptarget
+freezeplayer
+unfreezeplayer
+squelch
+unsquelch
+adjustlotcount
+credits
+editappearance
+kick
+maxcombatability
+maxstats
+money
+setfirstname
+setlastname
+setname
+setplayerstate
+uncityban
+setbiographyadmin
+activtequest
+activateinstance
+clearcompletedquest
+completequest
+listactivequests
+listcompletedquests
+grantskill
+revokeskill
+setexperience
+listguildes
+cityinfo
+broadcast
+broadcastarea
+broadcastplanet
+broadcastgalaxy
+addbannedplayer
+emptymailtarget
+getaccountinfo
+removebannedplayer
+createcreature
+createnpc
+createmissionelement
+createspawningelement
+createspawningelementwithdifficulty
+createstaticitem
+getspawndelays
+setmaximumspawntime
+setminimumspawntime
+showspawnregion
+startspawner
+starttargetspawner
+stopspawner
+stoptargetspawner
+clearveteranreward
+hasveteranreward
+setveteranrewardtimecs
+setveteranreward

accesslevels/dev.txt

@@ -0,0 +1,102 @@
+gmforcecommand
+goto
+findobject
+teleport
+teleportto
+invulnerable
+kill
+setspeed
+planetwarp
+harmfull
+harmless
+object
+searchcorpse
+giveitem
+sethue
+editbank
+editbankaccount
+editappearance
+editstats
+snoop
+wipeitems
+findplayer
+findobject
+findobjectbytemplate
+findcreature
+getgametime
+getplayerid
+getstationname
+gmrevive
+getrank
+setfaction
+settef
+setfactionstanding
+setrank
+killplayer
+teleporttarget
+planetwarptarget
+adjustlotcount
+editappearance
+kick
+maxcombatability
+maxstats
+setfirstname
+setlastname
+setname
+setplayerstate
+activtequest
+activateinstance
+clearcompletedquest
+completequest
+listactivequests
+listcompletedquests
+grantskill
+revokeskill
+setexperience
+listguildes
+cityinfo
+createcreature
+createnpc
+createmissionelement
+createspawningelement
+createspawningelementwithdifficulty
+createstaticitem
+getspawndelays
+setmaximumspawntime
+setminimumspawntime
+showspawnregion
+startspawner
+starttargetspawner
+stopspawner
+stoptargetspawner
+clearveteranreward
+hasveteranreward
+setveteranrewardtimecs
+setveteranreward
+aiignore
+combat
+craft
+forcecommand
+generatecrafteditem
+getobjvars
+gmcreateclassresource
+gmcreatespecificresource
+manufacture
+showfactioninformation
+qatool
+startrestussstagetwo
+completerestusstageone
+spewcommandqueue
+combatdatarecord
+combatdataclear
+combatdatareport
+combatdatastop
+combatmodecheck
+database
+destroy
+dumptargetinformation
+dumpzoneinformation
+initializecomponent
+script
+lag
+csdumptarget

accesslevels/ec.txt

@@ -0,0 +1,98 @@
+goto
+findobject
+teleport
+teleportto
+invulnerable
+kill
+setspeed
+planetwarp
+harmfull
+harmless
+object
+searchcorpse
+giveitem
+sethue
+findplayer
+findobject
+findobjectbytemplate
+findcreature
+getgametime
+getplayerid
+getstationname
+grantbadge
+grantbadgearea
+granttitle
+revokebadge
+revoketitle
+gmrevive
+getrank
+setfaction
+settef
+setfactionstanding
+setrank
+killplayer
+teleporttarget
+planetwarptarget
+freezeplayer
+unfreezeplayer
+squelch
+unsquelch
+adjustlotcount
+credits
+editappearance
+kick
+maxcombatability
+maxstats
+money
+setfirstname
+setlastname
+setname
+setplayerstate
+activtequest
+activateinstance
+clearcompletedquest
+completequest
+listactivequests
+listcompletedquests
+grantskill
+revokeskill
+setexperience
+broadcast
+broadcastarea
+broadcastplanet
+broadcastgalaxy
+createcreature
+createnpc
+createmissionelement
+createspawningelement
+createspawningelementwithdifficulty
+createstaticitem
+getspawndelays
+setmaximumspawntime
+setminimumspawntime
+showspawnregion
+startspawner
+starttargetspawner
+stopspawner
+stoptargetspawner
+eventbuff
+eventbuffarea
+eventbufftarget
+eventclearstates
+eventdamage
+eventmovetome
+eventstorepet
+eventtefarea
+eventtefclear
+eventteftarget
+eventundomovetome
+eventvaderchoke
+eventweapon
+setplayerappearance
+revokeplayerappearance
+csstorytellerdestroynpcs
+csstorytellerdestroyprops
+csstorytellerdestroyparticles
+csstorytellerdestroyallobjects
+startrestussstagetwo
+completerestusstageone

accesslevels/lead.txt

@@ -0,0 +1,163 @@
+gmforcecommand
+goto
+findobject
+teleport
+teleportto
+invulnerable
+kill
+setspeed
+planetwarp
+harmfull
+harmless
+object
+searchcorpse
+giveitem
+sethue
+editbank
+editbankaccount
+editappearance
+editstats
+snoop
+wipeitems
+findplayer
+findobject
+findobjectbytemplate
+findcreature
+getgametime
+getplayerid
+getstationname
+grantbadge
+grantbadgearea
+granttitle
+revokebadge
+revoketitle
+gmrevive
+getrank
+setfaction
+settef
+setfactionstanding
+setrank
+killplayer
+teleporttarget
+planetwarptarget
+freezeplayer
+unfreezeplayer
+squelch
+unsquelch
+adjustlotcount
+credits
+editappearance
+kick
+maxcombatability
+maxstats
+money
+setfirstname
+setlastname
+setname
+setplayerstate
+uncityban
+setbiographyadmin
+activtequest
+activateinstance
+clearcompletedquest
+completequest
+listactivequests
+listcompletedquests
+grantskill
+revokeskill
+setexperience
+listguildes
+cityinfo
+broadcast
+broadcastarea
+broadcastplanet
+broadcastgalaxy
+addbannedplayer
+emptymailtarget
+getaccountinfo
+removebannedplayer
+createcreature
+createnpc
+createmissionelement
+createspawningelement
+createspawningelementwithdifficulty
+createstaticitem
+getspawndelays
+setmaximumspawntime
+setminimumspawntime
+showspawnregion
+startspawner
+starttargetspawner
+stopspawner
+stoptargetspawner
+clearveteranreward
+hasveteranreward
+setveteranrewardtimecs
+setveteranreward
+aiignore
+combat
+craft
+forcecommand
+generatecrafteditem
+getobjvars
+gmcreateclassresource
+gmcreatespecificresource
+manufacture
+showfactioninformation
+qatool
+startrestussstagetwo
+completerestusstageone
+spewcommandqueue
+combatdatarecord
+combatdataclear
+combatdatareport
+combatdatastop
+combatmodecheck
+database
+destroy
+dumptargetinformation
+dumpzoneinformation
+initializecomponent
+script
+lag
+csdumptarget
+eventbuff
+eventbuffarea
+eventbufftarget
+eventclearstates
+eventdamage
+eventmovetome
+eventstorepet
+eventtefarea
+eventtefclear
+eventteftarget
+eventundomovetome
+eventvaderchoke
+eventweapon
+setplayerappearance
+revokeplayerappearance
+csstorytellerdestroynpcs
+csstorytellerdestroyprops
+csstorytellerdestroyparticles
+csstorytellerdestroyallobjects
+startrestussstagetwo
+completerestusstageone
+setgodmode
+server
+addallowedplayer
+removeallowedplayer
+setlogintitle
+setloginmessage
+setplanetlimit
+resendloginmessagetoall
+gmforcerank
+gmfsvillage
+gmjedistate
+grantpadawantrialseligibility
+overridepadawantrialseligibility
+resetjedi
+setwardenloginmessage
+findwarden
+activatequest
+grantwarden
+revokewarden

accesslevels/qa.txt

@@ -0,0 +1,82 @@
+goto
+findobject
+teleport
+teleportto
+invulnerable
+kill
+setspeed
+planetwarp
+harmfull
+harmless
+object
+searchcorpse
+giveitem
+sethue
+findplayer
+findobject
+findobjectbytemplate
+findcreature
+getgametime
+getplayerid
+getstationname
+gmrevive
+getrank
+setfaction
+settef
+setfactionstanding
+setrank
+killplayer
+teleporttarget
+planetwarptarget
+setfirstname
+setlastname
+setname
+setplayerstate
+activatequest
+activateinstance
+clearcompletedquest
+completequest
+listactivequests
+listcompletedquests
+grantskill
+revokeskill
+setexperience
+listguildes
+cityinfo
+createcreature
+createnpc
+createmissionelement
+createspawningelement
+createspawningelementwithdifficulty
+createstaticitem
+getspawndelays
+setmaximumspawntime
+setminimumspawntime
+showspawnregion
+startspawner
+starttargetspawner
+stopspawner
+stoptargetspawner
+aiignore
+combat
+craft
+forcecommand
+generatecrafteditem
+getobjvars
+gmcreateclassresource
+gmcreatespecificresource
+manufacture
+showfactioninformation
+qatool
+startrestussstagetwo
+completerestusstageone
+spewcommandqueue
+combatdatarecord
+combatdataclear
+combatdatareport
+combatdatastop
+combatmodecheck
+dumptargetinformation
+dumpzoneinformation
+csdumptarget
+destroy

accesslevels/staff.txt

@@ -0,0 +1,12 @@
+gmforcecommand
+goto
+findobject
+teleport
+teleportto
+invulnerable
+kill
+gmrevive
+setspeed
+planetwarp
+harmfull
+harmless

options.cfg

@@ -1,7 +1,31 @@
+# Toggles the loading of /clientdata/snapshot.
+# 1 = Enabled, 0 = Disabled.
 LOAD.SNAPSHOT_OBJECTS=1
+
+# Toggles the loading of /clientdata/buildouts.
+# 1 = Enabled, 0 = Disabled.
 LOAD.BUILDOUT_OBJECTS=0
+
+# Toggles the loading of /clinetdata/buildouts for a paticular terrain.
+# Specify the terrain. This line should be commented out to be disabled.
 #LOAD.BUILDOUT_ONLY_FOR="dathomir"
+
+# Toggles Loading Old/Creating new/Spawning New Resources.
+# 1 = On, 0 = Off.
 LOAD.RESOURCE.SYSTEM=1
 
-# Misc
+# Toggles full wipe of Object Database (Characters, Items, etc.)
+# 1 = Enabled, 0 = Disabled.
 CLEAN.ODB.FOLDERS=0
+
+# Toggles wipe of characters in Datatable
+# 1 = Enabled, 0 = Disabled
+CLEAN.CHARACTERS.TABLE=0
+
+# Toggles Isolation System Spawning at Tatooine 0 0 0 around no NPC's.
+# 1 = On, 0 = Off.
+DO.ISOLATION.TESTS=0
+
+# Toggles GCW Invasions System.
+# 1 = On, 0 = Off.
+ENABLE.INVASIONS=0

scripts/buffs/banner_buff_bounty_hunter.py

@@ -0,0 +1,14 @@
+import sys
+
+def setup(core, actor, buff):
+	
+	return
+
+def add(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'expertise_critical_niche_all', 5)
+	return
+	
+def remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'expertise_critical_niche_all', 5)
+	return
+	

scripts/buffs/banner_buff_commando.py

@@ -0,0 +1,14 @@
+import sys
+
+def setup(core, actor, buff):
+	
+	return
+
+def add(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'proc_buff', 1)
+	return
+	
+def remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'proc_buff', 1)
+	return
+	

scripts/buffs/banner_buff_entertainer.py

@@ -0,0 +1,14 @@
+import sys
+
+def setup(core, actor, buff):
+	
+	return
+
+def add(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'expertise_dodge', 2)
+	return
+	
+def remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'expertise_dodge', 2)
+	return
+	

scripts/buffs/banner_buff_force_sensitive.py

@@ -0,0 +1,14 @@
+import sys
+
+def setup(core, actor, buff):
+	
+	return
+
+def add(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'strength_modified', 100)
+	return
+	
+def remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'strength_modified', 100)
+	return
+	

scripts/buffs/banner_buff_medic.py

@@ -0,0 +1,14 @@
+import sys
+
+def setup(core, actor, buff):
+	
+	return
+
+def add(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'constitution_modified', 100)
+	return
+	
+def remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'constitution_modified', 100)
+	return
+	

scripts/buffs/banner_buff_officer.py

@@ -0,0 +1,14 @@
+import sys
+
+def setup(core, actor, buff):
+	
+	return
+
+def add(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'precision_modified', 100)
+	return
+	
+def remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'precision_modified', 100)
+	return
+	

scripts/buffs/banner_buff_smuggler.py

@@ -0,0 +1,14 @@
+import sys
+
+def setup(core, actor, buff):
+	
+	return
+
+def add(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'luck_modified', 100)
+	return
+	
+def remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'luck_modified', 100)
+	return
+	

scripts/buffs/banner_buff_spy.py

@@ -0,0 +1,14 @@
+import sys
+
+def setup(core, actor, buff):
+	
+	return
+
+def add(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'agility_modified', 100)
+	return
+	
+def remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'agility_modified', 100)
+	return
+	

scripts/buffs/banner_buff_trader.py

@@ -0,0 +1,14 @@
+import sys
+
+def setup(core, actor, buff):
+	
+	return
+
+def add(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'expertise_glancing_blow_all', 100)
+	return
+	
+def remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'expertise_glancing_blow_all', 100)
+	return
+	

scripts/buffs/barricade_defender.py

@@ -0,0 +1,18 @@
+import sys
+
+def setup(core, actor, buff):
+	
+	return
+
+def add(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'expertise_dodge', 35)
+	core.skillModService.addSkillMod(actor, 'display_only_evasion', 5000)
+	core.skillModService.addSkillMod(actor, 'combat_evasion_value', 50)
+	return
+	
+def remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'expertise_dodge', 35)
+	core.skillModService.deductSkillMod(actor, 'display_only_evasion', 5000)
+	core.skillModService.deductSkillMod(actor, 'combat_evasion_value', 50)
+	return
+	

scripts/buffs/gcw_fatigue.py

@@ -0,0 +1,25 @@
+import sys
+from java.lang import Short
+
+def setup(core, actor, buff):
+
+	return
+
+def add(core, actor, buff):
+	
+	#fatigue = actor.getGCWFatigue() + 1
+	#actor.setGCWFatigue(fatigue)
+	return
+	
+def remove(core, actor, buff):
+	#if actor.getGCWFatigue()>0:
+		#fatigue = actor.getGCWFatigue() - 1
+		#actor.setGCWFatigue(fatigue)
+	# Major flaw in Buff system. It does not consider infinite, stackable buffs
+	# The GCW buff gets automatically removed upon each new stack
+	# resulting in +1-1 Fatigue, if the fatigue gets set here.
+	# Only way is to set it, is in the java methods
+	# and then invent a way so that entertainer can heal this
+	
+	return
+	

scripts/buffs/gcw_general_resistance_stack_rebel.py

@@ -0,0 +1,18 @@
+import sys
+
+def setup(core, actor, buff):
+	
+	return
+
+def add(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'expertise_dodge', 35)
+	core.skillModService.addSkillMod(actor, 'display_only_evasion', 5000)
+	core.skillModService.addSkillMod(actor, 'combat_evasion_value', 50)
+	return
+	
+def remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'expertise_dodge', 35)
+	core.skillModService.deductSkillMod(actor, 'display_only_evasion', 5000)
+	core.skillModService.deductSkillMod(actor, 'combat_evasion_value', 50)
+	return
+	

scripts/buffs/tower_defender.py

@@ -0,0 +1,14 @@
+import sys
+
+def setup(core, actor, buff):
+	
+	return
+
+def add(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'expertise_damage_npc', 200)
+	return
+	
+def remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'expertise_damage_npc', -200)
+	return
+	

scripts/character_builder_terminal.py

@@ -142,8 +142,9 @@ def	travelHandler(owner):
 	window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, travelHandlerCallback)
 	window.addListBoxMenuItem('Tatooine, Mos Eisley', 0)
 	window.addListBoxMenuItem('Dantooine, Jedi Ruins', 1)
-	window.addListBoxMenuItem('Blank', 2)
-	window.addListBoxMenuItem('Blank', 3)
+	window.addListBoxMenuItem('Talus, Dearic Starport', 2)
+	window.addListBoxMenuItem('Naboo, Keren Starport', 3)
+	window.addListBoxMenuItem('Tatooine, Bestine Starport', 4)
 	core.suiService.openSUIWindow(window);
 	
 def travelHandlerCallback(owner, window, eventType, returnList):
@@ -158,6 +159,15 @@ def travelHandlerCallback(owner, window, eventType, returnList):
 	if returnList.get(0)=='1':
 		jediRuinsTravel(owner)
 		return
+	if returnList.get(0)=='2':
+		GCWDearicTravel(owner)
+		return
+	if returnList.get(0)=='3':
+		GCWKerenTravel(owner)
+		return
+	if returnList.get(0)=='4':
+		GCWBestineTravel(owner)
+		return
 	return
 	
 	
@@ -307,6 +317,9 @@ def	miscHandler(owner):
 	window.addListBoxMenuItem('Heroism Jewelry Set', 1)	
 	window.addListBoxMenuItem('Belt of Master Bodo Baas', 2)
 	window.addListBoxMenuItem('Starter Equipment Box', 3)
+	window.addListBoxMenuItem('GCW Banners', 4)
+	window.addListBoxMenuItem('Bounty Droids', 5)
+	
 	core.suiService.openSUIWindow(window);
 	
 def miscHandlerCallback(owner, window, eventType, returnList):
@@ -327,6 +340,13 @@ def miscHandlerCallback(owner, window, eventType, returnList):
 	if returnList.get(0)=='3':
 		starterEquipmentBox(owner, inventory)
 		return
+	if returnList.get(0)=='4':
+		GCWBanners(owner, inventory)
+		return
+	if returnList.get(0)=='5':
+		bountyDroids(owner, inventory)
+		return
+		
 	return
 	
 def combatLevel(owner):
@@ -652,6 +672,21 @@ def jediRuinsTravel(owner):
 	core.simulationService.transferToPlanet(owner, core.terrainService.getPlanetByName("dantooine"), position, owner.getOrientation(), None)
 	return
 	
+def GCWDearicTravel(owner):
+	position = Point3D(264, 4, -2950)
+	core.simulationService.transferToPlanet(owner, core.terrainService.getPlanetByName("talus"), position, owner.getOrientation(), None)
+	return	
+	
+def GCWKerenTravel(owner):
+	position = Point3D(1366, 13, 2747)
+	core.simulationService.transferToPlanet(owner, core.terrainService.getPlanetByName("naboo"), position, owner.getOrientation(), None)
+	return
+	
+def GCWBestineTravel(owner):
+	position = Point3D(-1385,12, -3597)
+	core.simulationService.transferToPlanet(owner, core.terrainService.getPlanetByName("tatooine"), position, owner.getOrientation(), None)
+	return
+
 def surveyDevices(owner, inventory):
 	mineralSurveyTool = core.objectService.createObject("object/tangible/survey_tool/shared_survey_tool_mineral.iff", owner.getPlanet())			
 	chemicalSurveyTool = core.objectService.createObject("object/tangible/survey_tool/shared_survey_tool_inorganic.iff", owner.getPlanet())		
@@ -668,4 +703,29 @@ def surveyDevices(owner, inventory):
 	inventory.add(windSurveyTool)
 	inventory.add(solarSurveyTool)
 	return
-	
+	
+def GCWBanners(owner, inventory):
+
+	gcwBanner1 = core.objectService.createObject('object/tangible/gcw/pvp_rank_rewards/shared_rebel_battle_banner.iff', owner.getPlanet())
+	gcwBanner1.setStfFilename('static_item_n')
+	gcwBanner1.setStfName('item_pvp_captain_battle_banner_rebel_reward_04_01')
+	gcwBanner1.setDetailFilename('static_item_d')
+	gcwBanner1.setDetailName('item_pvp_captain_battle_banner_rebel_reward_04_01')
+	inventory.add(gcwBanner1)
+	gcwBanner2 = core.objectService.createObject('object/tangible/gcw/pvp_rank_rewards/shared_imperial_battle_banner.iff', owner.getPlanet())
+	gcwBanner2.setStfFilename('static_item_n')
+	gcwBanner2.setStfName('item_pvp_captain_battle_banner_imperial_reward_04_01')
+	gcwBanner2.setDetailFilename('static_item_d')
+	gcwBanner2.setDetailName('item_pvp_captain_battle_banner_imperial_reward_04_01')
+	inventory.add(gcwBanner2)
+	return
+
+def bountyDroids(owner, inventory):
+	seekers = core.objectService.createObject('object/tangible/mission/shared_mission_bounty_droid_seeker.iff', owner.getPlanet())
+	seekers.setUses(20)
+	inventory.add(seekers)
+	
+	probe = core.objectService.createObject('object/tangible/mission/shared_mission_bounty_droid_probot.iff', owner.getPlanet())
+	probe.setUses(20)
+	inventory.add(probe)
+	return

scripts/commands/activatequest.py

@@ -0,0 +1,13 @@
+import sys
+
+def setup():
+	return
+	
+def run(core, actor, target, commandString):
+	if core.questService.adminActivateQuest(actor, commandString) is False:
+		actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF ActivateQuest: You entered a quest that does not exist or forgot to enter one!', 0)
+		return
+	
+	core.questService.sendQuestWindow(actor, commandString)
+	actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF ActivateQuest: Command completed successfully.', 0)
+	return

scripts/commands/combat/bh_dm_crit_2.py

@@ -1,19 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	if actor.getSkillMod('expertise_cooldown_line_dm_crit'):
-		command.setCooldown(command.getCooldown() - (actor.getSkillModBase('expertise_cooldown_line_dm_crit')/10))
-		
-	if actor.getSkillMod('expertise_damage_line_dm_crit'):
-		command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage()*actor.getSkillModBase('expertise_damage_line_dm_crit'))/100))
-	
-	if actor.getSkillMod('expertise_action_line_dm_crit'):
-		command.setActionCost(command.getActionCost() - ((command.getActionCost()*actor.getSkillModBase('expertise_action_line_dm_crit'))/100))			
-	
-	if actor.getSkillMod('expertise_critical_line_dm_crit'):
-		command.setCriticalChance(command.getCriticalChance + actor.getSkillModBase('expertise_critical_line_dm_crit'))
-		
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/bh_dm_crit_3.py

@@ -1,19 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	if actor.getSkillMod('expertise_cooldown_line_dm_crit'):
-		command.setCooldown(command.getCooldown() - (actor.getSkillModBase('expertise_cooldown_line_dm_crit')/10))
-		
-	if actor.getSkillMod('expertise_damage_line_dm_crit'):
-		command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage()*actor.getSkillModBase('expertise_damage_line_dm_crit'))/100))
-	
-	if actor.getSkillMod('expertise_action_line_dm_crit'):
-		command.setActionCost(command.getActionCost() - ((command.getActionCost()*actor.getSkillModBase('expertise_action_line_dm_crit'))/100))			
-	
-	if actor.getSkillMod('expertise_critical_line_dm_crit'):
-		command.setCriticalChance(command.getCriticalChance() + actor.getSkillModBase('expertise_critical_line_dm_crit'))
-		
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/bh_dm_crit_4.py

@@ -1,19 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	if actor.getSkillMod('expertise_cooldown_line_dm_crit'):
-		command.setCooldown(command.getCooldown() - (actor.getSkillModBase('expertise_cooldown_line_dm_crit')/10))
-		
-	if actor.getSkillMod('expertise_damage_line_dm_crit'):
-		command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage()*actor.getSkillModBase('expertise_damage_line_dm_crit'))/100))
-	
-	if actor.getSkillMod('expertise_action_line_dm_crit'):
-		command.setActionCost(command.getActionCost() - ((command.getActionCost()*actor.getSkillModBase('expertise_action_line_dm_crit'))/100))			
-	
-	if actor.getSkillMod('expertise_critical_line_dm_crit'):
-		command.setCriticalChance(command.getCriticalChance + actor.getSkillModBase('expertise_critical_line_dm_crit'))
-		
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/bh_dm_crit_5.py

@@ -1,19 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	if actor.getSkillMod('expertise_cooldown_line_dm_crit'):
-		command.setCooldown(command.getCooldown() - (actor.getSkillModBase('expertise_cooldown_line_dm_crit')/10))
-		
-	if actor.getSkillMod('expertise_damage_line_dm_crit'):
-		command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage()*actor.getSkillModBase('expertise_damage_line_dm_crit'))/100))
-	
-	if actor.getSkillMod('expertise_action_line_dm_crit'):
-		command.setActionCost(command.getActionCost() - ((command.getActionCost()*actor.getSkillModBase('expertise_action_line_dm_crit'))/100))			
-	
-	if actor.getSkillMod('expertise_critical_line_dm_crit'):
-		command.setCriticalChance(command.getCriticalChance + actor.getSkillModBase('expertise_critical_line_dm_crit'))
-		
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/bh_dm_crit_6.py

@@ -1,19 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	if actor.getSkillMod('expertise_cooldown_line_dm_crit'):
-		command.setCooldown(command.getCooldown() - (actor.getSkillModBase('expertise_cooldown_line_dm_crit')/10))
-		
-	if actor.getSkillMod('expertise_damage_line_dm_crit'):
-		command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage()*actor.getSkillModBase('expertise_damage_line_dm_crit'))/100))
-	
-	if actor.getSkillMod('expertise_action_line_dm_crit'):
-		command.setActionCost(command.getActionCost() - ((command.getActionCost()*actor.getSkillModBase('expertise_action_line_dm_crit'))/100))			
-	
-	if actor.getSkillMod('expertise_critical_line_dm_crit'):
-		command.setCriticalChance(command.getCriticalChance + actor.getSkillModBase('expertise_critical_line_dm_crit'))
-		
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/bh_dm_crit_7.py

@@ -1,19 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	if actor.getSkillMod('expertise_cooldown_line_dm_crit'):
-		command.setCooldown(command.getCooldown() - (actor.getSkillModBase('expertise_cooldown_line_dm_crit')/10))
-		
-	if actor.getSkillMod('expertise_damage_line_dm_crit'):
-		command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage()*actor.getSkillModBase('expertise_damage_line_dm_crit'))/100))
-	
-	if actor.getSkillMod('expertise_action_line_dm_crit'):
-		command.setActionCost(command.getActionCost() - ((command.getActionCost()*actor.getSkillModBase('expertise_action_line_dm_crit'))/100))			
-	
-	if actor.getSkillMod('expertise_critical_line_dm_crit'):
-		command.setCriticalChance(command.getCriticalChance + actor.getSkillModBase('expertise_critical_line_dm_crit'))
-		
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/bh_dm_crit_8.py

@@ -1,19 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	if actor.getSkillMod('expertise_cooldown_line_dm_crit'):
-		command.setCooldown(command.getCooldown() - (actor.getSkillModBase('expertise_cooldown_line_dm_crit')/10))
-		
-	if actor.getSkillMod('expertise_damage_line_dm_crit'):
-		command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage()*actor.getSkillModBase('expertise_damage_line_dm_crit'))/100))
-	
-	if actor.getSkillMod('expertise_action_line_dm_crit'):
-		command.setActionCost(command.getActionCost() - ((command.getActionCost()*actor.getSkillModBase('expertise_action_line_dm_crit'))/100))			
-	
-	if actor.getSkillMod('expertise_critical_line_dm_crit'):
-		command.setCriticalChance(command.getCriticalChance + actor.getSkillModBase('expertise_critical_line_dm_crit'))
-		
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/en_spiral_kick_1.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'en_spiral_kick_snare', actor)
-	return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/en_spiral_kick_2.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'en_spiral_kick_snare', actor)
-	return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/en_spiral_kick_3.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'en_spiral_kick_snare', actor)
-	return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/en_spiral_kick_4.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'en_spiral_kick_snare', actor)
-	return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/en_thrill_1.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'en_debuff_thrill_1', actor)
-	return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/en_thrill_2.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'en_debuff_thrill_1', actor)
-	return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/en_thrill_3.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'en_debuff_thrill_2', actor)
-	return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/en_void_dance_1.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'en_void_dance_buff_1', actor)
-	return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/en_void_dance_2.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'en_void_dance_buff_2', actor)
-	return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/en_void_dance_3.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'en_void_dance_buff_3', actor)
-	return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/fs_ae_dm_cc_2.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-
-	if actor.getSkillMod('expertise_fs_dm_armor_bypass'):
-		command.setBypassArmor(actor.getSkillModBase("expertise_fs_dm_armor_bypass"))
-			
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/fs_ae_dm_cc_3.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-
-	if actor.getSkillMod('expertise_fs_dm_armor_bypass'):
-		command.setBypassArmor(actor.getSkillModBase("expertise_fs_dm_armor_bypass"))
-			
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/fs_ae_dm_cc_4.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-
-	if actor.getSkillMod('expertise_fs_dm_armor_bypass'):
-		command.setBypassArmor(actor.getSkillModBase("expertise_fs_dm_armor_bypass"))
-			
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/fs_ae_dm_cc_5.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-
-	if actor.getSkillMod('expertise_fs_dm_armor_bypass'):
-		command.setBypassArmor(actor.getSkillModBase("expertise_fs_dm_armor_bypass"))
-			
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/fs_ae_dm_cc_6.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-
-	if actor.getSkillMod('expertise_fs_dm_armor_bypass'):
-		command.setBypassArmor(actor.getSkillModBase("expertise_fs_dm_armor_bypass"))
-			
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/fs_dm_2.py

@@ -1,20 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-
-	if actor.getSkillMod('expertise_cooldown_line_fs_dm'):
-		command.setCooldown(command.getCooldown() + (actor.getSkillMod('expertise_cooldown_line_fs_dm').getBase()/10))
-
-	if actor.getSkillMod('expertise_damage_line_fs_dm'):
-		command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100))
-
-	if actor.getSkillMod('expertise_critical_line_fs_dm'):
-		command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase())
-
-	if actor.getSkillMod('expertise_action_line_fs_dm'):
-		command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_dm').getBase())/100))		
-
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/fs_dm_3.py

@@ -1,20 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-
-	if actor.getSkillMod('expertise_cooldown_line_fs_dm'):
-		command.setCooldown(command.getCooldown() + (actor.getSkillMod('expertise_cooldown_line_fs_dm').getBase()/10))
-
-	if actor.getSkillMod('expertise_damage_line_fs_dm'):
-		command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100))
-
-	if actor.getSkillMod('expertise_critical_line_fs_dm'):
-		command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase())
-
-	if actor.getSkillMod('expertise_action_line_fs_dm'):
-		command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_dm').getBase())/100))		
-
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/fs_dm_4.py

@@ -1,20 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-
-	if actor.getSkillMod('expertise_cooldown_line_fs_dm'):
-		command.setCooldown(command.getCooldown() + (actor.getSkillMod('expertise_cooldown_line_fs_dm').getBase()/10))
-
-	if actor.getSkillMod('expertise_damage_line_fs_dm'):
-		command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100))
-
-	if actor.getSkillMod('expertise_critical_line_fs_dm'):
-		command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase())
-
-	if actor.getSkillMod('expertise_action_line_fs_dm'):
-		command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_dm').getBase())/100))		
-
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/fs_dm_5.py

@@ -1,20 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-
-	if actor.getSkillMod('expertise_cooldown_line_fs_dm'):
-		command.setCooldown(command.getCooldown() + (actor.getSkillMod('expertise_cooldown_line_fs_dm').getBase()/10))
-
-	if actor.getSkillMod('expertise_damage_line_fs_dm'):
-		command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100))
-
-	if actor.getSkillMod('expertise_critical_line_fs_dm'):
-		command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase())
-
-	if actor.getSkillMod('expertise_action_line_fs_dm'):
-		command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_dm').getBase())/100))		
-
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/fs_dm_6.py

@@ -1,20 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-
-	if actor.getSkillMod('expertise_cooldown_line_fs_dm'):
-		command.setCooldown(command.getCooldown() + (actor.getSkillMod('expertise_cooldown_line_fs_dm').getBase()/10))
-
-	if actor.getSkillMod('expertise_damage_line_fs_dm'):
-		command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100))
-
-	if actor.getSkillMod('expertise_critical_line_fs_dm'):
-		command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase())
-
-	if actor.getSkillMod('expertise_action_line_fs_dm'):
-		command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_dm').getBase())/100))		
-
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/fs_dm_7.py

@@ -1,20 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-
-	if actor.getSkillMod('expertise_cooldown_line_fs_dm'):
-		command.setCooldown(command.getCooldown() + (actor.getSkillMod('expertise_cooldown_line_fs_dm').getBase()/10))
-
-	if actor.getSkillMod('expertise_damage_line_fs_dm'):
-		command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100))
-
-	if actor.getSkillMod('expertise_critical_line_fs_dm'):
-		command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase())
-
-	if actor.getSkillMod('expertise_action_line_fs_dm'):
-		command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_dm').getBase())/100))		
-
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/fs_dm_cc_crit_1.py

@@ -1,10 +0,0 @@
-import sys
-
-def setup(core, actor, buff):
-	actor.setSpeedMultiplierBase(0.5)
-	return
-	
-def removeBuff(core, actor, buff):
-	actor.setSpeedMultiplierBase(1)
-	return
-	

scripts/commands/combat/fs_drain_1.py

@@ -1,10 +1,6 @@
 import sys
 
 def setup(core, actor, target, command):
-
-	if actor.getSkillMod('expertise_fs_dm_armor_bypass'):
-		command.setBypassArmor(actor.getSkillModBase("expertise_fs_dm_armor_bypass"))
-		
 	return
 	
 def run(core, actor, target, damage):

scripts/commands/combat/fs_drain_2.py

@@ -1,10 +1,6 @@
 import sys
 
 def setup(core, actor, target, command):
-
-	if actor.getSkillMod('expertise_fs_dm_armor_bypass'):
-		command.setBypassArmor(actor.getSkillModBase("expertise_fs_dm_armor_bypass"))
-		
 	return
 	
 def run(core, actor, target, damage):

scripts/commands/combat/fs_drain_3.py

@@ -1,10 +1,6 @@
 import sys
 
 def setup(core, actor, target, command):
-
-	if actor.getSkillMod('expertise_fs_dm_armor_bypass'):
-		command.setBypassArmor(actor.getSkillModBase("expertise_fs_dm_armor_bypass"))
-		
 	return
 	
 def run(core, actor, target, damage):

scripts/commands/combat/fs_drain_4.py

@@ -1,10 +1,6 @@
 import sys
 
 def setup(core, actor, target, command):
-
-	if actor.getSkillMod('expertise_fs_dm_armor_bypass'):
-		command.setBypassArmor(actor.getSkillModBase("expertise_fs_dm_armor_bypass"))
-		
 	return
 	
 def run(core, actor, target, damage):

scripts/commands/combat/fs_drain_5.py

@@ -1,10 +1,6 @@
 import sys
 
 def setup(core, actor, target, command):
-
-	if actor.getSkillMod('expertise_fs_dm_armor_bypass'):
-		command.setBypassArmor(actor.getSkillModBase("expertise_fs_dm_armor_bypass"))
-		
 	return
 	
 def run(core, actor, target, damage):

scripts/commands/combat/fs_flurry_1.py

@@ -1,13 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	if actor.getSkillMod('expertise_damage_line_fs_dm'):
-		command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100))
-
-	if actor.getSkillMod('expertise_critical_line_fs_dm'):
-		command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase())
-
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/fs_flurry_2.py

@@ -1,13 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	if actor.getSkillMod('expertise_damage_line_fs_dm'):
-		command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100))
-
-	if actor.getSkillMod('expertise_critical_line_fs_dm'):
-		command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase())
-
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/fs_flurry_3.py

@@ -1,13 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	if actor.getSkillMod('expertise_damage_line_fs_dm'):
-		command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100))
-
-	if actor.getSkillMod('expertise_critical_line_fs_dm'):
-		command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase())
-
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/fs_flurry_4.py

@@ -1,13 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	if actor.getSkillMod('expertise_damage_line_fs_dm'):
-		command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100))
-
-	if actor.getSkillMod('expertise_critical_line_fs_dm'):
-		command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase())
-
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/fs_flurry_5.py

@@ -1,13 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	if actor.getSkillMod('expertise_damage_line_fs_dm'):
-		command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100))
-
-	if actor.getSkillMod('expertise_critical_line_fs_dm'):
-		command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase())
-
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/fs_flurry_6.py

@@ -1,13 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	if actor.getSkillMod('expertise_damage_line_fs_dm'):
-		command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100))
-
-	if actor.getSkillMod('expertise_critical_line_fs_dm'):
-		command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase())
-
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/fs_flurry_7.py

@@ -1,13 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	if actor.getSkillMod('expertise_damage_line_fs_dm'):
-		command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100))
-
-	if actor.getSkillMod('expertise_critical_line_fs_dm'):
-		command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase())
-
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/fs_maelstrom_1.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-
-	if actor.getSkillMod('expertise_fs_dm_armor_bypass'):
-		command.setBypassArmor(actor.getSkillModBase("expertise_fs_dm_armor_bypass"))
-			
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/fs_maelstrom_2.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-
-	if actor.getSkillMod('expertise_fs_dm_armor_bypass'):
-		command.setBypassArmor(actor.getSkillModBase("expertise_fs_dm_armor_bypass"))
-			
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/fs_maelstrom_3.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-
-	if actor.getSkillMod('expertise_fs_dm_armor_bypass'):
-		command.setBypassArmor(actor.getSkillModBase("expertise_fs_dm_armor_bypass"))
-			
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/fs_maelstrom_4.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-
-	if actor.getSkillMod('expertise_fs_dm_armor_bypass'):
-		command.setBypassArmor(actor.getSkillModBase("expertise_fs_dm_armor_bypass"))
-			
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/fs_maelstrom_5.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-
-	if actor.getSkillMod('expertise_fs_dm_armor_bypass'):
-		command.setBypassArmor(actor.getSkillModBase("expertise_fs_dm_armor_bypass"))
-			
-	return
-	
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/fs_sweep_2.py

@@ -1,18 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-
-	if actor.getSkillMod('expertise_cooldown_line_fs_sweep'):
-		command.setCooldown(command.getCooldown() + (actor.getSkillModBase('expertise_cooldown_line_fs_sweep')/10))
-
-	if actor.getSkillMod('expertise_damage_line_fs_sweep'):
-		command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillModBase('expertise_damage_line_fs_sweep'))/100))
-
-	if actor.getSkillMod('expertise_action_line_fs_sweep'):
-		command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillModBase('expertise_action_line_fs_sweep'))/100))		
-	
-	return
-	
-def run(core, actor, target, commandString):
-	return
-	

scripts/commands/combat/fs_sweep_3.py

@@ -1,18 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-
-	if actor.getSkillMod('expertise_cooldown_line_fs_sweep'):
-		command.setCooldown(command.getCooldown() + (actor.getSkillModBase('expertise_cooldown_line_fs_sweep')/10))
-
-	if actor.getSkillMod('expertise_damage_line_fs_sweep'):
-		command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillModBase('expertise_damage_line_fs_sweep'))/100))
-
-	if actor.getSkillMod('expertise_action_line_fs_sweep'):
-		command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillModBase('expertise_action_line_fs_sweep'))/100))		
-	
-	return
-	
-def run(core, actor, target, commandString):
-	return
-	

scripts/commands/combat/fs_sweep_4.py

@@ -1,18 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-
-	if actor.getSkillMod('expertise_cooldown_line_fs_sweep'):
-		command.setCooldown(command.getCooldown() + (actor.getSkillModBase('expertise_cooldown_line_fs_sweep')/10))
-
-	if actor.getSkillMod('expertise_damage_line_fs_sweep'):
-		command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillModBase('expertise_damage_line_fs_sweep'))/100))
-
-	if actor.getSkillMod('expertise_action_line_fs_sweep'):
-		command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillModBase('expertise_action_line_fs_sweep'))/100))		
-	
-	return
-	
-def run(core, actor, target, commandString):
-	return
-	

scripts/commands/combat/fs_sweep_5.py

@@ -1,18 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-
-	if actor.getSkillMod('expertise_cooldown_line_fs_sweep'):
-		command.setCooldown(command.getCooldown() + (actor.getSkillModBase('expertise_cooldown_line_fs_sweep')/10))
-
-	if actor.getSkillMod('expertise_damage_line_fs_sweep'):
-		command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillModBase('expertise_damage_line_fs_sweep'))/100))
-
-	if actor.getSkillMod('expertise_action_line_fs_sweep'):
-		command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillModBase('expertise_action_line_fs_sweep'))/100))		
-	
-	return
-	
-def run(core, actor, target, commandString):
-	return
-	

scripts/commands/combat/fs_sweep_6.py

@@ -1,18 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-
-	if actor.getSkillMod('expertise_cooldown_line_fs_sweep'):
-		command.setCooldown(command.getCooldown() + (actor.getSkillModBase('expertise_cooldown_line_fs_sweep')/10))
-
-	if actor.getSkillMod('expertise_damage_line_fs_sweep'):
-		command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillModBase('expertise_damage_line_fs_sweep'))/100))
-
-	if actor.getSkillMod('expertise_action_line_fs_sweep'):
-		command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillModBase('expertise_action_line_fs_sweep'))/100))		
-	
-	return
-	
-def run(core, actor, target, commandString):
-	return
-	

scripts/commands/combat/fs_sweep_7.py

@@ -1,18 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-
-	if actor.getSkillMod('expertise_cooldown_line_fs_sweep'):
-		command.setCooldown(command.getCooldown() + (actor.getSkillModBase('expertise_cooldown_line_fs_sweep')/10))
-
-	if actor.getSkillMod('expertise_damage_line_fs_sweep'):
-		command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillModBase('expertise_damage_line_fs_sweep'))/100))
-
-	if actor.getSkillMod('expertise_action_line_fs_sweep'):
-		command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillModBase('expertise_action_line_fs_sweep'))/100))		
-	
-	return
-	
-def run(core, actor, target, commandString):
-	return
-	

scripts/commands/combat/of_cc_melee_2.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'of_cc_melee_2', actor)
-	return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/of_cc_melee_3.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'of_cc_melee_3', actor)
-	return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/of_cc_melee_4.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'of_cc_melee_4', actor)
-	return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/of_cc_melee_5.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'of_cc_melee_5', actor)
-	return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/of_cc_melee_6.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'of_cc_melee_6', actor)
-	return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/of_cc_melee_7.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'of_cc_melee_7', actor)
-	return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/of_deb_def_1.py

@@ -1,15 +0,0 @@
-def setup(core, actor, target, command):
-    core.buffService.addBuffToCreature(target, 'of_deb_def_1', actor)
-    if actor.getSkillMod('expertise_of_adv_paint_debuff'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_1', actor)
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_1', actor)
-    if actor.getSkillMod('expertise_of_adv_paint_expose'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_1', actor)
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_1', actor)
-		return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/of_deb_def_2.py

@@ -1,15 +0,0 @@
-def setup(core, actor, target, command):
-    core.buffService.addBuffToCreature(target, 'of_deb_def_2', actor)
-    if actor.getSkillMod('expertise_of_adv_paint_debuff'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_2', actor)
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_2', actor)
-    if actor.getSkillMod('expertise_of_adv_paint_expose'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_2', actor)
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_2', actor)
-		return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/of_deb_def_3.py

@@ -1,15 +0,0 @@
-def setup(core, actor, target, command):
-    core.buffService.addBuffToCreature(target, 'of_deb_def_3', actor)
-    if actor.getSkillMod('expertise_of_adv_paint_debuff'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_3', actor)
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_3', actor)
-    if actor.getSkillMod('expertise_of_adv_paint_expose'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_3', actor)
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_3', actor)
-		return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/of_deb_def_4.py

@@ -1,15 +0,0 @@
-def setup(core, actor, target, command):
-    core.buffService.addBuffToCreature(target, 'of_deb_def_4', actor)
-    if actor.getSkillMod('expertise_of_adv_paint_debuff'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_4', actor)
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_4', actor)
-    if actor.getSkillMod('expertise_of_adv_paint_expose'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_4', actor)
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_4', actor)
-		return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/of_deb_def_5.py

@@ -1,15 +0,0 @@
-def setup(core, actor, target, command):
-    core.buffService.addBuffToCreature(target, 'of_deb_def_5', actor)
-    if actor.getSkillMod('expertise_of_adv_paint_debuff'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_5', actor)
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_5', actor)
-    if actor.getSkillMod('expertise_of_adv_paint_expose'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_5', actor)
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_5', actor)
-		return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/of_deb_def_6.py

@@ -1,15 +0,0 @@
-def setup(core, actor, target, command):
-    core.buffService.addBuffToCreature(target, 'of_deb_def_6', actor)
-    if actor.getSkillMod('expertise_of_adv_paint_debuff'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_6', actor)
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_6', actor)
-    if actor.getSkillMod('expertise_of_adv_paint_expose'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_6', actor)
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_6', actor)
-		return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/of_deb_def_7.py

@@ -1,15 +0,0 @@
-def setup(core, actor, target, command):
-    core.buffService.addBuffToCreature(target, 'of_deb_def_7', actor)
-    if actor.getSkillMod('expertise_of_adv_paint_debuff'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_7', actor)
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_7', actor)
-    if actor.getSkillMod('expertise_of_adv_paint_expose'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_7', actor)
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_7', actor)
-		return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/of_decapitate_2.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'of_decap_bleed_2', actor)
-	return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/of_decapitate_3.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'of_decap_bleed_3', actor)
-	return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/of_decapitate_4.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'of_decap_bleed_4', actor)
-	return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/of_decapitate_5.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'of_decap_bleed_5', actor)
-	return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/of_decapitate_6.py

@@ -1,11 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'of_decap_bleed_6', actor)
-	return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/of_sh_0.py

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

scripts/commands/combat/of_sh_1.py

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

scripts/commands/combat/of_sh_2.py

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

scripts/commands/combat/of_vortex_2.py

@@ -1,12 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'of_vortex_bleed_2', actor)
-	core.buffService.addBuffToCreature(target, 'of_vortex_root', actor)
-	return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return

scripts/commands/combat/of_vortex_3.py

@@ -1,12 +0,0 @@
-import sys
-
-def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'of_vortex_bleed_3', actor)
-	core.buffService.addBuffToCreature(target, 'of_vortex_root', actor)
-	return
-	
-def preRun(core, actor, target, command):
-	return
-
-def run(core, actor, target, commandString):
-	return