--- SETUP-com_encounters.tp2	Sat Apr 23 11:14:42 2016
+++ C:\BWP Patchstudio\patched files\SETUP-com_encounters.tp2	Mon Aug 08 08:26:31 2016
@@ -9,7 +9,7 @@
 AUTHOR ~"http://chosenofmystra.com"~
 
 // Isaya: version, readme displayed at the beginning, UTF-8 conversion on the fly
-VERSION ~v1.10_charsets~
+VERSION ~v1.10_charsets BWP Fix~
 
 README ~com_encounters/readme_ce.html~
 
@@ -206,7 +206,6 @@
 
 // Items
 
-/*
 COPY ~com_encounters/item/UHALB4A.ITM~ ~override/UHALB4A.ITM~        
   SAY NAME1 ~Halberd~
   SAY NAME2 ~Doom Halberd +3~
@@ -220,7 +219,10 @@
 Speed Factor: 9 
 Proficiency Type: Halberd 
 Type: 2-handed Not 
-~
+Usable By:  
+Druid  
+Cleric  
+Mage~
   SAY DESC ~Like others of its type, this halberd consists of a cleaver-like axe blade mounted on a staff approximately six feet in length. It has also been bestowed with a small number of magical properties, however, thus making it more effective in combat. Its keen blade, for instance, will shear through your opponent's flesh to find the bone while its barbed tip will seek out gaps in their armor. This halberd has had various enchantments placed on it to increase its effectiveness in battle. 
 
 STATISTICS:  
@@ -235,7 +237,11 @@
 Speed Factor: 8 
 Proficiency Type: Halberds 
 Type: 2-handed 
-~
+Not Usable By:  
+Druid 
+Cleric
+Mage
+Thief~
 
 COPY ~com_encounters/item/UHALB4B.ITM~ ~override/UHALB4B.ITM~        
   SAY NAME1 ~Halberd~
@@ -250,7 +256,10 @@
 Speed Factor: 9 
 Proficiency Type: Halberd 
 Type: 2-handed Not 
-~
+Usable By:  
+Druid  
+Cleric  
+Mage~
   SAY DESC ~Like others of its type, this halberd consists of a cleaver-like axe blade mounted on a staff approximately six feet in length. It has also been bestowed with a small number of magical properties, however, thus making it more effective in combat. Its keen blade, for instance, will shear through your opponent's flesh to find the bone while its barbed tip will seek out gaps in their armor. This halberd has had various enchantments placed on it to increase its effectiveness in battle.
 
 STATISTICS:
@@ -267,7 +276,11 @@
 Speed Factor: 8
 Proficiency Type: Halberds
 Type: 2-handed
-~
+Not Usable By:
+ Druid
+ Cleric
+ Mage
+ Thief~
 
 COPY ~com_encounters/item/UHALB5A.ITM~ ~override/UHALB5A.ITM~        
   SAY NAME1 ~Halberd~
@@ -282,7 +295,10 @@
 Speed Factor: 9 
 Proficiency Type: Halberd 
 Type: 2-handed Not 
-~
+Usable By:  
+Druid
+Cleric  
+Mage~
   SAY DESC ~Like others of its type, this halberd consists of a cleaver-like axe blade mounted on a staff approximately six feet in length. It has also been bestowed with a small number of magical properties, however, thus making it more effective in combat. Its keen blade, for instance, will shear through your opponent's flesh to find the bone while its barbed tip will seek out gaps in their armor. This halberd has had various enchantments placed on it to increase its effectiveness in battle.
 
 STATISTICS:
@@ -296,7 +312,11 @@
 Speed Factor: 8
 Proficiency Type: Halberds
 Type:  2-handed
-~    */
+Not Usable By:
+ Druid
+ Cleric
+ Mage
+ Thief~
 
 // load up ee-specific tra files on BG2EE - Isaya: fixed path and missing .tra in file name
 ACTION_IF GAME_IS ~bg2ee~ THEN BEGIN
@@ -575,12 +595,223 @@
 // Improved Stuff
 
 BEGIN @10138
