Merge pull request #5 from NovaRain/pixote-map-update

Misc fixes for map update branch
phobos2077 · Dec 11, 2023 · c115d5a · c115d5a
2 parents cee4268 + 84f0be2
commit c115d5a
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 3 deletions.
diff --git a/data/art/inven/gizgun1.frm b/data/art/inven/gizgun1.frm
diff --git a/data/art/inven/hrifle.frm b/data/art/inven/hrifle.frm
diff --git a/data/art/inven/hrifle2.frm b/data/art/inven/hrifle2.frm
diff --git a/data/art/inven/sniper.frm b/data/art/inven/sniper.frm
diff --git a/scripts_src/den/dctyler.ssl b/scripts_src/den/dctyler.ssl
@@ -436,10 +436,10 @@ procedure Node011 begin
    set_lockout_timer
    if (dude_is_male) then begin
       Reply(300);
-      BOption(302, Node998, 004);
+      BOption(303, Node998, 004);
    end else begin
       Reply(301);
-      BOption(303, Node998, 004);
+      BOption(302, Node998, 004);
    end
    NOption(304, Node999, 004);
 end

diff --git a/scripts_src/sanfran/fcdokgrd.ssl b/scripts_src/sanfran/fcdokgrd.ssl
@@ -196,7 +196,9 @@ procedure destroy_p_proc begin
    inc_good_critter
    boatGrd_ptr := 0;
    set_map_var(MVAR_Use_Motor_Boat,0);
-   set_sub_flag(SHI_SUB_ALONE);
+   if (global_var(GVAR_SAN_FRAN_SUB) < SHI_SUB_DISABLED) then begin
+      set_sub_flag(SHI_SUB_ALONE);
+   end
 /* Set global_variable for Enemy status*/
 end