summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorJedzkie <jedzkie13@rocketmail.com>2017-04-19 23:41:37 +0800
committerJedzkie <jedzkie13@rocketmail.com>2017-04-19 23:41:37 +0800
commit94104f0e3c69e2089b42915de74c792acbda9e6d (patch)
tree5d39c8042527236f056243a518e1a09fe1bf9c37 /src/map
parentc22bc45868e8ea2b7ef904848d178caeaa6b379c (diff)
downloadhercules-94104f0e3c69e2089b42915de74c792acbda9e6d.tar.gz
hercules-94104f0e3c69e2089b42915de74c792acbda9e6d.tar.bz2
hercules-94104f0e3c69e2089b42915de74c792acbda9e6d.tar.xz
hercules-94104f0e3c69e2089b42915de74c792acbda9e6d.zip
Added oktoberfest_ignorepalette configuration
Diffstat (limited to 'src/map')
-rw-r--r--src/map/battle.c1
-rw-r--r--src/map/battle.h1
-rw-r--r--src/map/clif.c4
-rw-r--r--src/map/status.c2
4 files changed, 5 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index a43fa11c8..349a71f4b 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -7042,6 +7042,7 @@ static const struct battle_data {
{ "xmas_ignorepalette", &battle_config.xmas_ignorepalette, 0, 0, 1, },
{ "summer_ignorepalette", &battle_config.summer_ignorepalette, 0, 0, 1, },
{ "hanbok_ignorepalette", &battle_config.hanbok_ignorepalette, 0, 0, 1, },
+ { "oktoberfest_ignorepalette", &battle_config.oktoberfest_ignorepalette, 0, 0, 1, },
{ "summer2_ignorepalette", &battle_config.summer2_ignorepalette, 0, 0, 1, },
{ "natural_healhp_interval", &battle_config.natural_healhp_interval, 6000, NATURAL_HEAL_INTERVAL, INT_MAX, },
{ "natural_healsp_interval", &battle_config.natural_healsp_interval, 8000, NATURAL_HEAL_INTERVAL, INT_MAX, },
diff --git a/src/map/battle.h b/src/map/battle.h
index 2bc9f5b2e..4ec1be98d 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -246,6 +246,7 @@ struct Battle_Config {
int xmas_ignorepalette; // [Valaris]
int summer_ignorepalette; // [Zephyrus]
int hanbok_ignorepalette;
+ int oktoberfest_ignorepalette;
int summer2_ignorepalette;
int natural_healhp_interval;
int natural_healsp_interval;
diff --git a/src/map/clif.c b/src/map/clif.c
index 3bf77baef..fd1ec17bf 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -3213,7 +3213,7 @@ void clif_changelook(struct block_list *bl,int type,int val)
vd->cloth_color = 0;
if (sd->sc.option&OPTION_HANBOK && battle_config.hanbok_ignorepalette)
vd->cloth_color = 0;
- if (sd->sc.option&OPTION_OKTOBERFEST /* TODO: config? */)
+ if (sd->sc.option&OPTION_OKTOBERFEST && battle_config.oktoberfest_ignorepalette)
vd->cloth_color = 0;
if (sd->sc.option&OPTION_SUMMER2 && battle_config.summer2_ignorepalette)
vd->cloth_color = 0;
@@ -3248,7 +3248,7 @@ void clif_changelook(struct block_list *bl,int type,int val)
val = 0;
if( sd->sc.option&OPTION_HANBOK && battle_config.hanbok_ignorepalette )
val = 0;
- if( sd->sc.option&OPTION_OKTOBERFEST /* TODO: config? */ )
+ if( sd->sc.option&OPTION_OKTOBERFEST && battle_config.oktoberfest_ignorepalette)
val = 0;
if (sd->sc.option&OPTION_SUMMER2 && battle_config.summer2_ignorepalette)
val = 0;
diff --git a/src/map/status.c b/src/map/status.c
index 529ab1c02..fe09c1b7f 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -6883,7 +6883,7 @@ void status_set_viewdata(struct block_list *bl, int class_)
sd->vd.cloth_color = 0;
if (sd->sc.option&OPTION_HANBOK && battle_config.hanbok_ignorepalette)
sd->vd.cloth_color = 0;
- if (sd->sc.option&OPTION_OKTOBERFEST /* TODO: config? */)
+ if (sd->sc.option&OPTION_OKTOBERFEST && battle_config.oktoberfest_ignorepalette)
sd->vd.cloth_color = 0;
if (sd->sc.option&OPTION_SUMMER2 && battle_config.summer2_ignorepalette)
sd->vd.cloth_color = 0;