merge upstream

gframe/event_handler.cpp

@@ -1634,6 +1634,10 @@ void ClientField::ShowMenu(int flag, int x, int y) {
 		height += 21;
 	} else mainGame->btnMSet->setVisible(false);
 	if(flag & COMMAND_SSET) {
+		if(!(clicked_card->type & TYPE_MONSTER))
+			mainGame->btnSSet->setText(dataManager.GetSysString(1153));
+		else
+			mainGame->btnSSet->setText(dataManager.GetSysString(1159));
 		mainGame->btnSSet->setVisible(true);
 		mainGame->btnSSet->setRelativePosition(position2di(1, height));
 		height += 21;

ocgcore/operations.cpp

@@ -2779,6 +2779,7 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
 				pcard->current.reason &= ~REASON_TEMPORARY;
 				pcard->fieldid = infos.field_id++;
 				pcard->reset(RESET_LEAVE, RESET_EVENT);
+				pcard->relate_effect.clear();
 				remove_card(pcard);
 				leave.insert(pcard);
 				continue;

script/c16825874.lua

@@ -50,12 +50,12 @@ function c16825874.cop(e,tp,eg,ep,ev,re,r,rp)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE)
 	e2:SetCode(EFFECT_CANNOT_TRIGGER)
-	e2:SetReset(RESET_EVENT+0x1fc0000)
+	e2:SetReset(RESET_EVENT+0x1fe0000)
 	c:GetReasonCard():RegisterEffect(e2)
 	--disable
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_SINGLE)
 	e3:SetCode(EFFECT_DISABLE)
-	e3:SetReset(RESET_EVENT+0x1fc0000)
+	e3:SetReset(RESET_EVENT+0x1fe0000)
 	c:GetReasonCard():RegisterEffect(e3)
 end

script/c19891310.lua

@@ -18,11 +18,17 @@ function c19891310.initial_effect(c)
 	e2:SetCategory(CATEGORY_TOHAND)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e2:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP)
-	e2:SetCode(EVENT_LEAVE_FIELD)
+	e2:SetCode(EVENT_TO_GRAVE)
 	e2:SetCondition(c19891310.thcon)
 	e2:SetTarget(c19891310.thtg)
 	e2:SetOperation(c19891310.thop)
 	c:RegisterEffect(e2)
+	local e3=e2:Clone()
+	e3:SetCode(EVENT_REMOVE)
+	c:RegisterEffect(e3)
+	local e4=e2:Clone()
+	e4:SetCode(EVENT_TO_DECK)
+	c:RegisterEffect(e4)
 end
 function c19891310.condition(e,tp,eg,ep,ev,re,r,rp)
 	local bt=Duel.GetAttacker()
@@ -54,7 +60,7 @@ function c19891310.aclimit(e,re,tp)
 	return re:IsHasType(EFFECT_TYPE_ACTIVATE) or re:IsActiveType(TYPE_MONSTER)
 end
 function c19891310.thcon(e,tp,eg,ep,ev,re,r,rp)
-	return not e:GetHandler():IsLocation(LOCATION_DECK) and e:GetHandler():IsPreviousPosition(POS_FACEUP)
+	return e:GetHandler():IsPreviousPosition(POS_FACEUP) and e:GetHandler():IsPreviousLocation(LOCATION_ONFIELD)
 end
 function c19891310.thfilter(c)
 	return c:IsSetCard(0x72) and c:IsAbleToHand()

script/c21768554.lua

@@ -36,9 +36,10 @@ function c21768554.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and Duel.IsExistingTarget(c21768554.filter,tp,0,LOCATION_MZONE,1,nil) end
 	local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
+	if ft>3 then ft=3 end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONTROL)
 	local g=Duel.SelectTarget(tp,c21768554.filter,tp,0,LOCATION_MZONE,1,ft,nil)
-	Duel.SetOperationInfo(0,CATEGORY_CONTROL,g,1,0,0)
+	Duel.SetOperationInfo(0,CATEGORY_CONTROL,g,g:GetCount(),0,0)
 end
 function c21768554.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

script/c24731453.lua

@@ -44,11 +44,12 @@ end
 function c24731453.spop(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
 	local c=e:GetHandler()
-	if c:IsRelateToEffect(e) then
-		Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
-		Duel.BreakEffect()
+	if c:IsRelateToEffect(e) and Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)>0 then
 		local g=Duel.GetMatchingGroup(c24731453.filter,tp,LOCATION_SZONE,0,nil)
