From 0b4b9a1c6bf216633c85900565d6b63b1fa5a7cf Mon Sep 17 00:00:00 2001
From: hyperjuni <93186376+hyperjuni@users.noreply.github.com>
Date: Fri, 8 Nov 2024 23:39:05 +0200
Subject: [PATCH 1/2] Add Mechineki hardcore respawn animation

---
 .../mechineki/respawnhardcore.cinematic       | 208 ++++++++++++++++++
 1 file changed, 208 insertions(+)
 create mode 100644 cinematics/respawn/mechineki/respawnhardcore.cinematic

diff --git a/cinematics/respawn/mechineki/respawnhardcore.cinematic b/cinematics/respawn/mechineki/respawnhardcore.cinematic
new file mode 100644
index 0000000000..1115d6a83b
--- /dev/null
+++ b/cinematics/respawn/mechineki/respawnhardcore.cinematic
@@ -0,0 +1,208 @@
+{
+  "muteSfx" : true,
+  "muteMusic" : true,
+  "scissor" : false,
+  "letterbox" : false,
+  "panels" : [
+    {
+      "drawables" : [
+        {
+          "image" : "/cinematics/respawn/black.png"
+        }
+      ],
+      "keyframes" : [
+        {
+          "timecode" : 0.00,
+          "zoom" : 500,
+          "alpha" : 1,
+          "position" : [476, 253]
+        },
+        {
+          "timecode" : 11.5,
+          "zoom" : 500,
+          "alpha" : 1,
+          "position" : [476, 253]
+        },
+        {
+          "timecode" : 12,
+          "zoom" : 500,
+          "alpha" : 0,
+          "position" : [476, 253]
+        }
+      ]
+    },
+    {
+      "drawables" : [
+        {
+          "image" : "/cinematics/respawn/esc.png"
+        }
+      ],
+      "keyframes" : [
+        {
+          "timecode" : 0.74995,
+          "zoom" : 0.25,
+          "alpha" : 0,
+          "position" : [900, 30]
+        },
+        {
+          "timecode" : 0.749951,
+          "zoom" : 0.25,
+          "alpha" : 1,
+          "position" : [900, 30]
+        },
+        {
+          "timecode" : 10.5,
+          "zoom" : 0.25,
+          "alpha" : 1,
+          "position" : [900, 30]
+        }
+      ]
+    },
+    {
+      "startTime" : 4.5,
+      "endTime" : 10.5,
+      "drawables" : [
+      ],
+      "fontSize" : 16,
+      "text" : "50% of Pixels Lost",
+      "textPosition" : {
+        "position" : [40, 40],
+        "vAnchor" : "top",
+        "wrapWidth" : 218
+      },
+      "keyframes" : [
+        {
+          "timecode" : 0.0,
+          "alpha" : 1.0,
+          "zoom" : 1.0,
+          "position" : [366.5, 100],
+          "frame" : 0,
+          "textPercentage" : 0
+        },
+        {
+          "timecode" : 0.3,
+          "textPercentage" : 0
+        },
+        {
+          "timecode" : 2.5,
+          "frame" : 8,
+          "textPercentage" : 1
+        }
+      ]
+    },
+   {
+      "drawables" : [
+        {
+          "image" : "/cinematics/respawn/mechineki/layer1.png:<frame>"
+        }
+      ],
+      "keyframes" : [
+        {
+          "timecode" : 1.5,
+          "zoom" : 1.5,
+          "alpha" : 0,
+          "frame" : 0,
+          "position" : [478, 253]
+        },
+        {
+          "timecode" : 2.5,
+          "zoom" : 1.5,
+          "alpha" : 1,
+          "frame" : 0,
+          "position" : [478, 253]
+        },
+        {
+          "timecode" : 11,
+          "alpha" : 1,
+          "zoom" : 1.5,
+          "frame" : 93.999
+        },
+        {
+          "timecode" : 11.75,
+          "alpha" : 0,
+          "zoom" : 1.5,
+          "frame" : 93.999
+        }
+      ]
+    },
+    {
+      "avatar" : "fullneutralnude",
+      "keyframes" : [
+        {
+          "timecode" : 3.5,
+          "zoom" : 1.5,
+          "alpha" : 0,
+          "frame" : 0,
+          "position" : [478, 269]
+        },
+        {
+          "timecode" : 4,
+          "zoom" : 1.5,
+          "alpha" : 1,
+          "frame" : 0,
+          "position" : [478, 269]
+        },
+        {
+          "timecode" : 11.25,
+          "zoom" : 1.5,
+          "alpha" : 1,
+          "frame" : 0,
+          "position" : [478, 269]
+        },
+        {
+          "timecode" : 12,
+          "alpha" : 0,
+          "zoom" : 1.5,
+          "frame" : 93.999
+        }
+      ]
+    },
+    {
+      "drawables" : [
+        {
+          "image" : "/cinematics/respawn/mechineki/layer2.png:<frame>"
+        }
+      ],
+      "keyframes" : [
+        {
+          "timecode" : 1.5,
+          "zoom" : 1.5,
+          "alpha" : 0,
+          "frame" : 0,
+          "position" : [478, 253]
+        },
+        {
+          "timecode" : 2.5,
+          "zoom" : 1.5,
+          "alpha" : 1,
+          "frame" : 0,
+          "position" : [478, 253]
+        },
+        {
+          "timecode" : 11,
+          "alpha" : 1,
+          "zoom" : 1.5,
+          "frame" : 93.999
+        },
+        {
+          "timecode" : 11.75,
+          "alpha" : 0,
+          "zoom" : 1.5,
+          "frame" : 93.999
+        }
+      ]
+    }
+  ],
+  "audio" : [
+    {
+      "timecode" : 3,
+      "resource" : "/sfx/cinematics/pixels_lost_piano.ogg"
+    },
+    {
+      "timecode" : 5,
+      "endTimecode" : 7,
+      "loops" : -1,
+      "resource" : "/sfx/interface/aichatter1_loop.ogg"
+    }
+  ]
+}

