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

Upgrade to latest version of WyvernMods.

Browse Source
This commit is contained in:
Sindusk
2018-07-22 21:33:08 -04:00
parent f59852c91b
commit ba8dde10b5
31 changed files with 1358 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/mod/sin/wyvern/AntiCheat.java
View File

@@ -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) {

19
src/main/java/mod/sin/wyvern/Arena.java
View File

@@ -230,6 +230,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")) {
@@ -784,16 +785,16 @@ public class Arena {
Util.instrumentDeclaredCount(thisClass, ctCreature, "die", "isOnCurrentServer", 1, replace);
Util.setReason("Disable player skill loss on Arena.");
replace = "if(com.wurmonline.server.Servers.localServer.PVPSERVER && this.isPlayer() && this.isDeathProtected()){" +
" this.getCommunicator().sendSafeServerMessage(\"You have died on the Arena server with a Resurrection Stone and your knowledge is kept safe.\");" +
replace = "if(this.isPlayer() && this.isDeathProtected()){" +
" this.getCommunicator().sendSafeServerMessage(\"You have died with a Resurrection Stone and your knowledge is kept safe.\");" +
" return;" +
"}else if(com.wurmonline.server.Servers.localServer.PVPSERVER){" +
" this.getCommunicator().sendAlertServerMessage(\"You have died on the Arena server without a Resurrection Stone, resulting in some of your knowledge being lost.\");" +
"}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(com.wurmonline.server.Servers.localServer.PVPSERVER && this.isPlayer() && this.isDeathProtected()){" +
replace = "if(this.isPlayer() && this.isDeathProtected()){" +
" $_ = null;" +
"}else{" +
" $_ = $proceed($$);" +
@@ -809,6 +810,14 @@ public class Arena {
"}";
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);

26
src/main/java/mod/sin/wyvern/Bounty.java
View File

@@ -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);}");
}

3
src/main/java/mod/sin/wyvern/DatabaseHelper.java
View File

@@ -34,7 +34,8 @@ public class DatabaseHelper {
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 = dbcon.prepareStatement("INSERT INTO LeaderboardOpt (name) VALUES(?)");
ps.setString(1, p.getName());
ps.executeUpdate();
ps.close();
}

26
src/main/java/mod/sin/wyvern/DeityChanges.java
View File

@@ -1,23 +1,29 @@
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 Breyk player god
Deity breyk = Deities.getDeity(101);
if(Deities.getDeity(101) != null){ // Edit Thelastdab Player God
Deity thelastdab = Deities.getDeity(101);
// Add some defining affinities
breyk.repairer = true;
breyk.learner = true;
breyk.deathProtector = true;
breyk.befriendCreature = true;
thelastdab.metalAffinity = true;
thelastdab.deathProtector = true;
thelastdab.mountainGod = true;
thelastdab.warrior = true;
// Remove some affinities
breyk.warrior = false;
breyk.healer = false;
breyk.clayAffinity = false;
}*/
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

50
src/main/java/mod/sin/wyvern/GemAugmentation.java Normal file
View File

@@ -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);
}
}
}

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

@@ -50,6 +50,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();
@@ -115,6 +116,7 @@ public class ItemMod {
CORPSE_DECORATION.createTemplate();
DEPTH_DRILL.createTemplate();
DISINTEGRATION_ROD.createTemplate();
//ELECTRUM_LUMP.createTemplate();
ENCHANT_ORB.createTemplate();
ETERNAL_ORB.createTemplate();
EVISCERATOR.createTemplate();
@@ -183,6 +185,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());
@@ -197,12 +200,13 @@ public class ItemMod {
//COIN_DECORATION.initCreationEntry();
//CORPSE_DECORATION.initCreationEntry();
DEPTH_DRILL.initCreationEntry();
//ELECTRUM_LUMP.initCreationEntry();
EVISCERATOR.initCreationEntry();
KNUCKLES.initCreationEntry();
MASS_STORAGE_UNIT.initCreationEntry();
//SKELETON_DECORATION.initCreationEntry();
SOUL_FORGE.initCreationEntry();
//STATUETTE_BREYK.initCreationEntry();
STATUETTE_BREYK.initCreationEntry();
//STATUETTE_CYBERHUSKY.initCreationEntry();
WARHAMMER.initCreationEntry();
WARHAMMER_HEAD.initCreationEntry();
@@ -331,19 +335,31 @@ public class ItemMod {
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);
ItemTemplate goldMirror = ItemTemplateFactory.getInstance().getTemplate(ItemList.goldenMirror);
ReflectionUtil.setPrivateField(goldMirror, ReflectionUtil.getField(goldMirror.getClass(), "value"), 1000000);
// 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);
@@ -414,9 +430,15 @@ public class ItemMod {
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);

396
src/main/java/mod/sin/wyvern/KeyEvent.java Normal file
View File

@@ -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();
}
}

