1...

scripts/mixin/CapacitorMaxCap.txt

@@ -0,0 +1,21 @@
+#modloaded astralsorcery
+#loader mixin
+
+
+/*
+See StatsConfig.zs in this folder for values.
+*/
+
+#mixin {value: "crazypants.enderio.base.capacitor.CapacitorHelper"}
+zenClass MixinCapacitorHelper {
+    #mixin Static
+    #mixin ModifyConstant
+    #{
+    #    method: "getNBTCapacitorDataFromItemStack",
+    #    constant: {intValue: 10}
+    #}
+    function change_capacitor_cap(original as int) as int {
+        return 45;
+    }
+    
+}

scripts/mixin/ShaderBagGone.zs

@@ -0,0 +1,13 @@
+#loader mixin
+
+import native.blusunrize.immersiveengineering.common.EventHandler;
+
+import native.net.minecraftforge.event.entity.living.LivingDropsEvent;
+
+#mixin {value: "blusunrize.immersiveengineering.common.EventHandler"}
+zenClass MixinEventHandler {
+    #mixin Overwrite
+    function onLivingDrops(event as LivingDropsEvent) as void {
+        return;
+    }
+}

scripts/mixin/aoa3/SlabPetBuff.zs

@@ -0,0 +1,522 @@
+#modloaded aoa3
+#loader mixin
+
+import scripts.mixin.aoa3.StatsConfig as CFG;
+
+/*
+See StatsConfig.zs in this folder for values.
+*/
+
+#mixin Mixin
+#{targets: "net.tslat.aoa3.entity.minions.EntityMechaSkellox"}
+zenClass MixinEntityMechaSkelloxHP {
+
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMaxHealth",
+  #  constant: {doubleValue: 160.0d}
+  #}
+  function mbc_modify_hp_MechaSkellox(original as double) as double {
+    return CFG.hp_MechaSkellox;
+  }
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMeleeDamage",
+  #  constant: {doubleValue: 15.0d}
+  #}
+  function mbc_modify_dmg_MechaSkellox(original as double) as double {
+    return CFG.dmg_MechaSkellox;
+  }
+
+}
+
+
+
+
+#mixin Mixin
+#{targets: "net.tslat.aoa3.entity.minions.EntityCompeer"}
+zenClass MixinEntityCompeer {
+
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMaxHealth",
+  #  constant: {doubleValue: 20}
+  #}
+  function mbc_modify_hp_Compeer(original as double) as double {
+    return CFG.hp_Compeer;
+  }
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMeleeDamage",
+  #  constant: {doubleValue: 5.0d}
+  #}
+  function mbc_modify_dmg_Compeer(original as double) as double {
+    return CFG.dmg_Compeer;
+  }
+
+}
+
+
+#mixin Mixin
+#{targets: "net.tslat.aoa3.entity.minions.EntityWaggy"}
+zenClass MixinEntityWaggy {
+
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMaxHealth",
+  #  constant: {doubleValue: 110.0d}
+  #}
+  function mbc_modify_hp_Waggy(original as double) as double {
+    return CFG.hp_Waggy;
+  }
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMeleeDamage",
+  #  constant: {doubleValue: 10.0d}
+  #}
+  function mbc_modify_dmg_Waggy(original as double) as double {
+    return CFG.dmg_Waggy;
+  }
+
+}
+
+
+#mixin Mixin
+#{targets: "net.tslat.aoa3.entity.minions.EntitySpikeback"}
+zenClass MixinEntitySpikeback {
+
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMaxHealth",
+  #  constant: {doubleValue: 60.0d}
+  #}
+  function mbc_modify_hp_Spikeback(original as double) as double {
+    return CFG.hp_Spikeback;
+  }
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMeleeDamage",
+  #  constant: {doubleValue: 23.0d}
+  #}
+  function mbc_modify_dmg_Spikeback(original as double) as double {
+    return CFG.dmg_Spikeback;
+  }
+
+}
+
+#mixin Mixin
+#{targets: "net.tslat.aoa3.entity.minions.EntityRammerhorn"}
+zenClass MixinEntityRammerhorn {
+
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMaxHealth",
+  #  constant: {doubleValue: 210.0d}
+  #}
+  function mbc_modify_hp_Rammerhorn(original as double) as double {
+    return CFG.hp_Rammerhorn;
+  }
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMeleeDamage",
+  #  constant: {doubleValue: 11.0d}
+  #}
+  function mbc_modify_dmg_Rammerhorn(original as double) as double {
+    return CFG.dmg_Rammerhorn;
+  }
+
+}
+
+
+
+#mixin Mixin
+#{targets: "net.tslat.aoa3.entity.minions.EntitySpraggy"}
+zenClass MixinEntitySpraggy {
+
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMaxHealth",
+  #  constant: {doubleValue: 130.0d}
+  #}
+  function mbc_modify_hp_Spraggy(original as double) as double {
+    return CFG.hp_Spraggy;
+  }
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMeleeDamage",
+  #  constant: {doubleValue: 10.0d}
+  #}
+  function mbc_modify_dmg_Spraggy(original as double) as double {
+    return CFG.dmg_Spraggy;
+  }
+
+}
+
+
+
+#mixin Mixin
+#{targets: "net.tslat.aoa3.entity.minions.EntityPlateosaur"}
+zenClass MixinEntityPlateosaur {
+
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMaxHealth",
+  #  constant: {doubleValue: 320.0d}
+  #}
+  function mbc_modify_hp_Plateosaur(original as double) as double {
+    return CFG.hp_Plateosaur;
+  }
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMeleeDamage",
+  #  constant: {doubleValue: 5.0d}
+  #}
+  function mbc_modify_dmg_Plateosaur(original as double) as double {
+    return CFG.dmg_Plateosaur;
+  }
+
+}
+
+
+#mixin Mixin
+#{targets: "net.tslat.aoa3.entity.minions.EntityHellquin"}
+zenClass MixinEntityHellquin {
+
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMaxHealth",
+  #  constant: {doubleValue: 120}
+  #}
+  function mbc_modify_hp_Hellquin(original as double) as double {
+    return CFG.hp_Hellquin;
+  }
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMeleeDamage",
+  #  constant: {doubleValue: 10.0d}
+  #}
+  function mbc_modify_dmg_Hellquin(original as double) as double {
+    return CFG.dmg_Hellquin;
+  }
+
+}
+
+
+#mixin Mixin
+#{targets: "net.tslat.aoa3.entity.minions.EntityCraggy"}
+zenClass MixinEntityCraggy {
+
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMaxHealth",
+  #  constant: {doubleValue: 180}
+  #}
+  function mbc_modify_hp_Craggy(original as double) as double {
+    return CFG.hp_Craggy;
+  }
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMeleeDamage",
+  #  constant: {doubleValue: 10.0d}
+  #}
+  function mbc_modify_dmg_Craggy(original as double) as double {
+    return CFG.dmg_Craggy;
+  }
+
+}
+
+
+#mixin Mixin
+#{targets: "net.tslat.aoa3.entity.minions.EntityShaddy"}
+zenClass MixinEntityShaddy {
+
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMaxHealth",
+  #  constant: {doubleValue: 200.0d}
+  #}
+  function mbc_modify_hp_Shaddy(original as double) as double {
+    return CFG.hp_Shaddy;
+  }
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMeleeDamage",
+  #  constant: {doubleValue: 10.0d}
+  #}
+  function mbc_modify_dmg_Shaddy(original as double) as double {
+    return CFG.dmg_Shaddy;
+  }
+
+}
+
+#mixin Mixin
+#{targets: "net.tslat.aoa3.entity.minions.EntityCorby"}
+zenClass MixinEntityCorby {
+
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMaxHealth",
+  #  constant: {doubleValue: 200}
+  #}
+  function mbc_modify_hp_Corby(original as double) as double {
+    return CFG.hp_Corby;
+  }
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMeleeDamage",
+  #  constant: {doubleValue: 11.0d}
+  #}
+  function mbc_modify_dmg_Corby(original as double) as double {
+    return CFG.dmg_Corby;
+  }
+
+}
+
+
+#mixin Mixin
+#{targets: "net.tslat.aoa3.entity.minions.EntityHorntail"}
+zenClass MixinEntityHorntail {
+
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMaxHealth",
+  #  constant: {doubleValue: 270.0d}
+  #}
+  function mbc_modify_hp_Horntail(original as double) as double {
+    return CFG.hp_Horntail;
+  }
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMeleeDamage",
+  #  constant: {doubleValue: 18.0d}
+  #}
+  function mbc_modify_dmg_Horntail(original as double) as double {
+    return CFG.dmg_Horntail;
+  }
+
+}
+
+
+#mixin Mixin
+#{targets: "net.tslat.aoa3.entity.minions.EntityGnawer"}
+zenClass MixinEntityGnawer {
+
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMaxHealth",
+  #  constant: {doubleValue: 430.0d}
+  #}
+  function mbc_modify_hp_Gnawer(original as double) as double {
+    return CFG.hp_Gnawer;
+  }
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMeleeDamage",
+  #  constant: {doubleValue: 9.0d}
+  #}
+  function mbc_modify_dmg_Gnawer(original as double) as double {
+    return CFG.dmg_Gnawer;
+  }
+
+}
+
+
+#mixin Mixin
+#{targets: "net.tslat.aoa3.entity.minions.EntityBlissard"}
+zenClass MixinEntityBlissard {
+
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMaxHealth",
+  #  constant: {doubleValue: 100}
+  #}
+  function mbc_modify_hp_Blissard(original as double) as double {
+    return CFG.hp_Blissard;
+  }
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMeleeDamage",
+  #  constant: {doubleValue: 11.0d}
+  #}
+  function mbc_modify_dmg_Blissard(original as double) as double {
+    return CFG.dmg_Blissard;
+  }
+
+}
+
+
+
+#mixin Mixin
+#{targets: "net.tslat.aoa3.entity.minions.EntityGoofer"}
+zenClass MixinEntityGoofer {
+
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMaxHealth",
+  #  constant: {doubleValue: 270.0d}
+  #}
+  function mbc_modify_hp_Goofer(original as double) as double {
+    return CFG.hp_Goofer;
+  }
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMeleeDamage",
+  #  constant: {doubleValue: 10.0d}
+  #}
+  function mbc_modify_dmg_Goofer(original as double) as double {
+    return CFG.dmg_Goofer;
+  }
+
+}
+
+
+#mixin Mixin
+#{targets: "net.tslat.aoa3.entity.minions.EntityMechaCyclops"}
+zenClass MixinEntityMechaCyclops {
+
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMaxHealth",
+  #  constant: {doubleValue: 100}
+  #}
+  function mbc_modify_hp_MechaCyclops(original as double) as double {
+    return CFG.hp_MechaCyclops;
+  }
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMeleeDamage",
+  #  constant: {doubleValue: 30.0d}
+  #}
+  function mbc_modify_dmg_MechaCyclops(original as double) as double {
+    return CFG.dmg_MechaCyclops;
+  }
+
+}
+
+
+
+#mixin Mixin
+#{targets: "net.tslat.aoa3.entity.minions.EntityAlluricorn"}
+zenClass MixinEntityAlluricorns {
+
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMaxHealth",
+  #  constant: {doubleValue: 200}
+  #}
+  function mbc_modify_hp_Alluricorn(original as double) as double {
+    return CFG.hp_Alluricorn;
+  }
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMeleeDamage",
+  #  constant: {doubleValue: 13.0d}
+  #}
+  function mbc_modify_dmg_Alluricorn(original as double) as double {
+    return CFG.dmg_Alluricorn;
+  }
+
+}
+
+
+
+#mixin Mixin
+#{targets: "net.tslat.aoa3.entity.minions.EntityConstructOfServility"}
+zenClass MixinEntityConstructOfServility {
+
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMaxHealth",
+  #  constant: {doubleValue: 260}
+  #}
+  function mbc_modify_hp_ConstructOfServility(original as double) as double {
+    return CFG.hp_ConstructOfServility;
+  }
+
+  #mixin Static
+  #mixin ModifyConstant
+  #{
+  #  method: "getBaseMeleeDamage",
+  #  constant: {doubleValue: 15.0d}
+  #}
+  function mbc_modify_dmg_ConstructOfServility(original as double) as double {
+    return CFG.dmg_ConstructOfServility;
+  }
+
+}
+
+
+
+
+
+

