Rework shop changes for balance and compatability

LeDrascol · Jul 3, 2019 · 9a8aa7d · 9a8aa7d
1 parent c4518eb
commit 9a8aa7d
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 139 deletions.
diff --git a/Changes.md b/Changes.md
@@ -988,13 +988,7 @@
 + Updated Human racial description for Infinity Express
 + Updated UI subtitle for Infinity Express
 + Moved shop item from Terramart to Infinity Express - Cotton Wool
-+ Moved shop item from Infinity Express to Terramart - Cheese
-+ Moved shop item from Infinity Express to Terramart - Egg
-+ Moved shop item from Infinity Express to Terramart - Milk
-+ Moved shop item from Infinity Express to Terramart - Bacon
-+ Moved shop item from Infinity Express to Terramart - Apple
 + Updated item organization for Tech Dispenser
-+ Added Infinity Express item Hamburger
 + ~~Added Infinity Express item Pizza Slice~~
 + Added new Rocket Jump parameter rocketCooldown
 + Rocket Jump tech now recharges via cooldown in the air
@@ -1186,8 +1180,6 @@
 + Allowed 3D printing for Cameron York Statue
 + Allowed 3D printing for Imagination Memorial
 + Allowed 3D printing for XOliver137 Statue
-+ Added Terramart item Raw Ham
-+ Added Terramart item Green Apple
 + Added default blueprint Cooked Tentacle
 + Added Wooden Workbench crafting for Cloud
 + Added Wooden Workbench crafting for Coconut Block
@@ -1242,7 +1234,6 @@
 + Added Agricultural Station crafting for Microwave
 + Added Unapparent Apparel item Barrel Lid
 + Added Unapparent Apparel item Handy Space Helmet
-+ Added Infinity Express item Pizza
 + Restored Industrial Workbench crafting for Neon Block
 + Restored Kitchen Counter crafting for Pizza
 + Price change from 4 PIXELS to 20 PIXELS for Red Apple
@@ -1302,6 +1293,15 @@
 + Updated UI subtitle for Treasured Trophies
 + Minor code cleanup for Tech Dispenser patch
 + Updated description for Upgrade Module
++ Restored all removed items from Infinity Express (except Liquid Fuel)
++ Added Infinity Express item Raw Ham
++ Added Infinity Express item Green Apple
++ Added Infinity Express item Orange
++ Buy rates raised from 100% to 250% for Infinity Express
++ Moved shop item from Terramart to Infinity Express - Parasol
++ Moved shop item from Terramart to Infinity Express - Green Flashlight
++ Moved shop item from Terramart to Infinity Express - Red Flashlight
++ Moved shop item from Terramart to Infinity Express - Yellow Flashlight
 
 ### Avali
 + Price change from 12500 PIXELS to 11000 PIXELS for Avali Hoverbike Controller

diff --git a/README.md b/README.md
@@ -81,7 +81,7 @@ This project is open source. You may create a modular fork if you only want a ce
 - Buy your own personal Rob Repairo
 - Mech blueprints can be traded for at Beakeasy
 - Mech Assembly Station can be purchased from the tech dispenser
-- Terramart Shipments buys items for their full value
+- Terramart Shipments buys items for their full value (Even with Enhanced Storage)
 - Terramart Shipments accept all mining materials
 - Lana's supply business has improved to compete with augment crafting
 

diff --git a/objects/outpost/infinityexpress/infinityexpress.object.patch b/objects/outpost/infinityexpress/infinityexpress.object.patch
@@ -2,75 +2,36 @@
   {
     "op": "replace",
     "path": "/interactData/buyFactor",
-    "value": 1
+    "value": 2.5
   },
   {
     "op": "replace",
     "path": "/interactData/sellFactor",
     "value": 0.8
   },
