Skip to content

Y
ygopro-core
Commit 59593ffc authored by Chen Bill's avatar Chen Bill Committed by GitHub
Browse files
Options

add Effect.GetRange, IsHasRange (#649) 

* use constant

* add Effect.GetRange, IsHasRange

* avoid nullptr in add_effect

* fix card_state::is_location

* fix Effect.SetType

* use uint64
parent 7a9fd22d
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 67 deletions
card.cpp
View file @ 59593ffc
...@@ -26,7 +26,7 @@ const std::unordered_map<uint32, uint32> card::second_code = { ...@@ -26,7 +26,7 @@ const std::unordered_map<uint32, uint32> card::second_code = {
bool card_sort::operator()(card* const& c1, card* const& c2) const { bool card_sort::operator()(card* const& c1, card* const& c2) const {
return c1->cardid < c2->cardid; return c1->cardid < c2->cardid;
} }
bool card_state::is_location(int32 loc) const { bool card_state::is_location(uint32 loc) const {
if((loc & LOCATION_FZONE) && location == LOCATION_SZONE && sequence == 5) if((loc & LOCATION_FZONE) && location == LOCATION_SZONE && sequence == 5)
return true; return true;
if((loc & LOCATION_PZONE) && location == LOCATION_SZONE && pzone) if((loc & LOCATION_PZONE) && location == LOCATION_SZONE && pzone)
...@@ -1756,6 +1756,8 @@ void card::enable_field_effect(bool enabled) { ...@@ -1756,6 +1756,8 @@ void card::enable_field_effect(bool enabled) {
filter_disable_related_cards(); filter_disable_related_cards();
} }
int32 card::add_effect(effect* peffect) { int32 card::add_effect(effect* peffect) {
if (!peffect)
return 0;
if (get_status(STATUS_COPYING_EFFECT) && peffect->is_flag(EFFECT_FLAG_UNCOPYABLE)) { if (get_status(STATUS_COPYING_EFFECT) && peffect->is_flag(EFFECT_FLAG_UNCOPYABLE)) {
pduel->uncopy.insert(peffect); pduel->uncopy.insert(peffect);
return 0; return 0;
......
card.h
View file @ 59593ffc
...@@ -56,7 +56,7 @@ struct card_state { ...@@ -56,7 +56,7 @@ struct card_state {
uint8 reason_player{ PLAYER_NONE }; uint8 reason_player{ PLAYER_NONE };
effect* reason_effect{ nullptr }; effect* reason_effect{ nullptr };
bool is_location(int32 loc) const; bool is_location(uint32 loc) const;
bool is_main_mzone() const { bool is_main_mzone() const {
return location == LOCATION_MZONE && sequence >= 0 && sequence <= 4; return location == LOCATION_MZONE && sequence >= 0 && sequence <= 4;
} }
......
field.cpp
View file @ 59593ffc
...@@ -1161,6 +1161,8 @@ void field::tag_swap(uint8 playerid) { ...@@ -1161,6 +1161,8 @@ void field::tag_swap(uint8 playerid) {
pduel->write_buffer32(pcard->data.code | (pcard->is_position(POS_FACEUP) ? 0x80000000 : 0)); pduel->write_buffer32(pcard->data.code | (pcard->is_position(POS_FACEUP) ? 0x80000000 : 0));
} }
void field::add_effect(effect* peffect, uint8 owner_player) { void field::add_effect(effect* peffect, uint8 owner_player) {
if (!peffect)
return;
if (effects.indexer.find(peffect) != effects.indexer.end()) if (effects.indexer.find(peffect) != effects.indexer.end())
return; return;
effect_container::iterator it; effect_container::iterator it;
......
libeffect.cpp
View file @ 59593ffc
...@@ -12,6 +12,64 @@ ...@@ -12,6 +12,64 @@
#include "effect.h" #include "effect.h"
#include "group.h" #include "group.h"
int32 scriptlib::get_effect_property(lua_State* L, effect_member type) {
check_param_count(L, 1);
check_param(L, PARAM_TYPE_EFFECT, 1);
effect* peffect = *(effect**)lua_touserdata(L, 1);
lua_Integer value{};
if (peffect) {
switch (type) {
case MEMBER_CATEGORY:
value = peffect->category;
break;
case MEMBER_CODE:
value = peffect->code;
break;
case MEMBER_DESCRIPTION:
value = peffect->description;
break;
case MEMBER_ID:
value = peffect->id;
break;
case MEMBER_RANGE:
value = peffect->range;
break;
case MEMBER_TYPE:
value = peffect->type;
break;
}
}
lua_pushinteger(L, value);
return 1;
}
int32 scriptlib::is_effect_property(lua_State* L, effect_member type) {
check_param_count(L, 2);
check_param(L, PARAM_TYPE_EFFECT, 1);
effect* peffect = *(effect**)lua_touserdata(L, 1);
uint64 value{};
if (peffect) {
switch (type) {
case MEMBER_CATEGORY:
value = peffect->category;
break;
case MEMBER_CODE:
value = peffect->code;
break;
case MEMBER_RANGE:
value = peffect->range;
break;
case MEMBER_TYPE:
value = peffect->type;
break;
}
}
uint64 x = lua_tointeger(L, 2);
if (value & x)
lua_pushboolean(L, 1);
else
lua_pushboolean(L, 0);
return 1;
}
int32 scriptlib::effect_new(lua_State *L) { int32 scriptlib::effect_new(lua_State *L) {
check_param_count(L, 1); check_param_count(L, 1);
check_param(L, PARAM_TYPE_CARD, 1); check_param(L, PARAM_TYPE_CARD, 1);
...@@ -52,11 +110,7 @@ int32 scriptlib::effect_reset(lua_State *L) { ...@@ -52,11 +110,7 @@ int32 scriptlib::effect_reset(lua_State *L) {
return 0; return 0;
} }
int32 scriptlib::effect_get_field_id(lua_State *L) { int32 scriptlib::effect_get_field_id(lua_State *L) {
check_param_count(L, 1); return get_effect_property(L, MEMBER_ID);
check_param(L, PARAM_TYPE_EFFECT, 1);
effect* peffect = *(effect**) lua_touserdata(L, 1);
lua_pushinteger(L, peffect->id);
return 1;
} }
int32 scriptlib::effect_set_description(lua_State *L) { int32 scriptlib::effect_set_description(lua_State *L) {
check_param_count(L, 2); check_param_count(L, 2);
...@@ -147,19 +201,27 @@ int32 scriptlib::effect_set_type(lua_State *L) { ...@@ -147,19 +201,27 @@ int32 scriptlib::effect_set_type(lua_State *L) {
check_param(L, PARAM_TYPE_EFFECT, 1); check_param(L, PARAM_TYPE_EFFECT, 1);
effect* peffect = *(effect**) lua_touserdata(L, 1); effect* peffect = *(effect**) lua_touserdata(L, 1);
uint32 v = (uint32)lua_tointeger(L, 2); uint32 v = (uint32)lua_tointeger(L, 2);
if (v & EFFECT_TYPE_ACTIVATE) {
v = EFFECT_TYPE_FIELD | EFFECT_TYPE_ACTIVATE;
peffect->range = LOCATION_SZONE + LOCATION_FZONE + LOCATION_HAND;
}
else if(v & EFFECT_TYPE_FLIP) {
peffect->code = EVENT_FLIP;
if (v & EFFECT_TYPE_TRIGGER_O) {
v = EFFECT_TYPE_SINGLE | EFFECT_TYPE_FLIP | EFFECT_TYPE_TRIGGER_O;
peffect->flag[0] |= EFFECT_FLAG_DELAY;
}
else {
v = EFFECT_TYPE_SINGLE | EFFECT_TYPE_FLIP | EFFECT_TYPE_TRIGGER_F;
}
}
else if (v & (EFFECT_TYPE_IGNITION | EFFECT_TYPE_QUICK_O | EFFECT_TYPE_QUICK_F)) {
v |= EFFECT_TYPE_FIELD;
}
if (v & (EFFECT_TYPES_CHAIN_LINK | EFFECT_TYPE_CONTINUOUS)) if (v & (EFFECT_TYPES_CHAIN_LINK | EFFECT_TYPE_CONTINUOUS))
v |= EFFECT_TYPE_ACTIONS; v |= EFFECT_TYPE_ACTIONS;
else else
v &= ~EFFECT_TYPE_ACTIONS; v &= ~EFFECT_TYPE_ACTIONS;
if(v & (EFFECT_TYPE_ACTIVATE | EFFECT_TYPE_IGNITION | EFFECT_TYPE_QUICK_O | EFFECT_TYPE_QUICK_F))
v |= EFFECT_TYPE_FIELD;
if(v & EFFECT_TYPE_ACTIVATE)
peffect->range = LOCATION_SZONE + LOCATION_FZONE + LOCATION_HAND;
if(v & EFFECT_TYPE_FLIP) {
peffect->code = EVENT_FLIP;
if(!(v & EFFECT_TYPE_TRIGGER_O))
v |= EFFECT_TYPE_TRIGGER_F;
}
peffect->type = v; peffect->type = v;
return 0; return 0;
} }
...@@ -303,34 +365,13 @@ int32 scriptlib::effect_set_owner_player(lua_State *L) { ...@@ -303,34 +365,13 @@ int32 scriptlib::effect_set_owner_player(lua_State *L) {
return 0; return 0;
} }
int32 scriptlib::effect_get_description(lua_State *L) { int32 scriptlib::effect_get_description(lua_State *L) {
check_param_count(L, 1); return get_effect_property(L, MEMBER_DESCRIPTION);
check_param(L, PARAM_TYPE_EFFECT, 1);
effect* peffect = *(effect**) lua_touserdata(L, 1);
if (peffect) {
lua_pushinteger(L, peffect->description);
return 1;
}
return 0;
} }
int32 scriptlib::effect_get_code(lua_State *L) { int32 scriptlib::effect_get_code(lua_State *L) {
check_param_count(L, 1); return get_effect_property(L, MEMBER_CODE);
check_param(L, PARAM_TYPE_EFFECT, 1);
effect* peffect = *(effect**) lua_touserdata(L, 1);
if (peffect) {
lua_pushinteger(L, peffect->code);
return 1;
}
return 0;
} }
int32 scriptlib::effect_get_type(lua_State *L) { int32 scriptlib::effect_get_type(lua_State *L) {
check_param_count(L, 1); return get_effect_property(L, MEMBER_TYPE);
check_param(L, PARAM_TYPE_EFFECT, 1);
effect* peffect = *(effect**) lua_touserdata(L, 1);
if (peffect) {
lua_pushinteger(L, peffect->type);
return 1;
}
return 0;
} }
int32 scriptlib::effect_get_property(lua_State *L) { int32 scriptlib::effect_get_property(lua_State *L) {
check_param_count(L, 1); check_param_count(L, 1);
...@@ -376,14 +417,10 @@ int32 scriptlib::effect_get_label_object(lua_State *L) { ...@@ -376,14 +417,10 @@ int32 scriptlib::effect_get_label_object(lua_State *L) {
} }
} }
int32 scriptlib::effect_get_category(lua_State *L) { int32 scriptlib::effect_get_category(lua_State *L) {
check_param_count(L, 1); return get_effect_property(L, MEMBER_CATEGORY);
check_param(L, PARAM_TYPE_EFFECT, 1); }
effect* peffect = *(effect**) lua_touserdata(L, 1); int32 scriptlib::effect_get_range(lua_State* L) {
if (peffect) { return get_effect_property(L, MEMBER_RANGE);
lua_pushinteger(L, peffect->category);
return 1;
}
return 0;
} }
int32 scriptlib::effect_get_owner(lua_State *L) { int32 scriptlib::effect_get_owner(lua_State *L) {
check_param_count(L, 1); check_param_count(L, 1);
...@@ -482,26 +519,13 @@ int32 scriptlib::effect_is_has_property(lua_State *L) { ...@@ -482,26 +519,13 @@ int32 scriptlib::effect_is_has_property(lua_State *L) {
return 1; return 1;
} }
int32 scriptlib::effect_is_has_category(lua_State *L) { int32 scriptlib::effect_is_has_category(lua_State *L) {
check_param_count(L, 2); return is_effect_property(L, MEMBER_CATEGORY);
check_param(L, PARAM_TYPE_EFFECT, 1);
effect* peffect = *(effect**) lua_touserdata(L, 1);
uint32 tcate = (uint32)lua_tointeger(L, 2);
if (peffect && (peffect->category & tcate))
lua_pushboolean(L, 1);
else
lua_pushboolean(L, 0);
return 1;
} }
int32 scriptlib::effect_is_has_type(lua_State *L) { int32 scriptlib::effect_is_has_type(lua_State *L) {
check_param_count(L, 2); return is_effect_property(L, MEMBER_TYPE);
check_param(L, PARAM_TYPE_EFFECT, 1); }
effect* peffect = *(effect**) lua_touserdata(L, 1); int32 scriptlib::effect_is_has_range(lua_State* L) {
uint32 ttype = (uint32)lua_tointeger(L, 2); return is_effect_property(L, MEMBER_RANGE);
if (peffect && (peffect->type & ttype))
lua_pushboolean(L, 1);
else
lua_pushboolean(L, 0);
return 1;
} }
int32 scriptlib::effect_is_activatable(lua_State *L) { int32 scriptlib::effect_is_activatable(lua_State *L) {
check_param_count(L, 2); check_param_count(L, 2);
...@@ -615,6 +639,7 @@ static const struct luaL_Reg effectlib[] = { ...@@ -615,6 +639,7 @@ static const struct luaL_Reg effectlib[] = {
{ "GetLabel", scriptlib::effect_get_label }, { "GetLabel", scriptlib::effect_get_label },
{ "GetLabelObject", scriptlib::effect_get_label_object }, { "GetLabelObject", scriptlib::effect_get_label_object },
{ "GetCategory", scriptlib::effect_get_category }, { "GetCategory", scriptlib::effect_get_category },
{ "GetRange", scriptlib::effect_get_range },
{ "GetOwner", scriptlib::effect_get_owner }, { "GetOwner", scriptlib::effect_get_owner },
{ "GetHandler", scriptlib::effect_get_handler }, { "GetHandler", scriptlib::effect_get_handler },
{ "GetCondition", scriptlib::effect_get_condition }, { "GetCondition", scriptlib::effect_get_condition },
...@@ -629,6 +654,7 @@ static const struct luaL_Reg effectlib[] = { ...@@ -629,6 +654,7 @@ static const struct luaL_Reg effectlib[] = {
{ "IsHasProperty", scriptlib::effect_is_has_property }, { "IsHasProperty", scriptlib::effect_is_has_property },
{ "IsHasCategory", scriptlib::effect_is_has_category }, { "IsHasCategory", scriptlib::effect_is_has_category },
{ "IsHasType", scriptlib::effect_is_has_type }, { "IsHasType", scriptlib::effect_is_has_type },
{ "IsHasRange", scriptlib::effect_is_has_range },
{ "IsActivatable", scriptlib::effect_is_activatable }, { "IsActivatable", scriptlib::effect_is_activatable },
{ "IsActivated", scriptlib::effect_is_activated }, { "IsActivated", scriptlib::effect_is_activated },
{ "IsCostChecked", scriptlib::effect_is_cost_checked }, { "IsCostChecked", scriptlib::effect_is_cost_checked },
......
operations.cpp
View file @ 59593ffc
...@@ -4759,7 +4759,7 @@ int32 field::move_to_field(uint16 step, card* target, uint32 enable, uint32 ret, ...@@ -4759,7 +4759,7 @@ int32 field::move_to_field(uint16 step, card* target, uint32 enable, uint32 ret,
peffect->reset_flag = RESET_EVENT + 0x1fc0000; peffect->reset_flag = RESET_EVENT + 0x1fc0000;
peffect->value = TYPE_MONSTER | type; peffect->value = TYPE_MONSTER | type;
target->add_effect(peffect); target->add_effect(peffect);
if(core.duel_rule <= 4 && (type & TYPE_TRAPMONSTER)) { if(core.duel_rule <= NEW_MASTER_RULE && (type & TYPE_TRAPMONSTER)) {
peffect = pduel->new_effect(); peffect = pduel->new_effect();
peffect->owner = target; peffect->owner = target;
peffect->type = EFFECT_TYPE_FIELD; peffect->type = EFFECT_TYPE_FIELD;
......
scriptlib.h
View file @ 59593ffc
...@@ -17,6 +17,14 @@ constexpr bool match_all(uint32 x, uint32 y) { ...@@ -17,6 +17,14 @@ constexpr bool match_all(uint32 x, uint32 y) {
class scriptlib { class scriptlib {
public: public:
enum effect_member : int32 {
MEMBER_CATEGORY,
MEMBER_CODE,
MEMBER_DESCRIPTION,
MEMBER_ID,
MEMBER_RANGE,
MEMBER_TYPE,
};
static int32 check_param(lua_State* L, int32 param_type, int32 index, int32 retfalse = FALSE); static int32 check_param(lua_State* L, int32 param_type, int32 index, int32 retfalse = FALSE);
static int32 check_param_count(lua_State* L, int32 count); static int32 check_param_count(lua_State* L, int32 count);
static int32 check_action_permission(lua_State* L); static int32 check_action_permission(lua_State* L);
...@@ -299,6 +307,8 @@ public: ...@@ -299,6 +307,8 @@ public:
static void open_cardlib(lua_State *L); static void open_cardlib(lua_State *L);
//Effect functions //Effect functions
static int32 get_effect_property(lua_State* L, effect_member type);
static int32 is_effect_property(lua_State* L, effect_member type);
static int32 effect_new(lua_State *L); static int32 effect_new(lua_State *L);
static int32 effect_newex(lua_State *L); static int32 effect_newex(lua_State *L);
static int32 effect_clone(lua_State *L); static int32 effect_clone(lua_State *L);
...@@ -330,6 +340,7 @@ public: ...@@ -330,6 +340,7 @@ public:
static int32 effect_get_label(lua_State *L); static int32 effect_get_label(lua_State *L);
static int32 effect_get_label_object(lua_State *L); static int32 effect_get_label_object(lua_State *L);
static int32 effect_get_category(lua_State *L); static int32 effect_get_category(lua_State *L);
static int32 effect_get_range(lua_State* L);
static int32 effect_get_owner(lua_State *L); static int32 effect_get_owner(lua_State *L);
static int32 effect_get_handler(lua_State *L); static int32 effect_get_handler(lua_State *L);
static int32 effect_get_owner_player(lua_State *L); static int32 effect_get_owner_player(lua_State *L);
...@@ -343,6 +354,7 @@ public: ...@@ -343,6 +354,7 @@ public:
static int32 effect_is_active_type(lua_State *L); static int32 effect_is_active_type(lua_State *L);
static int32 effect_is_has_property(lua_State *L); static int32 effect_is_has_property(lua_State *L);
static int32 effect_is_has_category(lua_State *L); static int32 effect_is_has_category(lua_State *L);
static int32 effect_is_has_range(lua_State* L);
static int32 effect_is_has_type(lua_State *L); static int32 effect_is_has_type(lua_State *L);
static int32 effect_is_activatable(lua_State *L); static int32 effect_is_activatable(lua_State *L);
static int32 effect_is_activated(lua_State *L); static int32 effect_is_activated(lua_State *L);
......
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