scripts/mixin/aoa3/StatsConfig.zs

@@ -5,6 +5,43 @@
 // Mob HP
 static hp_KingShroomus as double = 3000.0d;
 static hp_Shadowlord as double   = 5000.0d;
+static hp_MechaSkellox as double   = 1000000.0d;
+static dmg_MechaSkellox as double   = 50000.0d;
+static hp_Compeer as double   = 200.0d;
+static dmg_Compeer as double   = 20.0d;
+static hp_Waggy as double   = 300.0d;
+static dmg_Waggy as double   = 10.5d;
+static hp_Spikeback as double   = 650.0d;
+static dmg_Spikeback as double   = 100.0d;
+static hp_Rammerhorn as double   = 400.0d;
+static dmg_Rammerhorn as double   = 55.0d;
+static hp_Spraggy as double   = 2000.0d;
+static dmg_Spraggy as double   = 50.0d;
+static hp_Plateosaur as double   = 1200.0d;
+static dmg_Plateosaur as double   = 30.0d;
+static hp_Hellquin as double   = 500.0d;
+static dmg_Hellquin as double   = 60.0d;
+static hp_Craggy as double   = 5000.0d;
+static dmg_Craggy as double   = 150.0d;
+static hp_Shaddy as double   = 50000.0d;
+static dmg_Shaddy as double   = 250.0d;
+static hp_Corby as double   = 2000.0d;
+static dmg_Corby as double   = 160.0d;
+static hp_Horntail as double   = 200.0d;
+static dmg_Horntail as double   = 150.0d;
+static hp_Gnawer as double   = 1000.0d;
+static dmg_Gnawer as double   = 180.0d;
+static hp_Blissard as double   = 10000.0d;
+static dmg_Blissard as double   = 400.0d;
+static hp_Goofer as double   = 1000.0d;
+static dmg_Goofer as double   = 80.0d;
+static hp_MechaCyclops as double   = 4000.0d;
+static dmg_MechaCyclops as double   = 300.0d;
+static hp_Alluricorn as double   = 100000.0d;
+static dmg_Alluricorn as double   = 600.0d;
+static hp_ConstructOfServility as double   = 10000.0d;
+static dmg_ConstructOfServility as double   = 400.0d;
+
 
 // Melee Weapons
 static dmg_BaronSword as float       = 99.0f;
