|
@@ -832,7 +832,11 @@ if $ARGS[0] = 'cum_stat_display':
|
|
|
if cumcount['<<i>>:<<j>>'] = knownguy['<<i>>:<<j>>']:
|
|
|
!! everyone is known (one or more)
|
|
|
if knownguy['<<i>>:<<j>>'] = 1:
|
|
|
- $txtperson = $npc_usedname[$cumowner['<<i>>:<<j>>:0']] + ' '
|
|
|
+ if $npc_usedname[$cumowner['<<i>>:<<j>>:0']] = 'stranger':
|
|
|
+ $txtperson = $npc_firstname[$cumowner['<<i>>:<<j>>:0']] + ' '
|
|
|
+ else
|
|
|
+ $txtperson = $npc_usedname[$cumowner['<<i>>:<<j>>:0']] + ' '
|
|
|
+ end
|
|
|
else
|
|
|
kmax = 0
|
|
|
:nullocator1
|
|
@@ -843,7 +847,11 @@ if $ARGS[0] = 'cum_stat_display':
|
|
|
$txtperson += $npc_usedname[$cumowner['<<i>>:<<j>>:<<k>>']]
|
|
|
if k < kmax-1:$txtperson += ', ' & k += 1 & jump 'knownloop'
|
|
|
k += 1
|
|
|
- $txtperson += ' and ' + $npc_usedname[$cumowner['<<i>>:<<j>>:<<k>>']] + ' '
|
|
|
+ if $npc_usedname[$cumowner['<<i>>:<<j>>:<<k>>']] = 'stranger':
|
|
|
+ $txtperson += ' and ' + $npc_firstname[$cumowner['<<i>>:<<j>>:<<k>>']] + ' '
|
|
|
+ else
|
|
|
+ $txtperson += ' and ' + $npc_usedname[$cumowner['<<i>>:<<j>>:<<k>>']] + ' '
|
|
|
+ end
|
|
|
end
|
|
|
elseif knownguy['<<i>>:<<j>>'] = 0:
|
|
|
!! no one is known (one or more)
|
|
@@ -855,7 +863,11 @@ if $ARGS[0] = 'cum_stat_display':
|
|
|
else
|
|
|
!! there are known and unknown guys in the mix
|
|
|
if knownguy['<<i>>:<<j>>'] = 1:
|
|
|
- $txtperson = $npc_usedname[$cumowner['<<i>>:<<j>>:0']] + ' and some guy'
|
|
|
+ if $npc_usedname[$cumowner['<<i>>:<<j>>:<<k>>']] = 'stranger':
|
|
|
+ $txtperson = $npc_firstname[$cumowner['<<i>>:<<j>>:0']] + ' and some guy'
|
|
|
+ else
|
|
|
+ $txtperson = $npc_usedname[$cumowner['<<i>>:<<j>>:0']] + ' and some guy'
|
|
|
+ end
|
|
|
else
|
|
|
kmax = 0
|
|
|
:nullocator2
|
|
@@ -863,7 +875,11 @@ if $ARGS[0] = 'cum_stat_display':
|
|
|
kmax -= 1
|
|
|
k = 0
|
|
|
:mixloop
|
|
|
- $txtperson += $npc_usedname[$cumowner['<<i>>:<<j>>:<<k>>']] + ', '
|
|
|
+ if $npc_usedname[$cumowner['<<i>>:<<j>>:<<k>>']] = 'stranger':
|
|
|
+ $txtperson += $npc_firstname[$cumowner['<<i>>:<<j>>:<<k>>']] + ', '
|
|
|
+ else
|
|
|
+ $txtperson += $npc_usedname[$cumowner['<<i>>:<<j>>:<<k>>']] + ', '
|
|
|
+ end
|
|
|
if k < kmax: k += 1 & jump 'mixloop'
|
|
|
$txtperson += 'and some guy'
|
|
|
end
|