buttload of changes to the NTotSC amazons

BigWorldSetup · Jul 11, 2015 · 83cf304 · 83cf304
1 parent 5645810
commit 83cf304
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 26 deletions.
diff --git a/BiG World Fixpack/NTotSC/AR3900.baf.patch b/BiG World Fixpack/NTotSC/AR3900.baf.patch
@@ -1,28 +1,37 @@
 --- NTotSC\BAF\Area\AR3900.baf	Thu Aug 21 16:46:22 2008
-+++ C:\BWP Patchstudio\patched files\NTotSC\BAF\Area\AR3900.baf	Thu Jul 02 23:35:25 2015
-@@ -2,8 +2,8 @@
++++ C:\BWP Patchstudio\patched files\NTotSC\BAF\Area\AR3900.baf	Thu	Sat Jul 11 10:06:57 2015
+@@ -2,19 +2,19 @@
    Global("NTotSCSpawn","AR3900",0)
  THEN
    RESPONSE #100
 -    CreateCreature("NATALK9",[2248.240],3)
 -    CreateCreature("ELKA9",[2145.205],4)
-+    CreateCreature("NATALKA",[2248.240],3)
-+    CreateCreature("NTELKA",[2145.205],4)
++    CreateCreature("NTNATALK",[-1.-1],3)
++    CreateCreature("NTELKA",[-1.-1],4)
      SetGlobal("NTotSCSpawn","AR3900",1)
  END
 
-@@ -11,10 +11,10 @@
-   Global("NTotSCspawn","AR3900",1)
-   OR(2)
-   GlobalGT("DMWWC3Assassin","GLOBAL",0)
+-IF
+-  Global("NTotSCspawn","AR3900",1)
+-  OR(2)
+-  GlobalGT("DMWWC3Assassin","GLOBAL",0)
 -  !Exists("LAMALHA")
-+  !Exists("LAMALH")
- THEN
-   RESPONSE #100
+-THEN
+-  RESPONSE #100
 -    ActionOverride("NATALK9",DestroySelf())
 -    ActionOverride("ELKA9",DestroySelf())
-+    ActionOverride("NATALKA",DestroySelf())
-+    ActionOverride("NTELKA",DestroySelf())
-     SetGlobal("NTotSCSpawn","AR3900",2)
- END
+-    SetGlobal("NTotSCSpawn","AR3900",2)
+-END
+\ No newline at end of file
++// IF
++//   Global("NTotSCspawn","AR3900",1)
++//   OR(2)
++//   GlobalGT("DMWWC3Assassin","GLOBAL",0)
++//   !Exists("LAMALH")
++// THEN
++//   RESPONSE #100
++//     ActionOverride("NTNATALK",DestroySelf())
++//     ActionOverride("NTELKA",DestroySelf())
++//     SetGlobal("NTotSCSpawn","AR3900",2)
++// END
 \ No newline at end of file
diff --git a/BiG World Fixpack/NTotSC/Setup-NTotSC.TP2.patch b/BiG World Fixpack/NTotSC/Setup-NTotSC.TP2.patch
@@ -1,5 +1,5 @@
---- Setup-NTotSC.TP2	Sat Aug 31 09:32:49 2013
-+++ C:\BWP Patchstudio\patched files\Setup-NTotSC.TP2	Sun Aug 25 09:57:26 2013
+--- Setup-NTotSC.TP2	Thu Jan 01 15:33:28 2009
++++ C:\BWP Patchstudio\patched files\Setup-NTotSC.TP2	Sat Jul 11 09:58:48 2015
 @@ -2,7 +2,7 @@
 
  AUTHOR ~SirBillyBob@gmail.com & erebusant@verizon.net~
@@ -13,14 +13,45 @@
   COPY ~ntotSC/itm/ADISEASE.ITM~       ~override~ 
     SAY NAME2 @69
     SAY DESC @71
-- COPY ~ntotSC/itm/NAMJI.ITM~       ~override~
--   SAY NAME2 @73
--   SAY DESC @75
- END
++END
 +
-+COPY ~ntotSC/itm/NAMJI.ITM~       ~override~
-+  SAY NAME2 @73
-+  SAY DESC @75
+  COPY ~ntotSC/itm/NAMJI.ITM~       ~override~
+    SAY NAME2 @73
+    SAY DESC @75
+-END
 
  COPY ~ntotSC/itm/NTDAGG01.ITM~       ~override~ 
    SAY NAME2 @77
+@@ -719,7 +720,7 @@
+   SAY NAME1 @247 
+   SAY NAME2 @247 
+
+-COPY ~NTotSC/CRE/ELKA9.cre~       ~override~         
++COPY ~NTotSC/CRE/NTELKA.cre~       ~override~         
+   SAY NAME1 @248 
+   SAY NAME2 @248 
+
+@@ -845,7 +846,7 @@
+   SAY NAME1 @315 
+   SAY NAME2 @315 
+
+-COPY ~NTotSC/CRE/NATALK9.cre~       ~override~       
++COPY ~NTotSC/CRE/NTNATALK.cre~       ~override~       
+   SAY NAME1 @316 
+   SAY NAME2 @316
+
+@@ -2551,7 +2552,13 @@
+ EXTEND_BOTTOM	~INITGOLV.BCS~	~NTotSC/BAF/NTGOLINV.BAF~
+
+ EXTEND_BOTTOM ~AR3400.bcs~       ~NTotSC/BAF/Area/AR3400.BAF~
+-EXTEND_BOTTOM ~AR3900.bcs~       ~NTotSC/BAF/Area/AR3900.BAF~
++EXTEND_BOTTOM ~LAMALHA.bcs~      ~NTotSC/BAF/Area/AR3900.BAF~
++COPY_EXISTING ~LAMALH.DLG~      ~override~
++DECOMPILE_AND_PATCH BEGIN
++  REPLACE_TEXTUALLY CASE_SENSITIVE EXACT_MATCH ~ActionOverride("MANEIRA",Enemy())~ ~ActionOverride("MANEIRA",Enemy())
++                                                                                    ActionOverride("NATALKA",Enemy())
++                                                                                    ActionOverride("NTELKA",Enemy())~
++END
+ EXTEND_BOTTOM ~AR4300.bcs~       ~NTotSC/BAF/Area/AR4300.BAF~
+ EXTEND_BOTTOM ~AR6700.bcs~       ~NTotSC/BAF/Area/AR6700.BAF~
+ EXTEND_BOTTOM ~AR6706.bcs~       ~NTotSC/BAF/Area/AR6706.BAF~
diff --git a/BiG World Fixpack/NTotSC/_copy/CRE/NTNATALK.cre b/BiG World Fixpack/NTotSC/_copy/CRE/NTNATALK.cre
diff --git a/BiG World Fixpack/_BWP fixes.txt b/BiG World Fixpack/_BWP fixes.txt
@@ -1433,8 +1433,8 @@ Pour en apprendre plus sur les corrections employ
 :: micbaldur's Charleston script name fix
 :: http://www.shsforums.net/topic/47635-notes-oddities-and-possible-bugs-in-my-bwp-game-spoilers/?p=578583
 
-:: micbaldur's Amazonian encounter fix
-:: http://www.shsforums.net/topic/47635-notes-oddities-and-possible-bugs-in-my-bwp-game-spoilers/?p=578707
+:: Lollorian's Amazonian encounter fixes
+:: http://www.shsforums.net/topic/47635-notes-oddities-and-possible-bugs-in-my-bwp-game-spoilers/?p=579179
 
 
 ----------------------------------------------------------------------------------------