Compare commits

...
374 Commits
Author SHA1 Message Date
NovaRain 4bc981dbc1 Updated changelog for better clarity 2023-11-20 21:28:06 +08:00
NovaRain 34a81e4f54 Updated changelog 2023-11-20 10:19:04 +08:00
NovaRain 584e026624 Fixed create_object_sid when passing 0 as the script index number
* would result in a crash. Now it allows creating an object with no
script (different from -1, which just doesn't touch default script).
2023-11-14 21:48:36 +08:00
NovaRain 1cca798b80 Tweaked the position of the ammo bar
Tweaked the alternative ammo bar to exactly match Mash's.
2023-10-30 21:31:21 +08:00
NovaRain 47d9bb1627 [HRP] Fixed the clickability issue of the file list in the char screen 2023-10-28 23:43:58 +08:00
NovaRain 2b8b797920 Fixed incorrect data for saved arrays
Updated version number.
2023-10-27 22:41:58 +08:00
NovaRain b1ce08a78f Fixed crash when calling start_gdialog outside talk_p_proc
(the fix was embedded in StartGDialogFix, now it works regardless of
the option.)
2023-10-19 15:13:37 +08:00
NovaRain 143ec750cf Updated documents (mainly array functions) 2023-10-16 11:32:52 +08:00
NovaRain e2b5a0652d Enabled build workflow for master branch 2023-10-07 21:15:16 +08:00
NovaRain c6635f65e5 Changed the "best armor" score calc to exclude EMP
(gameplay mod friendly)
2023-10-07 19:34:11 +08:00
NovaRain daf9e57d36 Updated NPC combat control mod for player's Jinxed trait/perk
* controlled critters will now be "Jinxed" as well (closes #492)
2023-10-05 09:24:34 +08:00
NovaRain 59f1ed0233 Removed AdditionalWeaponAnims from ddraw.ini (always enabled)
Updated version number.
2023-10-05 09:10:44 +08:00
NovaRain 7c8d2d6269 Merge branch 'develop' 2023-10-05 09:03:35 +08:00
NovaRain 75019a5546 Bump actions/checkout from 3 to 4
Set dependabot for the main branch
2023-10-02 08:49:15 +08:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1b3530e702 Bump actions/checkout from 3 to 4 (#493)
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-10-01 21:04:56 +08:00
NovaRain deee6fc521 Corrected the description of CALCAPCOST hook 2023-09-30 17:17:53 +08:00
brussell1andGitHub e703a82c8b Fixed German translation (#491) 2023-08-26 01:39:08 +08:00
NovaRain 5769843b89 Bump activesupport to 6.1.7.5 in /docs 2023-08-24 21:56:52 +08:00
NovaRain 7e2eaf0724 Fixed crash on startup on WinXP/2003
Moved the LoadLibrary call out of DllMain entry point.
Updated version number and changelog.
2023-08-24 21:27:54 +08:00
NovaRain b6a4c8d476 Tried fixing in-page subcategory links 2023-08-22 15:28:24 +08:00
NovaRain 1524c7daa0 Fixed functions.yml 2023-08-22 10:10:41 +08:00
NovaRain 228f8966f2 Release 4.4 2023-08-22 08:54:41 +08:00
NovaRain e923fa801b Updated changelog and other documents 2023-08-21 14:23:59 +08:00
NovaRain 16dacee0e0 Fixed UpdateHPStat() for not properly capping HP
* when a critter has modified base value of max HP in its proto.
2023-08-09 10:29:22 +08:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
b4fe9b3e57 Bump commonmarker from 0.23.9 to 0.23.10 in /docs (#490)
Bumps [commonmarker](https://github.com/gjtorikian/commonmarker) from 0.23.9 to 0.23.10.
- [Release notes](https://github.com/gjtorikian/commonmarker/releases)
- [Changelog](https://github.com/gjtorikian/commonmarker/blob/v0.23.10/CHANGELOG.md)
- [Commits](https://github.com/gjtorikian/commonmarker/compare/v0.23.9...v0.23.10)

---
updated-dependencies:
- dependency-name: commonmarker
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-08-09 08:24:32 +08:00
phobos2077 553c7cc195 Renamed string_pos back to string_find to make meaning more obvious 2023-08-07 20:01:21 +02:00
NovaRain 61f3a2ac13 Fixed the backward compatibility of get_npc_level
(broken in commit 438bc6f)
2023-08-04 09:13:55 +08:00
NovaRain aca6c92d86 Reordered the engine perk entries in perks.ini
(sorted by their perk IDs)
2023-07-31 20:52:43 +08:00
phobos2077 5d7015bbb5 Headers update
- Synced a small number of defines from RPU headers
- Removed duplicate defines from define_lite
2023-07-30 22:24:44 +02:00
phobos2077 f0ec82923d EnginePerks: fixes
- Remove duplicate Salesman tweak
- Decoupled hacks for multi-perk-level support for Salesman and Demolition Expert from the bonus value change
- Renamed settings for consistency ("<PerkName>Bonus" when it has only one effect)
2023-07-30 22:00:04 +02:00
phobos2077 cd5c803386 EnginePerks: rewritten and expanded
- Got rid of unused and repeated code
- Added all perk skill bonuses
2023-07-30 19:58:34 +02:00
NovaRain c95d872f77 Added build instructions to readme 2023-07-26 15:08:41 +08:00
phobos2077 5c3c1ca4db Header fixes
- Fix conflict with RPU command_extra.h
- Fix undefined debug_array_str error
2023-07-24 00:56:01 +02:00
NovaRain cb1a3dd764 Reverted the ASM change for StealCheckHook in commit 53c294c 2023-07-23 07:42:16 +08:00
phobos2077 4c441d5852 Fix incorrect int->float conversion in op_sub (closes #488) 2023-07-22 21:22:27 +02:00
NovaRain 53c294cf98 Edited ASM code and documents for HOOK_STEAL 2023-07-22 20:46:26 +08:00
phobos2077 5394352bf0 HOOK_STEAL: add ret0 value 2 to fail "silently" 2023-07-22 13:43:23 +02:00
phobos2077 f267224428 HOOK_STEAL: return value improvements
- Allow to use vanilla handler but only override experience in case of success
- Treat both return values less than -1 the same as -1
2023-07-22 10:43:18 +02:00
phobos2077 b189fe9252 HOOK_STEAL: ret1 to override experience for successful stealing 2023-07-22 04:21:05 +02:00
phobos2077 b2c9b1cc23 HOOK_STEAL: add arg4 - quantity of items stolen 2023-07-22 03:29:31 +02:00
NovaRain 0e8b6efe49 Re-added the check for valid objs to get/set_object_data
* disabled in combat for the combat data.
2023-07-19 20:56:12 +08:00
NovaRain 6d66bfffb0 Edited function and sslc docs 2023-07-17 20:53:50 +08:00
NovaRain 6eeb674641 Minor code edits to BugFixes.cpp
Minor edits to some comments.
2023-07-14 09:46:02 +08:00
NovaRain b94993d756 Minor edits to error msg for some script functions
Edits to function notes.
2023-07-11 11:19:29 +08:00
phobos2077 a2ea1910f5 Minor header and readme edits 2023-07-10 23:56:58 +02:00
NovaRain ddb3cf9b6e Added upper/lower limits to the hit chance value
Edited hookscript docs.
2023-07-09 15:22:56 +08:00
NovaRain 321f8e1ab2 Changed string_pos to return -1 on arg error
Added a check to PartyControl::OrderAttackPatch().
Updated function documents.
2023-07-05 22:14:04 +08:00
phobos2077 66559812bd Updated headers
- Add a bunch of array-related procs to unlock basic functional programming
- Fix error with FUNC_SELECTOR_7
2023-07-05 02:31:47 +02:00
phobos2077 f968dea5e7 string_pos: use negative pos value how it works in substr 2023-07-05 01:47:47 +02:00
phobos2077 664fb84dc5 string_find renamed to string_pos + header update
- Renamed get_clamped to math_clamp for consistency (libs should use namespace prefixes)
- Nuked above/below macros and renamed unsigned_comp to insigned_int_compare, because it doesn't work with floats
- Replaced sprintf2 and string_pos with macros (due to new metarules)
- Add a few entries to functions.yml
2023-07-04 21:06:35 +02:00
phobos2077 74ef65335d Add string_find metarule
- lib.inven.h: Updated remove_items_pid to return actually removed quantity
2023-07-04 20:19:38 +02:00
NovaRain 9f6ca9d55d Updated some documents 2023-07-03 15:39:56 +08:00
NovaRain f42b232e19 Moved sfall-mod.ini into mods\ folder
Packed item highlighting and NPC combat control mods into sfall.dat.
2023-07-02 20:40:35 +08:00
NovaRain 0926ace899 Use explicit GetFileAttributesA function 2023-07-02 08:28:15 +08:00
NovaRain b2023b7e51 Removed capping of console window position and size
* for multi-monitor setup, leaving only minimum size of 640x480.
2023-06-29 21:32:32 +08:00
NovaRain 1f962458cd Added file check for books/drugs/enginetweaks ini files
Fixed possible array index out of bound error in BarBoxes.
Added trimming to custom unarmed attack names.
Edits to ddraw.ini and function docs.
2023-06-27 21:19:36 +08:00
phobos2077 0bb5941c98 IniReader: Remove bufSize argument when it's not used (closes #485)
- Fix return value of getString with buffer argument
- Increase max line length to 2048
2023-06-27 00:14:00 +02:00
phobos2077 3e4e9ff4e6 Console window improvements
- Retain maximized/minimized state
- Save normal position when closing in maximized/minized state
- Allow to move window in negative x direction
- Disable close button
- Save position if game was closed by pressing Alt+F4 in console window
2023-06-26 23:31:06 +02:00
NovaRain ece95a95e9 Updated docs for improved string_format
Edited error messages for a few functions.
ConsoleWindow: disallowed negative window position.
2023-06-25 16:16:23 +08:00
phobos2077 5f38744a2e De-shittify string_format (closes #482) 2023-06-25 00:24:24 +02:00
phobos2077 c0aac45b0c ConsoleWindow: attempt to fix position jumping 2023-06-24 13:12:38 +02:00
NovaRain d7a974c50b Fixed the display after switching back in NPC combat control mod
* player's active "sneak" notification box wasn't shown when switching
back after the combat.

Replaced numbers with defines in item highlighting mod.
2023-06-24 14:17:38 +08:00
phobos2077andNovaRain 3f8d322697 Fix container highlight condition 2023-06-24 07:59:16 +08:00
phobos2077andNovaRain 50b51fc1a3 Highlighting mod update
- Optional highlighting of critters, using the same colors and rules as in the combat mode
- Holding highlight key will update outlines based on current positions
- Enable LOS check by default for more interesting looting
2023-06-24 07:59:16 +08:00
phobos2077 e1aebb21e4 op_create_spatial: fix spatial object having no scriptIndex upon creation 2023-06-24 01:58:17 +02:00
phobos2077 a5075734cc ConsoleWindow: prevent user from messing up window position & size 2023-06-24 01:57:27 +02:00
phobos2077 4adb6dffe2 get_ini_config - reset array cache to prevent wrong arrays being returned! 2023-06-21 23:32:33 +02:00
NovaRain 3b29088818 Edited the log messages in LoadOrder.cpp
Cleaned up some module headers.

Updated version number in documents.

Updated changelog in sslc document, and removed the mention about
empty statements (it never worked).
2023-06-21 22:21:12 +08:00
phobos2077 3a3760704c Load order: more informative logging 2023-06-20 20:44:57 +02:00
NovaRain b619ea3fba Updated function docs for get_ini_config 2023-06-19 12:15:17 +08:00
NovaRain ae7921fe26 Some format/textual edits to code
* line indents.
* remove trailing spaces.
* use nullptr instead of NULL for pointers.

Edited the error messages of get_ini_config.
2023-06-19 12:14:31 +08:00
NovaRainandGitHub 14f6de0329 Merge pull request #481 from sfall-team/feature/fo-ini-reader
INI Config reader:
- Replaced GetPrivateProfile* functions for reading ini with vanilla-based INI reader.
- Changed IniReader classes to read INI files once using new Config class and cache results until GameReset (going to main menu).
- Added metarule to read entire INI file in one operation and return as two-dimensional map array.
- Increased limits for INI strings to 1021.
2023-06-19 11:22:27 +08:00
phobos2077 e33a025c62 get_ini_config: sanitize and validate INI path 2023-06-18 15:01:25 +02:00
phobos2077 20088ffcb1 Save window positions in OnBeforeGameClose
- This way we can guarantee sfall has not started to "destruct" yet, so we don't have to rely on the order of destructor calls
2023-06-18 00:41:45 +02:00
phobos2077 cec091bda2 IniReader: Remove ini file from cache when it's changed by SetString
- Had to reorganize some code to make this work. Changed how some singletons are created to guarantee destructor calls in correct order (IniReader is constructed first and destructed last, after every other module).
2023-06-17 23:33:37 +02:00
NovaRain 97c2b111ff Updated the description of ConsoleWindow
Simplified ASM code in Premade.cpp a bit.
2023-06-17 21:40:11 +08:00
VladandGitHub 1e4bbaedbd Merge branch 'develop' into feature/fo-ini-reader 2023-06-16 18:13:12 +02:00
NovaRainandGitHub fce35c7e14 Merge pull request #480 from sfall-team/feature/debug-log-overflow-fix
Fixed buffer overflow when DebugMode is enabled and printing messages longer than 259 via script.
2023-06-16 23:37:59 +08:00
phobos2077 4d19fa2d60 Use single function for all string-to-integer conversions for consistent behavior
- Reading INI from within sfall as well as get_ini_setting opcode
- calling atoi opcode
- Support auto-detecting 0x, 0 and 0b for hex, octal and binary representations respectively
2023-06-16 16:06:24 +02:00
phobos2077 0a6a604abc Add support for using 0b prefix in INI files to denote binary base (consistent with GetPrivateProfile*) 2023-06-16 15:10:25 +02:00
phobos2077 2cef5310e2 Rewrite console writing
- Separate debug_msg and display_msg as separate Source
- Merge writing to one function with proper filtering
2023-06-16 14:57:41 +02:00
phobos2077 fe7aa9ae04 Removed unused code 2023-06-16 02:16:25 +02:00
phobos2077 b36771da48 Increase maximum size of one INI line to 1023 and fix potential crash in IniReader::getString()
- Now can read strings up to 1021 from INI files using all available functions (get_ini_string, get_ini_section, get_ini_config)
2023-06-16 00:53:03 +02:00
phobos2077 ad6491d61e Increase array string limit to 1024 bytes
- Because it is now safe to log longer stuff
2023-06-16 00:16:36 +02:00
phobos2077 4de5de6a0c Restore code page option from NovaRain 2023-06-16 00:02:55 +02:00
phobos2077 347b4a3ecb Fix buffer overflow when DebugMode is enabled and printing messages longer than 259 via script
- Refactoring: moved ConsoleWindow into separate file
2023-06-15 23:57:41 +02:00
phobos2077 0b161c7374 Rename metarule for consistency with other ini-related functions, add to functions.yml 2023-06-15 21:48:06 +02:00
phobos2077 7bbc15ab0b Made Config queries case-insensitive for both section names and keys to match GetPrivateProfile* behavior 2023-06-15 21:01:24 +02:00
phobos2077 ac02971d61 get_ini_section(s): switched to using Config class
- Load configs via IniReader to take advantage of it's cache
2023-06-15 19:28:52 +02:00
phobos2077 e4ea3645d6 Add config_load metarule to efficiently load INI into array and also load INI from DAT
- Refactoring: moved all ini-related handlers into new cpp
- Moved modified_ini opcode to C++
2023-06-15 19:01:07 +02:00
NovaRain f9dc7a3e25 Added code page setting for the console window 2023-06-15 23:27:07 +08:00
phobos2077 3f7ce8c412 Custom Config parser based on Vanilla & Fallout CE 2023-06-15 15:30:46 +02:00
phobos2077 6d3afd4e7d Attempt to fix config reader memory allocation issues (unsuccessful) 2023-06-15 15:30:46 +02:00
phobos2077 2fcf81cb78 Read all ini's using built-in FO config parser 2023-06-15 15:30:46 +02:00
phobos2077 b8c52304eb Add precise time measurements for: Sfall Init, Game Init, New Game start and Save game load. 2023-06-15 15:30:24 +02:00
NovaRain 23d1e3b9c8 Updated the description in [ExtraPatches] for mods_order.txt
Tweaked the error log entry for mods_order.txt.
Removed unnecessary Inject_SwitchHandHook (unused since 4.2.1)
2023-06-15 13:38:04 +08:00
NovaRain 7baa6de014 Reduced buffer flush in Logging.cpp
Edited some description in ddraw.ini.
2023-06-15 13:24:02 +08:00
NovaRainandGitHub 7bf562338c Merge pull request #477 from sfall-team/feature/console-window-v2
Console Window output (closes #474)
2023-06-15 13:14:46 +08:00
phobos2077 5f38a934ca Console improvements
- Save & restore window position
- Fix display_msg not mirrored to console
- Fix log prefixes showing up mid line
2023-06-14 21:34:57 +02:00
phobos2077 3c40518e87 Make sfall logs a little prettier 2023-06-14 20:01:13 +02:00
NovaRain 7939924257 Removed debug message about missing critter art from displaying in-game
* to prevent unnecessary annoyance to generic players.

Added a safeguard to get_tile_fid.
2023-06-14 09:26:28 +08:00
phobos2077 dc665cb741 Debugging.ConsoleWindow option 2023-06-13 23:09:21 +02:00
phobos2077 d7127a4deb Fix crash in debug mode due to __stdcall not being explicitly specified for C++ function (closes #476) 2023-06-13 19:45:11 +02:00
NovaRain 46a80fdb6a Added get_tile_fid and macros to function notes
Some misc edits to documents.
2023-06-13 12:32:49 +08:00
NovaRain 492e31410c Fixed the mode 2 of get_tile_fid
Minor code/comment/format edits.
2023-06-13 10:15:02 +08:00
phobos2077 f5e7235a80 get_tile_fid: take FRM Limit patch into account by extending FRM mask from 12 to 14 bits 2023-06-13 01:10:23 +02:00
phobos2077 0fef6f1f8c mods_order: remove comments before other checks, to prevent valid paths being ignored 2023-06-12 19:55:33 +02:00
phobos2077 4b9008d53c get_tile_fid correct for backwards compatibility and flexibility
- Allow to pass elevation using the free bits of the tileNum value to access elevations 1 and 2 (instead of defaulting to dude_elevation, which is not how it worked before)
- Access roof FID and raw data using mode flags in the top 4 bits
2023-06-12 18:26:28 +02:00
phobos2077 0d960ca326 Fix get_tile_fid function to work on elevations 1 and 2
- Since it has no second argument, assume dude elevation
- Rewrite into new opcode system
2023-06-12 16:44:07 +02:00
VladandGitHub c95d074f44 Merge pull request #470 from sfall-team/feature/load_order
load_order.txt per #469
2023-06-12 14:47:27 +02:00
VladandGitHub 4b88bfad10 Merge pull request #473 from sfall-team/hook_return_string_v2
Allow passing string directly to set_sfall_return in HOOK_DESCRIPTIONOBJ (v2)
2023-06-12 14:46:59 +02:00
phobos2077 94388d3470 LoadOrder update
- Rename to "mods_order.txt"
- Create "mods" folder if it doesn't exist before creating an empty mods_order.txt
- Trim space and tab characters
- Allow comments after file names with ; or # (INI-style)
2023-06-12 11:59:10 +02:00
phobos2077 208cacc4dd load_order.txt per #469 2023-06-12 11:59:10 +02:00
phobos2077 f222348b25 Update docs, remove deprecated macro 2023-06-12 11:55:06 +02:00
phobos2077 49cf0e6726 Allow passing string directly to set_sfall_return in HOOK_DESCRIPTIONOBJ
- HookScripts: track return types in addition to values
- Set allowNonIntReturn in hook code to allow non-int return values to be accepted
- Moved get_sfall_arg and set_sfall_return opcodes to the new table
2023-06-12 11:52:12 +02:00
phobos2077 d107edbb23 invenWieldFunc fix for putting non-armor, non-weapon items into hand slot 2023-06-11 20:12:11 +02:00
phobos2077 e9f8984819 Script Headers: fix remove_items_pid function and fix naming
- It didn't take different stacks of items into account as well as cases where one item is in the backback and other in the slot and you need to remove both
2023-06-11 14:07:44 +02:00
NovaRain ab0c373a9b Minor edits to code and documents
Commented out unused combat related functions.
2023-06-09 11:20:47 +08:00
phobos2077 1c34f85789 Add get_combat_free_move for better mod compatibility 2023-06-08 21:36:09 +02:00
NovaRain b317ed71ce Added options to override the names of sound files for game modes
Remove the worldmap/credits music override from Fallout1Behavior.
(was added in commit 00b85be)

Minor edits to ddraw.ini.
2023-06-05 11:37:58 +08:00
NovaRain 9197966993 Some grammar correction in function document 2023-06-05 10:54:36 +08:00
phobos2077 21fe99a297 Docs: Clarification about get_ini_* function return values
- Also updated lib.strings.h
2023-06-04 20:32:43 +02:00
phobos2077 ac1abf71f8 Corrected hook documentation 2023-06-04 12:02:11 +02:00
phobos2077 bfc9fd4d88 Add set_combat_free_move metarule and 2 arguments to STDPROCEDURE to make it more useful 2023-06-04 11:59:13 +02:00
phobos2077 f755e0a1dc Header update 2023-06-04 11:59:13 +02:00
NovaRain 3d88304777 Added a new example mod gl_rest_encounter
Added a burst control example script.
2023-06-02 15:14:25 +08:00
NovaRain 4e37fb0228 Fixed crash when using NumbersInDialogue
(revert commit a4d6687)

Added more accurate description for div function in DamageMod.cpp.
2023-06-01 15:56:43 +08:00
NovaRain 0de7614c53 Minor edits to ddraw.ini and define_extra.h 2023-05-29 15:21:21 +08:00
phobos2077 d5268f3fbc Small update to headers 2023-05-25 02:37:51 +02:00
NovaRain 19db722948 Decoupled hook type 2 of HOOK_AMMOCOST from CheckWeaponAmmoCost
Edits to documents to reflect the hook change.
Changed CheckWeaponAmmoCost to be enabled by default.
Updated version number.
2023-05-20 10:56:39 +08:00
NovaRain c2dde7485a Added back postbuild.cmd for github action 2023-05-19 10:35:59 +08:00
NovaRain c73f311b22 Randomized one extra bullet for side groups in burst attacks
* idea from phobos2077.

Added minimum value check to multipliers.
2023-05-19 09:45:15 +08:00
NovaRain 000816acb5 Merge branch 'scriptable-burst' into develop 2023-05-19 08:27:46 +08:00
NovaRain 37e7af2a17 Added documentation for set_spray_settings 2023-05-18 22:52:00 +08:00
NovaRain befea69909 Fixed "divided by zero" error when returning 0 in AMMOCOST hook
* with CheckWeaponAmmoCost=1

Added a value check to the return value of AMMOCOST hook.
Updated hookscripts.md to reflect this change.
2023-05-18 10:01:49 +08:00
phobos2077 a3cfc481a5 Remove postbuild.cmd from git 2023-05-16 18:50:13 +02:00
NovaRain c9034f917b Added "set_spray_settings" function for scriptable burst (#36)
* Current implementation works similar to metarule2_explosions.
documentation will come later.
2023-05-17 00:14:44 +08:00
NovaRain 5b9e90100d Changed AttackSubType enum "GUNS" to "RANGED"
* to be in line with define_extra.h, the naming is from RE/CE.

Minor textual edits to code.
2023-05-15 12:06:53 +08:00
phobos2077 427a978bb4 Implemented YAAM damage formula in script 2023-05-14 23:31:40 +02:00
phobos2077 e6e941e14c Updated gl_compute_damage example script to work as 1:1 reflection of vanilla damage formula
- In hope that this will make it easier for someone to write his own damage formula
2023-05-14 22:50:33 +02:00
phobos2077 493003af54 Updated some defines
- ATKMODE defines removed to avoid confusion - these are really two 4-bit fields, not bit flags!
2023-05-14 01:44:15 +02:00
phobos2077 1683678657 Revert adding RMOBJ to avoid duplication from devine_extra.h 2023-05-08 10:38:35 +02:00
phobos2077 a05207cc83 Add some missing script defines 2023-05-08 02:53:31 +02:00
NovaRain 00b85bec49 Expanded the functionality of Fallout1Behavior
* change the world map music and the credits music to match FO1 files.

Increased the maximum value of the combat speed slider.
Some minor code edits.
2023-04-30 09:18:51 +08:00
NovaRain 571955fbcb Tweaked set_pc/critter_base/extra_stat script functions
* before they didn't update derived stats when setting SPECIAL, for
the player it requires accessing the char screen to update.

Replaced some proto_ptr() usages with GetProto().
2023-04-22 23:45:57 +08:00
NovaRain f4e3049a0f Code edits to PartyControl.cpp
* use roll_random function from the engine instead of making a new one.

Updated version number.
2023-04-19 10:41:20 +08:00
NovaRain 184af43928 Attempt for reproducible builds
* ducible.exe is built with v140_xp toolset and /arch:SSE.
2023-04-17 10:06:46 +08:00
NovaRain 32e9642f90 Replaced deprecated set-output command in action
Removed Debug Directory "coffgrp" from PE header of release builds.
2023-04-14 14:04:41 +08:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
59310dec6d Bump nokogiri from 1.13.10 to 1.14.3 in /docs (#462)
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.10 to 1.14.3.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.10...v1.14.3)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-12 14:29:01 +08:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
55c5c815f8 Bump commonmarker from 0.23.7 to 0.23.9 in /docs (#461)
Bumps [commonmarker](https://github.com/gjtorikian/commonmarker) from 0.23.7 to 0.23.9.
- [Release notes](https://github.com/gjtorikian/commonmarker/releases)
- [Changelog](https://github.com/gjtorikian/commonmarker/blob/main/CHANGELOG.md)
- [Commits](https://github.com/gjtorikian/commonmarker/compare/v0.23.7...v0.23.9)

---
updated-dependencies:
- dependency-name: commonmarker
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-12 14:28:50 +08:00
NovaRain a4d6687aab Minor code edits to MiscPatches.cpp 2023-04-12 10:02:26 +08:00
NovaRain 99de222605 Release 4.3.8 2023-03-31 22:10:41 +08:00
NovaRain 29ad2bf3b8 Recompressed sfall resource files 2023-03-31 21:54:55 +08:00
NovaRain 4fc282fa61 Minor edit to the changelog 2023-03-29 14:31:50 +08:00
NovaRain 5b4e165368 Fixed assorted typos in documents
Added an example ini to Ammo INI Loader mod.
Updated the changelog.
2023-03-27 20:30:36 +08:00
NovaRainandGitHub 43a261bd27 Bump activesupport to 6.1.7.3 in /docs 2023-03-20 10:04:46 +08:00
NovaRain b69e4e0eeb Fixed being able to call multiple exit msg boxes with Alt+F4 2023-03-16 10:44:58 +08:00
NovaRain 254473cf1c Added support for closing the game by Alt+F4 (#457) 2023-03-15 12:09:52 +08:00
NovaRain c4efe78661 Updated readme and added changelog (#451) 2023-03-13 14:22:35 +08:00
NovaRain 656b122f3e Removed deprecated "register" keyword
Minor edits to documents.
2023-03-10 21:01:21 +08:00
NovaRain 30802e8e21 Changed the copyright text format in the credits 2023-03-06 22:41:37 +08:00
NovaRain 56150d572a Renamed some object flags 2023-03-05 10:18:59 +08:00
NovaRain a75886a020 Added a tweak to the ammo info for Glovz's/YAAM
* to display correct ammo stats based on the formulas w/o editing
proto.msg manually.

Updated translation ini files.

Set the maximum number of screenshots to 10k (was 100k)

* 100k is impractical because the max files per directory on FAT32 is
65535 (only if all files are in 8.3 format) when the game came out.
2023-03-01 09:13:48 +08:00
NovaRain 64dc30d922 Removed CreditsAtBottom from ddraw.ini
* sfall built-in credits will be shown at the beginning when from the
main menu and at the end during the ending.
2023-02-26 23:29:17 +08:00
NovaRain a6a2285ffe Fixed incorrect death endings being shown
* can happen in vanilla FO2 when the player is lv10 or higher,
with a low chance.
2023-02-15 21:05:25 +08:00
NovaRain 381032a246 Removed redundant "Done" strings from sfall log
* only when there are alternative states or for graphics/sound/scripting
2023-02-10 08:42:02 +08:00
NovaRain b6ee7bebf2 Tweaked how disabled unsafe opcodes work
* now disabled opcodes will just do nothing instead of causing the
script terminated.
2023-02-09 15:04:41 +08:00
NovaRain dd73cbea9c Removed StackEmptyWeapons from ddraw.ini (always enabled) 2023-02-02 12:38:33 +08:00
NovaRain d3960cbebb Bump activesupport to 6.1.7.1 in /docs (again) 2023-01-25 18:25:55 +08:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
a93eee9849 Bump commonmarker from 0.23.6 to 0.23.7 in /docs (#454)
Bumps [commonmarker](https://github.com/gjtorikian/commonmarker) from 0.23.6 to 0.23.7.
- [Release notes](https://github.com/gjtorikian/commonmarker/releases)
- [Changelog](https://github.com/gjtorikian/commonmarker/blob/main/CHANGELOG.md)
- [Commits](https://github.com/gjtorikian/commonmarker/compare/v0.23.6...v0.23.7)

---
updated-dependencies:
- dependency-name: commonmarker
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-25 18:23:49 +08:00
NovaRain e954b34676 Try to bump activesupport to 6.1.7.1 in /docs 2023-01-22 09:13:55 +08:00
NovaRain 5c5df4ef64 Added a tweak to allow premade characters to have less than two traits
Fixed the player's traits not being displayed in certain unusual cases.
(with save editing or hex-edited GCD file)
2023-01-10 10:31:35 +08:00
NovaRain ad137896c9 Increased the upper limit of ProcessorIdle 2023-01-07 23:06:07 +08:00
NovaRain 9bdd633fcd Cosmetic edits: updated/unified the copyright header years 2022-12-31 10:13:41 +08:00
NovaRain 48e2a63cdf Edits to sfall_ver_* script functions
* they take no arguments and only return constants, simpler structure
in ASM is enough.
2022-12-26 08:43:40 +08:00
NovaRain 33e6cb0cb8 Fixed broken read_string script function
* actually it has never worked.
2022-12-22 09:34:52 +08:00
NovaRain 52e796815a Fixed a crash bug in FullItemDescInBarter
* when weapon/ammo has no description, it'd trigger UB from strncpy_s.
2022-12-17 10:35:39 +08:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
6c7bbb5a58 Bump nokogiri from 1.13.9 to 1.13.10 in /docs (#449)
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.9 to 1.13.10.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.9...v1.13.10)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-08 12:17:40 +08:00
NovaRain 05f2fb4001 Minor edits to Functions_def.h 2022-12-03 13:18:06 +08:00
NovaRain 024a13c6a8 Minor edits to code and documents 2022-12-01 08:40:39 +08:00
NovaRain 9ecd598544 Fixed args for HOOK_RESTTIMER 2022-11-26 09:58:13 +08:00
NovaRain 8521c1772b Minor edits to a few ASM hacks
(Changed 2-bytes null jcc to just 2 nop)
2022-11-16 12:19:04 +08:00
NovaRain f7d94e16c9 Tweaked HOOK_INVENTORYMOVE for dropping caps
* before the amount was set in the dropped object only after the hook.

Edits to hook script documents.
2022-10-29 11:32:25 +08:00
NovaRain 3b8d2a4527 Edited the format for window title
Reorganized RMOBJ_* defines in define_extra.h.
2022-10-27 17:20:41 +08:00
NovaRain db7419a2f7 Some format edits to documents
Updated version number.
2022-10-25 21:23:21 +08:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
e93ca6fcab Bump nokogiri from 1.13.6 to 1.13.9 in /docs (#447)
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.6 to 1.13.9.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.6...v1.13.9)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-21 11:12:22 +08:00
NovaRain 6181140954 Minor edit to hook script document 2022-10-18 09:07:31 +08:00
NovaRain 007fa7314b Minor edit to hookscripts.md 2022-10-18 08:58:51 +08:00
NovaRain 87f5a5f081 Fixed incorrect critter names for corpses
* happens when multiple critters based on the same proto with
different scripts attached are killed.

Tweaked the fix for create_object_sid function.
2022-10-09 23:25:15 +08:00
NovaRain 5d5da0a471 Code correction to LoadOrder.cpp
Updated version number.
2022-09-28 10:17:11 +08:00
NovaRain bd15cf2b9e Fixed the order of autoloaded dat files on FAT file system 2022-09-27 16:14:38 +08:00
NovaRain ea2a4bfdfa Edited [ExtraPatches] description in ddraw.ini 2022-09-22 10:49:16 +08:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
8ad4f86e1d Bump commonmarker from 0.23.4 to 0.23.6 in /docs (#444)
Bumps [commonmarker](https://github.com/gjtorikian/commonmarker) from 0.23.4 to 0.23.6.
- [Release notes](https://github.com/gjtorikian/commonmarker/releases)
- [Changelog](https://github.com/gjtorikian/commonmarker/blob/main/CHANGELOG.md)
- [Commits](https://github.com/gjtorikian/commonmarker/compare/v0.23.4...v0.23.6)

---
updated-dependencies:
- dependency-name: commonmarker
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-22 10:46:18 +08:00
NovaRain c4b55734d1 Release 4.3.7 2022-08-27 21:15:14 +08:00
NovaRain ec5874a3c4 Fixed HOOK_REMOVEINVENOBJ to match RMOBJ_* defines
Edits to define_extra.h for RMOBJ_* defines
2022-08-14 11:04:17 +08:00
NovaRain 8b3a2bcead Expanded set_pipboy_available function for mode 2 2022-08-11 21:24:47 +08:00
NovaRain 13cf81e151 Code edits to SpeedInventoryPCRotation
Updated version number.
2022-08-09 21:32:59 +08:00
NovaRain efdd6afa34 Fixed the lighting of critters in gl_partycontrol 2022-08-09 08:43:39 +08:00
NovaRain c878d17a2b Added support for editor.msg to message_str_game
Edits to header files.
2022-08-09 08:12:54 +08:00
NovaRain 050af07b3b Corrected the language path for loading art files 2022-08-08 22:08:24 +08:00
NovaRain 1e5fd7fd13 Combined AllowDShowSound=2 with mode 1
Removed MoreTiles from ddraw.ini (always enabled)
Minor edits to documents.
2022-08-08 09:08:05 +08:00
NovaRain c1475ba453 Dropped support for old pre-SSE processors
Changed buf_to_buf function to SSE implementation.

* affected old processors:
Intel - Pentium II, older Celeron (Covington/Mendocino)
AMD - older K7 (Athlon Classic/Thunderbird)
2022-07-30 00:41:07 +08:00
NovaRain 85862d1599 Corrected comments in Functions.cpp 2022-07-27 22:11:42 +08:00
NovaRain be2af4a3a2 Changed the default number of sound buffers
Updated version number.
2022-07-26 08:23:47 +08:00
NovaRain d0fa304035 Minor edits to sslc document 2022-07-22 22:22:48 +08:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
e49922d438 Bump tzinfo from 1.2.9 to 1.2.10 in /docs (#442)
Bumps [tzinfo](https://github.com/tzinfo/tzinfo) from 1.2.9 to 1.2.10.
- [Release notes](https://github.com/tzinfo/tzinfo/releases)
- [Changelog](https://github.com/tzinfo/tzinfo/blob/master/CHANGES.md)
- [Commits](https://github.com/tzinfo/tzinfo/compare/v1.2.9...v1.2.10)

---
updated-dependencies:
- dependency-name: tzinfo
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-22 19:50:32 +08:00
burner1024andGitHub f29720effa Switch default Cat Jules appearance to leather jacket
* The original default/naked appearance (`nmprmb`) in RP only has very limited weapon anims.
2022-07-18 16:17:58 +08:00
NovaRain 543198cc89 Release 4.3.6 2022-07-08 21:00:59 +08:00
NovaRain c869080d91 Correction to previous commit 2022-07-07 08:28:03 +08:00
NovaRain f5f1f5ec70 Fixed NPC stuck in a loop of reloading the solar scorcher
(happens when out of ammo and it's dark.)
2022-07-06 20:05:17 +08:00
NovaRain 0b3be17839 Edits to document about set_self function
Updated version number.
2022-07-02 20:03:21 +08:00
NovaRainandGitHub 08f19e63e1 Merge pull request #439 from sfall-team/dependabot/github_actions/develop/actions/setup-python-4
Bump actions/setup-python from 3 to 4
2022-07-01 09:21:23 +08:00
dependabot[bot]andGitHub abbdc36eb8 Bump actions/setup-python from 3 to 4
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 3 to 4.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-01 01:09:07 +00:00
NovaRain 8c71953eed Fixed float_msg script function
* didn't set purple/black text color correctly (was always grey)
2022-06-30 21:51:34 +08:00
NovaRain dee28843ae Changed the mode 1 of NPC combat control mod
* now requires sfall debugging mode to control all critters.
2022-06-24 09:36:45 +08:00
NovaRain cd91355896 Added a warning pop-up for the open file limit 2022-06-17 22:47:27 +08:00
NovaRain 85e5da660b Added "get_terrain_name" script function
Updated documents for the function.
Minor edits to other code.
2022-06-14 21:04:51 +08:00
NovaRain 7015db2414 Changed HiResMode to not always be read from ddraw.ini
Minor edits to Perks.ini (120 CPL)
2022-06-10 09:04:17 +08:00
NovaRain a415fc2e7f Added ladder climbing action to UseWalkDistance
Added notes to MainMenuFontColour description in ddraw.ini.
Updated version number.
2022-06-07 10:24:52 +08:00
NovaRain 0516aabcc1 Added GainReputation to NPC combat control mod 2022-06-06 12:54:02 +08:00
NovaRain 1d8004623a Minor code edits
* read FastShotFix setting only once.
2022-06-02 14:22:05 +08:00
NovaRain 5d1c63ab08 Replaced item_w_curr_ammo_ engine function
* a simplified one, without calling proto_ptr_ unnecessarily.

Related code edits to Combat.cpp & Inventory.cpp.
2022-06-01 12:51:42 +08:00
NovaRainandGitHub 8527e17fa1 Merge pull request #438 from sfall-team/dependabot/github_actions/develop/actions/setup-python-3
Bump actions/setup-python from 2 to 3
2022-05-30 21:04:42 +08:00
NovaRainandGitHub 3782d548d8 Merge pull request #437 from sfall-team/dependabot/github_actions/develop/actions/upload-artifact-3
Bump actions/upload-artifact from 2 to 3
2022-05-30 21:04:06 +08:00
dependabot[bot]andGitHub f3e6c244be Bump actions/setup-python from 2 to 3
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2 to 3.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-30 12:59:24 +00:00
dependabot[bot]andGitHub c449c72556 Bump actions/upload-artifact from 2 to 3
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-30 12:59:21 +00:00
NovaRain 6b97ad4bcf Release 4.3.5 2022-05-30 20:56:17 +08:00
NovaRain a4230c3bad Added a function to EngineUtils.cpp
Minor edits to ddraw.ini.
2022-05-28 21:40:34 +08:00
NovaRain 9667b522a8 Tweaked how the graphics mode setting is read
Added a couple of notes to ddraw.ini.
Minor code edits.
2022-05-27 13:18:09 +08:00
NovaRain 73ec85b01d Code edits to gl_npcarmor script 2022-05-26 22:55:08 +08:00
NovaRain e8652ca17b Some edits to documents 2022-05-25 21:52:24 +08:00
NovaRain 8bad934279 Removed ComputeSprayMod from ddraw.ini
Updated version number.
2022-05-25 21:17:06 +08:00
NovaRain fddb71e88a Added support for SPLASH_SCRN_TIME option to sfall HRP 2022-05-24 22:49:40 +08:00
NovaRain a51bd676e0 Fixed being able to push knocked down team members in combat 2022-05-23 12:00:20 +08:00
NovaRain 02b25c325f Simplified the fix in commit 4e3d8a6 2022-05-22 14:45:21 +08:00
NovaRain 05cd041e79 Code edits to Stats::UpdateHPStat() 2022-05-20 15:36:15 +08:00
NovaRainandGitHub c8cd9ef4db Merge pull request #436 from phobos2077/dependabot/bundler/docs/nokogiri-1.13.6
Bump nokogiri from 1.13.4 to 1.13.6 in /docs
2022-05-19 11:41:26 +08:00
dependabot[bot]andGitHub f40e9be2a1 Bump nokogiri from 1.13.4 to 1.13.6 in /docs
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.4 to 1.13.6.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.4...v1.13.6)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-19 03:39:32 +00:00
NovaRain 7ab89200d7 Tweaked interface bar redraw in gl_partycontrol 2022-05-12 21:58:03 +08:00
NovaRain 7057e044d0 Changed Stats::UpdateHPStat() to update the current HP as well
Updated German translation file.
2022-05-11 21:55:50 +08:00
NovaRainandGitHub 51035958a3 Merge pull request #435 from wipe2238/dependabot
Add dependabot configuration for GitHub Actions
2022-05-10 21:40:23 +08:00
Wipe 2cbc026b72 Dependabot will make PRs against develop branch 2022-05-10 12:01:54 +02:00
Wipe 4ad77cebc1 Added dependabot configuration for GitHub Actions 2022-05-10 11:29:25 +02:00
NovaRain 64f6647fb0 Fixed crash when the player equips an "overloaded" weapon
Fixed a bug in ReloadWeaponKey that could cause a hang.
(only triggerable due to the crash fix for overloaded weapons)
2022-05-05 10:40:47 +08:00
NovaRain b24df4caad Removed DivisionOperatorFix from ddraw.ini (always enabled) 2022-04-29 08:09:24 +08:00
NovaRain 9a6022d923 Moved FO1 worldmap sfx code to Interface.cpp
Removed extra button release sfx for markers on the world map.
(to match the exact FO1 behavior)
2022-04-21 19:53:15 +08:00
MarkusandGitHub f985af96db Fallout 1 worldmap sfx implementation (#434)
Implemented FO1 worldmap sfx (#373)
Added obj_drop call definition.
2022-04-21 19:49:48 +08:00
NovaRain e9581cd92b Corrected placeholders for obsolete opcodes
Minor edit to documents.
2022-04-20 09:51:40 +08:00
NovaRain 144d57243c [HRP] Disabled scaling of main menu buttons/text for Chinese version
* to prevent garbled text from Image::ScaleText()
2022-04-18 14:22:08 +08:00
NovaRainandGitHub 3a9121fb8e Merge pull request #432 from phobos2077/dependabot/bundler/docs/nokogiri-1.13.4
Bump nokogiri from 1.13.3 to 1.13.4 in /docs
2022-04-12 19:51:28 +08:00
dependabot[bot]andGitHub 758162b3e0 Bump nokogiri from 1.13.3 to 1.13.4 in /docs
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.3 to 1.13.4.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.13.4/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.3...v1.13.4)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-12 10:02:30 +00:00
NovaRain e5f7d29a03 [HRP] Fixed movie subtitles not showing up when setting MOVIE_SIZE=1
* happens with certain combinations of screen and movie aspect ratios.

Minor edit to Credits.cpp.
Updated version number.
2022-04-11 09:56:35 +08:00
NovaRain d3255277d7 Copy GitHub pages fixes 2022-04-07 21:24:49 +08:00
NovaRain 824780db88 Fix to GitHub pages 2022-04-07 21:16:16 +08:00
NovaRain 0a5a4e569e Release 4.3.4 2022-04-07 20:46:58 +08:00
NovaRain 69461516fe Edited code comment in the previous commit
Code format edits to BugFixes.cpp.
2022-04-07 20:42:33 +08:00
NovaRain 4e3d8a62ca Fixed item planting for non-biped critters with the "barter" flag set
(BGforgeNet/Fallout2_Unofficial_Patch#95)

Updated version number.
2022-04-04 21:31:51 +08:00
NovaRain c3f6b0ebb6 Removed FadeBackgroundMusic option
Removed unused "type" parameter from Tilemap::make_path_func.
Edits to documents and README.md.
2022-03-28 14:35:15 +08:00
NovaRain 93b53081a7 Edits to hookscripts.md and hooks.yml
Corrected a typo in arrays.md.
Removed redundant compiler txt files.
2022-03-21 22:49:42 +08:00
NovaRain 4af68b612b Code edits to the fix for FadeBackgroundMusic 2022-03-21 08:42:45 +08:00
NovaRain 1f44428fd6 Updated Ammo INI Loader example script mod
Updated version number.
2022-03-15 12:59:19 +08:00
NovaRain b486b58dd1 Added .gitattributes with ssl syntax highlighting
Added game debug project info to ddraw.sln.
2022-03-11 20:23:57 +08:00
NovaRain 1b579ad1d4 Bumped checkout to v3 for GitHub Action
Bumped nokogiri from 1.12.5 to 1.13.3 in /docs
2022-03-03 16:51:24 +08:00
NovaRainandGitHub 454c8d2a6d Merge pull request #430 from phobos2077/dependabot/bundler/docs/nokogiri-1.13.3
Bump nokogiri from 1.12.5 to 1.13.3 in /docs
2022-02-26 19:44:38 +08:00
dependabot[bot]andGitHub c609d79841 Bump nokogiri from 1.12.5 to 1.13.3 in /docs
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.12.5 to 1.13.3.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.12.5...v1.13.3)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-26 11:33:23 +00:00
NovaRain a392e5620a Added support for LocalMapXLimit/LocalMapYLimit options to sfall HRP 2022-02-20 08:39:02 +08:00
NovaRain 15c512ff7b Fixed some problems with the main menu in sfall HRP
Minor edits to other code.
2022-02-20 08:05:27 +08:00
NovaRain 4b6bc75814 Changed the build OS to Windows Server 2019
* for keeping Visual Studio 2017.
2022-02-17 11:34:14 +08:00
NovaRain 3f2f3560ad Release 4.3.3.1 2022-02-17 10:38:06 +08:00
NovaRain 29cd430b17 Moved 24-bit BMP code refs to HRP\Image.cpp
Minor edits to code/documents.
Updated version number.
2022-02-17 10:20:56 +08:00
NovaRain e84376351b Reverted the palette update method for DX9 mode to pre-4.3.1
* moving the processing to GPU (commit edbfc05)

Improved the functionality of AllowDShowMovies:
now can take screenshots and press any key to skip AVI movies.

Code edits to Logging.cpp.
2022-02-14 12:03:21 +08:00
NovaRain 2d97d24a39 Reverted the limit on hit chance (commit 71bc271)
* reason: the text length is depend on the frm.
2022-02-13 07:37:11 +08:00
NovaRain 4f89788dbd Fixed the game printing an incorrect item name in some cases
Minor fixes in Graphics.cpp and InputFuncs.cpp.
2022-02-13 02:06:56 +08:00
NovaRain 6df9dacc5f Code correction on DX9 initialization for built-in HRP
Some minor code edits.
2022-02-12 10:48:07 +08:00
NovaRain 71bc2719c4 Added minimum and maximum limits to the hit chance
* to prevent display glitches (BGforgeNet/Fallout2_Unofficial_Patch#85)

Lowered the max number of PNG screenshots to 10K.
2022-02-11 15:06:07 +08:00
NovaRain 1c9866a693 [HRP] Fixed the screenshot for sfall DX9 mode
* Now the screenshots are saved in PNG format.

[HRP] Adjusted the position of movie subtitles.

[TEST] Changed the DirectX 9 device creation mode.
2022-02-10 12:13:26 +08:00
NovaRain a7e6365d84 [HRP] Fixed possible crash in combat for EXTRA_WIN_MSG_CHECKS (#425) 2022-02-05 09:08:24 +08:00
NovaRain 0622a89978 [HRP] Fixed the main menu still being stretched when MAIN_MENU_SIZE=0
[HRP] Fixed broken console messages when using ConsoleOutputPath (#424)
[HRP] Disabled IFACE_BAR_WIDTH for Chinese version.
Fixed the copyright line in the credits.
2022-02-01 09:37:27 +08:00
NovaRain 41b4b773a3 Release 4.3.3 2022-01-20 13:41:56 +08:00
NovaRain 0807a4ea02 Updated Translations.ini and Russian/Chinese files 2022-01-20 12:53:01 +08:00
NovaRain a9f03544d5 Fixed movie scale pitch size for CPU palette conversion 2022-01-20 10:29:00 +08:00
NovaRain 03676d09ee Fixed the music not playing after loading a saved game (#422)
* if the save is on the same map, and while in the game.
2022-01-20 07:11:51 +08:00
NovaRain e17ad5d11b Minor code edits 2022-01-19 09:41:37 +08:00
NovaRain b66cc42fbc [HRP] Added missing movie scaling implementation for GPUBlt=2
Reverted the previous commit.
2022-01-18 08:52:00 +08:00
NovaRain 6cf41401aa Disabled compiling HLSL shader files at build-time
* use existed files in the HLSL folder instead.
2022-01-17 21:25:25 +08:00
NovaRain 45e2037082 Added HLSL source files and compiled shader files
* this should remove the hidden dependency on d3dcompiler_xx.dll.
2022-01-17 21:14:01 +08:00
NovaRain fc5863ac46 Added a new warning message on shader effects to Graphics.cpp 2022-01-17 12:12:08 +08:00
NovaRain 0a5ec8c70f Added a redraw timer to the debug editor
* redraws the background game screen when moving the editor window.
* works for sfall DX9 mode.
2022-01-17 09:51:24 +08:00
NovaRain 937cff235e Updated the year for version info 2022-01-17 08:53:48 +08:00
NovaRain 6bf967e877 Code correction to DebugEditor.cpp 2022-01-15 11:59:13 +08:00
NovaRain f839c8374a Increased the width of the mouse drop area for inv on the barter screen
Removed HRP's BARTER_PC_INV_DROP_FIX.
2022-01-15 09:56:55 +08:00
NovaRain 3301ace580 [HRP] Fixed interface position for smaller resolution (640x480)
[HRP] Fixed main menu position when MAIN_MENU_SIZE=0
2022-01-15 08:57:51 +08:00
NovaRain 247d4fae6c Edits to the arrays document 2022-01-13 21:29:24 +08:00
NovaRain f30558b091 Fixed a bug in 4.3.1 that caused AI to be unable to use some weapons
Code edits regarding AIpref in Enums.h.

Added GamePids.h (derived from ItemPid.h in mapper scripts)
2022-01-13 10:14:25 +08:00
NovaRain 7c0adc558a Updated documents for the removal of ArraysBehavior option
Some other minor edits to documents.
2022-01-12 09:40:18 +08:00
NovaRain 5493ed38d3 Redid the idle implementation for ProcessorIdle
[HRP] Added support for CPU_USAGE_FIX option.
[HRP] Code changes to DirectDraw.cpp for DD7 performance.
2022-01-11 10:03:11 +08:00
NovaRain 16ad57806f Removed ArraysBehavior and RemoveWindowRounding from ddraw.ini
* both are now always enabled
2022-01-07 06:46:28 +08:00
NovaRain adadf608e7 Changed the "Radiated" on the char screen to be highlighted in gray
* when the player still has an impending radiation effect

[HRP] Fixed the clickability issue for SCALE_BUTTONS_AND_TEXT_MENU.

Moved some code related to HRP.
Unified the naming style for color variables.
2022-01-06 14:19:05 +08:00
NovaRain 6faf71da66 Code edits to Graphics.cpp for device lost state 2022-01-04 07:03:50 +08:00
NovaRain 40fa4a1336 Fixed black screen after restoring DX9 device 2022-01-03 23:58:17 +08:00
NovaRain 8427ad657a Fixed Tilemap::make_path_func and DrawAlternateAmmoMetre functions 2022-01-03 07:07:08 +08:00
NovaRain 5fbbeeb328 [HRP] Code correction 2021-12-29 07:06:56 +08:00
NovaRain a30f640eb9 [HRP] Added support for reading .rix images larger than 640x480 2021-12-29 06:20:20 +08:00
NovaRain 921db36478 Improved the message box for CRC mismatch
Changed SkipCompatModeCheck to not require sfall debugging mode.
Minor code edits.
2021-12-28 12:44:20 +08:00
NovaRain 74455db5a9 Removed SkipSizeCheck from ddraw.ini
* the executable file size check is also removed (mostly).
2021-12-27 10:15:41 +08:00
NovaRain 437e6bfaea Code correction/edits to the previous commit
Added a debug message for the open file limit being exceeded.
2021-12-26 11:33:15 +08:00
NovaRain eb0bd4dfd0 Fixed the broken fix for addicted party members
(BGforgeNet/Fallout2_Restoration_Project#131, #420)

Improved the duplicate path removal in LoadOrder.cpp.
Code edits to the fix in previous commit for system compatibility.
2021-12-25 20:40:09 +08:00
NovaRain b0cc4352f7 Added additional fixes to FadeBackgroundMusic
* fixes not closing sound files after fading, which led to unable to
load the game anymore due to the the open files limit.

Code edits to CRC.cpp for displayed messages.
2021-12-24 13:47:22 +08:00
NovaRain df15a147d9 Renamed ShowMapGridKey to MapGridToggleKey 2021-12-21 09:47:59 +08:00
NovaRain 680284d785 Fixed crashes in HRP code
Reverted the version string on the main menu.
2021-12-20 12:16:18 +08:00
NovaRain 3cc98fc15d Added a debug option to toggle the hex grid
Added HiResMode option to ddraw.ini, along with some edits.
Fixed db_init function wrapper.
Some edits to HRP code.
2021-12-20 12:00:45 +08:00
NovaRain 317c462918 Edited action.yml for additional library 2021-12-19 09:06:20 +08:00
NovaRain c7e46a6b84 Merge branch 'HRP-integration' into develop
# Conflicts:
#	sfall/Game/GUI/Text.cpp
#	sfall/Modules/Interface.cpp
2021-12-19 09:01:48 +08:00
NovaRain 92a24a6112 Code cleanup and edits before merging 2021-12-19 08:42:36 +08:00
NovaRain da5286eaa9 Code cleanup and correction 2021-12-19 08:40:12 +08:00
NovaRain 3022e96809 Merge branch 'develop' into HRP-integration 2021-12-18 12:58:03 +08:00
NovaRain 6ff73a513e Fixed the load order of f2_res.dat & sfall.dat
Changed the default graphics mode back to 0 (now DD7).
2021-12-18 11:39:05 +08:00
NovaRain 53be017f0b Added fixed call point for sfall initialization 2021-12-17 09:56:52 +08:00
NovaRain 095dfae544 Fixed broken object descriptions for Chinese version
Minor code edits.
2021-12-16 12:38:14 +08:00
NovaRain 3145d4e5dc Added missing functions (was causing errors)
Added an improvement to prevent the player from running outside the
cropped part of the map.

Added an improvement for the list of action icons when enabling
IFACE_BAR_MODE (the list is no longer created under the interface).
2021-12-16 12:28:26 +08:00
NovaRain 5a18570bd9 Code changes to Graphics.cpp & main.cpp
* from HRP test branch
2021-12-12 10:28:35 +08:00
NovaRain fb8ca5317f Added SCALE_2X option, and minor fixes 2021-12-12 09:26:23 +08:00
NovaRain bc8665b131 Added a limit on path nodes for NPCs to NumPathNodes option 2021-12-11 10:36:26 +08:00
NovaRain fee4720ef5 Added ALTERNATE_AMMO_METRE and NumPathNodes options 2021-12-11 09:19:00 +08:00
NovaRain 7553b7bfc0 Fixed a crash bug in FadeBackgroundMusic
(when trying to mute the master audio volume in the preferences screen)

Minor code edits.
2021-12-10 09:58:22 +08:00
NovaRain 26b3fac1e0 Code fixes/edits to the previous commit 2021-12-10 09:12:44 +08:00
NovaRain 0ba69166b9 Added FADE_TIME_RECALCULATE_ON_FADE and EXTRA_WIN_MSG_CHECKS options 2021-12-09 09:47:59 +08:00
NovaRain d94e68ba73 Finished the code for DirectDraw graphics mode 2021-12-08 12:59:02 +08:00
NovaRain 69cd1461f1 Updated the code for DirectDraw graphics mode 2021-12-07 08:43:02 +08:00
NovaRain 6ca5644e99 (WIP) Added DirectDraw graphics mode for built-in HRP
Moved some code from Graphics.cpp to WinProc.cpp
2021-12-05 09:29:48 +08:00
NovaRain 70da19e49b Added code for game movies and edited other code 2021-12-02 12:26:23 +08:00
NovaRain aa6f1cabec Edit to the previous commit 2021-11-28 19:02:24 +08:00
NovaRain 0a42db619d Added a tweak to allow printing new floating messages when their limit is exceeded (#388)
Fixed incorrect value of the limit number of floating messages.
2021-11-28 12:35:14 +08:00
NovaRain ccaacd72e4 Updated code for deactivating the external HRP 2021-11-28 09:31:13 +08:00
NovaRain 6f08a50f9a Removed UseCommandLine from ddraw.ini (always enabled)
Updated version number.
2021-11-27 06:42:19 +08:00
NovaRain 98cc168288 Added CreditsScreen.cpp/h 2021-11-26 09:32:55 +08:00
NovaRain 81912b47ed Added optimization for the save/load game screens
Edited the description of args for HOOK_TOHIT.
2021-11-23 20:43:19 +08:00
NovaRain 5acdf37c80 Added DeathScreen.cpp/h and SlidesScreen.cpp/h
Added optimization for the save/load game screens.
2021-11-23 10:04:05 +08:00
NovaRain f76c0dfe91 Added HelpScreen.cpp/h and Worldmap.cpp/h 2021-11-20 08:45:09 +08:00
NovaRain ba7773223a Added Character, LoadSave, and MiscInterface files 2021-11-19 08:54:42 +08:00
NovaRain 809cba44e8 Minor code edits to Graphics.cpp from HRP branch 2021-11-17 10:05:33 +08:00
NovaRain 1c3f3dbbd5 Changed the namespace for HRP modules
Moved some functions to the HRP namespace.
2021-11-17 10:03:45 +08:00
NovaRain 5265dd8ded Updated code 2021-11-17 06:42:12 +08:00
NovaRain 7e65aa2c64 Fixed the redrawing of windows with "DontMoveTop" flag
* if one is not topmost, it's not redrawn after calling show function.
2021-11-16 15:03:41 +08:00
NovaRain be4978324c Fixed minor bugs in HeroAppearance & CritterStats
Fixed incorrect display of name and damage values for unarmed attacks
in some cases.

Minor code edits.
2021-11-15 10:55:52 +08:00
NovaRain 1834fa3d18 Updated code for the interface bar 2021-11-15 09:02:23 +08:00
NovaRain ae05feee8c Updated code for the interface bar (WIP) 2021-11-14 09:36:29 +08:00
NovaRain e7add0d1b4 Added inventory code 2021-11-12 00:48:06 +08:00
NovaRain 5a61bb8fc3 Added code for Dialog/Barter interface
Added support for Continuum's dialog graphic.
2021-11-10 10:43:15 +08:00
NovaRain 281823e97d Release 4.3.2 2021-11-10 08:45:54 +08:00
NovaRain 32924db37c Reverted Worldmap.cpp changes in commit c19137b 2021-11-10 08:45:12 +08:00
NovaRain cd3c220ef8 Changed the option name of grave containers fix
Edited the code of tile_num function wrapper.
Reorganized the options in ddraw.ini.
Updated web document.
2021-11-09 10:01:17 +08:00
NovaRain 09813aeb86 Code edits to ScriptExtender.cpp/SpeedPatch.cpp
Minor edits to some files.
2021-11-08 13:45:35 +08:00
NovaRain f75214056e Updated map view code 2021-11-08 10:24:59 +08:00
NovaRain d4f011913c Changed the fix in commit 583105a to an option (#412) 2021-11-06 22:44:14 +08:00
NovaRain a543cd934c Updated the code for map edge clipping 2021-11-06 01:16:04 +08:00
NovaRain eb7aca6595 Added map edge clipping (partial) 2021-11-04 06:57:46 +08:00
NovaRain 49cfe39038 Updated code in EdgeBorder/ViewMap. 2021-11-03 09:02:37 +08:00
NovaRain 163b9ed5d3 Simplified the calculation loop in Glovz's formula
Changed the title bar text for DX9 windowed mode.
2021-11-02 09:39:47 +08:00
NovaRain 3846ec9b9d Updated/Corrected code
Added InterfaceBar.cpp/h.
2021-11-02 09:15:11 +08:00
NovaRain e35745353c Improvements for the windowed game mode
Some changes in the implementation of HRP code.
2021-10-31 09:57:18 +08:00
NovaRain d7647bca18 Optimized the calculation loop in YAAM code 2021-10-30 09:16:39 +08:00
NovaRain 53278a090b Some edits to YAAM code
Changed OverrideArtCacheSize to set the art cache size to 261.
Fixed typo in ddraw.ini.
2021-10-27 22:02:09 +08:00
NovaRain a533943200 Cosmetic edit: alignment of GPL text in some files 2021-10-27 22:01:15 +08:00
NovaRain 4385807cd3 Added code for the previous commit 2021-10-27 10:03:42 +08:00
NovaRain 17c73a81da Added ViewMap.cpp/h and EdgeBorder.cpp/h 2021-10-26 09:02:32 +08:00
NovaRain f2bc04001e Changed the description of CheckWeaponAmmoCost in ddraw.ini
Replaced <br> html tag with backslash in markdown documents.
(CommonMark spec)
2021-10-25 10:18:16 +08:00
NovaRain f1c087b3a3 Improved the division function in previous commit
Rewrote the text hook for main_menu_create_ in C++ (from HRP branch)
Updated version number.
2021-10-25 09:52:18 +08:00
NovaRain 3dea47c467 Rewrote Glovz's damage formula code in C++ (#355) 2021-10-24 11:12:56 +08:00
NovaRain c5075aa478 Finished the implementation of the main menu
* requires testing and correction of minor inaccuracies.
2021-10-23 07:34:39 +08:00
NovaRain 8d58e6e3bb Misc code edits 2021-10-22 00:23:58 +08:00
NovaRain be4c73fd50 Continue implementing the main menu section
Misc code edits.
2021-10-22 00:19:36 +08:00
NovaRain a19baedb96 [HRP] Implementation: MAINMENU, STATIC_SCREENS 2021-10-18 21:24:41 +08:00
NovaRain 43a8e84dee Updated define_extra.h 2021-10-16 07:24:58 +08:00
373 changed files with 17764 additions and 6006 deletions
+1
View File
@@ -0,0 +1 @@
*.ssl linguist-language=Pascal
+12
View File
@@ -0,0 +1,12 @@
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
# target-branch: "develop"
labels:
- "dependencies"
+4 -3
View File
@@ -3,6 +3,7 @@ name: Build
on:
push:
branches:
- 'master'
- 'develop'
- 'github-action'
paths:
@@ -13,11 +14,11 @@ on:
jobs:
Build:
name: sfall
runs-on: windows-latest
runs-on: windows-2019
steps:
- name: Clone sfall
uses: actions/checkout@v2
uses: actions/checkout@v4
# Action is used twice for self-testing only
# DevXP build results are intentionally *not* included in artifact
@@ -44,7 +45,7 @@ jobs:
shell: bash
- name: Upload artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: sfall-build
path: sfall-build
+2 -2
View File
@@ -10,10 +10,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.x'
+2 -1
View File
@@ -26,6 +26,7 @@
*.exe
*.out
*.app
!ducible.exe
# NetBeans
nbproject/private/
@@ -55,7 +56,7 @@ nb-configuration.xml
# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Dd]evXP
[Dd]evXP/
[Rr]elease/
[Rr]eleases/
[Rr]eleaseXP/
+982
View File
File diff suppressed because it is too large Load Diff
+8
View File
@@ -23,6 +23,7 @@
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent() {
this.components = new System.ComponentModel.Container();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.Column0 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -34,6 +35,7 @@
this.bSGlobals = new System.Windows.Forms.Button();
this.bArrays = new System.Windows.Forms.Button();
this.bEdit = new System.Windows.Forms.Button();
this.redrawTimer = new System.Windows.Forms.Timer(this.components);
this.bCrittersLvar = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.SuspendLayout();
@@ -154,6 +156,11 @@
this.bEdit.UseVisualStyleBackColor = true;
this.bEdit.Click += new System.EventHandler(this.bEdit_Click);
//
// redrawTimer
//
this.redrawTimer.Interval = 200;
this.redrawTimer.Tick += new System.EventHandler(this.timer1_Tick);
//
// bCrittersLvar
//
this.bCrittersLvar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -202,6 +209,7 @@
private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
internal System.Windows.Forms.Timer redrawTimer;
private System.Windows.Forms.Button bCrittersLvar;
}
+9
View File
@@ -137,6 +137,7 @@ namespace FalloutClient {
sr.Close();
}
Redraw();
redrawTimer.Start();
}
private void DebugEditor_FormClosing(object sender, FormClosingEventArgs e) {
@@ -188,6 +189,7 @@ namespace FalloutClient {
default:
return;
}
redrawTimer.Stop();
if (e.ColumnIndex == 2) {
string str = dataGridView1.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString();
int val;
@@ -211,11 +213,13 @@ namespace FalloutClient {
connection.WriteInt(converter.GetAsInt(val));
}
}
redrawTimer.Start();
}
private void bEdit_Click(object sender, EventArgs e) {
if (dataGridView1.SelectedRows.Count == 0) return;
int i = (int)dataGridView1.SelectedRows[0].Tag;
redrawTimer.Stop();
switch (mode) {
case Mode.Arrays: {
DataType[] types = new DataType[connection.ArrayLengths[i]];
@@ -333,6 +337,7 @@ namespace FalloutClient {
}
break;
}
redrawTimer.Start();
}
private void bCrittersLvar_Click(object sender, EventArgs e) {
@@ -381,5 +386,9 @@ namespace FalloutClient {
private void dataGridView1_RowsAdded(object sender, DataGridViewRowsAddedEventArgs e) {
dataGridView1.Rows[e.RowIndex].Tag = e.RowIndex;
}
private void timer1_Tick(object sender, EventArgs e) {
connection.WriteDataType(DataTypeSend.RedrawGame);
}
}
}
+3
View File
@@ -129,4 +129,7 @@
<metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="redrawTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>
+4
View File
@@ -48,8 +48,10 @@ namespace FalloutClient {
}
public static string[] ShowEditor(DebugEditor form, string[] names, DataType[] types, string[] values, bool isMap = false) {
form.redrawTimer.Start();
EditorWindow editor = new EditorWindow(names, types, values, isMap);
editor.ShowDialog();
form.redrawTimer.Stop();
if (editor.save) {
if (valueInHex) editor.ConvertValues(false);
return editor.values;
@@ -70,8 +72,10 @@ namespace FalloutClient {
}
public static string[] ShowEditor(DebugEditor form, string[] lvalues) {
form.redrawTimer.Start();
EditorWindow editor = new EditorWindow(lvalues);
editor.ShowDialog();
form.redrawTimer.Stop();
if (editor.save) {
if (valueInHex) editor.ConvertValues(false);
return editor.values;
+2 -1
View File
@@ -32,6 +32,7 @@ namespace FalloutClient {
SetArray = 10,
GetLocal = 11,
SetLocal = 12,
Exit = 254
Exit = 254,
RedrawGame = 255
}
}
+3 -3
View File
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("sfall")]
[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyCopyright("Copyright (C) 2022")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("4.1.9.0")]
[assembly: AssemblyFileVersion("4.1.9.0")]
[assembly: AssemblyVersion("4.1.9.1")]
[assembly: AssemblyFileVersion("4.1.9.1")]
+51 -4
View File
@@ -1,7 +1,10 @@
# sfall
[![github pages](https://github.com/phobos2077/sfall/actions/workflows/gh-pages.yml/badge.svg)](https://github.com/phobos2077/sfall/actions/workflows/gh-pages.yml)
A set of engine modifications for the classic game Fallout 2 in form of a DLL, which modifies executable in memory without changing anything in EXE file itself.
[![License](https://img.shields.io/badge/License-GPL--3.0-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
[![Dev Build](https://github.com/phobos2077/sfall/actions/workflows/build.yml/badge.svg?branch=develop)](https://github.com/phobos2077/sfall/actions/workflows/build.yml)
[![GitHub Pages](https://github.com/phobos2077/sfall/actions/workflows/gh-pages.yml/badge.svg)](https://github.com/phobos2077/sfall/actions/workflows/gh-pages.yml)
A set of engine modifications for the classic game Fallout 2 in the form of a DLL, which modifies executable in memory without changing anything in EXE file itself.
**Engine modifications include:**
- Better support for modern operating systems
@@ -10,8 +13,52 @@ A set of engine modifications for the classic game Fallout 2 in form of a DLL, w
- Many additional features for users, such as item highlight button, party member control, etc.
- Extended scripting capabilities for modders (many new opcodes to control sfall features as well as previously unavailable vanilla engine functions)
Original author: **Timeslip**
Original author: timeslip
Original description: A set of engine modifications for the classic game Fallout 2 by Interplay. Includes fixes for bugs in the original engine, allows Fallout to run correctly on modern operating systems, and adds additional features for modders.
Original description: A set of engine modifications for the classic game Fallout 2 by Interplay. Includes fixes for bugs in the original engine, allows fallout to run correctly on modern operating systems, and adds additional features for modders.
## Installation
- Download `sfall_*.7z` from the [release archive](https://sourceforge.net/projects/sfall/files/).
- Extract `ddraw.dll`, `ddraw.ini`, `sfall.dat`, and the `mods` folder to Fallout's base directory (i.e. the one that contains `fallout2.exe`). Also, remove `gl_highlighting.int` and `gl_partycontrol.int` from Fallout's `data\scripts\` directory if you are updating from an older version.
- __Important Note:__\
If you are using a mod that already included sfall (e.g. killap's [Unofficial Patch](https://github.com/BGforgeNet/Fallout2_Unofficial_Patch) or [Restoration Project](https://github.com/BGforgeNet/Fallout2_Restoration_Project)), then that mod has probably included a custom modified `ddraw.ini`. In that case, overwriting it with sfall's vanilla `ddraw.ini` will be likely break your game. Instead, only overwrite `ddraw.dll`, and keep the mod's existing copy of `ddraw.ini`. (Or, if you know what you're doing, you can merge them together by hand.)
- The folder `translations` contains translations of some of the strings that sfall displays in the game. To use a translation, copy this folder to Fallout's base directory too, and then in `ddraw.ini` change the __TranslationsINI__ setting to `.\translations\<your language>.ini`.
## Uninstallation
Delete `ddraw.dll`, `ddraw.ini`, and `sfall.dat` from your Fallout directory, and delete `sfall-mods.ini` from the `mods` folder.
## Usage
This mod is configured via the `ddraw.ini` and `sfall-mods.ini` files, which can be opened with any text editor. Details of every configerable option are included in those files. Where a comment refers to a DX scancode, the complete list of codes can be found at the link below:\
https://kippykip.com/b3ddocs/commands/scancodes.htm
In a default installation using an unmodified copy of `ddraw.ini`, the middle mouse button will be set to switch between weapons and the mouse wheel will be set to scroll through any menus that respond to the up/down arrow keys. Holding Ctrl and hitting numpad keys 0 to 6 (with Num Lock off) will adjust the game speed. Holding left Ctrl will let you move a whole stack of items at once. Pressing left Shift will highlight items on the ground. The script extender and any engine fixes are also enabled. Most of the options that change gameplay in some way not originally intended by the developers are disabled.
For [__Wine__](https://www.winehq.org/) users:\
You need to set DLL overrides for `ddraw.dll` to __"native, builtin"__ in `winecfg` or use `WINEDLLOVERRIDES="ddraw=n,b"` to run Fallout from the command line. If you want to play alternative sound files, you'll also need to install GStreamer Good 32-bit plugins.
## Build Instructions
### Prerequisites:
* Visual Studio 2015 with **Windows XP support for C++** component. If you're using Visual Studio 2017/2019/2022, make sure to install **VS 2015 C++ build tools (v140)**.
* [DirectX SDK (June 2010)](https://www.microsoft.com/en-us/download/details.aspx?id=6812). You will also need `ddraw.lib` from DXSDK February 2010 and `dinput.lib` from DXSDK August 2007. Both files can be found in the [DirectX SDK Collection repo](https://github.com/NovaRain/DXSDK_Collection).
* [DirectX Runtime (June 2010)](https://www.microsoft.com/en-us/download/details.aspx?id=8109). You can also install it from DirectX SDK installer.
### Steps:
1. Set up a `postbuild.cmd` using the template from the repo.
2. Open the solution file and build with the **ReleaseXP** configuration (this is the one used for sfall releases).
3. If everything is set up correctly, you should have a new sfall `ddraw.dll` in your Fallout 2 directory.
## Additional info
* [Changelog](CHANGELOG.md)
* [Scripting Documentation](https://sfall-team.github.io/sfall/)
* Fallout Engine IDA Database: [for IDA Pro 6.8](https://www.dropbox.com/s/tm0nyx0lnk4yui0/Fallout_1_and_2_IDA68.rar?dl=1 "Download from Dropbox") | [for IDA Pro 7.0](https://www.dropbox.com/s/61srq09pn8grfpu/Fallout_1_and_2_IDA70.rar?dl=1 "Download from Dropbox") (comments are in Russian)
* [Fallout 2 Reference Edition](https://github.com/alexbatalov/fallout2-re)
+8 -7
View File
@@ -78,10 +78,11 @@ runs:
#
git clone --quiet https://github.com/NovaRain/DXSDK_Collection.git "$DXSDK_DIR"
cp "$DXSDK_DIR/DXSDK_Aug2007/Lib/x86/dinput.lib" "$DXSDK_DIR/DXSDK_Jun2010/Lib/x86/"
cp "$DXSDK_DIR/DXSDK_Feb2010/Lib/x86/ddraw.lib" "$DXSDK_DIR/DXSDK_Jun2010/Lib/x86/"
#
echo "::endgroup::"
fi
echo "::set-output name=dir::$(cygpath --windows "$DXSDK_DIR/DXSDK_Jun2010/")"
echo "dir=$(cygpath --windows "$DXSDK_DIR/DXSDK_Jun2010/")" >> $GITHUB_OUTPUT
shell: bash
# MSBuild is not in PATH on Windows machines
@@ -92,7 +93,7 @@ runs:
echo "::group::Prepare MSBuild"
MSBUILD_EXE="$("/c/Program Files (x86)/Microsoft Visual Studio/Installer/vswhere.exe" -latest -requires Microsoft.Component.MSBuild -find MSBuild/**/Bin/MSBuild.exe)"
echo "::set-output name=exe::$MSBUILD_EXE"
echo "exe=$MSBUILD_EXE" >> $GITHUB_OUTPUT
echo "::endgroup::"
shell: bash
@@ -105,10 +106,10 @@ runs:
echo ::group::Build ReleaseXP
#
echo "@echo off" > "$GITHUB_ACTION_PATH/sfall/PostBuild.cmd"
# echo "@echo off" > "$GITHUB_ACTION_PATH/sfall/PostBuild.cmd"
"${{ steps.msbuild.outputs.exe }}" "$GITHUB_ACTION_PATH/sfall/ddraw.sln" -p:Configuration=ReleaseXP -p:Platform=Win32 -p:PlatformToolset=v140_xp
#
echo "::set-output name=ddraw-dll::$(cygpath --windows "$GITHUB_ACTION_PATH/sfall/ReleaseXP/ddraw.dll")"
echo "ddraw-dll=$(cygpath --windows "$GITHUB_ACTION_PATH/sfall/ReleaseXP/ddraw.dll")" >> $GITHUB_OUTPUT
echo "::endgroup::"
fi
@@ -125,11 +126,11 @@ runs:
echo "::group::Build DevXP"
#
echo "@echo off" > "$GITHUB_ACTION_PATH/sfall/PostBuild.cmd"
# echo "@echo off" > "$GITHUB_ACTION_PATH/sfall/PostBuild.cmd"
"${{ steps.msbuild.outputs.exe }}" "$GITHUB_ACTION_PATH/sfall/ddraw.sln" -p:Configuration=DevXP -p:Platform=Win32 -p:PlatformToolset=v140_xp
#
echo "::set-output name=ddraw-dll::$(cygpath --windows "$GITHUB_ACTION_PATH/sfall/DevXP/ddraw.dll")"
echo "::set-output name=ddraw-pdb::$(cygpath --windows "$GITHUB_ACTION_PATH/sfall/DevXP/ddraw.pdb")"
echo "ddraw-dll=$(cygpath --windows "$GITHUB_ACTION_PATH/sfall/DevXP/ddraw.dll")" >> $GITHUB_OUTPUT
echo "ddraw-pdb=$(cygpath --windows "$GITHUB_ACTION_PATH/sfall/DevXP/ddraw.pdb")" >> $GITHUB_OUTPUT
echo "::endgroup::"
fi
+74 -14
View File
@@ -1,16 +1,45 @@
;This file handles modifications to perks and traits
;When adding extra perks to a mod, it's advisable to use the fake perk scripting functions rather than make modifications
; in this file, as some perks have hardcoded effects which may catch you out
;When adding extra perks to a mod, it's advisable to use the fake perk scripting functions rather than make
; modifications in this file, as some perks have hardcoded effects which may catch you out
;Since traits need to be picked before any scripts run, they have an additional NoHardcode option in this file which can
; be used to remove their hardcoded effects, and add new stat/skill effects
[PerksTweak]
;Changes the Outdoorsman skill bonus for 'Survivalist' perk (ID 16)
;125 - maximum bonus, 25 - default bonus
SurvivalistBonus=25
;Changes the bonus for 'Master Trader' perk (ID 17)
;25 - default bonus
MasterTraderBonus=25
;Changes the Science and Repair skill bonus for 'Mr.Fixit' perk (ID 31)
;125 - maximum bonus, 10 - default bonus
MrFixitBonus=10
;Changes the skill bonuses for 'Medic' perk (ID 32)
;125 - maximum bonus, 10 - default bonus
MedicFirstAidBonus=10
MedicDoctorBonus=10
;Changes the Lockpick and Steal skill bonus for 'Master Thief' perk (ID 33)
;125 - maximum bonus, 15 - default bonus
MasterThiefBonus=15
;Changes the Speech skill bonus for 'Speaker' perk (ID 34)
;125 - maximum bonus, 20 - default bonus
SpeakerBonus=20
;Changes the Sneak skill bonus (when in darkness) for 'Ghost' perk (ID 38)
;125 - maximum bonus, 20 - default bonus
GhostBonus=20
;Changes the Outdoorsman skill bonus for 'Ranger' perk (ID 47)
;125 - maximum bonus, 15 - default bonus
RangerOutdoorsmanBonus=15
;Changes the distance bonus for 'Weapon Long Range' weapon perk (ID 58)
;2 - no bonus, 4 - default bonus
WeaponLongRangeBonus=4
@@ -34,9 +63,22 @@ VaultCityInoculationsRadBonus=10
;999 - maximum bonus, 10 - default bonus
DemolitionExpertBonus=10
;Changes the damage bonus for 'Living Anatomy' perk (ID 97)
;125 - maximum bonus, 5 - default bonus
;Changes the Gambling skill bonus for 'Gambler' perk (ID 83)
;125 - maximum bonus, 20 - default bonus
GamblerBonus=20
;Changes the Steal skill bonus for 'Harmless' perk (ID 91)
;125 - maximum bonus, 20 - default bonus
HarmlessBonus=20
;Changes the damage bonus and the Doctor skill bonus for 'Living Anatomy' perk (ID 97)
;125 - maximum bonus, 5 - default bonus, 10 - default skill bonus
LivingAnatomyBonus=5
LivingAnatomyDoctorBonus=10
;Changes the Speech and Barter skill bonus for 'Negotiator' perk (ID 99)
;125 - maximum bonus, 10 - default bonus
NegotiatorBonus=10
;Changes the damage bonus for 'Pyromaniac' perk (ID 101)
;125 - maximum bonus, 5 - default bonus
@@ -50,10 +92,23 @@ SalesmanBonus=20
;valid range: 0..100, 50 - default percent
StonewallPercent=50
;Changes the Lockpick, Steal, and Traps skill bonus for 'Thief' perk (ID 105)
;125 - maximum bonus, 10 - default bonus
ThiefBonus=10
;Changes the strength bonus for 'Weapon Handling' perk (ID 106)
;0 - no bonus, 10 - maximum bonus, 3 - default bonus
WeaponHandlingBonus=3
;Changes the skill bonuses for 'Vault City Training' perk (ID 107)
;125 - maximum bonus, 5 - default bonus
VaultCityTrainingFirstAidBonus=5
VaultCityTrainingDoctorBonus=5
;Changes the Speech skill bonus for 'Expert Excrement Expeditor' perk (ID 116)
;125 - maximum bonus, 5 - default bonus
ExpertExcrementExpeditorBonus=5
;##############################################################################
[Perks]
;Set to 1 to enable the modifications for perks
@@ -64,25 +119,30 @@ Enable=0
;Image: The line number (0-indexed) of the corresponding FRM in skilldex.lst
;Ranks: The number of perk levels
;Level: The minimum required level
;Type: If 0, the perk checks only Skill1 for skill requirements; if 1, it checks Skill1 or Skill2; if 2, it checks both Skill1 and Skill2
;Type: If 0, the perk checks only Skill1 for skill requirements; if 1, it checks Skill1 or Skill2; if 2, it checks both
; Skill1 and Skill2
;Stat: The modified stat or -1 if you don't want to change any stats
;StatMag: The increased/decreased value to the modified stat
;Skill1/Skill2: The first/second skill (or -1 for none) to check, but if you set a specific bit 0x4000000 (67108864), it checks GVAR.
; For example, if Skill1=0x4000004, then the perk will check GVAR_BAD_MONSTER (0x4000000 + 4) on Skill1Mag value
;Skill1/Skill2: The first/second skill (or -1 for none) to check, but if you set a specific bit 0x4000000 (67108864),
; it checks the corresponding GVAR
; For example, if Skill1=0x4000004, the perk will check GVAR_BAD_MONSTER (0x4000000 + 4) on Skill1Mag value
;Skill1Mag/Skill2Mag: Positive value is used as the minimum requirements of the first/second skill/GVAR, and a negative value is interpreted as the maximum requirement.
; For example, with Skill1=0 and Skill1Mag=100, if player has small guns skill >= 100 and meets all other requirements, the perk will be available in the
; selection window; with Skill1=1 and Skill1Mag=-120, the perk will not be available if player has big guns skill >= 120
;Skill1Mag/Skill2Mag: Positive value is used as the minimum requirements of the first/second skill/GVAR, and a negative
; value is interpreted as the maximum requirement
; For example, with Skill1=0 and Skill1Mag=100, if player has small guns skill >= 100 and meets all other requirements,
; the perk will be available in the selection window; with Skill1=1 and Skill1Mag=-120, the perk will not be available
; if player has big guns skill >= 120
;STR-LCK: Positive values are used as minimum requirements of SPECIAL stats, and negative values are interpreted as maximum requirements.
; For some special perks processed by the engine (e.g. PERK_armor_powered and PERK_armor_combat), the values are not used as requirements
; but to add to corresponding SPECIAL stats
;STR-LCK: Positive values are used as minimum requirements of SPECIAL stats, and negative values are interpreted as
; maximum requirements
; For some special perks processed by the engine (e.g. PERK_armor_powered and PERK_armor_combat), the values are not
; used as requirements but to add to corresponding SPECIAL stats
;If the value is set to -99999, the variable will be ignored (similar to comment out that line)
;You can add simple extra perks with ID numbers from 119 to 255
; that do not require using scripting functions to change player stats, and can also be used for Armor perks
;The extra perks do not require using scripting functions to change player stats, and can also be used for Armor perks
;These parameters are only for extra perks
;Stat1/Stat2: same as Stat
;Stat1Mag/Stat2Mag: same as StatMag
+1 -1
View File
@@ -11,7 +11,7 @@ TagSkillBonus=20
;Set to 3 to use both modes
TagSkillMode=0
;Set to 1 to base skill costs on spent points instead of current level
;Set to 1 to base skill costs on the number of additional points in a skill instead of the current level
BasedOnPoints=0
;Examples
+4
View File
@@ -11,11 +11,15 @@ PartyLvlMsg=Lvl:
PartyACMsg=AC:
PartyAddictMsg=Addict
NPCPickupFail=%s cannot pick up the item.
AmmoInfoGlovz=Div: DR/%d, DT/%d
AmmoInfoYAAM=DT Mod: %d
PartyOrderAttackHuman=I'll take care of it.|Okay, I got it.|Sounds like a plan.
PartyOrderAttackCreature=::Growl::
PartyOrderAttackRobot=::Beep::
HiResInfo=This version of sfall has its own integrated High Resolution Patch mode, which is compatible with the settings of the High Resolution Patch by Mash.\n\nIf you want to continue using the Hi-Res Patch by Mash without seeing this message, disable the 'HiResMode' option in ddraw.ini.\nOr you can disable the external Hi-Res Patch to get new graphics improvements from sfall.\n\nDo you want to disable the High Resolution Patch by Mash?
[AppearanceMod]
RaceText=Race
StyleText=Style
+1 -1
View File
@@ -10,4 +10,4 @@
;in the proto for other items, so AI will use them for healing in combat as well
STIMPAK=40
SUPER_STIMPAK=144
HEALING_POWDER=237
HEALING_POWDER=273
+1 -1
View File
@@ -72,7 +72,7 @@ Power=16777349
[5]
PID=16777720
WeaponAnims=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
Default=16777353
Default=16777346
Jacket=16777346
Leather=16777347
Metal=16777348
+14 -8
View File
@@ -4,15 +4,18 @@
Key=42
; Set to 1 to also highlight containers
Containers=1
Containers=0
; Set to 1 to also highlight lootable corpses
Corpses=1
Corpses=0
; Set to 1 to also highlight critters, with the same rules as in combat
Critters=0
; Set to 1 to only highlight objects in the player's line-of-sight
CheckLOS=0
CheckLOS=1
; Set the color of outlines, available colors:
; Set the color of outlines for items, corpses, and containers; available colors:
; 1 - glowing red
; 2 - red
; 4 - grey
@@ -20,7 +23,7 @@ CheckLOS=0
; 16 - bright yellow
; 32 - dark yellow
; 64 - purple
; You can set a custom color from the game palette by multiplying the color index value by 256 (available since sfall 4.2.7)
; You can set a custom color from the game palette by multiplying the color index value by 256 (in 4.2.7 or later)
OutlineColor=16
; Motion Scanner mode:
@@ -31,11 +34,11 @@ MotionScanner=0
[CombatControl]
;Allows you to directly control other critters in combat
;Allows you to control other critters directly in combat
;Set to 0 to disable
;Set to 1 to control all critters in combat
;Set to 1 to control all critters in combat (allowed only in sfall debugging mode)
;Set to 2 to control all party members
;Set to 3 to let you order party members to attack specified targets after your first attack instead of controlling them directly
;Set to 3 to let you use the command cursor to specify targets for party members to attack in combat
Mode=0
;If you want to control only specific critters, uncomment the PIDList line and set a comma delimited list of PIDs
;PIDList=62,89,97,107,160,161
@@ -43,6 +46,9 @@ Mode=0
;Set a comma delimited list of perk IDs for perks to be inherited from the player during the combat control
PerksList=0,73
;Set to 1 to allow the player to gain a positive reputation when killing NPCs while controlling other critters
GainReputation=0
;Choose a notification box to display the name of the controlled critter above the interface bar
;Must be between 5 and (4 + the value of BoxBarCount in ddraw.ini)
;For sfall 4.1.6+ the number for the notification box is set automatically, so just use any value

Some files were not shown because too many files have changed in this diff Show More