Replace c31710043.lua

expansions/script/c31710043.lua

@@ -73,8 +73,7 @@ end
 function s.pentg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local p0=Duel.CheckLocation(tp,LOCATION_PZONE,0)
 	local p1=Duel.CheckLocation(tp,LOCATION_PZONE,1)
-	if chk==0 then return e:GetHandler():IsDestructable()
-		and Duel.IsExistingMatchingCard(s.penfilter,tp,LOCATION_DECK+LOCATION_HAND,0,1,nil) and Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_HAND,0,1,nil) and (p0 or p1) end
+	if chk==0 then return (Duel.IsExistingMatchingCard(s.penfilter,tp,LOCATION_DECK,0,1,nil) and Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_HAND,0,1,nil)) and (p0 or p1) end
 	local g=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_HAND,0,1,1,nil)
 	Duel.ConfirmCards(tp,g)
 	Duel.ConfirmCards(1-tp,g)
@@ -85,10 +84,10 @@ function s.penop(e,tp,eg,ep,ev,re,r,rp)
 		local p0=Duel.CheckLocation(tp,LOCATION_PZONE,0)
 		local p1=Duel.CheckLocation(tp,LOCATION_PZONE,1)
 		if  not (p0 or p1) then return end
-		if Duel.GetFieldGroupCount(e:GetHandlerPlayer(),0,LOCATION_MZONE)==0 and Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1))  then 
+		if Duel.GetFieldGroupCount(e:GetHandlerPlayer(),LOCATION_MZONE,0)==0 and Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1))  then 
 			 Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
 			local tc=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_DECK,0,1,1,nil):GetFirst()
-			
+			if not tc then return end
 			Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
 			local e1=Effect.CreateEffect(e:GetHandler())
 			e1:SetCode(EFFECT_CHANGE_TYPE)
@@ -98,7 +97,7 @@ function s.penop(e,tp,eg,ep,ev,re,r,rp)
 			e1:SetValue(TYPE_TRAP+TYPE_CONTINUOUS)
 			tc:RegisterEffect(e1)
 			if e:GetLabelObject():IsLocation(LOCATION_HAND) then
-				if Duel.SendtoExtraP(e:GetLabelObject(),nil,REASON_EFFECT) ~= 0 then return end
+				--if Duel.SendtoExtraP(e:GetLabelObject(),nil,REASON_EFFECT) ~= 0 then return end
 				Duel.Destroy(e:GetLabelObject(),REASON_EFFECT)
 			end
 		   return 
@@ -113,6 +112,7 @@ function s.penop(e,tp,eg,ep,ev,re,r,rp)
 			e2:SetCode(EFFECT_UPDATE_LSCALE)
 			e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 			e2:SetRange(LOCATION_PZONE)
+			e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
 			e2:SetValue(3)
 			tc:RegisterEffect(e2)
 			local e3=e2:Clone()