JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed balloons still being added to chests

Browse Source
This commit is contained in:
LCastr0 2017-01-11 01:54:53 -02:00
parent 21473a7d82
commit 5e85f48c87
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
View File

@ -309,9 +309,9 @@ public class RewardManager
addHat(Type.OMEGA, HatType.PRESENT, rarity, 5); addHat(Type.OMEGA, HatType.PRESENT, rarity, 5);
addHat(Type.OMEGA, HatType.SNOWMAN, rarity, 5); addHat(Type.OMEGA, HatType.SNOWMAN, rarity, 5);
addBalloon(Type.OMEGA,BalloonType.BABY_COW, rarity, 10, 100); /*addBalloon(Type.OMEGA,BalloonType.BABY_COW, rarity, 10, 100);
addBalloon(Type.OMEGA, BalloonType.BABY_PIG, rarity, 10, 100); addBalloon(Type.OMEGA, BalloonType.BABY_PIG, rarity, 10, 100);
addBalloon(Type.OMEGA, BalloonType.BABY_SHEEP, rarity, 15, 100); addBalloon(Type.OMEGA, BalloonType.BABY_SHEEP, rarity, 15, 100);*/
// Minestrike Skins // Minestrike Skins
addMineStrikeSkin(Type.MINESTRIKE, MineStrikeSkin.P2000_Fire_Elemental, rarity, 100, 500); addMineStrikeSkin(Type.MINESTRIKE, MineStrikeSkin.P2000_Fire_Elemental, rarity, 100, 500);
@ -319,9 +319,9 @@ public class RewardManager
addMineStrikeSkin(Type.MINESTRIKE, MineStrikeSkin.Steyr_AUG_Torque, rarity, 100, 500); addMineStrikeSkin(Type.MINESTRIKE, MineStrikeSkin.Steyr_AUG_Torque, rarity, 100, 500);
// Balloons // Balloons
addBalloon(Type.NORMAL, BalloonType.BABY_COW, rarity, 10, 100); /*addBalloon(Type.NORMAL, BalloonType.BABY_COW, rarity, 10, 100);
addBalloon(Type.NORMAL, BalloonType.BABY_PIG, rarity, 10, 100); addBalloon(Type.NORMAL, BalloonType.BABY_PIG, rarity, 10, 100);
addBalloon(Type.NORMAL, BalloonType.BABY_SHEEP, rarity, 15, 100); addBalloon(Type.NORMAL, BalloonType.BABY_SHEEP, rarity, 15, 100);*/
// INFUSED CHESTS // INFUSED CHESTS
addHat(Type.INFUSED_CHESTS, HatType.PRESENT, rarity, 40, 100); addHat(Type.INFUSED_CHESTS, HatType.PRESENT, rarity, 40, 100);
@ -497,22 +497,22 @@ public class RewardManager
addGadget(Type.OMEGA, getGadget(ParticleCandyCane.class), rarity, 25); addGadget(Type.OMEGA, getGadget(ParticleCandyCane.class), rarity, 25);
addBalloon(Type.OMEGA, BalloonType.BABY_ZOMBIE, rarity, 25, 500); /*addBalloon(Type.OMEGA, BalloonType.BABY_ZOMBIE, rarity, 25, 500);
addBalloon(Type.OMEGA, BalloonType.BABY_MUSHROOM, rarity, 50, 500); addBalloon(Type.OMEGA, BalloonType.BABY_MUSHROOM, rarity, 50, 500);
addBalloon(Type.OMEGA, BalloonType.BABY_OCELOT, rarity, 50, 500); addBalloon(Type.OMEGA, BalloonType.BABY_OCELOT, rarity, 50, 500);
addBalloon(Type.OMEGA, BalloonType.BABY_WOLF, rarity, 75, 500); addBalloon(Type.OMEGA, BalloonType.BABY_WOLF, rarity, 75, 500);
addBalloon(Type.OMEGA, BalloonType.BABY_VILLAGER, rarity, 25, 500); addBalloon(Type.OMEGA, BalloonType.BABY_VILLAGER, rarity, 25, 500);
addBalloon(Type.OMEGA, BalloonType.BABY_SLIME, rarity, 25, 500); addBalloon(Type.OMEGA, BalloonType.BABY_SLIME, rarity, 25, 500);
addBalloon(Type.OMEGA, BalloonType.BAT, rarity, 50, 500); addBalloon(Type.OMEGA, BalloonType.BAT, rarity, 50, 500);*/
// Balloons // Balloons
addBalloon(Type.NORMAL, BalloonType.BABY_ZOMBIE, rarity, 25, 500); /*addBalloon(Type.NORMAL, BalloonType.BABY_ZOMBIE, rarity, 25, 500);
addBalloon(Type.NORMAL, BalloonType.BABY_MUSHROOM, rarity, 50, 500); addBalloon(Type.NORMAL, BalloonType.BABY_MUSHROOM, rarity, 50, 500);
addBalloon(Type.NORMAL, BalloonType.BABY_OCELOT, rarity, 50, 500); addBalloon(Type.NORMAL, BalloonType.BABY_OCELOT, rarity, 50, 500);
addBalloon(Type.NORMAL, BalloonType.BABY_WOLF, rarity, 75, 500); addBalloon(Type.NORMAL, BalloonType.BABY_WOLF, rarity, 75, 500);
addBalloon(Type.NORMAL, BalloonType.BABY_VILLAGER, rarity, 25, 500); addBalloon(Type.NORMAL, BalloonType.BABY_VILLAGER, rarity, 25, 500);
addBalloon(Type.NORMAL, BalloonType.BABY_SLIME, rarity, 25, 500); addBalloon(Type.NORMAL, BalloonType.BABY_SLIME, rarity, 25, 500);
addBalloon(Type.NORMAL, BalloonType.BAT, rarity, 50, 500); addBalloon(Type.NORMAL, BalloonType.BAT, rarity, 50, 500);*/
// HAUNTED CHEST // HAUNTED CHEST
addGadget(Type.HAUNTED, getGadget(DoubleJumpHalloween.class), rarity, 10); addGadget(Type.HAUNTED, getGadget(DoubleJumpHalloween.class), rarity, 10);
@ -703,24 +703,24 @@ public class RewardManager
addHat(Type.OMEGA, HatType.GRINCH, rarity, 25); addHat(Type.OMEGA, HatType.GRINCH, rarity, 25);
addBalloon(Type.OMEGA, BalloonType.SQUID, rarity, 10, 5000); /*addBalloon(Type.OMEGA, BalloonType.SQUID, rarity, 10, 5000);
addBalloon(Type.OMEGA, BalloonType.SILVERFISH, rarity, 30, 5000); addBalloon(Type.OMEGA, BalloonType.SILVERFISH, rarity, 30, 5000);
addBalloon(Type.OMEGA, BalloonType.GUARDIAN, rarity, 30, 5000); addBalloon(Type.OMEGA, BalloonType.GUARDIAN, rarity, 30, 5000);
/*addBalloon(Type.OMEGA, BalloonType.DRAGON_EGG, rarity, 10, 5000); addBalloon(Type.OMEGA, BalloonType.DRAGON_EGG, rarity, 10, 5000);
addBalloon(Type.OMEGA, BalloonType.DIAMOND_BLOCK, rarity, 10, 5000); addBalloon(Type.OMEGA, BalloonType.DIAMOND_BLOCK, rarity, 10, 5000);
addBalloon(Type.OMEGA, BalloonType.IRON_BLOCK, rarity, 20, 5000); addBalloon(Type.OMEGA, BalloonType.IRON_BLOCK, rarity, 20, 5000);
addBalloon(Type.OMEGA, BalloonType.GOLD_BLOCK, rarity, 30, 5000);*/ addBalloon(Type.OMEGA, BalloonType.GOLD_BLOCK, rarity, 30, 5000);
addBalloon(Type.OMEGA, BalloonType.EMERALD_BLOCK, rarity, 15, 5000); addBalloon(Type.OMEGA, BalloonType.EMERALD_BLOCK, rarity, 15, 5000);*/
// Balloon // Balloon
addBalloon(Type.NORMAL, BalloonType.SQUID, rarity, 10, 5000); /*addBalloon(Type.NORMAL, BalloonType.SQUID, rarity, 10, 5000);
addBalloon(Type.NORMAL, BalloonType.SILVERFISH, rarity, 30, 5000); addBalloon(Type.NORMAL, BalloonType.SILVERFISH, rarity, 30, 5000);
addBalloon(Type.NORMAL, BalloonType.GUARDIAN, rarity, 30, 5000); addBalloon(Type.NORMAL, BalloonType.GUARDIAN, rarity, 30, 5000);
/*addBalloon(Type.NORMAL, BalloonType.DRAGON_EGG, rarity, 10, 5000); addBalloon(Type.NORMAL, BalloonType.DRAGON_EGG, rarity, 10, 5000);
addBalloon(Type.NORMAL, BalloonType.DIAMOND_BLOCK, rarity, 10, 5000); addBalloon(Type.NORMAL, BalloonType.DIAMOND_BLOCK, rarity, 10, 5000);
addBalloon(Type.NORMAL, BalloonType.IRON_BLOCK, rarity, 20, 5000); addBalloon(Type.NORMAL, BalloonType.IRON_BLOCK, rarity, 20, 5000);
addBalloon(Type.NORMAL, BalloonType.GOLD_BLOCK, rarity, 30, 5000);*/ addBalloon(Type.NORMAL, BalloonType.GOLD_BLOCK, rarity, 30, 5000);
addBalloon(Type.NORMAL, BalloonType.EMERALD_BLOCK, rarity, 15, 5000); addBalloon(Type.NORMAL, BalloonType.EMERALD_BLOCK, rarity, 15, 5000);*/
// HAUNTED // HAUNTED
addPetReward(Type.HAUNTED, PetType.RABBIT, rarity, 100); addPetReward(Type.HAUNTED, PetType.RABBIT, rarity, 100);
@ -855,7 +855,7 @@ public class RewardManager
return addGadget(type, gadget, gadget.getDisplayName(), rarity, weight, shards); return addGadget(type, gadget, gadget.getDisplayName(), rarity, weight, shards);
} }
public UnknownPackageReward addBalloon(Type type, BalloonType balloonType, RewardRarity rarity, int weight) /*public UnknownPackageReward addBalloon(Type type, BalloonType balloonType, RewardRarity rarity, int weight)
{ {
return addBalloon(type, balloonType, rarity, weight, getShards(rarity)); return addBalloon(type, balloonType, rarity, weight, getShards(rarity));
} }
@ -864,7 +864,7 @@ public class RewardManager
{ {
Gadget gadget = _gadgetManager.getBalloonGadget(balloonType); Gadget gadget = _gadgetManager.getBalloonGadget(balloonType);
return addGadget(type, gadget, gadget.getDisplayName(), rarity, weight, shards); return addGadget(type, gadget, gadget.getDisplayName(), rarity, weight, shards);
} }*/
public InventoryReward addInventoryReward(RewardPool.Type type, ItemGadget gadget, RewardRarity rarity, int weight) public InventoryReward addInventoryReward(RewardPool.Type type, ItemGadget gadget, RewardRarity rarity, int weight)
{ {