Skip to content

Commit e29dba6

Browse files
authored
Some cleanup (#224)
1 parent c1f084b commit e29dba6

File tree

1 file changed

+3
-6
lines changed
  • Fallout2/Fallout1in2/Mapper/source/scripts/06hub

1 file changed

+3
-6
lines changed

Fallout2/Fallout1in2/Mapper/source/scripts/06hub/HBETH.ssl

+3-6
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ procedure Beth15 begin
392392
set_global_var(GVAR_DECKER_KNOWN, 1);
393393
Reply(151);
394394
NOption(152, Beth16, 4);
395-
if ((map_var(MVAR_DECKER_JOB_STATUS) >= 4) or (map_var(MVAR_DECKER_JOB_STATUS) >= 4)) then begin
395+
if (map_var(MVAR_DECKER_JOB_STATUS) >= 4) then begin
396396
BOption(153, Beth15a, 4);
397397
end
398398
NOption(154, BethEnd, 4);
@@ -406,7 +406,7 @@ end
406406
procedure Beth16 begin
407407
set_map_var(MVAR_BETH_TALKED_ABOUT_FRIEND, 1);
408408
Reply(155);
409-
if ((map_var(MVAR_DECKER_JOB_STATUS) >= 5) or (map_var(MVAR_DECKER_JOB_STATUS) >= 5)) then begin
409+
if (map_var(MVAR_DECKER_JOB_STATUS) >= 5) then begin
410410
BOption(156, Beth16a, 4);
411411
end
412412
NOption(157, Beth17, 4);
@@ -810,10 +810,7 @@ end
810810

811811
procedure Beth64 begin
812812
if ((dude_charisma >= 7) and (dude_is_male)) then begin
813-
if ((((GAME_TIME_IN_HOURS) - local_var(11)) <= 1) and (dude_is_female)) then begin
814-
Reply(mstr(random(311, 314)) + " " + mstr(315));
815-
end
816-
else if (((GAME_TIME_IN_HOURS) - local_var(11)) <= 1) then begin
813+
if (((GAME_TIME_IN_HOURS) - local_var(11)) <= 1) then begin
817814
Reply(mstr(random(311, 314)) + " " + mstr(316));
818815
end
819816
else if ((((GAME_TIME_IN_HOURS) - local_var(11)) > 1) and (((GAME_TIME_IN_HOURS) - local_var(11)) <= 96)) then begin

0 commit comments

Comments
 (0)