12450 Commits

Author SHA1 Message Date
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
lighta
78bcd82039 Update libconfig to 1.4.9 2014-12-19 03:10:07 -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
Lighta
09b0898e60 Update Tool
Upd to take in consideration the REPLACE user case.
2014-12-18 22:45:46 -05: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
Lighta
af0da61426 Tools update
Upd .gitignore to ignore object everywhere
Add update.pl, a small perl script to auto git update and apply db
update in sql.
Add setup_perl.sh, to setup perl environnement for module used by perl.
Move some function into rA_common.pm
2014-12-18 20:14:48 -05: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
nanakiwurtz
9f3c81c65f Merge pull request #162 from rathena/item_db
/npc/re/merchants/coin_exchange.txt item update
2014-12-17 17:59:17 +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
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
Cydh Ramdh
aff0a005a7 Doc update for 'ermgeitem'
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-12-06 14:36:42 +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
icxbb-xx
14f6654943 Fixed bugs.
- problem fast movement animation when disguised.
- devotion behaviour Can't cast on other characters when limit is reached.
2014-12-05 03:23:11 +07:00
Playtester
b5fd69b64d Spiritual Bestowment fixed
- Fixed Spiritual Bestowment working on Gunslinger and consuming a Spirit Sphere even when no Spirit Sphere was transferred (bugreport:4340)
2014-12-04 18:32:50 +01:00
Luciar
57d4e6718d Sura Job Quest Fix Bug #97
Updates Sura Job Quest by adjusting how some events are triggered
2014-12-04 00:04:30 -04:00
Playtester
861112b89b Gravitational Field full official implementation and minor fixes
- Gravitational Field will now work as official servers (bugreport:4897)
  * Fixed range of Ganbantein (16->14) and Gravitational Field (9->14)
  * Gravitational Field never misses and can hit hidden targets
  * Similar to Pressure the damage can not be increased or decreased by any means, it even hits GTB users and users protected by Devotion/Sacrifice
  * Renewal damage is now 400+100*level every 500ms (200+200*level every 1000ms in pre-renewal)
  * You can no longer do normal attacks while the skill is active
  * You now can use skills while the skill is active, however, other skills are unable to deal any damage as long as Gravitational Field is active
  * Added the possibility to link different skill unit groups together; if a skill unit group gets deleted, the linked skill unit groups are deleted as well; this was needed because when being hit, all Gravitational Fields of the person being hit need to be removed
  * Gravitational Field can no longer overlap with itself
  * Pressure and Gravitational Field will now be considered "physical normal attacks" and can consequently trigger Autospells; unlike manually cast spells, Autospells can deal damage while Gravitational Field is active
