From e6f679c4e283519e9ea8c1bd3e9cbb76a5b05f3d Mon Sep 17 00:00:00 2001
From: diligentcircle <diligentcircle@riseup.net>
Date: Fri, 17 Sep 2021 22:22:39 -0400
Subject: [PATCH] Simplified a few statements by making them depend on easy >
 assisted.

Minor internal change.
---
 src/collectable.c  | 3 +--
 src/game.c         | 3 +--
 src/intermission.c | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/collectable.c b/src/collectable.c
index d857218..72327ec 100644
--- a/src/collectable.c
+++ b/src/collectable.c
@@ -124,8 +124,7 @@ void collectable_add(float x, float y, int type, int value, int life)
 		type = P_PLASMA_RATE;
 
 		if ((game.difficulty == DIFFICULTY_NIGHTMARE)
-			|| ((game.difficulty != DIFFICULTY_SUPEREASY)
-				&& (game.difficulty != DIFFICULTY_EASY)
+			|| ((game.difficulty > DIFFICULTY_EASY)
 				&& (game.difficulty != DIFFICULTY_ORIGINAL)
 				&& ((game.area == MISN_MOEBO)
 					|| (game.area == MISN_ELAMALE)
diff --git a/src/game.c b/src/game.c
index 46d6cc5..7f31670 100644
--- a/src/game.c
+++ b/src/game.c
@@ -903,8 +903,7 @@ static void game_doBullets()
 			}
 		}
 
-		if ((game.difficulty != DIFFICULTY_SUPEREASY)
-			&& (game.difficulty != DIFFICULTY_EASY)
+		if ((game.difficulty > DIFFICULTY_EASY)
 			&& ((bullet->owner == &player) || (bullet->id == WT_ROCKET)))
 		{
 			for (int j = 0 ; j < 20 ; j++)
diff --git a/src/intermission.c b/src/intermission.c
index 9106c16..e0a4588 100644
--- a/src/intermission.c
+++ b/src/intermission.c
@@ -1467,8 +1467,7 @@ int intermission()
 	intermission_createCommsSurface(commsSurface);
 
 	// Remove the Supercharge, if it is there
-	if ((game.difficulty != DIFFICULTY_SUPEREASY)
-		&& (game.difficulty != DIFFICULTY_EASY)
+	if ((game.difficulty > DIFFICULTY_EASY)
 		&& (game.difficulty != DIFFICULTY_ORIGINAL))
 	{
 		weapons[W_PLAYER_WEAPON].reload[0] = MAX(