Fixed bountiful resources

Author: AdamKyle

app/Console/AfterDeployment/FixKingdomMaxResourcesBasedOnPassiveSkill.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Console\AfterDeployment;
+
+use App\Flare\Models\Kingdom;
+use App\Game\PassiveSkills\Values\PassiveSkillTypeValue;
+use Illuminate\Console\Command;
+
+class FixKingdomMaxResourcesBasedOnPassiveSkill extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'fix:kingdom-max-resources-based-on-passive-skill';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Fixes kingdoms to respect bountiful resources';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        Kingdom::where('npc_owned', false)->chunk(500, function ($kingdoms) {
+            foreach ($kingdoms as $kingdom) {
+                $skill = $kingdom->character->passiveSkills->where('passiveSkill.effect_type', PassiveSkillTypeValue::RESOURCE_INCREASE)->first();
+
+
+                if (is_null($skill)) {
+                    return;
+                }
+
+                $kingdom->update([
+                    'max_stone' => $kingdom->max_stone + $skill->resource_increase_amount,
+                    'max_iron' => $kingdom->max_iron + $skill->resource_increase_amount,
+                    'max_wood' => $kingdom->max_wood + $skill->resource_increase_amount,
+                    'max_clay' => $kingdom->max_clas + $skill->resource_increase_amount,
+                    'max_population' => $kingdom->max_population + $skill->resource_increase_amount,
+                ]);
+            }
+        });
+    }
+}

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

@@ -56,6 +56,7 @@ public function handle()
         Artisan::call('create:quest-cache');
         Artisan::call('generate:monster-cache');
         Artisan::call('create:location-data-cache');
+        Artisan::call('fix:kingdom-max-resources-based-on-passive-skill');
 
         $this->importInformationSection();
 

app/Flare/Models/CharacterPassiveSkill.php

@@ -41,6 +41,7 @@ class CharacterPassiveSkill extends Model
         'is_max_level',
         'current_bonus',
         'resource_request_time_reduction',
+        'resource_increase_amount',
         'capital_city_building_request_travel_time_reduction',
         'capital_city_unit_request_travel_time_reduction'
     ];
@@ -70,6 +71,11 @@ public function getCurrentBonusAttribute()
         return $this->current_level * $this->passiveSkill->bonus_per_level;
     }
 
