diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2015-02-23 09:11:56 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2015-02-23 09:11:56 +0100 |
| commit | e2b98e51d988da3ddeae8f529f37d8bd4be1b0dc (patch) | |
| tree | 4ce521ef056ac2c2204b812df34645b472977723 /lib/edit | |
| parent | 68fae568a6ffac4643d82980816e665d9d53c04b (diff) | |
Remove last remnants of the Merchant class
- Merchant's guild removed, it was unusable anyway
- Removed "loan" code
- Removed PWR_MERCHANT code
Diffstat (limited to 'lib/edit')
| -rw-r--r-- | lib/edit/ba_info.txt | 12 | ||||
| -rw-r--r-- | lib/edit/ow_info.txt | 2 | ||||
| -rw-r--r-- | lib/edit/st_info.txt | 6 | ||||
| -rw-r--r-- | lib/edit/t_bree.txt | 5 | ||||
| -rw-r--r-- | lib/edit/t_gondol.txt | 5 | ||||
| -rw-r--r-- | lib/edit/t_minas.txt | 5 |
6 files changed, 3 insertions, 32 deletions
diff --git a/lib/edit/ba_info.txt b/lib/edit/ba_info.txt index 8156fd2f..6612185b 100644 --- a/lib/edit/ba_info.txt +++ b/lib/edit/ba_info.txt @@ -257,18 +257,6 @@ N:55:Get an item C:0:0:0 I:44:0:g:p -N:56:Request an item -C:0:0:0 -I:51:2:r - -N:57:Ask for loan -C:0:0:0 -I:52:2:a - -N:58:Pay back loan -C:0:0:0 -I:53:2:p - N:59:Donate an item C:0:0:0 I:43:0:d diff --git a/lib/edit/ow_info.txt b/lib/edit/ow_info.txt index 4bd7c41a..333113ce 100644 --- a/lib/edit/ow_info.txt +++ b/lib/edit/ow_info.txt @@ -437,8 +437,6 @@ H:Orc | Troll | Half-Ogre | Beorning | Kobold | N:68:Kanris(Human) I:5000:140 C:120:100:80 -#L:Merchant -#H:Rogue N:69:Barliman Butterbur(Human) I:100:120 diff --git a/lib/edit/st_info.txt b/lib/edit/st_info.txt index 3762d0c5..45b1f0e2 100644 --- a/lib/edit/st_info.txt +++ b/lib/edit/st_info.txt @@ -692,12 +692,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 diff --git a/lib/edit/t_bree.txt b/lib/edit/t_bree.txt index c74fd58a..3ea29922 100644 --- a/lib/edit/t_bree.txt +++ b/lib/edit/t_bree.txt @@ -44,9 +44,6 @@ F:a:74:3:0:0:0:0:0:58 # Soothsayer F:c:74:3:0:0:0:0:0:12 -# Merchant Guild -F:d:74:3:0:0:0:0:0:56 - # The Mathom-house F:e:74:3:0:0:0:0:0:57 @@ -93,7 +90,7 @@ D:# ---- ---- ,,CT--.B#.-SStSS- D:# ------- ---- ,,CTT-....-sssss--,,,,,,-------------OO-,--SSSSSt-ss-,-,---...-T^^ ^ ^ -, OOOO # D:# ------- ------ ,,CCTT---..#2###-,sssss,-SSSSSSSS-----OO,--ssssss-tS--,.....---^^ ^^ ^^^ -, OOOOOOOO # D:# ----- ----- ,,CCT----..,,,,,-StSSS,-ssssssss------OOO-#1##a#-ss....-----T^^ ^^ -,- OOOOO # -D:# ---- -------- ,,CCTT----..----,sssss,-##7###d#--------OO,.,,.,-##.----TTTT^^ ^ ^^ -, OOOOO # +D:# ---- -------- ,,CCTT----..----,sssss,-##7#####--------OO,.,,.,-##.----TTTT^^ ^ ^^ -, OOOOO # D:# --------------- ,,,CCTTTT--..---,##3##-,--,,,---------...OOOOOOOOOOOTTTTTCC^^^ ^^ ^^ ,- OOO # D:# -------- ,,,CCCC --..........,-,,---,--.......-------TTTTTOCCCCC,,^^^^^^^^^^^ -.- OOOOO # D:# ---------- ,, ,,CCCTT----------.....-......-------TTTTTTTCCCCO,,,,, ^^^^^^^ -.- O # diff --git a/lib/edit/t_gondol.txt b/lib/edit/t_gondol.txt index 779c4fbb..51cf4b39 100644 --- a/lib/edit/t_gondol.txt +++ b/lib/edit/t_gondol.txt @@ -123,9 +123,6 @@ F:m:74:3:0:0:0:0:0:37 # Thunderlord's Hide F:n:74:3:0:0:0:0:0:22 -# Merchant guild -F:o:74:3:0:0:0:0:0:56 - # Force elven monsters f:ELVEN @@ -178,7 +175,7 @@ D:######$$$$$$$$$$$$$$$$$### ... D:######$$$$$$$$$$$$$$$$$$## ... C##T.V#######V...........TTTT#######TTTT..................TT####C----,--TTT##TTT----TTT##TTTTTT------,,,,,^^^^### D:#####$$$$$$$$$$$$$$$$$$$## ######### ... ############# CC#T.VV#####VV.............................................TTT#CC----,---TT#TT--------TT##T-T-TT------,,,,^^^^### D:#####$$$$$$$#####$$$$$$$## ######### ... ############# C#T..VV###VV.....TTTTTTTTTTT.......TTTTTTTTTTT..............T#C-----,,,,,,,,,,,,,,,,,,,e#TT-TTT------,,,,^^^^### -D:####$$$$#############$$$$# ########o.........7############ C#T...VVVVV....TTT#########TTT...TTT#########TTT............T#C----------T#TT--------TT##TTT-------,,,,^^^^^^### +D:####$$$$#############$$$$# #########.........7############ C#T...VVVVV....TTT#########TTT...TTT#########TTT............T#C----------T#TT--------TT##TTT-------,,,,^^^^^^### D:####$###################$# ######### ... ############# C#TT..........TT###VVVVVV####TT.TT####WWWWWW###TT..........TT#C--------TTT##TTT----TTT##TTTTT-----,,,,^^^^^^^### D:########################## ######### ... ############# C##T..........T##VVV....VVV###TTT###WWW....WWW##T..........T##C-------TTTTT###TTTTTT###TTTTT-----,,,,,^^^^^^^### D:########################### ... CC#T..........T#VV........VV#######WW........WW#T..........T#CC -----TTTT-TTT########TTTTTT------,,,,,,,^^^^^### diff --git a/lib/edit/t_minas.txt b/lib/edit/t_minas.txt index 51c74da3..9f6ae669 100644 --- a/lib/edit/t_minas.txt +++ b/lib/edit/t_minas.txt @@ -64,9 +64,6 @@ F:l:74:3:0:0:0:0:0:22 # Castle: Plot Minas Anor F:B:75:3:0:0:0:0:0:5 -# Merchant guild -F:m:74:3:0:0:0:0:0:56 - # Library Quest F:x:63:3 @@ -84,7 +81,7 @@ D:#^^----ssss-----###--------####------ ^^^^^^ D:#^^^---StSS-------###--#ssss--###------- ^^^^^^^^ @@VVVVVVVV@VVV@@@@@@@@ @@@V@@ @@@@VV@@@@ , # D:#^^----ssss----OO---##--#StSS---####------ ^^^^^^^^ @@V@V,@@@@@@VVVVVVVV@@@VVV@ @@VVVV@@ ,, # D:#^^----x#a#-----OOO--##--#sssss----###------ ^^^^^^^^ @@@@@ @@@@@@@@VVVVV@@@ @@@@VV@@@ ,,, # -D:#^ ---------------OO--###-#m#7#------###----- ^^^^^^^^^^ @VVV@@ @@VVV@@ ,O, # +D:#^ ---------------OO--###-###7#------###----- ^^^^^^^^^^ @VVV@@ @@VVV@@ ,O, # D:#^ StSSSS-----ss---OO---##-----OOOOO---###---- ^^^^^^^^^^^ @@@ @@VVV@@ OO # D:#^^ssssss----Ssss---OOO--##---OOOOOOOO---##---- ^l^^^^^^^ @@VVV@ OO # D:#^ ####9#---sstSss---OOO--##-OOOOOOOOOOO--##---- ^^^^^ @@VVV@@ OO # |