summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-05-09 12:52:43 -0300
committershennetsind <ind@henn.et>2013-05-09 12:52:43 -0300
commitfeba80eb95cdab74ea5bfeef8c9843de55100d98 (patch)
tree4c85f99c34a69dd6d2dabd1d0f57f953babe589d
parent00d78a1b14f524fa7a4aea9322d9f4b5df65a4d1 (diff)
downloadhercules-feba80eb95cdab74ea5bfeef8c9843de55100d98.tar.gz
hercules-feba80eb95cdab74ea5bfeef8c9843de55100d98.tar.bz2
hercules-feba80eb95cdab74ea5bfeef8c9843de55100d98.tar.xz
hercules-feba80eb95cdab74ea5bfeef8c9843de55100d98.zip
Fixed Item #12786
Special Thanks to Yommy <3~ Thanks! Signed-off-by: shennetsind <ind@henn.et>
-rw-r--r--db/const.txt1
-rw-r--r--db/pre-re/item_db.txt1
-rw-r--r--db/re/item_db.txt2
-rw-r--r--src/map/map.h1
-rw-r--r--src/map/pc.c4
5 files changed, 8 insertions, 1 deletions
diff --git a/db/const.txt b/db/const.txt
index ec051c4b0..5fdf46d23 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -412,6 +412,7 @@ BaseJob 119 1
BaseClass 120 1
killerrid 121 1
killedrid 122 1
+SlotChange 123 1
bMaxHP 6
bMaxSP 8
diff --git a/db/pre-re/item_db.txt b/db/pre-re/item_db.txt
index af7fcdd51..a7f8f1c16 100644
--- a/db/pre-re/item_db.txt
+++ b/db/pre-re/item_db.txt
@@ -5202,6 +5202,7 @@
12771,Passion_Hat_Box2,Passion Hat Box2,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12772,Cool_Hat_Box2,Cool Hat Box2,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12773,Victory_Hat_Box2,Victory Hat Box2,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12786,Change_Slot_Card,Character Position Change Coupon,2,,,,,,,,0xFFFFFFFF,7,2,,,,,,{ set SlotChange, SlotChange + 1; },{},{}
12848,Falcon_Flute,Falcon Flute,11,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ if(getskilllv("HT_FALCON")) { if(checkoption(Option_Wug)||checkoption(Option_Wugrider)) end; if(checkfalcon()==1) { setfalcon 0; } else { setfalcon 1; } } },{},{}
12900,Battle_Manual_Box,Battle Manual Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,10; },{},{}
12901,Insurance_Package,Insurance Package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12209,10; },{},{}
diff --git a/db/re/item_db.txt b/db/re/item_db.txt
index 4ac045036..f275b1c24 100644
--- a/db/re/item_db.txt
+++ b/db/re/item_db.txt
@@ -5983,7 +5983,7 @@
//
12775,Ancient_Spirit_Amulet,Ancient Spirit Amulet,2,20,,600,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
//
-12786,Change_Slot_Card,Character Position Change Coupon,2,,,,,,,,0xFFFFFFFF,7,2,,,,,,{ set CharMoves, CharMoves + 1; },{},{}
+12786,Change_Slot_Card,Character Position Change Coupon,2,,,,,,,,0xFFFFFFFF,7,2,,,,,,{ set SlotChange, SlotChange + 1; },{},{}
//
12848,Falcon_Flute,Falcon Flute,11,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ if(getskilllv("HT_FALCON")) { if(checkoption(Option_Wug)||checkoption(Option_Wugrider)) end; if(checkfalcon()==1) { setfalcon 0; } else { setfalcon 1; } } },{},{}
12900,Battle_Manual_Box,Battle Manual Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,10; },{},{}
diff --git a/src/map/map.h b/src/map/map.h
index ae60b810c..c7f9949eb 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -360,6 +360,7 @@ enum _sp {
SP_BASECLASS=120, //Hmm.. why 100+19? I just use the next one... [Skotlex]
SP_KILLERRID=121,
SP_KILLEDRID=122,
+ SP_SLOTCHANGE=123,
// Mercenaries
SP_MERCFLEE=165, SP_MERCKILLS=189, SP_MERCFAITH=190,
diff --git a/src/map/pc.c b/src/map/pc.c
index aaf89e09a..9dfaa18f1 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -6938,6 +6938,7 @@ int pc_readparam(struct map_session_data* sd,int type)
case SP_FAME: val = sd->status.fame; break;
case SP_KILLERRID: val = sd->killerrid; break;
case SP_KILLEDRID: val = sd->killedrid; break;
+ case SP_SLOTCHANGE: val = sd->status.slotchange;
case SP_CRITICAL: val = sd->battle_status.cri/10; break;
case SP_ASPD: val = (2000-sd->battle_status.amotion)/10; break;
case SP_BASE_ATK: val = sd->battle_status.batk; break;
@@ -7179,6 +7180,9 @@ int pc_setparam(struct map_session_data *sd,int type,int val)
case SP_KILLEDRID:
sd->killedrid = val;
return 1;
+ case SP_SLOTCHANGE:
+ sd->status.slotchange = val;
+ return 1;
default:
ShowError("pc_setparam: Attempted to set unknown parameter '%d'.\n", type);
return 0;