From 5df4b7c2034c58e1bfa3c0b1efe859d8efd88fdb Mon Sep 17 00:00:00 2001 From: Treeku Date: Wed, 19 Mar 2014 18:26:15 +0000 Subject: [PATCH] Made all callScript functions consistent --- scripts/starterclothing.py | 240 ++++++++++++------------- src/services/BuffService.java | 4 +- src/services/CharacterService.java | 2 +- src/services/PlayerService.java | 4 +- src/services/ScriptService.java | 12 +- src/services/SkillService.java | 2 +- src/services/StaticService.java | 2 +- src/services/map/MapService.java | 2 +- src/services/travel/TravelService.java | 2 +- 9 files changed, 135 insertions(+), 135 deletions(-) diff --git a/scripts/starterclothing.py b/scripts/starterclothing.py index f24afeb3..567e1345 100644 --- a/scripts/starterclothing.py +++ b/scripts/starterclothing.py @@ -5,294 +5,294 @@ import sys def CreateStarterClothing(core, object, starterProfession, raceTemplate): if starterProfession == 'outdoors_scout' and raceTemplate == 'object/creature/player/human_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "OutdoorScoutHumanoidMale", "outdoors_scout_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "outdoors_scout_humanoid_male", "OutdoorScoutHumanoidMale", core, object) elif starterProfession == 'outdoors_scout' and raceTemplate == 'object/creature/player/zabrak_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "OutdoorScoutHumanoidMale", "outdoors_scout_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "outdoors_scout_humanoid_male", "OutdoorScoutHumanoidMale", coree, object) elif starterProfession == 'outdoors_scout' and raceTemplate == 'object/creature/player/bothan_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "OutdoorScoutHumanoidMale", "outdoors_scout_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "outdoors_scout_humanoid_male", "OutdoorScoutHumanoidMale", coree, object) elif starterProfession == 'outdoors_scout' and raceTemplate == 'object/creature/player/sullustan_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "OutdoorScoutHumanoidMale", "outdoors_scout_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "outdoors_scout_humanoid_male", "OutdoorScoutHumanoidMale", coree, object) elif starterProfession == 'outdoors_scout' and raceTemplate == 'object/creature/player/twilek_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "OutdoorScoutHumanoidMale", "outdoors_scout_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "outdoors_scout_humanoid_male", "OutdoorScoutHumanoidMale", coree, object) elif starterProfession == 'outdoors_scout' and raceTemplate == 'object/creature/player/moncal_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "OutdoorScoutHumanoidMale", "outdoors_scout_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "outdoors_scout_humanoid_male", "OutdoorScoutHumanoidMale", coree, object) elif starterProfession == 'outdoors_scout' and raceTemplate == 'object/creature/player/rodian_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "OutdoorScoutHumanoidMale", "outdoors_scout_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "outdoors_scout_humanoid_male", "OutdoorScoutHumanoidMale", coree, object) elif starterProfession == 'outdoors_scout' and raceTemplate == 'object/creature/player/human_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "OutdoorScoutHumanoidFemale", "outdoors_scout_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "outdoors_scout_humanoid_female", "OutdoorScoutHumanoidFemale", core, object) elif starterProfession == 'outdoors_scout' and raceTemplate == 'object/creature/player/zabrak_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "OutdoorScoutHumanoidFemale", "outdoors_scout_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "outdoors_scout_humanoid_female", "OutdoorScoutHumanoidFemale", core, object) elif starterProfession == 'outdoors_scout' and raceTemplate == 'object/creature/player/bothan_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "OutdoorScoutHumanoidFemale", "outdoors_scout_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "outdoors_scout_humanoid_female", "OutdoorScoutHumanoidFemale", core, object) elif starterProfession == 'outdoors_scout' and raceTemplate == 'object/creature/player/sullustan_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "OutdoorScoutHumanoidFemale", "outdoors_scout_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "outdoors_scout_humanoid_female", "OutdoorScoutHumanoidFemale", core, object) elif starterProfession == 'outdoors_scout' and raceTemplate == 'object/creature/player/twilek_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "OutdoorScoutHumanoidFemale", "outdoors_scout_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "outdoors_scout_humanoid_female", "OutdoorScoutHumanoidFemale", core, object) elif starterProfession == 'outdoors_scout' and raceTemplate == 'object/creature/player/moncal_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "OutdoorScoutHumanoidFemale", "outdoors_scout_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "outdoors_scout_humanoid_female", "OutdoorScoutHumanoidFemale", core, object) elif starterProfession == 'outdoors_scout' and raceTemplate == 'object/creature/player/rodian_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "OutdoorScoutHumanoidFemale", "outdoors_scout_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "outdoors_scout_humanoid_female", "OutdoorScoutHumanoidFemale", core, object) elif starterProfession == 'outdoors_scout' and raceTemplate == 'object/creature/player/trandoshan_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "OutdoorScoutTrandoshanMale", "outdoors_scout_trandoshan_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "outdoors_scout_trandoshan_male", "OutdoorScoutTrandoshanMale", core, object) elif starterProfession == 'outdoors_scout' and raceTemplate == 'object/creature/player/trandoshan_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "OutdoorScoutTrandoshanFemale", "outdoors_scout_trandoshan_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "outdoors_scout_trandoshan_female", "OutdoorScoutTrandoshanFemale", core, object) elif starterProfession == 'outdoors_scout' and raceTemplate == 'object/creature/player/wookiee_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "OutdoorScoutWookieeMale", "outdoors_scout_wookiee_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "outdoors_scout_wookiee_male", "OutdoorScoutWookieeMale", core, object) elif starterProfession == 'outdoors_scout' and raceTemplate == 'object/creature/player/wookiee_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "OutdoorScoutWookieeFemale", "outdoors_scout_wookiee_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "outdoors_scout_wookiee_female", "OutdoorScoutWookieeFemale", core, object) elif starterProfession == 'outdoors_scout' and raceTemplate == 'object/creature/player/ithorian_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "OutdoorScoutIthorianMale", "outdoors_scout_ithorian_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "outdoors_scout_ithorian_male", "OutdoorScoutIthorianMale", core, object) elif starterProfession == 'outdoors_scout' and raceTemplate == 'object/creature/player/ithorian_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "OutdoorScoutIthorianFemale", "outdoors_scout_ithorian_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "outdoors_scout_ithorian_female", "OutdoorScoutIthorianFemale", core, object) elif starterProfession == 'combat_brawler' and raceTemplate == 'object/creature/player/human_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatBrawlerHumanoidMale", "combat_brawler_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_brawler_humanoid_male", "CombatBrawlerHumanoidMale", core, object) elif starterProfession == 'combat_brawler' and raceTemplate == 'object/creature/player/zabrak_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatBrawlerHumanoidMale", "combat_brawler_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_brawler_humanoid_male", "CombatBrawlerHumanoidMale", core, object) elif starterProfession == 'combat_brawler' and raceTemplate == 'object/creature/player/bothan_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatBrawlerHumanoidMale", "combat_brawler_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_brawler_humanoid_male", "CombatBrawlerHumanoidMale", core, object) elif starterProfession == 'combat_brawler' and raceTemplate == 'object/creature/player/sullustan_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatBrawlerHumanoidMale", "combat_brawler_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_brawler_humanoid_male", "CombatBrawlerHumanoidMale", core, object) elif starterProfession == 'combat_brawler' and raceTemplate == 'object/creature/player/twilek_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatBrawlerHumanoidMale", "combat_brawler_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_brawler_humanoid_male", "CombatBrawlerHumanoidMale", core, object) elif starterProfession == 'combat_brawler' and raceTemplate == 'object/creature/player/moncal_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatBrawlerHumanoidMale", "combat_brawler_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_brawler_humanoid_male", "CombatBrawlerHumanoidMale", core, object) elif starterProfession == 'combat_brawler' and raceTemplate == 'object/creature/player/rodian_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatBrawlerHumanoidMale", "combat_brawler_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_brawler_humanoid_male", "CombatBrawlerHumanoidMale", core, object) elif starterProfession == 'combat_brawler' and raceTemplate == 'object/creature/player/human_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatBrawlerHumanoidFemale", "combat_brawler_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_brawler_humanoid_female", "CombatBrawlerHumanoidFemale", core, object) elif starterProfession == 'combat_brawler' and raceTemplate == 'object/creature/player/zabrak_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatBrawlerHumanoidFemale", "combat_brawler_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_brawler_humanoid_female", "CombatBrawlerHumanoidFemale", core, object) elif starterProfession == 'combat_brawler' and raceTemplate == 'object/creature/player/bothan_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatBrawlerHumanoidFemale", "combat_brawler_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_brawler_humanoid_female", "CombatBrawlerHumanoidFemale", core, object) elif starterProfession == 'combat_brawler' and raceTemplate == 'object/creature/player/sullustan_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatBrawlerHumanoidFemale", "combat_brawler_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_brawler_humanoid_female", "CombatBrawlerHumanoidFemale", core, object) elif starterProfession == 'combat_brawler' and raceTemplate == 'object/creature/player/twilek_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatBrawlerHumanoidFemale", "combat_brawler_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_brawler_humanoid_female", "CombatBrawlerHumanoidFemale", core, object) elif starterProfession == 'combat_brawler' and raceTemplate == 'object/creature/player/moncal_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatBrawlerHumanoidFemale", "combat_brawler_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_brawler_humanoid_female", "CombatBrawlerHumanoidFemale", core, object) elif starterProfession == 'combat_brawler' and raceTemplate == 'object/creature/player/rodian_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatBrawlerHumanoidFemale", "combat_brawler_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_brawler_humanoid_female", "CombatBrawlerHumanoidFemale", core, object) elif starterProfession == 'combat_brawler' and raceTemplate == 'object/creature/player/trandoshan_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatBrawlerTrandoshanMale", "combat_brawler_trandoshan_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_brawler_trandoshan_male", "CombatBrawlerTrandoshanMale", core, object) elif starterProfession == 'combat_brawler' and raceTemplate == 'object/creature/player/trandoshan_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatBrawlerOutdoorScoutTrandoshanFemale", "combat_brawler_trandoshan_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_brawler_trandoshan_female", "CombatBrawlerOutdoorScoutTrandoshanFemale", core, object) elif starterProfession == 'combat_brawler' and raceTemplate == 'object/creature/player/wookiee_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatBrawlerWookieeMale", "combat_brawler_wookiee_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_brawler_wookiee_male", "CombatBrawlerWookieeMale", core, object) elif starterProfession == 'combat_brawler' and raceTemplate == 'object/creature/player/wookiee_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatBrawlerWookieeFemale", "combat_brawler_wookiee_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_brawler_wookiee_female", "CombatBrawlerWookieeFemale", core, object) elif starterProfession == 'combat_brawler' and raceTemplate == 'object/creature/player/ithorian_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatBrawlerIthorianMale", "combat_brawler_ithorian_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_brawler_ithorian_male", "CombatBrawlerIthorianMale", core, object) elif starterProfession == 'combat_brawler' and raceTemplate == 'object/creature/player/ithorian_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatBrawlerIthorianFemale", "combat_brawler_ithorian_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_brawler_ithorian_female", "CombatBrawlerIthorianFemale", core, object) elif starterProfession == 'combat_marksman' and raceTemplate == 'object/creature/player/human_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatMarksmanHumanoidMale", "combat_marksman_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_marksman_humanoid_male", "CombatMarksmanHumanoidMale", core, object) elif starterProfession == 'combat_marksman' and raceTemplate == 'object/creature/player/zabrak_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatMarksmanHumanoidMale", "combat_marksman_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_marksman_humanoid_male", "CombatMarksmanHumanoidMale", core, object) elif starterProfession == 'combat_marksman' and raceTemplate == 'object/creature/player/bothan_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatMarksmanHumanoidMale", "combat_marksman_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_marksman_humanoid_male", "CombatMarksmanHumanoidMale", core, object) elif starterProfession == 'combat_marksman' and raceTemplate == 'object/creature/player/sullustan_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatMarksmanHumanoidMale", "combat_marksman_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_marksman_humanoid_male", "CombatMarksmanHumanoidMale", core, object) elif starterProfession == 'combat_marksman' and raceTemplate == 'object/creature/player/twilek_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatMarksmanHumanoidMale", "combat_marksman_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_marksman_humanoid_male", "CombatMarksmanHumanoidMale", core, object) elif starterProfession == 'combat_marksman' and raceTemplate == 'object/creature/player/moncal_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatMarksmanHumanoidMale", "combat_marksman_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_marksman_humanoid_male", "CombatMarksmanHumanoidMale", core, object) elif starterProfession == 'combat_marksman' and raceTemplate == 'object/creature/player/rodian_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatMarksmanHumanoidMale", "combat_marksman_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_marksman_humanoid_male", "CombatMarksmanHumanoidMale", core, object) elif starterProfession == 'combat_marksman' and raceTemplate == 'object/creature/player/human_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatMarksmanHumanoidFemale", "combat_marksman_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_marksman_humanoid_female", "CombatMarksmanHumanoidFemale", core, object) elif starterProfession == 'combat_marksman' and raceTemplate == 'object/creature/player/zabrak_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatMarksmanHumanoidFemale", "combat_marksman_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_marksman_humanoid_female", "CombatMarksmanHumanoidFemale", core, object) elif starterProfession == 'combat_marksman' and raceTemplate == 'object/creature/player/bothan_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatMarksmanHumanoidFemale", "combat_marksman_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_marksman_humanoid_female", "CombatMarksmanHumanoidFemale", core, object) elif starterProfession == 'combat_marksman' and raceTemplate == 'object/creature/player/sullustan_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatMarksmanHumanoidFemale", "combat_marksman_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_marksman_humanoid_female", "CombatMarksmanHumanoidFemale", core, object) elif starterProfession == 'combat_marksman' and raceTemplate == 'object/creature/player/twilek_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatMarksmanHumanoidFemale", "combat_marksman_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_marksman_humanoid_female", "CombatMarksmanHumanoidFemale", core, object) elif starterProfession == 'combat_marksman' and raceTemplate == 'object/creature/player/moncal_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatMarksmanHumanoidFemale", "combat_marksman_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_marksman_humanoid_female", "CombatMarksmanHumanoidFemale", core, object) elif starterProfession == 'combat_marksman' and raceTemplate == 'object/creature/player/rodian_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatMarksmanHumanoidFemale", "combat_marksman_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_marksman_humanoid_female", "CombatMarksmanHumanoidFemale", core, object) elif starterProfession == 'combat_marksman' and raceTemplate == 'object/creature/player/trandoshan_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatMarksmanTrandoshanMale", "combat_marksman_trandoshan_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_marksman_trandoshan_male", "CombatMarksmanTrandoshanMale", core, object) elif starterProfession == 'combat_marksman' and raceTemplate == 'object/creature/player/trandoshan_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatMarksmanTrandoshanFemale", "combat_marksman_trandoshan_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_marksman_trandoshan_female", "CombatMarksmanTrandoshanFemale", core, object) elif starterProfession == 'combat_marksman' and raceTemplate == 'object/creature/player/wookiee_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatMarksmanWookieeMale", "combat_marksman_wookiee_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_marksman_wookiee_male", "CombatMarksmanWookieeMale", core, object) elif starterProfession == 'combat_marksman' and raceTemplate == 'object/creature/player/wookiee_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatMarksmanWookieeFemale", "combat_marksman_wookiee_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_marksman_wookiee_female", "CombatMarksmanWookieeFemale", core, object) elif starterProfession == 'combat_marksman' and raceTemplate == 'object/creature/player/ithorian_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatMarksmanIthorianMale", "combat_marksman_ithorian_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_marksman_ithorian_male", "CombatMarksmanIthorianMale", core, object) elif starterProfession == 'combat_marksman' and raceTemplate == 'object/creature/player/ithorian_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CombatMarksmanIthorianFemale", "combat_marksman_ithorian_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "combat_marksman_ithorian_female", "CombatMarksmanIthorianFemale", core, object) elif starterProfession == 'crafting_artisan' and raceTemplate == 'object/creature/player/human_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CraftingArtisanHumanoidMale", "crafting_artisan_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "crafting_artisan_humanoid_male", "CraftingArtisanHumanoidMale", core, object) elif starterProfession == 'crafting_artisan' and raceTemplate == 'object/creature/player/zabrak_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CraftingArtisanHumanoidMale", "crafting_artisan_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "crafting_artisan_humanoid_male", "CraftingArtisanHumanoidMale", core, object) elif starterProfession == 'crafting_artisan' and raceTemplate == 'object/creature/player/bothan_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CraftingArtisanHumanoidMale", "crafting_artisan_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "crafting_artisan_humanoid_male", "CraftingArtisanHumanoidMale", core, object) elif starterProfession == 'crafting_artisan' and raceTemplate == 'object/creature/player/sullustan_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CraftingArtisanHumanoidMale", "crafting_artisan_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "crafting_artisan_humanoid_male", "CraftingArtisanHumanoidMale", core, object) elif starterProfession == 'crafting_artisan' and raceTemplate == 'object/creature/player/twilek_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CraftingArtisanHumanoidMale", "crafting_artisan_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "crafting_artisan_humanoid_male", "CraftingArtisanHumanoidMale", core, object) elif starterProfession == 'crafting_artisan' and raceTemplate == 'object/creature/player/moncal_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CraftingArtisanHumanoidMale", "crafting_artisan_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "crafting_artisan_humanoid_male", "CraftingArtisanHumanoidMale", core, object) elif starterProfession == 'crafting_artisan' and raceTemplate == 'object/creature/player/rodian_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CraftingArtisanHumanoidMale", "crafting_artisan_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "crafting_artisan_humanoid_male", "CraftingArtisanHumanoidMale", core, object) elif starterProfession == 'crafting_artisan' and raceTemplate == 'object/creature/player/human_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CraftingArtisanHumanoidFemale", "crafting_artisan_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "crafting_artisan_humanoid_female", "CraftingArtisanHumanoidFemale", core, object) elif starterProfession == 'crafting_artisan' and raceTemplate == 'object/creature/player/zabrak_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CraftingArtisanHumanoidFemale", "crafting_artisan_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "crafting_artisan_humanoid_female", "CraftingArtisanHumanoidFemale", core, object) elif starterProfession == 'crafting_artisan' and raceTemplate == 'object/creature/player/bothan_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CraftingArtisanHumanoidFemale", "crafting_artisan_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "crafting_artisan_humanoid_female", "CraftingArtisanHumanoidFemale", core, object) elif starterProfession == 'crafting_artisan' and raceTemplate == 'object/creature/player/sullustan_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CraftingArtisanHumanoidFemale", "crafting_artisan_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "crafting_artisan_humanoid_female", "CraftingArtisanHumanoidFemale", core, object) elif starterProfession == 'crafting_artisan' and raceTemplate == 'object/creature/player/twilek_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CraftingArtisanTwilekFemale", "crafting_artisan_twilek_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "crafting_artisan_twilek_female", "CraftingArtisanTwilekFemale", core, object) elif starterProfession == 'crafting_artisan' and raceTemplate == 'object/creature/player/moncal_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CraftingArtisanHumanoidFemale", "crafting_artisan_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "crafting_artisan_humanoid_female", "CraftingArtisanHumanoidFemale", core, object) elif starterProfession == 'crafting_artisan' and raceTemplate == 'object/creature/player/rodian_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CraftingArtisanHumanoidFemale", "crafting_artisan_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "crafting_artisan_humanoid_female", "CraftingArtisanHumanoidFemale", core, object) elif starterProfession == 'crafting_artisan' and raceTemplate == 'object/creature/player/trandoshan_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CraftingArtisanTrandoshanMale", "crafting_artisan_trandoshan_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "crafting_artisan_trandoshan_male", "CraftingArtisanTrandoshanMale", core, object) elif starterProfession == 'crafting_artisan' and raceTemplate == 'object/creature/player/trandoshan_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CraftingArtisanTrandoshanFemale", "crafting_artisan_trandoshan_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "crafting_artisan_trandoshan_female", "CraftingArtisanTrandoshanFemale", core, object) elif starterProfession == 'crafting_artisan' and raceTemplate == 'object/creature/player/wookiee_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CraftingArtisanWookieeMale", "crafting_artisan_wookiee_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "crafting_artisan_wookiee_male", "CraftingArtisanWookieeMale", core, object) elif starterProfession == 'crafting_artisan' and raceTemplate == 'object/creature/player/wookiee_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CraftingArtisanWookieeFemale", "crafting_artisan_wookiee_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "crafting_artisan_wookiee_female", "CraftingArtisanWookieeFemale", core, object) elif starterProfession == 'crafting_artisan' and raceTemplate == 'object/creature/player/ithorian_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CraftingArtisanIthorianMale", "crafting_artisan_ithorian_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "crafting_artisan_ithorian_male", "CraftingArtisanIthorianMale", core, object) elif starterProfession == 'crafting_artisan' and raceTemplate == 'object/creature/player/ithorian_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "CraftingArtisanIthorianFemale", "crafting_artisan_ithorian_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "crafting_artisan_ithorian_female", "CraftingArtisanIthorianFemale", core, object) elif starterProfession == 'science_medic' and raceTemplate == 'object/creature/player/human_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "ScienceMedicHumanoidMale", "science_medic_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "science_medic_humanoid_male", "ScienceMedicHumanoidMale", core, object) elif starterProfession == 'science_medic' and raceTemplate == 'object/creature/player/zabrak_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "ScienceMedicHumanoidMale", "science_medic_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "science_medic_humanoid_male", "ScienceMedicHumanoidMale", core, object) elif starterProfession == 'science_medic' and raceTemplate == 'object/creature/player/bothan_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "ScienceMedicHumanoidMale", "science_medic_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "science_medic_humanoid_male", "ScienceMedicHumanoidMale", core, object) elif starterProfession == 'science_medic' and raceTemplate == 'object/creature/player/sullustan_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "ScienceMedicHumanoidMale", "science_medic_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "science_medic_humanoid_male", "ScienceMedicHumanoidMale", core, object) elif starterProfession == 'science_medic' and raceTemplate == 'object/creature/player/twilek_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "ScienceMedicHumanoidMale", "science_medic_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "science_medic_humanoid_male", "ScienceMedicHumanoidMale", core, object) elif starterProfession == 'science_medic' and raceTemplate == 'object/creature/player/moncal_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "ScienceMedicHumanoidMale", "science_medic_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "science_medic_humanoid_male", "ScienceMedicHumanoidMale", core, object) elif starterProfession == 'science_medic' and raceTemplate == 'object/creature/player/rodian_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "ScienceMedicHumanoidMale", "science_medic_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "science_medic_humanoid_male", "ScienceMedicHumanoidMale", core, object) elif starterProfession == 'science_medic' and raceTemplate == 'object/creature/player/human_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "ScienceMedicHumanoidFemale", "science_medic_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "science_medic_humanoid_female", "ScienceMedicHumanoidFemale", core, object) elif starterProfession == 'science_medic' and raceTemplate == 'object/creature/player/zabrak_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "ScienceMedicHumanoidFemale", "science_medic_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "science_medic_humanoid_female", "ScienceMedicHumanoidFemale", core, object) elif starterProfession == 'science_medic' and raceTemplate == 'object/creature/player/bothan_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "ScienceMedicHumanoidFemale", "science_medic_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "science_medic_humanoid_female", "ScienceMedicHumanoidFemale", core, object) elif starterProfession == 'science_medic' and raceTemplate == 'object/creature/player/sullustan_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "ScienceMedicHumanoidFemale", "science_medic_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "science_medic_humanoid_female", "ScienceMedicHumanoidFemale", core, object) elif starterProfession == 'science_medic' and raceTemplate == 'object/creature/player/twilek_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "ScienceMedicHumanoidFemale", "science_medic_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "science_medic_humanoid_female", "ScienceMedicHumanoidFemale", core, object) elif starterProfession == 'science_medic' and raceTemplate == 'object/creature/player/moncal_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "ScienceMedicHumanoidFemale", "science_medic_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "science_medic_humanoid_female", "ScienceMedicHumanoidFemale", core, object) elif starterProfession == 'science_medic' and raceTemplate == 'object/creature/player/rodian_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "ScienceMedicHumanoidFemale", "science_medic_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "science_medic_humanoid_female", "ScienceMedicHumanoidFemale", core, object) elif starterProfession == 'science_medic' and raceTemplate == 'object/creature/player/trandoshan_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "ScienceMedicTrandoshanMale", "science_medic_trandoshan_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "science_medic_trandoshan_male", "ScienceMedicTrandoshanMale", core, object) elif starterProfession == 'science_medic' and raceTemplate == 'object/creature/player/trandoshan_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "ScienceMedicTrandoshanFemale", "science_medic_trandoshan_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "science_medic_trandoshan_female", "ScienceMedicTrandoshanFemale", core, object) elif starterProfession == 'science_medic' and raceTemplate == 'object/creature/player/wookiee_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "ScienceMedicWookieeMale", "science_medic_wookiee_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "science_medic_wookiee_male", "ScienceMedicWookieeMale", core, object) elif starterProfession == 'science_medic' and raceTemplate == 'object/creature/player/wookiee_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "ScienceMedicWookieeFemale", "science_medic_wookiee_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "science_medic_wookiee_female", "ScienceMedicWookieeFemale", core, object) elif starterProfession == 'science_medic' and raceTemplate == 'object/creature/player/ithorian_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "ScienceMedicIthorianMale", "science_medic_ithorian_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "science_medic_ithorian_male", "ScienceMedicIthorianMale", core, object) elif starterProfession == 'science_medic' and raceTemplate == 'object/creature/player/ithorian_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "ScienceMedicIthorianFemale", "science_medic_ithorian_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "science_medic_ithorian_female", "ScienceMedicIthorianFemale", core, object) elif starterProfession == 'social_entertainer' and raceTemplate == 'object/creature/player/human_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "SocialEntertainerHumanoidMale", "social_entertainer_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "social_entertainer_humanoid_male", "SocialEntertainerHumanoidMale", core, object) elif starterProfession == 'social_entertainer' and raceTemplate == 'object/creature/player/zabrak_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "SocialEntertainerHumanoidMale", "social_entertainer_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "social_entertainer_humanoid_male", "SocialEntertainerHumanoidMale", core, object) elif starterProfession == 'social_entertainer' and raceTemplate == 'object/creature/player/bothan_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "SocialEntertainerHumanoidMale", "social_entertainer_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "social_entertainer_humanoid_male", "SocialEntertainerHumanoidMale", core, object) elif starterProfession == 'social_entertainer' and raceTemplate == 'object/creature/player/sullustan_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "SocialEntertainerHumanoidMale", "social_entertainer_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "social_entertainer_humanoid_male", "SocialEntertainerHumanoidMale", core, object) elif starterProfession == 'social_entertainer' and raceTemplate == 'object/creature/player/twilek_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "SocialEntertainerHumanoidMale", "social_entertainer_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "social_entertainer_humanoid_male", "SocialEntertainerHumanoidMale", core, object) elif starterProfession == 'social_entertainer' and raceTemplate == 'object/creature/player/moncal_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "SocialEntertainerHumanoidMale", "social_entertainer_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "social_entertainer_humanoid_male", "SocialEntertainerHumanoidMale", core, object) elif starterProfession == 'social_entertainer' and raceTemplate == 'object/creature/player/rodian_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "SocialEntertainerHumanoidMale", "social_entertainer_humanoid_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "social_entertainer_humanoid_male", "SocialEntertainerHumanoidMale", core, object) elif starterProfession == 'social_entertainer' and raceTemplate == 'object/creature/player/human_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "SocialEntertainerHumanoidFemale", "social_entertainer_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "social_entertainer_humanoid_female", "SocialEntertainerHumanoi_female", core, object) elif starterProfession == 'social_entertainer' and raceTemplate == 'object/creature/player/zabrak_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "SocialEntertainerHumanoidFemale", "social_entertainer_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "social_entertainer_humanoid_female", "SocialEntertainerHumanoi_female", core, object) elif starterProfession == 'social_entertainer' and raceTemplate == 'object/creature/player/bothan_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "SocialEntertainerHumanoidFemale", "social_entertainer_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "social_entertainer_humanoid_female", "SocialEntertainerHumanoi_female", core, object) elif starterProfession == 'social_entertainer' and raceTemplate == 'object/creature/player/sullustan_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "SocialEntertainerHumanoidFemale", "social_entertainer_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "social_entertainer_humanoid_female", "SocialEntertainerHumanoi_female", core, object) elif starterProfession == 'social_entertainer' and raceTemplate == 'object/creature/player/twilek_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "SocialEntertainerTwilekFemale", "social_entertainer_twilek_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "social_entertainer_twilek_female", "SocialEntertainerTwilekFemale", core, object) elif starterProfession == 'social_entertainer' and raceTemplate == 'object/creature/player/moncal_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "SocialEntertainerHumanoidFemale", "social_entertainer_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "social_entertainer_humanoid_female", "SocialEntertainerHumanoi_female", core, object) elif starterProfession == 'social_entertainer' and raceTemplate == 'object/creature/player/rodian_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "SocialEntertainerHumanoidFemale", "social_entertainer_humanoid_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "social_entertainer_humanoid_female", "SocialEntertainerHumanoi_female", core, object) elif starterProfession == 'social_entertainer' and raceTemplate == 'object/creature/player/trandoshan_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "SocialEntertainerTrandoshanMale", "social_entertainer_trandoshan_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "social_entertainer_trandoshan_male", "SocialEntertainerTrandoshanMale", core, object) elif starterProfession == 'social_entertainer' and raceTemplate == 'object/creature/player/trandoshan_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "SocialEntertainerTrandoshanFemale", "social_entertainer_trandoshan_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "social_entertainer_trandoshan_female", "SocialEntertainerTrandoshanFemale", core, object) elif starterProfession == 'social_entertainer' and raceTemplate == 'object/creature/player/wookiee_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "SocialEntertainerWookieeMale", "social_entertainer_wookiee_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "social_entertainer_wookiee_male", "SocialEntertainerWookieeMale", core, object) elif starterProfession == 'social_entertainer' and raceTemplate == 'object/creature/player/wookiee_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "SocialEntertainerWookieeFemale", "social_entertainer_wookiee_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "social_entertainer_wookiee_female", "SocialEntertainerWookieeFemale", core, object) elif starterProfession == 'social_entertainer' and raceTemplate == 'object/creature/player/ithorian_male.iff': - core.scriptService.callScript("scripts/starter_clothing/", "SocialEntertainerIthorianMale", "social_entertainer_ithorian_male", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "social_entertainer_ithorian_male", "SocialEntertainerIthorianMale", core, object) elif starterProfession == 'social_entertainer' and raceTemplate == 'object/creature/player/ithorian_female.iff': - core.scriptService.callScript("scripts/starter_clothing/", "SocialEntertainerIthorianFemale", "social_entertainer_ithorian_female", core, object) + core.scriptService.callScript("scripts/starter_clothing/", "social_entertainer_ithorian_female", "SocialEntertainerIthorianFemale", core, object) \ No newline at end of file diff --git a/src/services/BuffService.java b/src/services/BuffService.java index 76948e89..cd8e218b 100644 --- a/src/services/BuffService.java +++ b/src/services/BuffService.java @@ -110,7 +110,7 @@ public class BuffService implements INetworkDispatch { } if(FileUtilities.doesFileExist("scripts/buffs/" + buffName + ".py")) - core.scriptService.callScript("scripts/buffs/", "setup", buffName, core, creature, buff); + core.scriptService.callScript("scripts/buffs/", buffName, "setup", core, creature, buff); creature.addBuff(buff); @@ -168,7 +168,7 @@ public class BuffService implements INetworkDispatch { creature.removeDot(dot); } if(FileUtilities.doesFileExist("scripts/buffs/" + buff.getBuffName() + ".py")) - core.scriptService.callScript("scripts/buffs/", "removeBuff", buff.getBuffName(), core, creature, buff); + core.scriptService.callScript("scripts/buffs/", buff.getBuffName(), "removeBuff", core, creature, buff); creature.removeBuff(buff); for (String effect : buff.getParticleEffect().split(",")) { diff --git a/src/services/CharacterService.java b/src/services/CharacterService.java index d87738c9..ea133655 100644 --- a/src/services/CharacterService.java +++ b/src/services/CharacterService.java @@ -325,7 +325,7 @@ public class CharacterService implements INetworkDispatch { object._add(defaultWeapon); object.setWeaponId(defaultWeapon.getObjectID()); core.scriptService.callScript("scripts/", "starterclothing", "CreateStarterClothing", core, object, clientCreateCharacter.getStarterProfession(), clientCreateCharacter.getRaceTemplate()); - core.scriptService.callScript("scripts/", "CreateStartingCharacter", "demo", core, object); + core.scriptService.callScript("scripts/", "demo", "CreateStartingCharacter", core, object); core.getCreatureODB().put(object, Long.class, CreatureObject.class, object.getTransaction()); // might not need to commit transaction but better safe than sorry diff --git a/src/services/PlayerService.java b/src/services/PlayerService.java index 0c8dc7bc..5c3eaf9c 100644 --- a/src/services/PlayerService.java +++ b/src/services/PlayerService.java @@ -454,7 +454,7 @@ public class PlayerService implements INetworkDispatch { if(!FileUtilities.doesFileExist("scripts/expertise/" + expertiseBox + ".py")) return; - core.scriptService.callScript("scripts/expertise/", "addExpertisePoint", expertiseBox, core, creature); + core.scriptService.callScript("scripts/expertise/", expertiseBox, "addExpertisePoint", core, creature); } @@ -598,7 +598,7 @@ public class PlayerService implements INetworkDispatch { creature.playEffectObject("clienteffect/level_granted.cef", ""); creature.getClient().getSession().write((new ClientMfdStatusUpdateMessage((float) ((creature.getLevel() == 90) ? 90 : (creature.getLevel() + 1)), "/GroundHUD.MFDStatus.vsp.role.targetLevel")).serialize()); creature.setLevel(((Integer) experienceTable.getObject(i, 0)).shortValue()); - core.scriptService.callScript("scripts/collections/", "addMasterBadge", "master_" + player.getProfession(), core, creature); + core.scriptService.callScript("scripts/collections/", "master_" + player.getProfession(), "addMasterBadge", core, creature); // 3. Add the relevant health/action and expertise points. float luck = (((((float) (core.scriptService.getMethod("scripts/roadmap/", player.getProfession(), "getLuck").__call__().asInt()) + (core.scriptService.getMethod("scripts/roadmap/", creature.getStfName(), "getLuck").__call__().asInt())) / ((float) 90)) * ((float) creature.getLevel())) - ((float) creature.getSkillModBase("luck"))); diff --git a/src/services/ScriptService.java b/src/services/ScriptService.java index 791e3cd5..9ea1c999 100644 --- a/src/services/ScriptService.java +++ b/src/services/ScriptService.java @@ -30,10 +30,10 @@ import main.NGECore; @SuppressWarnings("unused") public class ScriptService { - + private NGECore core; private PythonInterpreter interpreter; - + public ScriptService(NGECore core) { this.core = core; } @@ -62,7 +62,7 @@ public class ScriptService { return python.get(method).__call__(Py.java2py(arg1)); } - public PyObject callScript(String path, String method, String module, Object arg1, Object arg2) { + public PyObject callScript(String path, String module, String method, Object arg1, Object arg2) { /*PythonInterpreter interpreter = new PythonInterpreter(); interpreter.cleanup(); interpreter.exec("import sys\nsys.path.append('" + path + "')\nfrom " + module + " import " + method); @@ -74,7 +74,7 @@ public class ScriptService { return python.get(method).__call__(Py.java2py(arg1), Py.java2py(arg2)); } - public PyObject callScript(String path, String method, String module, Object arg1, Object arg2, Object arg3) { + public PyObject callScript(String path, String module, String method, Object arg1, Object arg2, Object arg3) { /*PythonInterpreter interpreter = new PythonInterpreter(); interpreter.cleanup(); interpreter.exec("import sys\nsys.path.append('" + path + "')\nfrom " + module + " import " + method); @@ -86,7 +86,7 @@ public class ScriptService { return python.get(method).__call__(Py.java2py(arg1), Py.java2py(arg2), Py.java2py(arg3)); } - + public PyObject callScript(String path, String module, String method, Object arg1, Object arg2, Object arg3, Object arg4) { /*PythonInterpreter interpreter = new PythonInterpreter(); interpreter.cleanup(); @@ -106,5 +106,5 @@ public class ScriptService { PyObject func = python.get(method); return func; } - + } diff --git a/src/services/SkillService.java b/src/services/SkillService.java index 75385d8c..de024d6d 100644 --- a/src/services/SkillService.java +++ b/src/services/SkillService.java @@ -274,7 +274,7 @@ public class SkillService implements INetworkDispatch { addSkill(creature, expertiseName); if(!FileUtilities.doesFileExist("scripts/expertise/" + expertiseName + ".py")) continue; - core.scriptService.callScript("scripts/expertise/", "addAbilities", expertiseName, core, creature, player); + core.scriptService.callScript("scripts/expertise/", expertiseName, "addAbilities", core, creature, player); } } diff --git a/src/services/StaticService.java b/src/services/StaticService.java index 221ad1ce..f6c8bf68 100644 --- a/src/services/StaticService.java +++ b/src/services/StaticService.java @@ -71,7 +71,7 @@ public class StaticService implements INetworkDispatch { public void spawnPlanetStaticObjs(String planet) { Planet planetObj = (Planet) core.terrainService.getPlanetByName(planet); - core.scriptService.callScript("scripts/static_spawns/", "addPlanetSpawns", planetObj.getName(), core, planetObj); + core.scriptService.callScript("scripts/static_spawns/", planetObj.getName(), "addPlanetSpawns", core, planetObj); System.out.println("Loaded static objs for " + planetObj.getName()); } diff --git a/src/services/map/MapService.java b/src/services/map/MapService.java index f586cfde..23b6437c 100644 --- a/src/services/map/MapService.java +++ b/src/services/map/MapService.java @@ -105,7 +105,7 @@ public class MapService implements INetworkDispatch { public void addPlanet(Planet planet) { locationMap.put(planet, new Vector()); - core.scriptService.callScript("scripts/", "addLocations", "static_map_locations", core, planet); + core.scriptService.callScript("scripts/", "static_map_locations", "addLocations", core, planet); } public void addLocation(Planet planet, String name, float x, float y, byte category, byte subcategory, byte active) { diff --git a/src/services/travel/TravelService.java b/src/services/travel/TravelService.java index d0daaa6c..6eeb3bb5 100644 --- a/src/services/travel/TravelService.java +++ b/src/services/travel/TravelService.java @@ -193,7 +193,7 @@ public class TravelService implements INetworkDispatch { public void addPlanet(Planet planet) { Vector travelPointVector = new Vector(); travelMap.put(planet, travelPointVector); - core.scriptService.callScript("scripts/", "addPoints", "static_travel_points", core, planet); + core.scriptService.callScript("scripts/", "static_travel_points", "addPoints", core, planet); } public void addTravelPoint(Planet planet, String name, float x, float y, float z) {