From bf9445fd27dd016af98ca7e1b00a8b8b746f2481 Mon Sep 17 00:00:00 2001
From: Anton Simakov <67688115+GuardianDll@users.noreply.github.com>
Date: Mon, 6 Jan 2025 09:04:37 +0100
Subject: [PATCH] obsolete makeshift_solar_farm (#78969)

* obsolete makeshift_solar_farm

* Update data/json/mapgen/godco/nested.json

Co-authored-by: Procyonae <45432782+Procyonae@users.noreply.github.com>

---------

Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Co-authored-by: Procyonae <45432782+Procyonae@users.noreply.github.com>
---
 data/json/mapgen/godco/nested.json       |  2 +-
 data/json/npcs/godco/godco_missions.json | 19 +++++++++++++++++--
 data/json/vehicles/utility.json          | 13 -------------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/data/json/mapgen/godco/nested.json b/data/json/mapgen/godco/nested.json
index 819cb1c27976c..f0e084e3b171b 100644
--- a/data/json/mapgen/godco/nested.json
+++ b/data/json/mapgen/godco/nested.json
@@ -6,7 +6,7 @@
     "object": {
       "mapgensize": [ 1, 1 ],
       "faction_owner": [ { "id": "gods_community", "x": [ 1, 1 ], "y": [ 1, 1 ] } ],
-      "place_vehicles": [ { "vehicle": "makeshift_solar_farm", "x": 1, "y": 1, "chance": 100, "status": 0 } ]
+      "place_furniture": [ { "furn": "f_solar_unit", "x": 0, "y": 0 } ]
     }
   },
   {
diff --git a/data/json/npcs/godco/godco_missions.json b/data/json/npcs/godco/godco_missions.json
index b8d43e605e077..7973549878603 100644
--- a/data/json/npcs/godco/godco_missions.json
+++ b/data/json/npcs/godco/godco_missions.json
@@ -777,10 +777,17 @@
     "type": "mission_definition",
     "name": { "str": "Renewable Energy" },
     "description": "Find a solar panel for Corrie.",
-    "goal": "MGOAL_FIND_ITEM",
+    "goal": "MGOAL_CONDITION",
+    "goal_condition": {
+      "u_has_items_sum": [
+        { "item": "ground_solar_panel", "amount": 1 },
+        { "item": "ground_solar_panel_v2", "amount": 1 },
+        { "item": "solar_panel", "amount": 4 },
+        { "item": "solar_panel_v2", "amount": 4 }
+      ]
+    },
     "difficulty": 1,
     "value": 0,
-    "item": "solar_panel",
     "count": 1,
     "origins": [ "ORIGIN_SECONDARY" ],
     "has_generic_rewards": false,
@@ -797,6 +804,14 @@
     },
     "end": {
       "effect": [
+        {
+          "u_consume_item_sum": [
+            { "item": "ground_solar_panel", "amount": 1 },
+            { "item": "ground_solar_panel_v2", "amount": 1 },
+            { "item": "solar_panel", "amount": 4 },
+            { "item": "solar_panel_v2", "amount": 4 }
+          ]
+        },
         { "u_add_var": "mission_completed_godco_corrie_machine", "value": "in-progress" },
         { "mapgen_update": "place_solar_farm", "om_terrain": "godco_1" }
       ],
diff --git a/data/json/vehicles/utility.json b/data/json/vehicles/utility.json
index f884cf69bb783..51691d05f7bea 100644
--- a/data/json/vehicles/utility.json
+++ b/data/json/vehicles/utility.json
@@ -109,19 +109,6 @@
       { "x": 1, "y": 0, "chance": 20, "item_groups": [ "fuel_diesel" ] }
     ]
   },
-  {
-    "id": "makeshift_solar_farm",
-    "type": "vehicle",
-    "name": "Makeshift Solar Farm",
-    "blueprint": [ [ "o" ] ],
-    "parts": [
-      {
-        "x": 0,
-        "y": 0,
-        "parts": [ "frame_wood#cross", "wood box", "battery_charger", "dashboard", "battery_car", "solar_panel" ]
-      }
-    ]
-  },
   {
     "id": "road_roller",
     "type": "vehicle",