741 Commits

Author SHA1 Message Date
rAthenaAPI
1518d7be24 SQL synchronization 2015-04-04 17:10:44 +02:00
rAthenaAPI
f924f5aeac SQL synchronization 2015-04-04 01:20:40 +02:00
rAthenaAPI
e4f458f1dc SQL synchronization 2015-03-31 19:37:03 +02:00
rAthenaAPI
f62d2ab2d6 SQL synchronization 2015-03-31 12:53:33 +02:00
rAthenaAPI
a17d7bd8ed SQL synchronization 2015-03-28 02:15:20 +01:00
rAthenaAPI
ae66f7197f SQL synchronization 2015-03-27 17:11:57 +01:00
Cydh Ramdh
7d929a06a3 NPC Market Shop support
* New shop script definition: `<map name>,<x>,<y>,<facing>%TAB%marketshop%TAB%<NPC Name>%TAB%<sprite id>,<itemid>:<price>:<quantity>{,<itemid>:<price>:<quantity>...}`
* Added script command to update shop NPC: 'npcshopupdate "<name>",<itemid>,<price>{,<stock>}'
* Added NPCMarketDB (DBMap) for market data persistance method.
* Added `market_table` definition for market table in conf/inter_athena.conf.
* Thank to @aleos89, @Lemongrass, @icxbb-xx, merged HerculesWS/Hercules@cf19b26.

NOTES:
* Minimum client needed 2013-12-23 (but this client has bugs there-and-there).
* There's new table, see `upgrade_20150327.sql`.
* Market shop doesn't support discount.
* Added items by script `npcshopitem` or `npchopadditem` will be assumed as persistance items, will be loaded on next script reload or server start even market_shop NPC does't list them (unless NPC is not exists, entries will be removed).

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-03-27 21:11:07 +07:00
rAthenaAPI
c62b328413 SQL synchronization 2015-03-24 06:28:21 +01:00
Lemongrass3110
bbf6b96339 SQL synchronization 2015-03-23 21:09:59 +01:00
nanakiwurtz
fffb0adc66 Champion Mobs Implemented
* Big thanks to @Skormie, @Lemongrass3110 and @euphyy

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-03-22 01:59:22 +07:00
rAthenaAPI
e3adcbda3b SQL synchronization 2015-03-18 21:50:28 +01:00
nanakiwurtz
17213cabe3 File item_db.txt fixed
* Thanks to @carl820912

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-03-18 09:41:36 +07:00
nanakiwurtz
8d47306f18 File item_db_re.sql fixed
Missed a comma, Thanks to @carl820912
2015-03-17 17:40:20 +07:00
nanakiwurtz
186e7edf38 File item_db_re.sql updated
Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-03-17 09:47:03 +07:00
nanakiwurtz
d34a12ee05 Item DB Update
* Added Red Booster and Green Potion item script
2015-03-13 04:18:55 +07:00
Lemongrass3110
f366a23fa2 SQL synchronization 2015-02-26 21:40:40 +01:00
aleos89
d3625e5c10 Cleaned up merge issues. 2015-02-21 15:43:58 -05:00
Cydh Ramdh
d5b271b926 Merge pull request #289 from rathena/feature/bonus_HPSP_VanishRace
Bonus HP/SP Vanish updates:
* Added 'bonus3 bHPVanishRaceRate,r,n,x' (2074) and 'bonus3 bSPVanishRaceRate,r,n,x' (2075)
* Corrected documentation about 'bHPVanishRate' and 'bSPVanishRate', rate should be n/100%, 10000 for 100%
* 'bHPVanishRate' and 'bSPVanishRate' applied regardless the target's Race and map (before, if target is player bHPVanishRate only works in PVP/GVG maps)
* Changed Velum item scripts:
  * (1294) Velum_Scare to 'bonus3 bSPVanishRaceRate,RC_Player,10000,10;'
  * (1395) Velum_Buster to 'bonus3 bSPVanishRaceRate,RC_Player,10000,10;'
  * (18113) Velum_Arbalest to 'bonus3 bSPVanishRaceRate,RC_Player,10000,4;'
  * (21002) Velum_Katzbalger to 'bonus3 bHPVanishRaceRate,RC_Player,10000,8;'
2015-02-13 16:45:23 +07:00
Cydh Ramdh
bf6d2f0197 Merge pull request #263 from rathena/cleanup/bonus_script
Bonus Script clean up
* Removed fixed array size (MAX_PC_BONUS_SCRIPT) of bonus_script on players, changed to link list.
* Changed fixed script string on player's bonus_script to StringBuf, reduce memory usage for each connected player.
* Added new flags to expand duplicated script and flag to allow duplicate script.
* Reduced buf length from 1024 to 512 on bonus_script_data (used for saving/loading bonus_script from char-server). Still, MAX_PC_BONUS_SCRIPT is used to gives limit data can be loaded.
* Merged 'pc_bonus_script_clear_all' to 'pc_bonus_script_clear'
* Now bonus script will be saved on auto-save timer or other save request, prevent losing the bonus when "something" happen. But, saving when player is quitting will removes the bonus that won't be saved on logout.
* Fixed Superstar_Snack (22843) and Sealed_Dracula_Card (22846) fields

