fix Labrynth (#1866)

1719f4b8 · mercury233 · GitHub · d3c7bde0 · 1719f4b8 · 1719f4b8
Commit 1719f4b8 authored Apr 28, 2022 by mercury233 Committed by GitHub Apr 28, 2022
Showing with 9 additions and 6 deletions

c1225009.lua c1225009.lua +2 -1

c2347656.lua c2347656.lua +2 -1

c37629703.lua c37629703.lua +1 -1

c5380979.lua c5380979.lua +1 -1

c74018812.lua c74018812.lua +1 -1

c75730490.lua c75730490.lua +2 -1

No files found.
--- a/c1225009.lua
+++ b/c1225009.lua
@@ -47,7 +47,8 @@ function c1225009.cfilter(c)
 	return c:IsPreviousLocation(LOCATION_MZONE) and c:IsReason(REASON_EFFECT)
 end
 function c1225009.drcon(e,tp,eg,ep,ev,re,r,rp)
-	return re and rp==tp and re:GetHandler():GetType()==TYPE_TRAP and eg:IsExists(c1225009.cfilter,1,nil)
+	return re and rp==tp and re:IsActiveType(TYPE_TRAP) and re:GetHandler():GetOriginalType()==TYPE_TRAP
+		and eg:IsExists(c1225009.cfilter,1,nil)
 end
 function c1225009.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsPlayerCanDraw(tp,1) end

--- a/c2347656.lua
+++ b/c2347656.lua
@@ -74,7 +74,8 @@ function c2347656.cfilter(c)
 	return c:IsPreviousLocation(LOCATION_MZONE) and c:IsReason(REASON_EFFECT)
 end
 function c2347656.descon(e,tp,eg,ep,ev,re,r,rp)
-	return re and rp==tp and re:GetHandler():GetType()==TYPE_TRAP and eg:IsExists(c2347656.cfilter,1,nil)
+	return re and rp==tp and re:IsActiveType(TYPE_TRAP) and re:GetHandler():GetOriginalType()==TYPE_TRAP
+		and eg:IsExists(c2347656.cfilter,1,nil)
 end
 function c2347656.destg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetFieldGroupCount(tp,0,LOCATION_ONFIELD+LOCATION_HAND)>0 end

--- a/c37629703.lua
+++ b/c37629703.lua
@@ -49,7 +49,7 @@ function c37629703.cfilter(c)
 	return c:IsPreviousLocation(LOCATION_MZONE) and c:IsReason(REASON_EFFECT)
 end
 function c37629703.thcon(e,tp,eg,ep,ev,re,r,rp)
-	return re and rp==tp and re:GetHandler():GetType()==TYPE_TRAP
+	return re and rp==tp and re:IsActiveType(TYPE_TRAP) and re:GetHandler():GetOriginalType()==TYPE_TRAP
 		and eg:IsExists(c37629703.cfilter,1,nil) and not eg:IsContains(e:GetHandler())
 end
 function c37629703.thtg(e,tp,eg,ep,ev,re,r,rp,chk)

--- a/c5380979.lua
+++ b/c5380979.lua
@@ -80,7 +80,7 @@ function c5380979.cfilter(c)
 end
 function c5380979.setcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(c5380979.cfilter,1,nil) and not eg:IsContains(e:GetHandler()) and rp==tp
-		and re:IsActiveType(TYPE_TRAP) and re:GetHandler():GetType()==TYPE_TRAP and aux.exccon(e)
+		and re:IsActiveType(TYPE_TRAP) and re:GetHandler():GetOriginalType()==TYPE_TRAP and aux.exccon(e)
 end
 function c5380979.settg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsSSetable() end

--- a/c74018812.lua
+++ b/c74018812.lua
@@ -53,7 +53,7 @@ function c74018812.cfilter(c)
 	return c:IsPreviousLocation(LOCATION_MZONE) and c:IsReason(REASON_EFFECT)
 end
 function c74018812.spcon(e,tp,eg,ep,ev,re,r,rp)
-	return re and rp==tp and re:GetHandler():GetType()==TYPE_TRAP
+	return re and rp==tp and re:IsActiveType(TYPE_TRAP) and re:GetHandler():GetOriginalType()==TYPE_TRAP
 		and eg:IsExists(c74018812.cfilter,1,nil) and not eg:IsContains(e:GetHandler())
 end
 function c74018812.sptg(e,tp,eg,ep,ev,re,r,rp,chk)

--- a/c75730490.lua
+++ b/c75730490.lua
@@ -55,7 +55,8 @@ function c75730490.cfilter(c)
 	return c:IsPreviousLocation(LOCATION_MZONE) and c:IsReason(REASON_EFFECT)
 end
 function c75730490.drcon(e,tp,eg,ep,ev,re,r,rp)
-	return re and rp==tp and re:GetHandler():GetType()==TYPE_TRAP and eg:IsExists(c75730490.cfilter,1,nil)
+	return re and rp==tp and re:IsActiveType(TYPE_TRAP) and re:GetHandler():GetOriginalType()==TYPE_TRAP
+		and eg:IsExists(c75730490.cfilter,1,nil)
 end
 function c75730490.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsPlayerCanDraw(tp,1) end