--- Setup-NeJ3v702.tp2	Sat Dec 09 20:03:36 2017
+++ C:\BWP Patchstudio\patched files\Setup-NeJ3v702.tp2	Mon Jan 22 09:11:50 2018
@@ -2,6 +2,112 @@
 
 AUTHOR ~Vlad & Larrienne~
 
+VERSION ~v7.02 BWP compatibility~
+
+DEFINE_PATCH_MACRO are_update_offset BEGIN
+  SPRINT are_update_offset_datatype_off "%are_update_offset_datatype%_off"
+  SPRINT are_update_offset_datatype_num "%are_update_offset_datatype%_num"
+
+  PATCH_IF (NOT (("%are_update_offset_datatype%" STRING_COMPARE_CASE "actor")=0))
+            AND (("%actor_off%" > EVALUATE_BUFFER "%%are_update_offset_datatype_off%%")
+            OR (("%actor_off%" = EVALUATE_BUFFER "%%are_update_offset_datatype_off%%") AND (EVALUATE_BUFFER "%%are_update_offset_datatype_num%%" = 0))) BEGIN
+    WRITE_LONG 0x54 ("%actor_off%" + "%are_update_offset_increment%")
+  END
+  PATCH_IF (NOT (("%are_update_offset_datatype%" STRING_COMPARE_CASE "info")=0))   
+            AND (("%info_off%" > EVALUATE_BUFFER "%%are_update_offset_datatype_off%%")
+            OR (("%info_off%" = EVALUATE_BUFFER "%%are_update_offset_datatype_off%%") AND (EVALUATE_BUFFER "%%are_update_offset_datatype_num%%" = 0))) BEGIN
+    WRITE_LONG 0x5c ("%info_off%" + "%are_update_offset_increment%")
+  END
+  PATCH_IF (NOT (("%are_update_offset_datatype%" STRING_COMPARE_CASE "spawn")=0))
+            AND (("%spawn_off%" > EVALUATE_BUFFER "%%are_update_offset_datatype_off%%")
+            OR (("%spawn_off%" = EVALUATE_BUFFER "%%are_update_offset_datatype_off%%") AND (EVALUATE_BUFFER "%%are_update_offset_datatype_num%%" = 0))) BEGIN
+    WRITE_LONG 0x60 ("%spawn_off%" + "%are_update_offset_increment%")
+  END
+  PATCH_IF (NOT (("%are_update_offset_datatype%" STRING_COMPARE_CASE "entrance")=0))
+            AND (("%entrance_off%" > EVALUATE_BUFFER "%%are_update_offset_datatype_off%%")
+            OR (("%entrance_off%" = EVALUATE_BUFFER "%%are_update_offset_datatype_off%%") AND (EVALUATE_BUFFER "%%are_update_offset_datatype_num%%" = 0))) BEGIN
+    WRITE_LONG 0x68 ("%entrance_off%" + "%are_update_offset_increment%")
+  END
+  PATCH_IF (NOT (("%are_update_offset_datatype%" STRING_COMPARE_CASE "container")=0))
+            AND (("%container_off%" > EVALUATE_BUFFER "%%are_update_offset_datatype_off%%")
+            OR (("%container_off%" = EVALUATE_BUFFER "%%are_update_offset_datatype_off%%") AND (EVALUATE_BUFFER "%%are_update_offset_datatype_num%%" = 0))) BEGIN
+    WRITE_LONG 0x70 ("%container_off%" + "%are_update_offset_increment%")
+  END
+  PATCH_IF (NOT (("%are_update_offset_datatype%" STRING_COMPARE_CASE "item")=0))
+            AND (("%item_off%" > EVALUATE_BUFFER "%%are_update_offset_datatype_off%%")
+            OR (("%item_off%" = EVALUATE_BUFFER "%%are_update_offset_datatype_off%%") AND (EVALUATE_BUFFER "%%are_update_offset_datatype_num%%" = 0))) BEGIN
+    WRITE_LONG 0x78 ("%item_off%" + "%are_update_offset_increment%")
+  END
+  PATCH_IF (NOT (("%are_update_offset_datatype%" STRING_COMPARE_CASE "vertex")=0))
+            AND (("%vertex_off%" > EVALUATE_BUFFER "%%are_update_offset_datatype_off%%")
+            OR (("%vertex_off%" = EVALUATE_BUFFER "%%are_update_offset_datatype_off%%") AND (EVALUATE_BUFFER "%%are_update_offset_datatype_num%%" = 0))) BEGIN
+    WRITE_LONG 0x7c ("%vertex_off%" + "%are_update_offset_increment%")
+  END
+  PATCH_IF (NOT (("%are_update_offset_datatype%" STRING_COMPARE_CASE "ambient")=0))
+            AND (("%ambient_off%" > EVALUATE_BUFFER "%%are_update_offset_datatype_off%%")
+            OR (("%ambient_off%" = EVALUATE_BUFFER "%%are_update_offset_datatype_off%%") AND (EVALUATE_BUFFER "%%are_update_offset_datatype_num%%" = 0))) BEGIN
+    WRITE_LONG 0x84 ("%ambient_off%" + "%are_update_offset_increment%")
+  END
+  PATCH_IF (NOT (("%are_update_offset_datatype%" STRING_COMPARE_CASE "variable")=0))
+            AND (("%variable_off%" > EVALUATE_BUFFER "%%are_update_offset_datatype_off%%")
+            OR (("%variable_off%" = EVALUATE_BUFFER "%%are_update_offset_datatype_off%%") AND (EVALUATE_BUFFER "%%are_update_offset_datatype_num%%" = 0))) BEGIN
+    WRITE_LONG 0x88 ("%variable_off%" + "%are_update_offset_increment%")
+  END
+  PATCH_IF (NOT (("%are_update_offset_datatype%" STRING_COMPARE_CASE "door")=0))
+            AND (("%door_off%" > EVALUATE_BUFFER "%%are_update_offset_datatype_off%%")
+            OR (("%door_off%" = EVALUATE_BUFFER "%%are_update_offset_datatype_off%%") AND (EVALUATE_BUFFER "%%are_update_offset_datatype_num%%" = 0))) BEGIN
+    WRITE_LONG 0xa8 ("%door_off%" + "%are_update_offset_increment%")
+  END
+  PATCH_IF (NOT (("%are_update_offset_datatype%" STRING_COMPARE_CASE "explored")=0))
+            AND (("%explored_off%" > EVALUATE_BUFFER "%%are_update_offset_datatype_off%%")
+            OR (("%explored_off%" = EVALUATE_BUFFER "%%are_update_offset_datatype_off%%") AND (EVALUATE_BUFFER "%%are_update_offset_datatype_num%%" = 0))) BEGIN
+    WRITE_LONG 0xa0 ("%explored_off%" + "%are_update_offset_increment%")
+  END
+  PATCH_IF (NOT (("%are_update_offset_datatype%" STRING_COMPARE_CASE "anim")=0))
+            AND (("%anim_off%" > EVALUATE_BUFFER "%%are_update_offset_datatype_off%%")
+            OR (("%anim_off%" = EVALUATE_BUFFER "%%are_update_offset_datatype_off%%") AND (EVALUATE_BUFFER "%%are_update_offset_datatype_num%%" = 0))) BEGIN
+    WRITE_LONG 0xb0 ("%anim_off%" + "%are_update_offset_increment%")
+  END
+  PATCH_IF (NOT (("%are_update_offset_datatype%" STRING_COMPARE_CASE "tiled")=0))
+            AND (("%tiled_off%" > EVALUATE_BUFFER "%%are_update_offset_datatype_off%%")
+            OR (("%tiled_off%" = EVALUATE_BUFFER "%%are_update_offset_datatype_off%%") AND (EVALUATE_BUFFER "%%are_update_offset_datatype_num%%" = 0))) BEGIN
+    WRITE_LONG 0xb8 ("%tiled_off%" + "%are_update_offset_increment%")
+  END
+  PATCH_IF (NOT (("%are_update_offset_datatype%" STRING_COMPARE_CASE "song")=0))
+            AND (("%song_off%" > EVALUATE_BUFFER "%%are_update_offset_datatype_off%%")
+            OR (("%song_off%" = EVALUATE_BUFFER "%%are_update_offset_datatype_off%%") AND (EVALUATE_BUFFER "%%are_update_offset_datatype_num%%" = 0))) BEGIN
+    WRITE_LONG 0xbc ("%song_off%" + "%are_update_offset_increment%")
+  END
+  PATCH_IF (NOT (("%are_update_offset_datatype%" STRING_COMPARE_CASE "rest")=0))
+            AND (("%rest_off%" > EVALUATE_BUFFER "%%are_update_offset_datatype_off%%")
+            OR (("%rest_off%" = EVALUATE_BUFFER "%%are_update_offset_datatype_off%%") AND (EVALUATE_BUFFER "%%are_update_offset_datatype_num%%" = 0))) BEGIN
+    WRITE_LONG 0xc0 ("%rest_off%" + "%are_update_offset_increment%")
+  END
+  PATCH_IF (NOT (("%are_update_offset_datatype%" STRING_COMPARE_CASE "automap")=0))
+            AND (("%automap_off%" > EVALUATE_BUFFER "%%are_update_offset_datatype_off%%")
+            OR (("%automap_off%" = EVALUATE_BUFFER "%%are_update_offset_datatype_off%%") AND (EVALUATE_BUFFER "%%are_update_offset_datatype_num%%" = 0))) BEGIN
+    WRITE_LONG 0xc4 ("%automap_off%" + "%are_update_offset_increment%")
+  END
+
+  READ_LONG 0x54 actor_off
+  READ_LONG 0x5c info_off
+  READ_LONG 0x60 spawn_off
+  READ_LONG 0x68 entrance_off
+  READ_LONG 0x70 container_off
+  READ_LONG 0x78 items_off
+  READ_LONG 0x7c vertex_off
+  READ_LONG 0x84 ambient_off
+  READ_LONG 0x88 variable_off
+  READ_LONG 0xa8 door_off
+  READ_LONG 0xa0 explored_off
+  READ_LONG 0xb0 anim_off
+  READ_LONG 0xb8 tiled_off
+  READ_LONG 0xbc song_off
+  READ_LONG 0xc0 rest_off
+  READ_LONG 0xc4 automap_off
+
+END
+
 BEGIN ~Never Ending Journey Third Edition v7.02~
 REQUIRE_FILE ~Setup-VCv10.exe~ ~Please install Vlad's Compilation.~
 
