From 8878f021d05e84dc62cd3d1eb642b353d2e7365f Mon Sep 17 00:00:00 2001
From: ketmar <ketmar@ketmar.no-ip.org>
Date: Tue, 28 Aug 2018 04:18:21 +0000
Subject: [PATCH] sceptre and alienboss psychic waves now makes shopkeepers
 angry

FossilOrigin-Name: 5b748613636c5ac292566909dc157956c8c365cd09b233c41a05b53b6d72888c
---
 mapent/enemies/alienboss.vc | 3 +++
 mapent/weapons/sceptre.vc   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/mapent/enemies/alienboss.vc b/mapent/enemies/alienboss.vc
index 78e0922..c79d8d4 100644
--- a/mapent/enemies/alienboss.vc
+++ b/mapent/enemies/alienboss.vc
@@ -603,6 +603,9 @@ override void thinkFrame () {
   level.isObjectInRect(x0, y0, width, height, delegate bool (MapObject o) {
     if (o isa EnemyAlienBoss) return false;
     if (/*o.dead ||*/ o.invincible) return false;
+    // shopkeeper
+    auto scp = MonsterShopkeeper(o);
+    if (scp && !scp.angered) scp.status = ATTACK;
     // damsel
     auto dms = MonsterDamsel(o);
     if (dms) {
diff --git a/mapent/weapons/sceptre.vc b/mapent/weapons/sceptre.vc
index 8393266..c05a180 100644
--- a/mapent/weapons/sceptre.vc
+++ b/mapent/weapons/sceptre.vc
@@ -168,6 +168,9 @@ override void thinkFrame () {
   level.isObjectInRect(x0, y0, width, height, delegate bool (MapObject o) {
     if (o isa EnemyAlienBoss) return false;
     if (/*o.dead ||*/ o.invincible) return false;
+    // shopkeeper
+    auto scp = MonsterShopkeeper(o);
+    if (scp && !scp.angered) scp.status = ATTACK;
     // damsel
     auto dms = MonsterDamsel(o);
     if (dms) {
-- 
2.11.4.GIT