@@ -22,7 +59,7 @@ static dmg_HolySword as float        = 19.0f;
 static dmg_IllusionSword as float    = 37.5f;
 static dmg_LightsWaySword as float   = 999.0f;
 static dmg_PrimalSword as float      = 35.0f;
-static dmg_RockbasherSword as float  = 54.0f;
+static dmg_RockbasherSword as float  = 119.0f;
 static dmg_RosidianSword as float    = 54.0f;
 static dmg_RunicSword as float       = 499.0f;
 static dmg_ShadowSword as float      = 399.0f;
@@ -30,6 +67,31 @@ static dmg_ShroomusSword as float    = 61.0f;
 static dmg_SkeletalSword as float    = 37.0f;
 static dmg_SupremacySword as float   = 54.0f;
 static dmg_SweetSword as float       = 54.0f;
+static dmg_Bloodlurker as double       = 56.0d;
+static dmg_TidalGreatblade as double       = 30.0d;
+static dmg_BaronGreatblade as double       = 199.0d;
+static dmg_CreepoidGreatblade as double       = 79.0d;
+static dmg_LelyetianGreatblade as double       = 219.0d;
+static dmg_RoyalGreatblade as double       = 74.0d;
+static dmg_SubterraneanGreatblade as double       = 194.0d;
+static dmg_ShyreSword as double       = 1799.0d;
+static dmg_GodsGreatblade as double       = 3999.0d;
+static dmg_CrystalGreatblade as double       = 120.0d;
+static dmg_GoofyGreatblade as double       = 159.0d;
+static dmg_LyonicGreatblade as double       = 189.0d;
+static dmg_NoxiousGreatblade as double       = 169.0d;
+static dmg_RosidianGreatblade as double       = 129.0d;
+static dmg_ShroomicGreatblade as double       = 110.0d;
+static dmg_UnderworldGreatblade as double       = 79.0d;
+static dmg_RunicGreatblade as double       = 1110.0d;
+static dmg_CoralGreatblade as double       = 302.0d;
+static dmg_PrimordialGreatblade as double       = 849.0d;
+static dmg_HauntedGreatblade as double       = 554.0d;
+static dmg_VulcammerMaul as float       = 60.0f;
+static dmg_CoralstoneMaul as float       = 1249.0f;
+static dmg_CrystalMaul as float       = 149.0f;
+static dmg_ElectronMaul as float       = 699.0f;
+static dmg_HorizonMaul as float       = 149.0f;
 
 // staffs
 static dmg_waterStaff as float       = 300.0d;

