Merge pull request #555 from sidschingis/patch-1

fix 

script/c75524092.lua

@@ -55,10 +55,9 @@ function c75524092.desreptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	return true
 end
 function c75524092.desrepop(e,tp,eg,ep,ev,re,r,rp)
+	local exc=e:GetHandler():GetEquipTarget():GetBattleTarget()
 	Duel.SendtoHand(e:GetHandler(),nil,REASON_EFFECT)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
-	local exc=Duel.GetAttacker()
-	if exc:IsControler(tp) then exc=Duel.GetAttackTarget() end
 	local g=Duel.SelectMatchingCard(tp,Card.IsDestructable,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,exc)
 	if Duel.Destroy(g,REASON_EFFECT)>0 and Duel.Damage(1-tp,600,REASON_EFFECT)~=0 then
 		if Duel.GetLocationCount(1-tp,LOCATION_MZONE,tp)>0

script/c84968490.lua

@@ -6,11 +6,11 @@ function c84968490.initial_effect(c)
 	e1:SetCategory(CATEGORY_DECKDES)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
-	e1:SetCost(c84968490.discost)
+	e1:SetTarget(c84968490.distarget)
 	e1:SetOperation(c84968490.disop)
 	c:RegisterEffect(e1)
 end
-function c84968490.discost(e,tp,eg,ep,ev,re,r,rp,chk)
+function c84968490.distarget(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsPlayerCanDiscardDeck(tp,5) end
 	Duel.SetTargetPlayer(tp)
 	Duel.SetTargetParam(5)

script/c9161357.lua

@@ -29,7 +29,7 @@ function c9161357.eqcon(e,tp,eg,ep,ev,re,r,rp)
 	return bit.band(e:GetHandler():GetSummonType(),SUMMON_TYPE_XYZ)==SUMMON_TYPE_XYZ
 end
 function c9161357.filter(c)
-	return c:IsSetCard(0x48)
+	return c:IsSetCard(0x48) and c:IsType(TYPE_MONSTER)
 end
 function c9161357.eqtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c9161357.filter(chkc) end