From 330608667a48b38a74666999596626bdb9478e9e Mon Sep 17 00:00:00 2001
From: sigonasr2 <sigonasr2@gmail.com>
Date: Sun, 28 Apr 2024 22:33:34 -0500
Subject: [PATCH] Update distribution and release build scripts to not stop on
 failed removals for demo branch. Update .gitignore (google drive desktop.ini
 files)

---
 .gitignore                             |   4 +++-
 Adventures in Lestoria/Version.h       |   2 +-
 distribute.ps1                         |  11 +++++++----
 emscripten_build.ps1                   |   2 +-
 emscripten_debug_build.ps1             |   2 +-
 x64/Release/Adventures in Lestoria.exe | Bin 3595264 -> 3595264 bytes
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 16ba4891..0ae42b62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -400,4 +400,6 @@ test.cpp
 /x64/Release/Adventures in Lestoria.zip
 /x64/Release/Adventures in Lestoria_web.zip
 /x64/Release/AdventuresInLestoria_web.zip
-packkey.cpp
\ No newline at end of file
+packkey.cpp
+desktop.ini
+.tmp.driveupload
\ No newline at end of file
diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h
index dca7cc7f..45bb2936 100644
--- a/Adventures in Lestoria/Version.h	
+++ b/Adventures in Lestoria/Version.h	
@@ -39,7 +39,7 @@ All rights reserved.
 #define VERSION_MAJOR 1
 #define VERSION_MINOR 2
 #define VERSION_PATCH 2
-#define VERSION_BUILD 8952
+#define VERSION_BUILD 8953
 
 #define stringify(a) stringify_(a)
 #define stringify_(a) #a
diff --git a/distribute.ps1 b/distribute.ps1
index a85334c7..439aec67 100644
--- a/distribute.ps1
+++ b/distribute.ps1
@@ -1,14 +1,12 @@
 git update-index --assume-unchanged "Adventures in Lestoria/packkey.cpp"
+$ErrorActionPreference= 'silentlycontinue'
 rm -R bin
 mkdir bin
 mkdir bin/assets
-$ErrorActionPreference = "Stop"
 cp -R "Adventures in Lestoria/assets/Campaigns" bin/assets
 cp -R "Adventures in Lestoria/assets/config" bin/assets
 cp -R "Adventures in Lestoria/assets/maps" bin/assets
 cp -R "Adventures in Lestoria/assets/backgrounds" bin/assets
-rm -R bin/assets/backgrounds/commercial_assets
-rm -R bin/assets/maps/commercial_assets
 cp -R "Adventures in Lestoria/assets/monsters" bin/assets
 cp -R "Adventures in Lestoria/assets/music" bin/assets
 cp -R "Adventures in Lestoria/assets/npcs" bin/assets
@@ -18,6 +16,11 @@ cp -R "Adventures in Lestoria/assets/gamepack.pak" bin/assets
 cp -R "Adventures in Lestoria/assets/*.ttf" bin/assets
 cp -R "Adventures in Lestoria/controller_config" bin
 
+rm -R bin/assets/backgrounds/commercial_assets
+rm -R bin/assets/maps/commercial_assets
+rm -R bin/assets/monsters/commercial_assets
 
 cp -R "x64/Release/*" bin
-rm bin/*.pdb
\ No newline at end of file
+rm bin/*.pdb
+Write-Host -NoNewLine 'Press any key to continue...';
+$null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown');
\ No newline at end of file
diff --git a/emscripten_build.ps1 b/emscripten_build.ps1
index f05cdbc6..9421f9db 100755
--- a/emscripten_build.ps1
+++ b/emscripten_build.ps1
@@ -3,7 +3,7 @@ clear
 rm -R bin
 mkdir bin
 mkdir bin/assets
-$ErrorActionPreference = "Stop"
+
 cp -R 'Adventures in Lestoria/buildtemplate.html' bin/index.html
 cp -R "Adventures in Lestoria/assets/Campaigns" bin/assets
 cp -R "Adventures in Lestoria/assets/config" bin/assets
diff --git a/emscripten_debug_build.ps1 b/emscripten_debug_build.ps1
index c04d2c7d..a187eee9 100644
--- a/emscripten_debug_build.ps1
+++ b/emscripten_debug_build.ps1
@@ -3,7 +3,7 @@ clear
 rm -R bin
 mkdir bin
 mkdir bin/assets
-$ErrorActionPreference = "Stop"
+
 cp -R 'Adventures in Lestoria/buildtemplate.html' bin/index.html
 cp -R "Adventures in Lestoria/assets/Campaigns" bin/assets
 cp -R "Adventures in Lestoria/assets/config" bin/assets
diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe
index 17802fc79fe8566f4baafb0caa54fd6b732d6e91..fc490e9d66da004ad3fa25655fc22e86568d1edc 100644
GIT binary patch
delta 334
zcmYMuy-vbl6vpwsErQjGiWNiz6%@gj()zg&uEAb`#Knn3FMxqWV+RIo9C`)rPSgSJ
zf!#?*(;IN(-=Xm&zvSe3&TxjGUt)-lhS2(k{Un7aMNEZ;6qb-i2Fsxo`uDH;R}FeU
zDckEtI##d>18c})9UIt04qGs>jXVn2K@qzsVGm_gu#W>AqKX=haEv-m&_FZnMyG{&
zhxhLlM#Uorx0W(+tvFJW&R{nY(MA7VFrLbyo*ZR^yLad2WhN)H*6W*i_I%eu8#WxA
P;T#vZ#8v3K*AJrwy^eE&

delta 334
zcmYMuJ5B;&6o%pX2NVX7n<(Io`$c|7?ly)sI4jW5(82<yAR%EwEQDCh3hb>M5@iqe
zR#=)@0HrSl;UrIT@_nZ`<K>SS<Gm_8pR>|L3QLMD6&`qTfJ6A;ccjqPf9fW0KmB^^
zR?pQCKoB7uA&dy3h#`(+ByfULB#}ZIXE?_NE^&nnvdAHi0*WZ1j0&o_c6x3t`F+p(
z1BFpBg88T`rlD^mW!Ht+6L9I=eP_RX$+WgR3fuj+#=~?aKUO#MS5dPThK^g*(LfU|
Nw9!G=Sr~W2=YPANcJTlJ