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/help/defines.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/help/defines.txt')
| -rw-r--r-- | lib/help/defines.txt | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/lib/help/defines.txt b/lib/help/defines.txt index ac997501..147e61a1 100644 --- a/lib/help/defines.txt +++ b/lib/help/defines.txt @@ -12,7 +12,6 @@ instance don't have svalues as they are defined in lua. TV_SKELETON 1 /* Skeletons ('s') */ TV_BOTTLE 2 /* Empty bottles ('!') */ -*****defines.txt*04[TV_BATERIE] 4 /* For the Alchemists */ TV_SPIKE 5 /* Spikes ('~') */ TV_MSTAFF 6 /* Mage Staffs */ TV_CHEST 7 /* Chests ('~') */ @@ -66,7 +65,6 @@ TV_BOOK 111 /* spell books */ ~~~~~12|Svals /* The "sval" codes for TV_TOOL */ SV_TOOL_CLIMB 0 - SV_PORTABLE_HOLE 1 ~~~~~16 /* The "sval" codes for TV_SHOT/TV_ARROW/TV_BOLT */ SV_AMMO_LIGHT 0 /* pebbles */ @@ -604,27 +602,6 @@ TV_BOOK 111 /* spell books */ SV_FOOD_ATHELAS 40 SV_FOOD_GREAT_HEALTH 41 SV_FOOD_FORTUNE_COOKIE 42 -~~~~~04 -/* The "sval" codes for TV_BATERIE */ - SV_BATERIE_POISON 1 - SV_BATERIE_EXPLOSION 2 - SV_BATERIE_TELEPORT 3 - SV_BATERIE_COLD 4 - SV_BATERIE_FIRE 5 - SV_BATERIE_ACID 6 - SV_BATERIE_LIFE 7 - SV_BATERIE_CONFUSION 8 - SV_BATERIE_LITE 9 - SV_BATERIE_CHAOS 10 - SV_BATERIE_TIME 11 - SV_BATERIE_MAGIC 12 - SV_BATERIE_XTRA_LIFE 13 - SV_BATERIE_DARKNESS 14 - SV_BATERIE_KNOWLEDGE 15 - SV_BATERIE_FORCE 16 - SV_BATERIE_LIGHTNING 17 - SV_BATERIE_MANA 18 - MAX_BATERIE_SVAL 18 ~~~~~09 /* The "sval" codes for TV_CORPSE */ SV_CORPSE_CORPSE 1 |