diff options
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | app/controllers/characters/hearth_controller.rb | 6 | ||||
| -rw-r--r-- | data/activities.yml | 40 | ||||
| -rw-r--r-- | data/hearth_amenities.yml | 8 | ||||
| -rw-r--r-- | db/migrate/20210605223042_rename_pig_iron_ingots.rb | 6 | ||||
| -rw-r--r-- | db/migrate/20210610010413_fix_spelling_of_laboratory.rb | 7 |
6 files changed, 40 insertions, 32 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0915b8d..679e781 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ All notable changes to this project will be documented in this file. - Leviathans that had item drops with a less than 100% chance could fail to check all their items due to the awarding code returning early. This wouldn't have happened in the game yet because prior to this patch there were no item drops on leviathans with less than 100% drop chance. +- Spelling of laboratory ## [0.1.9.1] - 2021-06-07 @@ -367,7 +368,7 @@ hearth amenities, etc that are being added unless they warrant explicit mention - Rested time is used at the end of the activity, when the timer runs out, like other calculations. If you stop your activity before it finishes, rested time will not be used. - You can accumulate up to 10 days of rested time. -- You can now choose how many items you'd like to craft at your forge or labratory. If you want to just keep crafting +- You can now choose how many items you'd like to craft at your forge or laboratory. If you want to just keep crafting until you run out of materials, just enter a large number. Crafting will continue until materials are expended. - New Beastslay activity: the Hopegraves - New Fluxseethe activities: brew trawling draught, distill lusterlight tincture @@ -415,7 +416,7 @@ hearth amenities, etc that are being added unless they warrant explicit mention - Increased quarry Floret Mine iron ore drop table score from 0.98 to 0.95 (this is an increase in drop chance) - Removed level-based drop scaling from quarry floret mine - Sor Well Depths shimmering essence drop quantity increased from 1 to 1-2 -- Labratory level 2 now additionally requires 1 yellow beryl and 1 paraiba tourmaline +- laboratory level 2 now additionally requires 1 yellow beryl and 1 paraiba tourmaline - Adjusted description of disturbing doodad - Reduced height of activity output area, to fit better on screens until I improve general responsiveness diff --git a/app/controllers/characters/hearth_controller.rb b/app/controllers/characters/hearth_controller.rb index 86757d8..82f72d6 100644 --- a/app/controllers/characters/hearth_controller.rb +++ b/app/controllers/characters/hearth_controller.rb @@ -5,7 +5,7 @@ class Characters::HearthController < ApplicationController @amenity_activities = { forge: [], - labratory: [], + laboratory: [], spicebench: [], } @@ -16,8 +16,8 @@ class Characters::HearthController < ApplicationController case requirement_data[:gid] when "forge" @amenity_activities[:forge].push(activity) && next - when "labratory" - @amenity_activities[:labratory].push(activity) && next + when "laboratory" + @amenity_activities[:laboratory].push(activity) && next when "spicebench" @amenity_activities[:spicebench].push(activity) && next else diff --git a/data/activities.yml b/data/activities.yml index ca168a3..ee5ac76 100644 --- a/data/activities.yml +++ b/data/activities.yml @@ -60,9 +60,9 @@ construct_forge_level2: - type: "hearth_amenity" gid: "forge" level: 2 -construct_labratory_level1: - name: "Construct Labratory Level 1" - description: "Build a level 1 labratory." +construct_laboratory_level1: + name: "Construct laboratory Level 1" + description: "Build a level 1 laboratory." whatnot: requirements: - type: "hearth_amenity" @@ -79,15 +79,15 @@ construct_labratory_level1: quantity: 100 results: - type: "hearth_amenity" - gid: "labratory" + gid: "laboratory" level: 1 -construct_labratory_level2: - name: "Upgrade Labratory to Level 2" - description: "Upgrade your labratory to level 2." +construct_laboratory_level2: + name: "Upgrade laboratory to Level 2" + description: "Upgrade your laboratory to level 2." whatnot: requirements: - type: "hearth_amenity" - gid: "labratory" + gid: "laboratory" level: 1 duration: base: 2400 @@ -109,7 +109,7 @@ construct_labratory_level2: quantity: 1 results: - type: "hearth_amenity" - gid: "labratory" + gid: "laboratory" level: 2 construct_listern_font_level1: name: "Construct Listern Font Level 1" @@ -1565,7 +1565,7 @@ craft_mending_salve: whatnot: requirements: - type: "hearth_amenity" - gid: "labratory" + gid: "laboratory" level: 1 duration: base: 90 @@ -1596,7 +1596,7 @@ craft_manadross_tincture: whatnot: requirements: - type: "hearth_amenity" - gid: "labratory" + gid: "laboratory" level: 1 - type: "skill" gid: "fluxseethe" @@ -1633,7 +1633,7 @@ craft_lusterlight_tincture: whatnot: requirements: - type: "hearth_amenity" - gid: "labratory" + gid: "laboratory" level: 1 - type: "skill" gid: "fluxseethe" @@ -1670,7 +1670,7 @@ craft_quarrying_draught: whatnot: requirements: - type: "hearth_amenity" - gid: "labratory" + gid: "laboratory" level: 1 - type: "skill" gid: "fluxseethe" @@ -1704,7 +1704,7 @@ craft_reaping_draught: whatnot: requirements: - type: "hearth_amenity" - gid: "labratory" + gid: "laboratory" level: 1 - type: "skill" gid: "fluxseethe" @@ -1738,7 +1738,7 @@ craft_trawling_draught: whatnot: requirements: - type: "hearth_amenity" - gid: "labratory" + gid: "laboratory" level: 1 - type: "skill" gid: "fluxseethe" @@ -1772,7 +1772,7 @@ craft_woodflesh_potion: whatnot: requirements: - type: "hearth_amenity" - gid: "labratory" + gid: "laboratory" level: 1 - type: "skill" gid: "fluxseethe" @@ -1806,7 +1806,7 @@ craft_lightblood_potion: whatnot: requirements: - type: "hearth_amenity" - gid: "labratory" + gid: "laboratory" level: 1 - type: "skill" gid: "fluxseethe" @@ -1843,7 +1843,7 @@ craft_mercuria_potion: whatnot: requirements: - type: "hearth_amenity" - gid: "labratory" + gid: "laboratory" level: 1 - type: "skill" gid: "fluxseethe" @@ -2418,7 +2418,7 @@ craft_gem_dust_from_red_beryl: whatnot: requirements: - type: "hearth_amenity" - gid: "labratory" + gid: "laboratory" level: 1 duration: base: 60 @@ -2446,7 +2446,7 @@ craft_gem_dust_from_tourmaline: whatnot: requirements: - type: "hearth_amenity" - gid: "labratory" + gid: "laboratory" level: 1 duration: base: 60 diff --git a/data/hearth_amenities.yml b/data/hearth_amenities.yml index a2e2e89..16cb572 100644 --- a/data/hearth_amenities.yml +++ b/data/hearth_amenities.yml @@ -19,15 +19,15 @@ forge: level: 2 gid: "otherforge_speed" modifier: 4 -labratory: - name: "Labratory" +laboratory: + name: "laboratory" description: "A table and some containers, sufficient for practicing the fluxseethe skill." whatnot: construct_activities: - level: 1 - gid: "construct_labratory_level1" + gid: "construct_laboratory_level1" - level: 2 - gid: "construct_labratory_level2" + gid: "construct_laboratory_level2" effects: - type: "stat_change" level: 2 diff --git a/db/migrate/20210605223042_rename_pig_iron_ingots.rb b/db/migrate/20210605223042_rename_pig_iron_ingots.rb index 8f38c7c..df87aef 100644 --- a/db/migrate/20210605223042_rename_pig_iron_ingots.rb +++ b/db/migrate/20210605223042_rename_pig_iron_ingots.rb @@ -1,7 +1,7 @@ class RenamePigIronIngots < ActiveRecord::Migration[6.1] def change - Item.find_by_gid("pig_iron_ingot").update(gid: "crude_iron_ingot") - Activity.find_by_gid("craft_pig_iron_ingot").update(gid: "craft_crude_iron_ingot") - Activity.find_by_gid("craft_purify_pig_iron_ingot").update(gid: "craft_purify_crude_iron_ingot") + Item.find_by_gid("pig_iron_ingot")&.update(gid: "crude_iron_ingot") + Activity.find_by_gid("craft_pig_iron_ingot")&.update(gid: "craft_crude_iron_ingot") + Activity.find_by_gid("craft_purify_pig_iron_ingot")&.update(gid: "craft_purify_crude_iron_ingot") end end diff --git a/db/migrate/20210610010413_fix_spelling_of_laboratory.rb b/db/migrate/20210610010413_fix_spelling_of_laboratory.rb new file mode 100644 index 0000000..169608d --- /dev/null +++ b/db/migrate/20210610010413_fix_spelling_of_laboratory.rb @@ -0,0 +1,7 @@ +class FixSpellingOfLaboratory < ActiveRecord::Migration[6.1] + def change + HearthAmenity.find_by_gid("labratory")&.update(gid: "laboratory") + Activity.find_by_gid("construct_labratory_level1")&.update(gid: "construct_laboratory_level1") + Activity.find_by_gid("construct_labratory_level2")&.update(gid: "construct_laboratory_level2") + end +end |