171
src/main/java/mod/sin/wyvern/MiscChanges.java
View File

@@ -3,6 +3,8 @@ package mod.sin.wyvern;
import com.wurmonline.server.*;
import com.wurmonline.server.bodys.Wound;
import com.wurmonline.server.creatures.Creature;
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;
@@ -16,6 +18,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;
@@ -31,6 +34,7 @@ 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.logging.Logger;
@@ -52,16 +56,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 {
@@ -72,6 +79,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);
@@ -278,8 +308,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) {
@@ -341,12 +373,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");
@@ -401,8 +432,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");
@@ -692,7 +731,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));");*/
@@ -741,51 +779,12 @@ public class MiscChanges {
replace = "$_ = 1;";
Util.instrumentDeclared(thisClass, ctAbilities, "isInProperLocation", "getTemplateId", replace);
/*Util.setReason("Debug Login Handler when creating a new player via an exception.");
CtClass ctLoginHandler = classPool.get("com.wurmonline.server.LoginHandler");
replace = "$_ = $proceed($$);" +
"logger.info(ex.getMessage());";
Util.instrumentDeclared(thisClass, ctLoginHandler, "handleLogin", "doNewPlayer", replace);
replace = "$_ = $proceed($$);" +
"logger.info(\"addPlayer(\"+$1+\")\");";
Util.instrumentDeclared(thisClass, ctLoginHandler, "handleLogin", "addPlayer", replace);
replace = "$_ = $proceed($$);" +
"logger.info(\"initialisePlayer(\"+$1+\")\");";
Util.instrumentDeclared(thisClass, ctLoginHandler, "handleLogin", "initialisePlayer", replace);
replace = "$_ = $proceed($$);" +
"logger.info(\"createBodyParts\");";
Util.instrumentDeclared(thisClass, ctLoginHandler, "handleLogin", "createBodyParts", replace);
replace = "logger.info(\"loadSkills\");" +
"$_ = $proceed($$);";
Util.instrumentDeclared(thisClass, ctLoginHandler, "handleLogin", "loadSkills", replace);
replace = "logger.info(\"loadAllItemsForCreature1(\"+$1+\")\");" +
"logger.info(\"loadAllItemsForCreature2(\"+$1.getStatus()+\")\");" +
"logger.info(\"loadAllItemsForCreature3(\"+$2+\")\");" +
"try{" +
" $_ = $proceed($$);" +
"}catch(com.wurmonline.server.NoSuchItemException ex){" +
" logger.info(ex.getMessage());" +
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.instrumentDeclared(thisClass, ctLoginHandler, "handleLogin", "loadAllItemsForCreature", replace);
// -- Items method debugging -- //
Util.setReason("Debug Items method loadAllitemsForCreature");
CtClass ctItems = classPool.get("com.wurmonline.server.Items");
replace = "logger.info(\"creature = \"+$1+\", inventoryId = \"+$2);";
Util.insertBeforeDeclared(thisClass, ctItems, "loadAllItemsForCreature", replace);
replace = "logger.info(\"loadPossessions(\"+$1+\")\");" +
"$_ = $proceed($$);";
Util.instrumentDeclared(thisClass, ctItems, "loadAllItemsForCreature", "loadPossessions", replace);
replace = "logger.info(\"sendMapInfo - Communicator: \"+$0);" +
"$_ = $proceed($$);";
Util.instrumentDeclared(thisClass, ctLoginHandler, "handleLogin", "sendMapInfo", replace);
replace = "logger.info(\"loadAllPrivatePOIForPlayer(\"+$1+\")\");" +
"$_ = $proceed($$);";
Util.instrumentDeclared(thisClass, ctLoginHandler, "handleLogin", "loadAllPrivatePOIForPlayer", replace);
replace = "$_ = $proceed($$);" +
"logger.info(\"resetLastSentToolbelt\");";
Util.instrumentDeclared(thisClass, ctLoginHandler, "handleLogin", "resetLastSentToolbelt", replace);*/
Util.insertBeforeDeclared(thisClass, ctAbilities, "isInProperLocation", replace);
Util.setReason("Make drinks less filling.");
CtClass[] params13 = {
@@ -795,11 +794,67 @@ public class MiscChanges {
CtClass.floatType
};
String desc13 = Descriptor.ofMethod(CtClass.booleanType, params13);
replace = "$_ = $proceed($1, $2, $3*5);";
replace = "if(template != 128){" +
" $_ = $proceed($1, $2, $3*5);" +
"}else{" +
" $_ = $proceed($$);" +
"}";
Util.instrumentDescribed(thisClass, ctMethodsItems, "drink", desc13, "sendActionControl", replace);
replace = "$_ = $proceed($1/5, $2, $3, $4, $5);";
replace = "if(template != 128){" +
" $_ = $proceed($1/5, $2, $3, $4, $5);" +
"}else{" +
" $_ = $proceed($$);" +
"}";
Util.instrumentDescribed(thisClass, ctMethodsItems, "drink", desc13, "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[] params14 = {
ctAction,
ctCreature,
ctItem,
ctItem,
CtClass.shortType,
CtClass.floatType
};
String desc14 = Descriptor.ofMethod(CtClass.booleanType, params14);
replace = "if($5 == 519){" +
" $2.getCommunicator().sendNormalServerMessage(\"Smelting is disabled.\");" +
" return true;" +
"}";
Util.insertBeforeDescribed(thisClass, ctItemBehaviour, "action", desc14, replace);
} catch (CannotCompileException | NotFoundException | IllegalArgumentException | ClassCastException e) {
throw new HookException(e);
}

3
src/main/java/mod/sin/wyvern/PlayerTitles.java
View File

@@ -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);
}

