Skip to content

Commit f1b129d

Browse files
dashodangerdashodanger
authored
Merge pull request #744 from LoboEire/master
Heretic tweaks
2 parents 7b52ab3 + 3a2e612 commit f1b129d

File tree

7 files changed

+331
-261
lines changed

7 files changed

+331
-261
lines changed

‎edge_base/blasphemer/scripts/attacks.ddf

+1-1
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ ANGLE_OFFSET=0;
679679
Y_OFFSET=8;
680680
X_OFFSET=0;
681681
ATTACK_SPECIAL=PRESTEP_SPAWN;
682-
PROJECTILE_SPECIAL=NOBLOCKMAP,MISSILE,DROPOFF,NOGRAVITY,NOSHADOW,TUNNEL;
682+
PROJECTILE_SPECIAL=NOBLOCKMAP,MISSILE,DROPOFF,NOGRAVITY,NOSHADOW,BORE;
683683
//TRANSLUCENCY=70%;
684684
DLIGHT.TYPE=MODULATE;
685685
DLIGHT.RADIUS=10;

‎edge_base/blasphemer/scripts/lua/edge_hud.lua

+33-4
Original file line numberDiff line numberDiff line change
@@ -471,10 +471,39 @@ end
471471

472472

473473
function begin_level()
474-
-- player.set_who(0)--need to hook our player mobj first
475-
--
476-
-- if (player.inventory(1) > 0)
477-
-- hud.rts_enable("REMOVEFLASKS")
474+
475+
-- Heretic trims your inventory on each new map
476+
if (player.inventory(1) > 0) then
477+
hud.rts_enable("REMOVEFLASKS")
478+
end
479+
if (player.inventory(2) > 0) then
480+
hud.rts_enable("REMOVESHADOWSPHERES")
481+
end
482+
if (player.inventory(3) > 0) then
483+
hud.rts_enable("REMOVETOMES")
484+
end
485+
if (player.inventory(4) > 0) then
486+
hud.rts_enable("REMOVEURNS")
487+
end
488+
if (player.inventory(5) > 0) then
489+
hud.rts_enable("REMOVEWINGS")
490+
end
491+
if (player.inventory(6) > 0) then
492+
hud.rts_enable("REMOVERINGS")
493+
end
494+
if (player.inventory(7) > 0) then
495+
hud.rts_enable("REMOVETORCH")
496+
end
497+
if (player.inventory(8) > 0) then
498+
hud.rts_enable("REMOVEBOMBS")
499+
end
500+
if (player.inventory(9) > 0) then
501+
hud.rts_enable("REMOVECHAOS")
502+
end
503+
if (player.inventory(10) > 0) then
504+
hud.rts_enable("REMOVEOVUMS")
505+
end
506+
478507
end
479508

480509
--************************

‎edge_base/blasphemer/scripts/rscript.rts

+129-124
Original file line numberDiff line numberDiff line change
@@ -267,23 +267,9 @@ START_MAP ALL
267267
DISABLE_TAGGED SWITCH_MACE
268268
END_RADIUS_TRIGGER
269269

270-
271-
RADIUS_TRIGGER 0 0 -1
272-
TAG INVENTORY01
273-
NAME INVENTORY01
274-
TAGGED_DISABLED
275-
TAGGED_REPEATABLE 0 4T
276-
277-
HEAL_PLAYER 25 100
278-
WAIT 2T
279-
280-
//TIP_SET_COLOUR TEXT_GREEN
281-
//TIP "Used Quartz Flask" 1 FALSE
282-
WAIT 1
283-
284-
DISABLE_TAGGED INVENTORY01
285-
END_RADIUS_TRIGGER
286270

271+
//********************************************
272+
//***** Remove excess inventory at level start
287273
RADIUS_TRIGGER 0 0 -1 //Quartz Flask
288274
TAGGED_INDEPENDENT
289275
TAGGED_IMMEDIATE
@@ -295,119 +281,138 @@ START_MAP ALL
295281
WAIT 2T
296282
GIVE_BENEFIT INVENTORY01(1)//give just one
297283
END_RADIUS_TRIGGER
284+
285+
RADIUS_TRIGGER 0 0 -1 //Shadow Sphere
286+
TAGGED_INDEPENDENT
287+
TAGGED_IMMEDIATE
288+
TAGGED_DISABLED
289+
TAG REMOVESHADOWSPHERES
290+
NAME REMOVESHADOWSPHERES
298291