@@ -18,12 +124,12 @@
 REQUIRE_FILE ~Setup-VCv10.exe~ ~Please install Vlad's Compilation.~
 
 
-ACTION_IF (FILE_EXISTS ~data/CTB-RULE.BIF~)
+/* ACTION_IF (FILE_EXISTS ~data/CTB-RULE.BIF~)
        OR (FILE_EXISTS ~data/SOS-RULE.BIF~)
        OR (FILE_EXISTS ~data/TDD-RULE.BIF~)
 THEN BEGIN
   FAIL ~You may not install this mod with other big mods!~
-END
+END */
 
 ///////////////////////////////////////
 // 2. String replacements
@@ -91,7 +197,7 @@
 ///////////////////////////////////////
 // 4. Preventing possible errors
 ///////////////////////////////////////
-ACTION_IF NOT FILE_EXISTS_IN_GAME ~override/MASAKI.dlg~
+ACTION_IF NOT FILE_EXISTS_IN_GAME ~MASAKI.dlg~
  THEN BEGIN  
 		COMPILE ~NeJ/notsfix/KachiJ.d~
 		COMPILE ~NeJ/notsfix/BKACHI.d~
@@ -375,7 +481,19 @@
 COPY_EXISTING ~Minsc.bcs~ ~override/Minsc.bcs~
   EXTEND_TOP ~Minsc.bcs~ ~NeJ/sExt/sMinsc.baf~
 
