From ae8a9fc44c1feff2a6af1fb2b3147e0047b3f631 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Tue, 30 Jan 2024 18:30:42 +0100
Subject: [PATCH] This is more error resistant

---
 install/tools/7-finish.php |  3 +++
 system/migrations/31.php   | 39 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/install/tools/7-finish.php b/install/tools/7-finish.php
index f9c50671..2ea3c3da 100644
--- a/install/tools/7-finish.php
+++ b/install/tools/7-finish.php
@@ -67,6 +67,9 @@ require_once SYSTEM . 'migrations/22.php';
 require_once SYSTEM . 'migrations/27.php';
 require_once SYSTEM . 'migrations/30.php';
 
+// new monster columns
+require_once SYSTEM . 'migrations/31.php';
+
 if(ModelsFAQ::count() == 0) {
 	ModelsFAQ::create([
 		'question' => 'What is this?',
diff --git a/system/migrations/31.php b/system/migrations/31.php
index 744ba21f..8dadb817 100644
--- a/system/migrations/31.php
+++ b/system/migrations/31.php
@@ -2,17 +2,56 @@
 
 if(!$db->hasColumn(TABLE_PREFIX . 'monsters', 'elements')) {
 	$db->exec("ALTER TABLE `" . TABLE_PREFIX . "monsters`  ADD `elements` TEXT NOT NULL AFTER `immunities`;");
+}
+
+if(!$db->hasColumn(TABLE_PREFIX . 'monsters', 'pushable')) {
 	$db->exec("ALTER TABLE `" . TABLE_PREFIX . "monsters`  ADD `pushable` TINYINT(1) NOT NULL DEFAULT '0' AFTER `convinceable`;");
+}
+
+if(!$db->hasColumn(TABLE_PREFIX . 'monsters', 'canpushitems')) {
 	$db->exec("ALTER TABLE `" . TABLE_PREFIX . "monsters`  ADD `canpushitems` TINYINT(1) NOT NULL DEFAULT '0' AFTER `pushable`;");
+}
+
+if(!$db->hasColumn(TABLE_PREFIX . 'monsters', 'canpushcreatures')) {
 	$db->exec("ALTER TABLE `" . TABLE_PREFIX . "monsters`  ADD `canpushcreatures` TINYINT(1) NOT NULL DEFAULT '0' AFTER `canpushitems`;");
+}
+
+if(!$db->hasColumn(TABLE_PREFIX . 'monsters', 'canwalkonenergy')) {
 	$db->exec("ALTER TABLE `" . TABLE_PREFIX . "monsters`  ADD `canwalkonenergy` TINYINT(1) NOT NULL DEFAULT '0' AFTER `canpushitems`;");
+}
+
+if(!$db->hasColumn(TABLE_PREFIX . 'monsters', 'canwalkonpoison')) {
 	$db->exec("ALTER TABLE `" . TABLE_PREFIX . "monsters`  ADD `canwalkonpoison` TINYINT(1) NOT NULL DEFAULT '0' AFTER `canwalkonenergy`;");
+}
+
+if(!$db->hasColumn(TABLE_PREFIX . 'monsters', 'canwalkonfire')) {
 	$db->exec("ALTER TABLE `" . TABLE_PREFIX . "monsters`  ADD `canwalkonfire` TINYINT(1) NOT NULL DEFAULT '0' AFTER `canwalkonpoison`;");
+}
+
+if(!$db->hasColumn(TABLE_PREFIX . 'monsters', 'runonhealth')) {
 	$db->exec("ALTER TABLE `" . TABLE_PREFIX . "monsters`  ADD `runonhealth` TINYINT(1) NOT NULL DEFAULT '0' AFTER `canwalkonfire`;");
+}
+
+if(!$db->hasColumn(TABLE_PREFIX . 'monsters', 'hostile')) {
 	$db->exec("ALTER TABLE `" . TABLE_PREFIX . "monsters`  ADD `hostile` TINYINT(1) NOT NULL DEFAULT '0' AFTER `runonhealth`;");
+}
+
+if(!$db->hasColumn(TABLE_PREFIX . 'monsters', 'attackable')) {
 	$db->exec("ALTER TABLE `" . TABLE_PREFIX . "monsters`  ADD `attackable` TINYINT(1) NOT NULL DEFAULT '0' AFTER `hostile`;");
+}
+
+if(!$db->hasColumn(TABLE_PREFIX . 'monsters', 'rewardboss')) {
 	$db->exec("ALTER TABLE `" . TABLE_PREFIX . "monsters`  ADD `rewardboss` TINYINT(1) NOT NULL DEFAULT '0' AFTER `attackable`;");
+}
+
+if(!$db->hasColumn(TABLE_PREFIX . 'monsters', 'defense')) {
 	$db->exec("ALTER TABLE `" . TABLE_PREFIX . "monsters`  ADD `defense` INT(11) NOT NULL DEFAULT '0' AFTER `rewardboss`;");
+}
+
+if(!$db->hasColumn(TABLE_PREFIX . 'monsters', 'armor')) {
 	$db->exec("ALTER TABLE `" . TABLE_PREFIX . "monsters`  ADD `armor` INT(11) NOT NULL DEFAULT '0' AFTER `defense`;");
+}
+
+if(!$db->hasColumn(TABLE_PREFIX . 'monsters', 'summons')) {
 	$db->exec("ALTER TABLE `" . TABLE_PREFIX . "monsters`  ADD `summons` TEXT NOT NULL AFTER `loot`;");
 }