Merge branch 'master' into pixote-map-update

NovaRain · Jun 20, 2024 · 829c003 · 829c003
2 parents a96d77a + 3511a75
commit 829c003
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,8 +5,8 @@ on:
   pull_request:
 
 env:
-  sfall_version: 4.4.3.1
-  mpack_version: 4.4.3
+  sfall_version: 4.4.4
+  mpack_version: 4.4.4
 
 jobs:
   build:

diff --git a/extra/inno/ini_qol.iss b/extra/inno/ini_qol.iss
@@ -4,7 +4,7 @@ FileName: "{app}\ddraw.ini"; Section: "Interface"; Key: "WorldMapTerrainInfo"; S
 FileName: "{app}\ddraw.ini"; Section: "Misc"; Key: "DisplayBonusDamage"; String: "1"; Components: qol;
 FileName: "{app}\ddraw.ini"; Section: "Misc"; Key: "DisplayKarmaChanges"; String: "1"; Components: qol;
 FileName: "{app}\ddraw.ini"; Section: "Misc"; Key: "DontTurnOffSneakIfYouRun"; String: "1"; Components: qol;
-FileName: "{app}\ddraw.ini"; Section: "Misc"; Key: "NPCAutoLevel"; String: "1"; Components: qol;
+FileName: "{app}\ddraw.ini"; Section: "Misc"; Key: "PartyMemberNonRandomLevelUp"; String: "1"; Components: qol;
 FileName: "{app}\ddraw.ini"; Section: "Misc"; Key: "NumbersInDialogue"; String: "1"; Components: qol;
 FileName: "{app}\ddraw.ini"; Section: "Misc"; Key: "PartyMemberExtraInfo"; String: "1"; Components: qol;
 FileName: "{app}\ddraw.ini"; Section: "Misc"; Key: "PlayIdleAnimOnReload"; String: "1"; Components: qol;

diff --git a/extra/package/ddraw.ini b/extra/package/ddraw.ini
@@ -2,7 +2,6 @@
 HiResMode=0
 
 [Misc]
-AIDrugUsePerfFix=1
 BoxBarColours=11111
 ElevatorsFile=mods\elevators.ini
 EnableHeroAppearanceMod=1