1.3.32

Minor wiki and text changes.

Author: Sharp-Shark

Dam Defense/Items/Medicines.xml

@@ -1300,7 +1300,7 @@
   </Override>
 
   <!-- mutagenic serums -->
-  <Item name="Mutagenic Serum" nameidentifier="serum" identifier="serummollusc" category="Medical,Misc" Tags="smallitem,chem,medical" cargocontaineridentifier="chemicalcrate" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Item name="Mutagenic Serum" nameidentifier="serum" identifier="serummollusc" category="Medical,Misc" Tags="smallitem,chem,medical,serum" cargocontaineridentifier="chemicalcrate" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Deconstruct time="10">
       <Item identifier="iron" />
     </Deconstruct>

Dam Defense/Localizations/english.lua

@@ -276,7 +276,7 @@ return {
 	wikiName_gangEvent = 'Gang Event',
 	wikiText_gangEvent = 'This a side event where a player is spawned in as a mafioso gang leader. His objective is to grow his gang and obtain power and influence in whatever way he deems fit. He is not necessarily an antagonist and this is not a round ending event.\nThe gang leader and the gang leader only can craft items specific to the event for cheap, such as the UZI, ballistic cap, crystal meth and spraycans. The crystal meth is very important, because when smoked in a pipe by a player without an antag-safe job, they will be recruited to the gang of the respective color.',
 	wikiName_wizardEvent = 'Wizard Event',
-	wikiText_wizardEvent = 'This is a side event where a player is spawned in as a wizard. His objective is to cause chaos and mayhem, although this does not mean the wizard is an antagonist, for he can act good or evil.\nThe wizard spawns with, amongst other items, a staff and some spellbooks. When the staff and a spellbook are both held at once, spells can be cast.',
+	wikiText_wizardEvent = 'This is a side event where a player is spawned in as a wizard. His objective is to cause chaos and mayhem, although this does not mean the wizard is an antagonist, for he can act good or evil.\nThe wizard spawns with, amongst other items, a staff and some spellbooks. When the staff and a spellbook are both held at once, spells can be cast.\nThere is 10% chance from February to November and a 100% chance from December to January that instead of the regular Merasmus wizard spawning, Old Nick (Santa Claus) will spawn instead!',
 	wikiName_mercsEvent = 'MERCS Event',
 	wikiText_mercsEvent = 'This is a side event where a player will be spawned as a member of the Mobile Emergency Rescue and Combat Squad (abbreviated: MERCS). Their goal is to assist security and they are essentially a super cop, even counting as a member of security. They look very similar to the Death Squadders, but have an entirely different objective.',
 	wikiName_chimeraEvent = 'Chimera Event',
@@ -358,6 +358,8 @@ return {
 	wikiText_bloodsamplerItem = 'Can be used by medical to test people for diseases and for crystal meth (positive on crystal meth indicates player is a gang member, relevant to Gang Event). Medical and non medical jobs can also use the blood sampler take live samples of diseases from infected individuals. Live samples can usually be used to make antidotes... or for bioterrorism.',
 	wikiName_methItem = 'Crystal Meth',
 	wikiText_methItem = 'An item craftable by the gang leader. When smoked using a pipe, the player will join the gang of the associated color. Give this out as the gang leader to people you want to recruit to be your goons.\nHeals damage, bloodloss and gives haste when smoked using a pipe, but causes significant pulmonary emphysema, unless smoked by someone with strong lungs, like the mayor or gang leader.',
+	wikiName_serumItem = 'Mutagenic Serum',
+	wikiText_serumItem = 'Extract genetic material from fresh cadavers using a bonesaw. Refine impure genetic material into pure genetic material using a deconstructor. Finally craft the serum in a medical fabricator or chem kit.',
 	-- wiki items (autogen)
 	wikiText_goblincrateItem = 'Can fit an entire goblin or troll inside. Greenskins will heal when inside a crate. Do not try to hide inside it as a human.',
 	wikiText_skyholderartifactItem = 'Highly radioactive alien artifact. Best handled using a hazmat suit or PUCS.',
@@ -377,6 +379,8 @@ return {
 	wikiText_nexshop1Item = 'This page links to all items which can be bought in a Nexshop (TM).',
 	wikiText_nukieshop1Item = 'This page links to all items which can be bought in a Nukieshop.',
 	wikiText_secnexshopItem = 'This page links to all items which can be bought in a Security Nexshop (TM).',
+	wikiName_geneticmaterialItem = 'Pure Genetic Material',
+	wikiText_geneticmaterialItem = 'Sufficiently pure for concocting mutagenic serums. Obtained either from a fresh specimen or from deconstructing impure genetic material.\nCan be converted back into impure genetic material with sulphuric acid in a medical fabricator or chem kit.',
 	-- wiki creatures
 	wikiName_spitroachCreature = 'Spitroach',
 	wikiText_spitroachCreature = 'An annoying cowardly pest that breeds and grows fast. They run up close, spit their acid, run away and repeat, usually in a synchronized group motion. When no targets are in sight, they spit on their walls, causing leaks and trouble. Immune to acid burns.',

Dam Defense/Localizations/english.xml

@@ -73,7 +73,7 @@
   <jobdescription.foreman>The mayor will often be too busy to watch over the dam, and that is where you come in. You will work together with the engineers and janitors to make sure the dam and its reactors are working neatly at all times. If the situation damands it, you can also temporarily serve as an additional security officer.</jobdescription.foreman>
   <!-- Researcher Job -->
   <jobname.researcher>Researcher</jobname.researcher>
-  <jobdescription.researcher>Aside from working as a Medical Doctor if the times come, you will also be mainly conducting often unethical research with the aim of producing antidotes to infections by using your blood sampler on infected and later refining your live samples into antidotes in a medical fabricator.</jobdescription.researcher>
+  <jobdescription.researcher>Aside from working as a Medical Doctor if the times comes, you will mainly be conducting unethical research with the aim of producing antidotes and mutagenic serums. The materials for which you'll respectively extract using blood samplers and the bonesaw.</jobdescription.researcher>
   <!-- Diver Job -->
   <jobname.diver>Diver</jobname.diver>
   <jobdescription.diver>Expert in diving and hunting. Your main task is keeping the local fauna in check with your guns and to mine with your plasma cutter. If the situation calls for it, you can also temporarily work as an additional security officer.</jobdescription.diver>

Dam Defense/Lua/DD/gui/wikiData.lua

@@ -88,7 +88,7 @@ DD.wikiData = {
 		identifier = 'eventVIP',
 	},
 	wizardEvent = {
-		related = {'main', 'events', 'wizardJob', 'merasmushatItem', 'merasmusrobesItem', 'merasmusstaffItem', 'merasmusfireballbookItem', 'merasmusteleportbookItem', 'merasmusblastjumpbookItem'},
+		related = {'main', 'events', 'wizardJob', 'merasmushatItem', 'merasmusrobesItem', 'merasmusstaffItem', 'merasmusfireballbookItem', 'merasmusteleportbookItem', 'merasmusblastjumpbookItem', 'merasmusgiftbookItem', 'merasmusgiftbombbookItem'},
 	},
 	gangEvent = {
 		related = {'main', 'events', 'gangsterJob', 'methItem', 'uziItem', 'backwardscapItem', 'spraycanItem'},
@@ -122,7 +122,7 @@ DD.wikiData = {
 		related = {'main', 'jobs', 'hardhatheadItem'},
 	},
 	researcherJob = {
-		related = {'main', 'jobs', 'bloodsamplerItem'},
+		related = {'main', 'jobs', 'bonesawItem', 'serumItem', 'bloodsamplerItem', 'fluantidoteItem', 'tbantidoteItem', 'anthraxantidoteItem'},
 	},
 	medicaldoctorJob = {
 		related = {'main', 'jobs', 'healgunItem', 'healgundrumItem'},
@@ -150,7 +150,7 @@ DD.wikiData = {
 		related = {'main', 'jobs', 'vipEvent', 'midazolamItem'},
 	},
 	wizardJob = {
-		related = {'main', 'jobs', 'wizardEvent', 'merasmushatItem', 'merasmusrobesItem', 'merasmusstaffItem', 'merasmusfireballbookItem', 'merasmusteleportbookItem', 'merasmusblastjumpbookItem'},
+		related = {'main', 'jobs', 'wizardEvent', 'merasmushatItem', 'merasmusrobesItem', 'merasmusstaffItem', 'merasmusfireballbookItem', 'merasmusteleportbookItem', 'merasmusblastjumpbookItem', 'merasmusgiftbookItem', 'merasmusgiftbombbookItem'},
 	},
 	gangsterJob = {
 		related = {'main', 'jobs', 'gangEvent', 'cyanbosshatItem', 'bossclothesItem', 'methItem', 'uziItem', 'backwardscapItem', 'spraycanItem', 'captainspipeItem', 'pipetobaccoItem'},
@@ -187,6 +187,10 @@ DD.wikiData = {
 		related = {'main', 'items', 'gangsterJob', 'gangEvent'},
 		identifier = 'cyanspraycan',
 	},
+	geneticmaterialItem = {
+		related = {'main', 'items', 'serumItem', 'geneticmaterial_unresearchedItem'},
+		identifier = 'geneticmaterialmollusc',
+	},
 	-- items (medical)
 	bacterialsyringeItem = {
 		related = {'main', 'items', 'medicalSystem', 'bacterialinfectionAffliction'},
@@ -222,6 +226,10 @@ DD.wikiData = {
 		related = {'main', 'items', 'medicalSystem', 'captainspipeItem', 'bloodsamplerItem', 'gangsterJob', 'gangEvent'},
 		identifier = 'cyanmeth',
 	},
+	serumItem = {
+		related = {'main', 'items', 'medicalSystem', 'researcherJob', 'bonesawItem'},
+		identifier = 'serummollusc',
+	},
 	-- creatures
 	spitroachCreature = {
 		related = {'main', 'creatures', 'fishEvent'},
@@ -289,6 +297,18 @@ local autogenBlacklist = {
 	smguniqueItem = true,
 	nexshop2Item = true,
 	nukieshop2Item = true,
+	serummolluscItem = true,
+	serumskitterItem = true,
+	serumhunterItem = true,
+	serumhammerheadmatriarchItem = true,
+	serumcrawlerItem = true,
+	serummudraptorItem = true,
+	serummolochItem = true,
+	serumthresherItem = true,
+	serummantisItem = true,
+	serumspinelingItem = true,
+	serumhammerheadItem = true,
+	serumhuskItem = true,
 }
 local autogenRelated = {
 	captainspipeItem = {'pipetobaccoItem'},
@@ -301,6 +321,7 @@ local autogenRelated = {
 	nukieshop1Item = {'nukiesEvent', 'fakemoneyItem'},
 	fakemoneyItem = {'moneyItem'},
 	secnexshopItem = {'captainJob', 'diverJob', 'securityofficerJob', 'mercsJob'},
+	bonesawItem = {'researcherJob', 'serumItem', 'geneticmaterial_unresearchedItem'},
 }
 local autogenRelations = {
 	portablegeneratorItem = {'generatorfuel'},
@@ -311,6 +332,8 @@ local autogenRelations = {
 	nexshop1Item = {'money'},
 	secnexshopItem = {'realmoney'},
 	moneycaseItem = {'money'},
+	bonesawItem = {'geneticmaterial'},
+	serumItem = {'geneticmaterial'},
 }
 for prefab in ItemPrefab.Prefabs do
 	-- 3146664815 is the steamworkshopid of Dam Defense
@@ -367,7 +390,7 @@ if DD.isCSharpLoaded then
 	DD.wikiData.serverMessage.related = {'openhtml', 'main'}
 end
 
--- automatically adds an object's XML description to its wiki text
+-- automatically adds an object's XML description to its wiki text + run custom optional function
 for localization in DD.localizations do
 	for key, value in pairs(localization) do
 		if string.sub(key, 1, #'wikiText_') == 'wikiText_' then
@@ -383,7 +406,7 @@ for localization in DD.localizations do
 				identifier = DD.wikiData[wikiIdentifier].identifier or DD.stringSplit(wikiIdentifier, 'Item')[1]
 				description = tostring(ItemPrefab.GetItemPrefab(identifier).Description)
 			end
-			if description ~= nil then
+			if (description ~= nil) and (description ~= '') then
 				localization[key] = DD.stringReplace(localization['wiki_description'], {description = description}) .. localization[key]
 			end
 		end

Dam Defense/filelist.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<contentpackage name="Dam Defense" modversion="1.3.31" corepackage="False" steamworkshopid="3146664815" gameversion="1.11.5.0">
+<contentpackage name="Dam Defense" modversion="1.3.32" corepackage="False" steamworkshopid="3146664815" gameversion="1.11.5.0">
   <Other file="%ModDir%/CSharp/Client/DamDefense.cs" />
   <Text file="%ModDir%/Localizations/english.xml" />
   <Item file="%ModDir%/Items/Jerry.xml" />

README.md

@@ -1,4 +1,4 @@
-# Dam Defense v1.3.31
+# Dam Defense v1.3.32
 
 Read me? How about I read you instead?