Merge branch 'master' of github.com:Fluorohydride/ygopro

script/c21698716.lua

@@ -2,13 +2,12 @@
 function c21698716.initial_effect(c)
 	--send replace
 	local e1=Effect.CreateEffect(c)
-	e1:SetDescription(aux.Stringid(21698716,0))
-	e1:SetCode(EFFECT_SEND_REPLACE)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_UNCOPYABLE)
+	e1:SetCode(EVENT_LEAVE_FIELD_P)
 	e1:SetRange(LOCATION_MZONE)
-	e1:SetTarget(c21698716.reptarget)
-	e1:SetOperation(c21698716.repoperation)
+	e1:SetCondition(c21698716.repcon)
+	e1:SetOperation(c21698716.repop)
 	c:RegisterEffect(e1)
 	--return deck
 	local e2=Effect.CreateEffect(c)
@@ -22,14 +21,13 @@ function c21698716.initial_effect(c)
 	e2:SetOperation(c21698716.operation)
 	c:RegisterEffect(e2)
 end
-function c21698716.reptarget(e,tp,eg,ep,ev,re,r,rp,chk)
-	local c=e:GetHandler()
-	if chk==0 then return c:GetDestination()==LOCATION_GRAVE and c:IsReason(REASON_DESTROY) end
-	if Duel.GetLocationCount(tp,LOCATION_SZONE)<=0 then return false end
-	return Duel.SelectEffectYesNo(tp,c)
+function c21698716.repcon(e,tp,eg,ep,ev,re,r,rp)
+	return e:GetHandler():GetDestination()==LOCATION_GRAVE and e:GetHandler():IsReason(REASON_DESTROY)
 end
-function c21698716.repoperation(e,tp,eg,ep,ev,re,r,rp,chk)
+function c21698716.repop(e,tp,eg,ep,ev,re,r,rp)
+	if Duel.GetLocationCount(tp,LOCATION_SZONE)<=0 then return end
 	local c=e:GetHandler()
+	if not Duel.SelectEffectYesNo(tp,c) then return end
 	Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
 	local e1=Effect.CreateEffect(c)
 	e1:SetCode(EFFECT_CHANGE_TYPE)

script/c28120197.lua

---όӵ؎
+--断層地帯
 function c28120197.initial_effect(c)
 	--activate
 	local e1=Effect.CreateEffect(c)

script/c31812496.lua

---ƥʯ
+--アステカの石像
 function c31812496.initial_effect(c)
 	--deepen damage
 	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
-	e1:SetRange(LOCATION_MZONE)
+	e1:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_SINGLE)
 	e1:SetCode(EVENT_PRE_BATTLE_DAMAGE)
 	e1:SetCondition(c31812496.dcon)
 	e1:SetOperation(c31812496.dop)

script/c32710364.lua

@@ -2,13 +2,12 @@
 function c32710364.initial_effect(c)
 	--send replace
 	local e1=Effect.CreateEffect(c)
-	e1:SetDescription(aux.Stringid(32710364,0))
-	e1:SetCode(EFFECT_SEND_REPLACE)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_UNCOPYABLE)
+	e1:SetCode(EVENT_LEAVE_FIELD_P)
 	e1:SetRange(LOCATION_MZONE)
-	e1:SetTarget(c32710364.reptarget)
-	e1:SetOperation(c32710364.repoperation)
+	e1:SetCondition(c32710364.repcon)
+	e1:SetOperation(c32710364.repop)
 	c:RegisterEffect(e1)
 	--special summon
 	local e2=Effect.CreateEffect(c)
@@ -21,14 +20,13 @@ function c32710364.initial_effect(c)
 	e2:SetOperation(c32710364.operation)
 	c:RegisterEffect(e2)
 end
