diff --git a/objects/obj_ncombat/Alarm_7.gml b/objects/obj_ncombat/Alarm_7.gml index e4772a5270..51a2a62f2a 100644 --- a/objects/obj_ncombat/Alarm_7.gml +++ b/objects/obj_ncombat/Alarm_7.gml @@ -286,14 +286,22 @@ try { }; } if ((dropping+attacking=0)) and (string_count("_attack",battle_special)=0) and (string_count("mech",battle_special)=0) and (string_count("ruins",battle_special)=0) and (battle_special!="ship_demon") and (string_count("cs_meeting",battle_special)=0){ - - var yeehaw1=obj_turn_end.battle_object[obj_turn_end.current_battle]; - yeehaw1.p_player[obj_turn_end.battle_world[obj_turn_end.current_battle]]-=world_size; - if (defeat=1) then yeehaw1.p_player[obj_turn_end.battle_world[obj_turn_end.current_battle]]=0; - obj_controller.combat=0; - with(obj_turn_end){ - alarm[4]=1; + if (instance_exists(obj_turn_end)){ + var _battle_index = obj_turn_end.current_battle; + if (_battle_index0) and (defeat=1){