Skip to content

Commit 39f16df

Browse files
authored
Merge pull request #145 from CamDawg/master
a1 prep
2 parents 8713b4f + fa2cbc9 commit 39f16df

19 files changed

+138
-39
lines changed

docs/bg2ee.html

Lines changed: 27 additions & 4 deletions
Large diffs are not rendered by default.

docs/bgee.html

Lines changed: 19 additions & 3 deletions
Large diffs are not rendered by default.

docs/eefixpack_arrays.ods

425 Bytes
Binary file not shown.

docs/iwdee.html

Lines changed: 10 additions & 2 deletions
Large diffs are not rendered by default.

docs/pstee.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<body>
1717
<p><strong>Developer note:</strong> this is essentially copy-pasted (minus this paragraph, natch) into the documentation pages on the G3 project page. Feel free to add/adjust the documentation as needed. The class <span class="bg2fp_beta">bg2fp_beta (red)</span> should be used to mark fixes that are in the Beta Core Fixes (nothing yet) and the <span class="bg2fp_modder">bg2fp_modder (magenta)</span> class should be used for modder notes. In the live pages, these are normally colored, but hidden, unless the user enables them. </p>
1818
<!-- documentation begins here -->
19-
<p>This documentation is complete as of March 15, 2025. </p>
19+
<p>This documentation is complete as of Alpha 1 - April 1, 2025. </p>
2020
<p>
2121
<input id="cd_modder_show" name="cd_modder_show" onclick="$('.bg2fp_modder').css({'display':'block'}); $('span.bg2fp_modder').css({'display':'inline'}); $('#cd_modder_show').attr('disabled', 'disabled'); $('#cd_modder_hide').removeAttr('disabled');" type="button" value="Show Modder Notes" />
2222
<input disabled="disabled" id="cd_modder_hide" name="cd_modder_hide" onclick="$('.bg2fp_modder').css({'display':'none'}); $('span.bg2fp_modder').css({'display':'none'}); $('#cd_modder_hide').attr('disabled', 'disabled'); $('#cd_modder_show').removeAttr('disabled');" type="button" value="Hide Modder Notes" />
@@ -55,12 +55,17 @@ <h3> <a name="dialogue_fixes" id="dialogue_fixes"></a>Dialogue Fixes <a href="#d
5555
<li>Three dialogues set duplicate journal entries, and are fixed. <span class="bg2fp_modder">(dkitla.dlg, dgrace.dlg, dpillar.dlg)</span></li>
5656
<li>One of the replies in Fall-from-Grace's dialogue used the wrong string. <span class="bg2fp_modder">(dgrace.dlg)</span></li>
5757
<li>When Ingress' teeth are upgraded, they should preserve the damage type. <span class="bg2fp_modder">(ipteeth.dlg)</span></li>
58+
<li>One attack action for Vhailor wasn't working as it had the wrong actor name<span class="bg2fp_modder"> (dtrias.dlg)</span></li>
59+
<li>Cleared a reference to a non-existant item in Marissa's dialogue<span class="bg2fp_modder"> (dmarissa.dlg)</span></li>
60+
<li>Nihl Xander should give you an existing 'Pacify' scroll when following the Dreambuilder conversation branch<span class="bg2fp_modder"> (dxander.dlg)</span></li>
61+
<li>If actions in dialogues were misordered in a very specific and technical way, some of the actions (such as updating variables for quests) may not get executed. These action queues have been re-ordered to be more robust.<span class="bg2fp_modder"> (bladeim.dlg, d300mer5.dlg, dadyzoel.dlg, danam.dlg, dannah.dlg, dawait.dlg, dbaria.dlg, dberrog.dlg, dbish.dlg, dbladeim.dlg, dburgher.dlg, dcarver.dlg, dcoax.dlg, dcraddo.dlg, ddakkon.dlg, ddeathad.dlg, ddolora.dlg, ddust.dlg, ddustfem.dlg, deivene.dlg, deli.dlg, delobran.dlg, dfinnote.dlg, dghiverm.dlg, dgiantsk.dlg, dgith.dlg, dgoncal.dlg, dhgcorv.dlg, dhguard.dlg, dhivef1.dlg, dhpatrol.dlg, diannis.dlg, dignus.dlg, dkeldor.dlg, dkimasxi.dlg, dkitla.dlg, dlingash.dlg, dmar.dlg, dmorte.dlg, dnordom.dlg, dpox.dlg, dravel.dlg, drkchsr.dlg, dr_bone.dlg, dsabast.dlg, dsarhava.dlg, dscpat2.dlg, dstalema.dlg, dsybil.dlg, dthornco.dlg, dtires.dlg, dvaxis.dlg, dvhail.dlg, dzm985.dlg, finnote.dlg)</span></li>
5862
</ul>
5963
<h3> <a name="item_fixes" id="item_fixes"></a>Item Fixes <a href="#item_fixes"><img src="https://content.invisioncic.com/u284679/monthly_2022_11/link.png.a311bee5fc8e33e5450e13e9586b2372.png" alt="Link to this section" width="14" height="9" /></a></h3>
6064
<ul>
6165
<li>The Number of Ku'u Yin should protect from chaotic creatures. <span class="bg2fp_modder">(kyname.itm)</span></li>
6266
<li>Uhir's Knife should not by usable by Annah. <span class="bg2fp_modder">(uhrknf.itm)</span></li>
6367
<li>Silver Fork and Entropic Blade should not be usable by priests or some NPCs. <span class="bg2fp_modder">(fork.itm, supwep.itm)</span></li>
68+
<li>Various items were given to the party with the wrong number of charges<span class="bg2fp_modder"> (dcandri.dlg, ddakkon.dlg, debb.dlg, dghiverm.dlg, diannis.dlg, dignus.dlg, dkitla.dlg, dnordom.dlg)</span></li>
6469
</ul>
6570
<h3> <a name="creature_fixes" id="creature_fixes"></a>Creature Fixes <a href="#creature_fixes"><img src="https://content.invisioncic.com/u284679/monthly_2022_11/link.png.a311bee5fc8e33e5450e13e9586b2372.png" alt="Link to this section" width="14" height="9" /></a></h3>
6671
<ul>

