diff --git a/scripts/collections/master_bounty_hunter_1a.py b/scripts/collections/master_bounty_hunter_1a.py deleted file mode 100644 index c81bc04a..00000000 --- a/scripts/collections/master_bounty_hunter_1a.py +++ /dev/null @@ -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 \ No newline at end of file diff --git a/scripts/collections/master_commando_1a.py b/scripts/collections/master_commando_1a.py deleted file mode 100644 index beb5e848..00000000 --- a/scripts/collections/master_commando_1a.py +++ /dev/null @@ -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 \ No newline at end of file diff --git a/scripts/collections/master_entertainer_1a.py b/scripts/collections/master_entertainer_1a.py deleted file mode 100644 index e2dc3c3c..00000000 --- a/scripts/collections/master_entertainer_1a.py +++ /dev/null @@ -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 \ No newline at end of file diff --git a/scripts/collections/master_force_sensitive_1a.py b/scripts/collections/master_force_sensitive_1a.py deleted file mode 100644 index b2ae17a5..00000000 --- a/scripts/collections/master_force_sensitive_1a.py +++ /dev/null @@ -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 \ No newline at end of file diff --git a/scripts/collections/master_medic_1a.py b/scripts/collections/master_medic_1a.py deleted file mode 100644 index d19ba11b..00000000 --- a/scripts/collections/master_medic_1a.py +++ /dev/null @@ -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 \ No newline at end of file diff --git a/scripts/collections/master_officer_1a.py b/scripts/collections/master_officer_1a.py deleted file mode 100644 index 589869ae..00000000 --- a/scripts/collections/master_officer_1a.py +++ /dev/null @@ -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 \ No newline at end of file diff --git a/scripts/collections/master_smuggler_1a.py b/scripts/collections/master_smuggler_1a.py deleted file mode 100644 index f7d741f1..00000000 --- a/scripts/collections/master_smuggler_1a.py +++ /dev/null @@ -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 \ No newline at end of file diff --git a/scripts/collections/master_spy_1a.py b/scripts/collections/master_spy_1a.py deleted file mode 100644 index 1ff5be54..00000000 --- a/scripts/collections/master_spy_1a.py +++ /dev/null @@ -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 \ No newline at end of file diff --git a/scripts/collections/master_trader_0a.py b/scripts/collections/master_trader_0a.py deleted file mode 100644 index bff48590..00000000 --- a/scripts/collections/master_trader_0a.py +++ /dev/null @@ -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 \ No newline at end of file diff --git a/scripts/collections/master_trader_0b.py b/scripts/collections/master_trader_0b.py deleted file mode 100644 index 55a1c3d3..00000000 --- a/scripts/collections/master_trader_0b.py +++ /dev/null @@ -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 \ No newline at end of file diff --git a/scripts/collections/master_trader_0c.py b/scripts/collections/master_trader_0c.py deleted file mode 100644 index 018141b4..00000000 --- a/scripts/collections/master_trader_0c.py +++ /dev/null @@ -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 \ No newline at end of file diff --git a/scripts/collections/master_trader_0d.py b/scripts/collections/master_trader_0d.py deleted file mode 100644 index a9223ac6..00000000 --- a/scripts/collections/master_trader_0d.py +++ /dev/null @@ -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 \ No newline at end of file diff --git a/scripts/collections/profession_master.py b/scripts/collections/profession_master.py new file mode 100644 index 00000000..dbd6e1e0 --- /dev/null +++ b/scripts/collections/profession_master.py @@ -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 + \ No newline at end of file diff --git a/src/services/PlayerService.java b/src/services/PlayerService.java index d86f5f3e..4eda23aa 100644 --- a/src/services/PlayerService.java +++ b/src/services/PlayerService.java @@ -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", "");