mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-11 07:12:16 +00:00
1bd6ac028b
- Added a PickupMessage property to the internal actor parser, replaced most of the virtual PickupMessages with it and placed the code that reads the metadata into AInventory::PickupMessage. Now the PickupMessage method is truly virtual and I can do: Added a Health.LowMessage property to define double message items like Doom's medikit in DECORATE. - Since defining Mana3 as an ammo type and then overriding the TryPickup method means that this item defeats all ammo checks in the game it might as well be defined as a CustomInventory item. At least this fixes the amount given in easy and very hard skills. - Converted all ammo items to DECORATE. - Changed internal property setting of ammo types and sister weapons to use fuglyname as for DECORATE definitions. This allows to export the ammo definitions into DECORATE definitions without doing it for the weapons themselves. - Replaced obituary methods with actor properties. - Fixed: The secret map check didn't work for maps inside Zips. SVN r196 (trunk)
93 lines
1.7 KiB
Text
93 lines
1.7 KiB
Text
// Blue mana ----------------------------------------------------------------
|
|
|
|
ACTOR Mana1 : Ammo 122
|
|
{
|
|
Game Hexen
|
|
SpawnID 11
|
|
Inventory.Amount 15
|
|
Inventory.MaxAmount 200
|
|
Ammo.BackpackAmount 15
|
|
Ammo.BackpackMaxAmount 200
|
|
Radius 8
|
|
Height 8
|
|
+FLOATBOB
|
|
Inventory.Icon "MAN1I0"
|
|
Inventory.PickupMessage "$TXT_MANA_1"
|
|
States
|
|
{
|
|
Spawn:
|
|
MAN1 ABCDEFGHI 4 Bright
|
|
Loop
|
|
}
|
|
}
|
|
|
|
// Green mana ---------------------------------------------------------------
|
|
|
|
ACTOR Mana2 : Ammo 124
|
|
{
|
|
Game Hexen
|
|
SpawnID 12
|
|
Inventory.Amount 15
|
|
Inventory.MaxAmount 200
|
|
Ammo.BackpackAmount 15
|
|
Ammo.BackpackMaxAmount 200
|
|
Radius 8
|
|
Height 8
|
|
+FLOATBOB
|
|
Inventory.Icon "MAN2G0"
|
|
Inventory.PickupMessage "$TXT_MANA_2"
|
|
States
|
|
{
|
|
Spawn:
|
|
MAN2 ABCDEFGHIJKLMNOP 4 Bright
|
|
Loop
|
|
}
|
|
}
|
|
|
|
// Combined mana ------------------------------------------------------------
|
|
|
|
ACTOR Mana3 : CustomInventory 8004
|
|
{
|
|
Game Hexen
|
|
SpawnID 75
|
|
Radius 8
|
|
Height 8
|
|
+FLOATBOB
|
|
Inventory.PickupMessage "$TXT_MANA_BOTH"
|
|
States
|
|
{
|
|
Spawn:
|
|
MAN3 ABCDEFGHIJKLMNOP 4 Bright
|
|
Loop
|
|
Pickup:
|
|
TNT1 A 0 A_GiveInventory("Mana1", 20)
|
|
TNT1 A 0 A_GiveInventory("Mana2", 20)
|
|
Stop
|
|
}
|
|
}
|
|
|
|
// Boost Mana Artifact Krater of Might ------------------------------------
|
|
|
|
ACTOR ArtiBoostMana : CustomInventory 8003
|
|
{
|
|
Game Hexen
|
|
SpawnID 26
|
|
+FLOATBOB
|
|
+INVENTORY.INVBAR
|
|
+INVENTORY.PICKUPFLASH
|
|
+INVENTORY.FANCYPICKUPSOUND
|
|
Inventory.DefMaxAmount
|
|
Inventory.Icon "ARTIBMAN"
|
|
Inventory.PickupSound "misc/p_pkup"
|
|
Inventory.PickupMessage "$TXT_ARTIBOOSTMANA"
|
|
States
|
|
{
|
|
Spawn:
|
|
BMAN A -1
|
|
Stop
|
|
Use:
|
|
TNT1 A 0 A_GiveInventory("Mana1", 200)
|
|
TNT1 A 0 A_GiveInventory("Mana2", 200)
|
|
Stop
|
|
}
|
|
}
|