v2.5 introduces healer zombies

About/Manifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
   <identifier>net.pardeike.rimworld.mod.zombieland</identifier>
-  <version>2.4.3.0</version>
+  <version>2.5.0.0</version>
   <targetVersions>
     <li>1.0.0</li>
     <li>1.1.0</li>

Languages/ChineseSimplified/Keyed/Text.xml

@@ -101,6 +101,7 @@
 	<ElectrifierChance>电动僵尸</ElectrifierChance>
 	<AlbinoChance>白化僵尸</AlbinoChance>
 	<DarkSlimerChance>黑暗黏糊糊的僵尸</DarkSlimerChance>
+	<HealerChance>治疗僵尸</HealerChance>
 	<NormalZombieChance>普通丧尸: {0}</NormalZombieChance>
 
 	<ZombieMiscTitle>其他</ZombieMiscTitle>

Languages/ChineseTraditional/Keyed/Text.xml

@@ -101,6 +101,7 @@
 	<ElectrifierChance>電動殭屍</ElectrifierChance>
 	<AlbinoChance>白化殭屍</AlbinoChance>
 	<DarkSlimerChance>黑暗黏糊糊的殭屍</DarkSlimerChance>
+	<HealerChance>治療殭屍</HealerChance>
 	<NormalZombieChance>普通殭屍: {0}</NormalZombieChance>
 
 	<ZombieMiscTitle>其他</ZombieMiscTitle>

Languages/English/Keyed/Help.xml

@@ -113,6 +113,7 @@
 	<ElectrifierChance_Help>Electrifying zombies don't bite so you can melee them. In fact, their electric force field will protect them from any damage except melee. They will interfer and break anything electric, electronic or anything build with components including powered things, armor and weapons.</ElectrifierChance_Help>
 	<AlbinoChance_Help>Albino zombies don't attack you. Instead, they sabotage your base and scream so you get stunned and vomit.</AlbinoChance_Help>
 	<DarkSlimerChance_Help>Dark slimer zombies leave a ultra sticky tar like slime trail behind them. It is hard to clean (rain will wash it away though) and only zombies will pass it easily.</DarkSlimerChance_Help>
+	<HealerChance_Help>Healer zombies heal all zombies within a certain distance to full health. They can be identified by their cyan skin color and they otherwise act like normal standard zombies.</HealerChance_Help>
 	<NormalZombieChance_Help>Ordinary zombies come in different body sizes. That defines their strength but also their speed! They often wear any apparel that is available in the game and in any mods you have installed.</NormalZombieChance_Help>
 
 	<!-- -->

Languages/English/Keyed/Text.xml

@@ -101,6 +101,7 @@
 	<ElectrifierChance>Electrifying zombies</ElectrifierChance>
 	<AlbinoChance>Albino zombies</AlbinoChance>
 	<DarkSlimerChance>Dark slimer zombies</DarkSlimerChance>
+	<HealerChance>Healer zombies</HealerChance>
 	<NormalZombieChance>Ordinary zombies: {0}</NormalZombieChance>
 
 	<ZombieMiscTitle>Miscellaneous</ZombieMiscTitle>

Languages/French/Keyed/Text.xml

@@ -101,6 +101,7 @@
 	<ElectrifierChance>Zombies électrisants</ElectrifierChance>
 	<AlbinoChance>Zombies albinos</AlbinoChance>
 	<DarkSlimerChance>Zombies gluants sombres</DarkSlimerChance>
+	<HealerChance>Zombies guérisseurs</HealerChance>
 	<NormalZombieChance>Zombies ordinaires: {0}</NormalZombieChance>
 
 	<ZombieMiscTitle>Divers</ZombieMiscTitle>

Languages/German/Keyed/Text.xml

@@ -100,7 +100,8 @@
 	<MinerChance>Grabende Zombies</MinerChance>
 	<ElectrifierChance>Elektrische Zombies</ElectrifierChance>
 	<AlbinoChance>Albino Zombies</AlbinoChance>
-	<DarkSlimerChance>Dunkle Schleimer zombies</DarkSlimerChance>
+	<DarkSlimerChance>Dunkle Schleimer Zombies</DarkSlimerChance>
+	<HealerChance>Heilende Zombies</HealerChance>
 	<NormalZombieChance>Normale Zombies: {0}</NormalZombieChance>
 
 	<ZombieMiscTitle>Verschiedenes</ZombieMiscTitle>

Languages/Russian/Keyed/Text.xml

@@ -101,6 +101,7 @@
 	<ElectrifierChance>Электрические зомби</ElectrifierChance>
 	<AlbinoChance>альбинос зомби</AlbinoChance>
 	<DarkSlimerChance>Темные слизистые зомби</DarkSlimerChance>
