- Enabled auto-caps counter by default.

rotators · May 31, 2024 · 9b88cfc · 9b88cfc
1 parent 019ca8b
commit 9b88cfc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/Fallout2/Fallout1in2/Mapper/source/scripts/GlobalScripts/gl_worldmap.ssl b/Fallout2/Fallout1in2/Mapper/source/scripts/GlobalScripts/gl_worldmap.ssl
@@ -189,7 +189,7 @@ procedure Encounter_handler begin
       isSpecial := get_sfall_arg,
       encTable := get_sfall_arg;
 
-   set_global_var(GVAR_WORLDMAP_TABLE, (encTable - 19)); // ettu encounter tables are shifted, need to correct that
+   set_global_var(GVAR_WORLDMAP_TABLE, (encTable - 19)); // Fo1in2 encounter tables are shifted, need to correct that
    debug_yellow("Encounter table: " + global_var(GVAR_WORLDMAP_TABLE));
 
    // If the player enters a map on the worldmap, we set it depending on the current terrain type.

diff --git a/Fallout2/Fallout1in2/Mapper/source/scripts/headers/gl_worldmap.h b/Fallout2/Fallout1in2/Mapper/source/scripts/headers/gl_worldmap.h
@@ -1,12 +1,12 @@
 #pragma once
 
+/*
 #define WORLDMAP_TERRAIN_UNKNOWN  (0)
 #define WORLDMAP_TERRAIN_CITY     (1)
 #define WORLDMAP_TERRAIN_DESERT   (2)
 #define WORLDMAP_TERRAIN_MOUNTAIN (3)
 #define WORLDMAP_TERRAIN_OCEAN    (4)
 
-/*
 #define is_terrain_desert   (global_var(GVAR_WORLDMAP_TERRAIN) == WORLDMAP_TERRAIN_DESERT)
 #define is_terrain_city     (global_var(GVAR_WORLDMAP_TERRAIN) == WORLDMAP_TERRAIN_CITY)
 #define is_terrain_mountain (global_var(GVAR_WORLDMAP_TERRAIN) == WORLDMAP_TERRAIN_MOUNTAIN)

diff --git a/Fallout2/Fallout1in2/ddraw.fo1in2.ini b/Fallout2/Fallout1in2/ddraw.fo1in2.ini
@@ -117,6 +117,8 @@ MovieTimer_artimer2=5000
 MovieTimer_artimer3=5000
 MovieTimer_artimer4=5000
 
+ItemCounterAutoCaps=1
+
 DeathScreenFontPatch=1
 
 DisableSpecialMapIDs=1

diff --git a/Fallout2/Fallout1in2/ddraw.ini b/Fallout2/Fallout1in2/ddraw.ini
@@ -663,7 +663,7 @@ ItemCounterDefaultMax=0
 
 ;Set to 1 to enable money/caps auto-balancing in the barter screen
 ;When moving money/caps to or from the table, the 'Move Items' window will be pre-filled with the correct balancing amount
-ItemCounterAutoCaps=0
+ItemCounterAutoCaps=1
 
 ;Set to 1 to leave the music playing in dialogue with talking heads
 EnableMusicInDialogue=0