-		local ct=Duel.Destroy(g,REASON_EFFECT)
-		Duel.Damage(1-tp,ct*200,REASON_EFFECT)
+		if g:GetCount()>0 then
+			Duel.BreakEffect()
+			local ct=Duel.Destroy(g,REASON_EFFECT)
+			Duel.Damage(1-tp,ct*200,REASON_EFFECT)
+		end
 	end
 end

script/c25774450.lua

@@ -26,8 +26,7 @@ function c25774450.activate(e,tp,eg,ep,ev,re,r,rp)
 	local ex2,cg=Duel.GetOperationInfo(0,CATEGORY_CONTROL)
 	local dc=dg:GetFirst()
 	local cc=cg:GetFirst()
-	if dc:IsRelateToEffect(e) and cc:IsRelateToEffect(e) then
-		Duel.Destroy(dc,REASON_EFFECT)
+	if dc:IsRelateToEffect(e) and cc:IsRelateToEffect(e) and Duel.Destroy(dc,REASON_EFFECT)~=0 then
 		if not Duel.GetControl(cc,1-tp,0,0) and not cc:IsImmuneToEffect(e) and cc:IsAbleToChangeControler() then
 			Duel.Destroy(cc,REASON_EFFECT)
 		end

script/c28912357.lua

@@ -3,7 +3,7 @@ function c28912357.initial_effect(c)
 	--xyz summon
 	aux.AddXyzProcedure(c,aux.XyzFilterFunctionF(c,aux.FilterBoolFunction(Card.IsRace,RACE_MACHINE),4),2)
 	c:EnableReviveLimit()
-	--attack up
+	--search
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e1:SetDescription(aux.Stringid(28912357,0))
@@ -20,11 +20,17 @@ function c28912357.initial_effect(c)
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e2:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP)
-	e2:SetCode(EVENT_LEAVE_FIELD)
+	e2:SetCode(EVENT_TO_GRAVE)
 	e2:SetCondition(c28912357.spcon)
 	e2:SetTarget(c28912357.sptg)
 	e2:SetOperation(c28912357.spop)
 	c:RegisterEffect(e2)
+	local e3=e2:Clone()
+	e3:SetCode(EVENT_REMOVE)
+	c:RegisterEffect(e3)
+	local e4=e2:Clone()
+	e4:SetCode(EVENT_TO_DECK)
+	c:RegisterEffect(e4)
 end
 function c28912357.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end
@@ -48,8 +54,7 @@ function c28912357.operation(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c28912357.spcon(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	return not c:IsLocation(LOCATION_DECK) and c:IsPreviousPosition(POS_FACEUP)
+	return e:GetHandler():IsPreviousPosition(POS_FACEUP) and e:GetHandler():IsPreviousLocation(LOCATION_ONFIELD)
 end
 function c28912357.spfilter(c,e,tp)
 	return c:IsLevelBelow(3) and c:IsSetCard(0x72) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

script/c30312361.lua

@@ -31,24 +31,23 @@ function c30312361.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tc=Duel.GetFirstTarget()
 	if c:IsRelateToEffect(e) and c:IsFaceup() and tc:IsRelateToEffect(e) then
-		if Duel.Remove(tc,POS_FACEUP,REASON_EFFECT)~=1 then	return end
+		if Duel.Remove(tc,POS_FACEUP,REASON_EFFECT)~=1 then return end
 		local code=tc:GetOriginalCode()
 		local ba=tc:GetBaseAttack()
-		local reset_flag=RESET_EVENT+0x1fe0000+RESET_PHASE+RESET_END
-		c:CopyEffect(code, reset_flag, 1)
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_SINGLE)
 		e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-		e1:SetReset(reset_flag)
+		e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+RESET_END)
 		e1:SetCode(EFFECT_CHANGE_CODE)
 		e1:SetValue(code)
 		c:RegisterEffect(e1)
 		local e2=Effect.CreateEffect(c)
 		e2:SetType(EFFECT_TYPE_SINGLE)
 		e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-		e2:SetReset(reset_flag)
+		e2:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+RESET_END)
 		e2:SetCode(EFFECT_SET_BASE_ATTACK)
 		e2:SetValue(ba)
 		c:RegisterEffect(e2)
+		c:CopyEffect(code,RESET_EVENT+0x1fe0000+RESET_PHASE+RESET_END,1)
 	end
 end

script/c35952884.lua

@@ -36,11 +36,17 @@ function c35952884.initial_effect(c)
 	e4:SetType(EFFECT_TYPE_TRIGGER_O+EFFECT_TYPE_SINGLE)
 	e4:SetProperty(EFFECT_FLAG_DAMAGE_STEP)
 	e4:SetCategory(CATEGORY_SPECIAL_SUMMON)
