notnull/banned
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow for stacking wolf gunner's bullets, and allow for wolves to be both normal and wolf gunners.

Browse Source
This commit is contained in:
Vgr E.Barry 2015-03-08 19:29:16 -04:00
parent 24ce3ef384
commit c84b44f004
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/wolfgame.py
View File

@ -3556,7 +3556,9 @@ def transition_day(cli, gameid=0):
if guntaker not in dead: if guntaker not in dead:
break break
numbullets = var.GUNNERS[victim] numbullets = var.GUNNERS[victim]
var.WOLF_GUNNERS[guntaker] = 1 # transfer bullets a wolf if guntaker not in var.WOLF_GUNNERS:
var.WOLF_GUNNERS[guntaker] = 0
var.WOLF_GUNNERS[guntaker] += 1 # transfer bullets a wolf
mmsg = ("While searching {0}'s belongings, you found " + mmsg = ("While searching {0}'s belongings, you found " +
"a gun loaded with 1 silver bullet! " + "a gun loaded with 1 silver bullet! " +
"You may only use it during the day. " + "You may only use it during the day. " +
@ -4096,7 +4098,8 @@ def shoot(cli, nick, chan, rest):
cli.notice(nick, "You don't have a gun.") cli.notice(nick, "You don't have a gun.")
return return
elif ((nick in var.GUNNERS.keys() and not var.GUNNERS[nick]) or elif ((nick in var.GUNNERS.keys() and not var.GUNNERS[nick]) or
(nick in var.WOLF_GUNNERS.keys() and not var.WOLF_GUNNERS[nick])): ((nick not in var.GUNNERS.keys() or not var.GUNNERS[nick]) and
nick in var.WOLF_GUNNERS.keys() and not var.WOLF_GUNNERS[nick])):
cli.notice(nick, "You don't have any more bullets.") cli.notice(nick, "You don't have any more bullets.")
return return
elif nick in var.SILENCED: elif nick in var.SILENCED:
@ -4113,7 +4116,7 @@ def shoot(cli, nick, chan, rest):
wolfshooter = nick in var.list_players(var.WOLFCHAT_ROLES) wolfshooter = nick in var.list_players(var.WOLFCHAT_ROLES)
if wolfshooter and nick in var.WOLF_GUNNERS: if wolfshooter and nick in var.WOLF_GUNNERS and var.WOLF_GUNNERS[nick]:
var.WOLF_GUNNERS[nick] -= 1 var.WOLF_GUNNERS[nick] -= 1
else: else:
var.GUNNERS[nick] -= 1 var.GUNNERS[nick] -= 1