implement caffeine

assets/models/ar_skirt_tartan.gltf

@@ -0,0 +1,153 @@
+{
+	"asset":{
+		"generator":"Khronos glTF Blender I/O v4.2.70",
+		"version":"2.0"
+	},
+	"scene":0,
+	"scenes":[
+		{
+			"name":"Scene",
+			"nodes":[
+				0
+			]
+		}
+	],
+	"nodes":[
+		{
+			"mesh":0,
+			"name":"Skirt",
+			"rotation":[
+				0.18716467916965485,
+				0,
+				0,
+				0.9823286533355713
+			],
+			"scale":[
+				0.7949548363685608,
+				0.7549549341201782,
+				0.5049549341201782
+			],
+			"translation":[
+				0,
+				0,
+				-0.3132408559322357
+			]
+		}
+	],
+	"materials":[
+		{
+			"doubleSided":true,
+			"name":"Denim",
+			"pbrMetallicRoughness":{
+				"baseColorTexture":{
+					"index":0
+				},
+				"metallicFactor":0.5158730149269104,
+				"roughnessFactor":0.841269850730896
+			}
+		}
+	],
+	"meshes":[
+		{
+			"name":"Mesh",
+			"primitives":[
+				{
+					"attributes":{
+						"POSITION":0,
+						"NORMAL":1,
+						"TEXCOORD_0":2
+					},
+					"indices":3,
+					"material":0
+				}
+			]
+		}
+	],
+	"textures":[
+		{
+			"sampler":0,
+			"source":0
+		}
+	],
+	"images":[
+		{
+			"mimeType":"image/png",
+			"name":"tartan",
+			"uri":"textures/tartan.png"
+		}
+	],
+	"accessors":[
+		{
+			"bufferView":0,
+			"componentType":5126,
+			"count":2761,
+			"max":[
+				0.44324639439582825,
+				0.14108650386333466,
+				0.4957937002182007
+			],
+			"min":[
+				-0.44725117087364197,
+				-0.3539474904537201,
+				-0.2795291841030121
+			],
+			"type":"VEC3"
+		},
+		{
+			"bufferView":1,
+			"componentType":5126,
+			"count":2761,
+			"type":"VEC3"
+		},
+		{
+			"bufferView":2,
+			"componentType":5126,
+			"count":2761,
+			"type":"VEC2"
+		},
+		{
+			"bufferView":3,
+			"componentType":5123,
+			"count":15360,
+			"type":"SCALAR"
+		}
+	],
+	"bufferViews":[
+		{
+			"buffer":0,
+			"byteLength":33132,
+			"byteOffset":0,
+			"target":34962
+		},
+		{
+			"buffer":0,
+			"byteLength":33132,
+			"byteOffset":33132,
+			"target":34962
+		},
+		{
+			"buffer":0,
+			"byteLength":22088,
+			"byteOffset":66264,
+			"target":34962
+		},
+		{
+			"buffer":0,
+			"byteLength":30720,
+			"byteOffset":88352,
+			"target":34963
+		}
+	],
+	"samplers":[
+		{
+			"magFilter":9729,
+			"minFilter":9987
+		}
+	],
+	"buffers":[
+		{
+			"byteLength":119072,
+			"uri":"ar_skirt_tartan.bin"
+		}
+	]
+}

src/chats/serenity.yaml

@@ -334,6 +334,18 @@
     - Caffeine may be a mild drug, still it is addictive. Makes you tense, irritable. Manipulates your mind.
     - But guess what! Here at Old Earth Pizza, all blends are decaffeinated.
     - I'm not going to drug you, my friend. You are safe here.
+    - Perfect.:
+      - So what'll it be?
+      - goto: node_coffee
+    - "But I *want* you to drug me!":
+      - Ah, don't need me for that. You suit can synthesize just about any psychoactive substance.
+      - Fair enough.:
+        - So what'll it be?
+        - goto: node_coffee
+      - "But I want *you* to drug me!":
+        - Ah, craving the expert touch?
+        - Alright, let's do this. Just for you, I'm gonna add real, actual caffeine to the coffee.
+        - Which blend do you want?
         - goto: node_coffee
   - Where are you even getting this coffee from?:
     - Trade secret!

src/cmd.rs