- Fixed that in renewal, weapons with a range of 2 and 3 did depend on DEX instead of STR (fixed #129)
  * Special thanks to NovaRagnarok for the fix
2014-12-03 21:12:36 +01:00
Euphy
4e376c49b7 Merge pull request #150 from balrogsamson/patch-2
Update scripts_custom.conf
2014-12-02 22:54:40 -05:00
Euphy
859522ecca Merge pull request #149 from balrogsamson/patch-1
Rename THQS_ChatingNPC.txt to THQS_ChattingNPC.txt
2014-12-02 22:54:38 -05:00
Peter Derouen
9302969a9f Update scripts_custom.conf
Update THQS_ChatingNPC.txt field due to incorrect spelling.
2014-12-02 18:35:33 -08:00
Peter Derouen
01baeec58c Rename THQS_ChatingNPC.txt to THQS_ChattingNPC.txt
Typo.
2014-12-02 18:33:25 -08:00
Cydh Ramdh
5e6b4a157f Warnings...
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-12-02 20:09:14 +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
b92b8ffefc Added core.h config ENABLE_ITEM_GUID
* Enabled by default to take effect of `guid` function.
* When it's disabled, `guid` function will be ignored as suggestion to disable this 'weird. official feature.
* NOTE: If this feature is disabled "in the middle" of your game, the separated is still separated in inventory, storage, or guild storage until player move the item to/from storage/inventory to restack them.

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-11-30 18:44:20 +07:00
Cydh Ramdh
5ce80555a7 Corrected guid implementation of item package in 51074a0
* GUID
  - `guid` field in official PackageItem.lua supposed to make item will be separated even item is stackable item.
  - Currently `guid` usage is using item Unique ID that generated when item with GUID flag is appear from package.
  - Some item containers in official PackageItem.lua are also separated, not stacked when player obtain it. Example when using atcommand "@item Xmas_Bless". For current implementation, the items are flagged in item_flag.txt (db folder) with flag 4.
  - `isNamed` field in item group is replaced by `GUID` and move the `isNamed` as new additional field. See doc/item_group.txt or db/re/item_package.txt.
* NPC:
  - Enabled npc/re/other/item_merge.txt and it's now usable.
* Script Command:
  - Added `mergeitem` to merge separated items in player's inventory. See doc/script_commands.txt.
* Misc:
  - Changed how to broadcast the item that obtained from package with flag `isAnnounced` to intif_broadcast, so it will be announced to all connected map-servers.
  - Added some items that flagged as 'item group container' in db/re/item_flag.txt

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-11-30 13:52:52 +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
700d1e9508 Merge pull request #132 from nanakiwurtz/master
Item DB update:
2014-11-29 22:56:40 +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
aleos89
a88db39dd9 Follow up to 3be6f5a. Fixed compile warning for pre-renewal mode. 2014-11-27 22:46:14 -05:00
aleos89
3be6f5a4f3 * Adjusted new renewal changes and added missing bonus damage modifiers for several skills. (bugreport:9280)
* Put Gloomy Shyness into INF3_*.
2014-11-27 22:37:25 -05:00
nanakiwurtz
2839983b64 Follow up to ca150c5
-- English names fixed

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2014-11-28 00:35:04 +07:00
nanakiwurtz
ca150c58c7 Item DB update:
-- Up to kRO 2014-10-22

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2014-11-28 00:18:51 +07:00
Cydh Ramdh
0877fed66c Fixed Homunculus crash potential when checking the skill (bugreport:9162)
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-11-25 19:36:57 +07:00
Cydh Ramdh
4efbffca45 Merge pull request #120 from rathena/script/checkvending
Expand 'checkvending' script
* The returned value is bitmask of &1 - Vending, &2 - Autotrading, &4 - Buyingstore
2014-11-25 19:04:40 +07:00
Playtester
76a30f3927 Hindsight, Song/Dance Effect fixes
- Fixed Hindsight often casting level 0 of a skill when the selected auto-skill was of level 2
- Fixed song and dance effects staying forever on the screen if the bard / dancer walked out of sight (fixed #127)
2014-11-24 21:11:09 +01:00
Cydh Ramdh
a16701f33a Disabled @accinfo request in CZ_REQ_ACCOUNTNAME to avoid unnecessary request. Follow up c953236, bugreport:9186. Thank @anacondaqq
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-11-23 18:03:04 +07:00
Cydh Ramdh
34ca457ab0 Follow up bbe733e, typos
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-11-23 14:33:28 +07:00
icxbb-xx
91156ab3ee Fixed typo forgot next line 2014-11-23 03:37:48 +07:00
Playtester
0359420f42 Follow-up to 0fd7ba72df
- Fixed a compiler warning that showed when deactivating ACTIVEPATHSEARCH (special thanks to Napster for pointing it out)
2014-11-22 21:04:41 +01:00
Playtester
e6caa9569b Skill menu and looter fixes
- Fixed a bug that stopped characters server-sided and caused position lag when closing a skill menu (bugreport:9117)
- Fixed behavior of looter monsters (#125=fixed)
  * They will now always target the oldest item in their view range (which makes it seemingly random), rather than always the most south-western item available
  * Their loot range is now "0" meaning they need to be on the same cell as the item to loot it
  * Their AI will no longer get stuck in an endless loop when someone drops an item around the corner
2014-11-22 20:36:06 +01:00
Cydh Ramdh
a212839665 Fixed #122 @accountinfo issue
* Now inter-server always asking to login-server for account info instead using direct query to `login` table. Merged from HerculesWS/Hercules@da233d5
* Inter-server packet usage: HA 0x2720 & AH 0x2721
* Additional changes from inter-server to map-server to parse the account info result with type 1 by using packet 0x3808 for clif_account_name(). Just some changes from @lighta at his old diff
* Moved some messages to char_msg.conf
* Updated inter-server packet documentation

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-11-22 18:58:29 +07:00