ybb

expansions/script/c13001027.lua

@@ -76,37 +76,33 @@ function cm.destg(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SelectTarget(tp,cm.filter,tp,LOCATION_MZONE,0,1,1,nil)
 	Duel.SetOperationInfo(0,CATEGORY_EQUIP,e:GetHandler(),1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_NEGATE,eg,1,0,0)
-	if re:GetHandler():IsDestructable() and re:GetHandler():IsRelateToEffect(re) then
-		Duel.SetOperationInfo(0,CATEGORY_DESTROY,eg,1,0,0)
-	end
 end
 function cm.desop(e,tp,eg,ep,ev,re,r,rp)
-	if Duel.NegateActivation(ev) and re:GetHandler():IsRelateToEffect(re) then
-		Duel.Destroy(eg,REASON_EFFECT)
-	end
-	local c=e:GetHandler()
-	if not c:IsLocation(LOCATION_SZONE) then return end
-	if not c:IsRelateToEffect(e) or c:IsStatus(STATUS_LEAVE_CONFIRMED) then return end
-	local tc=Duel.GetFirstTarget()
-	if tc:IsRelateToEffect(e) and tc:IsFaceup() then
-		Duel.Equip(tp,c,tc)
-		--Atkup
-		local e2=Effect.CreateEffect(c)
-		e2:SetType(EFFECT_TYPE_EQUIP)
-		e2:SetCode(EFFECT_UPDATE_ATTACK)
-		e2:SetValue(500)
-		e2:SetReset(RESET_EVENT+RESETS_STANDARD)
-		c:RegisterEffect(e2)
-		--Equip limit
-		local e3=Effect.CreateEffect(c)
-		e3:SetType(EFFECT_TYPE_SINGLE)
-		e3:SetCode(EFFECT_EQUIP_LIMIT)
-		e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-		e3:SetValue(cm.eqlimit)
-		e3:SetReset(RESET_EVENT+RESETS_STANDARD)
-		c:RegisterEffect(e3)
-	else
-		c:CancelToGrave(false)
+	if Duel.NegateActivation(ev) then
+		local c=e:GetHandler()
+		if not c:IsLocation(LOCATION_SZONE) then return end
+		if not c:IsRelateToEffect(e) or c:IsStatus(STATUS_LEAVE_CONFIRMED) then return end
+		local tc=Duel.GetFirstTarget()
+		if tc:IsRelateToEffect(e) and tc:IsFaceup() then
+			Duel.Equip(tp,c,tc)
+			--Atkup
+			local e2=Effect.CreateEffect(c)
+			e2:SetType(EFFECT_TYPE_EQUIP)
+			e2:SetCode(EFFECT_UPDATE_ATTACK)
+			e2:SetValue(500)
+			e2:SetReset(RESET_EVENT+RESETS_STANDARD)
+			c:RegisterEffect(e2)
+			--Equip limit
+			local e3=Effect.CreateEffect(c)
+			e3:SetType(EFFECT_TYPE_SINGLE)
+			e3:SetCode(EFFECT_EQUIP_LIMIT)
+			e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+			e3:SetValue(cm.eqlimit)
+			e3:SetReset(RESET_EVENT+RESETS_STANDARD)
+			c:RegisterEffect(e3)
+		else
+			c:CancelToGrave(false)
+		end
 	end
 end
 function cm.eqlimit(e,c)

expansions/script/c81901024.lua

@@ -17,7 +17,7 @@ function cm.initial_effect(c)
 	--desory
 	local e2=Effect.CreateEffect(c)
 	e2:SetCategory(CATEGORY_DESTROY)
-	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
+	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e2:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e2:SetOperation(cm.desop)
 	c:RegisterEffect(e2)

expansions/strings.conf

@@ -726,7 +726,7 @@
 !setname 0x9344 白之女王
 !counter 0x34f 时间指示物
 
-#珈百璃 1248959763 335 0xa80-0xa8f
+#珈艾露 1248959763 335 0xa80-0xa8f
 !setname 0x3a80 灵气复苏
 !setname 0x3a81 金色暗影
 !setname 0x5a81 银光之穹