11 files changed, 79 insertions, 13 deletions
diff --git a/world/map/conf/magic.conf.template b/world/map/conf/magic.conf.template
index ea85bfa4..29f2ade5 100644
--- a/world/map/conf/magic.conf.template
+++ b/world/map/conf/magic.conf.template
@@ -876,10 +876,9 @@ SPELL happy-curse (target : PC) : "#N12" =
           REQUIRE rdistance(location(target), location(caster)) < 1 + spellpower / 100)
       => EFFECT CALL adjust_spellpower(school);
                 CALL default_effect();
-                    h = (max_hp(caster) / 2) * -1;
-                    IF skill(caster, DARK) > 1
-                    THEN itemheal(caster, h, 0);
-                FOR i = 0 TO (spellpower / 10) DO (emote(target, 3); WAIT 500;);
+                    IF (skill(caster, DARK) > 1)
+                    THEN FOR i = 0 TO (spellpower / 10) DO (emote(target, 5); WAIT 500;)
+                    ELSE FOR i = 0 TO (spellpower / 10) DO (emote(target, 3); WAIT 500;);
                 CALL gain_xp(1, 23);
 
 LOCAL SPELL rain : "#N13" =
diff --git a/world/map/data/003-2.wlk b/world/map/data/003-2.wlk
index ac9b22e2..908e3aaf 100644
--- a/world/map/data/003-2.wlk
+++ b/world/map/data/003-2.wlk
diff --git a/world/map/data/004-2.wlk b/world/map/data/004-2.wlk
index 6ea72abb..5a33b5e7 100644
--- a/world/map/data/004-2.wlk
+++ b/world/map/data/004-2.wlk
diff --git a/world/map/data/005-3.wlk b/world/map/data/005-3.wlk
index 1455f659..818b5cd4 100644
--- a/world/map/data/005-3.wlk
+++ b/world/map/data/005-3.wlk
diff --git a/world/map/data/045-1.wlk b/world/map/data/045-1.wlk
index 9fe0d480..3786dc34 100644
--- a/world/map/data/045-1.wlk
+++ b/world/map/data/045-1.wlk
diff --git a/world/map/news.d/26-unequipcb.txt b/world/map/news.d/26-unequipcb.txt
new file mode 100644
index 00000000..c692b647
--- /dev/null
+++ b/world/map/news.d/26-unequipcb.txt
@@ -0,0 +1,20 @@
+{title:Icon and Weapon Updates}
+{date:2013-11-30}
+
+With this update we ship new and better item icons.
+Those have been done a long time ago and we
+finally finished reviewing them all.
+
+The behavior of items when you do not meet their
+requirements has changed.
+
+As a result, a new type of ranged weapon has
+been introduced: the Sling Shot. You can get it
+somewhere in Tulimshar. We are aware of some
+small graphical glitches.
+
+The behaviour of the happy-curse
+for dark mages has been changed.
+You might want to try it out. ]:-)
+
+{author:TMW Development Team}
diff --git a/world/map/news.html b/world/map/news.html
index d69db891..a1977df8 100644
--- a/world/map/news.html
+++ b/world/map/news.html
@@ -1,6 +1,29 @@
 <!-- Generated by tools/news.py for index.php -->
 <div>
 <p/>
+<b>Icon and Weapon Updates</b>
+<font color="#0000ff">2013-11-30</font>
+<p/>
+With this update we ship new and better item icons.
+Those have been done a long time ago and we
+finally finished reviewing them all.
+<p/>
+The behavior of items when you do not meet their
+requirements has changed.
+<p/>
+As a result, a new type of ranged weapon has
+been introduced: the Sling Shot. You can get it
+somewhere in Tulimshar. We are aware of some
+small graphical glitches.
+<p/>
+The behaviour of the happy-curse
+for dark mages has been changed.
+You might want to try it out. ]:-)
+<p/>
+-<font color="#009000">TMW Development Team</font>
+</div>
+<div>
+<p/>
 <b>Halloween 2013</b>
 <font color="#0000ff">2013-10-30</font>
 <p/>
