sign out

expansions/script/c12045000.lua

@@ -22,7 +22,7 @@ function cm.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e2:SetCode(EFFECT_CANNOT_DISCARD_DECK)
-	e2:SetRange(LOCATION_MZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(1,1)
 	c:RegisterEffect(e2)
 	--CANNOT_REMOVE
@@ -30,7 +30,7 @@ function cm.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e2:SetCode(EFFECT_CANNOT_REMOVE)
-	e2:SetRange(LOCATION_MZONE)
+	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_DECK,LOCATION_DECK)
 	c:RegisterEffect(e2)
 	--tohand

expansions/script/c33701337.lua

@@ -103,8 +103,8 @@ end
 function cm.checkop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=eg:GetFirst()
 	while tc do
-		if tc:IsLocation(LOCATION_MZONE) then
-			cm[tc:GetControler()]=cm[tc:GetControler()]+1
+		if tc:IsPreviousLocation(LOCATION_MZONE) then
+			cm[tc:GetPreviousControler()]=cm[tc:GetPreviousControler()]+1
 		end
 		tc=eg:GetNext()
 	end
@@ -112,8 +112,8 @@ end
 function cm.checkop1(e,tp,eg,ep,ev,re,r,rp)
 	local tc=eg:GetFirst()
 	while tc do
-		if tc:IsLocation(LOCATION_ONFIELD) then
-			cm[tc:GetControler()+2]=cm[tc:GetControler()+2]+1
+		if tc:IsPreviousLocation(LOCATION_ONFIELD) then
+			cm[tc:GetPreviousControler()+2]=cm[tc:GetPreviousControler()+2]+1
 		end
 		tc=eg:GetNext()
 	end