From 4513ce7d7e62d205a570a178e7f73d02a6278bc6 Mon Sep 17 00:00:00 2001
From: hyperjuni <93186376+hyperjuni@users.noreply.github.com>
Date: Thu, 14 Nov 2024 01:45:08 +0200
Subject: [PATCH 2/2] Made the 'frontiertub' loungeable

Other tubs allowed sitting in them, but this one didn't. Now it does too.
---
 ...ntiertubicon.object => frontiertub.object} |  32 +++++++++++++++---
 .../novakid/frontiertub/frontiertubcover.png  | Bin 0 -> 205 bytes
 2 files changed, 27 insertions(+), 5 deletions(-)
 rename objects/novakid/frontiertub/{frontiertubicon.object => frontiertub.object} (58%)
 create mode 100644 objects/novakid/frontiertub/frontiertubcover.png

diff --git a/objects/novakid/frontiertub/frontiertubicon.object b/objects/novakid/frontiertub/frontiertub.object
similarity index 58%
rename from objects/novakid/frontiertub/frontiertubicon.object
rename to objects/novakid/frontiertub/frontiertub.object
index 8b4c1abd07..4e7a2c6601 100644
--- a/objects/novakid/frontiertub/frontiertubicon.object
+++ b/objects/novakid/frontiertub/frontiertub.object
@@ -5,7 +5,7 @@
   "description" : "A cozy bath that stands on four brass feet",
   "shortdescription" : "Clawfoot Tub",
   "race" : "novakid",
-  "category" : "decorative",
+  "category" : "furniture",
   "price" : 200,
 
   "apexDescription" : "The lip of this bath gives it the look of a teacup.",
@@ -19,10 +19,32 @@
   "inventoryIcon" : "frontiertubicon.png",
   "orientations" : [
     {
-      "dualImage" : "frontiertub.png:<color>",
-      "imagePosition" : [-16, 0],
+      "image" : "frontiertub.png",
+      "imagePosition" : [0, 0],
+      "direction" : "left",
+      "flipImages" : true,
       "spaceScan" : 0.1,
-      "anchors" : [ "bottom" ]
+      "anchors" : ["bottom"],
+      "sitPosition" : [-16, 22]
+    },
+    {
+      "image" : "frontiertub.png",
+      "imagePosition" : [0, 0],
+	    "direction" : "right",
+      "spaceScan" : 0.1,
+      "anchors" : ["bottom"],
+      "sitPosition" : [16, 22]
     }
-  ]
+  ],
+
+  "objectType" : "loungeable",
+  "sitFlipDirection" : false,
+  "sitOrientation" : "sit",
+  "sitAngle" : 0,
+  "sitCoverImage" : "/objects/novakid/frontiertub/frontiertubcover.png",
+  "sitEmote" : "happy",
+  "sitStatusEffects" : [
+    "nude"
+  ],
+  "sitEffectEmitters" : [ ]
 }
diff --git a/objects/novakid/frontiertub/frontiertubcover.png b/objects/novakid/frontiertub/frontiertubcover.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d28a7c21debc8ec8298fc0ab6fb644ba7fc69fb
GIT binary patch
literal 205
zcmeAS@N?(olHy`uVBq!ia0vp^3P3E$!3-qRFWy-Uq@)9ULR^9L#S1H+J-f7EPGL->
zV|J*pi3a<uTIKz#k~4Kb-ULcBmIV0)GdMiEkp|=>c)B=-RNQ)d%9V*Jkcaugm+L$J
zce*#TrJuYVBJ^kPDYll4%y)7)wn-P13(slb5Km%Puwl8M!+J7opNP*<an^_1S<OoJ
zaVaf7vTBuu+0>H<+1vM7Pfng(`ye8<D8Sr8?e`Ssizbm<o&oJ*@O1TaS?83{1OVS&
BN;Cif

literal 0
HcmV?d00001