Merge pull request #744 from LoboEire/master

Heretic tweaks
edge-classic · Nov 4, 2024 · f1b129d · f1b129d
2 parents 7b52ab3 + 3a2e612
commit f1b129d
Show file tree

Hide file tree

Showing 7 changed files with 331 additions and 261 deletions.
diff --git a/edge_base/blasphemer/scripts/attacks.ddf b/edge_base/blasphemer/scripts/attacks.ddf
@@ -679,7 +679,7 @@ ANGLE_OFFSET=0;
 Y_OFFSET=8;
 X_OFFSET=0;
 ATTACK_SPECIAL=PRESTEP_SPAWN;
-PROJECTILE_SPECIAL=NOBLOCKMAP,MISSILE,DROPOFF,NOGRAVITY,NOSHADOW,TUNNEL;
+PROJECTILE_SPECIAL=NOBLOCKMAP,MISSILE,DROPOFF,NOGRAVITY,NOSHADOW,BORE;
 //TRANSLUCENCY=70%;
 DLIGHT.TYPE=MODULATE;
 DLIGHT.RADIUS=10;

diff --git a/edge_base/blasphemer/scripts/lua/edge_hud.lua b/edge_base/blasphemer/scripts/lua/edge_hud.lua
@@ -471,10 +471,39 @@ end
 
 
 function begin_level()
-    --	player.set_who(0)--need to hook our player mobj first
-    --	
-    --	if (player.inventory(1) > 0)
-    --		hud.rts_enable("REMOVEFLASKS")
+
+    --	Heretic trims your inventory on each new map
+    if (player.inventory(1) > 0) then
+    	hud.rts_enable("REMOVEFLASKS")
+	end
+	if (player.inventory(2) > 0) then
+    	hud.rts_enable("REMOVESHADOWSPHERES")
+	end
+	if (player.inventory(3) > 0) then
+    	hud.rts_enable("REMOVETOMES")
+	end
+	if (player.inventory(4) > 0) then
+    	hud.rts_enable("REMOVEURNS")
+	end
+	if (player.inventory(5) > 0) then
+    	hud.rts_enable("REMOVEWINGS")
+	end
+	if (player.inventory(6) > 0) then
+    	hud.rts_enable("REMOVERINGS")
+	end
+	if (player.inventory(7) > 0) then
+    	hud.rts_enable("REMOVETORCH")
+	end
+	if (player.inventory(8) > 0) then
+    	hud.rts_enable("REMOVEBOMBS")
+	end
+	if (player.inventory(9) > 0) then
+    	hud.rts_enable("REMOVECHAOS")
+	end
+	if (player.inventory(10) > 0) then
+    	hud.rts_enable("REMOVEOVUMS")
+	end
+
 end
 
 --************************

diff --git a/edge_base/blasphemer/scripts/rscript.rts b/edge_base/blasphemer/scripts/rscript.rts
@@ -267,23 +267,9 @@ START_MAP ALL
 		DISABLE_TAGGED SWITCH_MACE
 	END_RADIUS_TRIGGER
 
-
-	RADIUS_TRIGGER 0 0 -1  
-		TAG INVENTORY01
-		NAME INVENTORY01
-		TAGGED_DISABLED
-		TAGGED_REPEATABLE 0 4T
-
-		HEAL_PLAYER 25 100
-		WAIT 2T
-
-		//TIP_SET_COLOUR TEXT_GREEN
-		//TIP "Used Quartz Flask" 1 FALSE 
-		WAIT 1
-
-		DISABLE_TAGGED INVENTORY01
-	END_RADIUS_TRIGGER
 
+	//********************************************
+	//***** Remove excess inventory at level start
 	RADIUS_TRIGGER 0 0 -1  //Quartz Flask
 		TAGGED_INDEPENDENT
 		TAGGED_IMMEDIATE
@@ -295,119 +281,138 @@ START_MAP ALL
 		WAIT 2T
 		GIVE_BENEFIT INVENTORY01(1)//give just one
 	END_RADIUS_TRIGGER
+
+	RADIUS_TRIGGER 0 0 -1  //Shadow Sphere
+		TAGGED_INDEPENDENT
+		TAGGED_IMMEDIATE
+		TAGGED_DISABLED
+		TAG REMOVESHADOWSPHERES
+		NAME REMOVESHADOWSPHERES
 
