From d53c5bc12c7f69f7a28a408111ae2c818b25c7ea Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Sat, 16 May 2020 10:25:06 -0500
Subject: [PATCH] Add and sadly hardcode our terraria servers

---
 ec2.yml                          | 41 +++++++++++++++++++++++++++++---
 roles/terraria/defaults/main.yml |  1 +
 roles/terraria/tasks/main.yml    |  2 +-
 3 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/ec2.yml b/ec2.yml
index 8a7812e..c0d4c3b 100644
--- a/ec2.yml
+++ b/ec2.yml
@@ -88,13 +88,48 @@
   roles:
     - role: terraria
       vars:
-        terraria_name: "vanilla1"
-        terraria_zip: "https://terraria.org/server/terraria-server-1344.zip"
+        terraria_name: "1401-main"
         terraria_password: "dicks"
         terraria_worldsize: 3
         terraria_motd: "New major release edition"
-        terraria_worldname: "Blitzballs"
+        terraria_worldname: "The Home Base"
         terraria_port: 7777
+        terraria_difficulty: 0
+    - role: terraria
+      vars:
+        terraria_name: "1401-farm-normal1"
+        terraria_password: "dicks"
+        terraria_worldsize: 3
+        terraria_motd: "New major release edition"
+        terraria_worldname: "Farman - Normal 1"
+        terraria_port: 7778
+        terraria_difficulty: 0
+    - role: terraria
+      vars:
+        terraria_name: "1401-farm-normal2"
+        terraria_password: "dicks"
+        terraria_worldsize: 3
+        terraria_motd: "New major release edition"
+        terraria_worldname: "Farman - Normal 2"
+        terraria_port: 7779
+        terraria_difficulty: 0
+    - role: terraria
+      vars:
+        terraria_name: "1401-farm-expert1"
+        terraria_password: "dicks"
+        terraria_worldsize: 3
+        terraria_motd: "New major release edition"
+        terraria_worldname: "Farman - Expert 1"
+        terraria_port: 7780
+        terraria_difficulty: 1
+    - role: terraria
+      vars:
+        terraria_name: "1401-farm-expert2"
+        terraria_password: "dicks"
+        terraria_worldsize: 3
+        terraria_motd: "New major release edition"
+        terraria_worldname: "Farman - Expert 2"
+        terraria_port: 7781
         terraria_difficulty: 1
 - hosts: tag_minecraft_ultreload
   roles:
diff --git a/roles/terraria/defaults/main.yml b/roles/terraria/defaults/main.yml
index d6aebe6..82f618c 100644
--- a/roles/terraria/defaults/main.yml
+++ b/roles/terraria/defaults/main.yml
@@ -4,3 +4,4 @@ terraria_port: 7777
 terraria_root: "/var/terraria"
 terraria_worldname: "World"
 terraria_worldsize: 3
+terraria_zip: "https://terraria.org/system/dedicated_servers/archives/000/000/033/original/terraria-server-1401.zip"
diff --git a/roles/terraria/tasks/main.yml b/roles/terraria/tasks/main.yml
index 77e354d..43cbfca 100644
--- a/roles/terraria/tasks/main.yml
+++ b/roles/terraria/tasks/main.yml
@@ -54,7 +54,7 @@
             remote_src: yes
             dest: "{{ terraria_root }}/{{ terraria_name }}"
         - name: Move zip contents
-          shell: mv "{{ terraria_root }}/{{ terraria_name }}/Dedicated Server/Linux/"* "{{ terraria_root }}/{{ terraria_name }}"
+          shell: mv "{{ terraria_root }}/{{ terraria_name }}/1401/Linux/"* "{{ terraria_root }}/{{ terraria_name }}"
         - name: Mark executable
           file:
             path: "{{ terraria_root }}/{{ terraria_name }}/TerrariaServer.bin.x86_64"