Merge branch 'master' into fix-capital-city-system

AdamKyle · Oct 8, 2024 · 00563ce · 00563ce
2 parents 1b8f6ff + 5ba56e8
commit 00563ce
Show file tree

Hide file tree

Showing 49 changed files with 706 additions and 278 deletions.
diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
@@ -19,42 +19,42 @@ jobs:
           --health-timeout=5s
           --health-retries=3
     steps:
-    - uses: actions/checkout@v1
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: 8.3
-    - name: Copy .env
-      run: php -r "file_exists('.env') || copy('.env.example', '.env');"
-    - name: Install Dependencies
-      run: |
-        rm -rf vendor
-        rm -rf composer.lock
-        composer install
-        yarn install
-    - name: Type Check
-      run: yarn type-check
-    - name: Generate key
-      run: php artisan key:generate
-    - name: Link Storage
-      run: php artisan storage:link
-    - name: Install dependencies (Laravel Vite)
-      run: yarn build
-    - name: Execute tests (Unit and Feature tests) via PHPUnit
-      env:
-        DB_CONNECTION: mysql
-        DB_HOST: 127.0.0.1
-        DB_DATABASE: flare_test
-        DB_PORT: 33306
-        DB_USER: root
-        DB_PASSWORD: password
-        TIME_ZONE: America/Edmonton
-      run: |
-        php artisan migrate
-        mkdir test-coverage
-        vendor/bin/phpunit --stop-on-error --stop-on-failure --coverage-html=./test-coverage
-    - name: Upload HTML coverage report
-      uses: actions/upload-artifact@v4
-      with:
-        name: coverage-report
-        path: test-coverage
+      - uses: actions/checkout@v1
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.3
+      - name: Copy .env
+        run: php -r "file_exists('.env') || copy('.env.example', '.env');"
+      - name: Install Dependencies
+        run: |
+          rm -rf vendor
+          rm -rf composer.lock
+          composer install
+          yarn install
+      - name: Type Check
+        run: yarn type-check
+      - name: Generate key
+        run: php artisan key:generate
+      - name: Link Storage
+        run: php artisan storage:link
+      - name: Install dependencies (Laravel Vite)
+        run: yarn build
+      - name: Execute tests (Unit and Feature tests) via PHPUnit
+        env:
+          DB_CONNECTION: mysql
+          DB_HOST: 127.0.0.1
+          DB_DATABASE: flare_test
+          DB_PORT: 33306
+          DB_USER: root
+          DB_PASSWORD: password
+          TIME_ZONE: America/Edmonton
+        run: |
+          php artisan migrate
+          mkdir test-coverage
+          vendor/bin/phpunit --stop-on-error --stop-on-failure --coverage-html=./test-coverage
+      - name: Upload HTML coverage report
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage-report
+          path: test-coverage
diff --git a/_ide_helper.php b/_ide_helper.php
@@ -5,7 +5,7 @@
 
 /**
  * A helper file for Laravel, to provide autocomplete information to your IDE
- * Generated for Laravel 10.48.18.
+ * Generated for Laravel 10.48.20.
  *
  * This file should not be included in your code, only analyzed by your IDE!
  *
@@ -4782,6 +4782,29 @@
         {
                         /** @var \Illuminate\Database\DatabaseManager $instance */
                         return $instance->macroCall($method, $parameters);
+        }
+                    /**
+         * Run an insert statement against the database.
+         *
+         * @param string $query
+         * @param array $bindings
+         * @param string|null $sequence
+         * @return bool 
+         * @static 
+         */        public static function insert($query, $bindings = [], $sequence = null)
+        {
+                        /** @var \Illuminate\Database\MySqlConnection $instance */
+                        return $instance->insert($query, $bindings, $sequence);
+        }
+                    /**
+         * Get the connection's last insert ID.
+         *
+         * @return string|int|null 
+         * @static 
+         */        public static function getLastInsertId()
+        {
+                        /** @var \Illuminate\Database\MySqlConnection $instance */
+                        return $instance->getLastInsertId();
         }
                     /**
          * Determine if the connected database is a MariaDB database.
@@ -4944,18 +4967,6 @@
         {            //Method inherited from \Illuminate\Database\Connection         
                         /** @var \Illuminate\Database\MySqlConnection $instance */
                         return $instance->cursor($query, $bindings, $useReadPdo);
-        }
-                    /**
-         * Run an insert statement against the database.
-         *
-         * @param string $query
-         * @param array $bindings
-         * @return bool 
-         * @static 
-         */        public static function insert($query, $bindings = [])
-        {            //Method inherited from \Illuminate\Database\Connection         
-                        /** @var \Illuminate\Database\MySqlConnection $instance */
-                        return $instance->insert($query, $bindings);
         }
                     /**
          * Run an update statement against the database.
@@ -16689,6 +16700,48 @@
         {
                         /** @var \Maatwebsite\Excel\Excel $instance */
                         return $instance->queueImport($import, $filePath, $disk, $readerType);