scripts/mixin/aoa3/WeaponRegisterBuffs.zs

@@ -1350,6 +1350,469 @@ zenClass MixinWeaponRegister {
   }
 
 
+  #mixin Definition
+  #{
+  #  id: "Bloodlurker", type: "net/tslat/aoa3/item/weapon/greatblade/Bloodlurker"
+  #}
+  #mixin Expression
+  #{
+  #  value: "new Bloodlurker(@(?), ?, ?)"
+  #}
+  #mixin Static
+  #mixin ModifyExpressionValue
+  #{
+  #  method: "registerWeapon",
+  #  at: {value: "MIXINEXTRAS:EXPRESSION"}
+  #}
+  function mbc_modify_dmg_Bloodlurker(original as double) as double {
+    return CFG.dmg_Bloodlurker;
+  }
+
+
+  #mixin Definition
+  #{
+  #  id: "TidalGreatblade", type: "net/tslat/aoa3/item/weapon/greatblade/TidalGreatblade"
+  #}
+  #mixin Expression
+  #{
+  #  value: "new TidalGreatblade(@(?), ?, ?)"
+  #}
+  #mixin Static
+  #mixin ModifyExpressionValue
+  #{
+  #  method: "registerWeapon",
+  #  at: {value: "MIXINEXTRAS:EXPRESSION"}
+  #}
+  function mbc_modify_dmg_TidalGreatblade(original as double) as double {
+    return CFG.dmg_TidalGreatblade;
+  }
+
+
+  #mixin Definition
+  #{
+  #  id: "BaronGreatblade", type: "net/tslat/aoa3/item/weapon/greatblade/BaronGreatblade"
+  #}
+  #mixin Expression
+  #{
+  #  value: "new BaronGreatblade(@(?), ?, ?)"
+  #}
+  #mixin Static
+  #mixin ModifyExpressionValue
+  #{
+  #  method: "registerWeapon",
+  #  at: {value: "MIXINEXTRAS:EXPRESSION"}
+  #}
+  function mbc_modify_dmg_BaronGreatblade(original as double) as double {
+    return CFG.dmg_BaronGreatblade;
+  }
+
+  #mixin Definition
+  #{
+  #  id: "CreepoidGreatblade", type: "net/tslat/aoa3/item/weapon/greatblade/CreepoidGreatblade"
+  #}
+  #mixin Expression
+  #{
+  #  value: "new CreepoidGreatblade(@(?), ?, ?)"
+  #}
+  #mixin Static
+  #mixin ModifyExpressionValue
+  #{
+  #  method: "registerWeapon",
+  #  at: {value: "MIXINEXTRAS:EXPRESSION"}
+  #}
+  function mbc_modify_dmg_CreepoidGreatblade(original as double) as double {
+    return CFG.dmg_CreepoidGreatblade;
+  }
+
+
+  #mixin Definition
+  #{
+  #  id: "LelyetianGreatblade", type: "net/tslat/aoa3/item/weapon/greatblade/LelyetianGreatblade"
+  #}
+  #mixin Expression
+  #{
+  #  value: "new LelyetianGreatblade(@(?), ?, ?)"
+  #}
+  #mixin Static
+  #mixin ModifyExpressionValue
+  #{
+  #  method: "registerWeapon",
+  #  at: {value: "MIXINEXTRAS:EXPRESSION"}
+  #}
+  function mbc_modify_dmg_LelyetianGreatblade(original as double) as double {
+    return CFG.dmg_LelyetianGreatblade;
+  }
+
+
+  #mixin Definition
+  #{
+  #  id: "RoyalGreatblade", type: "net/tslat/aoa3/item/weapon/greatblade/RoyalGreatblade"
+  #}
+  #mixin Expression
+  #{
+  #  value: "new RoyalGreatblade(@(?), ?, ?)"
+  #}
+  #mixin Static
+  #mixin ModifyExpressionValue
+  #{
+  #  method: "registerWeapon",
+  #  at: {value: "MIXINEXTRAS:EXPRESSION"}
+  #}
+  function mbc_modify_dmg_RoyalGreatblade(original as double) as double {
+    return CFG.dmg_RoyalGreatblade;
+  }
+
+
+  #mixin Definition
+  #{
+  #  id: "SubterraneanGreatblade", type: "net/tslat/aoa3/item/weapon/greatblade/SubterraneanGreatblade"
+  #}
+  #mixin Expression
+  #{
+  #  value: "new SubterraneanGreatblade(@(?), ?, ?)"
+  #}
+  #mixin Static
+  #mixin ModifyExpressionValue
+  #{
+  #  method: "registerWeapon",
+  #  at: {value: "MIXINEXTRAS:EXPRESSION"}
+  #}
+  function mbc_modify_dmg_SubterraneanGreatblade(original as double) as double {
+    return CFG.dmg_SubterraneanGreatblade;
+  }
+
+
+  #mixin Definition
+  #{
+  #  id: "ShyreSword", type: "net/tslat/aoa3/item/weapon/greatblade/ShyreSword"
+  #}
+  #mixin Expression
+  #{
+  #  value: "new ShyreSword(@(?), ?, ?)"
+  #}
+  #mixin Static
+  #mixin ModifyExpressionValue
+  #{
+  #  method: "registerWeapon",
+  #  at: {value: "MIXINEXTRAS:EXPRESSION"}
+  #}
+  function mbc_modify_dmg_ShyreSword(original as double) as double {
+    return CFG.dmg_ShyreSword;
+  }
+
+
+  #mixin Definition
+  #{
+  #  id: "GodsGreatblade", type: "net/tslat/aoa3/item/weapon/greatblade/GodsGreatblade"
+  #}
+  #mixin Expression
+  #{
+  #  value: "new GodsGreatblade(@(?), ?, ?)"
+  #}
+  #mixin Static
+  #mixin ModifyExpressionValue
+  #{
+  #  method: "registerWeapon",
+  #  at: {value: "MIXINEXTRAS:EXPRESSION"}
+  #}
+  function mbc_modify_dmg_GodsGreatblade(original as double) as double {
+    return CFG.dmg_GodsGreatblade;
+  }
+
+  #mixin Definition
+  #{
+  #  id: "CrystalGreatblade", type: "net/tslat/aoa3/item/weapon/greatblade/CrystalGreatblade"
+  #}
+  #mixin Expression
+  #{
+  #  value: "new CrystalGreatblade(@(?), ?, ?)"
+  #}
+  #mixin Static
+  #mixin ModifyExpressionValue
+  #{
+  #  method: "registerWeapon",
+  #  at: {value: "MIXINEXTRAS:EXPRESSION"}
+  #}
+  function mbc_modify_dmg_CrystalGreatblade(original as double) as double {
+    return CFG.dmg_CrystalGreatblade;
+  }
+
+
+  #mixin Definition
+  #{
+  #  id: "GoofyGreatblade", type: "net/tslat/aoa3/item/weapon/greatblade/GoofyGreatblade"
+  #}
+  #mixin Expression
+  #{
+  #  value: "new GoofyGreatblade(@(?), ?, ?)"
+  #}
+  #mixin Static
+  #mixin ModifyExpressionValue
+  #{
+  #  method: "registerWeapon",
+  #  at: {value: "MIXINEXTRAS:EXPRESSION"}
+  #}
+  function mbc_modify_dmg_GoofyGreatblade(original as double) as double {
+    return CFG.dmg_GoofyGreatblade;
+  }
+
+  #mixin Definition
+  #{
+  #  id: "LyonicGreatblade", type: "net/tslat/aoa3/item/weapon/greatblade/LyonicGreatblade"
+  #}
+  #mixin Expression
+  #{
+  #  value: "new LyonicGreatblade(@(?), ?, ?)"
+  #}
+  #mixin Static
+  #mixin ModifyExpressionValue
+  #{
+  #  method: "registerWeapon",
+  #  at: {value: "MIXINEXTRAS:EXPRESSION"}
+  #}
+  function mbc_modify_dmg_LyonicGreatblade(original as double) as double {
+    return CFG.dmg_LyonicGreatblade;
+  }
+
+  #mixin Definition
+  #{
+  #  id: "NoxiousGreatblade", type: "net/tslat/aoa3/item/weapon/greatblade/NoxiousGreatblade"
+  #}
+  #mixin Expression
+  #{
+  #  value: "new NoxiousGreatblade(@(?), ?, ?)"
+  #}
+  #mixin Static
+  #mixin ModifyExpressionValue
+  #{
+  #  method: "registerWeapon",
+  #  at: {value: "MIXINEXTRAS:EXPRESSION"}
+  #}
+  function mbc_modify_dmg_NoxiousGreatblade(original as double) as double {
+    return CFG.dmg_NoxiousGreatblade;
+  }
+
+  #mixin Definition
+  #{
+  #  id: "RosidianGreatblade", type: "net/tslat/aoa3/item/weapon/greatblade/RosidianGreatblade"
+  #}
+  #mixin Expression
+  #{
+  #  value: "new RosidianGreatblade(@(?), ?, ?)"
+  #}
+  #mixin Static
+  #mixin ModifyExpressionValue
+  #{
+  #  method: "registerWeapon",
+  #  at: {value: "MIXINEXTRAS:EXPRESSION"}
+  #}
+  function mbc_modify_dmg_RosidianGreatblade(original as double) as double {
+    return CFG.dmg_RosidianGreatblade;
+  }
+
+  #mixin Definition
+  #{
+  #  id: "ShroomicGreatblade", type: "net/tslat/aoa3/item/weapon/greatblade/ShroomicGreatblade"
+  #}
+  #mixin Expression
+  #{
+  #  value: "new ShroomicGreatblade(@(?), ?, ?)"
+  #}
+  #mixin Static
+  #mixin ModifyExpressionValue
+  #{
+  #  method: "registerWeapon",
+  #  at: {value: "MIXINEXTRAS:EXPRESSION"}
+  #}
+  function mbc_modify_dmg_ShroomicGreatblade(original as double) as double {
+    return CFG.dmg_ShroomicGreatblade;
+  }
+
+  #mixin Definition
+  #{
+  #  id: "UnderworldGreatblade", type: "net/tslat/aoa3/item/weapon/greatblade/UnderworldGreatblade"
+  #}
+  #mixin Expression
+  #{
+  #  value: "new UnderworldGreatblade(@(?), ?, ?)"
+  #}
+  #mixin Static
+  #mixin ModifyExpressionValue
+  #{
+  #  method: "registerWeapon",
+  #  at: {value: "MIXINEXTRAS:EXPRESSION"}
+  #}
+  function mbc_modify_dmg_UnderworldGreatblade(original as double) as double {
+    return CFG.dmg_UnderworldGreatblade;
+  }
+
+  #mixin Definition
+  #{
+  #  id: "RunicGreatblade", type: "net/tslat/aoa3/item/weapon/greatblade/RunicGreatblade"
+  #}
+  #mixin Expression
+  #{
+  #  value: "new RunicGreatblade(@(?), ?, ?)"
+  #}
+  #mixin Static
+  #mixin ModifyExpressionValue
+  #{
+  #  method: "registerWeapon",
+  #  at: {value: "MIXINEXTRAS:EXPRESSION"}
+  #}
+  function mbc_modify_dmg_RunicGreatblade(original as double) as double {
+    return CFG.dmg_RunicGreatblade;
+  }
+
+  #mixin Definition
+  #{
+  #  id: "CoralGreatblade", type: "net/tslat/aoa3/item/weapon/greatblade/CoralGreatblade"
+  #}
+  #mixin Expression
+  #{
+  #  value: "new CoralGreatblade(@(?), ?, ?)"
+  #}
+  #mixin Static
+  #mixin ModifyExpressionValue
+  #{
+  #  method: "registerWeapon",
+  #  at: {value: "MIXINEXTRAS:EXPRESSION"}
+  #}
+  function mbc_modify_dmg_CoralGreatblade(original as double) as double {
+    return CFG.dmg_CoralGreatblade;
+  }
+
+  #mixin Definition
+  #{
+  #  id: "PrimordialGreatblade", type: "net/tslat/aoa3/item/weapon/greatblade/PrimordialGreatblade"
+  #}
+  #mixin Expression
+  #{
+  #  value: "new PrimordialGreatblade(@(?), ?, ?)"
+  #}
+  #mixin Static
+  #mixin ModifyExpressionValue
+  #{
+  #  method: "registerWeapon",
+  #  at: {value: "MIXINEXTRAS:EXPRESSION"}
+  #}
+  function mbc_modify_dmg_PrimordialGreatblade(original as double) as double {
+    return CFG.dmg_PrimordialGreatblade;
+  }
+
+
+  #mixin Definition
+  #{
+  #  id: "HauntedGreatblade", type: "net/tslat/aoa3/item/weapon/greatblade/HauntedGreatblade"
+  #}
+  #mixin Expression
+  #{
+  #  value: "new HauntedGreatblade(@(?), ?, ?)"
+  #}
+  #mixin Static
+  #mixin ModifyExpressionValue
+  #{
+  #  method: "registerWeapon",
+  #  at: {value: "MIXINEXTRAS:EXPRESSION"}
+  #}
+  function mbc_modify_dmg_HauntedGreatblade(original as double) as double {
+    return CFG.dmg_HauntedGreatblade;
+  }
+
+
+  #mixin Definition
+  #{
+  #  id: "VulcammerMaul", type: "net/tslat/aoa3/item/weapon/maul/VulcammerMaul"
+  #}
+  #mixin Expression
+  #{
+  #  value: "new VulcammerMaul(@(?), ?, ?, ?)"
+  #}
+  #mixin Static
+  #mixin ModifyExpressionValue
+  #{
+  #  method: "registerWeapon",
+  #  at: {value: "MIXINEXTRAS:EXPRESSION"}
+  #}
+  function mbc_modify_dmg_VulcammerMaul(original as float) as float {
+    return CFG.dmg_VulcammerMaul;
+  }
+
+  #mixin Definition
+  #{
+  #  id: "CoralstoneMaul", type: "net/tslat/aoa3/item/weapon/maul/CoralstoneMaul"
+  #}
+  #mixin Expression
+  #{
+  #  value: "new CoralstoneMaul(@(?), ?, ?, ?)"
+  #}
+  #mixin Static
+  #mixin ModifyExpressionValue
+  #{
+  #  method: "registerWeapon",
+  #  at: {value: "MIXINEXTRAS:EXPRESSION"}
+  #}
+  function mbc_modify_dmg_CoralstoneMaul(original as float) as float {
+    return CFG.dmg_CoralstoneMaul;
+  }
+
+  #mixin Definition
+  #{
+  #  id: "CrystalMaul", type: "net/tslat/aoa3/item/weapon/maul/CrystalMaul"
+  #}
+  #mixin Expression
+  #{
+  #  value: "new CrystalMaul(@(?), ?, ?, ?)"
+  #}
+  #mixin Static
+  #mixin ModifyExpressionValue
+  #{
+  #  method: "registerWeapon",
+  #  at: {value: "MIXINEXTRAS:EXPRESSION"}
+  #}
+  function mbc_modify_dmg_CrystalMaul(original as float) as float {
+    return CFG.dmg_CrystalMaul;
+  }
+
+
+  #mixin Definition
+  #{
+  #  id: "ElectronMaul", type: "net/tslat/aoa3/item/weapon/maul/ElectronMaul"
+  #}
+  #mixin Expression
+  #{
+  #  value: "new ElectronMaul(@(?), ?, ?, ?)"
+  #}
+  #mixin Static
+  #mixin ModifyExpressionValue
+  #{
+  #  method: "registerWeapon",
+  #  at: {value: "MIXINEXTRAS:EXPRESSION"}
+  #}
+  function mbc_modify_dmg_ElectronMaul(original as float) as float {
+    return CFG.dmg_ElectronMaul;
+  }
+
+
+  #mixin Definition
+  #{
+  #  id: "HorizonMaul", type: "net/tslat/aoa3/item/weapon/maul/HorizonMaul"
+  #}
+  #mixin Expression
+  #{
+  #  value: "new HorizonMaul(@(?), ?, ?, ?)"
+  #}
+  #mixin Static
+  #mixin ModifyExpressionValue
+  #{
+  #  method: "registerWeapon",
+  #  at: {value: "MIXINEXTRAS:EXPRESSION"}
+  #}
+  function mbc_modify_dmg_HorizonMaul(original as float) as float {
+    return CFG.dmg_HorizonMaul;
+  }
+
+
 
 
 

