Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro-core
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
nanahira
ygopro-core
Commits
7d93e0e0
Commit
7d93e0e0
authored
Sep 01, 2021
by
mercury233
Committed by
GitHub
Sep 01, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update Duel.IsEnvironment (#394)
parent
64b93463
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
2 deletions
+16
-2
libduel.cpp
libduel.cpp
+16
-2
No files found.
libduel.cpp
View file @
7d93e0e0
...
@@ -1161,14 +1161,14 @@ int32 scriptlib::duel_is_environment(lua_State *L) {
...
@@ -1161,14 +1161,14 @@ int32 scriptlib::duel_is_environment(lua_State *L) {
uint32 playerid = PLAYER_ALL;
uint32 playerid = PLAYER_ALL;
if(lua_gettop(L) >= 2)
if(lua_gettop(L) >= 2)
playerid = (uint32)lua_tointeger(L, 2);
playerid = (uint32)lua_tointeger(L, 2);
uint32
loc
=
LOCATION_
FZONE
+
LOCATION_
ONFIELD
;
uint32 loc = LOCATION_ONFIELD;
if(lua_gettop(L) >= 3)
if(lua_gettop(L) >= 3)
loc = (uint32)lua_tointeger(L, 3);
loc = (uint32)lua_tointeger(L, 3);
if(playerid != 0 && playerid != 1 && playerid != PLAYER_ALL)
if(playerid != 0 && playerid != 1 && playerid != PLAYER_ALL)
return 0;
return 0;
duel* pduel = interpreter::get_duel_info(L);
duel* pduel = interpreter::get_duel_info(L);
int32 ret = 0, fc = 0;
int32 ret = 0, fc = 0;
if
(
loc
&
LOCATION_FZONE
)
{
if(loc &
(LOCATION_FZONE + LOCATION_SZONE)
) {
card* pcard = pduel->game_field->player[0].list_szone[5];
card* pcard = pduel->game_field->player[0].list_szone[5];
if(pcard && pcard->is_position(POS_FACEUP) && pcard->get_status(STATUS_EFFECT_ENABLED)) {
if(pcard && pcard->is_position(POS_FACEUP) && pcard->get_status(STATUS_EFFECT_ENABLED)) {
fc = 1;
fc = 1;
...
@@ -1210,6 +1210,20 @@ int32 scriptlib::duel_is_environment(lua_State *L) {
...
@@ -1210,6 +1210,20 @@ int32 scriptlib::duel_is_environment(lua_State *L) {
}
}
}
}
}
}
if(!ret && (loc & LOCATION_GRAVE)) {
if(playerid == 0 || playerid == PLAYER_ALL) {
for(auto& pcard : pduel->game_field->player[0].list_grave) {
if(code == pcard->get_code())
ret = 1;
}
}
if(playerid == 1 || playerid == PLAYER_ALL) {
for(auto& pcard : pduel->game_field->player[1].list_grave) {
if(code == pcard->get_code())
ret = 1;
}
}
}
if(!fc) {
if(!fc) {
effect_set eset;
effect_set eset;
pduel->game_field->filter_field_effect(EFFECT_CHANGE_ENVIRONMENT, &eset);
pduel->game_field->filter_field_effect(EFFECT_CHANGE_ENVIRONMENT, &eset);
...
...
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