Skip to content

Y
ygopro-scripts-888
Commit 2cc279b2 authored by Chrono-Genex's avatar Chrono-Genex Committed by GitHub
Browse files
Options

fix take damage trigger effect in damage calculation (#1899)

parent a3bd3094
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 20 deletions
c10194329.lua
View file @ 2cc279b2
...@@ -5,7 +5,7 @@ function c10194329.initial_effect(c) ...@@ -5,7 +5,7 @@ function c10194329.initial_effect(c)
e1:SetCategory(CATEGORY_SPECIAL_SUMMON) e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e1:SetCode(EVENT_DAMAGE) e1:SetCode(EVENT_DAMAGE)
e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY) e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL+EFFECT_FLAG_DELAY)
e1:SetRange(LOCATION_HAND) e1:SetRange(LOCATION_HAND)
e1:SetCondition(c10194329.condition) e1:SetCondition(c10194329.condition)
e1:SetTarget(c10194329.target) e1:SetTarget(c10194329.target)
......
c15771991.lua
View file @ 2cc279b2
...@@ -7,7 +7,7 @@ function c15771991.initial_effect(c) ...@@ -7,7 +7,7 @@ function c15771991.initial_effect(c)
e1:SetCategory(CATEGORY_SPECIAL_SUMMON) e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e1:SetCode(EVENT_DAMAGE) e1:SetCode(EVENT_DAMAGE)
e1:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP) e1:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
e1:SetRange(LOCATION_HAND) e1:SetRange(LOCATION_HAND)
e1:SetCountLimit(1,15771991) e1:SetCountLimit(1,15771991)
e1:SetCondition(c15771991.spcon) e1:SetCondition(c15771991.spcon)
......
c16964437.lua
View file @ 2cc279b2
...@@ -4,7 +4,7 @@ function c16964437.initial_effect(c) ...@@ -4,7 +4,7 @@ function c16964437.initial_effect(c)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetCategory(CATEGORY_SPECIAL_SUMMON) e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP) e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
e1:SetCode(EVENT_DAMAGE) e1:SetCode(EVENT_DAMAGE)
e1:SetCondition(c16964437.condition) e1:SetCondition(c16964437.condition)
e1:SetTarget(c16964437.target) e1:SetTarget(c16964437.target)
......
c2130625.lua
View file @ 2cc279b2
...@@ -4,7 +4,7 @@ function c2130625.initial_effect(c) ...@@ -4,7 +4,7 @@ function c2130625.initial_effect(c)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetCategory(CATEGORY_RECOVER) e1:SetCategory(CATEGORY_RECOVER)
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_DAMAGE_STEP) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
e1:SetCode(EVENT_DAMAGE) e1:SetCode(EVENT_DAMAGE)
e1:SetCondition(c2130625.reccon) e1:SetCondition(c2130625.reccon)
e1:SetTarget(c2130625.rectg) e1:SetTarget(c2130625.rectg)
......
c27565379.lua
View file @ 2cc279b2
...@@ -8,7 +8,7 @@ function c27565379.initial_effect(c) ...@@ -8,7 +8,7 @@ function c27565379.initial_effect(c)
e1:SetDescription(aux.Stringid(27565379,0)) e1:SetDescription(aux.Stringid(27565379,0))
e1:SetCategory(CATEGORY_DAMAGE) e1:SetCategory(CATEGORY_DAMAGE)
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_DAMAGE_STEP) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
e1:SetCode(EVENT_DAMAGE) e1:SetCode(EVENT_DAMAGE)
e1:SetRange(LOCATION_MZONE) e1:SetRange(LOCATION_MZONE)
e1:SetCountLimit(1,27565379) e1:SetCountLimit(1,27565379)
......
c35037880.lua
View file @ 2cc279b2
...@@ -5,7 +5,7 @@ function c35037880.initial_effect(c) ...@@ -5,7 +5,7 @@ function c35037880.initial_effect(c)
e1:SetCategory(CATEGORY_DAMAGE+CATEGORY_RECOVER+CATEGORY_SEARCH) e1:SetCategory(CATEGORY_DAMAGE+CATEGORY_RECOVER+CATEGORY_SEARCH)
e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetCode(EVENT_DAMAGE) e1:SetCode(EVENT_DAMAGE)
e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP) e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
e1:SetCountLimit(1,35037880+EFFECT_COUNT_CODE_OATH) e1:SetCountLimit(1,35037880+EFFECT_COUNT_CODE_OATH)
e1:SetCondition(c35037880.condition) e1:SetCondition(c35037880.condition)
e1:SetTarget(c35037880.target) e1:SetTarget(c35037880.target)
......
c39880350.lua
View file @ 2cc279b2
...@@ -17,7 +17,7 @@ function c39880350.initial_effect(c) ...@@ -17,7 +17,7 @@ function c39880350.initial_effect(c)
e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_RECOVER) e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_RECOVER)
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e2:SetCode(EVENT_DAMAGE) e2:SetCode(EVENT_DAMAGE)
e2:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP) e2:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
e2:SetRange(LOCATION_MZONE) e2:SetRange(LOCATION_MZONE)
e2:SetCountLimit(2) e2:SetCountLimit(2)
e2:SetCondition(c39880350.spcon) e2:SetCondition(c39880350.spcon)
......
c42461852.lua
View file @ 2cc279b2
...@@ -31,7 +31,7 @@ function c42461852.initial_effect(c) ...@@ -31,7 +31,7 @@ function c42461852.initial_effect(c)
e5:SetCategory(CATEGORY_SPECIAL_SUMMON) e5:SetCategory(CATEGORY_SPECIAL_SUMMON)
e5:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e5:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e5:SetCode(EVENT_DAMAGE) e5:SetCode(EVENT_DAMAGE)
e5:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY) e5:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_CAL)
e5:SetRange(LOCATION_FZONE) e5:SetRange(LOCATION_FZONE)
e5:SetCondition(c42461852.spcon) e5:SetCondition(c42461852.spcon)
e5:SetTarget(c42461852.sptg) e5:SetTarget(c42461852.sptg)
......
c44330098.lua
View file @ 2cc279b2
...@@ -5,7 +5,7 @@ function c44330098.initial_effect(c) ...@@ -5,7 +5,7 @@ function c44330098.initial_effect(c)
e1:SetDescription(aux.Stringid(44330098,0)) e1:SetDescription(aux.Stringid(44330098,0))
e1:SetCategory(CATEGORY_SPECIAL_SUMMON) e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP) e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
e1:SetRange(LOCATION_HAND) e1:SetRange(LOCATION_HAND)
e1:SetCode(EVENT_DAMAGE) e1:SetCode(EVENT_DAMAGE)
e1:SetCondition(c44330098.sumcon) e1:SetCondition(c44330098.sumcon)
......
c5130393.lua
View file @ 2cc279b2
...@@ -8,7 +8,7 @@ function c5130393.initial_effect(c) ...@@ -8,7 +8,7 @@ function c5130393.initial_effect(c)
e1:SetRange(LOCATION_HAND) e1:SetRange(LOCATION_HAND)
e1:SetCode(EVENT_DAMAGE) e1:SetCode(EVENT_DAMAGE)
e1:SetCountLimit(1,5130393) e1:SetCountLimit(1,5130393)
e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP) e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
e1:SetCondition(c5130393.spcon) e1:SetCondition(c5130393.spcon)
e1:SetTarget(c5130393.sptg) e1:SetTarget(c5130393.sptg)
e1:SetOperation(c5130393.spop) e1:SetOperation(c5130393.spop)
......
c60992105.lua
View file @ 2cc279b2
...@@ -9,7 +9,7 @@ function c60992105.initial_effect(c) ...@@ -9,7 +9,7 @@ function c60992105.initial_effect(c)
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e1:SetRange(LOCATION_MZONE) e1:SetRange(LOCATION_MZONE)
e1:SetCode(EVENT_DAMAGE) e1:SetCode(EVENT_DAMAGE)
e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP) e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
e1:SetCountLimit(1) e1:SetCountLimit(1)
e1:SetCondition(c60992105.condition) e1:SetCondition(c60992105.condition)
e1:SetTarget(c60992105.target) e1:SetTarget(c60992105.target)
......
c63689843.lua
View file @ 2cc279b2
...@@ -4,7 +4,7 @@ function c63689843.initial_effect(c) ...@@ -4,7 +4,7 @@ function c63689843.initial_effect(c)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetCategory(CATEGORY_DAMAGE) e1:SetCategory(CATEGORY_DAMAGE)
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_DAMAGE_STEP) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
e1:SetCode(EVENT_DAMAGE) e1:SetCode(EVENT_DAMAGE)
e1:SetTarget(c63689843.rectg) e1:SetTarget(c63689843.rectg)
e1:SetOperation(c63689843.recop) e1:SetOperation(c63689843.recop)
......
c65285459.lua
View file @ 2cc279b2
...@@ -17,7 +17,7 @@ function c65285459.initial_effect(c) ...@@ -17,7 +17,7 @@ function c65285459.initial_effect(c)
e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_RECOVER) e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_RECOVER)
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e2:SetCode(EVENT_DAMAGE) e2:SetCode(EVENT_DAMAGE)
e2:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP) e2:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
e2:SetRange(LOCATION_MZONE) e2:SetRange(LOCATION_MZONE)
e2:SetCountLimit(3) e2:SetCountLimit(3)
e2:SetCondition(c65285459.spcon) e2:SetCondition(c65285459.spcon)
......
c69764158.lua
View file @ 2cc279b2
...@@ -6,7 +6,7 @@ function c69764158.initial_effect(c) ...@@ -6,7 +6,7 @@ function c69764158.initial_effect(c)
e1:SetCategory(CATEGORY_DESTROY) e1:SetCategory(CATEGORY_DESTROY)
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e1:SetCode(EVENT_DAMAGE) e1:SetCode(EVENT_DAMAGE)
e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY) e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_CAL+EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
e1:SetRange(LOCATION_GRAVE) e1:SetRange(LOCATION_GRAVE)
e1:SetCountLimit(1) e1:SetCountLimit(1)
e1:SetCondition(c69764158.descon) e1:SetCondition(c69764158.descon)
......
c70939418.lua
View file @ 2cc279b2
...@@ -5,7 +5,7 @@ function c70939418.initial_effect(c) ...@@ -5,7 +5,7 @@ function c70939418.initial_effect(c)
e1:SetDescription(aux.Stringid(70939418,0)) e1:SetDescription(aux.Stringid(70939418,0))
e1:SetCategory(CATEGORY_SPECIAL_SUMMON) e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY) e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL+EFFECT_FLAG_DELAY)
e1:SetCode(EVENT_DAMAGE) e1:SetCode(EVENT_DAMAGE)
e1:SetRange(LOCATION_HAND) e1:SetRange(LOCATION_HAND)
e1:SetCondition(c70939418.spcon) e1:SetCondition(c70939418.spcon)
......
c73667937.lua
View file @ 2cc279b2
...@@ -20,7 +20,7 @@ function c73667937.initial_effect(c) ...@@ -20,7 +20,7 @@ function c73667937.initial_effect(c)
e2:SetCategory(CATEGORY_DESTROY) e2:SetCategory(CATEGORY_DESTROY)
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e2:SetCode(EVENT_DAMAGE) e2:SetCode(EVENT_DAMAGE)
e2:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP) e2:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
e2:SetRange(LOCATION_MZONE) e2:SetRange(LOCATION_MZONE)
e2:SetCondition(c73667937.descon) e2:SetCondition(c73667937.descon)
e2:SetTarget(c73667937.destg) e2:SetTarget(c73667937.destg)
......
c91946859.lua
View file @ 2cc279b2
...@@ -19,7 +19,7 @@ function c91946859.initial_effect(c) ...@@ -19,7 +19,7 @@ function c91946859.initial_effect(c)
e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e3:SetRange(LOCATION_SZONE) e3:SetRange(LOCATION_SZONE)
e3:SetCategory(CATEGORY_SPECIAL_SUMMON) e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP) e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
e3:SetCode(EVENT_DAMAGE) e3:SetCode(EVENT_DAMAGE)
e3:SetCountLimit(1,91946859) e3:SetCountLimit(1,91946859)
e3:SetCondition(c91946859.spcondition) e3:SetCondition(c91946859.spcondition)
......
c93896655.lua
View file @ 2cc279b2
...@@ -34,7 +34,7 @@ function c93896655.initial_effect(c) ...@@ -34,7 +34,7 @@ function c93896655.initial_effect(c)
e4:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_RECOVER) e4:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_RECOVER)
e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e4:SetCode(EVENT_DAMAGE) e4:SetCode(EVENT_DAMAGE)
e4:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP) e4:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
e4:SetRange(LOCATION_MZONE) e4:SetRange(LOCATION_MZONE)
e4:SetCountLimit(1) e4:SetCountLimit(1)
e4:SetCondition(c93896655.spcon) e4:SetCondition(c93896655.spcon)
......
c98535702.lua
View file @ 2cc279b2
...@@ -4,7 +4,7 @@ function c98535702.initial_effect(c) ...@@ -4,7 +4,7 @@ function c98535702.initial_effect(c)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetCategory(CATEGORY_RECOVER) e1:SetCategory(CATEGORY_RECOVER)
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_DAMAGE_STEP) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
e1:SetCode(EVENT_DAMAGE) e1:SetCode(EVENT_DAMAGE)
e1:SetTarget(c98535702.rectg) e1:SetTarget(c98535702.rectg)
e1:SetOperation(c98535702.recop) e1:SetOperation(c98535702.recop)
......
c98707192.lua
View file @ 2cc279b2
...@@ -20,7 +20,7 @@ function c98707192.initial_effect(c) ...@@ -20,7 +20,7 @@ function c98707192.initial_effect(c)
e3:SetDescription(aux.Stringid(98707192,1)) e3:SetDescription(aux.Stringid(98707192,1))
e3:SetCategory(CATEGORY_SPECIAL_SUMMON) e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP) e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
e3:SetRange(LOCATION_HAND) e3:SetRange(LOCATION_HAND)
e3:SetCode(EVENT_DAMAGE) e3:SetCode(EVENT_DAMAGE)
e3:SetCountLimit(1,98707192) e3:SetCountLimit(1,98707192)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment