Commit ce3d1169 authored by salix5's avatar salix5

Merge pull request #1261 from DailyShana/patch-3

get original pendulum scale
parents c2459915 93bca633
...@@ -29,7 +29,9 @@ static const struct luaL_Reg cardlib[] = { ...@@ -29,7 +29,9 @@ static const struct luaL_Reg cardlib[] = {
{ "GetOriginalRank", scriptlib::card_get_origin_rank }, { "GetOriginalRank", scriptlib::card_get_origin_rank },
{ "IsXyzLevel", scriptlib::card_is_xyz_level }, { "IsXyzLevel", scriptlib::card_is_xyz_level },
{ "GetLeftScale", scriptlib::card_get_lscale }, { "GetLeftScale", scriptlib::card_get_lscale },
{ "GetOriginalLeftScale", scriptlib::card_get_origin_lscale },
{ "GetRightScale", scriptlib::card_get_rscale }, { "GetRightScale", scriptlib::card_get_rscale },
{ "GetOriginalRightScale", scriptlib::card_get_origin_rscale },
{ "GetAttribute", scriptlib::card_get_attribute }, { "GetAttribute", scriptlib::card_get_attribute },
{ "GetOriginalAttribute", scriptlib::card_get_origin_attribute }, { "GetOriginalAttribute", scriptlib::card_get_origin_attribute },
{ "GetRace", scriptlib::card_get_race }, { "GetRace", scriptlib::card_get_race },
......
...@@ -128,6 +128,16 @@ int32 scriptlib::card_get_lscale(lua_State *L) { ...@@ -128,6 +128,16 @@ int32 scriptlib::card_get_lscale(lua_State *L) {
lua_pushinteger(L, pcard->get_lscale()); lua_pushinteger(L, pcard->get_lscale());
return 1; return 1;
} }
int32 scriptlib::card_get_origin_lscale(lua_State *L) {
check_param_count(L, 1);
check_param(L, PARAM_TYPE_CARD, 1);
card* pcard = *(card**) lua_touserdata(L, 1);
if(pcard->status & STATUS_NO_LEVEL)
lua_pushinteger(L, 0);
else
lua_pushinteger(L, pcard->data.lscale);
return 1;
}
int32 scriptlib::card_get_rscale(lua_State *L) { int32 scriptlib::card_get_rscale(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);
...@@ -135,6 +145,16 @@ int32 scriptlib::card_get_rscale(lua_State *L) { ...@@ -135,6 +145,16 @@ int32 scriptlib::card_get_rscale(lua_State *L) {
lua_pushinteger(L, pcard->get_rscale()); lua_pushinteger(L, pcard->get_rscale());
return 1; return 1;
} }
int32 scriptlib::card_get_origin_rscale(lua_State *L) {
check_param_count(L, 1);
check_param(L, PARAM_TYPE_CARD, 1);
card* pcard = *(card**) lua_touserdata(L, 1);
if(pcard->status & STATUS_NO_LEVEL)
lua_pushinteger(L, 0);
else
lua_pushinteger(L, pcard->data.rscale);
return 1;
}
int32 scriptlib::card_get_attribute(lua_State *L) { int32 scriptlib::card_get_attribute(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);
......
...@@ -31,7 +31,9 @@ public: ...@@ -31,7 +31,9 @@ public:
static int32 card_get_origin_rank(lua_State *L); static int32 card_get_origin_rank(lua_State *L);
static int32 card_is_xyz_level(lua_State *L); static int32 card_is_xyz_level(lua_State *L);
static int32 card_get_lscale(lua_State *L); static int32 card_get_lscale(lua_State *L);
static int32 card_get_origin_lscale(lua_State *L);
static int32 card_get_rscale(lua_State *L); static int32 card_get_rscale(lua_State *L);
static int32 card_get_origin_rscale(lua_State *L);
static int32 card_get_attribute(lua_State *L); static int32 card_get_attribute(lua_State *L);
static int32 card_get_origin_attribute(lua_State *L); static int32 card_get_origin_attribute(lua_State *L);
static int32 card_get_race(lua_State *L); static int32 card_get_race(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