-COPY ~NeJ/sExt/AR0603.bcs~ ~override/AR0603.bcs~
+COPY_EXISTING ~AR0603.bcs~ ~override/AR0603.bcs~
+  EXTEND_TOP ~AR0603.bcs~ ~NeJ/sExt/AR0603.bcs~
+
+ACTION_IF FILE_EXISTS_IN_GAME ~ENTERJ.bcs~ THEN BEGIN
+COPY_EXISTING ~AR0603.bcs~ ~override~
+DECOMPILE_BCS_TO_BAF
+REPLACE_TEXTUALLY ~ActionOverride("Yoshimo",DestroySelf())~ ~ActionOverride("Yoshimo",DestroySelf())
+SetGlobal("NeJRoT","AR0603",1)~
+COMPILE_BAF_TO_BCS
+REPLACE_BCS_BLOCK ~NeJ/wafixes/oRot.bcs~ ~NeJ/wafixes/nRot.bcs~
+END
+
+COMPILE ~NeJ/wafixes/yoshfix.d~
 
 /////////////////////////////////////
 //Stores 
@@ -2815,6 +2933,14 @@
   SAY SPELL_DISRUPTED ~Curses, my link with Ilmater is broken... my spell has gone adrift.~ [DAR_C33]
   SAY BIO ~Dar‘s conception is the usual one for a half-orc: his mother was mercilessly raped by raiding orcs. The woman was in terrifying condition. She was picked up by priests of Ilmater and taken to their Temple, where she was restored to physical health. Unfortunately, her mind was gone. She, however, gave birth to a half-monstrous child, to whom she was so attached to in her madness that none dared to kill the child, as it is customary done. Dar grew in the sanctuary of Ilmater. He was educated and tutored by priests, though he does not exhibit slurry speech and after knowing him for a while you‘d come to a conclusion that he might not be the brightest fellow, but he has a heart of gold, and a gentle and noble soul, and shows no trait of the savagery of his orcish heritage. He displays great loyalty to those that take the time to befriend him. When you ask him about his atypically fluent speech, he tells you that he owes his excellent knowledge and usage of the common tongue, rarely found in his kind, to the patience and tutoring of the priests that raised him. "It is because of them", he says, "that I am what I am today".~ 
 
