mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-12-11 21:21:45 +00:00
a96d6ab072
# Conflicts: # src/g_level.cpp # src/p_3dfloors.cpp # src/p_lnspec.cpp # src/p_saveg.cpp # src/p_spec.cpp # src/r_bsp.cpp # src/r_data/r_interpolate.cpp # src/r_data/r_translate.cpp # src/r_data/sprites.cpp # src/r_defs.h # src/r_sky.h # src/stats.h # src/textures/texturemanager.cpp # src/textures/textures.h # src/version.h # src/win32/fb_d3d9.cpp # src/win32/hardware.cpp # src/win32/i_system.cpp # wadsrc/static/actors/doom/doomarmor.txt # wadsrc/static/compatibility.txt # wadsrc/static/language.enu # wadsrc/static/mapinfo/common.txt # wadsrc/static/menudef.txt # wadsrc/static/xlat/eternity.txt
60 lines
974 B
Text
60 lines
974 B
Text
|
|
// Armor bonus --------------------------------------------------------------
|
|
|
|
Actor ArmorBonus : BasicArmorBonus
|
|
{
|
|
Radius 20
|
|
Height 16
|
|
Inventory.Pickupmessage "$GOTARMBONUS"
|
|
Inventory.Icon "BON2A0"
|
|
Armor.Savepercent 33.335
|
|
Armor.Saveamount 1
|
|
Armor.Maxsaveamount 200
|
|
+COUNTITEM
|
|
+INVENTORY.ALWAYSPICKUP
|
|
States
|
|
{
|
|
Spawn:
|
|
BON2 ABCDCB 6
|
|
loop
|
|
}
|
|
}
|
|
|
|
// Green armor --------------------------------------------------------------
|
|
|
|
Actor GreenArmor : BasicArmorPickup
|
|
{
|
|
Radius 20
|
|
Height 16
|
|
Inventory.Pickupmessage "$GOTARMOR"
|
|
Inventory.Icon "ARM1A0"
|
|
Armor.SavePercent 33.335
|
|
Armor.SaveAmount 100
|
|
States
|
|
{
|
|
Spawn:
|
|
ARM1 A 6
|
|
ARM1 B 7 bright
|
|
loop
|
|
}
|
|
}
|
|
|
|
// Blue armor ---------------------------------------------------------------
|
|
|
|
Actor BlueArmor : BasicArmorPickup
|
|
{
|
|
Radius 20
|
|
Height 16
|
|
Inventory.Pickupmessage "$GOTMEGA"
|
|
Inventory.Icon "ARM2A0"
|
|
Armor.Savepercent 50
|
|
Armor.Saveamount 200
|
|
States
|
|
{
|
|
Spawn:
|
|
ARM2 A 6
|
|
ARM2 B 6 bright
|
|
loop
|
|
}
|
|
}
|
|
|