-	//*******************
-	// Inventory 
+		LOSE_BENEFIT INVENTORY02(16)//remove all
+		WAIT 2T
+		GIVE_BENEFIT INVENTORY02(1)//give just one
+	END_RADIUS_TRIGGER
+
+	RADIUS_TRIGGER 0 0 -1  //Tome of power
+		TAGGED_INDEPENDENT
+		TAGGED_IMMEDIATE
+		TAGGED_DISABLED
+		TAG REMOVETOMES
+		NAME REMOVETOMES
+
+		LOSE_BENEFIT INVENTORY03(16)//remove all
+		WAIT 2T
+		GIVE_BENEFIT INVENTORY03(1)//give just one
+	END_RADIUS_TRIGGER
+
+	RADIUS_TRIGGER 0 0 -1  //Mystic Urn
+		TAGGED_INDEPENDENT
+		TAGGED_IMMEDIATE
+		TAGGED_DISABLED
+		TAG REMOVEURNS
+		NAME REMOVEURNS
+
+		LOSE_BENEFIT INVENTORY04(16)//remove all
+		WAIT 2T
+		GIVE_BENEFIT INVENTORY04(1)//give just one
+	END_RADIUS_TRIGGER
+
+	RADIUS_TRIGGER 0 0 -1  //Wings of wrath
+		TAGGED_INDEPENDENT
+		TAGGED_IMMEDIATE
+		TAGGED_DISABLED
+		TAG REMOVEWINGS
+		NAME REMOVEWINGS
+
+		LOSE_BENEFIT INVENTORY05(16)//remove all
+		WAIT 2T
+		//In the case of the wings of wrath we NEVER
+		//carry it across maps.
+		//GIVE_BENEFIT INVENTORY05(1)//give just one
+	END_RADIUS_TRIGGER
+
+	RADIUS_TRIGGER 0 0 -1  //Ring of invincibility
+		TAGGED_INDEPENDENT
+		TAGGED_IMMEDIATE
+		TAGGED_DISABLED
+		TAG REMOVERINGS
+		NAME REMOVERINGS
+
+		LOSE_BENEFIT INVENTORY06(16)//remove all
+		WAIT 2T
+		GIVE_BENEFIT INVENTORY06(1)//give just one
+	END_RADIUS_TRIGGER
+
+	RADIUS_TRIGGER 0 0 -1  //Torch
+		TAGGED_INDEPENDENT
+		TAGGED_IMMEDIATE
+		TAGGED_DISABLED
+		TAG REMOVETORCH
+		NAME REMOVETORCH
 
