12546 Commits

Author SHA1 Message Date
aleos89
54fe46f756 Fixed #205 2015-01-23 10:51:16 -05:00
aleos89
d7d65838b9 Merge branch 'master' of https://github.com/rathena/rathena 2015-01-23 10:18:54 -05:00
Cydh Ramdh
a9a8e9e96f Merge pull request #244 from RagnarokNova/patch-1
Light of Regene fixes:
* Light of Regene doesn't affect the master
* Wrong intimacy set, should be 25100 instead of 251.
2015-01-23 17:36:29 +07:00
RagnarokNova
198d230f2b Update skill.c
Follow-up according to Cydh's comment.
2015-01-23 02:30:53 -08:00
RagnarokNova
e2ae91db0e Made Light of Regene work.
Straight up copied the code from Pyroclastic, as the original skill code for Light of Regen was not applying the status effect to the player. Seems to work just fine, not sure if that second sc_start2 can just be deleted.
2015-01-23 00:33:15 -08:00
RagnarokNova
1cf2dd59c5 Light of Regene
Due to the way the source handles hom intimacy, 251 actually sets intimacy to 2 (Hate with a passion). The two extra 0s make it the appropriate value.
2015-01-23 00:20:36 -08:00
Cydh Ramdh
cdad6e4571 Follow up 1d27de7a35e58d3a71f28057d494366a597a440f
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-23 10:59:38 +07:00
nanakiwurtz
e31ed0c3ea Item DB Fix
-- Thanks to Chaos92

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-01-22 22:53:44 +07:00
aleos89
48020c4d5c Merge branch 'master' of https://github.com/rathena/rathena 2015-01-21 12:20:00 -05:00
Cydh Ramdh
c32b8e0c09 Merge pull request #229 from rathena/cleanup/itemmaxlv_n_equipitemack
Cleanup item maxlv and clif_equipitemack
2015-01-21 10:29:27 +07:00
Cydh Ramdh
44d599875a Merge pull request #206 from rathena/feature/import-maps
Import support for map data
2015-01-21 10:28:03 +07:00
Cydh Ramdh
8b05ac2875 Merge pull request #240 from rathena/cydh-patch-1
Update status.h
2015-01-21 10:27:49 +07:00
Capuche
b72162f095 Follow up f2621eec605fee7135e424dd3d466635988b2600
Signed-off-by: Capuche <capucrath@gmail.com>
2015-01-20 15:37:25 +01:00
nanakiwurtz
a60e41e8cb Mob Drop Update
-- Thanks to @DrNebula
-- Added some new monsters

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-01-20 14:06:28 +07:00
Cydh Ramdh
3b40780434 Update status.h
Just some source documentation style~
2015-01-20 01:14:00 +07:00
nanakiwurtz
88fdcc0ac2 Item DB Fix #236
-- Thanks to @trickyloki3
2015-01-19 05:44:50 +07:00
Cydh Ramdh
b47dc0f054 Item DB updates
* Implemented ALL_REVERSEORCISH as follow up 01ae1ae6126dc8aa91f967eea7d145e10dfb29e3.
* Clean up `rand()` script usage in Fools_Day_Box (12396) and Fools_Day_Box2 (12397).

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-18 20:57:42 +07:00
Cydh Ramdh
01ae1ae612 Fixed #235
* Thank @trickyloki3
* Except items with "ALL_REVERSEORCISH" skill

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-18 19:09:18 +07:00
Atemo
95792ecac8 Merge pull request #233 from emistry/patch-2
Fixed Issue #232
2015-01-17 12:05:25 +01:00
Cydh Ramdh
009e0e3846 Missing md.damage assignment after battle_attr_fix for RENEWAL CR_ACIDDEMONSTRATION in battle_calc_misc_attack since f926d8750aef664abd91404de53c5a5e60d9e16f
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-17 17:59:30 +07:00
Emistry
e134c76859 Issue #232
https://github.com/rathena/rathena/issues/232