-  {
-    "op": "remove",
-    "path": "/interactData/items/20"
-  },
-  {
-    "op": "remove",
-    "path": "/interactData/items/19"
-  },
-  {
-    "op": "remove",
-    "path": "/interactData/items/18"
-  },
-  {
-    "op": "remove",
-    "path": "/interactData/items/17"
-  },
-  {
-    "op": "remove",
-    "path": "/interactData/items/16"
-  },
-  {
-    "op": "remove",
-    "path": "/interactData/items/15"
-  },
   {
     "op": "remove",
     "path": "/interactData/items/5"
   },
   {
     "op": "add",
     "path": "/interactData/items/-",
-    "value": { "item": "pizza" }
-  },
-  {
-    "op": "add",
-    "path": "/interactData/items/-",
-    "value": { "item": "hamburger" }
-  },
-  {
-    "op": "add",
-    "path": "/interactData/items/-",
-    "value": { "item": "cottonwool" }
-  },
-  {
-    "op": "add",
-    "path": "/interactData/items/-",
-    "value": { "item": "parasol" }
+    "value": { "item": "rawham" }
   },
   {
     "op": "add",
     "path": "/interactData/items/-",
-    "value": { "item": "greenflashlight" }
+    "value": { "item": "greenapple" }
   },
   {
     "op": "add",
     "path": "/interactData/items/-",
-    "value": { "item": "redflashlight" }
+    "value": { "item": "orange" }
   },
   {
     "op": "add",
     "path": "/interactData/items/-",
-    "value": { "item": "yellowflashlight" }
+    "value": { "item": "cottonwool" }
   },
   {
     "op": "add",

diff --git a/objects/outpost/terramart/terramart.object.patch b/objects/outpost/terramart/terramart.object.patch
@@ -7,51 +7,31 @@
   {
     "op": "add",
     "path": "/interactData/items/-",
-    "value": { "item": "cheese" }
-  },
-  {
-    "op": "add",
-    "path": "/interactData/items/-",
-    "value": { "item": "egg" }
-  },
-  {
-    "op": "add",
-    "path": "/interactData/items/-",
-    "value": { "item": "milk" }
-  },
-  {
-    "op": "add",
-    "path": "/interactData/items/-",
-    "value": { "item": "rawbacon" }
-  },
-  {
-    "op": "add",
-    "path": "/interactData/items/-",
-    "value": { "item": "rawham" }
+    "value": { "item": "capturepod" }
   },
   {
     "op": "add",
     "path": "/interactData/items/-",
-    "value": { "item": "redapple" }
+    "value": { "item": "broom" }
   },
   {
     "op": "add",
     "path": "/interactData/items/-",
-    "value": { "item": "greenapple" }
+    "value": { "item": "parasol" }
   },
   {
     "op": "add",
     "path": "/interactData/items/-",
-    "value": { "item": "orange" }
+    "value": { "item": "greenflashlight" }
   },
   {
     "op": "add",
     "path": "/interactData/items/-",
-    "value": { "item": "capturepod" }
+    "value": { "item": "redflashlight" }
   },
   {
     "op": "add",
     "path": "/interactData/items/-",
-    "value": { "item": "broom" }
+    "value": { "item": "yellowflashlight" }
   }
 ]
diff --git a/objects/space/stationvendingmachine/stationvendingmachine.object.patch b/objects/space/stationvendingmachine/stationvendingmachine.object.patch
@@ -25,73 +25,30 @@
     "value": "What luck having this vending machine here! I'm too lazy to find these parts myself."
   },
   {
-    "op": "replace",
-    "path": "/interactData/paneLayoutOverride/windowtitle/title",
-    "value": " Scrap Vending Machine"
-  },
-  {
-    "op": "replace",
-    "path": "/interactData/paneLayoutOverride/windowtitle/subtitle",
-    "value": " Useful mech parts"
-  },
-  {
-    "op": "replace",
-    "path": "/interactData/buyFactor",
-    "value": 5
-  },
-  {
-    "op": "replace",
-    "path": "/interactData/sellFactor",
-    "value": 0
-  },
-  {
-    "op": "replace",
-    "path": "/interactData/items/0",
-    "value": {
-      "item": "salvagebody"
-    }
-  },
-  {
-    "op": "replace",
-    "path": "/interactData/items/1",
+    "op": "add",
+    "path": "/interactData/paneLayoutOverride/windowtitle",
     "value": {
-      "item": "salvagelegs"
+      "title": " Scrap Vending Machine",
+      "subtitle": " Salvaged mech parts"
     }
   },
   {
     "op": "replace",
-    "path": "/interactData/items/2",
-    "value": {
-      "item": "salvagebooster"
-    }
+    "path": "/interactData/buyFactor",
+    "value": 5
   },
   {
     "op": "replace",
-    "path": "/interactData/items/3",
-    "value": {
-      "item": "salvagearm"
-    }
-  },
-  {
-    "op": "add",
-    "path": "/interactData/items/-",
-    "value": {
-      "item": "salvagetier4"
-    }
-  },
-  {
-    "op": "add",
-    "path": "/interactData/items/-",
-    "value": {
-      "item": "salvagetier5"
-    }
-  },
-  {
-    "op": "add",
-    "path": "/interactData/items/-",
-    "value": {
-      "item": "salvagetier6"
-    }
+    "path": "/interactData/items",
+    "value": [
+      { "item" : "salvagebody" },
+      { "item" : "salvagelegs" },
+      { "item" : "salvagebooster" },
+      { "item" : "salvagearm" },
+      { "item" : "salvagetier4" },
+      { "item" : "salvagetier5" },
+      { "item" : "salvagetier6" }
+    ]
   },
   {
     "op": "remove",