Merge pull request #588 from LoboEire/master

Heretic/Blasphemer: fix tomed pickups
edge-classic · Oct 17, 2023 · 8e34f62 · 8e34f62
2 parents e6fb05e + 317bfd5
commit 8e34f62
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 8 deletions.
diff --git a/edge_base/blasphemer/scripts/rscript.rts b/edge_base/blasphemer/scripts/rscript.rts
@@ -4,9 +4,11 @@
 //    These scripts replace hardcoded events for Heretic.
 //    For documentation, see https://edge-classic.github.io/
 //
+
 #CLEAR_ALL
 
 
+
 START_MAP ALL
 
 	//Switch to Tomed STAFF
@@ -82,6 +84,7 @@ START_MAP ALL
 
 		WAIT 2T
 		REPLACE_WEAPON CROSSBOW CROSSBOW_TOMED //switch to the new one
+		REPLACE_THING CROSSBOW CROSSBOW_TOMED 
 
 		DISABLE_TAGGED SWITCH_TOMED_CROSSBOW
 	END_RADIUS_TRIGGER
@@ -97,6 +100,7 @@ START_MAP ALL
 
 		WAIT 2T
 		REPLACE_WEAPON CROSSBOW_TOMED CROSSBOW //switch to the new one
+		REPLACE_THING CROSSBOW_TOMED CROSSBOW
 
 		DISABLE_TAGGED SWITCH_CROSSBOW
 	END_RADIUS_TRIGGER
@@ -113,6 +117,7 @@ START_MAP ALL
 
 		WAIT 2T
 		REPLACE_WEAPON GAUNTLETS GAUNTLETS_TOMED //switch to the new one
+		REPLACE_THING GAUNTLETS GAUNTLETS_TOMED
 
 		DISABLE_TAGGED SWITCH_TOMED_GAUNTLETS
 	END_RADIUS_TRIGGER
@@ -128,6 +133,7 @@ START_MAP ALL
 
 		WAIT 2T
 		REPLACE_WEAPON GAUNTLETS_TOMED GAUNTLETS //switch to the new one
+		REPLACE_THING GAUNTLETS_TOMED GAUNTLETS
 
 		DISABLE_TAGGED SWITCH_GAUNTLETS
 	END_RADIUS_TRIGGER
@@ -143,6 +149,7 @@ START_MAP ALL
 
 		WAIT 2T
 		REPLACE_WEAPON PHOENIX_ROD PHOENIX_ROD_TOMED
+		REPLACE_THING PHOENIX_ROD PHOENIX_ROD_TOMED
 
 		DISABLE_TAGGED SWITCH_TOMED_PHOENIX_ROD
 	END_RADIUS_TRIGGER
@@ -158,6 +165,7 @@ START_MAP ALL
 
 		WAIT 2T
 		REPLACE_WEAPON PHOENIX_ROD_TOMED PHOENIX_ROD
+		REPLACE_THING PHOENIX_ROD_TOMED PHOENIX_ROD
 
 		DISABLE_TAGGED SWITCH_PHOENIX_ROD
 	END_RADIUS_TRIGGER
@@ -173,6 +181,7 @@ START_MAP ALL
 
 		WAIT 2T
 		REPLACE_WEAPON HELLSTAFF HELLSTAFF_TOMED
+		REPLACE_THING HELLSTAFF HELLSTAFF_TOMED
 
 		DISABLE_TAGGED SWITCH_TOMED_HELLSTAFF
 	END_RADIUS_TRIGGER
@@ -188,6 +197,7 @@ START_MAP ALL
 
 		WAIT 2T
 		REPLACE_WEAPON HELLSTAFF_TOMED HELLSTAFF
+		REPLACE_THING HELLSTAFF_TOMED HELLSTAFF
 
 		DISABLE_TAGGED SWITCH_HELLSTAFF
 	END_RADIUS_TRIGGER
@@ -203,6 +213,7 @@ START_MAP ALL
 
 		WAIT 2T
 		REPLACE_WEAPON DRAGON_CLAW DRAGON_CLAW_TOMED //switch to the new one
