Fixed merge conflicts

Author: AdamKyle

app/Console/AfterDeployment/FixFactionLoyaltyCraftingTasks.php

@@ -4,6 +4,8 @@
 
 use App\Flare\Models\FactionLoyaltyNpcTask;
 use App\Flare\Models\Item;
+use App\Flare\Values\MapNameValue;
+use App\Game\Character\CharacterInventory\Values\ItemType;
 use Illuminate\Console\Command;
 
 class FixFactionLoyaltyCraftingTasks extends Command
@@ -37,20 +39,69 @@ public function handle()
     private function fixInvalidItemsOnFactionLoyaltyTask(FactionLoyaltyNpcTask $factionLoyaltyNpcTask): void {
         $tasks = $factionLoyaltyNpcTask->fame_tasks;
 
+        $types = [
+            'weapon',
+            'ring',
+            'armour',
+            'spell',
+        ];
+
 
         foreach ($tasks as $index => $task) {
             if ($task['type'] === 'bounty') {
                 continue;
             }
 
+            if ($task['type'] === 'weapon') {
+                $this->info('Found an invalid type: Weapon, replacing ... ');
+
+                if (is_null($factionLoyaltyNpcTask->factionLoyaltyNpc) || is_null($factionLoyaltyNpcTask->factionLoyalty)) {
+                    continue;
+                }
+
+                $gameMapName = $factionLoyaltyNpcTask->factionLoyaltyNpc->npc->gameMap->name;
+
+                $item = $this->getItemForCraftingTask($types[rand(0, count($types) - 1)], $gameMapName);
+
+                $task['item_id'] = $item->id;
+                $task['item_name'] = $item->name;
+                $task['type'] = $item->type;
+
+                $tasks[$index] = $task;
+
+                $this->info('Replaced weapon type ');
+
+                continue;
+            }
+
             $doesItemExist = Item::where('id', $task['item_id'])->exists();
 
             if (!$doesItemExist) {
                 $this->info('Item: ' . $task['item_name'] . ' does not exist for id: ' . $task['item_id'] . '. Starting replacement');
 
-                $foundItemByName = Item::where('name', $task['item_name'])->first();
+                $item = Item::where('name', $task['item_name'])
+                    ->doesntHave('itemSuffix')
+                    ->doesntHave('itemPrefix')
+                    ->doesntHave('appliedHolyStacks')
+                    ->doesntHave('sockets')
+                    ->whereNotIn('type', ['quest', 'alchemy', 'trinket', 'artifact'])
+                    ->whereNull('specialty_type')
+                    ->first();
+
+                if (is_null($item)) {
 
-                $task['item_id'] = $foundItemByName->id;
+                    if (is_null($factionLoyaltyNpcTask->factionLoyaltyNpc) || is_null($factionLoyaltyNpcTask->factionLoyalty)) {
+                        continue;
+                    }
+
+                    $gameMapName = $factionLoyaltyNpcTask->factionLoyaltyNpc->npc->gameMap->name;
+
+                    $item = $this->getItemForCraftingTask($types[rand(0, count($types) - 1)], $gameMapName);
+                }
+
+                $task['item_id'] = $item->id;
+                $task['item_name'] = $item->name;
+                $task['type'] = $item->type;
 
                 $tasks[$index] = $task;
 
@@ -62,4 +113,43 @@ private function fixInvalidItemsOnFactionLoyaltyTask(FactionLoyaltyNpcTask $fact
             'fame_tasks' => $tasks,
         ]);
     }
+
+    private function getItemForCraftingTask(string $type, string $gamMapName): Item
+    {
+
+        $gameMapValue = new MapNameValue($gamMapName);
+
+        $item = Item::inRandomOrder()->doesntHave('itemSuffix')
+            ->doesntHave('itemPrefix')
+            ->doesntHave('appliedHolyStacks')
+            ->doesntHave('sockets')
+            ->whereNotIn('type', ['quest', 'alchemy', 'trinket', 'artifact'])
+            ->whereNull('specialty_type');
+
+        if ($gameMapValue->isSurface() || $gameMapValue->isTheIcePlane() || $gameMapValue->isDelusionalMemories()) {
+            $item->where('skill_level_required', '<=', 50);
+        }
+
+        if ($gameMapValue->isLabyrinth()) {
+            $item->where('skill_level_required', '<=', 150);
+        }
+
+        if ($gameMapValue->isDungeons()) {
+            $item->where('skill_level_required', '<=', 240);
+        }
+
+        if ($gameMapValue->isHell()) {
+            $item->where('skill_level_required', '<=', 300);
+        }
+
+        if ($gameMapValue->isPurgatory()) {
+            $item->where('skill_level_required', '<=', 350);
+        }
+
+        if ($gameMapValue->isTwistedMemories()) {
+            $item->where('skill_level_required', '<=', 370);
+        }
+
+        return $item->where('crafting_type', $type)->first();
+    }
 }

app/Flare/GameImporter/Console/Commands/MassImportCustomData.php

@@ -34,13 +34,13 @@ class MassImportCustomData extends Command
 
     public function handle()
     {
-
         Artisan::call('import:game-data Items');
         Artisan::call('import:game-data "Kingdom Passive Skills"');
         Artisan::call('import:game-data Quests');
 
         $this->importInformationSection();
 
+
         if (config('app.env') !== 'production') {
             $this->importGameMaps();
         }