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
2422327f
Commit
2422327f
authored
Mar 24, 2018
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
EFFECT_EXTRA_TOMAIN_KOISHI
parent
f0637a7e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
1 deletion
+4
-1
ocgcore/effect.h
ocgcore/effect.h
+1
-0
ocgcore/field.cpp
ocgcore/field.cpp
+1
-1
ocgcore/interpreter.cpp
ocgcore/interpreter.cpp
+2
-0
No files found.
ocgcore/effect.h
View file @
2422327f
...
...
@@ -113,6 +113,7 @@ public:
#define EFFECT_ADD_LINK_MARKER_KOISHI 37564151
#define EFFECT_REMOVE_LINK_MARKER_KOISHI 37564152
#define EFFECT_CANNOT_LOSE_KOISHI 37564153
#define EFFECT_EXTRA_TOMAIN_KOISHI 37564154
//status
#define EFFECT_STATUS_AVAILABLE 0x0001
...
...
ocgcore/field.cpp
View file @
2422327f
...
...
@@ -578,7 +578,7 @@ int32 field::get_useable_count_fromex(card* pcard, uint8 playerid, uint8 uplayer
pcard->current.location = LOCATION_EXTRA;
}
int useable_count = 0;
if(core.duel_rule >= 4)
if(core.duel_rule >= 4
&& !is_player_affected_by_effect(playerid, EFFECT_EXTRA_TOMAIN_KOISHI) && !pcard->is_affected_by_effect(EFFECT_EXTRA_TOMAIN_KOISHI)
)
useable_count = get_useable_count_fromex_rule4(pcard, playerid, uplayer, zone, list);
else
useable_count = get_useable_count_other(pcard, playerid, LOCATION_MZONE, uplayer, LOCATION_REASON_TOFIELD, zone, list);
...
...
ocgcore/interpreter.cpp
View file @
2422327f
...
...
@@ -693,6 +693,8 @@ interpreter::interpreter(duel* pd): coroutines(256) {
lua_setglobal
(
lua_state
,
"EFFECT_REMOVE_LINK_MARKER_KOISHI"
);
lua_pushinteger
(
lua_state
,
EFFECT_CANNOT_LOSE_KOISHI
);
lua_setglobal
(
lua_state
,
"EFFECT_CANNOT_LOSE_KOISHI"
);
lua_pushinteger
(
lua_state
,
EFFECT_EXTRA_TOMAIN_KOISHI
);
lua_setglobal
(
lua_state
,
"EFFECT_EXTRA_TOMAIN_KOISHI"
);
//music hints
lua_pushinteger
(
lua_state
,
HINT_MUSIC
);
lua_setglobal
(
lua_state
,
"HINT_MUSIC"
);
...
...
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