-function c32710364.reptarget(e,tp,eg,ep,ev,re,r,rp,chk)
-	local c=e:GetHandler()
-	if chk==0 then return c:GetDestination()==LOCATION_GRAVE and c:IsReason(REASON_DESTROY) end
-	if Duel.GetLocationCount(tp,LOCATION_SZONE)<=0 then return false end
-	return Duel.SelectEffectYesNo(tp,c)
+function c32710364.repcon(e,tp,eg,ep,ev,re,r,rp)
+	return e:GetHandler():GetDestination()==LOCATION_GRAVE and e:GetHandler():IsReason(REASON_DESTROY)
 end
-function c32710364.repoperation(e,tp,eg,ep,ev,re,r,rp,chk)
+function c32710364.repop(e,tp,eg,ep,ev,re,r,rp)
+	if Duel.GetLocationCount(tp,LOCATION_SZONE)<=0 then return end
 	local c=e:GetHandler()
+	if not Duel.SelectEffectYesNo(tp,c) then return end
 	Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
 	local e1=Effect.CreateEffect(c)
 	e1:SetCode(EFFECT_CHANGE_TYPE)

script/c32933942.lua

@@ -2,13 +2,12 @@
 function c32933942.initial_effect(c)
 	--send replace
 	local e1=Effect.CreateEffect(c)
-	e1:SetDescription(aux.Stringid(32933942,0))
-	e1:SetCode(EFFECT_SEND_REPLACE)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_UNCOPYABLE)
+	e1:SetCode(EVENT_LEAVE_FIELD_P)
 	e1:SetRange(LOCATION_MZONE)
-	e1:SetTarget(c32933942.reptarget)
-	e1:SetOperation(c32933942.repoperation)
+	e1:SetCondition(c32933942.repcon)
+	e1:SetOperation(c32933942.repop)
 	c:RegisterEffect(e1)
 	--direct attack
 	local e2=Effect.CreateEffect(c)
@@ -24,14 +23,13 @@ function c32933942.initial_effect(c)
 	e3:SetOperation(c32933942.rdop)
 	c:RegisterEffect(e3)
 end
-function c32933942.reptarget(e,tp,eg,ep,ev,re,r,rp,chk)
-	local c=e:GetHandler()
-	if chk==0 then return c:GetDestination()==LOCATION_GRAVE and c:IsReason(REASON_DESTROY) end
-	if Duel.GetLocationCount(tp,LOCATION_SZONE)<=0 then return false end
-	return Duel.SelectEffectYesNo(tp,c)
+function c32933942.repcon(e,tp,eg,ep,ev,re,r,rp)
+	return e:GetHandler():GetDestination()==LOCATION_GRAVE and e:GetHandler():IsReason(REASON_DESTROY)
 end
-function c32933942.repoperation(e,tp,eg,ep,ev,re,r,rp,chk)
+function c32933942.repop(e,tp,eg,ep,ev,re,r,rp)
+	if Duel.GetLocationCount(tp,LOCATION_SZONE)<=0 then return end
 	local c=e:GetHandler()
+	if not Duel.SelectEffectYesNo(tp,c) then return end
 	Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
 	local e1=Effect.CreateEffect(c)
 	e1:SetCode(EFFECT_CHANGE_TYPE)

script/c56460688.lua

@@ -54,7 +54,10 @@ function c56460688.retop(e,tp,eg,ep,ev,re,r,rp)
 		local g=e:GetLabelObject():GetLabelObject()
 		local tc=g:GetFirst()
 		while tc do
-			if tc:GetFlagEffect(56460688)>0 then Duel.ReturnToField(tc) end
+			if tc:GetFlagEffect(56460688)>0 then
+				Duel.ReturnToField(tc)
+				tc:SetStatus(STATUS_SUMMON_TURN+STATUS_FORM_CHANGED,false)
+			end
 			tc=g:GetNext()
 		end
 		g:DeleteGroup()

script/c68215963.lua

