summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-12-02Fixed an issue with the socket send/receive timeouts in WindowsHaru1-12/+27
- According to https://msdn.microsoft.com/en-us/library/windows/desktop/ms740476(v=vs.85).aspx setsockopt() for SO_RCVTIMEO/SO_SNDTIMEO require a DWORD argument, unlike their POSIX equivalent, requiring a struct timeval. - Always keep in mind: When you see a Microsoft API function that looks like a duck, swims like a duck, quacks like a duck, it most certainly is not a duck. - Thanks to ultramage. Signed-off-by: Haru <haru@dotalux.com>
2015-11-28Fixed a compilation error when the memory manager is disabledHaru1-1/+1
Signed-off-by: Haru <haru@dotalux.com>
2015-11-23ItemDB SQL SyncHercules.ws1-8/+9
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2015-11-23ItemDB Update:Jedzkie6-61/+80
- Added new official item status effect, 'SC_CUP_OF_BOZA'. - Follow up https://github.com/HerculesWS/Hercules/commit/f512a0b9cf93e2432f79b57fb05ccda4b6311b02. - Follow up https://github.com/HerculesWS/Hercules/commit/ce33936de2fcb9c565437cb80e6329ab76626500. - Follow up https://github.com/HerculesWS/Hercules/commit/d8909d9b2cf29f45c025fb93fc1df94ec1a40854. - Follow up https://github.com/HerculesWS/Hercules/commit/f65e0326ac7e6faf17451d4c6d275e4fd3133cc0. - Some white spaces adjustments.
2015-11-22ItemDB SQL SyncHercules.ws1-5/+12
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2015-11-22ItemDB Updates:Jedzkie2-7/+174
- Added new official cash shop usable items and it's boxes: • STR Biscuit Stick - http://www.divine-pride.net/database/item/14616 • VIT Biscuit Stick - http://www.divine-pride.net/database/item/14617 • AGI Biscuit Stick - http://www.divine-pride.net/database/item/14618 • INT Biscuit Stick - http://www.divine-pride.net/database/item/14619 • DEX Biscuit Stick - http://www.divine-pride.net/database/item/14620 • LUK Biscuit Stick - http://www.divine-pride.net/database/item/14621 • STR Biscuit Stick Box - http://www.divine-pride.net/database/item/17270 • VIT Biscuit Stick Box - http://www.divine-pride.net/database/item/17271 • AGI Biscuit Stick Box - http://www.divine-pride.net/database/item/17272 • INT Biscuit Stick Box - http://www.divine-pride.net/database/item/17273 • DEX Biscuit Stick Box - http://www.divine-pride.net/database/item/17274 • LUK Biscuit Stick Box - http://www.divine-pride.net/database/item/17275
2015-11-22ItemDB SQL SyncHercules.ws2-19/+19
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2015-11-22ItemDB Update:Jedzkie3-19/+34
- Fix some item behavior based on Official Servers. • Lucky Rice Cake • Charm Of Luck • Charm Of Happiness • Rune Kn Test Int • Takoyaki • Evasion Scroll • Concentration Scroll
2015-11-22ItemDB SQL SyncHercules.ws2-20/+20
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2015-11-22ItemDB Update:Jedzkie6-25/+37
- Fix some item behaviors based on Official Servers. • Str_Dish10 (Healing percent) • Citron • Meat Skewer • Mre_B • Mre_C • Spray Of Flowers • Strawberry Cake • Pineapple Juice • Spicy Sandwich • Grilled Corn - Implemented the follow SC: • SC_FOOD_CRITICALSUCCESSVALUE (Based on Aegis VAR_CRITICALSUCCESSVALUE)
2015-11-22ItemDB SQL SyncHercules.ws2-20/+20
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2015-11-22ItemDB Update:Jedzkie2-38/+76
- Fix some item behavior that should not stack w/ other stat foods. • Tyr's Blessing - http://www.divine-pride.net/database/item/14601 • Internet Cafe1 - • Internet Cafe2 - • Internet Cafe3 - • Internet Cafe4 - • Luxurious Western Food - http://www.divine-pride.net/database/item/14607 • Manchu-Han Imperial Feast - http://www.divine-pride.net/database/item/14608
2015-11-22ItemDB SQL SyncHercules.ws2-5/+5
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2015-11-22Merge branch 'master' of http://github.com/HerculesWS/HerculesJedzkie2-4/+4
2015-11-22ItemDB Update:Jedzkie3-8/+15
- Fixed 'Black Thing' not decreasing Stats and Movement Speed. - Fixed 'Enriched White Potion Z' no HP regeneration.
2015-11-22ItemDB SQL SyncHercules.ws2-4/+4
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2015-11-22ItemDB Update:Jedzkie6-40/+44
- Added official item effect of 'Gold Pill 1' and 'Gold Pill 2'. - Update SC_ACARAJE flag in sc_config.txt. Ref: http://www.divine-pride.net/database/item/12274, http://www.divine-pride.net/database/item/12275
2015-11-22MobDB Update:Jedzkie1-19/+903
- Added 'Geffen Magic Tournament' monsters. • Ahri - http://www.divine-pride.net/database/monster/2549 • Dio Anemos - http://www.divine-pride.net/database/monster/2550 • Geffen Shoplifter - http://www.divine-pride.net/database/monster/2551 • Geffen Bully - http://www.divine-pride.net/database/monster/2552 • Geffen Gang Member - http://www.divine-pride.net/database/monster/2553 • Faymont - http://www.divine-pride.net/database/monster/2554 • Ordre - http://www.divine-pride.net/database/monster/2555 • Blut Hase - http://www.divine-pride.net/database/monster/2556 • Kuro Akuma - http://www.divine-pride.net/database/monster/2557 • Ifodes - http://www.divine-pride.net/database/monster/2558 • Licheniyes - http://www.divine-pride.net/database/monster/2559 • Orodic - http://www.divine-pride.net/database/monster/2560 • Ju - http://www.divine-pride.net/database/monster/2561 • Dwigh - http://www.divine-pride.net/database/monster/2562 • Fay Kanavian - http://www.divine-pride.net/database/monster/2563 • Fenrir - http://www.divine-pride.net/database/monster/2564 • Alphonse - http://www.divine-pride.net/database/monster/2565 • Alphonse Jr - http://www.divine-pride.net/database/monster/2566 • E_GEFFEN_MAGIC_3_2 - http://www.divine-pride.net/database/monster/2567 • E_GEFFEN_MAGIC_3_3 - http://www.divine-pride.net/database/monster/2568 More info: http://irowiki.org/wiki/Geffen_Magic_Tournament NOTE: This commit is not complete, we need more Information of their official behaviors as well as their drop, and etc.
2015-11-22Follow Up d8909d9bDastgir1-1/+1
2015-11-22SC Update:Jedzkie5-2/+97
- Added 'Eden Crystal Synthesis' statuses. - Added 'Geffen Magic Tournament' statuses. Note: their sc_config.txt are not yet implemented, needs more information on official servers.
2015-11-22ItemDB SQL SyncHercules.ws2-24/+24
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2015-11-22ItemDB Update:Jedzkie7-79/+153
- Implemented the Geffen Scrolls and Mental Potion official effects. Thanks to Kyeme. (Ref: http://herc.ws/board/topic/1125-please-implement-the-magic-scroll-mental-potion-etc/)
2015-11-22ItemDB SQL SyncHercules.ws1-1/+1
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2015-11-22ItemDB Update:Jedzkie1-1/+1
- Fixes https://github.com/HerculesWS/Hercules/issues/626.
2015-11-21This reverts commit 3eb8f6cc123835fae6bbd847f02cdd45fcfccd60.AnnieRuru1-2/+2
2015-11-21Fix getitem/getitem2 give stacked items when ForceSerial on (#703)AnnieRuru1-2/+2
2015-11-20ItemDB SQL SyncHercules.ws2-18/+18
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2015-11-20Merge branch 'master' of http://github.com/HerculesWS/HerculesJedzkie2-7/+7
2015-11-20ItemDB Updates:Jedzkie3-69/+87
- Fixes http://herc.ws/board/tracker/issue-7330-halohalo/ where Item 'Halohalo' will not stack together w/ other Status Foods. - Change the Status Food Behavior based on Aegis: (NOTE: ID# 12202, 12203, 12204, 12205, 12206, 12207 and 12247) • Removed when the player dies. • Update its HP/SP percentheal based on Aegis script. - Follow up https://github.com/HerculesWS/Hercules/commit/e511dcf5940cee7a6e43744543a5ca96bc23cf84#commitcomment-14500629. Thanks to AnnieRuru. - Follow up https://github.com/HerculesWS/Hercules/commit/d9ad1cc97be0a90b3ef2f653ae2d2cdd77dddd83#commitcomment-14502822. Thanks also to AnnieRuru. - Change the sequence of our current Trade Restriction based on kRO's itemmoveinfov5.txt
2015-11-19ItemDB SQL SyncHercules.ws2-7/+7
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2015-11-19ItemDB Update:Jedzkie3-44/+66
- Follow up https://github.com/HerculesWS/Hercules/commit/d9ad1cc97be0a90b3ef2f653ae2d2cdd77dddd83. - Fixes http://herc.ws/board/tracker/issue-8592-mega-resist-potion/, where the SC_TARGET_BLOOD is not working properly. Thanks to kyeme. - Adjust some whitespaces.
2015-11-19ItemDB SQL SyncHercules.ws2-11/+19
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2015-11-19Merge branch 'master' of http://github.com/HerculesWS/HerculesJedzkie1-1/+1
2015-11-19ItemDB Updates:Jedzkie2-48/+204
- Fix 'Light Concentration Potion', 'Light Awakening Potion' and 'Light Berserk Potion' not giving additional ASPD when used. Thanks to Emistry. (Ref: http://herc.ws/board/tracker/issue-8482-light-centerawakeningbersek-potion/) - Change the 'Fools Day Box' and 'Fools Day Box2' variable from .@i to .@temp. - Added 9 New Items and its trade restriction based on itemmoveinfov5.txt of kRO. • Infinite Concentration Potion (ID#12884) (Ref: http://www.divine-pride.net/database/item/12884) • Infinite Awakening Potion (ID#12885) (Ref: http://www.divine-pride.net/database/item/12885) • Infinite Berserk Potion (ID#12886) (Ref: http://www.divine-pride.net/database/item/12886) • Infinite Fly Wing (ID:12887) (Ref: http://www.divine-pride.net/database/item/12887) • Infinite Concentration Potion Box (ID#17226) (Ref: http://www.divine-pride.net/database/item/17226) • Infinite Awakening Potion Box (ID#17227) (Ref: http://www.divine-pride.net/database/item/17227) • Infinite Berserk Potion Box (ID#17228) (Ref: http://www.divine-pride.net/database/item/17228) • Infinite Fly Wing Box (ID:17229) (Ref: http://www.divine-pride.net/database/item/17229) • Infinite Fly Wing Box 3Days (ID:17251) (Ref: http://www.divine-pride.net/database/item/17251)
2015-11-19ItemDB SQL SyncHercules.ws1-1/+1
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2015-11-19Minor follow up in ↵Jedzkie1-1/+1
https://github.com/HerculesWS/Hercules/commit/e511dcf5940cee7a6e43744543a5ca96bc23cf84, fixes a wrong skill name.
2015-11-19ItemDB SQL SyncHercules.ws2-7/+62
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2015-11-19ItemDB Updates:Jedzkie3-45/+821
- Change the effect of 'Devil Morocc Card' from MaxHP to MaxSP (Ref: http://www.divine-pride.net/database/item/4559) - Change the behavior of 'Fools Day Box' and 'Fools Day Box2'. (Thanks to Haru and Emistry) - Added the combo effect script of 'White Knightage Card' and 'Khalitzburg Knightage Card'. (Ref: http://www.divine-pride.net/database/item/4608) - Fix 'Birdcage Of Paradise' where the skill bonus is not working in Ranger Job and seperate its combo effect. - Added 54 New Cards up to the latest kRO Sakray Update (November 18, 2015) • Infinite Toad Card (ID#4642) (Ref: http://www.divine-pride.net/database/item/4642) • Infinite Vagabond Card (ID#4643) (Ref: http://www.divine-pride.net/database/item/4643) • Infinite Vocal Card (ID#4644) (Ref: http://www.divine-pride.net/database/item/4644) • Infinite Eclipse Card (ID#4645) (Ref: http://www.divine-pride.net/database/item/4645) • Infinite Chimera Card (ID#4646) (Ref: http://www.divine-pride.net/database/item/4646) • Infinite Osiris Card (ID#4647) (Ref: http://www.divine-pride.net/database/item/4647) • Infinite Eddga Card (ID#4648) (Ref: http://www.divine-pride.net/database/item/4648) • Infinite Phreeoni Card (ID#4649) (Ref: http://www.divine-pride.net/database/item/4649) • [WIP] Infinite Infinite Orc Hero Card (ID#4650) (Ref: http://www.divine-pride.net/database/item/4650) • Infinite Tao Gunka Card (ID#4651) (Ref: http://www.divine-pride.net/database/item/4651) • Nightmare Amon Ra Card (ID#4652) (Ref: http://www.divine-pride.net/database/item/4652) • Nightmare Arclouse Card (ID#4653) (Ref: http://www.divine-pride.net/database/item/4653) • Nightmare Mimic Card (ID#4654) (Ref: http://www.divine-pride.net/database/item/4654) • Nightmare Minorous Card (ID#4655) (Ref: http://www.divine-pride.net/database/item/4655) • [WIP] Nightmare Mummy Card (ID#4656) (Ref: http://www.divine-pride.net/database/item/4656) • [WIP] Nightmare Ancient Mummy Card (ID#4657) (Ref: http://www.divine-pride.net/database/item/4657) • Nightmare Verit Card (ID#4658) (Ref: http://www.divine-pride.net/database/item/4658) • Eggring Card (ID#4659) (Ref: http://www.divine-pride.net/database/item/4659) • Scout Basilisk Card (ID#4660) (Ref: http://www.divine-pride.net/database/item/4660) • Charge Basilisk Card (ID#4661) (Ref: http://www.divine-pride.net/database/item/4661) • Big Eggring Card (ID#4662) (Ref: http://www.divine-pride.net/database/item/4662) • Leaf Lunatic Card (ID#4663) (Ref: http://www.divine-pride.net/database/item/4663) • Grass Fabre Card (ID#4664) (Ref: http://www.divine-pride.net/database/item/4664) • Wild Honet Card (ID#4665) (Ref: http://www.divine-pride.net/database/item/4665) • Sweet Roda Frog Card (ID#4666) (Ref: http://www.divine-pride.net/database/item/4666) • Hunter Wolf Card (ID#4667) (Ref: http://www.divine-pride.net/database/item/4667) • Trance Spore Card (ID#4668) (Ref: http://www.divine-pride.net/database/item/4668) • Jungle Mandragora Card (ID#4669) (Ref: http://www.divine-pride.net/database/item/4669) • Fruit Pom Spider Card (ID#4670) (Ref: http://www.divine-pride.net/database/item/4670) • Sorcerer Celia Card (ID#4671) (Ref: http://www.divine-pride.net/database/item/4671) • Sura Chen Card (ID#4672) (Ref: http://www.divine-pride.net/database/item/4672) • Minstrel Alphoccio Card (ID#4673) (Ref: http://www.divine-pride.net/database/item/4673) • Guillotine Cross Eremes Card (ID#4674) (Ref: http://www.divine-pride.net/database/item/4674) • Arch Bishop Magaleta Card (ID#4675) (Ref: http://www.divine-pride.net/database/item/4675) • Ranger Cecil Card (ID#4676) (Ref: http://www.divine-pride.net/database/item/4676) • Mechanic Howard Card (ID#4677) (Ref: http://www.divine-pride.net/database/item/4677) • Warlock Kathryne Card (ID#4678) (Ref: http://www.divine-pride.net/database/item/4678) • Rune Knight Seyren Card (ID#4679) (Ref: http://www.divine-pride.net/database/item/4679) • Royal Guard Randel Card (ID#4680) (Ref: http://www.divine-pride.net/database/item/4680) • Genetic Flamel Card (ID#4681) (Ref: http://www.divine-pride.net/database/item/4681) • Shadow Chaser Gertie Card (ID#4682) (Ref: http://www.divine-pride.net/database/item/4682) • Wanderer Trentini Card (ID#4683) (Ref: http://www.divine-pride.net/database/item/4683) • True Eremes Guile Card (ID#4684) (Ref: http://www.divine-pride.net/database/item/4684) • True Margaretha Sorin Card (ID#4685) (Ref: http://www.divine-pride.net/database/item/4685) • True Kathryne Keyron Card (ID#4686) (Ref: http://www.divine-pride.net/database/item/4686) • True Cecil Damon Card (ID#4687) (Ref: http://www.divine-pride.net/database/item/4687) • True Howard Alt-Eisen Card (ID#4688) (Ref: http://www.divine-pride.net/database/item/4688) • True Seyren Windsor Card (ID#4689) (Ref: http://www.divine-pride.net/database/item/4689) • True Randel Lawrence Card (ID#4690) (Ref: http://www.divine-pride.net/database/item/4690) • True Flamel Emure Card (ID#4691) (Ref: http://www.divine-pride.net/database/item/4691) • True Celia Alde Card (ID#4692) (Ref: http://www.divine-pride.net/database/item/4692) • True Chen Liu Card (ID#4693) (Ref: http://www.divine-pride.net/database/item/4693) • True Gertie Card (ID#4694) (Ref: http://www.divine-pride.net/database/item/4694) • True Trentini Card (ID#4695) (Ref: http://www.divine-pride.net/database/item/4695) • True Alphoccio Card (ID#4696) (Ref: http://www.divine-pride.net/database/item/4696)
2015-11-19ItemDB SQL SyncHercules.ws2-72/+76
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2015-11-19Merge pull request #879 from Jedzkie/request_02Frost2-84/+224
2015-11-19Minor follow up.Jedzkie2-2/+2
2015-11-18Replaced -1 with FAKE_NPC in source, where appropriateHaru1-7/+6
Signed-off-by: Haru <haru@dotalux.com>
2015-11-18ItemDB Updates:Jedzkie2-84/+224
- Update Flame Stone, Ice Stone, Wind Stone, and Shadow Orb selling price base on kRO. - Update 'Mother_Heart' item effect. (Ref: http://www.divine-pride.net/database/item/2885) - Update 'Fools_Day_Box' and 'Fools_Day_Box2' based on Aegis. - Update some item scripts based on Aegis. - Changed some ItemID into Constants, Partial commit of my ItemID to Constant assignment. - Added New items and its effect and trade restrictions: • Mercenary_Casting_ (ID# 12807) (Ref: http://www.divine-pride.net/database/item/12807) • Mother_Love_Box (ID# 12808) (Ref: http://www.divine-pride.net/database/item/12808) • Level_Up_Box (ID# 12809) (Ref: http://www.divine-pride.net/database/item/12809) • Zherlthsh_Tck_Box_ (ID# 12819) (Ref: http://www.divine-pride.net/database/item/12819)
2015-11-18Merge pull request #837 from AnnieRuru/request_5Haruna5-1/+11
Add new config to allow player vend/chat room nearby hidden npc (#834)
2015-11-18Merge pull request #817 from HerculesWS/atcommand_msgHaruna1-2/+2
Fix Crash when message is not defined
2015-11-18ItemDB SQL SyncHercules.ws2-6/+6
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2015-11-18Merge pull request #878 from Jedzkie/request_01Dastgir7-15/+30
ItemDB Update:
2015-11-18ItemDB Update:Jedzkie7-15/+30
- Fixes Issue #688. - Update the item 'Acaraje' to its official effect. (Ref: http://herc.ws/board/tracker/issue-7773-acaraje-12375/) - Fix 'Vitata500' not giving additional % in sp. (Thanks to Haru) (Ref: http://www.divine-pride.net/database/item/12436) - Fix Ljosalfar and Mermaid Bubbles disappear its effect when died / dispell and etc.
2015-11-18Fixed a crash in some skills' multi-hit codeHaru1-4/+4
- The crash could happen when Land Protector is cast as result of a Fire Wall hit. - Fixes #698 (fix based on ultramage's suggestion) - The fix was also applied to the Taekwon Master's Warmth skills that, while not affected by Land Protector, use a very similar multi-hit loop. Signed-off-by: Haru <haru@dotalux.com>
2015-11-18Merge pull request #874 from Jedzkie/Script_ItemID_ConstantsFrost3-58/+626
Converted some dealers to new trader format.
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-28 08:00:00 +0000