From 72f75b1872d2a4b100abaa09ea2eb44a4eb02063 Mon Sep 17 00:00:00 2001
From: Justin Marshall <justinmarshall20@gmail.com>
Date: Tue, 4 Aug 2020 14:14:40 -0700
Subject: [PATCH] Added tesla coil side bar icon, added fastbuild option in
 rules.ini.

---
 code/redalert/conquer.cpp       |   7 ++++++-
 code/redalert/techno.cpp        |  10 +++++++++-
 rules.ini                       |   3 +++
 ui/sidebar/icons/ngtslaicon.png | Bin 0 -> 2781 bytes
 4 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 ui/sidebar/icons/ngtslaicon.png

diff --git a/code/redalert/conquer.cpp b/code/redalert/conquer.cpp
index c774e91..6233136 100644
--- a/code/redalert/conquer.cpp
+++ b/code/redalert/conquer.cpp
@@ -3726,7 +3726,12 @@ void CC_Draw_Shape(void const * shapefile, int shapenum, int x, int y, WindowNum
 
 		Image_t* shape_image = NULL;
 		char tmp[512];
-		sprintf(tmp, "s_%I64u_%d_%d_%d_%d", shapefile, shapenum, rotation, fadingdata, flags);
+		if (CCGlobalShadowRender) {
+			sprintf(tmp, "h_%I64u_%d_%d_%d_%d", shapefile, shapenum, rotation, fadingdata, flags);
+		}
+		else {
+			sprintf(tmp, "s_%I64u_%d_%d_%d_%d", shapefile, shapenum, rotation, fadingdata, flags);
+		}
 		shape_image = Find_Image(tmp);
 
 		if (!shape_image)
diff --git a/code/redalert/techno.cpp b/code/redalert/techno.cpp
index 28f35ab..60bd504 100644
--- a/code/redalert/techno.cpp
+++ b/code/redalert/techno.cpp
@@ -6735,7 +6735,15 @@ bool TechnoTypeClass::Read_INI(CCINIClass & ini)
 		SightRange = ini.Get_Int(Name(), "Sight", SightRange);
 		Level = ini.Get_Int(Name(), "TechLevel", Level);
 		MaxSpeed = MPHType(_Scale_To_256(ini.Get_Int(Name(), "Speed", fixed(MaxSpeed, 256) * 100)));
-		Cost = ini.Get_Int(Name(), "Cost", Cost);
+
+		bool fastBuild = ini.Get_Int("General", "FastBuild", 0);
+
+		if(fastBuild) {
+			Cost = 15;
+		}
+		else {
+			Cost = ini.Get_Int(Name(), "Cost", Cost);
+		}
 		MaxAmmo = ini.Get_Int(Name(), "Ammo", MaxAmmo);
 		Risk = Reward = Points = ini.Get_Int(Name(), "Points", Points);
 		Ownable = ini.Get_Owners(Name(), "Owner", Ownable);
diff --git a/rules.ini b/rules.ini
index 537bb98..dd9aa2f 100644
--- a/rules.ini
+++ b/rules.ini
@@ -7,6 +7,9 @@
 
 [General]
 
+; dev options
+FastBuild=0
+
 ; crates
 CrateMinimum=1          ; crates are normally one per human player but never below this number
 CrateMaximum=255        ; crates can never exceed this quantity
diff --git a/ui/sidebar/icons/ngtslaicon.png b/ui/sidebar/icons/ngtslaicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab4e249ec90f69c402bc90361f45205484528676
GIT binary patch
literal 2781
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
KI7So@oA!Sng-}}n

literal 0
HcmV?d00001