+REQUIRE_PREDICATE MOD_IS_INSTALLED ~SETUP-com_encounters.tp2~ ~0~ ~This component uses items from the main encounters component!~
 
-COPY ~com_encounters/improved_druids~ ~override~
+// COPY ~com_encounters/improved_druids~ ~override~
+COPY_EXISTING ~CEDRUID2.CRE~ ~override~
+  WRITE_LONG  0x14 4500											// XPVAL was 3000
+  WRITE_SHORT 0x48 5											// EFFAC was 10
+  WRITE_BYTE  0x52 8											// THAC0 was 12
+  WRITE_BYTE  0x23c 19											// DEX was 9
+  WRITE_ASCII 0x250 ~DRUID12A~									// CLASSSCRIPT was NONE
+  ADD_CRE_ITEM ~LEAT07~ #0 #0 #0 ~IDENTIFIED~ ~ARMOR~
+  ADD_MEMORIZED_SPELL ~SPPR103~ #0 ~priest~ ( 2 )
+  ADD_MEMORIZED_SPELL ~SPPR105~ #0 ~priest~ ( 2 )
+  ADD_MEMORIZED_SPELL ~SPPR110~ #0 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR113~ #0 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR206~ #1 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR211~ #1 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR213~ #1 ~priest~ ( 2 )
+  ADD_MEMORIZED_SPELL ~SPPR302~ #2 ~priest~ ( 2 )
+  ADD_MEMORIZED_SPELL ~SPPR319~ #2 ~priest~ ( 2 )
+  ADD_MEMORIZED_SPELL ~SPPR410~ #3 ~priest~ ( 2 )
+  ADD_MEMORIZED_SPELL ~SPPR516~ #4 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR517~ #4 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR605~ #5 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR610~ #5 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR704~ #6 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR717~ #6 ~priest~
+BUT_ONLY_IF_IT_CHANGES
+
+COPY_EXISTING ~CEFGT01.CRE~ ~override~
+  WRITE_LONG  0x14 7000											// XPVAL was 6000
+  WRITE_BYTE  0x53 9											// APR was 2
+  REPLACE_CRE_ITEM ~CHAN05~ #0 #0 #0 ~IDENTIFIED~ ~ARMOR~		// INV was CHAN04
+  ADD_CRE_ITEM ~BLUN10~ #0 #0 #0 ~IDENTIFIED~ ~SHIELD~
+BUT_ONLY_IF_IT_CHANGES
+
+COPY_EXISTING ~CEFGT02.CRE~ ~override~
+  WRITE_LONG  0x14 2500											// XPVAL was 2000
+  WRITE_LONG  0x1c 100											// GOLD was 0
+  WRITE_BYTE  0x52 11											// THAC0 was 14
+  WRITE_BYTE  0x53 2											// APR was 1
+  REPLACE_CRE_ITEM ~BLUN31~ #0 #0 #0 ~IDENTIFIED~ ~WEAPON1~ EQUIP	// INV was BLUN01
+  ADD_MEMORIZED_SPELL ~SPPR206~ #1 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR410~ #3 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR607~ #5 ~priest~
+BUT_ONLY_IF_IT_CHANGES
+
+COPY_EXISTING ~DGDRU01.CRE~ ~override~
+  WRITE_LONG  0x14 2500											// XPVAL was 2000
+  WRITE_LONG  0x1c 100											// GOLD was 0
+  WRITE_BYTE  0x53 7											// APR was 1
+  ADD_CRE_ITEM ~SW1H76~ #0 #0 #0 ~IDENTIFIED~ ~WEAPON1~ EQUIP
+  ADD_MEMORIZED_SPELL ~SPPR514~ #4 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR607~ #5 ~priest~
+BUT_ONLY_IF_IT_CHANGES
+
+COPY_EXISTING ~DGFIG01.CRE~ ~override~
+  WRITE_LONG  0x14 4000											// XPVAL was 2000
+  WRITE_LONG  0x1c 100											// GOLD was 0
+  REPLACE_CRE_ITEM ~SPER02~ #0 #0 #0 ~IDENTIFIED~ ~WEAPON1~ EQUIP	// INV was SPER01
+BUT_ONLY_IF_IT_CHANGES
+
+COPY_EXISTING ~DGMAG01.CRE~ ~override~
+  WRITE_LONG  0x14 5975											// XPVAL was 975
+  ADD_CRE_ITEM ~CLCK11~ #0 #0 #0 ~IDENTIFIED~ ~ARMOR~
+  ADD_CRE_ITEM ~DART05~ #40 #0 #0 ~IDENTIFIED~ ~WEAPON1~ EQUIP
+  ADD_MEMORIZED_SPELL ~SPWI217~ #1 ~wizard~
+  ADD_MEMORIZED_SPELL ~SPWI308~ #2 ~wizard~
+  ADD_MEMORIZED_SPELL ~SPWI309~ #2 ~wizard~
+  ADD_MEMORIZED_SPELL ~SPWI313~ #2 ~wizard~
+BUT_ONLY_IF_IT_CHANGES
+
+COPY_EXISTING ~TDR6A.CRE~ ~override~
+  WRITE_LONG  0x14 2975											// XPVAL was 975
+  WRITE_SHORT 0x24 68											// HP1 was 48
+  WRITE_SHORT 0x26 68											// HP2 was 48
+  WRITE_BYTE  0x52 10											// THAC0 was 18
+  WRITE_BYTE  0x53 2											// APR was 1
+  ADD_CRE_ITEM ~LEAT02~ #0 #0 #0 ~IDENTIFIED~ ~ARMOR~
+  ADD_CRE_ITEM ~STAF02~ #0 #0 #0 ~IDENTIFIED~ ~WEAPON1~ EQUIP
+  REMOVE_MEMORIZED_SPELL ~SPPR110~
+  REMOVE_MEMORIZED_SPELL ~SPPR111~
+  ADD_MEMORIZED_SPELL ~SPPR302~ #2 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR319~ #2 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR110~ #0 ~innate~
+  ADD_MEMORIZED_SPELL ~SPPR111~ #0 ~innate~
+  ADD_MEMORIZED_SPELL ~SPPR208~ #0 ~innate~
+BUT_ONLY_IF_IT_CHANGES
+
+COPY_EXISTING ~TDR8A.CRE~ ~override~
+  WRITE_LONG  0x14 3000											// XPVAL was 2000
+  WRITE_SHORT 0x24 68											// HP1 was 48
+  WRITE_SHORT 0x26 68											// HP2 was 48
+  WRITE_BYTE  0x52 10											// THAC0 was 16
+  WRITE_BYTE  0x53 8											// APR was 1
+  ADD_CRE_ITEM ~LEAT05~ #0 #0 #0 ~IDENTIFIED~ ~ARMOR~
+  ADD_CRE_ITEM ~SW1H22~ #0 #0 #0 ~IDENTIFIED~ ~WEAPON1~ EQUIP
+  ADD_MEMORIZED_SPELL ~SPPR208~ #1 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR302~ #2 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR319~ #2 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR401~ #3 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR411~ #3 ~priest~
+BUT_ONLY_IF_IT_CHANGES
+
+COPY_EXISTING ~TDR8B.CRE~ ~override~
+  ADD_CRE_ITEM ~LEAT11~ #0 #0 #0 ~IDENTIFIED~ ~ARMOR~
+  ADD_CRE_ITEM ~BLUN01~ #0 #0 #0 ~IDENTIFIED~ ~WEAPON1~ EQUIP
+  ADD_MEMORIZED_SPELL ~SPPR302~ #2 ~priest~
+BUT_ONLY_IF_IT_CHANGES
+
+COPY_EXISTING ~TDR10A.CRE~ ~override~
+  WRITE_LONG  0x14 6000											// XPVAL was 4000
+  WRITE_LONG  0x1c 20											// GOLD was 0
+  WRITE_BYTE  0x52 11											// THAC0 was 14
+  ADD_CRE_ITEM ~LEAT15~ #0 #0 #0 ~IDENTIFIED~ ~ARMOR~
+  ADD_CRE_ITEM ~STAF16~ #0 #0 #0 ~IDENTIFIED~ ~WEAPON1~ EQUIP
+  ADD_MEMORIZED_SPELL ~SPPR206~ #1 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR319~ #2 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR401~ #3 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR406~ #3 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR514~ #4 ~priest~
+BUT_ONLY_IF_IT_CHANGES
+
+COPY_EXISTING ~TDR10B.CRE~ ~override~
+  WRITE_SHORT 0x24 86											// HP1 was 76
+  WRITE_SHORT 0x26 86											// HP2 was 76
+  WRITE_SHORT 0x46 5											// NATAC was 10
+  WRITE_SHORT 0x48 5											// EFFAC was 10
+  WRITE_BYTE  0x52 10											// THAC0 was 14
+  WRITE_BYTE  0x53 2											// APR was 1
+  ADD_CRE_ITEM ~LEAT11~ #0 #0 #0 ~IDENTIFIED~ ~ARMOR~
+  ADD_CRE_ITEM ~SPER05~ #0 #0 #0 ~IDENTIFIED~ ~WEAPON1~ EQUIP
+  ADD_MEMORIZED_SPELL ~SPPR410~ #3 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR411~ #3 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR517~ #4 ~priest~
+BUT_ONLY_IF_IT_CHANGES
+
+COPY_EXISTING ~TRRAK01.CRE~ ~override~
+  REPLACE_CRE_ITEM ~UCMGSW02~ #0 #0 #0 ~IDENTIFIED~ ~WEAPON1~ EQUIP	// INV was SW1H04
+BUT_ONLY_IF_IT_CHANGES
+
+COPY_EXISTING ~TRRAK02.CRE~ ~override~
+  WRITE_LONG  0x14 3600											// XPVAL was 3000
+  WRITE_LONG  0x1c 60											// GOLD was 0
+  WRITE_SHORT 0x24 66											// HP1 was 56
+  WRITE_SHORT 0x26 66											// HP2 was 56
+  REPLACE_CRE_ITEM ~SW1H05~ #0 #0 #0 ~IDENTIFIED~ ~WEAPON1~ EQUIP	// INV was SW1H04
+  ADD_CRE_ITEM ~UCMGBR01~ #0 #0 #0 ~IDENTIFIED~ ~INV~
+BUT_ONLY_IF_IT_CHANGES
 
 BEGIN @10139
