conco/WyvernMods
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated server/servermodlauncher, added arcanite necklace

Browse Source
This commit is contained in:
mstoppelli
2018-12-09 17:53:46 -05:00
parent ac04253f75
commit bf252ba215
37 changed files with 243 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/mod/sin/wyvern/ItemMod.java
View File

@@ -19,7 +19,6 @@ import org.gotti.wurmunlimited.modloader.classhooks.InvocationHandlerFactory;
import org.gotti.wurmunlimited.modsupport.actions.ModActions;
import com.wurmonline.server.behaviours.ActionEntry;
import com.wurmonline.server.combat.Armour;
import com.wurmonline.server.combat.Weapon;
import com.wurmonline.server.creatures.Creature;
import com.wurmonline.server.items.Item;
@@ -107,6 +106,8 @@ public class ItemMod {
public static StableContract STABLE_CONTRACT = new StableContract();
public static MoreAnchors MORE_ANCHORS = new MoreAnchors();
public static WoodEssence WOOD_ESSENCE = new WoodEssence();
public static ArcaniteNecklace ARCANITE_NECKLACE = new ArcaniteNecklace();
public static ArcaniteNecklaceFocus ARCANITE_NECKLACE_FOCUS = new ArcaniteNecklaceFocus();
public static void createItems(){
logger.info("createItems()");
@@ -144,6 +145,8 @@ public class ItemMod {
PIPING_KIT.createTemplate();
STABLE_CONTRACT.createTemplate();
WOOD_ESSENCE.createTemplate();
ARCANITE_NECKLACE.createTemplate();
ARCANITE_NECKLACE_FOCUS.createTemplate();
// Arena Fragments
@@ -228,6 +231,9 @@ public class ItemMod {
//HUGE_CRATE.initCreationEntry();
MORE_ANCHORS.initCreationEntry();
WOOD_ESSENCE.initCreationEntry();
ARCANITE_NECKLACE.initCreationEntry();
ARCANITE_NECKLACE_FOCUS.initCreationEntry();
// Spectral set
/*SPECTRAL_BOOT.initCreationEntry();
@@ -265,12 +271,12 @@ public class ItemMod {
ItemList.staffSteel, false, true, 0.0f, false, false, CreationCategories.BLADES);*/
}
public static void createCustomArmours(){
/**public static void createCustomArmours(){
try {
logger.info("Beginning custom armour creation.");
Map<Integer, Armour> armours = ReflectionUtil.getPrivateField(null, ReflectionUtil.getField(Armour.class, "armours"));
armours.put(SpectralBoot.templateId, new Armour(SpectralBoot.templateId, 0.002f, 0.3f));
armours.put(SpectralBoot.templateId, new ArmourTemplate(SpectralBoot.templateId, ArmourTemplate.ARMOUR_TYPE_LEATHER_DRAGON, 0.3f));
armours.put(SpectralCap.templateId, new Armour(SpectralCap.templateId, 0.003f, 0.3f));
armours.put(SpectralGlove.templateId, new Armour(SpectralGlove.templateId, 0.002f, 0.3f));
armours.put(SpectralHose.templateId, new Armour(SpectralHose.templateId, 0.0075f, 0.3f));
@@ -288,7 +294,7 @@ public class ItemMod {
} catch (IllegalArgumentException | IllegalAccessException | ClassCastException | NoSuchFieldException e) {
e.printStackTrace();
}
}
}**/
public static void createCustomWeapons(){
try {
@@ -479,7 +485,7 @@ public class ItemMod {
// Still need to override the method for getting spaceLeft
createCustomWeapons();
createCustomArmours();
//createCustomArmours();
// Make huge crates larger
//ItemTemplate hugeCrate = ItemTemplateFactory.getInstance().getTemplate(HUGE_CRATE.getTemplateId());

4
src/main/java/mod/sin/wyvern/WyvernMods.java
View File

@@ -140,7 +140,7 @@ implements WurmServerMod, Configurable, PreInitable, Initable, ItemTemplatesCrea
Arena.preInit();
Titans.preInit();
RareSpawns.preInit();
PlayerTitles.preInit();
//PlayerTitles.preInit();
TeleportHandler.preInit();
MethodsBestiary.preInit();
MissionCreator.preInit();
@@ -336,7 +336,7 @@ implements WurmServerMod, Configurable, PreInitable, Initable, ItemTemplatesCrea
@Override
public void onPlayerLogin(Player p) {
DatabaseHelper.onPlayerLogin(p);
PlayerTitles.awardCustomTitles(p);
//PlayerTitles.awardCustomTitles(p);
}
@Override

8
src/main/java/mod/sin/wyvern/bonusoverhaul/ItemBonusOverhaul.java
View File

@@ -10,6 +10,7 @@ import javassist.ClassPool;
import javassist.CtClass;
import javassist.NotFoundException;
import javassist.bytecode.Descriptor;
import mod.sin.armour.ArcaniteNecklaceFocus;
import mod.sin.armour.GlimmerscaleVest;
import mod.sin.lib.Util;
import mod.sin.wyvern.MiscChanges;
@@ -33,6 +34,7 @@ public class ItemBonusOverhaul {
*/
public static void initializeBonuses() throws NoSuchTemplateException {
itemBonuses.add(new ItemBonusWrapper(GlimmerscaleVest.templateId, SpellEffectsEnum.ITEM_RING_CR, false, 1.0f, false));
itemBonuses.add(new ItemBonusWrapper(ArcaniteNecklaceFocus.templateId, SpellEffectsEnum.ITEM_NECKLACE_FOCUS, false, .2f, true));
for(ItemBonusWrapper wrapper: itemBonuses) {
ItemTemplate template = ItemTemplateFactory.getInstance().getTemplate(wrapper.getTemplateid());
@@ -137,9 +139,9 @@ public class ItemBonusOverhaul {
replace = "{ return " + ItemBonusOverhaul.class.getName() + ".getNewTimed($1); }";
Util.setBodyDeclared(thisClass, itemBonus, "isTimed", replace);
Util.setReason("Overwrite default check for bonus skillgain");
replace = "{ return " + ItemBonusOverhaul.class.getName() + ".getNewSkillBonus($1, $2); }";
Util.setBodyDeclared(thisClass, itemBonus, "getSkillGainBonus", replace);
//Util.setReason("Overwrite default check for bonus skillgain");
//replace = "{ return " + ItemBonusOverhaul.class.getName() + ".getNewSkillBonus($1, $2); }";
//Util.setBodyDeclared(thisClass, itemBonus, "getSkillGainBonus", replace);
Util.setReason("Overwrite default item spell effect lookup with one checking the custom list.");
replace = "{ return " + ItemBonusOverhaul.class.getName() + ".getNewEffectForTemplateId($1, $2); }";

3
src/main/java/mod/sin/wyvern/bounty/LootBounty.java
View File

@@ -270,9 +270,6 @@ public class LootBounty {
if (tool != null) {
corpse.insertItem(tool, true);
}
if(random.nextInt(100) < 75){
corpse.insertItem(ItemFactory.createItem((random.nextBoolean() ? ItemList.adamantineBar : ItemList.glimmerSteelBar), 30+(30*random.nextFloat()), ""));
}
if(random.nextInt(100) < 25) {
Item item = ItemFactory.createItem(ItemUtil.getMysteryEggID(), 50, "");
item.setRarity((byte)1);