From 9b659f72d64c9732eedef5bd80a1e3a1bfd44c27 Mon Sep 17 00:00:00 2001
From: Regalis <regalis@undertowgames.com>
Date: Mon, 30 May 2016 18:28:42 +0300
Subject: [PATCH] - fixed fulgurium batteries not working with flashlights or
 sonars and never running out in scooters

---
 Subsurface/Barotrauma.csproj                    | 2 +-
 Subsurface/Content/Items/Diving/divinggear.xml  | 2 +-
 Subsurface/Content/Items/Tools/tools.xml        | 4 ++--
 Subsurface/Data/ContentPackages/Vanilla 0.3.xml | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Subsurface/Barotrauma.csproj b/Subsurface/Barotrauma.csproj
index 0e6cb6166..4b40ce47b 100644
--- a/Subsurface/Barotrauma.csproj
+++ b/Subsurface/Barotrauma.csproj
@@ -342,7 +342,7 @@
     <Content Include="Content\BackgroundSprites\vegetation2.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Characters\Coelanth\Coelanth.png">
+    <Content Include="Content\Characters\Coelanth\coelanth.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Content\Characters\Coelanth\coelanth.xml">
diff --git a/Subsurface/Content/Items/Diving/divinggear.xml b/Subsurface/Content/Items/Diving/divinggear.xml
index 2b3e84607..8280ae83c 100644
--- a/Subsurface/Content/Items/Diving/divinggear.xml
+++ b/Subsurface/Content/Items/Diving/divinggear.xml
@@ -131,7 +131,7 @@
 
     <Propulsion force="80" usablein="water" particles="bubbles">
       <RequiredItems name="Battery Cell,Fulgurium Battery Cell" type="Contained" msg="Battery Cell required"/>
-      <StatusEffect type="OnUse" target="Contained" targetnames="Battery Cell" Condition="-1.0"/>
+      <StatusEffect type="OnUse" target="Contained" Condition="-1.0"/>
       <sound file="scooter.ogg" type="OnUse" range="500.0" loop="true"/>
 
       <LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.2" range="800">
diff --git a/Subsurface/Content/Items/Tools/tools.xml b/Subsurface/Content/Items/Tools/tools.xml
index b2f965c69..f5a77a507 100644
--- a/Subsurface/Content/Items/Tools/tools.xml
+++ b/Subsurface/Content/Items/Tools/tools.xml
@@ -207,7 +207,7 @@
     </Radar>
 
     <ItemContainer capacity="1" hideitems="true">
-      <Containable name="Battery Cell">
+      <Containable name="Battery Cell, Fulgurium Battery Cell">
         <StatusEffect type="OnContaining" target="This" Voltage="1.0" setvalue="true"/>
       </Containable>
     </ItemContainer>
@@ -239,7 +239,7 @@
     </LightComponent>
     
     <ItemContainer capacity="1" hideitems="true">
-      <Containable name="Battery Cell">
+      <Containable name="Battery Cell, Fulgurium Battery Cell">
         <StatusEffect type="OnContaining" target="This" Voltage="1.0" setvalue="true"/>
       </Containable>
     </ItemContainer>
diff --git a/Subsurface/Data/ContentPackages/Vanilla 0.3.xml b/Subsurface/Data/ContentPackages/Vanilla 0.3.xml
index ab80e3e5d..2e2d2444c 100644
--- a/Subsurface/Data/ContentPackages/Vanilla 0.3.xml	
+++ b/Subsurface/Data/ContentPackages/Vanilla 0.3.xml	
@@ -32,6 +32,8 @@
   <Item file="Content/Items/Weapons/weapons.xml" />
   <Character file="Content/Characters/Crawler/crawler.xml" />
   <Character file="Content/Characters/Endworm/endworm.xml" />
+  <Character file="Content/Characters/Fractalguardian/fractalguardian.xml" />
+  <Character file="Content/Characters/Fractalguardian2/fractalguardian2.xml" /> 
   <Character file="Content/Characters/Human/human.xml" />
   <Character file="Content/Characters/Husk/husk.xml" />
   <Character file="Content/Characters/Mantis/mantis.xml" />