Changeset 290
- Timestamp:
- 08/25/07 10:57:03 (1 year ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/games/minionsofmirth/v1/mud/characterserver/server.py
r289 r290 291 291 return (gplayers,muted) 292 292 293 def broadcastRaffle(self,msg ):293 def broadcastRaffle(self,msg,pname): 294 294 try: 295 295 d = self.perspective.callRemote("broadcastRaffle",msg) … … 570 570 cname = ACTIVE_PLAYER_TIMES[name][1] 571 571 for wname,wconn in WORLD_CONNECTIONS.iteritems(): 572 wconn.broadcastRaffle("Congratulations %s!!! You have won a ticket in the Halloween Raffle! The next ticket will be awarded in one hour. For information on the Halloween Raffle, visit http://minions.prairiegames.com!"%cname)572 wconn.broadcastRaffle("Congratulations %s!!! You have won a ticket in the Halloween Raffle! For information on the Halloween Raffle, visit http://minions.prairiegames.com!"%cname,name) 573 573 574 574 elif not force: 575 575 print "No one eligible for raffle" 576 for wname,wconn in WORLD_CONNECTIONS.iteritems():577 wconn.broadcastRaffle("There aren't enough eligible players online to hold a raffle ticket drawing. There must be at least 5 eligible players online to award a ticket! For information on the Halloween Raffle, visit http://minions.prairiegames.com!")576 #for wname,wconn in WORLD_CONNECTIONS.iteritems(): 577 # wconn.broadcastRaffle("There aren't enough eligible players online to hold a raffle ticket drawing. There must be at least 5 eligible players online to award a ticket! For information on the Halloween Raffle, visit http://minions.prairiegames.com!") 578 578 579 579 cursor.close() … … 583 583 584 584 def RaffleTicket(): 585 reactor.callLater( 60*60,RaffleTicket) #make sure we're called again no matter what!585 reactor.callLater(10*60,RaffleTicket) #make sure we're called again no matter what! 586 586 587 587 AwardTicket() … … 601 601 reactor.callLater(60*60,ReplicateDatabases) 602 602 603 reactor.callLater( 60*60,RaffleTicket)603 reactor.callLater(10*60,RaffleTicket) 604 604 605 605 reactor.run() trunk/games/minionsofmirth/v1/mud/world/cserveravatar.py
r288 r290 258 258 print_exc() 259 259 260 def remote_broadcastRaffle(self,msg ):260 def remote_broadcastRaffle(self,msg,pname): 261 261 if not AVATAR or not AVATAR.world: 262 262 return … … 265 265 266 266 for p in world.activePlayers: 267 try: 268 p.sendSpeechText(RPG_MSG_SPEECH_SYSTEM,msg) 269 except: 270 pass 267 if p.publicName.lower() == pname.lower() or not pname: 268 try: 269 p.sendSpeechText(RPG_MSG_SPEECH_SYSTEM,msg) 270 except: 271 pass 271 272 272 273 trunk/games/minionsofmirth/v1/mud/worlddaemon/charservices.py
r288 r290 40 40 self.repfiles = {} 41 41 42 def perspective_broadcastRaffle(self,msg ):42 def perspective_broadcastRaffle(self,msg,pname): 43 43 for avatar in CServerAvatar.worldCSAvatars.itervalues(): 44 44 try: 45 avatar.callRemote("broadcastRaffle",msg )45 avatar.callRemote("broadcastRaffle",msg,pname) 46 46 except: 47 47 pass

