Classic Characters

images/hud/abigail_flower_commands.xml

@@ -0,0 +1,12 @@
+<Atlas>
+    <Texture filename="abigail_flower_commands.tex"/>
+    <Elements>
+        <Element name="haunt.tex" u1="0" u2="0.25" v1="0.75" v2="1"/>
+        <Element name="resume.tex" u1="0.25" u2="0.5" v1="0.75" v2="1"/>
+        <Element name="rileup.tex" u1="0.5" u2="0.75" v1="0.75" v2="1"/>
+        <Element name="smoothe.tex" u1="0.75" u2="1" v1="0.75" v2="1"/>
+        <Element name="unsummon.tex" u1="0" u2="0.25" v1="0.5" v2="0.75"/>
+        <Element name="freeze.tex" u1="0.75" u2="1" v1="0.5" v2="0.75"/>
+        <Element name="goto.tex" u1="0" u2="0.25" v1="0.25" v2="0.5"/>
+    </Elements>
+</Atlas>

main/RPC.lua

@@ -14,6 +14,22 @@ local function printinvalid(rpcname, player)
     end
 end
 
+local function IsPointInRange(player, position)
+    local px, _, pz = player.Transform:GetWorldPosition()
+    return distsq(position.x, position.z, px, pz) <= 4096
+end
+
+local function ConvertPlatformRelativePositionToAbsolutePosition(platform, relative_x, relative_z)
+    if not (relative_x and relative_z) then
+        return
+    end
+    if not platform then
+        return Vector3(relative_x, 0, relative_z)
+    end
+    local x, _, z = platform.entity:LocalToWorldSpace(relative_x, 0, relative_z)
+    return Vector3(x, 0, z)
+end
+
 AddShardModRPCHandler("Porkland", "SetAporkalypseClockRewindMult", function(shardid, rewind_mult)
     if not TheWorld.ismastershard then
         return
@@ -63,6 +79,30 @@ AddModRPCHandler("Porkland", "StrafeFacing_pl", function(player, dir)
     end
 end)
 
+AddModRPCHandler("Porkland", "CastSpellCommand", function(player, item, command_id, target, x, z, platform)
+    if not (
+        checkentity(item)
+        and checkstring(command_id)
+        and optentity(target)
+        and optnumber(x)
+        and optnumber(z)
+        and optentity(platform)
+    ) then
+        printinvalid("CastSpellCommand", player)
+        return
+    end
+
+    local playercontroller = player.components.playercontroller
+    if playercontroller then
+        local position = ConvertPlatformRelativePositionToAbsolutePosition(platform, x, z)
+        if not position or IsPointInRange(player, position) then
+            playercontroller:OnRemoteCastSpellCommand(item, command_id, position, target)
+        else
+            print("Remote left click out of range")
+        end
+    end
+end)
+
 AddClientModRPCHandler("Porkland", "interior_map", function(data)
     local interiorvisitor = ThePlayer and ThePlayer.replica.interiorvisitor
     if interiorvisitor then

main/actions.lua

@@ -26,7 +26,7 @@ if not rawget(_G, "HotReloading") then
         WEIGHDOWN = Action({distance = 1.5}),
         DISARM = Action({priority = 1, distance = 1.5}),
         REARM = Action({priority = 1, distance = 1.5}),
-        SPY = Action({distance = 2, mount_valid = true}),
+        SPY = Action({distance = 2}), -- 骑在牛上用放大镜不太合理
         PUTONSHELF = Action({ distance = 1.5 }),
         TAKEFROMSHELF = Action({ distance = 1.5, priority = 1 }),
         ASSEMBLE_ROBOT = Action({}),
@@ -60,6 +60,9 @@ if not rawget(_G, "HotReloading") then
         THROW = Action({priority = 0, invalid_hold_action = true, rmb = true, distance = 20, mount_valid = true}),
 
         DODGE = Action({priority = -5, invalid_hold_action = true, distance = math.huge}),
+
+        -- Replacing CASTAOE for custom controls
+        SPELL_COMMAND = Action({mount_valid = true, distance = 35}),
     }
 
     for name, ACTION in pairs(_G.PL_ACTIONS) do
@@ -620,6 +623,25 @@ ACTIONS.THROW.fn = function(act)
     end
 end
 
+ACTIONS.SPELL_COMMAND.stroverridefn = function(act)
+	return act.invobject
+        and act.invobject.components.spellcommand
+        and act.invobject.components.spellcommand:GetSeletedCommandName()
+        or nil
+end
+
+ACTIONS.SPELL_COMMAND.strfn = function(act)
+    return act.invobject and string.upper(act.invobject.prefab) or nil
+end
+
+-- TODO: This is currently unused, left here in case we want to use it in the future
+ACTIONS.SPELL_COMMAND.fn = function(act)
+    print("WARNING: This action should not be ran directly, instead it should be intercepted and redirected to the PlayerController.OnRemoteCastSpellCommand")
+    -- if act.invobject.components.spellcommand then
+    --     return act.invobject.components.spellcommand:Run(act)
+    -- end
+end
+
 local _EQUIP_fn = ACTIONS.EQUIP.fn
 function ACTIONS.EQUIP.fn(act, ...)
     if act.doer.components.inventory and act.invobject.components.equippable.equipslot then
@@ -847,6 +869,14 @@ ACTIONS.ROTATE_FENCE.fn = function(act)
     return _ROTATE_FENCEfn(act)
 end
 
+local castaoe_stroverridefn = ACTIONS.CASTAOE.stroverridefn
+ACTIONS.CASTAOE.stroverridefn = function(act, ...)
+    return act.invobject
+        and act.invobject.components.spellcommand
+        and act.invobject.components.spellcommand:GetSeletedCommandName()
+        or castaoe_stroverridefn(act, ...)
+end
+
 -- SCENE        using an object in the world
 -- USEITEM      using an inventory item on an object in the world
 -- POINT        using an inventory item on a point in the world
@@ -985,8 +1015,13 @@ local PL_COMPONENT_ACTIONS =
     },
 
     INVENTORY = { -- args: inst, doer, actions, right
+        balloonmaker = function (inst, doer, actions, right)
+            if doer:HasTag("balloonomancer") then
+                table.insert(actions, ACTIONS.MAKEBALLOON)
+            end
+        end,
         livingartifact = function (inst, doer, actions, right)
-            if not (inst.replica.inventoryitem and inst.replica.inventoryitem:IsHeldBy(doer)) then
+            if not (inst.replica.inventoryitem and inst.replica.inventoryitem:IsGrandOwner(doer)) then
                 return
             end
 
@@ -1231,6 +1266,27 @@ function POINT.fishingrod(inst, doer, pos, actions, right, target, ...)
     return _POINT_fishingrod(inst, doer, pos, actions, right, target, ...)
 end
 
+-- 由于用菜单代替轮盘, 因此需要修改阿比盖尔之花的相关交互, 此函数应当在将物品拖动至人物身上时以及在非玩家所属的容器内右键时生效
+function INVENTORY.summoningitem(inst, doer, actions, ...)
+    if doer:HasTag("ghostfriend_notsummoned") and inst.replica.inventoryitem:IsGrandOwner(doer) then
+		table.insert(actions, ACTIONS.CASTSUMMON)
+	end
+end
+
+local _USEITEM_tradable = USEITEM.tradable
+function USEITEM.tradable(inst, doer, target, actions, ...)
+    if target:HasTag("trader") and
+        target:HasTag("abigail") and
+        not target:IsInLimbo() and
+        not (doer.replica.rider ~= nil and doer.replica.rider:IsRiding() and
+        not (target.replica.inventoryitem ~= nil and target.replica.inventoryitem:IsGrandOwner(doer))) then
+
+        table.insert(actions, ACTIONS.GIVE)
+    else
+        return _USEITEM_tradable(inst, doer, target, actions, ...)
+    end
+end
+
 local PlayerController = require("components/playercontroller")
 
 local NON_AUTO_EQUIP_ACTIONS = {

main/assets.lua

@@ -264,6 +264,12 @@ PrefabFiles = {
     "windswirl",
     "windtrail",
     "worldsound",
+
+    "woodie_beaver_bag",
+
+    "waxwell_shield",
+    "waxwell_pillar",
+    "waxwell_minion",
 }
 
 Assets = {
@@ -289,6 +295,11 @@ Assets = {
     Asset("ATLAS", "images/hud/pl_mapscreen_widgets.xml"),
     Asset("IMAGE", "images/hud/pl_mapscreen_widgets.tex"),
 
+    -- abigail flower spell command icons
+    Asset("ATLAS", "images/hud/abigail_flower_commands.xml"),
+    Asset("IMAGE", "images/hud/abigail_flower_commands.tex"),
+    Asset("ANIM", "anim/ui_abigail_command_5x1.zip"),
+
     -- falloff
     Asset("IMAGE", "levels/tiles/black_falloff.tex"),
     Asset("FILE", "levels/tiles/black_falloff.xml"),
@@ -321,12 +332,11 @@ Assets = {
     Asset("ANIM", "anim/player_actions_panning.zip"),
     Asset("ANIM", "anim/player_boat_onoff.zip"),
     Asset("ANIM", "anim/swap_paddle.zip"),
-    Asset("ANIM", "anim/player_action_sailing.zip"),
+    Asset("ANIM", "anim/player_actions_sailing.zip"),
     Asset("ANIM", "anim/player_boat_death.zip"),
     Asset("ANIM", "anim/werebeaver_boat_death.zip"),
     Asset("ANIM", "anim/player_lifeplant.zip"),
     Asset("ANIM", "anim/player_actions_hand_lens.zip"),
-    Asset("ANIM", "anim/player_mount_hand_lens.zip"),
     Asset("ANIM", "anim/player_living_suit_destruct.zip"),
     Asset("ANIM", "anim/player_living_suit_morph.zip"),
     Asset("ANIM", "anim/player_living_suit_punch.zip"),
@@ -506,3 +516,14 @@ local function AddCharacter(name, gender)
 end
 
 AddCharacter("wheeler", "FEMALE")
+
+local dst_chracters = {
+    "wortox",
+    "wurt",
+    "walter",
+    "wanda",
+}
+
+for _, v in pairs(dst_chracters) do
+    RemoveDefaultCharacter(v)
+end

main/constants.lua

@@ -72,12 +72,16 @@ TECH.HOME = {
     HOME = 2
 }
 
+TECH.WAXWELLJOURNAL = {
+    SHADOW = 4
+}
+
 -- Just an arbitrary number
 BUILDMODE.HOME_DECOR = 10
 
 LOCKTYPE.ROYAL = "royal"
 
--- City pigman is dont in pigman_city.lua
+-- City pigman is done in pigman_city.lua
 
 NAUGHTY_VALUE["hippopotamoose"] = 4
 NAUGHTY_VALUE["pangolden"] = 4

main/cooking.lua

@@ -9,16 +9,32 @@ for _, recipe in pairs(foods) do
     AddCookerRecipe("archive_cookpot", recipe)
 end
 
-AddCookerRecipe("smelter", {
-    name = "alloy",
-    weight = 1,
-    priority = 1,
-    cooktime = 0.2,
-    test = function(cooker, name, tags)
-        return true  -- alway true
-    end,
-    no_cookbook = true
-})
+local smelter_recipes =
+{
+    alloy =
+    {
+        name = "alloy",
+        weight = 1,
+        priority = 1,
+        cooktime = 0.2,
+        test = function(cooker, name, tags)
+            if cooker == "smelter" then
+                return true  -- alway true
+            else
+                return false
+            end
+        end,
+        no_cookbook = true
+    },
+}
+
+for _, recipe in pairs(smelter_recipes) do
+    AddCookerRecipe("smelter", recipe)
+
+    AddCookerRecipe("cookpot", recipe) -- 与初版智能锅mod SmartCrockpot进行兼容(workshop-365119238)
+    AddCookerRecipe("portablecookpot", recipe)
+    AddCookerRecipe("archive_cookpot", recipe)
+end
 
 AddIngredientValues({"coffeebeans"}, {fruit = 0.5})
 AddIngredientValues({"coffeebeans_cooked"}, {fruit = 1})