NOTE:
Please import 'upgrade_20150131.sql' for `bonus_script` table changes

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-02-13 16:37:28 +07:00
Cydh Ramdh
2ef7a7daa8 Bonus HP/SP Vanish updates:
* Added 'bonus3 bHPVanishRaceRate,r,n,x' (2074) and 'bonus3 bSPVanishRaceRate,r,n,x' (2075)
* Corrected documentation about 'bHPVanishRate' and 'bSPVanishRate', rate should be n/100%, 10000 for 100%
* 'bHPVanishRate' and 'bSPVanishRate' applied regardless the target's Race and map (before, if target is player bHPVanishRate only works in PVP/GVG maps)
* Changed Velum item scripts:
  * (1294) Velum_Scare to 'bonus3 bSPVanishRaceRate,RC_Player,10000,10;'
  * (1395) Velum_Buster to 'bonus3 bSPVanishRaceRate,RC_Player,10000,10;'
  * (18113) Velum_Arbalest to 'bonus3 bSPVanishRaceRate,RC_Player,10000,4;'
  * (21002) Velum_Katzbalger to 'bonus3 bHPVanishRaceRate,RC_Player,10000,8;'

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-02-13 01:39:17 +07:00
Cydh Ramdh
9d3d34205f Skill DB clean ups
* Changed skill_db array to better memory allocation.
* Reduced MAX_SKILL_LEVEL from 100 to 10 (part of Hercules 0f4a50d135), also has changes on skill_get checks for skill level that more than 10.
* Reduced MAX_SKILL from 5020 to 1200 (actually only 1109 skills are used).
* Added macros for checking Homunculus, Guild, Mercenary, & Elemental skill ranges.
* Added skill check & index validation when player logged in and when @reloadskilldb.
* Corrected `enum e_skill_flag` order for SKILL_FLAG_REPLACED_LV_0's sake.
* Merged 'addtoskill' script command just as alias of 'skill' script command.
* Fixed #277
* Changed 'skill' script command flag to constant value

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>

NOTE:
* Decreased memory usage by map-server reduced up to 50 MB.
* Decreased memory for each player because of mmo_charstatus::skill[] only has 1200 array, before is 5020.
* Please use skill_get_index() for accessing sd->status.skill[] or skill_db[], don't reckless use skill_id as array index.
* Please import upgrade_20150211_skillset.sql

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-02-12 15:50:50 +07:00
Cydh Ramdh
892e961823 * Fixed Superstar_Snack (22843) and Sealed_Dracula_Card (22846) fields
* Removed debug leftover

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-02-12 14:57:59 +07:00
Aleos
0e533fa7ab Revert "Skill DB clean ups" 2015-02-10 09:33:00 -05:00
Lemongrass3110
adbf6f05c6 SQL synchronization 2015-02-10 14:22:49 +01:00
Lemongrass3110
965416bb76 Small fixes to @lighta's convert SQL script 2015-02-10 14:18:45 +01:00
Cydh Ramdh
72617ac98b Skill DB clean ups
* Changed skill_db array to better memory allocation.
* Reduced MAX_SKILL_LEVEL from 100 to 10 (part of Hercules 0f4a50d135), also has changes on skill_get checks for skill level that more than 10.
* Reduced MAX_SKILL from 5020 to 1200 (actually only 1109 skills are used).
* Added macros for checking Homunculus, Guild, Mercenary, & Elemental skill ranges.
* Added skill check & index validation when player logged in and when @reloadskilldb.
* Corrected `enum e_skill_flag` order for SKILL_FLAG_REPLACED_LV_0's sake.
* Merged 'addtoskill' script command just as alias of 'skill' script command.

Summary:
* Decreased memory usage by map-server reduced up to 50 MB.
* Decreased memory for each player because of mmo_charstatus::skill[] only has 1200 array, before is 5020.
* Please use skill_get_index() for accessing sd->status.skill[] or skill_db[], don't reckless use skill_id as array index.