299-
//*******************
300-
// Inventory
292+
LOSE_BENEFIT INVENTORY02(16)//remove all
293+
WAIT 2T
294+
GIVE_BENEFIT INVENTORY02(1)//give just one
295+
END_RADIUS_TRIGGER
296+
297+
RADIUS_TRIGGER 0 0 -1 //Tome of power
298+
TAGGED_INDEPENDENT
299+
TAGGED_IMMEDIATE
300+
TAGGED_DISABLED
301+
TAG REMOVETOMES
302+
NAME REMOVETOMES
303+
304+
LOSE_BENEFIT INVENTORY03(16)//remove all
305+
WAIT 2T
306+
GIVE_BENEFIT INVENTORY03(1)//give just one
307+
END_RADIUS_TRIGGER
308+
309+
RADIUS_TRIGGER 0 0 -1 //Mystic Urn
310+
TAGGED_INDEPENDENT
311+
TAGGED_IMMEDIATE
312+
TAGGED_DISABLED
313+
TAG REMOVEURNS
314+
NAME REMOVEURNS
315+
316+
LOSE_BENEFIT INVENTORY04(16)//remove all
317+
WAIT 2T
318+
GIVE_BENEFIT INVENTORY04(1)//give just one
319+
END_RADIUS_TRIGGER
320+
321+
RADIUS_TRIGGER 0 0 -1 //Wings of wrath
322+
TAGGED_INDEPENDENT
323+
TAGGED_IMMEDIATE
324+
TAGGED_DISABLED
325+
TAG REMOVEWINGS
326+
NAME REMOVEWINGS
327+
328+
LOSE_BENEFIT INVENTORY05(16)//remove all
329+
WAIT 2T
330+
//In the case of the wings of wrath we NEVER
331+
//carry it across maps.
332+
//GIVE_BENEFIT INVENTORY05(1)//give just one
333+
END_RADIUS_TRIGGER
334+
335+
RADIUS_TRIGGER 0 0 -1 //Ring of invincibility
336+
TAGGED_INDEPENDENT
337+
TAGGED_IMMEDIATE
338+
TAGGED_DISABLED
339+
TAG REMOVERINGS
340+
NAME REMOVERINGS
341+
342+
LOSE_BENEFIT INVENTORY06(16)//remove all
343+
WAIT 2T
344+
GIVE_BENEFIT INVENTORY06(1)//give just one
345+
END_RADIUS_TRIGGER
346+
347+
RADIUS_TRIGGER 0 0 -1 //Torch
348+
TAGGED_INDEPENDENT
349+
TAGGED_IMMEDIATE
350+
TAGGED_DISABLED
351+
TAG REMOVETORCH
352+
NAME REMOVETORCH
301353

