diff --git a/dist/app/Classes/Character/CharacterItemConfig.php b/dist/app/Classes/Character/CharacterItemConfig.php index ad7d4d5..4a2db6d 100644 --- a/dist/app/Classes/Character/CharacterItemConfig.php +++ b/dist/app/Classes/Character/CharacterItemConfig.php @@ -54,7 +54,6 @@ public static function getDefaultEquippedWeapons(): array { return [ ...static::$defaultEquippedWeapons, - ...static::$additionalWeapons, ]; } @@ -76,6 +75,13 @@ public static function getDefaultPowers(): array ]; } + public static function getDefaultWeapons(): array { + return [ + ...static::$defaultEquippedWeapons, + ...static::$additionalWeapons, + ]; + } + public static function getAllowedPerks(): array { return [...static::$additionalPerks, ...static::$defaultEquippedPerks]; diff --git a/dist/app/Console/Commands/GiveAllUsersDefaultItems.php b/dist/app/Console/Commands/GiveAllUsersDefaultItems.php index f11f145..2467e6d 100644 --- a/dist/app/Console/Commands/GiveAllUsersDefaultItems.php +++ b/dist/app/Console/Commands/GiveAllUsersDefaultItems.php @@ -53,6 +53,7 @@ public function addItemsToUser(PlayerData &$playerData, string $config): void { ...$config::getDefaultEquippedWeapons(), ...$config::getDefaultEquipment(), ...$config::getDefaultPowers(), + ...$config::getDefaultWeapons(), ...$config::getDefaultEquippedPerks(), ]; diff --git a/dist/app/Http/Controllers/Api/Player/MetadataController.php b/dist/app/Http/Controllers/Api/Player/MetadataController.php index c5354ed..6c4bbde 100644 --- a/dist/app/Http/Controllers/Api/Player/MetadataController.php +++ b/dist/app/Http/Controllers/Api/Player/MetadataController.php @@ -146,6 +146,7 @@ private function handleUpdateCharacterMetadata(UpdateMetadataGroupRequest &$requ ...$characterConfig::getDefaultEquippedWeapons(), ...$characterConfig::getDefaultEquipment(), ...$characterConfig::getDefaultPowers(), + ...$characterConfig::getDefaultWeapons(), ...$characterConfig::getDefaultEquippedPerks(), ]; diff --git a/dist/app/Http/Controllers/Api/Player/PlayerController.php b/dist/app/Http/Controllers/Api/Player/PlayerController.php index 0def470..8f905f6 100644 --- a/dist/app/Http/Controllers/Api/Player/PlayerController.php +++ b/dist/app/Http/Controllers/Api/Player/PlayerController.php @@ -179,6 +179,7 @@ protected function resetCharacter(CharacterData &$characterData): void ...$config::getDefaultEquippedPerks(), ...$config::getDefaultPowers(), ...$config::getDefaultEquippedWeapons(), + ...$config::getDefaultWeapons(), ...$config::getDefaultEquippedBonuses(), ], true); $inventory = $characterData->playerData->inventory(); diff --git a/dist/app/Models/User/PlayerData.php b/dist/app/Models/User/PlayerData.php index b26f0cf..807ca83 100644 --- a/dist/app/Models/User/PlayerData.php +++ b/dist/app/Models/User/PlayerData.php @@ -70,6 +70,7 @@ protected static function booted(): void ...$configClass::getDefaultEquippedWeapons(), ...$configClass::getDefaultEquipment(), ...$configClass::getDefaultPowers(), + ...$configClass::getDefaultWeapons(), ...$configClass::getDefaultEquippedPerks(), ]; @@ -92,6 +93,7 @@ protected static function booted(): void ...$configClass::getDefaultEquippedWeapons(), ...$configClass::getDefaultEquipment(), ...$configClass::getDefaultPowers(), + ...$configClass::getDefaultWeapons(), ...$configClass::getDefaultEquippedPerks(), ];