+		REPLACE_THING DRAGON_CLAW DRAGON_CLAW_TOMED
 
 		DISABLE_TAGGED SWITCH_TOMED_DRAGON_CLAW
 	END_RADIUS_TRIGGER
@@ -218,6 +229,7 @@ START_MAP ALL
 
 		WAIT 2T
 		REPLACE_WEAPON DRAGON_CLAW_TOMED DRAGON_CLAW //switch to the new one
+		REPLACE_THING DRAGON_CLAW_TOMED DRAGON_CLAW
 
 		DISABLE_TAGGED SWITCH_DRAGON_CLAW
 	END_RADIUS_TRIGGER
@@ -234,6 +246,7 @@ START_MAP ALL
 
 		WAIT 2T
 		REPLACE_WEAPON MACE MACE_TOMED
+		REPLACE_THING MACE MACE_TOMED
 
 		DISABLE_TAGGED SWITCH_TOMED_MACE
 	END_RADIUS_TRIGGER
@@ -249,6 +262,7 @@ START_MAP ALL
 
 		WAIT 2T
 		REPLACE_WEAPON MACE_TOMED MACE
+		REPLACE_THING MACE_TOMED MACE
 
 		DISABLE_TAGGED SWITCH_MACE
 	END_RADIUS_TRIGGER
@@ -518,12 +532,6 @@ START_MAP ALL
 		TAGGED_DISABLED
 		TAGGED_REPEATABLE 0 1
 
-		GIVE_BENEFIT AMMO1(3)
-		GIVE_BENEFIT AMMO2(3)
-		GIVE_BENEFIT AMMO3(3)
-		GIVE_BENEFIT AMMO4(3)
-		GIVE_BENEFIT AMMO5(3)
-		GIVE_BENEFIT AMMO6(3)
 		THING_EVENT OUR_HERO SHOOT_EGG 
 
 		WAIT 2T

diff --git a/edge_base/blasphemer/scripts/things.ddf b/edge_base/blasphemer/scripts/things.ddf
@@ -3107,6 +3107,11 @@ RESPAWN_EFFECT=ITEM_RESPAWN;
 
 STATES(IDLE)=WBOW:A:-1:NORMAL:NOTHING;
 
+[CROSSBOW_TOMED]
+TEMPLATE=CROSSBOW;
+PICKUP_BENEFIT=CROSSBOW_TOMED,SHELLS(8);
+
+
 
 [GAUNTLETS:2005]
 RADIUS=20;
@@ -3119,6 +3124,11 @@ RESPAWN_EFFECT=ITEM_RESPAWN;
 
 STATES(IDLE)=WGNT:A:-1:NORMAL:NOTHING;
 
+[GAUNTLETS_TOMED]
+TEMPLATE=GAUNTLETS;
+PICKUP_BENEFIT=GAUNTLETS_TOMED;
+
+
 
 [DRAGON_CLAW:53]
 RADIUS=20;
@@ -3131,6 +3141,10 @@ RESPAWN_EFFECT=ITEM_RESPAWN;
 
 STATES(IDLE)=WBLS:A:-1:NORMAL:NOTHING;
 
+[DRAGON_CLAW_TOMED]
+TEMPLATE=DRAGON_CLAW;
+PICKUP_BENEFIT=DRAGON_CLAW_TOMED,CELLS(20);
+
 
 [HELLSTAFF:2004]
 RADIUS=20;
@@ -3142,6 +3156,10 @@ SPECIAL=SPECIAL,NOGRAVITY;
 RESPAWN_EFFECT=ITEM_RESPAWN;
 
 STATES(IDLE)=WSKL:A:-1:NORMAL:NOTHING;
+
+[HELLSTAFF_TOMED]
+TEMPLATE=HELLSTAFF;
+PICKUP_BENEFIT=HELLSTAFF_TOMED,AMMO6(50);
 
 
 
@@ -3156,7 +3174,9 @@ RESPAWN_EFFECT=ITEM_RESPAWN;
 
 STATES(IDLE)=WMCE:A:-1:NORMAL:NOTHING; 
 
-
+[MACE_TOMED]
+TEMPLATE=MACE;
+PICKUP_BENEFIT=MACE_TOMED,AMMO5(75);
 
 
 [PHOENIX_ROD:2003]
