Merge pull request #668 from Ziggeh/master

Collections - Refactored profession master badges
This commit is contained in:
Waverunner
2014-05-15 23:04:00 -04:00
14 changed files with 62 additions and 155 deletions
@@ -1,12 +0,0 @@
import sys
def setup():
return
def run():
return
def addMasterBadge(core, actor):
if actor.getLevel() == 90:
core.collectionService.addCollection(actor, "new_prof_bountyhunter_master")
return
-12
View File
@@ -1,12 +0,0 @@
import sys
def setup():
return
def run():
return
def addMasterBadge(core, actor):
if actor.getLevel() == 90:
core.collectionService.addCollection(actor, "new_prof_commando_master")
return
@@ -1,12 +0,0 @@
import sys
def setup():
return
def run():
return
def addMasterBadge(core, actor):
if actor.getLevel() == 90:
core.collectionService.addCollection(actor, "new_prof_social_entertainer_master")
return
@@ -1,12 +0,0 @@
import sys
def setup():
return
def run():
return
def addMasterBadge(core, actor):
if actor.getLevel() == 90:
core.collectionService.addCollection(actor, "new_prof_jedi_master")
return
-12
View File
@@ -1,12 +0,0 @@
import sys
def setup():
return
def run():
return
def addMasterBadge(core, actor):
if actor.getLevel() == 90:
core.collectionService.addCollection(actor, "new_prof_medic_master")
return
-12
View File
@@ -1,12 +0,0 @@
import sys
def setup():
return
def run():
return
def addMasterBadge(core, actor):
if actor.getLevel() == 90:
core.collectionService.addCollection(actor, "new_prof_officer_master")
return
-12
View File
@@ -1,12 +0,0 @@
import sys
def setup():
return
def run():
return
def addMasterBadge(core, actor):
if actor.getLevel() == 90:
core.collectionService.addCollection(actor, "new_prof_smuggler_master")
return
-12
View File
@@ -1,12 +0,0 @@
import sys
def setup():
return
def run():
return
def addMasterBadge(core, actor):
if actor.getLevel() == 90:
core.collectionService.addCollection(actor, "new_prof_spy_master")
return
-15
View File
@@ -1,15 +0,0 @@
import sys
def setup():
return
def run():
return
def addMasterBadge(core, actor):
if actor.getLevel() == 90:
core.collectionService.addCollection(actor, "new_prof_crafting_merchant_master")
core.collectionService.addCollection(actor, "new_prof_crafting_artisan_master")
core.collectionService.addCollection(actor, "new_prof_crafting_chef_master")
core.collectionService.addCollection(actor, "new_prof_crafting_tailor_master")
return
-14
View File
@@ -1,14 +0,0 @@
import sys
def setup():
return
def run():
return
def addMasterBadge(core, actor):
if actor.getLevel() == 90:
core.collectionService.addCollection(actor, "new_prof_crafting_merchant_master")
core.collectionService.addCollection(actor, "new_prof_crafting_artisan_master")
core.collectionService.addCollection(actor, "new_prof_crafting_architect_master")
return
-15
View File
@@ -1,15 +0,0 @@
import sys
def setup():
return
def run():
return
def addMasterBadge(core, actor):
if actor.getLevel() == 90:
core.collectionService.addCollection(actor, "new_prof_crafting_merchant_master")
core.collectionService.addCollection(actor, "new_prof_crafting_artisan_master")
core.collectionService.addCollection(actor, "new_prof_crafting_armorsmith_master")
core.collectionService.addCollection(actor, "new_prof_crafting_weaponsmith_master")
return
-14
View File
@@ -1,14 +0,0 @@
import sys
def setup():
return
def run():
return
def addMasterBadge(core, actor):
if actor.getLevel() == 90:
core.collectionService.addCollection(actor, "new_prof_crafting_merchant_master")
core.collectionService.addCollection(actor, "new_prof_crafting_artisan_master")
core.collectionService.addCollection(actor, "new_prof_crafting_droidengineer_master")
return
+60
View File
@@ -0,0 +1,60 @@
import sys
def bounty_hunter_1a(core, actor):
core.collectionService.addCollection(actor, "new_prof_bountyhunter_master")
return
def commando_1a(core, actor):
core.collectionService.addCollection(actor, "new_prof_commando_master")
return
def entertainer_1a(core, actor):
core.collectionService.addCollection(actor, "new_prof_social_entertainer_master")
return
def force_sensitive_1a(core, actor):
core.collectionService.addCollection(actor, "new_prof_jedi_master")
return
def medic_1a(core, actor):
core.collectionService.addCollection(actor, "new_prof_medic_master")
return
def officer_1a(core, actor):
core.collectionService.addCollection(actor, "new_prof_officer_master")
return
def smuggler_1a(core, actor):
core.collectionService.addCollection(actor, "new_prof_officer_master")
return
def spy_1a(core, actor):
core.collectionService.addCollection(actor, "new_prof_spy_master")
return
def trader_0a(core, actor):
core.collectionService.addCollection(actor, "new_prof_crafting_merchant_master")
core.collectionService.addCollection(actor, "new_prof_crafting_artisan_master")
core.collectionService.addCollection(actor, "new_prof_crafting_chef_master")
core.collectionService.addCollection(actor, "new_prof_crafting_tailor_master")
return
def trader_0b(core, actor):
core.collectionService.addCollection(actor, "new_prof_crafting_merchant_master")
core.collectionService.addCollection(actor, "new_prof_crafting_artisan_master")
core.collectionService.addCollection(actor, "new_prof_crafting_architect_master")
return
def trader_0c(core, actor):
core.collectionService.addCollection(actor, "new_prof_crafting_merchant_master")
core.collectionService.addCollection(actor, "new_prof_crafting_artisan_master")
core.collectionService.addCollection(actor, "new_prof_crafting_armorsmith_master")
core.collectionService.addCollection(actor, "new_prof_crafting_weaponsmith_master")
return
def trader_0d(core, actor):
core.collectionService.addCollection(actor, "new_prof_crafting_merchant_master")
core.collectionService.addCollection(actor, "new_prof_crafting_artisan_master")
core.collectionService.addCollection(actor, "new_prof_crafting_droidengineer_master")
return
+2 -1
View File
@@ -873,7 +873,8 @@ public class PlayerService implements INetworkDispatch {
creature.getClient().getSession().write((new ClientMfdStatusUpdateMessage((float) ((level >= 90) ? 90 : (level + 1)), "/GroundHUD.MFDStatus.vsp.role.targetLevel")).serialize());
creature.setLevel((short) level);
core.scriptService.callScript("scripts/collections/", "master_" + player.getProfession(), "addMasterBadge", core, creature);
if (level == 90)
core.scriptService.callScript("scripts/collections/", "profession_master", player.getProfession(), core, creature);
creature.showFlyText(OutOfBand.ProsePackage("@cbt_spam:skill_up"), 2.5f, new RGB(154, 205, 50), 0, true);
creature.playEffectObject("clienteffect/skill_granted.cef", "");