+COPY_EXISTING ~DAR67.cre~ ~override~
+              ~DAR77.cre~ ~override~
+              ~DAR78.cre~ ~override~
+              ~DAR88.cre~ ~override~
+SPRINT "flags" "IDENTIFIED"
+SPRINT "item_to_change" "BLUN02"
+LAUNCH_PATCH_MACRO ADD_CRE_ITEM_FLAGS
+
 COPY ~NeJ/cre/DDGUARD3.CRE~         ~override/DDGUARD3.CRE~
 
 COPY ~NeJ/cre/DEADVIL.CRE~          ~override/DEADVIL.CRE~        
@@ -3676,9 +3802,14 @@
 ~ACCALIA      ACCALIP            ACCALIJ           ACCALID        ACCAL25P           ACCAL25J              ACCAL25D              acca25~
 UNLESS ~ACCALIA~ // we are already there, skip it
 
+ACTION_IF FILE_EXISTS_IN_GAME ~ADARIO12.cre~ THEN BEGIN
+COPY_EXISTING ~pdialog.2da~ ~override~
+APPEND_FILE ~NeJ/wafixes/dar1.tbl~
+END ELSE BEGIN
 APPEND ~pdialog.2da~ // TOB append
 ~DAR          DARP               DARJ              DARD           DAR25P             DAR25J                DAR25D                dar25~
 UNLESS ~DAR~ // we are already there, skip it
+END
 
 APPEND ~interdia.2da~
 ~HROTHGAR    BHROTH	  BHROTH25~
@@ -3688,9 +3819,14 @@
 ~ACCALIA     BACCALI	  BACCAL25~
 UNLESS ~ACCALIA~ // we are already there, skip it
 
+ACTION_IF FILE_EXISTS_IN_GAME ~ADARIO12.cre~ THEN BEGIN
+COPY_EXISTING ~interdia.2da~ ~override~
+APPEND_FILE ~NeJ/wafixes/dar2.tbl~
+END ELSE BEGIN
 APPEND ~interdia.2da~
 ~DAR         BDAR 	  BDAR25~
 UNLESS ~DAR~ // we are already there, skip it
+END
 
 ////////////////////////////////////////////////
 