@@ -776,8 +776,8 @@ fn spawn_scenes(
                     "cruiser" => {
                         state.model = Some("cruiser".to_string());
 
-                        // command: name Cruiser
+                        // command: name "Midnight Cruiser"
-                        state.name = Some("Cruiser".to_string());
+                        state.name = Some("Midnight Cruiser".to_string());
 
                         // command: scale 5
                         state.model_scale = 5.0;

src/hud.rs

@@ -50,6 +50,7 @@ pub const PLAYER_AR_AVATARS: &[(Avatar, &str, f32, &str)] = &[
     (Avatar::Hoodie, "suit_ar_hoodie", 1.0, "Hoodie"),
     (Avatar::HoodieUp, "suit_ar_hoodie_up", 1.0, "Hoodie Up"),
     (Avatar::Skirt, "suit_ar_skirt", 1.0, "Skirt"),
+    (Avatar::SkirtTartan, "suit_ar_skirt_tartan", 1.0, "Tartan Skirt"),
     (Avatar::Dress, "suit_ar_dress", 1.0, "Dress"),
     (Avatar::Nekomimi, "suit_ar_nekomimi", 1.0, "Cat Ears"),
     (Avatar::Wings, "suit_ar_wings", 1.0, "Wings"),
@@ -205,6 +206,7 @@ pub enum Avatar {
     Hoodie,
     HoodieUp,
     Skirt,
+    SkirtTartan,
     Dress,
     Wings,
     Asteroid,

src/load.rs

@@ -37,6 +37,7 @@ pub fn asset_name_to_path(name: &str) -> &'static str {
         "suit_ar_hoodie" => "models/ar_hoodie.gltf#Scene0",
         "suit_ar_hoodie_up" => "models/ar_hoodie_up.gltf#Scene0",
         "suit_ar_skirt" => "models/ar_skirt.gltf#Scene0",
+        "suit_ar_skirt_tartan" => "models/ar_skirt_tartan.gltf#Scene0",
         "suit_ar_dress" => "models/ar_dress.gltf#Scene0",
         "suit_ar_wings" => "models/suit_v2/ar_wings.glb#Scene0",
         "sus" => "models/sus.glb#Scene0",

src/svg/tartan.svg

@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="512"
+   height="512"
+   viewBox="0 0 135.46707 135.46667"
+   version="1.1"
+   id="svg1"
+   inkscape:version="1.4 (e7c3feb100, 2024-10-09)"
+   sodipodi:docname="tartan1.svg"
+   inkscape:export-filename="../../assets/models/textures/tartan.png"
+   inkscape:export-xdpi="82.285713"
+   inkscape:export-ydpi="82.285713"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     inkscape:zoom="0.90736163"
+     inkscape:cx="220.97033"
+     inkscape:cy="274.97306"
+     inkscape:window-width="1440"
+     inkscape:window-height="765"
+     inkscape:window-x="0"
+     inkscape:window-y="115"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     showguides="false" />
+  <defs
+     id="defs1">
+    <linearGradient
+       id="linearGradient30"
+       inkscape:collect="always">
+      <stop
+         style="stop-color:#f72322;stop-opacity:0.5;"
+         offset="0"
+         id="stop30" />
+      <stop
+         style="stop-color:#f72322;stop-opacity:0.313223;"
+         offset="1"
+         id="stop31" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient26"
+       inkscape:collect="always">
+      <stop
+         style="stop-color:#d51155;stop-opacity:0.5;"
+         offset="0"
+         id="stop26" />
+      <stop
+         style="stop-color:#d51155;stop-opacity:0;"
+         offset="1"
+         id="stop27" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient17"
+       inkscape:collect="always">
+      <stop
+         style="stop-color:#c91027;stop-opacity:0.71104753;"
+         offset="0"
+         id="stop16" />
+      <stop
+         style="stop-color:#c91027;stop-opacity:0.32032049;"
+         offset="1"
+         id="stop17" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient14"
+       inkscape:collect="always">
+      <stop
+         style="stop-color:#6a1c2d;stop-opacity:1;"
+         offset="0"
+         id="stop14" />
+      <stop
+         style="stop-color:#6c4858;stop-opacity:0;"
+         offset="1"
+         id="stop15" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9"
+       inkscape:collect="always">
+      <stop
+         style="stop-color:#6d293a;stop-opacity:1;"
+         offset="0"
+         id="stop9" />
+      <stop
+         style="stop-color:#9a3a52;stop-opacity:0.50008494;"
+         offset="1"
+         id="stop10" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7"
+       inkscape:collect="always">
+      <stop
+         style="stop-color:#4d1d2a;stop-opacity:0;"
+         offset="0"
+         id="stop7" />
+      <stop
+         style="stop-color:#4d1d2a;stop-opacity:0.78650403;"
+         offset="1"
+         id="stop8" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7"
+       id="linearGradient8"
+       x1="40.61528"
+       y1="46.669247"
+       x2="135.46666"
+       y2="46.669247"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.7244759,0,-12.648606)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9"
+       id="linearGradient10"
+       x1="135.46666"
+       y1="92.049133"
+       x2="0"
+       y2="92.049133"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.68511532,0,10.767659)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14"
+       id="linearGradient15"
+       x1="-31.157948"
+       y1="77.647606"
+       x2="55.263702"
+       y2="57.235863"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient17"
+       id="linearGradient16"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,37.075194)"
+       x1="135.46666"
+       y1="92.049133"
+       x2="0"
+       y2="92.049133" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient26"
+       id="radialGradient27"
+       cx="22.121056"
+       cy="72.243965"
+       fx="22.121056"
+       fy="72.243965"
+       r="43.65625"
+       gradientTransform="matrix(1.2671749,0,0,0.60304425,-5.0956285,31.165343)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient30"
+       id="linearGradient31"
+       x1="2.6243749"
+       y1="-3.416182"
+       x2="2.6243749"
+       y2="140.63284"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#322329;fill-opacity:1;stroke:none;stroke-width:2.64583;stroke-linecap:round;stroke-linejoin:round"
+       id="rect1"
+       width="135.46666"
+       height="135.46666"
+       x="0"
+       y="0.02918632"
+       rx="7.3436623e-18" />
+    <rect
+       style="fill:url(#linearGradient15);stroke:none;stroke-width:4.92069;stroke-linecap:round;stroke-linejoin:round"
+       id="rect14"
+       width="109.74935"
+       height="135.46666"
+       x="23"
+       y="0"
+       rx="2.5400372e-17" />
+    <rect
+       style="fill:#000000;fill-opacity:0.5;stroke:none;stroke-width:2.64583;stroke-linecap:round;stroke-linejoin:round"
+       id="rect27"
+       width="135.46666"
+       height="3.96875"
+       x="0.29159635"
+       y="44.26862"
+       rx="7.3436623e-18" />
+    <rect
+       style="fill:#f72322;fill-opacity:0.5;stroke:none;stroke-width:2.64581;stroke-linecap:round;stroke-linejoin:round"
+       id="rect2"
+       width="135.46666"
+       height="3.175"
+       x="0"
+       y="-7.8488029e-06"
+       rx="7.3436623e-18" />
+    <rect
+       style="fill:url(#linearGradient8);stroke:none;stroke-width:2.25203;stroke-linecap:round;stroke-linejoin:round"
+       id="rect3"
+       width="135.46666"
+       height="23.00211"
+       x="0"
+       y="9.6610813"
+       rx="7.3436623e-18" />
+    <rect
+       style="fill:#4d1d2a;fill-opacity:1;stroke:none;stroke-width:2.64583;stroke-linecap:round;stroke-linejoin:round"
+       id="rect7"
+       width="135.46666"
+       height="7.9375"
+       x="-5.5511151e-17"
+       y="98.69725"
+       rx="7.3436623e-18" />
+    <rect
+       style="fill:#c61212;fill-opacity:0.582608;stroke:none;stroke-width:2.64583;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.29753"
+       id="rect5"
+       width="3.1750095"
+       height="135.46707"
+       x="19.843809"
+       y="6.6250781e-05"
+       rx="7.3436838e-18" />
+    <rect
+       style="fill:url(#linearGradient31);stroke:none;stroke-width:13.387;stroke-linecap:round;stroke-linejoin:round"
+       id="rect6"
+       width="5.2916665"
+       height="135.46707"
+       x="-3.1789146e-08"
+       y="0"
+       rx="7.3436623e-18" />
+    <rect
+       style="fill:#322329;fill-opacity:1;stroke:none;stroke-width:2.64583;stroke-linecap:round;stroke-linejoin:round"
+       id="rect15"
+       width="0.58319271"
+       height="2.3327708"
+       x="96.809982"
+       y="-88.645294"
+       rx="2.5400372e-17" />
+    <rect
+       style="fill:url(#linearGradient16);stroke:none;stroke-width:2.64583;stroke-linecap:round;stroke-linejoin:round"
+       id="rect16"
+       width="135.46666"
+       height="8.7312498"
+       x="-5.5511151e-17"
+       y="119.86388"
+       rx="7.3436623e-18" />
+    <rect
+       style="fill:url(#radialGradient27);fill-opacity:0.5;stroke:none;stroke-width:2.6336;stroke-linecap:round;stroke-linejoin:round"
+       id="rect17"
+       width="70.399918"
+       height="135.46666"
+       x="23.018818"
+       y="0"
+       rx="7.3296937e-18" />
+    <rect
+       style="mix-blend-mode:luminosity;fill:url(#linearGradient10);stroke:none;stroke-width:2.19;stroke-linecap:round;stroke-linejoin:round"
+       id="rect4"
+       width="135.46666"
+       height="12.688907"
+       x="-5.5511151e-17"
+       y="67.487473"
+       rx="7.3436623e-18" />
+    <rect
+       style="fill:#f7a7ba;fill-opacity:0.0993911;stroke:#000000;stroke-width:2.11667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:0.29753;paint-order:normal"
+       id="rect29"
+       width="11.543851"
+       height="150.40718"
+       x="69.005516"
+       y="-5.7206759"
+       rx="2.6700518e-17" />
+  </g>
+</svg>