@@ -2,13 +2,12 @@
 function c68215963.initial_effect(c)
 	--send replace
 	local e1=Effect.CreateEffect(c)
-	e1:SetDescription(aux.Stringid(68215963,0))
-	e1:SetCode(EFFECT_SEND_REPLACE)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_UNCOPYABLE)
+	e1:SetCode(EVENT_LEAVE_FIELD_P)
 	e1:SetRange(LOCATION_MZONE)
-	e1:SetTarget(c68215963.reptarget)
-	e1:SetOperation(c68215963.repoperation)
+	e1:SetCondition(c68215963.repcon)
+	e1:SetOperation(c68215963.repop)
 	c:RegisterEffect(e1)
 	--change pos
 	local e2=Effect.CreateEffect(c)
@@ -22,14 +21,13 @@ function c68215963.initial_effect(c)
 	e2:SetOperation(c68215963.operation)
 	c:RegisterEffect(e2)
 end
-function c68215963.reptarget(e,tp,eg,ep,ev,re,r,rp,chk)
-	local c=e:GetHandler()
-	if chk==0 then return c:GetDestination()==LOCATION_GRAVE and c:IsReason(REASON_DESTROY) end
-	if Duel.GetLocationCount(tp,LOCATION_SZONE)<=0 then return false end
-	return Duel.SelectEffectYesNo(tp,c)
+function c68215963.repcon(e,tp,eg,ep,ev,re,r,rp)
+	return e:GetHandler():GetDestination()==LOCATION_GRAVE and e:GetHandler():IsReason(REASON_DESTROY)
 end
-function c68215963.repoperation(e,tp,eg,ep,ev,re,r,rp,chk)
+function c68215963.repop(e,tp,eg,ep,ev,re,r,rp)
+	if Duel.GetLocationCount(tp,LOCATION_SZONE)<=0 then return end
 	local c=e:GetHandler()
+	if not Duel.SelectEffectYesNo(tp,c) then return end
 	Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
 	local e1=Effect.CreateEffect(c)
 	e1:SetCode(EFFECT_CHANGE_TYPE)

script/c68815401.lua

@@ -23,8 +23,7 @@ function c68815401.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.RegisterEffect(e1,tp)
 end
 function c68815401.filter1(c)
-	local code=c:GetCode()
-	return c:IsFaceup() and (code==69537999 or code==21420702) and c:IsDestructable()
+	return c:IsFaceup() and c:IsSetCard(0xb9) and c:IsDestructable()
 end
 function c68815401.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c68815401.filter1,tp,LOCATION_SZONE,0,1,nil)

script/c69750546.lua

@@ -12,7 +12,7 @@ function c69750546.initial_effect(c)
 	c:RegisterEffect(e1)
 	--destroy
 	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(69750546,0))
+	e2:SetDescription(aux.Stringid(69750546,1))
 	e2:SetCategory(CATEGORY_DESTROY)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e2:SetProperty(EFFECT_FLAG_DELAY)
@@ -37,9 +37,7 @@ function c69750546.operation(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Damage(p,d,REASON_EFFECT)
 end
 function c69750546.descon(e,tp,eg,ep,ev,re,r,rp)
-	if not re or e:GetHandler():IsReason(REASON_RETURN) then return false end
-	local code=re:GetHandler():GetCode()
-	return code==69537999 or code==21420702
+	return not e:GetHandler():IsReason(REASON_RETURN) and re and re:GetHandler():IsSetCard(0xb9)
 end
 function c69750546.costfilter(c)
 	return c:IsCode(69750546) and c:IsAbleToGraveAsCost()

script/c69937550.lua

@@ -2,13 +2,12 @@
 function c69937550.initial_effect(c)
 	--send replace
 	local e1=Effect.CreateEffect(c)
-	e1:SetDescription(aux.Stringid(69937550,0))
-	e1:SetCode(EFFECT_SEND_REPLACE)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_UNCOPYABLE)
+	e1:SetCode(EVENT_LEAVE_FIELD_P)
 	e1:SetRange(LOCATION_MZONE)
