diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar index a679fe0..a85182c 100644 Binary files a/TwosideKeeper.jar and b/TwosideKeeper.jar differ diff --git a/src/plugin.yml b/src/plugin.yml index fb68966..cef3e6a 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,6 +1,6 @@ name: TwosideKeeper main: sig.plugin.TwosideKeeper.TwosideKeeper -version: 3.8.5a +version: 3.8.5ar1 commands: money: description: Tells the player the amount of money they are holding. diff --git a/src/sig/plugin/TwosideKeeper/HelperStructures/Common/CustomRecipe.java b/src/sig/plugin/TwosideKeeper/HelperStructures/Common/CustomRecipe.java new file mode 100644 index 0000000..e1205ea --- /dev/null +++ b/src/sig/plugin/TwosideKeeper/HelperStructures/Common/CustomRecipe.java @@ -0,0 +1,5 @@ +package sig.plugin.TwosideKeeper.HelperStructures.Common; + +public enum CustomRecipe { + +} diff --git a/src/sig/plugin/TwosideKeeper/HelperStructures/ItemSet.java b/src/sig/plugin/TwosideKeeper/HelperStructures/ItemSet.java index 17208c0..f76bb17 100644 --- a/src/sig/plugin/TwosideKeeper/HelperStructures/ItemSet.java +++ b/src/sig/plugin/TwosideKeeper/HelperStructures/ItemSet.java @@ -91,7 +91,6 @@ public enum ItemSet { int oldtier=GetTier(item); //TwosideKeeper.log("In lore: "+lore.get(i)+". Old tier: "+oldtier,2); lore.set(i, lore.get(i).replace("T"+oldtier, "T"+tier)); - GenericFunctions.UpdateItemLore(item); //Update this item now that we upgraded the tier. found=true; break; } @@ -99,6 +98,7 @@ public enum ItemSet { ItemMeta m = item.getItemMeta(); m.setLore(lore); item.setItemMeta(m); + GenericFunctions.UpdateItemLore(item); //Update this item now that we upgraded the tier. } if (!found) { TwosideKeeper.log(ChatColor.RED+"[ERROR] Could not detect proper tier of "+item.toString()+"!", 1); @@ -324,4 +324,31 @@ public enum ItemSet { } return lore; } + + public static void SetItemSet(ItemStack item, ItemSet set) { + //Convert this item to a different set. + boolean found=false; + if (isSetItem(item) && + item.getItemMeta().hasLore()) { + List lore = item.getItemMeta().getLore(); + for (int i=0;i lore = new ArrayList(); int type = (int)(Math.random()*3); if (item.getType().name().contains("LEATHER") || item.getType()==Material.BOW) { type=4+(int)(Math.random()*4); } - String set_name = ""; - String prefix = ""; - prefix = (hardened)?(ChatColor.LIGHT_PURPLE+""+ChatColor.BOLD+"Hardened Mega "):(ChatColor.AQUA+""+ChatColor.BOLD+"Mega "); ItemSet set = null; switch (type) { case 0:{ set = ItemSet.PANROS; - tierbonus = modifyTierBonus(item,tierbonus); - set_name = prefix+"Panros Striker "+GenericFunctions.UserFriendlyMaterialName(item.getType()); //Striker set. }break; case 1:{ set = ItemSet.SONGSTEEL; + }break; + case 2:{ + set = ItemSet.DAWNTRACKER; + }break; + case 3:{ + set = ItemSet.LORASYS; + }break; + case 4:{ + set = ItemSet.JAMDAK; + }break; + case 5:{ + set = ItemSet.DARNYS; + }break; + case 6:{ + set = ItemSet.ALIKAHN; + }break; + case 7:{ + set = ItemSet.LORASAADI; + }break; + default: + set = ItemSet.PANROS; + } + return GenerateSetPiece(item,set,hardened,tierbonus); + } + + public static ItemStack GenerateSetPiece(Material item, ItemSet set, boolean hardened, int tierbonus) { + return GenerateSetPiece(new ItemStack(item),set,hardened,tierbonus); + } + + public static ItemStack GenerateSetPiece(ItemStack item, ItemSet set, boolean hardened, int tierbonus) { + List lore = new ArrayList(); + String set_name = ""; + String prefix = ""; + prefix = (hardened)?(ChatColor.LIGHT_PURPLE+""+ChatColor.BOLD+"Hardened Mega "):(ChatColor.AQUA+""+ChatColor.BOLD+"Mega "); + switch (set) { + case PANROS:{ + tierbonus = modifyTierBonus(item,tierbonus); + set_name = prefix+"Panros Striker "+GenericFunctions.UserFriendlyMaterialName(item.getType()); //Striker set. + }break; + case SONGSTEEL:{ if (item.getType().toString().contains("SWORD")) { item.setType(Material.SHIELD); + tierbonus/=2; } tierbonus = modifyTierBonus(item,tierbonus); set_name = prefix+"Songsteel Defender "+GenericFunctions.UserFriendlyMaterialName(item.getType()); //Defender set. }break; - case 2:{ - set = ItemSet.DAWNTRACKER; + case DAWNTRACKER:{ if (item.getType().toString().contains("SWORD")) { item.setType(Material.valueOf(item.getType().toString().replace("SWORD","")+"AXE")); } tierbonus = modifyTierBonus(item,tierbonus); set_name = prefix+"Dawntracker Barbarian "+GenericFunctions.UserFriendlyMaterialName(item.getType()); }break; - case 3:{ - set = ItemSet.LORASYS; + case LORASYS:{ if (item.getType().toString().contains("SWORD")) { //Convert Slayer weapon here. ??? } tierbonus = modifyTierBonus(item,tierbonus); set_name = prefix+"Lorasys Slayer "+GenericFunctions.UserFriendlyMaterialName(item.getType()); }break; - case 4:{ - set = ItemSet.JAMDAK; + case JAMDAK:{ if (item.getType().toString().contains("SWORD")) { item.setType(Material.BOW); + tierbonus/=2; } set_name = prefix+"Jamdak Ranger "+GenericFunctions.UserFriendlyMaterialName(item.getType()); if (Math.random()<=0.5 && tierbonus<2) { tierbonus+=2; } }break; - case 5:{ - set = ItemSet.DARNYS; + case DARNYS:{ if (item.getType().toString().contains("SWORD")) { - //Convert Slayer weapon here. ??? + item.setType(Material.BOW); + tierbonus/=2; } set_name = prefix+"Darnys Ranger "+GenericFunctions.UserFriendlyMaterialName(item.getType()); if (Math.random()<=0.5 && tierbonus<1) { tierbonus+=1; } }break; - case 6:{ - set = ItemSet.ALIKAHN; + case ALIKAHN:{ if (item.getType().toString().contains("SWORD")) { - //Convert Slayer weapon here. ??? + item.setType(Material.BOW); + tierbonus/=2; } set_name = prefix+"Alikahn Ranger "+GenericFunctions.UserFriendlyMaterialName(item.getType()); if (Math.random()<=0.1 && tierbonus<1) { tierbonus+=1; } }break; - case 7:{ - set = ItemSet.LORASAADI; + case LORASAADI:{ if (item.getType().toString().contains("SWORD")) { - //Convert Slayer weapon here. ??? + item.setType(Material.BOW); + tierbonus/=2; } set_name = prefix+"Lorasaadi Ranger "+GenericFunctions.UserFriendlyMaterialName(item.getType()); if (tierbonus>0 && Math.random()<=0.5) { diff --git a/src/sig/plugin/TwosideKeeper/MonsterController.java b/src/sig/plugin/TwosideKeeper/MonsterController.java index 95989d9..b43ec80 100644 --- a/src/sig/plugin/TwosideKeeper/MonsterController.java +++ b/src/sig/plugin/TwosideKeeper/MonsterController.java @@ -362,8 +362,12 @@ public class MonsterController { int patterns = (int)(Math.random()*7)+1; List patternlist = new ArrayList(); for (int i=0;i patternlist = new ArrayList(); for (int i=0;i patternlist = new ArrayList(); for (int i=0;i