Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

fate peddler work

Browse Source
This commit is contained in:
FatBoy-DOTC
2023-08-08 20:37:31 -05:00
parent 04fcdd2545
commit d53bf0f66e
2 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/LootManager.java
+39 -14
View File
@@ -13,6 +13,7 @@ import engine.loot.*;
import engine.net.DispatchMessage; import engine.net.DispatchMessage;
import engine.net.client.msg.chat.ChatSystemMsg; import engine.net.client.msg.chat.ChatSystemMsg;
import engine.objects.*; import engine.objects.*;
import engine.server.MBServerStatics;
import org.pmw.tinylog.Logger; import org.pmw.tinylog.Logger;
import java.util.ArrayList; import java.util.ArrayList;
@@ -148,7 +149,7 @@ public enum LootManager {
MobLoot outItem; MobLoot outItem;
int genRoll = new Random().nextInt(99) + 1; int genRoll = ThreadLocalRandom.current().nextInt(1,100 + 1);
GenTableEntry selectedRow = GenTableEntry.rollTable(genTableID, genRoll); GenTableEntry selectedRow = GenTableEntry.rollTable(genTableID, genRoll);
@@ -161,11 +162,14 @@ public enum LootManager {
return null; return null;
//gets the 1-320 roll for this mob //gets the 1-320 roll for this mob
int itemTableRoll = 0;
int itemTableRoll = TableRoll(mob.level, inHotzone); int objectType = mob.getObjectType().ordinal();
if(mob.getObjectType().ordinal() == 52) { //52 = player character
itemTableRoll = ThreadLocalRandom.current().nextInt(1,320 + 1);
} else{
itemTableRoll = TableRoll(mob.level, inHotzone);
}
ItemTableEntry tableRow = ItemTableEntry.rollTable(itemTableId, itemTableRoll); ItemTableEntry tableRow = ItemTableEntry.rollTable(itemTableId, itemTableRoll);
if (tableRow == null) if (tableRow == null)
return null; return null;
@@ -215,8 +219,13 @@ public enum LootManager {
if (prefixTable == null) if (prefixTable == null)
return inItem; return inItem;
int prefixTableRoll = 0;
ModTableEntry prefixMod = ModTableEntry.rollTable(prefixTable.modTableID, TableRoll(mob.level, inHotzone)); if(mob.getObjectType().ordinal() == 52) {
prefixTableRoll = ThreadLocalRandom.current().nextInt(1,320 + 1);
} else{
prefixTableRoll = TableRoll(mob.level, inHotzone);
}
ModTableEntry prefixMod = ModTableEntry.rollTable(prefixTable.modTableID, prefixTableRoll);
if (prefixMod == null) if (prefixMod == null)
return inItem; return inItem;
@@ -242,8 +251,13 @@ public enum LootManager {
if (suffixTable == null) if (suffixTable == null)
return inItem; return inItem;
int suffixTableRoll = 0;
ModTableEntry suffixMod = ModTableEntry.rollTable(suffixTable.modTableID, TableRoll(mob.level, inHotzone)); if(mob.getObjectType().ordinal() == 52) {
suffixTableRoll = ThreadLocalRandom.current().nextInt(1,320 + 1);
} else{
suffixTableRoll = TableRoll(mob.level, inHotzone);
}
ModTableEntry suffixMod = ModTableEntry.rollTable(suffixTable.modTableID, suffixTableRoll);
if (suffixMod == null) if (suffixMod == null)
return inItem; return inItem;
@@ -361,17 +375,28 @@ public enum LootManager {
if (lootItem != null) if (lootItem != null)
mob.getCharItemManager().addItemToInventory(lootItem); mob.getCharItemManager().addItemToInventory(lootItem);
} }
public static void peddleFate(AbstractCharacter character, int giftID){ public static void peddleFate(AbstractCharacter character, Item gift){
int tableID = 0; if(character.getCharItemManager().inventoryContains(gift)){
if(LootManager._bootySetMap.get(giftID) != null) { character.getCharItemManager().getInventory().remove(gift) ;
tableID = LootManager._bootySetMap.get(giftID).get(ThreadLocalRandom.current().nextInt(1, LootManager._bootySetMap.get(giftID).size() - 1)).genTable;
} else{ } else{
character.getCharItemManager().updateInventory();
return; return;
} }
int tableID = 3010;
//if(LootManager._bootySetMap.get(giftID) != null) {
// tableID = LootManager._bootySetMap.get(giftID).get(ThreadLocalRandom.current().nextInt(1, LootManager._bootySetMap.get(giftID).size() - 1)).genTable;
//} else{
// return;
//}
MobLoot gamblingResult= getGenTableItem(tableID,character,false); MobLoot gamblingResult= getGenTableItem(tableID,character,false);
Item winnings;
if(gamblingResult != null){ if(gamblingResult != null){
gamblingResult.promoteToItem((PlayerCharacter)character); winnings = gamblingResult.promoteToItem(PlayerCharacter.getPlayerCharacter(character.getObjectUUID()));
} else{
winnings = new MobLoot(character, ItemBase.getItemBase(1580008), 1, false);//item ID is coal set to amount of 1
} }
character.getCharItemManager().updateInventory(winnings,true);
} }
} }
src/engine/net/client/handlers/ObjectActionMsgHandler.java
+1 -1
View File
@@ -442,7 +442,7 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
//} //}
// Garbage method removed until rewritten. // Garbage method removed until rewritten.
// LootTable.CreateGamblerItem(item, player); // LootTable.CreateGamblerItem(item, player);
LootManager.peddleFate(player,item.getItemBaseID()); LootManager.peddleFate(player,item);
break; break;
case 30: //water bucket case 30: //water bucket