-	e1:SetTarget(c69937550.reptarget)
-	e1:SetOperation(c69937550.repoperation)
+	e1:SetCondition(c69937550.repcon)
+	e1:SetOperation(c69937550.repop)
 	c:RegisterEffect(e1)
 	--change battle target
 	local e2=Effect.CreateEffect(c)
@@ -20,14 +19,13 @@ function c69937550.initial_effect(c)
 	e2:SetOperation(c69937550.cboperation)
 	c:RegisterEffect(e2)
 end
-function c69937550.reptarget(e,tp,eg,ep,ev,re,r,rp,chk)
-	local c=e:GetHandler()
-	if chk==0 then return c:GetDestination()==LOCATION_GRAVE and c:IsReason(REASON_DESTROY) end
-	if Duel.GetLocationCount(tp,LOCATION_SZONE)<=0 then return false end
-	return Duel.SelectEffectYesNo(tp,c)
+function c69937550.repcon(e,tp,eg,ep,ev,re,r,rp)
+	return e:GetHandler():GetDestination()==LOCATION_GRAVE and e:GetHandler():IsReason(REASON_DESTROY)
 end
-function c69937550.repoperation(e,tp,eg,ep,ev,re,r,rp,chk)
+function c69937550.repop(e,tp,eg,ep,ev,re,r,rp)
+	if Duel.GetLocationCount(tp,LOCATION_SZONE)<=0 then return end
 	local c=e:GetHandler()
+	if not Duel.SelectEffectYesNo(tp,c) then return end
 	Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
 	local e1=Effect.CreateEffect(c)
 	e1:SetCode(EFFECT_CHANGE_TYPE)

script/c7093411.lua

@@ -2,13 +2,12 @@
 function c7093411.initial_effect(c)
 	--send replace
 	local e1=Effect.CreateEffect(c)
-	e1:SetDescription(aux.Stringid(7093411,0))
-	e1:SetCode(EFFECT_SEND_REPLACE)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_UNCOPYABLE)
+	e1:SetCode(EVENT_LEAVE_FIELD_P)
 	e1:SetRange(LOCATION_MZONE)
-	e1:SetTarget(c7093411.reptarget)
-	e1:SetOperation(c7093411.repoperation)
+	e1:SetCondition(c7093411.repcon)
+	e1:SetOperation(c7093411.repop)
 	c:RegisterEffect(e1)
 	--place
 	local e2=Effect.CreateEffect(c)
@@ -26,14 +25,13 @@ function c7093411.initial_effect(c)
 	e4:SetCode(EVENT_FLIP_SUMMON_SUCCESS)
 	c:RegisterEffect(e4)
 end
-function c7093411.reptarget(e,tp,eg,ep,ev,re,r,rp,chk)
-	local c=e:GetHandler()
-	if chk==0 then return c:GetDestination()==LOCATION_GRAVE and c:IsReason(REASON_DESTROY) end
-	if Duel.GetLocationCount(tp,LOCATION_SZONE)<=0 then return false end
-	return Duel.SelectEffectYesNo(tp,c)
+function c7093411.repcon(e,tp,eg,ep,ev,re,r,rp)
+	return e:GetHandler():GetDestination()==LOCATION_GRAVE and e:GetHandler():IsReason(REASON_DESTROY)
 end
-function c7093411.repoperation(e,tp,eg,ep,ev,re,r,rp,chk)
+function c7093411.repop(e,tp,eg,ep,ev,re,r,rp)
+	if Duel.GetLocationCount(tp,LOCATION_SZONE)<=0 then return end
 	local c=e:GetHandler()
+	if not Duel.SelectEffectYesNo(tp,c) then return end
 	Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
 	local e1=Effect.CreateEffect(c)
 	e1:SetCode(EFFECT_CHANGE_TYPE)

