Merge branch 'master' into jesusalva/redesign

5 files changed, 101 insertions, 18 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 2c6c4429..1dcca8cb 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -3939,6 +3939,12 @@ constants_db: {
     RIGHT:          6
     DOWNRIGHT:      7
 
+	comment__: "seasons"
+	WINTER:         0
+	SPRING:         1
+	SUMMER:         2
+	AUTUMN:         3
+
     comment__: "speechflags"
     S_FIRST_BLANK_LINE: 1
     S_LAST_BLANK_LINE:  2
diff --git a/db/item_options.conf b/db/item_options.conf
index 95e2316a..9a827dca 100644
--- a/db/item_options.conf
+++ b/db/item_options.conf
@@ -1032,5 +1032,85 @@ item_options_db: (
 	Id: 186
 	Name: "BODY_INDESTRUCTIBLE"
 	Script: <" bonus(bUnbreakableArmor, 1); ">
+},
+{
+	Id: 187
+	Name: "IOPT_SPLASHDAMAGE"
+	Script: <" bonus(bSplashAddRange, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 188
+	Name: "IOPT_WALKSPEED"
+	Script: <" bonus(bSpeedAddRate, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 189
+	Name: "IOPT_EXPGAIN"
+	Script: <" bonus2(bExpAddRace, RC_All, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 190
+	Name: "IOPT_DOUBLEATTACK"
+	Script: <" bonus(bDoubleAddRate, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 191
+	Name: "IOPT_SCRESIST_POISON"
+	Script: <" bonus2(bResEff,Eff_Poison, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 192
+	Name: "IOPT_SCRESIST_SILENCE"
+	Script: <" bonus2(bResEff,Eff_Silence, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 193
+	Name: "IOPT_SCRESIST_CURSE"
+	Script: <" bonus2(bResEff,Eff_Curse, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 194
+	Name: "IOPT_SCRESIST_BLIND"
+	Script: <" bonus2(bResEff,Eff_Blind, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 195
+	Name: "IOPT_SCPROVOKE_POISON"
+	Script: <" bonus2(bAddEff,Eff_Poison, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 196
+	Name: "IOPT_SCPROVOKE_SILENCE"
+	Script: <" bonus2(bAddEff,Eff_Silence, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 197
+	Name: "IOPT_SCPROVOKE_CURSE"
+	Script: <" bonus2(bAddEff,Eff_Curse, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 198
+	Name: "IOPT_SCPROVOKE_BLIND"
+	Script: <" bonus2(bAddEff,Eff_Blind, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 199
+	Name: "IOPT_CRITDMG"
+	Script: <" bonus(bCritAtkRate, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 200
+	Name: "IOPT_RICHNESS"
+	Script: <" bonus2(bAddGetZenyNum, -2, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 201
+	Name: "VINTAGE_WPN"
+	Script: <" bonus2(bAddRace2, RC_All, -50); ">
+},
+{
+	Id: 202
+	Name: "VINTAGE_ARM"
+	Script: <" bonus2(bAddDefClass, RC_All, -20); ">
 }
 )
diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt
index f412c19c..76870170 100644
--- a/npc/000-0/sailors.txt
+++ b/npc/000-0/sailors.txt
@@ -35,7 +35,7 @@ OnTouch:
 
     setcamnpc "Sailors", 0, -32;
     mesn "Human Voice";
-    mesq lg("Why Frenchy? It's a Russian!");
+    mesq lg("I think he's from the East...");
     next;
 
     setcamnpc "Sailors", 144, -80;
@@ -45,7 +45,7 @@ OnTouch:
 
     setcamnpc;
     mesn "Raijin Voice";
-    mesq lg("You stupid, she's English, look at the shape of her head.", "You stupid, he's English, look at the shape of his head.");
+    mesq lg("You think she's from the East? As in... Ancea?", "You think he's from the East? As in... Ancea?");
     next;
     mesq l("Hey you! Can you hear us? Are you okay?");
     next;
diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt
index 1fde8713..24635648 100644
--- a/npc/000-2-0/julia.txt
+++ b/npc/000-2-0/julia.txt
@@ -289,7 +289,7 @@ OnTouch:
     next;
     mesq lg("I'm glad to see you're okay.");
     next;
-    mesq lg("Could I ask you what your native language is? A sailor told me you're Russian, but another one told me you're French... I'm a bit lost. I will register you on the ship passenger list just after that.");
+    mesq lg("Could I ask you what your native language is? A sailor told me you're from Ancea, but another one told me you're from Aemil because of the logo that... never mind. I'm a bit lost, if you could tell me what language you speak I will register you on the ship passenger list just after that.");
     next;
     chooseLang;
     mainMenu;
diff --git a/npc/functions/util.txt b/npc/functions/util.txt
index a8e157b2..8e263eb0 100644
--- a/npc/functions/util.txt
+++ b/npc/functions/util.txt
@@ -8,17 +8,19 @@
 
 // season_direction({day, month})
 //    returns the direction that represents our current season (approximation)
-//      DOWN:      Winter, 21/12
-//      DOWNLEFT:  Spring, 20/03
-//      LEFT:      Summer, 21/06
-//      UPLEFT:    Autumn, 22/09
+//    Note: You may also use WINTER/SPRING/SUMMER/AUTUMN constants for scripts
+//    where the direction is not important, but the season is. (Readability)
+//      DOWN:      Winter, 21/12    WINTER
+//      DOWNLEFT:  Spring, 20/03    SPRING
+//      LEFT:      Summer, 21/06    SUMMER
+//      UPLEFT:    Autumn, 22/09    AUTUMN
 
 function	script	season_direction	{
-    .@current_month = getarg(0, gettime(GETTIME_MONTH));
+    .@current_month = getarg(1, gettime(GETTIME_MONTH));
 
     if (.@current_month % 3 == 0)
     {
-        .@current_day = getarg(1, gettime(GETTIME_DAYOFMONTH));
+        .@current_day = getarg(0, gettime(GETTIME_DAYOFMONTH));
 
         switch (.@current_month)
         {
@@ -36,7 +38,7 @@ function	script	season_direction	{
 }
 
 // This is part of Jesusalva script toolkit to make his life easier when writing
-// quests. Many of these are actually redudant functions.
+// quests. Many of these are actually redundant functions.
 
 // Four different flavours of setq() to quickly preserve old values
 function	script	setq1	{
@@ -63,14 +65,9 @@ function	script	setqtime	{
     return;
 }
 
-// Function to quickly disregard part of getmapxy().
-// If you use this function too much, you'll lose efficiency, and it'll be better
-// to use getmapxy() normally to save to temporary variables.
-// Can take one optional argument (unittype argument).
+// Shortcut for getmapname()
 function	script	getmap	{
-    if (getmapxy(.@mapName$, .@xpos, .@ypos, getarg(0,0)) != 0)
-        return false;
-    return .@mapName$;
+    return getmapname();
 }
 
 // Returns the player race in plain text
@@ -84,7 +81,7 @@ function	script	get_race	{
     .@g=getarg(1, Class);
 
     // We also allow this to run without player attached for... science.
-    if (getarg(1,-1) >= 0)
+    if (playerattached())
     {
         setarray .@allraces$, l("Human"), l("Ukar"), l("Kralog"),
          l("Raijin"), l("Kralog"), l("Raijin"), l("Tritan"),