Merge pull request #1041 from salix5/patch1

fix: processor

ocgcore/processor.cpp

@@ -3043,7 +3043,7 @@ int32 field::process_battle_command(uint16 step) {
 	}
 	case 6: {
 		if(returns.ivalue[0] == -1) {
-			//roolback
+			//rollback
 			if(core.units.begin()->arg1) {
 				core.attacker->announce_count++;
 				if(core.attack_target)
@@ -3783,14 +3783,14 @@ int32 field::process_battle_command(uint16 step) {
 		return FALSE;
 	}
 	case 30: {
-		raise_single_event(core.attacker, 0, EVENT_BATTLE_END, 0, 0, PLAYER_NONE, 0, 0);
-		if(core.attack_target)
-			raise_single_event(core.attack_target, 0, EVENT_BATTLE_END, 0, 0, PLAYER_NONE, 0, 1);
-		raise_event((card*)0, EVENT_BATTLE_END, 0, 0, PLAYER_NONE, 0, 0);
-		process_single_event();
-		process_instant_event();
+		//raise_single_event(core.attacker, 0, EVENT_BATTLE_END, 0, 0, PLAYER_NONE, 0, 0);
+		//if(core.attack_target)
+		//	raise_single_event(core.attack_target, 0, EVENT_BATTLE_END, 0, 0, PLAYER_NONE, 0, 1);
+		//raise_event((card*)0, EVENT_BATTLE_END, 0, 0, PLAYER_NONE, 0, 0);
+		//process_single_event();
+		//process_instant_event();
 		if(!core.effect_damage_step || ((core.effect_damage_step != 3) && (core.current_chain.size() <= 1))) {
-			add_process(PROCESSOR_POINT_EVENT, 0, 0, 0, FALSE, TRUE);
+			//add_process(PROCESSOR_POINT_EVENT, 0, 0, 0, FALSE, TRUE);
 			core.units.begin()->arg1 = 1;
 		} else {
 			break_effect();

script/constant.lua

@@ -505,10 +505,10 @@ EVENT_CONTROL_CHANGED			=1120	--控制权变更
 EVENT_EQUIP						=1121	--装备卡装备时
 EVENT_ATTACK_ANNOUNCE			=1130	--攻击宣言时
 EVENT_BE_BATTLE_TARGET			=1131	--被选为攻击对象时
-EVENT_BATTLE_START				=1132	--战斗阶段开始时
-EVENT_BATTLE_CONFIRM			=1133	--选完攻击对象时
-EVENT_PRE_DAMAGE_CALCULATE		=1134	--伤害计算前
-EVENT_DAMAGE_CALCULATING		=1135	--伤害计算时
+EVENT_BATTLE_START				=1132	--伤害步骤开始时（反转前）
+EVENT_BATTLE_CONFIRM			=1133	--伤害计算前（反转後）
+EVENT_PRE_DAMAGE_CALCULATE		=1134	--伤害计算时（羽斬）
+EVENT_DAMAGE_CALCULATING		=1135	--伤害计算时（摩天樓）
 EVENT_PRE_BATTLE_DAMAGE			=1136	--即将产生战斗伤害
 EVENT_BATTLE_END				=1137	--战斗结束（开辟）
 EVENT_BATTLED					=1138	--伤害计算后（异女、同反转效果时点）