New component: Increase Yoshimo's Trapsetting Ability

Yoshimo is a bounty hunter, whose specialty is laying custom snares, but Yoshimo comes with a piddly 35 in his trapsetting ability. This
component adjusts Yoshimo's thieving abilities to shift more points into his trapsetting, primarily at the expense of stealth. At level 10
his trapsetting is adjusted to 70 by removing 5 points from find traps, 10 from hide in shadows, and 20 from move silently. At the two
level ups that followed, Yoshimo gained 5 points each in hide in shadows and move silently and then 10 in lock picking; the 10 in
lockpicking is changed to 5 lockpicking and 5 in trapsetting.

Author: CamDawg

cdtweaks/languages/english/weidu.tra

@@ -880,6 +880,8 @@ Use Baldur.lua options: a7_interval_ini
 @422001 = ~Delay until the Nashkel mines are cleared~
 @422100 = ~Delay until PC has 5000 XP~
 
+@423000 = ~Increase Yoshimo's Trapsetting Ability~
+
 /////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\
 /////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\
 /////                                                  \\\\\

cdtweaks/lib/comp_4230.tpa

@@ -0,0 +1,34 @@
+/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\
+/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\
+/////                                                            \\\\\
+///// Increase Yoshimo's Trapsetting Ability                     \\\\\
+/////                                                            \\\\\
+/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\
+/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\
+
+ACTION_DEFINE_ASSOCIATIVE_ARRAY cd_yoshimo_traps BEGIN 
+
+  // locks, find traps, pickpocket, MS, HiS, DI, set traps => creature file
+        65,         95,         25, 40,  40,  0,        70 => yoshi7  // moving 5 find traps/20 MS/10 HiS > +35 set traps
+        65,         95,         25, 40,  40,  0,        70 => yoshi8  // ^^ same
+        65,         95,         25, 40,  40,  0,        70 => yoshi10 // ^^ same
+        70,         95,         25, 45,  45,  0,        75 => yoshi11 // level up was +5 HiS, +10 locks, +5 MS => 10 in locks changed to 5 locks, 5 set traps
+        75,         95,         25, 50,  50,  0,        80 => yoshi12 // level up was +5 HiS, +10 locks, +5 MS => 10 in locks changed to 5 locks, 5 set traps
+  
+END
+
+ACTION_PHP_EACH cd_yoshimo_traps AS params => file BEGIN
+
+  // the array has *final* values - we need to adjust the actual scores in the creature files to account for racial/dex bonuses
+  COPY_EXISTING ~%file%.cre~ ~override~
+    WRITE_BYTE 0x67 (params_0 -                             25) // locks (10 human, 15 for 18 DEX)
+    WRITE_BYTE 0x69 (params_1 -                             10) // find traps (5 human, 5 for 18 DEX)
+    WRITE_BYTE 0x6a (params_2 -                             25) // pickpocket (15 human, 10 for 18 DEX)
+    WRITE_BYTE 0x68 (params_3 -                             20) // MS (10 human, 10 for 18 DEX)
+    WRITE_BYTE 0x45 (params_4 -                             15) // HiS (5 human, 10 for 18 DEX)
+    WRITE_BYTE 0x64 (params_5 -                              0) // detect illusion (0 human, 0 for 18 DEX)
+    // obg2 applies spcl417 for +15 set trap bonus, whereas ee applies it directly, so we have to account for it:
+    WRITE_BYTE 0x65 (params_6 - (20 - (15 * enhanced_edition))) // set traps (0 human, 5 for 18 DEX, 15 for oBG2 for spcl417): net is -5 bg2ee, -20 obg2
+    BUT_ONLY IF_EXISTS
+    
+END

cdtweaks/readme-cdtweaks.html

@@ -1536,6 +1536,9 @@ <h3> <a id="contents_npc" name="contents_npc"></a>Joinable <abbr title="Non-Play
       <p> <a id="contents_4220" name="contents_4220"></a><a id="contents_4221" name="contents_4221"></a><strong>Delay Neera's Appearance in Beregost</strong> <a href="#contents_4220" rel=""><img alt="Link to this component" height="9" width="14" src="style/link.png" /></a><br />
       <em><abbr title="Baldur's Gate: Enhanced Edition">BGEE</abbr>,  <abbr title="Enhanced Edition Trilogy">EET</abbr></em></p>
       <p> Neera's introduction in Beregost leads immediately to a fight in the middle of the town, which can be problematic for lower level characters. With this component the player can delay Neera's appearance until after the Nashkel Mines are cleared, or after the PC has 5000 XP. </p>
