projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-03 18:13:11 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #229 from ProjectSWGCore/Wave_Entertainer

Browse Source 
Merge Wave_Entertainer
This commit is contained in:
Waverunner
2014-03-23 16:06:38 -04:00
parent c0fcda14df 0f390c063b
commit 5b2ce53cb3
35 changed files with 552 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/commands/colorlights.py
+13 -5
View File
@@ -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)
scripts/commands/dazzle.py
+13 -5
View File
@@ -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)
scripts/commands/distract.py
+13 -4
View File
@@ -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
scripts/commands/firejet.py
+15 -6
View File
@@ -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
scripts/commands/inspire.py
+1 -1
View File
@@ -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
scripts/commands/smokebomb.py
+13 -5
View File
@@ -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)
scripts/commands/spotlight.py
+14 -9
View File
@@ -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
scripts/commands/startdance.py
+1 -2
View File
@@ -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)
scripts/commands/ventriloquism.py
+13 -5
View File
@@ -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)