Merge branch 'WikiEnhancements' into Develop

Epicguru · May 27, 2020 · bc305d1 · bc305d1
2 parents 5036f86 + 868cb20
commit bc305d1
Show file tree

Hide file tree

Showing 27 changed files with 98 additions and 57 deletions.
diff --git a/Defs/Research/Hyper Alloy Research.xml b/Defs/Research/Hyper Alloy Research.xml
@@ -17,10 +17,10 @@ In order to manufacture it, a special facility will be needed.</discoveredLetter
             <li>MultiAnalyzer</li>
         </requiredResearchFacilities>
         <prerequisites>
-            <li>R_AntimatterComposite_AA</li>
+            <li>R_HyperComponents_AA</li>
         </prerequisites>        
-        <researchViewX>5.00</researchViewX>
-        <researchViewY>0.60</researchViewY>
+        <researchViewX>4.00</researchViewX>
+        <researchViewY>2.50</researchViewY>
     </ResearchProjectDef>
 
 </Defs>
diff --git a/Defs/Research/Hyper Components Research.xml b/Defs/Research/Hyper Components Research.xml
@@ -23,7 +23,7 @@ Ultratech raiders will ocasionally carry them, and you can also attack Ultratech
             <li>ATFields_AA</li>
         </prerequisites>        
         <researchViewX>3.00</researchViewX>
-        <researchViewY>2.80</researchViewY>
+        <researchViewY>3.15</researchViewY>
     </ResearchProjectDef>
 
 </Defs>
diff --git a/Defs/Research/MBD Research.xml b/Defs/Research/MBD Research.xml
@@ -19,7 +19,7 @@ Using hyper components allows for incredibly accurate control over channeling an
             <li>ThunderGun_AA</li>
         </prerequisites>        
         <researchViewX>3.00</researchViewX>
-        <researchViewY>4.90</researchViewY>
+        <researchViewY>5.05</researchViewY>
     </ResearchProjectDef>
 
 </Defs>
diff --git a/Defs/Research/Megumin Research.xml b/Defs/Research/Megumin Research.xml
@@ -21,7 +21,7 @@ Don't target anything near something you care about loosing!</discoveredLetterTe
             <li>R_HyperComponents_AA</li>
         </prerequisites>        
         <researchViewX>4.00</researchViewX>
-        <researchViewY>2.80</researchViewY>
+        <researchViewY>3.15</researchViewY>
     </ResearchProjectDef>
 
 </Defs>
diff --git a/Defs/Research/Railgun Research.xml b/Defs/Research/Railgun Research.xml
@@ -19,10 +19,10 @@ You will need to aquire Hyper Components to build them.</discoveredLetterText>
         </requiredResearchFacilities>
         <prerequisites>
             <li>ThunderGun_AA</li>
-            <li>ATFields_AA</li>
+            <li>R_HyperComponents_AA</li>
         </prerequisites>        
-        <researchViewX>3.00</researchViewX>
-        <researchViewY>3.95</researchViewY>
+        <researchViewX>4.00</researchViewX>
+        <researchViewY>3.85</researchViewY>
     </ResearchProjectDef>
 
 </Defs>
diff --git a/Defs/Research/Void Armor Research.xml b/Defs/Research/Void Armor Research.xml
@@ -16,7 +16,7 @@
             <li>R_AntimatterComposite_AA</li>
         </prerequisites>        
         <researchViewX>4.00</researchViewX>
-        <researchViewY>1.15</researchViewY>
+        <researchViewY>1.05</researchViewY>
     </ResearchProjectDef>
 
 </Defs>
diff --git a/Source/AntimatterAnnihilation/AntimatterAnnihilation.csproj b/Source/AntimatterAnnihilation/AntimatterAnnihilation.csproj
@@ -40,7 +40,8 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="Lib.InGameWiki, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Lib.InGameWiki.1.1.0\lib\net472\net472\Lib.InGameWiki.dll</HintPath>
+      <HintPath>..\packages\Lib.InGameWiki.1.2.0\lib\net472\net472\Lib.InGameWiki.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Source/AntimatterAnnihilation/Buildings/MBDTop.cs b/Source/AntimatterAnnihilation/Buildings/MBDTop.cs
@@ -35,7 +35,7 @@ public override void Tick()
 
             const float DT = 1f / 60f;
             const float BARRELS_VEL = -2880f;
