diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2013-10-30 13:30:51 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-10-30 13:30:51 -0700 |
| commit | 0de5ecad9758520e3c5e3f2490decf8a5c2019dc (patch) | |
| tree | 007e3ab4895093bca6806d86a34ac81a97235224 | |
| parent | b2a807100e553eb8dc578ba3c6c89934bd52d5e0 (diff) | |
| download | serverdata-0de5ecad9758520e3c5e3f2490decf8a5c2019dc.tar.gz serverdata-0de5ecad9758520e3c5e3f2490decf8a5c2019dc.tar.bz2 serverdata-0de5ecad9758520e3c5e3f2490decf8a5c2019dc.tar.xz serverdata-0de5ecad9758520e3c5e3f2490decf8a5c2019dc.zip | |
Fix issues with the way the halloween quest was committed
| m--------- | client-data | 0 | ||||
| -rw-r--r-- | world/map/db/const.txt | 2 | ||||
| -rw-r--r-- | world/map/news.html | 11 | ||||
| -rw-r--r-- | world/map/news.txt | 10 | ||||
| -rw-r--r-- | world/map/npc/026-1/_import.txt | 3 |
5 files changed, 23 insertions, 3 deletions
diff --git a/client-data b/client-data -Subproject ce5b807ce78b215e86c736820d064e04ed94ac5 +Subproject 57f8d3569be4e4e3b5c8b86bdf0529622a6c7cc diff --git a/world/map/db/const.txt b/world/map/db/const.txt index d4c393bf..240507a7 100644 --- a/world/map/db/const.txt +++ b/world/map/db/const.txt @@ -3,7 +3,7 @@ // This defaults to 1, but should be disabled on the official server. // If set to 2 or higher, it also disables global timers to aid gdb'ing. -debug 0 +debug 1 // BEFORE UNCOMMENTING ANYTHING, TALK TO o11c! //MF_NOMEMO 0 diff --git a/world/map/news.html b/world/map/news.html index a834b327..f6fce85d 100644 --- a/world/map/news.html +++ b/world/map/news.html @@ -1,6 +1,17 @@ <!-- Generated by tools/news.py for index.php --> <div> <p/> +<font color="#0000ff">2013-10-30</font> +<p/> +Happy Halloween! +<p/> +Also, some minor bugs have been fixed with Waric and Rossy. +Alas poor Waric, Will he ever learn to behave properly? +<p/> +-<font color="#009000">MadCamel</font> +</div> +<div> +<p/> <font color="#0000ff">2013-09-28</font> <p/> As you might have found out we had another restart yesterday. diff --git a/world/map/news.txt b/world/map/news.txt index 5f7b88fe..c96e760a 100644 --- a/world/map/news.txt +++ b/world/map/news.txt @@ -1,3 +1,13 @@ +##32013-10-30##0 + +Happy Halloween! + +Also, some minor bugs have been fixed with Waric and Rossy. +Alas poor Waric, Will he ever learn to behave properly? + +-##2MadCamel##0 + + ##32013-09-28##0 As you might have found out we had another restart yesterday. diff --git a/world/map/npc/026-1/_import.txt b/world/map/npc/026-1/_import.txt index bd87b3f4..38d5f638 100644 --- a/world/map/npc/026-1/_import.txt +++ b/world/map/npc/026-1/_import.txt @@ -3,6 +3,5 @@ map: 026-1.gat npc: npc/026-1/_mobs.txt npc: npc/026-1/_warps.txt -npc: npc/026-1/sign.txt npc: npc/026-1/munro.txt - +npc: npc/026-1/sign.txt |