8088 Commits

Author SHA1 Message Date
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
Cydh Ramdh
3037a1b57e Merge pull request #222 from rathena/hotfix/issue204
Fixed #204
2015-01-14 23:25:45 +07: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
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
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
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
Aleos
d02edae233 Merge pull request #190 from rathena/cleanup/skill_damage_db
Cleanup for Skill Damage Adjustment.
2015-01-08 14:50:52 -05:00
Cydh Ramdh
7864250955 Follow up 7fcacb64c44f4305352d55dc12390aaaa8882997
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-08 16:12:39 +07:00
Cydh Ramdh
5feff01ddd Follow up 54031eda9dcea4a0c5958276a7786cbcdcdc55c5
* Missing `item_ratio->nameid = nameid;` assignment when item_ratio isn't exist in db yet
* Modified @whodrops result for monster list to: "- <monster name> (<mob_id>): <rate>%"

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-08 12:51:52 +07:00
Cydh Ramdh
9021cb6349 Fixed #177
* Wrong number, out of array bounds

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-07 17:13:17 +07:00
Cydh Ramdh
8e71ae6688 Follow up 022d72891e1c38ac6953a5118eea87efd7deddc3
* Fixed warnings in mapif_parse_itembound_retrieve

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-07 15:33:47 +07:00
Cydh Ramdh
f5ddcc55f8 Follow up 72cb55470b160b4a8aae8d64462ac29ab1e44d04
* Added/correcting some #ifdef ADJUST_SKILL_DAMAGE checks

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-07 15:23:21 +07:00
Cydh Ramdh
7fcacb64c4 Autotrade persistance cleanup
* Moved redundant structs for vending & buyingstore, move it to vending.h
* Removed redundant query to update autotrade info (autotrade state, head, body direction, & sit state) that previously executed in vending_reopen & vending_openvending, buyingstore_reopen & buyingstore_create.
* Removed lines to execute queries each iteration to insert vending/buyingstore list, now using StringBuf and just being executed once after the item listing. (in vending_openvending & buyingstore_create)
* Revert the ways initializing autotrader list by using DBMap (vending_autotrader_db & buyingstore_autotrader_db)

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-07 15:08:14 +07:00
Lemongrass3110
d07e5929fd Fixed a small issue and cleaned up the code a little 2015-01-06 16:21:51 +01:00
Lemongrass3110
3707bcfa22 Added import support to mapcache 2015-01-06 16:09:12 +01:00
Lemongrass3110
b5e30e0eb6 Added import support for mapindex 2015-01-06 16:06:09 +01:00
lighta
357aa0489f Merge pull request #201 from rathena/update/npc_ids
Added support for the latest NPC ids
2015-01-04 14:31:58 -05:00
Lemongrass3110
ebe4a1cc17 Added support for the latest NPC ids 2015-01-04 10:51:09 +01:00
Cydh Ramdh
022d72891e Changed Guild/Party Bound Item Retrieval Methods:
* Bug Fixes bug: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 anymore if the player idle on character select window (just prevents player to login when retriving 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 canceled!
* 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

NOTE: Please import upgrade-20150103_log.sql
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-03 20:37:38 +07:00
Cydh Ramdh
d555cac992 Follow up 54031eda9dcea4a0c5958276a7786cbcdcdc55c5
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-03 19:23:35 +07:00
Lemongrass3110
54031eda9d Seperated monster drop ratio adjustment into it's own function.
Fixes #146
2015-01-03 03:14:26 +01:00
Cydh Ramdh
1d27de7a35 Fixed #180
* Separated Sql handle for query_sql to avoid mapreg overwrite the mmysql_handle.
* New handle for query_sql: qsmysql_handle

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-03 08:57:36 +07:00
Cydh Ramdh
0987aeeb5d Official Item BindOnEquip Support
* Added item flag value: 8 to init default item with BindOnEquip. Item with this flag will be character bound item once equipped.
* Added optional config 'default_bind_on_equip' in conf/battle/items.conf to set default bind type. By default the type is character bound.
* Hercules merge 1f5161a2bd

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-02 14:44:49 +07:00
Cydh Ramdh
62bdc99f05 A little cleanup for Pet DB
* 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.

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-12-31 23:38:57 +07:00
Cydh Ramdh
72cb55470b A little clean for Skill Damage Adjustment
* re-Disabled the ADJUST_SKILL_DAMAGE by default (core.h) that enabled by accident since 794c1a8. :P
* Removed MAX_MAP_SKILL_MODIFIER variable.
* Removed fixed array for skill damage adjustment in each map.

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-12-31 23:34:01 +07:00
Lemongrass3110
08941b2a80 Fixed party creation. Thanks @lighta 2014-12-30 23:37:05 +01:00
Lemongrass3110
f4ad757538 Removed a redundant call to clif_party_info on party loading. 2014-12-27 13:57:48 +01:00
Lemongrass3110
4e3a94006f Added an error message for movenpc to report which NPC was not found 2014-12-26 11:09:36 +01:00
lighta
a0753244f7 Few typo
Fix few typo and change défault optimisation lvl for O3 for gcc.
2014-12-19 23:55:14 -05:00
lighta
8066bdef46 Data alignement
Align account_id and char_id to uint32 as this is the value they can be
in DB.
Remove src/test folder, unused
Remove useless #include to speedup compilation.
2014-12-19 21:31:04 -05:00
Cydh Ramdh
73c4c7613c Fixed #164 thank @SusanoSprites and @lighta
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-12-20 09:07:40 +07:00
lighta
37b2ff7b09 Merge branch 'master' of https://github.com/rathena/rathena 2014-12-19 16:24:33 -05:00
lighta
629af3be48 Fix GCC 4.9 plugin needed to handle lto object 2014-12-19 16:22:58 -05:00
Cydh Ramdh
1e6e3f4df3 Follow up 5ce8055
* Added safe check if `mergeitem` script command being used with no items to be merged. Thank @RadianFord

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-12-19 13:01:12 +07:00
Cydh Ramdh
4d5fc9604c Some typos
* Changed -1 for timer id to INVALID_TIMER
* Changed values for pc_bound_chk(). 2 to BOUND_GUILD and 3 to BOUND_PARTY

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-12-17 18:18:56 +07:00
Cydh Ramdh
7295bdc925 Merge pull request #143 from rathena/feature/separated_item_guid
Corrected `guid` implementation of item package in 51074a0. See http://rathena.org/board/topic/99743-item-guid/
2014-12-16 20:26:16 +07:00
Cydh Ramdh
130fa2ce2b Follow up 47e3308, these lines shouldn't be changed.
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-12-09 13:51:14 +07:00
Cydh Ramdh
47e33084ea A little clean up in atcommand
* Typo "status" should be "equip" at 267d521
* Follow up 3428ae2, use the 'parent' command name -atcommand_checkalias()- to compare the command, so it won't breaks alias recognition

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-12-09 13:22:40 +07:00
Aleos
2015b127dd Merge pull request #153 from Tempestronics/patch-1
Doubled the hostname length
2014-12-08 10:08:39 -05:00
Cydh Ramdh
45fdf3252a Follow up 5ce8055
* Changed wrong flag value, 6 -> 4
* Added UID check in pc_cart_additem()
* Generate GUID moved to pc_additem() for item with flag.guid
* Added card comparison in 'mergeitem' to avoid merge CARD0_* items with non-CARD0_*

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-12-08 17:44:45 +07:00
Cydh Ramdh
d3704d50dd Merge pull request #136 from rathena/cleanup/renewal_cast
Clean up something RENEWAL_CAST
* Moved additive bonuses (reducing/increasing) to first calculation before the rate adjustment
* Corrected `bonus(2) bFixedCastrate` shouldn't be stacked. Example between Puente_Robe (15012) is -3% and +10 Rafini_Staff (1649) is -10%, only -10% will be used not -13%.
* Reversed some value assignment, `-=` to `+=` and other part that affected by this change.
* Also as follow up c3e488e & 4f4d8fe, fixed `bonus2 bFixedCastrate,"sk",rate;` algorithm
* Corrected `bFixedCastrate` for Krieger_Knuckle2 (1827) only for skill `MO_EXTREMITYFIST`
* Moved default the 20% of fixed cast rate to conf/battle/skill.conf `default_fixed_castrate`
2014-12-08 13:04:26 +07:00
Cydh Ramdh
396072acc8 Some typos
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-12-08 12:04:07 +07:00
Saifur Rahman Mohsin
3f912f42a2 Doubled the hostname length
The hostname char array was doubled on commit #0f2dd7f but wasn't reflected later on in further file modifications.
2014-12-05 19:01:42 +05:30
icxbb-xx
24f2e82381 follow up to b5fd69b
- remove duplicate code sorry my bad thank you @cydh
2014-12-05 13:03:08 +07:00