From 69caa31b8a552bb4fe7fbfbb7da4df5beb6f43e1 Mon Sep 17 00:00:00 2001
From: kinther <patrick.t.walton@gmail.com>
Date: Wed, 13 Aug 2025 15:55:39 -0700
Subject: [PATCH] Remove happyhour

---
 lib/text/help/help.hlp | 16 ----------------
 src/fight.c            |  2 +-
 src/interpreter.c      |  5 -----
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/lib/text/help/help.hlp b/lib/text/help/help.hlp
index 5ecfd23..89f33e8 100644
--- a/lib/text/help/help.hlp
+++ b/lib/text/help/help.hlp
@@ -3683,22 +3683,6 @@ HANDBOOK WIZHANDBOOK WIZ-HANDBOOK IMMHANDBOOK IMM-HANDBOOK
 Usage: handbook
 
    Guidelines for having an Immortal character -- you should read it.
-#31
-HAPPYHOUR
-
-Usage: happyhour              - show usage (this info)
-       happyhour show         - display current settings (what mortals see)
-       happyhour time <ticks> - set happyhour time and start timer
-       happyhour qp <num>     - set qp percentage gain
-       happyhour exp <num>    - set exp percentage gain
-       happyhour gold <num>   - set gold percentage gain
-       happyhour default      - sets a default setting for happyhour
-
-Configure the happyhour settings and start a happyhour.
-Currently 1 hour IRL = 48 ticks
-If no number is specified, 0 (off) is assumed.
-The command happyhour time will therefore stop the happyhour timer.
-
 
 #31
 HARM
diff --git a/src/fight.c b/src/fight.c
index 650cbba..58f9bd8 100644
--- a/src/fight.c
+++ b/src/fight.c
@@ -306,7 +306,7 @@ void die(struct char_data * ch, struct char_data * killer)
 static void perform_group_gain(struct char_data *ch, int base,
 			     struct char_data *victim)
 {
-  int share, hap_share;
+  int share;
 
   share = MIN(CONFIG_MAX_EXP_GAIN, MAX(1, base));
 
diff --git a/src/interpreter.c b/src/interpreter.c
index 440ed3b..19cb184 100644
--- a/src/interpreter.c
+++ b/src/interpreter.c
@@ -1641,11 +1641,6 @@ void nanny(struct descriptor_data *d, char *arg)
 
   case CON_RMOTD:		/* read CR after printing motd   */
     write_to_output(d, "%s", CONFIG_MENU);
-    if (IS_HAPPYHOUR > 0){
-      write_to_output(d, "\r\n");
-      write_to_output(d, "\tyThere is currently a Happyhour!\tn\r\n");
-      write_to_output(d, "\r\n");
-    }
     add_llog_entry(d->character, LAST_CONNECT);
     STATE(d) = CON_MENU;
     break;