summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-03 20:58:46 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-03 20:58:46 +0000
commitaa588005380c101b4b539e90234a9524f5390575 (patch)
tree2970061c49cd3f66aaa91dd58bfcc3c330aeb025
parentf8887e4e989ac4e0c8d860a690dfb5520e708d9e (diff)
downloadhercules-aa588005380c101b4b539e90234a9524f5390575.tar.gz
hercules-aa588005380c101b4b539e90234a9524f5390575.tar.bz2
hercules-aa588005380c101b4b539e90234a9524f5390575.tar.xz
hercules-aa588005380c101b4b539e90234a9524f5390575.zip
- Corrected Longing for Freedom, it should triple SP cost rather than modifying SP cost to 1/sec
- Corrected Marionette Control's SP cost, it should be 100. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10150 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--db/Changelog.txt1
-rw-r--r--db/skill_require_db.txt2
-rw-r--r--src/map/status.c2
4 files changed, 5 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 2e73e9a2e..4f356bedb 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/04/04
+ * Corrected Longing for Freedom, it should triple SP cost rather than
+ modifying SP cost to 1/sec
* SC_ENCHANTARMS will no longer fail to start if it's already running with
a "higher elemental level".
* When trying to trade an untradeable item, the add-item-fail packet will
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 5d4219fbf..6263e7c56 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -20,6 +20,7 @@
========================
04/04
+ * Corrected Marionette Control's SP cost, it should be 100. [Skotlex]
* Updated Poison Bottle and Thunder Box [Playtester]
* Had to revert some mob modes [Playtester]
- figured out I can't read the mode fully from the inc value
diff --git a/db/skill_require_db.txt b/db/skill_require_db.txt
index 491cfb11e..198e13ccb 100644
--- a/db/skill_require_db.txt
+++ b/db/skill_require_db.txt
@@ -299,7 +299,7 @@
394,0,0,12:14:16:18:20:22:24:26:28:30,0,0,0,13:14,1,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //CG_ARROWVULCAN#アロ?バルカン#
395,0,0,30:40:50:60:70,0,0,0,13:14,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //CG_MOONLIT#月明りの泉に落ちる花びら#
-396,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //CG_MARIONETTE#マリオネットコントロ?ル#
+396,0,0,100,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //CG_MARIONETTE#マリオネットコントロ?ル#
397,0,0,18:21:24:27:30,0,0,0,4:5,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //LK_SPIRALPIERCE#スパイラルピア?ス#
398,0,0,23,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //LK_HEADCRUSH#ヘッドクラッシュ#
399,0,0,12:12:14:14:16:16:18:18:20:20,0,0,0,4:5,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //LK_JOINTBEAT#ジョイントビ?ト#
diff --git a/src/map/status.c b/src/map/status.c
index e3be77a41..ece5fef5f 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -6754,7 +6754,7 @@ int status_change_timer(int tid, unsigned int tick, int id, int data)
}
if (s && ((sc->data[type].val3 % s) == 0)) {
if (sc->data[SC_LONGING].timer != -1)
- sp = s;
+ sp*= 3;
if (!status_charge(bl, 0, sp))
break;
}