Merge remote-tracking branch 'upstream/master' into master

c15862758.lua

@@ -52,7 +52,7 @@ function c15862758.operation(e,tp,eg,ep,ev,re,r,rp)
 	e2:SetTargetRange(0,LOCATION_MZONE)
 	e2:SetCondition(c15862758.effcon)
 	e2:SetLabel(turn)
-	e2:SetReset(RESET_EVENT+RESETS_WITHOUT_TEMP_REMOVE)
+	e2:SetReset(RESET_EVENT+RESETS_STANDARD)
 	c:RegisterEffect(e2)
 	local e3=e2:Clone()
 	e3:SetCode(EFFECT_MUST_ATTACK_MONSTER)
@@ -66,7 +66,7 @@ function c15862758.operation(e,tp,eg,ep,ev,re,r,rp)
 	e4:SetCondition(c15862758.wincon)
 	e4:SetOperation(c15862758.winop)
 	e4:SetLabel(turn)
-	e4:SetReset(RESET_EVENT+RESETS_WITHOUT_TEMP_REMOVE)
+	e4:SetReset(RESET_EVENT+RESETS_STANDARD)
 	c:RegisterEffect(e4)
 end
 function c15862758.atkcon(e)

c28677304.lua

@@ -49,7 +49,7 @@ end
 function c28677304.disop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tc=Duel.GetFirstTarget()
-	if c:IsRelateToEffect(e) and tc:IsFaceup() and tc:IsRelateToEffect(e) then
+	if c:IsRelateToEffect(e) and tc:IsFaceup() and tc:IsRelateToEffect(e) and not tc:IsImmuneToEffect(e) then
 		c:SetCardTarget(tc)
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_SINGLE)

c33099732.lua

@@ -40,6 +40,7 @@ end
 function s.tgop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
 	local tc=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_EXTRA,0,1,1,nil,tp):GetFirst()
+	if not tc then return end
 	Duel.ConfirmCards(1-tp,tc)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
 	local sc=Duel.SelectMatchingCard(tp,s.sfilter,tp,LOCATION_DECK,0,1,1,nil,tc):GetFirst()
@@ -55,7 +56,7 @@ function s.tgop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.RegisterEffect(e1,tp)
 		local e2=e1:Clone()
 		e2:SetCode(EFFECT_CANNOT_ACTIVATE)
-		e2:SetTarget(s.alimit)
+		e2:SetValue(s.alimit)
 		Duel.RegisterEffect(e2,tp)
 	end
 end

c76403456.lua

@@ -15,7 +15,7 @@ function c76403456.condition(e,tp,eg,ep,ev,re,r,rp)
 end
 function c76403456.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	local val=math.ceil(Duel.GetBattleDamage(tp)/500)
-	if chk==0 then return Duel.IsPlayerCanDiscardDeck(tp,val)
+	if chk==0 then return val>0 and Duel.IsPlayerCanDiscardDeck(tp,val)
 		and not Duel.IsPlayerAffectedByEffect(tp,EFFECT_AVOID_BATTLE_DAMAGE) end
 	Duel.SetOperationInfo(0,CATEGORY_DECKDES,nil,0,tp,0)
 end