diff options
| author | Haru <haru@dotalux.com> | 2015-11-15 00:54:33 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2015-11-15 00:57:00 +0100 |
| commit | 34037c40d28c9fe179d930949320090448b249e9 (patch) | |
| tree | 3fe4d79c6185df4f165beae47cc3e7a286ce5af8 /db | |
| parent | 8ee5eafc741d581579efd696765fb0646b72a553 (diff) | |
| download | hercules-34037c40d28c9fe179d930949320090448b249e9.tar.gz hercules-34037c40d28c9fe179d930949320090448b249e9.tar.bz2 hercules-34037c40d28c9fe179d930949320090448b249e9.tar.xz hercules-34037c40d28c9fe179d930949320090448b249e9.zip | |
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>
Diffstat (limited to 'db')
| -rw-r--r-- | db/const.txt | 16 | ||||
| -rw-r--r-- | db/pre-re/item_db.conf | 9 | ||||
| -rw-r--r-- | db/re/item_db.conf | 9 |
3 files changed, 20 insertions, 14 deletions
diff --git a/db/const.txt b/db/const.txt index 7b0b7c076..792f8f56e 100644 --- a/db/const.txt +++ b/db/const.txt @@ -3400,14 +3400,14 @@ MOUNT_DRAGON_BLUE 7 MOUNT_DRAGON_RED 8 // gettime( <param> ) -SECOND 1 -MINUTE 2 -HOUR 3 -WEEKDAY 4 -DAYOFMONTH 5 -MONTH 6 -YEAR 7 -DAYOFYEAR 8 +GETTIME_SECOND 1 +GETTIME_MINUTE 2 +GETTIME_HOUR 3 +GETTIME_WEEKDAY 4 +GETTIME_DAYOFMONTH 5 +GETTIME_MONTH 6 +GETTIME_YEAR 7 +GETTIME_DAYOFYEAR 8 // Weekday SUNDAY 0 diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf index 42d75e300..b66b1198c 100644 --- a/db/pre-re/item_db.conf +++ b/db/pre-re/item_db.conf @@ -38844,7 +38844,10 @@ item_db: ( Weight: 100 Loc: 256 View: 433 - Script: <" if(gettime(6)==9&&gettime(5)>=10&&gettime(5)<=24) bonus bAllStats, 4; "> + Script: <" + if (gettime(GETTIME_MONTH) == SEPTEMBER && gettime(GETTIME_DAYOFMONTH) >= 10 && gettime(GETTIME_DAYOFMONTH) <= 24) + bonus bAllStats, 4; + "> }, { Id: 5433 @@ -63137,8 +63140,8 @@ item_db: ( Buy: 0 Weight: 80 Script: <" - if(gettime(5)!=MDiceCone) { - MDiceCone = gettime(5); + if (gettime(GETTIME_DAYOFMONTH) != MDiceCone) { + MDiceCone = gettime(GETTIME_DAYOFMONTH); percentheal 50,50; } diff --git a/db/re/item_db.conf b/db/re/item_db.conf index 9203ef46d..2b0f70489 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -50364,7 +50364,10 @@ item_db: ( Weight: 100 Loc: 256 View: 433 - Script: <" if(gettime(6)==9&&gettime(5)>=10&&gettime(5)<=24) bonus bAllStats,4; "> + Script: <" + if (gettime(GETTIME_MONTH) == SEPTEMBER && gettime(GETTIME_DAYOFMONTH) >= 10 && gettime(GETTIME_DAYOFMONTH) <= 24) + bonus bAllStats,4; + "> }, { Id: 5433 @@ -77254,8 +77257,8 @@ item_db: ( Buy: 0 Weight: 80 Script: <" - if(gettime(5)!=MDiceCone) { - MDiceCone = gettime(5); + if (gettime(GETTIME_DAYOFMONTH) != MDiceCone) { + MDiceCone = gettime(GETTIME_DAYOFMONTH); percentheal 50,50; } "> |