Commit fd258cd0 authored by Amiya's avatar Amiya

Merge branch 'master' of git.moenext.com:mycard/pre-release-database-cdb

parents 06f72af8 0fa86c77
No preview for this file type
No preview for this file type
......@@ -12,4 +12,5 @@
100256016
100256017
100256019
100256025
\ No newline at end of file
100256025
100201001
\ No newline at end of file
......@@ -4,4 +4,5 @@
100228003
100238401
100200283
100201001
\ No newline at end of file
100258001
100258002
\ No newline at end of file
......@@ -12,7 +12,7 @@
"js-yaml": "^4.1.1",
"sql.js": "^1.13.0",
"ygopro-jstest": "^1.0.10",
"ygopro-msg-encode": "^1.1.6"
"ygopro-msg-encode": "^1.1.7"
},
"devDependencies": {
"@types/jest": "^30.0.0",
......@@ -6399,9 +6399,9 @@
}
},
"node_modules/ygopro-msg-encode": {
"version": "1.1.6",
"resolved": "https://registry.npmjs.org/ygopro-msg-encode/-/ygopro-msg-encode-1.1.6.tgz",
"integrity": "sha512-ViNMcSM5o32zW0GhaPgXCQSz8hJJ/4Nd5HPQVRA6o9qqZ+2+0tjLZX8vviMA48iFmsA03ABTx6Y5iT8h1e11jQ==",
"version": "1.1.7",
"resolved": "https://registry.npmjs.org/ygopro-msg-encode/-/ygopro-msg-encode-1.1.7.tgz",
"integrity": "sha512-KQ5uirF+LfD1/IlTrIJh/f37IwXc5IMFs5qO8Uw+KZI7cW4UVQmH7CRygDS+lbJcnHDrd2qhD4l3YpsmYqqBkg==",
"license": "MIT",
"dependencies": {
"typed-reflector": "^1.0.14",
......
--憑依共鳴-ウィン
--憑依共鳴ウィン
local s,id,o=GetID()
function s.initial_effect(c)
--material
......@@ -79,9 +79,8 @@ function s.tdtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
Duel.SetOperationInfo(0,CATEGORY_TODECK,g1,2,0,0)
end
function s.tdop(e,tp,eg,ep,ev,re,r,rp)
local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS)
local tg=g:Filter(Card.IsRelateToChain,nil)
local tg=Duel.GetTargetsRelateToChain()
if tg:GetCount()>0 then
aux.PlaceCardsOnDeckBottom(tp,tg)
end
end
\ No newline at end of file
end
......@@ -10,7 +10,7 @@ function s.initial_effect(c)
e1:SetCode(EFFECT_SPSUMMON_CONDITION)
e1:SetValue(aux.AssaultModeLimit)
c:RegisterEffect(e1)
--draw
--atk to 0
local e2=Effect.CreateEffect(c)
e2:SetDescription(aux.Stringid(id,0))
e2:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_TODECK)
......@@ -68,9 +68,11 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp)
local g=Duel.SelectMatchingCard(tp,s.atkfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
local tc=g:GetFirst()
if tc then
Duel.HintSelection(g)
local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_SET_ATTACK_FINAL)
e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
e1:SetValue(0)
e1:SetReset(RESET_EVENT+RESETS_STANDARD)
tc:RegisterEffect(e1)
......@@ -102,4 +104,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
if g:GetCount()>0 then
Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
end
end
\ No newline at end of file
end
......@@ -97,6 +97,6 @@ function s.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
end
function s.desop(e,tp,eg,ep,ev,re,r,rp)
local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS)
local sg=g:Filter(Card.IsRelateToChain,nil)
local sg=g:Filter(Card.IsRelateToChain,nil):Filter(Card.IsOnField,nil)
Duel.Destroy(sg,REASON_EFFECT)
end
\ No newline at end of file
end
......@@ -15,13 +15,14 @@ export interface YrpInfo {
export const toYrpInfo = (test: YGOProTest): YrpInfo => {
const snapshot = test.querySnapshot();
const snapshotText = formatSnapshot(snapshot);
const stripMsgName = (msg: string) => msg.replace(/^YGOProMsg/, "");
return {
messages: test.allMessages.map((msg) => ({
identifier: msg.identifier,
msg: msg.constructor.name,
msg: stripMsgName(msg.constructor.name),
...msg,
})),
snapshot,
snapshotText,
};
}
};
messages:
- identifier: 33
msg: YGOProMsgShuffleHand
msg: ShuffleHand
player: 0
count: 2
cards:
- 28985331
- 10000000
- identifier: 41
msg: YGOProMsgNewPhase
msg: NewPhase
phase: 1
- identifier: 41
msg: YGOProMsgNewPhase
msg: NewPhase
phase: 2
- identifier: 41
msg: YGOProMsgNewPhase
msg: NewPhase
phase: 4
- identifier: 11
msg: YGOProMsgSelectIdleCmd
msg: SelectIdleCmd
player: 0
summonableCount: 1
summonableCards:
......
This diff is collapsed.
......@@ -54,7 +54,9 @@ describe("YRP", () => {
);
const sortMesssages = (messages: MsgSnapshot[]) =>
messages
.filter((m) => !m.msg.includes("Hint"))
.filter(
(m) => !m.msg.includes("Hint") && m.msg !== "ConfirmCards",
)
.map((m) => {
// go through all properties and prune every desc
const pruneDesc = <T>(obj: T, visited = new Set<any>()): T => {
......
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