script/c76459806.lua

@@ -17,8 +17,7 @@ function c76459806.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function c76459806.filter(c)
-	local code=c:GetCode()
-	return (code==69537999 or code==21420702) and c:IsAbleToHand() and not c:IsHasEffect(EFFECT_NECRO_VALLEY)
+	return c:IsSetCard(0xb9) and c:IsAbleToHand() and not c:IsHasEffect(EFFECT_NECRO_VALLEY)
 end
 function c76459806.tg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c76459806.filter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil) end

script/c91677585.lua

@@ -37,12 +37,13 @@ function c91677585.activate(e,tp,eg,ep,ev,re,r,rp)
 		local e2=Effect.CreateEffect(c)
 		e2:SetType(EFFECT_TYPE_FIELD)
 		e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
+		e2:SetRange(LOCATION_MZONE)
 		e2:SetCode(EFFECT_CANNOT_ACTIVATE)
 		e2:SetTargetRange(0,1)
 		e2:SetValue(c91677585.aclimit)
 		e2:SetCondition(c91677585.actcon)
-		e2:SetReset(RESET_PHASE+PHASE_BATTLE)
-		Duel.RegisterEffect(e2,tp)
+		e2:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_BATTLE)
+		tc:RegisterEffect(e2)
 	end
 end
 function c91677585.actcon(e)

script/c93717133.lua

@@ -87,6 +87,7 @@ function c93717133.retop(e,tp,eg,ep,ev,re,r,rp)
 			e1:SetValue(e:GetLabel()*500)
 			e:GetOwner():RegisterEffect(e1)
 		end
+		tc:SetStatus(STATUS_SUMMON_TURN+STATUS_FORM_CHANGED,false)
 		tc=sg:GetNext()
 	end
 end

script/c95600067.lua

@@ -2,13 +2,12 @@
 function c95600067.initial_effect(c)
 	--send replace
 	local e1=Effect.CreateEffect(c)
-	e1:SetDescription(aux.Stringid(95600067,0))
-	e1:SetCode(EFFECT_SEND_REPLACE)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_UNCOPYABLE)
+	e1:SetCode(EVENT_LEAVE_FIELD_P)
 	e1:SetRange(LOCATION_MZONE)
-	e1:SetTarget(c95600067.reptarget)
-	e1:SetOperation(c95600067.repoperation)
+	e1:SetCondition(c95600067.repcon)
+	e1:SetOperation(c95600067.repop)
 	c:RegisterEffect(e1)
 	--atkup
 	local e2=Effect.CreateEffect(c)
@@ -20,14 +19,13 @@ function c95600067.initial_effect(c)
 	e2:SetValue(400)
 	c:RegisterEffect(e2)
 end
-function c95600067.reptarget(e,tp,eg,ep,ev,re,r,rp,chk)
-	local c=e:GetHandler()
-	if chk==0 then return c:GetDestination()==LOCATION_GRAVE and c:IsReason(REASON_DESTROY) end
-	if Duel.GetLocationCount(tp,LOCATION_SZONE)<=0 then return false end
-	return Duel.SelectEffectYesNo(tp,c)
+function c95600067.repcon(e,tp,eg,ep,ev,re,r,rp)
+	return e:GetHandler():GetDestination()==LOCATION_GRAVE and e:GetHandler():IsReason(REASON_DESTROY)
 end
-function c95600067.repoperation(e,tp,eg,ep,ev,re,r,rp,chk)
+function c95600067.repop(e,tp,eg,ep,ev,re,r,rp)
+	if Duel.GetLocationCount(tp,LOCATION_SZONE)<=0 then return end
 	local c=e:GetHandler()
+	if not Duel.SelectEffectYesNo(tp,c) then return end
 	Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
 	local e1=Effect.CreateEffect(c)
 	e1:SetCode(EFFECT_CHANGE_TYPE)