add patch 15 changes

codengine · Dec 1, 2023 · 10405e6 · 10405e6
1 parent 30a64a5
commit 10405e6
Show file tree

Hide file tree

Showing 8 changed files with 249 additions and 9 deletions.
diff --git a/.idea/.idea.SOTFEdit/.idea/inspectionProfiles/Project_Default.xml b/.idea/.idea.SOTFEdit/.idea/inspectionProfiles/Project_Default.xml
diff --git a/SOTFEdit/ViewModel/InventoryPageViewModel.cs b/SOTFEdit/ViewModel/InventoryPageViewModel.cs
@@ -29,7 +29,8 @@ public partial class InventoryPageViewModel : ObservableObject
         680, //Spotlight
         681, //Clock
         682, //Spin Trap
-        688 //Spear Thrower Trap
+        688, //Spear Thrower Trap
+        701 //Leg Lamp
     };
 
     private readonly ObservableCollectionEx<InventoryItem> _inventory = new();

diff --git a/SOTFEdit/data/data.json b/SOTFEdit/data/data.json
@@ -3095,9 +3095,90 @@
         "shelf": 0,
         "inventory": 1
       }
+    },
+    {
+      "id": 701,
+      "type": "blueprint",
+      "storageMax": {
+        "shelf": 0,
+        "inventory": 1
+      },
+      "image": "Paper.png"
+    },
+    {
+      "id": 702,
+      "type": "blueprint",
+      "storageMax": {
+        "shelf": 0,
+        "inventory": 1
+      }
+    },
+    {
+      "id": 703,
+      "type": "clothes",
+      "storageMax": {
+        "shelf": 0,
+        "inventory": 1
+      },
+      "image": "Clothing.png"
+    },
+    {
+      "id": 704,
+      "type": "blueprint",
+      "storageMax": {
+        "shelf": 0,
+        "inventory": 1
+      }
+    },
+    {
+      "id": 705,
+      "type": "document",
+      "storageMax": {
+        "shelf": 0,
+        "inventory": 1
+      },
+      "image": "BunkerPamphlet.png"
+    },
+    {
+      "id": 706,
+      "type": "document",
+      "storageMax": {
+        "shelf": 0,
+        "inventory": 1
+      },
+      "image": "Paper.png"
     }
   ],
   "storages": [
+    {
+      "id": 19,
+      "slots": 4,
+      "maxPerSlot": 1,
+      "type": "Items",
+      "restrictedItemIds": [
+        340,
+        353,
+        355,
+        356,
+        358,
+        359,
+        360,
+        361,
+        365,
+        367,
+        386,
+        394,
+        396,
+        422,
+        431,
+        443,
+        477,
+        485,
+        522,
+        525,
+        663
+      ]
+    },
     {
       "id": 27,
       "slots": 6,
@@ -3222,6 +3303,44 @@
         474
       ],
       "type": "Spears"
+    },
+    {
+      "id": 84,
+      "slots": 1,
+      "maxPerSlot": 12,
+      "restrictedItemIds": [
+        576
+      ],
+      "type": "Items"
+    },
+    {
+      "id": 86,
+      "slots": 1,
+      "maxPerSlot": 1,
+      "type": "Items",
+      "restrictedItemIds": [
+        340,
+        353,
+        355,
+        356,
+        358,
+        359,
+        360,
+        361,
+        365,
+        367,
+        386,
+        394,
+        396,
+        422,
+        431,
+        443,
+        477,
+        485,
+        522,
+        525,
+        663
+      ]
     }
   ],
   "advancedStorages": [
@@ -3294,7 +3413,10 @@
         3,
         4,
         5,
-        6
+        6,
+        7,
+        8,
+        9
       ],
       "10": [
         -1,
@@ -3672,6 +3794,13 @@
       "gender": "male",
       "image": "igor.jpg",
       "icon": "igor.png"
+    },
+    {
+      "id": 56,
+      "classification": "cannibal",
+      "gender": "female",
+      "image": "elise.jpg",
+      "icon": "elise.png"
     }
   ],
   "namedIntKeys": [
@@ -3699,6 +3828,12 @@
     "HellCave.MutantDemonBossIntro"
   ],
   "screwStructures": [
+    {
+      "id": 19,
+      "buildCost": 13,
+      "category": "storage",
+      "icon": "shelf.png"
+    },
     {
       "id": 20,
       "buildCost": 14,
@@ -4059,6 +4194,24 @@
       "buildCost": 10,
       "category": "storage",
       "icon": "../items/Stick_tn.png"
+    },
+    {
+      "id": 84,
+      "buildCost": 20,
+      "category": "storage",
+      "icon": "fireplace.png"
+    },
+    {
+      "id": 85,
+      "buildCost": 20,
+      "category": "misc",
+      "icon": "../items/Lightbulb_tn.png"
+    },
+    {
+      "id": 86,
+      "buildCost": 6,
+      "category": "storage",
+      "icon": "shelf.png"
     }
   ],
   "areas": [

diff --git a/SOTFEdit/data/item_pois.json b/SOTFEdit/data/item_pois.json
@@ -7974,6 +7974,69 @@
           "screenshot": "jianzu_email.jpg"
         }
       ]
