2 files changed, 5 insertions, 10 deletions
diff --git a/npc/018-5-4/elder.txt b/npc/018-5-4/elder.txt
index 830cc4616..7d148b913 100644
--- a/npc/018-5-4/elder.txt
+++ b/npc/018-5-4/elder.txt
@@ -95,8 +95,7 @@ function elderSupplyList {
     mesq l("We need:");
     mesq l("%d/%d %s", countitem(Moss), 300, getitemlink(Moss));
     mesq l("%d/%d %s", countitem(RoastedMaggot), 250, getitemlink(RoastedMaggot));
-    mesq l("%d/%d %s", countitem(CommonCarp), 250, getitemlink(CommonCarp));
-    mesq l("%d/%d %s", countitem(GrassCarp), 75, getitemlink(GrassCarp));
+    mesq l("%d/%d %s", countitem(FishBox), 20, getitemlink(FishBox));
     mesq l("%d/%d %s", countitem(CrystallizedMaggot), 1, getitemlink(CrystallizedMaggot));
     next;
     mesq l("Of course, we'll find a way to reward you for your efforts.");
@@ -106,8 +105,7 @@ function elderSupplyList {
 function elderSupplyGive {
     if (countitem(Moss) < 300 ||
         countitem(RoastedMaggot) < 250 ||
-        countitem(CommonCarp) < 250 ||
-        countitem(GrassCarp) < 75 ||
+        countitem(FishBox) < 20 ||
         countitem(CrystallizedMaggot) < 1) {
         mesn;
         mesq l("This isn't what we requested. Perhaps you should count your items more carefully.");
@@ -121,8 +119,7 @@ function elderSupplyGive {
 
     delitem(Moss, 300);
     delitem(RoastedMaggot, 250);
-    delitem(CommonCarp, 250);
-    delitem(GrassCarp, 75);
+    delitem(FishBox, 20);
     delitem(CrystallizedMaggot, 1);
 
     getitem(RubberDucky, 1);
@@ -149,7 +146,6 @@ function elderSupplyGive {
 function elderPirateAttack {
     mesn;
     mesq l("The tritan pirates amass for their siege, but they will not attack yet. Return later. King DD is working to find a solution.");
-    next;
     close;
 }
 
@@ -186,8 +182,7 @@ function elderClose {
     mesn;
     if (BaseLevel < 50) {
         mesq l("Perhaps you may be of assistance later...");
-    }
-    else{
+    } else {
         mesq l("I may have a task for you. Return when you tired of exploring...");
     }
     close;
diff --git a/npc/config/hairstyle_config.txt b/npc/config/hairstyle_config.txt
index c55585393..0d594e9e5 100644
--- a/npc/config/hairstyle_config.txt
+++ b/npc/config/hairstyle_config.txt
@@ -23,6 +23,6 @@ OnInit:
        "Silver Grey", "Imperial Blue";
 
     setarray $@allraces$[0], "Human", "Human", "Human", "Elf", "Orc",
-        "Raijin", "Tritan", "Ukar", "Redy";
+        "Raijin", "Tritan", "Ukar", "Redy", "Savior";
     end;
 }