Fixes #648

db0 · Aug 25, 2015 · 977a01b · 977a01b
1 parent c774623
commit 977a01b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/o8g/Scripts/CardScripts.py b/o8g/Scripts/CardScripts.py
@@ -6241,9 +6241,9 @@
 -----
 bc0f047c-01b1-427f-a439-d451eda09013
 -----
-onAccess:Lose3Credits-isCost-isOptional$$Trace6-isSubroutine-traceEffects<UninstallTarget-DemiAutoTargeted-atProgram_or_Resource_or_Hardware-targetOpponents-choose1>
+onAccess:Lose3Credits-isCost-isOptional$$Trace6-isSubroutine-traceEffects<UseCustomAbility,None>
 +++++
-A0B0G0T0:Trace6-isSubroutine-traceEffects<UninstallTarget-DemiAutoTargeted-targetOpponents-choose1,None>
+A0B0G0T0:Trace6-isSubroutine-traceEffects<UseCustomAbility,None>
 .....
 News Hound
 -----

diff --git a/o8g/Scripts/actions.py b/o8g/Scripts/actions.py
@@ -2169,7 +2169,8 @@ def uninstall(card, x=0, y=0, destination = 'hand', silent = False):
       if card.isFaceUp and card.highlight != InactiveColor: executePlayScripts(card,'UNINSTALL')
       autoscriptOtherPlayers('CardUninstalled',card)
       clearAttachLinks(card)
-      card.moveTo(group)
+      changeCardGroup(card, group)
+      #card.moveTo(group)
    if not silent: notify("{} uninstalled {}{}.".format(me,card,MUtext))
 
 def useCard(card,x=0,y=0):

diff --git a/o8g/Scripts/customscripts.py b/o8g/Scripts/customscripts.py
@@ -433,6 +433,8 @@ def UseCustomAbility(Autoscript, announceText, card, targetCards = None, notific
          else: 
             ModifyStatus('InstallTarget-rezPay', announceText, card,findTarget('DemiAutoTargeted-atAdvertisement-choose1-fromHand'))
       announceString = "{} install and rez {} advertisements".format(announceText,n)
+   if fetchProperty(card, 'name') == "Archangel":
+      remoteCall(fetchCorpPL(),'Archangel',[card])
    if fetchProperty(card, 'name') == "Hunting Grounds":
       for c in deck.top(3):
          placeCard(c, action = 'INSTALL', type = 'Apex')
@@ -2143,4 +2145,10 @@ def AllSeeingI(card):
 
 def DrugDealer(card):
    drawMany(me.piles['R&D/Stack'], 1, silent = True)
-   notify("--> {} triggers to hook {} up with 1 new card ".format(card,card.owner.name))
+   notify("--> {} triggers to hook {} up with 1 new card ".format(card,card.owner.name))
+
+def Archangel(card):
+   mute()
+   targets = findTarget('DemiAutoTargeted-atProgram_or_Resource_or_Hardware-choose1')
+   if len(targets): ModifyStatus('UninstallTarget', '', card, targets)
+