@@ -4197,6 +4333,42 @@
 
 STATISTICS:
    Armor Class Bonus: +1
+   THAC0 Bonus: +1
+
+Special Abilities:
+   Charm Fire Elemental (+2 bonus to elementals saving throw)
+   Charm Air Elemental (+2 bonus to elementals saving throw)
+   Charm Earth Elemental (+2 bonus to elemental‘s saving throw)
+   Duration: 45 seconds
+
+Abilities when restored:
+1. Dehydration:
+   When activated all liquid and moisture in a 10 ft. cubic area immediately evaporates. The effect can be cast out to a range of 50 yards. Creatures can save vs.spells or die immediately. If save successful creatures suffer a loss of half total hit points. Does not effect creatures that do not possess fluids.
+
+2. Shatter rock:
+   When activated a 10 ft. cubic area of stone will shatter. The effect can be cast out to a range of 50 yards. All creatures of stone, i.e. stone golems, save vs.spells or die immediately. If save successfully creatures suffer a loss of half total hit points.
+
+3. Solidify Air:
+   When activated the air in a 10 ft.cubic area becomes solid. The effect can be cast out to a range of 50 yards. Trapped creatures can neither move nor speak and will die within 1 turn due to lack of air. Creatures can save vs.spells per round. Each round the save fails any trapped creature suffers a loss of 1 quarter total hit points until death. If save thrown successful creatures are still trapped but do not suffer the hit point loss. Creatures that do not breath air do not suffer the hit point loss but are still rendered immobile.
+
+4.Spontaneous Combustion:
+   When activated all flammable objects within a 10 ft. Cubic area bursts into flame. The effect can be cast out to a range 50 yards. The fire burns for one turn doing 10d6 damage per round to creatures trapped in the blaze. Creatures can save vs. spell each round for half damage until they die or escape the blaze. Creatures immune to fire suffer no damage.~
+ 
+COPY ~NeJ2/cre/Lhillias.cre~        ~override/Lhillias.cre~
+  SAY NAME1 ~Lhillias~
+  SAY NAME2 #3139
+
+COPY ~NeJ2/itm/ELEMHYD1.itm~        ~override/ELEMHYD1.itm~
+COPY ~NeJ2/cre/Elemwag.cre~        ~override/Elemwag.cre~
+  SAY NAME1 ~Water Elemental~
+  SAY NAME2 ~Water Elemental~
+
+COPY ~NeJ2/itm/DeRing2.itm~        ~override/DeRing2.itm~
+  SAY NAME2 ~Ring of Might~
+  SAY DESC ~Legend says the first Ring of Might was forged by four elementalist wizards, possibly siblings. Only a dozen or so of these potent rings are said to exist. The secret of their creation, the wizards took to their graves. Nevertheless, wizards still continue to seek to discover the process.
+
+STATISTICS:
+   Armor Class Bonus: +1
    THAC0 Bonus: +2
    
 Equipped Abilities:
@@ -5376,7 +5548,53 @@
 TT0078	value
 TT0079	value~
 
-COPY ~NeJ2/are/AR0700.are~           ~override/AR0700.are~
+COPY_EXISTING ~AR0700.are~ ~override~
+  LPF fj_are_structure
+    INT_VAR
+      fj_type           = 0
+      fj_box_left       = 2886
+      fj_box_top        = 904
+      fj_box_right      = 3025
+      fj_box_bottom     = 1048
+      fj_cursor_idx     = 0
+      fj_flags          = 0x00000002
+      fj_trap_active    = 1
+      fj_loc_x          = 2946
+      fj_loc_y          = 960
+      fj_vertex_0       = 2886 + ( 955 << 16)
+      fj_vertex_1       = 2948 + (1048 << 16)
+      fj_vertex_2       = 3025 + ( 993 << 16)
+      fj_vertex_3       = 2968 + ( 903 << 16)
+      fj_vertex_4       = 2886 + ( 955 << 16)
+    STR_VAR
+      fj_structure_type = region
+      fj_name           = VPTalk1
+      fj_reg_script     = VPCUTH02
+  END
+  LPF fj_are_structure
+    INT_VAR
+      fj_type           = 0
+      fj_box_left       = 2408
+      fj_box_top        = 843
+      fj_box_right      = 2748
+      fj_box_bottom     = 1116
+      fj_cursor_idx     = 0
+      fj_flags          = 0x00000002
+      fj_trap_active    = 1
+      fj_loc_x          = 2645
+      fj_loc_y          = 937
+      fj_vertex_0       = 2466 + ( 842 << 16)
+      fj_vertex_1       = 2748 + (1050 << 16)
+      fj_vertex_2       = 2692 + (1116 << 16)
+      fj_vertex_3       = 2408 + ( 905 << 16)
+      fj_vertex_4       = 2466 + ( 842 << 16)
+    STR_VAR
+      fj_structure_type = region
+      fj_name           = VPTalk2
+      fj_reg_script     = VPCUTH02
+  END
+BUT_ONLY
+
 COPY ~NeJ2/are/AR9801.are~           ~override/AR9801.are~
 
 COPY ~NeJ2/cre/TilornN.cre~        ~override/TilornN.cre~
