diff options
| -rw-r--r-- | app/views/locations/show.html.erb | 2 | ||||
| -rw-r--r-- | data/activities.yml | 24 | ||||
| -rw-r--r-- | data/locations.yml | 2 | ||||
| -rw-r--r-- | db/migrate/20210705235925_update_floret_gid.rb | 5 |
4 files changed, 19 insertions, 14 deletions
diff --git a/app/views/locations/show.html.erb b/app/views/locations/show.html.erb index fcc668a..2f1074a 100644 --- a/app/views/locations/show.html.erb +++ b/app/views/locations/show.html.erb @@ -6,7 +6,7 @@ <% @location.monster_spawns.select(&:alive?).each do |ms| %> <p class="text-yellow-400">A <%= ms.monster.name %> is ravaging this location! (<%= ms.remaining_hp %> HP)</p> <%# TODO: HACK %> - <% activity = Activity.find_by_gid("beastslay_leviathan_floret_region") %> + <% activity = Activity.find_by_gid("beastslay_leviathan_floret") %> <%= form_with url: start_activity_path(activity) do |f| %> <%= f.hidden_field :id, value: activity.id %> <%= f.submit "Hunt" %> diff --git a/data/activities.yml b/data/activities.yml index 9711582..00419bd 100644 --- a/data/activities.yml +++ b/data/activities.yml @@ -2120,7 +2120,7 @@ craft_mercuria_potion: planequarry_floret_mines: name: "Quarry Floret Mines" description: "Planequarry at the Floret Mines." - location: "floret_region" + location: "floret" whatnot: requirements: - type: "skill" @@ -2190,7 +2190,7 @@ planequarry_floret_mines: planequarry_deepshaft: name: "Quarry Deepshaft" description: "Descend far below the the Floret Mines into the labyrinth of shafts left behind by the ancients." - location: "floret_region" + location: "floret" whatnot: requirements: - type: "skill" @@ -2265,7 +2265,7 @@ planequarry_deepshaft: planequarry_brine_trench: name: "Quarry Brine Trench" description: "Planequarry in the south Floret brine trench." - location: "floret_region" + location: "floret" whatnot: requirements: - type: "skill" @@ -2300,7 +2300,7 @@ planequarry_brine_trench: beastslay_killing_fields: name: "Slay in the Killing Fields" description: "Hunt monsters in the Killing Fields." - location: "floret_region" + location: "floret" whatnot: requirements: - type: "skill" @@ -2328,7 +2328,7 @@ beastslay_killing_fields: beastslay_hopegraves: name: "Slay in the Hopegraves" description: "Hunt monsters in the Hopegraves." - location: "floret_region" + location: "floret" whatnot: requirements: - type: "skill" @@ -2354,7 +2354,7 @@ beastslay_hopegraves: wealdreap_twil_woods: name: "Reap Twil Woods" description: "Wealdreap within Twil Woods." - location: "floret_region" + location: "floret" whatnot: requirements: - type: "skill" @@ -2430,7 +2430,7 @@ wealdreap_twil_woods: wealdreap_twil_grove: name: "Reap Twil Grove" description: "Wealdreap within the hidden woodways of the Twil Woods Grove." - location: "floret_region" + location: "floret" whatnot: requirements: - type: "skill" @@ -2507,7 +2507,7 @@ wealdreap_twil_grove: manatrawl_sor_well: name: "Trawl Sor Well" description: "Manatrawl within Sor Well." - location: "floret_region" + location: "floret" whatnot: requirements: - type: "skill" @@ -2551,7 +2551,7 @@ manatrawl_sor_well: manatrawl_sor_well_depths: name: "Trawl Sor Well Depths" description: "Manatrawl deep within Sor Well." - location: "floret_region" + location: "floret" whatnot: requirements: - type: "skill" @@ -2657,7 +2657,7 @@ open_unlocked_rusted_lockbox: wildscour_crumbling_ruins: name: "Scour Crumbling Ruins" description: "Wildscour within the crumbling ruins." - location: "floret_region" + location: "floret" whatnot: requirements: - type: "skill" @@ -2936,7 +2936,7 @@ craft_dusted_templis: xp: - gid: "spicework" value: 14 -beastslay_leviathan_floret_region: +beastslay_leviathan_floret: name: "Hunt a Leviathan in the Floret Region" description: "You are hunting down a leviathan ravaging the Floret Region." whatnot: @@ -2956,7 +2956,7 @@ beastslay_leviathan_floret_region: scale_value: 1 results: - type: "monster_spawn" - location: "floret_region" + location: "floret" chance: 1 craft_faint_mana: name: "Bind faint mana" diff --git a/data/locations.yml b/data/locations.yml index 10bc028..00b48c0 100644 --- a/data/locations.yml +++ b/data/locations.yml @@ -1,4 +1,4 @@ -floret_region: +floret: name: "Floret" description: "A relatively safe haven nestled against the great Sor River." whatnot: diff --git a/db/migrate/20210705235925_update_floret_gid.rb b/db/migrate/20210705235925_update_floret_gid.rb new file mode 100644 index 0000000..db24044 --- /dev/null +++ b/db/migrate/20210705235925_update_floret_gid.rb @@ -0,0 +1,5 @@ +class UpdateFloretGid < ActiveRecord::Migration[6.1] + def change + Location.find_by_gid("floret_region").update(gid: "floret") + end +end |