-//	//********************************************
-//	//***** Remove excess inventory at level start
-//	RADIUS_TRIGGER 0 0 -1  //Quartz Flask
-//		TAGGED_INDEPENDENT
-//		TAGGED_IMMEDIATE
-//		ON_CONDITION INVENTORY01(2)//check if they have 2 or more
-//		
-//		LOSE_BENEFIT INVENTORY01(16)//remove all
-//		WAIT 2T
-//		GIVE_BENEFIT INVENTORY01(1)//give just one
-//	END_RADIUS_TRIGGER
-//	
-//	RADIUS_TRIGGER 0 0 -1  //Shadow Sphere
-//		TAGGED_INDEPENDENT
-//		TAGGED_IMMEDIATE
-//		ON_CONDITION INVENTORY02(2)//check if they have 2 or more
-//		
-//		LOSE_BENEFIT INVENTORY02(16)//remove all
-//		WAIT 2T
-//		GIVE_BENEFIT INVENTORY02(1)//give just one
-//	END_RADIUS_TRIGGER
-//	
-//	RADIUS_TRIGGER 0 0 -1  //Tome of power
-//		TAGGED_INDEPENDENT
-//		TAGGED_IMMEDIATE
-//		ON_CONDITION INVENTORY03(2)//check if they have 2 or more
-//		
-//		LOSE_BENEFIT INVENTORY03(16)//remove all
-//		WAIT 2T
-//		GIVE_BENEFIT INVENTORY03(1)//give just one
-//	END_RADIUS_TRIGGER
-//	
-//	RADIUS_TRIGGER 0 0 -1  //Mystic Urn
-//		TAGGED_INDEPENDENT
-//		TAGGED_IMMEDIATE
-//		ON_CONDITION INVENTORY04(2)//check if they have 2 or more
-//		
-//		LOSE_BENEFIT INVENTORY04(16)//remove all
-//		WAIT 2T
-//		GIVE_BENEFIT INVENTORY04(1)//give just one
-//	END_RADIUS_TRIGGER
-//	
-//	RADIUS_TRIGGER 0 0 -1  //Wings of wrath
-//		TAGGED_INDEPENDENT
-//		TAGGED_IMMEDIATE
-//		ON_CONDITION INVENTORY05(2)//check if they have 2 or more
-//		
-//		LOSE_BENEFIT INVENTORY05(16)//remove all
-//		WAIT 2T
-//		//In the case of the wings of wrath we NEVER
-//		//carry it across maps.
-//		//GIVE_BENEFIT INVENTORY05(1)//give just one
-//	END_RADIUS_TRIGGER
-//	
-//	RADIUS_TRIGGER 0 0 -1  //Ring of invincibility
-//		TAGGED_INDEPENDENT
-//		TAGGED_IMMEDIATE
-//		ON_CONDITION INVENTORY06(2)//check if they have 2 or more
-//		
-//		LOSE_BENEFIT INVENTORY06(16)//remove all
-//		WAIT 2T
-//		GIVE_BENEFIT INVENTORY06(1)//give just one
-//	END_RADIUS_TRIGGER
-//	
-//	RADIUS_TRIGGER 0 0 -1  //Torch
-//		TAGGED_INDEPENDENT
-//		TAGGED_IMMEDIATE
-//		ON_CONDITION INVENTORY07(2)//check if they have 2 or more
-//		
-//		LOSE_BENEFIT INVENTORY07(16)//remove all
-//		WAIT 2T
-//		GIVE_BENEFIT INVENTORY07(1)//give just one
-//	END_RADIUS_TRIGGER
-//	
-//	RADIUS_TRIGGER 0 0 -1  //Time Bomb of the ancients
-//		TAGGED_INDEPENDENT
-//		TAGGED_IMMEDIATE
-//		ON_CONDITION INVENTORY08(2)//check if they have 2 or more
-//		
-//		LOSE_BENEFIT INVENTORY08(16)//remove all
-//		WAIT 2T
-//		GIVE_BENEFIT INVENTORY08(1)//give just one
-//	END_RADIUS_TRIGGER
-//	
-//	RADIUS_TRIGGER 0 0 -1  //Chaos Device
-//		TAGGED_INDEPENDENT
-//		TAGGED_IMMEDIATE
-//		ON_CONDITION INVENTORY09(2)//check if they have 2 or more
-//		
-//		LOSE_BENEFIT INVENTORY09(16)//remove all
-//		WAIT 2T
-//		GIVE_BENEFIT INVENTORY09(1)//give just one
-//	END_RADIUS_TRIGGER
-//	
-//	RADIUS_TRIGGER 0 0 -1  //Morph Ovum
-//		TAGGED_INDEPENDENT
-//		TAGGED_IMMEDIATE
-//		ON_CONDITION INVENTORY10(2)//check if they have 2 or more
-//		
-//		LOSE_BENEFIT INVENTORY10(16)//remove all
-//		WAIT 2T
-//		GIVE_BENEFIT INVENTORY10(1)//give just one
-//	END_RADIUS_TRIGGER
-//	
-//	//***** Remove excess inventory at level start
-//	//********************************************
+		LOSE_BENEFIT INVENTORY07(16)//remove all
+		WAIT 2T
+		GIVE_BENEFIT INVENTORY07(1)//give just one
+	END_RADIUS_TRIGGER
+
+	RADIUS_TRIGGER 0 0 -1  //Time Bomb of the ancients
+		TAGGED_INDEPENDENT
+		TAGGED_IMMEDIATE
+		TAGGED_DISABLED
+		TAG REMOVEBOMBS
+		NAME REMOVEBOMBS
 
+		LOSE_BENEFIT INVENTORY08(16)//remove all
+		WAIT 2T
+		GIVE_BENEFIT INVENTORY08(1)//give just one
+	END_RADIUS_TRIGGER
 
