difficulty-based fixes to doppelgangers et al

stratagems/lib/stratagems_shared.tph

@@ -3,6 +3,7 @@ DEFINE_PATCH_FUNCTION strip_scs_scripts
 BEGIN
   PATCH_IF "%arguments%" STRING_COMPARE_CASE no_change BEGIN
    FOR (i=0x248;i<0x270;i+=8) BEGIN
+      READ_ASCII i checkfull
       READ_ASCII i check4 (4)
       TO_LOWER check4
       READ_ASCII i check5 (5)
@@ -19,6 +20,11 @@ BEGIN
                DEFAULT
                END
          END
+      PATCH_MATCH "%checkfull%" WITH wtasight wdasight wtarsgt wdarsgt _tasight _dasight _wtarsgt _wdarsgt BEGIN
+         WRITE_ASCII i ~~ (8)
+      END
+      DEFAULT
+      END
    END
  END
 END

stratagems/readme-stratagems.html

@@ -2055,7 +2055,7 @@ <h3>Override files</h3>
 <li>For help with BGT: Ronin69hof, Pro5, cmorgan</li>
 <li>For help with BGEE: Cheesebelly, AndreaColombo</li>
 <li>For BGEE itself, and also for giving me advance access to the BGEE and BG2EE betas: Everyone at Beamdog</li>
-<li>For translation: Leonardo Watson, ClanDLAN, Yarpen, Immortality, Nugrud, Etamin, Cahir, Graoumf, Leonardo Watson, and many others</li>
+<li>For translation: Leonardo Watson, ClanDLAN, Yarpen, Immortality, Nugrud, Etamin, Cahir, Graoumf, Leonardo Watson, Stoneangel, Improbabile, and many others</li>
 <li>For testing, bugfixes, bug reports, and related suggestions: many of the above, and also Berelinde, Demivrgvs, Gort, Lemernis, Temujin, Avenger_RR, Stworca, Bursk, Coaster, Erebusant Grand_Dracolich,
     Jadefang, KGub, Nythrun, PetrusOctavius, Polytope, Raven_Song, Shaitan,  thetruth,
     Wanderer, Mad Mate, Kreso, Dakk, and many others</li>

stratagems/setup-stratagems.tp2

@@ -1,6 +1,6 @@
 BACKUP ~weidu_external/backup/stratagems~
 AUTHOR ~For help troubleshooting installation problems, go to the Sword Coast Stratagems forum at forums.gibberlings3.net.~
-VERSION ~v32 RC4~
+VERSION ~v32 RC5~
 README ~stratagems/readme-stratagems.html~
 AUTO_EVAL_STRINGS
 
@@ -55,7 +55,7 @@ FRENCH
  ~weidu_external/lang/french/setup.tra~
 
  LANGUAGE
-"Italiano (Stoneangel)"
+"Italiano (Stoneangel/Improbabile)"
 ITALIAN
  ~stratagems/lang/english/setup.tra~
  ~weidu_external/lang/english/setup.tra~
@@ -99,10 +99,10 @@ EMPTY_LANGUAGE
 ////////////////////////////////////////////////////////////////////
 /////////////////////////////////////
 
-
+/*
 BEGIN test DESIGNATED 0 
 LAF run STR_VAR files=test location=test END
-
+*/
 
 ///////////////////////////////////////////////////////////////////
 ////////////////////////////////////

stratagems/tactical_bg1/doppelganger.tpa

@@ -106,6 +106,10 @@ DEFINE_ACTION_FUNCTION doppelganger_core BEGIN
      LAF clone_spell STR_VAR spell=~%DOPPLEGANGER_CHANGE2%=>dw#dopzo~ END
      LAF swap_text STR_VAR files=dw#dopzo.spl swaps=~%tutu_var%dopzorl=>dw#dopzo~ END
 
+     LAF get_area_script STR_VAR area="%SWBaldursGate_MerchantLeague_L3%" RET script END
+     LAF edit_script STR_VAR script editstring="patch=>delete_action_if(dopzorl)" END
+     LAF extend STR_VAR script top=merchant_league_roof ssl=yes location=ssl END
+
 
 
 END

stratagems/tactical_bg1/ssl/bassiladd.ssl

@@ -44,24 +44,16 @@ THEN DO
 END
 
 IF TRIGGER
-        RequireBlock(EasyOptionAvailable)
         TriggerBlock(CoreMinus)
 THEN DO
        Action(EasyUndead)
 END
 
 IF TRIGGER
-        RequireBlock(EasyOptionAvailable)
         TriggerBlock(HardPlus)
-        !Global("DW#Bassilus_Override","GLOBAL",1)
 THEN DO
      Action(HardUndead)
 END
 
-IF TRIGGER
-        IgnoreBlock(EasyOptionAvailable)
-        !Global("DW#Bassilus_Override","GLOBAL",1)
-THEN DO
-     Action(HardUndead)
-END
+
 

stratagems/tactical_bg1/ssl/laureladd.ssl

@@ -19,16 +19,8 @@ ACTION
 END
 
 IF TRIGGER
