* Updated the demo quest anddemo npcs to use include, the new '.zs'

* extension, and to show ghost enemies behind layers. * The demo quest main script is now in the demo path, instead * of the buffer.
ArmageddonGames · Jan 27, 2020 · 600bbfa · 600bbfa
1 parent a37ea37
commit 600bbfa
Show file tree

Hide file tree

Showing 12 changed files with 80 additions and 3 deletions.
diff --git a/demo/ghost_zh_demo.qst b/demo/ghost_zh_demo.qst
diff --git a/demo/ghost_zh_demo_2.8.12.qst b/demo/ghost_zh_demo_2.8.12.qst
diff --git a/demo/ghostdemo.zs b/demo/ghostdemo.zs
@@ -0,0 +1,68 @@
+//Updated 27th January, 2020
+
+#include "std.zh"
+#include "ghost.zh"
+
+#include "ghzhDemo/SimpleGhostZHExample.zs"
+#include "ghzhDemo/Dragon.zs"
+#include "ghzhDemo/TwinAmoeba.zs"
+#include "ghzhDemo/Lich.zs"
+#include "ghzhDemo/Iflyte.zs"
+#include "ghzhDemo/Julius.zs"
+#include "ghzhDemo/Grell.zs"
+
+
+// Since the script-spawned Triforce doesn't get
+// held up automatically...
+item script holdup
+{
+	void run()
+	{
+		Link->Action=LA_HOLD2LAND;
+		Link->HeldItem=20;
+	}
+}
+
+
+
+// Just an extra little detail. Destroy the statues in Iflyte's room if he hits them.
+ffc script DestroyStatues
+{
+	void run()
+	{
+		ffc iflyte=Screen->LoadFFC(1);
+
+		if(Screen->D[0]>0)
+		{
+			Game->SetComboData(1, 0x31, 99, 0);
+			Screen->ComboD[115]=134;
+		}
+
+		if(Screen->D[1]>0)
+		{
+			Game->SetComboData(1, 0x31, 108, 0);
+			Screen->ComboD[124]=134;
+		}
+
+		while(true)
+		{
+			if(Screen->D[0]==0 && iflyte->X<60 && iflyte->Y>84)
+			{
+				Game->PlaySound(SFX_BOMB);
+				Game->SetComboData(1, 0x31, 99, 0);
+				Screen->ComboD[115]=134;
+				Screen->D[0]=1;
+			}
+
+			if(Screen->D[1]==0 && iflyte->X>164 && iflyte->Y>84)
+			{
+				Game->PlaySound(SFX_BOMB);
+				Game->SetComboData(1, 0x31, 108, 0);
+				Screen->ComboD[124]=134;
+				Screen->D[1]=1;
+			}
+
+			Waitframe();
+		}
+	}
+}
diff --git a/demo/ghzhDemo/Dragon.z → demo/ghzhDemo/Dragon.zs b/demo/ghzhDemo/Dragon.z → demo/ghzhDemo/Dragon.zs
diff --git a/demo/ghzhDemo/Grell.z → demo/ghzhDemo/Grell.zs b/demo/ghzhDemo/Grell.z → demo/ghzhDemo/Grell.zs
diff --git a/demo/ghzhDemo/Iflyte.z → demo/ghzhDemo/Iflyte.zs b/demo/ghzhDemo/Iflyte.z → demo/ghzhDemo/Iflyte.zs
diff --git a/demo/ghzhDemo/Julius.z → demo/ghzhDemo/Julius.zs b/demo/ghzhDemo/Julius.z → demo/ghzhDemo/Julius.zs
diff --git a/demo/ghzhDemo/Lich.z → demo/ghzhDemo/Lich.zs b/demo/ghzhDemo/Lich.z → demo/ghzhDemo/Lich.zs
diff --git a/demo/ghzhDemo/SimpleGhostZHExample.z → demo/ghzhDemo/SimpleGhostZHExample.zs b/demo/ghzhDemo/SimpleGhostZHExample.z → demo/ghzhDemo/SimpleGhostZHExample.zs
diff --git a/demo/ghzhDemo/TwinAmoeba.z → demo/ghzhDemo/TwinAmoeba.zs b/demo/ghzhDemo/TwinAmoeba.z → demo/ghzhDemo/TwinAmoeba.zs
diff --git a/header/ghostZHChangelog.txt b/header/ghostZHChangelog.txt
@@ -3,6 +3,10 @@ Version 2.8.12
 
 2.8.12
 	(2020-27-JAN)
+* Updated the demo quest anddemo npcs to use include, the new '.zs'
+*	extension, and to show ghost enemies behind layers.
+*	The demo quest main script is now in the demo path, instead
+*	of the buffer.
 * Try to fix bugs caused by changes in 2.8.10.
 * Added __GH_ETHEREAL, defaulted to 1 to user settings.
 *	This forces ffcs used to control ghost npcs to Ethereal.

diff --git a/header/ghost_zh/2.8/ghost2_global.zh b/header/ghost_zh/2.8/ghost2_global.zh
@@ -158,9 +158,14 @@ void AutoGhost()
         enemy=Screen->LoadNPC(i);
 
         // ID out of range??
-        if(enemy->ID<AUTOGHOST_MIN_ENEMY_ID || enemy->ID>AUTOGHOST_MAX_ENEMY_ID)
-            continue;
-
+        if(enemy->ID<AUTOGHOST_MIN_ENEMY_ID)
+	{
+		continue;
+	}
+	if(enemy->ID>AUTOGHOST_MAX_ENEMY_ID)
+	{
+		continue;
+	}
 
         if(__GH_ALWAYS_USE_NAME) // Read from name
         {