Skip to content

Y
ygopro-core
Commit e1bf58a5 authored by mercury233's avatar mercury233 Committed by GitHub
Browse files
Options

update (#108)

parent 04362c80
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
card.h
View file @ e1bf58a5
...@@ -485,7 +485,7 @@ public: ...@@ -485,7 +485,7 @@ public:
#define STATUS_SUMMON_DISABLED 0x20000 // #define STATUS_SUMMON_DISABLED 0x20000 //
#define STATUS_ACTIVATE_DISABLED 0x40000 // #define STATUS_ACTIVATE_DISABLED 0x40000 //
#define STATUS_EFFECT_REPLACED 0x80000 #define STATUS_EFFECT_REPLACED 0x80000
#define STATUS_UNION 0x100000 #define STATUS_FUTURE_FUSION 0x100000
#define STATUS_ATTACK_CANCELED 0x200000 #define STATUS_ATTACK_CANCELED 0x200000
#define STATUS_INITIALIZING 0x400000 #define STATUS_INITIALIZING 0x400000
#define STATUS_ACTIVATED 0x800000 #define STATUS_ACTIVATED 0x800000
......
operations.cpp
View file @ e1bf58a5
...@@ -2946,7 +2946,7 @@ int32 field::special_summon(uint16 step, effect* reason_effect, uint8 reason_pla ...@@ -2946,7 +2946,7 @@ int32 field::special_summon(uint16 step, effect* reason_effect, uint8 reason_pla
if(!((*cit)->current.position & POS_FACEDOWN)) if(!((*cit)->current.position & POS_FACEDOWN))
raise_single_event(*cit, 0, EVENT_SPSUMMON_SUCCESS, (*cit)->current.reason_effect, 0, (*cit)->current.reason_player, (*cit)->summon_player, 0); raise_single_event(*cit, 0, EVENT_SPSUMMON_SUCCESS, (*cit)->current.reason_effect, 0, (*cit)->current.reason_player, (*cit)->summon_player, 0);
int32 summontype = (*cit)->summon_info & 0xff000000; int32 summontype = (*cit)->summon_info & 0xff000000;
if(summontype && (*cit)->material_cards.size()) { if(summontype && (*cit)->material_cards.size() && !(*cit)->is_status(STATUS_FUTURE_FUSION)) {
int32 matreason = 0; int32 matreason = 0;
if(summontype == SUMMON_TYPE_FUSION) if(summontype == SUMMON_TYPE_FUSION)
matreason = REASON_FUSION; matreason = REASON_FUSION;
...@@ -2960,6 +2960,7 @@ int32 field::special_summon(uint16 step, effect* reason_effect, uint8 reason_pla ...@@ -2960,6 +2960,7 @@ int32 field::special_summon(uint16 step, effect* reason_effect, uint8 reason_pla
raise_single_event(*mit, &targets->container, EVENT_BE_MATERIAL, (*cit)->current.reason_effect, matreason, (*cit)->current.reason_player, (*cit)->summon_player, 0); raise_single_event(*mit, &targets->container, EVENT_BE_MATERIAL, (*cit)->current.reason_effect, matreason, (*cit)->current.reason_player, (*cit)->summon_player, 0);
raise_event(&((*cit)->material_cards), EVENT_BE_MATERIAL, reason_effect, matreason, reason_player, (*cit)->summon_player, 0); raise_event(&((*cit)->material_cards), EVENT_BE_MATERIAL, reason_effect, matreason, reason_player, (*cit)->summon_player, 0);
} }
(*cit)->set_status(STATUS_FUTURE_FUSION, FALSE);
} }
process_single_event(); process_single_event();
process_instant_event(); process_instant_event();
......
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