@@ -3169,6 +3189,11 @@ SPECIAL=SPECIAL,NOGRAVITY,DROPPED;
 RESPAWN_EFFECT=ITEM_RESPAWN;
 
 STATES(IDLE)=WPHX:A:-1:NORMAL:NOTHING; 
+
+[PHOENIX_ROD_TOMED]
+TEMPLATE=PHOENIX_ROD;
+PICKUP_BENEFIT=PHOENIX_ROD_TOMED,ROCKETS(4);
+
 
 // Mage's Best Friend :->
 

diff --git a/edge_base/heretic/scripts/rscript.rts b/edge_base/heretic/scripts/rscript.rts
@@ -84,6 +84,7 @@ START_MAP ALL
 
 		WAIT 2T
 		REPLACE_WEAPON CROSSBOW CROSSBOW_TOMED //switch to the new one
+		REPLACE_THING CROSSBOW CROSSBOW_TOMED 
 
 		DISABLE_TAGGED SWITCH_TOMED_CROSSBOW
 	END_RADIUS_TRIGGER
@@ -99,6 +100,7 @@ START_MAP ALL
 
 		WAIT 2T
 		REPLACE_WEAPON CROSSBOW_TOMED CROSSBOW //switch to the new one
+		REPLACE_THING CROSSBOW_TOMED CROSSBOW
 
 		DISABLE_TAGGED SWITCH_CROSSBOW
 	END_RADIUS_TRIGGER
@@ -115,6 +117,7 @@ START_MAP ALL
 
 		WAIT 2T
 		REPLACE_WEAPON GAUNTLETS GAUNTLETS_TOMED //switch to the new one
+		REPLACE_THING GAUNTLETS GAUNTLETS_TOMED
 
 		DISABLE_TAGGED SWITCH_TOMED_GAUNTLETS
 	END_RADIUS_TRIGGER
@@ -130,6 +133,7 @@ START_MAP ALL
 
 		WAIT 2T
 		REPLACE_WEAPON GAUNTLETS_TOMED GAUNTLETS //switch to the new one
+		REPLACE_THING GAUNTLETS_TOMED GAUNTLETS
 
 		DISABLE_TAGGED SWITCH_GAUNTLETS
 	END_RADIUS_TRIGGER
@@ -145,6 +149,7 @@ START_MAP ALL
 
 		WAIT 2T
 		REPLACE_WEAPON PHOENIX_ROD PHOENIX_ROD_TOMED
+		REPLACE_THING PHOENIX_ROD PHOENIX_ROD_TOMED
 
 		DISABLE_TAGGED SWITCH_TOMED_PHOENIX_ROD
 	END_RADIUS_TRIGGER
@@ -160,6 +165,7 @@ START_MAP ALL
 
 		WAIT 2T
 		REPLACE_WEAPON PHOENIX_ROD_TOMED PHOENIX_ROD
+		REPLACE_THING PHOENIX_ROD_TOMED PHOENIX_ROD
 
 		DISABLE_TAGGED SWITCH_PHOENIX_ROD
 	END_RADIUS_TRIGGER
@@ -175,6 +181,7 @@ START_MAP ALL
 
 		WAIT 2T
 		REPLACE_WEAPON HELLSTAFF HELLSTAFF_TOMED
+		REPLACE_THING HELLSTAFF HELLSTAFF_TOMED
 
 		DISABLE_TAGGED SWITCH_TOMED_HELLSTAFF
 	END_RADIUS_TRIGGER
@@ -190,6 +197,7 @@ START_MAP ALL
 
 		WAIT 2T
 		REPLACE_WEAPON HELLSTAFF_TOMED HELLSTAFF
+		REPLACE_THING HELLSTAFF_TOMED HELLSTAFF
 
 		DISABLE_TAGGED SWITCH_HELLSTAFF
 	END_RADIUS_TRIGGER
@@ -205,6 +213,7 @@ START_MAP ALL
 
 		WAIT 2T
 		REPLACE_WEAPON DRAGON_CLAW DRAGON_CLAW_TOMED //switch to the new one
