mirror of
https://github.com/ProjectSWGCore/NGECore2.git
synced 2026-08-01 02:16:15 -04:00
Merge pull request #229 from ProjectSWGCore/Wave_Entertainer
Merge Wave_Entertainer
This commit is contained in:
Waverunner
@@ -11,8 +11,10 @@ def add(core, actor, buff):
|
||||
if buffWorkshop is None:
|
||||
return
|
||||
|
||||
buff.setDuration(3600) #1 hour
|
||||
|
||||
attached = actor.getAttachment('inspireDuration')
|
||||
|
||||
buff.setDuration(float(actor.getAttachment('inspireDuration') * 60))
|
||||
|
||||
for BuffItem in buffWorkshop:
|
||||
core.skillModService.addSkillMod(actor, BuffItem.getSkillName(), BuffItem.getAffectAmount())
|
||||
|
||||
@@ -22,5 +24,5 @@ def remove(core, actor, buff):
|
||||
for BuffItem in actor.getAttachment('buffWorkshop'):
|
||||
core.skillModService.deductSkillMod(actor, BuffItem.getSkillName(), BuffItem.getAffectAmount())
|
||||
|
||||
actor.setAttachment('buffWorkshop', 'none')
|
||||
actor.setAttachment('buffWorkshop', None)
|
||||
return
|
||||
@@ -0,0 +1,12 @@
|
||||
from java.lang import System
|
||||
import sys
|
||||
|
||||
def modify(core, actor, count):
|
||||
return
|
||||
|
||||
def complete(core, actor, collection):
|
||||
ghost = actor.getSlottedObject('ghost')
|
||||
|
||||
actor.sendSystemMessage('@collection_n:col_entertainer_01_finished', 0)
|
||||
ghost.addAbility('bm_dancing_pet_entertainer')
|
||||
return
|
||||
@@ -6,13 +6,21 @@ def setup():
|
||||
def run(core, actor, target, commandString):
|
||||
|
||||
command = 'ColorLights1'
|
||||
effect = 'entertainer_color_lights_level_1.cef'
|
||||
effect = 'clienteffect/entertainer_color_lights_level_1.cef'
|
||||
rLevel = 4 # minimum level to perform this effect
|
||||
|
||||
if actor.getLevel() < 4:
|
||||
actor.sendSystemMessage('@performance:effect_lack_skill_self', 0)
|
||||
return
|
||||
if commandString == '2':
|
||||
command = 'ColorLights2'
|
||||
effect = 'clienteffect/entertainer_color_lights_level_2.cef'
|
||||
rLevel = 20
|
||||
|
||||
# TODO: Find out levels for other colored light 2 and 3
|
||||
elif commandString == '3':
|
||||
command = 'ColorLights3'
|
||||
effect = 'clienteffect/entertainer_color_lights_level_3.cef'
|
||||
rLevel = 50
|
||||
|
||||
if actor.getLevel() < rLevel:
|
||||
actor.sendSystemMessage('@performance:effect_lack_skill_self')
|
||||
|
||||
if core.entertainmentService.performEffect(actor, command, effect, target) is True:
|
||||
actor.sendSystemMessage('@performance:effect_perform_color_lights', 0)
|
||||
|
||||
@@ -6,13 +6,21 @@ def setup():
|
||||
def run(core, actor, target, commandString):
|
||||
|
||||
command = 'Dazzle1'
|
||||
effect = 'entertainer_dazzle_level_1.cef'
|
||||
effect = 'clienteffect/entertainer_dazzle_level_1.cef'
|
||||
rLevel = 10 # minimum level to perform this effect
|
||||
|
||||
if actor.getLevel() < 10:
|
||||
actor.sendSystemMessage('@performance:effect_lack_skill_self', 0)
|
||||
return
|
||||
if commandString == '2':
|
||||
command = 'Dazzle2'
|
||||
effect = 'clienteffect/entertainer_dazzle_level_2.cef'
|
||||
rLevel = 20
|
||||
|
||||
# TODO: Find out levels for other dazzle 2 and 3
|
||||
elif commandString == '3':
|
||||
command = 'Dazzle3'
|
||||
effect = 'clienteffect/entertainer_dazzle_level_3.cef'
|
||||
rLevel = 30
|
||||
|
||||
if actor.getLevel() < rLevel:
|
||||
actor.sendSystemMessage('@performance:effect_lack_skill_self')
|
||||
|
||||
if core.entertainmentService.performEffect(actor, command, effect, target) is True:
|
||||
actor.sendSystemMessage('@performance:effect_perform_dazzle', 0)
|
||||
|
||||
@@ -6,14 +6,23 @@ def setup():
|
||||
def run(core, actor, target, commandString):
|
||||
|
||||
command = 'Distract1'
|
||||
effect = 'entertainer_distract_level_1.cef'
|
||||
effect = 'clienteffect/entertainer_distract_level_1.cef'
|
||||
rLevel = 18 # minimum level to perform this effect
|
||||
|
||||
if actor.getLevel() < 18:
|
||||
if commandString == '2':
|
||||
command = 'Distract2'
|
||||
effect = 'clienteffect/entertainer_distract_level_2.cef'
|
||||
rLevel = 50
|
||||
|
||||
elif commandString == '3':
|
||||
command = 'Distract3'
|
||||
effect = 'clienteffect/entertainer_distract_level_3.cef'
|
||||
rLevel = 75
|
||||
|
||||
if actor.getLevel() < rLevel:
|
||||
actor.sendSystemMessage('@performance:effect_lack_skill_self')
|
||||
return
|
||||
|
||||
# TODO: Find out levels for other distract 2 and 3
|
||||
|
||||
if core.entertainmentService.performEffect(actor, command, effect, target) is True:
|
||||
actor.sendSystemMessage('@performance:effect_perform_distract', 0)
|
||||
return
|
||||
@@ -6,14 +6,23 @@ def setup():
|
||||
def run(core, actor, target, commandString):
|
||||
|
||||
command = 'FireJets1'
|
||||
effect = 'entertainer_fire_jets_level_1.cef'
|
||||
effect = 'clienteffect/entertainer_fire_jets_level_1.cef'
|
||||
rLevel = 26 # minimum level to perform this effect
|
||||
|
||||
if actor.getLevel() < 26:
|
||||
actor.sendSystemMessage('@performance:effect_lack_skill_self', 0)
|
||||
if commandString == '2':
|
||||
command = 'FireJets2'
|
||||
effect = 'clienteffect/entertainer_fire_jets_level_2.cef'
|
||||
rLevel = 50
|
||||
|
||||
elif commandString == '3':
|
||||
command = 'FireJets3'
|
||||
effect = 'clienteffect/entertainer_fire_jets_level_3.cef'
|
||||
rLevel = 75
|
||||
|
||||
if actor.getLevel() < rLevel:
|
||||
actor.sendSystemMessage('@performance:effect_lack_skill_self')
|
||||
return
|
||||
|
||||
# TODO: Find out levels for other firejets 2 and 3
|
||||
|
||||
|
||||
if core.entertainmentService.performEffect(actor, command, effect, target) is True:
|
||||
actor.sendSystemMessage('@performance:effect_perform_fire_jets', 0)
|
||||
return
|
||||
@@ -7,7 +7,7 @@ def setup():
|
||||
|
||||
def run(core, actor, target, commandString):
|
||||
playerObject = actor.getSlottedObject('ghost')
|
||||
print playerObject.getProfession()
|
||||
|
||||
if not playerObject or playerObject.getProfession() != "entertainer_1a":
|
||||
return
|
||||
|
||||
|
||||
@@ -6,13 +6,21 @@ def setup():
|
||||
def run(core, actor, target, commandString):
|
||||
|
||||
command = 'SmokeBomb1'
|
||||
effect = 'entertainer_smoke_bomb_level_1.cef'
|
||||
effect = 'clienteffect/entertainer_smoke_bomb_level_1.cef'
|
||||
rLevel = 50 # minimum level to perform this effect
|
||||
|
||||
if actor.getLevel() < 50:
|
||||
actor.sendSystemMessage('@performance:effect_lack_skill_self', 0)
|
||||
return
|
||||
if commandString == '2':
|
||||
command = 'SmokeBomb2'
|
||||
effect = 'clienteffect/entertainer_smoke_bomb_level_2.cef'
|
||||
rLevel = 75
|
||||
|
||||
# TODO: Find out levels for other smoke bomb 2 and 3
|
||||
elif commandString == '3':
|
||||
command = 'SmokeBomb3'
|
||||
effect = 'clienteffect/entertainer_smoke_bomb_level_3.cef'
|
||||
rLevel = 90
|
||||
|
||||
if actor.getLevel() < rLevel:
|
||||
actor.sendSystemMessage('@performance:effect_lack_skill_self')
|
||||
|
||||
if core.entertainmentService.performEffect(actor, command, effect, target) is True:
|
||||
actor.sendSystemMessage('@performance:effect_perform_smoke_bomb', 0)
|
||||
|
||||
@@ -8,17 +8,22 @@ def run(core, actor, target, commandString):
|
||||
|
||||
command = 'SpotLight1'
|
||||
effect = 'clienteffect/entertainer_spot_light_level_1.cef'
|
||||
rLevel = 1 # minimum level to perform this effect
|
||||
|
||||
# TODO: Figure out what levels the spotlight effects upgraded at.
|
||||
|
||||
if actor.getLevel() >= 80:
|
||||
command == 'SpotLight3'
|
||||
effect = 'clienteffect/entertainer_spot_light_level_3.cef'
|
||||
|
||||
elif actor.getLevel() >= 40:
|
||||
command == 'SpotLight2'
|
||||
if commandString == '2':
|
||||
command = 'SpotLight2'
|
||||
effect = 'clienteffect/entertainer_spot_light_level_2.cef'
|
||||
|
||||
rLevel = 20
|
||||
|
||||
elif commandString == '3':
|
||||
command = 'SpotLight3'
|
||||
effect = 'clienteffect/entertainer_spot_light_level_3.cef'
|
||||
rLevel = 30
|
||||
|
||||
if actor.getLevel() < rLevel:
|
||||
actor.sendSystemMessage('@performance:effect_lack_skill_self')
|
||||
return
|
||||
|
||||
if core.entertainmentService.performEffect(actor, command, effect, None) is True:
|
||||
actor.sendSystemMessage('@performance:effect_perform_spot_light', 0)
|
||||
return
|
||||
|
||||
@@ -77,7 +77,6 @@ def startDance(core, actor, danceName, visual):
|
||||
#TODO: check costume
|
||||
|
||||
if actor.getPosture() != Posture.Upright:
|
||||
print (' can\t dance because ' + str(actor.getPosture()))
|
||||
actor.sendSystemMessage('@performance:dance_fail', 0)
|
||||
return
|
||||
|
||||
@@ -97,7 +96,7 @@ def startDance(core, actor, danceName, visual):
|
||||
actor.setPosture(0x09);
|
||||
|
||||
playerObject = actor.getSlottedObject('ghost')
|
||||
if playerObject and playerObject.getProfession() == "entertainer_1a":
|
||||
if playerObject and playerObject.getProfession() == "entertainer_1a" and actor.getLevel() != 90:
|
||||
entSvc.startPerformanceExperience(actor)
|
||||
|
||||
dance = entSvc.getDance(visual)
|
||||
|
||||
@@ -6,13 +6,21 @@ def setup():
|
||||
def run(core, actor, target, commandString):
|
||||
|
||||
command = 'Ventriloquism1'
|
||||
effect = 'entertainer_ventriloquism_level_1.cef'
|
||||
effect = 'clienteffect/entertainer_ventriloquism_level_1.cef'
|
||||
rLevel = 58 # minimum level to perform this effect
|
||||
|
||||
if actor.getLevel() < 58:
|
||||
actor.sendSystemMessage('@performance:effect_lack_skill_self', 0)
|
||||
return
|
||||
if commandString == '2':
|
||||
command = 'Ventriloquism2'
|
||||
effect = 'clienteffect/entertainer_ventriloquism_level_2.cef'
|
||||
rLevel = 75
|
||||
|
||||
# TODO: Find out levels for other ventriloquism 2 and 3
|
||||
elif commandString == '3':
|
||||
command = 'Ventriloquism3'
|
||||
effect = 'clienteffect/entertainer_ventriloquism_level_3.cef'
|
||||
rLevel = 90
|
||||
|
||||
if actor.getLevel() < rLevel:
|
||||
actor.sendSystemMessage('@performance:effect_lack_skill_self')
|
||||
|
||||
if core.entertainmentService.performEffect(actor, command, effect, target) is True:
|
||||
actor.sendSystemMessage('@performance:effect_perform_ventriloquism', 0)
|
||||
|
||||
@@ -11,8 +11,8 @@ def addExpertisePoint(core, actor):
|
||||
return
|
||||
|
||||
actor.addSkill('expertise_en_intense_performer_1')
|
||||
core.skillModService.addSkillMod(actor, 'expertise_en_inspire_pulse_duration_increase', 1)
|
||||
addAbilities(core, actor, player)
|
||||
|
||||
return
|
||||
|
||||
def removeExpertisePoint(core, actor):
|
||||
@@ -26,9 +26,8 @@ def removeExpertisePoint(core, actor):
|
||||
return
|
||||
|
||||
actor.removeSkill('expertise_en_intense_performer_1')
|
||||
|
||||
core.skillModService.deductSkillMod(actor, 'expertise_en_inspire_pulse_duration_increase', 1)
|
||||
removeAbilities(core, actor, player)
|
||||
|
||||
return
|
||||
|
||||
# this checks what abilities the player gets by level, need to also call this on level-up
|
||||
|
||||
@@ -11,6 +11,7 @@ def addExpertisePoint(core, actor):
|
||||
return
|
||||
|
||||
actor.addSkill('expertise_en_intense_performer_2')
|
||||
core.skillModService.addSkillMod(actor, 'expertise_en_inspire_pulse_duration_increase', 1)
|
||||
addAbilities(core, actor, player)
|
||||
|
||||
return
|
||||
@@ -26,7 +27,7 @@ def removeExpertisePoint(core, actor):
|
||||
return
|
||||
|
||||
actor.removeSkill('expertise_en_intense_performer_2')
|
||||
|
||||
core.skillModService.deductSkillMod(actor, 'expertise_en_inspire_pulse_duration_increase', 1)
|
||||
removeAbilities(core, actor, player)
|
||||
|
||||
return
|
||||
|
||||
@@ -11,6 +11,7 @@ def addExpertisePoint(core, actor):
|
||||
return
|
||||
|
||||
actor.addSkill('expertise_en_intense_performer_3')
|
||||
core.skillModService.addSkillMod(actor, 'expertise_en_inspire_pulse_duration_increase', 1)
|
||||
addAbilities(core, actor, player)
|
||||
|
||||
return
|
||||
@@ -26,7 +27,7 @@ def removeExpertisePoint(core, actor):
|
||||
return
|
||||
|
||||
actor.removeSkill('expertise_en_intense_performer_3')
|
||||
|
||||
core.skillModService.deductSkillMod(actor, 'expertise_en_inspire_pulse_duration_increase', 1)
|
||||
removeAbilities(core, actor, player)
|
||||
|
||||
return
|
||||
|
||||
@@ -11,6 +11,7 @@ def addExpertisePoint(core, actor):
|
||||
return
|
||||
|
||||
actor.addSkill('expertise_en_intense_performer_4')
|
||||
core.skillModService.addSkillMod(actor, 'expertise_en_inspire_pulse_duration_increase', 1)
|
||||
addAbilities(core, actor, player)
|
||||
|
||||
return
|
||||
@@ -26,7 +27,7 @@ def removeExpertisePoint(core, actor):
|
||||
return
|
||||
|
||||
actor.removeSkill('expertise_en_intense_performer_4')
|
||||
|
||||
core.skillModService.deductSkillMod(actor, 'expertise_en_inspire_pulse_duration_increase', 1)
|
||||
removeAbilities(core, actor, player)
|
||||
|
||||
return
|
||||
|
||||
@@ -11,6 +11,7 @@ def addExpertisePoint(core, actor):
|
||||
return
|
||||
|
||||
actor.addSkill('expertise_en_lasting_impression_1')
|
||||
core.skillModService.addSkillMod(actor, 'expertise_en_inspire_buff_duration_increase', 30)
|
||||
addAbilities(core, actor, player)
|
||||
|
||||
return
|
||||
@@ -26,7 +27,7 @@ def removeExpertisePoint(core, actor):
|
||||
return
|
||||
|
||||
actor.removeSkill('expertise_en_lasting_impression_1')
|
||||
|
||||
core.skillModService.deductSkillMod(actor, 'expertise_en_inspire_buff_duration_increase', 30)
|
||||
removeAbilities(core, actor, player)
|
||||
|
||||
return
|
||||
|
||||
@@ -11,6 +11,7 @@ def addExpertisePoint(core, actor):
|
||||
return
|
||||
|
||||
actor.addSkill('expertise_en_lasting_impression_2')
|
||||
core.skillModService.addSkillMod(actor, 'expertise_en_inspire_buff_duration_increase', 30)
|
||||
addAbilities(core, actor, player)
|
||||
|
||||
return
|
||||
@@ -26,7 +27,7 @@ def removeExpertisePoint(core, actor):
|
||||
return
|
||||
|
||||
actor.removeSkill('expertise_en_lasting_impression_2')
|
||||
|
||||
core.skillModService.deductSkillMod(actor, 'expertise_en_inspire_buff_duration_increase', 30)
|
||||
removeAbilities(core, actor, player)
|
||||
|
||||
return
|
||||
|
||||
@@ -11,6 +11,7 @@ def addExpertisePoint(core, actor):
|
||||
return
|
||||
|
||||
actor.addSkill('expertise_en_lasting_impression_3')
|
||||
core.skillModService.addSkillMod(actor, 'expertise_en_inspire_buff_duration_increase', 30)
|
||||
addAbilities(core, actor, player)
|
||||
|
||||
return
|
||||
@@ -26,7 +27,7 @@ def removeExpertisePoint(core, actor):
|
||||
return
|
||||
|
||||
actor.removeSkill('expertise_en_lasting_impression_3')
|
||||
|
||||
core.skillModService.deductSkillMod(actor, 'expertise_en_inspire_buff_duration_increase', 30)
|
||||
removeAbilities(core, actor, player)
|
||||
|
||||
return
|
||||
|
||||
@@ -11,6 +11,7 @@ def addExpertisePoint(core, actor):
|
||||
return
|
||||
|
||||
actor.addSkill('expertise_en_lasting_impression_4')
|
||||
core.skillModService.addSkillMod(actor, 'expertise_en_inspire_buff_duration_increase', 30)
|
||||
addAbilities(core, actor, player)
|
||||
|
||||
return
|
||||
@@ -26,7 +27,7 @@ def removeExpertisePoint(core, actor):
|
||||
return
|
||||
|
||||
actor.removeSkill('expertise_en_lasting_impression_4')
|
||||
|
||||
core.skillModService.deductSkillMod(actor, 'expertise_en_inspire_buff_duration_increase', 30)
|
||||
removeAbilities(core, actor, player)
|
||||
|
||||
return
|
||||
|
||||
@@ -4,11 +4,16 @@ import sys
|
||||
|
||||
def createRadial(core, owner, target, radials):
|
||||
if target.getPosture() == Posture.SkillAnimating:
|
||||
if target.getPerformanceType() is True:
|
||||
radials.add(RadialOptions(0, 140, 1, 'Watch'))
|
||||
if owner.getPerformanceWatchee() == target:
|
||||
if target.getPerformanceType() is True:
|
||||
radials.add(RadialOptions(0, 141, 3, 'Stop Watching'))
|
||||
elif owner.getPerformanceListenee() == target: # TODO: Get rid of PerformanceWatchee variable, no need for listenee (same thing really)
|
||||
radials.add(RadialOptions(0, 141, 3, 'Stop Listening'))
|
||||
else:
|
||||
radials.add(RadialOptions(0, 140, 1, 'Listen'))
|
||||
|
||||
if target.getPerformanceType() is True:
|
||||
radials.add(RadialOptions(0, 140, 3, 'Watch'))
|
||||
else:
|
||||
radials.add(RadialOptions(0, 140, 3, 'Listen'))
|
||||
return
|
||||
|
||||
def handleSelection(core, owner, target, option):
|
||||
@@ -20,4 +25,8 @@ def handleSelection(core, owner, target, option):
|
||||
# TODO: Insert callCommand /listen
|
||||
return
|
||||
return
|
||||
|
||||
if option == 141:
|
||||
#core.commandService.callCommand(owner, 'stopwatching', target, '') #SWGList error for remove audience in CreatureObject
|
||||
return
|
||||
return
|
||||
@@ -16,10 +16,10 @@ def createRadial(core, owner, target, radials):
|
||||
if targetPlayer is not None and targetPlayer.getSlottedObject('ghost') is not None:
|
||||
if targetPlayer.getObjectID() == owner.getObjectID():
|
||||
return
|
||||
radials.add(RadialOptions(0, 69, 1, '@unity:mnu_propose'))
|
||||
radials.add(RadialOptions(0, 69, 3, '@unity:mnu_propose'))
|
||||
return
|
||||
else:
|
||||
radials.add(RadialOptions(0, 70, 1, '@unity:mnu_divorce'))
|
||||
radials.add(RadialOptions(0, 70, 3, '@unity:mnu_divorce'))
|
||||
return
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user