summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
Diffstat (limited to 'db')
-rw-r--r--db/Changelog.txt1
-rw-r--r--db/item_trade.txt30
2 files changed, 31 insertions, 0 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 118b0d6f3..5c19fbe34 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -13,6 +13,7 @@
=======================
2009/09/16
+ * Rev, 14061 Re-added missing mercenary scrolls to item_trade database, must have gotten lost while diffing. [L0ne_W0lf]
* Rev. 14060 Fixed the AI mode for Zombie, change I made while testing new the Luciola AI. [L0ne_W0lf]
* Updated item_trade with several new items, hopefully retaining most white space.
2009/09/10
diff --git a/db/item_trade.txt b/db/item_trade.txt
index ef52a2748..ff7ca41e5 100644
--- a/db/item_trade.txt
+++ b/db/item_trade.txt
@@ -311,6 +311,36 @@
12180,115,100 // SpearMercenary_Scroll8
12181,115,100 // SpearMercenary_Scroll9
12182,115,100 // SpearMercenary_Scroll10
+12153,115,100 // Bow_Mercenary_Scroll1
+12154,115,100 // Bow_Mercenary_Scroll2
+12155,115,100 // Bow_Mercenary_Scroll3
+12156,115,100 // Bow_Mercenary_Scroll4
+12157,115,100 // Bow_Mercenary_Scroll5
+12158,115,100 // Bow_Mercenary_Scroll6
+12159,115,100 // Bow_Mercenary_Scroll7
+12160,115,100 // Bow_Mercenary_Scroll8
+12161,115,100 // Bow_Mercenary_Scroll9
+12162,115,100 // Bow_Mercenary_Scroll10
+12163,115,100 // SwordMercenary_Scroll1
+12164,115,100 // SwordMercenary_Scroll2
+12165,115,100 // SwordMercenary_Scroll3
+12166,115,100 // SwordMercenary_Scroll4
+12167,115,100 // SwordMercenary_Scroll5
+12168,115,100 // SwordMercenary_Scroll6
+12169,115,100 // SwordMercenary_Scroll7
+12170,115,100 // SwordMercenary_Scroll8
+12171,115,100 // SwordMercenary_Scroll9
+12172,115,100 // SwordMercenary_Scroll10
+12173,115,100 // SpearMercenary_Scroll1
+12174,115,100 // SpearMercenary_Scroll2
+12175,115,100 // SpearMercenary_Scroll3
+12176,115,100 // SpearMercenary_Scroll4
+12177,115,100 // SpearMercenary_Scroll5
+12178,115,100 // SpearMercenary_Scroll6
+12179,115,100 // SpearMercenary_Scroll7
+12180,115,100 // SpearMercenary_Scroll8
+12181,115,100 // SpearMercenary_Scroll9
+12182,115,100 // SpearMercenary_Scroll10
// Additonal mixed items
7713,115,100 // BlueCard_A_