From 04a81a4517c33d86cdebed9116bbd0a7656bd68d Mon Sep 17 00:00:00 2001
From: David Gay <david@davidgay.org>
Date: Fri, 28 May 2021 10:21:12 -0400
Subject: Refactor HA effects and equipment equip effects to use the same
 format, then include them both in Character#effects

---
 data/hearth_amenities.yml |  6 +++---
 data/items.yml            | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'data')

diff --git a/data/hearth_amenities.yml b/data/hearth_amenities.yml
index d6dca76..fd090c8 100644
--- a/data/hearth_amenities.yml
+++ b/data/hearth_amenities.yml
@@ -17,7 +17,7 @@ forge:
     effects:
       - type: "stat_change"
         level: 2
-        stat: "otherforge_speed"
+        gid: "otherforge_speed"
         modifier: 4
 labratory:
   name: "Labratory"
@@ -31,7 +31,7 @@ labratory:
     effects:
       - type: "stat_change"
         level: 2
-        stat: "fluxseethe_speed"
+        gid: "fluxseethe_speed"
         modifier: 4
 listern_font:
   name: "Listern Font"
@@ -50,5 +50,5 @@ listern_font:
     effects:
       - type: "stat_change"
         level: 2
-        stat: "max_wounds"
+        gid: "max_wounds"
         modifier: 1
diff --git a/data/items.yml b/data/items.yml
index 2c00f61..c153b57 100644
--- a/data/items.yml
+++ b/data/items.yml
@@ -35,10 +35,10 @@ iron_dagger:
     equip_slots:
       - "mainhand"
     equip_effects:
-      - type: "stat"
+      - type: "stat_change"
         gid: "accuracy"
         modifier: 2
-      - type: "stat"
+      - type: "stat_change"
         gid: "power"
         modifier: 2
 iron_short_sword:
@@ -48,10 +48,10 @@ iron_short_sword:
     equip_slots:
       - "mainhand"
     equip_effects:
-      - type: "stat"
+      - type: "stat_change"
         gid: "accuracy"
         modifier: 3
-      - type: "stat"
+      - type: "stat_change"
         gid: "power"
         modifier: 3
 iron_longsword:
@@ -65,10 +65,10 @@ iron_longsword:
         - gid: "beastslay"
           level: 3
     equip_effects:
-      - type: "stat"
+      - type: "stat_change"
         gid: "accuracy"
         modifier: 4
-      - type: "stat"
+      - type: "stat_change"
         gid: "power"
         modifier: 4
 mending_salve:
@@ -145,7 +145,7 @@ warm_diadem:
     equip_slots:
       - "head"
     equip_effects:
-      - type: "stat"
+      - type: "stat_change"
         gid: "max_hp"
         modifier: 1
 warped_eyestalk:
-- 
cgit v1.2.3