Just like @Cydh said:
somehow, += for a string in iteration is fail. /hmm
temp fix is .@foo$ = .@foo$+"bar";
2015-01-17 15:14:28 +08:00
Cydh Ramdh
b9f5bca9b1 Follow up fa75733cc109f926b1df4156ccdf1292c78f8f79 typos
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-16 23:38:00 +07:00
aleos89
ee6e47b7c2 Merge branch 'master' of https://github.com/rathena/rathena 2015-01-16 11:22:44 -05:00
Cydh Ramdh
73bd593055 Fixed #219
* Manhole effect (SC__MANHOLE & UNT_MANHOLE) is ignore player's knockback immunity at GVG/BG maps (only if target is BL_PC).

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-16 20:38:26 +07:00
Cydh Ramdh
c7dcca3b6e Follow up 48d8389d27af8400e1048d2c626e259686357865
* No UTF-8 BOM for npc/re/quests/quests_eclage.txt

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-16 12:49:52 +07:00
Euphy
df6fb01739 Small fixes in Eclage scripts and code style changes.
- Fixed some minor bugs.
- Added GM NPC function.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2015-01-15 13:01:12 -05:00
Capuche
89d436f53f Follow up 48d8389d27af8400e1048d2c626e259686357865 2015-01-15 15:00:59 +01:00
Atemo
48d8389d27 Merge pull request #228 from Skormie/eclage_update_r1
Eclage update r3
2015-01-15 14:42:46 +01:00
Cydh Ramdh
90f08a4f08 Follow up 5feff01ddd621fd49985e0374bf3fe169ded02f3
* Typo of error message in mob_readdb_itemratio()

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-15 16:53:28 +07:00
Cydh Ramdh
4d97e9adf2 Typo on a683e005d73f37b57e625046168e9f3282131a81
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-15 10:29:08 +07:00
aleos89
907bc6e4b5 Merge branch 'master' of https://github.com/rathena/rathena 2015-01-14 14:37:28 -05:00
Cydh Ramdh
817d6bf800 Multi-client support for clif_equipitemack with packet identifier ZC_WEAR_EQUIP_ACK
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-15 02:07:06 +07:00
Cydh Ramdh
fa75733cc1 Item Max Level clif_equipitemack messages
* Max level to equip item now works for Pre-Renewal too, since the field is optional. 0 means no max level limit.
* Fixed fail message on clif_equipitemack when item cannot be equipped because level limitation

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-15 01:17:54 +07:00
Skormie
f2621eec60 Eclage update with minor error fix. r3 2015-01-14 12:02:31 -05:00
Cydh Ramdh
3037a1b57e Merge pull request #222 from rathena/hotfix/issue204
Fixed #204
2015-01-14 23:25:45 +07:00
Skormie
e8d0d35324 Eclage update with minor error fix. r2 2015-01-14 10:54:03 -05:00
Cydh Ramdh
2b90b60142 Fixed #227
* SC_EQC & SC_CBC shouldn't be saved on logout
* Moved additional effect SC_EQC to the proper place

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-14 15:55:42 +07:00
Skormie
03249a0430 Eclage update with minor error fix and added optimizations. 2015-01-13 20:38:54 -05:00
Skormie
a4cac34dc6 Eclage update with minor error fix. 2015-01-13 18:19:32 -05:00
aleos89
6ae8404e4e Merge branch 'cleanup/autotrade_persistance' of https://github.com/rathena/rathena 2015-01-13 13:11:52 -05:00
aleos89
a683e005d7 Merge pull request #197 from rathena/hotfix/bug9338
* Changed Guild/Party Bound Item Retrieval Methods:
- Fixes bugreport:9338
- Now resend the list to map-server from char/inter-server to avoid "weird" item allocation on guild storage. Example, previously you will meet stacked item like GUID does, but it shouldn't!
- Also will check the maximum amount that can be store in guild store. If guild storage is full (the slots or item stack limit is reach) the rest value/item will be dropped.
- Account of kicked guild member won't be kicked from server any more if the player idle on character select window (just prevents player to login when retrieving items are in progress)
- Delete guild bound items from guild master when guild is disbanded! Previously, the bound type just changed to NONE. Also for party bound item.
- If kicked guild/party member is trading bound item when be kicked, the trade will be cancelled!
- If the guild member is being kicked when open guild storage, storage will be closed first waiting for next item retrieval.
- Now when guild storage is opened, storage_status (changed the var to 'opened') will be used to hold char_id who opens it.
* Misc:
- Cleanup guild storage prefix functions, changed them to "gstorage_*"
- Added picklog type 'B' for logging deleted bound item because of kicked from guild/party.
- Updated documentation for new used packet 0x3857
2015-01-13 12:59:19 -05:00
aleos89
4860a7c7c4 Merge pull request #191 from rathena/cleanup/petdb
* Separated pet_db for Renewal & Pre-Renewal to avoid non-existant monster in different mode.
* Cleaned script command in pet_db.txt file, just point it to doc/script_commands.txt. Read them there!
* Separated damage value for petskillattack2 to its own var 'damage', that previously use 'lv' var to store the value.
* Added config 'pet_ignore_infinite_def' in conf/battle/pet.conf,
- If disabled (val:"no"), fixed damage from pet script 'petskillattack2' will be adjusted to 1. Example, just like player attacks Shining Plant.
- Enabled by default. Previously, fixed damage ignore the infinite defense, that's why it's enabled by default.
- TODO: Correcting the logic and maybe also confirm the correct behavior!
* Added validation for pet script commands,
- Skill for petskillattack, petskillattack2, & petskillsupport
- SC range for petrecovery.
* Cleaned up some source documentation.
2015-01-13 12:43:07 -05:00
Cydh Ramdh
e76d92f538 Fixed #220
* SC_FIGHTINGSPIRIT gives no effect for RK_FIGHTINGSPIRIT level < 10
* Fixed RK_FIGHTINGSPIRIT gives no effect if level < 5
* Little optimization on RK_FIGHTINGSPIRIT codes

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-13 12:35:44 +07:00
Cydh Ramdh
5566424129 Merge pull request #225 from rathena/update/skill_unit_error_messages
Additional error information in skill_unit_move_sub
2015-01-13 10:30:32 +07:00
Lemongrass3110
c222a1ccea Added skill_id to error messages in skill_unit_move_sub 2015-01-12 22:00:22 +01:00
Cydh Ramdh
5196eadb2b Fixed #204
* Separated how monster's skills to be assigned to each monster to `mob_skill_db_set()` function
* Added temporary `DBMap *mob_skill_db` to store monster skills by using `struct s_mob_skill`

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-12 16:34:49 +07:00
Capuche
d1a1029316 Added Eden quests 100-140.
Thanks to Euphy.

Signed-off-by: Capuche <capucrath@gmail.com>
2015-01-12 01:08:44 +01:00
Cydh Ramdh
cba366e143 Merge pull request #195 from rathena/hotfix/issue146
Hotfix for issue #146
2015-01-11 00:09:28 +07:00
Lemongrass3110
df16b6e905 follow up
Mapindex now also uses the common variable db_path and the DBIMPORT define
Also removed the global mapindex configuration variable from the header file
2015-01-09 18:12:04 +01:00
Cydh Ramdh
4f1fa38915 Merge pull request #192 from rathena/feature/bindonequip
Official Item BindOnEquip Support
2015-01-09 23:02:08 +07:00