From aa64fb57f541564b65d753f06333db238f655bfe Mon Sep 17 00:00:00 2001
From: David Gay <david@davidgay.org>
Date: Wed, 2 Jun 2021 22:43:03 -0400
Subject: Some tweaks and fixes for magiculture

---
 CHANGELOG.md                                       |  2 +-
 .../hearth/hearth_plantings/index.html.erb         |  2 +-
 app/views/characters/hearth/index.html.erb         |  2 +-
 data/activities.yml                                | 24 +++++++++++-----------
 data/hearth_amenities.yml                          |  2 +-
 data/items.yml                                     |  8 ++++----
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c1410c..4e8ae5a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ All notable changes to this project will be documented in this file.
   a loamspire. After some time has passed, you can harvest the result. You can perform other activities whilst your
   crops are growing.
 - New hearth amenities: loamspire level 1, loamspire level 2
-- New items: mudtub seed, midorias seed, templis seed, enzon seed, mudtub, midoras, templis, enzon, stone spade,
+- New items: mudtub seed, midoras seed, templis seed, enzon seed, mudtub, midoras, templis, enzon, stone spade,
   iron spade, arcanite spade
 - New activities: construct loamspire level 1, construct loamspire level 2, craft iron spade, craft arcanite spade,
   and all plant and harvest activities for the seeds and crops listed above
diff --git a/app/views/characters/hearth/hearth_plantings/index.html.erb b/app/views/characters/hearth/hearth_plantings/index.html.erb
index 8aaefcc..d8e7f96 100644
--- a/app/views/characters/hearth/hearth_plantings/index.html.erb
+++ b/app/views/characters/hearth/hearth_plantings/index.html.erb
@@ -11,7 +11,7 @@
 </div>
 
 <div class="grid grid-cols-1 lg:grid-cols-2 gap-4">
-  <% @hearth_plantings.each do |hp| %>
+  <% @hearth_plantings.sort_by(&:ripens_at).each do |hp| %>
     <div class="flex justify-between items-center border-2 border-yellow-900 rounded p-2">
       <h2 class="font-bold"><%= hp.item.name %></h2>
       <% if hp.ripens_at > Time.now %>
diff --git a/app/views/characters/hearth/index.html.erb b/app/views/characters/hearth/index.html.erb
index 7ff34c5..c063088 100644
--- a/app/views/characters/hearth/index.html.erb
+++ b/app/views/characters/hearth/index.html.erb
@@ -25,7 +25,7 @@
             <%= button_to "Use", hearth_amenity_use_path(built_amenity.hearth_amenity) %>
           <% end %>
           <% if built_amenity.hearth_amenity.gid == "loamspire" %>
-            <%= link_to "Manage", character_hearth_loamspire_path, class: "btn btn-primary" %>
+            <%= link_to "Manage crops", character_hearth_loamspire_path, class: "btn btn-primary" %>
           <% end %>
         <% end %>
         <% next_level = built_amenity ? built_amenity.level + 1 : 1 %>
diff --git a/data/activities.yml b/data/activities.yml
index 7ab2413..ab199c1 100644
--- a/data/activities.yml
+++ b/data/activities.yml
@@ -252,9 +252,9 @@ harvest_mudtub:
         xp:
           - gid: "magiculture"
             value: 10
-plant_midorias_seed:
-  name: "Plant Midorias Seed"
-  description: "Plant a midorias seed."
+plant_midoras_seed:
+  name: "Plant Midoras Seed"
+  description: "Plant a midoras seed."
   whatnot:
     requirements:
       - type: "hearth_amenity"
@@ -274,13 +274,13 @@ plant_midorias_seed:
           scale_value: 1
     cost:
       - type: "item"
-        gid: "midorias_seed"
+        gid: "midoras_seed"
     results:
       - type: "hearth_planting"
-        gid: "midorias_seed"
-harvest_midorias:
-  name: "Harvest Midorias"
-  description: "Harvest a midorias."
+        gid: "midoras_seed"
+harvest_midoras:
+  name: "Harvest Midoras"
+  description: "Harvest a midoras."
   whatnot:
     requirements:
       - type: "hearth_amenity"
@@ -300,10 +300,10 @@ harvest_midorias:
           scale_value: 1
     cost:
       - type: "hearth_planting"
-        gid: "midorias_seed"
+        gid: "midoras_seed"
     results:
       - type: "item"
-        gid: "midorias"
+        gid: "midoras"
         xp:
           - gid: "magiculture"
             value: 15
@@ -1638,7 +1638,7 @@ wealdreap_twil_woods:
             xp:
               - gid: "wealdreap"
                 value: 10
-          - gid: "midorias_seed"
+          - gid: "midoras_seed"
             score: 0.45
             xp:
               - gid: "wealdreap"
@@ -1699,7 +1699,7 @@ wealdreap_twil_grove:
             xp:
               - gid: "wealdreap"
                 value: 10
-          - gid: "midorias_seed"
+          - gid: "midoras_seed"
             score: 0.30
             xp:
               - gid: "wealdreap"
diff --git a/data/hearth_amenities.yml b/data/hearth_amenities.yml
index 9d6aeb3..e660a92 100644
--- a/data/hearth_amenities.yml
+++ b/data/hearth_amenities.yml
@@ -55,7 +55,7 @@ listern_font:
 loamspire:
   name: "Loamspire"
   description: >-
-    A tower of teired planting areas filled with imbued soil. Fruits, vegetables, roots, and herbs can be grown here.
+    A tower of tiered planting areas filled with imbued soil. Fruits, vegetables, roots, and herbs can be grown here.
   whatnot:
     construct_activities:
       - level: 1
diff --git a/data/items.yml b/data/items.yml
index 6dc187a..1a5c00e 100644
--- a/data/items.yml
+++ b/data/items.yml
@@ -395,15 +395,15 @@ mudtub_seed:
     ripen_duration:
       base: 28800 # 8 hours
     harvest_activity: "harvest_mudtub"
-midorias_seed:
-  name: "midorias seed"
-  description: "The seed of a midorias plant."
+midoras_seed:
+  name: "midoras seed"
+  description: "The seed of a midoras plant."
   whatnot:
     tags:
       - "seed"
     ripen_duration:
       base: 36000 # 10 hours
-    harvest_activity: "harvest_midorias"
+    harvest_activity: "harvest_midoras"
 templis_seed:
   name: "templis seed"
   description: "The seed of a templis plant."
-- 
cgit v1.2.3