diff options
author | Manoj Srivastava <srivasta@debian.org> | 2016-01-27 13:11:31 -0800 |
---|---|---|
committer | Manoj Srivastava <srivasta@debian.org> | 2016-01-27 13:11:31 -0800 |
commit | 02819db3483514d49df7ec3f7e372b5aeb831466 (patch) | |
tree | 6a86adac74beac293bc688dafcfa1709a6476901 /lib/edit/st_info.txt | |
parent | 2a61dffe127e22c1aaf955db6f085ac2eefbebba (diff) | |
parent | 6f6de67c70fd98815088ce49f046f48f88ea35bd (diff) |
Merge branch 'upstream'
Signed-off-by: Manoj Srivastava <srivasta@debian.org>
# Conflicts:
# src/CMakeLists.txt
# src/config.h
# src/lua/llimits.h
Diffstat (limited to 'lib/edit/st_info.txt')
-rw-r--r-- | lib/edit/st_info.txt | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/lib/edit/st_info.txt b/lib/edit/st_info.txt index 3762d0c5..d0defd31 100644 --- a/lib/edit/st_info.txt +++ b/lib/edit/st_info.txt @@ -1,13 +1,5 @@ # File: st_info.txt -# Fixed Potions of Cure Light/Serious Wounds in the Temple, Potions of -# Restore Str/Con in the Alchemist -# Magic Shop - Amulet of Slow Digestion, Wand of Light, Staffs of Enlightenment, -# Door/Stair Location, Detect Invis/Evil, and Remove Curse - -# This file is used to initialize the "lib/raw/st_info.raw" file, which is -# used to initialize the "store info type" information for the Angband game. - # Do not modify this file unless you know exactly what you are doing, # unless you wish to risk possible system crashes and broken savefiles. @@ -22,10 +14,6 @@ # proba is the chance(out of 100) of the item being generated -# Version stamp (required) - -V:2.0.0 - N:0:General Store I:100:& Wooden Torch~ I:95:& Brass Lantern~ @@ -271,7 +259,7 @@ N:7:Home A:0:0:54:55:3:0 O:0:0:0:0 G:8:y -W:24 +W:240 N:8:Book Store # & Book~ of Beginner Cantrips @@ -348,9 +336,6 @@ G:+:s W:0 N:16:Beastmaster Shanty -# Disabled the bounty list for the time being to not confuse people -# with the bounty quest -# A:18:0:19:20:21:22 A:18:0:21:22:0:0 O:19:19:19:19 G:+:g @@ -692,12 +677,6 @@ F:RANDOM | MEDIUM_LEVEL | DEPEND_LEVEL F:RARE W:24 -N:56:Merchants Guild -A:0:0:56:57:58:0 -O:68:68:68:68 -G:+:g -W:0 - N:57:The Mathom-house A:0:0:59:0:3:0 O:0:0:0:0 |