Merge pull request #123 from destdev/patch-1

fix Kozmo Lightsword

c82270047.lua

@@ -24,31 +24,36 @@ function c82270047.initial_effect(c)
 	e4:SetCode(EFFECT_EXTRA_ATTACK)
 	e4:SetValue(1)
 	c:RegisterEffect(e4)
-	--pierce
 	local e5=Effect.CreateEffect(c)
 	e5:SetType(EFFECT_TYPE_EQUIP)
-	e5:SetCode(EFFECT_PIERCE)
+	e5:SetCode(EFFECT_CANNOT_DIRECT_ATTACK)
+	e5:SetCondition(c82270047.dircon)
 	c:RegisterEffect(e5)
-	--equip limit
+	--pierce
 	local e6=Effect.CreateEffect(c)
-	e6:SetType(EFFECT_TYPE_SINGLE)
-	e6:SetCode(EFFECT_EQUIP_LIMIT)
-	e6:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e6:SetValue(c82270047.eqlimit)
+	e6:SetType(EFFECT_TYPE_EQUIP)
+	e6:SetCode(EFFECT_PIERCE)
 	c:RegisterEffect(e6)
-	--tohand
+	--equip limit
 	local e7=Effect.CreateEffect(c)
-	e7:SetDescription(aux.Stringid(82270047,0))
-	e7:SetCategory(CATEGORY_TOHAND)
-	e7:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e7:SetCode(EVENT_TO_GRAVE)
-	e7:SetProperty(EFFECT_FLAG_DELAY)
-	e7:SetCountLimit(1,82270047)
-	e7:SetCondition(c82270047.thcon)
-	e7:SetCost(c82270047.thcost)
-	e7:SetTarget(c82270047.thtg)
-	e7:SetOperation(c82270047.thop)
+	e7:SetType(EFFECT_TYPE_SINGLE)
+	e7:SetCode(EFFECT_EQUIP_LIMIT)
+	e7:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+	e7:SetValue(c82270047.eqlimit)
 	c:RegisterEffect(e7)
+	--tohand
+	local e8=Effect.CreateEffect(c)
+	e8:SetDescription(aux.Stringid(82270047,0))
+	e8:SetCategory(CATEGORY_TOHAND)
+	e8:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
+	e8:SetCode(EVENT_TO_GRAVE)
+	e8:SetProperty(EFFECT_FLAG_DELAY)
+	e8:SetCountLimit(1,82270047)
+	e8:SetCondition(c82270047.thcon)
+	e8:SetCost(c82270047.thcost)
+	e8:SetTarget(c82270047.thtg)
+	e8:SetOperation(c82270047.thop)
+	c:RegisterEffect(e8)
 end
 function c82270047.eqlimit(e,c)
 	return c:IsSetCard(0xd2) and c:IsRace(RACE_PSYCHO)
@@ -69,6 +74,9 @@ function c82270047.operation(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Equip(tp,e:GetHandler(),tc)
 	end
 end
+function c82270047.dircon(e)
+	return e:GetHandler():GetEquipTarget():GetAttackAnnouncedCount()>0
+end
 function c82270047.thcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsPreviousLocation(LOCATION_ONFIELD)
 end