Project cleanup pre merge.

This commit is contained in:
2023-07-15 09:23:48 -04:00
parent 134b651df8
commit 9bbdef224d
747 changed files with 99704 additions and 101200 deletions
+108 -83
View File
@@ -16,11 +16,11 @@ import engine.gameManager.ZoneManager;
import engine.net.DispatchMessage;
import engine.net.client.msg.chat.ChatSystemMsg;
import engine.objects.*;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.Random;
import java.util.concurrent.ThreadLocalRandom;
@@ -30,12 +30,14 @@ import java.util.concurrent.ThreadLocalRandom;
public class LootManager {
//new tables
private static final HashMap<Integer,GenTable> generalItemTables = new HashMap<>();
private static final HashMap<Integer,ItemTable> itemTables = new HashMap<>();
private static final HashMap<Integer,ModTypeTable> modTypeTables = new HashMap<>();
private static final HashMap<Integer,ModTable> modTables = new HashMap<>();
private static final HashMap<Integer, GenTable> generalItemTables = new HashMap<>();
private static final HashMap<Integer, ItemTable> itemTables = new HashMap<>();
private static final HashMap<Integer, ModTypeTable> modTypeTables = new HashMap<>();
private static final HashMap<Integer, ModTable> modTables = new HashMap<>();
private LootManager() {
}
private LootManager() {}
// Bootstrap routine to load loot data from database
public static void loadLootData() {
DbManager.LootQueries.LOAD_ALL_LOOTGROUPS();
@@ -43,7 +45,8 @@ public class LootManager {
DbManager.LootQueries.LOAD_ALL_MODGROUPS();
DbManager.LootQueries.LOAD_ALL_MODTABLES();
}
public static void GenerateMobLoot(Mob mob, boolean fromDeath){
public static void GenerateMobLoot(Mob mob, boolean fromDeath) {
//determine if mob is in hotzone
boolean inHotzone = ZoneManager.inHotZone(mob.getLoc());
//get multiplier form config manager
@@ -53,14 +56,14 @@ public class LootManager {
multiplier = Float.parseFloat(ConfigManager.MB_HOTZONE_DROP_RATE.getValue());
}
//iterate the booty sets
if(mob.getMobBase().bootySet != 0 && NPCManager._bootySetMap.containsKey(mob.getMobBase().bootySet)) {
if (mob.getMobBase().bootySet != 0 && NPCManager._bootySetMap.containsKey(mob.getMobBase().bootySet)) {
RunBootySet(NPCManager._bootySetMap.get(mob.getMobBase().bootySet), mob, multiplier, inHotzone, fromDeath);
}
if(mob.bootySet != 0) {
if (mob.bootySet != 0) {
RunBootySet(NPCManager._bootySetMap.get(mob.bootySet), mob, multiplier, inHotzone, fromDeath);
}
//lastly, check mobs inventory for godly or disc runes to send a server announcement
if(!fromDeath) {
if (!fromDeath) {
for (Item it : mob.getInventory()) {
ItemBase ib = it.getItemBase();
if (ib.isDiscRune() || ib.getName().toLowerCase().contains("of the gods")) {
@@ -72,16 +75,17 @@ public class LootManager {
}
}
}
private static void RunBootySet(ArrayList<BootySetEntry> entries, Mob mob, float multiplier, boolean inHotzone, boolean fromDeath) {
if(fromDeath){
if (fromDeath) {
//do equipment here
if (mob.getEquip() != null){
for (MobEquipment me : mob.getEquip().values()){
if (mob.getEquip() != null) {
for (MobEquipment me : mob.getEquip().values()) {
if (me.getDropChance() == 0)
continue;
float equipmentRoll = ThreadLocalRandom.current().nextFloat();
float dropChance = me.getDropChance();
if (equipmentRoll < dropChance * multiplier){
if (equipmentRoll < dropChance * multiplier) {
MobLoot ml = new MobLoot(mob, me.getItemBase(), false);
mob.getCharItemManager().addItemToInventory(ml);
}
@@ -131,170 +135,185 @@ public class LootManager {
}
}
}
public static MobLoot getGenTableItem(int genTableID, Mob mob){
if(genTableID == 0 ||mob == null || generalItemTables.containsKey(genTableID) == false){
public static MobLoot getGenTableItem(int genTableID, Mob mob) {
if (genTableID == 0 || mob == null || generalItemTables.containsKey(genTableID) == false) {
return null;
}
MobLoot outItem;
int roll = new Random().nextInt(101);
GenTableRow selectedRow = generalItemTables.get(genTableID).getRowForRange(roll);
if(selectedRow == null) {
return null;
if (selectedRow == null) {
return null;
}
int itemTableId = selectedRow.itemTableID;
int minRollRange = mob.getLevel() + roll + mob.getParentZone().minLvl;
//add 20 to max roll range to make dwarven HA and Sage possible
int maxRollRange = (mob.getLevel() * 2) + roll + 20 + (mob.getParentZone().maxLvl * 2);
if(maxRollRange > 320){
if (maxRollRange > 320) {
maxRollRange = 320;
}
int roll2 = new Random().nextInt(maxRollRange- minRollRange) + minRollRange;
int roll2 = new Random().nextInt(maxRollRange - minRollRange) + minRollRange;
ItemTableRow tableRow = itemTables.get(itemTableId).getRowForRange(roll2);
if(tableRow == null){
if (tableRow == null) {
return null;
}
int itemUUID = tableRow.cacheID;
if(itemUUID == 0){
if (itemUUID == 0) {
return null;
}
if(ItemBase.getItemBase(itemUUID).getType().ordinal() == Enum.ItemType.RESOURCE.ordinal()){
if (ItemBase.getItemBase(itemUUID).getType().ordinal() == Enum.ItemType.RESOURCE.ordinal()) {
int amount = ThreadLocalRandom.current().nextInt(tableRow.maxSpawn - tableRow.minSpawn) + tableRow.minSpawn;
return new MobLoot(mob, ItemBase.getItemBase(itemUUID),amount, false);
return new MobLoot(mob, ItemBase.getItemBase(itemUUID), amount, false);
}
outItem = new MobLoot(mob, ItemBase.getItemBase(itemUUID), false);
Enum.ItemType outType = outItem.getItemBase().getType();
if(outType.ordinal() == Enum.ItemType.WEAPON.ordinal() || outType.ordinal() == Enum.ItemType.ARMOR.ordinal() || outType.ordinal() == Enum.ItemType.JEWELRY.ordinal()) {
if(outItem.getItemBase().isGlass() == false) {
ModTypeTable prefixTable = modTypeTables.get(selectedRow.pModTable);
ModTypeTable suffixTable = modTypeTables.get(selectedRow.sModTable);
if (modTables.get(prefixTable.getRowForRange(100).modTableID) != null) {
ModTable prefixModTable = modTables.get(prefixTable.getRowForRange(100).modTableID);
ModTableRow prefixMod = prefixModTable.getRowForRange(new Random().nextInt(maxRollRange) + minRollRange);
if (prefixMod != null && prefixMod.action.length() > 0) {
outItem.setPrefix(prefixMod.action);
outItem.addPermanentEnchantment(prefixMod.action, 0, prefixMod.level, true);
}
}
if (modTables.get(suffixTable.getRowForRange(100).modTableID) != null) {
ModTable suffixModTable = modTables.get(suffixTable.getRowForRange(100).modTableID);
ModTableRow suffixMod = suffixModTable.getRowForRange(new Random().nextInt(maxRollRange) + minRollRange);
if (suffixMod != null && suffixMod.action.length() > 0) {
outItem.setSuffix(suffixMod.action);
outItem.addPermanentEnchantment(suffixMod.action, 0, suffixMod.level, true);
}
}
}
if (outType.ordinal() == Enum.ItemType.WEAPON.ordinal() || outType.ordinal() == Enum.ItemType.ARMOR.ordinal() || outType.ordinal() == Enum.ItemType.JEWELRY.ordinal()) {
if (outItem.getItemBase().isGlass() == false) {
ModTypeTable prefixTable = modTypeTables.get(selectedRow.pModTable);
ModTypeTable suffixTable = modTypeTables.get(selectedRow.sModTable);
if (modTables.get(prefixTable.getRowForRange(100).modTableID) != null) {
ModTable prefixModTable = modTables.get(prefixTable.getRowForRange(100).modTableID);
ModTableRow prefixMod = prefixModTable.getRowForRange(new Random().nextInt(maxRollRange) + minRollRange);
if (prefixMod != null && prefixMod.action.length() > 0) {
outItem.setPrefix(prefixMod.action);
outItem.addPermanentEnchantment(prefixMod.action, 0, prefixMod.level, true);
}
}
if (modTables.get(suffixTable.getRowForRange(100).modTableID) != null) {
ModTable suffixModTable = modTables.get(suffixTable.getRowForRange(100).modTableID);
ModTableRow suffixMod = suffixModTable.getRowForRange(new Random().nextInt(maxRollRange) + minRollRange);
if (suffixMod != null && suffixMod.action.length() > 0) {
outItem.setSuffix(suffixMod.action);
outItem.addPermanentEnchantment(suffixMod.action, 0, suffixMod.level, true);
}
}
}
}
return outItem;
}
public static void AddGenTableRow(int tableID,GenTableRow row){
if(!generalItemTables.containsKey(tableID)){
public static void AddGenTableRow(int tableID, GenTableRow row) {
if (!generalItemTables.containsKey(tableID)) {
//create the new table
GenTable gt = new GenTable();
gt.rows.add(row);
generalItemTables.put(tableID,gt);
} else{
generalItemTables.put(tableID, gt);
} else {
//add row to existing table
GenTable toAdd = generalItemTables.get(tableID);
toAdd.rows.add(row);
}
}
public static void AddItemTableRow(int tableID, ItemTableRow row){
if(!itemTables.containsKey(tableID)){
public static void AddItemTableRow(int tableID, ItemTableRow row) {
if (!itemTables.containsKey(tableID)) {
//create the new table
ItemTable it = new ItemTable();
it.rows.add(row);
itemTables.put(tableID,it);
} else{
itemTables.put(tableID, it);
} else {
//add row to existing table
ItemTable toAdd = itemTables.get(tableID);
toAdd.rows.add(row);
}
}
public static void AddModTypeTableRow(int tableID, ModTypeTableRow row){
if(!modTypeTables.containsKey(tableID)){
public static void AddModTypeTableRow(int tableID, ModTypeTableRow row) {
if (!modTypeTables.containsKey(tableID)) {
//create the new table
ModTypeTable mtt = new ModTypeTable();
mtt.rows.add(row);
modTypeTables.put(tableID,mtt);
} else{
modTypeTables.put(tableID, mtt);
} else {
//add row to existing table
ModTypeTable toAdd = modTypeTables.get(tableID);
toAdd.rows.add(row);
}
}
public static void AddModTableRow(int tableID,ModTableRow row){
if(!modTables.containsKey(tableID)){
public static void AddModTableRow(int tableID, ModTableRow row) {
if (!modTables.containsKey(tableID)) {
//create the new table
ModTable mt = new ModTable();
mt.rows.add(row);
modTables.put(tableID,mt);
} else{
modTables.put(tableID, mt);
} else {
//add row to existing table
ModTable toAdd = modTables.get(tableID);
toAdd.rows.add(row);
}
}
public static class GenTable{
public static class GenTable {
public ArrayList<GenTableRow> rows = new ArrayList<GenTableRow>();
public GenTableRow getRowForRange(int roll){
public GenTableRow getRowForRange(int roll) {
GenTableRow outRow = null;
for(GenTableRow iteration : this.rows){
if(roll >= iteration.minRoll && roll <= iteration.maxRoll){
for (GenTableRow iteration : this.rows) {
if (roll >= iteration.minRoll && roll <= iteration.maxRoll) {
outRow = iteration;
}
}
return outRow;
}
}
public static class ItemTable{
public static class ItemTable {
public ArrayList<ItemTableRow> rows = new ArrayList<ItemTableRow>();
public ItemTableRow getRowForRange(int roll){
if(roll > 320){
public ItemTableRow getRowForRange(int roll) {
if (roll > 320) {
roll = 320;
}
ItemTableRow outRow = null;
for(ItemTableRow iteration : this.rows){
if(roll >= iteration.minRoll && roll <= iteration.maxRoll){
for (ItemTableRow iteration : this.rows) {
if (roll >= iteration.minRoll && roll <= iteration.maxRoll) {
outRow = iteration;
}
}
return outRow;
}
}
public static class ModTypeTable{
public static class ModTypeTable {
public ArrayList<ModTypeTableRow> rows = new ArrayList<ModTypeTableRow>();
public ModTypeTableRow getRowForRange(int roll){
public ModTypeTableRow getRowForRange(int roll) {
ModTypeTableRow outRow = null;
for(ModTypeTableRow iteration : this.rows){
if(roll >= iteration.minRoll && roll <= iteration.maxRoll){
for (ModTypeTableRow iteration : this.rows) {
if (roll >= iteration.minRoll && roll <= iteration.maxRoll) {
return iteration;
}
}
return outRow;
}
}
public static class ModTable{
public static class ModTable {
public ArrayList<ModTableRow> rows = new ArrayList<ModTableRow>();
public ModTableRow getRowForRange(int roll){
if(roll > 320){
public ModTableRow getRowForRange(int roll) {
if (roll > 320) {
roll = 320;
}
ModTableRow outRow = null;
for(ModTableRow iteration : this.rows){
if(roll >= iteration.minRoll && roll <= iteration.maxRoll){
for (ModTableRow iteration : this.rows) {
if (roll >= iteration.minRoll && roll <= iteration.maxRoll) {
outRow = iteration;
}
}
return outRow;
}
}
public static class GenTableRow{
public static class GenTableRow {
public int minRoll;
public int maxRoll;
public int itemTableID;
public int pModTable;
public int sModTable;
public GenTableRow(ResultSet rs) throws SQLException {
this.minRoll = rs.getInt("minRoll");
this.maxRoll = rs.getInt("maxRoll");
@@ -303,12 +322,14 @@ public class LootManager {
this.sModTable = rs.getInt("sModTableID");
}
}
public static class ItemTableRow{
public static class ItemTableRow {
public int minRoll;
public int maxRoll;
public int cacheID;
public int minSpawn;
public int maxSpawn;
public ItemTableRow(ResultSet rs) throws SQLException {
this.minRoll = rs.getInt("minRoll");
this.maxRoll = rs.getInt("maxRoll");
@@ -318,10 +339,12 @@ public class LootManager {
}
}
public static class ModTypeTableRow{
public static class ModTypeTableRow {
public int minRoll;
public int maxRoll;
public int modTableID;
public ModTypeTableRow(ResultSet rs) throws SQLException {
this.minRoll = rs.getInt("minRoll");
this.maxRoll = rs.getInt("maxRoll");
@@ -329,11 +352,13 @@ public class LootManager {
}
}
public static class ModTableRow{
public static class ModTableRow {
public int minRoll;
public int maxRoll;
public String action;
public int level;
public ModTableRow(ResultSet rs) throws SQLException {
this.minRoll = rs.getInt("minRoll");
this.maxRoll = rs.getInt("maxRoll");