From 11a6f64ecad076ed85e4d4897f20ac83e9a4b9a9 Mon Sep 17 00:00:00 2001 From: Omnidecker Date: Thu, 2 Nov 2023 23:38:37 -0600 Subject: [PATCH] equipment string refactor adds white space so that equipment is more readable. Fixes issue with glance where no break is added causing lines to run together --- vme/zone/commands.zon | 52 +++++++++++++++++++++---------------------- vme/zone/skills.zon | 4 ++-- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/vme/zone/commands.zon b/vme/zone/commands.zon index f4a0cc33..66f02204 100644 --- a/vme/zone/commands.zon +++ b/vme/zone/commands.zon @@ -4938,31 +4938,31 @@ two : integer; code { if (i == WEAR_FINGER_R) - return("worn on right finger"); + return("<worn on right finger> "); else if (i == WEAR_FINGER_L) - return("worn on left finger"); + return("<worn on left finger> "); else if ((i == WEAR_NECK_1) or (i == WEAR_NECK_2)) - return("worn around neck"); + return("<worn around neck> "); else if (i == WEAR_BODY) - return("worn on body"); + return("<worn on body> "); else if (i == WEAR_HEAD) - return("worn on head"); + return("<worn on head> "); else if (i == WEAR_LEGS) - return("worn on legs"); + return("<worn on legs> "); else if (i == WEAR_FEET) - return("worn on feet"); + return("<worn on feet> "); else if (i == WEAR_HANDS) - return("worn on hands"); + return("<worn on hands> "); else if (i == WEAR_ARMS) - return("worn on arms"); + return("<worn on arms> "); else if (i == WEAR_SHIELD) - return("worn as shield"); + return("<worn as shield> "); else if (i == WEAR_ABOUT) - return("worn about body"); + return("<worn about body> "); else if (i == WEAR_WAIST) - return("worn about waist"); + return("<worn about waist> "); else if ((i == WEAR_WRIST_R) or (i == WEAR_WRIST_L)) - return("worn around wrist"); + return("<worn around wrist> "); else if (i == WEAR_WIELD) { if (ting) @@ -4970,9 +4970,9 @@ code else two:=FALSE; if (two == TRUE) - return("two hand wielded"); + return("<two hand wielded> "); else - return("wielded"); + return("<wielded> "); } else if (i == WEAR_HOLD) { @@ -4981,22 +4981,22 @@ code else two:=FALSE; if (two == TRUE) - return("two hand held"); + return("<two hand held> "); else - return("held"); + return("<held "); } else if (i == WEAR_CHEST) - return("worn across chest"); + return("<worn across chest> "); else if (i == WEAR_BACK) - return("worn on back"); + return("<worn on back> "); else if (i == WEAR_EAR_L) - return("worn on left ear"); + return("<worn on left ear> "); else if (i == WEAR_EAR_R) - return("worn on right ear"); + return("<worn on right ear> "); else if ((i == WEAR_ANKLE_L) or (i == WEAR_ANKLE_R)) - return("worn on ankle"); + return("<worn on ankle> "); else - return("report to an admin"); + return("<report to an admin> "); } dilend @@ -5033,8 +5033,7 @@ code lit := ""; str := eq_string(obj.equip,obj); - pge := pge+"<"+str+">"+ - "
"+obj.title+lit+"
"; + pge := pge+str+"
"+obj.title+lit+"
"; cnt := cnt + 1; } obj := obj.next; @@ -5128,7 +5127,7 @@ code else lit := ""; - ret := ret+"<"+str+">
"+obj.title+lit+"
"; + ret := ret+str+"
"+obj.title+lit+"
"; } else ret := ret+"<"+str+">nothing"; @@ -11199,3 +11198,4 @@ dilcopy test1(); end %end + diff --git a/vme/zone/skills.zon b/vme/zone/skills.zon index 11de80ad..b0ae030d 100644 --- a/vme/zone/skills.zon +++ b/vme/zone/skills.zon @@ -1762,7 +1762,7 @@ code } tot := 0; - buf := ""; + buf := "
"; buf:=buf+""; while((obj != null) and (num > 0)) @@ -1770,7 +1770,7 @@ code if (obj.equip) { str := eq_string@commands(obj.equip,obj); - buf := buf+""; + buf := buf+str+""; tot := tot + 1; num := num - 1; }
<"+str+">
"+obj.title+"
"+obj.title+"