@@ -5521,8 +5739,8 @@
 COPY ~NeJ2/are/TT0079.wed~           ~override/TT0079.wed~
 COPY ~NeJ2/are/TT0079.are~           ~override/TT0079.are~
   
-COPY ~Intro/Combo1/combo1b.acm~				~music/Combo1/combo1b.acm~
-COPY ~Intro/Theme/themea.acm~					~music/Theme/themea.acm~
+// COPY ~Intro/Combo1/combo1b.acm~				~music/Combo1/combo1b.acm~
+// COPY ~Intro/Theme/themea.acm~					~music/Theme/themea.acm~
 
 ///////////////////////////////
 // Cleric of Tempus Kit
@@ -5852,6 +6070,14 @@
   SAY 0x1c4 ~~ [MELORA06] //SET_A_TRAP
   SAY BIO ~Melora hates men and magic and is quick to tell you so if you happen to be male or adept in the arts of sorcery. Melora’s small Hafling eyes will look at you with even more contempt and her Sturdy Hafling body will take on a stance of defiance as she speaks to you if you happen to be both male and mage! The illegitimate daughter of a mage and a hafling servant girl, Melora’s first years were hapless. Despised by a father that regarded as an “accident” and who treated her like some lesser being, Melora did not even have the comfort of a mother’s love. She too cast Melora aside when she made a wealthy marriage for herself. So perhaps her hatred is justified, or so Melora would have you believe. The young maiden swore to herself that she would ever be on the side of the oppressed. She has become somewhat of a hero to the poorer people on the outskirts of Candlekeep for her generosity with rich men’s money, none of which she keeps for herself. Often widows and poorer families have found their incomes supplemented by her generous nature. None will speak ill of her excepting the authorities of course... but Melora cares very little for what they say.~
 
+COPY_EXISTING ~MELORA11.cre~ ~override~
+              ~MELORA12.cre~ ~override~
+              ~MELORA13.cre~ ~override~
+              ~MELORA14.cre~ ~override~
+SPRINT "flags" "IDENTIFIED"
+SPRINT "item_to_change" "LEAT02"
+LAUNCH_PATCH_MACRO ADD_CRE_ITEM_FLAGS
+  
 COPY ~NeJ2/Melora/itm/Ryxyr.itm~        ~override/Ryxyr.itm~
   SAY NAME1 #6865
   SAY NAME2 ~Ryxyr~
@@ -7839,6 +8065,15 @@
  THEN BEGIN
 	COPY_EXISTING ~AR9799.bcs~ ~override/AR9799.bcs~
   EXTEND_TOP ~AR9799.bcs~ ~NeJ3/fixes/eAR9799.baf~
+  EXTEND_TOP ~AR9799.bcs~ ~NeJ/wafixes/eAR9799.baf~
+  ACTION_IF FILE_EXISTS ~Worldmap/map_mods_links.tbl~ THEN BEGIN
+    COPY ~Worldmap/map_mods_links.tbl~  ~Worldmap~
+     APPEND_FILE ~NeJ/wafixes//links.tbl~
+  END
+  ELSE BEGIN
+    MKDIR ~Worldmap~
+    COPY ~NeJ/wafixes/links.tbl~ ~Worldmap/map_mods_links.tbl~
+  END
 END
  ELSE BEGIN
   COMPILE ~NeJ3/fixes/AR9799.baf~