302-
// //********************************************
303-
// //***** Remove excess inventory at level start
304-
// RADIUS_TRIGGER 0 0 -1 //Quartz Flask
305-
// TAGGED_INDEPENDENT
306-
// TAGGED_IMMEDIATE
307-
// ON_CONDITION INVENTORY01(2)//check if they have 2 or more
308-
//
309-
// LOSE_BENEFIT INVENTORY01(16)//remove all
310-
// WAIT 2T
311-
// GIVE_BENEFIT INVENTORY01(1)//give just one
312-
// END_RADIUS_TRIGGER
313-
//
314-
// RADIUS_TRIGGER 0 0 -1 //Shadow Sphere
315-
// TAGGED_INDEPENDENT
316-
// TAGGED_IMMEDIATE
317-
// ON_CONDITION INVENTORY02(2)//check if they have 2 or more
318-
//
319-
// LOSE_BENEFIT INVENTORY02(16)//remove all
320-
// WAIT 2T
321-
// GIVE_BENEFIT INVENTORY02(1)//give just one
322-
// END_RADIUS_TRIGGER
323-
//
324-
// RADIUS_TRIGGER 0 0 -1 //Tome of power
325-
// TAGGED_INDEPENDENT
326-
// TAGGED_IMMEDIATE
327-
// ON_CONDITION INVENTORY03(2)//check if they have 2 or more
328-
//
329-
// LOSE_BENEFIT INVENTORY03(16)//remove all
330-
// WAIT 2T
331-
// GIVE_BENEFIT INVENTORY03(1)//give just one
332-
// END_RADIUS_TRIGGER
333-
//
334-
// RADIUS_TRIGGER 0 0 -1 //Mystic Urn
335-
// TAGGED_INDEPENDENT
336-
// TAGGED_IMMEDIATE
337-
// ON_CONDITION INVENTORY04(2)//check if they have 2 or more
338-
//
339-
// LOSE_BENEFIT INVENTORY04(16)//remove all
340-
// WAIT 2T
341-
// GIVE_BENEFIT INVENTORY04(1)//give just one
342-
// END_RADIUS_TRIGGER
343-
//
344-
// RADIUS_TRIGGER 0 0 -1 //Wings of wrath
345-
// TAGGED_INDEPENDENT
346-
// TAGGED_IMMEDIATE
347-
// ON_CONDITION INVENTORY05(2)//check if they have 2 or more
348-
//
349-
// LOSE_BENEFIT INVENTORY05(16)//remove all
350-
// WAIT 2T
351-
// //In the case of the wings of wrath we NEVER
352-
// //carry it across maps.
353-
// //GIVE_BENEFIT INVENTORY05(1)//give just one
354-
// END_RADIUS_TRIGGER
355-
//
356-
// RADIUS_TRIGGER 0 0 -1 //Ring of invincibility
357-
// TAGGED_INDEPENDENT
358-
// TAGGED_IMMEDIATE
359-
// ON_CONDITION INVENTORY06(2)//check if they have 2 or more
360-
//
361-
// LOSE_BENEFIT INVENTORY06(16)//remove all
362-
// WAIT 2T
363-
// GIVE_BENEFIT INVENTORY06(1)//give just one
364-
// END_RADIUS_TRIGGER
365-
//
366-
// RADIUS_TRIGGER 0 0 -1 //Torch
367-
// TAGGED_INDEPENDENT
368-
// TAGGED_IMMEDIATE
369-
// ON_CONDITION INVENTORY07(2)//check if they have 2 or more
370-
//
371-
// LOSE_BENEFIT INVENTORY07(16)//remove all
372-
// WAIT 2T
373-
// GIVE_BENEFIT INVENTORY07(1)//give just one
374-
// END_RADIUS_TRIGGER
375-
//
376-
// RADIUS_TRIGGER 0 0 -1 //Time Bomb of the ancients
377-
// TAGGED_INDEPENDENT
378-
// TAGGED_IMMEDIATE
379-
// ON_CONDITION INVENTORY08(2)//check if they have 2 or more
380-
//
381-
// LOSE_BENEFIT INVENTORY08(16)//remove all
382-
// WAIT 2T
383-
// GIVE_BENEFIT INVENTORY08(1)//give just one
384-
// END_RADIUS_TRIGGER
385-
//
386-
// RADIUS_TRIGGER 0 0 -1 //Chaos Device
387-
// TAGGED_INDEPENDENT
388-
// TAGGED_IMMEDIATE
389-
// ON_CONDITION INVENTORY09(2)//check if they have 2 or more
390-
//
391-
// LOSE_BENEFIT INVENTORY09(16)//remove all
392-
// WAIT 2T
393-
// GIVE_BENEFIT INVENTORY09(1)//give just one
394-
// END_RADIUS_TRIGGER
395-
//
396-
// RADIUS_TRIGGER 0 0 -1 //Morph Ovum
397-
// TAGGED_INDEPENDENT
398-
// TAGGED_IMMEDIATE
399-
// ON_CONDITION INVENTORY10(2)//check if they have 2 or more
400-
//
401-
// LOSE_BENEFIT INVENTORY10(16)//remove all
402-
// WAIT 2T
403-
// GIVE_BENEFIT INVENTORY10(1)//give just one
404-
// END_RADIUS_TRIGGER
405-
//
406-
// //***** Remove excess inventory at level start
407-
// //********************************************
354+
LOSE_BENEFIT INVENTORY07(16)//remove all
355+
WAIT 2T
356+
GIVE_BENEFIT INVENTORY07(1)//give just one
357+
END_RADIUS_TRIGGER
358+
359+
RADIUS_TRIGGER 0 0 -1 //Time Bomb of the ancients
360+
TAGGED_INDEPENDENT
361+
TAGGED_IMMEDIATE
362+
TAGGED_DISABLED
363+
TAG REMOVEBOMBS
364+
NAME REMOVEBOMBS
408365

366+
LOSE_BENEFIT INVENTORY08(16)//remove all
367+
WAIT 2T
368+
GIVE_BENEFIT INVENTORY08(1)//give just one
369+
END_RADIUS_TRIGGER
409370