eefixpack/data/immunity/bg1/protective.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ AMUL17.ITM
44
AMUL21.ITM
55
ANTIWEB.ITM
66
BAZPATRG.ITM
7-
BDRING09.ITM
87
BEHOLDER.ITM
98
BHAALHP1.ITM
109
BHAALIMM.ITM

eefixpack/eefixpack.ini

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# Never copy this file from other mods, always use https://github.com/ALIENQuake/ProjectInfinity/wiki/Adding-metadata-for-mod
2+
# Filename must be the same as tp2 basename, placed in the same folder where
3+
# .tp2 file is located, use UTF8 (without BOM) encoding, everything is optional
4+
5+
# ini section header is required to avoid false detection
6+
[Metadata]
7+
8+
# Full name of the mod, without the list of supported games, without the version number, without 'Mod'
9+
Name = Enhanced Edition Fixpack
10+
11+
# Author name or nick, don't use an email address
12+
Author = EEFP Team
13+
14+
# Short description of the mod, main goals, features etc
15+
Description = The EE Fixpack is a WeiDU compilation of fixes for the Enhanced Editions of Baldur's Gate, Baldur's Gate II, Icewind Dale, and Planescape: Torment. This collaborative effort, including the work of modders from several different modding communities, is intended to address issues left over in these games after the current official patch.
16+
17+
# Web address of mod readme file (filename is case-sensitive!), comma-separated list. You can link to txt, md, html, pdf etc.
18+
Readme = https://gibberlings3.github.io/Documentation/readmes/readme-eefixpack.html
19+
20+
# Web address of mod dedicated forum or forum thread
21+
Forum = https://www.gibberlings3.net/forums/forum/232-ee-fixpack/
22+
23+
# Web address of mod personal Homepage, no need to duplicate with a mod dedicated forum
24+
Homepage = https://www.gibberlings3.net/mods/fixes/eefp/
25+
26+
# If you use GitHub.com, simply use https://github.com/AccountOrOrgName/RepositoryName (omit /releases)
27+
# read more about Delta Updates https://github.com/ALIENQuake/ProjectInfinity/wiki/Delta-Updates-for-mods-hosted-at-Github
28+
Download = https://github.com/Gibberlings3/EE_Fixpack
29+
30+
# Type of LABELs used by the mod, read more here https://www.gibberlings3.net/forums/topic/32516-tutorial-what-is-label
31+
LabelType = GloballyUnique
32+
33+
# Dynamic Install Order, use mod ID as tp2 name without file extension and `setup-` prefix
34+
35+
# This mod must be installed *before* those ModID listed below, comma-separated list:
36+
# copy-pasted from anthology's after list
37+
Before = 1pp, ab, arestorationp, bg1npc, bg2fixpack, cdtweaks, item_rev, itemupgrade, iu_iwd, iwdfixpack, iwdification, mts_crappackv2, oversight, thecalling, tobex, tomeandblood, ub_iwd, underrep
38+
39+
# This mod must be installed *after* those ModID listed below, comma-separated list:
40+
After = dlcmerger