@@ -7870,7 +8105,8 @@
 	COPY ~NeJ3/are/AR8700.ARE~	~override~
 		SAY 0x464c ~Large Tent~
 //This is a tutorial area of Candlekeep. I'm just replacing its script for the non-BGT installation.
-	COPY ~NeJ2/Dar/scripts/AR0015.bcs~ ~override~  	
+	COPY_EXISTING ~AR0015.bcs~ ~override/AR0015.bcs~
+	EXTEND_BOTTOM ~AR0015.bcs~ ~NeJ2/Dar/scripts/AR0015.bcs~  	
 	
 	COPY ~NeJ3/cre/VPBEAST.CRE~        ~override/VPBEAST.CRE~
   	SAY NAME1 ~Wild Hunter~ 
@@ -7964,8 +8200,9 @@
 APPEND ~SPELL.IDS~
 ~2797 WIZARD_MALAVONS_RAGE~
 
-APPEND ~PROJECTL.IDS~
-~273 PMALAVOR~
+//APPEND ~PROJECTL.IDS~
+//~273 PMALAVOR~
+ADD_PROJECTILE ~NeJ3/spl/malavonr/PMalavoR.PRO~
 
 COPY ~NeJ3/are_copy~ ~override~
 COPY ~NeJ3/bam~ ~override~
@@ -9494,7 +9731,7 @@
 Not Usable By:
  Cleric~
 
-COPY ~NeJ3/spl/malavonr/PMalavoR.PRO~ ~override/PMalavoR.PRO~
+//COPY ~NeJ3/spl/malavonr/PMalavoR.PRO~ ~override/PMalavoR.PRO~
 
 COPY ~NeJ3/spl/malavonr/SPWI797.SPL~		~override/SPWI797.SPL~
   SAY NAME1 ~Malavon's Rage~
@@ -9509,6 +9746,13 @@
 Saving Throw: None
 Malavon's Rage was created by the dark elf sorcerer Malavon. It creates a wave of pure energy out from the caster's body, harming friend and foe alike on its way. The energy wave front throw everything away from the catser and do 20-80 points of crushing damage to everything caught in its path. This spell is especially useful when a mage is surrounded by enemies.~
 
+COPY_EXISTING ~override\SPWI797.SPL~ ~override\SPWI797.SPL~
+LAUNCH_PATCH_FUNCTION ALTER_ITEM_HEADER
+  INT_VAR
+  header = 1
+  projectile = "%PMalavoR%"
+END
+  
 COPY ~NeJ3/spl/malavonr/MalavonR.itm~        ~override/MalavonR.itm~
   SAY NAME2 ~Malavon's Rage~
   SAY DESC ~Malavon's Rage was created by the dark elf sorcerer Malavon. It creates a wave of pure energy out from the caster's body, harming friend and foe alike on its way. The energy wave front throw everything away from the catser and do 20-80 points of crushing damage to everything caught in its path. This spell is especially useful when a mage is surrounded by enemies.~
@@ -10220,16 +10464,23 @@
   		SAY CRITICAL_MISS ~I spit on your manhood.~ [SHART36]
   		SAY BIO ~When asked about her past, Shar-Teel has very little to say.  From the little she speaks of it can be gleaned that she is an orphan. She also seems to harbor an intense dislike for Flaming Fist mercenaries, as well as an obvious disrespect for men in general. She seems to have something to prove, and likely her childhood was not of storybook quality.~ 
 
-COPY ~NeJ3/sharteel/wav~	~override~
+		COPY ~NeJ3/sharteel/wav~	~override~
 
