From 034eda5b375b38517b881fb742b875b1d4d6c356 Mon Sep 17 00:00:00 2001 From: ZHAY10086 Date: Mon, 17 Nov 2025 09:09:34 +0800 Subject: [PATCH] update to hotfix1 --- config/CustomMainMenu/mainmenu.json | 2 +- config/ItemFavorites/servercrash.dat | 1 + config/gendustry/meatball_bees.en_US.lang | 2 +- config/gendustry/meatball_bees.zh_cn.lang | 2 +- config/ichunutil.cfg | 2 +- config/jei/worldSettings.cfg | 37 +- config/peteams-early.properties | 4 + config/renderlib.cfg | 24 +- config/tconstruct_oredictcache.dat | Bin 86775 -> 86775 bytes config/teamreborn/configData.nbt | Bin 42432 -> 42432 bytes scripts/EMCless.zs | 2 +- scripts/MythicProcessorAssemblingMachine.zs | 2 +- scripts/TheGreatOreCleanse.zs | 9 + .../AstralRelayHaloClient.zs} | 1 + .../AstralRelayRenderFixClient.zs} | 42 -- .../AstralRelayRenderFixServer.txt | 49 ++ .../SigilTableJEITransferClient.zs} | 1 + ...stStandFormula.zs => LastStandFormula.txt} | 0 scripts/mixin/{LazyAe2.zs => LazyAe2.txt} | 0 scripts/mixin/aoa3/BossBuffs.zs | 35 ++ scripts/mixin/aoa3/MaterialRegisterBuffs.zs | 425 ++++++++++++++++++ scripts/mixin/aoa3/StatsConfig.zs | 41 ++ scripts/mixin/aoa3/WeaponRegisterBuffs.zs | 119 +++++ scripts/mixin/aoa3/aoa3.zs | 38 -- scripts/mixin/aoa3/aoa3BaronSwordBuff.zs | 25 -- scripts/mixin/aoa3/aoa3BloodfuryBuff.zs | 25 -- scripts/mixin/aoa3/aoa3BloodstoneSwordBuff.zs | 25 -- scripts/mixin/aoa3/aoa3CaramelCarverBuff.zs | 25 -- scripts/mixin/aoa3/aoa3ChainsawBuffs.zs | 25 -- scripts/mixin/aoa3/aoa3ChilliChuggerBuff.zs | 21 - scripts/mixin/aoa3/aoa3CoralstormBuff.zs | 24 - scripts/mixin/aoa3/aoa3CreepswordBuff.zs | 25 -- .../mixin/aoa3/aoa3CrystalliteSwordBuff.zs | 25 -- scripts/mixin/aoa3/aoa3DartGunBuff.zs | 17 - scripts/mixin/aoa3/aoa3ExplochronBuff.zs | 25 -- scripts/mixin/aoa3/aoa3FlamingFuryBuff.zs | 17 - scripts/mixin/aoa3/aoa3GuardianSwordBuff.zs | 25 -- scripts/mixin/aoa3/aoa3HarvesterswordBuff.zs | 25 -- scripts/mixin/aoa3/aoa3HolySwordBuff.zs | 25 -- scripts/mixin/aoa3/aoa3IllusionSwordBuff.zs | 25 -- scripts/mixin/aoa3/aoa3LightswayBuff.zs | 25 -- .../mixin/aoa3/aoa3NethengeicSluggerBuff.zs | 17 - scripts/mixin/aoa3/aoa3PrimalswordBuff.zs | 25 -- scripts/mixin/aoa3/aoa3RockbasherBuff.zs | 25 -- scripts/mixin/aoa3/aoa3RosidianswordBuff.zs | 25 -- scripts/mixin/aoa3/aoa3RunicSwordBuff.zs | 25 -- scripts/mixin/aoa3/aoa3ShadowswordBuff.zs | 25 -- scripts/mixin/aoa3/aoa3ShroomusswordBuff.zs | 25 -- scripts/mixin/aoa3/aoa3SkeletalswordBuff.zs | 25 -- scripts/mixin/aoa3/aoa3Supremacyswordbuff.zs | 25 -- scripts/mixin/aoa3/aoa3SweetswordBuff.zs | 25 -- scripts/mixin/aoa3/aoa3WitherWrathBuff.zs | 19 - scripts/mixin/aoa3/aoa3WitherWrathBuff2.zs | 17 - scripts/mixin/astralperk_V3.zip | Bin 9647 -> 0 bytes .../{tidetrident.zs => tidetrident.txt} | 0 55 files changed, 733 insertions(+), 787 deletions(-) create mode 100644 config/ItemFavorites/servercrash.dat create mode 100644 config/peteams-early.properties rename scripts/mixin/{AstralRelayHalo.zs => AedialClientVSServer/AstralRelayHaloClient.zs} (99%) rename scripts/mixin/{AstralRelayRenderFix.zs => AedialClientVSServer/AstralRelayRenderFixClient.zs} (54%) create mode 100644 scripts/mixin/AedialClientVSServer/AstralRelayRenderFixServer.txt rename scripts/mixin/{SigilTableJEITransfer.zs => AedialClientVSServer/SigilTableJEITransferClient.zs} (99%) rename scripts/mixin/LastStandrework/{LastStandFormula.zs => LastStandFormula.txt} (100%) rename scripts/mixin/{LazyAe2.zs => LazyAe2.txt} (100%) create mode 100644 scripts/mixin/aoa3/BossBuffs.zs create mode 100644 scripts/mixin/aoa3/MaterialRegisterBuffs.zs create mode 100644 scripts/mixin/aoa3/StatsConfig.zs create mode 100644 scripts/mixin/aoa3/WeaponRegisterBuffs.zs delete mode 100644 scripts/mixin/aoa3/aoa3.zs delete mode 100644 scripts/mixin/aoa3/aoa3BaronSwordBuff.zs delete mode 100644 scripts/mixin/aoa3/aoa3BloodfuryBuff.zs delete mode 100644 scripts/mixin/aoa3/aoa3BloodstoneSwordBuff.zs delete mode 100644 scripts/mixin/aoa3/aoa3CaramelCarverBuff.zs delete mode 100644 scripts/mixin/aoa3/aoa3ChainsawBuffs.zs delete mode 100644 scripts/mixin/aoa3/aoa3ChilliChuggerBuff.zs delete mode 100644 scripts/mixin/aoa3/aoa3CoralstormBuff.zs delete mode 100644 scripts/mixin/aoa3/aoa3CreepswordBuff.zs delete mode 100644 scripts/mixin/aoa3/aoa3CrystalliteSwordBuff.zs delete mode 100644 scripts/mixin/aoa3/aoa3DartGunBuff.zs delete mode 100644 scripts/mixin/aoa3/aoa3ExplochronBuff.zs delete mode 100644 scripts/mixin/aoa3/aoa3FlamingFuryBuff.zs delete mode 100644 scripts/mixin/aoa3/aoa3GuardianSwordBuff.zs delete mode 100644 scripts/mixin/aoa3/aoa3HarvesterswordBuff.zs delete mode 100644 scripts/mixin/aoa3/aoa3HolySwordBuff.zs delete mode 100644 scripts/mixin/aoa3/aoa3IllusionSwordBuff.zs delete mode 100644 scripts/mixin/aoa3/aoa3LightswayBuff.zs delete mode 100644 scripts/mixin/aoa3/aoa3NethengeicSluggerBuff.zs delete mode 100644 scripts/mixin/aoa3/aoa3PrimalswordBuff.zs delete mode 100644 scripts/mixin/aoa3/aoa3RockbasherBuff.zs delete mode 100644 scripts/mixin/aoa3/aoa3RosidianswordBuff.zs delete mode 100644 scripts/mixin/aoa3/aoa3RunicSwordBuff.zs delete mode 100644 scripts/mixin/aoa3/aoa3ShadowswordBuff.zs delete mode 100644 scripts/mixin/aoa3/aoa3ShroomusswordBuff.zs delete mode 100644 scripts/mixin/aoa3/aoa3SkeletalswordBuff.zs delete mode 100644 scripts/mixin/aoa3/aoa3Supremacyswordbuff.zs delete mode 100644 scripts/mixin/aoa3/aoa3SweetswordBuff.zs delete mode 100644 scripts/mixin/aoa3/aoa3WitherWrathBuff.zs delete mode 100644 scripts/mixin/aoa3/aoa3WitherWrathBuff2.zs delete mode 100644 scripts/mixin/astralperk_V3.zip rename scripts/mixin/iceandfireweapons/{tidetrident.zs => tidetrident.txt} (100%) diff --git a/config/CustomMainMenu/mainmenu.json b/config/CustomMainMenu/mainmenu.json index cb352a66..0d56b0b3 100644 --- a/config/CustomMainMenu/mainmenu.json +++ b/config/CustomMainMenu/mainmenu.json @@ -85,7 +85,7 @@ "action" : { "type": "openLink", - "link": "https://github.com/sainagh/meatballcraft/wiki/%5B0.18%5D-Improving-Performance" + "link": "https://github.com/sainagh/meatballcraft/wiki/%5B0.18.3%5D-Improving-Performance" } }, diff --git a/config/ItemFavorites/servercrash.dat b/config/ItemFavorites/servercrash.dat new file mode 100644 index 00000000..e0e6278f --- /dev/null +++ b/config/ItemFavorites/servercrash.dat @@ -0,0 +1 @@ +["false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false","false"] \ No newline at end of file diff --git a/config/gendustry/meatball_bees.en_US.lang b/config/gendustry/meatball_bees.en_US.lang index 689ddb8c..295181c4 100644 --- a/config/gendustry/meatball_bees.en_US.lang +++ b/config/gendustry/meatball_bees.en_US.lang @@ -120,5 +120,5 @@ gendustry.bees.species.SpoonyPanda=SpoonyPanda gendustry.bees.species.LordRaine=LordRaine gendustry.bees.species.Freeky=Freeky gendustry.bees.species.Honeysmeltest=Honeysmeltest -gendustry.honeycomb.honeysmeltest.name=Honeysmeltest Comb gendustry.bees.species.Ascendant=Ascendant +gendustry.honeycomb.honeysmeltest.name=Honeysmeltest Comb diff --git a/config/gendustry/meatball_bees.zh_cn.lang b/config/gendustry/meatball_bees.zh_cn.lang index e51430d4..76e55b84 100644 --- a/config/gendustry/meatball_bees.zh_cn.lang +++ b/config/gendustry/meatball_bees.zh_cn.lang @@ -120,5 +120,5 @@ gendustry.bees.species.SpoonyPanda=SpoonyPanda gendustry.bees.species.LordRaine=LordRaine gendustry.bees.species.Freeky=Freeky gendustry.bees.species.Honeysmeltest=蜜极炼 -gendustry.honeycomb.honeysmeltest.name=蜜极炼蜂窝 gendustry.bees.species.Ascendant=上升星座 +gendustry.honeycomb.honeysmeltest.name=蜜极炼蜂窝 diff --git a/config/ichunutil.cfg b/config/ichunutil.cfg index c6dd3b1e..59fb0503 100644 --- a/config/ichunutil.cfg +++ b/config/ichunutil.cfg @@ -70,7 +70,7 @@ module { I:versionNotificationTypes=0 # Don't change this. - I:versionSave=15 + I:versionSave=16 } } diff --git a/config/jei/worldSettings.cfg b/config/jei/worldSettings.cfg index b21e28ac..927ade01 100644 --- a/config/jei/worldSettings.cfg +++ b/config/jei/worldSettings.cfg @@ -245,20 +245,11 @@ world-1686736984 { world-1707250433 { - # Show the list of bookmarks next to open GUIs. B:bookmarkOverlayEnabled=true - - # Give items instead of showing the recipe. B:cheatItemsEnabled=false - - # Default item to use to fill up fluids when clicking on a fluid ingredient in the menu, (format: item_name@meta) S:defaultFluidContainerItem= - - # Hide and unhide ingredients by clicking them in the list. B:editEnabled=false S:filterText= - - # Show the list of ingredients next to open GUIs. B:overlayEnabled=true } @@ -412,11 +403,20 @@ world-288993849 { world-310143583 { + # Show the list of bookmarks next to open GUIs. B:bookmarkOverlayEnabled=false + + # Give items instead of showing the recipe. B:cheatItemsEnabled=true + + # Default item to use to fill up fluids when clicking on a fluid ingredient in the menu, (format: item_name@meta) S:defaultFluidContainerItem= + + # Hide and unhide ingredients by clicking them in the list. B:editEnabled=false - S:filterText= + S:filterText=integrat contr + + # Show the list of ingredients next to open GUIs. B:overlayEnabled=true } @@ -590,6 +590,23 @@ world-754345806 { } +world-754956732 { + # Show the list of bookmarks next to open GUIs. + B:bookmarkOverlayEnabled=true + B:cheatItemsEnabled=true + + # Default item to use to fill up fluids when clicking on a fluid ingredient in the menu, (format: item_name@meta) + S:defaultFluidContainerItem= + + # Hide and unhide ingredients by clicking them in the list. + B:editEnabled=false + S:filterText=@packaged + + # Show the list of ingredients next to open GUIs. + B:overlayEnabled=true +} + + world-769278255 { B:bookmarkOverlayEnabled=true B:cheatItemsEnabled=false diff --git a/config/peteams-early.properties b/config/peteams-early.properties new file mode 100644 index 00000000..9ae803cb --- /dev/null +++ b/config/peteams-early.properties @@ -0,0 +1,4 @@ +# PETeams Early Config Properties +# Caches the result of FTB Lib's team UID getter. +# This has a pretty big impact, so do not turn it off unless it causes compatibility issues +memoizeFtbLibTeamUIDGetter=true diff --git a/config/renderlib.cfg b/config/renderlib.cfg index 840c2837..0473e267 100644 --- a/config/renderlib.cfg +++ b/config/renderlib.cfg @@ -30,29 +30,35 @@ general { I:tileEntityCachedBoundingBoxUpdateInterval=100 opengldebugoutput { + # Enable/Disable crashing when an OpenGL error occurs. If disabled OpenGL errors are likely to go unnoticed unless the log is checked manually. B:crashOnError=false # Better debugging of OpenGL errors. Might not be supported by your hardware/driver. B:enabled=false - - # Enable/Disable logging of high severity non-error messages. (You probably never want to enable this as a normal user) B:logHighSeverity=false - - # Enable/Disable logging of low severity non-error messages. (You probably never want to enable this as a normal user) B:logLowSeverity=false - - # Enable/Disable logging of medium severity non-error messages. (You probably never want to enable this as a normal user) B:logMediumSeverity=false - - # Enable/Disable logging of notification severity non-error messages. (You probably never want to enable this as a normal user) B:logNotificationSeverity=false + + # Enable/Disable appending of the stack trace when logging a debug message. + # Valid values: + # DISABLED + # ALWAYS + # ERRORS_ONLY S:logStackTrace=ERRORS_ONLY + + # Enable/Disable debug messages matching the specified filters. + # Format: 'source, type, severity, enabled' + # Valid source values: [ ANY, API, WINDOW_SYSTEM, SHADER_COMPILER, THIRD_PARTY, APPLICATION, OTHER ] + # Valid type values: [ ANY, ERROR, DEPRECATED_BEHAVIOR, UNDEFINED_BEHAVIOR, PORTABILITY, PERFORMANCE, MARKER, PUSH_GROUP, POP_GROUP, OTHER ] + # Valid severity values: [ ANY, HIGH, MEDIUM, LOW, NOTIFICATION ] S:messageFilters < ANY;ERROR;ANY;true > + + # May be required by some systems to generate OpenGL debug output. (Enabling might have a negative impact on performance) B:setContextDebugBit=false } } - diff --git a/config/tconstruct_oredictcache.dat b/config/tconstruct_oredictcache.dat index e8421d0b475fcac924911b8fdf1fc7229361f2e7..5ae16bc8e203db805d473c15b778757ba05d6095 100644 GIT binary patch delta 65 zcmeyql=b^k)(valPgeL)HhJy);z=KkHlO&AqBy-*h%s}zju2zg^mt)L{_SkSjAu2s X-?Cv07h+>AE=VlO-frN}c$^sk4L2JL delta 63 zcmeyql=b^k)(valPged=JbCT=vPmC}HlO&AqBwo35M$DGT_MJd>2bo00^8Yy8P966 Vu%_iCZogo|7$vmb(4X-bGXT>-8Xo`v diff --git a/config/teamreborn/configData.nbt b/config/teamreborn/configData.nbt index 7f25833203ffefe1031b2e330d4f754a80604ce1..22296f3fe8f59494e8b249be18e54bb667d0b8b4 100644 GIT binary patch delta 7312 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 soulaccumemcless11.addFluidInput(*1); soulaccumemcless11.addItemInput(.withTag({entityId: "aoa3:ghostine_ancient"})); -soulaccumemcless11.addItemInput(); +soulaccumemcless11.addItemInput(); soulaccumemcless11.addItemOutput(*2); soulaccumemcless11.build(); diff --git a/scripts/MythicProcessorAssemblingMachine.zs b/scripts/MythicProcessorAssemblingMachine.zs index a7eca60a..8ee7da44 100644 --- a/scripts/MythicProcessorAssemblingMachine.zs +++ b/scripts/MythicProcessorAssemblingMachine.zs @@ -216,7 +216,7 @@ mythassmac30.addItemInput(); mythassmac30.addItemInput(); mythassmac30.addItemInput(); mythassmac30.addItemInput(*4); -mythassmac30.addItemOutput(); +mythassmac30.addItemOutput(); mythassmac30.build(); diff --git a/scripts/TheGreatOreCleanse.zs b/scripts/TheGreatOreCleanse.zs index c03a6e81..ac8d8ecf 100644 --- a/scripts/TheGreatOreCleanse.zs +++ b/scripts/TheGreatOreCleanse.zs @@ -72,6 +72,15 @@ mods.immersiveengineering.ArcFurnace.removeRecipe(); mods.immersiveengineering.ArcFurnace.addRecipe(, , null, 100, 512, [*3]); mods.immersiveengineering.ArcFurnace.addRecipe(, , null, 100, 512, [*3]); +recipes.removeShaped(*4, +[[, , ], +[, null, ], +[, , ]]); +recipes.addShaped(*4, +[[, , ], +[, null, ], +[, , ]]); + //================================================================== // titanium diff --git a/scripts/mixin/AstralRelayHalo.zs b/scripts/mixin/AedialClientVSServer/AstralRelayHaloClient.zs similarity index 99% rename from scripts/mixin/AstralRelayHalo.zs rename to scripts/mixin/AedialClientVSServer/AstralRelayHaloClient.zs index 59ced9d3..a1c84c02 100644 --- a/scripts/mixin/AstralRelayHalo.zs +++ b/scripts/mixin/AedialClientVSServer/AstralRelayHaloClient.zs @@ -1,5 +1,6 @@ #modloaded astralsorcery #loader mixin +#clientonly import native.hellfirepvp.astralsorcery.client.ClientScheduler; import native.net.minecraft.client.renderer.BufferBuilder; diff --git a/scripts/mixin/AstralRelayRenderFix.zs b/scripts/mixin/AedialClientVSServer/AstralRelayRenderFixClient.zs similarity index 54% rename from scripts/mixin/AstralRelayRenderFix.zs rename to scripts/mixin/AedialClientVSServer/AstralRelayRenderFixClient.zs index 3af83302..d6598a0d 100644 --- a/scripts/mixin/AstralRelayRenderFix.zs +++ b/scripts/mixin/AedialClientVSServer/AstralRelayRenderFixClient.zs @@ -3,22 +3,14 @@ import native.hellfirepvp.astralsorcery.common.tile.TileAttunementRelay; -import native.net.minecraft.block.state.IBlockState; import native.net.minecraft.client.Minecraft; import native.net.minecraft.client.renderer.GlStateManager; import native.net.minecraft.client.renderer.RenderHelper; import native.net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import native.net.minecraft.entity.player.EntityPlayer; import native.net.minecraft.item.ItemStack; -import native.net.minecraft.tileentity.TileEntity; -import native.net.minecraft.util.math.BlockPos; import native.net.minecraft.util.math.MathHelper; -import native.net.minecraft.util.EnumHand; -import native.net.minecraft.util.EnumFacing; -import native.net.minecraft.world.World; import mixin.CallbackInfo; -import mixin.CallbackInfoReturnable; // Replace TESRAttunementRelay's item rendering so TEISR items (e.g., DivineRPG statues) render correctly #mixin {targets: "hellfirepvp.astralsorcery.client.render.tile.TESRAttunementRelay"} @@ -65,37 +57,3 @@ zenClass MixinTESRAttunementRelay_RenderFix { ci.cancel(); } } - - -/* -Early-return in BlockAttunementRelay#onBlockActivated when the held item equals the current slot item (including NBT), -avoiding the eject-then-insert flow that appears as duplication. -This behavior is due to how we short-circuit the normal rendering path in TESRAttunementRelay. -*/ -#mixin {targets: "hellfirepvp.astralsorcery.common.block.BlockAttunementRelay"} -zenClass MixinBlockAttunementRelay_OnActivateGuard { - // SRG HEAD: Block#onBlockActivated -> func_180639_a - #mixin Inject - #{ - # method: "func_180639_a", - # at: { value: "HEAD" }, - # cancellable: true - #} - function sameItemNoOp(world as World, pos as BlockPos, state as IBlockState, player as EntityPlayer, hand as EnumHand, facing as EnumFacing, hitX as float, hitY as float, hitZ as float, cir as CallbackInfoReturnable) as void { - if (world.isRemote) return; - - val held as ItemStack = player.getHeldItem(hand); - if (held.isEmpty()) return; - - val te as TileEntity = world.getTileEntity(pos); - if (!(te instanceof TileAttunementRelay)) return; - - val tar as TileAttunementRelay = te as TileAttunementRelay; - val inv = tar.getInventoryHandler(); - if (inv == null) return; - - val current as ItemStack = inv.getStackInSlot(0); - if (!current.isEmpty() && ItemStack.areItemsEqual(current, held) && ItemStack.areItemStackTagsEqual(current, held)) - cir.setReturnValue(true); - } -} diff --git a/scripts/mixin/AedialClientVSServer/AstralRelayRenderFixServer.txt b/scripts/mixin/AedialClientVSServer/AstralRelayRenderFixServer.txt new file mode 100644 index 00000000..29c28017 --- /dev/null +++ b/scripts/mixin/AedialClientVSServer/AstralRelayRenderFixServer.txt @@ -0,0 +1,49 @@ +#modloaded astralsorcery +#loader mixin + +import native.hellfirepvp.astralsorcery.common.tile.TileAttunementRelay; + +import native.net.minecraft.block.state.IBlockState; +import native.net.minecraft.entity.player.EntityPlayer; +import native.net.minecraft.item.ItemStack; +import native.net.minecraft.tileentity.TileEntity; +import native.net.minecraft.util.math.BlockPos; +import native.net.minecraft.util.EnumHand; +import native.net.minecraft.util.EnumFacing; +import native.net.minecraft.world.World; + +import mixin.CallbackInfoReturnable; + + +/* +Early-return in BlockAttunementRelay#onBlockActivated when the held item equals the current slot item (including NBT), +avoiding the eject-then-insert flow that appears as duplication. +This behavior is due to how we short-circuit the normal rendering path in TESRAttunementRelay. +*/ +#mixin {targets: "hellfirepvp.astralsorcery.common.block.BlockAttunementRelay"} +zenClass MixinBlockAttunementRelay_OnActivateGuard { + // SRG HEAD: Block#onBlockActivated -> func_180639_a + #mixin Inject + #{ + # method: "func_180639_a", + # at: { value: "HEAD" }, + # cancellable: true + #} + function sameItemNoOp(world as World, pos as BlockPos, state as IBlockState, player as EntityPlayer, hand as EnumHand, facing as EnumFacing, hitX as float, hitY as float, hitZ as float, cir as CallbackInfoReturnable) as void { + if (world.isRemote) return; + + val held as ItemStack = player.getHeldItem(hand); + if (held.isEmpty()) return; + + val te as TileEntity = world.getTileEntity(pos); + if (!(te instanceof TileAttunementRelay)) return; + + val tar as TileAttunementRelay = te as TileAttunementRelay; + val inv = tar.getInventoryHandler(); + if (inv == null) return; + + val current as ItemStack = inv.getStackInSlot(0); + if (!current.isEmpty() && ItemStack.areItemsEqual(current, held) && ItemStack.areItemStackTagsEqual(current, held)) + cir.setReturnValue(true); + } +} diff --git a/scripts/mixin/SigilTableJEITransfer.zs b/scripts/mixin/AedialClientVSServer/SigilTableJEITransferClient.zs similarity index 99% rename from scripts/mixin/SigilTableJEITransfer.zs rename to scripts/mixin/AedialClientVSServer/SigilTableJEITransferClient.zs index f6d5064b..52d2fbd4 100644 --- a/scripts/mixin/SigilTableJEITransfer.zs +++ b/scripts/mixin/AedialClientVSServer/SigilTableJEITransferClient.zs @@ -1,5 +1,6 @@ #modloaded bewitchment #loader mixin +#clientonly import native.mezz.jei.api.IModRegistry; import native.mezz.jei.api.recipe.transfer.IRecipeTransferRegistry; diff --git a/scripts/mixin/LastStandrework/LastStandFormula.zs b/scripts/mixin/LastStandrework/LastStandFormula.txt similarity index 100% rename from scripts/mixin/LastStandrework/LastStandFormula.zs rename to scripts/mixin/LastStandrework/LastStandFormula.txt diff --git a/scripts/mixin/LazyAe2.zs b/scripts/mixin/LazyAe2.txt similarity index 100% rename from scripts/mixin/LazyAe2.zs rename to scripts/mixin/LazyAe2.txt diff --git a/scripts/mixin/aoa3/BossBuffs.zs b/scripts/mixin/aoa3/BossBuffs.zs new file mode 100644 index 00000000..7f8c572c --- /dev/null +++ b/scripts/mixin/aoa3/BossBuffs.zs @@ -0,0 +1,35 @@ +#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.boss.kingshroomus.EntityKingShroomus"} +zenClass MixinEntityKingShroomus { + #mixin ModifyConstant + #{ + # method: "getBaseMaxHealth", + # constant: {doubleValue: 1800.0} + #} + function mbc_modify_hp_KingShroomus(original as double) as double { + return CFG.hp_KingShroomus; + } +} + + +#mixin Mixin +#{targets: "net.tslat.aoa3.entity.boss.shadowlord.EntityShadowlord"} +zenClass MixinEntityShadowlord { + #mixin ModifyConstant + #{ + # method: "func_110147_ax", + # constant: {doubleValue: 2000.0} + #} + function mbc_modify_hp_Shadowlord(original as double) as double { + return CFG.hp_Shadowlord; + } +} \ No newline at end of file diff --git a/scripts/mixin/aoa3/MaterialRegisterBuffs.zs b/scripts/mixin/aoa3/MaterialRegisterBuffs.zs new file mode 100644 index 00000000..822457a7 --- /dev/null +++ b/scripts/mixin/aoa3/MaterialRegisterBuffs.zs @@ -0,0 +1,425 @@ +#modloaded aoa3 +#loader mixin + +import scripts.mixin.aoa3.StatsConfig as CFG; + +/* +See StatsConfig.zs in this folder for values. +*/ + +#mixin {value: "net.tslat.aoa3.common.registration.MaterialsRegister"} +zenClass MixinWeaponRegister { + #mixin Definition + #{ + # id: "addToolMaterial", method: "Lnet/minecraftforge/common/util/EnumHelper;addToolMaterial(Ljava/lang/String;IIFFI)Lnet/minecraft/item/Item$ToolMaterial;" + #} + #mixin Expression + #{ + # value: "addToolMaterial('AOABARON', ?, ?, ?, @(?), ?)" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_dmg_BaronSword(original as float) as float { + return CFG.dmg_BaronSword; + } + + #mixin Definition + #{ + # id: "addToolMaterial", method: "Lnet/minecraftforge/common/util/EnumHelper;addToolMaterial(Ljava/lang/String;IIFFI)Lnet/minecraft/item/Item$ToolMaterial;" + #} + #mixin Expression + #{ + # value: "addToolMaterial('AOABLOODFURY', ?, ?, ?, @(?), ?)" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_dmg_Bloodfury(original as float) as float { + return CFG.dmg_Bloodfury; + } + + #mixin Definition + #{ + # id: "addToolMaterial", method: "Lnet/minecraftforge/common/util/EnumHelper;addToolMaterial(Ljava/lang/String;IIFFI)Lnet/minecraft/item/Item$ToolMaterial;" + #} + #mixin Expression + #{ + # value: "addToolMaterial('AOABLOODSTONE', ?, ?, ?, @(?), ?)" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_dmg_BloodstoneSword(original as float) as float { + return CFG.dmg_BloodstoneSword; + } + + #mixin Definition + #{ + # id: "addToolMaterial", method: "Lnet/minecraftforge/common/util/EnumHelper;addToolMaterial(Ljava/lang/String;IIFFI)Lnet/minecraft/item/Item$ToolMaterial;" + #} + #mixin Expression + #{ + # value: "addToolMaterial('AOACARAMELCARVER', ?, ?, ?, @(?), ?)" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_dmg_CaramelCarver(original as float) as float { + return CFG.dmg_CaramelCarver; + } + + #mixin Definition + #{ + # id: "addToolMaterial", method: "Lnet/minecraftforge/common/util/EnumHelper;addToolMaterial(Ljava/lang/String;IIFFI)Lnet/minecraft/item/Item$ToolMaterial;" + #} + #mixin Expression + #{ + # value: "addToolMaterial('AOACHAINSAWTOOL', ?, ?, ?, @(?), ?)" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_dmg_Chainsaw(original as float) as float { + return CFG.dmg_Chainsaw; + } + + #mixin Definition + #{ + # id: "addToolMaterial", method: "Lnet/minecraftforge/common/util/EnumHelper;addToolMaterial(Ljava/lang/String;IIFFI)Lnet/minecraft/item/Item$ToolMaterial;" + #} + #mixin Expression + #{ + # value: "addToolMaterial('AOACORALSTORM', ?, ?, ?, @(?), ?)" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_dmg_CoralstormSword(original as float) as float { + return CFG.dmg_CoralstormSword; + } + + #mixin Definition + #{ + # id: "addToolMaterial", method: "Lnet/minecraftforge/common/util/EnumHelper;addToolMaterial(Ljava/lang/String;IIFFI)Lnet/minecraft/item/Item$ToolMaterial;" + #} + #mixin Expression + #{ + # value: "addToolMaterial('AOACREEPIFIED', ?, ?, ?, @(?), ?)" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_dmg_CreepifiedSword(original as float) as float { + return CFG.dmg_CreepifiedSword; + } + + #mixin Definition + #{ + # id: "addToolMaterial", method: "Lnet/minecraftforge/common/util/EnumHelper;addToolMaterial(Ljava/lang/String;IIFFI)Lnet/minecraft/item/Item$ToolMaterial;" + #} + #mixin Expression + #{ + # value: "addToolMaterial('AOACRYSTALLITE', ?, ?, ?, @(?), ?)" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_dmg_CrystalliteSword(original as float) as float { + return CFG.dmg_CrystalliteSword; + } + + #mixin Definition + #{ + # id: "addToolMaterial", method: "Lnet/minecraftforge/common/util/EnumHelper;addToolMaterial(Ljava/lang/String;IIFFI)Lnet/minecraft/item/Item$ToolMaterial;" + #} + #mixin Expression + #{ + # value: "addToolMaterial('AOAEXPLOCHRON', ?, ?, ?, @(?), ?)" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_dmg_ExplochronSword(original as float) as float { + return CFG.dmg_ExplochronSword; + } + + #mixin Definition + #{ + # id: "addToolMaterial", method: "Lnet/minecraftforge/common/util/EnumHelper;addToolMaterial(Ljava/lang/String;IIFFI)Lnet/minecraft/item/Item$ToolMaterial;" + #} + #mixin Expression + #{ + # value: "addToolMaterial('AOAGUARDIAN', ?, ?, ?, @(?), ?)" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_dmg_GuardianSword(original as float) as float { + return CFG.dmg_GuardianSword; + } + + #mixin Definition + #{ + # id: "addToolMaterial", method: "Lnet/minecraftforge/common/util/EnumHelper;addToolMaterial(Ljava/lang/String;IIFFI)Lnet/minecraft/item/Item$ToolMaterial;" + #} + #mixin Expression + #{ + # value: "addToolMaterial('AOAHARVESTER', ?, ?, ?, @(?), ?)" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_dmg_HarvesterSword(original as float) as float { + return CFG.dmg_HarvesterSword; + } + + #mixin Definition + #{ + # id: "addToolMaterial", method: "Lnet/minecraftforge/common/util/EnumHelper;addToolMaterial(Ljava/lang/String;IIFFI)Lnet/minecraft/item/Item$ToolMaterial;" + #} + #mixin Expression + #{ + # value: "addToolMaterial('AOAHOLY', ?, ?, ?, @(?), ?)" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_dmg_HolySword(original as float) as float { + return CFG.dmg_HolySword; + } + + #mixin Definition + #{ + # id: "addToolMaterial", method: "Lnet/minecraftforge/common/util/EnumHelper;addToolMaterial(Ljava/lang/String;IIFFI)Lnet/minecraft/item/Item$ToolMaterial;" + #} + #mixin Expression + #{ + # value: "addToolMaterial('AOAILLUSION', ?, ?, ?, @(?), ?)" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_dmg_IllusionSword(original as float) as float { + return CFG.dmg_IllusionSword; + } + + #mixin Definition + #{ + # id: "addToolMaterial", method: "Lnet/minecraftforge/common/util/EnumHelper;addToolMaterial(Ljava/lang/String;IIFFI)Lnet/minecraft/item/Item$ToolMaterial;" + #} + #mixin Expression + #{ + # value: "addToolMaterial('AOALIGHTSWAY', ?, ?, ?, @(?), ?)" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_dmg_LightsWaySword(original as float) as float { + return CFG.dmg_LightsWaySword; + } + + #mixin Definition + #{ + # id: "addToolMaterial", method: "Lnet/minecraftforge/common/util/EnumHelper;addToolMaterial(Ljava/lang/String;IIFFI)Lnet/minecraft/item/Item$ToolMaterial;" + #} + #mixin Expression + #{ + # value: "addToolMaterial('AOAPRIMAL', ?, ?, ?, @(?), ?)" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_dmg_PrimalSword(original as float) as float { + return CFG.dmg_PrimalSword; + } + + #mixin Definition + #{ + # id: "addToolMaterial", method: "Lnet/minecraftforge/common/util/EnumHelper;addToolMaterial(Ljava/lang/String;IIFFI)Lnet/minecraft/item/Item$ToolMaterial;" + #} + #mixin Expression + #{ + # value: "addToolMaterial('AOAROCKBASHER', ?, ?, ?, @(?), ?)" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_dmg_RockbasherSword(original as float) as float { + return CFG.dmg_RockbasherSword; + } + + #mixin Definition + #{ + # id: "addToolMaterial", method: "Lnet/minecraftforge/common/util/EnumHelper;addToolMaterial(Ljava/lang/String;IIFFI)Lnet/minecraft/item/Item$ToolMaterial;" + #} + #mixin Expression + #{ + # value: "addToolMaterial('AOAROSIDIAN', ?, ?, ?, @(?), ?)" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_dmg_RosidianSword(original as float) as float { + return CFG.dmg_RosidianSword; + } + + #mixin Definition + #{ + # id: "addToolMaterial", method: "Lnet/minecraftforge/common/util/EnumHelper;addToolMaterial(Ljava/lang/String;IIFFI)Lnet/minecraft/item/Item$ToolMaterial;" + #} + #mixin Expression + #{ + # value: "addToolMaterial('AOARUNIC', ?, ?, ?, @(?), ?)" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_dmg_RunicSword(original as float) as float { + return CFG.dmg_RunicSword; + } + + #mixin Definition + #{ + # id: "addToolMaterial", method: "Lnet/minecraftforge/common/util/EnumHelper;addToolMaterial(Ljava/lang/String;IIFFI)Lnet/minecraft/item/Item$ToolMaterial;" + #} + #mixin Expression + #{ + # value: "addToolMaterial('AOASHADOW', ?, ?, ?, @(?), ?)" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_dmg_ShadowSword(original as float) as float { + return CFG.dmg_ShadowSword; + } + + #mixin Definition + #{ + # id: "addToolMaterial", method: "Lnet/minecraftforge/common/util/EnumHelper;addToolMaterial(Ljava/lang/String;IIFFI)Lnet/minecraft/item/Item$ToolMaterial;" + #} + #mixin Expression + #{ + # value: "addToolMaterial('AOASHROOMUS', ?, ?, ?, @(?), ?)" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_dmg_ShroomusSword(original as float) as float { + return CFG.dmg_ShroomusSword; + } + + #mixin Definition + #{ + # id: "addToolMaterial", method: "Lnet/minecraftforge/common/util/EnumHelper;addToolMaterial(Ljava/lang/String;IIFFI)Lnet/minecraft/item/Item$ToolMaterial;" + #} + #mixin Expression + #{ + # value: "addToolMaterial('AOASKELETAL', ?, ?, ?, @(?), ?)" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_dmg_SkeletalSword(original as float) as float { + return CFG.dmg_SkeletalSword; + } + + #mixin Definition + #{ + # id: "addToolMaterial", method: "Lnet/minecraftforge/common/util/EnumHelper;addToolMaterial(Ljava/lang/String;IIFFI)Lnet/minecraft/item/Item$ToolMaterial;" + #} + #mixin Expression + #{ + # value: "addToolMaterial('AOASUPREMACY', ?, ?, ?, @(?), ?)" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_dmg_SupremacySword(original as float) as float { + return CFG.dmg_SupremacySword; + } + + #mixin Definition + #{ + # id: "addToolMaterial", method: "Lnet/minecraftforge/common/util/EnumHelper;addToolMaterial(Ljava/lang/String;IIFFI)Lnet/minecraft/item/Item$ToolMaterial;" + #} + #mixin Expression + #{ + # value: "addToolMaterial('AOASWEET', ?, ?, ?, @(?), ?)" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_dmg_SweetSword(original as float) as float { + return CFG.dmg_SweetSword; + } +} \ No newline at end of file diff --git a/scripts/mixin/aoa3/StatsConfig.zs b/scripts/mixin/aoa3/StatsConfig.zs new file mode 100644 index 00000000..8a0fe6ed --- /dev/null +++ b/scripts/mixin/aoa3/StatsConfig.zs @@ -0,0 +1,41 @@ +#modloaded aoa3 +#priority 10 +#loader mixin + +// Mob HP +static hp_KingShroomus as double = 3000.0d; +static hp_Shadowlord as double = 5000.0d; + +// Melee Weapons +static dmg_BaronSword as float = 99.0f; +static dmg_Bloodfury as float = 35.0f; +static dmg_BloodstoneSword as float = 29.0f; +static dmg_CaramelCarver as float = 49.0f; +static dmg_Chainsaw as float = 799.0f; +static dmg_CoralstormSword as float = 13.0f; +static dmg_CreepifiedSword as float = 33.0f; +static dmg_CrystalliteSword as float = 54.0f; +static dmg_ExplochronSword as float = 59.0f; +static dmg_GuardianSword as float = 59.0f; +static dmg_HarvesterSword as float = 249.0f; +static dmg_HolySword as float = 199.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_RosidianSword as float = 54.0f; +static dmg_RunicSword as float = 499.0f; +static dmg_ShadowSword as float = 399.0f; +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; + +// Ranged Weapons +static dmg_ChilliChugger as double = 40.0d; +static dmg_DartGun as double = 100.0d; +static dmg_FlamingFury as double = 200.0d; +static dmg_NethengeicSlugger as double = 240.0d; +static dmg_WithersWrath as double = 100.0d; + +static energyCost_WithersWrath as float = 8.0f; \ No newline at end of file diff --git a/scripts/mixin/aoa3/WeaponRegisterBuffs.zs b/scripts/mixin/aoa3/WeaponRegisterBuffs.zs new file mode 100644 index 00000000..ceb89bb9 --- /dev/null +++ b/scripts/mixin/aoa3/WeaponRegisterBuffs.zs @@ -0,0 +1,119 @@ +#modloaded aoa3 +#loader mixin + +import scripts.mixin.aoa3.StatsConfig as CFG; + +/* +See StatsConfig.zs in this folder for values. +*/ + +#mixin {value: "net.tslat.aoa3.common.registration.WeaponRegister"} +zenClass MixinWeaponRegister { + #mixin Definition + #{ + # id: "ChilliChugger", type: "net/tslat/aoa3/item/weapon/gun/ChilliChugger" + #} + #mixin Expression + #{ + # value: "new ChilliChugger(@(?), ?, ?, ?)" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "registerWeapon", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_dmg_ChilliChugger(original as double) as double { + return CFG.dmg_ChilliChugger; + } + + #mixin Definition + #{ + # id: "DartGun", type: "net/tslat/aoa3/item/weapon/gun/DartGun" + #} + #mixin Expression + #{ + # value: "new DartGun(@(?), ?, ?, ?)" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "registerWeapon", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_dmg_DartGun(original as double) as double { + return CFG.dmg_DartGun; + } + + #mixin Definition + #{ + # id: "FlamingFury", type: "net/tslat/aoa3/item/weapon/gun/FlamingFury" + #} + #mixin Expression + #{ + # value: "new FlamingFury(@(?), ?, ?, ?)" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "registerWeapon", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_dmg_FlamingFury(original as double) as double { + return CFG.dmg_FlamingFury; + } + + #mixin Definition + #{ + # id: "NethengeicSlugger", type: "net/tslat/aoa3/item/weapon/gun/NethengeicSlugger" + #} + #mixin Expression + #{ + # value: "new NethengeicSlugger(@(?), ?, ?, ?)" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "registerWeapon", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_dmg_NethengeicSlugger(original as double) as double { + return CFG.dmg_NethengeicSlugger; + } + + #mixin Definition + #{ + # id: "WithersWrath", type: "net/tslat/aoa3/item/weapon/blaster/WithersWrath" + #} + #mixin Expression + #{ + # value: "new WithersWrath(@(?), ?, ?, ?)" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "registerWeapon", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_dmg_WithersWrath(original as double) as double { + return CFG.dmg_WithersWrath; + } + + #mixin Definition + #{ + # id: "WithersWrath", type: "net/tslat/aoa3/item/weapon/blaster/WithersWrath" + #} + #mixin Expression + #{ + # value: "new WithersWrath(?, ?, ?, @(?))" + #} + #mixin Static + #mixin ModifyExpressionValue + #{ + # method: "registerWeapon", + # at: {value: "MIXINEXTRAS:EXPRESSION"} + #} + function mbc_modify_energyCost_WithersWrath(original as float) as float { + return CFG.energyCost_WithersWrath; + } +} \ No newline at end of file diff --git a/scripts/mixin/aoa3/aoa3.zs b/scripts/mixin/aoa3/aoa3.zs deleted file mode 100644 index 4a18b3bc..00000000 --- a/scripts/mixin/aoa3/aoa3.zs +++ /dev/null @@ -1,38 +0,0 @@ -#loader mixin - -import mixin.CallbackInfo; -import native.net.tslat.aoa3.entity.boss.kingshroomus.EntityKingShroomus; -import native.net.tslat.aoa3.entity.boss.shadowlord.EntityShadowlord; - -/* -Edit aoa3 boss HP -*/ - -// king shroomus -#mixin Mixin -#{targets: "net.tslat.aoa3.entity.boss.kingshroomus.EntityKingShroomus"} -zenClass MixinEntityKingShroomus { - #mixin ModifyConstant - #{ - # method: "getBaseMaxHealth", - # constant: {floatValue: 1800} - #} - function mbc_changeShroomusMaxHP(value as float) as float { - return 3000.0f; - } -} - - -// shadowlord -#mixin Mixin -#{targets: "net.tslat.aoa3.entity.boss.shadowlord.EntityShadowlord"} -zenClass MixinEntityShadowlord { - #mixin ModifyConstant - #{ - # method: "applyEntityAttributes", - # constant: {intValue: 2000} - #} - function mbc_changeShroomusMaxHP(value as int) as int { - return 5000; - } -} \ No newline at end of file diff --git a/scripts/mixin/aoa3/aoa3BaronSwordBuff.zs b/scripts/mixin/aoa3/aoa3BaronSwordBuff.zs deleted file mode 100644 index 4306bdcc..00000000 --- a/scripts/mixin/aoa3/aoa3BaronSwordBuff.zs +++ /dev/null @@ -1,25 +0,0 @@ -#modloaded aoa3 -#loader mixin - -import mixin.CallbackInfo; -import native.net.tslat.aoa3.common.registration.MaterialsRegister; - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.MaterialsRegister"} -zenClass MixinMaterialsRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "", - # constant: {floatValue: 12.0}, - # slice: { - # from: {value: "CONSTANT", args: "stringValue=AOABARON"}, - # to: {value: "CONSTANT", args: "stringValue=AOABLOODFURY"} - # } - #} - function modifyBaronswordDamage(original as float) as float { - return 99.0f; - } -} - - diff --git a/scripts/mixin/aoa3/aoa3BloodfuryBuff.zs b/scripts/mixin/aoa3/aoa3BloodfuryBuff.zs deleted file mode 100644 index a16543d5..00000000 --- a/scripts/mixin/aoa3/aoa3BloodfuryBuff.zs +++ /dev/null @@ -1,25 +0,0 @@ -#modloaded aoa3 -#loader mixin - -import mixin.CallbackInfo; -import native.net.tslat.aoa3.common.registration.MaterialsRegister; - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.MaterialsRegister"} -zenClass MixinMaterialsRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "", - # constant: {floatValue: 13.0}, - # slice: { - # from: {value: "CONSTANT", args: "stringValue=AOABLOODFURY"}, - # to: {value: "CONSTANT", args: "stringValue=AOABLOODSTONE"} - # } - #} - function modifyBloodfuryDamage(original as float) as float { - return 35.0f; - } -} - - diff --git a/scripts/mixin/aoa3/aoa3BloodstoneSwordBuff.zs b/scripts/mixin/aoa3/aoa3BloodstoneSwordBuff.zs deleted file mode 100644 index 14e783cb..00000000 --- a/scripts/mixin/aoa3/aoa3BloodstoneSwordBuff.zs +++ /dev/null @@ -1,25 +0,0 @@ -#modloaded aoa3 -#loader mixin - -import mixin.CallbackInfo; -import native.net.tslat.aoa3.common.registration.MaterialsRegister; - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.MaterialsRegister"} -zenClass MixinMaterialsRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "", - # constant: {floatValue: 14.0}, - # slice: { - # from: {value: "CONSTANT", args: "stringValue=AOABLOODSTONE"}, - # to: {value: "CONSTANT", args: "stringValue=AOACANDLEFIRE"} - # } - #} - function modifyBloodgemSwordDamage(original as float) as float { - return 29.0f; - } -} - - diff --git a/scripts/mixin/aoa3/aoa3CaramelCarverBuff.zs b/scripts/mixin/aoa3/aoa3CaramelCarverBuff.zs deleted file mode 100644 index 27110ebc..00000000 --- a/scripts/mixin/aoa3/aoa3CaramelCarverBuff.zs +++ /dev/null @@ -1,25 +0,0 @@ -#modloaded aoa3 -#loader mixin - -import mixin.CallbackInfo; -import native.net.tslat.aoa3.common.registration.MaterialsRegister; - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.MaterialsRegister"} -zenClass MixinMaterialsRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "", - # constant: {floatValue: 15.5}, - # slice: { - # from: {value: "CONSTANT", args: "stringValue=AOACARAMELCARVER"}, - # to: {value: "CONSTANT", args: "stringValue=AOACORALSTORM"} - # } - #} - function modifyCaramelcarverDamage(original as float) as float { - return 49.0f; - } -} - - diff --git a/scripts/mixin/aoa3/aoa3ChainsawBuffs.zs b/scripts/mixin/aoa3/aoa3ChainsawBuffs.zs deleted file mode 100644 index 396ef354..00000000 --- a/scripts/mixin/aoa3/aoa3ChainsawBuffs.zs +++ /dev/null @@ -1,25 +0,0 @@ -#modloaded aoa3 -#loader mixin - -import mixin.CallbackInfo; -import native.net.tslat.aoa3.common.registration.MaterialsRegister; - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.MaterialsRegister"} -zenClass MixinMaterialsRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "", - # constant: {floatValue: 4.0}, - # slice: { - # from: {value: "CONSTANT", args: "stringValue=AOACHAINSAWTOOL"}, - # to: {value: "CONSTANT", args: "stringValue=AOAEMBERSTONETOOL"} - # } - #} - function modifyChainsawDamage(original as float) as float { - return 799.0f; - } -} - - diff --git a/scripts/mixin/aoa3/aoa3ChilliChuggerBuff.zs b/scripts/mixin/aoa3/aoa3ChilliChuggerBuff.zs deleted file mode 100644 index be265301..00000000 --- a/scripts/mixin/aoa3/aoa3ChilliChuggerBuff.zs +++ /dev/null @@ -1,21 +0,0 @@ -#modloaded aoa3 -#loader mixin - -import mixin.CallbackInfo; -import native.net.tslat.aoa3.common.registration.MaterialsRegister; - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.MaterialsRegister"} -zenClass MixinWeaponRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "ChilliChugger", - # constant: {floatValue: 12.0} - #} - function modifyChillichuggerDamage(original as float) as float { - return 40.0f; - } -} - - diff --git a/scripts/mixin/aoa3/aoa3CoralstormBuff.zs b/scripts/mixin/aoa3/aoa3CoralstormBuff.zs deleted file mode 100644 index 3d6c0085..00000000 --- a/scripts/mixin/aoa3/aoa3CoralstormBuff.zs +++ /dev/null @@ -1,24 +0,0 @@ -#modloaded aoa3 -#loader mixin - -import mixin.CallbackInfo; -import native.net.tslat.aoa3.common.registration.MaterialsRegister; - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.MaterialsRegister"} -zenClass MixinMaterialsRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "", - # constant: {floatValue: 8.0}, - # slice: { - # from: {value: "CONSTANT", args: "stringValue=AOACORALSTORM"}, - # to: {value: "CONSTANT", args: "stringValue=AOACREEPIFIED"} - # } - #} - function modifyRunicswordDamage(original as float) as float { - return 13.0f; - } -} - diff --git a/scripts/mixin/aoa3/aoa3CreepswordBuff.zs b/scripts/mixin/aoa3/aoa3CreepswordBuff.zs deleted file mode 100644 index 76c4d3a4..00000000 --- a/scripts/mixin/aoa3/aoa3CreepswordBuff.zs +++ /dev/null @@ -1,25 +0,0 @@ -#modloaded aoa3 -#loader mixin - -import mixin.CallbackInfo; -import native.net.tslat.aoa3.common.registration.MaterialsRegister; - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.MaterialsRegister"} -zenClass MixinMaterialsRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "", - # constant: {floatValue: 13.5}, - # slice: { - # from: {value: "CONSTANT", args: "stringValue=AOACREEPIFIED"}, - # to: {value: "CONSTANT", args: "stringValue=AOACRYSTALLITE"} - # } - #} - function modifyBloodgemSwordDamage(original as float) as float { - return 33.0f; - } -} - - diff --git a/scripts/mixin/aoa3/aoa3CrystalliteSwordBuff.zs b/scripts/mixin/aoa3/aoa3CrystalliteSwordBuff.zs deleted file mode 100644 index a18eaf01..00000000 --- a/scripts/mixin/aoa3/aoa3CrystalliteSwordBuff.zs +++ /dev/null @@ -1,25 +0,0 @@ -#modloaded aoa3 -#loader mixin - -import mixin.CallbackInfo; -import native.net.tslat.aoa3.common.registration.MaterialsRegister; - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.MaterialsRegister"} -zenClass MixinMaterialsRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "", - # constant: {floatValue: 14.0}, - # slice: { - # from: {value: "CONSTANT", args: "stringValue=AOACRYSTALLITE"}, - # to: {value: "CONSTANT", args: "stringValue=AOAEMBERSTONE"} - # } - #} - function modifyCrystalliteswordDamage(original as float) as float { - return 54.0f; - } -} - - diff --git a/scripts/mixin/aoa3/aoa3DartGunBuff.zs b/scripts/mixin/aoa3/aoa3DartGunBuff.zs deleted file mode 100644 index d4511f91..00000000 --- a/scripts/mixin/aoa3/aoa3DartGunBuff.zs +++ /dev/null @@ -1,17 +0,0 @@ -#modloaded aoa3 -#loader mixin - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.WeaponRegister"} -zenClass MixinWeaponRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "registerWeapon", - # slice: {from: {value: "NEW", target: "net/tslat/aoa3/item/weapon/gun/DartGun"}}, - # constant: {doubleValue: 10.0f, ordinal: 0} - #} - function modifyDartGunDamage(original as double) as double { - return 100.0; - } -} \ No newline at end of file diff --git a/scripts/mixin/aoa3/aoa3ExplochronBuff.zs b/scripts/mixin/aoa3/aoa3ExplochronBuff.zs deleted file mode 100644 index 5242391a..00000000 --- a/scripts/mixin/aoa3/aoa3ExplochronBuff.zs +++ /dev/null @@ -1,25 +0,0 @@ -#modloaded aoa3 -#loader mixin - -import mixin.CallbackInfo; -import native.net.tslat.aoa3.common.registration.MaterialsRegister; - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.MaterialsRegister"} -zenClass MixinMaterialsRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "", - # constant: {floatValue: 15.0}, - # slice: { - # from: {value: "CONSTANT", args: "stringValue=AOAEXPLOCHRON"}, - # to: {value: "CONSTANT", args: "stringValue=AOAFIREBORNE"} - # } - #} - function modifyExplochronDamage(original as float) as float { - return 59.0f; - } -} - - diff --git a/scripts/mixin/aoa3/aoa3FlamingFuryBuff.zs b/scripts/mixin/aoa3/aoa3FlamingFuryBuff.zs deleted file mode 100644 index 5c0214b6..00000000 --- a/scripts/mixin/aoa3/aoa3FlamingFuryBuff.zs +++ /dev/null @@ -1,17 +0,0 @@ -#modloaded aoa3 -#loader mixin - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.WeaponRegister"} -zenClass MixinWeaponRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "registerWeapon", - # slice: {from: {value: "NEW", target: "net/tslat/aoa3/item/weapon/gun/FlamingFury"}}, - # constant: {doubleValue: 20.5f, ordinal: 0} - #} - function modifyFlamingFuryDamage(original as double) as double { - return 200.0; - } -} \ No newline at end of file diff --git a/scripts/mixin/aoa3/aoa3GuardianSwordBuff.zs b/scripts/mixin/aoa3/aoa3GuardianSwordBuff.zs deleted file mode 100644 index 97b4672f..00000000 --- a/scripts/mixin/aoa3/aoa3GuardianSwordBuff.zs +++ /dev/null @@ -1,25 +0,0 @@ -#modloaded aoa3 -#loader mixin - -import mixin.CallbackInfo; -import native.net.tslat.aoa3.common.registration.MaterialsRegister; - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.MaterialsRegister"} -zenClass MixinMaterialsRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "", - # constant: {floatValue: 15.0}, - # slice: { - # from: {value: "CONSTANT", args: "stringValue=AOAGUARDIAN"}, - # to: {value: "CONSTANT", args: "stringValue=AOAHARVESTER"} - # } - #} - function modifyGuardianswordDamage(original as float) as float { - return 59.0f; - } -} - - diff --git a/scripts/mixin/aoa3/aoa3HarvesterswordBuff.zs b/scripts/mixin/aoa3/aoa3HarvesterswordBuff.zs deleted file mode 100644 index 8a2b7c07..00000000 --- a/scripts/mixin/aoa3/aoa3HarvesterswordBuff.zs +++ /dev/null @@ -1,25 +0,0 @@ -#modloaded aoa3 -#loader mixin - -import mixin.CallbackInfo; -import native.net.tslat.aoa3.common.registration.MaterialsRegister; - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.MaterialsRegister"} -zenClass MixinMaterialsRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "", - # constant: {floatValue: 17.5}, - # slice: { - # from: {value: "CONSTANT", args: "stringValue=AOAHARVESTER"}, - # to: {value: "CONSTANT", args: "stringValue=AOAHOLY"} - # } - #} - function modifyRunicswordDamage(original as float) as float { - return 249.0f; - } -} - - diff --git a/scripts/mixin/aoa3/aoa3HolySwordBuff.zs b/scripts/mixin/aoa3/aoa3HolySwordBuff.zs deleted file mode 100644 index e839c2f0..00000000 --- a/scripts/mixin/aoa3/aoa3HolySwordBuff.zs +++ /dev/null @@ -1,25 +0,0 @@ -#modloaded aoa3 -#loader mixin - -import mixin.CallbackInfo; -import native.net.tslat.aoa3.common.registration.MaterialsRegister; - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.MaterialsRegister"} -zenClass MixinMaterialsRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "", - # constant: {floatValue: 0.0}, - # slice: { - # from: {value: "CONSTANT", args: "stringValue=AOAHOLY"}, - # to: {value: "CONSTANT", args: "stringValue=AOAILLUSION"} - # } - #} - function modifyHolyswordDamage(original as float) as float { - return 199.0f; - } -} - - diff --git a/scripts/mixin/aoa3/aoa3IllusionSwordBuff.zs b/scripts/mixin/aoa3/aoa3IllusionSwordBuff.zs deleted file mode 100644 index 675f9489..00000000 --- a/scripts/mixin/aoa3/aoa3IllusionSwordBuff.zs +++ /dev/null @@ -1,25 +0,0 @@ -#modloaded aoa3 -#loader mixin - -import mixin.CallbackInfo; -import native.net.tslat.aoa3.common.registration.MaterialsRegister; - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.MaterialsRegister"} -zenClass MixinMaterialsRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "", - # constant: {floatValue: 14.5}, - # slice: { - # from: {value: "CONSTANT", args: "stringValue=AOAILLUSION"}, - # to: {value: "CONSTANT", args: "stringValue=AOAJADE"} - # } - #} - function modifyIllusionSwordDamage(original as float) as float { - return 37.5f; - } -} - - diff --git a/scripts/mixin/aoa3/aoa3LightswayBuff.zs b/scripts/mixin/aoa3/aoa3LightswayBuff.zs deleted file mode 100644 index 0719fcf9..00000000 --- a/scripts/mixin/aoa3/aoa3LightswayBuff.zs +++ /dev/null @@ -1,25 +0,0 @@ -#modloaded aoa3 -#loader mixin - -import mixin.CallbackInfo; -import native.net.tslat.aoa3.common.registration.MaterialsRegister; - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.MaterialsRegister"} -zenClass MixinMaterialsRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "", - # constant: {floatValue: 7.5}, - # slice: { - # from: {value: "CONSTANT", args: "stringValue=AOALIGHTSWAY"}, - # to: {value: "CONSTANT", args: "stringValue=AOALIMONITE"} - # } - #} - function modifyLightswayDamage(original as float) as float { - return 999.0f; - } -} - - diff --git a/scripts/mixin/aoa3/aoa3NethengeicSluggerBuff.zs b/scripts/mixin/aoa3/aoa3NethengeicSluggerBuff.zs deleted file mode 100644 index 89be33e5..00000000 --- a/scripts/mixin/aoa3/aoa3NethengeicSluggerBuff.zs +++ /dev/null @@ -1,17 +0,0 @@ -#modloaded aoa3 -#loader mixin - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.WeaponRegister"} -zenClass MixinWeaponRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "registerWeapon", - # slice: {from: {value: "NEW", target: "net/tslat/aoa3/item/weapon/gun/NethengeicSlugger"}}, - # constant: {doubleValue: 22.5f, ordinal: 0} - #} - function modifyNethengeicSluggerDamage(original as double) as double { - return 240.0; - } -} \ No newline at end of file diff --git a/scripts/mixin/aoa3/aoa3PrimalswordBuff.zs b/scripts/mixin/aoa3/aoa3PrimalswordBuff.zs deleted file mode 100644 index 849cdf61..00000000 --- a/scripts/mixin/aoa3/aoa3PrimalswordBuff.zs +++ /dev/null @@ -1,25 +0,0 @@ -#modloaded aoa3 -#loader mixin - -import mixin.CallbackInfo; -import native.net.tslat.aoa3.common.registration.MaterialsRegister; - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.MaterialsRegister"} -zenClass MixinMaterialsRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "", - # constant: {floatValue: 13.0}, - # slice: { - # from: {value: "CONSTANT", args: "stringValue=AOAPRIMAL"}, - # to: {value: "CONSTANT", args: "stringValue=AOAROCKBASHER"} - # } - #} - function modifyPrimalswordDamage(original as float) as float { - return 35.0f; - } -} - - diff --git a/scripts/mixin/aoa3/aoa3RockbasherBuff.zs b/scripts/mixin/aoa3/aoa3RockbasherBuff.zs deleted file mode 100644 index c2f04dfa..00000000 --- a/scripts/mixin/aoa3/aoa3RockbasherBuff.zs +++ /dev/null @@ -1,25 +0,0 @@ -#modloaded aoa3 -#loader mixin - -import mixin.CallbackInfo; -import native.net.tslat.aoa3.common.registration.MaterialsRegister; - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.MaterialsRegister"} -zenClass MixinMaterialsRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "", - # constant: {floatValue: 16.0}, - # slice: { - # from: {value: "CONSTANT", args: "stringValue=AOAROCKBASHER"}, - # to: {value: "CONSTANT", args: "stringValue=AOAROCKPICK"} - # } - #} - function modifyGuardianswordDamage(original as float) as float { - return 259.0f; - } -} - - diff --git a/scripts/mixin/aoa3/aoa3RosidianswordBuff.zs b/scripts/mixin/aoa3/aoa3RosidianswordBuff.zs deleted file mode 100644 index 28b4f7ca..00000000 --- a/scripts/mixin/aoa3/aoa3RosidianswordBuff.zs +++ /dev/null @@ -1,25 +0,0 @@ -#modloaded aoa3 -#loader mixin - -import mixin.CallbackInfo; -import native.net.tslat.aoa3.common.registration.MaterialsRegister; - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.MaterialsRegister"} -zenClass MixinMaterialsRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "", - # constant: {floatValue: 15.5}, - # slice: { - # from: {value: "CONSTANT", args: "stringValue=AOAROSIDIAN"}, - # to: {value: "CONSTANT", args: "stringValue=AOAROSITE"} - # } - #} - function modifyRosidianswordDamage(original as float) as float { - return 54.0f; - } -} - - diff --git a/scripts/mixin/aoa3/aoa3RunicSwordBuff.zs b/scripts/mixin/aoa3/aoa3RunicSwordBuff.zs deleted file mode 100644 index 2e60c5cd..00000000 --- a/scripts/mixin/aoa3/aoa3RunicSwordBuff.zs +++ /dev/null @@ -1,25 +0,0 @@ -#modloaded aoa3 -#loader mixin - -import mixin.CallbackInfo; -import native.net.tslat.aoa3.common.registration.MaterialsRegister; - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.MaterialsRegister"} -zenClass MixinMaterialsRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "", - # constant: {floatValue: 17.5}, - # slice: { - # from: {value: "CONSTANT", args: "stringValue=AOARUNIC"}, - # to: {value: "CONSTANT", args: "stringValue=AOASAPPHIRE"} - # } - #} - function modifyRunicswordDamage(original as float) as float { - return 499.0f; - } -} - - diff --git a/scripts/mixin/aoa3/aoa3ShadowswordBuff.zs b/scripts/mixin/aoa3/aoa3ShadowswordBuff.zs deleted file mode 100644 index 541c124e..00000000 --- a/scripts/mixin/aoa3/aoa3ShadowswordBuff.zs +++ /dev/null @@ -1,25 +0,0 @@ -#modloaded aoa3 -#loader mixin - -import mixin.CallbackInfo; -import native.net.tslat.aoa3.common.registration.MaterialsRegister; - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.MaterialsRegister"} -zenClass MixinMaterialsRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "", - # constant: {floatValue: 17.0}, - # slice: { - # from: {value: "CONSTANT", args: "stringValue=AOASHADOW"}, - # to: {value: "CONSTANT", args: "stringValue=AOASHROOMUS"} - # } - #} - function modifyRunicswordDamage(original as float) as float { - return 399.0f; - } -} - - diff --git a/scripts/mixin/aoa3/aoa3ShroomusswordBuff.zs b/scripts/mixin/aoa3/aoa3ShroomusswordBuff.zs deleted file mode 100644 index 9012fa20..00000000 --- a/scripts/mixin/aoa3/aoa3ShroomusswordBuff.zs +++ /dev/null @@ -1,25 +0,0 @@ -#modloaded aoa3 -#loader mixin - -import mixin.CallbackInfo; -import native.net.tslat.aoa3.common.registration.MaterialsRegister; - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.MaterialsRegister"} -zenClass MixinMaterialsRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "", - # constant: {floatValue: 15.0}, - # slice: { - # from: {value: "CONSTANT", args: "stringValue=AOASHROOMUS"}, - # to: {value: "CONSTANT", args: "stringValue=AOASKELETAL"} - # } - #} - function modifyShroomusswordDamage(original as float) as float { - return 61.0f; - } -} - - diff --git a/scripts/mixin/aoa3/aoa3SkeletalswordBuff.zs b/scripts/mixin/aoa3/aoa3SkeletalswordBuff.zs deleted file mode 100644 index 41e3d3bc..00000000 --- a/scripts/mixin/aoa3/aoa3SkeletalswordBuff.zs +++ /dev/null @@ -1,25 +0,0 @@ -#modloaded aoa3 -#loader mixin - -import mixin.CallbackInfo; -import native.net.tslat.aoa3.common.registration.MaterialsRegister; - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.MaterialsRegister"} -zenClass MixinMaterialsRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "", - # constant: {floatValue: 10.5}, - # slice: { - # from: {value: "CONSTANT", args: "stringValue=AOASKELETAL"}, - # to: {value: "CONSTANT", args: "stringValue=AOASUPREMACY"} - # } - #} - function modifySkeletalswordDamage(original as float) as float { - return 37.0f; - } -} - - diff --git a/scripts/mixin/aoa3/aoa3Supremacyswordbuff.zs b/scripts/mixin/aoa3/aoa3Supremacyswordbuff.zs deleted file mode 100644 index 1dad83dc..00000000 --- a/scripts/mixin/aoa3/aoa3Supremacyswordbuff.zs +++ /dev/null @@ -1,25 +0,0 @@ -#modloaded aoa3 -#loader mixin - -import mixin.CallbackInfo; -import native.net.tslat.aoa3.common.registration.MaterialsRegister; - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.MaterialsRegister"} -zenClass MixinMaterialsRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "", - # constant: {floatValue: 14.5}, - # slice: { - # from: {value: "CONSTANT", args: "stringValue=AOASUPREMACY"}, - # to: {value: "CONSTANT", args: "stringValue=AOASWEET"} - # } - #} - function modifySupremacyswordDamage(original as float) as float { - return 54.0f; - } -} - - diff --git a/scripts/mixin/aoa3/aoa3SweetswordBuff.zs b/scripts/mixin/aoa3/aoa3SweetswordBuff.zs deleted file mode 100644 index 2dc297f3..00000000 --- a/scripts/mixin/aoa3/aoa3SweetswordBuff.zs +++ /dev/null @@ -1,25 +0,0 @@ -#modloaded aoa3 -#loader mixin - -import mixin.CallbackInfo; -import native.net.tslat.aoa3.common.registration.MaterialsRegister; - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.MaterialsRegister"} -zenClass MixinMaterialsRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "", - # constant: {floatValue: 15.0}, - # slice: { - # from: {value: "CONSTANT", args: "stringValue=AOASWEET"}, - # to: {value: "CONSTANT", args: "stringValue=AOATROLLBASHERAXE"} - # } - #} - function modifySweetswordDamage(original as float) as float { - return 54.0f; - } -} - - diff --git a/scripts/mixin/aoa3/aoa3WitherWrathBuff.zs b/scripts/mixin/aoa3/aoa3WitherWrathBuff.zs deleted file mode 100644 index 5ec19ab6..00000000 --- a/scripts/mixin/aoa3/aoa3WitherWrathBuff.zs +++ /dev/null @@ -1,19 +0,0 @@ -#modloaded aoa3 -#loader mixin - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.WeaponRegister"} -zenClass MixinWeaponRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "registerWeapon", - # slice: {from: {value: "NEW", target: "net/tslat/aoa3/item/weapon/blaster/WithersWrath"}}, - # constant: {doubleValue: 7.5f, ordinal: 0} - #} - function modifyWitherWrathDamage(original as double) as double { - return 100.0; - } -} - - diff --git a/scripts/mixin/aoa3/aoa3WitherWrathBuff2.zs b/scripts/mixin/aoa3/aoa3WitherWrathBuff2.zs deleted file mode 100644 index 7b1fbb3f..00000000 --- a/scripts/mixin/aoa3/aoa3WitherWrathBuff2.zs +++ /dev/null @@ -1,17 +0,0 @@ -#modloaded aoa3 -#loader mixin - -#mixin Mixin -#{targets: "net.tslat.aoa3.common.registration.WeaponRegister"} -zenClass MixinWeaponRegister { - #mixin Static - #mixin ModifyConstant - #{ - # method: "registerWeapon", - # slice: {from: {value: "NEW", target: "net/tslat/aoa3/item/weapon/blaster/WithersWrath"}}, - # constant: {doubleValue: 21f, ordinal: 0} - #} - function modifyWitherWrathDamage(original as double) as double { - return 8.0; - } -} \ No newline at end of file diff --git a/scripts/mixin/astralperk_V3.zip b/scripts/mixin/astralperk_V3.zip deleted file mode 100644 index 13acb4dad77aa6b368c05a7163785ad2471a7fee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9647 zcmWIWW@h1H0D+e+=FuP;hItqm7!r$1iV|}QQj4;S^+75{7#J8h7`i7KMQh}?zxQKg zU|7w>z#xXEGBGDPu_)0{uc~J=9m#j*jdPh*W^V%YBkEsH$oC741HBWCqT>W@%A@ecfRSER@!Uzi`G-I;@KZFf`ld<nbyTTyqVNTVulx1?-eB9FX}4vatbN_*RV$ZXnxM6C$|?4+W5U@FCVTAG^6sAh zqQzmiI^W;$Y1+wlQ|{UB?n=9_yPQc*@phA;sL`AL-*4JxWNw-kb1Wcv&HPQ<6)Rcq z{hTR~$v*vbUSbtzS2jnT*5rDn$!>EFK6R_S@0`EulTu1g;!7)+ufKL}S|YSM*zX+s zQ>XiqZnxT7H!L;ka&BjwdeB(sqF_05VE&PbuTy*KmVarOeac((FYo(PG6`D8ZytWU zXs6Y4-d7R(Z(Vmgnv(qS2EXdh(^-3Gt~WdB;kG(z@uQ~~uF8J#lw2DjI!&Uh_6lQY zXwT%=s<|w)yncqO$TAf?ZAQ? z*39qfH$B{xYtX{H`^BjWLt)!pf=)Gzh}cMOHjh57^hTJAk%8eIBLjmJdVVO%O)N@u zEXvI<0>#Kg+k7TNp0@9Qx;mnxR(55$&xle{VY{+w>aN}8b{jmBp8N=4yj!2YBgQ`B z^})iN=aqApaNVhBW0U6gWUWbB8Q8Z>YEu$(ZIDUZp?R*S&*>ic&A+02^^H$|c8fT^ zY{=`rw_Rn2{hPa@7q7}NxvTG3ILCh1b;AnBn@e{ZUS-(++Hr%G_6auAvu~cvKjE40 zCm}8uq;+BSDqHEv2zUKD@Y0L9|ZFu7y9eGRdnwLzj#20S8>S^lFmYC~oS;%4c zf10evcKeGJi@Q0q)IT=uk3ZL*lV6p5MjR1>0xjmz{t;)b0vQda#3bU zW^!VVM`j7ASeZM?Hv6!FKwJ4=u0(xZmWfX7k1j0S(Ng9SH0y%ticN21F1k-Rx6toH z{ra4py_=`rQ<#76v+ei9<+sF6eR2|;Qe6^L`MRZq*R%R+Aa8sE2V?C9zQ?^!V^;d> zeOte5%jWqL9&)&!EDKsGG{;7U|4rA4maDgv_>a~F?DkE-1JCM2 z-n^PATLn3;1;}0(sS>~ppD@yW1exa_byEOM4ue@#eVH`|K;wJ(pm z?aZ^=^6vGIjh|O-EZkY96mBU#FCgQ6fR@e19l;Z&e=wbvm~l$+Yy3&4jK7Lc9v&6T z`xm^a>A{LgdoS%`2)Vk^E3c!o=Mf@_mETnTTR_AOE5ZLHihW^NXz z!;!gJK|fgHocI>qPbkWrz^wUnx>AJqd#CGKPdBF;TRky7q0skiOW*=yN1Jc57n3&M zdnb2&cgCS+*R_rhgAz{n{ZJ6pVAeL?DIT_Jjnj9@-t;YwdQbn@AIXt24SzD>+xkV@ zCLM^(t73QlZhYa*ImIant$hC_-^=Xyf3}T#dt+DDmYP{-rWIe?EPd>TIU+mow3tVy z*nQv%VPs%fgg+9DK_$v0Z%`S3{QXZ6a2d~8#{Aa6aN%19ALh4FshLqcmEcIYU;8q7 z@ttKqFYKs4Zf`&3#tt9ri7R`!{WZ3fYlzN^xU=d6Z%tz=kI%~qyY{E(ZTTni=|fhr z`ESlh$AXZPewlNbSAB|5Ge6>Dl|08cKvdvM@TYs$`CR;U$0F_=`ngG0BHklm;R*lB zFa9YZn>TMN*4^`dfq7tEqD@46iSxp0%aCb$&3{bFL6PA4Ys#}^k+(5ovmlYMRy*hi zPn;9mqSpx}z7uRSPw7`i=+<(?uGE~b^Xj1LdPlaxfaM!y=5jvTc)H`+>#J$Mx7>15 zmJ7S0qrt$*9NC{^<%dmzOUa~ckNg}VC%I0$tRPJS(TlY_|1lh46_#V zXvR-lIzX+RmG~pW1k&X3KI|aS_Wrl_v?q%Km|Q&eHST5XCDs*S!(Ydd79Md=HS$Hqn{crdr z&ZTy(clOS@bgs_JO+ZfJW>b)=)eZS?Cq)e>hGl09v5T_(ow0}ir1Xxt^9{wy3--NW zJC-iAj_H$T|G$nNsWPU?nh$IF_pbV6{8+JVVK&$8(;GK!V4ZgSjFkVOfOyHMTkUMO zZYk-svvIZ_5?+(V^t~r8sS%VVGC^75xlx3-ywlYQpLSOoTRjmy1s$XM0)Lqj&G&+S=}c27%8GgHSg=UWQ1i~i}S*!9lhF825x9x3ga!Fzpg z`@+AhFaI60T62Lz^qAZE^6PF)O~$Jp4!VBwNvhTZq)txE>G^( z7qxSW)<4gm%a_Yple=(@#)1cjCJUd6RzD~kac5;;_8+Ii60hc#Uiq&&GvJl;iMQRF zZ@;LgusoET#H$gysQGT)^cVr*%&pth3Ih@^@SnW>U{BNSUz*8KAwTWTyn5`_Fat(dAuxoXhvDusqDR-Tu@q z52x%M@2-m*&71gc-I~K(y#Ws=e$4yxIzE5KHdFQx>%;0N|K^;kDm#plDK@v5N3;A{ zD(}z8z_1p7Y?y&EMUb!e5d(p}&%;~3E!rUB67b@Yqt>Dm>mKRFdHXECoA^0!(#@mq zF8$B@wea@dS2B}M&OTW^**z(jJJpquReau@fO}S)>k`)4^KGOFU$(|bC%L`6@wSYhzM_miDk{)26G=OXS*{_LtRA@8|^>%?-KU&^Uh zHZjle;e5}2X|tBSkzA5UY~YMIzlp878*+@YZ8)8sQ}hRc%fOOdh%{uU^nikrUr>)#^TvlSnf z7pw2#@VzR0FL&X|xfiysP*~5JTa?UwVySc2GOySPzLx*x^B1mOVY{*K<%X%&%A9K- zR(&w+`Os2QoG2TX(ZaRA_q$)rzqH4vcNaKVr~e2o`fZWUTz(oQ9(J{uN7svGvxGA; zFwDar59Z)p;p-3XkAZpvjG3#B=y}YxaJb0Q&U-{{U8u*Mb2{>&k9>13|FeF{zGk;# zO~#$;CqEwx3wk`I%&GB_(gblU3;l!dBX6ymC;i9iw8X4im9PG7iUHNv&u&i3`xU&Y zset{a)E2#q&U;sH=1x+ZYj`eAPOImaUG?k9;U8ujr0V28thpz(%w1?76PNJ3Kf*KT z++fUE=gJ}bWznhrp5rfkr;Ft4x1YMBsq=m3=Ejz#>n_P>+OcK44cQ|Tr6MB5|DnTi zk<-Tqty5p8l-$#)KGhU6#DD z{BBU*T9uM%v-1ir{^fl6?NsHO3tY1E#q($H|9AFR-0Tky(fL1p&F1+=9=9_@DWz_< zm`9fjv-A2gGB8ZVA0HOr_^|b7hV%tq>}qK7Yhqm~%4`*K@IuqAF437W@3K4|ohsD6 zwd()eJM3HT3djjP-}>2No6(05tENlSq!twf`zdK?{=~L*PHwN~{b!r+Rc`zv>F&iFwPW5ER`zPf zb!(3-Jom5j3}05d^FxJWd{tsstCvpx>iT?AT)y8_&Z!Z(++2YQ9^x<8n{;pAw8Y4k zkD06K@Z8!185>+?2zr*4`k2}#ulOD+wQ5gO^zDWFB<1}kEpncGWHMK8sE=Le?00Tq zHvZ4Mf4@}PeJRu8Y(|i^#H(o)&mT7b;BBtdKIojgIk+y_$$9O6uj=-UXo(H#=lI-1 z-j_vh<#U_R^zH5*iKl{3zcoo@^E|k;{!;Gs>HFjErzGd3o^_0WZvJ@Us~hY~uOPLb zy5lUO=k5q+XJBMtxXy^TJ7Ecmg+TBq#opiHGoEZZXdwG$(-R4ey9*7hZrt^r5^`l* z)0!zu75~>}POAN4C7bio_T|gO<@2=Mw>5d)*2sxf(QB-pdQKy|f4;;Nr~5*ugJvGG z`kr|DviAzj|I3<0ZJI5cicO8SJim5FW7ecS%M&D|=6tv(bM1-f50T=fmm*`{KW}}h zFim>GjF(U5Pdd3mPk<{uImRVF!dAof=&momYTuv6r}&Frt94ZD;@xEM`oz}{3ht}a ziX{RrSnWB`=rO7N{jag zOt||+ziQt8|0l!VUr(6O*IZ{bJJ+sxvDDO{ctl&ry4gJ1EYok5U7ITyhF)oDgYq>Y~VAEwfAFs>vGfB1>-UWNrDtS-0I! z^!)mjEMDv-(L4*44*pGipVx7&xM$9s1mC%JCHcu8x;C9IPVSP+Gp{}TXpMqt*1Vf1 z?I%vYHpf7h>4}X){-$p^Ip)Wfy}z~dd;L`2=^?V>b2d3$QZ$|xv#ev+(@n540Qmw2}yzq%(p`m$6qa%)92)I9pgg`M4?fPBx$z#xMb zkf0$o-_o2C-^48Fpn$JGv!X!T`#)Tl_GTn?$ocqG=j1#}6kgm}p3+{XV=y~$+s52) z`%l;XxVTy-p(4HF9^)zxUxnKai*v=cDGFOZSiH(@YUvSwAFsrm&eU5oxAH!`yX$Z8 zr!BwyRJAJ@Ha82{7;S0479-HRSVB{>O;_x1M%=Rpk`?pAy+V~^t}jk36+0b0Vb7KB zdL{9_R*q5Zvp=)!J@IPurPMRa)(7n>ub(dSG{r8;IOr_Ai<31+z&7(DB6OOx3H zPPR9TzduOXwEySYGUK$B=lAVdz31kIgF*La?f&g+Kh?MU{UqTfOCD#$-{ybR7*_7M zftRDkwI|xgY|8&j%5Q$D&w6jd!}iibw7vaomPqwg?WOw|5D7A*&nSA`9mQ9ij0_Af z@q}YYW@-_5WB@HITl3sXUa-MAF(A0SmlFL z#vu`r9$F8Cy*rDHeztV+e(}60!KK@MZmRZy-~1Z<{u`g2H5YY!*^$?O@4Ctjx#;qx zFTD5~7YpZP9Poda>NzivFEiQ4uJiWYlo|0NOB{W(Xa5a0dVN+h`Jv*{$S+-6#gp43 zeBw)Q?EBOGX2+smAq75Mf$3?IlKl<4o@Yh$DQPw?H}2cS%AHoeKliE8{%zB58Naap z!FRpvX;}a5y1d!zcXclna+g-SZ|<~Hp0#{#c-G&5dm93r1^;{qEEC%O_vEzWJ&G&l z9=Z51arev%_r4sPfizkh+GiBa=xcOYl#zkq2Z102b?N6$w9N+9N#*~!CPznUsIlx) zNnS8PG2qsPbMNNr2~K?Ke63aO;lJuy`M)Qkc(;8yRi$#@Nj8N?eZJi^A5;1tZ-|5c4de3BJE_3iE|IgZLTZR zpZuAp$VWT5i!pDz^WjIU;=V1&%uN69a?YxlF>bPdX3M>lw^wiE1YZt6dwF{O)Z8^2 z?A9x*e_fNDruA|_Jd?&5v=L67U*MBAtJo0;GIJ3jl}wb>2Z z4%N0Fy_^+beOWRYIYnltm`6Jph%e-4WMIITvq32m+&Q0kG7A)(@9VfG@7xmL^P<>qdA$)P3 z;SCB+^X7!YKz-{ATQ+R2S4y92=^QiBKeOfE%3IwVZ>n8PKYMxleq-r%8|>CvsC^AQ zeyU_iJkyJLt8HZ5LcX-5-!RJVue;5B;mxz<+vg~7SFilM`qk>?Vq#_Qo_&9vmm|G> zSMO3KcWJhd;w(E~cg~(BB7N$iDEB*qs#E(@*>8N^Zhm)#Ib*KsH?Hmcub)nM=ab&^ zlLe8rQ&P;M1@|7XA|_peI@WV1!rQJFs~9<5g$r)=2~W20aWXh)xg{_Ctf$uTwby+A zzF#6=^QMcx^RHFi84`*?&3>>rLO(c7Pg0D%h{IKi&z39d zkTK7V<&znbAK2a&d-0gTp?mlJRW--fep%}CUi&jO5c1;ChvP-- zzM6|KFJE2oGkTMagYwP5thEPDu3CA+-c{{_#FjHBg_Pz(wn z?FV8to6l!_T99&S(&{ZcpWWkM^ncYCw~U^RFU^j;JSq~I%=l{3;;)Uj4MN|4tus-CbaG<(!+l*lJbDDbY?R z_z{V@W1>-X+q8~Tpne!=*c5B%gG*P`88Ij8GOwG7EL_%Gq_ba|R&>tox)ruz?gjo& z_n%wboOSP5Nr&jksxMv^VG&*_s`{Fn&lzN16uC3UQ)W?{mPMl)OGxiA-g?htOa3Gs z{piab^KXes@r6%M4lET(sJMIWq^zN4faaCXhoV1zSpJlm%b(X*=IJ5xphQ;cSom?D zqjP;TzxbzInaF*8X390b3%hmp3cbqB*;N`>YuLMHBTM1Afav2}q>Yk2{|DZY-SFj+ zLo>75!$a2>Tx?-lfBkU)zfs!uRY^yde$o02x*mlSFPI3ZW7R#c4@z{R9pR@ug4s#jqjMc{qEHX z^ER4b?R3ICz?+dto&ncHrV0ZD2tX*5X-zH$1+XY1g9Jm$KGv2?I(HaveRBVls&|KR zYMB3C2Z=k35Yur@e!@%#nWKf4>kw0+$o6di+Oy%K#vMjs_ODT)dUqHLezS30(?GQc zbBYhyo;8f9ld}+eKnV=lp2Wtxn?Uybehjh4!Y)=7-JWEO$tz@gteDa4L7B=zwoCL; z?fDBjcNpC}zk&U9TV}&*5Fa`0FsFHt?W$oxwF_<12idY&2^S|_)Vag>DCs-cvM0eU zj37R;WtcM=$d<9O;j|1r6eV2cCx8sMneqc{*-?#dR}dfBGRzTsWXrnQaasmyA|U%r z?07^k$Z*kLKf#uz?((bz@sTaV9Fa!0Oo9`qWuR&l*|MG+v-g4wueA9MwoInHeI|&H zY#HXbE3#$txo}zr8ihr+Y(ZVa1(4zKy??-#9gT=Y?&?(PRl@pjL4Qr zYKM4&a`K0wzhKLPdUIc+TZTDyhHTkZUYwSJM$(WiJFzq(5M)`0!auNOxi9)OKzwAM zVGax-Tjt7-(=yO75wc~GS3`?IhU>EY2V3?$DIp%jN45-e`~%st(*igx1C53tTPAVv z_{?J6JB)AC7@|Q1RsG%tjp&wPju{|Z#v+7j8O8_#vUMuEzAgck8Jh$c!PYgOWXk~Y zk^P3*vqrYgR~Xeg^nNz7ZH=OR*$Z^;Fm`h>fo=Qaa{b{;v{D$e|A}ndR1xg9f!h9{ zrWUeol}air-f7%nT>J`RTVLo5_Sa~(VRqG!ZMz|g+cxwvtFp^u709+uP8P7=eiWSZ zMYj#JCxdL8x;Spz&k?eZ$HIYM6*Jh%#K_U|={78bV?K0ICCl A2mk;8 diff --git a/scripts/mixin/iceandfireweapons/tidetrident.zs b/scripts/mixin/iceandfireweapons/tidetrident.txt similarity index 100% rename from scripts/mixin/iceandfireweapons/tidetrident.zs rename to scripts/mixin/iceandfireweapons/tidetrident.txt