From 9ca02bef6ec44e7ce89d5d1b3d67ad09e709868a Mon Sep 17 00:00:00 2001 From: Justin Marshall Date: Wed, 5 Aug 2020 11:52:11 -0700 Subject: [PATCH] Added RA2 pillbox and added missing IdleAnimIgnorePowerState in Read_INI. --- EXPAND3.mix | Bin 2894624 -> 2899855 bytes code/redalert/bdata.cpp | 1 + rules.ini | 8 ++++++++ ui/sidebar/icons/ggpillicon.png | Bin 0 -> 2919 bytes 4 files changed, 9 insertions(+) create mode 100644 ui/sidebar/icons/ggpillicon.png diff --git a/EXPAND3.mix b/EXPAND3.mix index 74239a4823db4f0141dbade1186e94c49dfcdce4..9d48a08eb1e420dde873626f74a488020ad01313 100644 GIT binary patch delta 5381 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 B!ukLJ diff --git a/code/redalert/bdata.cpp b/code/redalert/bdata.cpp index 5f86510..37230b7 100644 --- a/code/redalert/bdata.cpp +++ b/code/redalert/bdata.cpp @@ -4077,6 +4077,7 @@ bool BuildingTypeClass::Read_INI(CCINIClass & ini) ActiveAnimAnimShape = MFCD::Retrieve(ConstructAnimName); } + IdleAnimIgnorePowerState = ini.Get_Int(Name(), "IdleAnimIgnorePowerState", 0); IdleHasShadowFrames = ini.Get_Int(Name(), "IdleHasShadowFrames", 0); IdleAnimNonDamagedStart = ini.Get_Int(Name(), "IdleAnimNonDamagedStart", -1); IdleAnimNonDamagedFrames = ini.Get_Int(Name(), "IdleAnimNonDamagedFrames", -1); diff --git a/rules.ini b/rules.ini index bb471e2..8c3c842 100644 --- a/rules.ini +++ b/rules.ini @@ -1326,6 +1326,14 @@ Points=50 Power=-15 Sensors=yes Crewed=yes +Image=ggpill +Snow=eapal1sno.pal +Temperate=eapal1tem.pa +IdleAnimNonDamagedStart=0 +IdleAnimNonDamagedFrames=1 +IdleAnimDamagedStart=0 +IdleAnimDamagedFrames=1 +IdleHasShadowFrames=1 ; camouflaged pill box [HBOX] diff --git a/ui/sidebar/icons/ggpillicon.png b/ui/sidebar/icons/ggpillicon.png new file mode 100644 index 0000000000000000000000000000000000000000..e904650b221fd7593735fbb75bd2975bb953d6d2 GIT binary patch literal 2919 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 s