11
src/main/java/mod/sin/wyvern/SkillChanges.java
View File

@@ -37,16 +37,19 @@ public class SkillChanges {
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 p = 5;
double q = 3;
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), p))*Math.pow((100-power)*0.01, q));
//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*0.95d;
advanceMultiplicator *= mult;
}else{
advanceMultiplicator = 0;
}

7
src/main/java/mod/sin/wyvern/Titans.java
View File

@@ -153,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);
@@ -163,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)){
@@ -681,7 +682,7 @@ public class Titans {
for (Creature cret : titans) {
if (cret.getBody().isWounded()) {
Wounds tWounds = cret.getBody().getWounds();
int toHeal = 2;
int toHeal = 5;
Wound w = tWounds.getWounds()[Server.rand.nextInt(tWounds.getWounds().length)];
if (w.getSeverity() > toHeal) {
w.modifySeverity(-toHeal);

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

@@ -5,38 +5,29 @@ import java.io.IOException;
import java.io.UnsupportedEncodingException;
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.Items;
import com.wurmonline.server.Message;
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 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 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;
@@ -51,7 +42,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;
@@ -155,6 +146,8 @@ implements WurmServerMod, Configurable, PreInitable, Initable, ItemTemplatesCrea
Mastercraft.preInit();
Mastercraft.addNewTitles();
SupplyDepots.preInit();
KeyEvent.preInit();
//GemAugmentation.preInit();
Class<WyvernMods> thisClass = WyvernMods.class;
ClassPool classPool = HookManager.getInstance().getClassPool();
@@ -288,6 +281,7 @@ implements WurmServerMod, Configurable, PreInitable, Initable, ItemTemplatesCrea
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.
@@ -410,4 +404,14 @@ implements WurmServerMod, Configurable, PreInitable, Initable, ItemTemplatesCrea
}
}
@Override
public MessagePolicy onKingdomMessage(Message message) {
String window = message.getWindow();
if(window.startsWith("GL-Freedom") && KeyEvent.isActive()){
KeyEvent.handlePlayerMessage(message);
}
return MessagePolicy.PASS;
}
}

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

@@ -9,6 +9,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;
@@ -29,14 +30,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.");
@@ -145,7 +146,7 @@ public class LootBounty {
}
public static void blessWorldWithMoonVeins(Creature mob){
int i = 10+Server.rand.nextInt(6);
int i = 8+Server.rand.nextInt(5);
while(i > 0){
int x = random.nextInt(Server.surfaceMesh.getSize());
int y = random.nextInt(Server.surfaceMesh.getSize());
@@ -158,8 +159,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;
@@ -168,6 +169,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--;

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

@@ -20,6 +20,7 @@ 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;
@@ -128,7 +129,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:

1
src/main/java/mod/sin/wyvern/mastercraft/Mastercraft.java
View File

@@ -112,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");