fallout2sfall/sfall
0
0
Fork 0
mirror of https://github.com/sfall-team/sfall.git synced 2026-07-27 16:52:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added an optional bug fix for the car charging issues, and made some changes in the wording.

Browse Source 
Fixed the incorrect setting in CriticalOverrides.ini.
Updated version number for 3.7 release.
Unified tab/spaces usage, tweaked some typesettings, and trimmed trailing spaces in documents.
This commit is contained in:
NovaRain
2015-10-27 12:26:01 +08:00
parent 017b958b69
commit c34dc2700a
10 changed files with 172 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/config_files/CriticalOverrides.ini
+2 -2
View File
@@ -8,9 +8,9 @@
[c_00] ; The entries for the 'men' critter type
Enabled=1 ; Tell sfall that we want to modify this table
Part0=1 ; Tell sfall that we want to modify the head entries
Part_0=1 ; Tell sfall that we want to modify the head entries
; If we had set 'Enabled=2' then sfall will assume you want to modify all
; parts, and will not check the PartX entries
; parts, and will not check the Part_X entries
[c_00_0] ; The entries for the head table of the men critter type.
e0_DamageMultiplier=100 ;First level critical
artifacts/config_files/readme.txt
+4 -4
View File
@@ -1,9 +1,9 @@
sfall's main configuration options appear in ddraw.ini, but there are several other configuration files that it can read in for modding purposes.
books.ini: Lets you override/add books to the game (associated PIDs, skills and messages)
perks.ini: Lets you override the name/description/frm image/other stats of perks and traits
elevators.ini: Lets you override which elevators lead where
Books.ini: Lets you override/add books to the game (associated object PIDs, skills and text messages)
Perks.ini: Lets you override the name/description/frm image/other stats of perks and traits
Elevators.ini: Lets you override which elevators lead where
CriticalOverrides.ini: Lets you make modifications to the critical hit tables
Translations.ini: Contains some text strings which sfall displays, to allow their translation
Skills.ini: Lets you change the formula used for calculating skills
stats.ini: Lets you change the formula used to calculate the derived stats
Stats.ini: Lets you change the formula used to calculate the derived stats
artifacts/ddraw.ini
+28 -25
View File
@@ -17,7 +17,7 @@ NumSoundBuffers=0
;Set to 1 to allow attaching sound files to combat float messages
AllowSoundForFloats=1
;Set to 1 to automatically search for alternative formats when fallout tries to play an acm
;Set to 1 to automatically search for alternative formats when Fallout tries to play an acm
;This does not effect the play_sfall_sound and stop_sfall_sound script functions
AllowDShowSound=0
@@ -56,7 +56,7 @@ Mode=0
;If using a dx9 mode, this changes the resolution
;The graphics are simply stretched to fit the new window; this does _not_ let you see more of the map
;If set to 0, use fallout's native resolution
;If set to 0, use Fallout's native resolution
GraphicsWidth=0
GraphicsHeight=0
@@ -82,7 +82,7 @@ UseScrollWheel=1
ScrollMod=0
;Adjusts mouse sensitivity to some percentage of normal.
;Negative values are valid, if you want your mouse axis reversed for some reason
;Negative values are valid if you want your mouse axis reversed for some reason
MouseSensitivity=100
;DX scancode of a key to press when the middle mouse button is clicked
@@ -93,7 +93,7 @@ MiddleMouse=0x30
;Set to 1 to reverse the left and right mouse buttons
ReverseMouseButtons=0
;Set these to 1 if you want fallout to access the keyboard or mouse in background mode
;Set these to 1 if you want Fallout to access the keyboard or mouse in background mode
;Try these if you get the 'Failure initializing input devices' error
BackgroundKeyboard=0
BackgroundMouse=0
@@ -147,7 +147,7 @@ DebugEditorKey=0
;Set to 0 if you want to die the instant you leave arroyo
;Set to -1 to remove the time limit, and automatically reset the date back to 2241 each time you would have reached it
;Set to -2 to remove the time limit without resetting the date. The game will lock up on 8th of March 2255
;Set to -3 to remove the time limit, automatically reset the date, but override fallouts GetDate function to return the correct year
;Set to -3 to remove the time limit, automatically reset the date, but override Fallout's GetDate function to return the correct year
TimeLimit=13
;World map travel time percentage modifier
@@ -158,7 +158,7 @@ WorldMapTimeMod=100
;Set to 1 to enable functions relating to overriding the file system
UseFileSystemOverride=0
;Set to 1 to use the fallout 1 code to control world map speed
;Set to 1 to use the Fallout 1 code to control world map speed
WorldMapFPSPatch=1
;Controls the world map speed if WorldMapFPSPatch is 1. Higher values cause slower movement
@@ -169,7 +169,7 @@ WorldMapDelay2=66
;XX ;This will change the physical speed at which you move across the map
;XX ;Set to 0 to leave at the default. (i.e. limited by vwait in windowed mode, or by processor speed in fullscreen)
;XX ;If set to something other than 0, it enforces a maximum fps on the world map screen.
;XX ;Changing this to something other than 0 is not recommended if you've already applied a world map speed patch to your fallout exe.
;XX ;Changing this to something other than 0 is not recommended if you've already applied a world map speed patch to your Fallout exe.
;XX WorldMapFPS=0
;XX
;XX ;Only set to 1 if your systems high performance timer is unreliable for some reason
@@ -192,10 +192,10 @@ WorldMapSlots=0
;StartingMap=
;To change the 'FALLOUT II v1.02d' version string on the main menu, uncomment the next line
;You can use up to 2 %d's in this, if you want to include fallouts version number somewhere
;You can use up to 2 %d's in this if you want to include Fallout's version number somewhere
;VersionString=
;To use a config file other than fallout.cfg, uncomment the next line and add the name of your new file
;To use a config file other than fallout2.cfg, uncomment the next line and add the name of your new file
;ConfigFile=
;To use a patch file other than patch000.dat, uncomment the next line and add your new file name
@@ -261,7 +261,7 @@ ExtraKillTypes=0
;0 - Fallout default
;1 - Glovz's Damage Fix
;2 - Glovz's Damage Fix with Damage Multiplier tweak
;4 - Jim's Formula
;4 - Jim's Formula for the Mechanics Overhaul Mod
;5 - Haenlomal's Yet Another Ammo Mod.
DamageFormula=0
@@ -282,7 +282,7 @@ StartYPos=-1
ViewXPos=-1
ViewYPos=-1
;Set to 1 for force fallout not to use multiple processor cores even if they are available
;Set to 1 to force Fallout not to use multiple processor cores even if they are available
SingleCore=1
;Set to 1 to override the art_chache_size setting in fallout2.cfg
@@ -432,7 +432,7 @@ NPCStage6Fix=0
;Set to 1 to fix the problem with melee weapon equiped npcs being unable to attack multi-hex critters
MultiHexPathingFix=1
;Change the colour of the font used on the main menu for the fallout/sfall version number
;Change the colour of the font used on the main menu for the Fallout/sfall version number
;It's the last byte ('3c' by default,) that picks the colour used. The first byte supplies additional flags
;MainMenuFontColour=0x0600003c
@@ -538,7 +538,7 @@ ControlCombat=0
StackEmptyWeapons=0
;Allows 9 options (lines of text) to be displayed correctly in a dialog window
DialogOptions9Lines=1
DialogOptions9Lines=0
;Prevents 'Too Many Items' bug from corrupting game saves
@@ -553,49 +553,52 @@ InventoryDragIssuesFix=1
NPCDrugAddictionFix=1
;Set to 1 to fix issues with NPC stats being dropped unreasonably if one has mutiple of the same armor in inventory and equips the armor,
;And either you order NPC to take off armor via dialog option or one levels up
;And either you order NPC to remove the armor through dialog or one levels up
ArmorCorruptsNPCStatsFix=1
;Set to 1 to fix the bug that if you move to another map while NPCs are under 'lost next turn' critical miss effect, they become unresponsive and act like walking containers
;Set to 1 to fix the bug that NPCs become unresponsive and act like walking containers if you move to another map while they are under 'lost next turn' critical miss effect
NPCTurnsIntoContainerFix=1
;Set to 1 to fix issues with being able to charge the car with using cells on scenary/critters and cells getting consumed even when the car is already fully charged
CarChargingFix=1
;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
[Debugging]
;Extra sfall configuration settings that can be used by the modders version of sfall
;Extra sfall configuration settings that can be used by modders
;This section is not effected by the 'UseCommandLine' option. It will always be read from the main ini
;Set to 1 to enable debugging mode
;Set to 1 to enable sfall debugging mode
Enable=0
;Set to 1 to enable debugging output to screen or 2 to create a debug.log file
;While you don't need to create an environment variable, you do still need to set the appropriate lines in fallout.cfg
;While you don't need to create an environment variable, you do still need to set the appropriate lines in fallout2.cfg
DebugMode=0
;Change to 1 to skip the compatibility mode check
SkipCompatModeCheck=1
SkipCompatModeCheck=0
;Set to 1 to skip the executable file size check
SkipSizeCheck=0
;If you're testing changes to the fallout exe, you can override the crc that sfall looks for here
;If you're testing changes to the Fallout exe, you can override the crc that sfall looks for here
;You can use several hex values, separated by commas
;ExtraCRC=0x00000000,0x00000000
;Set to 1 to stop fallout from deleting non readonly protos at startup
;Set to 1 to stop Fallout from deleting non readonly protos at startup
;Has pretty nasty side effects when saving/reloading, so don't use for regular gameplay
DontDeleteProtos=0
;Set to 1 to give scripts direct access to fallouts address space, and to make arbitrary calls into fallout's code
AllowUnsafeScripting=1
;Set to 1 to give scripts direct access to Fallout's address space, and to make arbitrary calls into Fallout's code
AllowUnsafeScripting=0
;These options control what output is saved in the debug log
;Prints messages duing sfall initialization
Init=1
Init=0
;Prints messages relating to hook scripts
Hook=0
;Prints messages relating to scripting
Script=0
;Prints messages relating to the critical table
Criticals=1
Criticals=0
artifacts/scripting/headers/define_extra.h
+2 -3
View File
@@ -24,7 +24,7 @@
#define CFLG_BARTER 2 //0x00000002 - Barter (can trade with)
#define CFLG_NOSTEAL 32 //0x00000020 - Steal (cannot steal from)
#define CFLG_NODROP 64 //0x00000040 - Drop (doesn't drop items)
#define CFLG_NOLIMBS 128 //0x00000080 - Limbs (can not lose limbs)
#define CFLG_NOLIMBS 128 //0x00000080 - Limbs (cannot lose limbs)
#define CFLG_NOAGES 256 //0x00000100 - Ages (dead body does not disappear)
#define CFLG_NOHEAL 512 //0x00000200 - Heal (damage is not cured with time)
#define CFLG_INVULN 1024 //0x00000400 - Invulnerable (cannot be hurt)
@@ -40,7 +40,7 @@
#define RMOBJ_EQUIP_ARMOR 4658121
#define RMOBJ_EQUIP_WEAPON 4658675
#define RMOBJ_UNLOAD_WEAPON 4667030
//#definE RMOBJ_LOAD_WEAPON 4831349 // same as RMOBJ_DROP
//#define RMOBJ_LOAD_WEAPON 4831349 // same as RMOBJ_DROP
#define RMOBJ_USE_DRUG_ON 4834866
#define RMOBJ_STEAL_VIEW 4668206
//#define RMOBJ_DROP_DYNAMITE 4666865 // same as USE_OBJ
@@ -139,7 +139,6 @@
#define PROTO_DR_ADDICT_PERK (96)
#define PROTO_DR_ADDICT_DELAY (100)
// critters
#define PROTO_CR_ACTION_FLAGS (32)
#define PROTO_CR_HEAD_FID (40)
artifacts/scripting/headers/sfall.h
+1 -2
View File
@@ -89,7 +89,7 @@
#define VALTYPE_FLOAT (2)
#define VALTYPE_STR (3)
// Arrays defines
//Arrays defines
// create persistent list
#define create_array_list(size) (create_array(size, 0))
@@ -187,4 +187,3 @@
#define party_member_list_critters party_member_list(0)
#define party_member_list_all party_member_list(1)
sfall/AmmoMod.cpp
+1 -1
View File
@@ -408,7 +408,7 @@ end:
}
}
// Jim's Formula
// Jim's Formula for the Mechanics Overhaul Mod
static __declspec(naked) void DamageFunction4() {
__asm {
mov eax,dword ptr ds:[esi+0x8]; // Get pointer to critter's weapon
sfall/Bugs.cpp
+36 -35
View File
@@ -4,7 +4,7 @@
#include "Define.h"
#include "FalloutEngine.h"
DWORD WeightOnBody = 0;
//DWORD WeightOnBody = 0;
static void __declspec(naked) SharpShooterFix() {
__asm {
@@ -70,23 +70,21 @@ skip:
}
}
/*
static void __declspec(naked) protinst_default_use_item_hook() {
static void __declspec(naked) protinst_default_use_item_hack() {
__asm {
mov eax, dword ptr [edx+0x64] // eax = target pid
cmp eax, PID_DRIVABLE_CAR
je itsCar
je isCar
cmp eax, PID_CAR_TRUNK
jne noCar
itsCar:
jne notCar
isCar:
mov eax, ebx
call obj_use_power_on_car_
cmp eax, -1
jne skip
noCar:
notCar:
mov eax, 0x49C38B
jmp eax // "This does nothing."
jmp eax // "That does nothing."
skip:
test eax, eax
jnz end
@@ -97,19 +95,17 @@ end:
}
}
static void __declspec(naked) obj_use_power_on_car_hook() {
static void __declspec(naked) obj_use_power_on_car_hack() {
__asm {
xor eax, eax
cmp ebx, 596 // "Battery is fully charged."?
cmp ebx, 596 // "The car is already full of power."?
je skip // Yes
inc eax // "You charge the car's battery."
inc eax // "You charge the car with more power."
skip:
retn
}
}
*/
static void __declspec(naked) item_d_check_addict_hack() {
__asm {
mov edx, 2 // type = addiction
@@ -697,49 +693,54 @@ void BugsInit()
SafeWrite8(0x424527, 0xEB); // in detemine_to_hit_func_()
dlogr(" Done", DL_INIT);
// Fixes for clickability issue in PipBoy and exploit that allows to rest in places where you shouldn't be able to rest
dlog("Applying Fix PipBoy Rest exploit.", DL_INIT);
// Fixes for clickability issue in Pip-Boy and exploit that allows to rest in places where you shouldn't be able to rest
dlog("Applying fix for Pip-Boy rest exploit.", DL_INIT);
MakeCall(0x4971C7, &pipboy_hack, false);
MakeCall(0x499530, &PipAlarm_hack, false);
dlogr(" Done.", DL_INIT);
// Fix for "Too Many Items Bug"
// Fix for "Too Many Items" bug
if (GetPrivateProfileIntA("Misc", "TooManyItemsBugFix", 1, ini)) {
dlog("Applying preventive patch for \"Too Many Items Bug\".", DL_INIT);
dlog("Applying preventive patch for \"Too Many Items\" bug.", DL_INIT);
HookCall(0x4A596A, &scr_write_ScriptNode_hook);
HookCall(0x4A59C1, &scr_write_ScriptNode_hook);
dlogr(" Done.", DL_INIT);
}
// Fix "fueling" no_car and using fuel cells even when car is full
/*MakeCall(0x49C36D, &protinst_default_use_item_hook, true);
MakeCall(0x49BE70, &obj_use_power_on_car_hook, false);*/
// Fixes for being able to charge the car with using cells on scenary/critters
// and cells getting consumed even when the car is already fully charged
if (GetPrivateProfileIntA("Misc", "CarChargingFix", 1, ini)) {
dlog("Applying car charging issues fix.", DL_INIT);
MakeCall(0x49C36D, &protinst_default_use_item_hack, true);
MakeCall(0x49BE70, &obj_use_power_on_car_hack, false);
dlogr(" Done.", DL_INIT);
}
// makes jet addiction eternal.. why?
//MakeCall(0x47A3A4, &item_wd_process_hook, false);
// Fix increasing stats more than two times via drug use after save-load
dlog("Applying save-load unlimited drug use exploit.", DL_INIT);
// Fix for gaining stats from more than two doses of a specific chem after save-load
dlog("Applying fix for save-load unlimited drug use exploit.", DL_INIT);
MakeCall(0x47A243, &item_d_load_hack, false);
dlogr(" Done.", DL_INIT);
// Fix crash when using stimpak on a victim and then exiting the map
dlog("Applying Fix for \"using stimpak on a victim and exiting the map\" crash.", DL_INIT);
// Fix crash when leaving the map while waiting for someone to die of a super stimpak overdose
dlog("Applying fix for \"leaving the map while waiting for a super stimpak overdose death\" crash.", DL_INIT);
HookCall(0x4A27E7, &queue_clear_type_mem_free_hook); // hooks mem_free_()
dlogr(" Done.", DL_INIT);
// Evil bug! If party member has the same armor type in inventory as currently equipped, then
// on level up he loses Armor Class equal to the one received from this armor.
// The same happens if you just order NPC to remove armor through dialog.
// The same happens if you just order NPC to remove the armor through dialog.
if (GetPrivateProfileIntA("Misc", "ArmorCorruptsNPCStatsFix", 1, ini)) {
dlog("Applying Fix for armor decreasing NPC stats when removed.", DL_INIT);
dlog("Applying fix for armor reducing NPC original stats when removed.", DL_INIT);
HookCall(0x495F3B, &partyMemberCopyLevelInfo_stat_level_hook);
HookCall(0x45419B, &correctFidForRemovedItem_adjust_ac_hook);
dlogr(" Done.", DL_INIT);
}
// Fix of invalid stats when party member gains a level while being on drugs
dlog("Applying Fix for addicted party member level up bug.", DL_INIT);
dlog("Applying fix for addicted party member level up bug.", DL_INIT);
HookCall(0x495D5C, &partyMemberCopyLevelInfo_hook);
dlogr(" Done.", DL_INIT);
@@ -750,13 +751,13 @@ void BugsInit()
dlogr(" Done.", DL_INIT);
}
// Fix for "Unlimited Ammo bug"
dlog("Applying Fix for Unlimited Ammo bug.", DL_INIT);
// Fix for "Unlimited Ammo" bug
dlog("Applying fix for Unlimited Ammo bug.", DL_INIT);
HookCall(0x472957, &invenWieldFunc_item_get_type_hook); // hooks item_get_type_()
dlogr(" Done.", DL_INIT);
// Fix for negative values in Skilldex window ("S")
dlog("Applying Fix for negative values in Skilldex window.", DL_INIT);
dlog("Applying fix for negative values in Skilldex window.", DL_INIT);
SafeWrite8(0x4AC377, 0x7F); // jg
dlogr(" Done.", DL_INIT);
@@ -789,7 +790,7 @@ void BugsInit()
HookCall(0x497D0F, &PipStatus_AddHotLines_hook);
dlogr(" Done", DL_INIT);
dlog("Applying withdrawal perk description crash fix. ", DL_INIT);
dlog("Applying withdrawal perk description crash fix.", DL_INIT);
HookCall(0x47A501, &perform_withdrawal_start_display_print_hook);
dlogr(" Done", DL_INIT);
@@ -806,7 +807,7 @@ void BugsInit()
dlogr(" Done.", DL_INIT);
}
dlog("Applying shiv patch. ", DL_INIT);
dlog("Applying shiv patch.", DL_INIT);
SafeWrite8(0x477B2B, 0xEB);
dlogr(" Done", DL_INIT);
@@ -822,9 +823,9 @@ void BugsInit()
MakeCall(0x411BCC, &action_ranged_hack, true);
dlogr(" Done", DL_INIT);
// Corrects "NPC turns into a container"
// Fix for "NPC turns into a container"
if (GetPrivateProfileIntA("Misc", "NPCTurnsIntoContainerFix", 1, ini)) {
dlog("Applying Fix for NPC turns into a container.", DL_INIT);
dlog("Applying fix for \"NPC turns into a container\" bug.", DL_INIT);
MakeCall(0x424F8E, &set_new_results_hack, false);
MakeCall(0x42E46E, &critter_wake_clear_hack, true);
MakeCall(0x488EF3, &obj_load_func_hack, true);
sfall/version.h
+5 -5
View File
@@ -21,13 +21,13 @@
#define TARGETVERSION "Fallout 2 v1.02 US"
#define VERSION_MAJOR 3
#define VERSION_MINOR 6
#define VERSION_BUILD 999
#define VERSION_REV 8
#define VERSION_MINOR 7
#define VERSION_BUILD 0
#define VERSION_REV 0
#ifdef WIN2K
#define VERSION_STRING "3.7 alpha8 win2k"
#define VERSION_STRING "3.7 win2k"
#else
#define VERSION_STRING "3.7 alpha8"
#define VERSION_STRING "3.7"
#endif
#define CHECK_VAL (4)