Fixed too-generic constant names of gettime() types

- Follow-up to 3bd77ffc0daca508352834add828766490075aee
- The names were too generic (not namespaced), and were easily clashing
  with custom (and potential future official) constants or variables.
- Constants are now prefixed with a 'GETTIME_' namespace:
  - GETTIME_SECOND
  - GETTIME_MINUTE
  - GETTIME_HOUR
  - GETTIME_WEEKDAY
  - GETTIME_DAYOFMONTH
  - GETTIME_MONTH
  - GETTIME_YEAR
  - GETTIME_DAYOFYEAR
- Fixed some excessive (and some times incorrect) parentheses in
  various scripts using gettime().
- Updated documentation.

Signed-off-by: Haru <haru@dotalux.com>

1 files changed, 30 insertions, 30 deletions

diff --git a/npc/quests/guildrelay.txt b/npc/quests/guildrelay.txt
index de61abad4..6c12574f0 100644
--- a/npc/quests/guildrelay.txt
+++ b/npc/quests/guildrelay.txt
@@ -70,7 +70,7 @@
 		if (strcharinfo(0) == getguildmaster(.@GID)) {
 			if (guildrelay_q == 100) {
 				if (guildtime > 22) {
-					if ((gettime(HOUR) > 1) && (gettime(HOUR) < guildtime)) {
+					if (gettime(GETTIME_HOUR) > 1 && gettime(GETTIME_HOUR) < guildtime) {
 						mes "[" + .@name$ + "]";
 						mes "Oh, you're back. So did you";
 						mes "rest up enough? I'm sure the";
@@ -127,7 +127,7 @@
 					}
 				}
 				else if (guildtime > 22) {
-					if ((gettime(HOUR) > 0) && (gettime(HOUR) < guildtime)) {
+					if (gettime(GETTIME_HOUR) > 0 && gettime(GETTIME_HOUR) < guildtime) {
 						mes "[" + .@name$ + "]";
 						mes "Oh, you're back. So did you";
 						mes "rest up enough? I'm sure the";
@@ -182,8 +182,7 @@
 						mes "come back to me later.";
 						close;
 					}
-				}
-				else if ((gettime(HOUR) - guildtime) > 2) {
+				} else if (gettime(GETTIME_HOUR) - guildtime > 2) {
 					mes "[" + .@name$ + "]";
 					mes "Oh, you're back. So did you";
 					mes "rest up enough? I'm sure the";
@@ -240,7 +239,9 @@
 				}
 			}
 			else if (guildrelay_q == 150) {
-				if (((guildtime > 22) && (gettime(HOUR) > 1) && (gettime(HOUR) < guildtime)) || ((guildtime > 21) && (gettime(HOUR) > 0) && (gettime(HOUR) < guildtime)) || ((gettime(HOUR) - guildtime) > 2)) {
+				if ((guildtime > 22 && gettime(GETTIME_HOUR) > 1 && gettime(GETTIME_HOUR) < guildtime)
+				 || (guildtime > 21 && gettime(GETTIME_HOUR) > 0 && gettime(GETTIME_HOUR) < guildtime)
+				 || (gettime(GETTIME_HOUR) - guildtime > 2)) {
 					mes "[" + .@name$ + "]";
 					mes "Ah, you look well rested,";
 					mes "master. It is now time for";
@@ -304,12 +305,12 @@
 				}
 			}
 			else if (guildrelay_q == 25) {
-				if (((guildtime > 22) && ((gettime(HOUR) > 4) && (gettime(HOUR) < guildtime)))
-				|| ((guildtime > 21) && ((gettime(HOUR) > 3) && (gettime(HOUR) < guildtime)))
-				|| ((guildtime > 20) && ((gettime(HOUR) > 2) && (gettime(HOUR) < guildtime)))
-				|| ((guildtime > 19) && ((gettime(HOUR) > 1) && (gettime(HOUR) < guildtime)))
-				|| ((guildtime > 18) && ((gettime(HOUR) > 0) && (gettime(HOUR) < guildtime)))
-				|| ((gettime(HOUR) - guildtime) > 5)) {
+				if ((guildtime > 22 && gettime(GETTIME_HOUR) > 4 && gettime(GETTIME_HOUR) < guildtime)
+				 || (guildtime > 21 && gettime(GETTIME_HOUR) > 3 && gettime(GETTIME_HOUR) < guildtime)
+				 || (guildtime > 20 && gettime(GETTIME_HOUR) > 2 && gettime(GETTIME_HOUR) < guildtime)
+				 || (guildtime > 19 && gettime(GETTIME_HOUR) > 1 && gettime(GETTIME_HOUR) < guildtime)
+				 || (guildtime > 18 && gettime(GETTIME_HOUR) > 0 && gettime(GETTIME_HOUR) < guildtime)
+				 || gettime(GETTIME_HOUR) - guildtime > 5) {
 					mes "[" + .@name$ + "]";
 					mes "Ah, have you rested well,";
 					mes "master? Please excuse my";
@@ -413,7 +414,7 @@
 					mes "Hand me the spirit, and allow";
 					mes "me to give you your guild's reward.";
 					delitem 7239,1; //Soul_Of_Proceeding
-					guildtime = gettime(HOUR);
+					guildtime = gettime(GETTIME_HOUR);
 					guildrelay_q = 100;
 					.@incen_item = rand(1,100);
 					if ((.@incen_item > 0) && (.@incen_item < 25)) {
@@ -481,7 +482,7 @@
 					mes "challenges that you will all";
 					mes "face together. Good work!";
 					delitem 7245,1; //Soul_Of_Friendship
-					guildtime = gettime(HOUR);
+					guildtime = gettime(GETTIME_HOUR);
 					guildrelay_q = 150;
 					.@incen_item = rand(1,100);
 					if ((.@incen_item > 0) && (.@incen_item < 16)) {
@@ -574,7 +575,7 @@
 					mes "Tristan III, and share it with";
 					mes "guild. Once again, good work.";
 					delitem 7251,1; //Soul_Of_Victory
-					guildtime = gettime(HOUR);
+					guildtime = gettime(GETTIME_HOUR);
 					guildrelay_q = 25;
 					.@incen_item = rand(1,100);
 					if ((.@incen_item > 0) && (.@incen_item < 26)) {
@@ -1409,11 +1410,11 @@
 				mes "don't you worry about it.";
 				delitem 7235,1; //Soul_Of_Courage
 				guildrelay_q = 4;
-				guildtime = gettime(HOUR);
+				guildtime = gettime(GETTIME_HOUR);
 				close;
 			}
 			if ((guildtime > 22) && (guildrelay_q == 4) && (BaseJob == Job_Blacksmith)) {
-				if ((gettime(HOUR) > 2) && (gettime(HOUR) < guildtime)) {
+				if (gettime(GETTIME_HOUR) > 2 && gettime(GETTIME_HOUR) < guildtime) {
 					mes "[" + .@name$ + "]";
 					mes "I guess enough time";
 					mes "has passed. You ready";
@@ -1427,7 +1428,7 @@
 				}
 			}
 			if ((guildtime > 21) && (guildrelay_q == 4) && (BaseJob == Job_Blacksmith)) {
-				if ((gettime(HOUR) > 0101) && (gettime(HOUR) < guildtime)) {
+				if (gettime(GETTIME_HOUR) > 0101 && gettime(GETTIME_HOUR) < guildtime) { // FIXME[Haru]: hour is clearly wrong
 					mes "[" + .@name$ + "]";
 					mes "I guess enough time";
 					mes "has passed. You ready";
@@ -1441,7 +1442,7 @@
 				}
 			}
 			if ((guildtime > 20) && (guildrelay_q == 4) && (BaseJob == Job_Blacksmith)) {
-				if ((gettime(HOUR) > 0001) && (gettime(HOUR) < guildtime)) {
+				if (gettime(GETTIME_HOUR) > 0001 && gettime(GETTIME_HOUR) < guildtime) { // FIXME[Haru]: Hour is probably wrong
 					mes "[" + .@name$ + "]";
 					mes "I guess enough time";
 					mes "has passed. You ready";
@@ -1454,7 +1455,7 @@
 					close;
 				}
 			}
-			if ((gettime(HOUR) - guildtime > 0300) && (guildrelay_q == 4) && (BaseJob == Job_Blacksmith)) {
+			if (gettime(GETTIME_HOUR) - guildtime > 0300 && guildrelay_q == 4 && BaseJob == Job_Blacksmith) { // FIXME[Haru]: Hour is clearly wrong
 				mes "[" + .@name$ + "]";
 				mes "I guess enough time";
 				mes "has passed. You ready";
@@ -1795,11 +1796,11 @@
 				mes "in order to be successful.";
 				delitem 7240,1; //Soul_Of_Confidence
 				guildrelay_q = 9;
-				guildtime = gettime(HOUR);
+				guildtime = gettime(GETTIME_HOUR);
 				close;
 			}
 			if ((guildtime > 22) && (guildrelay_q == 9) && (BaseJob == Job_Sage)) {
-				if ((gettime(HOUR) > 02) && (gettime(HOUR) < guildtime)) {
+				if (gettime(GETTIME_HOUR) > 2 && gettime(GETTIME_HOUR) < guildtime) {
 					mes "[" + .@name$ + "]";
 					mes "So did you spend some";
 					mes "quality time with your";
@@ -1830,7 +1831,7 @@
 				}
 			}
 			else if ((guildtime > 21) && (guildrelay_q == 9) && (BaseJob == Job_Sage)) {
-				if ((gettime(HOUR) > 01) && (gettime(HOUR) < guildtime)) {
+				if (gettime(GETTIME_HOUR) > 1 && gettime(GETTIME_HOUR) < guildtime) {
 					mes "[" + .@name$ + "]";
 					mes "So did you spend some";
 					mes "quality time with your";
@@ -1861,7 +1862,7 @@
 				}
 			}
 			else if ((guildtime > 20) && (guildrelay_q == 9) && (BaseJob == Job_Sage)) {
-				if ((gettime(HOUR) > 0) && (gettime(HOUR) < guildtime)) {
+				if (gettime(GETTIME_HOUR) > 0 && gettime(GETTIME_HOUR) < guildtime) {
 					mes "[" + .@name$ + "]";
 					mes "So did you spend some";
 					mes "quality time with your";
@@ -1890,8 +1891,7 @@
 					mes "dreams, passions, and goals!";
 					close;
 				}
-			}
-			else if ((gettime(HOUR) - guildtime > 3) && (guildrelay_q == 9) && (BaseJob == Job_Sage)) {
+			} else if (gettime(GETTIME_HOUR) - guildtime > 3 && guildrelay_q == 9 && BaseJob == Job_Sage) {
 				mes "[" + .@name$ + "]";
 				mes "So did you spend some";
 				mes "quality time with your";
@@ -2765,11 +2765,11 @@
 				mes "to your feelings this time...";
 				delitem 7249,1; //Soul_Of_Service
 				guildrelay_q = 21;
-				guildtime = gettime(HOUR);
+				guildtime = gettime(GETTIME_HOUR);
 				close;
 			}
 			if ((guildtime > 22) && (guildrelay_q == 21) && (BaseJob == Job_Crusader)) {
-				if ((gettime(HOUR) > 2) && (gettime(HOUR) < guildtime)) {
+				if (gettime(GETTIME_HOUR) > 2 && gettime(GETTIME_HOUR) < guildtime) {
 					mes "[" + .@name$ + "]";
 					mes "Yes. You've come at just";
 					mes "the right time. Remember";
@@ -2791,7 +2791,7 @@
 				}
 			}
 			if ((guildtime > 21) && (guildrelay_q == 21) && (BaseJob == Job_Crusader)) {
-				if ((gettime(HOUR) > 1) && (gettime(HOUR) < guildtime)) {
+				if (gettime(GETTIME_HOUR) > 1 && gettime(GETTIME_HOUR) < guildtime) {
 					mes "[" + .@name$ + "]";
 					mes "Yes. You've come at just";
 					mes "the right time. Remember";
@@ -2813,7 +2813,7 @@
 				}
 			}
 			if ((guildtime > 20) && (guildrelay_q == 21) && (BaseJob == Job_Crusader)) {
-				if ((gettime(HOUR) > 0) && (gettime(HOUR) < guildtime)) {
+				if (gettime(GETTIME_HOUR) > 0 && gettime(GETTIME_HOUR) < guildtime) {
 					mes "[" + .@name$ + "]";
 					mes "Yes. You've come at just";
 					mes "the right time. Remember";
@@ -2834,7 +2834,7 @@
 					close;
 				}
 			}
-			if ((gettime(HOUR) - guildtime > 3) && (guildrelay_q == 21) && (BaseJob == Job_Crusader)) {
+			if (gettime(GETTIME_HOUR) - guildtime > 3 && guildrelay_q == 21 && BaseJob == Job_Crusader) {
 				mes "[" + .@name$ + "]";
 				mes "Yes. You've come at just";
 				mes "the right time. Remember";