Update of /cvsroot/wpdev/xmlscripts/scripts/magic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20413/magic
Modified Files:
circle7.py
Log Message:
Fix for polymorph.
Index: circle7.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle7.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** circle7.py 7 Sep 2004 23:43:03 -0000 1.15
--- circle7.py 22 Sep 2004 07:37:46 -0000 1.16
***************
*** 329,332 ****
--- 329,350 ----
def polymorph_expire(char, arguments):
+ # Hidden beard?
+ if char.hastag('polymorph_beard_id'):
+ current = char.itemonlayer(LAYER_BEARD)
+ if current:
+ current.delete()
+
+ newid = char.gettag('polymorph_beard_id')
+ color = 0
+ if char.hastag('polymorph_beard_color'):
+ color = int(char.gettag('polymorph_beard_color'))
+ item = wolfpack.additem(newid)
+ item.color = color
+ char.additem(LAYER_BEARD, item)
+ item.update()
+
+ char.deltag('polymorph_beard_id')
+ char.deltag('polymorph_beard_color')
+
char.id = char.orgid
char.skin = char.orgskin
***************
*** 375,378 ****
--- 393,405 ----
else:
char.skin = 0
+
+ # Remove the beard if morphing into a female
+ if char.id == 0x191:
+ beard = char.itemonlayer(LAYER_BEARD)
+ if beard:
+ char.settag('polymorph_beard_id', beard.baseid)
+ char.settag('polymorph_beard_color', beard.color)
+ beard.delete()
+
char.polymorph = 1
char.update()
|