+    },
+    "701": {
+      "pois": [
+        {
+          "x": 1474.47,
+          "y": 71.51,
+          "teleport": {
+            "x": 1474.47,
+            "y": 77.14,
+            "z": 71.51,
+            "areaMask": 0
+          },
+          "screenshot": "blueprint_leg_lamp.jpg"
+        }
+      ]
+    },
+    "703": {
+      "pois": [
+        {
+          "x": 185.79,
+          "y": -331.96,
+          "teleport": {
+            "x": 185.79,
+            "y": 524.08,
+            "z": -331.96,
+            "areaMask": 0
+          },
+          "screenshot": "priest_outfit.jpg"
+        }
+      ]
+    },
+    "705": {
+      "pois": [
+        {
+          "x": -1078.22,
+          "y": 13.13,
+          "teleport": {
+            "x": -1078.22,
+            "y": 59.31,
+            "z": 13.13,
+            "areaMask": 1048576
+          },
+          "requirements": [
+            566
+          ],
+          "screenshot": "circus_pamphlet.jpg"
+        }
+      ]
+    },
+    "706": {
+      "pois": [
+        {
+          "x": 1942.71,
+          "y": 453.7,
+          "teleport": {
+            "x": 1942.71,
+            "y": 14.84,
+            "z": 453.7,
+            "areaMask": 0
+          },
+          "screenshot": "newspaper_d_cutout.jpg"
+        }
+      ]
     }
   }
 }
diff --git a/SOTFEdit/data/lang/en.json b/SOTFEdit/data/lang/en.json
@@ -172,7 +172,8 @@
       "52": "Eddy",
       "53": "Greg",
       "54": "Henry",
-      "55": "Igor"
+      "55": "Igor",
+      "56": "Elise"
     }
   },
   "armor": {
@@ -334,7 +335,8 @@
         "5": "Blue TShirt",
         "6": "Blazer",
         "7": "Black Leather Jacket",
-        "8": "Space Suit"
+        "8": "Space Suit",
+        "9": "Priest Outfit"
       },
       "10": {
         "-1": "Default",
@@ -719,8 +721,8 @@
     "573": "Sleeping Bag",
     "574": "Novel [Rescued]",
     "575": "Novel [Parallel Universes]",
-    "576": "Quarter Log plank",
-    "577": "Half Log plank",
+    "576": "Quarter Log Plank",
+    "577": "Half Log Plank",
     "578": "Three Quarter Log Plank",
     "579": "Bone Chair Blueprint",
     "580": "Stick Ladder Blueprint",
@@ -842,7 +844,13 @@
     "697": "Cult Sign I",
     "698": "Cult Sign J",
     "699": "Cult Sign K",
-    "700": "Spear Storage Blueprint"
+    "700": "Spear Storage Blueprint",
+    "701": "Leg Lamp Blueprint",
+    "702": "Firewood Storage Blueprint",
+    "703": "Priest Outfit",
+    "704": "Wall Weapon Rack Blueprint",
+    "705": "Circus Pamphlet",
+    "706": "Newspaper Cutout [Husbands]"
   },
   "itemTypes": {
     "ammo": "Ammo",
@@ -1205,6 +1213,7 @@
     "percentDone": "Percent Done",
     "structureTypeSelectorDisclaimer": "If nothing is selected, all structures will be changed",
     "types": {
+      "19": "Weapon Rack",
       "20": "Stick Chair",
       "21": "Bone Maker Trap",
       "22": "Stick Bed",
@@ -1262,7 +1271,10 @@
       "79": "Spin Trap",
       "80": "Double Bed",
       "81": "Spear Thrower Trap",
-      "82": "Spear Holder"
+      "82": "Spear Holder",
+      "84": "Firewood Storage",
+      "85": "Leg Lamp",
+      "86": "Wall Weapon Rack"
     }
   },
   "tabs": {

diff --git a/SOTFEdit/data/pois.json b/SOTFEdit/data/pois.json
@@ -209,7 +209,8 @@
           555,
           567,
           575,
-          677
+          677,
+          705
         ],
         "screenshot": "cave_leading_to_entertainment_bunker.jpg",
         "wiki": "https://sonsoftheforest.wiki.gg/wiki/Bunkers#Entertainment_Bunker_Check_on_map"

diff --git a/SOTFEdit/images/actors/elise.jpg b/SOTFEdit/images/actors/elise.jpg
diff --git a/SOTFEdit/images/actors/icons/elise.png b/SOTFEdit/images/actors/icons/elise.png