Various fixes

AdamKyle · Jan 15, 2024 · eec40a1 · eec40a1
1 parent 346674a
commit eec40a1
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 24 deletions.
diff --git a/app/Console/Commands/RessurectRaidBoss.php b/app/Console/Commands/RessurectRaidBoss.php
@@ -56,17 +56,17 @@ public function handle(UpdateRaidMonsters $updateRaidMonsters) {
 
             $corruptedLocations = Location::whereIn('id', $corruptedLocationIds)->get();
 
-            // foreach ($corruptedLocations as $location) {
-            //     $characters = Character::leftJoin('maps', 'characters.id', '=', 'maps.character_id')
-            //                            ->where('maps.character_position_x', $location->x)
-            //                            ->where('maps.character_position_y', $location->y)
-            //                            ->where('maps.game_map_id', $location->game_map_id)
-            //                            ->get();
-
-            //     foreach ($characters as $character) {
-            //         $updateRaidMonsters->updateMonstersForRaidLocations($character, $location);
-            //     }
-            // }
+             foreach ($corruptedLocations as $location) {
+                 $characters = Character::leftJoin('maps', 'characters.id', '=', 'maps.character_id')
+                                        ->where('maps.character_position_x', $location->x)
+                                        ->where('maps.character_position_y', $location->y)
+                                        ->where('maps.game_map_id', $location->game_map_id)
+                                        ->get();
+
+                 foreach ($characters as $character) {
+                     $updateRaidMonsters->updateMonstersForRaidLocations($character, $location);
+                 }
+             }
         }
     }
 }
diff --git a/app/Flare/GameImporter/Console/Commands/MassImportCustomData.php b/app/Flare/GameImporter/Console/Commands/MassImportCustomData.php
@@ -31,18 +31,8 @@ class MassImportCustomData extends Command {
      */
     public function handle() {
 
-        // Handle importing things in a custom format.
-        Artisan::call('import:game-data Skills');
-        Artisan::call('import:game-data Items');
-        Artisan::call('import:game-data Monsters');
-        Artisan::call('import:game-data "Admin Section"');
-        Artisan::call('import:game-data Quests');
-        Artisan::call('import:game-data Locations');
-
-        Artisan::call('change:damage-amount-on-affixes');
-        Artisan::call('assign:new-factions-to-characters');
         Artisan::call('create:character-attack-data');
-        Artisan::call('create:quest-cache');
+
         $this->importInformationSection();
     }
 

diff --git a/app/Flare/ServerFight/Fight/Affixes.php b/app/Flare/ServerFight/Fight/Affixes.php
@@ -25,7 +25,7 @@ public function getCharacterAffixDamage(array $attackData, bool $isPvp, float $m
         $nonStackingDamage = ($attackData['affixes']['non_stacking_damage'] - $attackData['damage_deduction']) + $totalDamage;
         $cantBeResisted    = $attackData['affixes']['cant_be_resisted'];
 
-        $weaponDamage = $attackData[$attribute] + ($attackData[$attribute] * ($totalDamage + $nonStackingDamage));
+        $weaponDamage = $attackData[$attribute] + ($attackData[$attribute] * $totalDamage);
         $nonStackingWeaponDamage = $attackData[$attribute] + ($attackData[$attribute] * $nonStackingDamage);
 
         if ($totalDamage > 0 || $nonStackingDamage > 0) {

diff --git a/app/Flare/ServerFight/Fight/CharacterAttacks/SecondaryAttacks.php b/app/Flare/ServerFight/Fight/CharacterAttacks/SecondaryAttacks.php
@@ -99,6 +99,7 @@ public function classSpecialtyDamage(bool $isPvp = false) {
         }
 
         if ($special['required_attack_type'] === $this->attackData['attack_type']) {
+
             $this->monsterHealth -= $special['damage'];
 
             $this->addMessage('Your class special: ' . $special['name'] . ' fires off and you do: ' . number_format($special['damage']) . ' damage to the enemy!', "player-action", $isPvp);

diff --git a/...fo-sections-images/equipment-types/tBX2kfRnH1f5779H76eLWySgXxRv0LOjdE2uybpR.png b/...fo-sections-images/equipment-types/tBX2kfRnH1f5779H76eLWySgXxRv0LOjdE2uybpR.png
diff --git a/resources/data-imports/Admin Section/information.json b/resources/data-imports/Admin Section/information.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -99,6 +99,7 @@ public function classSpecialtyDamage(bool $isPvp = false) { @@
             }
             if ($special['required_attack_type'] === $this->attackData['attack_type']) {
                 $this->monsterHealth -= $special['damage'];
                 $this->addMessage('Your class special: ' . $special['name'] . ' fires off and you do: ' . number_format($special['damage']) . ' damage to the enemy!', "player-action", $isPvp);
@@ Expand Down @@