605310

clothing.lua

@@ -2630,8 +2630,9 @@ CLOTHING =
 	{
 		type = "body",
 		skin_tags = { "LUNAR", "CLOTHING_BODY", "CLOTHING", },
-		symbol_overrides = { "arm_lower_cuff", "arm_lower", "arm_upper", "torso", "torso_pelvis", "foot", "leg", },
+		symbol_overrides = { "hand", "arm_lower", "arm_upper", "torso", "torso_pelvis", "foot", "leg", },
 		symbol_hides = { "skirt", "arm_upper_skin", },
+		symbol_in_base_hides = { "arm_lower_cuff", },
 		torso_tuck = "untucked",
 		rarity = "Distinguished",
 		rarity_modifier = "Woven",

components/dynamicmusic.lua

@@ -651,9 +651,8 @@ local function OnInsane()
 end
 
 local function OnEnlightened()
-	-- TEMP
     if _dangertask == nil and _isenabled and (_extendtime == 0 or GetTime() >= _extendtime) then
-        _soundemitter:PlaySound("dontstarve/sanity/gonecrazy_stinger")
+        _soundemitter:PlaySound("dontstarve/sanity/lunacy_stinger")
         StopBusy()
         --Repurpose this as a delay before stingers or busy can start again
         _extendtime = GetTime() + 15

components/trader.lua

@@ -84,6 +84,10 @@ function Trader:SetOnAccept(fn)
     self.onaccept = fn
 end
 
+function Trader:SetOnRefuse(fn)
+    self.onrefuse = fn
+end
+
 function Trader:SetAcceptStacks()
     self.acceptstacks = true
 end

consolecommands.lua

@@ -638,6 +638,31 @@ function c_listtag(tag)
     end
 end
 
+function c_kitcoon(name, age, build)
+    -- NOTES(JBK): This is for players who for outside forces or otherwise lost their kitcoon pet and want a way for it back.
+    -- The hope is that this function is easier to use and can be used by the community.
+    if type(name) ~= "string" or type(age) ~= "number" or type(build) ~= "string" or not table.contains(VALID_KITCOON_BUILDS, build) then
+        print("Invalid c_kitcoon use. c_kitcoon(\"name here\", #, \"build_name_here\")")
+        print("Example: c_kitcoon(\"kitty the IV\", 42, \"kitcoon_deciduous_build\")")
+        print("Age is how many days old it is. Valid build names are:")
+        for _, build in ipairs(VALID_KITCOON_BUILDS) do
+            print(build)
+        end
+        return
+    end
+    local now = os.time()
+    Profile:SetKitName(name)
+    Profile:SetKitLastTime(now)
+    Profile:SetKitBirthTime(now - age * 60 * 60 * 24)
+    Profile:SetKitBuild(build)
+    Profile:SetKitSize(1) -- Just make it large.
+    Profile:SetKitHunger(0.5)
+    Profile:SetKitHappiness(0.7)
+    Profile:SetKitPoops(0)
+    Profile:SetKitAbandonedMessage(false)
+    Profile:Save()
+end
+
 local lastroom = -1
 function c_gotoroom(roomname, inst)
     inst = ListingOrConsolePlayer(inst)

constants.lua

@@ -1859,6 +1859,18 @@ OCCUPANTTYPE =
     BIRD = "bird",
 }
 
+VALID_KITCOON_BUILDS = {
+    "kitcoon_forest_build",
+    "kitcoon_savanna_build",
+    "kitcoon_deciduous_build",
+    "kitcoon_marsh_build",
+    "kitcoon_grass_build",
+    "kitcoon_rocky_build",
+    "kitcoon_desert_build",
+    "kitcoon_moon_build",
+    "kitcoon_yot_build", 
+}
+
 FOODTYPE =
 {
     GENERIC = "GENERIC",