-   RequireBlock(EasyOptionAvailable)
-   TriggerBlock(HardPlus)
-   !Global("DW#Gibber_Override","GLOBAL",1)
+   TriggerBlock(CorePlus)
 THEN DO
    Action(MakeGibberlings)
 END
 
-IF TRIGGER
-   IgnoreBlock(EasyOptionAvailable)
-   !Global("DW#Gibber_Override","GLOBAL",1)
-THEN DO
-   Action(MakeGibberlings)
-END

stratagems/tactical_bg1/ssl/merchant_league_roof.ssl

@@ -0,0 +1,36 @@
+
+
+BEGIN_ACTION_DEFINITION
+Name(SpawnDoppelgangers)
+TRIGGER
+	Global("ThirdFloorFight","GLOBAL",0)
+	OR(2)
+		Global("ZorlDopple","GLOBAL",1)
+		Global("IrelentreDopple","GLOBAL",1)
+ACTION
+	RESPONSE #100
+		SetGlobal("ThirdFloorFight","GLOBAL",1)
+		CreateCreature("scsargument1",[754.613],W) // Doppelganger
+		CreateCreature("scsargument1",[1040.633],W) // Doppelganger
+		CreateCreature("scsargument1",[941.971],NW) // Doppelganger
+		CreateCreature("scsargument1",[830.668],NW) // Doppelganger
+		CreateCreature("scsargument1",[505.688],N) // Doppelganger
+		CreateCreature("scsargument1",[577.733],N) // Doppelganger
+		CreateCreature("scsargument1",[437.641],NE) // Doppelganger
+		CreateCreature("scsargument1",[905.422],NW) // Doppelganger
+		CreateCreature("scsargument1",[860.464],W) // Doppelganger
+		CreateCreature("scsargument1",[964.497],NWW) // Doppelganger
+END
+
+
+IF TRIGGER
+   TriggerBlock(CoreMinus)
+THEN DO
+     Action(SpawnDoppelgangers,%tutu_var%dopzorl)
+END
+
+IF TRIGGER
+   TriggerBlock(HardPlus)
+THEN DO
+     Action(SpawnDoppelgangers,dw#dopzo)
+END

stratagems/tactical_bg1/ssl/noblpa.ssl

@@ -1,6 +1,5 @@
 IF TRIGGER
 	Global("NobleDopple","GLOBAL",1)
-   RequireBlock(EasyOptionAvailable)
    Global("dw#doppel_override","GLOBAL",1)
    Allegiance(Myself,NEUTRAL)
 THEN DO
@@ -10,7 +9,6 @@ END
 
 IF TRIGGER
 	Global("NobleDopple","GLOBAL",1)
-   RequireBlock(EasyOptionAvailable)
    TriggerBlock(EasyMinus)
    Allegiance(Myself,NEUTRAL)
 THEN DO
@@ -20,7 +18,6 @@ END
 
 IF TRIGGER
 	Global("NobleDopple","GLOBAL",1)
-   RequireBlock(EasyOptionAvailable)
    TriggerBlock(Core)
    Allegiance(Myself,NEUTRAL)
 THEN DO
@@ -30,23 +27,13 @@ END
 
 IF TRIGGER
 	Global("NobleDopple","GLOBAL",1)
-   RequireBlock(EasyOptionAvailable)
    TriggerBlock(HardPlus)
    Allegiance(Myself,NEUTRAL)
 THEN DO
      Action(Literal)
      ForceSpellRES("dw#hdp7",Myself)
 END
 
-IF TRIGGER
-	Global("NobleDopple","GLOBAL",1)
-   IgnoreBlock(EasyOptionAvailable)
-   Allegiance(Myself,NEUTRAL)
-THEN DO
-     Action(Literal)
-     ForceSpellRES("dw#hdp7",Myself)
-END
-
 IF
 	OnCreation()
 THEN

stratagems/tactical_bg1/ssl/zorl.ssl

@@ -16,7 +16,6 @@ THEN DO
 END
 
 IF TRIGGER
-        RequireBlock(EasyOptionAvailable)
         TriggerBlock(HardPlus)
 	Global("ZorlDopple","GLOBAL",1)
 	Allegiance(Myself,NEUTRAL)

stratagems/test/test.tpa

@@ -10,10 +10,12 @@ ACTION_IF GAME_IS iwdee BEGIN
     LAF kit_research END
 
 END ELSE BEGIN
+      OUTER_SPRINT component_loc tactical_bg1
+      LAF get_area_script STR_VAR area="%SWBaldursGate_MerchantLeague_L3%" RET script END
+      LAF edit_script STR_VAR script editstring="patch=>delete_action_if(dopzorl)" END
+      LAF extend STR_VAR script top=merchant_league_roof ssl=yes location=ssl END
+
 
-     LOAD_TRA "%scsroot%/lang/english/dw_iwdspells_divine.tra"
-     LAF remove_cause_wounds_alignment_restrictions END
-  //   LAF make_scroll_of_spell INT_VAR price=5000 STR_VAR resref="%CLERIC_UNHOLY_BLIGHT%" scrollname=testscrl END
 
 END