+    public function getResourceIncreaseAmountAttribute()
+    {
+        return $this->current_level * $this->passiveSkill->resource_bonus_per_level;
+    }
+
     public function getNameAttribute()
     {
         return $this->passiveSkill->name;

app/Game/Kingdoms/Builders/KingdomBuilder.php

@@ -5,6 +5,7 @@
 use App\Flare\Models\Character;
 use App\Flare\Models\Kingdom;
 use App\Game\Messages\Events\ServerMessageEvent;
+use App\Game\PassiveSkills\Values\PassiveSkillTypeValue;
 
 class KingdomBuilder
 {
@@ -16,7 +17,7 @@ public function createKingdom(Character $character, string $name, string $color)
 
         $isOnIcePlane = $character->map->gameMap->mapType()->isTheIcePlane();
         $characterKingdomCount = $character->kingdoms()->count();
-
+        $skill = $character->passiveSkills->where('passiveSkill.effect_type', PassiveSkillTypeValue::RESOURCE_INCREASE)->first();
         $protectedUntil = null;
 
         if (! $isOnIcePlane && $characterKingdomCount === 0) {
@@ -32,18 +33,18 @@ public function createKingdom(Character $character, string $name, string $color)
             'color' => $color,
             'character_id' => $character->id,
             'game_map_id' => $character->map->gameMap->id,
-            'max_stone' => 2000,
-            'max_wood' => 2000,
-            'max_clay' => 2000,
-            'max_iron' => 2000,
+            'max_stone' => 2000 + $skill->resource_increase_amount,
+            'max_wood' => 2000 + $skill->resource_increase_amount,
+            'max_clay' => 2000 + $skill->resource_increase_amount,
+            'max_iron' => 2000 + $skill->resource_increase_amount,
             'max_steel' => 31000,
             'current_stone' => 2000,
             'current_wood' => 2000,
             'current_clay' => 2000,
             'current_iron' => 2000,
             'current_steel' => 0,
             'current_population' => 100,
-            'max_population' => 100,
+            'max_population' => 100 + $skill->resource_increase_amount,
             'current_morale' => .50,
             'max_morale' => 1.0,
             'treasury' => 0,

app/Game/Kingdoms/Jobs/UpgradeBuilding.php

@@ -4,6 +4,7 @@
 
 use App\Flare\Models\BuildingInQueue;
 use App\Flare\Models\CapitalCityBuildingQueue;
+use App\Flare\Models\Character;
 use App\Flare\Models\Kingdom;
 use App\Flare\Models\KingdomBuilding;
 use App\Flare\Models\User;
@@ -12,6 +13,7 @@
 use App\Game\Kingdoms\Service\UpdateKingdom;
 use App\Game\Kingdoms\Values\CapitalCityQueueStatus;
 use App\Game\Messages\Types\KingdomMessageTypes;
+use App\Game\PassiveSkills\Values\PassiveSkillTypeValue;
 use Exception;
 use Facades\App\Flare\Values\UserOnlineValue;
 use Facades\App\Game\Messages\Handlers\ServerMessageHandler;
@@ -28,7 +30,9 @@ class UpgradeBuilding implements ShouldQueue
     /**
      * @var User
      */
-    protected $user;
+    protected User $user;
+
+    protected Character $character;
 
     protected KingdomBuilding $building;
 
@@ -53,6 +57,8 @@ public function __construct(KingdomBuilding $building, User $user, int $queueId,
     {
         $this->user = $user;
 
+        $this->character = $user->character;
+
         $this->building = $building;
 
         $this->queueId = $queueId;
@@ -72,6 +78,9 @@ public function handle(UpdateKingdom $updateKingdom, CapitalCityBuildingManageme
 
         $queue = BuildingInQueue::find($this->queueId);
 
+        $skill = $this->character->passiveSkills->where('passiveSkill.effect_type', PassiveSkillTypeValue::RESOURCE_INCREASE)->first();
+
+
         if (is_null($queue)) {
             return;
         }
@@ -109,7 +118,7 @@ public function handle(UpdateKingdom $updateKingdom, CapitalCityBuildingManageme
             }
             // @codeCoverageIgnoreEnd
 
-            $this->building->kingdom->{'max_' . $type} += 1000;
+            $this->building->kingdom->{'max_' . $type} += (1000 + $skill->resource_increase_amount);
         }
 
         $this->building->kingdom->save();
@@ -133,7 +142,7 @@ public function handle(UpdateKingdom $updateKingdom, CapitalCityBuildingManageme
 
         if ($building->is_farm) {
             $building->kingdom->update([
-                'max_population' => $building->kingdom->max_population + (($building->level * 100) + 100),
+                'max_population' => $building->kingdom->max_population + (($building->level * 100) + 100) + $skill->resource_increase_amount,
             ]);
         }
 

app/Game/Maps/Jobs/UpdateMapLocationsJob.php

@@ -56,8 +56,8 @@ public function handle(LocationService $locationService): void
 
         $raid = Raid::find($this->raidId);
 
-        $locationData =  $locationService->fetchLocationData($character->map->game_map_id); // $locationService->fetchLocationData($character->map->game_map_id)->merge($locationService->fetchCorruptedLocationData($raid));
-        dump('Handle of App\Game\Maps\Jobs\UpdateMapLocationsJob, locations is:', $locationData);
+        $locationData =  $locationService->fetchLocationData($character->map->game_map_id)->merge($locationService->fetchCorruptedLocationData($raid));
+
         event(new UpdateMapLocations($character->user, $locationData));
     }
 }

app/Game/Maps/Services/LocationService.php

@@ -146,7 +146,6 @@ public function fetchLocationData(int $gameMapId): Collection
         $cachedValue = Cache::get($cacheKey);
 
         if (!is_null($cachedValue)) {
-            dump('Being called?');
             return collect($cachedValue);
         }
 

app/Providers/AppServiceProvider.php

@@ -4,6 +4,7 @@
 
 use App\Console\AfterDeployment\CreateLocationDataCache;
 use App\Console\AfterDeployment\FixFactionLoyaltyCraftingTasks;
+use App\Console\AfterDeployment\FixKingdomMaxResourcesBasedOnPassiveSkill;
 use App\Console\AfterDeployment\FixWeaponMasteryTypes;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Mail;
@@ -96,6 +97,7 @@ public function register(): void
             FixFactionLoyaltyCraftingTasks::class,
             FixWeaponMasteryTypes::class,
             CreateLocationDataCache::class,
+            FixKingdomMaxResourcesBasedOnPassiveSkill::class,
 
             // Development Commands:
             CreateCharacter::class,