diff --git a/world/map/news.txt b/world/map/news.txt
index 4c9a2f1c..7f9dc7c2 100644
--- a/world/map/news.txt
+++ b/world/map/news.txt
@@ -1,3 +1,25 @@
+##7Icon and Weapon Updates##0
+##32013-11-30##0
+ 
+With this update we ship new and better item icons.
+Those have been done a long time ago and we
+finally finished reviewing them all.
+ 
+The behavior of items when you do not meet their
+requirements has changed.
+ 
+As a result, a new type of ranged weapon has
+been introduced: the Sling Shot. You can get it
+somewhere in Tulimshar. We are aware of some
+small graphical glitches.
+ 
+The behaviour of the happy-curse
+for dark mages has been changed.
+You might want to try it out. ]:-)
+ 
+-##2TMW Development Team##0
+ 
+ 
 ##7Halloween 2013##0
 ##32013-10-30##0
  
diff --git a/world/map/npc/026-1/munro.txt b/world/map/npc/026-1/munro.txt
index ab304091..9522102c 100644
--- a/world/map/npc/026-1/munro.txt
+++ b/world/map/npc/026-1/munro.txt
@@ -44,6 +44,7 @@ L_Exit:
     end;
 
 OnInit:
+    if (debug >= 2) end;
     initnpctimer;
     end;
 
@@ -79,7 +80,7 @@ function|script|CheckMunro|,
     if ((gettime(6) == 10 && gettime(5) >= 27) || (gettime(6) == 11 && gettime(5) <= 5))
         goto L_Return;
 
-    if ((gettime(6) == 12 && gettime(5) >= 23) || (gettime(6) == 12 && gettime(5) <= 26))
+    if (gettime(6) == 12 && gettime(5) >= 23 && gettime(5) <= 26)
         goto L_Return;
 
     callfunc "UnequipLater";
diff --git a/world/map/npc/027-1/golbenez.txt b/world/map/npc/027-1/golbenez.txt
index a2989cb1..f8fe4a70 100644
--- a/world/map/npc/027-1/golbenez.txt
+++ b/world/map/npc/027-1/golbenez.txt
@@ -38,6 +38,7 @@ L_Weak:
 // Golbenez resets the graveyard monsters when no players are present
 // He's such an evil guy!
 OnInit:
+    if (debug >= 2) end;
     initnpctimer;
     end;
 
diff --git a/world/map/npc/functions/game_rules.txt b/world/map/npc/functions/game_rules.txt
index 1d9bd91d..7ede18ea 100644
--- a/world/map/npc/functions/game_rules.txt
+++ b/world/map/npc/functions/game_rules.txt
@@ -88,16 +88,16 @@ L_French:
     goto L_End;
 
 L_Spanish:
-    mes "Los jugadores que infringan las siguientes reglas pueden ser bloqueados (incluso permanentemente) o sus personajes reseteados segun la discrecion de los administradores.";
-    mes "1. No abuse de otros jugadores (esto incluye insultos, palabras mal sonantes, burlas, etc. dirigidas a una o varias personas)";
-    mes "2. No utilizar programas automaticos (esto hace referencia a cualquier tipo de actividad llevada a cabo sin que el jugador este tocando el teclado directamente o al seguimiento automatico)";
-    mes "3. No envie mensajes publicitarios o inunde el chat de mensajes (incluyendo los mensajes referidos al comercio en el juego)";
+    mes "Los jugadores que infrinjan las siguientes reglas pueden ser bloqueados (incluso permanentemente) o se reiniciarán al nivel 1 sus personajes, según el criterio de los GM:";
+    mes "1. No abuse de otros jugadores (esto incluye insultos, malas palabras, y similares dirigidas a una o varias personas)";
+    mes "2. No utilizar programas automáticos (incluyendo CUALQUIER actividad con el usuario lejos del teclado o el seguimiento automático)";
+    mes "3. No envíe mensajes publicitarios o inunde el chat de mensajes (incluyendo los mensajes de intercambio)";
     mes "4. No mendigar.";
-    mes "5. Escriba unicamente en Ingles en el chat publico";
-    mes "6. Trate a los demas de la misma forma que le gustaria ser tratado";
+    mes "5. Escriba únicamente en Inglés en el chat público";
+    mes "6. Trate a los demás de la misma forma que le gustaría ser tratado";
     next;
-    mes "El uso de programas automaticos para jugar sin estar frente al teclado se determinara hablando con los jugadores que esten moviendose y/o atacando.";
-    mes "El seguimiento automatizado sera determinado por observacion.";
+    mes "El uso de programas automáticos para jugar sin estar frente al teclado se determinará hablando con los jugadores que estén moviéndose y/o atacando.";
+    mes "El seguimiento automático será determinado por observación.";
     next;
     goto L_End;