From 5783f74075b6e946cb4f13c832db836dffb34fcc Mon Sep 17 00:00:00 2001
From: Daniel Ceregatti <Daniel.Ceregatti@PolicyMap.com>
Date: Fri, 17 Nov 2023 18:00:30 -0800
Subject: [PATCH] The installation instructions for Winter Deer Isle have
 changed. Merging. See
 https://steamcommunity.com/sharedfiles/filedetails/?id=1891132304. Make it so
 the DEVELOPMENT environment variable doesn't prevent the file actions when
 DONT_START is set.

---
 files/custom/README.md                 |  4 +--
 files/mods/1891132304/cfggameplay.json |  4 +--
 files/mods/1891132304/cfgweather.xml   | 27 ++++++++++++++++++++
 files/mods/1891132304/init.c           | 35 ++++++++++----------------
 files/mods/1891132304/xml.env          |  2 +-
 server/bin/dz                          |  2 +-
 6 files changed, 46 insertions(+), 28 deletions(-)
 create mode 100644 files/mods/1891132304/cfgweather.xml

diff --git a/files/custom/README.md b/files/custom/README.md
index da68a95..8c5b3c8 100644
--- a/files/custom/README.md
+++ b/files/custom/README.md
@@ -100,8 +100,8 @@ docker compose exec server bash
 Copy the custom integration directory:
 
 ```shell
-cd /profiles/custom
-cp -a /files/custom/starting-gear .
+mkdir -p /profiles/custom
+cp -a /files/custom/starting-gear /profiles/custom/
 ```
 
 Restart the server.
diff --git a/files/mods/1891132304/cfggameplay.json b/files/mods/1891132304/cfggameplay.json
index 5583ea2..aa8ae87 100644
--- a/files/mods/1891132304/cfggameplay.json
+++ b/files/mods/1891132304/cfggameplay.json
@@ -1,6 +1,6 @@
 {
   "WorldsData":{
-    "environmentMinTemps": [-25.0, -20.0, -21.0, -14.0,  -7.0,  -4.0,  -2.0,   2.0,  -3.0,  -7.0, -15.0, -20.0],
-    "environmentMaxTemps": [-8.0, -8.0, -3.0, 0.0, 2.0, 5.0, 7.0, 11.0, 8.0, 5.0, 2.0, -3.0]
+    "environmentMinTemps": [-7.0, -5.0, -3.0, -2.0, 0.0, 2.0, 5.0, 10.0, 7.0, 5.0, 1.0, -2.0],
+    "environmentMaxTemps": [-3.0, -1.0, 2.0, 5.0, 7.0, 10.0, 12.0, 16.0, 13.0, 10.0, 7.0, 2.0],
   }
 }
diff --git a/files/mods/1891132304/cfgweather.xml b/files/mods/1891132304/cfgweather.xml
new file mode 100644
index 0000000..1860627
--- /dev/null
+++ b/files/mods/1891132304/cfgweather.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<weather reset="1" enable="1">
+    <overcast>
+        <current actual="0.10" time="900" duration="1200" />
+        <limits min="0.6" max="1.0" />
+        <timelimits min="900" max="1800" />
+        <changelimits min="0.1" max="0.3" />
+    </overcast>
+    <fog>
+        <current actual="0.0" time="0" duration="0" />
+        <limits min="0.0" max="0.0" />
+        <timelimits min="0" max="0" />
+        <changelimits min="0.0" max="0.0" />
+    </fog>
+    <rain>
+        <current actual="0.2" time="120" duration="240" />
+        <limit min="0.1" max="1.0" />
+        <timelimits min="120" max="240" />
+        <changelimits min="0.0" max="0.1" />
+        <thresholds min="0.6" max="1.0" end="10" />
+    </rain>
+    <wind>
+        <maxspeed>13</maxspeed>
+        <params min="0.0" max="0.6" frequency="30" />
+    </wind>
+    <storm density="0.0" threshold="1.0" timeout="0"/>
+</weather>
\ No newline at end of file
diff --git a/files/mods/1891132304/init.c b/files/mods/1891132304/init.c
index edc4e3a..5003c03 100644
--- a/files/mods/1891132304/init.c
+++ b/files/mods/1891132304/init.c
@@ -1,6 +1,6 @@
---- init.c	2023-11-11 00:41:20.472220009 +0000
-+++ init.c.new	2023-11-11 00:42:32.432098018 +0000
-@@ -1,47 +1,19 @@
+--- init.c	2023-11-17 20:59:30.977503823 +0000
++++ init.c.new	2023-11-17 21:01:06.501035495 +0000
+@@ -1,46 +1,18 @@
  void main()
  {
 -	//INIT WEATHER BEFORE ECONOMY INIT------------------------
@@ -25,17 +25,13 @@
 +	GetGame().GetWorld().GetDate( year, month, day, hour, minute );
  
 -	if ((month == reset_month) && (day < reset_day))
+-	{
+-		GetGame().GetWorld().SetDate(year, reset_month, reset_day, hour, minute);
+-	}
+-	else
 +	//Change here the dates for whatever months you desire
 +	if ( month < 12 )
  	{
--		GetGame().GetWorld().SetDate(year, reset_month, reset_day, hour, minute);
-+		year = 2011;
-+		month = 12;
-+		day = 25;
-+		GetGame().GetWorld().SetDate( year, month, day, hour, minute );
- 	}
--	else
--	{
 -		if ((month == reset_month + 1) && (day > reset_day))
 -		{
 -			GetGame().GetWorld().SetDate(year, reset_month, reset_day, hour, minute);
@@ -47,21 +43,16 @@
 -				GetGame().GetWorld().SetDate(year, reset_month, reset_day, hour, minute);
 -			}
 -		}
--	}
++		year = 2011;
++		month = 12;
++		day = 25;
++		GetGame().GetWorld().SetDate( year, month, day, hour, minute );
+ 	}
 -	
 -    //CEApi TestHive = GetCEApi();
 -    //TestHive.ExportProxyProto();
 -    //TestHive.ExportProxyData( "8096 0 8096", 16384 );
 -    //TestHive.ExportClusterData() ;	  	
--}
-+} 
+ }
  
  class CustomMission: MissionServer
- {
-@@ -108,4 +80,4 @@
- Mission CreateCustomMission(string path)
- {
- 	return new CustomMission();
--}
-\ No newline at end of file
-+}
diff --git a/files/mods/1891132304/xml.env b/files/mods/1891132304/xml.env
index 2874aad..6e90116 100644
--- a/files/mods/1891132304/xml.env
+++ b/files/mods/1891132304/xml.env
@@ -1,3 +1,3 @@
 INIT=local
 CFGGAMEPLAY=local
-CFGWEATHER=https://pastebin.com/raw/t2CUHdMn
\ No newline at end of file
+CFGWEATHER=local
\ No newline at end of file
diff --git a/server/bin/dz b/server/bin/dz
index b23e712..84f8033 100755
--- a/server/bin/dz
+++ b/server/bin/dz
@@ -313,7 +313,7 @@ mergexml(){
 # Start the server in the foreground
 start(){
 	# If we're developing, just block the container
-	if [[ ${DEVELOPMENT} = "1" ]]
+	if [[ ${DEVELOPMENT} = "1" ]] && [[ ${DONT_START} = "" ]]
 	then
 		echo "DEVELOPMENT mode, blocking. Unset DEVELOPMENT in the current environment to run the server."
 		trap '