@@ -52,7 +52,7 @@
|
|
52 |
//Torch, Wings, and the Urn got replaced in Heretic, so it affects it here, too.
|
53 |
Actor AmuletOfWardingSpawner : RandomSpawner replaces AmuletOfWarding { DropItem "SecurityVest" }
|
54 |
Actor PlatinumHelmSpawner : RandomSpawner replaces PlatinumHelm { DropItem "SecurityVest" }
|
55 |
-
Actor MeshArmorSpawner :
|
56 |
Actor FalconShieldSpawner : RandomSpawner replaces FalconShield { DropItem "BodyArmor" }
|
57 |
|
58 |
Actor ArtiBoostArmorSpawner : RandomSpawner replaces ArtiBoostArmor { DropItem "BodyArmor" }
|
@@ -175,16 +175,9 @@
|
|
175 |
DropItem "Fleshrend2_Dual"
|
176 |
}
|
177 |
|
178 |
-
ACTOR Fleshrend2_Dual :
|
179 |
{
|
180 |
-
Inventory.PickupMessage "Obtained a pair of really damn stylish ''Fleshrend'' sawed-offs! Peeling off the skins - multiple enemies at a time! (3)"
|
181 |
DropItem "Fleshrend2"
|
182 |
-
States
|
183 |
-
{
|
184 |
-
Spawn:
|
185 |
-
RND2 X -1
|
186 |
-
Stop
|
187 |
-
}
|
188 |
}
|
189 |
|
190 |
ACTOR Fleshrend2Pickup : CustomInventory
|
@@ -254,16 +247,9 @@
|
|
254 |
DropItem "Leadspitter2_Dual"
|
255 |
}
|
256 |
|
257 |
-
ACTOR Leadspitter2_Dual :
|
258 |
{
|
259 |
-
Inventory.PickupMessage "Grabbed a pair of SC-P30 ''Leadspitter'' uzis! Let there be firefight, till they all fall to the ground! (4)"
|
260 |
DropItem "Leadspitter2"
|
261 |
-
States
|
262 |
-
{
|
263 |
-
Spawn:
|
264 |
-
UZI2 X -1
|
265 |
-
Stop
|
266 |
-
}
|
267 |
}
|
268 |
|
269 |
ACTOR Leadspitter2Pickup : CustomInventory
|
52 |
//Torch, Wings, and the Urn got replaced in Heretic, so it affects it here, too.
|
53 |
Actor AmuletOfWardingSpawner : RandomSpawner replaces AmuletOfWarding { DropItem "SecurityVest" }
|
54 |
Actor PlatinumHelmSpawner : RandomSpawner replaces PlatinumHelm { DropItem "SecurityVest" }
|
55 |
+
Actor MeshArmorSpawner : RandomSpawner replaces MeshArmor { DropItem "BodyArmor" } // Fixed inheritance - Talon1024
|
56 |
Actor FalconShieldSpawner : RandomSpawner replaces FalconShield { DropItem "BodyArmor" }
|
57 |
|
58 |
Actor ArtiBoostArmorSpawner : RandomSpawner replaces ArtiBoostArmor { DropItem "BodyArmor" }
|
175 |
DropItem "Fleshrend2_Dual"
|
176 |
}
|
177 |
|
178 |
+
ACTOR Fleshrend2_Dual : Fleshrend_Dual
|
179 |
{
|
|
|
180 |
DropItem "Fleshrend2"
|
|
|
|
|
|
|
|
|
|
|
|
|
181 |
}
|
182 |
|
183 |
ACTOR Fleshrend2Pickup : CustomInventory
|
247 |
DropItem "Leadspitter2_Dual"
|
248 |
}
|
249 |
|
250 |
+
ACTOR Leadspitter2_Dual : Leadspitter_Dual
|
251 |
{
|
|
|
252 |
DropItem "Leadspitter2"
|
|
|
|
|
|
|
|
|
|
|
|
|
253 |
}
|
254 |
|
255 |
ACTOR Leadspitter2Pickup : CustomInventory
|
@@ -20,8 +20,8 @@
|
|
20 |
//TNT1 A 0 A_JumpIfInventory("PowerFlareActive",1,"Nope")
|
21 |
TNT1 A 0 {
|
22 |
//Stuff.
|
23 |
-
A_PlaySound("Flare/Use",3);
|
24 |
-
If(CountInv("PowerFlareActive") <= 0)
|
25 |
{
|
26 |
A_SpawnItemEx("Flarestick",0,0,0,0,0,0,0,SXF_SETTARGET);
|
27 |
}
|
@@ -65,9 +65,13 @@
|
|
65 |
{
|
66 |
Spawn:
|
67 |
TNT1 A 1 NoDelay {
|
|
|
|
|
|
|
|
|
|
|
68 |
A_SetBlend("Orange",0.1,10);
|
69 |
-
|
70 |
-
A_Warp(AAPTR_TARGET,0,0,0,0,WARPF_NOCHECKPOSITION|WARPF_INTERPOLATE,0,0,0);
|
71 |
}
|
72 |
TNT1 A 0 A_JumpIf(CountInv("PowerFlareActive",AAPTR_TARGET), "Spawn")
|
73 |
End:
|
20 |
//TNT1 A 0 A_JumpIfInventory("PowerFlareActive",1,"Nope")
|
21 |
TNT1 A 0 {
|
22 |
//Stuff.
|
23 |
+
A_PlaySound("Flare/Use",3);
|
24 |
+
If(CountInv("PowerFlareActive") <= 0 || GetCvar("Talon_FlareFix") == 1)
|
25 |
{
|
26 |
A_SpawnItemEx("Flarestick",0,0,0,0,0,0,0,SXF_SETTARGET);
|
27 |
}
|
65 |
{
|
66 |
Spawn:
|
67 |
TNT1 A 1 NoDelay {
|
68 |
+
A_PlaySound("Flare/Loop",5,0.2,1);
|
69 |
+
}
|
70 |
+
TNT1 A 0 A_JumpIf(GetCVar("Talon_FlareFix") == 1, 2)
|
71 |
+
TNT1 A 0
|
72 |
+
{
|
73 |
A_SetBlend("Orange",0.1,10);
|
74 |
+
A_Warp(AAPTR_TARGET,0,0,0,0,WARPF_NOCHECKPOSITION|WARPF_INTERPOLATE|WARPF_COPYVELOCITY,0,0,0);
|
|
|
75 |
}
|
76 |
TNT1 A 0 A_JumpIf(CountInv("PowerFlareActive",AAPTR_TARGET), "Spawn")
|
77 |
End:
|
@@ -456,8 +456,9 @@
|
|
456 |
DropItem "Fleshrend_Dual"
|
457 |
}
|
458 |
|
459 |
-
ACTOR Fleshrend_Dual :
|
460 |
-
{
|
|
|
461 |
Inventory.PickupMessage "Obtained a pair of really damn stylish ''Fleshrend'' sawed-offs! Peeling off the skins - multiple enemies at a time! (3)"
|
462 |
DropItem "Fleshrend"
|
463 |
States
|
@@ -559,8 +560,9 @@
|
|
559 |
DropItem "Leadspitter_Dual"
|
560 |
}
|
561 |
|
562 |
-
ACTOR Leadspitter_Dual :
|
563 |
-
{
|
|
|
564 |
Inventory.PickupMessage "Grabbed a pair of SC-P30 ''Leadspitter'' uzis! Let there be firefight, till they all fall to the ground! (4)"
|
565 |
DropItem "Leadspitter"
|
566 |
States
|
456 |
DropItem "Fleshrend_Dual"
|
457 |
}
|
458 |
|
459 |
+
ACTOR Fleshrend_Dual : TBMPWeaponGiver
|
460 |
+
{
|
461 |
+
TBMPWeaponGiver.PickupCounter "FleshrendPickupCounter"
|
462 |
Inventory.PickupMessage "Obtained a pair of really damn stylish ''Fleshrend'' sawed-offs! Peeling off the skins - multiple enemies at a time! (3)"
|
463 |
DropItem "Fleshrend"
|
464 |
States
|
560 |
DropItem "Leadspitter_Dual"
|
561 |
}
|
562 |
|
563 |
+
ACTOR Leadspitter_Dual : TBMPWeaponGiver
|
564 |
+
{
|
565 |
+
TBMPWeaponGiver.PickupCounter "LeadspitPickupCounter"
|
566 |
Inventory.PickupMessage "Grabbed a pair of SC-P30 ''Leadspitter'' uzis! Let there be firefight, till they all fall to the ground! (4)"
|
567 |
DropItem "Leadspitter"
|
568 |
States
|
@@ -390,8 +390,8 @@
|
|
390 |
FHGG A 0 A_Jump(256,3)
|
391 |
2MGG A 0 A_Jump(256,2)
|
392 |
FMGG A 0
|
393 |
-
|
394 |
-
Goto Deselect+
|
395 |
|
396 |
Select:
|
397 |
TNT1 A 0 A_GiveInventory("FMGSelected")
|
@@ -536,7 +536,7 @@
|
|
536 |
"####" A 0 {
|
537 |
if(CountInv("HeavyMachinegun"))
|
538 |
{
|
539 |
-
A_FireBullets(0.375, 0.125, 1, 8, "BulletPuff",FBF_USEAMMO,8192,"FMGBullet
|
540 |
}
|
541 |
else
|
542 |
{
|
@@ -550,7 +550,7 @@
|
|
550 |
"####" A 0 {
|
551 |
if(CountInv("HeavyMachinegun"))
|
552 |
{
|
553 |
-
A_FireBullets(0.375, 0.125, 1, 8, "BulletPuff",FBF_USEAMMO,8192,"FMGBullet
|
554 |
}
|
555 |
else
|
556 |
{
|
@@ -708,7 +708,8 @@
|
|
708 |
2MIG A 0 A_ReFire
|
709 |
Goto ReadyMain
|
710 |
|
711 |
-
ZoomedReload:
|
|
|
712 |
2MIU A 0 A_JumpIfInventory("FMGUpgrade",1,2)
|
713 |
FMIU A 0
|
714 |
|
@@ -718,7 +719,8 @@
|
|
718 |
"####" ED 1
|
719 |
"####" C 1 A_JumpIf(Health <= 50 || CountInv("PowerBlazing") > 0,2)
|
720 |
"####" BA 1
|
721 |
-
|
|
|
722 |
2MGG A 0 A_JumpIfInventory("FMGUpgrade",1,2)
|
723 |
FMGG A 0
|
724 |
"####" A 1 A_JumpIf(Health <= 25 || CountInv("PowerBlazing") > 0,2)
|
390 |
FHGG A 0 A_Jump(256,3)
|
391 |
2MGG A 0 A_Jump(256,2)
|
392 |
FMGG A 0
|
393 |
+
TNT1 A 4 A_TakeInventory("FMGZoomed",1)
|
394 |
+
Goto Deselect+12
|
395 |
|
396 |
Select:
|
397 |
TNT1 A 0 A_GiveInventory("FMGSelected")
|
536 |
"####" A 0 {
|
537 |
if(CountInv("HeavyMachinegun"))
|
538 |
{
|
539 |
+
A_FireBullets(0.375, 0.125, 1, 8, "BulletPuff",FBF_USEAMMO,8192,"FMGBullet",-5);
|
540 |
}
|
541 |
else
|
542 |
{
|
550 |
"####" A 0 {
|
551 |
if(CountInv("HeavyMachinegun"))
|
552 |
{
|
553 |
+
A_FireBullets(0.375, 0.125, 1, 8, "BulletPuff",FBF_USEAMMO,8192,"FMGBullet",-5);
|
554 |
}
|
555 |
else
|
556 |
{
|
708 |
2MIG A 0 A_ReFire
|
709 |
Goto ReadyMain
|
710 |
|
711 |
+
ZoomedReload:
|
712 |
+
2HIU A 0 A_JumpIfInventory("HeavyMachinegun",1,3)
|
713 |
2MIU A 0 A_JumpIfInventory("FMGUpgrade",1,2)
|
714 |
FMIU A 0
|
715 |
|
719 |
"####" ED 1
|
720 |
"####" C 1 A_JumpIf(Health <= 50 || CountInv("PowerBlazing") > 0,2)
|
721 |
"####" BA 1
|
722 |
+
|
723 |
+
2HGG A 0 A_JumpIfInventory("HeavyMachinegun",1,3)
|
724 |
2MGG A 0 A_JumpIfInventory("FMGUpgrade",1,2)
|
725 |
FMGG A 0
|
726 |
"####" A 1 A_JumpIf(Health <= 25 || CountInv("PowerBlazing") > 0,2)
|
@@ -239,7 +239,17 @@
|
|
239 |
BRWG A 0 A_JumpIf(GetPlayerInput(INPUT_BUTTONS) & (BT_ZOOM), "Punch")
|
240 |
Loop
|
241 |
BrowningFire:
|
242 |
-
BRWG A 0
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
243 |
BRWG A 0 A_TakeInventory("SlowRideMinigun",1)
|
244 |
Goto BrowningIdle
|
245 |
BRWF A 0 A_GiveInventory("SlowRideMinigun",1)
|
239 |
BRWG A 0 A_JumpIf(GetPlayerInput(INPUT_BUTTONS) & (BT_ZOOM), "Punch")
|
240 |
Loop
|
241 |
BrowningFire:
|
242 |
+
BRWG A 0 { // Hexen fix - Talon1024
|
243 |
+
if (CountInv("HexenCounter") == 0 &&
|
244 |
+
A_JumpIfInventory("ThrottleAmmo",3,2)) {
|
245 |
+
return state(2); // Jumps ahead 2 states
|
246 |
+
} else if (A_JumpIfInventory("HexenCounter", 1, 1) &&
|
247 |
+
A_JumpIfInventory("BlueMana", 3, 2) &&
|
248 |
+
A_JumpIfInventory("GreenMana", 3, 2)) {
|
249 |
+
return state(2);
|
250 |
+
}
|
251 |
+
return state(0);
|
252 |
+
}
|
253 |
BRWG A 0 A_TakeInventory("SlowRideMinigun",1)
|
254 |
Goto BrowningIdle
|
255 |
BRWF A 0 A_GiveInventory("SlowRideMinigun",1)
|
@@ -132,10 +132,10 @@
|
|
132 |
drawnumber 3, SMALLFONT, Untranslated, ColtsUpgradeCounter, -104, -14;
|
133 |
drawimage "tbslash", -103, -14;
|
134 |
drawnumber 3, SMALLFONT, Untranslated, AmmoCapacity ColtsUpgradeCounter, Alignment(Left), -92, -14;
|
|
|
|
|
|
|
135 |
}
|
136 |
-
|
137 |
-
drawnumber 4, BIGFONT, Untranslated, ammo1, -126, -21;
|
138 |
-
drawnumber 4, BIGFONT, Untranslated, ammo2, -126, -39;
|
139 |
}
|
140 |
|
141 |
//Sidekick
|
@@ -399,10 +399,8 @@
|
|
399 |
drawnumber 3, SMALLFONT, Untranslated, AmmoCapacity ThrottleUpgradeCounter, Alignment(Left), -92, -14;
|
400 |
}
|
401 |
|
402 |
-
|
403 |
-
|
404 |
-
drawnumber 4, BIGFONT, Untranslated, ammo1, -126, -21;
|
405 |
-
}
|
406 |
InInventory HexenCounter
|
407 |
{
|
408 |
drawnumber 4, BIGFONT, Untranslated, ammo2, -126, -39;
|
@@ -434,10 +432,8 @@
|
|
434 |
drawnumber 3, SMALLFONT, Untranslated, AmmoCapacity NutterUpgradeCounter, Alignment(Left), -92, -14;
|
435 |
}
|
436 |
|
437 |
-
|
438 |
-
|
439 |
-
drawnumber 4, BIGFONT, Untranslated, ammo1, -126, -21;
|
440 |
-
}
|
441 |
InInventory HexenCounter
|
442 |
{
|
443 |
drawnumber 4, BIGFONT, Untranslated, ammo2, -126, -39;
|
@@ -445,7 +441,18 @@
|
|
445 |
}
|
446 |
|
447 |
InInventory HexenCounter
|
448 |
-
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
449 |
weaponammo BlueMana
|
450 |
{
|
451 |
DrawNumber 4, SMALLFONT, Untranslated, Ammo("BlueMana"), Alignment(right), -35, -20;
|
132 |
drawnumber 3, SMALLFONT, Untranslated, ColtsUpgradeCounter, -104, -14;
|
133 |
drawimage "tbslash", -103, -14;
|
134 |
drawnumber 3, SMALLFONT, Untranslated, AmmoCapacity ColtsUpgradeCounter, Alignment(Left), -92, -14;
|
135 |
+
|
136 |
+
drawnumber 4, BIGFONT, Untranslated, ammo1, -126, -21;
|
137 |
+
drawnumber 4, BIGFONT, Untranslated, ammo2, -126, -39;
|
138 |
}
|
|
|
|
|
|
|
139 |
}
|
140 |
|
141 |
//Sidekick
|
399 |
drawnumber 3, SMALLFONT, Untranslated, AmmoCapacity ThrottleUpgradeCounter, Alignment(Left), -92, -14;
|
400 |
}
|
401 |
|
402 |
+
drawnumber 4, BIGFONT, Untranslated, ammo1, -126, -21;
|
403 |
+
|
|
|
|
|
404 |
InInventory HexenCounter
|
405 |
{
|
406 |
drawnumber 4, BIGFONT, Untranslated, ammo2, -126, -39;
|
432 |
drawnumber 3, SMALLFONT, Untranslated, AmmoCapacity NutterUpgradeCounter, Alignment(Left), -92, -14;
|
433 |
}
|
434 |
|
435 |
+
drawnumber 4, BIGFONT, Untranslated, ammo1, -126, -21;
|
436 |
+
|
|
|
|
|
437 |
InInventory HexenCounter
|
438 |
{
|
439 |
drawnumber 4, BIGFONT, Untranslated, ammo2, -126, -39;
|
441 |
}
|
442 |
|
443 |
InInventory HexenCounter
|
444 |
+
{
|
445 |
+
// Spikebomb ammo - Talon1024
|
446 |
+
weaponammo SpikebombAmmo
|
447 |
+
{
|
448 |
+
DrawNumber 4, SMALLFONT, Untranslated, Ammo("SpikebombAmmo"), Alignment(right), -35, -60;
|
449 |
+
}
|
450 |
+
else
|
451 |
+
{
|
452 |
+
DrawNumber 4, SMALLFONT, Black, Ammo("SpikebombAmmo"), Alignment(right), -35, -60;
|
453 |
+
}
|
454 |
+
drawbar "PIPEAMMO", "PIPEAMM2", SpikebombAmmo, vertical, interpolate(4), -22, -55;
|
455 |
+
|
456 |
weaponammo BlueMana
|
457 |
{
|
458 |
DrawNumber 4, SMALLFONT, Untranslated, Ammo("BlueMana"), Alignment(right), -35, -20;
|
@@ -186,10 +186,11 @@
|
|
186 |
drawnumber 3, SMALLFONT, Untranslated, ColtsUpgradeCounter, -104, -14;
|
187 |
drawimage "tbslash", -103, -14;
|
188 |
drawnumber 3, SMALLFONT, Untranslated, AmmoCapacity ColtsUpgradeCounter, Alignment(Left), -92, -14;
|
|
|
|
|
|
|
|
|
189 |
}
|
190 |
-
|
191 |
-
drawnumber 4, BIGFONT, Untranslated, ammo1, -126, -21;
|
192 |
-
drawnumber 4, BIGFONT, Untranslated, ammo2, -126, -39;
|
193 |
}
|
194 |
|
195 |
//Sidekick
|
@@ -453,10 +454,8 @@
|
|
453 |
drawnumber 3, SMALLFONT, Untranslated, AmmoCapacity ThrottleUpgradeCounter, Alignment(Left), -92, -14;
|
454 |
}
|
455 |
|
456 |
-
|
457 |
-
|
458 |
-
drawnumber 4, BIGFONT, Untranslated, ammo1, -126, -21;
|
459 |
-
}
|
460 |
InInventory HexenCounter
|
461 |
{
|
462 |
drawnumber 4, BIGFONT, Untranslated, ammo2, -126, -39;
|
@@ -488,10 +487,8 @@
|
|
488 |
drawnumber 3, SMALLFONT, Untranslated, AmmoCapacity NutterUpgradeCounter, Alignment(Left), -92, -14;
|
489 |
}
|
490 |
|
491 |
-
|
492 |
-
|
493 |
-
drawnumber 4, BIGFONT, Untranslated, ammo1, -126, -21;
|
494 |
-
}
|
495 |
InInventory HexenCounter
|
496 |
{
|
497 |
drawnumber 4, BIGFONT, Untranslated, ammo2, -126, -39;
|
@@ -499,7 +496,18 @@
|
|
499 |
}
|
500 |
|
501 |
InInventory HexenCounter
|
502 |
-
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
503 |
weaponammo BlueMana
|
504 |
{
|
505 |
DrawNumber 4, SMALLFONT, Untranslated, Ammo("BlueMana"), Alignment(right), -35, -20;
|
@@ -628,8 +636,15 @@
|
|
628 |
}
|
629 |
|
630 |
statusbar inventory, forcescaled
|
631 |
-
{
|
632 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
633 |
}
|
634 |
|
635 |
createpopup keys, 200, 200, slideinbottom, 20;
|
186 |
drawnumber 3, SMALLFONT, Untranslated, ColtsUpgradeCounter, -104, -14;
|
187 |
drawimage "tbslash", -103, -14;
|
188 |
drawnumber 3, SMALLFONT, Untranslated, AmmoCapacity ColtsUpgradeCounter, Alignment(Left), -92, -14;
|
189 |
+
|
190 |
+
|
191 |
+
drawnumber 4, BIGFONT, Untranslated, ammo1, -126, -21;
|
192 |
+
drawnumber 4, BIGFONT, Untranslated, ammo2, -126, -39;
|
193 |
}
|
|
|
|
|
|
|
194 |
}
|
195 |
|
196 |
//Sidekick
|
454 |
drawnumber 3, SMALLFONT, Untranslated, AmmoCapacity ThrottleUpgradeCounter, Alignment(Left), -92, -14;
|
455 |
}
|
456 |
|
457 |
+
drawnumber 4, BIGFONT, Untranslated, ammo1, -126, -21;
|
458 |
+
|
|
|
|
|
459 |
InInventory HexenCounter
|
460 |
{
|
461 |
drawnumber 4, BIGFONT, Untranslated, ammo2, -126, -39;
|
487 |
drawnumber 3, SMALLFONT, Untranslated, AmmoCapacity NutterUpgradeCounter, Alignment(Left), -92, -14;
|
488 |
}
|
489 |
|
490 |
+
drawnumber 4, BIGFONT, Untranslated, ammo1, -126, -21;
|
491 |
+
|
|
|
|
|
492 |
InInventory HexenCounter
|
493 |
{
|
494 |
drawnumber 4, BIGFONT, Untranslated, ammo2, -126, -39;
|
496 |
}
|
497 |
|
498 |
InInventory HexenCounter
|
499 |
+
{
|
500 |
+
// Spikebomb ammo - Talon1024
|
501 |
+
weaponammo SpikebombAmmo
|
502 |
+
{
|
503 |
+
DrawNumber 4, SMALLFONT, Untranslated, Ammo("SpikebombAmmo"), Alignment(right), -35, -60;
|
504 |
+
}
|
505 |
+
else
|
506 |
+
{
|
507 |
+
DrawNumber 4, SMALLFONT, Black, Ammo("SpikebombAmmo"), Alignment(right), -35, -60;
|
508 |
+
}
|
509 |
+
drawbar "PIPEAMMO", "PIPEAMM2", SpikebombAmmo, vertical, interpolate(4), -22, -55;
|
510 |
+
|
511 |
weaponammo BlueMana
|
512 |
{
|
513 |
DrawNumber 4, SMALLFONT, Untranslated, Ammo("BlueMana"), Alignment(right), -35, -20;
|
636 |
}
|
637 |
|
638 |
statusbar inventory, forcescaled
|
639 |
+
{
|
640 |
+
InInventory not HereticCounter, 1
|
641 |
+
{
|
642 |
+
drawinventorybar Doom, translucent, 4, INDEXFONT, 100, 165;
|
643 |
+
}
|
644 |
+
else
|
645 |
+
{
|
646 |
+
drawinventorybar Heretic, translucent, 4, INDEXFONT, 100, 165;
|
647 |
+
}
|
648 |
}
|
649 |
|
650 |
createpopup keys, 200, 200, slideinbottom, 20;
|
@@ -357,18 +357,26 @@
|
|
357 |
}
|
358 |
}
|
359 |
}
|
360 |
-
|
361 |
-
// Zhs2: Override for causing players to deal full damage to other players imported from Talon1024's fixpack. I can't see much wrong with it.
|
362 |
override int DamageMobj(Actor inflictor, Actor source, int damage, Name mod, int flags, double angle)
|
363 |
-
{
|
364 |
-
|
365 |
-
|
366 |
-
|
|
|
|
|
367 |
}
|
368 |
else
|
369 |
{
|
370 |
-
|
371 |
-
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
372 |
}
|
373 |
|
374 |
States
|
357 |
}
|
358 |
}
|
359 |
}
|
360 |
+
|
|
|
361 |
override int DamageMobj(Actor inflictor, Actor source, int damage, Name mod, int flags, double angle)
|
362 |
+
{
|
363 |
+
CVar fullSelfDamage = CVar.GetCVar("Talon_MasochistMode", Player);
|
364 |
+
bool selfDamage;
|
365 |
+
|
366 |
+
if (fullSelfDamage.GetInt()) {
|
367 |
+
selfDamage = source != self && (mod == "Patriarch" || mod == "MasteringExplosions");
|
368 |
}
|
369 |
else
|
370 |
{
|
371 |
+
selfDamage = deathmatch && (source != self) && (source is "PlayerPawn");
|
372 |
+
}
|
373 |
+
|
374 |
+
if (selfDamage)
|
375 |
+
{
|
376 |
+
//return Super.DamageMobj(inflictor, source, damage, "Normal", flags, angle);
|
377 |
+
return Super.DamageMobj(inflictor, source, damage, mod, flags | DMG_NO_FACTOR, angle);
|
378 |
+
}
|
379 |
+
return Super.DamageMobj(inflictor, source, damage, mod, flags, angle);
|
380 |
}
|
381 |
|
382 |
States
|