Skip to content

Commit

Permalink
Fixes #16
Browse files Browse the repository at this point in the history
  • Loading branch information
db0 committed Dec 17, 2014
1 parent a85da49 commit be36d6d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions o8g/Scripts/actions.py
Original file line number Diff line number Diff line change
Expand Up @@ -938,8 +938,9 @@ def tradeGoods(card, x = 0, y = 0):
whisper(":::ERROR::: This dude does not hold any goods they can trade.")
return
elif len(attachedGoods) == 1:
if attachedGoods[0].markers[mdict['Traded']] and not confirm("This goods has already been traded this turn. Bypass once-per-turn restriction?"): return
else: extraTXT = ' (Bypassing the once-per-turn restriction)'
if attachedGoods[0].markers[mdict['Traded']]:
if not confirm("This goods has already been traded this turn. Bypass once-per-turn restriction?"): return
else: extraTXT = ' (Bypassing the once-per-turn restriction)'
attachCard(attachedGoods[0],newHost) #If there's only 1 goods attached, we assume that's the one that is going to be moved.
chosenGoods.append(attachedGoods[0])
attachedGoods[0].markers[mdict['Traded']] += 1
Expand Down
2 changes: 1 addition & 1 deletion o8g/Scripts/customscripts.py
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ def UnionCasino(card,mainBet,targetDude, function = 'others bet'):
card.markers[currBet] = 0
highBetter = player
if mainBet >= (highBet + 4) or not highBetter:
targetDude.markers[mdict['PermControl']] += 1
targetDude.markers[mdict['PermControlPlus']] += 1
notify(":> {} outbid all other players by {} and thus {} gains a permanent control point".format(me,mainBet - highBet,targetDude))
else: notify(":> {} checked the bet by raising {} to {}'s {}".format(me,highBet,card.controller,mainBet))

Expand Down

0 comments on commit be36d6d

Please sign in to comment.