eefixpack/files/lib/gt_7eyes.tph

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ BEGIN
410410
PATCH_FAIL "Should not happen (~%DEST_FILE%~)"
411411
END
412412
END ELSE BEGIN
413-
PATCH_WARN "SPL file ~%subspell_resref%~ already exists as a game resource! Intended?"
413+
//PATCH_WARN "SPL file ~%subspell_resref%~ already exists as a game resource! Intended?"
414414
END
415415
END
416416

eefixpack/files/tph/bg2ee.tph

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,11 +1214,6 @@ COPY_EXISTING ~spwish12.spl~ ~override~
12141214
LPF ALTER_EFFECT INT_VAR match_opcode = 321 target = 3 END
12151215
BUT_ONLY // Now removes hardiness effects from the same targets it adds them to
12161216

1217-
// tbd, cam
1218-
// expiry sound is way too early
1219-
COPY_EXISTING ~spwish33.spl~ ~override~ // Intoxication - causes drunkenness - plays sound EFF_E06 - portrait icon 5
1220-
LPF ALTER_EFFECT INT_VAR match_opcode = 174 match_duration = 60 duration = 1200 END
1221-
12221217
// luke
12231218
// Mis-indexed effects
12241219
WITH_SCOPE BEGIN

eefixpack/files/tph/bg_bg2_common_spell_fixes.tph

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -716,6 +716,12 @@ COPY_EXISTING ~sppr509.spl~ ~override~ //magic resistance
716716
COPY_EXISTING ~sppr608.spl~ ~override~ // harm
717717
LPF ALTER_EFFECT INT_VAR match_duration = 15 duration = 12 END // duration is three seconds long
718718

719+
// at levels 14-15, shield of the archons absorbs 9 levels of level 3 spells instead of the correct 7
720+
COPY_EXISTING ~sppr701.spl~ ~override~
721+
LPF ALTER_EFFECT INT_VAR match_opcode = 201 match_parameter1 = 9 parameter1 = 7 match_duration = 252 END
722+
LPF ALTER_EFFECT INT_VAR match_opcode = 201 match_parameter1 = 9 parameter1 = 7 match_duration = 270 END
723+
BUT_ONLY
724+
719725
COPY_EXISTING ~sppr709.spl~ ~override~ // Confusion [bg2]
720726
LPF CLONE_EFFECT INT_VAR header = 0 match_opcode = 174 timing = 1 duration = 0 STR_VAR match_resource = eff_e05 resource = eff_m05 END // missing sound at min level
721727

0 commit comments

Comments
 (0)