From 92722445aaeb0af39523c79257d036d36d2ed3f5 Mon Sep 17 00:00:00 2001 From: Xylemon Date: Sun, 17 Mar 2024 18:54:41 -0700 Subject: [PATCH] Fixes for scientist body types --- zpak001.pk3dir/def/monsters/scientist.def | 15 +++- .../def/monsters/scientist_dead.def | 75 ++++++++++--------- .../def/monsters/sitting_scientist.def | 10 ++- 3 files changed, 59 insertions(+), 41 deletions(-) diff --git a/zpak001.pk3dir/def/monsters/scientist.def b/zpak001.pk3dir/def/monsters/scientist.def index ac805b4..a794cae 100644 --- a/zpak001.pk3dir/def/monsters/scientist.def +++ b/zpak001.pk3dir/def/monsters/scientist.def @@ -9,10 +9,11 @@ entityDef monster_scientist "eye_height" "64" "team" "0" "propdata" "actor_human" - - // When body equals 0, this is our default Scientist. - "netname" "Walter" + + // Until Randomization is functional + // we need to do this hack "pitch" "105" + "netname" "Walter" "body1" "1" "follow_on_use" "1" @@ -43,6 +44,14 @@ entityDef monster_scientist "talk_stop_follow" "!SC_STOP" "talk_deny_follow" "!SC_POK" + // Body Types + + when "body" equals "0" { + "pitch" "105" + "netname" "Walter" + "body1" "1" + } + when "body" equals "1" { "pitch" "100" "netname" "Einstein" diff --git a/zpak001.pk3dir/def/monsters/scientist_dead.def b/zpak001.pk3dir/def/monsters/scientist_dead.def index 3d57526..f9436a8 100644 --- a/zpak001.pk3dir/def/monsters/scientist_dead.def +++ b/zpak001.pk3dir/def/monsters/scientist_dead.def @@ -10,56 +10,63 @@ entityDef monster_scientist_dead "propdata" "actor_human" "dead" "1" - "frame" "38" + "sequence" "37" - // Stomach - when "pose" equals "1" { - "frame" "39" - } + // Body Types - // Sitting - when "pose" equals "2" { - "frame" "40" - } - - // Hanging - when "pose" equals "3" { - "frame" "41" - } - - // Table1 - when "pose" equals "4" { - "frame" "42" - } - - // Table2 - when "pose" equals "5" { - "frame" "43" - } - - // Table3 - when "pose" equals "6" { - "frame" "44" - } - - when "body" equals "1" { + when "body" equals "0" { "netname" "Dead Walter" "body1" "1" } - when "body" equals "2" { + when "body" equals "1" { "netname" "Dead Einstein" "body1" "2" } - when "body" equals "3" { + when "body" equals "2" { "netname" "Dead Luther" "skin" "1" "body1" "3" } - when "body" equals "4" { + when "body" equals "3" { "netname" "Dead Slick" "body1" "4" } + + // Poses + + // Stomach + when "pose" equals "1" { + "sequence" "38" + } + + // Sitting + when "pose" equals "2" { + "sequence" "39" + } + + // Hanging + // Frozen walking animation in retail + // Cut from final? + when "pose" equals "3" { + "sequence" "0" + } + + // Table1 + when "pose" equals "4" { + "sequence" "40" + } + + // Table2 + when "pose" equals "5" { + "sequence" "41" + } + + // Table3 + when "pose" equals "6" { + "sequence" "42" + } + } \ No newline at end of file diff --git a/zpak001.pk3dir/def/monsters/sitting_scientist.def b/zpak001.pk3dir/def/monsters/sitting_scientist.def index 254caf3..0b57a3e 100644 --- a/zpak001.pk3dir/def/monsters/sitting_scientist.def +++ b/zpak001.pk3dir/def/monsters/sitting_scientist.def @@ -11,26 +11,28 @@ entityDef monster_sitting_scientist "propdata" "actor_human" "sequence" "75" - when "body" equals "1" { + // Body Types + + when "body" equals "0" { "pitch" "105" "netname" "Walter" "body1" "1" } - when "body" equals "2" { + when "body" equals "1" { "pitch" "100" "netname" "Einstein" "body1" "2" } - when "body" equals "3" { + when "body" equals "2" { "pitch" "95" "netname" "Luther" "skin" "1" "body1" "3" } - when "body" equals "4" { + when "body" equals "3" { "pitch" "105" "netname" "Slick" "body1" "4"