-	e4:SetCode(EVENT_LEAVE_FIELD)
+	e4:SetCode(EVENT_TO_GRAVE)
 	e4:SetCondition(c35952884.sumcon)
 	e4:SetTarget(c35952884.sumtg)
 	e4:SetOperation(c35952884.sumop)
 	c:RegisterEffect(e4)
+	local e5=e4:Clone()
+	e5:SetCode(EVENT_REMOVE)
+	c:RegisterEffect(e5)
+	local e6=e4:Clone()
+	e6:SetCode(EVENT_TO_DECK)
+	c:RegisterEffect(e6)
 end
 function c35952884.mtop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
@@ -69,7 +75,7 @@ function c35952884.disop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c35952884.sumcon(e,tp,eg,ep,ev,re,r,rp,chk)
-	return bit.band(e:GetHandler():GetPreviousPosition(),POS_FACEDOWN)==0
+	return e:GetHandler():IsPreviousPosition(POS_FACEUP) and e:GetHandler():IsPreviousLocation(LOCATION_ONFIELD)
 end
 function c35952884.filter(c,e,tp)
 	return c:GetCode()==24696097 and c:IsCanBeSpecialSummoned(e,0,tp,false,true)

script/c36261276.lua

@@ -22,7 +22,7 @@ function c36261276.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 end
 function c36261276.operation(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
-	if tc:IsRelateToEffect(e) and tc:IsFaceup() and Duel.Remove(tc,0,REASON_EFFECT+REASON_TEMPORARY)~=0 then
+	if tc:IsRelateToEffect(e) and tc:IsFaceup() and tc:IsControler(tp) and Duel.Remove(tc,0,REASON_EFFECT+REASON_TEMPORARY)~=0 then
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 		e1:SetCode(EVENT_PHASE+PHASE_END)

script/c36405256.lua

@@ -7,6 +7,7 @@ function c36405256.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_CHAIN_UNIQUE)
 	e1:SetCode(EVENT_SUMMON_SUCCESS)
+	e1:SetCost(c36405256.spcost)
 	e1:SetTarget(c36405256.sptg)
 	e1:SetOperation(c36405256.spop)
 	c:RegisterEffect(e1)
@@ -15,16 +16,19 @@ function c36405256.initial_effect(c)
 	e2:SetCode(EVENT_SPSUMMON_SUCCESS)
 	c:RegisterEffect(e2)
 end
+function c36405256.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.GetFlagEffect(tp,36405256)==0 end
+	Duel.RegisterFlagEffect(tp,36405256,RESET_PHASE+PHASE_END,0,1)
+end
 function c36405256.filter(c,e,tp)
 	return c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c36405256.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(1-tp) and c36405256.filter(chkc,e,tp) end
-	if chk==0 then return Duel.GetFlagEffect(tp,36405256)==0 and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 end
+	if chk==0 then return e:GetHandler():IsRelateToEffect(e) and e:GetHandler():IsFaceup() end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local g=Duel.SelectTarget(tp,c36405256.filter,tp,0,LOCATION_GRAVE,1,1,nil,e,tp)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g,g:GetCount(),0,0)
-	Duel.RegisterFlagEffect(tp,36405256,RESET_PHASE+PHASE_END,0,1)
 end
 function c36405256.spop(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end

script/c64605089.lua

@@ -34,7 +34,7 @@ function c64605089.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local at=Duel.GetAttacker()
 	if c:IsRelateToEffect(e) and Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)>0
-		and at:IsFaceup() and at:GetAttack()<c:GetDefence() then
+		and at:IsFaceup() and at:IsRelateToBattle() and at:GetAttack()<c:GetDefence() then
 		Duel.BreakEffect()
 		Duel.Destroy(at,REASON_EFFECT)
 	end

script/c67957315.lua

@@ -8,7 +8,6 @@ function c67957315.initial_effect(c)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetHintTiming(TIMING_BATTLE_PHASE)
-	e1:SetCountLimit(1)
 	e1:SetCondition(c67957315.adcon)
 	e1:SetCost(c67957315.adcost)
 	e1:SetOperation(c67957315.adop)
@@ -16,13 +15,14 @@ function c67957315.initial_effect(c)
 end
 function c67957315.adcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetTurnPlayer()==tp and Duel.GetCurrentPhase()==PHASE_BATTLE and Duel.GetCurrentChain()==0
+		and (e:GetHandler()==Duel.GetAttacker() or e:GetHandler()==Duel.GetAttackTarget())
 end
 function c67957315.cfilter(c)