scripts/mixin/astralsorcery/AstralPerks.zs

@@ -554,4 +554,175 @@ zenClass MixinRegistryPerks {
     }
 
 
+
+    #mixin Static
+    #mixin ModifyConstant
+    #{
+    #    method: "initializeOuterEvorsioPerks",
+    #    constant: {floatValue: 1.02F},
+    #    slice: {
+    #        from: {value: "CONSTANT", args: "stringValue=ev_gem_path"},
+    #        to:   {value: "CONSTANT", args: "stringValue=ev_gem_path_1"}
+    #    }
+    #}
+    function mbc_modify_perkEff_EvorsioOuter0(original as float) as float {
+        return CFG.perkEff_EvorsioOuter0;
+    }
+
+    #mixin Static
+    #mixin ModifyConstant
+    #{
+    #    method: "initializeOuterEvorsioPerks",
+    #    constant: {floatValue: 1.02F},
+    #    slice: {
+    #        from: {value: "CONSTANT", args: "stringValue=ev_gem_path_1"},
+    #        to:   {value: "CONSTANT", args: "stringValue=ev_gem_slot"}
+    #    }
+    #}
+    function mbc_modify_perkEff_EvorsioOuter1(original as float) as float {
+        return CFG.perkEff_EvorsioOuter1;
+    }
+
+    #mixin Static
+    #mixin ModifyConstant
+    #{
+    #    method: "initializeOuterAevitasPerks",
+    #    constant: {floatValue: 1.02F},
+    #    slice: {
+    #        from: {value: "CONSTANT", args: "stringValue=life_gem_path"},
+    #        to:   {value: "CONSTANT", args: "stringValue=life_gem_path_1"}
+    #    }
+    #}
+    function mbc_modify_perkEff_AevitasOuter0(original as float) as float {
+        return CFG.perkEff_AevitasOuter0;
+    }
+
+    #mixin Static
+    #mixin ModifyConstant
+    #{
+    #    method: "initializeOuterAevitasPerks",
+    #    constant: {floatValue: 1.02F},
+    #    slice: {
+    #        from: {value: "CONSTANT", args: "stringValue=life_gem_path_1"},
+    #        to:   {value: "CONSTANT", args: "stringValue=life_gem_slot"}
+    #    }
+    #}
+    function mbc_modify_perkEff_AevitasOuter1(original as float) as float {
+        return CFG.perkEff_AevitasOuter1;
+    }
+
+    #mixin Static
+    #mixin ModifyConstant
+    #{
+    #    method: "initializeVicioKeyPerks",
+    #    constant: {floatValue: 0.05F},
+    #    slice: {
+    #        from: {value: "CONSTANT", args: "stringValue=major_ats_inc_ats"},
+    #        to:   {value: "CONSTANT", args: "stringValue=major_ats_inc_ats_1"}
+    #    }
+    #}
+    function mbc_modify_atkSpeed_VicioKey0(original as float) as float {
+        return CFG.atkSpeed_VicioKey0;
+    }
+
+    #mixin Static
+    #mixin ModifyConstant
+    #{
+    #    method: "initializeVicioKeyPerks",
+    #    constant: {floatValue: 0.05F},
+    #    slice: {
+    #        from: {value: "CONSTANT", args: "stringValue=major_ats_inc_ats_1"},
+    #        to:   {value: "CONSTANT", args: "stringValue=major_increased_ats_zeal"}
+    #    }
+    #}
+    function mbc_modify_atkSpeed_VicioKey1(original as float) as float {
+        return CFG.atkSpeed_VicioKey1;
+    }
+
+
+    #mixin Static
+    #mixin ModifyConstant
+    #{
+    #    method: "initializeVicioKeyPerks",
+    #    constant: {floatValue: 0.15F},
+    #    slice: {
+    #        from: {value: "CONSTANT", args: "stringValue=major_increased_ats_zeal"},
+    #        to:   {value: "CONSTANT", args: "stringValue=base_inc_perkeffect_t3_7"}
+    #    }
+    #}
+    function mbc_modify_atkSpeed_VicioKey2(original as float) as float {
+        return CFG.atkSpeed_VicioKey2;
+    }
+
+    #mixin Static
+    #mixin ModifyConstant
+    #{
+    #    method: "initializeEvorsioBranch",
+    #    constant: {floatValue: 1.1F},
+    #    slice: {
+    #        from: {value: "CONSTANT", args: "stringValue=not_evo_hrv_ats"},
+    #        to:   {value: "CONSTANT", args: "stringValue=med_inc_hrv_speed_2"}
+    #    }
+    #}
+    function mbc_modify_atkSpeed_EvorsioBranch0(original as float) as float {
+        return CFG.atkSpeed_EvorsioBranch0;
+    }
+
+    #mixin Static
+    #mixin ModifyConstant
+    #{
+    #    method: "initializeDiscidiaBranch",
+    #    constant: {floatValue: 0.1F},
+    #    slice: {
+    #        from: {value: "CONSTANT", args: "stringValue=med_inc_proj_damage"},
+    #        to:   {value: "CONSTANT", args: "stringValue=med_inc_proj_damage_1"}
+    #    }
+    #}
+    function mbc_modify_damage_DiscidiaBranch0(original as float) as float {
+        return CFG.damage_DiscidiaBranch0;
+    }
+
+    #mixin Static
+    #mixin ModifyConstant
+    #{
+    #    method: "initializeDiscidiaBranch",
+    #    constant: {floatValue: 0.1F},
+    #    slice: {
+    #        from: {value: "CONSTANT", args: "stringValue=med_inc_proj_damage_1"},
+    #        to:   {value: "CONSTANT", args: "stringValue=not_dsc_proj_crit"}
+    #    }
+    #}
+    function mbc_modify_damage_DiscidiaBranch1(original as float) as float {
+        return CFG.damage_DiscidiaBranch1;
+    }
+
+    #mixin Static
+    #mixin ModifyConstant
+    #{
+    #    method: "initializeDiscidiaBranch",
+    #    constant: {floatValue: 1.05F},
+    #    slice: {
+    #        from: {value: "CONSTANT", args: "stringValue=not_dsc_proj_crit"},
+    #        to:   {value: "CONSTANT", args: "stringValue=med_inc_melee_damage"}
+    #    }
+    #}
+    function mbc_modify_damage_Sniper(original as float) as float {
+        return CFG.damage_Sniper;
+    }
+
+
+    #mixin Static
+    #mixin ModifyConstant
+    #{
+    #    method: "initializeDiscidiaRoot",
+    #    constant: {floatValue: 1.05F},
+    #    slice: {
+    #        from: {value: "CONSTANT", args: "stringValue=major_inc_damage"}
+    #    }
+    #}
+    function mbc_modify_damage_precision(original as float) as float {
+        return CFG.damage_Precision;
+    }
+
+
 }