+	RADIUS_TRIGGER 0 0 -1  //Chaos Device
+		TAGGED_INDEPENDENT
+		TAGGED_IMMEDIATE
+		TAGGED_DISABLED
+		TAG REMOVECHAOS
+		NAME REMOVECHAOS
+
+		LOSE_BENEFIT INVENTORY09(16)//remove all
+		WAIT 2T
+		GIVE_BENEFIT INVENTORY09(1)//give just one
+	END_RADIUS_TRIGGER
 
+	RADIUS_TRIGGER 0 0 -1  //Morph Ovum
+		TAGGED_INDEPENDENT
+		TAGGED_IMMEDIATE
+		TAGGED_DISABLED
+		TAG REMOVEOVUMS
+		NAME REMOVEOVUMS
+
+		LOSE_BENEFIT INVENTORY10(16)//remove all
+		WAIT 2T
+		GIVE_BENEFIT INVENTORY10(1)//give just one
+	END_RADIUS_TRIGGER
+
+	//***** Remove excess inventory at level start
+	//********************************************
+
+	//*******************
+	// Inventory 
+
+	RADIUS_TRIGGER 0 0 -1  
+		TAG INVENTORY01
+		NAME INVENTORY01
+		TAGGED_DISABLED
+		TAGGED_REPEATABLE 0 4T
+
+		HEAL_PLAYER 25 100
+		WAIT 2T
+
+		//TIP_SET_COLOUR TEXT_GREEN
+		//TIP "Used Quartz Flask" 1 FALSE 
+		WAIT 1
+
+		DISABLE_TAGGED INVENTORY01
+	END_RADIUS_TRIGGER
 
 	RADIUS_TRIGGER 0 0 -1  
 		TAG INVENTORY02

diff --git a/edge_base/blasphemer/scripts/things.ddf b/edge_base/blasphemer/scripts/things.ddf
@@ -1480,7 +1480,7 @@ PAINCHANCE=90%;
 CASTORDER=7;
 BLOOD=BLOOD;
 FLOAT_SPEED=5;
-SPECIAL=COUNT_AS_KILL,SOLID,SPAWNCEILING,CLIMBABLE,SHOOTABLE,NOGRAVITY,FLOATER;
+SPECIAL=COUNT_AS_KILL,SOLID,SPAWNCEILING,CLIMBABLE,SHOOTABLE,NOGRAVITY,FLOATER,NOGRAV_KILL;
 MINATTACK_CHANCE=22%;
 CASTORDER=7;
 BLOOD=BLOOD;
@@ -1537,11 +1537,12 @@ STATES(DEATH)=IMPX:G:0:NORMAL:KILLSOUND,
 			  IMPX:G:4:NORMAL:MAKEDEATHSOUND,
               IMPX:H:3:NORMAL:SPARE_ATTACK,
               IMPX:H:1:NORMAL:SPARE_ATTACK,
-              IMPX:H:0:NORMAL:JUMP(DEATH:6,50%),
+              IMPX:H:0:NORMAL:JUMP(DEATH:7,50%),
               IMPX:H:1:NORMAL:SPARE_ATTACK,
+			  IMPX:H:7:NORMAL:GRAVITY,
               IMPX:I:7:NORMAL:NOTHING,
               IMPX:J:7:NORMAL:MAKEDEAD,
-              IMPX:K:7:NORMAL:NOTHING,
+              IMPX:K:7:NORMAL:NOTHING,			  
               IMPX:L:-1:NORMAL:NOTHING;
 
 STATES(OVERKILL)=IMPX:S:5:NORMAL:NOTHING,

diff --git a/edge_base/heretic/scripts/attacks.ddf b/edge_base/heretic/scripts/attacks.ddf
@@ -679,7 +679,7 @@ ANGLE_OFFSET=0;
 Y_OFFSET=8;
 X_OFFSET=0;
 ATTACK_SPECIAL=PRESTEP_SPAWN;
-PROJECTILE_SPECIAL=NOBLOCKMAP,MISSILE,DROPOFF,NOGRAVITY,NOSHADOW,TUNNEL;
+PROJECTILE_SPECIAL=NOBLOCKMAP,MISSILE,DROPOFF,NOGRAVITY,NOSHADOW,BORE;
 //TRANSLUCENCY=70%;
 DLIGHT.TYPE=MODULATE;
 DLIGHT.RADIUS=10;