From fabeaed919e91ebb77de5cebf14eb148676b8f01 Mon Sep 17 00:00:00 2001 From: CharonInferar Date: Sun, 4 May 2014 23:06:27 +0200 Subject: [PATCH] Armor loot fix, stat loot fix fixed numeric errors Loot client command response coded --- .gitignore | 446 +++++++++--------- ...lOdbFolders_ONLY_EXECUTE_IN_ODB_FOLDER.bat | 20 +- scripts/commands/loot.py | 14 + scripts/mobiles/canon/stormtrooper.py | 2 +- .../dressed_dark_force_crystal_hunter.py | 11 +- .../dressed_dark_jedi_elder_male_human_01.py | 29 +- .../dressed_dark_jedi_female_human_01.py | 29 +- .../dressed_dark_jedi_female_human_02.py | 29 +- .../dressed_dark_jedi_female_human_03.py | 29 +- .../dressed_dark_jedi_female_human_04.py | 29 +- .../dressed_dark_jedi_female_marauder_01.py | 29 +- .../mobile/dressed_dark_jedi_female_twk_01.py | 29 +- .../mobile/dressed_dark_jedi_female_twk_02.py | 29 +- .../mobile/dressed_dark_jedi_female_twk_03.py | 29 +- .../mobile/dressed_dark_jedi_female_zab_01.py | 29 +- .../mobile/dressed_dark_jedi_female_zab_02.py | 29 +- .../mobile/dressed_dark_jedi_female_zab_03.py | 29 +- .../dressed_dark_jedi_human_female_01.py | 29 +- .../mobile/dressed_dark_jedi_human_male_01.py | 29 +- .../mobile/dressed_dark_jedi_male_human_01.py | 29 +- .../mobile/dressed_dark_jedi_male_human_02.py | 29 +- .../mobile/dressed_dark_jedi_male_human_03.py | 29 +- .../mobile/dressed_dark_jedi_male_human_04.py | 29 +- .../mobile/dressed_dark_jedi_male_human_05.py | 29 +- .../mobile/dressed_dark_jedi_male_human_06.py | 29 +- .../dressed_dark_jedi_male_marauder_01.py | 29 +- .../mobile/dressed_dark_jedi_male_twk_01.py | 29 +- .../mobile/dressed_dark_jedi_male_twk_02.py | 29 +- .../mobile/dressed_dark_jedi_male_twk_03.py | 29 +- .../mobile/dressed_dark_jedi_male_zab_01.py | 29 +- .../mobile/dressed_dark_jedi_male_zab_02.py | 29 +- .../mobile/dressed_dark_jedi_male_zab_03.py | 29 +- ...dressed_dark_jedi_master_female_bith_01.py | 24 +- ...essed_dark_jedi_master_female_bothan_01.py | 24 +- ...ressed_dark_jedi_master_female_chiss_01.py | 24 +- ...ressed_dark_jedi_master_female_chiss_02.py | 24 +- .../dressed_dark_jedi_master_female_twk_01.py | 4 + .../dressed_dark_jedi_master_female_twk_02.py | 4 + .../dressed_dark_jedi_master_female_zab_01.py | 4 + .../dressed_dark_jedi_master_female_zab_02.py | 4 + ...dressed_dark_jedi_master_male_arcona_01.py | 24 +- ...dressed_dark_jedi_master_male_barada_01.py | 24 +- .../dressed_dark_jedi_master_male_gotal_01.py | 24 +- .../dressed_dark_jedi_master_male_human_01.py | 4 + .../dressed_dark_jedi_master_male_human_02.py | 4 + .../dressed_dark_jedi_master_male_human_03.py | 4 + .../dressed_dark_jedi_master_male_human_04.py | 4 + .../dressed_dark_jedi_master_male_human_05.py | 4 + .../dressed_dark_jedi_master_male_human_06.py | 4 + .../dressed_dark_jedi_master_male_sul_01.py | 24 +- .../dressed_dark_jedi_master_male_twk_01.py | 24 +- .../dressed_dark_jedi_master_male_twk_02.py | 24 +- .../dressed_dark_jedi_master_male_twk_03.py | 24 +- .../dressed_dark_jedi_master_male_twk_04.py | 24 +- ...ressed_dark_jedi_master_male_weequay_01.py | 24 +- .../dressed_dark_jedi_master_male_zab_01.py | 24 +- .../dressed_dark_jedi_master_male_zab_02.py | 24 +- .../dressed_force_sensitive_crypt_crawler.py | 11 +- .../dressed_force_sensitive_renegade.py | 11 +- .../mobile/dressed_novice_force_mystic.py | 11 +- .../object/mobile/dressed_stormtrooper_m.py | 6 +- ...essed_untrained_wielder_of_the_darkside.py | 11 +- scripts/radial/npc/corpse.py | 2 + src/services/LootService.java | 105 +++-- src/services/SimulationService.java | 12 +- src/services/ai/AIActor.java | 3 +- src/services/ai/states/DeathState.java | 7 +- src/services/sui/SUIService.java | 15 +- 68 files changed, 1523 insertions(+), 347 deletions(-) create mode 100644 scripts/commands/loot.py diff --git a/.gitignore b/.gitignore index 8c1860c6..f80b1387 100644 --- a/.gitignore +++ b/.gitignore @@ -1,225 +1,221 @@ -################# -## Eclipse -################# - -*.pydevproject -.metadata -bin/ -tmp/ -*.tmp -*.bak -*.pkc -*.swp -*~.nib -local.properties -.settings/ -.loadpath -*.ltn -*.pln -*.lsb -pt_sword_glint -*.lod -*.msh -*.mesh -*.iff -*.pob -*.ws -*.trn -*.tga -*.lmg -*.sat -*.lay -*.flr -*.apt -*.prt -*.cfg -*.spr -*.swh -*.jdb -*.lck -*.mgn -*.0 -cachedir/ -appearance/ -clientdata/ -*.class - -# SWG Client Folders -footprint/ -interiorlayout/ -clientdata/quest/ - -# PSWG Object Databases -odb/building/je.info.* -odb/creature/je.info.* -odb/doids/je.info.* -odb/guild/je.info.* -odb/mails/je.info.* -odb/oids/je.info.* -odb/chatRooms/je.info.* -odb/resourcehistory/je.info.* -odb/resourceroots/je.info.* -odb/resources/je.info.* -<<<<<<< HEAD -odb/auction/je.info.* -odb/swgobjects/je.info.* -======= -odb/auction/je.info.* -odb/bounties/je.info.* -<<<<<<< HEAD -odb/swgobjects/je.info.* -======= ->>>>>>> 12ca3ae66170fcfe09d848a7eea529041b9af5ad ->>>>>>> origin/master - -# External tool builders -.externalToolBuilders/ - -# Locally stored "Eclipse launch configurations" -*.launch - -# CDT-specific -.cproject - -# PDT-specific -.buildpath - - -################# -## Visual Studio -################# - -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# User-specific files -*.suo -*.user -*.sln.docstates - -# Build results -[Dd]ebug/ -[Rr]elease/ -*_i.c -*_p.c -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.vspscc -.builds -*.dotCover - -## TODO: If you have NuGet Package Restore enabled, uncomment this -#packages/ - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opensdf -*.sdf - -# Visual Studio profiler -*.psess -*.vsp - -# ReSharper is a .NET coding add-in -_ReSharper* - -# Installshield output folder -[Ee]xpress - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish - -# Others -[Bb]in -[Oo]bj -sql -TestResults -*.Cache -ClientBin -stylecop.* -~$* -*.dbmdl -Generated_Code #added for RIA/Silverlight projects - -# Backup & report files from converting an old project file to a newer -# Visual Studio version. Backup files are not needed, because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML - - - -############ -## Windows -############ - -# Windows image file caches -Thumbs.db - -# Folder config file -Desktop.ini - - -############# -## Python -############# - -*.py[co] - -# Packages -*.egg -*.egg-info -dist -build -eggs -parts -bin -var -sdist -develop-eggs -.installed.cfg - -# Installer logs -pip-log.txt - -# Unit test / coverage reports -.coverage -.tox - -#Translations -*.mo - -#Mr Developer -.mr.developer.cfg - -# Mac crap -.DS_Store - - -############# -## PyCharm -############# -.idea +################# +## Eclipse +################# + +*.pydevproject +.metadata +bin/ +tmp/ +*.tmp +*.bak +*.pkc +*.swp +*~.nib +local.properties +.settings/ +.loadpath +*.ltn +*.pln +*.lsb +pt_sword_glint +*.lod +*.msh +*.mesh +*.iff +*.pob +*.ws +*.trn +*.tga +*.lmg +*.sat +*.lay +*.flr +*.apt +*.prt +*.cfg +*.spr +*.swh +*.jdb +*.lck +*.mgn +*.0 +cachedir/ +appearance/ +clientdata/ +*.class + +# SWG Client Folders +footprint/ +interiorlayout/ +clientdata/quest/ + +# PSWG Object Databases +odb/building/je.info.* +odb/creature/je.info.* +odb/doids/je.info.* +odb/guild/je.info.* +odb/mails/je.info.* +odb/oids/je.info.* +odb/chatRooms/je.info.* +odb/resourcehistory/je.info.* +odb/resourceroots/je.info.* +odb/resources/je.info.* +<<<<<<< HEAD +odb/auction/je.info.* +odb/swgobjects/je.info.* +======= +odb/auction/je.info.* +odb/bounties/je.info.* +>>>>>>> 12ca3ae66170fcfe09d848a7eea529041b9af5ad + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# CDT-specific +.cproject + +# PDT-specific +.buildpath + + +################# +## Visual Studio +################# + +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files +*.suo +*.user +*.sln.docstates + +# Build results +[Dd]ebug/ +[Rr]elease/ +*_i.c +*_p.c +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.vspscc +.builds +*.dotCover + +## TODO: If you have NuGet Package Restore enabled, uncomment this +#packages/ + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opensdf +*.sdf + +# Visual Studio profiler +*.psess +*.vsp + +# ReSharper is a .NET coding add-in +_ReSharper* + +# Installshield output folder +[Ee]xpress + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish + +# Others +[Bb]in +[Oo]bj +sql +TestResults +*.Cache +ClientBin +stylecop.* +~$* +*.dbmdl +Generated_Code #added for RIA/Silverlight projects + +# Backup & report files from converting an old project file to a newer +# Visual Studio version. Backup files are not needed, because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML + + + +############ +## Windows +############ + +# Windows image file caches +Thumbs.db + +# Folder config file +Desktop.ini + + +############# +## Python +############# + +*.py[co] + +# Packages +*.egg +*.egg-info +dist +build +eggs +parts +bin +var +sdist +develop-eggs +.installed.cfg + +# Installer logs +pip-log.txt + +# Unit test / coverage reports +.coverage +.tox + +#Translations +*.mo + +#Mr Developer +.mr.developer.cfg + +# Mac crap +.DS_Store + + +############# +## PyCharm +############# +.idea diff --git a/odb/WipeAllOdbFolders_ONLY_EXECUTE_IN_ODB_FOLDER.bat b/odb/WipeAllOdbFolders_ONLY_EXECUTE_IN_ODB_FOLDER.bat index ebbd9e09..6fa1c55b 100644 --- a/odb/WipeAllOdbFolders_ONLY_EXECUTE_IN_ODB_FOLDER.bat +++ b/odb/WipeAllOdbFolders_ONLY_EXECUTE_IN_ODB_FOLDER.bat @@ -7,6 +7,23 @@ cls setlocal EnableDelayedExpansion +for %%* in (.) do set CurrDirName=%%~n* + +if "%CurrDirName%" == "eclipse" ( + echo You are running this script from inside Eclipse ^^! + echo You must execute it via windows in the odb folder ONLY ^^! + echo Terminating for your own data safety. + pause + EXIT +) + +if NOT "%CurrDirName%" == "odb" ( + echo You are not executing this file from the odb folder^^! + echo Terminating for your own data safety. + pause + EXIT +) + set /a count=0 for /d %%d in (*) do ( @@ -15,5 +32,4 @@ for /d %%d in (*) do ( del "%%d\*.*" /s/q echo. 2>%%d\placeholder.txt ) -setlocal DisableDelayedExpansion - +setlocal DisableDelayedExpansion \ No newline at end of file diff --git a/scripts/commands/loot.py b/scripts/commands/loot.py new file mode 100644 index 00000000..19ae81f3 --- /dev/null +++ b/scripts/commands/loot.py @@ -0,0 +1,14 @@ +import sys + +def setup(): + return + +def run(core, actor, target, commandString): + + if not target: + return + + #actor.sendSystemMessage('LOOT SCRIPT COMMAND', 0) + core.lootService.handleLootRequest(actor,target) + return + \ No newline at end of file diff --git a/scripts/mobiles/canon/stormtrooper.py b/scripts/mobiles/canon/stormtrooper.py index 1dd8a67e..a7a49123 100644 --- a/scripts/mobiles/canon/stormtrooper.py +++ b/scripts/mobiles/canon/stormtrooper.py @@ -8,7 +8,7 @@ def addTemplate(core): mobileTemplate.setCreatureName('stormtrooper') mobileTemplate.setLevel(90) - mobileTemplate.setDifficulty(2) + mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(24) mobileTemplate.setAttackSpeed(1.0) mobileTemplate.setWeaponType(0) diff --git a/scripts/object/mobile/dressed_dark_force_crystal_hunter.py b/scripts/object/mobile/dressed_dark_force_crystal_hunter.py index dbbb65df..c7237ff3 100644 --- a/scripts/object/mobile/dressed_dark_force_crystal_hunter.py +++ b/scripts/object/mobile/dressed_dark_force_crystal_hunter.py @@ -17,11 +17,16 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) - lootPoolNames_4 = ['sithholocrons'] - lootPoolChances_4 = [100] - lootGroupChance_4 = 1 + lootPoolNames_4 = ['armor_various','random_loot_rifles'] + lootPoolChances_4 = [80,20] + lootGroupChance_4 = 35 object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_elder_male_human_01.py b/scripts/object/mobile/dressed_dark_jedi_elder_male_human_01.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_elder_male_human_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_elder_male_human_01.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_female_human_01.py b/scripts/object/mobile/dressed_dark_jedi_female_human_01.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_female_human_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_female_human_01.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_female_human_02.py b/scripts/object/mobile/dressed_dark_jedi_female_human_02.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_female_human_02.py +++ b/scripts/object/mobile/dressed_dark_jedi_female_human_02.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_female_human_03.py b/scripts/object/mobile/dressed_dark_jedi_female_human_03.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_female_human_03.py +++ b/scripts/object/mobile/dressed_dark_jedi_female_human_03.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_female_human_04.py b/scripts/object/mobile/dressed_dark_jedi_female_human_04.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_female_human_04.py +++ b/scripts/object/mobile/dressed_dark_jedi_female_human_04.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_female_marauder_01.py b/scripts/object/mobile/dressed_dark_jedi_female_marauder_01.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_female_marauder_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_female_marauder_01.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_female_twk_01.py b/scripts/object/mobile/dressed_dark_jedi_female_twk_01.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_female_twk_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_female_twk_01.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_female_twk_02.py b/scripts/object/mobile/dressed_dark_jedi_female_twk_02.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_female_twk_02.py +++ b/scripts/object/mobile/dressed_dark_jedi_female_twk_02.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_female_twk_03.py b/scripts/object/mobile/dressed_dark_jedi_female_twk_03.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_female_twk_03.py +++ b/scripts/object/mobile/dressed_dark_jedi_female_twk_03.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_female_zab_01.py b/scripts/object/mobile/dressed_dark_jedi_female_zab_01.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_female_zab_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_female_zab_01.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_female_zab_02.py b/scripts/object/mobile/dressed_dark_jedi_female_zab_02.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_female_zab_02.py +++ b/scripts/object/mobile/dressed_dark_jedi_female_zab_02.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_female_zab_03.py b/scripts/object/mobile/dressed_dark_jedi_female_zab_03.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_female_zab_03.py +++ b/scripts/object/mobile/dressed_dark_jedi_female_zab_03.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_human_female_01.py b/scripts/object/mobile/dressed_dark_jedi_human_female_01.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_human_female_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_human_female_01.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_human_male_01.py b/scripts/object/mobile/dressed_dark_jedi_human_male_01.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_human_male_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_human_male_01.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_male_human_01.py b/scripts/object/mobile/dressed_dark_jedi_male_human_01.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_male_human_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_male_human_01.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_male_human_02.py b/scripts/object/mobile/dressed_dark_jedi_male_human_02.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_male_human_02.py +++ b/scripts/object/mobile/dressed_dark_jedi_male_human_02.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_male_human_03.py b/scripts/object/mobile/dressed_dark_jedi_male_human_03.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_male_human_03.py +++ b/scripts/object/mobile/dressed_dark_jedi_male_human_03.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_male_human_04.py b/scripts/object/mobile/dressed_dark_jedi_male_human_04.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_male_human_04.py +++ b/scripts/object/mobile/dressed_dark_jedi_male_human_04.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_male_human_05.py b/scripts/object/mobile/dressed_dark_jedi_male_human_05.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_male_human_05.py +++ b/scripts/object/mobile/dressed_dark_jedi_male_human_05.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_male_human_06.py b/scripts/object/mobile/dressed_dark_jedi_male_human_06.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_male_human_06.py +++ b/scripts/object/mobile/dressed_dark_jedi_male_human_06.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_male_marauder_01.py b/scripts/object/mobile/dressed_dark_jedi_male_marauder_01.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_male_marauder_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_male_marauder_01.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_male_twk_01.py b/scripts/object/mobile/dressed_dark_jedi_male_twk_01.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_male_twk_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_male_twk_01.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_male_twk_02.py b/scripts/object/mobile/dressed_dark_jedi_male_twk_02.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_male_twk_02.py +++ b/scripts/object/mobile/dressed_dark_jedi_male_twk_02.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_male_twk_03.py b/scripts/object/mobile/dressed_dark_jedi_male_twk_03.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_male_twk_03.py +++ b/scripts/object/mobile/dressed_dark_jedi_male_twk_03.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_male_zab_01.py b/scripts/object/mobile/dressed_dark_jedi_male_zab_01.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_male_zab_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_male_zab_01.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_male_zab_02.py b/scripts/object/mobile/dressed_dark_jedi_male_zab_02.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_male_zab_02.py +++ b/scripts/object/mobile/dressed_dark_jedi_male_zab_02.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_male_zab_03.py b/scripts/object/mobile/dressed_dark_jedi_male_zab_03.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_male_zab_03.py +++ b/scripts/object/mobile/dressed_dark_jedi_male_zab_03.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_female_bith_01.py b/scripts/object/mobile/dressed_dark_jedi_master_female_bith_01.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_female_bith_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_female_bith_01.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_female_bothan_01.py b/scripts/object/mobile/dressed_dark_jedi_master_female_bothan_01.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_female_bothan_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_female_bothan_01.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_female_chiss_01.py b/scripts/object/mobile/dressed_dark_jedi_master_female_chiss_01.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_female_chiss_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_female_chiss_01.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_female_chiss_02.py b/scripts/object/mobile/dressed_dark_jedi_master_female_chiss_02.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_female_chiss_02.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_female_chiss_02.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_female_twk_01.py b/scripts/object/mobile/dressed_dark_jedi_master_female_twk_01.py index 9e598690..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_female_twk_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_female_twk_01.py @@ -17,6 +17,10 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_female_twk_02.py b/scripts/object/mobile/dressed_dark_jedi_master_female_twk_02.py index 9e598690..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_female_twk_02.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_female_twk_02.py @@ -17,6 +17,10 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_female_zab_01.py b/scripts/object/mobile/dressed_dark_jedi_master_female_zab_01.py index 9e598690..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_female_zab_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_female_zab_01.py @@ -17,6 +17,10 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_female_zab_02.py b/scripts/object/mobile/dressed_dark_jedi_master_female_zab_02.py index 9e598690..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_female_zab_02.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_female_zab_02.py @@ -17,6 +17,10 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_arcona_01.py b/scripts/object/mobile/dressed_dark_jedi_master_male_arcona_01.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_arcona_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_arcona_01.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_barada_01.py b/scripts/object/mobile/dressed_dark_jedi_master_male_barada_01.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_barada_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_barada_01.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_gotal_01.py b/scripts/object/mobile/dressed_dark_jedi_master_male_gotal_01.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_gotal_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_gotal_01.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_human_01.py b/scripts/object/mobile/dressed_dark_jedi_master_male_human_01.py index 9e598690..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_human_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_human_01.py @@ -17,6 +17,10 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_human_02.py b/scripts/object/mobile/dressed_dark_jedi_master_male_human_02.py index 9e598690..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_human_02.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_human_02.py @@ -17,6 +17,10 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_human_03.py b/scripts/object/mobile/dressed_dark_jedi_master_male_human_03.py index 9e598690..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_human_03.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_human_03.py @@ -17,6 +17,10 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_human_04.py b/scripts/object/mobile/dressed_dark_jedi_master_male_human_04.py index 9e598690..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_human_04.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_human_04.py @@ -17,6 +17,10 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_human_05.py b/scripts/object/mobile/dressed_dark_jedi_master_male_human_05.py index 9e598690..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_human_05.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_human_05.py @@ -17,6 +17,10 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_human_06.py b/scripts/object/mobile/dressed_dark_jedi_master_male_human_06.py index 9e598690..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_human_06.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_human_06.py @@ -17,6 +17,10 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_sul_01.py b/scripts/object/mobile/dressed_dark_jedi_master_male_sul_01.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_sul_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_sul_01.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_twk_01.py b/scripts/object/mobile/dressed_dark_jedi_master_male_twk_01.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_twk_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_twk_01.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_twk_02.py b/scripts/object/mobile/dressed_dark_jedi_master_male_twk_02.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_twk_02.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_twk_02.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_twk_03.py b/scripts/object/mobile/dressed_dark_jedi_master_male_twk_03.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_twk_03.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_twk_03.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_twk_04.py b/scripts/object/mobile/dressed_dark_jedi_master_male_twk_04.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_twk_04.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_twk_04.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_weequay_01.py b/scripts/object/mobile/dressed_dark_jedi_master_male_weequay_01.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_weequay_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_weequay_01.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_zab_01.py b/scripts/object/mobile/dressed_dark_jedi_master_male_zab_01.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_zab_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_zab_01.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_zab_02.py b/scripts/object/mobile/dressed_dark_jedi_master_male_zab_02.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_zab_02.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_zab_02.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_force_sensitive_crypt_crawler.py b/scripts/object/mobile/dressed_force_sensitive_crypt_crawler.py index 2c42c975..a96bd6e6 100644 --- a/scripts/object/mobile/dressed_force_sensitive_crypt_crawler.py +++ b/scripts/object/mobile/dressed_force_sensitive_crypt_crawler.py @@ -17,11 +17,16 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) - lootPoolNames_4 = ['jediholocrons'] - lootPoolChances_4 = [100] - lootGroupChance_4 = 1 + lootPoolNames_4 = ['armor_various','random_loot_rifles'] + lootPoolChances_4 = [80,20] + lootGroupChance_4 = 35 object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + lootPoolNames_5 = ['jediholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_force_sensitive_renegade.py b/scripts/object/mobile/dressed_force_sensitive_renegade.py index 2c42c975..a96bd6e6 100644 --- a/scripts/object/mobile/dressed_force_sensitive_renegade.py +++ b/scripts/object/mobile/dressed_force_sensitive_renegade.py @@ -17,11 +17,16 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) - lootPoolNames_4 = ['jediholocrons'] - lootPoolChances_4 = [100] - lootGroupChance_4 = 1 + lootPoolNames_4 = ['armor_various','random_loot_rifles'] + lootPoolChances_4 = [80,20] + lootGroupChance_4 = 35 object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + lootPoolNames_5 = ['jediholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_novice_force_mystic.py b/scripts/object/mobile/dressed_novice_force_mystic.py index 2c42c975..a96bd6e6 100644 --- a/scripts/object/mobile/dressed_novice_force_mystic.py +++ b/scripts/object/mobile/dressed_novice_force_mystic.py @@ -17,11 +17,16 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) - lootPoolNames_4 = ['jediholocrons'] - lootPoolChances_4 = [100] - lootGroupChance_4 = 1 + lootPoolNames_4 = ['armor_various','random_loot_rifles'] + lootPoolChances_4 = [80,20] + lootGroupChance_4 = 35 object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + lootPoolNames_5 = ['jediholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_stormtrooper_m.py b/scripts/object/mobile/dressed_stormtrooper_m.py index 6b81cf5a..e972026a 100644 --- a/scripts/object/mobile/dressed_stormtrooper_m.py +++ b/scripts/object/mobile/dressed_stormtrooper_m.py @@ -8,8 +8,8 @@ def setup(core, object): object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) lootPoolNames_2 = ['armor_various','random_loot_rifles'] - lootPoolChances_2 = [50,50] - lootGroupChance_2 = 20 + lootPoolChances_2 = [99,1] + lootGroupChance_2 = 100 object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) lootPoolNames_3 = ['Colorcrystals'] @@ -20,7 +20,7 @@ def setup(core, object): # just to test lootPoolNames_4 = ['random_stat_jewelry'] lootPoolChances_4 = [100] - lootGroupChance_4 = 100 + lootGroupChance_4 = 10 object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_untrained_wielder_of_the_darkside.py b/scripts/object/mobile/dressed_untrained_wielder_of_the_darkside.py index dbbb65df..c7237ff3 100644 --- a/scripts/object/mobile/dressed_untrained_wielder_of_the_darkside.py +++ b/scripts/object/mobile/dressed_untrained_wielder_of_the_darkside.py @@ -17,11 +17,16 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) - lootPoolNames_4 = ['sithholocrons'] - lootPoolChances_4 = [100] - lootGroupChance_4 = 1 + lootPoolNames_4 = ['armor_various','random_loot_rifles'] + lootPoolChances_4 = [80,20] + lootGroupChance_4 = 35 object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + return \ No newline at end of file diff --git a/scripts/radial/npc/corpse.py b/scripts/radial/npc/corpse.py index dc93d74a..4f8093d5 100644 --- a/scripts/radial/npc/corpse.py +++ b/scripts/radial/npc/corpse.py @@ -2,12 +2,14 @@ from resources.common import RadialOptions import sys def createRadial(core, owner, target, radials): + #owner.sendSystemMessage('Correct Loot Radial created', 0) radials.clear() radials.add(RadialOptions(0, 36, 0, 'Loot')) return def handleSelection(core, owner, target, option): + #owner.sendSystemMessage('Correct Loot Radial called', 0) if option == 36 and target: #core.lootService.handleLootRequest(owner,target) core.lootService.handleLootRequest(owner,target) diff --git a/src/services/LootService.java b/src/services/LootService.java index 1c2dfb22..a23d367b 100644 --- a/src/services/LootService.java +++ b/src/services/LootService.java @@ -25,9 +25,14 @@ import java.io.File; import java.io.IOException; import java.nio.file.DirectoryStream; import java.nio.file.DirectoryStream.Filter; +import java.nio.file.attribute.BasicFileAttributes; import java.nio.file.FileSystems; +import java.nio.file.FileVisitResult; +import java.nio.file.FileVisitor; import java.nio.file.Files; import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.SimpleFileVisitor; import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedHashMap; @@ -36,6 +41,8 @@ import java.util.Map; import java.util.Random; import java.util.Vector; +import org.apache.commons.lang3.ArrayUtils; + import protocol.swg.PlayClientEffectObjectTransformMessage; import resources.loot.LootGroup; import resources.loot.LootRollSession; @@ -87,12 +94,8 @@ public class LootService implements INetworkDispatch { } SWGObject lootedObjectInventory = lootedObject.getSlottedObject("inventory"); core.simulationService.openContainer(requester, lootedObjectInventory); - System.err.println("core.simulationService.openContainer " + lootedObject.getTemplate() ); - System.err.println("core.simulationService.openContainer " + lootedObjectInventory.getTemplate()); setLooted(requester,lootedObject); } - System.err.println("NO ACCESS lootedObject.isLooted(): " + lootedObject.isLooted()); - System.err.println("NO ACCESS hasAccess(requester,lootedObject): " + hasAccess(requester,lootedObject)); } private boolean hasAccess(CreatureObject requester, TangibleObject lootedObject){ @@ -101,7 +104,6 @@ public class LootService implements INetworkDispatch { System.err.println("LootSession null: " + lootRollSession); if (lootRollSession!=null){ if (lootRollSession.getRequester()==requester){ - System.err.println("lootRollSession.getRequester()==requester: " + (lootRollSession.getRequester()==requester)); return true; } } @@ -151,7 +153,9 @@ public class LootService implements INetworkDispatch { System.out.println("this lootGroup will drop something"); handleLootGroup(lootGroup,lootRollSession); //this lootGroup will drop something e.g. {kraytpearl_range,krayt_tissue_rare} } + System.out.println("While Loop Stuck check"); } + System.out.println("Past while "); // Rare Loot System Stage (Is in place for all looted creatures) //if (lootRollSession.isAllowRareLoot()){ @@ -256,9 +260,9 @@ public class LootService implements INetworkDispatch { Vector itemChances = (Vector)core.scriptService.fetchDoubleVector(path,"itemChances"); double randomItemFromPool = new Random().nextDouble()*100; - int remainder = 0; // [10,20,30,34,5,1] - double span = 100/itemNames.size(); - + double remainder = 0.0; // [10,20,30,34,5,1] + double span = 100.0/(double)itemNames.size(); + for (int i=0;i subfolders = new ArrayList(); // Consider all sub-folders - try (DirectoryStream ds = Files.newDirectoryStream(FileSystems.getDefault().getPath("scripts/loot/lootItems/"), new DirectoriesFilter())) { - for (Path p : ds) { - subfolders.add(p.getFileName().toString()); - } - } catch (IOException e) { - lootRollSession.addErrorMessage("File system check caused an error. Please contact Charon about this issue."); - return; - } - - String itemPath = "scripts/loot/lootItems/"+itemName.toLowerCase()+".py"; - File file = new File(itemPath); - if (!file.isFile()){ - for (String subfolderName : subfolders){ - itemPath = "scripts/loot/lootItems/"+ subfolderName +"/"+itemName.toLowerCase()+".py"; - File subfile = new File(itemPath); - if (subfile.isFile()) - break; - } + + final Vector foundPath = new Vector(); + Path p = Paths.get("scripts/loot/lootItems/"); + FileVisitor fv = new SimpleFileVisitor() { + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { + String actualFileName = file.getFileName().toString(); + actualFileName = actualFileName.substring(0, actualFileName.length()-3); + if (actualFileName.equals(itemName.toLowerCase())){ + foundPath.add(file.toString()); + } + return FileVisitResult.CONTINUE; + } + }; + try { + Files.walkFileTree(p, fv); + } catch (IOException e) { + e.printStackTrace(); } - - File checkfile = new File(itemPath); - if (!checkfile.isFile()){ + + + if (foundPath.size()==0){ String errorMessage = "Loot item '" + itemName + "' not found in file system. Please contact Charon about this issue."; lootRollSession.addErrorMessage(errorMessage); return; - } + + } + String itemPath = foundPath.get(0); itemPath = itemPath.substring(0, itemPath.length()-3); // remove the file type @@ -358,7 +363,7 @@ public class LootService implements INetworkDispatch { if(core.scriptService.getMethod(itemPath,"","itemStats")!=null) itemStats = (Vector)core.scriptService.fetchStringVector(itemPath,"itemStats"); - if(core.scriptService.getMethod(itemPath,"","itemStats")!=null) + if(core.scriptService.getMethod(itemPath,"","itemSkillMods")!=null) itemSkillMods = (Vector)core.scriptService.fetchStringVector(itemPath,"itemSkillMods"); if(core.scriptService.getMethod(itemPath,"","biolink")!=null) @@ -448,7 +453,7 @@ public class LootService implements INetworkDispatch { lootRollSession.addDroppedItem(droppedItem); - System.err.println("END REACHED"); + System.out.println("END REACHED"); } private void handleCustomDropName(TangibleObject droppedItem,String customName) { @@ -954,7 +959,7 @@ public class LootService implements INetworkDispatch { statNumber++; - int primaryAttribute = new Random().nextInt(6); // 0-6 + int primaryAttribute = new Random().nextInt(7); // 0-6 int maxValue = (int) (levelOfDrop*25/90); int minValue = (int) (0.75*maxValue); minValue = Math.max(1, minValue); @@ -972,15 +977,27 @@ public class LootService implements INetworkDispatch { int attribute = primaryAttribute; +// for (int i=0;i statList = new ArrayList(); + for (int i=0;i<7;i++) + statList.add(i); + statList.remove(primaryAttribute); + for (int i=0;i()); + NGECore.getInstance().lootService.DropLoot((CreatureObject)(actor.getCreature().getKiller()),(TangibleObject)(actor.getCreature())); actor.scheduleDespawn(); return 0; } diff --git a/src/services/sui/SUIService.java b/src/services/sui/SUIService.java index 309577cc..7be91518 100644 --- a/src/services/sui/SUIService.java +++ b/src/services/sui/SUIService.java @@ -77,7 +77,7 @@ public class SUIService implements INetworkDispatch { ObjectMenuRequest request = new ObjectMenuRequest(); request.deserialize(data); - + SWGObject target = core.objectService.getObject(request.getTargetId()); SWGObject owner = core.objectService.getObject(request.getCharacterId()); @@ -107,6 +107,7 @@ public class SUIService implements INetworkDispatch { } if (target instanceof CreatureObject){ + //System.out.println("SUI target is creatureobject"); CreatureObject creature = (CreatureObject) target; if (!creature.isPlayer() && creature.isLootLock()){ LootRollSession lootRollSession = (LootRollSession )creature.getAttachment("LootSession"); @@ -114,12 +115,22 @@ public class SUIService implements INetworkDispatch { if (lootRollSession.getRequester()!=owner){ // ToDo: RADIALS MUST BE DISABLED HERE FOR THE CORPSE, BUT HOW? - core.scriptService.callScript("scripts/radial/", "npc/noloot", "createRadial", core, owner, target, request.getRadialOptions()); + target.setAttachment("radial_filename", "npc/noloot"); + core.scriptService.callScript("scripts/radial/npc/noloot", "", "createRadial", core, owner, target, request.getRadialOptions()); sendRadial(owner, target, request.getRadialOptions(), request.getRadialCount()); return; + } else { + // Note: Bugged NPC corpses never make it through here, they are not sent from client at all it seems + target.setAttachment("radial_filename", "npc/corpse"); + core.scriptService.callScript("scripts/radial/npc/corpse", "", "createRadial", core, owner, target, request.getRadialOptions()); + sendRadial(owner, target, request.getRadialOptions(), request.getRadialCount()); + //((CreatureObject)owner).sendSystemMessage("Radial set from suiservice", (byte)0); + return; } } } + } else { + //System.out.println("SUI target is NOT creatureobject " + target.getTemplate()); } if(target.getGrandparent() != null && target.getGrandparent().getAttachment("structureAdmins") != null)