Rail ammo fix

dolkensp · Mar 10, 2016 · f232fcc · f232fcc
1 parent e45ebd2
commit f232fcc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/HoloXPLOR/Scripts/holoxplor.ship.js b/HoloXPLOR/Scripts/holoxplor.ship.js
@@ -346,9 +346,11 @@ $(document).ready(function () {
 
                             equippedData.Ammo  = ammoMap[equippedData.FireMode.Fire.AmmoType || equippedData.AmmoType[0]] ||
                                                  ammoMap[(inventoryMap[equippedData.FireMode.Fire.AmmoType || equippedData.AmmoType[0]] || { AmmoBox: {} }).AmmoBox.AmmoType] ||
+                                                 ammoMap[(equippedData.AmmoType[0] || '').replace('Ammo_Rail_', '') + '_Rail_AMMO'] ||
                                                  ammoMap[(equippedData.AmmoType[0] || '').replace('Ammo_', '') + '_AMMO'] || {};
                             availableData.Ammo = ammoMap[availableData.FireMode.Fire.AmmoType || availableData.AmmoType[0]] ||
                                                  ammoMap[(inventoryMap[availableData.FireMode.Fire.AmmoType || availableData.AmmoType[0]] || { AmmoBox: {} }).AmmoBox.AmmoType] ||
+                                                 ammoMap[(equippedData.AmmoType[0] || '').replace('Ammo_Rail_', '') + '_Rail_AMMO'] ||
                                                  ammoMap[(availableData.AmmoType[0] || '').replace('Ammo_', '') + '_AMMO'] || {};
 
                             equippedData.Ammo.Explosion = equippedData.Ammo.Explosion || {};

diff --git a/HoloXPLOR/Views/Home/Index.cshtml b/HoloXPLOR/Views/Home/Index.cshtml
@@ -2,9 +2,9 @@
     ViewBag.Title = "Home Page";
 }
 
-<div class="alert alert-danger" role="alert">
+<!--<div class="alert alert-danger" role="alert">
     <strong>IMPORTANT:</strong> If you're playing on the live server, you need to use <a href="https://holoxplor.space" class="alert-link">holoxplor.space</a>
-</div>
+</div>-->
 
 <div class="jumbotron js-upload-inventory">
     <h1>HoloXPLOR - 2.2.1</h1>

diff --git a/HoloXPLOR/Views/Shared/_Layout.cshtml b/HoloXPLOR/Views/Shared/_Layout.cshtml
@@ -76,7 +76,7 @@
             </div>
             <div class="navbar-collapse collapse">
                 <ul class="nav navbar-nav">
-                    <li><a href="https://holoxplor.space"><span class="glyphicon glyphicon-bell"></span> Live Version</a></li>
+                    <!--<li><a href="https://holoxplor.space"><span class="glyphicon glyphicon-bell"></span> Live Version</a></li>-->
                     @if (!String.IsNullOrWhiteSpace(ViewBag.ID))
                     {
                         if (ViewBag.Title != "Hangar")