Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro
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
List
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
REIKAI
ygopro
Commits
74cbf991
Commit
74cbf991
authored
Mar 13, 2012
by
argon.sun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
973e13c2
Changes
13
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
185 additions
and
154 deletions
+185
-154
ocgcore/card.cpp
ocgcore/card.cpp
+1
-1
ocgcore/effect.h
ocgcore/effect.h
+1
-0
ocgcore/field.h
ocgcore/field.h
+1
-1
ocgcore/operations.cpp
ocgcore/operations.cpp
+24
-11
ocgcore/processor.cpp
ocgcore/processor.cpp
+141
-119
script/c11021521.lua
script/c11021521.lua
+1
-0
script/c14087893.lua
script/c14087893.lua
+1
-1
script/c48206762.lua
script/c48206762.lua
+1
-1
script/c58996430.lua
script/c58996430.lua
+9
-18
script/c74694807.lua
script/c74694807.lua
+1
-1
script/c98045062.lua
script/c98045062.lua
+1
-0
script/constant.lua
script/constant.lua
+2
-0
system.conf
system.conf
+1
-1
No files found.
ocgcore/card.cpp
View file @
74cbf991
...
...
@@ -1607,7 +1607,7 @@ int32 card::is_can_be_special_summoned(effect * reason_effect, uint32 sumtype, u
int32
card
::
is_setable_mzone
(
uint8
playerid
,
uint8
ignore_count
,
effect
*
peffect
)
{
if
(
!
(
data
.
type
&
TYPE_MONSTER
))
return
FALSE
;
if
(
is_status
(
STATUS_REVIVE_LIMIT
))
if
(
status
&
(
STATUS_REVIVE_LIMIT
|
STATUS_UNSUMMONABLE_CARD
))
return
FALSE
;
if
(
current
.
location
!=
LOCATION_HAND
)
return
FALSE
;
...
...
ocgcore/effect.h
View file @
74cbf991
...
...
@@ -153,6 +153,7 @@ public:
#define EFFECT_FLAG_OWNER_RELATE 0x1000000 //
#define EFFECT_FLAG_AVAILABLE_BD 0x2000000 //
#define EFFECT_FLAG_CLIENT_HINT 0x4000000 //
#define EFFECT_FLAG_CHAIN_UNIQUE 0x8000000 //
//========== Codes ==========
#define EFFECT_IMMUNE_EFFECT 1 //
#define EFFECT_DISABLE 2 //
...
...
ocgcore/field.h
View file @
74cbf991
...
...
@@ -507,7 +507,7 @@ public:
#define TIMING_TOHAND 0x200000
#define TIMING_TODECK 0x400000
#define TIMING_TOGRAVE 0x800000
#define TIMING_BATTLE_PHASE 0x1000000
//
#define PROCESSOR_NONE 0
#define PROCESSOR_WAITING 0x10000
...
...
ocgcore/operations.cpp
View file @
74cbf991
...
...
@@ -1136,14 +1136,21 @@ int32 field::summon(uint16 step, uint8 sumplayer, card* target, effect* proc, ui
core
.
phase_action
=
TRUE
;
target
->
current
.
reason
=
REASON_SUMMON
;
target
->
summon_player
=
sumplayer
;
if
(
core
.
current_chain
.
size
()
>
1
||
target
->
is_affected_by_effect
(
EFFECT_CANNOT_DISABLE_SUMMON
))
{
core
.
units
.
begin
()
->
step
=
14
;
if
(
core
.
current_chain
.
size
()
==
0
)
{
if
(
target
->
is_affected_by_effect
(
EFFECT_CANNOT_DISABLE_SUMMON
))
core
.
units
.
begin
()
->
step
=
14
;
return
FALSE
;
}
else
if
(
core
.
current_chain
.
size
()
==
0
)
{
core
.
units
.
begin
()
->
step
=
9
;
}
else
if
(
core
.
current_chain
.
size
()
>
1
)
{
core
.
units
.
begin
()
->
step
=
14
;
return
FALSE
;
}
else
{
if
(
target
->
is_affected_by_effect
(
EFFECT_CANNOT_DISABLE_SUMMON
))
core
.
units
.
begin
()
->
step
=
15
;
else
core
.
units
.
begin
()
->
step
=
10
;
core
.
reserved
=
core
.
units
.
front
();
return
TRUE
;
}
core
.
reserved
=
core
.
units
.
front
();
return
TRUE
;
}
case
10
:
{
...
...
@@ -1628,15 +1635,21 @@ int32 field::special_summon_rule(uint16 step, uint8 sumplayer, card * target) {
target
->
set_status
(
STATUS_SUMMONING
,
TRUE
);
target
->
set_status
(
STATUS_SUMMON_DISABLED
,
FALSE
);
core
.
spsummoning_card
=
target
;
if
(
core
.
current_chain
.
size
()
>
1
||
target
->
is_affected_by_effect
(
EFFECT_CANNOT_DISABLE_SPSUMMON
))
{
core
.
units
.
begin
()
->
step
=
14
;
if
(
core
.
current_chain
.
size
()
==
0
)
{
if
(
target
->
is_affected_by_effect
(
EFFECT_CANNOT_DISABLE_SPSUMMON
))
core
.
units
.
begin
()
->
step
=
14
;
return
FALSE
;
}
else
if
(
core
.
current_chain
.
size
()
==
0
)
{
core
.
units
.
begin
()
->
step
=
9
;
}
else
if
(
core
.
current_chain
.
size
()
>
1
)
{
core
.
units
.
begin
()
->
step
=
14
;
return
FALSE
;
}
else
{
if
(
target
->
is_affected_by_effect
(
EFFECT_CANNOT_DISABLE_SPSUMMON
))
core
.
units
.
begin
()
->
step
=
15
;
else
core
.
units
.
begin
()
->
step
=
10
;
core
.
reserved
=
core
.
units
.
front
();
return
TRUE
;
}
core
.
reserved
=
core
.
units
.
front
();
return
TRUE
;
}
case
10
:
{
pduel
->
write_buffer8
(
MSG_SPSUMMONING
);
...
...
ocgcore/processor.cpp
View file @
74cbf991
This diff is collapsed.
Click to expand it.
script/c11021521.lua
View file @
74cbf991
--ネコマネキング
function
c11021521
.
initial_effect
(
c
)
c
:
SetStatus
(
STATUS_UNSUMMONABLE_CARD
,
true
)
--end turn
local
e1
=
Effect
.
CreateEffect
(
c
)
e1
:
SetDescription
(
aux
.
Stringid
(
11021521
,
0
))
...
...
script/c14087893.lua
View file @
74cbf991
...
...
@@ -6,7 +6,7 @@ function c14087893.initial_effect(c)
e1
:
SetType
(
EFFECT_TYPE_ACTIVATE
)
e1
:
SetProperty
(
EFFECT_FLAG_CARD_TARGET
)
e1
:
SetCode
(
EVENT_FREE_CHAIN
)
e1
:
SetHintTiming
(
TIMING_
ATTACK
,
0x11c0
)
e1
:
SetHintTiming
(
TIMING_
BATTLE_PHASE
,
0x1c0
+
TIMING_BATTLE_PHASE
)
e1
:
SetTarget
(
c14087893
.
target
)
e1
:
SetOperation
(
c14087893
.
activate
)
c
:
RegisterEffect
(
e1
)
...
...
script/c48206762.lua
View file @
74cbf991
...
...
@@ -40,7 +40,7 @@ function c48206762.operation(e,tp,eg,ep,ev,re,r,rp)
local
c
=
e
:
GetHandler
()
local
tc
=
Duel
.
GetFirstTarget
()
if
c
:
IsRelateToEffect
(
e
)
and
tc
:
IsRelateToEffect
(
e
)
then
if
Duel
.
SpecialSummon
(
tc
,
0
,
tp
,
tp
,
false
,
false
,
POS_FACEUP
_ATTACK
)
==
0
then
return
end
if
Duel
.
SpecialSummon
(
tc
,
0
,
tp
,
tp
,
false
,
false
,
POS_FACEUP
)
==
0
then
return
end
Duel
.
Equip
(
tp
,
c
,
tc
)
--Add Equip limit
local
e1
=
Effect
.
CreateEffect
(
tc
)
...
...
script/c58996430.lua
View file @
74cbf991
--ライトロード·ビースト ウォルフ
function
c58996430
.
initial_effect
(
c
)
--cannot normal summon
local
e1
=
Effect
.
CreateEffect
(
c
)
e1
:
SetType
(
EFFECT_TYPE_SINGLE
)
e1
:
SetCode
(
EFFECT_CANNOT_SUMMON
)
c
:
RegisterEffect
(
e1
)
local
e2
=
Effect
.
CreateEffect
(
c
)
e2
:
SetType
(
EFFECT_TYPE_SINGLE
)
e2
:
SetCode
(
EFFECT_CANNOT_MSET
)
c
:
RegisterEffect
(
e2
)
c
:
SetStatus
(
STATUS_UNSUMMONABLE_CARD
,
true
)
--special summon
local
e
3
=
Effect
.
CreateEffect
(
c
)
e
3
:
SetType
(
EFFECT_TYPE_SINGLE
+
EFFECT_TYPE_TRIGGER_F
)
e
3
:
SetCategory
(
CATEGORY_SPECIAL_SUMMON
)
e
3
:
SetDescription
(
aux
.
Stringid
(
58996430
,
0
))
e
3
:
SetCode
(
EVENT_TO_GRAVE
)
e
3
:
SetCondition
(
c58996430
.
condtion
)
e
3
:
SetTarget
(
c58996430
.
target
)
e
3
:
SetOperation
(
c58996430
.
operation
)
c
:
RegisterEffect
(
e
3
)
local
e
1
=
Effect
.
CreateEffect
(
c
)
e
1
:
SetType
(
EFFECT_TYPE_SINGLE
+
EFFECT_TYPE_TRIGGER_F
)
e
1
:
SetCategory
(
CATEGORY_SPECIAL_SUMMON
)
e
1
:
SetDescription
(
aux
.
Stringid
(
58996430
,
0
))
e
1
:
SetCode
(
EVENT_TO_GRAVE
)
e
1
:
SetCondition
(
c58996430
.
condtion
)
e
1
:
SetTarget
(
c58996430
.
target
)
e
1
:
SetOperation
(
c58996430
.
operation
)
c
:
RegisterEffect
(
e
1
)
end
function
c58996430
.
condtion
(
e
,
tp
,
eg
,
ep
,
ev
,
re
,
r
,
rp
)
return
e
:
GetHandler
():
GetPreviousLocation
()
==
LOCATION_DECK
...
...
script/c74694807.lua
View file @
74cbf991
...
...
@@ -40,7 +40,7 @@ function c74694807.operation(e,tp,eg,ep,ev,re,r,rp)
local
c
=
e
:
GetHandler
()
local
tc
=
Duel
.
GetFirstTarget
()
if
c
:
IsRelateToEffect
(
e
)
and
tc
:
IsRelateToEffect
(
e
)
then
if
Duel
.
SpecialSummon
(
tc
,
0
,
tp
,
tp
,
false
,
false
,
POS_FACEUP
_ATTACK
)
==
0
then
return
end
if
Duel
.
SpecialSummon
(
tc
,
0
,
tp
,
tp
,
false
,
false
,
POS_FACEUP
)
==
0
then
return
end
Duel
.
Equip
(
tp
,
c
,
tc
)
--Add Equip limit
local
e1
=
Effect
.
CreateEffect
(
tc
)
...
...
script/c98045062.lua
View file @
74cbf991
...
...
@@ -6,6 +6,7 @@ function c98045062.initial_effect(c)
e1
:
SetType
(
EFFECT_TYPE_ACTIVATE
)
e1
:
SetProperty
(
EFFECT_FLAG_CARD_TARGET
)
e1
:
SetCode
(
EVENT_FREE_CHAIN
)
e1
:
SetHintTiming
(
TIMING_BATTLE_PHASE
)
e1
:
SetCost
(
c98045062
.
cost
)
e1
:
SetTarget
(
c98045062
.
target
)
e1
:
SetOperation
(
c98045062
.
activate
)
...
...
script/constant.lua
View file @
74cbf991
...
...
@@ -236,6 +236,7 @@ EFFECT_FLAG_EVENT_PLAYER =0x800000 --
EFFECT_FLAG_OWNER_RELATE
=
0x1000000
--
EFFECT_FLAG_AVAILABLE_BD
=
0x2000000
--
EFFECT_FLAG_CLIENT_HINT
=
0x4000000
--
EFFECT_FLAG_CHAIN_UNIQUE
=
0x8000000
--
--========== Codes ==========
EFFECT_IMMUNE_EFFECT
=
1
--
EFFECT_DISABLE
=
2
--
...
...
@@ -583,3 +584,4 @@ TIMING_REMOVE =0x100000
TIMING_TOHAND
=
0x200000
TIMING_TODECK
=
0x400000
TIMING_TOGRAVE
=
0x800000
TIMING_BATTLE_PHASE
=
0x1000000
\ No newline at end of file
system.conf
View file @
74cbf991
...
...
@@ -3,7 +3,7 @@
antialias
=
2
nickname
=
Player
gamename
=
Game
lastdeck
=
sample
lastdeck
=
test
textfont
=
c
:/
windows
/
fonts
/
simsun
.
ttc
14
numfont
=
c
:/
windows
/
fonts
/
arialbd
.
ttf
serverport
=
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