Merge remote-tracking branch 'origin/master'

# Conflicts:
#	scripts/actions.py

README.md

@@ -1,12 +1,21 @@
 # Agot2.0cn
 
+
+2016-2-24
+
+
+4.2 action finished
+
 2016-2-12
+
+
 4.2.5 finished
 
 2016-2-10
-4.2.2 finished
 
 
+4.2.2 finished
+
 
 
 

scripts/actions.py

@@ -2794,12 +2794,16 @@ def onloaddeck(args):
 	setGlobalVariable("chaevent", "-1")
 	setGlobalVariable("attachmodify", "{}")
 	setGlobalVariable("mainstep", "0")
+<<<<<<< HEAD
 	setGlobalVariable("ambush", "1")
+=======
+>>>>>>> origin/master
 	setGlobalVariable("aftercalculatestand", "[]")
 	setGlobalVariable("aftercalculatedraw", "[]")
 	setGlobalVariable("ignorestr", "[]")
 	setGlobalVariable("addclaim","0")
 	setGlobalVariable("addclaimall","0")
+<<<<<<< HEAD
 	setGlobalVariable("reavelplot","0")
 	setGlobalVariable("drawphase","0")
 	setGlobalVariable("marshalphase","0")
@@ -2816,6 +2820,8 @@ def onloaddeck(args):
 	setGlobalVariable("action","0")
 	setGlobalVariable("activeplayer","")
 	me.setGlobalVariable("active","0")
+=======
+>>>>>>> origin/master
 	player = args.player
 	if player==me:
 		checkdeck()
@@ -5181,7 +5187,11 @@ def next(group, x=0, y=0):
 			notify("{}'s {} kneel {} by Initimidate".format(me,cardtoaction,selectedcard[0]))
 			cardtoaction = []
 		keywordforability(1)
+<<<<<<< HEAD
 	if sessionpass in("kneelhouseok","addintselectok","adddefselectok","dischandselectok","adddstrselectok","ignorestrselectok","returnhandselectok","drawstarkselectok","burnselectok","returndeadselectok","addstrdrawselectok","addclaimselectok","addstr3selectok","attaddstr3selectok","standremovechallengeselectok","3playeraddstr2selectok","removechallengeok"):
+=======
+	if sessionpass in("kneelhouseok","addintselectok","adddefselectok","dischandselectok","adddstrselectok","ignorestrselectok","returnhandselectok","drawstarkselectok","burnselectok","returndeadselectok","addstrdrawselectok","addclaimselectok","addstr3selectok","attaddstr3selectok","standremovechallengeselectok","3playeraddstr2selectok"):
+>>>>>>> origin/master
 		if len(selectedcard) > 1 and sessionpass != "3playeraddstr2selectok":
 			whisper("You must select only one card to action.")
 			return
@@ -5201,7 +5211,11 @@ def next(group, x=0, y=0):
 				for incomecard in table:
 					if incomecard.controller == me and incomecard.markers[Gold] > 0:
 						incomecard.markers[Gold] -= 1
+<<<<<<< HEAD
 			if sessionpass in ("adddefselectok","dischandselectok","ignorestrselectok","returnhandselectok","burnselectok","returndeadselectok","addstrdrawselectok","addclaimselectok","removechallengeok"):
+=======
+			if sessionpass in ("adddefselectok","dischandselectok","ignorestrselectok","returnhandselectok","burnselectok","returndeadselectok","addstrdrawselectok","addclaimselectok"):
+>>>>>>> origin/master
 				if sessionpass == "returndeadselectok":
 					debug(cardtoaction)
 					if cardtoaction == None:
@@ -5210,6 +5224,7 @@ def next(group, x=0, y=0):
 						sessionpass = ""
 						remoteCall(otherplayer, "action", ["challenge",1])
 						return
+<<<<<<< HEAD
 				if sessionpass == "removechallengeok":
 					savetarget = selectedcard[0]
 					debug(savetarget)
@@ -5222,6 +5237,8 @@ def next(group, x=0, y=0):
 					remoteCall(me, "setTimer", [me,"interruptcancel",table])
 					nextcardtmp = []
 					return
+=======
+>>>>>>> origin/master
 				if play(nextcardtmp):
 					if dwtmpcard != []:
 						kneel(dwtmpcard)
@@ -6159,12 +6176,15 @@ def checkdeadtargaryen(ok):
 		if card.Faction == "Targaryen." and card.Unique =="Yes" and card.Type == "Character":
 			return True
 
+<<<<<<< HEAD
 def checkpr(player):
 	mute()
 	for card in table:
 		if card.model == "12bc6cd7-39f0-44b7-9492-101d8083c468" and card.controller == player:
 			return True
 
+=======
+>>>>>>> origin/master
 def challengeaction(count):
 	mute()
 	global actionattach
@@ -6489,6 +6509,7 @@ def actionforability(card,repass):
 					for addcard in cardtoaction:
 						addcard.markers[STR_Up] += 2
 						notify("{}'s {} action {} gets +2 STR.".format(me,card,addcard))#GrowingStrong
+<<<<<<< HEAD
 				if actionchallenge[d][2] == "choosechallenge":
 					choiceList = ['Military', 'Intrigue', 'Power']
 					colorList = ['#ae0603' ,'#006b34','#1a4d8f']
@@ -6503,6 +6524,8 @@ def actionforability(card,repass):
 					card.target(False)
 					cardtoaction.highlight = None
 					notify("{}'s {} action remove {} from the challenge.".format(me,card,cardtoaction))#AreoHotah
+=======
+>>>>>>> origin/master
 
 				cardtoaction == []
 				if not actioncardlimit.has_key(card._id):

scripts/cardaction.py

@@ -93,7 +93,15 @@
             IronFleetScout =         ("Iron Fleet Scout","6357f740-5434-4d09-957a-87af33f9b57b","addstr","table",1,""),
             TheKrakensGrasp =        ("The Kraken's Grasp","80300190-96a8-4fa7-be7f-1a2bea691978","ignorestr","Hand",1,"fplay"),
             TheThingsIDoForLove =    ("The Things I Do For Love","6d93075c-8517-44ef-8580-f4fdfe1967da","kneelhousereturnhand","Hand",1,"Lord./Lady."),
-            GatesofWinterfell =      ("Gates of Winterfell","14fb9ce4-6d48-4c9f-a8d0-5ded218714dc","drawstark","table",1,""))
+            GatesofWinterfell =      ("Gates of Winterfell","14fb9ce4-6d48-4c9f-a8d0-5ded218714dc","drawstark","table",1,""),
+            FortheNorth =            ("For the North","764fd244-f0f0-4b61-a435-9cf73ef074ce","addstrdraw","Hand",1,""),
+            WinterIsComing =         ("Winter Is Coming","18f549b8-eda2-4a40-8196-d952f5a4874f","addclaim","Hand",1,""),
+            Dracarys =               ("Dracarys","aae782b7-cd97-4818-b56a-d1dafe6f80de","burn","Hand",1,""),
+            FireandBlood =           ("Fire and Blood","06a715e0-f26c-4894-8610-63353d73e0fd","returndead","Hand",1,""),
+            MargaeryTyrell =         ("Margaery Tyrell","9e0df853-1c6d-4be2-b799-fe69524a6057","addstr3","table",1,""),
+            Heartsbane =             ("Heartsbane","4c8a114e-106c-4460-846b-28f73914fc11","attaddstr3","table",1,""),
+            Highgarden =             ("Highgarden","15ae647f-bc30-4cca-aeed-bb675c8096c7","standremovechallenge","table",1,""),
+            GrowingStrong =          ("Growing Strong","92d9670d-d842-4c6c-990c-e1e5cb05759d","3playeraddstr2","Hand",1,""))
 
 
 keywordsreaction = dict(