-            const float BARRELS_VEL_DECAY = 0.98f;
+            const float BARRELS_VEL_DECAY = 0.99f;
 
             if (parentTurret.IsInBurst)
             {

diff --git a/Source/AntimatterAnnihilation/packages.config b/Source/AntimatterAnnihilation/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Lib.Harmony" version="2.0.1" targetFramework="net472" />
-  <package id="Lib.InGameWiki" version="1.1.0" targetFramework="net472" />
+  <package id="Lib.InGameWiki" version="1.2.0" targetFramework="net472" />
 </packages>
diff --git a/Wiki/English/GettingStarted.txt b/Wiki/English/GettingStarted.txt
@@ -1,7 +1,10 @@
-GettingStarted_AA
-Getting started
-AntimatterAnnihilation/UI/QuestionMark
-AntimatterAnnihilation/PreRendered/ReactorWithPropsBG
+ID: GettingStarted_AA
+Title: Getting started
+Icon: AntimatterAnnihilation/UI/QuestionMark
+Background: AntimatterAnnihilation/PreRendered/ReactorWithPropsBG
+RequiredResearch: Entry_AA
+
+ENDTAGS
 
 #!Basics#
 #This is a mid to late-game mod. You will need loads of <color=\#8fffff>plasteel</color>, <color=\#e8e8e8>steel</color> and <color=\#ffff5c>power</color>.#

diff --git a/Wiki/English/MeleeWeapons.txt b/Wiki/English/MeleeWeapons.txt
@@ -1,8 +1,11 @@
-MeleeWeapons_AA
-Melee Weapons
-AntimatterAnnihilation/UI/MeleeIcon
-AntimatterAnnihilation/PreRendered/MeleeBG
-An overview of the melee weapons added to the game by this mod.
+ID: MeleeWeapons_AA
+Title: Melee Weapons
+Icon: AntimatterAnnihilation/UI/MeleeIcon
+Background: AntimatterAnnihilation/PreRendered/MeleeBG
+Description: An overview of the melee weapons added to the game by this mod.
+RequiredResearch: MeleeIndustrialAdvanced_AA
+
+ENDTAGS
 
 #Most melee weapons added by this mod can be crafted at a smithing table or a fabrication bench once the research is complete.
 

diff --git a/Wiki/English/RangedWeapons.txt b/Wiki/English/RangedWeapons.txt
@@ -1,8 +1,11 @@
-RangedWeapons_AA
-Ranged Weapons
-AntimatterAnnihilation/UI/RangedIcon
-AntimatterAnnihilation/PreRendered/RangedBG
-An overview of the ranged weapons added to the game by this mod.
+ID: RangedWeapons_AA
+Title: Ranged Weapons
+Icon: AntimatterAnnihilation/UI/RangedIcon
+Background: AntimatterAnnihilation/PreRendered/RangedBG
+Description: An overview of the ranged weapons added to the game by this mod.
+RequiredResearch: RangedMedium_AA
+
+ENDTAGS
 
 $AntimatterAnnihilation/UI/ExampleColonists:256,256$
 

diff --git a/Wiki/English/S_Defences.txt b/Wiki/English/S_Defences.txt
@@ -1,13 +1,17 @@
-Defences_AA
-Defences
-AntimatterAnnihilation/UI/ThunderGunIcon
-AntimatterAnnihilation/PreRendered/TurretsBG
-An overview of the stationary defences added by the mod.
+ID: Defences_AA
+Title: Defences
+Icon: AntimatterAnnihilation/UI/ThunderGunIcon
+Background: AntimatterAnnihilation/PreRendered/TurretsBG
+Description: An overview of the stationary defences added by the mod.
+RequiredResearch: R_Turrets_AA
+
+ENDTAGS
 
 #!Turrets#
 #In order to build the turrets, you will need plasteel, advanced components and sometimes antimatter composite. You will also need to do research for each turret type.#
 #Here is a list of the turrets added by this mod:#
 @Turret_ThunderGun_AA@
+@Turret_MBD_AA@
 @Turret_AntimatterRailgun_AA@
 
 #!Special#

diff --git a/Wiki/English/S_UltratechFaction.txt b/Wiki/English/S_UltratechFaction.txt
@@ -1,8 +1,11 @@
-UltratechFaction_AA
-Ultratech Faction
-AntimatterAnnihilation/UI/FactionIcon
-AntimatterAnnihilation/PreRendered/ReactorWithPropsBG
-The Ultratech faction is a new faction added to the world. They are very strong and pose a significant threat, but carry some of the essential items required for advanced crafting and construcion.
+ID: UltratechFaction_AA
+Title: Ultratech Faction
+Icon: AntimatterAnnihilation/UI/FactionIcon
+Background: AntimatterAnnihilation/PreRendered/ReactorWithPropsBG
+Description: The Ultratech faction is a new faction added to the world. They are very strong and pose a significant threat, but carry some of the essential items required for advanced crafting and construcion.
+RequiredResearch: Entry_AA
+
+ENDTAGS
 
 #!Who are they?#
 #The Ultratech are an inter-planetary conglomerate that posses the knowlege and technology to manipulate antimatter.

diff --git a/Wiki/English/Thing_AntimatterCanister_AA.txt b/Wiki/English/Thing_AntimatterCanister_AA.txt
@@ -1,3 +1,5 @@
+RequiredResearch:ParticleAccelerators_AA
+ENDTAGS
 
 #!How to produce#
 #Antimatter canisters are created in Particle Accelerators:#

diff --git a/Wiki/English/Thing_AntimatterComposite_AA.txt b/Wiki/English/Thing_AntimatterComposite_AA.txt
@@ -0,0 +1,5 @@
+RequiredResearch:R_AntimatterComposite_AA
+ENDTAGS
+
+#Manufactured using the Composite Refiner:#
+@CompositeRefiner_AA@
diff --git a/Wiki/English/Thing_AntimatterReactor_AA.txt b/Wiki/English/Thing_AntimatterReactor_AA.txt
@@ -1,5 +1,3 @@
-
-
 #!Setup#
 #There are 3 parts required to a working reactor setup:#
 @AntimatterReactor_AA:(this)@

diff --git a/Wiki/English/Thing_CompositeRefiner_AA.txt b/Wiki/English/Thing_CompositeRefiner_AA.txt
@@ -1,4 +1,3 @@
-
 #!How to set up#
 #2 <color=\#e0d290>Input Trays</color> must be built next to the Composite Refiner, as shown here:#
 $AntimatterAnnihilation/UI/CompositeRefinerTrays$

diff --git a/Wiki/English/Thing_DevastatorLMG_AA.txt b/Wiki/English/Thing_DevastatorLMG_AA.txt
@@ -0,0 +1,4 @@
+AlwaysSpoiler:true
+ENDTAGS
+
+#This gun cannot be crafted, and is only available as a rare drop from Ultratech raiders.#
diff --git a/Wiki/English/Thing_DevastatorSmartGun_AA.txt b/Wiki/English/Thing_DevastatorSmartGun_AA.txt
@@ -0,0 +1,4 @@
+AlwaysSpoiler:true
+ENDTAGS
+
+#This gun cannot be crafted, and is only available as a rare drop from Ultratech raiders.#
diff --git a/Wiki/English/Thing_HyperAlloy_AA.txt b/Wiki/English/Thing_HyperAlloy_AA.txt
@@ -0,0 +1,5 @@
+RequiredResearch:R_HyperAlloy_AA
+ENDTAGS
+
+#Manufactured using the Alloy Fusion Machine:#
+@AlloyFusionMachine_AA@
diff --git a/Wiki/English/Thing_HyperComponent_AA.txt b/Wiki/English/Thing_HyperComponent_AA.txt
@@ -0,0 +1,4 @@
+RequiredResearch:R_HyperComponents_AA
+ENDTAGS
+
+#This component cannot be crafted, and is only available as a rare drop from Ultratech raiders.#
diff --git a/Wiki/English/Thing_InputTray_AA.txt b/Wiki/English/Thing_InputTray_AA.txt
@@ -1,3 +1,3 @@
-
 #Used to input materials into various machines:#
-@CompositeRefiner_AA@
+@CompositeRefiner_AA@
+@AlloyFusionMachine_AA@
diff --git a/Wiki/English/Thing_Megumin_AA.txt b/Wiki/English/Thing_Megumin_AA.txt
@@ -1,4 +1,3 @@
-
 #!How it works#
 #It must not be under a roof, and it must have power and antimatter canisters stored in it.
 Once these conditions are met, simply target the desired area using the button.#

diff --git a/Wiki/English/Thing_ParticleAccelerator_AA.txt b/Wiki/English/Thing_ParticleAccelerator_AA.txt
@@ -1,4 +1,3 @@
-
 #!How to set up#
 #Simply build it somewhere in your colony, ideally in a place where it won't be destroyed by raiders.
 Your colonists will automatically haul Plasteel to fuel the accelerator once it has been built.#

diff --git a/Wiki/English/_WhatIsAntimatter.txt b/Wiki/English/_WhatIsAntimatter.txt
@@ -1,14 +1,17 @@
-WhatIsAntimatter_AA
-What is antimatter?
-AntimatterAnnihilation/Items/AntimatterCanister
-AntimatterAnnihilation/PreRendered/ReactorWithPropsBG
+ID: WhatIsAntimatter_AA
+Title: What is antimatter?
+Icon: AntimatterAnnihilation/Items/AntimatterCanister
+Background: AntimatterAnnihilation/PreRendered/ReactorWithPropsBG
+
+ENDTAGS
 
 #!What is it?#
 #<b>Antimatter is the opposite of regular matter</b>. For every particle, there is an anti-particle that has the <i>same mass</i> but <i>opposite charge</i>.#
 #When matter and antimatter come into contact, a reaction known as <i><color=\#db63d7>annihilation</color></i> occurs. The two particles are destroyed and a certain amount of energy is released, based on the equation <i>E=mc²</i>.#
 
 #!How do I make it?#
-#To create and store antimatter, you will need a <i><color=\#3468eb>particle accelerator</color></i>. This machine requires a lot of power and a constant supply of Plasteel, and will produce Antimatter Canisters.#
+#To create and store antimatter, you will need a <i><color=\#3468eb>particle accelerator</color></i>. This machine requires a lot of power and a constant supply of Plasteel, and will produce Antimatter Canisters.
+Research <i><b>Hack Ultratech database</b></i> and then <i><b>Particle accelerators</b></i> to get started.#
 
 #!What is it used for?#
 #Antimatter canisters can be used to create certain items and weapons.

diff --git a/Wiki/English/__Introduction.txt b/Wiki/English/__Introduction.txt
@@ -1,14 +1,16 @@
-Introduction_AA
-Introduction
-AntimatterAnnihilation/UI/FactionIcon
-AntimatterAnnihilation/PreRendered/ReactorWithPropsBG
+ID: Introduction_AA
+Title: Introduction
+Icon: AntimatterAnnihilation/UI/FactionIcon
+Background: AntimatterAnnihilation/PreRendered/ReactorWithPropsBG
+
+ENDTAGS
 
 #!Welcome to Antimatter Annihilation!#
 
 #This is an end-game mod that adds powerful items, weapons, defences and materials. It also adds a mysterious and powerful new faction, who will try to keep the secret of antimatter technology at any cost.#
-#This is the in-game wiki. It will guide you through the mod's steps and phases.#
+#This is the in-game wiki. It will give additional information about items and buildings. By default, pages are hidden to avoid 'spoilers'. This can be disabled if you want to see the entire contents of this mod.#
 
-#I recommend reading the <i>What Is Antimatter</i> page for a bit of a lore/science primer before you start.
-Otherwise, to get started see the <i>Getting Started</i> page.#
+#I recommend reading the <i>What Is Antimatter</i> page for a bit of a lore/science primer before you start.#
 ~WhatIsAntimatter_AA~
-~GettingStarted_AA~
+
+#The first step in this mod is researching <i><b>Hack Ultratech database</b></i>.#