From 8f546fa327575160169aa4a1a4c575b7ffaf50b9 Mon Sep 17 00:00:00 2001 From: The Kins Date: Wed, 24 Apr 2019 18:13:22 +1000 Subject: [PATCH] Artifact ported --- metadoom-dev/actors/inventory/theartifact.zsc | 71 +++++++++++++++++++ .../actors/{inventory => old}/theartifact.dec | 0 metadoom-dev/decorate.dec | 2 +- 3 files changed, 72 insertions(+), 1 deletion(-) rename metadoom-dev/actors/{inventory => old}/theartifact.dec (100%) diff --git a/metadoom-dev/actors/inventory/theartifact.zsc b/metadoom-dev/actors/inventory/theartifact.zsc index 676a5934..471c8030 100644 --- a/metadoom-dev/actors/inventory/theartifact.zsc +++ b/metadoom-dev/actors/inventory/theartifact.zsc @@ -1,3 +1,74 @@ +// The Artifact!!! +class ArtifactSoundToken : _Boolean {} + +class ArtifactPickup : CustomInventory +{ + Default + { + inventory.pickupmessage "$GOTARTIFACT"; + Tag "$TAGARTIFACT"; + inventory.icon "INVARTI"; + inventory.pickupsound "inventory/artifact/get"; + +INVENTORY.ALWAYSPICKUP + +FLOATBOB + scale 0.75; + +BLOCKASPLAYER + } + + states + { + Spawn: + ARTI ZYXY 10 bright; + loop; + Pickup: + TNT1 A 0 A_GiveInventory ("Artifact", 1); + TNT1 A 0 A_GiveInventory ("GrenadeAmmo", 3); + stop; + } +} + +class Artifact : CustomInventory +{ + Default + { + inventory.pickupmessage "$GOTARTIFACT"; + Tag "$TAGARTIFACT"; + inventory.icon "INVARTI"; + inventory.pickupsound "inventory/artifact/get"; + inventory.amount 1; + inventory.maxamount 1; + +INVENTORY.INVBAR + scale 0.75; + +FLOATBOB + } + + states + { + Spawn: + ARTI ZYXY 10; + loop; + Use: + TNT1 A 0 A_JumpIfInventory("InventoryCooldownToken", 1, "FailureCooldown"); + TNT1 A 0 A_JumpIfInventory("ArtifactTimer", 1, "FailureCooldown"); + TNT1 A 0 ACS_NamedExecuteWithResult("InventoryCooldown"); + TNT1 A 0 A_JumpIfInventory("GrenadeAmmo", 1, "Fire"); + goto Failure; + Fire: + TNT1 A 0 A_PlaySound("inventory/artifact/on"); + TNT1 A 0 A_GiveInventory("ArtifactTimer", 175); + TNT1 A 0 A_TakeInventory("GrenadeAmmo", 1); + fail; + Failure: + TNT1 A 0 A_PlaySound("menu/invalid"); + TNT1 A 0 A_Log("You don't have any grenades!", 1); + fail; + FailureCooldown: + TNT1 A 0; + TNT1 A 0; + fail; + } +} + class ArtifactEffect : PowerupGiver { Default diff --git a/metadoom-dev/actors/inventory/theartifact.dec b/metadoom-dev/actors/old/theartifact.dec similarity index 100% rename from metadoom-dev/actors/inventory/theartifact.dec rename to metadoom-dev/actors/old/theartifact.dec diff --git a/metadoom-dev/decorate.dec b/metadoom-dev/decorate.dec index dd98ec47..dcb11d1e 100644 --- a/metadoom-dev/decorate.dec +++ b/metadoom-dev/decorate.dec @@ -60,7 +60,7 @@ Index #include "actors/inventory/siphongrenade.dec" #include "actors/inventory/hologram.dec" //#include "actors/inventory/kineticmine.dec" -#include "actors/inventory/theartifact.dec" +//#include "actors/inventory/theartifact.dec" #include "actors/inventory/dogcollar.dec" #include "actors/weapons/doggun.dec"