From 4bee18c36305d980fddf5656b2d245daa2b26e96 Mon Sep 17 00:00:00 2001
From: Tony Bark <noreply@tonybark.com>
Date: Tue, 7 May 2024 08:45:16 -0400
Subject: [PATCH] Fixed object files - Added comfort property - Created open
 object schema

---
 docs/{ => schema}/jblueprint.json             |   0
 docs/schema/openitem.json                     | 152 ++++++++++++++++++
 resources/items/dorm/chair/chair.json         |  38 +++++
 .../dorm/table/{chair.json => table.json}     |   1 +
 src/io/oiff.zig                               |   1 +
 5 files changed, 192 insertions(+)
 rename docs/{ => schema}/jblueprint.json (100%)
 create mode 100644 docs/schema/openitem.json
 create mode 100644 resources/items/dorm/chair/chair.json
 rename resources/items/dorm/table/{chair.json => table.json} (97%)

diff --git a/docs/jblueprint.json b/docs/schema/jblueprint.json
similarity index 100%
rename from docs/jblueprint.json
rename to docs/schema/jblueprint.json
diff --git a/docs/schema/openitem.json b/docs/schema/openitem.json
new file mode 100644
index 0000000..99e1437
--- /dev/null
+++ b/docs/schema/openitem.json
@@ -0,0 +1,152 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "type": "object",
+    "properties": {
+        "item": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "description": {
+                    "type": "string"
+                },
+                "version": {
+                    "type": "integer"
+                },
+                "size": {
+                    "type": "integer"
+                },
+                "catagory": {
+                    "type": "string"
+                },
+                "base": {
+                    "type": "string"
+                },
+                "views": {
+                    "type": "object",
+                    "properties": {
+                        "south": {
+                            "type": "object",
+                            "properties": {
+                                "texture": {
+                                    "type": "string"
+                                },
+                                "buffer": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "texture",
+                                "buffer"
+                            ]
+                        },
+                        "north": {
+                            "type": "object",
+                            "properties": {
+                                "texture": {
+                                    "type": "string"
+                                },
+                                "buffer": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "texture",
+                                "buffer"
+                            ]
+                        }
+                    },
+                    "required": [
+                        "south",
+                        "north"
+                    ]
+                },
+                "motives": {
+                    "type": "object",
+                    "properties": {
+                        "room": {
+                            "type": "integer"
+                        },
+                        "hunger": {
+                            "type": "integer"
+                        },
+                        "social": {
+                            "type": "integer"
+                        },
+                        "comfort": {
+                            "type": "integer"
+                        },
+                        "fun": {
+                            "type": "integer"
+                        },
+                        "hygiene": {
+                            "type": "integer"
+                        },
+                        "energy": {
+                            "type": "integer"
+                        },
+                        "bladder": {
+                            "type": "integer"
+                        }
+                    },
+                    "required": [
+                        "room",
+                        "hunger",
+                        "social",
+                        "comfort",
+                        "fun",
+                        "hygiene",
+                        "energy",
+                        "bladder"
+                    ]
+                },
+                "skills": {
+                    "type": "object",
+                    "properties": {
+                        "cooking": {
+                            "type": "integer"
+                        },
+                        "mechanical": {
+                            "type": "integer"
+                        },
+                        "charism": {
+                            "type": "integer"
+                        },
+                        "body": {
+                            "type": "integer"
+                        },
+                        "logic": {
+                            "type": "integer"
+                        },
+                        "creativity": {
+                            "type": "integer"
+                        }
+                    },
+                    "required": [
+                        "cooking",
+                        "mechanical",
+                        "charism",
+                        "body",
+                        "logic",
+                        "creativity"
+                    ]
+                }
+            },
+            "required": [
+                "name",
+                "description",
+                "version",
+                "size",
+                "catagory",
+                "base",
+                "views",
+                "motives",
+                "skills"
+            ]
+        }
+    },
+    "required": [
+        "item"
+    ]
+}
\ No newline at end of file
diff --git a/resources/items/dorm/chair/chair.json b/resources/items/dorm/chair/chair.json
new file mode 100644
index 0000000..ee0fdd4
--- /dev/null
+++ b/resources/items/dorm/chair/chair.json
@@ -0,0 +1,38 @@
+{
+    "item": {
+        "name": "Dorm End chair",
+        "description": "Created by Judhudson@knology.net",
+        "version": 1,
+        "size": 1,
+        "catagory": "surfaces",
+        "base": "chair",
+        "views": {
+            "south": {
+                "texture": "chair_1.png",
+                "buffer": "chair_1_z.png"
+            },
+            "north": {
+                "texture": "chair_2.png",
+                "buffer": "chair_2_z.png"
+            }
+        },
+        "motives": {
+            "room": 5,
+            "hunger": 0,
+            "social": 0,
+            "comfort": 8,
+            "fun": 0,
+            "hygiene": 0,
+            "energy": 0,
+            "bladder": 0
+        },
+        "skills": {
+            "cooking": 5,
+            "mechanical": 0,
+            "charism": 0,
+            "body": 0,
+            "logic": 0,
+            "creativity": 0
+        }
+    }
+}
\ No newline at end of file
diff --git a/resources/items/dorm/table/chair.json b/resources/items/dorm/table/table.json
similarity index 97%
rename from resources/items/dorm/table/chair.json
rename to resources/items/dorm/table/table.json
index 3eeca76..4281ca5 100644
--- a/resources/items/dorm/table/chair.json
+++ b/resources/items/dorm/table/table.json
@@ -20,6 +20,7 @@
             "room": 5,
             "hunger": 0,
             "social": 0,
+            "comfort": 0,
             "fun": 0,
             "hygiene": 0,
             "energy": 0,
diff --git a/src/io/oiff.zig b/src/io/oiff.zig
index f6d501e..007260c 100644
--- a/src/io/oiff.zig
+++ b/src/io/oiff.zig
@@ -15,6 +15,7 @@ pub const Motives = struct {
     room: i64, // Environment in later games
     hunger: i64,
     social: i64,
+    comfort: i64,
     hygiene: i64,
     fun: i64,
     energy: i64,