From 2879b1ce1b13e0ece3267e90b7dd349290b4efaa Mon Sep 17 00:00:00 2001
From: CommonLoon102 <321850+CommonLoon102@users.noreply.github.com>
Date: Sat, 1 Feb 2020 22:50:59 +0000
Subject: [PATCH] update Ira mod (#15)

* update twoira mod

* fix linux paths
---
 Common/Constants.cs                  |  8 +++++++-
 README.md                            | 16 +++++++++++-----
 WebInterface/Views/Home/Index.cshtml | 23 ++++++++++++++++-------
 3 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/Common/Constants.cs b/Common/Constants.cs
index cde07d3..367f506 100644
--- a/Common/Constants.cs
+++ b/Common/Constants.cs
@@ -1,6 +1,7 @@
 using Model;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Text;
 
 namespace Common
@@ -9,12 +10,17 @@ namespace Common
     {
         public const long FileSizeLimit = 1024 * 1024;
 
+        private const string workingDirectory = "WD";
+        private static readonly string iraArt = Path.Combine(workingDirectory, "IRA");
+        private static readonly string iraRff = Path.Combine(workingDirectory, "BLOOD.RFF");
+        private static readonly string iraSound = Path.Combine(workingDirectory, "SOUNDS.RFF");
+
         public static readonly IReadOnlyDictionary<string, Mod> SupportedMods = new Dictionary<string, Mod>()
         {
             { "BLOOD", new Mod("BLOOD", "Blood", "") },
             { "CRYPTIC", new Mod("CRYPTIC", "Cryptic Passage", "-ini CRYPTIC.INI") },
             { "DW", new Mod("DW", "Death Wish", "-ini dw.ini") },
-            { "TWOIRA", new Mod("TWOIRA", "The Way of Ira", "-ini TWOIRA/twoira.ini -j=TWOIRA") },
+            { "TWOIRA", new Mod("TWOIRA", "The Way of Ira", $"-game_dir IRA -ini ira.ini -art {iraArt} -rff {iraRff} -snd {iraSound}") },
         };
     }
 }
diff --git a/README.md b/README.md
index 3692e98..2847e15 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ After you start the container, the following will happen:
 2. Download the Dockerfile: `wget https://raw.githubusercontent.com/CommonLoon102/NBloodServerSupervisor/master/Dockerfile --directory-prefix=supervisor`
 3. Build the Docker image: `sudo docker build --build-arg CACHEBUST=$(date +%s) -t nblood-supervisor:latest supervisor`
 4. Navigate to your Blood 1.21 directory where you have the below files.
-The files are from stock Blood 1.21, Cryptic Passage, Death Wish 1.6.10 and The Way of Ira 1.0.1
+The files are from stock Blood 1.21, Cryptic Passage, Death Wish 1.6.10 and The Way of Ira 1.0.2.4
 - BLOOD.INI
 - BLOOD.RFF
 - CP01.MAP-CP09.MAP
@@ -52,10 +52,12 @@ The files are from stock Blood 1.21, Cryptic Passage, Death Wish 1.6.10 and The
 - SOUNDS.RFF
 - SURFACE.DAT
 - TILES000.ART-TILES017.ART
-- TWOIRA (folder, see below)
+- IRA (folder, see below)
 - VOXEL.DAT
 
-You need a folder in your Blood folder, named `TWOIRA`, and inside that, these files:
+You need a folder in your Blood folder, named `IRA`, and inside that, these files:
+- WD (folder, see below)
+- ira.ini
 - IRA01.MAP
 - IRA02_A.MAP
 - IRA02_B.MAP
@@ -66,8 +68,12 @@ You need a folder in your Blood folder, named `TWOIRA`, and inside that, these f
 - IRA07.MAP
 - IRA08.MAP
 - SURFACE.DAT
-- TILES18.ART
-- twoira.ini
+- VOXEL.DAT
+
+Inside `WD`:
+ - BLOOD.RFF
+ - IRA000.ART-IRA018.ART
+ - SOUNDS.RFF
 
 5. Run a Docker container from there: `sudo docker run --volume "$PWD":/supervisor/publish/blood --network=host --detach nblood-supervisor`
 6. Optional: You can see the ApiKey here:
diff --git a/WebInterface/Views/Home/Index.cshtml b/WebInterface/Views/Home/Index.cshtml
index 8524711..4d95c48 100644
--- a/WebInterface/Views/Home/Index.cshtml
+++ b/WebInterface/Views/Home/Index.cshtml
@@ -104,6 +104,7 @@
     <h2>@dw 1.6.10</h2>
     <details>
         <summary>Show @dw <span class="bolder">version 1.6.10</span> servers</summary>
+        <p><a href="https://www.moddb.com/mods/death-wish-for-blood/downloads/death-wish-160-updated-10-31-19" target="_blank" rel="nofollow noreferrer noopener">Download @dw from here</a></p>
         <p>The below files must be in your Blood directory:</p>
         <ul>
             <li>dw.ini</li>
@@ -115,15 +116,24 @@
         @ListServers(@dw)
     </details>
     <br />
-    <h2>@twoira 1.0.1</h2>
+    <h2>@twoira 1.0.2.4</h2>
     <details>
-        <summary>Show @twoira <span class="bolder">version 1.0.1</span> servers</summary>
-        <p>@twoira </p>
-        <p>The below folder (TWOIRA) must be in your Blood directory, and inside that the other additional files:</p>
+        <summary>Show @twoira <span class="bolder">version 1.0.2.4</span> servers</summary>
+        <p><a href="https://www.moddb.com/mods/the-way-of-ira/downloads/the-way-of-ira-twoira-v102-an-episode-for-blood" target="_blank" rel="nofollow noreferrer noopener">Download @twoira from here</a></p>
+        <p>The below folder (IRA) must be in your Blood directory, and inside that the other additional files and folders:</p>
         <ul>
-            <li>TWOIRA</li>
             <li>
+                IRA
                 <ul>
+                    <li>
+                        WD
+                        <ul>
+                            <li>BLOOD.RFF</li>
+                            <li>IRA000.ART-IRA018.ART</li>
+                            <li>SOUNDS.RFF</li>
+                        </ul>
+                    </li>
+                    <li>ira.ini</li>
                     <li>IRA01.MAP</li>
                     <li>IRA02_A.MAP</li>
                     <li>IRA02_B.MAP</li>
@@ -134,8 +144,7 @@
                     <li>IRA07.MAP</li>
                     <li>IRA08.MAP</li>
                     <li>SURFACE.DAT</li>
-                    <li>TILES18.ART</li>
-                    <li>twoira.ini</li>
+                    <li>VOXEL.DAT</li>
                 </ul>
             </li>
         </ul>