NOTE:
* Please import upgrade_20150131_skillset.sql

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-31 19:45:52 +07:00
Cydh Ramdh
95705d41be Bonus Script clean up
* Removed fixed array size (MAX_PC_BONUS_SCRIPT) of bonus_script on players.
* Changed fixed script string on player's bonus_script to StringBuf, reduce memory usage for each connected player.
* Added new flags to expand duplicated script and flag to allow duplicate script.
* Reduced buf lenght from 1024 to 512 on bonus_script_data (used for saving/loading bonus_script from char-server). Still, MAX_PC_BONUS_SCRIPT is used to gives limit data can be loaded.

NOTE:
Please import 'upgrade_20150131.sql' for `bonus_script` table changes

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-31 15:07:13 +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
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
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
Cydh Ramdh
241469a04a Item DB Update
* Added Valor set scripts (parts & combo)

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-09 10:24:28 +07: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
d98f99b2de Item DB Updates
* Follow up 5004eb6
  * Fixed Sealed_Fortune_Egg (22845) script
  * Changed the way to comment a line for item_combo. Need more info about the pairs for Enhanced_Force_Shadow_Weapon (24223) and Enhanced_Soul_Shadow_Weapon (24227)
* Renamed English name of 4482 to 'Sealed General Egnigem Cenia Card'

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-02 14:18:29 +07:00
nanakiwurtz
f599bb5fbd Follow up to 5004eb6
-- Added missing refinable attributes to Shadow Equipments
2015-01-01 18:30:05 +07:00
nanakiwurtz
5004eb6de0 Item DB Update
-- Updated up to kRO 2014-10-29 (Source: Super Star Monster 2014 R Event + Infinite Room Instance)
-- C_Will_O_Wisp (18741) item script updated. Thanks to Radian
-- SP_Increase_Potion_(Large) (12427) weight updated. Thanks to rayn
2015-01-01 18:16:34 +07:00
nanakiwurtz
5e573aabdb Follow up to b6253cf
-- Added C_Drooping_Dorasuke (20177) View ID (Thanks to Cydh)
2014-12-28 14:56:32 +07:00
nanakiwurtz
b6253cf2b6 Item DB Update
-- Costume Horse Hairpin: View ID added (Thanks to zackdreaver)
2014-12-28 14:43:46 +07:00
Cydh Ramdh
bbfa46dd90 Item DB Update
* Just View ID for C_Drooping_Dorasuke (20177)

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-12-28 01:41:06 +07:00
nanakiwurtz
ba817e807f Item DB Update
-- Fixed some item's "English Name"
2014-12-27 05:53:50 +07:00
Cydh Ramdh
fe56ff0b06 Item DB updates.
* Updated View IDs for headgears & robe, some follow up of changes by @nanakiwurtz.
* Corrected script of Full_Moon (19538).
* Corrected item location of C_Monster_Card (19764) to mid-head, Fantastic_Aura (20600) to costume robe.
* Corrected item type of Ribbon_Piamat (20725), Brilliant_Golden_Wings (20727), Loyalists_Hood (20730) from 12 to 4.
* ... what else?

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-12-25 22:57:03 +07:00
nanakiwurtz
36717c6a35 Item DB update
-- kRO 2014-10-29
2014-12-23 21:13:31 +07:00
nanakiwurtz
3ad8b99ced Item script typo fixed
-- Nut_Donut_In_Mouth (18566) typo fixed (Thanks to Radian)
2014-12-19 08:28:12 +07:00
nanakiwurtz
229d15db87 /npc/re/merchants/coin_exchange.txt item update
-- Added Costume Hahoe Mask (19554). Thanks to rayn
2014-12-17 17:45:27 +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
071cb76bc3 Fixed #141 & Changed regen rate value from 1 to 100
* 1 = 1%, 100 = 100%... previously 1 = 100%
* Increase calculation accuracy. Example for previous calculation of Concentrated_White_Potion_Z (12428) bonus to add 20% HP recovery rate always be fail, since "1*20/100" always be round down to 0, didn't add 20%!
* Vitata_500 (12436) has incomplete vals for SC

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-12-01 19:55:53 +07:00
Cydh Ramdh
e4663e99e1 Follow up 700d1e9 & misc
* Added newline at end of file
* Removed extra parenthesis. Thank @julia40124009
* Added constantan value, IT_SHADOWGEAR 12
* Corrected some item type, 11 -> 2
* Removed `set` from item_combo_db.txt to direct assignment

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-11-29 23:15:30 +07:00
Cydh Ramdh
5c6afd7ea3 Clean up something RENEWAL_CAST
* Moved additive bonuses (reducing/increasing) to first calculation before the rate adjustment
* Corrected 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 changes.
* Also as follow up c3e488e & 4f4d8fe, fixed `bonus2 bFixedCastrate,"sk",rate;`
* 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`

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-11-29 01:54:56 +07:00
nanakiwurtz
c366d98004 Follow up to 2839983
-- Changed Skill ID to it's corresponding skill constants

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2014-11-28 14:30:29 +07:00