mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-30 15:52:09 +00:00
42ac64d964
- Fixed: Gravity application was not correct. For actors with no vertical momentum the initial pull is supposed to be twice as strong as when vertical movement already takes place. - added invquery CCMD like in Strife. Also removed all underscores from the tag strings so that they can be printed properly. - Fixed: Skill baby was missing 'autousehealth' for all games. - Added a new CVAR: sv_disableautohealth - Autouse of health items is no longer hardwired to the default item classes. There's a new property HealthPickup.Autouse. 0 means no autouse, 1 a small Raven health item, 2 a large Raven health item and 3 a Strife item. SVN r1452 (trunk)
100 lines
1.6 KiB
Text
100 lines
1.6 KiB
Text
// Base class for the merchants ---------------------------------------------
|
|
|
|
ACTOR Merchant
|
|
{
|
|
Health 10000000
|
|
PainChance 256 // a merchant should always enter the pain state when getting hurt
|
|
Radius 20
|
|
Height 56
|
|
Mass 5000
|
|
+SOLID
|
|
+SHOOTABLE
|
|
+NOTDMATCH
|
|
+NOSPLASHALERT
|
|
+NODAMAGE
|
|
States
|
|
{
|
|
Spawn:
|
|
MRST A 10 A_Look2
|
|
Loop
|
|
MRLK A 30 A_ActiveSound
|
|
Loop
|
|
MRLK B 30
|
|
Loop
|
|
MRBD ABCDEDCB 4
|
|
MRBD A 5
|
|
MRBD F 6
|
|
Loop
|
|
See:
|
|
Pain:
|
|
MRPN A 1
|
|
MRPN A 2 A_AlertMonsters
|
|
MRPN B 3 A_Pain
|
|
MRPN C 3
|
|
MRPN D 9 Door_CloseWaitOpen(999, 64, 960)
|
|
MRPN C 4
|
|
MRPN B 3
|
|
MRPN A 3 A_ClearSoundTarget
|
|
Goto Spawn
|
|
Yes:
|
|
MRYS A 20
|
|
// Fall through
|
|
Greetings:
|
|
MRGT ABCDEFGHI 5
|
|
Goto Spawn
|
|
No:
|
|
MRNO AB 6
|
|
MRNO C 10
|
|
MRNO BA 6
|
|
Goto Greetings
|
|
}
|
|
}
|
|
|
|
|
|
// Weapon Smith -------------------------------------------------------------
|
|
|
|
ACTOR WeaponSmith : Merchant 116
|
|
{
|
|
Game Strife
|
|
ConversationID 2
|
|
PainSound "smith/pain"
|
|
Tag "Weapon Smith"
|
|
}
|
|
|
|
|
|
// Bar Keep -----------------------------------------------------------------
|
|
|
|
ACTOR BarKeep : Merchant 72
|
|
{
|
|
Game Strife
|
|
Translation 4
|
|
ConversationID 3
|
|
PainSound "barkeep/pain"
|
|
ActiveSound "barkeep/active"
|
|
Tag "Bar Keep"
|
|
}
|
|
|
|
|
|
// Armorer ------------------------------------------------------------------
|
|
|
|
ACTOR Armorer : Merchant 73
|
|
{
|
|
Game Strife
|
|
Translation 5
|
|
ConversationID 4
|
|
PainSound "armorer/pain"
|
|
Tag "Armorer"
|
|
}
|
|
|
|
|
|
// Medic --------------------------------------------------------------------
|
|
|
|
ACTOR Medic : Merchant 74
|
|
{
|
|
Game Strife
|
|
Translation 6
|
|
ConversationID 5
|
|
PainSound "medic/pain"
|
|
Tag "Medic"
|
|
}
|
|
|