fix

ocgcore/processor.cpp

@@ -3749,32 +3749,32 @@ 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();
-		}*/
+		}
 		return FALSE;
 	}
 	case 31: {
 		core.flip_delayed = FALSE;
 		core.new_fchain.splice(core.new_fchain.begin(), core.new_fchain_b);
 		core.new_ochain.splice(core.new_ochain.begin(), core.new_ochain_b);
-		//if(core.units.begin()->arg1) {
+		if(core.units.begin()->arg1) {
 			raise_single_event(core.attacker, 0, EVENT_BATTLED, 0, 0, PLAYER_NONE, 0, 0);
 			if(core.attack_target)
 				raise_single_event(core.attack_target, 0, EVENT_BATTLED, 0, 0, PLAYER_NONE, 0, 1);
 			raise_event((card*)0, EVENT_BATTLED, 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))) {
 			if(core.new_fchain.size() || core.new_ochain.size())
 				add_process(PROCESSOR_POINT_EVENT, 0, 0, 0, FALSE, FALSE);

script/constant.lua

@@ -508,8 +508,8 @@ 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_PRE_DAMAGE_CALCULATE		=1134	--伤害计算时（羽斬）
+EVENT_DAMAGE_CALCULATING		=1135	--伤害计算时（摩天樓）
 EVENT_PRE_BATTLE_DAMAGE			=1136	--即将产生战斗伤害
 EVENT_BATTLE_END				=1137	--战斗结束（开辟）
 EVENT_BATTLED					=1138	--伤害计算后（异女、同反转效果时点）