Master combo of all forks, other general updates#14
Open
CamDawg wants to merge 46 commits into
Open
Conversation
Basically, skip trueclass bards getting an updated bard song if IWDification's bard songs are installed.
Poor logic on the RR/IWDification compat check. Fixed now.
…ities since it's more standard
Collecting all of the changes from Selphira and Angel's forks. Selphira's update to Detectable Spells v4.01 was dropped as Angel's branch updates it to v4.03. * Updates DS to v4.03 * Clears a warning on EE games for misc2p.itm since EEs already have this change * Makes the mod immutable - specifically it now backs up to weidu_external and use same for tra conversions * Moves the ALWAYS block to an external file Additional changes from Cam beyond the aforementioned forks: * Streamlined the encoding code * Added a var so that ALWAYS only runs once per session * AUTHOR => SUPPORT Contains the following commits: AngelGryph@6e473b1 AngelGryph@e0a51b2 AngelGryph@27c0208 AngelGryph@e661467 AngelGryph@b2caa92 (Should) deprecate the following forks and their associated PRs: https://github.com/AngelGryph/rr https://github.com/Selphira/rr FredrikLindgren#12
Collecting all of the changes from Lzw104522773 and abalabokhin's forks. * Adds a Simplified Chinese translation * Updates the Russian translation * Now has the proper chapter numbers for EET games Additional changes from Cam beyond the aforementioned forks: * Accidentally dropped the manual load of EE-specific strings from the previous commit in the ALWAYS block Contains the following commits: abalabokhin@2dd73be Lzw104522773@bbed19f Lzw104522773@1a51366 Lzw104522773@cdb32e7 (Should) deprecate the following forks and their associated PRs: https://github.com/Lzw104522773/rr FredrikLindgren#13 https://github.com/abalabokhin/rr FredrikLindgren#9
TotoR115@17c8891 * Bard song replacements are done is slightly different fashion * Dagger of Venom, Longtooth, Greagan's Harp edits skipped if Item Revisions is installed * Was detecting the wrong 1pp component for shield paperdolls * Updated ground icons for two items * Other changes already incorporated/not needed Cam's edits on top of this * Longtooth edit is no longer to a direct offset but through a function that properly reads the variable offset * Ground icons updated directly on items
TotoR115@bde3d27 * Added bypass Mirror Image flag to damage on rr#buc1a.eff * Added rr#buc1g.eff - investigate * Added more 1pp checks and utilization of those graphics if available The graphical checks are not complete. It's checking for only 1pp in some cases where these graphics are also available on EEs. It's also assigning BS as a paperdoll animation without a 1pp/EE check. All of this will need to be reviewed, but it'll wait until I've caught up and then I'll do it systematically--if TotoR hasn't done it a future commit already.
TotoR115@6bf0d1d * More coloration changes from 1pp
TotoR115@28a8982 Color corrections to their previous commit
TotoR115@8fe116c * More coloration changes
TotoR115@0eb88cb * Missing timing, target params on previous commit
TotoR115@d25e331 * Skip Graegan's harp outright if IR is installed
TotoR115@30d5d30#diff-504638a3e920f2fba6acadba73280631e3371e4db8cdda75ee6b03bbc0d62675 * Now just install RR's version of Graegan's Harp and overwrite IR's version, if present
TotoR115@c9fd9be Skipped as we're already at DS v4.03 from Angel's fork TotoR115@64eec9b Skipped as I don't think Avenger would want a different bard progression table TotoR115@30ab9f7 Partially implemented, as it does two things: * Add the generic composite shortbow name as the unidentified name for all of these items (implemented) * Remove scaling damage bonuses (see below) On the latter, TotoR correctly identified that damage doesn't scale with enchantments on bows--but this is conditional based on the game. BG2, BGT, and EET don't scale bow damage with enchantment, but BGEE, IWDEE, and Tutu do scale. This will be addressed in the next commit.
Glomming these together as they both kinda rely on the game_checks library. Speaking of which, added the game_checks library and swapped some checks over. I'm not messing with existing GAME_IS checkins in functions like Wisp's so that we can drop in updated libraries, should they become available. For 1pp compat: Rather than individual checks on items, a series of variables for appearance and palette checks are set in ALWAYS and then we just use variables as appropriate, e.g. BS for shortbow paperdolls if it's available, BW if not. The bows themselves just get writes of the variables, eschewing the individual checks. For the shortbow damage scaling, we define a scaling variable and then calculate damage for bows based on it. This variable is then applied to the launcher header, and used in the tra files to get the descriptions correctly. Blindstrike (rr#bow01) doesn't go through this since it's *only* available on non-scaling platforms, so the descript and item get static corrections. The Blindstrike correction and the variable damage means we touched pretty much every translation file. Also noted that two shortbows were using piercing damage instead of missile. I'm 99% sure this gets overridden by the ammo damage type, but I fixed them anyway.
One notable thing missing from the last commit notes: we should now be on par with TotoR's fork and PR and should now be pulling ahead. https://github.com/TotoR115/rr FredrikLindgren#10
Double spacing and other antiquated text format
Pretty much rewrote the stat blocks entirely to match EE formatting. Fixed a typo in the Keeper of the Law's flavor text. Graegan's Harp is missing its unidentified strings
Streamlined the code. Also resolved a missing path in HANDLE_CHARSETS
* RR has a slew of relevant code that it applies if BG2FP isn't present; this was reviewed against the current BG2FP and updated as needed * Sapped in my spell -> innate macro as it's more thorough * Added support for EEFP x_IMMNITY states and will be patching them in as relevant * Call to rr#afix moved to ALWAYS as it's called in 10/11 components * 206s used to prevent stacking are being swapped for 321s on EE games * EFFs used to make certain creatures immune (e.g. golems to poison) are being swapped to 318s on EEs
* use 321 instead of 206 to block spell stacking on EEs * swap 177 protections for 318s on EEs * Evasion was not blocking everything ti should due to effect ordering * Exploding Trap might (?) fail to remove its map note for the same reason
* No changes for racial adjustments * All bard songs get deafness checks on EEs - previously only done for IWDEE, but BGEE and BG2EE songs now work this way, too * Stacking for EEs now done with 321s * EFF-based exclusions now done with 318s on EEs * Expanded the IWDification bard song exclusion to include David's projects which do the same thing as IWDification * Deleted 267 in rr#bdf02 directly in file rather than tp2 * Added support for EEFP spell states and cure spells; had to reorder some effects in rr#bjs00 as a result * Weapons Display's 206 for the target lacked proper HD checks
* COMPONENT_NUMBER apparently needs an explicit != 0 instead of just ! * Added an insert parameter for Wisp's very clever protection_from_string macro so that I could use it with 318/177 protected spells * While it's unlikely, need to account for x_IMMUNITY spellstates having a valid value of 0 * Added IWDSpells support for RR scroll scribing HLA * While the HLAs should only be for BG2 and known strrefs, utilized Wisp's macro to assign op 267s dynamically * Use 318s on EEs instead of 177 for immunities * use 321s on EEs instead of 206 for stacking * Utilized EEFP x_IMMUNITY spellstates and #cureXXX spells * Added (Great) Shout immunities to Sound Barrier, if the spells are present * Sound Barrier wasn't actually blocking the existing innate shout due to effect misordering
* Moved arcane spell cloning to item component instead of ALWAYS block * Fixed off-by-one probability issues on all items/spells * Fixed an error introduced by me in a previous commit for the basic composite shortbow description (EE version) * Small changes (like op deletion) that were done in tp2 now made directly on the files * Utilized EEFP x_IMMUNITY states, where applicable. Same for #cureXXX spells * Use op 318s instead of EFFs for various racial/class/general immunities on EEs * Used op 321 instead of 206 on EEs for stacking prevention * Added tooltips for Tri-Souled Sapphire * Added a few (likely unnecessary) safeguards to the make-dialogue-pause patching * Improved my handling of unidentified name/desc strings for Graegan's Harp * Changed how we distribute composite shortbows on BG/BG2 platforms--now done by regexp to catch mod-added shops * Ioun stones no longer protect against critical hits on all games, not just IWDEE * Whitcomb dialogue change now done via d code * Left description images for IWDEE, as there are UI mods that supprt them * Utilized op 146's mode 2 for EE games for items casting spells * Several items which provide damage bonuses vs specific targets were doing it the old way, which allowed the bonus to apply to the other weapon if dual-wielded
* Added EE version of Lapis description * Added tooltips for upgraded Keeper of the Law * Since upgraded Keeper of the Law needs tooltips, did it for the base item too * Swapped 177s for 318s on EEs for race/general/class exclusions * Utilized EEFP's x_IMMUNITY states for EE games * Utilized EE's mode 2 for op 146 * Corrected off-by-one probability errors
…from stacking Only change is to use 321s instead of 206s on EE games
…effects from stacking Same as previous, just swapped stacking protections from 206 to 321s on EE games
* added thieving penalties to drow chain description * moved relevant spell cloning from item component to CoC component * items that cast spells now use op 146 mode 2 on EEs * Boots of the Fox and the cloned Boots of Speed now use EE's 'Increased Movement Speed' portrait icon * Above items now also use op 126, not 176, for their speed increases (making them subject to blocking by free action) * Use 318s instead of 177s on EEs to block effects by race/general/class * Supercharged Axe was providing 20% electrical resistance instead of the stated 10% * Spells that stack now use EE's op 321 instead of 206 * Dead Man's Face was protecting from a 'blind' string (the immunity is for fear) * Implemented EEFP spellstates and cures, as applicable * Ring of Geminus is blocked from being worn with the Ring of Wizardry, but wasn't accounting for the second version in BG2FP/BG2EE * Corrected a few off-by-one probability errors * Moved a few item changes from tp2 to direct changes on the item
* PnP Wand of Fear now just cloned from existing Wand of Fear * The two items that are shared between this component and the thief item are pushed into libraries and called as needed * Since face.ids exists for EEs, many script patches failed since it was expecting purely numerical face values * One of the stgarud1 patches was failing due to whitespace mismatching
Just added a check that the bam is present before copying it over
General changes * EFF files are no longer copied on EEs, as they're not needed. * Generally shifted from 318s to 324s to provide some feedback to players. Otherwise use of 324s were reviewed for effect exclusion. In some cases it was better to exclude effects upstream of where they were currently set. For example, the Weary Cudgel (base and upgraded) cast a spell to invoke fatigue on its target, and the spell was being guarded by 324s there (177/EFFs on the original). These 324s were moved upstream to the item directly. This was done on a few items with similar setups, such as the Supercharged Axes, Plaguebearer, and the various shambler weapons.
Stormcharged Axe did properly provide 20% electrical resistance; it was a bad copy-paste in the EE-specific tra file
Allowing them to get picked up by the bard hat e.g.
Death Attack, Crippling Strike, Danger Sense, Evasion, Set Acid Trap, Insightful Strike, and Paralytic Toxin are now all usable while silenced, at least on EEs or TobEx games.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This should contain all of the fixes and updates from all of the other forks and PRs of the mod: @abalabokhin, @AngelGryph,
@Lzw104522773, @Selphira, @TotoR115, and myself. I also found a few unresolved issues reported to the SHS forum. This should obsolete the following open PRs:
On top of that, I've spent a week crawling through the items, spells, and other code. A lot of it was just better utilization of how EE does stuff, but there were some bugs here and there that got fixed as well.
The WIP changelog: