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

Fixed NPCAutoLevel and set_npc_level opcode

Browse Source 
- Now properly doesn't shift first level up too early and doesn't set "early" flag
- Fixed using set_npc_level without disabling engine leveling logic
- Renamed to PartyMemberNoEarlyLevelUpPatch to match behavior
This commit is contained in:
NovaRain
2024-06-02 08:43:38 +08:00
parent ca42b01193
commit 181560265f
4 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/ddraw.ini
+3 -3
View File
@@ -386,9 +386,9 @@ TownMapHotkeysFix=1
;Set to 1 to disable the Horrigan encounter ;Set to 1 to disable the Horrigan encounter
DisableHorrigan=0 DisableHorrigan=0
;Set to 1 to disable the random element in NPC levelling ;Set to 1 to disable the random element in party member leveling
;This will cause all NPC party members to automatically level up as soon as the player reaches the requirements ;This will prevent party members from randomly leveling up 'earlier' and instead level them up at defined regular intervals
NPCAutoLevel=0 PartyMemberNoEarlyLevelUp=0
;Change the initial starting location and world map viewport ;Change the initial starting location and world map viewport
;Leave at -1 for default ;Leave at -1 for default
sfall/Modules/PartyControl.cpp
+6 -7
View File
@@ -28,7 +28,6 @@
namespace sfall namespace sfall
{ {
bool npcAutoLevelEnabled;
bool npcEngineLevelUp = true; bool npcEngineLevelUp = true;
static bool isControllingNPC = false; static bool isControllingNPC = false;
@@ -692,11 +691,11 @@ void PartyControl::OrderAttackPatch() {
orderAttackPatch = true; orderAttackPatch = true;
} }
static void NpcAutoLevelPatch() { static void PartyMemberNoEarlyLevelUpPatch() {
npcAutoLevelEnabled = IniReader::GetConfigInt("Misc", "NPCAutoLevel", 0) != 0; if (IniReader::GetConfigInt("Misc", "PartyMemberNoEarlyLevelUp", 0)) {
if (npcAutoLevelEnabled) { dlogr("Applying no early level-up patch for party members.", DL_INIT);
dlogr("Applying NPC autolevel patch.", DL_INIT); __int64 data = 0x014FE9; // jmp 0x495E51
SafeWrite8(0x495CFB, CodeType::JumpShort); // jmps 0x495D28 (skip random check) SafeWriteBytes(0x495CFD, (BYTE*)&data, 5);
} }
} }
@@ -725,7 +724,7 @@ void PartyControl::init() {
const DWORD switchHandAddr[] = {0x4712E3, 0x47136D}; // left slot, right slot const DWORD switchHandAddr[] = {0x4712E3, 0x47136D}; // left slot, right slot
HookCalls(inven_pickup_hook, switchHandAddr); // will be overwritten if HOOK_INVENTORYMOVE is injected HookCalls(inven_pickup_hook, switchHandAddr); // will be overwritten if HOOK_INVENTORYMOVE is injected
NpcAutoLevelPatch(); PartyMemberNoEarlyLevelUpPatch();
// Display party member's current level & AC & addict flag // Display party member's current level & AC & addict flag
if (IniReader::GetConfigInt("Misc", "PartyMemberExtraInfo", 0)) { if (IniReader::GetConfigInt("Misc", "PartyMemberExtraInfo", 0)) {
sfall/Modules/PartyControl.h
-1
View File
@@ -44,7 +44,6 @@ public:
static void OrderAttackPatch(); static void OrderAttackPatch();
}; };
extern bool npcAutoLevelEnabled;
extern bool npcEngineLevelUp; extern bool npcEngineLevelUp;
} }
sfall/Modules/Scripting/Handlers/Objects.cpp
+7 -7
View File
@@ -54,10 +54,9 @@ static void __cdecl IncNPCLevel(const char* fmt, const char* name) {
SafeMemSet(0x495C77, CodeType::Nop, 6); // Check that the player is high enough for the npc to consider this level SafeMemSet(0x495C77, CodeType::Nop, 6); // Check that the player is high enough for the npc to consider this level
//SafeMemSet(0x495C8C, CodeType::Nop, 6); // Check that the npc isn't already at its maximum level //SafeMemSet(0x495C8C, CodeType::Nop, 6); // Check that the npc isn't already at its maximum level
SafeMemSet(0x495CEC, CodeType::Nop, 6); // Check that the npc hasn't already levelled up recently SafeMemSet(0x495CE3, CodeType::Nop, 5); // Check if npc had "early" level up before the next scheduled one, resets the "early" flag
if (!npcAutoLevelEnabled) { SafeMemSet(0x495CEC, CodeType::Nop, 6); // Related to above
SafeWrite8(0x495CFB, CodeType::JumpShort); // Disable random element SafeWrite8(0x495CFB, CodeType::JumpShort); // Skip random roll for early level up
}
__asm mov dword ptr [ebp + 0x150 - 0x28 + 16], 255; // set counter for exit loop __asm mov dword ptr [ebp + 0x150 - 0x28 + 16], 255; // set counter for exit loop
} else { } else {
if (!onceNpcLoop) { if (!onceNpcLoop) {
@@ -78,16 +77,17 @@ void op_inc_npc_level(OpcodeContext& ctx) {
onceNpcLoop = false; onceNpcLoop = false;
// restore code // restore code
SafeWrite32(0x495BF1 + 1, 0x031352); // restore debug_printf call
SafeWrite32(0x495C50, 0x01FB840F); SafeWrite32(0x495C50, 0x01FB840F);
__int64 data = 0x01D48C0F; __int64 data = 0x01D48C0F;
SafeWriteBytes(0x495C77, (BYTE*)&data, 6); SafeWriteBytes(0x495C77, (BYTE*)&data, 6);
//SafeWrite16(0x495C8C, 0x8D0F); //SafeWrite16(0x495C8C, 0x8D0F);
//SafeWrite32(0x495C8E, 0x000001BF); //SafeWrite32(0x495C8E, 0x000001BF);
data = 0x0130850F; data = 0x0169E9;
SafeWriteBytes(0x495CE3, (BYTE*)&data, 5);
data = 0x015F850F;
SafeWriteBytes(0x495CEC, (BYTE*)&data, 6); SafeWriteBytes(0x495CEC, (BYTE*)&data, 6);
if (!npcAutoLevelEnabled) {
SafeWrite8(0x495CFB, CodeType::JumpZ); SafeWrite8(0x495CFB, CodeType::JumpZ);
}
} }
void op_get_npc_level(OpcodeContext& ctx) { void op_get_npc_level(OpcodeContext& ctx) {