From 9856fca4e381d111a468e568cd715ee7a6be197a Mon Sep 17 00:00:00 2001 From: Steaphan Greene Date: Sun, 17 Nov 2019 18:52:02 -0800 Subject: [PATCH] Fix a few apparent TBA world consistency errors. (#65) These are mostly cases of confusion between the "on the body" and "about the body" slots (5 and 12). But, there are also some that seem to just be misconfigured, like non-weapons being wielded, worn items being unwearable, weapons being worn instead of wielded, and items being worn instead of held. I have an independent MUD codebase that reads these files, and so this gives me an ability to somewhat orthogonally test these, and easily find this sort of issue. I did avoid all the cases where it was clear this was done intentionally, like all the cases where the second neck was used for the missing face slot (masks, etc). The ones fixed here all seem to really be (minor) bugs. --- lib/world/obj/1.obj | 2 +- lib/world/obj/101.obj | 2 +- lib/world/obj/115.obj | 2 +- lib/world/obj/200.obj | 2 +- lib/world/obj/43.obj | 2 +- lib/world/zon/101.zon | 2 +- lib/world/zon/115.zon | 2 +- lib/world/zon/200.zon | 2 +- lib/world/zon/283.zon | 2 +- lib/world/zon/3.zon | 4 ++-- lib/world/zon/313.zon | 2 +- lib/world/zon/43.zon | 4 ++-- lib/world/zon/555.zon | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/world/obj/1.obj b/lib/world/obj/1.obj index 1948884..e7d7e13 100644 --- a/lib/world/obj/1.obj +++ b/lib/world/obj/1.obj @@ -223,7 +223,7 @@ yellow robe~ a yellow robe~ A yellow robe of the Magi was left here, how strange.~ ~ -9 0 0 0 0 a 0 0 0 0 0 0 0 +9 0 0 0 0 ak 0 0 0 0 0 0 0 3 0 0 0 3 500 0 0 0 E diff --git a/lib/world/obj/101.obj b/lib/world/obj/101.obj index a127280..b0351d7 100644 --- a/lib/world/obj/101.obj +++ b/lib/world/obj/101.obj @@ -191,7 +191,7 @@ local bottle rum local~ a bottle~ A bottle of cheap rum lies here.~ ~ -17 0 0 0 0 a 0 0 0 0 0 0 0 +17 0 0 0 0 ao 0 0 0 0 0 0 0 3 3 8 0 8 120 12 0 0 E diff --git a/lib/world/obj/115.obj b/lib/world/obj/115.obj index 7e515ea..87f1b41 100644 --- a/lib/world/obj/115.obj +++ b/lib/world/obj/115.obj @@ -45,7 +45,7 @@ horse shoe~ a copper horse shoe~ A roughly pressed copper horse shoe lays here.~ ~ -11 g 0 0 0 ao 0 0 0 0 0 0 0 +12 g 0 0 0 ao 0 0 0 0 0 0 0 0 0 0 0 1 20 2 0 A diff --git a/lib/world/obj/200.obj b/lib/world/obj/200.obj index 1a7c6db..fa2b860 100644 --- a/lib/world/obj/200.obj +++ b/lib/world/obj/200.obj @@ -95,7 +95,7 @@ rabbit foot fur~ a rabbit's foot~ A hacked off rabbit's foot lays here, hopping no more.~ ~ -11 dkp 0 0 0 ao 0 0 0 0 0 0 0 +12 dkp 0 0 0 ao 0 0 0 0 0 0 0 0 0 0 0 1 5 1 0 0 E diff --git a/lib/world/obj/43.obj b/lib/world/obj/43.obj index e25ee40..47ac905 100644 --- a/lib/world/obj/43.obj +++ b/lib/world/obj/43.obj @@ -47,7 +47,7 @@ penguin claw~ a black penguin claw~ A smooth, black claw of a penguin lays here.~ ~ -12 0 0 0 0 an 0 0 0 0 0 0 0 +12 0 0 0 0 ao 0 0 0 0 0 0 0 0 0 0 0 3 30 3 0 0 #4305 diff --git a/lib/world/zon/101.zon b/lib/world/zon/101.zon index d3fb361..1cd012e 100644 --- a/lib/world/zon/101.zon +++ b/lib/world/zon/101.zon @@ -10,7 +10,7 @@ M 0 10108 1 10113 (a clairvoyant gypsy) E 1 10116 99 14 (a bracelet of the gypsy) M 0 10107 1 10111 (a robbed merchant) E 1 10115 99 13 (a beltpouch) -E 1 10114 99 11 (a bottle) +E 1 10114 99 17 (a bottle) E 1 10113 99 10 (some torn sleeves) M 0 10106 2 10109 (a pillaging bandit) E 1 10112 99 9 (some camouflage gloves) diff --git a/lib/world/zon/115.zon b/lib/world/zon/115.zon index 9d3ea2f..3cdb43b 100644 --- a/lib/world/zon/115.zon +++ b/lib/world/zon/115.zon @@ -64,7 +64,7 @@ E 1 11500 20 16 (a goblin shortsword) M 0 11524 3 11556 (an ensign goblin) E 1 11500 20 16 (a goblin shortsword) M 0 11507 1 11554 (a centaur archer) -E 1 11505 10 8 (a copper horse shoe) +G 1 11505 10 -1 (a copper horse shoe) M 0 11506 3 11553 (a goblin bomber) E 1 11500 20 16 (a goblin shortsword) M 0 11504 3 11552 (a hulk goblin) diff --git a/lib/world/zon/200.zon b/lib/world/zon/200.zon index 75a1129..d384bfe 100644 --- a/lib/world/zon/200.zon +++ b/lib/world/zon/200.zon @@ -50,7 +50,7 @@ E 1 20015 100 5 (a thick black fur coat) M 0 20006 3 20023 (an angry black bear) E 1 20015 100 5 (a thick black fur coat) M 0 20001 3 20003 (the rabbit) -E 1 20007 10 8 (a rabbit's foot) +G 1 20007 10 -1 (a rabbit's foot) E 1 20012 10 6 (a pair of rabbit ears) M 0 20000 3 20008 (a lost adventurer) E 1 20008 100 5 (some smelly rags) diff --git a/lib/world/zon/283.zon b/lib/world/zon/283.zon index 5cf0ad2..7379853 100644 --- a/lib/world/zon/283.zon +++ b/lib/world/zon/283.zon @@ -78,7 +78,7 @@ M 0 28304 1 28340 (a harmless spider) O 0 28313 1 28344 (a rusty sword) M 0 28305 1 28318 (the mad dragon) G 1 28303 1 -1 (a secret key) -E 1 28331 1 7 (a dragon tail) +E 1 28331 1 16 (a dragon tail) E 1 28332 1 6 (a bull skull) M 0 28306 2 28344 (a box) M 0 28307 4 28327 (a rock) diff --git a/lib/world/zon/3.zon b/lib/world/zon/3.zon index 5cc52f4..d9729a9 100644 --- a/lib/world/zon/3.zon +++ b/lib/world/zon/3.zon @@ -3,9 +3,9 @@ Rumble~ Sanctus III~ 300 399 30 2 M 0 146 2 332 (the grey magi) -E 1 122 99 5 (a grey robe) +E 1 122 99 12 (a grey robe) M 0 145 2 345 (the yellow magi) -E 1 119 99 5 (a yellow robe) +E 1 119 99 12 (a yellow robe) M 0 171 3 345 (the townswoman) M 0 148 2 329 (the purple magi) E 1 126 99 5 (a purple robe) diff --git a/lib/world/zon/313.zon b/lib/world/zon/313.zon index 38ac03d..c473eaa 100644 --- a/lib/world/zon/313.zon +++ b/lib/world/zon/313.zon @@ -18,7 +18,7 @@ R 0 31353 31326 -1 (an unidentifiable body part) O 0 31326 3 31353 (an unidentifiable body part) M 0 31310 1 31353 (Jon Boggins) E 1 31314 100 16 (a three-pronged pitch fork) -E 1 31315 100 5 (a homemade leather vest) +E 1 31315 100 12 (a homemade leather vest) E 1 31316 100 7 (a pair of sewn leather pants) M 0 31304 5 31353 (a goblin scout) E 1 31301 100 5 (some goblin scrap armor) diff --git a/lib/world/zon/43.zon b/lib/world/zon/43.zon index 2c100b0..54e8a85 100644 --- a/lib/world/zon/43.zon +++ b/lib/world/zon/43.zon @@ -20,11 +20,11 @@ M 0 4303 1 4332 (the royal penguin) E 1 4301 1 6 (a crown of ice) E 1 4301 10 17 (a crown of ice) M 0 4304 2 4332 (the royal penguins guard) -E 1 4304 2 16 (a black penguin claw) +G 1 4304 2 -1 (a black penguin claw) O 0 4306 1 4332 (a chest) P 1 4307 1 4306 (a pair of melting boots) M 0 4304 2 4332 (the royal penguins guard) -E 1 4304 2 16 (a black penguin claw) +G 1 4304 2 -1 (a black penguin claw) O 0 4321 1 4393 (a HUGE pile of money) D 0 4393 3 2 (Treasure Room) O 0 4323 10 4393 (a hunting tunic for the king) diff --git a/lib/world/zon/555.zon b/lib/world/zon/555.zon index 346c30e..fca990f 100644 --- a/lib/world/zon/555.zon +++ b/lib/world/zon/555.zon @@ -64,7 +64,7 @@ M 0 55507 1 55535 (the giant spider) G 1 55509 50 -1 (Moonstone) G 1 55520 100 -1 (a wrinkled scroll) M 0 55508 10 55530 (the mage) -E 1 55522 100 5 (a robe) +E 1 55522 100 12 (a robe) D 0 55528 0 1 (The Library Moongate) D 0 55528 4 2 (The Library Moongate) M 0 55506 10 55524 (the giant rat)