|
@@ -236,11 +236,11 @@ if $ARGS[0] = 'view_clothing_list':
|
|
|
|
|
|
if ARRSIZE('gm_dress') > 0:'<center><a href="exec:$ward_list_store = ''gm_dress'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''gm_dress''">Regular G&M clothing</a></center>'
|
|
|
|
|
|
- if ARRSIZE('office') > 0:'<center><a href="exec:$ward_list_store = ''office'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''office''">Office wear</a></center>'
|
|
|
+ if ARRSIZE('gm_office') > 0:'<center><a href="exec:$ward_list_store = ''office'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''office''">Office wear</a></center>'
|
|
|
|
|
|
- if ARRSIZE('school') > 0:'<center><a href="exec:$ward_list_store = ''school'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''school''">School uniforms</a></center>'
|
|
|
+ if ARRSIZE('gm_school') > 0:'<center><a href="exec:$ward_list_store = ''school'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''school''">School uniforms</a></center>'
|
|
|
|
|
|
- if ARRSIZE('uniform') > 0:'<center><a href="exec:$ward_list_store = ''uniform'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''uniform''">Work uniforms</a></center>'
|
|
|
+ if ARRSIZE('gm_uniform') > 0:'<center><a href="exec:$ward_list_store = ''uniform'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''uniform''">Work uniforms</a></center>'
|
|
|
|
|
|
act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
|
|
|
end
|
|
@@ -273,7 +273,7 @@ if $ARGS[0] = 'view_clothing_list':
|
|
|
$ward_list_store = $ARGS[2]
|
|
|
i = 1
|
|
|
:loopoffice
|
|
|
- if gm_office[i] = 1 and gm_office_s[i] = cloc and ($clothingworntype ! 'office' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'office', i)
|
|
|
+ if gm_office[i] = 1 and gm_office_s[i] = cloc and ($clothingworntype ! 'gm_office' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'office', i)
|
|
|
i += 1
|
|
|
if i <= ARRSIZE('office'):jump 'loopoffice'
|
|
|
|
|
@@ -284,11 +284,11 @@ if $ARGS[0] = 'view_clothing_list':
|
|
|
if $ARGS[2] = 'school':
|
|
|
$ward_list_store = $ARGS[2]
|
|
|
|
|
|
- if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = cloc and ($clothingworntype ! 'school' or clothingwornnumber ! 6):*P dyneval($clothing_list_line, $ARGS[1], 'school', 6)
|
|
|
+ if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = cloc and ($clothingworntype ! 'gm_school' or clothingwornnumber ! 6):*P dyneval($clothing_list_line, $ARGS[1], 'school', 6)
|
|
|
|
|
|
i = 1
|
|
|
:loopschool
|
|
|
- if gm_school[i] = 1 and gm_school_s[i] = cloc and ($clothingworntype ! 'school' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'school', i)
|
|
|
+ if gm_school[i] = 1 and gm_school_s[i] = cloc and ($clothingworntype ! 'gm_school' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'school', i)
|
|
|
i += 1
|
|
|
if i = 6: i = 7
|
|
|
if i <= ARRSIZE('school'):jump 'loopschool'
|
|
@@ -301,7 +301,7 @@ if $ARGS[0] = 'view_clothing_list':
|
|
|
$ward_list_store = $ARGS[2]
|
|
|
i = 1
|
|
|
:loopuniform
|
|
|
- if gm_uniform[i] = 1 and gm_uniform_s[i] = cloc and ($clothingworntype ! 'uniform' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'uniform', i)
|
|
|
+ if gm_uniform[i] = 1 and gm_uniform_s[i] = cloc and ($clothingworntype ! 'gm_uniform' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'uniform', i)
|
|
|
i += 1
|
|
|
if i <= ARRSIZE('uniform'):jump 'loopuniform'
|
|
|
|