-	return c:IsRace(RACE_DRAGON) and c:IsDiscardable()
+	return c:IsRace(RACE_DRAGON) and c:IsDiscardable() and c:IsAbleToGraveAsCost()
 end
 function c67957315.adcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c67957315.cfilter,tp,LOCATION_HAND,0,1,nil) end
-	e:SetLabel(Duel.DiscardHand(tp,c67957315.cfilter,1,99,REASON_COST+REASON_DISCARD))
+	Duel.DiscardHand(tp,c67957315.cfilter,1,1,REASON_COST+REASON_DISCARD)
 end
 function c67957315.adop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
@@ -30,8 +30,8 @@ function c67957315.adop(e,tp,eg,ep,ev,re,r,rp)
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_SINGLE)
 		e1:SetCode(EFFECT_UPDATE_ATTACK)
-		e1:SetValue(e:GetLabel()*1000)
-		e1:SetReset(RESET_EVENT+0x1ff0000+RESET_PHASE+PHASE_END)
+		e1:SetValue(1000)
+		e1:SetReset(RESET_EVENT+0x1ff0000+RESET_PHASE+PHASE_BATTLE)
 		c:RegisterEffect(e1)
 		local e2=e1:Clone()
 		e2:SetCode(EFFECT_UPDATE_DEFENCE)

script/c7194917.lua

+--No.52 ダイヤモンド・クラブ・キング
+function c7194917.initial_effect(c)
+	c:SetUniqueOnField(1,0,7194917)
+	--xyz summon
+	aux.AddXyzProcedure(c,aux.XyzFilterFunction(c,4),2)
+	c:EnableReviveLimit()
+	--atk/def
+	local e1=Effect.CreateEffect(c)
+	e1:SetDescription(aux.Stringid(7194917,0))
+	e1:SetType(EFFECT_TYPE_IGNITION)
+	e1:SetRange(LOCATION_MZONE)
+	e1:SetCountLimit(1)
+	e1:SetCost(c7194917.adcost)
+	e1:SetOperation(c7194917.adop)
+	c:RegisterEffect(e1)
+	--pos
+	local e2=Effect.CreateEffect(c)
+	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e2:SetCode(EVENT_PHASE+PHASE_BATTLE)
+	e2:SetRange(LOCATION_MZONE)
+	e2:SetCountLimit(1)
+	e2:SetCondition(c7194917.poscon1)
+	e2:SetOperation(c7194917.posop1)
+	c:RegisterEffect(e2)
+	--pos
+	local e3=Effect.CreateEffect(c)
+	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
+	e3:SetCode(EVENT_DAMAGE_STEP_END)
+	e3:SetCondition(c7194917.poscon2)
+	e3:SetOperation(c7194917.posop2)
+	c:RegisterEffect(e3)
+end
+function c7194917.adcost(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end
+	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
+end
+function c7194917.adop(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
+	if c:IsRelateToEffect(e) and c:IsFaceup() then
+		local e1=Effect.CreateEffect(c)
+		e1:SetType(EFFECT_TYPE_SINGLE)
+		e1:SetCode(EFFECT_SET_ATTACK_FINAL)
+		e1:SetValue(3000)
+		e1:SetReset(RESET_EVENT+0x1ff0000+RESET_PHASE+RESET_END)
+		c:RegisterEffect(e1)
+		local e2=Effect.CreateEffect(c)
+		e2:SetType(EFFECT_TYPE_SINGLE)
+		e2:SetCode(EFFECT_SET_DEFENCE_FINAL)
+		e2:SetValue(0)
+		e2:SetReset(RESET_EVENT+0x1ff0000+RESET_PHASE+RESET_END)
+		c:RegisterEffect(e2)
+	end
+end
+function c7194917.poscon1(e,tp,eg,ep,ev,re,r,rp)
+	return e:GetHandler():GetAttackedCount()>0
+end
+function c7194917.posop1(e,tp,eg,ep,ev,re,r,rp)
+	if e:GetHandler():IsAttackPos() then
+		Duel.ChangePosition(e:GetHandler(),POS_FACEUP_DEFENCE)
+	end
+end
+function c7194917.poscon2(e,tp,eg,ep,ev,re,r,rp)
+	return e:GetHandler()==Duel.GetAttackTarget() and e:GetHandler():GetOverlayCount()==0
+end
+function c7194917.posop2(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
+	if c:IsRelateToBattle() and c:IsDefencePos() then
+		Duel.ChangePosition(c,POS_FACEUP_ATTACK)
+	end
+end

script/c73289035.lua

@@ -16,15 +16,21 @@ function c73289035.initial_effect(c)
 	e1:SetOperation(c73289035.operation)
 	c:RegisterEffect(e1)
 	--spsummon
-	local e3=Effect.CreateEffect(c)
-	e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
-	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e3:SetCode(EVENT_LEAVE_FIELD)
-	e3:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP)
-	e3:SetCondition(c73289035.spcon)
-	e3:SetTarget(c73289035.sptg)
-	e3:SetOperation(c73289035.spop)
+	local e2=Effect.CreateEffect(c)
+	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
+	e2:SetCode(EVENT_TO_GRAVE)
+	e2:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP)
+	e2:SetCondition(c73289035.spcon)
+	e2:SetTarget(c73289035.sptg)
+	e2:SetOperation(c73289035.spop)
+	c:RegisterEffect(e2)
+	local e3=e2:Clone()
+	e3:SetCode(EVENT_REMOVE)
 	c:RegisterEffect(e3)
+	local e4=e2:Clone()
+	e4:SetCode(EVENT_TO_DECK)
+	c:RegisterEffect(e4)
 end
 function c73289035.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end
@@ -46,7 +52,7 @@ function c73289035.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local ct=e:GetHandler():GetOverlayCount()
 	e:SetLabel(ct)
 	return rp~=tp and bit.band(r,REASON_EFFECT)~=0 and ct>0
-		and e:GetHandler():IsPreviousPosition(POS_FACEUP) and not e:GetHandler():IsLocation(LOCATION_DECK)
+		and e:GetHandler():IsPreviousPosition(POS_FACEUP) and e:GetHandler():IsPreviousLocation(LOCATION_ONFIELD)
 end
 function c73289035.spfilter(c,e,tp)
 	return c:GetLevel()==4 and c:IsSetCard(0x88) and c:IsRace(RACE_BEASTWARRIOR) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

script/c8198620.lua

@@ -35,7 +35,7 @@ function c8198620.splimit(e,se,sp,st)
 end
 function c8198620.attg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local bc=e:GetHandler():GetBattleTarget()
-	if chk==0 then return bc and bc:IsRelateToBattle() and bc:GetAttack()>0 end
+	if chk==0 then return bc and bc:IsRelateToBattle() end
 	Duel.SetOperationInfo(0,CATEGORY_TOKEN,nil,1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,0,0)
 end

script/c84298614.lua

@@ -6,6 +6,7 @@ function c84298614.initial_effect(c)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetHintTiming(0,TIMING_END_PHASE)
 	e1:SetTarget(c84298614.target)
 	e1:SetOperation(c84298614.operation)
 	c:RegisterEffect(e1)
@@ -32,13 +33,15 @@ end
 function c84298614.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tc=Duel.GetFirstTarget()
-	if tc:IsRelateToEffect(e) and Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)~=0 then
+	if c:IsRelateToEffect(e) and tc:IsRelateToEffect(e) and Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)~=0 then
 		c:SetCardTarget(tc)
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_SINGLE)
+		e1:SetProperty(EFFECT_FLAG_OWNER_RELATE)
 		e1:SetCode(EFFECT_UPDATE_ATTACK)
 		e1:SetValue(100)
 		e1:SetReset(RESET_EVENT+0x1fe0000)
