Commit 37b31b72 authored by nanahira's avatar nanahira

map of heaven

parent 84800589
...@@ -3781,6 +3781,8 @@ int32 card::is_can_be_ritual_material(card* scard) { ...@@ -3781,6 +3781,8 @@ int32 card::is_can_be_ritual_material(card* scard) {
return TRUE; return TRUE;
return FALSE; return FALSE;
} }
if(current.location == LOCATION_EXTRA && is_affected_by_effect(EFFECT_MAP_OF_HEAVEN) && scard && scard->get_level() < 7)
return FALSE;
return TRUE; return TRUE;
} }
int32 card::is_can_be_xyz_material(card* scard) { int32 card::is_can_be_xyz_material(card* scard) {
......
...@@ -125,6 +125,7 @@ public: ...@@ -125,6 +125,7 @@ public:
#define EFFECT_CHANGE_SUMMON_LOCATION_KOISHI 37564161 #define EFFECT_CHANGE_SUMMON_LOCATION_KOISHI 37564161
#define EFFECT_LINK_SPELL_KOISHI 37564162 #define EFFECT_LINK_SPELL_KOISHI 37564162
#define EFFECT_SEA_PULSE 37564163 #define EFFECT_SEA_PULSE 37564163
#define EFFECT_MAP_OF_HEAVEN 77702007
//status //status
#define EFFECT_STATUS_AVAILABLE 0x0001 #define EFFECT_STATUS_AVAILABLE 0x0001
......
...@@ -1814,6 +1814,9 @@ void field::get_ritual_material(uint8 playerid, effect* peffect, card_set* mater ...@@ -1814,6 +1814,9 @@ void field::get_ritual_material(uint8 playerid, effect* peffect, card_set* mater
for(auto& pcard : player[playerid].list_grave) for(auto& pcard : player[playerid].list_grave)
if((pcard->data.type & TYPE_MONSTER) && pcard->is_affected_by_effect(EFFECT_EXTRA_RITUAL_MATERIAL) && pcard->is_removeable(playerid)) if((pcard->data.type & TYPE_MONSTER) && pcard->is_affected_by_effect(EFFECT_EXTRA_RITUAL_MATERIAL) && pcard->is_removeable(playerid))
material->insert(pcard); material->insert(pcard);
for(auto& pcard : player[playerid].list_extra)
if((pcard->data.type & TYPE_MONSTER) && pcard->is_affected_by_effect(EFFECT_MAP_OF_HEAVEN) && pcard->is_removeable(playerid))
material->insert(pcard);
} }
void field::get_fusion_material(uint8 playerid, card_set* material) { void field::get_fusion_material(uint8 playerid, card_set* material) {
for(auto& pcard : player[playerid].list_mzone) { for(auto& pcard : player[playerid].list_mzone) {
......
...@@ -731,6 +731,8 @@ interpreter::interpreter(duel* pd): coroutines(256) { ...@@ -731,6 +731,8 @@ interpreter::interpreter(duel* pd): coroutines(256) {
lua_setglobal(lua_state, "EFFECT_LINK_SPELL_KOISHI"); lua_setglobal(lua_state, "EFFECT_LINK_SPELL_KOISHI");
lua_pushinteger(lua_state, EFFECT_SEA_PULSE); lua_pushinteger(lua_state, EFFECT_SEA_PULSE);
lua_setglobal(lua_state, "EFFECT_SEA_PULSE"); lua_setglobal(lua_state, "EFFECT_SEA_PULSE");
lua_pushinteger(lua_state, EFFECT_MAP_OF_HEAVEN);
lua_setglobal(lua_state, "EFFECT_MAP_OF_HEAVEN");
//music hints //music hints
lua_pushinteger(lua_state, HINT_MUSIC); lua_pushinteger(lua_state, HINT_MUSIC);
......
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