+      <p> <a id="contents_4230" name="contents_4230"></a><strong>Increase Yoshimo's Trapsetting Ability</strong> <a href="#contents_4230" rel=""><img alt="Link to this component" height="9" width="14" src="style/link.png" /></a><br />
+      <em><abbr title="Baldur's Gate II: Enhanced Edition">BG2EE</abbr>, <abbr title="Enhanced Edition Trilogy">EET</abbr>, <abbr title="Baldur's Gate II">BG2</abbr>, <abbr title="Baldur's Gate Trilogy">BGT</abbr></em></p>
+      <p>Yoshimo is a bounty hunter, whose specialty is laying custom snares, but Yoshimo comes with a piddly 35 in his trapsetting ability. This component adjusts Yoshimo's thieving abilities to shift more points into his trapsetting, primarily at the expense of stealth. At level 10 his trapsetting is adjusted to 70 by removing 5 points from find traps, 10 from hide in shadows, and 20 from move silently. At the two level ups that followed, Yoshimo gained 5 points each in hide in shadows and move silently and then 10 in lock picking; the 10 in lockpicking is changed to 5 lockpicking and 5 in trapsetting. </p>
     </div>
     <div class="ribbon_rectangle_h3">
       <h3> <a id="contents_feats" name="contents_feats"></a><abbr title="Neverwinter Nights">NWN</abbr>-Style Feats <a href="#contents_feats" rel=""><img alt="Link to this section" height="9" width="14" src="style/link.png" /></a></h3>
@@ -2437,7 +2440,7 @@ <h2> Version History <a href="#History" rel=""><img alt="Link to this section" h
       <ul>
         <li>Fixed a severe issue with <strong>Allow Monks to Change Damage Types with Hand Weapons</strong> where it could cause crashes on level up</li>
         <li>Fixed a severe issue with <strong>Make Bears and Boars Continue Fighting after Reaching 0 Hit Points</strong> where it could crash when the 0-hit point threshold was reached</li>
-        <li>Three new components: <strong>Allow Shapeshifters to Wear Armor But Prevent Shapeshifting While Worn</strong>, <strong>Adjust Nalia's Thief Level</strong>, and <strong>Delay Neera's Appearance in Beregost</strong></li>
+        <li>Four new components: <strong>Allow Shapeshifters to Wear Armor But Prevent Shapeshifting While Worn</strong>, <strong>Adjust Nalia's Thief Level</strong>,  <strong>Delay Neera's Appearance in Beregost</strong>, and <strong>Increase Yoshimo's Trapsetting Ability</strong></li>
         <li><strong>Taerom Makes Additional Ankheg Armors</strong> will now skip if the same component from Tweaks and Tricks is installed, but it was checking the wrong component from TnT (thanks Selphira)</li>
         <li>With the mage stronghold enabled via <strong>Multiple Strongholds</strong> or <strong>Make Individual Strongholds Available</strong>, the Knights of Solamnia could leave (and prevent their normal quest) if they were spoken to at just the wrong moment, which is fixed. An option to decline the offer of the Planar Sphere as a stronghold has been added as well. </li>
         <li><strong>Weapon Animation Tweaks</strong> was changing flails to use the morningstar animation, which it shouldn't </li>

cdtweaks/setup-cdtweaks.tp2

@@ -5538,6 +5538,19 @@ GROUP @0
 REQUIRE_PREDICATE GAME_IS ~bgee eet~ @25
 LABEL ~cd_tweaks_neera_delay_till_5k_xp~
 
+/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\
+/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\
+/////                                                            \\\\\
+///// Increase Yoshimo's Trapsetting Ability                     \\\\\
+/////                                                            \\\\\
+/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\
+/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\
+
+BEGIN @423000 DESIGNATED 4230
+GROUP @0
+REQUIRE_PREDICATE GAME_IS ~soa tob bgt bg2ee eet~ @25
+LABEL ~cd_tweaks_yoshimo_better_trapsetting~
+
 /////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\
 /////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\
 /////                                                            \\\\\