885 Commits

Author SHA1 Message Date
Atemo
9b13351817 Merge branch 'master' into academie 2015-11-24 18:01:09 +01:00
lighta
d22eb4326b Merge pull request #749 from Baalberith6/master
Fixing sql upgrade 2014 06 12 losing data when having negative values in card columns
2015-11-20 01:38:41 -04:00
nanakiwurtz
4df55c9753 Fixed #766
* Thanks to @ernestfegarido

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-11-20 09:51:15 +07:00
marha
fd9251579c Narrow the query results to named items only (card0 IN (254,255)) 2015-11-19 22:18:23 +01:00
lighta
8703eacfe4 Merge branch 'academie' of https://github.com/rathena/rathena into academie 2015-11-17 22:19:38 -05:00
nanakiwurtz
e9d8661c6f Reverted item ID 4845 (Strength of Ocean)
* Blame b69d9b0db2

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-11-17 10:57:16 +07:00
nanakiwurtz
bac1607624 Item DB Update
* Several cards script updated

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-11-17 10:46:25 +07:00
Atemo
cc8edaaac6 Merged novice academie from Hercules 21564acf13
-> All Credit to Kisuka for this big work.

Added news commands to alter questinfo conditions :
- setquestinfo_level : Add level range criteria for quest info with quest id 'quest_id'.
- setquestinfo_req : Add quest requirement for quest info with quest id 'quest_id'.
   -> Player have / doesn't have the required quest.
- setquestinfo_job : To add additionnal job criteria.
-> Credit to Cydh !
2015-11-16 00:34:00 +01:00
nanakiwurtz
b69d9b0db2 Item DB Update
* Card and Armor Enchantment update

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-11-10 11:39:41 +07:00
marha
f34deb0ebc Fixing upgrade 2014 06 12 losing data when having negative data (e.g. char ids) in card slots. Easiest way to reproduce is on a Wedding Ring. 2015-11-10 00:19:57 +01:00
rAthenaAPI
789a54cc17 SQL synchronization
[ci skip]
2015-11-10 00:17:51 +01:00
nanakiwurtz
21603f0f69 Item DB Update
* Thanks to @Badarosk0

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-11-08 22:40:57 +07:00
rAthenaAPI
7e04987235 SQL synchronization
[ci skip]
2015-11-08 11:30:46 +01:00
nanakiwurtz
c262cb9b01 Fixed #740
* Thanks to @ernestfegarido

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-11-05 17:39:52 +07:00
Cydh Ramdh
c73ebec481 Corrected scripts for items following official scripts.
Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2015-11-02 10:53:53 +07:00
Aleos
286f251e2e Merge pull request #668 from Vennren/master
Fixed a possible syntax error for roulette tables
* Thanks to @Vennren.
2015-10-26 12:34:05 -04:00
nanakiwurtz
581c2368fe Fixed #711
* Thanks to @ernestfegarido

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-10-23 08:47:21 +07:00
nanakiwurtz
b6187aa9b3 Fixed #695
* Thanks to @ernestfegarido

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-10-18 22:25:52 +07:00
nanakiwurtz
8952412d07 Follow up to 587da10
Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-10-18 22:00:46 +07:00
Cydh Ramdh
587da1048d Item DB Update
* Added items, packages, and combos from idRO patch 2015-10-07 and 2015-10-15.
* There are some WoE TE items. (just bad, we don't have WoE TE implemented yet)

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2015-10-18 16:38:08 +07:00
nanakiwurtz
e0b24fc670 Fixed #683
* Thanks to @Badarosk0

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-10-15 03:23:24 +07:00
Vennren
ea1ffb578a Update upgrade_20150619.sql
Fixed 'db_roulette' table in relation to Error Code: 1064.
2015-10-08 05:10:51 +02:00
Vennren
0da96457e7 Update main.sql
Fixed 'db_roulette' table in relation to Error Code: 1064.
2015-10-08 05:09:46 +02:00
nanakiwurtz
64d2463e25 Fixed #664
* Thanks to @ernestfegarido

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-10-04 17:17:20 +07:00
nanakiwurtz
9f126d2d73 Item DB Update
* Added Moving Dark Matter (6940)
* Add 2 spaces to script_commands.txt

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-09-27 05:09:02 +07:00
nanakiwurtz
5e18376dc8 Item DB Update
* Added Old Belt (6939)

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-09-25 04:39:08 +07:00
nanakiwurtz
8840d4f397 Item DB Update
* Added Hedgehog Picks (6938)

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-09-24 05:30:28 +07:00
nanakiwurtz
0b568eba7e Item DB Update
* Added Advanced Dish (6935)

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-09-23 04:21:22 +07:00
nanakiwurtz
3113168f79 Item DB Update
* Added Magnificent Dish (6934)

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-09-22 03:29:19 +07:00
nanakiwurtz
bc30633043 Item DB Update
* Added Letter_With_Stamped_Seal (6929)

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-09-21 04:58:24 +07:00
nanakiwurtz
e46574a12d Item DB Update
* Added Samples New Business Items (6930)

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-09-20 15:58:21 +07:00
nanakiwurtz
c02089fdb5 Item DB Update
* Added Secret Documents (6931)

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-09-19 11:13:05 +07:00
aleos89
4e630a2a4d Merge branch 'master' of https://github.com/rathena/rathena 2015-09-17 13:25:15 -04:00
aleos89
039e1b65a3 Quest System Update
* Added support for the new quests that grant item drops from mobs.
2015-09-17 13:24:42 -04:00
nanakiwurtz
c3e91b53e7 Item DB Update
* Added Rare_Book (6932)

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-09-18 00:08:59 +07:00
nanakiwurtz
fd227bf7a1 Item DB Update
* Added Banquet Invitation Letter (6933)

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-09-16 05:09:41 +07:00
nanakiwurtz
564a46b40c Item DB Update
* Added Silicone Shell (6937)

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-09-15 02:19:07 +07:00
Cydh Ramdh
48293b757d Item DB Update
* Added items, packages, and combos from idRO patch 2015-09-09

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2015-09-14 11:56:48 +07:00
nanakiwurtz
d1f9470009 Item DB Update
* Added Cold Core (6936)

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-09-14 04:48:44 +07:00
nanakiwurtz
36d290b6fc Item DB Update
* Added Zombie Guard Card (4641)

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-09-13 03:11:33 +07:00
nanakiwurtz
f69647171f Item DB Update
* Added Frozen Wolf Card (4640)

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-09-12 01:02:09 +07:00
nanakiwurtz
02b31b9dfc Fixed #631
* Thanks to @ernestfegarido

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-09-11 00:09:58 +07:00
nanakiwurtz
d17e95b898 Item DB Update
* Added Taffy Card (4639)

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-09-10 02:45:15 +07:00
nanakiwurtz
edb817c260 Item DB Update
* Added Watcher Card (4638)

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-09-09 04:58:09 +07:00
nanakiwurtz
a1afbd847a Item DB Update
* Added Immortal Corps Card (4637)

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-09-08 00:57:58 +07:00
nanakiwurtz
d3ab33e158 Item DB Update
* Added Bijou Card (4636)
* Added Bijou Card + Enhanced Amdarais Card combo set
* Sorted eff, ele and RC in /doc/item_bonus.txt alphabetically

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-09-07 03:27:09 +07:00
nanakiwurtz
172ae93d47 Item DB Update
* Added Enhanced Amdarais Card (4635)

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-09-06 00:42:05 +07:00
Cydh Ramdh
997836897f Follow up 43068e1777d4b75baa3f36e1c5ff13ca5289e0f4:
* Eff_Crystalize on Sropho_Card (4522) has defined duration.
* Bonus added:
  * `bonus4 bAddEff,eff,n,y,t;`
    * Adds a n/100% chance to cause status eff for t milliseconds on the target when attacking
    * Just like `bonus3 bAddEff,eff,n,y;` but with user-defined duration;
  * `bonus4 bAddEffWhenHit,eff,n,y,t;`
    * Adds a n/100% chance to cause status eff for t milliseconds on the target when being hit by physical damage
    * Just like `bonus3 bAddEffWhenHit,eff,n,y;` but with user-defined duration;
  * bonus5 bAddEffOnSkill,sk,eff,n,y,t;
    * Adds a n/100% chance to cause status eff for t milliseconds on the target when using skill sk
    * Just like `bonus4 bAddEffOnSkill,sk,eff,n,y;` but with user-defined duration;

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2015-09-05 08:19:23 +07:00
nanakiwurtz
8701b9b09d Item DB Update
* Added Enhanced Soldier Skeleton Card (4634)

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-09-05 05:24:14 +07:00
nanakiwurtz
43068e1777 Fixed #469
* Added Eff_Crystalize to /db/const.txt
* Thanks to @joelolopez

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-09-04 01:28:50 +07:00