Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro-2pick
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
ygopro-2pick
Commits
379eb15f
Commit
379eb15f
authored
Feb 25, 2012
by
argon.sun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
1c94ecfb
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
29 additions
and
31 deletions
+29
-31
gframe/drawing.cpp
gframe/drawing.cpp
+1
-2
gframe/game.cpp
gframe/game.cpp
+4
-1
script/c21598948.lua
script/c21598948.lua
+15
-3
script/c40640057.lua
script/c40640057.lua
+3
-11
script/c50091196.lua
script/c50091196.lua
+1
-1
script/c55375684.lua
script/c55375684.lua
+1
-1
script/c60953118.lua
script/c60953118.lua
+1
-9
script/c98558751.lua
script/c98558751.lua
+1
-1
system.conf
system.conf
+2
-2
No files found.
gframe/drawing.cpp
View file @
379eb15f
...
...
@@ -147,8 +147,7 @@ void Game::DrawCards() {
for
(
int
i
=
0
;
i
<
dField
.
extra
[
p
].
size
();
++
i
)
DrawCard
(
dField
.
extra
[
p
][
i
]);
}
std
::
set
<
ClientCard
*>::
iterator
cit
;
for
(
cit
=
dField
.
overlay_cards
.
begin
();
cit
!=
dField
.
overlay_cards
.
end
();
++
cit
)
for
(
auto
cit
=
dField
.
overlay_cards
.
begin
();
cit
!=
dField
.
overlay_cards
.
end
();
++
cit
)
DrawCard
(
*
cit
);
}
void
Game
::
DrawCard
(
ClientCard
*
pcard
)
{
...
...
gframe/game.cpp
View file @
379eb15f
...
...
@@ -750,6 +750,9 @@ void Game::ClearTextures() {
imageManager
.
ClearTexture
();
}
void
Game
::
CloseDuelWindow
()
{
for
(
auto
wit
=
fadingList
.
begin
();
wit
!=
fadingList
.
end
();
++
wit
)
wit
->
guiFading
->
setRelativePosition
(
wit
->
fadingSize
);
fadingList
.
clear
();
wACMessage
->
setVisible
(
false
);
wANAttribute
->
setVisible
(
false
);
wANCard
->
setVisible
(
false
);
...
...
@@ -766,7 +769,7 @@ void Game::CloseDuelWindow() {
wPhase
->
setVisible
(
false
);
wPosSelect
->
setVisible
(
false
);
wQuery
->
setVisible
(
false
);
wReplay
Control
->
setVisible
(
false
);
wReplay
->
setVisible
(
false
);
stHintMsg
->
setVisible
(
false
);
btnSideOK
->
setVisible
(
false
);
btnLeaveGame
->
setVisible
(
false
);
...
...
script/c21598948.lua
View file @
379eb15f
...
...
@@ -5,6 +5,8 @@ function c21598948.initial_effect(c)
e1
:
SetType
(
EFFECT_TYPE_ACTIVATE
)
e1
:
SetCode
(
EVENT_FREE_CHAIN
)
e1
:
SetHintTiming
(
0
,
TIMING_MAIN_END
)
e1
:
SetTarget
(
c21598948
.
atktg1
)
e1
:
SetOperation
(
c21598948
.
atkop
)
c
:
RegisterEffect
(
e1
)
--atk change
local
e2
=
Effect
.
CreateEffect
(
c
)
...
...
@@ -14,7 +16,7 @@ function c21598948.initial_effect(c)
e2
:
SetCode
(
EVENT_ATTACK_ANNOUNCE
)
e2
:
SetRange
(
LOCATION_SZONE
)
e2
:
SetCondition
(
c21598948
.
atkcon
)
e2
:
SetTarget
(
c21598948
.
atktg
)
e2
:
SetTarget
(
c21598948
.
atktg
2
)
e2
:
SetOperation
(
c21598948
.
atkop
)
c
:
RegisterEffect
(
e2
)
--maintain
...
...
@@ -30,13 +32,23 @@ end
function
c21598948
.
atkcon
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
return
tp
~=
Duel
.
GetTurnPlayer
()
end
function
c21598948
.
atktg
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
)
function
c21598948
.
atktg
1
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
)
if
chk
==
0
then
return
true
end
e
:
SetLabel
(
0
)
if
Duel
.
CheckEvent
(
EVENT_ATTACK_ANNOUNCE
)
and
tp
~=
Duel
.
GetTurnPlayer
()
then
e
:
SetLabel
(
1
)
Duel
.
SetTargetCard
(
Duel
.
GetAttacker
())
Duel
.
SetOperationInfo
(
0
,
CATEGORY_COIN
,
nil
,
0
,
tp
,
1
)
end
end
function
c21598948
.
atktg2
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
)
if
chk
==
0
then
return
true
end
e
:
SetLabel
(
1
)
Duel
.
SetTargetCard
(
Duel
.
GetAttacker
())
Duel
.
SetOperationInfo
(
0
,
CATEGORY_COIN
,
nil
,
0
,
tp
,
1
)
end
function
c21598948
.
atkop
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
if
not
e
:
GetHandler
():
IsRelateToEffect
(
e
)
then
return
end
if
e
:
GetLabel
()
==
0
or
not
e
:
GetHandler
():
IsRelateToEffect
(
e
)
then
return
end
local
a
=
Duel
.
GetAttacker
()
if
not
a
:
IsRelateToEffect
(
e
)
then
return
end
Duel
.
Hint
(
HINT_SELECTMSG
,
tp
,
aux
.
Stringid
(
21598948
,
4
))
...
...
script/c40640057.lua
View file @
379eb15f
...
...
@@ -5,27 +5,19 @@ function c40640057.initial_effect(c)
e1
:
SetDescription
(
aux
.
Stringid
(
40640057
,
0
))
e1
:
SetType
(
EFFECT_TYPE_QUICK_O
+
EFFECT_TYPE_FIELD
)
e1
:
SetRange
(
LOCATION_HAND
)
e1
:
SetCode
(
EVENT_PRE_
DAMAGE_CALCULAT
E
)
e1
:
SetCode
(
EVENT_PRE_
BATTLE_DAMAG
E
)
e1
:
SetCondition
(
c40640057
.
con
)
e1
:
SetCost
(
c40640057
.
cost
)
e1
:
SetOperation
(
c40640057
.
op
)
c
:
RegisterEffect
(
e1
)
end
function
c40640057
.
con
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
return
Duel
.
GetTurnPlayer
()
~=
tp
and
Duel
.
GetAttacker
():
GetAttack
()
>
0
return
Duel
.
GetTurnPlayer
()
~=
tp
and
ep
==
tp
end
function
c40640057
.
cost
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
)
if
chk
==
0
then
return
e
:
GetHandler
():
IsAbleToGraveAsCost
()
end
Duel
.
SendtoGrave
(
e
:
GetHandler
(),
REASON_COST
)
end
function
c40640057
.
op
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
local
c
=
e
:
GetHandler
()
local
e1
=
Effect
.
CreateEffect
(
c
)
e1
:
SetType
(
EFFECT_TYPE_FIELD
)
e1
:
SetCode
(
EFFECT_AVOID_BATTLE_DAMAGE
)
e1
:
SetProperty
(
EFFECT_FLAG_PLAYER_TARGET
)
e1
:
SetTargetRange
(
1
,
0
)
e1
:
SetReset
(
RESET_PHASE
+
RESET_DAMAGE_CAL
)
e1
:
SetValue
(
1
)
Duel
.
RegisterEffect
(
e1
,
tp
)
Duel
.
ChangeBattleDamage
(
ep
,
0
)
end
script/c50091196.lua
View file @
379eb15f
...
...
@@ -20,7 +20,7 @@ function c50091196.initial_effect(c)
e2
:
SetCategory
(
CATEGORY_SPECIAL_SUMMON
)
e2
:
SetType
(
EFFECT_TYPE_QUICK_O
)
e2
:
SetCode
(
EVENT_FREE_CHAIN
)
e2
:
SetHintTiming
(
0
,
TIMING_MAIN_END
)
e2
:
SetHintTiming
(
0
,
0x1c0
+
TIMING_MAIN_END
)
e2
:
SetRange
(
LOCATION_MZONE
)
e2
:
SetCondition
(
c50091196
.
sccon
)
e2
:
SetTarget
(
c50091196
.
sctarg
)
...
...
script/c55375684.lua
View file @
379eb15f
...
...
@@ -21,7 +21,7 @@ function c55375684.condition(e,tp,eg,ep,ev,re,r,rp)
return
Duel
.
GetFieldGroupCount
(
tp
,
LOCATION_MZONE
,
0
)
==
0
end
function
c55375684
.
filter
(
c
,
e
,
tp
)
return
c
:
IsSetCard
(
0x18
)
and
c
:
IsCanBeSpecialSummoned
(
e
,
0
,
tp
,
false
,
false
)
return
c
:
Is
LevelBelow
(
4
)
and
c
:
Is
SetCard
(
0x18
)
and
c
:
IsCanBeSpecialSummoned
(
e
,
0
,
tp
,
false
,
false
)
and
not
c
:
IsHasEffect
(
EFFECT_NECRO_VALLEY
)
end
function
c55375684
.
target
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
)
...
...
script/c60953118.lua
View file @
379eb15f
...
...
@@ -34,15 +34,7 @@ function c60953118.damcost(e,tp,eg,ep,ev,re,r,rp,chk)
Duel
.
SendtoGrave
(
e
:
GetHandler
(),
REASON_COST
)
end
function
c60953118
.
damop
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
local
c
=
e
:
GetHandler
()
local
e1
=
Effect
.
CreateEffect
(
c
)
e1
:
SetType
(
EFFECT_TYPE_FIELD
)
e1
:
SetCode
(
EFFECT_AVOID_BATTLE_DAMAGE
)
e1
:
SetProperty
(
EFFECT_FLAG_PLAYER_TARGET
)
e1
:
SetTargetRange
(
1
,
0
)
e1
:
SetReset
(
RESET_PHASE
+
RESET_DAMAGE_CAL
)
e1
:
SetValue
(
1
)
Duel
.
RegisterEffect
(
e1
,
tp
)
Duel
.
ChangeBattleDamage
(
ep
,
0
)
end
function
c60953118
.
cointg
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
,
chk
)
if
chk
==
0
then
return
true
end
...
...
script/c98558751.lua
View file @
379eb15f
...
...
@@ -31,7 +31,7 @@ function c98558751.initial_effect(c)
e3
:
SetCategory
(
CATEGORY_SPECIAL_SUMMON
)
e3
:
SetType
(
EFFECT_TYPE_QUICK_O
)
e3
:
SetCode
(
EVENT_FREE_CHAIN
)
e3
:
SetHintTiming
(
0
,
TIMING_MAIN_END
)
e3
:
SetHintTiming
(
0
,
0x1c0
+
TIMING_MAIN_END
)
e3
:
SetRange
(
LOCATION_MZONE
)
e3
:
SetCondition
(
c98558751
.
sccon
)
e3
:
SetTarget
(
c98558751
.
sctg
)
...
...
system.conf
View file @
379eb15f
...
...
@@ -3,9 +3,9 @@
antialias
=
2
nickname
=
Player
gamename
=
Game
lastdeck
=
chaosls
lastdeck
=
test
textfont
=
c
:/
windows
/
fonts
/
simsun
.
ttc
14
numfont
=
c
:/
windows
/
fonts
/
arialbd
.
ttf
serverport
=
7911
lastip
=
192
.
168
.
3
.
235
lastip
=
192
.
168
.
2
.
100
lastport
=
7911
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment