From 695b193accaecd7968a305ae4c31c96bc4447841 Mon Sep 17 00:00:00 2001
From: SpeedyD <speedydvv@gmail.com>
Date: Thu, 27 Nov 2025 01:46:25 +0100
Subject: [PATCH 1/7] Feat(characters): Show only traits belonging to the
 character's species (or non-species specific traits)

---
 .../Characters/CharacterImageController.php   |  2 +-
 .../Characters/DesignController.php           | 15 +++++++-
 app/Models/Feature/Feature.php                | 38 ++++++++++++++++---
 config/lorekeeper/extensions.php              |  3 ++
 4 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/Admin/Characters/CharacterImageController.php b/app/Http/Controllers/Admin/Characters/CharacterImageController.php
index 0aefec61b3..f537c2e659 100644
--- a/app/Http/Controllers/Admin/Characters/CharacterImageController.php
+++ b/app/Http/Controllers/Admin/Characters/CharacterImageController.php
@@ -106,7 +106,7 @@ public function getEditImageFeatures($id) {
             'rarities'  => ['0' => 'Select Rarity'] + Rarity::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
             'specieses' => ['0' => 'Select Species'] + Species::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
             'subtypes'  => Subtype::where('species_id', '=', $image->species_id)->orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'features'  => Feature::getDropdownItems(1),
+            'features'  => Feature::getDropdownItems(Auth::user()->hasPower('edit_data'), $image->species_id),
         ]);
     }
 
diff --git a/app/Http/Controllers/Characters/DesignController.php b/app/Http/Controllers/Characters/DesignController.php
index 58ea7a54b1..adf6dae147 100644
--- a/app/Http/Controllers/Characters/DesignController.php
+++ b/app/Http/Controllers/Characters/DesignController.php
@@ -235,7 +235,7 @@ public function getFeatures($id) {
             'specieses' => ['0' => 'Select Species'] + Species::visible()->orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
             'subtypes'  => Subtype::visible()->where('species_id', '=', $r->species_id)->orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
             'rarities'  => ['0' => 'Select Rarity'] + Rarity::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'features'  => Feature::getDropdownItems(),
+            'features'  => Feature::getDropdownItems(Auth::user()->hasPower('edit_data'), $r->species_id),
         ]);
     }
 
@@ -254,6 +254,19 @@ public function getFeaturesSubtype(Request $request) {
         ]);
     }
 
+    /**
+     * Shows the edit image trait portion of the modal.
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    public function getFeaturesFeature(Request $request) {
+        $species = $request->input('species');
+
+        return view('character.design._features_feature', [
+            'features'  => Feature::getDropdownItems(Auth::user()->hasPower('edit_data'), $species)
+        ]);
+    }
+
     /**
      * Edits a design update request's features section.
      *
diff --git a/app/Models/Feature/Feature.php b/app/Models/Feature/Feature.php
index 253389abd8..d0f1b70563 100644
--- a/app/Models/Feature/Feature.php
+++ b/app/Models/Feature/Feature.php
@@ -6,6 +6,7 @@
 use App\Models\Rarity;
 use App\Models\Species\Species;
 use App\Models\Species\Subtype;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\DB;
 
 class Feature extends Model {
@@ -286,7 +287,7 @@ public function getAdminPowerAttribute() {
 
     **********************************************************************************************/
 
-    public static function getDropdownItems($withHidden = 0) {
+    public static function getDropdownItems($withHidden = 0, $withSpecies = 0) {
         $visibleOnly = 1;
         if ($withHidden) {
             $visibleOnly = 0;
@@ -295,10 +296,21 @@ public static function getDropdownItems($withHidden = 0) {
         if (config('lorekeeper.extensions.organised_traits_dropdown.enable')) {
             $sorted_feature_categories = collect(FeatureCategory::all()->where('is_visible', '>=', $visibleOnly)->sortBy('sort')->pluck('name')->toArray());
 
-            $grouped = self::where('is_visible', '>=', $visibleOnly)
-                ->select('name', 'id', 'feature_category_id', 'rarity_id', 'species_id', 'subtype_id')->with(['category', 'rarity', 'species', 'subtype'])
-                ->orderBy('name')->get()->keyBy('id')->groupBy('category.name', $preserveKeys = true)
-                ->toArray();
+            if (config('show_species-only_traits_in_dropdown') && $withSpecies) {
+                $grouped = self::where('is_visible', '>=', $visibleOnly)
+                    ->when($withSpecies, function (Builder $query, int $withSpecies) {
+                        $query->where('species_id', '=', $withSpecies)
+                        ->orWhere('species_id', '=', NULL);
+                    })
+                    ->select('name', 'id', 'feature_category_id', 'rarity_id', 'species_id', 'subtype_id')->with(['category', 'rarity', 'species', 'subtype'])
+                    ->orderBy('name')->get()->keyBy('id')->groupBy('category.name', $preserveKeys = true)
+                    ->toArray();
+            } else {
+                $grouped = self::where('is_visible', '>=', $visibleOnly)
+                    ->select('name', 'id', 'feature_category_id', 'rarity_id', 'species_id', 'subtype_id')->with(['category', 'rarity', 'species', 'subtype'])
+                    ->orderBy('name')->get()->keyBy('id')->groupBy('category.name', $preserveKeys = true)
+                    ->toArray();
+            }
             if (isset($grouped[''])) {
                 if (!$sorted_feature_categories->contains('Miscellaneous')) {
                     $sorted_feature_categories->push('Miscellaneous');
@@ -353,7 +365,21 @@ public static function getDropdownItems($withHidden = 0) {
 
             return $features_by_category;
         } else {
-            return self::where('is_visible', '>=', $visibleOnly)->orderBy('name')->pluck('name', 'id')->toArray();
+            if (config('show_species-only_traits_in_dropdown') && $withSpecies) {
+                return self::where('is_visible', '>=', $visibleOnly)
+                    ->when($withSpecies, function (Builder $query, int $withSpecies) {
+                        $query->where('species_id', '=', $withSpecies)
+                        ->orWhere('species_id', '=', NULL);
+                    })
+                    ->orderBy('name')
+                    ->pluck('name', 'id')
+                    ->toArray();
+            } else {
+                return self::where('is_visible', '>=', $visibleOnly)
+                    ->orderBy('name')
+                    ->pluck('name', 'id')
+                    ->toArray();
+            }
         }
     }
 }
diff --git a/config/lorekeeper/extensions.php b/config/lorekeeper/extensions.php
index 9e0f7041b2..818e7c07ac 100644
--- a/config/lorekeeper/extensions.php
+++ b/config/lorekeeper/extensions.php
@@ -140,4 +140,7 @@
 
     // Unmerge Item Page and Item Entry - Speedy
     'unmerge_item_page_and_entry' => 0, // If enabled, uses the html on world/item_page.blade.php instead of the include that links to world/_item_entry.blade.php
+    
+    // Show Species-only traits in dropdown - Speedy
+    'show_species-only_traits_in_dropdown' => 0, // If enabled, will only show traits from the associated species as well as traits that aren't species-limited in the dropdown menus.
 ];

From 50d27bd4bb88d44cb5850a58bc9197c5ef1e9b28 Mon Sep 17 00:00:00 2001
From: SpeedyD <speedydvv@gmail.com>
Date: Thu, 27 Nov 2025 01:58:24 +0100
Subject: [PATCH 2/7] Refresh trait on species change

---
 .../admin/_edit_features_modal.blade.php      | 17 +++++++++++++++-
 .../design/_features_feature.blade.php        |  3 +++
 .../views/character/design/features.blade.php | 20 ++++++++++++++++++-
 .../views/widgets/_image_upload_js.blade.php  |  1 +
 routes/lorekeeper/members.php                 |  1 +
 5 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 resources/views/character/design/_features_feature.blade.php

diff --git a/resources/views/character/admin/_edit_features_modal.blade.php b/resources/views/character/admin/_edit_features_modal.blade.php
index 13affc9d08..9f0dc59dfd 100644
--- a/resources/views/character/admin/_edit_features_modal.blade.php
+++ b/resources/views/character/admin/_edit_features_modal.blade.php
@@ -26,7 +26,7 @@
             </div>
         @endforeach
     </div>
-    <div class="feature-row hide mb-2">
+    <div class="feature-row hide mb-2" id="new-feature">
         {!! Form::select('feature_id[]', $features, null, ['class' => 'form-control mr-2 feature-select', 'placeholder' => 'Select Trait']) !!}
         {!! Form::text('feature_data[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Extra Info (Optional)']) !!}
         <a href="#" class="remove-feature btn btn-danger mb-2">×</a>
@@ -116,6 +116,7 @@ function featureSelectedRender(item, escape) {
 
     $("#species").change(function() {
         refreshSubtype();
+        refreshTrait();
     });
 
     function refreshSubtype() {
@@ -135,6 +136,20 @@ function refreshSubtype() {
         });
     };
 
+
+    function refreshTrait() {
+        var species = $('#species').val();
+        $.ajax({
+            type: "GET",
+            url: "{{ url('designs/traits/feature') }}?species=" + species,
+            dataType: "text"
+        }).done(function(res) {
+            $("#new-feature").html(res);
+        }).fail(function(jqXHR, textStatus, errorThrown) {
+            alert("AJAX call failed: " + textStatus + ", " + errorThrown);
+        });
+    };
+
     $("#subtype").selectize({
         maxItems: {{ config('lorekeeper.extensions.multiple_subtype_limit') }},
     });
diff --git a/resources/views/character/design/_features_feature.blade.php b/resources/views/character/design/_features_feature.blade.php
new file mode 100644
index 0000000000..b9b7fd5e74
--- /dev/null
+++ b/resources/views/character/design/_features_feature.blade.php
@@ -0,0 +1,3 @@
+{!! Form::select('feature_id[]', $features, null, ['class' => 'form-control mr-2 feature-select', 'placeholder' => 'Select Trait']) !!}
+{!! Form::text('feature_data[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Extra Info (Optional)']) !!}
+<a href="#" class="remove-feature btn btn-danger mb-2">×</a>
\ No newline at end of file
diff --git a/resources/views/character/design/features.blade.php b/resources/views/character/design/features.blade.php
index 08c8d3866a..a1ce6d562d 100644
--- a/resources/views/character/design/features.blade.php
+++ b/resources/views/character/design/features.blade.php
@@ -73,7 +73,7 @@
                     @endforeach
                 @endif
             </div>
-            <div class="feature-row hide mb-2">
+            <div class="feature-row hide mb-2" id="new-feature">
                 {!! Form::select('feature_id[]', $features, null, ['class' => 'form-control mr-2 feature-select', 'placeholder' => 'Select Trait']) !!}
                 {!! Form::text('feature_data[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Extra Info (Optional)']) !!}
                 <a href="#" class="remove-feature btn btn-danger mb-2">×</a>
@@ -144,6 +144,11 @@
 
     <script>
         $("#species").change(function() {
+            refreshSubtype();
+            refreshTrait();
+        });
+
+        function refreshSubtype() {
             var species = $('#species').val();
             var id = '<?php echo $request->id; ?>';
             $.ajax({
@@ -158,6 +163,19 @@
             }).fail(function(jqXHR, textStatus, errorThrown) {
                 alert("AJAX call failed: " + textStatus + ", " + errorThrown);
             });
+        };
+
+        function refreshTrait() {
+            var species = $('#species').val();
+            $.ajax({
+                type: "GET",
+                url: "{{ url('designs/traits/feature') }}?species=" + species,
+                dataType: "text"
+            }).done(function(res) {
+                $("#new-feature").html(res);
+            }).fail(function(jqXHR, textStatus, errorThrown) {
+                alert("AJAX call failed: " + textStatus + ", " + errorThrown);
+            });
         });
 
         $("#subtype").selectize({
diff --git a/resources/views/widgets/_image_upload_js.blade.php b/resources/views/widgets/_image_upload_js.blade.php
index ed14de759c..2d6c430ae4 100644
--- a/resources/views/widgets/_image_upload_js.blade.php
+++ b/resources/views/widgets/_image_upload_js.blade.php
@@ -102,6 +102,7 @@ function addFeatureRow() {
             var $clone = $('.feature-row').clone();
             $('#featureList').append($clone);
             $clone.removeClass('hide feature-row');
+            $clone.removeAttr('id');
             $clone.addClass('d-flex');
             $clone.find('.remove-feature').on('click', function(e) {
                 e.preventDefault();
diff --git a/routes/lorekeeper/members.php b/routes/lorekeeper/members.php
index 173191d76c..77d234c146 100644
--- a/routes/lorekeeper/members.php
+++ b/routes/lorekeeper/members.php
@@ -219,6 +219,7 @@
     Route::get('{id}/traits', 'DesignController@getFeatures');
     Route::post('{id}/traits', 'DesignController@postFeatures');
     Route::get('traits/subtype', 'DesignController@getFeaturesSubtype');
+    Route::get('traits/feature', 'DesignController@getFeaturesFeature');
 
     Route::get('{id}/confirm', 'DesignController@getConfirm');
     Route::post('{id}/submit', 'DesignController@postSubmit');

From 979561d86a540565b7ec5344bda3cefa647a27ca Mon Sep 17 00:00:00 2001
From: SpeedyD <SpeedyD@users.noreply.github.com>
Date: Thu, 27 Nov 2025 00:59:13 +0000
Subject: [PATCH 3/7] refactor: fix blade formatting

---
 resources/views/admin/prompts/create_edit_prompt.blade.php   | 4 ++--
 resources/views/character/design/_features_feature.blade.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/admin/prompts/create_edit_prompt.blade.php b/resources/views/admin/prompts/create_edit_prompt.blade.php
index 7c4a1e2bec..9f4d98dec1 100644
--- a/resources/views/admin/prompts/create_edit_prompt.blade.php
+++ b/resources/views/admin/prompts/create_edit_prompt.blade.php
@@ -100,8 +100,8 @@
         'showLootTables' => true,
         'showRecipient' => true,
         'info' => '<p>User rewards are credited on a per-user basis, character rewards are rewarded to all characters attached. Mods are able to modify the specific rewards granted at approval time.</p>
-                                                <p class="mb-0">You can add loot tables containing any kind of currencies (both user- and character-attached), but be sure to keep track of which are being distributed!
-                                                <strong>Character-only currencies cannot be given to users.</strong></p>',
+                                                    <p class="mb-0">You can add loot tables containing any kind of currencies (both user- and character-attached), but be sure to keep track of which are being distributed!
+                                                    <strong>Character-only currencies cannot be given to users.</strong></p>',
     ])
 
     <div class="text-right">
diff --git a/resources/views/character/design/_features_feature.blade.php b/resources/views/character/design/_features_feature.blade.php
index b9b7fd5e74..0dc9c60104 100644
--- a/resources/views/character/design/_features_feature.blade.php
+++ b/resources/views/character/design/_features_feature.blade.php
@@ -1,3 +1,3 @@
 {!! Form::select('feature_id[]', $features, null, ['class' => 'form-control mr-2 feature-select', 'placeholder' => 'Select Trait']) !!}
 {!! Form::text('feature_data[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Extra Info (Optional)']) !!}
-<a href="#" class="remove-feature btn btn-danger mb-2">×</a>
\ No newline at end of file
+<a href="#" class="remove-feature btn btn-danger mb-2">×</a>

From 8a343270ef3df5a95ec5f9952681a4e690b0d785 Mon Sep 17 00:00:00 2001
From: SpeedyD <SpeedyD@users.noreply.github.com>
Date: Thu, 27 Nov 2025 06:57:08 +0000
Subject: [PATCH 4/7] refactor: fix PHP styling

---
 .../Characters/DesignController.php           |  2 +-
 app/Models/Feature/Feature.php                | 40 +++++++++----------
 config/lorekeeper/extensions.php              |  2 +-
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/app/Http/Controllers/Characters/DesignController.php b/app/Http/Controllers/Characters/DesignController.php
index adf6dae147..6484629faf 100644
--- a/app/Http/Controllers/Characters/DesignController.php
+++ b/app/Http/Controllers/Characters/DesignController.php
@@ -263,7 +263,7 @@ public function getFeaturesFeature(Request $request) {
         $species = $request->input('species');
 
         return view('character.design._features_feature', [
-            'features'  => Feature::getDropdownItems(Auth::user()->hasPower('edit_data'), $species)
+            'features'  => Feature::getDropdownItems(Auth::user()->hasPower('edit_data'), $species),
         ]);
     }
 
diff --git a/app/Models/Feature/Feature.php b/app/Models/Feature/Feature.php
index d0f1b70563..7f9c17771a 100644
--- a/app/Models/Feature/Feature.php
+++ b/app/Models/Feature/Feature.php
@@ -98,10 +98,10 @@ public function category() {
     /**
      * Scope a query to sort features in alphabetical order.
      *
-     * @param \Illuminate\Database\Eloquent\Builder $query
-     * @param bool                                  $reverse
+     * @param Builder $query
+     * @param bool    $reverse
      *
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return Builder
      */
     public function scopeSortAlphabetical($query, $reverse = false) {
         return $query->orderBy('name', $reverse ? 'DESC' : 'ASC');
@@ -110,9 +110,9 @@ public function scopeSortAlphabetical($query, $reverse = false) {
     /**
      * Scope a query to sort features in category order.
      *
-     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param Builder $query
      *
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return Builder
      */
     public function scopeSortCategory($query) {
         if (FeatureCategory::all()->count()) {
@@ -125,9 +125,9 @@ public function scopeSortCategory($query) {
     /**
      * Scope a query to sort features in species order.
      *
-     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param Builder $query
      *
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return Builder
      */
     public function scopeSortSpecies($query) {
         $ids = Species::orderBy('sort', 'DESC')->pluck('id')->toArray();
@@ -138,9 +138,9 @@ public function scopeSortSpecies($query) {
     /**
      * Scope a query to sort features in subtype order.
      *
-     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param Builder $query
      *
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return Builder
      */
     public function scopeSortSubtype($query) {
         $ids = Subtype::orderBy('sort', 'DESC')->pluck('id')->toArray();
@@ -151,10 +151,10 @@ public function scopeSortSubtype($query) {
     /**
      * Scope a query to sort features in rarity order.
      *
-     * @param \Illuminate\Database\Eloquent\Builder $query
-     * @param bool                                  $reverse
+     * @param Builder $query
+     * @param bool    $reverse
      *
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return Builder
      */
     public function scopeSortRarity($query, $reverse = false) {
         $ids = Rarity::orderBy('sort', $reverse ? 'ASC' : 'DESC')->pluck('id')->toArray();
@@ -165,10 +165,10 @@ public function scopeSortRarity($query, $reverse = false) {
     /**
      * Scope a query to sort features by newest first.
      *
-     * @param \Illuminate\Database\Eloquent\Builder $query
-     * @param mixed                                 $reverse
+     * @param Builder $query
+     * @param mixed   $reverse
      *
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return Builder
      */
     public function scopeSortNewest($query, $reverse = false) {
         return $query->orderBy('id', $reverse ? 'ASC' : 'DESC');
@@ -177,10 +177,10 @@ public function scopeSortNewest($query, $reverse = false) {
     /**
      * Scope a query to show only visible features.
      *
-     * @param \Illuminate\Database\Eloquent\Builder $query
-     * @param mixed|null                            $user
+     * @param Builder    $query
+     * @param mixed|null $user
      *
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return Builder
      */
     public function scopeVisible($query, $user = null) {
         if ($user && $user->hasPower('edit_data')) {
@@ -300,7 +300,7 @@ public static function getDropdownItems($withHidden = 0, $withSpecies = 0) {
                 $grouped = self::where('is_visible', '>=', $visibleOnly)
                     ->when($withSpecies, function (Builder $query, int $withSpecies) {
                         $query->where('species_id', '=', $withSpecies)
-                        ->orWhere('species_id', '=', NULL);
+                            ->orWhere('species_id', '=', null);
                     })
                     ->select('name', 'id', 'feature_category_id', 'rarity_id', 'species_id', 'subtype_id')->with(['category', 'rarity', 'species', 'subtype'])
                     ->orderBy('name')->get()->keyBy('id')->groupBy('category.name', $preserveKeys = true)
@@ -369,7 +369,7 @@ public static function getDropdownItems($withHidden = 0, $withSpecies = 0) {
                 return self::where('is_visible', '>=', $visibleOnly)
                     ->when($withSpecies, function (Builder $query, int $withSpecies) {
                         $query->where('species_id', '=', $withSpecies)
-                        ->orWhere('species_id', '=', NULL);
+                            ->orWhere('species_id', '=', null);
                     })
                     ->orderBy('name')
                     ->pluck('name', 'id')
diff --git a/config/lorekeeper/extensions.php b/config/lorekeeper/extensions.php
index 818e7c07ac..70276026c2 100644
--- a/config/lorekeeper/extensions.php
+++ b/config/lorekeeper/extensions.php
@@ -140,7 +140,7 @@
 
     // Unmerge Item Page and Item Entry - Speedy
     'unmerge_item_page_and_entry' => 0, // If enabled, uses the html on world/item_page.blade.php instead of the include that links to world/_item_entry.blade.php
-    
+
     // Show Species-only traits in dropdown - Speedy
     'show_species-only_traits_in_dropdown' => 0, // If enabled, will only show traits from the associated species as well as traits that aren't species-limited in the dropdown menus.
 ];

From fc021e2fba74d06e00e696140d3c16d4c8d35862 Mon Sep 17 00:00:00 2001
From: SpeedyD <SpeedyD@users.noreply.github.com>
Date: Thu, 27 Nov 2025 15:39:47 +0000
Subject: [PATCH 5/7] refactor: fix blade formatting

---
 resources/views/admin/prompts/create_edit_prompt.blade.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/views/admin/prompts/create_edit_prompt.blade.php b/resources/views/admin/prompts/create_edit_prompt.blade.php
index 554d402287..5b7d3d46b6 100644
--- a/resources/views/admin/prompts/create_edit_prompt.blade.php
+++ b/resources/views/admin/prompts/create_edit_prompt.blade.php
@@ -99,7 +99,8 @@
         'showRaffles' => true,
         'showLootTables' => true,
         'showRecipient' => true,
-        'info' => '<p>User rewards are credited on a per-user basis, character rewards are rewarded to all characters attached. Mods are able to modify the specific rewards granted at approval time.</p><p class="mb-0">You can add loot tables containing any kind of currencies (both user- and character-attached), but be sure to keep track of which are being distributed! <strong>Character-only currencies cannot be given to users.</strong></p>',
+        'info' =>
+            '<p>User rewards are credited on a per-user basis, character rewards are rewarded to all characters attached. Mods are able to modify the specific rewards granted at approval time.</p><p class="mb-0">You can add loot tables containing any kind of currencies (both user- and character-attached), but be sure to keep track of which are being distributed! <strong>Character-only currencies cannot be given to users.</strong></p>',
     ])
 
     <div class="text-right">

From 0c60930b1859b28e4ca833d84a35adb5f2fbf781 Mon Sep 17 00:00:00 2001
From: Speedy <speedydvv@gmail.com>
Date: Sat, 29 Nov 2025 21:07:28 +0100
Subject: [PATCH 6/7] Renaming function and route to Features Trait because
 that's the closest correct name

---
 app/Http/Controllers/Characters/DesignController.php          | 4 ++--
 ...{_features_feature.blade.php => _features_trait.blade.php} | 0
 routes/lorekeeper/members.php                                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename resources/views/character/design/{_features_feature.blade.php => _features_trait.blade.php} (100%)

diff --git a/app/Http/Controllers/Characters/DesignController.php b/app/Http/Controllers/Characters/DesignController.php
index 6484629faf..f6fe792d91 100644
--- a/app/Http/Controllers/Characters/DesignController.php
+++ b/app/Http/Controllers/Characters/DesignController.php
@@ -259,10 +259,10 @@ public function getFeaturesSubtype(Request $request) {
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getFeaturesFeature(Request $request) {
+    public function getFeaturesTrait(Request $request) {
         $species = $request->input('species');
 
-        return view('character.design._features_feature', [
+        return view('character.design._features_trait', [
             'features'  => Feature::getDropdownItems(Auth::user()->hasPower('edit_data'), $species),
         ]);
     }
diff --git a/resources/views/character/design/_features_feature.blade.php b/resources/views/character/design/_features_trait.blade.php
similarity index 100%
rename from resources/views/character/design/_features_feature.blade.php
rename to resources/views/character/design/_features_trait.blade.php
diff --git a/routes/lorekeeper/members.php b/routes/lorekeeper/members.php
index 77d234c146..c4cb0bb5aa 100644
--- a/routes/lorekeeper/members.php
+++ b/routes/lorekeeper/members.php
@@ -219,7 +219,7 @@
     Route::get('{id}/traits', 'DesignController@getFeatures');
     Route::post('{id}/traits', 'DesignController@postFeatures');
     Route::get('traits/subtype', 'DesignController@getFeaturesSubtype');
-    Route::get('traits/feature', 'DesignController@getFeaturesFeature');
+    Route::get('traits/feature', 'DesignController@getFeaturesTrait');
 
     Route::get('{id}/confirm', 'DesignController@getConfirm');
     Route::post('{id}/submit', 'DesignController@postSubmit');

From 5e585925acf76682d5998bf3528e8e733005ad21 Mon Sep 17 00:00:00 2001
From: Speedy <speedydvv@gmail.com>
Date: Sat, 29 Nov 2025 21:09:58 +0100
Subject: [PATCH 7/7] show_exlusively_species_traits_in_dropdown to reduce
 hyphens

---
 app/Models/Feature/Feature.php   | 4 ++--
 config/lorekeeper/extensions.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Models/Feature/Feature.php b/app/Models/Feature/Feature.php
index 7f9c17771a..1901612393 100644
--- a/app/Models/Feature/Feature.php
+++ b/app/Models/Feature/Feature.php
@@ -296,7 +296,7 @@ public static function getDropdownItems($withHidden = 0, $withSpecies = 0) {
         if (config('lorekeeper.extensions.organised_traits_dropdown.enable')) {
             $sorted_feature_categories = collect(FeatureCategory::all()->where('is_visible', '>=', $visibleOnly)->sortBy('sort')->pluck('name')->toArray());
 
-            if (config('show_species-only_traits_in_dropdown') && $withSpecies) {
+            if (config('show_exlusively_species_traits_in_dropdown') && $withSpecies) {
                 $grouped = self::where('is_visible', '>=', $visibleOnly)
                     ->when($withSpecies, function (Builder $query, int $withSpecies) {
                         $query->where('species_id', '=', $withSpecies)
@@ -365,7 +365,7 @@ public static function getDropdownItems($withHidden = 0, $withSpecies = 0) {
 
             return $features_by_category;
         } else {
-            if (config('show_species-only_traits_in_dropdown') && $withSpecies) {
+            if (config('show_exlusively_species_traits_in_dropdown') && $withSpecies) {
                 return self::where('is_visible', '>=', $visibleOnly)
                     ->when($withSpecies, function (Builder $query, int $withSpecies) {
                         $query->where('species_id', '=', $withSpecies)
diff --git a/config/lorekeeper/extensions.php b/config/lorekeeper/extensions.php
index 70276026c2..4121cb85ff 100644
--- a/config/lorekeeper/extensions.php
+++ b/config/lorekeeper/extensions.php
@@ -142,5 +142,5 @@
     'unmerge_item_page_and_entry' => 0, // If enabled, uses the html on world/item_page.blade.php instead of the include that links to world/_item_entry.blade.php
 
     // Show Species-only traits in dropdown - Speedy
-    'show_species-only_traits_in_dropdown' => 0, // If enabled, will only show traits from the associated species as well as traits that aren't species-limited in the dropdown menus.
+    'show_exlusively_species_traits_in_dropdown' => 0, // If enabled, will only show traits from the associated species as well as traits that aren't species-limited in the dropdown menus.
 ];