Commit 032deb32 authored by nanahira's avatar nanahira

update

parent 6f0ce8ee
...@@ -2788,7 +2788,7 @@ int32 card::check_cost_condition(int32 ecode, int32 playerid, int32 sumtype) { ...@@ -2788,7 +2788,7 @@ int32 card::check_cost_condition(int32 ecode, int32 playerid, int32 sumtype) {
} }
// check if this is a normal summonable card // check if this is a normal summonable card
int32 card::is_summonable_card() { int32 card::is_summonable_card() {
if(!(data.type & TYPE_MONSTER)) if(!(data.type & TYPE_MONSTER) || (data.type & TYPE_TOKEN))
return FALSE; return FALSE;
return !is_affected_by_effect(EFFECT_UNSUMMONABLE_CARD); return !is_affected_by_effect(EFFECT_UNSUMMONABLE_CARD);
} }
......
...@@ -423,7 +423,7 @@ public: ...@@ -423,7 +423,7 @@ public:
#define RACE_DEVINE 0x200000 // #define RACE_DEVINE 0x200000 //
#define RACE_CREATORGOD 0x400000 // #define RACE_CREATORGOD 0x400000 //
#define RACE_WYRM 0x800000 // #define RACE_WYRM 0x800000 //
#define RACE_CYBERS 0x1000000 // #define RACE_CYBERSE 0x1000000 //
//Reason //Reason
#define REASON_DESTROY 0x1 // #define REASON_DESTROY 0x1 //
#define REASON_RELEASE 0x2 // #define REASON_RELEASE 0x2 //
......
...@@ -538,7 +538,7 @@ int32 scriptlib::effect_is_activated(lua_State * L) { ...@@ -538,7 +538,7 @@ int32 scriptlib::effect_is_activated(lua_State * L) {
check_param_count(L, 1); check_param_count(L, 1);
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);
lua_pushboolean(L, (peffect->status & EFFECT_STATUS_ACTIVATED)); lua_pushboolean(L, (peffect->type & 0x7f0));
return 1; return 1;
} }
......
...@@ -3706,7 +3706,7 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3 ...@@ -3706,7 +3706,7 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
exargs* param = (exargs*)targets; exargs* param = (exargs*)targets;
card* pcard = *param->cvit; card* pcard = *param->cvit;
uint8 oloc = pcard->current.location; uint8 oloc = pcard->current.location;
uint8 playerid = pcard->sendto_param.playerid; uint8 playerid = pcard->sendto_param.playerid & 0x7;
uint8 dest = pcard->sendto_param.location; uint8 dest = pcard->sendto_param.location;
uint8 seq = pcard->sendto_param.sequence; uint8 seq = pcard->sendto_param.sequence;
if(dest == LOCATION_GRAVE) { if(dest == LOCATION_GRAVE) {
......
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