+	<HealerChance>Целители зомби</HealerChance>
 	<NormalZombieChance>Обычные зомби: {0}</NormalZombieChance>
 
 	<ZombieMiscTitle>Разное</ZombieMiscTitle>

Languages/Turkish/Keyed/Text.xml

@@ -101,6 +101,7 @@
 	<ElectrifierChance>Elektrikli zombiler</ElectrifierChance>
 	<AlbinoChance>Albino zombiler</AlbinoChance>
 	<DarkSlimerChance>Karanlık sümüksü zombiler</DarkSlimerChance>
+	<HealerChance>Şifacı zombiler</HealerChance>
 	<NormalZombieChance>Sıradan zombiler: {0}</NormalZombieChance>
 
 	<ZombieMiscTitle>Çeşitli</ZombieMiscTitle>

Source/CameraPlusSupport.cs

@@ -31,6 +31,8 @@ static Color[] GetCameraPlusColors(Pawn pawn)
 				innerColor = Color.cyan;
 			else if (zombie.isAlbino)
 				innerColor = Color.white;
+			else if (zombie.isHealer)
+				innerColor = Color.cyan;
 			else if (zombie.isDarkSlimer)
 				innerColor = darkColor;
 			else if (zombie.isMiner)

Source/Constants.cs

@@ -257,10 +257,42 @@ static Constants()
 				MaterialPool.MatFrom("TarSlime/TarSlime7", ShaderDatabase.Mote, new Color(1,1,1,1)),
 			},
 		};
+		public static readonly Material HEAL = MaterialPool.MatFrom("Heal", ShaderDatabase.Mote);
+		public static Material[] healingMaterials = new[]
+		{
+			new Material(HEAL) { color = new Color(1f, 1f, 1f, 0.00f) },
+			new Material(HEAL) { color = new Color(1f, 1f, 1f, 0.05f) },
+			new Material(HEAL) { color = new Color(1f, 1f, 1f, 0.1f) },
+			new Material(HEAL) { color = new Color(1f, 1f, 1f, 0.1f) },
+			new Material(HEAL) { color = new Color(1f, 1f, 1f, 0.15f) },
+			new Material(HEAL) { color = new Color(1f, 1f, 1f, 0.2f) },
+			new Material(HEAL) { color = new Color(1f, 1f, 1f, 0.25f) },
+			new Material(HEAL) { color = new Color(1f, 1f, 1f, 0.3f) },
+			new Material(HEAL) { color = new Color(1f, 1f, 1f, 0.3f) },
+			new Material(HEAL) { color = new Color(1f, 1f, 1f, 0.3f) },
+			new Material(HEAL) { color = new Color(1f, 1f, 1f, 0.5f) },
+			new Material(HEAL) { color = new Color(1f, 1f, 1f, 0.7f) },
+			new Material(HEAL) { color = new Color(1f, 1f, 1f, 0.8f) },
+			new Material(HEAL) { color = new Color(1f, 1f, 1f, 0.9f) },
+			new Material(HEAL) { color = new Color(1f, 1f, 1f, 1.0f) },
+			new Material(HEAL) { color = new Color(1f, 1f, 1f, 1.0f) },
+			new Material(HEAL) { color = new Color(1f, 1f, 1f, 1.0f) },
+			new Material(HEAL) { color = new Color(1f, 1f, 1f, 0.8f) },
+			new Material(HEAL) { color = new Color(1f, 1f, 1f, 0.5f) },
+			new Material(HEAL) { color = new Color(1f, 1f, 1f, 0.25f) },
+		};
+		public static readonly Material[] BEING_HEALED = new Material[] {
+			MaterialPool.MatFrom("BeingHealed", ShaderDatabase.Mote, new Color(1f, 1f, 1f, 0.3f)),
+			MaterialPool.MatFrom("BeingHealed", ShaderDatabase.Mote, new Color(1f, 1f, 1f, 0.5f)),
+			MaterialPool.MatFrom("BeingHealed", ShaderDatabase.Mote, new Color(1f, 1f, 1f, 0.7f)),
+			MaterialPool.MatFrom("BeingHealed", ShaderDatabase.Mote, new Color(1f, 1f, 1f, 0.9f)),
+			MaterialPool.MatFrom("BeingHealed", ShaderDatabase.Mote, new Color(1f, 1f, 1f, 1.0f))
+		};
 
 		public static readonly System.Random random = new System.Random();
 
 		public static readonly Mesh screamMesh = MeshMakerPlanes.NewPlaneMesh(8f);
