Update of /cvsroot/wpdev/xmlscripts/scripts/magic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14177/magic
Modified Files:
circle3.py circle7.py gate.py
Log Message:
fixed smoke puffs appearing for invisible chars.
Index: circle3.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle3.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** circle3.py 3 Sep 2004 16:56:23 -0000 1.13
--- circle3.py 7 Sep 2004 23:43:03 -0000 1.14
***************
*** 6,10 ****
import random
import wolfpack
! from wolfpack.utilities import tobackpack, energydamage
from system import poison
--- 6,10 ----
import random
import wolfpack
! from wolfpack.utilities import tobackpack, energydamage, smokepuff
from system import poison
***************
*** 109,116 ****
char.socket.resendworld()
! wolfpack.effect(0x3728, source, 10, 15)
! wolfpack.effect(0x3728, target, 10, 15)
! char.soundeffect(0x1fe)
!
class MagicLock(Spell):
--- 109,114 ----
char.socket.resendworld()
! smokepuff(char, source)
! smokepuff(char, target)
class MagicLock(Spell):
Index: circle7.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle7.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** circle7.py 1 Sep 2004 09:44:07 -0000 1.14
--- circle7.py 7 Sep 2004 23:43:03 -0000 1.15
***************
*** 181,202 ****
# Create the two gates
! gate = wolfpack.newitem(1)
! gate.id = 0xf6c
gate.moveto(char.pos)
gate.settag('dispellable_field', 1)
gate.addscript( 'magic.gate' )
gate.settag('target', target.gettag('location'))
- gate.direction = 9
gate.update()
gate.soundeffect(0x20e)
serials.append(gate.serial)
! gate = wolfpack.newitem(1)
! gate.id = 0xf6c
gate.moveto(location)
gate.settag('target', '%u,%u,%d,%u' % (char.pos.x, char.pos.y, char.pos.z, char.pos.map))
gate.settag('dispellable_field', 1)
gate.addscript( 'magic.gate' )
- gate.direction = 9
gate.update()
gate.soundeffect(0x20e)
--- 181,198 ----
# Create the two gates
! gate = wolfpack.additem('f6c')
gate.moveto(char.pos)
gate.settag('dispellable_field', 1)
gate.addscript( 'magic.gate' )
gate.settag('target', target.gettag('location'))
gate.update()
gate.soundeffect(0x20e)
serials.append(gate.serial)
! gate = wolfpack.additem('f6c')
gate.moveto(location)
gate.settag('target', '%u,%u,%d,%u' % (char.pos.x, char.pos.y, char.pos.z, char.pos.map))
gate.settag('dispellable_field', 1)
gate.addscript( 'magic.gate' )
gate.update()
gate.soundeffect(0x20e)
Index: gate.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/gate.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gate.py 26 May 2004 13:07:23 -0000 1.2
--- gate.py 7 Sep 2004 23:43:03 -0000 1.3
***************
*** 1,4 ****
--- 1,5 ----
import wolfpack
+ from wolfpack import utilities
def onCollide(player, item):
***************
*** 32,39 ****
# An der alten und neuen position soundeffekt und effekt spielen
- player.soundeffect(0x1fe)
item.soundeffect(0x1fe)
! wolfpack.effect(0x3728, player.pos, 10, 30)
! pos = item.pos
! wolfpack.effect(0x3728, pos, 10, 30)
return 1
--- 33,39 ----
# An der alten und neuen position soundeffekt und effekt spielen
item.soundeffect(0x1fe)
!
! utilities.smokepuff(player, player.pos)
! utilities.smokepuff(player, item.pos)
return 1
|