MagicBane
/
Server
92
0
Fork 2
Code Issues 7 Pull Requests Projects Releases Wiki Activity
Browse Source

fix resource drops

lakebane-recovery
FatBoy-DOTC 4 days ago
parent
ff20c1ed7e
commit
4ab053ec82
2 changed files with 115 additions and 107 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 113
      src/engine/gameManager/LootManager.java
  2. 109
      src/engine/gameManager/SpecialLootHandler.java

113
src/engine/gameManager/LootManager.java
Unescape View File

@ -92,6 +92,7 @@ public enum LootManager { @@ -92,6 +92,7 @@ public enum LootManager {
SpecialLootHandler.RollGlass(mob);
SpecialLootHandler.RollRune(mob);
SpecialLootHandler.RollRacialGuard(mob);
SpecialLootHandler.ResourceDrop(mob);
}
//determine if mob is in hotzone
@ -186,90 +187,6 @@ public enum LootManager { @@ -186,90 +187,6 @@ public enum LootManager {
}
}
public static void SpecialCaseContractDrop(Mob mob,ArrayList<BootySetEntry> entries){
int lootTableID = 0;
for(BootySetEntry entry : entries){
if(entry.bootyType.equals("LOOT")){
lootTableID = entry.genTable;
break;
}
}
if(lootTableID == 0)
return;
int ContractTableID = 0;
for(GenTableEntry entry : _genTables.get(lootTableID)){
try {
if (ItemBase.getItemBase(_itemTables.get(entry.itemTableID).get(0).cacheID).getType().equals(Enum.ItemType.CONTRACT)) {
ContractTableID = entry.itemTableID;
break;
}
}catch(Exception e){
}
}
if(ContractTableID == 0)
return;
ItemBase ib = ItemBase.getItemBase(rollRandomItem(ContractTableID));
if(ib != null){
MobLoot toAdd = new MobLoot(mob,ib,false);
mob.getCharItemManager().addItemToInventory(toAdd);
}
}
public static void SpecialCaseRuneDrop(Mob mob,ArrayList<BootySetEntry> entries){
int roll = ThreadLocalRandom.current().nextInt(static_rune_ids.size() + 1);
int itemId = static_rune_ids.get(0);
try {
itemId = static_rune_ids.get(roll);
}catch(Exception e){
}
ItemBase ib = ItemBase.getItemBase(itemId);
if(ib != null){
MobLoot toAdd = new MobLoot(mob,ib,false);
mob.getCharItemManager().addItemToInventory(toAdd);
}
}
public static void SpecialCaseResourceDrop(Mob mob,ArrayList<BootySetEntry> entries){
int lootTableID = 0;
for(BootySetEntry entry : entries){
if(entry.bootyType.equals("LOOT")){
lootTableID = entry.genTable;
break;
}
}
if(lootTableID == 0)
return;
int ResourceTableID = 0;
for(GenTableEntry entry : _genTables.get(lootTableID)){
try {
if (ItemBase.getItemBase(_itemTables.get(entry.itemTableID).get(0).cacheID).getType().equals(Enum.ItemType.RESOURCE)) {
ResourceTableID = entry.itemTableID;
break;
}
}catch(Exception e){
}
}
if(ResourceTableID == 0)
return;
ItemBase ib = ItemBase.getItemBase(rollRandomItem(ResourceTableID));
if(ib != null){
MobLoot toAdd = new MobLoot(mob,ib,false);
mob.getCharItemManager().addItemToInventory(toAdd);
}
}
public static MobLoot getGenTableItem(int genTableID, AbstractCharacter mob, Boolean inHotzone) {
if (mob == null || _genTables.containsKey(genTableID) == false)
@ -305,24 +222,11 @@ public enum LootManager { @@ -305,24 +222,11 @@ public enum LootManager {
if (itemUUID == 0)
return null;
if (ItemBase.getItemBase(itemUUID).getType().equals(Enum.ItemType.RESOURCE) || ItemBase.getItemBase(itemUUID).getName().equals("Mithril")) {
if(ThreadLocalRandom.current().nextInt(1,101) < 91)
return null; // cut down world drops rates of resources by 90%
int amount = ThreadLocalRandom.current().nextInt(tableRow.minSpawn, tableRow.maxSpawn + 1);
return new MobLoot(mob, ItemBase.getItemBase(itemUUID), amount, false);
}
if(ItemBase.getItemBase(itemUUID).getType().equals(Enum.ItemType.RUNE)){
int randomRune = rollRandomItem(itemTableId);
if(randomRune != 0) {
itemUUID = randomRune;
}
} else if(ItemBase.getItemBase(itemUUID).getType().equals(Enum.ItemType.CONTRACT)){
int randomContract = rollRandomItem(itemTableId);
if(randomContract != 0) {
itemUUID = randomContract;
}
}
outItem = new MobLoot(mob, ItemBase.getItemBase(itemUUID), false);
ItemBase ib = ItemBase.getItemBase(itemUUID);
if (ib == null || ib.getType().equals(Enum.ItemType.RESOURCE) || ib.getName().equals("Mithril") || ib.getType().equals(Enum.ItemType.RUNE) || ib.getType().equals(Enum.ItemType.CONTRACT))
return null;
outItem = new MobLoot(mob, ib, false);
if(selectedRow.pModTable != 0){
try {
@ -341,11 +245,6 @@ public enum LootManager { @@ -341,11 +245,6 @@ public enum LootManager {
}
}
if(outItem.getItemBase().getType().equals(Enum.ItemType.CONTRACT) || outItem.getItemBase().getType().equals(Enum.ItemType.RUNE)){
if(ThreadLocalRandom.current().nextInt(1,101) < 66)
return null; // cut down world drops rates of resources by 65%
}
return outItem;
}

109
src/engine/gameManager/SpecialLootHandler.java
Unescape View File

@ -82,6 +82,20 @@ public class SpecialLootHandler { @@ -82,6 +82,20 @@ public class SpecialLootHandler {
1452,1500,1502,1525,1527,1550,1552,1575,1577,1600,1602,1650,1652,1700,980100,
980102
);
public static final List<Integer> gold_resources = Arrays.asList(
1580000, 1580008, 1580009, 1580010, 1580011, 1580017
);
public static final List<Integer> lumber_resources = Arrays.asList(
1580004, 1580005, 1580006, 1580007, 1580018
);
public static final List<Integer> ore_resources = Arrays.asList(
1580000, 1580001, 1580002, 1580003, 1580019
);
public static final List<Integer> magic_resources = Arrays.asList(
1580012, 1580013, 1580014, 1580015, 1580016, 1580020
);
public static void RollContract(Mob mob){
Zone zone = getMacroZone(mob);
if(zone == null)
@ -246,4 +260,99 @@ public class SpecialLootHandler { @@ -246,4 +260,99 @@ public class SpecialLootHandler {
MobLoot guard = new MobLoot(mob,guardBase,false);
mob.getCharItemManager().addItemToInventory(guard);
}
public static void ResourceDrop(Mob mob){
Zone zone = getMacroZone(mob);
if(zone == null)
return;
int resourceId = 0;
int roll = ThreadLocalRandom.current().nextInt(125);
if(roll == 75){
resourceId = getResourceForZone(zone);
}
if(resourceId == 0)
return;
ItemBase resourceBase = ItemBase.getItemBase(resourceId);
if(resourceBase == null)
return;
if(mob.getCharItemManager() == null)
return;
MobLoot resource = new MobLoot(mob,resourceBase,false);
int stackMax = (int)(Warehouse.maxResources.get(resourceId) * 0.02f);
if(stackMax > 100)
stackMax = 100;
resource.setNumOfItems(ThreadLocalRandom.current().nextInt(stackMax));
mob.getCharItemManager().addItemToInventory(resource);
}
public static int getResourceForZone(Zone zone){
Random random = new Random();
switch (zone.getObjectUUID())
{
case 178:
case 717:
case 632:
case 952:
case 475:
case 371:
case 313:
case 234:
// Ecklund Wilds // ORE MINE
// Greensward Pyre // ORE MINE
// The Black Bog // ORE MINE
// Phaedra's Prize // ORE MINE
//plain of ashes ORE MINE
// Ashfell Plain // ORE MINE
// Kharsoom // ORE MINE
// Kralgaar Holm // ORE MINE
return ore_resources.get(random.nextInt(ore_resources.size()));
case 122:
case 824:
case 737:
case 569:
case 590:
case 437:
case 388:
// Sevaath Mere // LUMBER MINE
// Grimscairne // LUMBER MINE
// Fellgrim Forest // LUMBER MINE
// Aedroch Highlands // LUMBER MINE
// Leth'khalivar Desert // LUMBER MINE
// Western Battleground // LUMBER MINE
// Aurrochs Skrae // LUMBER MINE
return lumber_resources.get(random.nextInt(lumber_resources.size()));
case 197:
case 761:
case 616:
case 951:
case 532:
case 491:
case 353:
case 331:
// The Doomplain // GOLD MINE
// Thollok Marsh // GOLD MINE
// Holloch Forest // GOLD MINE
// Tainted Swamp // GOLD MINE
//Bone Marches // GOLD MINE
// Derros Plains // GOLD MINE
// The Blood Sands // GOLD MINE
// Ymur's Crown // GOLD MINE
return gold_resources.get(random.nextInt(gold_resources.size()));
case 418:
case 842:
case 785:
case 550:
case 508:
// Aeran Belendor // MAGIC MINE
// Aerath Hellendroth // MAGIC MINE
// Vale of Nar Addad // MAGIC MINE
// Pandemonium // MAGIC MINE
// Valkos Wilds // MAGIC MINE
return magic_resources.get(random.nextInt(magic_resources.size()));
}
return 0;
}
}

Write Preview
Loading…
Cancel
Save