Hub

- Tweaked: If Sheriff Greene in the Hub gets knocked out/down in the Decker fight, he will stand up again once back in his office.

Author: Lexx2k

Fallout2/Fallout1in2/Mapper/source/scripts/07bos/LARYKNIG.ssl

@@ -48,6 +48,8 @@ procedure start begin
       set_self_team(TEAM_BROTHERHOOD);
       set_self_ai(AI_BROTHERHOOD_KNIGHT);
    end
+
+   if not(fo1in2_cut_characters_enabled) then destroy_object(self_obj);
 end
 
 procedure combat begin

Fallout2/Fallout1in2/Mapper/source/scripts/11cathedral/MASTER.ssl

@@ -371,7 +371,7 @@ procedure master09 begin
    Reply(130);
    BOption(131, master203, 5);// <-- Combat trigger [mastercbt]
    NOption(132, master10, 6);
-   if (global_var(GVAR_VREEDISK_HOLODISK_USED) == 1) or (global_var(GVAR_VREE_GIVEN_DUDE_AUTOPSY) > 0) then begin// USED_DISK, DISK_REBUILT, DISK_GIVEN
+   if (global_var(GVAR_VREEDISK_HOLODISK_USED) == 1) or (global_var(GVAR_VREE_GIVEN_DUDE_AUTOPSY) > 0) then begin
       NOption(133, master11, 7);
    end
 end

Fallout2/Fallout1in2/Mapper/source/scripts/99map/HUBDWNTN.ssl

@@ -62,6 +62,13 @@ procedure map_update_p_proc begin
       gfade_out(1);
          if not(is_loading_game) then begin  set_obj_invisible(Fry_Stub_Ptr); end
          if (global_var(GVAR_GREENE_DEAD) != 1) then begin
+            // If the sheriff got knocked down, make him stand up again
+            if (((critter_state(Justin_Ptr) bwand DAM_KNOCKED_DOWN) == true) OR ((critter_state(Justin_Ptr) bwand DAM_KNOCKED_OUT) == true)) then begin
+               critter_uninjure(Justin_Ptr, DAM_KNOCKED_DOWN);
+               critter_uninjure(Justin_Ptr, DAM_KNOCKED_OUT);
+               reg_anim_clear(Justin_Ptr);
+            end
+
             move_to(Justin_Ptr, justin_office_hex, 0);
             obj_rotate(Justin_Ptr, 3);
             set_team(Justin_Ptr, TEAM_HUB_SHERIFF);