+		ACTION_IF FILE_EXISTS ~data/BG1ARE.bif~ THEN BEGIN
+		COPY_EXISTING ~pdialog.2da~ ~override~
+		REPLACE_TEXTUALLY ~SHARTEEL     SHARTP             SHARTJ            ***            SHARTP             SHARTJ             ***                 ***~ ~SHARTEEL     SHARTP             SHARTJ            SHARTD         SHARTP           SHARTJ              SHARTD              shar25~
+		BUT_ONLY
+		COPY_EXISTING ~interdia.2da~ ~override~
+		REPLACE_TEXTUALLY ~SHARTEEL    BSHART        NONE~ ~SHARTEEL    BSHART	  BSHART~
+		BUT_ONLY
+		END ELSE BEGIN
 		APPEND ~pdialog.2da~ // TOB append
 			~SHARTEEL     SHARTP             SHARTJ            SHARTD         SHARTP           SHARTJ              SHARTD              shar25~
 			UNLESS ~SHARTEEL~ // we are already there, skip it
-
 		APPEND ~interdia.2da~
 			~SHARTEEL    BSHART	  BSHART~
 			UNLESS ~SHARTEEL~ // we are already there, skip it
-
+		END
 //Lock cell that Shar-teel will be imported into
 
 COPY ~NeJ3/sharteel/itm/VPShrKey.ITM~           ~override/VPShrKey.ITM~         
@@ -10548,9 +10799,9 @@
 ///////////////////////////////
 //PRINT ~Now you may install Erevain NPC for NeJ3 (by Bill and Vlad). Erevain is available in two options: triple class fighter/mage/thief or dual class fighet/thief. Both options are based on a special Infiltrator kit developed for Erevain. However, the actual stats and innate spells are different between the two options. The innate spells for the triple-class character are strongly theif-oriented, while for the dual-class character, some mage spells are provided to account for the lack of the mage class. Please choose one of the options below.~
 //////////////////////////////////////////////////////////////////////////////////////
-//BEGIN ~Erevain NPC for NeJ3 (by Bill and Vlad)~ 
+BEGIN ~Erevain NPC for NeJ3 (by Bill and Vlad)~ 
 //////////////////////////////////////////////////////////////////////////////////////
-/*APPEND ~SPELL.IDS~
+APPEND ~SPELL.IDS~
 ~3273 EREV_DETECT_INVISIBILITY
 3276 EREV_INVISIBILITY
 3277 EREV_KNOCK
@@ -10891,12 +11142,12 @@
 
 COPY ~NeJ/Erev/cre/VARBU.CRE~           ~override/VARBU.CRE~         
   SAY NAME1 ~Varbu~ 
-  SAY NAME2 ~Varbu~*/
+  SAY NAME2 ~Varbu~
          
 //////////////////////////////////////////////////////////////////////////////////////
-//BEGIN ~Dual-Class Erevain NPC for NeJ3 (by Bill and Vlad)~ 
+BEGIN ~Dual-Class Erevain NPC for NeJ3 (by Bill and Vlad)~ 
 //////////////////////////////////////////////////////////////////////////////////////
-/*ACTION_IF FILE_EXISTS ~override/EREVCHA2.ITM~
+ACTION_IF FILE_EXISTS ~override/EREVCHA2.ITM~
 THEN BEGIN
   FAIL ~You have already installed the Triple-Class Erevain NPC component!~
 END
@@ -11253,7 +11504,7 @@
 
 COPY ~NeJ/Erev/cre/VARBU.CRE~           ~override/VARBU.CRE~         
   SAY NAME1 ~Varbu~ 
-  SAY NAME2 ~Varbu~*/
+  SAY NAME2 ~Varbu~
   		
 //__________________________________________//
 //                                          //
@@ -11270,7 +11521,7 @@
 //__________________________________________//
 //                                          //
 
-/*BEGIN ~Improved and Continuous Character Skie (BGT required!)~
+BEGIN ~Improved and Continuous Character Skie (BGT required!)~
 
 REQUIRE_FILE ~data/BG1ARE.BIF~ ~Please install BG1 and BGT before installation of this component.~
 
@@ -11326,7 +11577,7 @@
 END
  ELSE BEGIN
   COPY ~BGTComp/Skie/sxAR0602.BCS~ ~override/AR0602.BCS~
-END*/
+END
 
 //////////////////////////////////////////////////////////////////////////////////////////////////
  