371+
RADIUS_TRIGGER 0 0 -1 //Chaos Device
372+
TAGGED_INDEPENDENT
373+
TAGGED_IMMEDIATE
374+
TAGGED_DISABLED
375+
TAG REMOVECHAOS
376+
NAME REMOVECHAOS
377+
378+
LOSE_BENEFIT INVENTORY09(16)//remove all
379+
WAIT 2T
380+
GIVE_BENEFIT INVENTORY09(1)//give just one
381+
END_RADIUS_TRIGGER
410382

383+
RADIUS_TRIGGER 0 0 -1 //Morph Ovum
384+
TAGGED_INDEPENDENT
385+
TAGGED_IMMEDIATE
386+
TAGGED_DISABLED
387+
TAG REMOVEOVUMS
388+
NAME REMOVEOVUMS
389+
390+
LOSE_BENEFIT INVENTORY10(16)//remove all
391+
WAIT 2T
392+
GIVE_BENEFIT INVENTORY10(1)//give just one
393+
END_RADIUS_TRIGGER
394+
395+
//***** Remove excess inventory at level start
396+
//********************************************
397+
398+
//*******************
399+
// Inventory
400+
401+
RADIUS_TRIGGER 0 0 -1
402+
TAG INVENTORY01
403+
NAME INVENTORY01
404+
TAGGED_DISABLED
405+
TAGGED_REPEATABLE 0 4T
406+
407+
HEAL_PLAYER 25 100
408+
WAIT 2T
409+
410+
//TIP_SET_COLOUR TEXT_GREEN
411+
//TIP "Used Quartz Flask" 1 FALSE
412+
WAIT 1
413+
414+
DISABLE_TAGGED INVENTORY01
415+
END_RADIUS_TRIGGER
411416

412417
RADIUS_TRIGGER 0 0 -1
413418
TAG INVENTORY02

‎edge_base/blasphemer/scripts/things.ddf

+4-3
Original file line numberDiff line numberDiff line change
@@ -1480,7 +1480,7 @@ PAINCHANCE=90%;
14801480
CASTORDER=7;
14811481
BLOOD=BLOOD;
14821482
FLOAT_SPEED=5;
1483-
SPECIAL=COUNT_AS_KILL,SOLID,SPAWNCEILING,CLIMBABLE,SHOOTABLE,NOGRAVITY,FLOATER;
1483+
SPECIAL=COUNT_AS_KILL,SOLID,SPAWNCEILING,CLIMBABLE,SHOOTABLE,NOGRAVITY,FLOATER,NOGRAV_KILL;
14841484
MINATTACK_CHANCE=22%;
14851485
CASTORDER=7;
14861486
BLOOD=BLOOD;
@@ -1537,11 +1537,12 @@ STATES(DEATH)=IMPX:G:0:NORMAL:KILLSOUND,
15371537
IMPX:G:4:NORMAL:MAKEDEATHSOUND,
15381538
IMPX:H:3:NORMAL:SPARE_ATTACK,
15391539
IMPX:H:1:NORMAL:SPARE_ATTACK,
1540-
IMPX:H:0:NORMAL:JUMP(DEATH:6,50%),
1540+
IMPX:H:0:NORMAL:JUMP(DEATH:7,50%),
15411541
IMPX:H:1:NORMAL:SPARE_ATTACK,
1542+
IMPX:H:7:NORMAL:GRAVITY,
15421543
IMPX:I:7:NORMAL:NOTHING,
15431544
IMPX:J:7:NORMAL:MAKEDEAD,
1544-
IMPX:K:7:NORMAL:NOTHING,
1545+
IMPX:K:7:NORMAL:NOTHING,
15451546
IMPX:L:-1:NORMAL:NOTHING;
15461547

15471548
STATES(OVERKILL)=IMPX:S:5:NORMAL:NOTHING,

‎edge_base/heretic/scripts/attacks.ddf

+1-1
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ ANGLE_OFFSET=0;
679679
Y_OFFSET=8;
680680
X_OFFSET=0;
681681
ATTACK_SPECIAL=PRESTEP_SPAWN;
682-
PROJECTILE_SPECIAL=NOBLOCKMAP,MISSILE,DROPOFF,NOGRAVITY,NOSHADOW,TUNNEL;
682+
PROJECTILE_SPECIAL=NOBLOCKMAP,MISSILE,DROPOFF,NOGRAVITY,NOSHADOW,BORE;
683683
//TRANSLUCENCY=70%;
684684
DLIGHT.TYPE=MODULATE;
685685
DLIGHT.RADIUS=10;

0 commit comments

Comments
 (0)