+		REPLACE_THING DRAGON_CLAW DRAGON_CLAW_TOMED
 
 		DISABLE_TAGGED SWITCH_TOMED_DRAGON_CLAW
 	END_RADIUS_TRIGGER
@@ -220,6 +229,7 @@ START_MAP ALL
 
 		WAIT 2T
 		REPLACE_WEAPON DRAGON_CLAW_TOMED DRAGON_CLAW //switch to the new one
+		REPLACE_THING DRAGON_CLAW_TOMED DRAGON_CLAW
 
 		DISABLE_TAGGED SWITCH_DRAGON_CLAW
 	END_RADIUS_TRIGGER
@@ -236,6 +246,7 @@ START_MAP ALL
 
 		WAIT 2T
 		REPLACE_WEAPON MACE MACE_TOMED
+		REPLACE_THING MACE MACE_TOMED
 
 		DISABLE_TAGGED SWITCH_TOMED_MACE
 	END_RADIUS_TRIGGER
@@ -251,6 +262,7 @@ START_MAP ALL
 
 		WAIT 2T
 		REPLACE_WEAPON MACE_TOMED MACE
+		REPLACE_THING MACE_TOMED MACE
 
 		DISABLE_TAGGED SWITCH_MACE
 	END_RADIUS_TRIGGER

diff --git a/edge_base/heretic/scripts/things.ddf b/edge_base/heretic/scripts/things.ddf
@@ -3107,6 +3107,11 @@ RESPAWN_EFFECT=ITEM_RESPAWN;
 
 STATES(IDLE)=WBOW:A:-1:NORMAL:NOTHING;
 
+[CROSSBOW_TOMED]
+TEMPLATE=CROSSBOW;
+PICKUP_BENEFIT=CROSSBOW_TOMED,SHELLS(8);
+
+
 
 [GAUNTLETS:2005]
 RADIUS=20;
@@ -3119,6 +3124,11 @@ RESPAWN_EFFECT=ITEM_RESPAWN;
 
 STATES(IDLE)=WGNT:A:-1:NORMAL:NOTHING;
 
+[GAUNTLETS_TOMED]
+TEMPLATE=GAUNTLETS;
+PICKUP_BENEFIT=GAUNTLETS_TOMED;
+
+
 
 [DRAGON_CLAW:53]
 RADIUS=20;
@@ -3131,6 +3141,10 @@ RESPAWN_EFFECT=ITEM_RESPAWN;
 
 STATES(IDLE)=WBLS:A:-1:NORMAL:NOTHING;
 
+[DRAGON_CLAW_TOMED]
+TEMPLATE=DRAGON_CLAW;
+PICKUP_BENEFIT=DRAGON_CLAW_TOMED,CELLS(20);
+
 
 [HELLSTAFF:2004]
 RADIUS=20;
@@ -3142,6 +3156,10 @@ SPECIAL=SPECIAL,NOGRAVITY;
 RESPAWN_EFFECT=ITEM_RESPAWN;
 
 STATES(IDLE)=WSKL:A:-1:NORMAL:NOTHING;
+
+[HELLSTAFF_TOMED]
+TEMPLATE=HELLSTAFF;
+PICKUP_BENEFIT=HELLSTAFF_TOMED,AMMO6(50);
 
 
 
@@ -3156,7 +3174,9 @@ RESPAWN_EFFECT=ITEM_RESPAWN;
 
 STATES(IDLE)=WMCE:A:-1:NORMAL:NOTHING; 
 
-
+[MACE_TOMED]
+TEMPLATE=MACE;
+PICKUP_BENEFIT=MACE_TOMED,AMMO5(75);
 
 
 [PHOENIX_ROD:2003]
@@ -3169,6 +3189,11 @@ SPECIAL=SPECIAL,NOGRAVITY,DROPPED;
 RESPAWN_EFFECT=ITEM_RESPAWN;
 
 STATES(IDLE)=WPHX:A:-1:NORMAL:NOTHING; 
+
+[PHOENIX_ROD_TOMED]
+TEMPLATE=PHOENIX_ROD;
+PICKUP_BENEFIT=PHOENIX_ROD_TOMED,ROCKETS(4);
+
 
 // Mage's Best Friend :->