+        }
+                    /**
+         * Register a custom macro.
+         *
+         * @param string $name
+         * @param object|callable $macro
+         * @return void 
+         * @static 
+         */        public static function macro($name, $macro)
+        {
+                        \Maatwebsite\Excel\Excel::macro($name, $macro);
+        }
+                    /**
+         * Mix another object into the class.
+         *
+         * @param object $mixin
+         * @param bool $replace
+         * @return void 
+         * @throws \ReflectionException
+         * @static 
+         */        public static function mixin($mixin, $replace = true)
+        {
+                        \Maatwebsite\Excel\Excel::mixin($mixin, $replace);
+        }
+                    /**
+         * Checks if macro is registered.
+         *
+         * @param string $name
+         * @return bool 
+         * @static 
+         */        public static function hasMacro($name)
+        {
+                        return \Maatwebsite\Excel\Excel::hasMacro($name);
+        }
+                    /**
+         * Flush the existing macros.
+         *
+         * @return void 
+         * @static 
+         */        public static function flushMacros()
+        {
+                        \Maatwebsite\Excel\Excel::flushMacros();
         }
                     /**
          * 

diff --git a/app/Admin/Services/ItemsService.php b/app/Admin/Services/ItemsService.php
@@ -84,6 +84,7 @@ public function formInputs(): array
                 ItemeffectsValue::SETTLE_IN_ICE_PLANE,
                 ItemEffectsValue::MERCENARY_SLOT_BONUS,
                 ItemEffectsValue::TWISTED_TREE_BRANCH,
+                ItemEffectsValue::TWISTED_DUNGEONS,
             ],
             'specialtyTypes' => [
                 ItemSpecialtyType::HELL_FORGED,

diff --git a/app/Console/AfterDeployment/AddHolyStacksToItems.php b/app/Console/AfterDeployment/AddHolyStacksToItems.php
@@ -49,7 +49,14 @@ public function handle(): void
                     if (! is_null($item->specialty_type)) {
                         $type = new ItemSpecialtyType($item->specialty_type);
 
-                        if ($type->isHellForged() || $type->isPurgatoryChains() || $type->isPirateLordLeather() || $type->isCorruptedIce() || $type->isDelusionalSilver() || $type->isTwistedEarth()) {
+                        if ($type->isHellForged() ||
+                            $type->isPurgatoryChains() ||
+                            $type->isPirateLordLeather() ||
+                            $type->isCorruptedIce() ||
+                            $type->isDelusionalSilver() ||
+                            $type->isTwistedEarth() ||
+                            $type->isFaithlessPlate()) {
+
                             $maxStacks = 20;
                         }
                     } else {

diff --git a/app/Console/Commands/ReBalanceMonsters.php b/app/Console/Commands/ReBalanceMonsters.php
@@ -114,6 +114,17 @@ public function handle(ExponentialAttributeCurve $exponentialAttributeCurve)
 
         $this->manageMonsters($monsters, $exponentialAttributeCurve, 10000000, 16000000000, 1000000, 5000, MapNameValue::TWISTED_MEMORIES);
 
+        // Twisted Memories Weekly Fights:
+        $gameMap = GameMap::where('name', MapNameValue::TWISTED_MEMORIES)->first();
+        $monsters = Monster::where('game_map_id', $gameMap->id)
+            ->where('is_raid_monster', false)
+            ->where('is_raid_boss', false)
+            ->where('is_celestial_entity', false)
+            ->whereNotNull('only_for_location_type')
+            ->get();
+
+        $this->manageMonsters($monsters, $exponentialAttributeCurve, 500000000000, 2000000000000, 150000000000, 1000000000, MapNameValue::TWISTED_MEMORIES);
+
         // Delusional Memories Monsters:
         $gameMap = GameMap::where('name', MapNameValue::DELUSIONAL_MEMORIES)->first();
         $monsters = Monster::where('game_map_id', $gameMap->id)
@@ -145,7 +156,7 @@ public function handle(ExponentialAttributeCurve $exponentialAttributeCurve)
             ->whereNotNull('only_for_location_type')
             ->get();
 
-        $this->manageMonsters($monsters, $exponentialAttributeCurve, 500000000000, 2000000000000, 150000000000, 1000000000, MapNameValue::DELUSIONAL_MEMORIES);
+        $this->manageMonsters($monsters, $exponentialAttributeCurve, 500000000000, 4000000000000, 150000000000, 1000000000, MapNameValue::DELUSIONAL_MEMORIES);
 
         // Shadow Planes Weekly Fights:
         $gameMap = GameMap::where('name', MapNameValue::SHADOW_PLANE)->first();