scripts/mixin/astralsorcery/StatsConfig.zs

@@ -3,8 +3,8 @@
 #loader mixin
 
 // Perk effectiveness (Alcara, focus)
-static perkEff_AlcaraFocus0 as float = 1.1f;
-static perkEff_AlcaraFocus1 as float = 1.1f;
+static perkEff_AlcaraFocus0 as float = 1.03f;
+static perkEff_AlcaraFocus1 as float = 1.03f;
 
 // Armor (Armara, outer-most ring)
 static armor_ArmaraOuter as float = 0.01f;
@@ -38,8 +38,10 @@ static damage_Rampage1 as float = 0.06f;
 
 // Near Sniper
 static crit_Sniper as float = 1.2f;
+static damage_Sniper as float = 1.02f;
 // Precision
 static crit_Precision as float = 1.2f;
+static damage_Precision as float = 1.02f;
 // Discidia root
 static crit_DiscidiaRoot as float = 4.0f;
 static damage_rootDiscidia0 as float = 0.03f;
@@ -47,6 +49,12 @@ static damage_rootDiscidia1 as float = 0.03f;
 
 // Evorsio root
 static damage_rootEvorsio as float = 0.07f;
+// Evorsio Outer
+static perkEff_EvorsioOuter0 as float = 1.01f;
+static perkEff_EvorsioOuter1 as float = 1.01f;
+// Evorsio Branch
+static atkSpeed_EvorsioBranch0 as float = 1.05f;
+
 
 
 // Damage, Discidia Key