+		e1:SetCondition(c84298614.rcon)
 		tc:RegisterEffect(e1)
 		local e2=e1:Clone()
 		e2:SetCode(EFFECT_UPDATE_DEFENCE)
@@ -49,6 +52,9 @@ function c84298614.operation(e,tp,eg,ep,ev,re,r,rp)
 		tc:RegisterEffect(e3)
 	end
 end
+function c84298614.rcon(e)
+	return e:GetOwner():IsHasCardTarget(e:GetHandler())
+end
 function c84298614.descon(e,tp,eg,ep,ev,re,r,rp)
 	local tc=e:GetHandler():GetFirstCardTarget()
 	return tc and eg:IsContains(tc) and tc:IsReason(REASON_DESTROY)

script/c9952083.lua

@@ -9,7 +9,7 @@ function c9952083.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c9952083.condition(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.GetCurrentChain()>1 and Duel.CheckChainUniqueness()
+	return Duel.GetCurrentChain()>1 and Duel.CheckChainUniqueness() and Duel.GetTurnPlayer()==tp
 end
 function c9952083.activate(e,tp,eg,ep,ev,re,r,rp)
 	local e1=Effect.CreateEffect(e:GetHandler())

strings.conf

@@ -208,6 +208,7 @@
 !system 1156 攻击表示
 !system 1157 攻击
 !system 1158 查看列表
+!system 1159 放置
 #menu
 !system 1200 联机模式
 !system 1201 单人模式