sync ocgcore

Classes/ocgcore/card.cpp

@@ -509,7 +509,7 @@ int32 card::get_base_attack() {
 	if(swap)
 		filter_effect(EFFECT_SET_BASE_DEFENSE, &eset, FALSE);
 	eset.sort();
-	// calculate continous effects of this first
+	// calculate continuous effects of this first
 	for(int32 i = 0; i < eset.size();) {
 		if((eset[i]->type & EFFECT_TYPE_SINGLE) && eset[i]->is_flag(EFFECT_FLAG_SINGLE_RANGE)) {
 			switch(eset[i]->code) {
@@ -896,31 +896,22 @@ uint32 card::get_level() {
 	effect_set effects;
 	int32 level = data.level;
 	temp.level = level;
-	int32 up = 0, upc = 0;
+	int32 up = 0;
 	filter_effect(EFFECT_UPDATE_LEVEL, &effects, FALSE);
-	filter_effect(EFFECT_CHANGE_LEVEL, &effects, FALSE);
-	filter_effect(EFFECT_CHANGE_LEVEL_FINAL, &effects);
+	filter_effect(EFFECT_CHANGE_LEVEL, &effects);
 	for (int32 i = 0; i < effects.size(); ++i) {
 		switch (effects[i]->code) {
 		case EFFECT_UPDATE_LEVEL:
-			if ((effects[i]->type & EFFECT_TYPE_SINGLE) && !effects[i]->is_flag(EFFECT_FLAG_SINGLE_RANGE))
-				up += effects[i]->get_value(this);
-			else
-				upc += effects[i]->get_value(this);
+			up += effects[i]->get_value(this);
 			break;
 		case EFFECT_CHANGE_LEVEL:
 			level = effects[i]->get_value(this);
 			up = 0;
 			break;
-		case EFFECT_CHANGE_LEVEL_FINAL:
-			level = effects[i]->get_value(this);
-			up = 0;
-			upc = 0;
-			break;
 		}
-		temp.level = level + up + upc;
+		temp.level = level + up;
 	}
-	level += up + upc;
+	level += up;
 	if(level < 1 && (get_type() & TYPE_MONSTER))
 		level = 1;
 	temp.level = 0xffffffff;
@@ -938,31 +929,22 @@ uint32 card::get_rank() {
 	effect_set effects;
 	int32 rank = data.level;
 	temp.level = rank;
-	int32 up = 0, upc = 0;
+	int32 up = 0;
 	filter_effect(EFFECT_UPDATE_RANK, &effects, FALSE);
-	filter_effect(EFFECT_CHANGE_RANK, &effects, FALSE);
-	filter_effect(EFFECT_CHANGE_RANK_FINAL, &effects);
+	filter_effect(EFFECT_CHANGE_RANK, &effects);
 	for (int32 i = 0; i < effects.size(); ++i) {
 		switch (effects[i]->code) {
 		case EFFECT_UPDATE_RANK:
-			if ((effects[i]->type & EFFECT_TYPE_SINGLE) && !effects[i]->is_flag(EFFECT_FLAG_SINGLE_RANGE))
-				up += effects[i]->get_value(this);
-			else
-				upc += effects[i]->get_value(this);
+			up += effects[i]->get_value(this);
 			break;
 		case EFFECT_CHANGE_RANK:
 			rank = effects[i]->get_value(this);
 			up = 0;
 			break;
-		case EFFECT_CHANGE_RANK_FINAL:
-			rank = effects[i]->get_value(this);
-			up = 0;
-			upc = 0;
-			break;
 		}
-		temp.level = rank + up + upc;
+		temp.level = rank + up;
 	}
-	rank += up + upc;
+	rank += up;
 	if(rank < 1 && (get_type() & TYPE_MONSTER))
 		rank = 1;
 	temp.level = 0xffffffff;
@@ -2749,7 +2731,7 @@ effect* card::is_affected_by_effect(int32 code, card* target) {
 	}
 	return 0;
 }
-// return the last control-changing continous effect
+// return the last control-changing continuous effect
 effect* card::check_control_effect() {
 	effect* ret_effect = 0;
 	for (auto& pcard : equiping_cards) {

Classes/ocgcore/effect.h

@@ -407,8 +407,8 @@ inline effect_flag operator|(effect_flag flag1, effect_flag flag2)
 #define EFFECT_QP_ACT_IN_NTPHAND		311
 #define EFFECT_MUST_BE_SMATERIAL		312
 #define EFFECT_TO_GRAVE_REDIRECT_CB		313
-#define EFFECT_CHANGE_LEVEL_FINAL		314
-#define EFFECT_CHANGE_RANK_FINAL		315
+//#define EFFECT_CHANGE_LEVEL_FINAL		314
+//#define EFFECT_CHANGE_RANK_FINAL		315
 #define EFFECT_MUST_BE_FMATERIAL		316
 #define EFFECT_MUST_BE_XMATERIAL		317
 #define EFFECT_MUST_BE_LMATERIAL		318