+		public static readonly Mesh healMesh = MeshMakerPlanes.NewPlaneMesh(4f);
 
 		public static Texture2D dot = new Texture2D(3, 3);
 	}

Source/Dialog_ZombieDebugActionMenu.cs

@@ -41,43 +41,47 @@ public override void DoListingItems()
 
 			// TODO: use Dialog_DebugOptionLister.DebugToolMap(string label, Action toolAction, bool highlight) ?
 
-			base.DebugToolMap("Spawn: Zombie (dig out)", delegate
+			DebugToolMap("Spawn: Zombie (dig out)", delegate
 			{
 				SpawnZombie(ZombieType.Normal, false);
 			}, highlightedIndex == i++);
-			base.DebugToolMap("Spawn: Zombie (standing)", delegate
+			DebugToolMap("Spawn: Zombie (standing)", delegate
 			{
 				SpawnZombie(ZombieType.Normal, true);
 			}, highlightedIndex == i++);
-			base.DebugToolMap("Spawn: Suicide bomber", delegate
+			DebugToolMap("Spawn: Suicide bomber", delegate
 			{
 				SpawnZombie(ZombieType.SuicideBomber, true);
 			}, highlightedIndex == i++);
-			base.DebugToolMap("Spawn: Toxic Splasher", delegate
+			DebugToolMap("Spawn: Toxic Splasher", delegate
 			{
 				SpawnZombie(ZombieType.ToxicSplasher, true);
 			}, highlightedIndex == i++);
-			base.DebugToolMap("Spawn: Tanky Operator", delegate
+			DebugToolMap("Spawn: Tanky Operator", delegate
 			{
 				SpawnZombie(ZombieType.TankyOperator, true);
 			}, highlightedIndex == i++);
-			base.DebugToolMap("Spawn: Miner", delegate
+			DebugToolMap("Spawn: Miner", delegate
 			{
 				SpawnZombie(ZombieType.Miner, true);
 			}, highlightedIndex == i++);
-			base.DebugToolMap("Spawn: Electrifier", delegate
+			DebugToolMap("Spawn: Electrifier", delegate
 			{
 				SpawnZombie(ZombieType.Electrifier, true);
 			}, highlightedIndex == i++);
-			base.DebugToolMap("Spawn: Albino", delegate
+			DebugToolMap("Spawn: Albino", delegate
 			{
 				SpawnZombie(ZombieType.Albino, true);
 			}, highlightedIndex == i++);
-			base.DebugToolMap("Spawn: Dark Slimer", delegate
+			DebugToolMap("Spawn: Dark Slimer", delegate
 			{
 				SpawnZombie(ZombieType.DarkSlimer, true);
 			}, highlightedIndex == i++);
-			base.DebugToolMap("Spawn: Random zombie", delegate
+			DebugToolMap("Spawn: Healer", delegate
+			{
+				SpawnZombie(ZombieType.Healer, true);
+			}, highlightedIndex == i++);
+			DebugToolMap("Spawn: Random zombie", delegate
 			{
 				SpawnZombie(ZombieType.Random, true);
 			}, highlightedIndex == i++);
@@ -87,39 +91,39 @@ public override void DoListingItems()
 				var size = tm.incidentInfo.parameters.incidentSize;
 				if (size > 0)
 				{
-					base.DebugToolMap($"Trigger: Zombie incident ({size})", delegate
+					DebugToolMap($"Trigger: Zombie incident ({size})", delegate
 					{
 						var success = ZombiesRising.TryExecute(map, size, IntVec3.Invalid, false, false);
 						if (success == false)
 							Log.Error("Incident creation failed. Most likely no valid spawn point found.");
 					}, highlightedIndex == i++);
 				}
 			}
-			base.DebugToolMap("Spawn: Zombie incident (4)", delegate
+			DebugToolMap("Spawn: Zombie incident (4)", delegate
 			{
 				_ = ZombiesRising.TryExecute(map, 4, UI.MouseCell(), false, true);
 			}, highlightedIndex == i++);
-			base.DebugToolMap("Spawn: Zombie incident (25)", delegate
+			DebugToolMap("Spawn: Zombie incident (25)", delegate
 			{
 				_ = ZombiesRising.TryExecute(map, 25, UI.MouseCell(), false, true);
 			}, highlightedIndex == i++);
-			base.DebugToolMap("Spawn: Zombie incident (100)", delegate
+			DebugToolMap("Spawn: Zombie incident (100)", delegate
 			{
 				_ = ZombiesRising.TryExecute(map, 100, UI.MouseCell(), false, true);
 			}, highlightedIndex == i++);
-			base.DebugToolMap("Spawn: Zombie incident (200)", delegate
+			DebugToolMap("Spawn: Zombie incident (200)", delegate
 			{
 				_ = ZombiesRising.TryExecute(map, 200, UI.MouseCell(), false, true);
 			}, highlightedIndex == i++);
-			base.DebugToolMap("Convert: Make Zombie", delegate
+			DebugToolMap("Convert: Make Zombie", delegate
 			{
 				foreach (var thing in map.thingGrid.ThingsAt(UI.MouseCell()))
 				{
 					if (!(thing is Pawn pawn) || pawn is Zombie) continue;
 					Tools.ConvertToZombie(pawn, map, true);
 				}
 			}, highlightedIndex == i++);
-			base.DebugToolMap("Apply: Trigger rotting", delegate
+			DebugToolMap("Apply: Trigger rotting", delegate
 			{
 				foreach (var thing in Find.CurrentMap.thingGrid.ThingsAt(UI.MouseCell()))
 				{
@@ -128,7 +132,7 @@ public override void DoListingItems()
 						compRottable.RotProgress = compRottable.PropsRot.TicksToRotStart;
 				}
 			}, highlightedIndex == i++);
-			base.DebugToolMap("Apply: Add zombie bite", delegate
+			DebugToolMap("Apply: Add zombie bite", delegate
 			{
 				foreach (var thing in Find.CurrentMap.thingGrid.ThingsAt(UI.MouseCell()))
 				{
@@ -158,7 +162,7 @@ public override void DoListingItems()
 					pawn.health.AddHediff(bite, bodyPart, damageInfo);
 				}
 			}, highlightedIndex == i++);
-			base.DebugToolMap("Apply: Remove infections", delegate
+			DebugToolMap("Apply: Remove infections", delegate
 			{
 				foreach (var thing in Find.CurrentMap.thingGrid.ThingsAt(UI.MouseCell()))
 				{
@@ -175,7 +179,7 @@ public override void DoListingItems()
 					_ = pawn.health.hediffSet.hediffs.RemoveAll(hediff => hediff is Hediff_ZombieInfection);
 				}
 			}, highlightedIndex == i++);
-			base.DebugToolMap("Apply: Zombie raging", delegate
+			DebugToolMap("Apply: Zombie raging", delegate
 			{
 				foreach (var thing in Find.CurrentMap.thingGrid.ThingsAt(UI.MouseCell()))
 				{

Source/Dialogs.cs

@@ -518,14 +518,15 @@ public static void DoWindowContentsInternal(ref SettingsGroup settings, Rect inR
 				// Types
 				list.Dialog_Label("SpecialZombiesTitle", headerColor);
 				list.Gap(8f);
-				list.Dialog_FloatSlider("SuicideBomberChance", "0%", ref settings.suicideBomberChance, 0f, 1f - settings.toxicSplasherChance - settings.tankyOperatorChance - settings.minerChance - settings.electrifierChance - settings.albinoChance - settings.darkSlimerChance);
-				list.Dialog_FloatSlider("ToxicSplasherChance", "0%", ref settings.toxicSplasherChance, 0f, 1f - settings.suicideBomberChance - settings.tankyOperatorChance - settings.minerChance - settings.electrifierChance - settings.albinoChance - settings.darkSlimerChance);
-				list.Dialog_FloatSlider("TankyOperatorChance", "0%", ref settings.tankyOperatorChance, 0f, 1f - settings.suicideBomberChance - settings.toxicSplasherChance - settings.minerChance - settings.electrifierChance - settings.albinoChance - settings.darkSlimerChance);
-				list.Dialog_FloatSlider("MinerChance", "0%", ref settings.minerChance, 0f, 1f - settings.suicideBomberChance - settings.toxicSplasherChance - settings.tankyOperatorChance - settings.electrifierChance - settings.albinoChance - settings.darkSlimerChance);
-				list.Dialog_FloatSlider("ElectrifierChance", "0%", ref settings.electrifierChance, 0f, 1f - settings.suicideBomberChance - settings.toxicSplasherChance - settings.tankyOperatorChance - settings.minerChance - settings.albinoChance - settings.darkSlimerChance);
-				list.Dialog_FloatSlider("AlbinoChance", "0%", ref settings.albinoChance, 0f, 1f - settings.suicideBomberChance - settings.toxicSplasherChance - settings.tankyOperatorChance - settings.minerChance - settings.electrifierChance - settings.darkSlimerChance);
-				list.Dialog_FloatSlider("DarkSlimerChance", "0%", ref settings.darkSlimerChance, 0f, 1f - settings.suicideBomberChance - settings.toxicSplasherChance - settings.tankyOperatorChance - settings.minerChance - settings.electrifierChance - settings.albinoChance);
-				var normalChance = 1 - settings.suicideBomberChance - settings.toxicSplasherChance - settings.tankyOperatorChance - settings.minerChance - settings.electrifierChance - settings.albinoChance - settings.darkSlimerChance;
+				list.Dialog_FloatSlider("SuicideBomberChance", "0%", ref settings.suicideBomberChance, 0f, 1f - settings.toxicSplasherChance - settings.tankyOperatorChance - settings.minerChance - settings.electrifierChance - settings.albinoChance - settings.darkSlimerChance - settings.healerChance);
+				list.Dialog_FloatSlider("ToxicSplasherChance", "0%", ref settings.toxicSplasherChance, 0f, 1f - settings.suicideBomberChance - settings.tankyOperatorChance - settings.minerChance - settings.electrifierChance - settings.albinoChance - settings.darkSlimerChance - settings.healerChance);
+				list.Dialog_FloatSlider("TankyOperatorChance", "0%", ref settings.tankyOperatorChance, 0f, 1f - settings.suicideBomberChance - settings.toxicSplasherChance - settings.minerChance - settings.electrifierChance - settings.albinoChance - settings.darkSlimerChance - settings.healerChance);
+				list.Dialog_FloatSlider("MinerChance", "0%", ref settings.minerChance, 0f, 1f - settings.suicideBomberChance - settings.toxicSplasherChance - settings.tankyOperatorChance - settings.electrifierChance - settings.albinoChance - settings.darkSlimerChance - settings.healerChance);
+				list.Dialog_FloatSlider("ElectrifierChance", "0%", ref settings.electrifierChance, 0f, 1f - settings.suicideBomberChance - settings.toxicSplasherChance - settings.tankyOperatorChance - settings.minerChance - settings.albinoChance - settings.darkSlimerChance - settings.healerChance);
+				list.Dialog_FloatSlider("AlbinoChance", "0%", ref settings.albinoChance, 0f, 1f - settings.suicideBomberChance - settings.toxicSplasherChance - settings.tankyOperatorChance - settings.minerChance - settings.electrifierChance - settings.darkSlimerChance - settings.healerChance);
+				list.Dialog_FloatSlider("DarkSlimerChance", "0%", ref settings.darkSlimerChance, 0f, 1f - settings.suicideBomberChance - settings.toxicSplasherChance - settings.tankyOperatorChance - settings.minerChance - settings.electrifierChance - settings.albinoChance - settings.healerChance);
+				list.Dialog_FloatSlider("HealerChance", "0%", ref settings.healerChance, 0f, 1f - settings.suicideBomberChance - settings.toxicSplasherChance - settings.tankyOperatorChance - settings.minerChance - settings.electrifierChance - settings.albinoChance - settings.darkSlimerChance);
+				var normalChance = 1 - settings.suicideBomberChance - settings.toxicSplasherChance - settings.tankyOperatorChance - settings.minerChance - settings.electrifierChance - settings.albinoChance - settings.darkSlimerChance - settings.healerChance;
 				list.Gap(-6f);
 				list.Dialog_Text(GameFont.Tiny, "NormalZombieChance", string.Format("{0:0%}", normalChance));
 				list.Gap(30f);
@@ -590,7 +591,7 @@ public static void DoWindowContentsInternal(ref SettingsGroup settings, Rect inR
 				list.Dialog_Checkbox("AnyTreatmentStopsInfection", ref settings.anyTreatmentStopsInfection);
 				list.Gap(22f);
 				static string hoursTranslator(int n) => n == -1 ? "Off".Translate() : (n == 0 ? "Immediately".Translate() : null);
-				list.Dialog_TimeSlider("HoursAfterDeathToBecomeZombie", ref settings.hoursAfterDeathToBecomeZombie, -1, 24, hoursTranslator, false);
+				list.Dialog_TimeSlider("HoursAfterDeathToBecomeZombie", ref settings.hoursAfterDeathToBecomeZombie, -1, 6 * 24, hoursTranslator, false);
 				list.Gap(30f);
 
 				// Serum

Source/GraphicsDatabase.cs

@@ -83,6 +83,12 @@ static GraphicsDatabase()
 						var data = new ColorData(width, height, pixels);
 						colorDataDatabase.Add(path + "#dark", data);
 					}
+
+					// add healer cyan
+					{
+						var data = GetColoredData(originalPixels, Color.cyan, width, height);
+						colorDataDatabase.Add(path + "#healer", data);
+					}
 				}
 				else
 				{