merge latest version, fix up gradle depends

build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'java'
 
 group "mod.sin"
-version "1.0"
+version "1.1"
 
 repositories {
     mavenCentral()
@@ -11,9 +11,10 @@ repositories {
 }
 
 dependencies {
-    compile 'org.gotti.wurmunlimited:server-modlauncher:0.35-beta1'
-    compile 'com.github.Sindusk:sindusklibrary:1.2'
+    compile 'org.gotti.wurmunlimited:server-modlauncher:0.37'
+    compile 'com.github.Sindusk:sindusklibrary:v1.7'
     compile 'com.github.Sindusk:DiscordRelay:v1.2'
+    compile 'com.github.Sindusk:DUSKombat:v1.0'
     compile 'com.github.Sindusk:TreasureHunting:1.1.4'
 }
 

src/main/java/com/wurmonline/server/questions/AffinityOrbQuestion.java

@@ -0,0 +1,113 @@
+package com.wurmonline.server.questions;
+
+import com.wurmonline.server.Items;
+import com.wurmonline.server.Server;
+import com.wurmonline.server.creatures.Creature;
+import com.wurmonline.server.items.Item;
+import com.wurmonline.server.players.Player;
+import com.wurmonline.server.skills.Affinities;
+import com.wurmonline.server.skills.Affinity;
+import com.wurmonline.server.skills.SkillSystem;
+import net.coldie.tools.BmlForm;
+
+import java.util.HashMap;
+import java.util.Properties;
+import java.util.Random;
+
+public class AffinityOrbQuestion extends Question {
+    protected Item affinityOrb;
+
+    public AffinityOrbQuestion(Creature aResponder, String aTitle, String aQuestion, long aTarget, Item orb){
+        super(aResponder, aTitle, aQuestion, 79, aTarget);
+        this.affinityOrb = orb;
+    }
+
+    public HashMap<Integer, Integer> affinityMap = new HashMap<>();
+
+    @Override
+    public void answer(Properties answer) {
+        boolean accepted = answer.containsKey("accept") && answer.get("accept") == "true";
+        if (accepted) {
+            logger.info("Accepted AffinityOrb");
+            int entry = Integer.parseInt(answer.getProperty("affinity"));
+            int skillNum = affinityMap.get(entry);
+            if(affinityOrb == null || affinityOrb.getOwnerId() != this.getResponder().getWurmId()){
+                this.getResponder().getCommunicator().sendNormalServerMessage("You must own an affinity orb to obtain an affinity.");
+            }else{
+                if(this.getResponder() instanceof Player) {
+                    Player player = (Player) this.getResponder();
+                    //logger.info("Converting "+player.getName()+" to " + Deities.getDeityName(deity));
+                    String skillName = SkillSystem.getNameFor(skillNum);
+                    logger.info("Adding affinity for skill "+skillName+" to "+player.getName());
+                    Items.destroyItem(affinityOrb.getWurmId());
+
+                    Affinity[] affs = Affinities.getAffinities(player.getWurmId());
+                    boolean found = false;
+                    for (Affinity affinity : affs) {
+                        if (affinity.getSkillNumber() != skillNum) continue;
+                        if (affinity.getNumber() >= 5){
+                            player.getCommunicator().sendSafeServerMessage("You already have the maximum amount of affinities for "+skillName);
+                            return;
+                        }
+                        Affinities.setAffinity(player.getWurmId(), skillNum, affinity.getNumber() + 1, false);
+                        found = true;
+                        Items.destroyItem(affinityOrb.getWurmId());
+                        player.getCommunicator().sendSafeServerMessage("Vynora infuses you with an affinity for " + skillName + "!");
+                        break;
+                    }
+                    if (!found) {
+                        Affinities.setAffinity(player.getWurmId(), skillNum, 1, false);
+                        Items.destroyItem(affinityOrb.getWurmId());
+                        player.getCommunicator().sendSafeServerMessage("Vynora infuses you with an affinity for " + skillName + "!");
+                    }
+                }else{
+                    logger.info("Non-player used a "+affinityOrb.getName()+"?");
+                }
+            }
+        }
+    }
+
+    public String getAffinities(){
+        String builder = "";
+        Random rand = new Random();
+        if(affinityOrb.getAuxData() == 0){
+            logger.info("Orb has no affinity set, creating random seed now.");
+            affinityOrb.setAuxData((byte) ((1+Server.rand.nextInt(120))*(Server.rand.nextBoolean() ? 1 : -1)));
+        }
+        rand.setSeed(affinityOrb.getAuxData());
+        logger.info("Seed set to "+affinityOrb.getAuxData());
+        affinityMap.clear();
+        int i = 0;
+        while(i < 10){
+            int num = rand.nextInt(SkillSystem.getNumberOfSkillTemplates());
+            if(!affinityMap.containsValue(num)) {
+                builder = builder + SkillSystem.getSkillTemplateByIndex(num).getName();
+                affinityMap.put(i, SkillSystem.getSkillTemplateByIndex(num).getNumber());
+                i++;
+                if (i < 10) {
+                    builder = builder + ",";
+                }
+            }
+        }
+        return builder;
+    }
+
+    @Override
+    public void sendQuestion() {
+        if(affinityOrb == null || affinityOrb.getOwnerId() != this.getResponder().getWurmId()){
+            this.getResponder().getCommunicator().sendNormalServerMessage("You must own an affinity orb before being infused.");
+            return;
+        }
+        BmlForm f = new BmlForm("");
+        f.addHidden("id", String.valueOf(this.id));
+        f.addBoldText("Select the affinity you would like to obtain\n", new String[0]);
+        f.addRaw("harray{label{text='Select Affinity:'}dropdown{id='affinity';options='");
+        f.addRaw(getAffinities());
+        f.addRaw("'}}");
+        f.addText("\n\n", new String[0]);
+        f.beginHorizontalFlow();
+        f.addButton("Accept", "accept");
+        f.endHorizontalFlow();
+        this.getResponder().getCommunicator().sendBml(400, 300, true, true, f.toString(), 255, 255, 255, this.title);
+    }
+}

src/main/java/com/wurmonline/server/questions/LeaderboardAchievementQuestion.java

@@ -0,0 +1,128 @@
+package com.wurmonline.server.questions;
+
+import com.wurmonline.server.DbConnector;
+import com.wurmonline.server.creatures.Creature;
+import com.wurmonline.server.deities.Deities;
+import com.wurmonline.server.players.AchievementTemplate;
+import com.wurmonline.server.skills.SkillList;
+import com.wurmonline.server.utils.DbUtilities;
+import mod.sin.wyvern.AchievementChanges;
+import net.coldie.tools.BmlForm;
+import org.gotti.wurmunlimited.modsupport.ModSupportDb;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Properties;
+
+public class LeaderboardAchievementQuestion extends Question {
+    protected int achievementNum;
+    protected AchievementTemplate template;
+
+    public LeaderboardAchievementQuestion(Creature aResponder, String aTitle, String aQuestion, long aTarget, int achievementNum){
+        super(aResponder, aTitle, aQuestion, 79, aTarget);
+        this.achievementNum = achievementNum;
+        this.template = AchievementChanges.goodAchievements.get(achievementNum);
+    }
+
+    @Override
+    public void answer(Properties answer) {
+        boolean accepted = answer.containsKey("okay") && answer.get("okay") == "true";
+        if (accepted) {
+            LeaderboardQuestion lbq = new LeaderboardQuestion(this.getResponder(), "Leaderboard", "Which leaderboard would you like to view?", this.getResponder().getWurmId());
+            lbq.sendQuestion();
+        }
+    }
+
+    protected HashMap<String, Integer> optIn = new HashMap<>();
+    protected void identifyOptIn(){
+        String name;
+        int opted;
+        Connection dbcon;
+        PreparedStatement ps;
+        ResultSet rs;
+        try {
+            dbcon = ModSupportDb.getModSupportDb();
+            ps = dbcon.prepareStatement("SELECT * FROM LeaderboardOpt");
+            rs = ps.executeQuery();
+            while (rs.next()) {
+                name = rs.getString("name");
+                opted = rs.getInt("OPTIN");
+                optIn.put(name, opted);
+            }
+            rs.close();
+            ps.close();
+        }
+        catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void sendQuestion() {
+        BmlForm f = new BmlForm("");
+        f.addHidden("id", String.valueOf(this.id));
+        ArrayList<String> names = new ArrayList<>();
+        ArrayList<Integer> counts = new ArrayList<>();
+        //ArrayList<Integer> deities = new ArrayList<>();
+        String name;
+        int counter;
+        int deity;
+        String extra = "";
+
+        // Populates HashMap with latest opt-in data.
+        identifyOptIn();
+
+        Connection dbcon;
+        PreparedStatement ps;
+        ResultSet rs;
+        try {
+            dbcon = DbConnector.getPlayerDbCon();
+            //ps = dbcon.prepareStatement("SELECT players.name, skills.value, players.deity FROM skills JOIN players ON skills.owner = players.wurmid WHERE skills.number = " + skillNum + " AND (players.power = 0) ORDER BY skills.value DESC LIMIT 20");
+            ps = dbcon.prepareStatement("SELECT players.name, achievements.counter FROM achievements JOIN players ON achievements.player = players.wurmid WHERE achievements.achievement = " + achievementNum + " AND achievements.counter > 0 AND players.power = 0 ORDER BY achievements.counter DESC LIMIT 20");
+            rs = ps.executeQuery();
+            while(rs.next()){
+                name = rs.getString(1);
+                counter = rs.getInt(2);
+                //deity = rs.getInt(3);
+                names.add(name);
+                counts.add(counter);
+                //deities.add(deity);
+            }
+            DbUtilities.closeDatabaseObjects(ps, rs);
+        }
+        catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+        f.addBoldText("Top 20 players with achievement "+this.getQuestion(), new String[0]);
+        f.addBoldText(template.getRequirement(), new String[0]);
+        f.addText("\n\n", new String[0]);
+        int i = 0;
+        DecimalFormat df = new DecimalFormat(".000");
+        while(i < names.size() && i < counts.size()){
+            name = names.get(i);
+            if(!optIn.containsKey(name)){
+                name = "Unknown";
+            }else if(optIn.get(name).equals(0)){
+                name = "Unknown";
+            }
+            if(names.get(i).equals(this.getResponder().getName())){
+                name = names.get(i);
+                f.addBoldText(counts.get(i) + " - " + name + extra);
+            }else{
+                f.addText(counts.get(i) + " - " + name + extra);
+            }
+            i++;
+        }
+        f.addText(" \n", new String[0]);
+        f.beginHorizontalFlow();
+        f.addButton("Ok", "okay");
+        f.endHorizontalFlow();
+        f.addText(" \n", new String[0]);
+        this.getResponder().getCommunicator().sendBml(400, 500, true, true, f.toString(), 150, 150, 200, this.title);
+    }
+}

src/main/java/com/wurmonline/server/questions/LeaderboardCustomQuestion.java

@@ -12,9 +12,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Properties;
+import java.util.*;
 
 public class LeaderboardCustomQuestion extends Question {
     protected int entryNum;
@@ -132,6 +130,149 @@ public class LeaderboardCustomQuestion extends Question {
             throw new RuntimeException(e);
         }
     }
+    protected void topAffinities(int limit){
+        Connection dbcon;
+        PreparedStatement ps;
+        ResultSet rs;
+        String name;
+        int skillNum;
+        double affinities;
+        try {
+            dbcon = DbConnector.getPlayerDbCon();
+            ps = dbcon.prepareStatement("SELECT players.name, sum(affinities.number) as Count FROM affinities JOIN players ON affinities.wurmid = players.wurmid WHERE players.power = 0 GROUP BY players.name ORDER BY Count DESC LIMIT "+limit);
+            rs = ps.executeQuery();
+            while(rs.next()){
+                name = rs.getString(1);
+                affinities = rs.getDouble(2);
+                names.add(name);
+                values.add(affinities);
+            }
+            DbUtilities.closeDatabaseObjects(ps, rs);
+        }
+        catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+    protected void topUniqueAchievements(int limit){
+        Connection dbcon;
+        PreparedStatement ps;
+        ResultSet rs;
+        String name;
+        int skillNum;
+        double achievements;
+        try {
+            dbcon = DbConnector.getPlayerDbCon();
+            ps = dbcon.prepareStatement("SELECT players.name, count(*) AS theCount FROM achievements JOIN players ON achievements.player = players.wurmid WHERE players.power = 0 GROUP BY players.name ORDER BY theCount DESC LIMIT "+limit);
+            rs = ps.executeQuery();
+            while(rs.next()){
+                name = rs.getString(1);
+                achievements = rs.getDouble(2);
+                names.add(name);
+                values.add(achievements);
+            }
+            DbUtilities.closeDatabaseObjects(ps, rs);
+        }
+        catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+    protected HashMap<Long, String> structureNames = new HashMap<>();
+    protected HashMap<Long, String> structurePlanners = new HashMap<>();
+    protected HashMap<Long, Integer> structureWalls = new HashMap<>();
+    protected HashMap<Long, Integer> structureFloors = new HashMap<>();
+    protected void calculateStructureWalls(){
+        Connection dbcon;
+        PreparedStatement ps;
+        ResultSet rs;
+        String name;
+        long wurmid;
+        int walls;
+        String planner;
+        try {
+            dbcon = DbConnector.getZonesDbCon();
+            ps = dbcon.prepareStatement("SELECT structures.wurmid, structures.name, count(*), structures.planner FROM walls JOIN structures ON structures.wurmid = walls.structure WHERE structures.finished = 1 AND walls.state > 1 GROUP BY walls.structure ORDER BY count(*) DESC");
+            rs = ps.executeQuery();
+            while(rs.next()){
+                wurmid = rs.getLong(1);
+                name = rs.getString(2);
+                walls = rs.getInt(3);
+                planner = rs.getString(4);
+                structureNames.put(wurmid, name);
+                structurePlanners.put(wurmid, planner);
+                structureWalls.put(wurmid, walls);
+            }
+            DbUtilities.closeDatabaseObjects(ps, rs);
+        }
+        catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+    protected void calculateStructureFloors(){
+        Connection dbcon;
+        PreparedStatement ps;
+        ResultSet rs;
+        String name;
+        long wurmid;
+        int floors;
+        String planner;
+        try {
+            dbcon = DbConnector.getZonesDbCon();
+            ps = dbcon.prepareStatement("SELECT structures.wurmid, structures.name, count(*), structures.planner FROM floors JOIN structures ON structures.wurmid = floors.structure WHERE structures.finished = 1 AND floors.state > 1 GROUP BY floors.structure ORDER BY count(*) DESC");
+            rs = ps.executeQuery();
+            while(rs.next()){
+                wurmid = rs.getLong(1);
+                name = rs.getString(2);
+                floors = rs.getInt(3);
+                planner = rs.getString(4);
+                structureNames.put(wurmid, name);
+                structurePlanners.put(wurmid, planner);
+                structureFloors.put(wurmid, floors);
+            }
+            DbUtilities.closeDatabaseObjects(ps, rs);
+        }
+        catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+    protected void topStructureSizes(int limit){
+        calculateStructureWalls();
+        calculateStructureFloors();
+        HashMap<Long, Integer> structureTotals = new HashMap<>();
+        for(long wurmid : structureWalls.keySet()){
+            structureTotals.put(wurmid, structureWalls.get(wurmid));
+        }
+        for(long wurmid : structureFloors.keySet()){
+            if(structureTotals.containsKey(wurmid)){
+                int current = structureTotals.get(wurmid);
+                structureTotals.put(wurmid, current + structureFloors.get(wurmid));
+            }else{
+                structureTotals.put(wurmid, structureFloors.get(wurmid));
+            }
+        }
+        LinkedList<Map.Entry<Long, Integer>> list = new LinkedList<>(structureTotals.entrySet());
+        list.sort((o1, o2) -> ((Comparable) o1.getValue())
+                .compareTo(((Map.Entry) (o2)).getValue()));
+        Collections.reverse(list);
+        HashMap<Long, Integer> sortedHashMap = new LinkedHashMap<>();
+        for (Iterator it = list.iterator(); it.hasNext();) {
+            Map.Entry<Long, Integer> entry = (Map.Entry<Long, Integer>) it.next();
+            sortedHashMap.put(entry.getKey(), entry.getValue());
+        }
+        Set set2 = sortedHashMap.entrySet();
+        Iterator iterator2 = set2.iterator();
+        int i = 0;
+        long wurmid;
+        while(iterator2.hasNext()) {
+            Map.Entry me2 = (Map.Entry)iterator2.next();
+            if(i < limit){
+                wurmid = (long) me2.getKey();
+                names.add(structureNames.get(wurmid));
+                values.add((double) (int) me2.getValue());
+                extra.add(structurePlanners.get(wurmid));
+            }
+            i++;
+        }
+    }
     protected void topPlayerStats(String statName, int limit){
         Connection dbcon;
         PreparedStatement ps;
@@ -155,6 +296,33 @@ public class LeaderboardCustomQuestion extends Question {
             throw new RuntimeException(e);
         }
     }
+    protected void mostCitizens(int limit){
+        Connection dbcon;
+        PreparedStatement ps;
+        ResultSet rs;
+        String name;
+        int skillNum;
+        String mayor;
+        double stat;
+        try {
+            dbcon = DbConnector.getZonesDbCon();
+            ps = dbcon.prepareStatement("SELECT name, maxcitizens, mayor FROM villages WHERE disbanded = 0 ORDER BY maxcitizens DESC LIMIT "+limit);
+            rs = ps.executeQuery();
+            while(rs.next()){
+                name = rs.getString(1);
+                stat = rs.getInt(2);
+                mayor = rs.getString(3);
+                stat++; // Add one citizen to account for mayor.
+                names.add(name);
+                values.add(stat);
+                extra.add(mayor);
+            }
+            DbUtilities.closeDatabaseObjects(ps, rs);
+        }
+        catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
 
     @Override
     public void sendQuestion() {
@@ -193,24 +361,42 @@ public class LeaderboardCustomQuestion extends Question {
                 ignoreOpt = true;
                 break;
             case 5:
+                limit = 20;
+                topAffinities(limit);
+                break;
+            case 6:
+                limit = 20;
+                topUniqueAchievements(limit);
+                break;
+            case 7:
+                limit = 20;
+                topStructureSizes(limit);
+                ignoreOpt = true;
+                break;
+            case 8:
+                limit = 100;
+                mostCitizens(limit);
+                ignoreOpt = true;
+                break;
+            case 9:
                 limit = 10;
                 topPlayerStats("kills", limit);
                 ignoreOpt = true;
                 break;
-            case 6:
+            case 10:
                 limit = 10;
                 topPlayerStats("deaths", limit);
                 ignoreOpt = true;
                 break;
-            case 7:
+            case 11:
                 limit = 10;
                 topPlayerStats("depots", limit);
                 ignoreOpt = true;
                 break;
         }
 
-        f.addBoldText("Top "+limit+" players in "+this.getQuestion(), new String[0]);
-        f.addText("\n\n", new String[0]);
+        f.addBoldText("Top "+limit+" players in "+this.getQuestion());
+        f.addText("\n\n");
         int i = 0;
         DecimalFormat df = new DecimalFormat(".000");
         if(!format){
@@ -238,11 +424,11 @@ public class LeaderboardCustomQuestion extends Question {
             }
             i++;
         }
-        f.addText(" \n", new String[0]);
+        f.addText(" \n");
         f.beginHorizontalFlow();
         f.addButton("Ok", "okay");
         f.endHorizontalFlow();
-        f.addText(" \n", new String[0]);
+        f.addText(" \n");
         this.getResponder().getCommunicator().sendBml(400, 500, true, true, f.toString(), 150, 150, 200, this.title);
     }
 }

src/main/java/com/wurmonline/server/questions/LeaderboardQuestion.java

@@ -2,8 +2,10 @@ package com.wurmonline.server.questions;
 
 import com.wurmonline.server.Servers;
 import com.wurmonline.server.creatures.Creature;
+import com.wurmonline.server.players.AchievementTemplate;
 import com.wurmonline.server.skills.SkillSystem;
 import com.wurmonline.server.skills.SkillTemplate;
+import mod.sin.wyvern.AchievementChanges;
 import net.coldie.tools.BmlForm;
 import org.gotti.wurmunlimited.modsupport.ModSupportDb;
 
@@ -11,10 +13,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Properties;
+import java.util.*;
 
 public class LeaderboardQuestion extends Question {
 
@@ -38,15 +37,21 @@ public class LeaderboardQuestion extends Question {
 
     @Override
     public void answer(Properties answer) {
-        boolean accepted = answer.containsKey("accept") && answer.get("accept") == "true";
+        boolean skill = answer.containsKey("accept") && answer.get("accept") == "true";
+        boolean achievements = answer.containsKey("achievements") && answer.get("achievements") == "true";
         boolean custom = answer.containsKey("custom") && answer.get("custom") == "true";
-        if (accepted) {
+        if (skill) {
             int entry = Integer.parseInt(answer.getProperty("leaderboard"));
             String val = skillMap.get(entry);
             int skillNum = skillIdMap.get(entry);
-            //this.getResponder().getCommunicator().sendNormalServerMessage("Received response: "+val);
             LeaderboardSkillQuestion lbsq = new LeaderboardSkillQuestion(this.getResponder(), "Leaderboard", val, this.getResponder().getWurmId(), skillNum);
             lbsq.sendQuestion();
+        }else if(achievements){
+            int entry = Integer.parseInt(answer.getProperty("achievementboard"));
+            String val = achievementMap.get(entry);
+            int achievementNum = achievementIdMap.get(entry);
+            LeaderboardAchievementQuestion lbaq = new LeaderboardAchievementQuestion(this.getResponder(), "Leaderboard", val, this.getResponder().getWurmId(), achievementNum);
+            lbaq.sendQuestion();
         }else if(custom){
             int entry = Integer.parseInt(answer.getProperty("customboard"));
             String val = customMap.get(entry);
@@ -94,6 +99,34 @@ public class LeaderboardQuestion extends Question {
         return builder;
     }
 
+    protected HashMap<Integer, String> achievementMap = new HashMap<>();
+    protected HashMap<Integer, Integer> achievementIdMap = new HashMap<>();
+
+    public String getAchievementOptions(){
+        String builder = "";
+        Collection<AchievementTemplate> achievements = AchievementChanges.goodAchievements.values();
+        List<AchievementTemplate> sortedAchievements = new ArrayList<>(achievements);
+        sortedAchievements.sort(new Comparator<AchievementTemplate>() {
+            public int compare(AchievementTemplate o1, AchievementTemplate o2) {
+                return o1.getName().compareTo(o2.getName());
+            }
+        });
+        int i = 0;
+        int index = 0;
+        achievementMap.clear();
+        while(i < sortedAchievements.size()){
+            builder = builder + sortedAchievements.get(i).getName();
+            achievementMap.put(i, sortedAchievements.get(i).getName());
+            achievementIdMap.put(i, sortedAchievements.get(i).getNumber());
+            i++;
+            if(i < sortedAchievements.size()){
+                builder = builder + ",";
+            }
+        }
+        builder = builder.replaceAll("'", "");
+        return builder;
+    }
+
     public String getCustomOptions(){
         String builder = "Total Skill";
         customMap.put(0, "Total Skill");
@@ -105,13 +138,21 @@ public class LeaderboardQuestion extends Question {
         customMap.put(3, "Uniques Slain");
         builder = builder + ",Titans Slain";
         customMap.put(4, "Titans Slain");
+        builder = builder + ",Most Affinities";
+        customMap.put(5, "Most Affinities");
+        builder = builder + ",Most Unique Achievements";
+        customMap.put(6, "Most Unique Achievements");
+        builder = builder + ",Largest Structures";
+        customMap.put(7, "Largest Structures");
+        builder = builder + ",Most Populated Villages";
+        customMap.put(8, "Most Populated Villages");
         if(Servers.localServer.PVPSERVER || this.getResponder().getPower() >= 5){
             builder = builder + ",PvP Kills";
-            customMap.put(5, "PvP Kills");
+            customMap.put(9, "PvP Kills");
             builder = builder + ",PvP Deaths";
-            customMap.put(6, "PvP Deaths");
+            customMap.put(10, "PvP Deaths");
             builder = builder + ",Depots Captured";
-            customMap.put(7, "PvP Depots Captured");
+            customMap.put(11, "PvP Depots Captured");
         }
         return builder;
     }
@@ -136,6 +177,7 @@ public class LeaderboardQuestion extends Question {
             throw new RuntimeException(e);
         }
         f.addBoldText("You are currently " + (opted == 0 ? "not " : "") + "opted into the leaderboard system.\n\n", new String[0]);
+        f.addBoldText("Skill Leaderboards");
         f.addRaw("harray{label{text='View leaderboard:'}dropdown{id='leaderboard';options='");
         f.addRaw(getSkillOptions());
         f.addRaw("'}}");
@@ -143,19 +185,27 @@ public class LeaderboardQuestion extends Question {
         f.addButton("Accept", "accept");
         f.endHorizontalFlow();
         f.addText(" \n\n", new String[0]);
-        f.addBoldText("Opt into or out of the Leaderboard system.");
+        f.addBoldText("Achievement Leaderboards");
+        f.addRaw("harray{label{text='View leaderboard:'}dropdown{id='achievementboard';options='");
+        f.addRaw(getAchievementOptions());
+        f.addRaw("'}}");
         f.beginHorizontalFlow();
-        f.addButton("Opt In", "optin");
-        f.addButton("Opt Out", "optout");
+        f.addButton("Accept", "achievements");
         f.endHorizontalFlow();
         f.addText(" \n\n", new String[0]);
-        f.addBoldText("Special leaderboards are available below.");
+        f.addBoldText("Special Leaderboards");
         f.addRaw("harray{label{text='View leaderboard:'}dropdown{id='customboard';options='");
         f.addRaw(getCustomOptions());
         f.addRaw("'}}");
         f.beginHorizontalFlow();
         f.addButton("Accept", "custom");
         f.endHorizontalFlow();
+        f.addText(" \n\n", new String[0]);
+        f.addBoldText("Opt into or out of the Leaderboard system.");
+        f.beginHorizontalFlow();
+        f.addButton("Opt In", "optin");
+        f.addButton("Opt Out", "optout");
+        f.endHorizontalFlow();
         this.getResponder().getCommunicator().sendBml(400, 500, true, true, f.toString(), 150, 150, 200, this.title);
     }
 }

src/main/java/com/wurmonline/server/questions/LeaderboardSkillQuestion.java

@@ -4,8 +4,6 @@ import com.wurmonline.server.DbConnector;
 import com.wurmonline.server.creatures.Creature;
 import com.wurmonline.server.deities.Deities;
 import com.wurmonline.server.skills.SkillList;
-import com.wurmonline.server.skills.SkillSystem;
-import com.wurmonline.server.skills.SkillTemplate;
 import com.wurmonline.server.utils.DbUtilities;
 import net.coldie.tools.BmlForm;
 import org.gotti.wurmunlimited.modsupport.ModSupportDb;
@@ -36,6 +34,29 @@ public class LeaderboardSkillQuestion extends Question {
         }
     }
 
+    public int[] getSkilLevelColors(double skill){
+        int[] colors = new int[3];
+        colors[0] = 0; // No red value
+        if(skill >= 90){
+            double percentTowards100 = 1-((100-skill)*0.1); // Division by 10
+            double greenPower = 128 + (128*percentTowards100);
+            colors[1] = (int) Math.min(255, greenPower);
+            colors[2] = (int) Math.max(0, 255-greenPower);
+        }else if(skill >= 50){
+            double percentTowards90 = 1-((90-skill)*0.025); // Division by 40
+            double greenPower = percentTowards90*128;
+            colors[1] = (int) Math.max(128, greenPower);
+            colors[2] = (int) Math.min(255, 255-greenPower);
+        }else{
+            double percentTowards50 = 1-((50-skill)*0.02); // Division by 50
+            double otherPower = 255 - (percentTowards50*255);
+            colors[0] = (int) Math.min(255, otherPower);
+            colors[1] = (int) Math.min(255, Math.max(128, otherPower));
+            colors[2] = 255;
+        }
+        return colors;
+    }
+
     protected HashMap<String, Integer> optIn = new HashMap<>();
     protected void identifyOptIn(){
         String name;
@@ -95,8 +116,8 @@ public class LeaderboardSkillQuestion extends Question {
         catch (SQLException e) {
             throw new RuntimeException(e);
         }
-        f.addBoldText("Top 20 players in "+this.getQuestion(), new String[0]);
-        f.addText("\n\n", new String[0]);
+        f.addBoldText("Top 20 players in "+this.getQuestion());
+        f.addText("\n\n");
         int i = 0;
         DecimalFormat df = new DecimalFormat(".000");
         while(i < names.size() && i < skills.size()){
@@ -109,19 +130,20 @@ public class LeaderboardSkillQuestion extends Question {
             if(skillNum == SkillList.CHANNELING){
                 extra = " ("+ Deities.getDeityName(deities.get(i))+")";
             }
+            int[] color = getSkilLevelColors(skills.get(i));
             if(names.get(i).equals(this.getResponder().getName())){
                 name = names.get(i);
-                f.addBoldText(df.format(skills.get(i)) + " - " + name + extra);
+                f.addBoldColoredText(df.format(skills.get(i)) + " - " + name + extra, color[0], color[1], color[2]);
             }else{
-                f.addText(df.format(skills.get(i)) + " - " + name + extra);
+                f.addColoredText(df.format(skills.get(i)) + " - " + name + extra, color[0], color[1], color[2]);
             }
             i++;
         }
-        f.addText(" \n", new String[0]);
+        f.addText(" \n");
         f.beginHorizontalFlow();
         f.addButton("Ok", "okay");
         f.endHorizontalFlow();
-        f.addText(" \n", new String[0]);
+        f.addText(" \n");
         this.getResponder().getCommunicator().sendBml(400, 500, true, true, f.toString(), 150, 150, 200, this.title);
     }
 }

src/main/java/com/wurmonline/server/questions/NewSpawnQuestion.java

@@ -2,7 +2,9 @@ package com.wurmonline.server.questions;
 
 import com.wurmonline.mesh.Tiles;
 import com.wurmonline.server.*;
+import com.wurmonline.server.behaviours.AutoEquipMethods;
 import com.wurmonline.server.creatures.Creature;
+import com.wurmonline.server.items.Item;
 import com.wurmonline.server.players.Player;
 import com.wurmonline.server.players.Spawnpoint;
 import com.wurmonline.server.villages.Village;
@@ -58,16 +60,30 @@ public class NewSpawnQuestion extends Question {
         }else{
             boolean transfer = answer.containsKey("transfer") && answer.get("transfer") == "true";
             if(transfer) {
+                logger.info("Respawning player before transfer.");
+                Spawnpoint spawn = spawns.get(0);
+                this.spawn((Player) this.getResponder(), spawn);
+                logger.info("Spawn complete, beginning to unequip all items into inventory.");
+                for(Item equip : this.getResponder().getBody().getAllItems()){
+                    AutoEquipMethods.unequip(equip, this.getResponder());
+                }
+                if(!this.getResponder().getPrimWeapon().isBodyPartAttached()){
+                    AutoEquipMethods.unequip(this.getResponder().getPrimWeapon(), this.getResponder());
+                }
+                logger.info("Unequip method complete. Beginning transfer.");
                 try {
                     ServerEntry targetServer = Servers.localServer.serverSouth;
                     Player player = Players.getInstance().getPlayer(this.getResponder().getWurmId());
                     if(targetServer == null){
                         player.getCommunicator().sendNormalServerMessage("Error: Something went wrong [TARGETSERVER=NULL].");
+                        return;
                     }
                     if (!targetServer.isAvailable(player.getPower(), true)) {
                         player.getCommunicator().sendNormalServerMessage(targetServer.name + " is not currently available.");
                     } else {
-                        player.sendTransfer(Server.getInstance(), targetServer.EXTERNALIP, Integer.parseInt(targetServer.EXTERNALPORT), targetServer.INTRASERVERPASSWORD, targetServer.getId(), -1, -1, true, false, player.getKingdomId());
+                        int tilex = 1010;
+                        int tiley = 1010;
+                        player.sendTransfer(Server.getInstance(), targetServer.EXTERNALIP, Integer.parseInt(targetServer.EXTERNALPORT), targetServer.INTRASERVERPASSWORD, targetServer.getId(), tilex, tiley, true, false, player.getKingdomId());
                     }
                 } catch (NoSuchPlayerException e) {
                     logger.info("Could not find player for WurmId " + this.getResponder().getWurmId() + " [" + this.getResponder().getName() + "]");

src/main/java/mod/sin/actions/CreatureReportAction.java

@@ -0,0 +1,118 @@
+package mod.sin.actions;
+
+import com.wurmonline.server.behaviours.Action;
+import com.wurmonline.server.behaviours.ActionEntry;
+import com.wurmonline.server.creatures.*;
+import com.wurmonline.server.items.Item;
+import com.wurmonline.server.items.ItemList;
+import com.wurmonline.server.players.Player;
+import org.gotti.wurmunlimited.modsupport.actions.ActionPerformer;
+import org.gotti.wurmunlimited.modsupport.actions.BehaviourProvider;
+import org.gotti.wurmunlimited.modsupport.actions.ModAction;
+import org.gotti.wurmunlimited.modsupport.actions.ModActions;
+
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.stream.Collectors;
+
+public class CreatureReportAction implements ModAction {
+	private static Logger logger = Logger.getLogger(CreatureReportAction.class.getName());
+
+	private final short actionId;
+	private final ActionEntry actionEntry;
+
+	public CreatureReportAction() {
+		logger.log(Level.WARNING, "CreatureReportAction()");
+
+		actionId = (short) ModActions.getNextActionId();
+		actionEntry = ActionEntry.createEntry(
+			actionId,
+			"Creature Report",
+			"reporting",
+			new int[] { 0 }
+			//new int[] { 6 /* ACTION_TYPE_NOMOVE */ }	// 6 /* ACTION_TYPE_NOMOVE */, 48 /* ACTION_TYPE_ENEMY_ALWAYS */, 36 /* ACTION_TYPE_ALWAYS_USE_ACTIVE_ITEM */
+		);
+		ModActions.registerAction(actionEntry);
+	}
+
+
+	@Override
+	public BehaviourProvider getBehaviourProvider()
+	{
+		return new BehaviourProvider() {
+			// Menu with activated object
+			@Override
+			public List<ActionEntry> getBehavioursFor(Creature performer, Item source, Item object)
+			{
+				return this.getBehavioursFor(performer, object);
+			}
+
+			// Menu without activated object
+			@Override
+			public List<ActionEntry> getBehavioursFor(Creature performer, Item object)
+			{
+				if(performer instanceof Player && object != null && (object.getTemplateId() == ItemList.bodyBody || object.getTemplateId() == ItemList.bodyHand) && performer.getPower() >= 5) {
+					return Collections.singletonList(actionEntry);
+				}
+
+				return null;
+			}
+		};
+	}
+	private static void creatureReport(Communicator comm) {
+		HashMap<CreatureTemplate, Integer> counts = new HashMap<>();
+		Arrays.stream(CreatureTemplateFactory.getInstance().getTemplates()).forEach(ct -> counts.put(ct, 0));
+		Arrays.stream(Creatures.getInstance().getCreatures()).forEach(cr -> counts.put(cr.getTemplate(), counts.get(cr.getTemplate()) + 1));
+		Map<Boolean, List<Map.Entry<CreatureTemplate, Integer>>> tmp = counts.entrySet().stream().collect(Collectors.partitioningBy(e -> e.getKey().isMonster() || e.getKey().isAggHuman()));
+		List<Map.Entry<CreatureTemplate, Integer>> aggro = tmp.get(true);
+		List<Map.Entry<CreatureTemplate, Integer>> passive = tmp.get(false);
+		aggro.sort((o1, o2) -> -Integer.compare(o1.getValue(), o2.getValue()));
+		passive.sort((o1, o2) -> -Integer.compare(o1.getValue(), o2.getValue()));
+		int aggroTotal = aggro.stream().mapToInt(Map.Entry::getValue).sum();
+		int passiveTotal = passive.stream().mapToInt(Map.Entry::getValue).sum();
+		int sum = aggroTotal + passiveTotal;
+		comm.sendSystemMessage(String.format("Passive: %d (%.1f) Aggro: %d (%.1f) Total: %d", passiveTotal, 100.0 * passiveTotal / sum, aggroTotal, 100.0 * aggroTotal / sum, sum));
+		comm.sendSystemMessage("== Aggressive ==");
+		aggro.forEach(e -> comm.sendSystemMessage(String.format("%s: %d (%.1f)", e.getKey().getName(), e.getValue(), 100.0 * e.getValue() / aggroTotal)));
+		comm.sendSystemMessage("== Passive ==");
+		passive.forEach(e -> comm.sendSystemMessage(String.format("%s: %d (%.1f)", e.getKey().getName(), e.getValue(), 100.0 * e.getValue() / passiveTotal)));
+		comm.sendSystemMessage("=============");
+	}
+
+	@Override
+	public ActionPerformer getActionPerformer()
+	{
+		return new ActionPerformer() {
+			
+			@Override
+			public short getActionId() {
+				return actionId;
+			}
+			
+			// Without activated object
+			@Override
+			public boolean action(Action act, Creature performer, Item target, short action, float counter)
+			{
+				if(performer instanceof Player){
+					if(performer.getPower() < 5){
+						performer.getCommunicator().sendNormalServerMessage("You do not have permission to do that.");
+						return true;
+					}
+					creatureReport(performer.getCommunicator());
+				}else{
+					logger.info("Somehow a non-player activated an Affinity Orb...");
+				}
+				return true;
+			}
+			
+			@Override
+			public boolean action(Action act, Creature performer, Item source, Item target, short action, float counter)
+			{
+				return this.action(act, performer, target, action, counter);
+			}
+			
+	
+		}; // ActionPerformer
+	}
+}

src/main/java/mod/sin/actions/LeaderboardSkillAction.java

@@ -0,0 +1,101 @@
+package mod.sin.actions;
+
+import com.wurmonline.server.behaviours.Action;
+import com.wurmonline.server.behaviours.ActionEntry;
+import com.wurmonline.server.creatures.Creature;
+import com.wurmonline.server.items.Item;
+import com.wurmonline.server.players.Player;
+import com.wurmonline.server.questions.LeaderboardSkillQuestion;
+import com.wurmonline.server.skills.NoSuchSkillException;
+import com.wurmonline.server.skills.Skill;
+import org.gotti.wurmunlimited.modsupport.actions.ActionPerformer;
+import org.gotti.wurmunlimited.modsupport.actions.BehaviourProvider;
+import org.gotti.wurmunlimited.modsupport.actions.ModAction;
+import org.gotti.wurmunlimited.modsupport.actions.ModActions;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class LeaderboardSkillAction implements ModAction {
+	private static Logger logger = Logger.getLogger(LeaderboardSkillAction.class.getName());
+
+	private final short actionId;
+	private final ActionEntry actionEntry;
+
+	public LeaderboardSkillAction() {
+		logger.log(Level.WARNING, "LeaderboardSkillAction()");
+
+		actionId = (short) ModActions.getNextActionId();
+		actionEntry = ActionEntry.createEntry(
+			actionId,
+			"Open leaderboard",
+			"opening",
+			new int[] { 0 /* ACTION_TYPE_NOMOVE */ }	// 6 /* ACTION_TYPE_NOMOVE */, 48 /* ACTION_TYPE_ENEMY_ALWAYS */, 36 /* ACTION_TYPE_ALWAYS_USE_ACTIVE_ITEM */
+		);
+		ModActions.registerAction(actionEntry);
+	}
+
+	@Override
+	public BehaviourProvider getBehaviourProvider()
+	{
+		return new BehaviourProvider() {
+            @Override
+            public List<ActionEntry> getBehavioursFor(Creature performer, Skill skill) {
+                if(performer instanceof Player && skill.getNumber() > 0) {
+                    return Collections.singletonList(actionEntry);
+                }
+
+                return null;
+            }
+
+            // Never called
+			@Override
+			public List<ActionEntry> getBehavioursFor(Creature performer, Item source, Skill skill) {
+				if (performer instanceof Player && skill.getNumber() > 0) {
+					return Collections.singletonList(actionEntry);
+				}
+
+                return null;
+			}
+		};
+	}
+
+	@Override
+	public ActionPerformer getActionPerformer()
+	{
+		return new ActionPerformer() {
+			
+			@Override
+			public short getActionId() {
+				return actionId;
+			}
+            @Override
+            public boolean action(Action act, Creature performer, Skill skill, short action, float counter) {
+				LeaderboardSkillQuestion lbsq = new LeaderboardSkillQuestion(performer, "Leaderboard", skill.getName(), performer.getWurmId(), skill.getNumber());
+				lbsq.sendQuestion();
+			    return true;
+            }
+			
+			// Without activated object
+			@Override
+            public boolean action(Action act, Creature performer, Item source, Skill skill, short action, float counter) {
+				if(performer instanceof Player){
+					this.action(act, performer, skill, action, counter);
+				}else{
+					logger.info("Somehow a non-player opened a leaderboard...");
+				}
+				return true;
+			}
+			
+			@Override
+			public boolean action(Action act, Creature performer, Item source, Item target, short action, float counter)
+			{
+				return this.action(act, performer, target, action, counter);
+			}
+			
+	
+		}; // ActionPerformer
+	}
+}

src/main/java/mod/sin/actions/SmoothTerrainAction.java

@@ -0,0 +1,323 @@
+package mod.sin.actions;
+
+import com.wurmonline.mesh.MeshIO;
+import com.wurmonline.mesh.Tiles;
+import com.wurmonline.server.Constants;
+import com.wurmonline.server.Players;
+import com.wurmonline.server.Server;
+import com.wurmonline.server.Servers;
+import com.wurmonline.server.behaviours.Action;
+import com.wurmonline.server.behaviours.ActionEntry;
+import com.wurmonline.server.behaviours.Actions;
+import com.wurmonline.server.behaviours.Terraforming;
+import com.wurmonline.server.creatures.Creature;
+import com.wurmonline.server.items.Item;
+import com.wurmonline.server.players.Player;
+import com.wurmonline.server.structures.Structure;
+import com.wurmonline.server.structures.Structures;
+import com.wurmonline.server.villages.Village;
+import com.wurmonline.server.villages.Villages;
+import com.wurmonline.server.zones.NoSuchZoneException;
+import com.wurmonline.server.zones.Zone;
+import com.wurmonline.server.zones.Zones;
+import org.gotti.wurmunlimited.modsupport.actions.ActionPerformer;
+import org.gotti.wurmunlimited.modsupport.actions.BehaviourProvider;
+import org.gotti.wurmunlimited.modsupport.actions.ModAction;
+import org.gotti.wurmunlimited.modsupport.actions.ModActions;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class SmoothTerrainAction implements ModAction {
+	private static Logger logger = Logger.getLogger(SmoothTerrainAction.class.getName());
+
+	private final short actionId;
+	private final ActionEntry actionEntry;
+
+	public SmoothTerrainAction() {
+		logger.log(Level.WARNING, "SmoothTerrainAction()");
+
+		actionId = (short) ModActions.getNextActionId();
+		actionEntry = ActionEntry.createEntry(
+			actionId,
+			"Smooth Terrain",
+			"smoothing",
+			new int[] {
+                    Actions.ACTION_TYPE_QUICK,
+                    Actions.ACTION_TYPE_IGNORERANGE
+            }
+			//new int[] { 6 /* ACTION_TYPE_NOMOVE */ }	// 6 /* ACTION_TYPE_NOMOVE */, 48 /* ACTION_TYPE_ENEMY_ALWAYS */, 36 /* ACTION_TYPE_ALWAYS_USE_ACTIVE_ITEM */
+		);
+		ModActions.registerAction(actionEntry);
+	}
+
+
+	@Override
+	public BehaviourProvider getBehaviourProvider()
+	{
+		return new BehaviourProvider() {
+			// Menu with activated object
+            @Override
+            public List<ActionEntry> getBehavioursFor(Creature performer, Item source, int tilex, int tiley, boolean onSurface, boolean corner, int tile, int heightOffset) {
+                return this.getBehavioursFor(performer, tilex, tiley, onSurface, corner, tile, heightOffset);
+            }
+
+			@Override
+			public List<ActionEntry> getBehavioursFor(Creature performer, int tilex, int tiley, boolean onSurface, boolean corner, int tile, int heightOffset) {
+				if(performer instanceof Player && performer.getPower() >= 5){
+					return Collections.singletonList(actionEntry);
+				}
+				return null;
+			}
+		};
+	}
+
+	static boolean isValidSmoothTile(byte type){
+	    return Tiles.isTree(type) || Tiles.isBush(type) || type == Tiles.Tile.TILE_SAND.id || type == Tiles.Tile.TILE_GRASS.id || type == Tiles.Tile.TILE_TUNDRA.id || type == Tiles.Tile.TILE_STEPPE.id || type == Tiles.Tile.TILE_SNOW.id;
+    }
+    /*static boolean isImmutableTile(byte type) {
+        return Tiles.isTree(type) || Tiles.isBush(type) || type == Tiles.Tile.TILE_CLAY.id || type == Tiles.Tile.TILE_MARSH.id || type == Tiles.Tile.TILE_PEAT.id || type == Tiles.Tile.TILE_TAR.id || type == Tiles.Tile.TILE_HOLE.id || type == Tiles.Tile.TILE_MOSS.id || type == Tiles.Tile.TILE_LAVA.id || Tiles.isMineDoor(type);
+    }
+    static boolean isRockTile(byte type) {
+        return Tiles.isSolidCave(type) || type == Tiles.Tile.TILE_CAVE.id || type == Tiles.Tile.TILE_CAVE_EXIT.id || type == Tiles.Tile.TILE_CLIFF.id || type == Tiles.Tile.TILE_ROCK.id || type == Tiles.Tile.TILE_CAVE_FLOOR_REINFORCED.id;
+    }*/
+
+    public static void smooth(int tilex, int tiley, MeshIO mesh) {
+        int currentTileRock;
+        short currentRockHeight;
+        boolean insta;
+        if(tilex < 50 || tiley < 50 || tilex > Server.surfaceMesh.getSize()-50 || tiley > Server.surfaceMesh.getSize()-50){
+            return;
+        }
+        if (tilex > 1 << Constants.meshSize || tiley > 1 << Constants.meshSize) {
+            return;
+        }
+        int digTile = mesh.getTile(tilex, tiley);
+        byte digTileType = Tiles.decodeType(digTile);
+        if(!isValidSmoothTile(digTileType)){
+            return;
+        }
+        short digTileHeight = Tiles.decodeHeight(digTile);
+        if (digTileHeight <= Tiles.decodeHeight(Server.rockMesh.getTile(tilex, tiley))) {
+            return;
+        }
+        Village village = Villages.getVillageWithPerimeterAt(tilex, tiley, true);
+        if(village != null){
+            return;
+        }
+        Structure structure = Structures.getStructureForTile(tilex, tiley, true);
+        if(structure != null){
+            return;
+        }
+        short minHeight = -300;
+        short maxHeight = 20000;
+
+        // Check for slopes nearby
+        int minDiff = -5;
+        int xMinDiff = 0;
+        int yMinDiff = 0;
+        int lNewTile = mesh.getTile(tilex, tiley - 1);
+        short height = Tiles.decodeHeight(lNewTile);
+        int difference = height - digTileHeight;
+        int northDiff = difference;
+        if(northDiff < minDiff){
+            minDiff = northDiff;
+            xMinDiff = 0;
+            yMinDiff = -1;
+        }
+
+        lNewTile = mesh.getTile(tilex + 1, tiley);
+        height = Tiles.decodeHeight(lNewTile);
+        difference = height - digTileHeight;
+        int eastDiff = difference;
+        if(eastDiff < minDiff){
+            minDiff = eastDiff;
+            xMinDiff = 1;
+            yMinDiff = 0;
+        }
+
+        lNewTile = mesh.getTile(tilex, tiley + 1);
+        height = Tiles.decodeHeight(lNewTile);
+        difference = height - digTileHeight;
+        int southDiff = difference;
+        if(southDiff < minDiff){
+            minDiff = southDiff;
+            xMinDiff = 0;
+            yMinDiff = 1;
+        }
+
+        lNewTile = mesh.getTile(tilex - 1, tiley);
+        height = Tiles.decodeHeight(lNewTile);
+        difference = height - digTileHeight;
+        int westDiff = difference;
+        if(westDiff < minDiff){
+            //minDiff = westDiff;
+            xMinDiff = -1;
+            yMinDiff = 0;
+        }
+
+        boolean bump = false;
+        boolean pit = false;
+        boolean slanted = false;
+        if(westDiff < 0 && eastDiff < 0){
+            bump = true;
+        }else if(westDiff > 0 && eastDiff > 0){
+            pit = true;
+        }else if(northDiff < 0 && southDiff < 0){
+            bump = true;
+        }else if(northDiff > 0 && southDiff > 0){
+            pit = true;
+        }
+        if(pit){
+            return;
+        }
+        if(!bump){
+            if(westDiff + eastDiff > 10 || westDiff + eastDiff < -10){
+                slanted = true;
+            }else if(northDiff + southDiff > 10 || northDiff + southDiff < -10){
+                slanted = true;
+            }
+        }
+
+        if(!bump && !slanted){
+            return;
+        }
+
+        for(int x = tilex-2; x < tilex+2; x++){
+            for(int y = tiley-2; y < tiley+2; y++){
+                lNewTile = mesh.getTile(x, y);
+                byte lNewTileType = Tiles.decodeType(lNewTile);
+                if(!isValidSmoothTile(lNewTileType)){
+                    return;
+                }
+                structure = Structures.getStructureForTile(x, y, true);
+                if(structure != null){
+                    return;
+                }
+            }
+        }
+
+        if (digTileHeight > minHeight && digTileHeight < maxHeight) {
+            short maxdifference = 0;
+            boolean hitRock = false;
+            boolean allCornersRock;
+            for (int x = 1; x >= -1; --x) {
+                for (int y = 1; y >= -1; --y) {
+                    boolean lChanged = false;
+                    lNewTile = mesh.getTile(tilex + x, tiley + y);
+                    byte type = Tiles.decodeType(lNewTile);
+                    short newTileHeight = Tiles.decodeHeight(lNewTile);
+                    int rockTile = Server.rockMesh.getTile(tilex + x, tiley + y);
+                    short rockHeight = Tiles.decodeHeight(rockTile);
+                    if (x == xMinDiff && y == yMinDiff){
+                        lChanged = true;
+                        newTileHeight = (short)Math.max(newTileHeight + 1, rockHeight);
+                        //logger.info("Tile " + (tilex + x) + ", " + (tiley + y) + " now at " + newTileHeight + ", rock at " + rockHeight + ".");
+                        mesh.setTile(tilex + x, tiley + y, Tiles.encode(newTileHeight, type, Tiles.decodeData(lNewTile)));
+                    }
+                    if (x == 0 && y == 0) {
+                        if (newTileHeight > rockHeight) {
+                            lChanged = true;
+                            newTileHeight = (short)Math.max(newTileHeight - 1, rockHeight);
+                            //logger.info("Tile " + (tilex + x) + ", " + (tiley + y) + " now at " + newTileHeight + ", rock at " + rockHeight + ".");
+                            mesh.setTile(tilex + x, tiley + y, Tiles.encode(newTileHeight, type, Tiles.decodeData(lNewTile)));
+                        }
+                    }
+                    allCornersRock = Terraforming.allCornersAtRockLevel(tilex + x, tiley + y, mesh);
+                    if(allCornersRock) {
+                        int theTile = mesh.getTile(tilex + x, tiley + y);
+                        float oldTileHeight = Tiles.decodeHeightAsFloat(theTile);
+                        Server.modifyFlagsByTileType(tilex + x, tiley + y, Tiles.Tile.TILE_ROCK.id);
+                        mesh.setTile(tilex + x, tiley + y, Tiles.encode(oldTileHeight, Tiles.Tile.TILE_ROCK.id, (byte) 0));
+                        Players.getInstance().sendChangedTile(tilex + x, tiley + y, true, true);
+                    }else if(type == Tiles.TILE_TYPE_ROCK){
+                        int theTile = mesh.getTile(tilex + x, tiley + y);
+                        float oldTileHeight = Tiles.decodeHeightAsFloat(theTile);
+                        Server.modifyFlagsByTileType(tilex + x, tiley + y, Tiles.Tile.TILE_DIRT.id);
+                        mesh.setTile(tilex + x, tiley + y, Tiles.encode(oldTileHeight, Tiles.Tile.TILE_DIRT.id, (byte) 0));
+                        Players.getInstance().sendChangedTile(tilex + x, tiley + y, true, true);
+                    }
+                    if (lChanged) {
+                        Players.getInstance().sendChangedTile(tilex + x, tiley + y, true, true);
+                        try {
+                            Zone toCheckForChange = Zones.getZone(tilex + x, tiley + y, true);
+                            toCheckForChange.changeTile(tilex + x, tiley + y);
+                        }
+                        catch (NoSuchZoneException nsz) {
+                            logger.log(Level.INFO, "no such zone?: " + tilex + ", " + tiley, nsz);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    public static void smoothArea(int tilex, int tiley){
+        long start = System.currentTimeMillis();
+        int x = tilex-10;
+        int y;
+        while(x < tilex+10){
+            y = tiley-10;
+            while(y < tiley+10){
+                SmoothTerrainAction.smooth(x, y, Server.surfaceMesh);
+                y++;
+            }
+            x++;
+        }
+        if(System.currentTimeMillis()-start > 500) {
+            logger.info(String.format("Smoothing terrain at [%s, %s] took %s milliseconds.", tilex, tiley, System.currentTimeMillis() - start));
+        }
+    }
+    public static void onServerPoll(){
+        if(Servers.localServer.PVPSERVER){
+            return;
+        }
+        smoothArea(Server.rand.nextInt(Server.surfaceMesh.getSize()), Server.rand.nextInt(Server.surfaceMesh.getSize()));
+    }
+
+	@Override
+	public ActionPerformer getActionPerformer()
+	{
+		return new ActionPerformer() {
+			
+			@Override
+			public short getActionId() {
+				return actionId;
+			}
+
+            // Without activated object
+            @Override
+            public boolean action(Action action, Creature performer, Item source, int tilex, int tiley, boolean onSurface, boolean corner, int tile, int heightOffset, short num, float counter)
+            {
+                return this.action(action, performer, tilex, tiley, onSurface, corner, tile, heightOffset, num, counter);
+            }
+
+			// Without activated object
+			@Override
+			public boolean action(Action action, Creature performer, int tilex, int tiley, boolean onSurface, boolean corner, int tile, int heightOffset, short num, float counter)
+			{
+				if(performer instanceof Player){
+					if(performer.getPower() < 5){
+						performer.getCommunicator().sendNormalServerMessage("You do not have permission to do that.");
+						return true;
+					}
+					smoothArea(tilex, tiley);
+					//SmoothTerrainAction.smooth(tilex, tiley, Server.surfaceMesh);
+				}else{
+					logger.info("Somehow a non-player activated an Affinity Orb...");
+				}
+				return true;
+			}
+			
+			@Override
+			public boolean action(Action act, Creature performer, Item source, Item target, short action, float counter)
+			{
+				return this.action(act, performer, target, action, counter);
+			}
+			
+	
+		}; // ActionPerformer
+	}
+}

src/main/java/mod/sin/actions/items/AffinityCatcherCaptureAction.java

@@ -0,0 +1,150 @@
+package mod.sin.actions.items;
+
+import com.wurmonline.server.behaviours.Action;
+import com.wurmonline.server.behaviours.ActionEntry;
+import com.wurmonline.server.creatures.Creature;
+import com.wurmonline.server.items.Item;
+import com.wurmonline.server.players.Player;
+import com.wurmonline.server.skills.Affinities;
+import com.wurmonline.server.skills.Affinity;
+import com.wurmonline.server.skills.Skill;
+import com.wurmonline.server.skills.SkillSystem;
+import mod.sin.items.AffinityCatcher;
+import org.gotti.wurmunlimited.modsupport.actions.ActionPerformer;
+import org.gotti.wurmunlimited.modsupport.actions.BehaviourProvider;
+import org.gotti.wurmunlimited.modsupport.actions.ModAction;
+import org.gotti.wurmunlimited.modsupport.actions.ModActions;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class AffinityCatcherCaptureAction implements ModAction {
+	private static Logger logger = Logger.getLogger(AffinityCatcherCaptureAction.class.getName());
+
+	private final short actionId;
+	private final ActionEntry actionEntry;
+
+	public AffinityCatcherCaptureAction() {
+		logger.log(Level.WARNING, "AffinityCatcherCaptureAction()");
+
+		actionId = (short) ModActions.getNextActionId();
+		actionEntry = ActionEntry.createEntry(
+			actionId,
+			"Capture affinity",
+			"capturing",
+			new int[] { 0 /* ACTION_TYPE_NOMOVE */ }	// 6 /* ACTION_TYPE_NOMOVE */, 48 /* ACTION_TYPE_ENEMY_ALWAYS */, 36 /* ACTION_TYPE_ALWAYS_USE_ACTIVE_ITEM */
+		);
+		ModActions.registerAction(actionEntry);
+	}
+
+	public static boolean hasAffinityCatcher(Creature performer){
+	    //logger.info("Checking if creature has affinity catcher.");
+	    for(Item i : performer.getInventory().getItems()){
+	        if(i.getTemplateId() == AffinityCatcher.templateId){
+	            //logger.info("Has affinity catcher.");
+	            return true;
+            }
+        }
+        //logger.info("No affinity catcher found.");
+        return false;
+    }
+
+	@Override
+	public BehaviourProvider getBehaviourProvider()
+	{
+		return new BehaviourProvider() {
+            @Override
+            public List<ActionEntry> getBehavioursFor(Creature performer, Skill skill) {
+                if(performer instanceof Player && skill.affinity > 0 && hasAffinityCatcher(performer)) {
+                    return Collections.singletonList(actionEntry);
+                }
+
+                return null;
+            }
+
+            // Never called
+			@Override
+			public List<ActionEntry> getBehavioursFor(Creature performer, Item source, Skill skill) {
+				if(performer instanceof Player && source != null && source.getTemplateId() == AffinityCatcher.templateId && source.getData() == 0) {
+                    return Collections.singletonList(actionEntry);
+                }
+
+                return null;
+			}
+		};
+	}
+
+	@Override
+	public ActionPerformer getActionPerformer()
+	{
+		return new ActionPerformer() {
+			
+			@Override
+			public short getActionId() {
+				return actionId;
+			}
+            @Override
+            public boolean action(Action act, Creature performer, Skill skill, short action, float counter) {
+			    performer.getCommunicator().sendNormalServerMessage("Activate your affinity catcher to capture the affinity.");
+			    return true;
+            }
+			
+			// Without activated object
+			@Override
+            public boolean action(Action act, Creature performer, Item source, Skill skill, short action, float counter) {
+				if(performer instanceof Player){
+					Player player = (Player) performer;
+					if (source.getTemplate().getTemplateId() != AffinityCatcher.templateId){
+	                    player.getCommunicator().sendSafeServerMessage("You must use an Affinity Catcher to capture an affinity.");
+	                    return true;
+					}
+					if(source.getData() > 0){
+					    player.getCommunicator().sendSafeServerMessage("The catcher already has an affinity captured.");
+					    return true;
+                    }
+                    int skillNum = skill.getNumber();
+                    Affinity[] affs = Affinities.getAffinities(player.getWurmId());
+                    int affinityCount = 0;
+                    for (Affinity affinity : affs) {
+                        if(affinity.getNumber() > 0){
+                            logger.info("Adding "+affinity.getNumber()+" affinities to total due to skill "+SkillSystem.getNameFor(affinity.getSkillNumber()));
+                            affinityCount += affinity.getNumber();
+                        }
+                    }
+                    if(affinityCount < 3){
+                        logger.info("Player "+performer.getName()+" does not have enough affinities to utilize an affinity catcher.");
+                        performer.getCommunicator().sendNormalServerMessage("You must have at least 3 affinities in total before using an "+source.getName()+".");
+                        return true;
+                    }
+                    for (Affinity affinity : affs) {
+                        if (affinity.getSkillNumber() != skillNum) continue;
+                        if (affinity.getNumber() < 1){
+                            break;
+                        }
+                        Affinities.setAffinity(player.getWurmId(), skillNum, affinity.getNumber() - 1, false);
+                        logger.info("Setting "+source.getName()+" data to "+skillNum);
+                        source.setData(skill.getNumber());
+                        source.setName("captured "+skill.getName()+" affinity");
+                        performer.getCommunicator().sendSafeServerMessage("Your "+skill.getName()+" affinity is captured!");
+                        return true;
+                    }
+                    // Only called if the affinity is not found or it breaks from having less than one.
+                    player.getCommunicator().sendNormalServerMessage("You must have an affinity in the skill to capture.");
+				}else{
+					logger.info("Somehow a non-player activated an Affinity Catcher...");
+				}
+				return true;
+			}
+			
+			@Override
+			public boolean action(Action act, Creature performer, Item source, Item target, short action, float counter)
+			{
+				return this.action(act, performer, target, action, counter);
+			}
+			
+	
+		}; // ActionPerformer
+	}
+}

src/main/java/mod/sin/actions/items/AffinityCatcherConsumeAction.java

@@ -0,0 +1,125 @@
+package mod.sin.actions.items;
+
+import com.wurmonline.server.Items;
+import com.wurmonline.server.behaviours.Action;
+import com.wurmonline.server.behaviours.ActionEntry;
+import com.wurmonline.server.creatures.Creature;
+import com.wurmonline.server.items.Item;
+import com.wurmonline.server.players.Player;
+import com.wurmonline.server.questions.AffinityOrbQuestion;
+import com.wurmonline.server.skills.Affinities;
+import com.wurmonline.server.skills.Affinity;
+import mod.sin.items.AffinityCatcher;
+import mod.sin.items.AffinityOrb;
+import org.gotti.wurmunlimited.modsupport.actions.ActionPerformer;
+import org.gotti.wurmunlimited.modsupport.actions.BehaviourProvider;
+import org.gotti.wurmunlimited.modsupport.actions.ModAction;
+import org.gotti.wurmunlimited.modsupport.actions.ModActions;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class AffinityCatcherConsumeAction implements ModAction {
+	private static Logger logger = Logger.getLogger(AffinityCatcherConsumeAction.class.getName());
+
+	private final short actionId;
+	private final ActionEntry actionEntry;
+
+	public AffinityCatcherConsumeAction() {
+		logger.log(Level.WARNING, "AffinityCatcherConsumeAction()");
+
+		actionId = (short) ModActions.getNextActionId();
+		actionEntry = ActionEntry.createEntry(
+			actionId,
+			"Gain affinity",
+			"infusing",
+			new int[] { 6 /* ACTION_TYPE_NOMOVE */ }	// 6 /* ACTION_TYPE_NOMOVE */, 48 /* ACTION_TYPE_ENEMY_ALWAYS */, 36 /* ACTION_TYPE_ALWAYS_USE_ACTIVE_ITEM */
+		);
+		ModActions.registerAction(actionEntry);
+	}
+
+
+	@Override
+	public BehaviourProvider getBehaviourProvider()
+	{
+		return new BehaviourProvider() {
+			// Menu with activated object
+			@Override
+			public List<ActionEntry> getBehavioursFor(Creature performer, Item source, Item object)
+			{
+				return this.getBehavioursFor(performer, object);
+			}
+
+			// Menu without activated object
+			@Override
+			public List<ActionEntry> getBehavioursFor(Creature performer, Item object)
+			{
+				if(performer instanceof Player && object != null && object.getTemplateId() == AffinityCatcher.templateId && object.getData() > 0) {
+					return Collections.singletonList(actionEntry);
+				}
+				
+				return null;
+			}
+		};
+	}
+
+	@Override
+	public ActionPerformer getActionPerformer()
+	{
+		return new ActionPerformer() {
+			
+			@Override
+			public short getActionId() {
+				return actionId;
+			}
+			
+			// Without activated object
+			@Override
+			public boolean action(Action act, Creature performer, Item target, short action, float counter)
+			{
+				if(performer instanceof Player){
+					Player player = (Player) performer;
+					if (target.getTemplate().getTemplateId() != AffinityCatcher.templateId){
+	                    player.getCommunicator().sendSafeServerMessage("You must use a captured affinity.");
+	                    return true;
+					}
+					if(target.getData() <= 0){
+						player.getCommunicator().sendSafeServerMessage("The catcher needs to have an affinity captured before being consumed.");
+						return true;
+					}
+					int skillNum = (int) target.getData();
+					Affinity[] affs = Affinities.getAffinities(performer.getWurmId());
+                    for (Affinity affinity : affs) {
+                        if (affinity.getSkillNumber() != skillNum) continue;
+                        if (affinity.getNumber() >= 5){
+                            player.getCommunicator().sendSafeServerMessage("You already have the maximum amount of affinities for that skill.");
+                            return true;
+                        }
+                        Affinities.setAffinity(player.getWurmId(), skillNum, affinity.getNumber() + 1, false);
+                        player.getCommunicator().sendSafeServerMessage("Your affinity grows stronger.");
+                        Items.destroyItem(target.getWurmId());
+                        return true;
+                    }
+                    // Has no affinity in this, so should give them one.
+					Affinities.setAffinity(player.getWurmId(), skillNum, 1, false);
+                    player.getCommunicator().sendSafeServerMessage("You obtain a new affinity.");
+					Items.destroyItem(target.getWurmId());
+					return true;
+				}else{
+					logger.info("Somehow a non-player activated an Affinity Orb...");
+				}
+				return true;
+			}
+			
+			@Override
+			public boolean action(Action act, Creature performer, Item source, Item target, short action, float counter)
+			{
+				return this.action(act, performer, target, action, counter);
+			}
+			
+	
+		}; // ActionPerformer
+	}
+}

src/main/java/mod/sin/actions/items/AffinityOrbAction.java

@@ -1,14 +1,11 @@
 package mod.sin.actions.items;
 
-import com.wurmonline.server.Items;
 import com.wurmonline.server.behaviours.Action;
 import com.wurmonline.server.behaviours.ActionEntry;
 import com.wurmonline.server.creatures.Creature;
 import com.wurmonline.server.items.Item;
 import com.wurmonline.server.players.Player;
-import com.wurmonline.server.skills.Affinities;
-import com.wurmonline.server.skills.Affinity;
-import com.wurmonline.server.skills.SkillSystem;
+import com.wurmonline.server.questions.AffinityOrbQuestion;
 import mod.sin.items.AffinityOrb;
 import org.gotti.wurmunlimited.modsupport.actions.ActionPerformer;
 import org.gotti.wurmunlimited.modsupport.actions.BehaviourProvider;
@@ -84,7 +81,9 @@ public class AffinityOrbAction implements ModAction {
 	                    player.getCommunicator().sendSafeServerMessage("You must use an Affinity Orb to be infused.");
 	                    return true;
 					}
-					int skillNum = SkillSystem.getRandomSkillNum();
+                    AffinityOrbQuestion aoq = new AffinityOrbQuestion(performer, "Affinity Orb", "Which affinity would you like to receive?", performer.getWurmId(), target);
+                    aoq.sendQuestion();
+					/*int skillNum = SkillSystem.getRandomSkillNum();
 		            Affinity[] affs = Affinities.getAffinities(player.getWurmId());
 		            boolean found = false;
 		            while (!found) {
@@ -108,7 +107,7 @@ public class AffinityOrbAction implements ModAction {
 		                    found = true;
 		                }
 		                skillNum = SkillSystem.getRandomSkillNum();
-		            }
+		            }*/
 				}else{
 					logger.info("Somehow a non-player activated an Affinity Orb...");
 				}

src/main/java/mod/sin/actions/items/ArenaCacheOpenAction.java

@@ -99,8 +99,8 @@ public class ArenaCacheOpenAction implements ModAction {
 							Server.getInstance().broadCastAction(performer.getName() + " opens "+performer.getHisHerItsString()+" "+target.getName()+".", performer, 5);
 							logger.info("Player "+performer.getName()+" opened arena cache.");
 							// Sorcery fragment.
-							Item sorceryFragment = ItemFactory.createItem(SorceryFragment.templateId, 90f, null);
-							performer.getInventory().insertItem(sorceryFragment, true);
+							/*Item sorceryFragment = ItemFactory.createItem(SorceryFragment.templateId, 90f, null);
+							performer.getInventory().insertItem(sorceryFragment, true);*/
 							SupplyDepots.giveCacheReward(performer);
 							Items.destroyItem(target.getWurmId());
 							return true;

src/main/java/mod/sin/actions/items/ChaosCrystalInfuseAction.java

@@ -128,7 +128,7 @@ public class ChaosCrystalInfuseAction implements ModAction {
 								Items.destroyItem(source.getWurmId());
 							}else if(power > 30){
 								performer.getCommunicator().sendNormalServerMessage("You safely infuse the "+target.getName()+ ", chaotically changing it its weight.");
-								target.setWeight((int) (target.getWeightGrams()*Server.rand.nextFloat()*2f), false);
+								target.setWeight((int) ((target.getWeightGrams()*0.5f)+target.getWeightGrams()*Server.rand.nextFloat()*1.5f), false);
 								Items.destroyItem(source.getWurmId());
 							}else if(power > 0){
 								performer.getCommunicator().sendNormalServerMessage("You barely manage to infuse the "+target.getName()+ ", chaotically changing its quality.");

src/main/java/mod/sin/actions/items/EnchantersCrystalInfuseAction.java

@@ -137,7 +137,7 @@ public class EnchantersCrystalInfuseAction implements ModAction {
 							}else if(power > 35){
 								performer.getCommunicator().sendNormalServerMessage("You manage to infuse the "+target.getName()+ ", shifting its magical properties.");
 								for(SpellEffect eff : effs.getEffects()){
-									eff.setPower(eff.getPower()+((eff.getPower()*Server.rand.nextFloat()*0.4f) * (Server.rand.nextBoolean() ? 1 : -1)));
+									eff.setPower(eff.getPower()+((eff.getPower()*Server.rand.nextFloat()*0.3f) * (Server.rand.nextBoolean() ? 1 : -1)));
 								}
 								Items.destroyItem(source.getWurmId());
 							}else if(power > 0){

src/main/java/mod/sin/actions/items/EternalOrbAction.java

@@ -95,6 +95,12 @@ public class EternalOrbAction implements ModAction {
 						player.getCommunicator().sendNormalServerMessage("The "+target.getTemplate().getName()+" has no enchants.");
 						return true;
 					}
+					for(SpellEffect eff : teffs.getEffects()){
+					    if(eff.type == 120){
+					        player.getCommunicator().sendNormalServerMessage("The "+eff.getName()+" enchant makes this item immune to the effects of the "+source.getName()+".");
+					        return true;
+                        }
+                    }
 					try {
 						Item enchantOrb = ItemFactory.createItem(EnchantOrb.templateId, source.getCurrentQualityLevel(), "");
 						ItemSpellEffects effs = enchantOrb.getSpellEffects();

src/main/java/mod/sin/actions/items/KeyCombinationAction.java

@@ -0,0 +1,388 @@
+package mod.sin.actions.items;
+
+import com.wurmonline.server.Items;
+import com.wurmonline.server.Server;
+import com.wurmonline.server.behaviours.Action;
+import com.wurmonline.server.behaviours.ActionEntry;
+import com.wurmonline.server.creatures.Communicator;
+import com.wurmonline.server.creatures.Creature;
+import com.wurmonline.server.deities.Deities;
+import com.wurmonline.server.items.Item;
+import com.wurmonline.server.items.ItemFactory;
+import com.wurmonline.server.items.ItemList;
+import com.wurmonline.server.players.Player;
+import mod.sin.items.KeyFragment;
+import mod.sin.wyvern.KeyEvent;
+import mod.sin.wyvern.MiscChanges;
+import org.gotti.wurmunlimited.modsupport.actions.ActionPerformer;
+import org.gotti.wurmunlimited.modsupport.actions.BehaviourProvider;
+import org.gotti.wurmunlimited.modsupport.actions.ModAction;
+import org.gotti.wurmunlimited.modsupport.actions.ModActions;
+import org.nyxcode.wurm.discordrelay.DiscordRelay;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class KeyCombinationAction implements ModAction {
+	private static Logger logger = Logger.getLogger(KeyCombinationAction.class.getName());
+
+	private final short actionId;
+	private final ActionEntry actionEntry;
+
+	public KeyCombinationAction() {
+		logger.log(Level.WARNING, "KeyCombinationAction()");
+
+		actionId = (short) ModActions.getNextActionId();
+		actionEntry = ActionEntry.createEntry(
+			actionId,
+			"Call upon the heavens",
+			"intervening",
+			new int[] { 6 /* ACTION_TYPE_NOMOVE */ }	// 6 /* ACTION_TYPE_NOMOVE */, 48 /* ACTION_TYPE_ENEMY_ALWAYS */, 36 /* ACTION_TYPE_ALWAYS_USE_ACTIVE_ITEM */
+		);
+		ModActions.registerAction(actionEntry);
+	}
+
+
+	@Override
+	public BehaviourProvider getBehaviourProvider()
+	{
+		return new BehaviourProvider() {
+			// Menu with activated object
+			@Override
+			public List<ActionEntry> getBehavioursFor(Creature performer, Item source, Item object)
+			{
+				return this.getBehavioursFor(performer, object);
+			}
+
+			// Menu without activated object
+			@Override
+			public List<ActionEntry> getBehavioursFor(Creature performer, Item object)
+			{
+				if(performer instanceof Player && object != null && object.getTemplateId() == KeyFragment.templateId) {
+					return Collections.singletonList(actionEntry);
+				}
+				
+				return null;
+			}
+		};
+	}
+
+	@Override
+	public ActionPerformer getActionPerformer()
+	{
+		return new ActionPerformer() {
+			
+			@Override
+			public short getActionId() {
+				return actionId;
+			}
+
+			protected boolean hasEnoughFragments(Creature performer){
+			    int count = 0;
+				for(Item item : performer.getInventory().getItems()){
+					if(item.getTemplateId() == KeyFragment.templateId){
+                        count++;
+					}
+				}
+                return count >= 50;
+            }
+            protected void removeFragments(Creature performer){
+			    int count = 0;
+			    int index = 0;
+			    ArrayList<Long> fragments = new ArrayList<>();
+			    for(Item item : performer.getInventory().getItems()){
+			        if(item.getTemplateId() == KeyFragment.templateId && count < 50){
+			            fragments.add(item.getWurmId());
+			            count++;
+                    }
+                }
+                for(long wid : fragments){
+			        Items.destroyItem(wid);
+                }
+            }
+
+            protected void broadcast(Creature performer, int speaker, String message){
+			    String name;
+			    int r;
+			    int g;
+			    int b;
+			    if(speaker == 0){
+			        name = "Unknown Entity";
+			        r = 0;
+			        g = 255;
+			        b = 255;
+                }else if(speaker == Deities.DEITY_FO){
+			        name = "Fo";
+			        r = 128;
+			        g = 255;
+			        b = 128;
+                }else if(speaker == Deities.DEITY_MAGRANON){
+			        name = "Magranon";
+			        r = 255;
+			        g = 128;
+			        b = 128;
+                }else if(speaker == Deities.DEITY_VYNORA){
+			        name = "Vynora";
+			        r = 192;
+			        g = 192;
+			        b = 255;
+                }else if(speaker == Deities.DEITY_LIBILA){
+			        name = "Libila";
+			        r = 192;
+			        g = 192;
+			        b = 192;
+                }else{
+			        name = Deities.getEntityName(speaker);
+			        r = 192;
+			        g = 192;
+			        b = 192;
+                }
+                MiscChanges.sendGlobalFreedomChat(performer, name, message, r, g, b);
+                DiscordRelay.sendToDiscord("gl-freedom", "<"+name+"> "+message, false);
+            }
+
+			// Without activated object
+			@Override
+			public boolean action(Action act, Creature performer, Item target, short action, float counter)
+			{
+				try{
+					if(performer instanceof Player){
+						if(target.getTemplateId() != KeyFragment.templateId){
+							performer.getCommunicator().sendNormalServerMessage("That is not a key fragment.");
+							return true;
+						}
+						if(target.getLastOwnerId() != performer.getWurmId() && target.getOwnerId() != performer.getWurmId()){
+							performer.getCommunicator().sendNormalServerMessage("You must own the "+target.getName()+" to begin.");
+							return true;
+						}
+						Communicator comm = performer.getCommunicator();
+						if(counter == 1.0f){
+                            if(!hasEnoughFragments(performer)){
+                                performer.getCommunicator().sendSafeServerMessage("You must obtain enough fragments to form a full key before you begin.");
+                                return true;
+                            }
+							performer.getCommunicator().sendNormalServerMessage("You begin to combine the the key fragments.");
+							Server.getInstance().broadCastAction(performer.getName() + " begins unseal "+performer.getHisHerItsString()+" "+target.getName()+".", performer, 5);
+							act.setTimeLeft(3800);
+							performer.sendActionControl("Heaven intervention", true, act.getTimeLeft());
+                            KeyEvent.setActive(System.currentTimeMillis(), performer);
+						}else if(act.currentSecond() == 5){
+						    comm.sendAlertServerMessage("Stand still and do not move until the process is complete.", (byte) 2);
+                        }else if(act.currentSecond() == 9){
+						    comm.sendAlertServerMessage("Pay attention to GL-Freedom chat, and respond to divine inquiries there.", (byte) 2);
+                        }else if(act.currentSecond() == 13){
+                            comm.sendAlertServerMessage("Answer the inquiries directly in GL-Freedom.", (byte) 2);
+                        }else if(act.currentSecond() == 17){
+                            comm.sendAlertServerMessage("You have 20 to 30 seconds to answer each question. Let's begin.", (byte) 2);
+                        }else if(act.currentSecond() == 20){
+                            broadcast(performer, 0, "What is this I feel? Something is happening.");
+                        }else if(act.currentSecond() == 25){
+						    broadcast(performer, 0, "Who is this creature? This... "+performer.getName()+"...");
+                        }else if(act.currentSecond() == 29){
+						    broadcast(performer, 0, "Ah, there you are. Like a speck of dust. I see you.");
+                        }else if(act.currentSecond() == 33){
+						    broadcast(performer, 0, "You possess a large quantity of divine power.");
+                        }else if(act.currentSecond() == 37){
+						    broadcast(performer, 0, "I'll take it. In exchange, I will grant you one wish.");
+                        }else if(act.currentSecond() == 40){
+						    broadcast(performer, 0, "Let's hear it. "+performer.getName()+": What do you desire most? Power? Wealth? Recognition?");
+                        }else if(act.currentSecond() == 50){ // Reminder
+						    if(KeyEvent.getResponse(0).equals("")) {
+                                broadcast(performer, 0, "Nothing to say? I'll give you a few more seconds...");
+                            }
+                        }else if(act.currentSecond() == 60){
+						    String response = KeyEvent.getResponse(0);
+						    if(response.equals("")){
+						        broadcast(performer, 0, "No answer. Just as I expected.");
+                            }else {
+                                broadcast(performer, 0, "Hah! You want " + KeyEvent.getResponse(0) + "? Such a lack of imagination.");
+                            }
+                        }else if(act.currentSecond() == 65){
+						    if(performer.getDeity() != null) {
+                                broadcast(performer, performer.getDeity().getNumber(), "Master, I recognize this one.");
+                            }else{
+						        broadcast(performer, 1+Server.rand.nextInt(4), "This one seems important."); // Random entity.
+                            }
+                        }else if(act.currentSecond() == 70){
+						    if(performer.getDeity() != null){
+						        broadcast(performer, performer.getDeity().getNumber(), performer.getName()+" is my champion, and possesses the fragments of the hunt.");
+                            }else{
+						        broadcast(performer, 1+Server.rand.nextInt(4), "They possess the fragments of the hunt.");
+                            }
+                        }else if(act.currentSecond() == 75){
+						    if(performer.getDeity() != null){
+						        broadcast(performer, 0, "Silence, "+performer.getDeity().getName()+"! I was just offering a trade, that's all.");
+                            }else{
+                                broadcast(performer, 0, "Silence! I was just offering a trade, that's all.");
+                            }
+                        }else if(act.currentSecond() == 80){
+						    if(performer.getDeity() != null){
+						        broadcast(performer, performer.getDeity().getNumber(), "Master, you know the rules. Ascension is required.");
+                            }else{
+                                broadcast(performer, 1+Server.rand.nextInt(4), "Master, you know the rules. Ascension is required.");
+                            }
+                        }else if(act.currentSecond() == 84){
+						    broadcast(performer, 0, "Yes, yes. Rules and tradition and all that wonderful stuff. Alright. Let's begin.");
+                        }else if(act.currentSecond() == 88){
+						    broadcast(performer, 0, performer.getName()+"! Your efforts have not gone unnoticed.");
+                        }else if(act.currentSecond() == 92){
+						    broadcast(performer, 0, "For your valor, I shall lift you into the heavens and bestow upon you ascension to demigod.");
+                        }else if(act.currentSecond() == 95){
+						    broadcast(performer, 0, "A shame, really. Now you wont get "+KeyEvent.getResponse(0)+". Oh well.");
+                        }else if(act.currentSecond() == 99){
+						    broadcast(performer, 1+Server.rand.nextInt(4), "Master...");
+                        }else if(act.currentSecond() == 103){
+						    broadcast(performer, 0, "I digress. We, as the council of the heavens, shall grant you one power each.");
+                        }else if(act.currentSecond() == 107){
+						    broadcast(performer, 0, "Fo. We'll start with you.");
+                        }else if(act.currentSecond() == 110){
+						    broadcast(performer, Deities.DEITY_FO, "Greetings, "+performer.getName()+". I am Fo, the Silence and the Trees.");
+                        }else if(act.currentSecond() == 114){
+						    broadcast(performer, Deities.DEITY_FO, "For you, I grant a decision between four of my powers.");
+                        }else if(act.currentSecond() == 117){
+						    broadcast(performer, Deities.DEITY_FO, KeyEvent.getFoPowers());
+                        }else if(act.currentSecond() == 120){
+						    broadcast(performer, Deities.DEITY_FO, "Choose, "+performer.getName()+": Which power do you select?");
+                        }else if(act.currentSecond() == 140){
+						    if(KeyEvent.getResponse(1).equals("")){
+						        broadcast(performer, Deities.DEITY_FO, "Are you still there? "+performer.getName()+", you must choose.");
+                            }
+                        }else if(act.currentSecond() == 150){
+						    if(!KeyEvent.isValidFo()) {
+                                broadcast(performer, Deities.DEITY_FO, "If you refuse to choose, I will choose for you. I grant you Life Transfer.");
+                                KeyEvent.foPower = "Life Transfer";
+                                KeyEvent.hasWeaponEnchant = true;
+                            }else{
+						        broadcast(performer, Deities.DEITY_FO, "I hear you, "+performer.getName()+", and grant you the power of "+KeyEvent.foPower+".");
+                            }
+                        }else if(act.currentSecond() == 155){
+						    broadcast(performer, 0, "Your first power is "+KeyEvent.foPower+" from Fo. Next up, Magranon.");
+                        }else if(act.currentSecond() == 159){
+						    broadcast(performer, Deities.DEITY_MAGRANON, "Greetings, "+performer.getName()+". I am Magranon, the Fire and the Mountain.");
+                        }else if(act.currentSecond() == 163){
+						    broadcast(performer, Deities.DEITY_MAGRANON, "I was going to offer you six powers, but you already chose "+KeyEvent.foPower+", which is incompatible with one of mine.");
+                        }else if(act.currentSecond() == 167){
+                            broadcast(performer, Deities.DEITY_MAGRANON, KeyEvent.getMagranonPowers());
+                        }else if(act.currentSecond() == 170){
+						    broadcast(performer, Deities.DEITY_MAGRANON, "Choose, "+performer.getName()+": Which power do you wish to wield?");
+                        }else if(act.currentSecond() == 190){
+                            if (KeyEvent.getResponse(2).equals("")) {
+                                broadcast(performer, Deities.DEITY_MAGRANON, "Are you still there? " + performer.getName() + ", you must choose.");
+                            }
+                        }else if(act.currentSecond() == 200){
+                            if (!KeyEvent.isValidMagranon()) {
+                                KeyEvent.setRandomMagranonPower();
+                                broadcast(performer, Deities.DEITY_MAGRANON, "If you refuse to choose, I will choose for you. I grant you "+KeyEvent.magranonPower+".");
+                            } else {
+                                broadcast(performer, Deities.DEITY_MAGRANON, "I hear you, " + performer.getName() + ", and grant you the power of " + KeyEvent.magranonPower + ".");
+                            }
+                        }else if(act.currentSecond() == 205){
+						    broadcast(performer, 0, "Your second power is "+KeyEvent.magranonPower+" from Magranon. Your next power shall come from Vynora.");
+                        }else if(act.currentSecond() == 209){
+						    broadcast(performer, Deities.DEITY_VYNORA, "Greetings, "+performer.getName()+". I am Vynora, the Water and the Wind.");
+                        }else if(act.currentSecond() == 213){
+						    broadcast(performer, Deities.DEITY_VYNORA, "I have much to offer you. Unlike my peers, I can only offer you enchant powers to choose from.");
+                        }else if(act.currentSecond() == 217){
+						    broadcast(performer, Deities.DEITY_VYNORA, KeyEvent.getVynoraPowers());
+                        }else if(act.currentSecond() == 220){
+                            broadcast(performer, Deities.DEITY_VYNORA, "Choose, "+performer.getName()+": Which enchant power suits your needs?");
+                        }else if(act.currentSecond() == 240){
+                            if (KeyEvent.getResponse(3).equals("")) {
+                                broadcast(performer, Deities.DEITY_VYNORA, "Are you still there? " + performer.getName() + ", you must choose.");
+                            }
+                        }else if(act.currentSecond() == 250) {
+                            if (!KeyEvent.isValidVynora()) {
+                                KeyEvent.setRandomVynoraPower();
+                                broadcast(performer, Deities.DEITY_VYNORA, "If you refuse to choose, I will choose for you. I grant you " + KeyEvent.vynoraPower + ".");
+                            } else {
+                                broadcast(performer, Deities.DEITY_VYNORA, "I hear you, " + performer.getName() + ", and grant you the power of " + KeyEvent.vynoraPower + ".");
+                            }
+                        }else if(act.currentSecond() == 255){
+						    broadcast(performer, 0, "Your third power is "+KeyEvent.vynoraPower+" from Vynora. You have one more to choose. Libila!");
+                        }else if(act.currentSecond() == 259){
+                            broadcast(performer, Deities.DEITY_LIBILA, "Greetings, "+performer.getName()+". I am Libila, the Hate and the Deceit.");
+                        }else if(act.currentSecond() == 263){
+                            broadcast(performer, Deities.DEITY_LIBILA, "My offerings are the most powerful of all, so choose wisely.");
+                        }else if(act.currentSecond() == 267){
+                            broadcast(performer, Deities.DEITY_LIBILA, KeyEvent.getLibilaPowers());
+                        }else if(act.currentSecond() == 270){
+                            broadcast(performer, Deities.DEITY_LIBILA, "Choose, "+performer.getName()+": What shall be your strongest power?");
+                        }else if(act.currentSecond() == 290){
+                            if (KeyEvent.getResponse(4).equals("")) {
+                                broadcast(performer, Deities.DEITY_LIBILA, "Are you still there? " + performer.getName() + ", you must choose.");
+                            }
+                        }else if(act.currentSecond() == 300) {
+                            if (!KeyEvent.isValidLibila()) {
+                                KeyEvent.setRandomLibilaPower();
+                                broadcast(performer, Deities.DEITY_LIBILA, "If you refuse to choose, I will choose for you. I grant you " + KeyEvent.libilaPower + ".");
+                            } else {
+                                broadcast(performer, Deities.DEITY_LIBILA, "I hear you, " + performer.getName() + ", and grant you the power of " + KeyEvent.libilaPower + ".");
+                            }
+                        }else if(act.currentSecond() == 305){
+						    broadcast(performer, 0, "So it appears you have completed your choices.");
+                        }else if(act.currentSecond() == 310){
+						    broadcast(performer, 0, "Upon ascension, you will receive "+KeyEvent.foPower+", "+KeyEvent.magranonPower+", "+KeyEvent.vynoraPower+", and "+KeyEvent.libilaPower);
+                        }else if(act.currentSecond() == 314){
+						    broadcast(performer, 0, "There is one last question to answer. Which of the council shall you base your ascension on?");
+                        }else if(act.currentSecond() == 318){
+						    broadcast(performer, 0, "Each comes with their own benefit. They will explain them to you.");
+                        }else if(act.currentSecond() == 322){
+						    broadcast(performer, Deities.DEITY_FO, "I can grant you immunity to thorns and the wildlife shall no longer be aggressive.");
+                        }else if(act.currentSecond() == 326){
+						    broadcast(performer, Deities.DEITY_MAGRANON, "I can grant you immunity to lava and increased learning from combat.");
+                        }else if(act.currentSecond() == 330){
+						    broadcast(performer, Deities.DEITY_VYNORA, "I can grant you industrial aptitude.");
+                        }else if(act.currentSecond() == 334){
+						    broadcast(performer, Deities.DEITY_LIBILA, "I can grant you healing and replenishment from mycelium.");
+                        }else if(act.currentSecond() == 340){
+						    broadcast(performer, 0, "The choice is yours, "+performer.getName()+": Which deity shall you base your ascension on? Fo, Magranon, Vynora, or Libila?");
+                        }else if(act.currentSecond() == 360){
+                            if (KeyEvent.getResponse(5).equals("")) {
+                                broadcast(performer, 0, "Are you still there? " + performer.getName() + ", you must choose.");
+                            }
+                        }else if(act.currentSecond() == 370) {
+                            if (!KeyEvent.isValidAscendTemplate()) {
+                                KeyEvent.setRandomAscendTemplate();
+                                broadcast(performer, 0, "If you refuse to choose, I will choose for you. Your ascension shall be based on " + KeyEvent.ascendTemplate + ".");
+                            } else {
+                                broadcast(performer, 0, "Your ascension shall be based on " + KeyEvent.ascendTemplate + ".");
+                            }
+                        }else if(act.currentSecond() == 375){
+						    broadcast(performer, 0, "With this council concluded, I now award you, "+performer.getName()+", with the Key of the Heavens.");
+                        }else if(act.currentSecond() == 378){
+						    broadcast(performer, 0, "Use it, and claim your place among the gods.");
+                        }else if(counter * 10f > performer.getCurrentAction().getTimeLeft()){
+                            if(!hasEnoughFragments(performer)){
+                                performer.getCommunicator().sendSafeServerMessage("You have lost the fragments required.");
+                                return true;
+                            }
+                            removeFragments(performer);
+                            Item key = ItemFactory.createItem(ItemList.keyHeavens, 99.0f, "Entity");
+                            performer.getInventory().insertItem(key, true);
+							performer.getCommunicator().sendSafeServerMessage("You obtain a "+key.getTemplate().getName()+"!");
+							logger.info("Player "+performer.getName()+" obtained "+key.getName()+" - "+KeyEvent.foPower+", "+KeyEvent.magranonPower+", "+KeyEvent.vynoraPower+", "+KeyEvent.libilaPower+", "+KeyEvent.ascendTemplate);
+							return true;
+						}
+					}else{
+						logger.info("Somehow a non-player activated a Treasure Box...");
+					}
+					return false;
+				}catch(Exception e){
+					e.printStackTrace();
+					return true;
+				}
+			}
+			
+			@Override
+			public boolean action(Action act, Creature performer, Item source, Item target, short action, float counter)
+			{
+				return this.action(act, performer, target, action, counter);
+			}
+			
+	
+		}; // ActionPerformer
+	}
+}

src/main/java/mod/sin/actions/items/SealedMapAction.java

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import mod.sin.items.KeyFragment;
 import org.gotti.wurmunlimited.modsupport.actions.ActionPerformer;
 import org.gotti.wurmunlimited.modsupport.actions.BehaviourProvider;
 import org.gotti.wurmunlimited.modsupport.actions.ModAction;
@@ -75,7 +76,7 @@ public class SealedMapAction implements ModAction {
 			public short getActionId() {
 				return actionId;
 			}
-			
+
 			// Without activated object
 			@Override
 			public boolean action(Action act, Creature performer, Item target, short action, float counter)
@@ -92,7 +93,7 @@ public class SealedMapAction implements ModAction {
 						}
 						if(counter == 1.0f){
 							performer.getCommunicator().sendNormalServerMessage("You begin to unseal the "+target.getName()+".");
-							Server.getInstance().broadCastAction(performer.getName() + " begins unseal "+performer.getHisHerItsString()+" "+target.getName()+".", performer, 5);
+							Server.getInstance().broadCastAction(performer.getName() + " begins unsealing "+performer.getHisHerItsString()+" "+target.getName()+".", performer, 5);
 							act.setTimeLeft(50);
 							performer.sendActionControl("Unsealing", true, act.getTimeLeft());
 						}else if(counter * 10f > performer.getCurrentAction().getTimeLeft()){

src/main/java/mod/sin/actions/items/SorcerySplitAction.java

@@ -0,0 +1,119 @@
+package mod.sin.actions.items;
+
+import com.wurmonline.server.FailedException;
+import com.wurmonline.server.behaviours.Action;
+import com.wurmonline.server.behaviours.ActionEntry;
+import com.wurmonline.server.creatures.Creature;
+import com.wurmonline.server.items.Item;
+import com.wurmonline.server.items.ItemFactory;
+import com.wurmonline.server.items.NoSuchTemplateException;
+import com.wurmonline.server.players.Player;
+import com.wurmonline.server.questions.BookConversionQuestion;
+import mod.sin.items.BookOfConversion;
+import mod.sin.wyvern.util.ItemUtil;
+import org.gotti.wurmunlimited.modsupport.actions.ActionPerformer;
+import org.gotti.wurmunlimited.modsupport.actions.BehaviourProvider;
+import org.gotti.wurmunlimited.modsupport.actions.ModAction;
+import org.gotti.wurmunlimited.modsupport.actions.ModActions;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Logger;
+
+public class SorcerySplitAction implements ModAction {
+	private static Logger logger = Logger.getLogger(SorcerySplitAction.class.getName());
+
+	private final short actionId;
+	private final ActionEntry actionEntry;
+
+	public SorcerySplitAction() {
+		actionId = (short) ModActions.getNextActionId();
+		actionEntry = ActionEntry.createEntry(
+			actionId,
+			"Split sorcery",
+			"splitting",
+			new int[] { 0 /* ACTION_TYPE_NOMOVE */ }	// 6 /* ACTION_TYPE_NOMOVE */, 48 /* ACTION_TYPE_ENEMY_ALWAYS */, 36 /* ACTION_TYPE_ALWAYS_USE_ACTIVE_ITEM */
+		);
+		ModActions.registerAction(actionEntry);
+	}
+
+
+	@Override
+	public BehaviourProvider getBehaviourProvider()
+	{
+		return new BehaviourProvider() {
+			// Menu with activated object
+			@Override
+			public List<ActionEntry> getBehavioursFor(Creature performer, Item source, Item object)
+			{
+				return this.getBehavioursFor(performer, object);
+			}
+
+			// Menu without activated object
+			@Override
+			public List<ActionEntry> getBehavioursFor(Creature performer, Item object)
+			{
+				if(performer instanceof Player && object != null && ItemUtil.isSorcery(object) && object.getAuxData() < 2) {
+					return Collections.singletonList(actionEntry);
+				}
+				
+				return null;
+			}
+		};
+	}
+
+	@Override
+	public ActionPerformer getActionPerformer()
+	{
+		return new ActionPerformer() {
+			
+			@Override
+			public short getActionId() {
+				return actionId;
+			}
+			
+			// Without activated object
+			@Override
+			public boolean action(Action act, Creature performer, Item target, short action, float counter)
+			{
+				if(performer instanceof Player){
+					Player player = (Player) performer;
+					if(!ItemUtil.isSorcery(target)){
+						player.getCommunicator().sendNormalServerMessage("You can only split a sorcery.");
+						return true;
+					}
+					if(target.getAuxData() >= 2){
+						player.getCommunicator().sendNormalServerMessage("The sorcery must have at least two charges to split.");
+						return true;
+					}
+                    if(target.getOwnerId() != player.getWurmId()){
+					    player.getCommunicator().sendNormalServerMessage("You must be holding the sorcery to split it.");
+                        return true;
+                    }
+					while(target.getAuxData() < 2){
+                        try {
+                            Item newSorcery = ItemFactory.createItem(target.getTemplateId(), target.getCurrentQualityLevel(), null);
+                            newSorcery.setAuxData((byte) 2);
+                            player.getInventory().insertItem(newSorcery, true);
+                            target.setAuxData((byte) (target.getAuxData()+1));
+                        } catch (FailedException | NoSuchTemplateException e) {
+                            e.printStackTrace();
+                            break;
+                        }
+                    }
+				}else{
+					logger.info("Somehow a non-player activated a "+target.getName()+"...");
+				}
+				return true;
+			}
+			
+			@Override
+			public boolean action(Action act, Creature performer, Item source, Item target, short action, float counter)
+			{
+				return this.action(act, performer, target, action, counter);
+			}
+			
+	
+		}; // ActionPerformer
+	}
+}

src/main/java/mod/sin/actions/items/SupplyDepotAction.java

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import mod.sin.items.SorceryFragment;
 import org.gotti.wurmunlimited.modsupport.actions.ActionPerformer;
 import org.gotti.wurmunlimited.modsupport.actions.BehaviourProvider;
 import org.gotti.wurmunlimited.modsupport.actions.ModAction;
@@ -110,6 +111,8 @@ public class SupplyDepotAction implements ModAction {
 							Item inv = performer.getInventory();
 							Item cache = ItemFactory.createItem(ArenaCache.templateId, 90+(10*Server.rand.nextFloat()), "");
 							inv.insertItem(cache, true);
+							Item fragment = ItemFactory.createItem(SorceryFragment.templateId, 90+(10*Server.rand.nextFloat()), "");
+							inv.insertItem(fragment, true);
 							performer.getCommunicator().sendSafeServerMessage("You have successfully captured the depot!");
 							Server.getInstance().broadCastAction(performer.getName() + " successfully captures the depot!", performer, 50);
 							SupplyDepots.broadcastCapture(performer);

src/main/java/mod/sin/creatures/Charger.java

@@ -68,6 +68,10 @@ public class Charger implements ModCreature, CreatureTypes {
 		builder.denMaterial(Materials.MATERIAL_WOOD_BIRCH);
 		builder.denName("charger lair");
 		builder.maxGroupAttackSize(100);
+		//builder.color(219, 180, 87);
+        //builder.color(255, 0, 0);
+		//builder.sizeModifier(1024, 1024, 1024);
+		//builder.paintMode(2);
 		
 		templateId = builder.getTemplateId();
 		return builder;
@@ -87,7 +91,7 @@ public class Charger implements ModCreature, CreatureTypes {
 
 				vehicle.createPassengerSeats(0);
 				vehicle.setSeatFightMod(0, 0.8f, 1.1f);
-				vehicle.setSeatOffset(0, 0.0f, 0.0f, 0.0f);
+				vehicle.setSeatOffset(0, 0.0f, 0.0f, 0.5f);
 				vehicle.setCreature(true);
 				vehicle.setSkillNeeded(Servers.localServer.PVPSERVER ? 25.0f : 37.0f);
 				vehicle.setName(creature.getName());

src/main/java/mod/sin/creatures/Facebreyker.java

@@ -1,5 +1,7 @@
 package mod.sin.creatures;
 
+import com.wurmonline.server.items.ItemList;
+import com.wurmonline.server.items.Materials;
 import com.wurmonline.shared.constants.CreatureTypes;
 import org.gotti.wurmunlimited.modsupport.CreatureTemplateBuilder;
 import org.gotti.wurmunlimited.modsupport.creatures.ModCreature;
@@ -33,7 +35,7 @@ public class Facebreyker implements ModCreature, CreatureTypes {
 				"model.creature.humanoid.ogre.rift", types, (byte) 0, (short) 20, (byte) 0, (short) 350, (short) 100, (short) 60,
 				"sound.death.troll", "sound.death.troll", "sound.combat.hit.troll", "sound.combat.hit.troll",
 				0.05f, 50.0f, 50.0f, 0.0f, 0.0f, 0.0f, 1.6f, 1100,
-				new int[]{867}, 40, 100, (byte) 0);
+				new int[]{ItemList.boneCollar}, 40, 100, Materials.MATERIAL_MEAT_HUMANOID);
 		
 		builder.skill(SkillList.BODY_STRENGTH, 90.0f);
 		builder.skill(SkillList.BODY_STAMINA, 90.0f);
@@ -55,6 +57,8 @@ public class Facebreyker implements ModCreature, CreatureTypes {
 		builder.baseCombatRating(80.0f);
 		builder.combatDamageType(Wound.TYPE_CRUSH);
 		builder.maxGroupAttackSize(100);
+
+		builder.setCombatMoves(new int[]{5});
 		
 		//builder.usesNewAttacks(true);
 		// float baseDamage, float criticalChance, float baseSpeed, int attackReach, int weightGroup, byte damageType, boolean usesWeapon, int rounds, float waitUntilNextAttack

src/main/java/mod/sin/creatures/GuardianMagranon.java

@@ -0,0 +1,80 @@
+package mod.sin.creatures;
+
+import com.wurmonline.server.bodys.BodyTemplate;
+import com.wurmonline.server.bodys.Wound;
+import com.wurmonline.server.combat.ArmourTypes;
+import com.wurmonline.server.items.ItemList;
+import com.wurmonline.server.items.Materials;
+import com.wurmonline.server.skills.SkillList;
+import com.wurmonline.shared.constants.CreatureTypes;
+import org.gotti.wurmunlimited.modsupport.CreatureTemplateBuilder;
+import org.gotti.wurmunlimited.modsupport.creatures.ModCreature;
+
+public class GuardianMagranon implements ModCreature, CreatureTypes {
+	public static int templateId;
+	
+	@Override
+	public CreatureTemplateBuilder createCreateTemplateBuilder() {
+		// {C_TYPE_MOVE_LOCAL, C_TYPE_VEHICLE, C_TYPE_ANIMAL, C_TYPE_LEADABLE, C_TYPE_GRAZER, C_TYPE_OMNIVORE, C_TYPE_DOMINATABLE, C_TYPE_AGG_HUMAN, C_TYPE_NON_NEWBIE, C_TYPE_BURNING}; - Hell Horse
+		// int[] types = new int[]{7, 6, 13, 3, 29, 39, 60, 61}; - Spider
+		int[] types = {
+				CreatureTypes.C_TYPE_MOVE_LOCAL,
+				CreatureTypes.C_TYPE_AGG_HUMAN,
+				CreatureTypes.C_TYPE_HUNTING,
+				CreatureTypes.C_TYPE_MONSTER,
+				CreatureTypes.C_TYPE_CARNIVORE,
+				CreatureTypes.C_TYPE_DETECTINVIS,
+				CreatureTypes.C_TYPE_NON_NEWBIE,
+				CreatureTypes.C_TYPE_NO_REBIRTH
+		};
+		
+		//public CreatureTemplateBuilder(final String identifier, final String name, final String description,
+		//       final String modelName, final int[] types, final byte bodyType, final short vision, final byte sex, final short centimetersHigh, final short centimetersLong, final short centimetersWide,
+		//       final String deathSndMale, final String deathSndFemale, final String hitSndMale, final String hitSndFemale,
+		//       final float naturalArmour, final float handDam, final float kickDam, final float biteDam, final float headDam, final float breathDam, final float speed, final int moveRate,
+		//       final int[] itemsButchered, final int maxHuntDist, final int aggress) {
+		CreatureTemplateBuilder builder = new CreatureTemplateBuilder("mod.creature.guardian.magranon", "Guardian of Magranon", "A loyal servant of Magranon, bound to defend their master.",
+				"model.creature.humanoid.giant.juggernaut", types, BodyTemplate.TYPE_HUMAN, (short) 5, (byte) 0, (short) 85, (short) 50, (short) 85,
+                "sound.death.magranon.juggernaut", "sound.death.magranon.juggernaut", "sound.combat.hit.magranon.juggernaut", "sound.combat.hit.magranon.juggernaut",
+				0.1f, 12f, 0f, 0f, 0.0f, 0.0f, 1.2f, 500,
+				new int[]{ItemList.charcoal, ItemList.flint, ItemList.heart, ItemList.adamantineOre}, 15, 70, Materials.MATERIAL_MEAT_HUMANOID);
+		
+		builder.skill(SkillList.BODY_STRENGTH, 70.0f);
+		builder.skill(SkillList.BODY_STAMINA, 70.0f);
+		builder.skill(SkillList.BODY_CONTROL, 70.0f);
+		builder.skill(SkillList.MIND_LOGICAL, 50.0f);
+		builder.skill(SkillList.MIND_SPEED, 50.0f);
+		builder.skill(SkillList.SOUL_STRENGTH, 50.0f);
+		builder.skill(SkillList.SOUL_DEPTH, 50.0f);
+		builder.skill(SkillList.WEAPONLESS_FIGHTING, 70.0f);
+		builder.skill(SkillList.GROUP_FIGHTING, 90.0f);
+		builder.skill(SkillList.AXE_HUGE, 70.0f);
+		builder.skill(SkillList.AXE_LARGE, 70.0f);
+		builder.skill(SkillList.AXE_SMALL, 70.0f);
+		builder.skill(SkillList.MAUL_LARGE, 70.0f);
+		builder.skill(SkillList.MAUL_MEDIUM, 70.0f);
+		builder.skill(SkillList.MAUL_SMALL, 70.0f);
+		builder.skill(SkillList.SWORD_TWOHANDED, 70.0f);
+		builder.skill(SkillList.SWORD_LONG, 70.0f);
+		builder.skill(SkillList.SWORD_SHORT, 70.0f);
+		
+		builder.boundsValues(-0.5f, -1.0f, 0.5f, 1.42f);
+		builder.handDamString("hit");
+		builder.maxAge(100);
+		builder.armourType(ArmourTypes.ARMOUR_LEATHER);
+		builder.baseCombatRating(30.0f);
+		builder.combatDamageType(Wound.TYPE_BURN);
+		builder.maxGroupAttackSize(100);
+		builder.sizeModifier(5, 5, 5);
+		builder.hasHands(true);
+		
+		templateId = builder.getTemplateId();
+		return builder;
+	}
+	
+	@Override
+	public void addEncounters() {
+		if (templateId == 0)
+			return;
+	}
+}

src/main/java/mod/sin/creatures/SpiritTroll.java

@@ -57,10 +57,10 @@ public class SpiritTroll implements ModCreature, CreatureTypes {
 		//       final float naturalArmour, final float handDam, final float kickDam, final float biteDam, final float headDam, final float breathDam, final float speed, final int moveRate,
 		//       final int[] itemsButchered, final int maxHuntDist, final int aggress) {
 		CreatureTemplateBuilder builder = new CreatureTemplateBuilder("mod.creature.spirit.troll", "Spirit troll", "A spirit troll.",
-				"model.creature.humanoid.troll.standard", Servers.localServer.PVPSERVER ? pvpTypes : types, BodyTemplate.TYPE_HUMAN, (short) 5, (byte) 0, (short) 85, (short) 50, (short) 85,
+				"model.creature.humanoid.troll.king", Servers.localServer.PVPSERVER ? pvpTypes : types, BodyTemplate.TYPE_HUMAN, (short) 5, (byte) 0, (short) 85, (short) 50, (short) 85,
 				"sound.death.troll", "sound.death.troll", "sound.combat.hit.troll", "sound.combat.hit.troll", 
 				0.15f, 15f, 17f, 19.0f, 0.0f, 0.0f, 1.2f, 500,
-				new int[]{}, 10, 74, (byte) 82);
+				new int[]{}, 10, 74, Materials.MATERIAL_MEAT_HUMANOID);
 		
 		builder.skill(SkillList.BODY_STRENGTH, 45.0f);
 		builder.skill(SkillList.BODY_STAMINA, 40.0f);

src/main/java/mod/sin/creatures/Worg.java

@@ -1,5 +1,6 @@
 package mod.sin.creatures;
 
+import com.wurmonline.server.Servers;
 import org.gotti.wurmunlimited.modsupport.CreatureTemplateBuilder;
 import org.gotti.wurmunlimited.modsupport.creatures.EncounterBuilder;
 import org.gotti.wurmunlimited.modsupport.creatures.ModCreature;
@@ -54,7 +55,7 @@ public class Worg implements ModCreature {
 				vehicle.setName(creature.getName());
 				vehicle.setMaxHeightDiff(0.07f);
 				vehicle.setMaxDepth(-1.7f);
-				vehicle.setMaxSpeed(40.0f);
+				vehicle.setMaxSpeed(Servers.localServer.PVPSERVER ? 35.0f : 40.0f);
 				vehicle.setCommandType((byte) 3);
 				vehicle.setCanHaveEquipment(false);
 			}

src/main/java/mod/sin/items/AffinityCatcher.java

@@ -0,0 +1,45 @@
+package mod.sin.items;
+
+import com.wurmonline.server.MiscConstants;
+import com.wurmonline.server.items.ItemTemplate;
+import com.wurmonline.server.items.ItemTypes;
+import com.wurmonline.server.items.Materials;
+import org.gotti.wurmunlimited.modsupport.ItemTemplateBuilder;
+
+import java.io.IOException;
+import java.util.logging.Logger;
+
+public class AffinityCatcher implements ItemTypes, MiscConstants {
+	public static Logger logger = Logger.getLogger(AffinityCatcher.class.getName());
+	public static int templateId;
+	
+	public void createTemplate() throws IOException{
+		String name = "affinity catcher";
+		ItemTemplateBuilder itemBuilder = new ItemTemplateBuilder("mod.item.affinity.catcher");
+		itemBuilder.name(name, "affinity catchers", "A valuable orb that can transfer knowledge from one person to another.");
+		itemBuilder.itemTypes(new short[]{
+				ItemTypes.ITEM_TYPE_MAGIC,
+				ItemTypes.ITEM_TYPE_FULLPRICE,
+				ItemTypes.ITEM_TYPE_HASDATA,
+				ItemTypes.ITEM_TYPE_NOSELLBACK,
+				ItemTypes.ITEM_TYPE_ALWAYS_BANKABLE
+		});
+		itemBuilder.imageNumber((short) 919);
+		itemBuilder.behaviourType((short) 1);
+		itemBuilder.combatDamage(0);
+		itemBuilder.decayTime(Long.MAX_VALUE);
+		itemBuilder.dimensions(1, 1, 1);
+		itemBuilder.primarySkill((int) NOID);
+		itemBuilder.bodySpaces(EMPTY_BYTE_PRIMITIVE_ARRAY);
+		itemBuilder.modelName("model.artifact.orbdoom");
+		itemBuilder.difficulty(5.0f);
+		itemBuilder.weightGrams(500);
+		itemBuilder.material(Materials.MATERIAL_CRYSTAL);
+		itemBuilder.value(100000);
+		itemBuilder.isTraded(true);
+		
+		ItemTemplate template = itemBuilder.build();
+		templateId = template.getTemplateId();
+		logger.info(name+" TemplateID: "+templateId);
+	}
+}

src/main/java/mod/sin/items/AffinityOrb.java

@@ -36,8 +36,8 @@ public class AffinityOrb implements ItemTypes, MiscConstants {
 		itemBuilder.difficulty(5.0f);
 		itemBuilder.weightGrams(500);
 		itemBuilder.material(Materials.MATERIAL_CRYSTAL);
-		itemBuilder.value(1000000);
-		itemBuilder.isTraded(false);
+		itemBuilder.value(500000);
+		itemBuilder.isTraded(true);
 		
 		ItemTemplate template = itemBuilder.build();
 		templateId = template.getTemplateId();

src/main/java/mod/sin/items/StatuetteBreyk.java

@@ -17,10 +17,10 @@ import com.wurmonline.server.skills.SkillList;
 public class StatuetteBreyk implements ItemTypes, MiscConstants {
 	public static Logger logger = Logger.getLogger(StatuetteBreyk.class.getName());
 	public static int templateId;
-	private String name = "statuette of Breyk";
+	private String name = "statuette of Thelastdab";
 	public void createTemplate() throws IOException{
 		ItemTemplateBuilder itemBuilder = new ItemTemplateBuilder("mod.item.statuette.breyk");
-		itemBuilder.name(name, "statuettes", "A statuette resembling the artists interpretation of the deity Breyk.");
+		itemBuilder.name(name, "statuettes", "A statuette resembling the artists interpretation of the demigod Thelastdab.");
 		itemBuilder.itemTypes(new short[]{ // {108, 52, 22, 44, 87, 92, 147} - Statuette
 				ItemTypes.ITEM_TYPE_NAMED,
 				ItemTypes.ITEM_TYPE_DECORATION,
@@ -37,7 +37,7 @@ public class StatuetteBreyk implements ItemTypes, MiscConstants {
 		itemBuilder.dimensions(3, 5, 20);
 		itemBuilder.primarySkill(-10);
 		itemBuilder.bodySpaces(MiscConstants.EMPTY_BYTE_PRIMITIVE_ARRAY);
-		itemBuilder.modelName("model.decoration.statuette.fo.");
+		itemBuilder.modelName("model.decoration.statuette.magranon.");
 		itemBuilder.difficulty(40.0f);
 		itemBuilder.weightGrams(1000);
 		itemBuilder.material(Materials.MATERIAL_SILVER);

src/main/java/mod/sin/items/TitaniumLump.java

@@ -0,0 +1,52 @@
+package mod.sin.items;
+
+import com.wurmonline.server.MiscConstants;
+import com.wurmonline.server.items.*;
+import com.wurmonline.server.skills.SkillList;
+import org.gotti.wurmunlimited.modsupport.ItemTemplateBuilder;
+
+import java.io.IOException;
+import java.util.logging.Logger;
+
+public class TitaniumLump {
+	private static Logger logger = Logger.getLogger(TitaniumLump.class.getName());
+	public static int templateId;
+	private String name = "lump, titanium";
+	public void createTemplate() throws IOException{
+		ItemTemplateBuilder itemBuilder = new ItemTemplateBuilder("mod.item.lump.titanium");
+		itemBuilder.name(name, "titanium lumps", "A lightweight lump of glistening titanium.");
+		itemBuilder.itemTypes(new short[]{ // {22, 146, 46, 113, 157} - Addy Lump
+				ItemTypes.ITEM_TYPE_METAL,
+				ItemTypes.ITEM_TYPE_BULK,
+				ItemTypes.ITEM_TYPE_COMBINE
+		});
+		itemBuilder.imageNumber((short) 638);
+		itemBuilder.behaviourType((short) 1);
+		itemBuilder.combatDamage(0);
+		itemBuilder.decayTime(Long.MAX_VALUE);
+		itemBuilder.dimensions(3, 3, 3);
+		itemBuilder.primarySkill(-10);
+		itemBuilder.bodySpaces(MiscConstants.EMPTY_BYTE_PRIMITIVE_ARRAY);
+		itemBuilder.modelName("model.resource.lump.");
+		itemBuilder.difficulty(40.0f);
+		itemBuilder.weightGrams(400);
+		itemBuilder.material(Materials.MATERIAL_UNDEFINED);
+		itemBuilder.value(200);
+		
+		ItemTemplate template = itemBuilder.build();
+		templateId = template.getTemplateId();
+		logger.info(name+" TemplateID: "+templateId);
+	}
+	
+	public void initCreationEntry(){
+		logger.info("initCreationEntry()");
+		if(templateId > 0){
+			logger.info("Creating "+name+" creation entry, ID = "+templateId);
+			// CreationEntryCreator.createSimpleEntry(10041, 220, 47, 223, true, true, 0.0f, false, false, CreationCategories.RESOURCES);
+			CreationEntryCreator.createSimpleEntry(SkillList.SMITHING_METALLURGY, ItemList.adamantineBar, ItemList.glimmerSteelBar,
+					templateId, true, true, 0.0f, true, false, CreationCategories.RESOURCES);
+		}else{
+			logger.info(name+" does not have a template ID on creation entry.");
+		}
+	}
+}

src/main/java/mod/sin/items/TitaniumSocket.java

@@ -0,0 +1,50 @@
+package mod.sin.items;
+
+import com.wurmonline.server.MiscConstants;
+import com.wurmonline.server.items.*;
+import com.wurmonline.server.skills.SkillList;
+import org.gotti.wurmunlimited.modsupport.ItemTemplateBuilder;
+
+import java.io.IOException;
+import java.util.logging.Logger;
+
+public class TitaniumSocket {
+	private static Logger logger = Logger.getLogger(TitaniumSocket.class.getName());
+	public static int templateId;
+	private String name = "titanium socket";
+	public void createTemplate() throws IOException{
+		ItemTemplateBuilder itemBuilder = new ItemTemplateBuilder("mod.item.socket.titanium");
+		itemBuilder.name(name, "titanium sockets", "A socket for a gem, designed for insertion into an item.");
+		itemBuilder.itemTypes(new short[]{ // {22, 146, 46, 113, 157} - Addy Lump
+				ItemTypes.ITEM_TYPE_METAL
+		});
+		itemBuilder.imageNumber((short) 250); // Bracelet
+		itemBuilder.behaviourType((short) 1);
+		itemBuilder.combatDamage(0);
+		itemBuilder.decayTime(Long.MAX_VALUE);
+		itemBuilder.dimensions(3, 3, 3);
+		itemBuilder.primarySkill(-10);
+		itemBuilder.bodySpaces(MiscConstants.EMPTY_BYTE_PRIMITIVE_ARRAY);
+		itemBuilder.modelName("model.resource.lump.");
+		itemBuilder.difficulty(40.0f);
+		itemBuilder.weightGrams(1000);
+		itemBuilder.material(Materials.MATERIAL_UNDEFINED);
+		itemBuilder.value(200);
+		
+		ItemTemplate template = itemBuilder.build();
+		templateId = template.getTemplateId();
+		logger.info(name+" TemplateID: "+templateId);
+	}
+	
+	public void initCreationEntry(){
+		logger.info("initCreationEntry()");
+		if(templateId > 0){
+			logger.info("Creating "+name+" creation entry, ID = "+templateId);
+			// CreationEntryCreator.createSimpleEntry(10041, 220, 47, 223, true, true, 0.0f, false, false, CreationCategories.RESOURCES);
+			CreationEntryCreator.createSimpleEntry(SkillList.SMITHING_GOLDSMITHING, ItemList.anvilSmall, TitaniumLump.templateId,
+					templateId, false, true, 0.0f, true, false, CreationCategories.JEWELRY);
+		}else{
+			logger.info(name+" does not have a template ID on creation entry.");
+		}
+	}
+}

src/main/java/mod/sin/wyvern/AchievementChanges.java

@@ -0,0 +1,325 @@
+package mod.sin.wyvern;
+
+import com.wurmonline.server.players.Achievement;
+import com.wurmonline.server.players.AchievementTemplate;
+import org.gotti.wurmunlimited.modloader.ReflectionUtil;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Logger;
+
+public class AchievementChanges {
+    private static Logger logger = Logger.getLogger(AchievementChanges.class.getName());
+    public static HashMap<Integer, AchievementTemplate> goodAchievements = new HashMap<>();
+    public static ArrayList<Integer> blacklist = new ArrayList<>();
+
+    protected static int getNumber(String name){
+        AchievementTemplate temp = Achievement.getTemplate(name);
+        if(temp != null){
+            return temp.getNumber();
+        }
+        return -1;
+    }
+
+    protected static void blacklist(String name){
+        blacklist.add(getNumber(name));
+    }
+    protected static void blacklist(int number){
+        blacklist.add(number);
+    }
+
+    private static AchievementTemplate addAchievement(int id, String name, String description, String requirement, boolean isInvisible, int triggerOn, byte achievementType, boolean playUpdateSound, boolean isOneTimer) {
+        AchievementTemplate ach = new AchievementTemplate(id, name, isInvisible, triggerOn, achievementType, playUpdateSound, isOneTimer, requirement);
+        ach.setDescription(description);
+        try {
+            ReflectionUtil.callPrivateMethod(null, ReflectionUtil.getMethod(Achievement.class, "addTemplate", new Class<?>[]{AchievementTemplate.class}), ach);
+        } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+            e.printStackTrace();
+        }
+        return ach;
+    }
+
+    protected static void generateBlacklist(){
+        blacklist("Adulterator");
+        blacklist("All Hell");
+        blacklist("Ambitious");
+        blacklist("Angry Sailor");
+        blacklist("Arachnophile");
+        blacklist("Arch Mage");
+        blacklist("Ascended");
+        blacklist("Backstabber");
+        blacklist("Barbarian");
+        blacklist("Braaains");
+        blacklist(299); // Brilliant!
+        blacklist(364); // Brilliant!
+        blacklist("Bumble Bee");
+        blacklist("Burglar");
+        blacklist("Cap'n");
+        blacklist("Caravel sailor");
+        blacklist("Chief Mate");
+        blacklist("Cog sailor");
+        blacklist("Corbita sailor");
+        blacklist("Cowboy");
+        blacklist("Deforestation");
+        blacklist("Demolition");
+        blacklist("Diabolist");
+        blacklist("Die by the Rift");
+        blacklist("Die by the Rift a gazillion times");
+        blacklist("Drake Spirits");
+        blacklist("Eagle Spirits");
+        blacklist("Environmental Hero");
+        blacklist("Epic finalizer");
+        blacklist(298); // Exquisite Gem
+        blacklist(363); // Exquisite Gem
+        blacklist("Fast Learner");
+        blacklist("Fine titles");
+        blacklist("Fo's Favourite");
+        blacklist("Ghost of the Rift Warmasters");
+        blacklist("Hedgehog");
+        blacklist("High Spirits");
+        blacklist("Hippie");
+        blacklist("Humanss!");
+        blacklist("Hunter Apprentice");
+        blacklist("Incarnated To Hell");
+        blacklist("Investigating the Rift");
+        blacklist("Jackal Hunter");
+        blacklist("Janitor");
+        blacklist("Johnny Appleseed");
+        blacklist("Joyrider");
+        blacklist("Juggernaut's demise");
+        blacklist("Kingdom Assault");
+        blacklist("Knarr sailor");
+        blacklist("Last Rope");
+        blacklist("Lord of War");
+        blacklist("Mage");
+        blacklist("Magician");
+        blacklist("Magus");
+        blacklist("Manifested No More");
+        blacklist("Master Bridgebuilder");
+        blacklist("Master Shipbuilder");
+        blacklist("Master Winemaker");
+        blacklist("Miner on Strike");
+        blacklist("Moby Dick");
+        blacklist("Mountain Goat");
+        blacklist("Moved a Mountain");
+        blacklist("Muffin Maker");
+        blacklist("Mussst kill");
+        blacklist("No Fuel for the Flame Of Udun");
+        blacklist("On the Way to the Moon");
+        blacklist("Out At Sea");
+        blacklist("Out, out, brief candle!");
+        blacklist("Own The Rift");
+        blacklist("Pasta maker");
+        blacklist("Pasta master");
+        blacklist("Peace of Mind");
+        blacklist("Pirate");
+        blacklist("Pizza maker");
+        blacklist("Pizza master");
+        blacklist("Planeswalker");
+        blacklist("Rider of the Apocalypse");
+        blacklist("Rift Beast Nemesis");
+        blacklist("Rift Ogre Hero");
+        blacklist("Rift Opener");
+        blacklist("Rift Specialist");
+        blacklist("Rift Surfer");
+        blacklist("Rowboat sailor");
+        blacklist("Ruler");
+        blacklist("Sailboat sailor");
+        blacklist("Settlement Assault");
+        blacklist("Sisyphos Says Hello");
+        blacklist("Shadow");
+        blacklist("Shadowmage");
+        blacklist("Shutting Down");
+        blacklist("Singing While Eating");
+        blacklist("Sneaky");
+        blacklist("Tastes like Chicken");
+        blacklist("Tears of the Unicorn");
+        blacklist("The Path of Vynora");
+        blacklist("The Smell of Freshly Baked Bread");
+        blacklist("The Smell of Freshly Made Muffins");
+        blacklist("Thin Air");
+        blacklist("Tree Hugger");
+        blacklist("Trucker");
+        blacklist("Truffle Pig");
+        blacklist("Vynora commands you");
+        blacklist("Waller");
+        blacklist("Wanderer");
+        blacklist("Went up a Hill");
+        blacklist("Wet Feet");
+        blacklist("You Beauty");
+        blacklist("You Cannot Pass");
+        blacklist("Zombie Hunter");
+        blacklist("around the world");
+        blacklist("brewed 1000 liters");
+        blacklist("brewed liters");
+        blacklist("distilled 1000 liters");
+        blacklist("distilled liters");
+    }
+
+    protected static void setRequirement(AchievementTemplate temp, String req){
+        try {
+            ReflectionUtil.setPrivateField(temp, ReflectionUtil.getField(temp.getClass(), "requirement"), req);
+        } catch (IllegalAccessException | NoSuchFieldException e) {
+            e.printStackTrace();
+        }
+    }
+
+    protected static void addRequirements(AchievementTemplate temp){
+        if(temp.getName().equals("Meoww!")){
+            setRequirement(temp, "Kill a Wild Cat");
+        }
+        if(temp.getName().equals("Treasure Hunter")){
+            setRequirement(temp, "Open a treasure chest");
+        }
+        if(temp.getName().equals("Mercykiller")){
+            setRequirement(temp, "Slay a Diseased creature");
+        }
+        if(temp.getName().equals("Slayer of the Meek")){
+            setRequirement(temp, "Slay a Scared creature");
+        }
+        if(temp.getName().equals("Willbreaker")){
+            setRequirement(temp, "Slay a Hardened creature");
+        }
+        if(temp.getName().equals("Crocodiles Killed")){
+            setRequirement(temp, "Kill a Crocodile");
+        }
+        if(temp.getName().equals("Tower Builder")){
+            setRequirement(temp, "Build a Guard Tower");
+        }
+        if(temp.getName().equals("Invisible:UseResStone")){
+            setRequirement(temp, "Use a Resurrection Stone");
+        }
+        if(temp.getName().equals("Invisible:ShakerOrbing")){
+            setRequirement(temp, "Use a Shaker Orb");
+        }
+        if(temp.getName().equals("Invisible:CutTree")){
+            setRequirement(temp, "Cut down a tree");
+        }
+        if(temp.getName().equals("Invisible:CatchFish")){
+            setRequirement(temp, "Catch a fish");
+        }
+        if(temp.getName().equals("Invisible:PlantFlower")){
+            setRequirement(temp, "Plant a flower");
+        }
+        if(temp.getName().equals("Invisible:Planting")){
+            setRequirement(temp, "Plant a tree");
+        }
+        if(temp.getName().equals("Invisible:PickLock")){
+            setRequirement(temp, "Pick a lock");
+        }
+        if(temp.getName().equals("Invisible:Stealth")){
+            setRequirement(temp, "Successfully hide");
+        }
+        if(temp.getName().equals("Invisible:ItemInTrash")){
+            setRequirement(temp, "Trash an item");
+        }
+        if(temp.getName().equals("Invisible:BulkBinDeposit")){
+            setRequirement(temp, "Deposit a bulk item");
+        }
+        if(temp.getName().equals("Invisible:Distancemoved")){
+            setRequirement(temp, "Walk one tile");
+        }
+        if(temp.getName().equals("Invisible:Hedges")){
+            setRequirement(temp, "Plant a hedge or flower bed");
+        }
+        if(temp.getName().equals("Invisible:MeditatingAction")){
+            setRequirement(temp, "Meditate");
+        }
+        if(temp.getName().equals("Invisible:PickMushroom")){
+            setRequirement(temp, "Pick a mushroom");
+        }
+        if(temp.getName().equals("Maintenance")){
+            setRequirement(temp, "Repair a fence, floor, or wall");
+        }
+        if(temp.getName().equals("Be Gentle Please")){
+            setRequirement(temp, "Win a spar");
+        }
+        if(temp.getName().equals("Rarity")){
+            setRequirement(temp, "Make the best quality of an item");
+        }
+    }
+
+    protected static void fixName(AchievementTemplate temp){
+        if(temp.getName().contains("Invisible:")){
+            temp.setName(temp.getName().replaceAll("Invisible:", ""));
+        }
+        if(temp.getName().equals("PlayerkillBow")){
+            temp.setName("Arrow To The Knee");
+        }
+        if(temp.getName().equals("PlayerkillSword")){
+            temp.setName("Pointing The Right Direction");
+        }
+        if(temp.getName().equals("PlayerkillMaul")){
+            temp.setName("Trip To The Maul");
+        }
+        if(temp.getName().equals("PlayerkillAxe")){
+            temp.setName("Can I Axe You A Question?");
+        }
+        if(temp.getName().equals("OuchThatHurt")){
+            temp.setName("Ouch That Hurt");
+        }
+        if(temp.getName().equals("UseResStone")){
+            temp.setName("No Risk No Reward");
+        }
+        if(temp.getName().equals("ShakerOrbing")){
+            temp.setName("This Mine Is Busted");
+        }
+        if(temp.getName().equals("CutTree")){
+            temp.setName("Getting Wood");
+        }
+        if(temp.getName().equals("CatchFish")){
+            temp.setName("Delicious Fish");
+        }
+        if(temp.getName().equals("PlantFlower")){
+            temp.setName("Gardening");
+        }
+        if(temp.getName().equals("Planting")){
+            temp.setName("Forester");
+        }
+        if(temp.getName().equals("PickLock")){
+            temp.setName("Vault Hunter");
+        }
+        if(temp.getName().equals("ItemInTrash")){
+            temp.setName("Another Mans Trash");
+        }
+        if(temp.getName().equals("Stealth")){
+            temp.setName("The Invisible Man");
+        }
+        if(temp.getName().equals("BulkBinDeposit")){
+            temp.setName("Bulk Hoarder");
+        }
+        if(temp.getName().equals("Distancemoved")){
+            temp.setName("Explorer");
+        }
+        if(temp.getName().equals("Hedges")){
+            temp.setName("Hedging Your Bets");
+        }
+        if(temp.getName().equals("MeditatingAction")){
+            temp.setName("One With The World");
+        }
+        if(temp.getName().equals("PickMushroom")){
+            temp.setName("Mushroom Collector");
+        }
+    }
+
+    public static void onServerStarted(){
+        try {
+            ConcurrentHashMap<Integer, AchievementTemplate> templates = ReflectionUtil.getPrivateField(Achievement.class, ReflectionUtil.getField(Achievement.class, "templates"));
+            generateBlacklist();
+            for(int i : templates.keySet()){
+                AchievementTemplate temp = templates.get(i);
+                addRequirements(temp);
+                if(!temp.getRequirement().equals("") && !temp.isForCooking() && !blacklist.contains(i)){
+                    fixName(temp);
+                    goodAchievements.put(i, temp);
+                    logger.info(temp.getNumber()+": "+temp.getName()+" - "+temp.getDescription()+" ("+temp.getRequirement()+")");
+                }
+            }
+            logger.info("Total achievements loaded into system: "+goodAchievements.size());
+        } catch (IllegalAccessException | NoSuchFieldException e) {
+            e.printStackTrace();
+        }
+    }
+}

src/main/java/mod/sin/wyvern/AntiCheat.java

@@ -44,11 +44,16 @@ public class AntiCheat {
         boolean foundSteamIdMap = false;
         try {
             dbcon = ModSupportDb.getModSupportDb();
-            ps = dbcon.prepareStatement("SELECT * FROM SteamIdMap");
+            ps = dbcon.prepareStatement("SELECT * FROM SteamIdMap WHERE NAME=? AND STEAMID=?");
+            ps.setString(1, name);
+            ps.setString(2, steamId);
             ResultSet rs = ps.executeQuery();
             while (rs.next()) {
-                if (!rs.getString("NAME").equals(name)) continue;
-                foundSteamIdMap = true;
+                if(!foundSteamIdMap) {
+                    foundSteamIdMap = true;
+                }else{
+                    logger.warning(String.format("Player %s has accessed their account from multiple Steam ID's!", name));
+                }
             }
             rs.close();
             ps.close();
@@ -59,7 +64,9 @@ public class AntiCheat {
             logger.info("No steam id entry for " + name + ". Creating one.");
             try {
                 dbcon = ModSupportDb.getModSupportDb();
-                ps = dbcon.prepareStatement("INSERT INTO SteamIdMap (NAME, STEAMID) VALUES(\"" + name + "\", " + steamId + ")");
+                ps = dbcon.prepareStatement("INSERT INTO SteamIdMap (NAME, STEAMID) VALUES(?, ?)");
+                ps.setString(1, name);
+                ps.setString(2, steamId);
                 ps.executeUpdate();
                 ps.close();
             } catch (SQLException e) {

src/main/java/mod/sin/wyvern/Arena.java

@@ -9,6 +9,7 @@ import com.wurmonline.server.items.*;
 import com.wurmonline.server.players.Player;
 import com.wurmonline.server.questions.NewSpawnQuestion;
 import com.wurmonline.server.questions.SpawnQuestion;
+import com.wurmonline.server.skills.Affinity;
 import com.wurmonline.server.villages.Citizen;
 import com.wurmonline.server.villages.Village;
 import com.wurmonline.server.zones.Zone;
@@ -135,14 +136,14 @@ public class Arena {
 				statue.insertItem(sleepPowder, true);
 			}
 			for (x = 0; x < 5; ++x) {
-				lump = ItemFactory.createItem(ItemList.adamantineBar, Math.min(99, 50 + winStreak), null);
+				lump = ItemFactory.createItem(ItemList.adamantineBar, Math.min(99f, 60 + (winStreak*Server.rand.nextFloat()*1.5f)), null);
 				float baseWeight = lump.getWeightGrams();
 				float multiplier = 1f;//+(winStreak*0.4f*Server.rand.nextFloat());
 				lump.setWeight((int) (baseWeight*multiplier), true);
 				statue.insertItem(lump, true);
 			}
 			for (x = 0; x < 5; ++x) {
-				lump = ItemFactory.createItem(ItemList.glimmerSteelBar, Math.min(99, 50 + winStreak), null);
+				lump = ItemFactory.createItem(ItemList.glimmerSteelBar, Math.min(99f, 60 + (winStreak*Server.rand.nextFloat()*1.5f)), null);
                 float baseWeight = lump.getWeightGrams();
                 float multiplier = 1f;//+(winStreak*0.2f*Server.rand.nextFloat());
                 lump.setWeight((int) (baseWeight*multiplier), true);
@@ -159,8 +160,8 @@ public class Arena {
                     ArtifactCache.templateId,
                     CrystalCache.templateId, CrystalCache.templateId,
                     DragonCache.templateId, DragonCache.templateId, DragonCache.templateId,
-                    GemCache.templateId,
                     RiftCache.templateId, RiftCache.templateId, RiftCache.templateId,
+                    ToolCache.templateId,
                     TreasureMapCache.templateId
             };
             int i = 5+Server.rand.nextInt(4); // 5-8 caches.
@@ -176,9 +177,9 @@ public class Arena {
                 i--;
             }
             // Add 3-5 seryll lumps of medium ql
-            i = 3+Server.rand.nextInt(3); // 3-5 caches
+            i = 3+Server.rand.nextInt(3); // 3-5 lumps
             while(i > 0){
-                Item seryll = ItemFactory.createItem(ItemList.seryllBar, 30f+(40f*Server.rand.nextFloat()), null);
+                Item seryll = ItemFactory.createItem(ItemList.seryllBar, 40f+(60f*Server.rand.nextFloat()), null);
                 statue.insertItem(seryll, true);
                 i--;
             }
@@ -205,6 +206,10 @@ public class Arena {
 		}
 	}
 
+	public static Affinity[] getNullAffinities(){
+	    return new Affinity[0];
+    }
+
 	public static void preInit(){
 		try {
 			ClassPool classPool = HookManager.getInstance().getClassPool();
@@ -221,6 +226,7 @@ public class Arena {
             		+ "  $_ = $proceed($$);"
             		+ "}";
             Util.instrumentDeclared(thisClass, ctCommunicator, "reallyHandle_CMD_MOVE_INVENTORY", "getDominator", replace);
+            Util.instrumentDeclared(thisClass, ctCommunicator, "equipCreatureCheck", "getDominator", replace);
             /*ctCommunicator.getDeclaredMethod("reallyHandle_CMD_MOVE_INVENTORY").instrument(new ExprEditor(){
                 public void edit(MethodCall m) throws CannotCompileException {
                     if (m.getMethodName().equals("getDominator")) {
@@ -684,13 +690,13 @@ public class Arena {
                     "}";
             Util.instrumentDeclared(thisClass, ctCreature, "die", "getFavor", replace);
 
-            Util.setReason("Nerf resurrection stones.");
+            /*Util.setReason("Nerf resurrection stones.");
             replace = "if(com.wurmonline.server.Servers.localServer.PVPSERVER){" +
                     "  $_ = com.wurmonline.server.Server.rand.nextInt(40) > 35;" +
                     "}else{" +
                     "  $_ = $proceed($$);" +
                     "}";
-            Util.instrumentDeclared(thisClass, ctCreature, "die", "isDeathProtected", replace);
+            Util.instrumentDeclared(thisClass, ctCreature, "die", "isDeathProtected", replace);*/
 
             Util.setReason("Adjust spawn question mechanics.");
             CtClass ctSpawnQuestion = classPool.get("com.wurmonline.server.questions.SpawnQuestion");
@@ -766,6 +772,48 @@ public class Arena {
             replace = "$_ = $0.getAttitude(this) == 1;";
             Util.instrumentDeclared(thisClass, ctPlayer, "spreadCrownInfluence", "isFriendlyKingdom", replace);
 
+            Util.setReason("Disable item drops from players on Arena.");
+            replace = "if(com.wurmonline.server.Servers.localServer.PVPSERVER && this.isPlayer()){" +
+                    "  this.getCommunicator().sendSafeServerMessage(\"You have died on the Arena server and your items are kept safe.\");" +
+                    "  keepItems = true;" +
+                    "}" +
+                    "$_ = $proceed($$);";
+            Util.instrumentDeclaredCount(thisClass, ctCreature, "die", "isOnCurrentServer", 1, replace);
+
+            Util.setReason("Disable player skill loss on Arena.");
+            replace = "if(this.isPlayer() && this.isDeathProtected()){" +
+                    "  this.getCommunicator().sendSafeServerMessage(\"You have died with a Resurrection Stone and your knowledge is kept safe.\");" +
+                    "  return;" +
+                    "}else{" +
+                    "  this.getCommunicator().sendAlertServerMessage(\"You have died without a Resurrection Stone, resulting in some of your knowledge being lost.\");" +
+                    "}";
+            Util.insertBeforeDeclared(thisClass, ctCreature, "punishSkills", replace);
+
+            Util.setReason("Disable player fight skill loss on Arena.");
+            replace = "if(this.isPlayer() && this.isDeathProtected()){" +
+                    "  $_ = null;" +
+                    "}else{" +
+                    "  $_ = $proceed($$);" +
+                    "}";
+            Util.instrumentDeclaredCount(thisClass, ctCreature, "modifyFightSkill", "setKnowledge", 1, replace);
+
+            Util.setReason("Disable player affinity loss on Arena.");
+            replace = "if(com.wurmonline.server.Servers.localServer.PVPSERVER && this.isPlayer() && this.isDeathProtected()){" +
+                    "  this.getCommunicator().sendSafeServerMessage(\"Your resurrection stone keeps your affinities safe from your slayers.\");" +
+                    "  $_ = "+Arena.class.getName()+".getNullAffinities();" +
+                    "}else{" +
+                    "  $_ = $proceed($$);" +
+                    "}";
+            Util.instrumentDeclared(thisClass, ctPlayer, "modifyRanking", "getAffinities", replace);
+
+            /*Util.setReason("Enable stealing from deeds.");
+            replace = "if(com.wurmonline.server.Servers.localServer.PVPSERVER){" +
+                    "  $_ = true;" +
+                    "}else{" +
+                    "  $_ = $proceed($$);" +
+                    "}";
+            Util.instrumentDeclared(thisClass, ctMethodsItems, "checkIfStealing", "mayPass", replace);*/
+
 
 		}catch (NotFoundException e) {
 			throw new HookException(e);

src/main/java/mod/sin/wyvern/Bounty.java

@@ -26,25 +26,6 @@ public class Bounty {
 	//protected static WyvernMods mod;
 	public static HashMap<String, Integer> reward = new HashMap<>();
 
-	// Using a hook in CombatEngine.addWound, we call this function to create a list of creatures that actually inflicted damage.
-	public static HashMap<Long, Map<Long, Double>> dealtDamage = new HashMap<>();
-	public static void addDealtDamage(long defender, long attacker, double damage){
-		if(dealtDamage.containsKey(defender)){
-			Map<Long, Double> dealers = dealtDamage.get(defender);
-			if(!dealers.containsKey(attacker)){
-				dealers.put(attacker, damage);
-			}else{
-				double newDam = dealers.get(attacker);
-				newDam += damage;
-				dealers.put(attacker, newDam);
-			}
-		}else{
-			Map<Long, Double> dealers = new HashMap<>();
-			dealers.put(attacker, damage);
-			dealtDamage.put(defender, dealers);
-		}
-	}
-	
     public static long lastAttacked(Map<Long, Long> attackers, long playerId){
     	return System.currentTimeMillis()-attackers.get(playerId);
     }
@@ -219,7 +200,7 @@ public class Bounty {
           			+ "}");*/
           
           // -- When a creature takes damage, track the damage taken -- //
-          CtClass[] params2 = {
+          /*CtClass[] params2 = {
         		  ctCreature,
         		  ctCreature,
         		  CtClass.byteType,
@@ -235,11 +216,10 @@ public class Bounty {
           };
           String desc2 = Descriptor.ofMethod(CtClass.booleanType, params2);
           CtClass ctCombatEngine = classPool.get("com.wurmonline.server.combat.CombatEngine");
-          replace = ""
-          		+ "if($1 != null && $2 != null){"
+          replace = "if($1 != null && $2 != null){"
           		+ "  "+Bounty.class.getName()+".addDealtDamage($2.getWurmId(), $1.getWurmId(), $5);"
           		+ "}";
-          Util.insertBeforeDescribed(thisClass, ctCombatEngine, "addWound", desc2, replace);
+          Util.insertBeforeDescribed(thisClass, ctCombatEngine, "addWound", desc2, replace);*/
           //ctCombatEngine.getMethod("addWound", desc2).insertBefore("if($1 != null && $2 != null){mod.sin.wyvern.bounty.MethodsBounty.addDealtDamage($2.getWurmId(), $1.getWurmId(), $5);}");
           
       }

src/main/java/mod/sin/wyvern/Caches.java

@@ -55,10 +55,10 @@ public class Caches {
 	}
 	
 	public static float getBaseQuality(float quality){
-		return quality*0.2f;
+		return quality*0.25f;
 	}
 	public static float getRandomQuality(float quality){
-		return quality*0.5f;
+		return quality*0.6f;
 	}
 	public static float getWeightMultiplier(int templateId, float quality){
 		if(templateId == DragonCache.templateId){
@@ -120,6 +120,7 @@ public class Caches {
 					ItemList.axeSmall, ItemList.axeMedium, ItemList.axeHuge,
 					ItemList.maulSmall, ItemList.maulMedium, ItemList.maulLarge,
 					ItemList.spearLong, ItemList.staffSteel, ItemList.halberd,
+                    Club.templateId, BattleYoyo.templateId,
 					Knuckles.templateId, Warhammer.templateId
 			};
 		}else if(templateId == CrystalCache.templateId){
@@ -174,11 +175,52 @@ public class Caches {
 					ItemList.riftWood,
 					ItemList.riftStone
 			};
+		}else if(templateId == ToolCache.templateId){
+			return new int[]{
+                    ItemList.hatchet,
+                    ItemList.knifeCarving,
+                    ItemList.pickAxe,
+                    ItemList.saw,
+                    ItemList.shovel,
+                    ItemList.rake,
+                    ItemList.hammerMetal,
+                    ItemList.hammerWood,
+                    ItemList.anvilSmall,
+                    ItemList.cheeseDrill,
+                    ItemList.knifeButchering,
+                    ItemList.fishingRodIronHook,
+                    ItemList.stoneChisel,
+                    ItemList.spindle,
+                    ItemList.anvilLarge,
+                    ItemList.grindstone,
+                    ItemList.needleIron,
+                    ItemList.knifeFood,
+                    ItemList.sickle,
+                    ItemList.scythe,
+                    ItemList.file,
+                    ItemList.awl,
+                    ItemList.leatherKnife,
+                    ItemList.scissors,
+                    ItemList.clayShaper,
+                    ItemList.spatula,
+                    ItemList.fruitpress,
+                    ItemList.trowel,
+                    ItemList.groomingBrush
+			};
 		}
 		return null;
 	}
 	public static void adjustBasicItem(int templateId, float quality, Item item){
 		if(templateId == ArmourCache.templateId){
+            if(Server.rand.nextInt(800) < quality){
+                if(item.getRarity() == 0){
+                    if(Server.rand.nextInt(1800) < quality){
+                        item.setRarity(MiscConstants.SUPREME);
+                    }else{
+                        item.setRarity(MiscConstants.RARE);
+                    }
+                }
+            }
 			if(quality > 50){
 				if(quality > 95 && Server.rand.nextBoolean()){
 					ItemUtil.applyEnchant(item, Enchants.BUFF_SHARED_PAIN, quality*Server.rand.nextFloat()*0.7f);
@@ -218,7 +260,6 @@ public class Caches {
 					Materials.MATERIAL_STEEL
 			};
 			item.setMaterial(materials[Server.rand.nextInt(materials.length)]);
-			item.setQualityLevel(item.getQualityLevel());
 			if(Server.rand.nextInt(400) < quality){
 				if(item.getRarity() == 0){
 					if(Server.rand.nextInt(900) < quality){
@@ -233,8 +274,8 @@ public class Caches {
 						Enchants.BUFF_WIND_OF_AGES,
 						Enchants.BUFF_BLESSINGDARK
 				};
-				ItemUtil.applyEnchant(item, enchants[Server.rand.nextInt(enchants.length)], quality*Server.rand.nextFloat()*0.6f);
-				ItemUtil.applyEnchant(item, Enchants.BUFF_NIMBLENESS, quality*Server.rand.nextFloat()*0.7f);
+				ItemUtil.applyEnchant(item, enchants[Server.rand.nextInt(enchants.length)], quality*0.5f+(quality*0.5f*Server.rand.nextFloat()));
+				ItemUtil.applyEnchant(item, Enchants.BUFF_NIMBLENESS, quality*0.3f+(quality*0.7f*Server.rand.nextFloat()));
 			}else if(quality > 30){
 				ItemUtil.applyEnchant(item, Enchants.BUFF_LIFETRANSFER, quality*0.6f+(quality*0.6f*Server.rand.nextFloat()));
 			}
@@ -242,7 +283,54 @@ public class Caches {
 			if(Server.rand.nextInt(500) < quality){
 				item.setRarity(MiscConstants.RARE);
 			}
-		}
+		}else if(templateId == ToolCache.templateId){
+		    byte[] materials = {
+		            Materials.MATERIAL_SERYLL,
+                    Materials.MATERIAL_GLIMMERSTEEL,
+                    Materials.MATERIAL_ADAMANTINE,
+                    Materials.MATERIAL_STEEL,
+                    Materials.MATERIAL_TIN,
+                    Materials.MATERIAL_BRONZE,
+                    Materials.MATERIAL_BRASS,
+                    Materials.MATERIAL_ZINC,
+                    Materials.MATERIAL_IRON,
+                    Materials.MATERIAL_COPPER,
+                    Materials.MATERIAL_GOLD,
+                    Materials.MATERIAL_LEAD,
+                    Materials.MATERIAL_SILVER
+            };
+		    item.setMaterial(materials[Server.rand.nextInt(materials.length)]);
+            if(Server.rand.nextInt(1200) < quality){
+                if(item.getRarity() == 0){
+                    if(Server.rand.nextInt(2700) < quality){
+                        item.setRarity(MiscConstants.SUPREME);
+                    }else{
+                        item.setRarity(MiscConstants.RARE);
+                    }
+                }
+            }
+            if(Server.rand.nextInt(200) < quality){
+                byte rune = (byte) (Server.rand.nextInt(78)-128);
+                if(!ItemUtil.isSingleUseRune(rune)){
+                    ItemUtil.applyEnchant(item, rune, 50);
+                }
+            }
+            if(quality > 30 && Server.rand.nextInt(250) < quality){
+                ItemUtil.applyEnchant(item, Enchants.BUFF_WIND_OF_AGES, quality*0.6f+(quality*0.6f*Server.rand.nextFloat()));
+            }
+            if(quality > 30 && Server.rand.nextInt(250) < quality){
+                ItemUtil.applyEnchant(item, Enchants.BUFF_CIRCLE_CUNNING, quality*0.6f+(quality*0.6f*Server.rand.nextFloat()));
+            }
+            if(quality > 50 && Server.rand.nextInt(250) < quality){ // Efficiency
+                ItemUtil.applyEnchant(item, (byte) 114, quality*0.6f+(quality*0.6f*Server.rand.nextFloat()));
+            }
+            if(quality > 70 && Server.rand.nextInt(350) < quality){
+                ItemUtil.applyEnchant(item, Enchants.BUFF_BLESSINGDARK, quality*0.6f+(quality*0.6f*Server.rand.nextFloat()));
+            }
+            if(quality > 90 && Server.rand.nextInt(5000) < quality){ // Titanforged
+                ItemUtil.applyEnchant(item, (byte) 120, quality*0.2f+(quality*0.2f*Server.rand.nextFloat()));
+            }
+        }
 	}
 	public static int getBasicNums(int templateId){
 		if(templateId == CrystalCache.templateId){
@@ -439,7 +527,7 @@ public class Caches {
             TITAN_CACHE.createTemplate();
             CACHE_IDS.add(TitanCache.templateId);
 			TOOL_CACHE.createTemplate();
-			//CACHE_IDS.add(ToolCache.templateId);
+			CACHE_IDS.add(ToolCache.templateId);
 			TREASUREMAP_CACHE.createTemplate();
 			CACHE_IDS.add(TreasureMapCache.templateId);
 			WEAPON_CACHE.createTemplate();

src/main/java/mod/sin/wyvern/CombatChanges.java

@@ -9,21 +9,22 @@ import com.wurmonline.server.creatures.Creatures;
 import com.wurmonline.server.items.Item;
 import com.wurmonline.server.players.Player;
 import com.wurmonline.shared.constants.Enchants;
-import javassist.ClassPool;
-import javassist.CtClass;
-import javassist.CtMethod;
-import javassist.NotFoundException;
+import javassist.*;
 import javassist.bytecode.*;
+import javassist.expr.ExprEditor;
+import javassist.expr.FieldAccess;
 import mod.sin.lib.Util;
 import org.gotti.wurmunlimited.modloader.classhooks.HookException;
 import org.gotti.wurmunlimited.modloader.classhooks.HookManager;
 
 import java.util.ArrayList;
+import java.util.Objects;
 import java.util.logging.Logger;
 
 public class CombatChanges {
     public static Logger logger = Logger.getLogger(CombatChanges.class.getName());
 
+    // Added to CombatHandled
     public static int getWeaponType(Item weapon){
         if(weapon.enchantment == Enchants.ACID_DAM){
             return Wound.TYPE_ACID;
@@ -67,6 +68,7 @@ public class CombatChanges {
         return mult;
     }
 
+    // Added to CombatHandled
     public static int getLifeTransferAmountModifier(Wound wound, int initial){
         byte type = wound.getType();
         if(type == Wound.TYPE_ACID || type == Wound.TYPE_BURN || type == Wound.TYPE_COLD){
@@ -77,6 +79,7 @@ public class CombatChanges {
         return initial;
     }
 
+    // Added to CombatHandled
     public static float getLifeTransferModifier(Creature creature, Creature defender){
         if(Servers.localServer.PVPSERVER && (defender.isDominated() || defender.isPlayer()) && creature.isPlayer()){
             return 0.5f;
@@ -84,6 +87,7 @@ public class CombatChanges {
         return 1.0f;
     }
 
+    // Added to CombatHandled
     public static void doLifeTransfer(Creature creature, Creature defender, Item attWeapon, double defdamage, float armourMod){
         float lifeTransfer = attWeapon.getSpellLifeTransferModifier()*getLifeTransferModifier(creature, defender);
         Wound[] w;
@@ -94,6 +98,7 @@ public class CombatChanges {
         }
     }
 
+    // Added (kind of) to CombatHandled
     public static float getAdjustedOakshell(Creature defender, Item armour, float armourMod){
         if(defender != null && armour == null){
             float oakshellPower = defender.getBonusForSpellEffect(Enchants.CRET_OAKSHELL);
@@ -139,6 +144,8 @@ public class CombatChanges {
             }
         }
     }
+
+    // Added to CombatHandled
     public static boolean canDoDamage(double damage, Creature attacker, Creature defender) {
         //logger.info(String.format("canDoDamage from %s to %s - %.1f", attacker.getName(), defender.getName(), damage));
         return damage > 1D;
@@ -250,6 +257,18 @@ public class CombatChanges {
         }
     }
 
+    // Added to CombatHandled
+    public static void pollCreatureActionStacks(){
+        for(Creature c : Creatures.getInstance().getCreatures()){
+            if(c.isFighting()) {
+                c.getActions().poll(c);
+            }
+        }
+    }
+
+    public static void goodLog(String str){
+        logger.info(str);
+    }
 
     public static void preInit(){
         try{
@@ -383,6 +402,55 @@ public class CombatChanges {
                     "}";
             Util.instrumentDeclared(thisClass, ctCombatHandler, "setDamage", "getSpellPainShare", replace);
 
+            /*Util.setReason("Debug attack method");
+            CtClass ctAction = classPool.get("com.wurmonline.server.behaviours.Action");
+            CtClass[] params4 = {
+                    ctCreature,
+                    CtClass.intType,
+                    CtClass.booleanType,
+                    CtClass.floatType,
+                    ctAction
+            };
+            String desc4 = Descriptor.ofMethod(CtClass.booleanType, params4);
+            replace = "logger.info(\"opponent = \"+$1.getName()+\", combatCounter = \"+$2+\", opportunity = \"+$3+\", actionCounter = \"+$4);";
+            Util.insertBeforeDescribed(thisClass, ctCombatHandler, "attack", desc4, replace);*/
+
+            /*Util.setReason("Debug CreatureAI Poll");
+            CtClass ctCreatureAI = classPool.get("com.wurmonline.server.creatures.ai.CreatureAI");
+            replace = "if($1.getTemplate().getTemplateId() == 2147483619){" +
+                    CombatChanges.class.getName()+".goodLog(\"CreatureAI.pollCreature(\"+$1.getName()+\", \"+$2+\")\");" +
+                    "}";
+            Util.insertBeforeDeclared(thisClass, ctCreatureAI, "pollCreature", replace);*/
+
+            /*Util.setReason("Debug VolaTile Poll");
+            CtClass ctVolaTile = classPool.get("com.wurmonline.server.zones.VolaTile");
+            replace = "if($2.getTemplate().getTemplateId() == 2147483619){" +
+                    CombatChanges.class.getName()+".goodLog(\"VolaTile.pollOneCreatureOnThisTile(\"+$2.getName()+\")\");" +
+                    "}";
+            Util.insertBeforeDeclared(thisClass, ctVolaTile, "pollOneCreatureOnThisTile", replace);*/
+
+            /*Util.setReason("Debug Creature Poll");
+            replace = "if($0.getTemplate().getTemplateId() == 2147483619){" +
+                    CombatChanges.class.getName()+".goodLog(\"Creature.poll(\"+$0.getName()+\")\");" +
+                    "}";
+            Util.insertBeforeDeclared(thisClass, ctCreature, "poll", replace);*/
+
+            /*Util.setReason("Debug Creatures Poll");
+            CtClass ctCreatures = classPool.get("com.wurmonline.server.creatures.Creatures");
+            replace = CombatChanges.class.getName()+".goodLog(\"Creatures.pollAllCreatures()\");";
+            Util.insertBeforeDeclared(thisClass, ctCreatures, "pollAllCreatures", replace);*/
+
+            // TODO: Enable with new combat rework.
+            /*Util.setReason("Poll creature action stacks on every update.");
+            CtClass ctZones = classPool.get("com.wurmonline.server.zones.Zones");
+            replace = //CombatChanges.class.getName()+".goodLog(\"Zones.pollNextZones(\"+$1+\") [time \"+java.lang.System.currentTimeMillis()+\"]\");" +
+                    CombatChanges.class.getName()+".pollCreatureActionStacks();";
+            Util.insertBeforeDeclared(thisClass, ctZones, "pollNextZones", replace);*/
+
+            /*replace = "$_ = $proceed($$);" +
+                    CombatChanges.class.getName()+".goodLog(\"Zones.pollNextZones(\"+sleepTime+\") call to Creatures.getInstance().pollAllCreatures(\"+$1+\") [time \"+java.lang.System.currentTimeMillis()+\"]\");";
+            Util.instrumentDeclared(thisClass, ctZones, "pollNextZones", "pollAllCreatures", replace);*/
+
             patchCombatDamageCheckCombatEngine(classPool);
             patchCombatDamageCheckCombatHandler(classPool);
 

src/main/java/mod/sin/wyvern/Crystals.java

@@ -28,7 +28,8 @@ public class Crystals {
 			Enchants.BUFF_VENOM,
 			Enchants.BUFF_WEBARMOUR,
 			Enchants.BUFF_WIND_OF_AGES,
-			110 // Harden
+			110, // Harden
+			114 // Efficiency
 			//110, 111 // Harden and Phasing
 	};
 	public static byte getNewRandomEnchant(Item target){

src/main/java/mod/sin/wyvern/DatabaseHelper.java

@@ -0,0 +1,150 @@
+package mod.sin.wyvern;
+
+import com.wurmonline.server.players.Player;
+import org.gotti.wurmunlimited.modsupport.ModSupportDb;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.logging.Logger;
+
+public class DatabaseHelper {
+    private static Logger logger = Logger.getLogger(DatabaseHelper.class.getName());
+
+    public static void onPlayerLogin(Player p){
+        Connection dbcon;
+        PreparedStatement ps;
+        boolean foundLeaderboardOpt = false;
+        try {
+            dbcon = ModSupportDb.getModSupportDb();
+            ps = dbcon.prepareStatement("SELECT * FROM LeaderboardOpt");
+            ResultSet rs = ps.executeQuery();
+            while (rs.next()) {
+                if (!rs.getString("name").equals(p.getName())) continue;
+                foundLeaderboardOpt = true;
+            }
+            rs.close();
+            ps.close();
+        }
+        catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+        if (!foundLeaderboardOpt) {
+            logger.info("No leaderboard entry for "+p.getName()+". Creating one.");
+            try {
+                dbcon = ModSupportDb.getModSupportDb();
+                ps = dbcon.prepareStatement("INSERT INTO LeaderboardOpt (name) VALUES(?)");
+                ps.setString(1, p.getName());
+                ps.executeUpdate();
+                ps.close();
+            }
+            catch (SQLException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        boolean foundPlayerStats = false;
+        try {
+            dbcon = ModSupportDb.getModSupportDb();
+            ps = dbcon.prepareStatement("SELECT * FROM PlayerStats");
+            ResultSet rs = ps.executeQuery();
+            while (rs.next()) {
+                if (!rs.getString("NAME").equals(p.getName())) continue;
+                foundPlayerStats = true;
+            }
+            rs.close();
+            ps.close();
+        }
+        catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+        if (!foundPlayerStats) {
+            logger.info("No player stats entry for "+p.getName()+". Creating one.");
+            try {
+                dbcon = ModSupportDb.getModSupportDb();
+                ps = dbcon.prepareStatement("INSERT INTO PlayerStats (NAME) VALUES(\"" + p.getName() + "\")");
+                ps.executeUpdate();
+                ps.close();
+            }
+            catch (SQLException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    public static void onServerStarted(){
+        try {
+            Connection con = ModSupportDb.getModSupportDb();
+            String sql;
+            String tableName = "LeaderboardOpt";
+            if (!ModSupportDb.hasTable(con, tableName)) {
+                logger.info(tableName+" table not found in ModSupport. Creating table now.");
+                sql = "CREATE TABLE "+tableName+" (name VARCHAR(30) NOT NULL DEFAULT 'Unknown', OPTIN INT NOT NULL DEFAULT 0)";
+                PreparedStatement ps = con.prepareStatement(sql);
+                ps.execute();
+                ps.close();
+            }
+            tableName = "SteamIdMap";
+            if (!ModSupportDb.hasTable(con, tableName)) {
+                logger.info(tableName+" table not found in ModSupport. Creating table now.");
+                sql = "CREATE TABLE "+tableName+" (NAME VARCHAR(30) NOT NULL DEFAULT 'Unknown', STEAMID LONG NOT NULL DEFAULT 0)";
+                PreparedStatement ps = con.prepareStatement(sql);
+                ps.execute();
+                ps.close();
+            }
+            tableName = "PlayerStats";
+            if (!ModSupportDb.hasTable(con, tableName)) {
+                logger.info(tableName+" table not found in ModSupport. Creating table now.");
+                sql = "CREATE TABLE "+tableName+" (NAME VARCHAR(30) NOT NULL DEFAULT 'Unknown', KILLS INT NOT NULL DEFAULT 0, DEATHS INT NOT NULL DEFAULT 0, DEPOTS INT NOT NULL DEFAULT 0, HOTAS INT NOT NULL DEFAULT 0, TITANS INT NOT NULL DEFAULT 0, UNIQUES INT NOT NULL DEFAULT 0)";
+                PreparedStatement ps = con.prepareStatement(sql);
+                ps.execute();
+                ps.close();
+            }else{
+                logger.info("Found "+tableName+". Checking if it has a unique column.");
+                ResultSet rs = con.getMetaData().getColumns(null, null, tableName, "UNIQUES");
+                if(rs.next()){
+                    logger.info(tableName+" already has a uniques column.");
+                }else{
+                    logger.info("Detected no uniques column in "+tableName);
+                    sql = "ALTER TABLE "+tableName+" ADD COLUMN UNIQUES INT NOT NULL DEFAULT 0";
+                    PreparedStatement ps = con.prepareStatement(sql);
+                    ps.execute();
+                    ps.close();
+                }
+            }
+            tableName = "ObjectiveTimers";
+            if (!ModSupportDb.hasTable(con, tableName)) {
+                logger.info(tableName+" table not found in ModSupport. Creating table now.");
+                sql = "CREATE TABLE "+tableName+" (ID VARCHAR(30) NOT NULL DEFAULT 'Unknown', TIMER LONG NOT NULL DEFAULT 0)";
+                PreparedStatement ps = con.prepareStatement(sql);
+                ps.execute();
+                ps.close();
+                try {
+                    Connection dbcon;
+                    dbcon = ModSupportDb.getModSupportDb();
+                    ps = dbcon.prepareStatement("INSERT INTO ObjectiveTimers (ID, TIMER) VALUES(\"DEPOT\", 0)");
+                    ps.executeUpdate();
+                    ps.close();
+                }
+                catch (SQLException e) {
+                    throw new RuntimeException(e);
+                }
+                try {
+                    Connection dbcon;
+                    dbcon = ModSupportDb.getModSupportDb();
+                    ps = dbcon.prepareStatement("INSERT INTO ObjectiveTimers (ID, TIMER) VALUES(\"TITAN\", 0)");
+                    ps.executeUpdate();
+                    ps.close();
+                }
+                catch (SQLException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+            SupplyDepots.initializeDepotTimer();
+            Titans.initializeTitanTimer();
+        }
+        catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

src/main/java/mod/sin/wyvern/DeityChanges.java

@@ -0,0 +1,38 @@
+package mod.sin.wyvern;
+
+import com.wurmonline.server.deities.Deities;
+import com.wurmonline.server.deities.Deity;
+
+import java.util.logging.Logger;
+
+public class DeityChanges {
+    public static Logger logger = Logger.getLogger(DeityChanges.class.getName());
+
+    public static void onServerStarted(){
+        if(Deities.getDeity(101) != null){ // Edit Thelastdab Player God
+            Deity thelastdab = Deities.getDeity(101);
+            // Add some defining affinities
+            thelastdab.metalAffinity = true;
+            thelastdab.deathProtector = true;
+            thelastdab.mountainGod = true;
+            thelastdab.warrior = true;
+            // Remove some affinities
+            thelastdab.learner = false;
+            thelastdab.repairer = false;
+            thelastdab.befriendCreature = false;
+            thelastdab.healer = false;
+            thelastdab.clayAffinity = false;
+            thelastdab.waterGod = false;
+        }
+        /*if(Deities.getDeity(102) != null){ // Edit Cyberhusky player god
+            Deity cyberhusky = Deities.getDeity(102);
+            // Add some defining affinities
+            cyberhusky.hateGod = true;
+            cyberhusky.allowsButchering = true;
+            cyberhusky.warrior = true;
+            // Remove some affinities
+            cyberhusky.woodAffinity = false;
+            cyberhusky.befriendCreature = false;
+        }*/
+    }
+}

src/main/java/mod/sin/wyvern/EconomicChanges.java

@@ -1,6 +1,9 @@
 package mod.sin.wyvern;
 
+import com.wurmonline.server.economy.Economy;
+import com.wurmonline.server.economy.Shop;
 import com.wurmonline.server.items.Item;
+import com.wurmonline.server.items.Trade;
 import com.wurmonline.server.items.ItemTemplateFactory;
 import com.wurmonline.server.villages.GuardPlan;
 import com.wurmonline.server.villages.Village;
@@ -49,6 +52,36 @@ public class EconomicChanges {
         return -10;
     }
 
+    public static long getNewShopDiff(Trade trade, long money, long shopDiff){
+        Shop shop = null;
+        Village citizenVillage = null;
+        if (trade.creatureOne.isNpcTrader()) {
+            shop = Economy.getEconomy().getShop(trade.creatureOne);
+        }
+        if (trade.creatureTwo.isNpcTrader()) {
+            shop = Economy.getEconomy().getShop(trade.creatureTwo);
+        }
+        if(shop == null){
+            logger.info("Something went horribly wrong and the shop is null.");
+            return 0;
+        }
+        logger.info("Money = "+money+", shopDiff = "+shopDiff);
+        if(!shop.isPersonal() && money > 0){
+            logger.info("We're adding money. Testing to see how much difference there is.");
+            if(money + shopDiff > 0){
+                logger.info("Player actually purchased something. Reducing the income.");
+                long newDiff = money + shopDiff;
+                logger.info("Actual difference in currency: "+Economy.getEconomy().getChangeFor(newDiff).getChangeString());
+                newDiff *= 0.2;
+                logger.info("After 80% void: "+Economy.getEconomy().getChangeFor(newDiff).getChangeString());
+                logger.info("Returning the following amount of money to incur the change: "+(-shopDiff+newDiff));
+                return -shopDiff+newDiff;
+            }
+            //return (long) (money*0.2);
+        }
+        return money;
+    }
+
     public static void preInit(){
         try{
             ClassPool classPool = HookManager.getInstance().getClassPool();
@@ -77,6 +110,11 @@ public class EconomicChanges {
             replace = "$_ = 1;";
             Util.instrumentDeclared(thisClass, ctCreature, "removeRandomItems", "nextInt", replace);
 
+            Util.setReason("Void 80% of all currency put into traders.");
+            CtClass ctTrade = classPool.get("com.wurmonline.server.items.Trade");
+            replace = "$1 = "+EconomicChanges.class.getName()+".getNewShopDiff($0, $1, $0.shopDiff);";
+            Util.insertBeforeDeclared(thisClass, ctTrade, "addShopDiff", replace);
+
     } catch ( NotFoundException | IllegalArgumentException | ClassCastException e) {
         throw new HookException(e);
     }

src/main/java/mod/sin/wyvern/GemAugmentation.java

@@ -0,0 +1,50 @@
+package mod.sin.wyvern;
+
+import com.wurmonline.server.items.Item;
+import javassist.ClassPool;
+import javassist.CtClass;
+import javassist.NotFoundException;
+import mod.sin.lib.Util;
+import org.gotti.wurmunlimited.modloader.classhooks.HookException;
+import org.gotti.wurmunlimited.modloader.classhooks.HookManager;
+
+import java.util.logging.Logger;
+
+public class GemAugmentation {
+    public static Logger logger = Logger.getLogger(GemAugmentation.class.getName());
+
+    public static boolean setGemmedQuality(Item target, double power, float maxGain, float modifier){
+        logger.info(String.format("Item %s [QL %.2f] improved with power %.1f, max gain %.1f, modifier %.1f",
+                target.getName(), target.getQualityLevel(), power, maxGain, modifier));
+        return target.setQualityLevel(Math.min(999.9f, (float)((double)target.getQualityLevel() + power * (double)maxGain * (double) (modifier * target.getMaterialImpBonus()))));
+    }
+
+    public static void preInit(){
+        try {
+            ClassPool classPool = HookManager.getInstance().getClassPool();
+            Class<GemAugmentation> thisClass = GemAugmentation.class;
+            String replace;
+
+            Util.setReason("Primary Gem Augmentation Hook.");
+            CtClass ctMethodsItems = classPool.get("com.wurmonline.server.behaviours.MethodsItems");
+            replace = "$_ = "+GemAugmentation.class.getName()+".setGemmedQuality($0, power, maxGain, modifier);";
+            Util.instrumentDeclared(thisClass, ctMethodsItems, "improveItem", "setQualityLevel", replace);
+            Util.instrumentDeclared(thisClass, ctMethodsItems, "polishItem", "setQualityLevel", replace);
+            Util.instrumentDeclared(thisClass, ctMethodsItems, "temper", "setQualityLevel", replace);
+
+            Util.setReason("Prevent action power from being diluted.");
+            replace = "$_ = $proceed((float)power);";
+            Util.instrumentDeclared(thisClass, ctMethodsItems, "improveItem", "setPower", replace);
+            Util.instrumentDeclared(thisClass, ctMethodsItems, "polishItem", "setPower", replace);
+            Util.instrumentDeclared(thisClass, ctMethodsItems, "temper", "setPower", replace);
+
+            CtClass ctDbItem = classPool.get("com.wurmonline.server.items.DbItem");
+            replace = //"logger.info(\"qlevel = \"+qlevel);" +
+                    "$_ = $proceed(9999.9f, $2);";
+            Util.instrumentDeclared(thisClass, ctDbItem, "setQualityLevel", "min", replace);
+
+        }catch (NotFoundException e) {
+            throw new HookException(e);
+        }
+    }
+}

src/main/java/mod/sin/wyvern/ItemMod.java

@@ -12,6 +12,7 @@ import java.util.logging.Logger;
 import com.wurmonline.server.Servers;
 import com.wurmonline.server.behaviours.Action;
 import mod.sin.lib.Util;
+import mod.sin.items.caches.*;
 import org.gotti.wurmunlimited.modloader.ReflectionUtil;
 import org.gotti.wurmunlimited.modloader.classhooks.HookManager;
 import org.gotti.wurmunlimited.modloader.classhooks.InvocationHandlerFactory;
@@ -37,7 +38,8 @@ import mod.sin.weapons.titan.*;
 
 public class ItemMod {
 	public static Logger logger = Logger.getLogger(ItemMod.class.getName());
-	
+
+	public static AffinityCatcher AFFINITY_CATCHER = new AffinityCatcher();
 	public static AffinityOrb AFFINITY_ORB = new AffinityOrb();
 	public static ArenaCache ARENA_CACHE = new ArenaCache();
 	public static ArenaSupplyDepot ARENA_SUPPLY_DEPOT = new ArenaSupplyDepot();
@@ -50,6 +52,7 @@ public class ItemMod {
 	public static CorpseDecoration CORPSE_DECORATION = new CorpseDecoration();
 	public static DepthDrill DEPTH_DRILL = new DepthDrill();
 	public static DisintegrationRod DISINTEGRATION_ROD = new DisintegrationRod();
+	//public static TitaniumLump ELECTRUM_LUMP = new TitaniumLump();
 	public static EnchantOrb ENCHANT_ORB = new EnchantOrb();
 	public static EternalOrb ETERNAL_ORB = new EternalOrb();
 	public static Eviscerator EVISCERATOR = new Eviscerator();
@@ -104,10 +107,11 @@ 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 void createItems(){
 		logger.info("createItems()");
 		try{
+		    AFFINITY_CATCHER.createTemplate();
 			AFFINITY_ORB.createTemplate();
 			ARENA_CACHE.createTemplate();
 			ARENA_SUPPLY_DEPOT.createTemplate();
@@ -120,6 +124,7 @@ public class ItemMod {
 			CORPSE_DECORATION.createTemplate();
 			DEPTH_DRILL.createTemplate();
 			DISINTEGRATION_ROD.createTemplate();
+			//ELECTRUM_LUMP.createTemplate();
 			ENCHANT_ORB.createTemplate();
 			ETERNAL_ORB.createTemplate();
 			EVISCERATOR.createTemplate();
@@ -178,6 +183,8 @@ public class ItemMod {
 	}
 	
 	public static void registerActions(){
+	    ModActions.registerAction(new AffinityCatcherCaptureAction());
+	    ModActions.registerAction(new AffinityCatcherConsumeAction());
 		ModActions.registerAction(new AffinityOrbAction());
 		ModActions.registerAction(new ArenaCacheOpenAction());
 		ModActions.registerAction(new ArrowPackUnpackAction());
@@ -190,6 +197,7 @@ public class ItemMod {
 		ModActions.registerAction(new EnchantOrbAction());
 		ModActions.registerAction(new EternalOrbAction());
 		ModActions.registerAction(new FriyanTabletAction());
+        ModActions.registerAction(new KeyCombinationAction());
 		ModActions.registerAction(new SealedMapAction());
 		ModActions.registerAction(new SupplyDepotAction());
 		ModActions.registerAction(new TreasureBoxAction());
@@ -207,6 +215,7 @@ public class ItemMod {
 		//COIN_DECORATION.initCreationEntry();
 		//CORPSE_DECORATION.initCreationEntry();
 		DEPTH_DRILL.initCreationEntry();
+		//ELECTRUM_LUMP.initCreationEntry();
 		EVISCERATOR.initCreationEntry();
 		KNUCKLES.initCreationEntry();
 		MASS_STORAGE_UNIT.initCreationEntry();
@@ -288,6 +297,7 @@ public class ItemMod {
 			new Weapon(Club.templateId, 8.1f, 4.5f, 0.002f, 3, 3, 0.4f, 0.5d);
 			new Weapon(Knuckles.templateId, 3.6f, 2.1f, 0.002f, 1, 1, 0.2f, 0.5d);
 			new Weapon(Warhammer.templateId, 9.40f, 5.6f, 0.008f, 4, 3, 1f, 0d);
+			//new Weapon(ItemList.stoneChisel, 50f, 1f, 0.5f, 8, 1, 3f, -5f);
 			// Titan weaponry
 			new Weapon(MaartensMight.templateId, 11, 5, 0.02f, 4, 4, 1.0f, 0d);
 			new Weapon(RaffehsRage.templateId, 9.5f, 4.25f, 0.02f, 3, 3, 1.0f, 0d);
@@ -328,19 +338,35 @@ public class ItemMod {
 		}
 		return -10;
 	}
-	
+
+	private static void setFragments(int templateId, int fragmentCount){
+        try {
+            ItemTemplate item = ItemTemplateFactory.getInstance().getTemplate(templateId);
+            ReflectionUtil.setPrivateField(item, ReflectionUtil.getField(item.getClass(), "fragmentAmount"), fragmentCount);
+        } catch (IllegalAccessException | NoSuchFieldException | NoSuchTemplateException e) {
+            e.printStackTrace();
+        }
+    }
+
 	public static void modifyItems() throws NoSuchTemplateException, IllegalArgumentException, IllegalAccessException, ClassCastException, NoSuchFieldException{
 		// Make leather able to be combined.
 		ItemTemplate leather = ItemTemplateFactory.getInstance().getTemplate(ItemList.leather);
 		ReflectionUtil.setPrivateField(leather, ReflectionUtil.getField(leather.getClass(), "combine"), true);
 
-        // Make logs able to be combined.
+        // Make logs able to be combined. Also reduce their volume.
         ItemTemplate log = ItemTemplateFactory.getInstance().getTemplate(ItemList.log);
 		ReflectionUtil.setPrivateField(log, ReflectionUtil.getField(log.getClass(), "combine"), true);
 		ReflectionUtil.setPrivateField(log, ReflectionUtil.getField(log.getClass(), "centimetersZ"), 50);
 		int newVolume = log.getSizeX()*log.getSizeY()*log.getSizeZ();
 		ReflectionUtil.setPrivateField(log, ReflectionUtil.getField(log.getClass(), "volume"), newVolume);
 
+		// Reduce kindling volume as well to make sure they're not larger than logs.
+        ItemTemplate kindling = ItemTemplateFactory.getInstance().getTemplate(ItemList.kindling);
+        ReflectionUtil.setPrivateField(kindling, ReflectionUtil.getField(kindling.getClass(), "centimetersY"), 10);
+        ReflectionUtil.setPrivateField(kindling, ReflectionUtil.getField(kindling.getClass(), "centimetersZ"), 10);
+        int newKindlingVolume = kindling.getSizeX()*kindling.getSizeY()*kindling.getSizeZ();
+        ReflectionUtil.setPrivateField(kindling, ReflectionUtil.getField(kindling.getClass(), "volume"), newKindlingVolume);
+
 		// Set silver mirror price to 10 silver instead of 1 iron.
 		ItemTemplate handMirror = ItemTemplateFactory.getInstance().getTemplate(ItemList.handMirror);
 		ReflectionUtil.setPrivateField(handMirror, ReflectionUtil.getField(handMirror.getClass(), "value"), 200000);
@@ -362,6 +388,14 @@ public class ItemMod {
 		ItemTemplate transmutationRod = ItemTemplateFactory.getInstance().getTemplate(ItemList.rodTransmutation);
 		ReflectionUtil.setPrivateField(transmutationRod, ReflectionUtil.getField(transmutationRod.getClass(), "value"), 2000000);
 
+		// Creature crates to 10 silver.
+		ItemTemplate creatureCage = ItemTemplateFactory.getInstance().getTemplate(ItemList.creatureCrate);
+        ReflectionUtil.setPrivateField(creatureCage, ReflectionUtil.getField(creatureCage.getClass(), "value"), 100000);
+        ReflectionUtil.setPrivateField(creatureCage, ReflectionUtil.getField(creatureCage.getClass(), "fullprice"), true);
+
+		// Set transmutation rod to 2 gold instead of 50 silver.
+		//ItemTemplate transmutationRod = ItemTemplateFactory.getInstance().getTemplate(668);
+		//ReflectionUtil.setPrivateField(transmutationRod, ReflectionUtil.getField(transmutationRod.getClass(), "value"), 2000000);
 
 		// "  return this.isTransportable || (this.getTemplateId() >= 510 && this.getTemplateId() <= 513) || this.getTemplateId() == 722 || this.getTemplateId() == 670;"
 		// Make mailboxes loadable (PvE Only)
@@ -413,8 +447,37 @@ public class ItemMod {
         ReflectionUtil.setPrivateField(marbleKeystone, ReflectionUtil.getField(marbleKeystone.getClass(), "decoration"), true);
         ItemTemplate skull = ItemTemplateFactory.getInstance().getTemplate(ItemList.skull);
         ReflectionUtil.setPrivateField(skull, ReflectionUtil.getField(skull.getClass(), "decoration"), true);
+
+        // Modify fragment counts
+        setFragments(ArmourCache.templateId, 18);
+        setFragments(ArtifactCache.templateId, 33);
+        setFragments(CrystalCache.templateId, 11);
+        setFragments(DragonCache.templateId, 19);
+        setFragments(GemCache.templateId, 7);
+        setFragments(MoonCache.templateId, 14);
+        setFragments(PotionCache.templateId, 18);
+        setFragments(RiftCache.templateId, 24);
+        setFragments(TitanCache.templateId, 100);
+        setFragments(ToolCache.templateId, 27);
+        setFragments(TreasureMapCache.templateId, 38);
+
+        setFragments(AffinityOrb.templateId, 20);
+
+        // Tier 4
+        setFragments(ItemList.statueWorg, 40);
+        setFragments(ItemList.statueEagle, 40);
+
+        // Tier 5
+        setFragments(ItemList.statueHellHorse, 45);
+        setFragments(ItemList.statueDrake, 45);
+
+        // Tier 6
+        setFragments(ItemList.statueFo, 50);
+        setFragments(ItemList.statueMagranon, 50);
+        setFragments(ItemList.statueLibila, 50);
+        setFragments(ItemList.statueVynora, 50);
         // Still need to override the method for getting spaceLeft
-		
+
 		createCustomWeapons();
 		createCustomArmours();
 

src/main/java/mod/sin/wyvern/KeyEvent.java

@@ -0,0 +1,396 @@
+package mod.sin.wyvern;
+
+import com.wurmonline.server.Message;
+import com.wurmonline.server.Server;
+import com.wurmonline.server.TimeConstants;
+import com.wurmonline.server.creatures.Creature;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.logging.Logger;
+
+public class KeyEvent {
+    public static Logger logger = Logger.getLogger(KeyEvent.class.getName());
+
+    protected static class Response{
+        protected int index;
+        protected long startTime;
+        protected long endTime;
+        protected String response = "";
+        public Response(int index, int startSecond, int endSecond){
+            this.index = index;
+            this.startTime = startSecond * TimeConstants.SECOND_MILLIS;
+            this.endTime = endSecond * TimeConstants.SECOND_MILLIS;
+        }
+        public void setResponse(String response){
+            this.response = response;
+        }
+        public String getResponse(){
+            return response;
+        }
+    }
+
+    protected static ArrayList<Response> responses = new ArrayList<>();
+    protected static void resetResponses(){
+        responses.clear();
+        responses.add(new Response(0, 40, 60)); // Desire
+        responses.add(new Response(1, 120, 150)); // Fo's Power
+        responses.add(new Response(2, 170, 200)); // Magranon's Power
+        responses.add(new Response(3, 220, 250)); // Vynora's Power
+        responses.add(new Response(4, 270, 300)); // Liblia's Power
+        responses.add(new Response(5, 340, 370)); // Ascend Template
+
+        // Reset booleans
+        hasWeaponEnchant = false;
+        hasCreatureEnchant = false;
+        hasIndustryEnchant = false;
+        hasHeal = false;
+        hasTame = false;
+    }
+    public static String getResponse(int index){
+        for(Response r : responses){
+            if(r.index == index){
+                return r.getResponse();
+            }
+        }
+        return "";
+    }
+
+    public static boolean hasWeaponEnchant = false;
+    public static boolean hasCreatureEnchant = false;
+    public static boolean hasIndustryEnchant = false;
+    public static boolean hasHeal = false;
+    public static boolean hasTame = false;
+
+    public static String foPower = "";
+    public static String magranonPower = "";
+    public static String vynoraPower = "";
+    public static String libilaPower = "";
+    public static String ascendTemplate = "";
+
+    public static String getFoPowers(){
+        return "I offer the following: Life Transfer, Oakshell, Light of Fo, Charm";
+    }
+    public static boolean isValidFo(){
+        return isValidFo(getResponse(1).toLowerCase());
+    }
+    public static boolean isValidFo(String response){
+        if(response.contains("life transfer") || response.contains("lifetransfer") || response.equals("lt")){
+            foPower = "Life Transfer";
+            hasWeaponEnchant = true;
+            return true;
+        }else if(response.contains("oakshell") || response.contains("oak shell")){
+            foPower = "Oakshell";
+            hasCreatureEnchant = true;
+            return true;
+        }else if(response.contains("light of fo") || response.contains("lof") || response.contains("light fo")){
+            foPower = "Light of Fo";
+            hasHeal = true;
+            return true;
+        }else if(response.contains("charm") || response.contains("tame")){
+            foPower = "Charm";
+            hasTame = true;
+            return true;
+        }
+        return false;
+    }
+    public static String getMagranonPowers(){
+        String builder = "I offer the following: ";
+        boolean started = false;
+        if(!hasWeaponEnchant){
+            builder += "Flaming Aura";
+            started = true;
+        }
+        if(!hasCreatureEnchant){
+            if(started){
+                builder += ", Frantic Charge";
+            }else{
+                builder += "Frantic Charge";
+                started = true;
+            }
+        }
+        if(!hasIndustryEnchant){
+            if(started){
+                builder += ", Efficiency";
+            }else{
+                builder += "Efficiency";
+                started = true;
+            }
+        }
+        if(!hasHeal){
+            if(started){
+                builder += ", Mass Stamina";
+            }else{
+                builder += "Mass Stamina";
+                started = true;
+            }
+        }
+        if(!hasTame){
+            if(started){
+                builder += ", Dominate";
+            }else{
+                builder += "Dominate";
+            }
+        }
+        builder += ", Strongwall";
+        return builder;
+    }
+    public static void setRandomMagranonPower(){
+        if(!hasWeaponEnchant){
+            magranonPower = "Flaming Aura";
+            hasWeaponEnchant = true;
+        }else if(!hasCreatureEnchant){
+            magranonPower = "Frantic Charge";
+            hasCreatureEnchant = true;
+        }else if(!hasIndustryEnchant){
+            magranonPower = "Efficiency";
+            hasIndustryEnchant = true;
+        }else{
+            magranonPower = "Strongwall";
+        }
+    }
+    public static boolean isValidMagranon(){
+        return isValidMagranon(getResponse(2).toLowerCase());
+    }
+    public static boolean isValidMagranon(String response){
+        if((response.contains("flaming aura") || response.contains("flamingaura") || response.contains("flame aura") || response.equals("fa"))){
+            magranonPower = "Flaming Aura";
+            hasWeaponEnchant = true;
+            return true;
+        }else if((response.contains("frantic") || response.contains("charge"))){
+            magranonPower = "Frantic Charge";
+            hasCreatureEnchant = true;
+            return true;
+        }else if((response.contains("mass stam") || response.contains("stamina"))){
+            magranonPower = "Mass Stamina";
+            hasHeal = true;
+            return true;
+        }else if((response.contains("effic") || response.contains("effec"))){
+            magranonPower = "Efficiency";
+            hasIndustryEnchant = true;
+            return true;
+        }else if((response.contains("dominate") || response.contains("dom"))){
+            magranonPower = "Dominate";
+            hasTame = true;
+            return true;
+        }else if(response.contains("wall") || response.contains("strong")){
+            magranonPower = "Strongwall";
+            return true;
+        }
+        return false;
+    }
+    public static String getVynoraPowers(){
+        String builder = "I offer the following: ";
+        builder += "Wind of Ages, Circle of Cunning, Aura of Shared Pain";
+        if(!hasWeaponEnchant){
+            builder += ", Frostbrand, Nimbleness, Mind Stealer";
+        }
+        if(!hasCreatureEnchant){
+            builder += ", Excel";
+        }
+        builder += ", Opulence";
+        return builder;
+    }
+    public static void setRandomVynoraPower(){
+        if(!hasWeaponEnchant){
+            vynoraPower = "Nimbleness";
+            hasWeaponEnchant = true;
+        }else if(!hasCreatureEnchant){
+            vynoraPower = "Excel";
+            hasCreatureEnchant = true;
+        }else{
+            vynoraPower = "Wind of Ages";
+            hasIndustryEnchant = true;
+        }
+    }
+    public static boolean isValidVynora(){
+        return isValidVynora(getResponse(3).toLowerCase());
+    }
+    public static boolean isValidVynora(String response){
+        if((response.contains("frost"))){
+            vynoraPower = "Frostbrand";
+            hasWeaponEnchant = true;
+            return true;
+        }else if((response.contains("nimb"))){
+            vynoraPower = "Nimbleness";
+            hasWeaponEnchant = true;
+            return true;
+        }else if((response.contains("mind stealer") || response.contains("mindstealer"))){
+            vynoraPower = "Mind Stealer";
+            hasWeaponEnchant = true;
+            return true;
+        }else if((response.contains("excel"))){
+            vynoraPower = "Excel";
+            hasCreatureEnchant = true;
+            return true;
+        }else if(response.contains("wind") || response.equals("woa")){
+            vynoraPower = "Wind of Ages";
+            hasIndustryEnchant = true;
+            return true;
+        }else if(response.contains("circle") || response.contains("cunning") || response.equals("coc")){
+            vynoraPower = "Circle of Cunning";
+            hasIndustryEnchant = true;
+            return true;
+        }else if(response.contains("aura") || response.contains("shared") || response.equals("aosp")){
+            vynoraPower = "Aura of Shared Pain";
+            return true;
+        }else if(response.contains("opulence")){
+            vynoraPower = "Opulence";
+            return true;
+        }
+        return false;
+    }
+    public static String getLibilaPowers(){
+        String builder = "I offer the following: ";
+        builder += "Web Armour";
+        if(!hasWeaponEnchant){
+            builder += ", Bloodthirst, Rotting Touch";
+        }
+        if(!hasCreatureEnchant){
+            builder += ", Truehit";
+        }
+        if(!hasHeal){
+            builder += ", Scorn of Libila";
+        }
+        if(!hasIndustryEnchant){
+            builder += ", Blessings of the Dark";
+        }
+        if(!hasTame){
+            builder += ", Rebirth";
+        }
+        builder += ", Drain Health, Drain Stamina";
+        return builder;
+    }
+    public static void setRandomLibilaPower(){
+        if(!hasWeaponEnchant){
+            libilaPower = "Rotting Touch";
+            hasWeaponEnchant = true;
+        }else if(!hasCreatureEnchant){
+            libilaPower = "Truehit";
+            hasCreatureEnchant = true;
+        }else if(!hasTame){
+            libilaPower = "Rebirth";
+            hasTame = true;
+        }else{
+            libilaPower = "Drain Health";
+        }
+    }
+    public static boolean isValidLibila(){
+        return isValidLibila(getResponse(4).toLowerCase());
+    }
+    public static boolean isValidLibila(String response){
+        if((response.contains("bloodthirst") || response.contains("blood thirst"))){
+            libilaPower = "Bloodthirst";
+            hasWeaponEnchant = true;
+            return true;
+        }else if((response.contains("rotting") || response.contains("touch"))){
+            libilaPower = "Rotting Touch";
+            hasWeaponEnchant = true;
+            return true;
+        }else if((response.contains("truehit") || response.contains("truhit"))){
+            libilaPower = "Truehit";
+            hasCreatureEnchant = true;
+            return true;
+        }else if((response.contains("scorn"))){
+            libilaPower = "Scorn of Libila";
+            hasHeal = true;
+            return true;
+        }else if((response.contains("blessing") || response.contains("dark") || response.equals("botd"))){
+            libilaPower = "Blessings of the Dark";
+            hasIndustryEnchant = true;
+            return true;
+        }else if((response.contains("rebirth"))){
+            libilaPower = "Rebirth";
+            hasTame = true;
+            return true;
+        }else if(response.contains("health")){
+            libilaPower = "Drain Health";
+            return true;
+        }else if(response.contains("stam")){
+            libilaPower = "Drain Stamina";
+            return true;
+        }else if(response.contains("web") || response.contains("armour")){
+            libilaPower = "Web Armour";
+            return true;
+        }
+        return false;
+    }
+    public static void setRandomAscendTemplate(){
+        if(Server.rand.nextBoolean()) {
+            ascendTemplate = "Fo";
+        }else{
+            ascendTemplate = "Vynora";
+        }
+    }
+    public static boolean isValidAscendTemplate(){
+        return isValidAscendTemplate(getResponse(5).toLowerCase());
+    }
+    public static boolean isValidAscendTemplate(String response){
+        if(response.equals("fo")){
+            ascendTemplate = "Fo";
+            return true;
+        }else if(response.contains("mag")){
+            ascendTemplate = "Magranon";
+            return true;
+        }else if(response.contains("vyn")){
+            ascendTemplate = "Vynora";
+            return true;
+        }else if(response.contains("lib")){
+            ascendTemplate = "Libila";
+            return true;
+        }
+        return false;
+    }
+
+    protected static boolean isValidResponse(int index, String message){
+        if (index == 0){ // Desire
+            return true;
+        }else if(index == 1){ // Fo Power
+            return isValidFo(message);
+        }else if(index == 2){ // Magranon Power
+            return isValidMagranon(message);
+        }else if(index == 3) { // Vynora Power
+            return isValidVynora(message);
+        }else if(index == 4){ // Libila Power
+            return isValidLibila(message);
+        }else if(index == 5){ // Ascend Template
+            return isValidAscendTemplate(message);
+        }
+        return true;
+    }
+
+    protected static boolean active = false;
+    protected static long startTime = 0;
+    protected static Creature performer = null;
+    public static boolean isActive(){
+        return active;
+    }
+
+    public static void setActive(long time, Creature performer){
+        KeyEvent.active = true;
+        KeyEvent.startTime = time;
+        KeyEvent.performer = performer;
+        resetResponses();
+    }
+
+    public static void handlePlayerMessage(Message message){
+        if(performer == message.getSender()){
+            long currentTime = System.currentTimeMillis() - startTime;
+            //logger.info(String.format("Current timer: %s", currentTime));
+            for(Response r : responses){
+                //logger.info(String.format("Checking if index %s is valid at time %s (%s to %s)", r.index, currentTime, r.startTime, r.endTime));
+                if(r.startTime < currentTime && r.endTime > currentTime){
+                    String response = message.getMessage().substring(message.getSender().getName().length()+3).toLowerCase();
+                    //logger.info(String.format("Response at index %s is valid (%s to %s)", r.index, r.startTime, r.endTime));
+                    if (isValidResponse(r.index, response)) {
+                        r.setResponse(response);
+                    }
+                }
+            }
+        }
+    }
+
+    public static void preInit(){
+        resetResponses();
+    }
+}

src/main/java/mod/sin/wyvern/MiscChanges.java

@@ -10,6 +10,11 @@ import com.wurmonline.server.creatures.Creatures;
 import com.wurmonline.server.deities.Deities;
 import com.wurmonline.server.economy.Economy;
 import com.wurmonline.server.items.*;
+import com.wurmonline.server.creatures.Creatures;
+import com.wurmonline.server.creatures.NoSuchCreatureException;
+import com.wurmonline.server.items.Item;
+import com.wurmonline.server.items.ItemTemplate;
+import com.wurmonline.server.items.SimpleCreationEntry;
 import com.wurmonline.server.players.Player;
 import com.wurmonline.server.players.PlayerInfo;
 import com.wurmonline.server.players.PlayerInfoFactory;
@@ -20,6 +25,7 @@ import com.wurmonline.server.webinterface.WcKingdomChat;
 import com.wurmonline.server.zones.VolaTile;
 import com.wurmonline.server.zones.Zones;
 import com.wurmonline.shared.constants.Enchants;
+import com.wurmonline.shared.util.StringUtilities;
 import javassist.*;
 import javassist.bytecode.Descriptor;
 import javassist.expr.ExprEditor;
@@ -41,6 +47,10 @@ import java.lang.reflect.InvocationTargetException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Logger;
@@ -61,16 +71,19 @@ public class MiscChanges {
         };
         r.run();
 	}
-	
-	public static void sendGlobalFreedomChat(final Creature sender, final String message, final int red, final int green, final int blue){
+
+    public static void sendGlobalFreedomChat(final Creature sender, final String message, final int red, final int green, final int blue){
+	    sendGlobalFreedomChat(sender, sender.getNameWithoutPrefixes(), message, red, green, blue);
+    }
+	public static void sendGlobalFreedomChat(final Creature sender, final String name, final String message, final int red, final int green, final int blue){
 		Runnable r = () -> {
             Message mess;
             for(Player rec : Players.getInstance().getPlayers()){
-                mess = new Message(sender, (byte)10, "GL-Freedom", "<"+sender.getNameWithoutPrefixes()+"> "+message, red, green, blue);
+                mess = new Message(sender, (byte)10, "GL-Freedom", "<"+name+"> "+message, red, green, blue);
                 rec.getCommunicator().sendMessage(mess);
             }
             if (message.trim().length() > 1) {
-                WcKingdomChat wc = new WcKingdomChat(WurmId.getNextWCCommandId(), sender.getWurmId(), sender.getNameWithoutPrefixes(), message, false, (byte) 4, red, green, blue);
+                WcKingdomChat wc = new WcKingdomChat(WurmId.getNextWCCommandId(), sender.getWurmId(), name, message, false, (byte) 4, red, green, blue);
                 if (!Servers.isThisLoginServer()) {
                     wc.sendToLoginServer();
                 } else {
@@ -81,6 +94,29 @@ public class MiscChanges {
         r.run();
 	}
 
+	public static void broadCastDeathsPvE(Player player, Map<Long, Long> attackers){
+	    StringBuilder attackerString = new StringBuilder();
+        final long now = System.currentTimeMillis();
+        for (final Long attackerId : attackers.keySet()) {
+            final Long time = attackers.get(attackerId);
+            try {
+                final Creature creature = Creatures.getInstance().getCreature(attackerId);
+                if (now - time >= 600000L) {
+                    continue;
+                }
+                if(attackerString.length() > 0){
+                    attackerString.append(" ");
+                }
+                attackerString.append(StringUtilities.raiseFirstLetter(creature.getName()));
+                if (creature.isPlayer()) {
+                    return;
+                }
+            }
+            catch (NoSuchCreatureException ignored) {}
+        }
+	    Players.getInstance().broadCastDeathInfo(player, attackerString.toString());
+    }
+
 	public static void broadCastDeaths(Creature player, String slayers){
 	    String slayMessage = "slain by ";
 		sendGlobalFreedomChat(player, slayMessage+slayers, 200, 25, 25);
@@ -374,8 +410,10 @@ public class MiscChanges {
             String infoTabTitle = "Server";
             // Initial messages:
             String[] infoTabLine = {"Server Thread: https://forum.wurmonline.com/index.php?/topic/162067-revenant-modded-pvepvp-3x-action-new-skillgain/",
-                            "Website/Maps: https://www.sarcasuals.com/",
-                            "Server Discord: https://discord.gg/r8QNXAC"};
+                    "Website/Maps: https://www.sarcasuals.com/",
+                    "Server Discord: https://discord.gg/r8QNXAC",
+                    "Server Data: https://docs.google.com/spreadsheets/d/1yjqTHoxUan4LIldI3jgrXZgXj1M2ENQ4MXniPUz0rE4",
+                    "Server Wiki/Documentation: https://docs.google.com/document/d/1GeaygilS-Z-d1TuGB7awOe9sJNV4o5BTZw_a2ATJy98"};
             StringBuilder str = new StringBuilder("{"
                     + "        com.wurmonline.server.Message mess;");
             for (String anInfoTabLine : infoTabLine) {
@@ -437,12 +475,11 @@ public class MiscChanges {
             Util.instrumentDeclared(thisClass, ctMethodsItems, "improveItem", "isCombine", replace);
             
             // - Check new improve materials - //
-            // TODO: Re-enable when custom items are created that require it.
-            /*replace = "int temp = "+ItemMod.class.getName()+".getModdedImproveTemplateId($1);"
+            replace = "int temp = "+ItemMod.class.getName()+".getModdedImproveTemplateId($1);"
             		+ "if(temp != -10){"
             		+ "  return temp;"
             		+ "}";
-            Util.insertBeforeDeclared(thisClass, ctMethodsItems, "getImproveTemplateId", replace);*/
+            Util.insertBeforeDeclared(thisClass, ctMethodsItems, "getImproveTemplateId", replace);
             
             // - Remove fatiguing actions requiring you to be on the ground - //
             CtClass ctAction = classPool.get("com.wurmonline.server.behaviours.Action");
@@ -497,8 +534,16 @@ public class MiscChanges {
         	Util.instrumentDeclared(thisClass, ctArrows, "addToHitCreature", "addAttacker", replace);
 
         	Util.setReason("Broadcast death tabs to GL-Freedom.");
-        	Util.insertBeforeDeclared(thisClass, ctPlayers, "broadCastDeathInfo", MiscChanges.class.getName()+".broadCastDeaths($1, $2);");
-        	//ctPlayers.getDeclaredMethod("broadCastDeathInfo").insertBefore("mod.sin.wyvern.MiscChanges.broadCastDeaths($1, $2);");
+        	replace = MiscChanges.class.getName()+".broadCastDeaths($1, $2);";
+            Util.insertBeforeDeclared(thisClass, ctPlayers, "broadCastDeathInfo", replace);
+
+            Util.setReason("Broadcast player death tabs always.");
+            replace = MiscChanges.class.getName()+".broadCastDeathsPvE($0, $0.attackers);";
+            Util.insertBeforeDeclared(thisClass, ctPlayer, "modifyRanking", replace);
+
+            Util.setReason("Disable PvP only death tabs.");
+            replace = "$_ = true;";
+            Util.instrumentDeclared(thisClass, ctPlayers, "broadCastDeathInfo", "isThisAPvpServer", replace);
 
         	Util.setReason("Attempt to prevent libila from losing faith when crossing servers.");
             CtClass ctIntraServerConnection = classPool.get("com.wurmonline.server.intra.IntraServerConnection");
@@ -804,7 +849,6 @@ public class MiscChanges {
             // How to add a skill!
             /*CtClass ctSkillSystem = classPool.get("com.wurmonline.server.skills.SkillSystem");
             CtConstructor ctSkillSystemConstructor = ctSkillSystem.getClassInitializer();
-            logathing("Test first");
             ctSkillSystemConstructor.insertAfter("com.wurmonline.server.skills.SkillSystem.addSkillTemplate(new "+SkillTemplate.class.getName()+"(10096,
                      \"Battle Yoyos\", 4000.0f, new int[]{1022}, 1209600000l, (short) 4, true, true));");*/
 
@@ -868,6 +912,92 @@ public class MiscChanges {
                 }
             });
 
+            Util.setReason("Make armour title benefits always occur.");
+            replace = "$_ = improve.getNumber();";
+            Util.instrumentDeclared(thisClass, ctMethodsItems, "improveItem", "getSkillId", replace);
+            Util.instrumentDeclared(thisClass, ctMethodsItems, "polishItem", "getSkillId", replace);
+
+            Util.setReason("Make it so sorceries can be used anywhere with a flat 3x3 altar.");
+            CtClass ctAbilities = classPool.get("com.wurmonline.server.players.Abilities");
+            replace = "$_ = 1;";
+            Util.instrumentDeclared(thisClass, ctAbilities, "isInProperLocation", "getTemplateId", replace);
+
+            Util.setReason("Make the key of the heavens only usable on PvE");
+            replace = "if($1.getTemplateId() == 794 && com.wurmonline.server.Servers.localServer.PVPSERVER){" +
+                    "  $2.getCommunicator().sendNormalServerMessage(\"The \"+$1.getName()+\" may not be used on Arena.\");" +
+                    "  return false;" +
+                    "}";
+            Util.insertBeforeDeclared(thisClass, ctAbilities, "isInProperLocation", replace);
+
+            Util.setReason("Make drinks less filling.");
+            CtClass[] params14 = {
+                    ctAction,
+                    ctCreature,
+                    ctItem,
+                    CtClass.floatType
+            };
+            String desc14 = Descriptor.ofMethod(CtClass.booleanType, params14);
+            replace = "if(template != 128){" +
+                    "  $_ = $proceed($1, $2, $3*5);" +
+                    "}else{" +
+                    "  $_ = $proceed($$);" +
+                    "}";
+            Util.instrumentDescribed(thisClass, ctMethodsItems, "drink", desc14, "sendActionControl", replace);
+            replace = "if(template != 128){" +
+                    "  $_ = $proceed($1/5, $2, $3, $4, $5);" +
+                    "}else{" +
+                    "  $_ = $proceed($$);" +
+                    "}";
+            Util.instrumentDescribed(thisClass, ctMethodsItems, "drink", desc14, "modifyThirst", replace);
+
+            Util.setReason("Disable Gem Augmentation skill from converting.");
+            CtClass ctMethodsReligion = classPool.get("com.wurmonline.server.behaviours.MethodsReligion");
+            replace = "$_ = $proceed($1, $2, true, $4);";
+            Util.instrumentDeclared(thisClass, ctMethodsReligion, "listen", "skillCheck", replace);
+
+            Util.setReason("Disable GM commands from displaying in /help unless the player is a GM.");
+            CtClass ctServerTweaksHandler = classPool.get("com.wurmonline.server.ServerTweaksHandler");
+            replace = "if($1.getPower() < 1){" +
+                    "  return;" +
+                    "}";
+            Util.insertBeforeDeclared(thisClass, ctServerTweaksHandler, "sendHelp", replace);
+
+            Util.setReason("Make damage less likely to interrupt actions during combat.");
+            replace = "$1 = $1/2;";
+            Util.insertBeforeDeclared(thisClass, ctCreature, "maybeInterruptAction", replace);
+
+            Util.setReason("Fix mission null pointer exception.");
+            CtClass ctEpicServerStatus = classPool.get("com.wurmonline.server.epic.EpicServerStatus");
+            replace = "if(itemplates.size() < 1){" +
+                    "  com.wurmonline.server.epic.EpicServerStatus.setupMissionItemTemplates();" +
+                    "}";
+            Util.insertBeforeDeclared(thisClass, ctEpicServerStatus, "getRandomItemTemplateUsed", replace);
+
+            Util.setReason("Fix bug causing high cast spells to reduce power.");
+            CtClass ctSpellEffect = classPool.get("com.wurmonline.server.spells.SpellEffect");
+            replace = "{" +
+                    "  final float mod = 5.0f * (1.0f - java.lang.Math.min($0.getPower(), 100f) / 100.0f);" +
+                    "  $0.setPower(mod + $1);" +
+                    "}";
+            Util.setBodyDeclared(thisClass, ctSpellEffect, "improvePower", replace);
+
+            Util.setReason("Disable smelting pots from being used.");
+            CtClass ctItemBehaviour = classPool.get("com.wurmonline.server.behaviours.ItemBehaviour");
+            CtClass[] params15 = {
+                    ctAction,
+                    ctCreature,
+                    ctItem,
+                    ctItem,
+                    CtClass.shortType,
+                    CtClass.floatType
+            };
+            String desc15 = Descriptor.ofMethod(CtClass.booleanType, params15);
+            replace = "if($5 == 519){" +
+                    "  $2.getCommunicator().sendNormalServerMessage(\"Smelting is disabled.\");" +
+                    "  return true;" +
+                    "}";
+            Util.insertBeforeDescribed(thisClass, ctItemBehaviour, "action", desc15, replace);
+
         } catch (CannotCompileException | NotFoundException | IllegalArgumentException | ClassCastException e) {
             throw new HookException(e);
         }

src/main/java/mod/sin/wyvern/MountedChanges.java

@@ -67,7 +67,7 @@ public class MountedChanges {
         if(creature.isHorse() || creature.isUnicorn()) {
             factor *= newCalcHorseShoeBonus(creature);
         }
-        if(creature.isHorse()){
+        /*if(creature.isHorse()){
             try {
                 Item barding = creature.getArmour(BodyPartConstants.TORSO);
                 if(barding != null){
@@ -81,7 +81,7 @@ public class MountedChanges {
                 }
             } catch (NoArmourException | NoSpaceException ignored) {
             }
-        }
+        }*/
         if (creature.getBonusForSpellEffect(Enchants.CRET_OAKSHELL) > 0.0f) {
             factor *= 1f - (0.3f * (creature.getBonusForSpellEffect(Enchants.CRET_OAKSHELL) / 100.0f));
         }

src/main/java/mod/sin/wyvern/PlayerTitles.java

@@ -80,6 +80,9 @@ public class PlayerTitles {
         customTitles.put("Piratemax", 810); // Slave
         playerTitles.put("Piratemax", "Boy Next Door");
 
+        donatorTitles.add("Eltacolad");
+        customTitles.put("Eltacolad", 811); // The One True Taco
+
         // Other rewards
         customTitles.put("Critias", 602);
     }

src/main/java/mod/sin/wyvern/SkillChanges.java

@@ -0,0 +1,147 @@
+package mod.sin.wyvern;
+
+import com.wurmonline.server.Server;
+import com.wurmonline.server.TimeConstants;
+import com.wurmonline.server.skills.*;
+import javassist.ClassPool;
+import javassist.CtClass;
+import javassist.NotFoundException;
+import mod.sin.lib.Util;
+import org.gotti.wurmunlimited.modloader.ReflectionUtil;
+import org.gotti.wurmunlimited.modloader.classhooks.HookException;
+import org.gotti.wurmunlimited.modloader.classhooks.HookManager;
+
+import java.util.logging.Logger;
+
+public class SkillChanges {
+    public static Logger logger = Logger.getLogger(SkillChanges.class.getName());
+
+    public static double newDoSkillGainNew(Skill skill, double check, double power, double learnMod, float times, double skillDivider) {
+        double bonus = 1.0;
+        double diff = Math.abs(check - skill.getKnowledge());
+        short sType = SkillSystem.getTypeFor(skill.getNumber());
+        boolean awardBonus = true;
+        if (sType == 1 || sType == 0) {
+            awardBonus = false;
+        }
+        if (diff <= 15.0 && awardBonus) {
+            bonus = 1.0 + (0.1 * (diff / 15.0));
+        }
+        /*if (power < 0.0) {
+            if (this.knowledge < 20.0) {
+                this.alterSkill((100.0 - this.knowledge) / (this.getDifficulty(this.parent.priest) * this.knowledge * this.knowledge) * learnMod * bonus, false, times, true, skillDivider);
+            }
+        } else {
+            this.alterSkill((100.0 - this.knowledge) / (this.getDifficulty(this.parent.priest) * this.knowledge * this.knowledge) * learnMod * bonus, false, times, true, skillDivider);
+        }*/
+        try {
+            Skills parent = ReflectionUtil.getPrivateField(skill, ReflectionUtil.getField(skill.getClass(), "parent"));
+            double advanceMultiplicator = (100.0 - skill.getKnowledge()) / (skill.getDifficulty(parent.priest) * skill.getKnowledge() * skill.getKnowledge()) * learnMod * bonus;
+            double negativeDecayRate = 5;
+            double positiveDecayRate = 3;
+            double valueAtZero = 3.74d;
+            double valueAtOneHundred = 0.9d;
+            //advanceMultiplicator *= Math.pow(2, ((2-Math.pow((100/(100+power)), p))*(100-power)/100));
+            //double mult = Math.pow(2, (2-Math.pow(100/(100+power), negativeDecayRate))*Math.pow((100-power)*0.01, positiveDecayRate));
+            double mult = valueAtOneHundred*Math.pow(valueAtZero/valueAtOneHundred, (2-Math.pow(100/(100+Math.max(-99,power)), negativeDecayRate))*Math.pow((100-power)*0.01, positiveDecayRate));
+            if(mult < 0.5 && skill.getKnowledge() < 20){
+                advanceMultiplicator *= 0.5+(Server.rand.nextDouble()*0.5);
+            }else if(skill.getNumber() == SkillList.MEDITATING || skill.getNumber() == SkillList.LOCKPICKING){
+                advanceMultiplicator *= Math.max(mult, 0.8d);
+            }else if(mult > 0.0001) {
+                advanceMultiplicator *= mult;
+            }else{
+                advanceMultiplicator = 0;
+            }
+            /*if(skill.getType() > 3) {
+                logger.info(String.format("Power of %.2f on skill %s gives multiplier of %.2f.", power, skill.getName(), mult));
+            }*/
+            return advanceMultiplicator;
+            //ReflectionUtil.callPrivateMethod(skill, ReflectionUtil.getMethod(skill.getClass(), "alterSkill"), advanceMultiplicator, false, times, true, skillDivider);
+        } catch (IllegalAccessException | NoSuchFieldException e) {
+            logger.info(e.getMessage());
+            e.printStackTrace();
+        }
+        return 0;
+    }
+
+    public static void onServerStarted(){
+        /*SkillTemplate exorcism = SkillSystem.templates.get(SkillList.EXORCISM);
+        int[] deps = {SkillList.GROUP_ALCHEMY};
+        try {
+            String newName = "Crystal handling";
+            ReflectionUtil.setPrivateField(exorcism, ReflectionUtil.getField(exorcism.getClass(), "name"), newName);
+            SkillSystem.skillNames.put(exorcism.getNumber(), newName);
+            SkillSystem.namesToSkill.put(newName, exorcism.getNumber());
+            ReflectionUtil.setPrivateField(exorcism, ReflectionUtil.getField(exorcism.getClass(), "dependencies"), deps);
+        } catch (IllegalAccessException | NoSuchFieldException e) {
+            logger.info("Failed to rename exorcism!");
+            e.printStackTrace();
+        }
+        SkillTemplate ballistae = SkillSystem.templates.get(SkillList.BALLISTA);
+        int[] deps2 = {SkillList.GROUP_ALCHEMY};
+        try {
+            String newName = "Mystic components";
+            ReflectionUtil.setPrivateField(ballistae, ReflectionUtil.getField(ballistae.getClass(), "name"), newName);
+            SkillSystem.skillNames.put(ballistae.getNumber(), newName);
+            SkillSystem.namesToSkill.put(newName, ballistae.getNumber());
+            ReflectionUtil.setPrivateField(ballistae, ReflectionUtil.getField(ballistae.getClass(), "dependencies"), deps2);
+        } catch (IllegalAccessException | NoSuchFieldException e) {
+            logger.info("Failed to rename ballistae!");
+            e.printStackTrace();
+        }*/
+        SkillTemplate preaching = SkillSystem.templates.get(SkillList.PREACHING);
+        int[] deps3 = {SkillList.MASONRY};
+        try {
+            String newName = "Gem augmentation";
+            ReflectionUtil.setPrivateField(preaching, ReflectionUtil.getField(preaching.getClass(), "name"), newName);
+            SkillSystem.skillNames.put(preaching.getNumber(), newName);
+            SkillSystem.namesToSkill.put(newName, preaching.getNumber());
+            ReflectionUtil.setPrivateField(preaching, ReflectionUtil.getField(preaching.getClass(), "dependencies"), deps3);
+        } catch (IllegalAccessException | NoSuchFieldException e) {
+            logger.info("Failed to rename preaching!");
+            e.printStackTrace();
+        }
+        SkillTemplate stealing = SkillSystem.templates.get(SkillList.STEALING);
+        try {
+            ReflectionUtil.setPrivateField(stealing, ReflectionUtil.getField(stealing.getClass(), "tickTime"), 0);
+        } catch (IllegalAccessException | NoSuchFieldException e) {
+            logger.info("Failed to set tickTime for stealing!");
+            e.printStackTrace();
+        }
+        SkillTemplate meditating = SkillSystem.templates.get(SkillList.MEDITATING);
+        try {
+            ReflectionUtil.setPrivateField(meditating, ReflectionUtil.getField(meditating.getClass(), "tickTime"), TimeConstants.HOUR_MILLIS);
+        } catch (IllegalAccessException | NoSuchFieldException e) {
+            logger.info("Failed to set tickTime for meditating!");
+            e.printStackTrace();
+        }
+        meditating.setDifficulty(300f);
+
+        // Set mining difficulty down to be equivalent to digging.
+        SkillTemplate mining = SkillSystem.templates.get(SkillList.MINING);
+        mining.setDifficulty(3000f);
+        // Triple lockpicking skill
+        SkillTemplate lockpicking = SkillSystem.templates.get(SkillList.LOCKPICKING);
+        lockpicking.setDifficulty(700f);
+    }
+
+    public static void preInit(){
+        try{
+            ClassPool classPool = HookManager.getInstance().getClassPool();
+            final Class<SkillChanges> thisClass = SkillChanges.class;
+            String replace;
+
+            Util.setReason("Allow skill check failures to add skill gain.");
+            CtClass ctSkill = classPool.get("com.wurmonline.server.skills.Skill");
+            replace = "{" +
+                    "  double advanceMultiplicator = "+SkillChanges.class.getName()+".newDoSkillGainNew($0, $1, $2, $3, $4, $5);" +
+                    "  $0.alterSkill(advanceMultiplicator, false, $4, true, $5);" +
+                    "}";
+            Util.setBodyDeclared(thisClass, ctSkill, "doSkillGainNew", replace);
+
+        } catch ( NotFoundException | IllegalArgumentException | ClassCastException e) {
+            throw new HookException(e);
+        }
+    }
+}

src/main/java/mod/sin/wyvern/SupplyDepots.java

@@ -198,6 +198,7 @@ public class SupplyDepots {
 						MiscChanges.sendServerTabMessage("arena", "The next Arena depot will appear in 5 minutes!", 255, 128, 0);
 					}else if(minutesLeft == 19){
 						MiscChanges.sendServerTabMessage("arena", "The next Arena depot will appear in 20 minutes!", 255, 128, 0);
+                        MiscChanges.sendGlobalFreedomChat(host, "The next Arena depot will appear in 20 minutes!", 255, 128, 0);
 					}else if(minutesLeft == 59){
 						MiscChanges.sendServerTabMessage("arena", "The next Arena depot will appear in 60 minutes!", 255, 128, 0);
 						MiscChanges.sendGlobalFreedomChat(host, "The next Arena depot will appear in 60 minutes!", 255, 128, 0);
@@ -251,14 +252,12 @@ public class SupplyDepots {
 				inv.insertItem(token, true);
 				i--;
 			}
-			// Seryll or sleep powder
-			if(Server.rand.nextBoolean()){
-			    Item seryll = ItemFactory.createItem(ItemList.seryllBar, 70+(30*Server.rand.nextFloat()), null);
-			    inv.insertItem(seryll, true);
-            }else{
-			    Item sleepPowder = ItemFactory.createItem(ItemList.sleepPowder, 99f, null);
-			    inv.insertItem(sleepPowder, true);
-            }
+			// High quality seryll
+			Item seryll = ItemFactory.createItem(ItemList.seryllBar, 80+(20*Server.rand.nextFloat()), null);
+			inv.insertItem(seryll, true);
+			// Sleep powder
+			Item sleepPowder = ItemFactory.createItem(ItemList.sleepPowder, 99f, null);
+			inv.insertItem(sleepPowder, true);
 			// Very low chance for a HotA statue.
 			if(Server.rand.nextFloat()*100f <= 1f){
 				Item hotaStatue = ItemFactory.createItem(ItemList.statueHota, 80f+(20f*Server.rand.nextFloat()), "");

src/main/java/mod/sin/wyvern/Titans.java

@@ -3,6 +3,7 @@ package mod.sin.wyvern;
 import com.wurmonline.mesh.Tiles;
 import com.wurmonline.server.*;
 import com.wurmonline.server.bodys.Wound;
+import com.wurmonline.server.bodys.Wounds;
 import com.wurmonline.server.creatures.Creature;
 import com.wurmonline.server.creatures.Creatures;
 import com.wurmonline.server.creatures.MineDoorPermission;
@@ -152,7 +153,8 @@ public class Titans {
         if (lCret.isUnique() || lCret.isInvulnerable() || lCret == titan || isTitanMinion(lCret)){
             return;
         }
-        if (!lCret.addWoundOfType(lCret, Wound.TYPE_INFECTION, 1, true, 1.0f, true, 50000f)) {
+        lCret.addWoundOfType(lCret, Wound.TYPE_INFECTION, 1, true, 1.0f, true, 50000f);
+        /*if (!lCret.addWoundOfType(lCret, Wound.TYPE_INFECTION, 1, true, 1.0f, true, 50000f)) {
             Creatures.getInstance().setCreatureDead(lCret);
             Players.getInstance().setCreatureDead(lCret);
             lCret.setTeleportPoints((short)tilex, (short)tiley, titan.getLayer(), 0);
@@ -162,7 +164,7 @@ public class Titans {
             if (!lCret.isPlayer()) {
                 lCret.getMovementScheme().resumeSpeedModifier();
             }
-        }
+        }*/
     }
     public static void ifritMassIncinerateAttack(Creature titan, Creature lCret){
         if (lCret.isUnique() || lCret.isInvulnerable() || lCret == titan || isTitanMinion(lCret)){
@@ -675,6 +677,23 @@ public class Titans {
         }
         titanDamage.put(titan, currentDamage);
     }
+    public static void pollTitanRegeneration(){
+        if(!titans.isEmpty()) {
+            for (Creature cret : titans) {
+                if (cret.getBody().isWounded()) {
+                    Wounds tWounds = cret.getBody().getWounds();
+                    int toHeal = 5;
+                    Wound w = tWounds.getWounds()[Server.rand.nextInt(tWounds.getWounds().length)];
+                    if (w.getSeverity() > toHeal) {
+                        w.modifySeverity(-toHeal);
+                        break;
+                    } else {
+                        w.heal();
+                    }
+                }
+            }
+        }
+    }
     public static void pollTitan(Creature titan){
         if(titanDamage.containsKey(titan)){
             int prevDamage = titanDamage.get(titan);
@@ -687,6 +706,14 @@ public class Titans {
             titanDamage.put(titan, titan.getStatus().damage);
         }
     }
+    public static void pollTitans(){
+        for(Creature c : titans){
+            if(isTitan(c)){
+                pollTitan(c);
+            }
+        }
+        pollTitanRegeneration();
+    }
 
     public static ArrayList<Creature> titans = new ArrayList<>();
     public static long lastPolledTitanSpawn = 0;
@@ -764,7 +791,7 @@ public class Titans {
                 int tiley = (int) (minY+(minY*2*Server.rand.nextFloat()))*4;*/
                 int[] titanTemplates = {Lilith.templateId, Ifrit.templateId};
                 try {
-                    Creature.doNew(titanTemplates[Server.rand.nextInt(titanTemplates.length)], spawnX, spawnY, 360f*Server.rand.nextFloat(), 1, "", (byte)0);
+                    Creature.doNew(titanTemplates[Server.rand.nextInt(titanTemplates.length)], spawnX, spawnY, 360f*Server.rand.nextFloat(), 0, "", (byte)0);
                     lastSpawnedTitan = System.currentTimeMillis();
                     updateLastSpawnedTitan();
                 } catch (Exception e) {
@@ -779,13 +806,6 @@ public class Titans {
             lastPolledTitanSpawn = System.currentTimeMillis();
         }
     }
-    public static void pollTitans(){
-        for(Creature c : titans){
-            if(isTitan(c)){
-                pollTitan(c);
-            }
-        }
-    }
 
     public static void preInit(){
         try {

src/main/java/mod/sin/wyvern/WyvernMods.java

@@ -7,23 +7,20 @@ import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.nio.ByteBuffer;
 import java.nio.file.Paths;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.Properties;
 import java.util.logging.FileHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.SimpleFormatter;
 
+import com.wurmonline.server.Message;
 import com.wurmonline.server.Items;
 import com.wurmonline.server.Server;
 import com.wurmonline.server.creatures.Communicator;
 import com.wurmonline.server.creatures.Creature;
-import com.wurmonline.server.creatures.CreatureTemplate;
-import com.wurmonline.server.creatures.CreatureTemplateFactory;
 import com.wurmonline.server.items.*;
+import com.wurmonline.server.kingdom.Kingdoms;
+import mod.sin.actions.items.SorcerySplitAction;
 import javassist.bytecode.Descriptor;
 import mod.sin.items.*;
 import mod.sin.kingdomoffices.ItemCreator;
@@ -34,16 +31,12 @@ import org.gotti.wurmunlimited.modloader.classhooks.HookException;
 import org.gotti.wurmunlimited.modloader.classhooks.HookManager;
 import org.gotti.wurmunlimited.modloader.classhooks.InvocationHandlerFactory;
 import org.gotti.wurmunlimited.modloader.interfaces.*;
-import org.gotti.wurmunlimited.modsupport.ModSupportDb;
 import org.gotti.wurmunlimited.modsupport.actions.ModActions;
 import org.gotti.wurmunlimited.modsupport.creatures.ModCreatures;
 import org.gotti.wurmunlimited.modsupport.vehicles.ModVehicleBehaviours;
 
 import com.wurmonline.server.TimeConstants;
 import com.wurmonline.server.players.Player;
-import com.wurmonline.server.skills.SkillList;
-import com.wurmonline.server.skills.SkillSystem;
-import com.wurmonline.server.skills.SkillTemplate;
 
 import javassist.CannotCompileException;
 import javassist.ClassPool;
@@ -58,7 +51,7 @@ import mod.sin.wyvern.bestiary.MethodsBestiary;
 import mod.sin.wyvern.mastercraft.Mastercraft;
 
 public class WyvernMods
-implements WurmServerMod, Configurable, PreInitable, Initable, ItemTemplatesCreatedListener, ServerStartedListener, ServerPollListener, PlayerLoginListener {
+implements WurmServerMod, Configurable, PreInitable, Initable, ItemTemplatesCreatedListener, ServerStartedListener, ServerPollListener, PlayerLoginListener, ChannelMessageListener {
 	private static Logger logger = Logger.getLogger(WyvernMods.class.getName());
 	public static boolean espCounter = false;
 	public static boolean enableDepots = false;
@@ -120,9 +113,9 @@ implements WurmServerMod, Configurable, PreInitable, Initable, ItemTemplatesCrea
         }
     }
 
-    /*public static void handleExamine(Creature performer, Item target) {
+    public static void handleExamine(Creature performer, Item target) {
         // Im just not a smart man.
-        if(target.isContainerLiquid()){
+        /*if(target.isContainerLiquid()){
             boolean found = false;
             for(Item i : Items.getAllItems()){
                 if(i == target){
@@ -134,8 +127,8 @@ implements WurmServerMod, Configurable, PreInitable, Initable, ItemTemplatesCrea
             }else{
                 logger.info("Item not found.");
             }
-        }
-    }*/
+        }*/
+    }
 
     public void preInit() {
     	logger.info("Pre-Initializing.");
@@ -152,6 +145,7 @@ implements WurmServerMod, Configurable, PreInitable, Initable, ItemTemplatesCrea
             MethodsBestiary.preInit();
             MissionCreator.preInit();
             CombatChanges.preInit();
+            SkillChanges.preInit();
             MeditationPerks.preInit();
             MountedChanges.preInit();
             EconomicChanges.preInit();
@@ -161,15 +155,17 @@ implements WurmServerMod, Configurable, PreInitable, Initable, ItemTemplatesCrea
             Mastercraft.preInit();
             Mastercraft.addNewTitles();
             SupplyDepots.preInit();
+            KeyEvent.preInit();
+            //GemAugmentation.preInit();
             ItemBonusOverhaul.preInit();
 
             Class<WyvernMods> thisClass = WyvernMods.class;
 			ClassPool classPool = HookManager.getInstance().getClassPool();
 
-            /*Util.setReason("Insert examine method.");
+            Util.setReason("Insert examine method.");
             CtClass ctItemBehaviour = classPool.get("com.wurmonline.server.behaviours.ItemBehaviour");
             String replace = WyvernMods.class.getName() + ".handleExamine($2, $3);";
-            Util.insertAfterDeclared(thisClass, ctItemBehaviour, "examine", replace);*/
+            Util.insertAfterDeclared(thisClass, ctItemBehaviour, "examine", replace);
 
             // - Enable custom command handler - //
 			CtClass ctCommunicator = classPool.get("com.wurmonline.server.creatures.Communicator");
@@ -180,7 +176,6 @@ implements WurmServerMod, Configurable, PreInitable, Initable, ItemTemplatesCrea
                         		+ "if(!mod.sin.wyvern.WyvernMods.customCommandHandler($1, this.player)){"
                         		+ "  $_ = $proceed(tempBuffer);"
                         		+ "}");
-                        return;
                     }
                 }
             });
@@ -216,6 +211,7 @@ implements WurmServerMod, Configurable, PreInitable, Initable, ItemTemplatesCrea
 		// Flavor Mobs:
         logger.info("Registering Flavor creatures.");
 		ModCreatures.addCreature(new Avenger());
+        ModCreatures.addCreature(new FireCrab());
 		ModCreatures.addCreature(new ForestSpider());
 		ModCreatures.addCreature(new Giant());
         ModCreatures.addCreature(new Charger());
@@ -226,9 +222,9 @@ implements WurmServerMod, Configurable, PreInitable, Initable, ItemTemplatesCrea
 		// Event Mobs:
         logger.info("Registering Event creatures.");
         ModCreatures.addCreature(new IceCat());
-        ModCreatures.addCreature(new FireCrab());
         ModCreatures.addCreature(new FireGiant());
-		
+        ModCreatures.addCreature(new GuardianMagranon());
+
 		// Bosses:
 		logger.info("Registering Custom Boss creatures.");
 		ModCreatures.addCreature(new Reaper());
@@ -254,7 +250,6 @@ implements WurmServerMod, Configurable, PreInitable, Initable, ItemTemplatesCrea
 		Bounty.init();
 		
 		Mastercraft.changeExistingTitles();
-
 	}
 
 	@Override
@@ -340,62 +335,7 @@ implements WurmServerMod, Configurable, PreInitable, Initable, ItemTemplatesCrea
 
 	@Override
     public void onPlayerLogin(Player p) {
-        Connection dbcon;
-        PreparedStatement ps;
-        boolean foundLeaderboardOpt = false;
-        try {
-            dbcon = ModSupportDb.getModSupportDb();
-            ps = dbcon.prepareStatement("SELECT * FROM LeaderboardOpt");
-            ResultSet rs = ps.executeQuery();
-            while (rs.next()) {
-                if (!rs.getString("name").equals(p.getName())) continue;
-                foundLeaderboardOpt = true;
-            }
-            rs.close();
-            ps.close();
-        }
-        catch (SQLException e) {
-            throw new RuntimeException(e);
-        }
-        if (!foundLeaderboardOpt) {
-            logger.info("No leaderboard entry for "+p.getName()+". Creating one.");
-            try {
-                dbcon = ModSupportDb.getModSupportDb();
-                ps = dbcon.prepareStatement("INSERT INTO LeaderboardOpt (name) VALUES(\"" + p.getName() + "\")");
-                ps.executeUpdate();
-                ps.close();
-            }
-            catch (SQLException e) {
-                throw new RuntimeException(e);
-            }
-        }
-        boolean foundPlayerStats = false;
-        try {
-            dbcon = ModSupportDb.getModSupportDb();
-            ps = dbcon.prepareStatement("SELECT * FROM PlayerStats");
-            ResultSet rs = ps.executeQuery();
-            while (rs.next()) {
-                if (!rs.getString("NAME").equals(p.getName())) continue;
-                foundPlayerStats = true;
-            }
-            rs.close();
-            ps.close();
-        }
-        catch (SQLException e) {
-            throw new RuntimeException(e);
-        }
-        if (!foundPlayerStats) {
-            logger.info("No player stats entry for "+p.getName()+". Creating one.");
-            try {
-                dbcon = ModSupportDb.getModSupportDb();
-                ps = dbcon.prepareStatement("INSERT INTO PlayerStats (NAME) VALUES(\"" + p.getName() + "\")");
-                ps.executeUpdate();
-                ps.close();
-            }
-            catch (SQLException e) {
-                throw new RuntimeException(e);
-            }
-        }
+        DatabaseHelper.onPlayerLogin(p);
         PlayerTitles.awardCustomTitles(p);
     }
 
@@ -415,6 +355,8 @@ implements WurmServerMod, Configurable, PreInitable, Initable, ItemTemplatesCrea
 			ModActions.registerAction(new ReceiveMailAction());
 			ModActions.registerAction(new LeaderboardAction());
 			ModActions.registerAction(new AddSubGroupAction());
+			ModActions.registerAction(new SorcerySplitAction());
+			ModActions.registerAction(new LeaderboardSkillAction());
 			logger.info("Registering Arena actions.");
 			ModActions.registerAction(new SorceryCombineAction());
 			//ModActions.registerAction(new VillageTeleportAction()); // [3/28/18] Disabled - Highway Portals added instead.
@@ -423,85 +365,19 @@ implements WurmServerMod, Configurable, PreInitable, Initable, ItemTemplatesCrea
 			logger.info("Registering Dev actions.");
 			ModActions.registerAction(new MissionAddAction());
 			ModActions.registerAction(new MissionRemoveAction());
+			ModActions.registerAction(new CreatureReportAction());
+			ModActions.registerAction(new SmoothTerrainAction());
 			logger.info("Setting custom creature corpse models.");
 			MethodsBestiary.setTemplateVariables();
-			/*if(Deities.getDeity(101) != null){ // Edit Breyk player god
-				Deity breyk = Deities.getDeity(101);
-				// Add some defining affinities
-				breyk.repairer = true;
-				breyk.learner = true;
-				breyk.deathProtector = true;
-				breyk.befriendCreature = true;
-				// Remove some affinities
-				breyk.warrior = false;
-				breyk.healer = false;
-				breyk.clayAffinity = false;
-			}*/
-			/*if(Deities.getDeity(102) != null){ // Edit Cyberhusky player god
-				Deity cyberhusky = Deities.getDeity(102);
-				// Add some defining affinities
-				cyberhusky.hateGod = true;
-				cyberhusky.allowsButchering = true;
-				cyberhusky.warrior = true;
-				// Remove some affinities
-				cyberhusky.woodAffinity = false;
-				cyberhusky.befriendCreature = false;
-			}*/
+			logger.info("Setting up Achievement templates.");
+			AchievementChanges.onServerStarted();
+
+			DeityChanges.onServerStarted();
 			
 			//espCounter = Servers.localServer.PVPSERVER; // Enables on PvP server by default.
 			//espCounter = false;
 
-            SkillTemplate exorcism = SkillSystem.templates.get(SkillList.EXORCISM);
-            int[] deps = {SkillList.GROUP_ALCHEMY};
-            try {
-                String newName = "Crystal handling";
-                ReflectionUtil.setPrivateField(exorcism, ReflectionUtil.getField(exorcism.getClass(), "name"), newName);
-                SkillSystem.skillNames.put(exorcism.getNumber(), newName);
-                SkillSystem.namesToSkill.put(newName, exorcism.getNumber());
-                ReflectionUtil.setPrivateField(exorcism, ReflectionUtil.getField(exorcism.getClass(), "dependencies"), deps);
-            } catch (IllegalAccessException | NoSuchFieldException e) {
-                logger.info("Failed to rename exorcism!");
-                e.printStackTrace();
-            }
-            SkillTemplate ballistae = SkillSystem.templates.get(SkillList.BALLISTA);
-            int[] deps2 = {SkillList.GROUP_ALCHEMY};
-            try {
-                String newName = "Mystic components";
-                ReflectionUtil.setPrivateField(ballistae, ReflectionUtil.getField(ballistae.getClass(), "name"), newName);
-                SkillSystem.skillNames.put(ballistae.getNumber(), newName);
-                SkillSystem.namesToSkill.put(newName, ballistae.getNumber());
-                ReflectionUtil.setPrivateField(ballistae, ReflectionUtil.getField(ballistae.getClass(), "dependencies"), deps2);
-            } catch (IllegalAccessException | NoSuchFieldException e) {
-                logger.info("Failed to rename ballistae!");
-                e.printStackTrace();
-            }
-            SkillTemplate preaching = SkillSystem.templates.get(SkillList.PREACHING);
-            int[] deps3 = {SkillList.MASONRY};
-            try {
-                String newName = "Gem augmentation";
-                ReflectionUtil.setPrivateField(preaching, ReflectionUtil.getField(preaching.getClass(), "name"), newName);
-                SkillSystem.skillNames.put(preaching.getNumber(), newName);
-                SkillSystem.namesToSkill.put(newName, preaching.getNumber());
-                ReflectionUtil.setPrivateField(preaching, ReflectionUtil.getField(preaching.getClass(), "dependencies"), deps3);
-            } catch (IllegalAccessException | NoSuchFieldException e) {
-                logger.info("Failed to rename preaching!");
-                e.printStackTrace();
-            }
-            SkillTemplate stealing = SkillSystem.templates.get(SkillList.STEALING);
-            try {
-				ReflectionUtil.setPrivateField(stealing, ReflectionUtil.getField(stealing.getClass(), "tickTime"), 0);
-			} catch (IllegalAccessException | NoSuchFieldException e) {
-				logger.info("Failed to set tickTime for stealing!");
-				e.printStackTrace();
-			}
-            SkillTemplate meditating = SkillSystem.templates.get(SkillList.MEDITATING);
-            try {
-                ReflectionUtil.setPrivateField(meditating, ReflectionUtil.getField(meditating.getClass(), "tickTime"), TimeConstants.HOUR_MILLIS);
-            } catch (IllegalAccessException | NoSuchFieldException e) {
-                logger.info("Failed to set tickTime for meditating!");
-                e.printStackTrace();
-            }
-            meditating.setDifficulty(300f);
+            SkillChanges.onServerStarted();
 
 			CreationEntry lockpicks = CreationMatrix.getInstance().getCreationEntry(ItemList.lockpick);
 			try {
@@ -512,88 +388,10 @@ implements WurmServerMod, Configurable, PreInitable, Initable, ItemTemplatesCrea
 				e.printStackTrace();
 			}
 
-			// Set mining difficulty down to be equivalent to digging.
-			SkillTemplate mining = SkillSystem.templates.get(SkillList.MINING);
-			mining.setDifficulty(3000f);
-			// Triple lockpicking skill
-            SkillTemplate lockpicking = SkillSystem.templates.get(SkillList.LOCKPICKING);
-            lockpicking.setDifficulty(700f);
 		} catch (IllegalArgumentException | ClassCastException e) {
 			e.printStackTrace();
 		}
-		try {
-			Connection con = ModSupportDb.getModSupportDb();
-			String sql;
-			String tableName = "LeaderboardOpt";
-            if (!ModSupportDb.hasTable(con, tableName)) {
-                logger.info(tableName+" table not found in ModSupport. Creating table now.");
-                sql = "CREATE TABLE "+tableName+" (\t\tname\t\t\t\tVARCHAR(30)\t\t\tNOT NULL DEFAULT 'Unknown',\t\tOPTIN\t\t\t\t\tINT\t\tNOT NULL DEFAULT 0)";
-                PreparedStatement ps = con.prepareStatement(sql);
-                ps.execute();
-                ps.close();
-            }
-            tableName = "SteamIdMap";
-            if (!ModSupportDb.hasTable(con, tableName)) {
-                logger.info(tableName+" table not found in ModSupport. Creating table now.");
-                sql = "CREATE TABLE "+tableName+" (\t\tNAME\t\t\t\tVARCHAR(30)\t\t\tNOT NULL DEFAULT 'Unknown',\t\tSTEAMID\t\t\t\t\tLONG\t\tNOT NULL DEFAULT 0)";
-                PreparedStatement ps = con.prepareStatement(sql);
-                ps.execute();
-                ps.close();
-            }
-            tableName = "PlayerStats";
-            if (!ModSupportDb.hasTable(con, tableName)) {
-                logger.info(tableName+" table not found in ModSupport. Creating table now.");
-                sql = "CREATE TABLE "+tableName+" (NAME VARCHAR(30) NOT NULL DEFAULT 'Unknown', KILLS INT NOT NULL DEFAULT 0, DEATHS INT NOT NULL DEFAULT 0, DEPOTS INT NOT NULL DEFAULT 0, HOTAS INT NOT NULL DEFAULT 0, TITANS INT NOT NULL DEFAULT 0, UNIQUES INT NOT NULL DEFAULT 0)";
-                PreparedStatement ps = con.prepareStatement(sql);
-                ps.execute();
-                ps.close();
-            }else{
-                logger.info("Found "+tableName+". Checking if it has a unique column.");
-                ResultSet rs = con.getMetaData().getColumns(null, null, tableName, "UNIQUES");
-                if(rs.next()){
-                    logger.info(tableName+" already has a uniques column.");
-                }else{
-                    logger.info("Detected no uniques column in "+tableName);
-                    sql = "ALTER TABLE "+tableName+" ADD COLUMN UNIQUES INT NOT NULL DEFAULT 0";
-                    PreparedStatement ps = con.prepareStatement(sql);
-                    ps.execute();
-                    ps.close();
-                }
-            }
-            tableName = "ObjectiveTimers";
-            if (!ModSupportDb.hasTable(con, tableName)) {
-                logger.info(tableName+" table not found in ModSupport. Creating table now.");
-				sql = "CREATE TABLE "+tableName+" (ID VARCHAR(30) NOT NULL DEFAULT 'Unknown', TIMER LONG NOT NULL DEFAULT 0)";
-				PreparedStatement ps = con.prepareStatement(sql);
-				ps.execute();
-				ps.close();
-				try {
-					Connection dbcon;
-					dbcon = ModSupportDb.getModSupportDb();
-					ps = dbcon.prepareStatement("INSERT INTO ObjectiveTimers (ID, TIMER) VALUES(\"DEPOT\", 0)");
-					ps.executeUpdate();
-					ps.close();
-				}
-				catch (SQLException e) {
-					throw new RuntimeException(e);
-				}
-				try {
-					Connection dbcon;
-					dbcon = ModSupportDb.getModSupportDb();
-					ps = dbcon.prepareStatement("INSERT INTO ObjectiveTimers (ID, TIMER) VALUES(\"TITAN\", 0)");
-					ps.executeUpdate();
-					ps.close();
-				}
-				catch (SQLException e) {
-					throw new RuntimeException(e);
-				}
-			}
-			SupplyDepots.initializeDepotTimer();
-            Titans.initializeTitanTimer();
-		}
-		catch (SQLException e) {
-			throw new RuntimeException(e);
-		}
+		DatabaseHelper.onServerStarted();
 	}
 	
 	public static long lastSecondPolled = 0;
@@ -615,6 +413,8 @@ implements WurmServerMod, Configurable, PreInitable, Initable, ItemTemplatesCrea
     public static final long pollUniqueRegenerationTime = TimeConstants.SECOND_MILLIS;
     public static long lastPolledUniqueCollection = 0;
     public static final long pollUniqueCollectionTime = TimeConstants.MINUTE_MILLIS*5;
+    public static long lastPolledTerrainSmooth = 0;
+    public static final long pollTerrainSmoothTime = TimeConstants.SECOND_MILLIS*5;
 	@Override
 	public void onServerPoll() {
 		if((lastSecondPolled + TimeConstants.SECOND_MILLIS) < System.currentTimeMillis()){
@@ -654,7 +454,11 @@ implements WurmServerMod, Configurable, PreInitable, Initable, ItemTemplatesCrea
                 CombatChanges.pollUniqueCollection();
                 lastPolledUniqueCollection += pollUniqueCollectionTime;
             }
-			
+            if(lastPolledTerrainSmooth + pollTerrainSmoothTime < System.currentTimeMillis()){
+                SmoothTerrainAction.onServerPoll();
+                lastPolledTerrainSmooth += pollTerrainSmoothTime;
+            }
+
 			// Update counter
 			if(lastSecondPolled + TimeConstants.SECOND_MILLIS*10 > System.currentTimeMillis()){
 				lastSecondPolled += TimeConstants.SECOND_MILLIS;
@@ -670,8 +474,19 @@ implements WurmServerMod, Configurable, PreInitable, Initable, ItemTemplatesCrea
 				lastPolledBloodlust = System.currentTimeMillis();
 				lastPolledUniqueRegeneration = System.currentTimeMillis();
 				lastPolledUniqueCollection = System.currentTimeMillis();
+				lastPolledTerrainSmooth = System.currentTimeMillis();
 			}
 		}
 	}
 
+	@Override
+	public MessagePolicy onKingdomMessage(Message message) {
+		String window = message.getWindow();
+		if(window.startsWith("GL-Freedom") && KeyEvent.isActive()){
+			KeyEvent.handlePlayerMessage(message);
+		}
+
+		return MessagePolicy.PASS;
+	}
+
 }

src/main/java/mod/sin/wyvern/bestiary/MethodsBestiary.java

@@ -5,6 +5,8 @@ import java.util.Random;
 import java.util.logging.Logger;
 
 import com.wurmonline.mesh.Tiles;
+import com.wurmonline.server.Servers;
+import com.wurmonline.server.behaviours.AutoEquipMethods;
 import com.wurmonline.server.combat.Weapon;
 import com.wurmonline.server.creatures.*;
 import com.wurmonline.server.items.*;
@@ -627,6 +629,11 @@ public class MethodsBestiary {
 		// Goblin leader natural armour increase:
 		setNaturalArmour(CreatureTemplate.GOBLIN_LEADER_CID, 0.055f);
 
+		// Worg armour reduction on Arena
+        if(Servers.localServer.PVPSERVER) {
+            setNaturalArmour(CreatureTemplate.WORG_CID, 0.3f);
+        }
+
 		// Make titan minions drop no corpse
 		setNoCorpse(IfritFiend.templateId);
 		setNoCorpse(IfritSpider.templateId);

src/main/java/mod/sin/wyvern/bounty/LootBounty.java

@@ -6,11 +6,7 @@ import java.util.Random;
 import java.util.logging.Logger;
 
 import com.wurmonline.mesh.Tiles;
-import com.wurmonline.server.FailedException;
-import com.wurmonline.server.HistoryManager;
-import com.wurmonline.server.Players;
-import com.wurmonline.server.Server;
-import com.wurmonline.server.Servers;
+import com.wurmonline.server.*;
 import com.wurmonline.server.creatures.Creature;
 import com.wurmonline.server.creatures.CreatureTemplate;
 import com.wurmonline.server.creatures.CreatureTemplateFactory;
@@ -18,6 +14,7 @@ import com.wurmonline.server.creatures.Creatures;
 import com.wurmonline.server.items.*;
 import com.wurmonline.server.villages.Village;
 import com.wurmonline.server.villages.Villages;
+import mod.piddagoras.duskombat.DamageEngine;
 import mod.sin.creatures.Reaper;
 import mod.sin.creatures.SpectralDrake;
 import mod.sin.items.AffinityOrb;
@@ -39,14 +36,14 @@ public class LootBounty {
 	protected static final Random random = new Random();
 	
 	public static void displayLootAssistance(Creature mob){
-		if(Bounty.dealtDamage.containsKey(mob.getWurmId())){
+		if(DamageEngine.dealtDamage.containsKey(mob.getWurmId())){
 			logger.info("Found the damageDealt entry, parsing...");
     		ArrayList<String> names = new ArrayList<String>();
     		ArrayList<Double> damages = new ArrayList<Double>();
-    		for(long creatureId : Bounty.dealtDamage.get(mob.getWurmId()).keySet()){
+    		for(long creatureId : DamageEngine.dealtDamage.get(mob.getWurmId()).keySet()){
     			if(Players.getInstance().getPlayerOrNull(creatureId) != null){
     				names.add(Players.getInstance().getPlayerOrNull(creatureId).getName());
-    				damages.add(Bounty.dealtDamage.get(mob.getWurmId()).get(creatureId));
+    				damages.add(DamageEngine.dealtDamage.get(mob.getWurmId()).get(creatureId));
     			}else{
     				if(Creatures.getInstance().getCreatureOrNull(creatureId) != null){
     					logger.info("Skipping creature "+Creatures.getInstance().getCreatureOrNull(creatureId).getName()+" in loot assistance.");
@@ -158,14 +155,14 @@ public class LootBounty {
             e.printStackTrace();
         }
     }
-
+	
 	public static void blessWorldWithMoonVeins(Creature mob){
-		int i = 20;
+		int i = 8+Server.rand.nextInt(5);
 		while(i > 0){
 			int x = random.nextInt(Server.surfaceMesh.getSize());
 			int y = random.nextInt(Server.surfaceMesh.getSize());
 			short height = Tiles.decodeHeight(Server.surfaceMesh.getTile(x, y));
-			int type = Tiles.decodeType((int)Server.caveMesh.getTile(x, y));
+			int type = Tiles.decodeType(Server.caveMesh.getTile(x, y));
 			if(height >= 100 && (type == Tiles.Tile.TILE_CAVE_WALL.id || type == Tiles.Tile.TILE_CAVE.id)){
 				Tiles.Tile tileType = random.nextBoolean() ? Tiles.Tile.TILE_CAVE_WALL_ORE_ADAMANTINE : Tiles.Tile.TILE_CAVE_WALL_ORE_GLIMMERSTEEL;
 				Server.caveMesh.setTile(x, y, Tiles.encode(Tiles.decodeHeight(Server.caveMesh.getTile(x, y)), tileType.id, Tiles.decodeData(Server.caveMesh.getTile(x, y))));
@@ -173,8 +170,8 @@ public class LootBounty {
 				Server.setCaveResource(x, y, 400+random.nextInt(600));
 				Village v = Villages.getVillage(x, y, true);
 		        if (v == null) {
-		            for (int vx = -50; vx < 50; vx += 5) {
-		                for (int vy = -50; vy < 50 && (v = Villages.getVillage(x + vx, y + vy, true)) == null; vy += 5) {
+		            for (int vx = -20; vx < 20; vx += 5) {
+		                for (int vy = -20; vy < 20 && (v = Villages.getVillage(x + vx, y + vy, true)) == null; vy += 5) {
 		                }
 		                if(v != null){
 		                    break;
@@ -183,6 +180,7 @@ public class LootBounty {
 		        }
 		        if(v != null){
 		        	HistoryManager.addHistory(mob.getTemplate().getName(), "blesses the world with a "+tileType.getName()+" near "+v.getName()+"!");
+		        	MiscChanges.sendServerTabMessage("rumors",mob.getTemplate().getName()+" blesses the world with a "+tileType.getName()+" near "+v.getName()+"!", 255, 255, 255);
 		        }
 				logger.info("Placed a "+tileType.getName()+" at "+x+", "+y+" - "+height+" height");
 				i--;
@@ -338,6 +336,23 @@ public class LootBounty {
 	    boolean sendLootHelp = false;
 	    // Begin loot table drops
         int templateId = mob.getTemplate().getTemplateId();
+        if(Servers.localServer.PVPSERVER && mob.isPlayer()){
+            if(mob.isDeathProtected()) {
+                logger.info("Death protection was active for " + mob.getName() + ". Inserting silver coin reward.");
+                try {
+                    Item silver = ItemFactory.createItem(ItemList.coinSilver, 99f, null);
+                    corpse.insertItem(silver, true);
+                } catch (FailedException | NoSuchTemplateException e) {
+                    e.printStackTrace();
+                }
+            }
+            Item[] items = mob.getAllItems();
+            for(Item item : items){
+                if(item.isRepairable()){
+                    item.setDamage(Math.min(99f, item.getDamage() + Math.max(10f+(Server.rand.nextFloat()*5f), 10f * item.getDamageModifier(false))));
+                }
+            }
+        }
     	if(templateId == Reaper.templateId || templateId == SpectralDrake.templateId){
     		Server.getInstance().broadCastAlert("The "+mob.getName()+" has been slain. A new creature shall enter the realm shortly.");
     		sendLootHelp = true;
@@ -383,7 +398,7 @@ public class LootBounty {
     		spawnFriyanTablets();
     		// Add unique loot
 			insertUniqueLoot(mob, corpse);
-
+			
 			// Spawn Spectral Drake
     		/*if (mob.isDragon()) { // Spawn the spectral drake and add extra hide/scale
     			handleDragonLoot(mob, corpse);

src/main/java/mod/sin/wyvern/bounty/PlayerBounty.java

@@ -18,6 +18,9 @@ import com.wurmonline.server.items.ItemTemplate;
 import com.wurmonline.server.items.NoSuchTemplateException;
 import com.wurmonline.server.players.Player;
 import com.wurmonline.server.players.Titles.Title;
+import com.wurmonline.server.skills.NoSuchSkillException;
+import com.wurmonline.server.skills.SkillList;
+import mod.piddagoras.duskombat.DamageEngine;
 import mod.sin.armour.SpectralHide;
 import mod.sin.creatures.Reaper;
 import mod.sin.creatures.SpectralDrake;
@@ -141,7 +144,7 @@ public class PlayerBounty {
 					return;
 				}
 			}
-    		if(Bounty.dealtDamage.containsKey(mobWurmId) && Bounty.dealtDamage.get(mobWurmId).containsKey(player.getWurmId())){
+    		if(DamageEngine.dealtDamage.containsKey(mobWurmId) && DamageEngine.dealtDamage.get(mobWurmId).containsKey(player.getWurmId())){
     			// -- Damage Dealt Rewards -- //
 				/*if(mob.isUnique()){
 					// Treasure boxes awarded to players who deal damage:
@@ -234,7 +237,7 @@ public class PlayerBounty {
 		try {
 			//Map<Long, Long> attackers = ReflectionUtil.getPrivateField(creature, ReflectionUtil.getField(creature.getClass(), "attackers"));
 			Map<Long, Long> attackers = Bounty.getAttackers(creature);
-			if(!Bounty.isCombatant(attackers, player.getWurmId()) || creature.isPlayer() || creature.isReborn()){
+			if((attackers != null && !Bounty.isCombatant(attackers, player.getWurmId())) || creature.isPlayer() || creature.isReborn()){
 				return;
 			}
 			logger.info(player.getName()+" killed "+creature.getName());

src/main/java/mod/sin/wyvern/mastercraft/Mastercraft.java

@@ -92,6 +92,7 @@ public class Mastercraft {
             ExtendTitleEnum.getSingletonInstance().addExtendEntry("Home_Decorator", 600, "Home Decorator", "Home Decorator", -1, "NORMAL");
             ExtendTitleEnum.getSingletonInstance().addExtendEntry("Arena_Champion", 601, "Champion of the Arena", "Champion of the Arena", -1, "NORMAL");
             ExtendTitleEnum.getSingletonInstance().addExtendEntry("Pastamancer", 602, "Pastamancer", "Pastamancer", -1, "NORMAL");
+            ExtendTitleEnum.getSingletonInstance().addExtendEntry("Pizzamancer", 603, "Pizzamancer", "Pizzamancer", -1, "NORMAL");
             
             // Special Event Titles
             ExtendTitleEnum.getSingletonInstance().addExtendEntry("Titan_Slayer", 700, "Titanslayer", "Titanslayer", -1, "NORMAL");
@@ -111,6 +112,7 @@ public class Mastercraft {
             ExtendTitleEnum.getSingletonInstance().addExtendEntry("Genocide_GrandDesigner", 808, "Grand Designer", "Grand Designer", -1, "NORMAL");
             ExtendTitleEnum.getSingletonInstance().addExtendEntry("Seleas_CrazyCatLord", 809, "The Crazy Cat Lord", "The Crazy Cat Lord", -1, "NORMAL");
             ExtendTitleEnum.getSingletonInstance().addExtendEntry("Piratemax_Slave", 810, "Slave", "Slave", -1, "NORMAL");
+            ExtendTitleEnum.getSingletonInstance().addExtendEntry("Eltacolad_TrueTaco", 811, "The One True Taco", "The One True Taco", -1, "NORMAL");
 
             // Characteristic Titles
             ExtendTitleEnum.getSingletonInstance().addExtendEntry("MindLogic_Normal", 1000, "Logical", "Logical", 100, "NORMAL");

src/main/java/mod/sin/wyvern/util/ItemUtil.java

@@ -33,6 +33,14 @@ public class ItemUtil {
 			ItemList.tomeMagicBlue,
 			ItemList.tomeMagicWhite
 	};
+	public static boolean isSorcery(Item item){
+		for(int id : sorceryIds){
+			if(item.getTemplateId() == id){
+				return true;
+			}
+		}
+		return false;
+	}
 	public static int[] plateChainTemplates = {
 			ItemList.plateBoot,
 			ItemList.plateGauntlet,
@@ -271,4 +279,24 @@ public class ItemUtil {
 		}
 		return null;
 	}
+	public static boolean isSingleUseRune(byte rune){
+        if(rune == -80){
+            return true;
+        }else if(rune == -81){
+            return true;
+        }else if(rune == -91){
+            return true;
+        }else if(rune == -97){
+            return true;
+        }else if(rune == -104){
+            return true;
+        }else if(rune == -107){
+            return true;
+        }else if(rune == -119){
+            return true;
+        }else if(rune == -126){
+            return true;
+        }
+        return false;
+    }
 }