Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix CtD in Black Pits I + Add dlcmerger #15

Closed
wants to merge 3 commits into from
Closed

Fix CtD in Black Pits I + Add dlcmerger #15

wants to merge 3 commits into from

Conversation

RoxanneSHS
Copy link
Contributor

No description provided.

@RoxanneSHS RoxanneSHS changed the title Fix CtD in Black Pits I Fix CtD in Black Pits I + Add dlcmerger Jun 21, 2018
@K4thos
Copy link
Collaborator

K4thos commented Jul 20, 2018 •
edited
Loading

Thanks for pull request.
I've added dlcmerger to compatibility list (btw. you don't need to create include.tph file if there are no patches needed - just set 0 value in compatibility.tbl)

As for the second portion of pull request there are few issues with it:

  1. BPLLYRK.CRE has been added to base/cre dir even though the file is imported from BG:EE (in such case EET patches file rather than overwriting it)
  2. Same is true for BPSKEL.BCS - if already imported we're patching instead of overwriting (this way proper warning can be implemented in case the file is changed in future official patches)
  3. I can't replicate the CTD. Repro steps or save file would be helpful.
  4. Removing this code from BPSKEL.BCS changes important part of the battle:
IF
	OR(3)
		Dead("BPLLYRK")  // Llyrk
		HPLT("BPLLYRK",1)  // Llyrk
		!InMyArea("BPLLYRK")  // Llyrk
THEN
	RESPONSE #100
		Kill(Myself)
		ApplyDamage(Myself,999,CRUSHING)
END

Based on my tests it works as indented.
5. There is known bug when replaying the battle but since it's Submitted it will likely be fixed by Beamdog in the upcoming patch 2.5 for SoD: https://support.baldursgate.com/issues/37227
Probably Beamdog will implement SPRITEISDEADBPLLYRK var reset after the battle. The report doesn't mention CTD though.

K4thos added a commit that referenced this pull request Jul 20, 2018
@K4thos
Version 1.0 Release Candidate 10
0c13767 
General changes and fixes:
- WeiDU updated to Version 246
- 64-bit WeiDU binaries added to package (64-bit setup-EET used by default)
- SPLPROT.2DA importation and patching (weapons should no longer break past chapter 6)
- impact projectile patching
- IncrementGlobal chapter patching
- macros.tph now uses NearInfinity names for Effects comments (cosmetic change)
- housg3state5 dialog state variable added to cpmvars (Pull request #10 by AstroBryGuy on Github)
- EET.ico file with multiple resolutions (Pull request #11 by Rakhsev on Github)
- vanilla OnCreation() trigger removed from AR4000.bcs (Issue #12 on Github)
- added DLC Merger to compatibility list (Pull request #15 by Roxanne on Github)
- removed reputation reset during SoA transition (Issue #16 on Github, the feature will be likely implemented back once I test the transition on 2.5 patch - better safe than sorry)
- Baldur.exe patching is now done with external LUA code to save memory (Issue #17 on Github, REPLACE_TEXTUALLY used on 5MB+ file may be too much for BWS installation)

Changes related to BG2:EE patch 2.5.16.6:
- updated BG2:EE GUI (based on latest UI.MENU, SoD GUI still awaits for unreleased 2.5 SoD patch in order to get the same functionality)
- removed BCS and DLG patching for stuff fixed in the patch
- additional resource and special fields patching (based on recent NearInfinity changelogs)
- DisplayStringPoint, DisplayStringPointLog strref patching in reversed order
- BitCheck, Proficiency, ProficiencyGT, ProficiencyLT triggers patching
- BitSet, BitClear, IncrementGlobalOnce, IncrementGlobalOnceEx, PlaySoundNotRanged, PlaySoundThroughVoice actions patching
- removed cheat area codes for SoA and ToB areas (they are now part of vanilla game)
@RoxanneSHS
Copy link
Contributor Author

Overcome by EET RC10

@RoxanneSHS RoxanneSHS closed this Jul 20, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@RoxanneSHS @K4thos