--- a/ggrtf-pssmangle.tf	Fri Oct 05 17:53:43 2007 +0000
+++ b/ggrtf-pssmangle.tf	Fri Oct 05 18:05:30 2007 +0000
@@ -65,7 +65,13 @@
 /def pss = /set gparty_gag=1%;@@party status short
 
 /def -i gparty_set =\
-	/if (!regmatch("^([1-3])\.([1-3])$",{1})) /gerror Invalid party place '%{1}'!%;/break%;/endif%;\
+	/if (regmatch("^([A-Z][a-z]+)",{2}))\
+		/let _gpn=%{P1}%;\
+	/else \
+		/let _gpn=%{2}%;\
+	/endif%;\
+	/set gparty_mtmp=%{gparty_mtmp} %{P1}%;\
+	/if (!regmatch("^([1-3])\.([1-3])$",{1})) /break%;/endif%;\
 	/if ({2}!~"") /set gparty_row%{P1}=1%;/else /set gparty_row%{P1}=0%;/endif%;\
 	/let _gps=$[replace(".","_",{1})]%;\
 	/eval /set gparty_%{_gps}_os=$$[gparty_%{_gps}_s]%;\
@@ -76,13 +82,7 @@
 	/eval /set gparty_%{_gps}_ospm=$$[gparty_%{_gps}_spm]%;\
 	/eval /set gparty_%{_gps}_oep=$$[gparty_%{_gps}_ep]%;\
 	/eval /set gparty_%{_gps}_oepm=$$[gparty_%{_gps}_epm]%;\
-	/if (regmatch("^([A-Z][a-z]+)",{2}))\
-		/set gparty_%{_gps}_s=%{P1}%;\
-		/set gparty_mtmp=%{gparty_mtmp} %{P1}%;\
-	/else \
-		/set gparty_%{_gps}_s=%{2}%;\
-		/set gparty_mtmp=%{gparty_mtmp} %{2}%;\
-	/endif%;\
+	/set gparty_%{_gps}_s=%{_gpn}%;\
 	/set gparty_%{_gps}_pl=%{3}%;\
 	/set gparty_%{_gps}_hp=%{4}%;\
 	/set gparty_%{_gps}_hpm=%{5}%;\
@@ -104,9 +104,7 @@
 
 
 /def -i -F -Egparty_gag -ag -p9999 -mregexp -t"^\|.([1-3?]\.[1-3?])   ([A-Z][a-z ][a-z ]?[a-z ]?[a-z ]?[a-z ]?[a-z ]?[a-z ]?[a-z ]?[a-z ]?[a-z ]?[a-z]?) +(ld|ldr|fol|mbr|form|unc|dead|rest|stun) +([0-9-]+)\( *([0-9-]+)\) +([0-9-]+)\( *([0-9-]+)\) +([0-9-]+)\( *([0-9-]+)\)" gpss_getps =\
-	/if ({P1} !~ "?.?")\
-		/test gparty_set({P1},{P2},{P3},{P4},{P5},{P6},{P7},{P8},{P9})%;\
-	/endif%;\
+	/test gparty_set({P1},{P2},{P3},{P4},{P5},{P6},{P7},{P8},{P9})
 
 
 /def -i -F -Egparty_gag -ag -p9999 -msimple -t'`-----------------------------------------------------------------------------\'' gpss_getend =\