diff --git a/app/Console/Commands/CombatLog/ExtractSpellAurasToCsv.php b/app/Console/Commands/CombatLog/ExtractSpellAurasToCsv.php index 64580eda0..6f80518ac 100644 --- a/app/Console/Commands/CombatLog/ExtractSpellAurasToCsv.php +++ b/app/Console/Commands/CombatLog/ExtractSpellAurasToCsv.php @@ -5,7 +5,7 @@ use App\Logic\CombatLog\CombatEvents\CombatLogEvent; use App\Logic\CombatLog\Guid\Creature; use App\Models\Dungeon; -use App\Models\Spell; +use App\Models\Spell\Spell; use App\Service\CombatLog\CombatLogDataExtractionServiceInterface; use App\Service\Wowhead\WowheadServiceInterface; use Illuminate\Support\Collection; diff --git a/app/Console/Commands/Mapping/Save.php b/app/Console/Commands/Mapping/Save.php index 9a9f2d63f..c7c858779 100644 --- a/app/Console/Commands/Mapping/Save.php +++ b/app/Console/Commands/Mapping/Save.php @@ -10,7 +10,7 @@ use App\Models\Mapping\MappingCommitLog; use App\Models\Mapping\MappingVersion; use App\Models\Npc\Npc; -use App\Models\Spell; +use App\Models\Spell\Spell; use App\Traits\SavesArrayToJsonFile; use Illuminate\Console\Command; use Illuminate\Database\Eloquent\Model; diff --git a/app/Console/Commands/Wowhead/FetchSpellData.php b/app/Console/Commands/Wowhead/FetchSpellData.php index cdf035a04..c158f10df 100644 --- a/app/Console/Commands/Wowhead/FetchSpellData.php +++ b/app/Console/Commands/Wowhead/FetchSpellData.php @@ -2,7 +2,7 @@ namespace App\Console\Commands\Wowhead; -use App\Models\Spell; +use App\Models\Spell\Spell; use App\Service\Wowhead\WowheadServiceInterface; use Exception; use Illuminate\Console\Command; diff --git a/app/Http/Controllers/AdminToolsController.php b/app/Http/Controllers/AdminToolsController.php index 6d4500e85..e04fb7201 100644 --- a/app/Http/Controllers/AdminToolsController.php +++ b/app/Http/Controllers/AdminToolsController.php @@ -17,7 +17,7 @@ use App\Models\Npc\NpcClassification; use App\Models\Npc\NpcEnemyForces; use App\Models\Npc\NpcType; -use App\Models\Spell; +use App\Models\Spell\Spell; use App\Service\Cache\CacheServiceInterface; use App\Service\CombatLog\ResultEventDungeonRouteServiceInterface; use App\Service\Coordinates\CoordinatesServiceInterface; diff --git a/app/Http/Controllers/Ajax/AjaxEnemyController.php b/app/Http/Controllers/Ajax/AjaxEnemyController.php index d50d6ba37..d06642bb4 100644 --- a/app/Http/Controllers/Ajax/AjaxEnemyController.php +++ b/app/Http/Controllers/Ajax/AjaxEnemyController.php @@ -10,7 +10,7 @@ use App\Models\EnemyActiveAura; use App\Models\Mapping\MappingVersion; use App\Models\RaidMarker; -use App\Models\Spell; +use App\Models\Spell\Spell; use App\Models\User; use App\Service\Coordinates\CoordinatesServiceInterface; use DB; diff --git a/app/Http/Controllers/Ajax/AjaxSpellController.php b/app/Http/Controllers/Ajax/AjaxSpellController.php index 743670914..62620c953 100644 --- a/app/Http/Controllers/Ajax/AjaxSpellController.php +++ b/app/Http/Controllers/Ajax/AjaxSpellController.php @@ -4,7 +4,7 @@ use App\Http\Controllers\Controller; use App\Http\Requests\Spell\AjaxSpellUpdateFormRequest; -use App\Models\Spell; +use App\Models\Spell\Spell; class AjaxSpellController extends Controller { diff --git a/app/Http/Controllers/NpcController.php b/app/Http/Controllers/NpcController.php index b313de718..ac0667e32 100644 --- a/app/Http/Controllers/NpcController.php +++ b/app/Http/Controllers/NpcController.php @@ -12,7 +12,7 @@ use App\Models\Npc\NpcClassification; use App\Models\Npc\NpcEnemyForces; use App\Models\Npc\NpcSpell; -use App\Models\Spell; +use App\Models\Spell\Spell; use App\Models\User; use App\Service\Npc\NpcServiceInterface; use Exception; diff --git a/app/Http/Controllers/SpellController.php b/app/Http/Controllers/SpellController.php index 7283f9597..7368d9e3b 100644 --- a/app/Http/Controllers/SpellController.php +++ b/app/Http/Controllers/SpellController.php @@ -4,7 +4,7 @@ use App\Http\Controllers\Traits\ChangesMapping; use App\Http\Requests\SpellFormRequest; -use App\Models\Spell; +use App\Models\Spell\Spell; use Exception; use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; diff --git a/app/Http/Requests/KillZone/APIKillZoneFormRequest.php b/app/Http/Requests/KillZone/APIKillZoneFormRequest.php index 226e67577..c9a667239 100644 --- a/app/Http/Requests/KillZone/APIKillZoneFormRequest.php +++ b/app/Http/Requests/KillZone/APIKillZoneFormRequest.php @@ -3,7 +3,7 @@ namespace App\Http\Requests\KillZone; use App\Models\Floor\Floor; -use App\Models\Spell; +use App\Models\Spell\Spell; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rule; diff --git a/app/Http/Requests/Spell/AjaxSpellUpdateFormRequest.php b/app/Http/Requests/Spell/AjaxSpellUpdateFormRequest.php index fae54d765..206e4cecf 100644 --- a/app/Http/Requests/Spell/AjaxSpellUpdateFormRequest.php +++ b/app/Http/Requests/Spell/AjaxSpellUpdateFormRequest.php @@ -3,7 +3,7 @@ namespace App\Http\Requests\Spell; use App\Models\Laratrust\Role; -use App\Models\Spell; +use App\Models\Spell\Spell; use Auth; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rule; diff --git a/app/Http/Requests/SpellFormRequest.php b/app/Http/Requests/SpellFormRequest.php index d475638d6..71c2b354e 100644 --- a/app/Http/Requests/SpellFormRequest.php +++ b/app/Http/Requests/SpellFormRequest.php @@ -3,7 +3,7 @@ namespace App\Http\Requests; use App\Models\Laratrust\Role; -use App\Models\Spell; +use App\Models\Spell\Spell; use Auth; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rule; diff --git a/app/Logic/MapContext/MapContext.php b/app/Logic/MapContext/MapContext.php index e4218bb05..737968642 100644 --- a/app/Logic/MapContext/MapContext.php +++ b/app/Logic/MapContext/MapContext.php @@ -11,7 +11,7 @@ use App\Models\Mapping\MappingVersion; use App\Models\PublishedState; use App\Models\RaidMarker; -use App\Models\Spell; +use App\Models\Spell\Spell; use App\Models\User; use App\Service\Cache\CacheServiceInterface; use App\Service\Coordinates\CoordinatesServiceInterface; diff --git a/app/Models/EnemyActiveAura.php b/app/Models/EnemyActiveAura.php index e9f4621ea..d3899afd2 100644 --- a/app/Models/EnemyActiveAura.php +++ b/app/Models/EnemyActiveAura.php @@ -2,6 +2,7 @@ namespace App\Models; +use App\Models\Spell\Spell; use App\Models\Traits\SeederModel; use Eloquent; use Illuminate\Database\Eloquent\Relations\BelongsTo; diff --git a/app/Models/KillZone/KillZone.php b/app/Models/KillZone/KillZone.php index d5cf0c7ee..aee0b8ff6 100644 --- a/app/Models/KillZone/KillZone.php +++ b/app/Models/KillZone/KillZone.php @@ -7,7 +7,7 @@ use App\Models\DungeonRoute\DungeonRoute; use App\Models\Enemy; use App\Models\Floor\Floor; -use App\Models\Spell; +use App\Models\Spell\Spell; use App\Models\Traits\HasLatLng; use Eloquent; use Illuminate\Database\Eloquent\Model; diff --git a/app/Models/KillZone/KillZoneSpell.php b/app/Models/KillZone/KillZoneSpell.php index 5c0cc7210..5520b1624 100644 --- a/app/Models/KillZone/KillZoneSpell.php +++ b/app/Models/KillZone/KillZoneSpell.php @@ -2,7 +2,7 @@ namespace App\Models\KillZone; -use App\Models\Spell; +use App\Models\Spell\Spell; use Eloquent; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; diff --git a/app/Models/Npc/Npc.php b/app/Models/Npc/Npc.php index ce3d61bc8..02da28c2a 100644 --- a/app/Models/Npc/Npc.php +++ b/app/Models/Npc/Npc.php @@ -8,7 +8,7 @@ use App\Models\Enemy; use App\Models\Mapping\MappingModelInterface; use App\Models\Mapping\MappingVersion; -use App\Models\Spell; +use App\Models\Spell\Spell; use App\Models\Traits\SeederModel; use Eloquent; use Illuminate\Database\Eloquent\Relations\BelongsTo; diff --git a/app/Models/Npc/NpcSpell.php b/app/Models/Npc/NpcSpell.php index 2916ce0c8..c7dcbb5cd 100644 --- a/app/Models/Npc/NpcSpell.php +++ b/app/Models/Npc/NpcSpell.php @@ -3,7 +3,7 @@ namespace App\Models\Npc; use App\Models\CacheModel; -use App\Models\Spell; +use App\Models\Spell\Spell; use App\Models\Traits\SeederModel; use Eloquent; use Illuminate\Database\Eloquent\Relations\BelongsTo; diff --git a/app/Models/Spell/Spell.php b/app/Models/Spell/Spell.php new file mode 100644 index 000000000..b8436dd61 --- /dev/null +++ b/app/Models/Spell/Spell.php @@ -0,0 +1,112 @@ + 'integer', + 'schools_mask' => 'integer', + 'aura' => 'boolean', + 'selectable' => 'boolean', + 'hidden_on_map' => 'boolean', + ]; + + public function getSchoolsAsArray(): array + { + $result = []; + + foreach (self::ALL_SCHOOLS as $school) { + $result[$school] = $this->schools_mask & $school; + } + + return $result; + } + + public function scopeVisible(): Builder + { + return $this->where('hidden_on_map', false); + } + + /** + * @return string + */ + public function getIconUrlAttribute(): string + { + return url(sprintf('/images/spells/%s.jpg', $this->icon_name)); + } + + public function getDungeonId(): ?int + { + // Spells aren't tied to a specific dungeon, but they're part of the mapping + return 0; + } + + public function getWowheadLink(): string + { + return sprintf('https://wowhead.com/spell=%d/%s', $this->id, Str::slug($this->name)); + } + + public static function maskToReadableString(int $spellSchoolMask): string + { + $result = []; + + foreach (self::ALL_SCHOOLS as $schoolName => $schoolMask) { + if ($spellSchoolMask & $schoolMask) { + $result[] = $schoolName; + } + } + + return implode(', ', $result); + } +} diff --git a/app/Models/Spell.php b/app/Models/Spell/SpellConstants.php similarity index 62% rename from app/Models/Spell.php rename to app/Models/Spell/SpellConstants.php index 935442ff7..9a80e8c55 100644 --- a/app/Models/Spell.php +++ b/app/Models/Spell/SpellConstants.php @@ -1,35 +1,9 @@ 'integer', - 'schools_mask' => 'integer', - 'aura' => 'boolean', - 'selectable' => 'boolean', - 'hidden_on_map' => 'boolean', + public const MECHANIC_ASLEEP = 'asleep'; + public const MECHANIC_BANISHED = 'banished'; + public const MECHANIC_BLEEDING = 'bleeding'; + public const MECHANIC_CHARMED = 'charmed'; + public const MECHANIC_GRIPPED = 'gripped'; + public const MECHANIC_DAZED = 'dazed'; + public const MECHANIC_DISARMED = 'disarmed'; + public const MECHANIC_DISCOVERY = 'discovery'; + public const MECHANIC_DISORIENTED = 'disoriented'; + public const MECHANIC_DISTRACTED = 'distracted'; + public const MECHANIC_ENRAGED = 'enraged'; + public const MECHANIC_SNARED = 'snared'; + public const MECHANIC_FLEEING = 'fleeing'; + public const MECHANIC_FROZEN = 'frozen'; + public const MECHANIC_HEALING = 'healing'; + public const MECHANIC_HORRIFIED = 'horrified'; + public const MECHANIC_INCAPACITATED = 'incapacitated'; + public const MECHANIC_INTERRUPTED = 'interrupted'; + public const MECHANIC_INVULNERABLE = 'invulnerable'; + public const MECHANIC_MOUNTED = 'mounted'; + public const MECHANIC_SLOWED = 'slowed'; + public const MECHANIC_POLYMORPHED = 'polymorphed'; + public const MECHANIC_ROOTED = 'rooted'; + public const MECHANIC_SAPPED = 'sapped'; + public const MECHANIC_INFECTED = 'infected'; + public const MECHANIC_SHACKLED = 'shackled'; + public const MECHANIC_SHIELDED = 'shielded'; + public const MECHANIC_SILENCED = 'silenced'; + public const MECHANIC_STUNNED = 'stunned'; + public const MECHANIC_TURNED = 'turned'; + public const MECHANIC_WOUNDED = 'wounded'; + + public const ALL_MECHANIC = [ + self::MECHANIC_ASLEEP, + self::MECHANIC_BANISHED, + self::MECHANIC_BLEEDING, + self::MECHANIC_CHARMED, + self::MECHANIC_GRIPPED, + self::MECHANIC_DAZED, + self::MECHANIC_DISARMED, + self::MECHANIC_DISCOVERY, + self::MECHANIC_DISORIENTED, + self::MECHANIC_DISTRACTED, + self::MECHANIC_ENRAGED, + self::MECHANIC_SNARED, + self::MECHANIC_FLEEING, + self::MECHANIC_FROZEN, + self::MECHANIC_HEALING, + self::MECHANIC_HORRIFIED, + self::MECHANIC_INCAPACITATED, + self::MECHANIC_INTERRUPTED, + self::MECHANIC_INVULNERABLE, + self::MECHANIC_MOUNTED, + self::MECHANIC_SLOWED, + self::MECHANIC_POLYMORPHED, + self::MECHANIC_ROOTED, + self::MECHANIC_SAPPED, + self::MECHANIC_INFECTED, + self::MECHANIC_SHACKLED, + self::MECHANIC_SHIELDED, + self::MECHANIC_SILENCED, + self::MECHANIC_STUNNED, + self::MECHANIC_TURNED, + self::MECHANIC_WOUNDED, ]; - - - public function getSchoolsAsArray(): array - { - $result = []; - - foreach (self::ALL_SCHOOLS as $school) { - $result[$school] = $this->schools_mask & $school; - } - - return $result; - } - - public function scopeVisible(): Builder - { - return $this->where('hidden_on_map', false); - } - - /** - * @return string - */ - public function getIconUrlAttribute(): string - { - return url(sprintf('/images/spells/%s.jpg', $this->icon_name)); - } - - public function getDungeonId(): ?int - { - // Spells aren't tied to a specific dungeon, but they're part of the mapping - return 0; - } - - public function getWowheadLink(): string - { - return sprintf('https://wowhead.com/spell=%d/%s', $this->id, Str::slug($this->name)); - } - - public static function maskToReadableString(int $spellSchoolMask): string - { - $result = []; - - foreach (self::ALL_SCHOOLS as $schoolName => $schoolMask) { - if ($spellSchoolMask & $schoolMask) { - $result[] = $schoolName; - } - } - - return implode(', ', $result); - } } diff --git a/app/Repositories/Database/SpellRepository.php b/app/Repositories/Database/SpellRepository.php index 92f502897..0a20c95c6 100644 --- a/app/Repositories/Database/SpellRepository.php +++ b/app/Repositories/Database/SpellRepository.php @@ -2,7 +2,7 @@ namespace App\Repositories\Database; -use App\Models\Spell; +use App\Models\Spell\Spell; use App\Repositories\Interfaces\SpellRepositoryInterface; class SpellRepository extends DatabaseRepository implements SpellRepositoryInterface diff --git a/app/Repositories/Interfaces/SpellRepositoryInterface.php b/app/Repositories/Interfaces/SpellRepositoryInterface.php index 64a276aa3..0600d1b6e 100644 --- a/app/Repositories/Interfaces/SpellRepositoryInterface.php +++ b/app/Repositories/Interfaces/SpellRepositoryInterface.php @@ -2,7 +2,7 @@ namespace App\Repositories\Interfaces; -use App\Models\Spell; +use App\Models\Spell\Spell; use App\Repositories\BaseRepositoryInterface; use Illuminate\Support\Collection; diff --git a/app/SeederHelpers/RelationImport/Mapping/SpellRelationMapping.php b/app/SeederHelpers/RelationImport/Mapping/SpellRelationMapping.php index 516256d15..d2bb3634d 100644 --- a/app/SeederHelpers/RelationImport/Mapping/SpellRelationMapping.php +++ b/app/SeederHelpers/RelationImport/Mapping/SpellRelationMapping.php @@ -2,7 +2,7 @@ namespace App\SeederHelpers\RelationImport\Mapping; -use App\Models\Spell; +use App\Models\Spell\Spell; class SpellRelationMapping extends RelationMapping { diff --git a/app/Service/CombatLog/Builders/DungeonRouteBuilder.php b/app/Service/CombatLog/Builders/DungeonRouteBuilder.php index da5f33723..a67501d22 100644 --- a/app/Service/CombatLog/Builders/DungeonRouteBuilder.php +++ b/app/Service/CombatLog/Builders/DungeonRouteBuilder.php @@ -11,7 +11,7 @@ use App\Models\KillZone\KillZone; use App\Models\KillZone\KillZoneEnemy; use App\Models\Npc\NpcClassification; -use App\Models\Spell; +use App\Models\Spell\Spell; use App\Repositories\Interfaces\DungeonRoute\DungeonRouteRepositoryInterface; use App\Repositories\Interfaces\KillZone\KillZoneEnemyRepositoryInterface; use App\Repositories\Interfaces\KillZone\KillZoneRepositoryInterface; diff --git a/app/Service/CombatLog/Filters/DungeonRoute/SpellFilter.php b/app/Service/CombatLog/Filters/DungeonRoute/SpellFilter.php index c3d8ad89c..f82dec5d2 100644 --- a/app/Service/CombatLog/Filters/DungeonRoute/SpellFilter.php +++ b/app/Service/CombatLog/Filters/DungeonRoute/SpellFilter.php @@ -6,7 +6,7 @@ use App\Logic\CombatLog\CombatEvents\AdvancedCombatLogEvent; use App\Logic\CombatLog\CombatEvents\Prefixes\Spell as SpellPrefix; use App\Logic\CombatLog\CombatEvents\Suffixes\CastSuccess; -use App\Models\Spell; +use App\Models\Spell\Spell; use App\Service\CombatLog\Interfaces\CombatLogParserInterface; use App\Service\CombatLog\ResultEvents\SpellCast; use Illuminate\Support\Collection; diff --git a/app/Service/MDT/MDTImportStringService.php b/app/Service/MDT/MDTImportStringService.php index 1b45ff4b5..5698889f8 100644 --- a/app/Service/MDT/MDTImportStringService.php +++ b/app/Service/MDT/MDTImportStringService.php @@ -30,7 +30,7 @@ use App\Models\Patreon\PatreonBenefit; use App\Models\Polyline; use App\Models\PublishedState; -use App\Models\Spell; +use App\Models\Spell\Spell; use App\Service\Cache\CacheServiceInterface; use App\Service\Coordinates\CoordinatesServiceInterface; use App\Service\MDT\Logging\MDTImportStringServiceLoggingInterface; diff --git a/app/Service/MDT/MDTMappingExportService.php b/app/Service/MDT/MDTMappingExportService.php index 002d76b87..570f48e8c 100644 --- a/app/Service/MDT/MDTMappingExportService.php +++ b/app/Service/MDT/MDTMappingExportService.php @@ -12,7 +12,7 @@ use App\Models\Npc\Npc; use App\Models\Npc\NpcClassification; use App\Models\Npc\NpcEnemyForces; -use App\Models\Spell; +use App\Models\Spell\Spell; use App\Service\Coordinates\CoordinatesServiceInterface; use App\Service\MDT\Logging\MDTMappingExportServiceLoggingInterface; use Illuminate\Support\Collection; diff --git a/app/Service/MDT/MDTMappingImportService.php b/app/Service/MDT/MDTMappingImportService.php index d0bb6df9c..57134e829 100644 --- a/app/Service/MDT/MDTMappingImportService.php +++ b/app/Service/MDT/MDTMappingImportService.php @@ -21,7 +21,7 @@ use App\Models\Npc\NpcSpell; use App\Models\Npc\NpcType; use App\Models\Polyline; -use App\Models\Spell; +use App\Models\Spell\Spell; use App\Service\Cache\CacheServiceInterface; use App\Service\Coordinates\CoordinatesServiceInterface; use App\Service\Mapping\MappingServiceInterface; diff --git a/app/Service/Spell/SpellService.php b/app/Service/Spell/SpellService.php index fd209f3c7..59171a1c7 100644 --- a/app/Service/Spell/SpellService.php +++ b/app/Service/Spell/SpellService.php @@ -3,7 +3,7 @@ namespace App\Service\Spell; use App\Models\CharacterClass; -use App\Models\Spell; +use App\Models\Spell\Spell; use App\Service\Spell\Logging\SpellServiceLoggingInterface; use Illuminate\Support\Str; diff --git a/app/Service/View/ViewService.php b/app/Service/View/ViewService.php index 980d1be91..7cccb4b28 100644 --- a/app/Service/View/ViewService.php +++ b/app/Service/View/ViewService.php @@ -16,7 +16,7 @@ use App\Models\Release; use App\Models\ReleaseChangelogCategory; use App\Models\RouteAttribute; -use App\Models\Spell; +use App\Models\Spell\Spell; use App\Models\User; use App\Service\AffixGroup\AffixGroupEaseTierServiceInterface; use App\Service\Cache\CacheServiceInterface; diff --git a/app/Service/Wowhead/WowheadService.php b/app/Service/Wowhead/WowheadService.php index 541b683c2..af60a5670 100644 --- a/app/Service/Wowhead/WowheadService.php +++ b/app/Service/Wowhead/WowheadService.php @@ -4,7 +4,7 @@ use App\Models\GameVersion\GameVersion; use App\Models\Npc\Npc; -use App\Models\Spell; +use App\Models\Spell\Spell; use App\Service\Traits\Curl; use App\Service\Wowhead\Dtos\SpellDataResult; use App\Service\Wowhead\Logging\WowheadServiceLoggingInterface; diff --git a/database/seeders/DungeonDataSeeder.php b/database/seeders/DungeonDataSeeder.php index 47a7053e6..17df00a0e 100644 --- a/database/seeders/DungeonDataSeeder.php +++ b/database/seeders/DungeonDataSeeder.php @@ -22,7 +22,7 @@ use App\Models\Npc\NpcEnemyForces; use App\Models\Npc\NpcSpell; use App\Models\Speedrun\DungeonSpeedrunRequiredNpc; -use App\Models\Spell; +use App\Models\Spell\Spell; use App\SeederHelpers\RelationImport\Mapping\DungeonFloorSwitchMarkerRelationMapping; use App\SeederHelpers\RelationImport\Mapping\DungeonRelationMapping; use App\SeederHelpers\RelationImport\Mapping\DungeonRouteRelationMapping; diff --git a/lang/en_US/spells.php b/lang/en_US/spells.php index 7a061bd6b..25f4d1fea 100644 --- a/lang/en_US/spells.php +++ b/lang/en_US/spells.php @@ -35,4 +35,38 @@ 'utility' => 'Utility', 'unknown' => 'Unknown', ], + 'mechanic' => [ + 'asleep' => 'Asleep', + 'banished' => 'Banished', + 'bleeding' => 'Bleeding', + 'charmed' => 'Charmed', + 'gripped' => 'Gripped', + 'dazed' => 'Dazed', + 'disarmed' => 'Disarmed', + 'discovery' => 'Discovery', + 'disoriented' => 'Disoriented', + 'distracted' => 'Distracted', + 'enraged' => 'Enraged', + 'snared' => 'Snared', + 'fleeing' => 'Fleeing', + 'frozen' => 'Frozen', + 'healing' => 'Healing', + 'horrified' => 'Horrified', + 'incapacitated' => 'Incapacitated', + 'interrupted' => 'Interrupted', + 'invulnerable' => 'Invulnerable', + 'mounted' => 'Mounted', + 'slowed' => 'Slowed', + 'polymorphed' => 'Polymorphed', + 'rooted' => 'Rooted', + 'sapped' => 'Sapped', + 'infected' => 'Infected', + 'shackled' => 'Shackled', + 'shielded' => 'Shielded', + 'silenced' => 'Silenced', + 'stunned' => 'Stunned', + 'turned' => 'Turned', + 'wounded' => 'Wounded', + ], + ]; diff --git a/resources/views/admin/npc/edit.blade.php b/resources/views/admin/npc/edit.blade.php index 6c00ef4cc..0d28ff52c 100644 --- a/resources/views/admin/npc/edit.blade.php +++ b/resources/views/admin/npc/edit.blade.php @@ -1,7 +1,22 @@ + + @extends('layouts.sitepage', [ 'breadcrumbsParams' => [$npc ?? null], 'showAds' => false, - 'title' => isset($npc) ? __('view_admin.npc.edit.title_edit', ['name' => $npc->name]) : __('view_admin.npc.edit.title_new') + 'title' => isset($npc) ? __('view_admin.npc.edit.title_edit', ['name' => $npc->name]) : __('view_admin.npc.edit.title_new'), ]) @include('common.general.inline', ['path' => 'admin/npc/edit', 'options' => [ @@ -17,16 +32,6 @@ @section('header-title') {{ isset($npc) ? __('view_admin.npc.edit.header_edit', ['name' => $npc->name]) : __('view_admin.npc.edit.header_new') }} @endsection - - @section('content') @isset($npc) {{ Form::model($npc, ['route' => ['admin.npc.update', $npc->id], 'autocomplete' => 'off', 'method' => 'patch', 'files' => true]) }} @@ -62,7 +67,7 @@ * @@ -103,14 +108,14 @@ {!! Form::text('scaled_health', null, [ 'id' => 'scaled_health', 'class' => 'form-control', - 'placeholder' => __('view_admin.npc.edit.scaled_health_placeholder') + 'placeholder' => __('view_admin.npc.edit.scaled_health_placeholder'), ]) !!}
{!! Form::text('scaled_health_percentage', null, [ 'id' => 'scaled_health_percentage', 'class' => 'form-control', - 'placeholder' => __('view_admin.npc.edit.scaled_health_percentage_placeholder') + 'placeholder' => __('view_admin.npc.edit.scaled_health_percentage_placeholder'), ]) !!}
@@ -122,7 +127,7 @@ [ 'none' => __('view_admin.npc.edit.scaled_type_none'), 'fortified' => __('view_admin.npc.edit.scaled_type_fortified', ['affix' => __('affixes.fortified.name')]), - 'tyrannical' => __('view_admin.npc.edit.scaled_type_tyrannical', ['affix' => __('affixes.tyrannical.name')]) + 'tyrannical' => __('view_admin.npc.edit.scaled_type_tyrannical', ['affix' => __('affixes.tyrannical.name')]), ], null, ['id' => 'scaled_health_type', 'class' => 'form-control selectpicker']) diff --git a/resources/views/admin/spell/edit.blade.php b/resources/views/admin/spell/edit.blade.php index bb96e1c87..f8d73352a 100644 --- a/resources/views/admin/spell/edit.blade.php +++ b/resources/views/admin/spell/edit.blade.php @@ -1,11 +1,11 @@ $categories * @var array $dispelTypes * @var array $cooldownGroups diff --git a/resources/views/admin/spell/list.blade.php b/resources/views/admin/spell/list.blade.php index 6d5ddad53..1a5916f22 100644 --- a/resources/views/admin/spell/list.blade.php +++ b/resources/views/admin/spell/list.blade.php @@ -1,6 +1,6 @@ $npcs + * @var Collection $npcs * @var Collection $spells */ ?> diff --git a/resources/views/app/commit/commit.blade.php b/resources/views/app/commit/commit.blade.php index 28ac62182..991d062a0 100644 --- a/resources/views/app/commit/commit.blade.php +++ b/resources/views/app/commit/commit.blade.php @@ -1,6 +1,10 @@ - - + @if(!empty($lines) > 0) {{ implode('\n', $lines) }} -@endisset \ No newline at end of file +@endisset diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php index 12fef4df6..df53f548d 100644 --- a/routes/breadcrumbs.php +++ b/routes/breadcrumbs.php @@ -11,7 +11,7 @@ use App\Models\Npc\NpcEnemyForces; use App\Models\Release; use App\Models\Season; -use App\Models\Spell; +use App\Models\Spell\Spell; use App\Models\Team; use Diglactic\Breadcrumbs\Breadcrumbs; use Diglactic\Breadcrumbs\Generator;