diff --git a/scripts/loot/lootPools/powercrystals_hiq.py b/scripts/loot/lootPools/powercrystals_hiq.py index 63d33a9b..52dadfb8 100644 --- a/scripts/loot/lootPools/powercrystals_hiq.py +++ b/scripts/loot/lootPools/powercrystals_hiq.py @@ -1,6 +1,6 @@ def itemNames(): - return ['powercrystal_premium','powercrystal_flawless','powercrystal_perfect'] + return ['powercrystal_select', 'powercrystal_premium', 'powercrystal_flawless'] def itemChances(): - return [94,5,1] #= 100% \ No newline at end of file + return [75, 20, 5] #= 100% \ No newline at end of file diff --git a/scripts/loot/rarelootchestcontents/exceptionaltable.py b/scripts/loot/rarelootchestcontents/exceptionaltable.py index f652f0a4..9fece86c 100644 --- a/scripts/loot/rarelootchestcontents/exceptionaltable.py +++ b/scripts/loot/rarelootchestcontents/exceptionaltable.py @@ -28,21 +28,21 @@ def itemNames(): templates +=['ugnaught_costume_instructions','victory','wampa_costume_instructions','war_terminal'] templates +=['warriors honor','wookie_home_banner_kit','wookie_life_day_orb','xeno_couch'] templates +=['xeno_desk','xeno_desk_lamp','xeno_rug','xeno_table'] - + templates += ['powercrystal_perfect'] return templates def itemChances(): chances = [1.908,1.908,1.908,1.908,1.908,1.908,1.908,1.908,1.908,1.908] #27 Exceptionals chances += [1.908,1.908,1.908,1.908,1.908,1.908,1.908,1.908,1.908,1.908] chances += [1.908,1.908,1.908,1.908,1.908,1.908,1.908] - chances += [0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636] #76 Rares - chances += [0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636] - chances += [0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636] - chances += [0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636] - chances += [0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636] - chances += [0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636] - chances += [0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636] - chances += [0.636,0.636,0.636,0.636,0.636,0.784] + chances += [0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629] #77 Rares + chances += [0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629] + chances += [0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629] + chances += [0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629] + chances += [0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629] + chances += [0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629] + chances += [0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629] + chances += [0.629,0.629,0.629,0.629,0.629,0.629,0.629] return chances \ No newline at end of file diff --git a/scripts/loot/rarelootchestcontents/legendarytable.py b/scripts/loot/rarelootchestcontents/legendarytable.py index c46a7855..6a082256 100644 --- a/scripts/loot/rarelootchestcontents/legendarytable.py +++ b/scripts/loot/rarelootchestcontents/legendarytable.py @@ -32,6 +32,7 @@ def itemNames(): templates +=['ugnaught_costume_instructions','victory','wampa_costume_instructions','war_terminal'] templates +=['warriors honor','wookie_home_banner_kit','wookie_life_day_orb','xeno_couch'] templates +=['xeno_desk','xeno_desk_lamp','xeno_rug','xeno_table'] + templates += ['powercrystal_perfect'] return templates def itemChances(): @@ -39,13 +40,13 @@ def itemChances(): chances += [1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25] #27 Exceptionals chances += [1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25] chances += [1.25,1.25,1.25,1.25,1.25,1.25,1.25] - chances += [0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625] #76 Rares - chances += [0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625] - chances += [0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625] - chances += [0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625] - chances += [0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625] - chances += [0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625] - chances += [0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625] - chances += [0.625,0.625,0.625,0.625,0.625,0.625] + chances += [0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616] #77 Rares + chances += [0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616] + chances += [0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616] + chances += [0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616] + chances += [0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616] + chances += [0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616] + chances += [0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616] + chances += [0.616,0.616,0.616,0.616,0.616,0.616,0.616] return chances \ No newline at end of file diff --git a/scripts/loot/rarelootchestcontents/raretable.py b/scripts/loot/rarelootchestcontents/raretable.py index 8e049299..49014635 100644 --- a/scripts/loot/rarelootchestcontents/raretable.py +++ b/scripts/loot/rarelootchestcontents/raretable.py @@ -20,17 +20,18 @@ def itemNames(): items +=['ugnaught_costume_instructions','victory','wampa_costume_instructions','war_terminal'] items +=['warriors honor','wookie_home_banner_kit','wookie_life_day_orb','xeno_couch'] items +=['xeno_desk','xeno_desk_lamp','xeno_rug','xeno_table'] + items += ['powercrystal_perfect'] return items def itemChances(): - chances=[1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315] - chances+=[1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315] - chances+=[1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315] - chances+=[1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315] - chances+=[1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315] - chances+=[1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315] - chances+=[1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315] - chances+=[1.315,1.315,1.315,1.315,1.315,1.375] - return chances ##Sum must be exactly 100 76 items -> 1.315 + chances=[1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298] + chances+=[1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298] + chances+=[1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298] + chances+=[1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298] + chances+=[1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298] + chances+=[1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298] + chances+=[1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298] + chances+=[1.298,1.298,1.298,1.298,1.298,1.298,1.298] + return chances ##Sum must be exactly 100 77 items -> 1.298 \ No newline at end of file diff --git a/src/services/LootService.java b/src/services/LootService.java index ba03cbcb..5949339a 100644 --- a/src/services/LootService.java +++ b/src/services/LootService.java @@ -1687,7 +1687,7 @@ public class LootService implements INetworkDispatch { minValue1 = 21; maxValue1 = 23; finalMinDmg = minValue1+new Random().nextInt(maxValue1+1-minValue1); - finalMaxDmg = finalMinDmg+1; + finalMaxDmg = finalMinDmg+2; break; } } @@ -1729,15 +1729,17 @@ public class LootService implements INetworkDispatch { minValue1 = 15; maxValue1 = 17; finalMinDmg = minValue1+new Random().nextInt(maxValue1+1-minValue1); - finalMaxDmg = finalMinDmg+1; + finalMaxDmg = finalMinDmg+2; break; case "kraytpearl_flawless": // Flawless - 19/20 damage finalMinDmg = 19; finalMaxDmg = 20; break; - case "kraytpearl_ancient": // Ancient - 20/22 damage - finalMinDmg = 20; - finalMaxDmg = 22; + case "kraytpearl_ancient": // Ancient - between 20/21 min and 22/23 max damage + minValue1 = 20; + maxValue1 = 21; + finalMinDmg = minValue1+new Random().nextInt(maxValue1+1-minValue1); + finalMaxDmg = finalMinDmg+2; break; } }