+REQUIRE_PREDICATE MOD_IS_INSTALLED ~SETUP-com_encounters.tp2~ ~0~ ~This component uses items from the main encounters component!~
 
-COPY ~com_encounters/shagbag~ ~override~
+//COPY ~com_encounters/shagbag~ ~override~
+COPY_EXISTING ~KORCRAZY.CRE~ ~override~
+  WRITE_LONG  0x1c 20											// GOLD was 2
+  WRITE_SHORT 0x24 60											// HP1 was 40
+  WRITE_SHORT 0x26 60											// HP2 was 40
+  WRITE_BYTE  0x52 8											// THAC0 was 15
+  WRITE_BYTE  0x53 7											// APR was 1
+  REPLACE_CRE_ITEM ~STAF02~ #0 #0 #0 ~IDENTIFIED~ ~WEAPON1~ EQUIP	// INV was STAF01
+  ADD_CRE_ITEM ~CHAN05~ #0 #0 #0 ~IDENTIFIED~ ~ARMOR~
+  ADD_CRE_ITEM ~POTN08~ #0 #0 #0 ~IDENTIFIED~ ~QITEM~
+  ADD_MEMORIZED_SPELL ~SPPR202~ #1 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR405~ #3 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR501~ #4 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR503~ #4 ~priest~ ( 2 )
+  ADD_MEMORIZED_SPELL ~SPPR511~ #4 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR603~ #5 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR703~ #6 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR717~ #6 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR720~ #6 ~priest~
+  ADD_MEMORIZED_SPELL ~SPPR727~ #6 ~priest~
+BUT_ONLY_IF_IT_CHANGES
+
+COPY_EXISTING ~KORGOO01.CRE~ ~override~
+  WRITE_LONG  0x14 1650											// XPVAL was 165
+  WRITE_SHORT 0x24 45											// HP1 was 35
+  WRITE_SHORT 0x26 45											// HP2 was 35
+  WRITE_BYTE  0x52 12											// THAC0 was 16
+  REPLACE_CRE_ITEM ~LEAT10~ #0 #0 #0 ~IDENTIFIED~ ~ARMOR~		// INV was CHAN01
+  REPLACE_CRE_ITEM ~SHLD29~ #0 #0 #0 ~IDENTIFIED~ ~SHIELD~		// INV was SHLD03
+  REPLACE_CRE_ITEM ~SW1H14~ #0 #0 #0 ~IDENTIFIED~ ~WEAPON1~ EQUIP	// INV was SW1H07
+BUT_ONLY_IF_IT_CHANGES
+
+COPY_EXISTING ~KORGOO02.CRE~ ~override~
+  WRITE_LONG  0x14 1650											// XPVAL was 165
+  WRITE_SHORT 0x24 45											// HP1 was 35
+  WRITE_SHORT 0x26 45											// HP2 was 35
+  WRITE_BYTE  0x52 11											// THAC0 was 16
+  WRITE_BYTE  0x53 2											// APR was 7
+  REPLACE_CRE_ITEM ~HELM16~ #0 #0 #0 ~IDENTIFIED~ ~HELMET~		// INV was HELM01
+  REPLACE_CRE_ITEM ~PLAT10~ #0 #0 #0 ~IDENTIFIED~ ~ARMOR~		// INV was CHAN01
+  REPLACE_CRE_ITEM ~SW1H08~ #0 #0 #0 ~IDENTIFIED~ ~WEAPON1~ EQUIP	// INV was SW1H07
+BUT_ONLY_IF_IT_CHANGES
+
+COPY_EXISTING ~KORSCROO.CRE~ ~override~
+  WRITE_LONG  0x14 2950											// XPVAL was 19504
+  WRITE_BYTE  0x52 6											// THAC0 was 13
+  WRITE_BYTE  0x53 2											// APR was 7
+  WRITE_BYTE  0x23c 18											// DEX was 17
+  REPLACE_CRE_ITEM ~LEAT15~ #0 #0 #0 ~IDENTIFIED~ ~ARMOR~		// INV was CHAN01
+  REPLACE_CRE_ITEM ~UCMGSW07~ #0 #0 #0 ~IDENTIFIED~ ~SHIELD~ 	// INV was SHLD03
+  REPLACE_CRE_ITEM ~SW1H09~ #0 #0 #0 ~IDENTIFIED~ ~WEAPON1~ EQUIP	// INV was SW1H07
+  ADD_CRE_ITEM ~POTN17~ #5 #0 #0 ~IDENTIFIED~ ~QITEM~
+BUT_ONLY_IF_IT_CHANGES
+
+COPY_EXISTING ~KORSHAG.CRE~ ~override~
+  WRITE_LONG  0x14 4500											// XPVAL was 4000
+  WRITE_SHORT 0x24 85											// HP1 was 65
+  WRITE_SHORT 0x26 85											// HP2 was 65
+  WRITE_BYTE  0x53 8											// APR was 7
+  REPLACE_CRE_ITEM ~CHAN02~ #0 #0 #0 ~IDENTIFIED~ ~ARMOR~		// INV was CHAN01
+  REPLACE_CRE_ITEM ~SHLD04~ #0 #0 #0 ~IDENTIFIED~ ~SHIELD~		// INV was SHLD03
+  REPLACE_CRE_ITEM ~UCMGSW06~ #0 #0 #0 ~IDENTIFIED~ ~WEAPON1~ EQUIP	// INV was SW1H07
+  ADD_CRE_ITEM ~POTN08~ #5 #0 #0 ~IDENTIFIED~ ~QITEM~
+  ADD_CRE_ITEM ~POTN14~ #5 #0 #0 ~IDENTIFIED~ ~QITEM~
+BUT_ONLY_IF_IT_CHANGES
 
 // Isaya: now displayed at the beginning of installation with README
 //AT_INTERACTIVE_EXIT ~VIEW com_encounters/readme_ce.html~