@@ -55,16 +63,22 @@ static crit_dst_damage1 as float = 0.6f;
 static crit_dst_damage2 as float = 0.6f;
 static crit_dst_damage3 as float = 0.6f;
 
+// Discidia Branch
+static damage_DiscidiaBranch0 as float = 0.05f;
+static damage_DiscidiaBranch1 as float = 0.07f;
+
+
 
 // Damage (Discidia, outer-most ring)
 static damage_DiscidiaOuter as float = 0.01f;
+static crit_cullDiscidiaOuter as float = 0.05f;
 
 // Perk effectiveness (tiered)
-static perkEff_major as float = 0.2f;
-static perkEff_t1 as float = 0.04f;
-static perkEff_t2 as float = 0.03f;
-static perkEff_t3 as float = 0.025f;
-static perkEff_t4 as float = 0.02f;
+static perkEff_major as float = 0.08f;
+static perkEff_t1 as float = 0.035f;
+static perkEff_t2 as float = 0.025f;
+static perkEff_t3 as float = 0.02f;
+static perkEff_t4 as float = 0.015f;
 
 // Perk effectiveness (Vorux, focus)
 static perkEff_VoruxFocus0 as float = 0.1f;
@@ -75,7 +89,15 @@ static damage_meleeMulti as float = 1.03f;
 static crit_meleeMulti as float = 0.2f;
 
 // Discidia damage medium
-static damage_medDiscidia0 as float = 0.05f;
-static damage_medDiscidia1 as float = 0.05f;
+static damage_medDiscidia0 as float = 0.03f;
+static damage_medDiscidia1 as float = 0.03f;
 
+// Aevitas outer
+static perkEff_AevitasOuter0 as float = 1.01f;
+static perkEff_AevitasOuter1 as float = 1.01f;
+
+// Vicio key
+static atkSpeed_VicioKey0 as float = 0.03f;
+static atkSpeed_VicioKey1 as float = 0.04f;
+static atkSpeed_VicioKey2 as float = 0.10f;
 

scripts/mixin/p2pClick.zs

@@ -0,0 +1,14 @@
+#modloaded astralsorcery
+#loader mixin
+
+
+import mixin.CallbackInfoReturnable;
+import native.net.minecraft.item.ItemStack;
+
+#mixin {targets: "appeng.core.features.registries.P2PTunnelRegistry"}
+zenClass MixinP2PTunnelRegistry {
+    #mixin Inject {method: "getTunnelTypeByItem", at: {value: "HEAD"}}
+    function ignoreStack(trigger as ItemStack, cir as mixin.CallbackInfoReturnable) as void {
+        cir.setReturnValue(null);
+    }
+}