Commit Graph

299 Commits

Author SHA1 Message Date
glighta
8d605f89c3 - Follow up r17296
-- capped CAMOUFLAGE effect, (defs should be lower then 0, atk bonus max 300, fix cri bonus  (base is 1000 not 100))
-- fix bugreport:7601 and add new mapflad for clif_maptypeproperty2 (nomineeffect, nolockon, noitemconsumption, nousecart, nosumstarmiracle) still investgating full effect
-- harmonize script_ref source


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17297 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-04-26 14:38:54 +00:00
euphyy
8c2ff84055 * Documented 'consumeitem' command from r17137.
* Added 'consumeitem' to all applicable scripts.
* Moved "Catalog Magician" to Renewal path.
* Created "Pet Commands" and "Homunculus Commands" sections in script_commands.txt.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17138 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-02-18 01:21:59 +00:00
euphyy
711e5009da * Added a missing 'close' in El Dicastes quests (bugreport:7273).
> Hercules merges:
* ac78454:
Extending readparam functionality: Added many more bonuses including missing key stuff such as def/mdef.

* 4983181:
Script commands relying on equipment slot may now access the 3 following types:
EQI_COSTUME_HEAD_LOW (11)
EQI_COSTUME_HEAD_MID (12)
EQI_COSTUME_HEAD_TOP (13)

* b305c1f, e5cc221:
Updated EXP rewards in 13-1 and 13-2 quests.

* a244b61:
Status effects no longer propagate with magical reflection (e.g. when frost diver is reflected there is no chance that target will be frozen)

* f825d79:
Database and script updates. (bugreport:6957, bugreport:6834)

* a2b070b:
Various typo fixes.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17131 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-02-15 04:24:14 +00:00
euphyy
30bfcfe8e0 * Updated WOE Controller script to v1.5, which overhauls the rewards system (with many new features).
* Fixed another Renewal Izlude coordinate (bugreport:7169).
* Fixed a mail bug, since r16574.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17096 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-13 01:37:40 +00:00
euphyy
f54be649cd > Pre-Renewal fixes, major credits to Deep Forest for his detailed reports:
* Separated Renewal Alberta features with checkre() and new files, follow-up r16125 (bugreport:7041).
* Moved remaining Renewal shops out of pre-Renewal file, follow-up r16138 / r16104 (bugreport:7042).
* Moved Renewal refining features to a separate file, and made some changes, follow-up r16126 (bugreport:7043).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17042 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-24 17:30:14 +00:00
euphyy
5c0f8fa61a * Updated Arch Bishop, Guillotine Cross, Mechanic, and Royal Guard job quests to their latest versions.
* Fixed Izlude RE warps (bugreport:6884, bugreport:6285).
* Fixed experience reward in Cursed Spirit quest (bugreport:6288).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16990 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-01 22:45:51 +00:00
euphyy
884e6a1390 * Optimized Splendide coin merchant and merged it to a template with Manuk's (merchants\coin_exchange.txt)
* Fixed and enabled a Manuk NPC (cities\manuk.txt)
* Other small changes and fixes.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16773 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-10 20:33:57 +00:00
j-tkay
7700b560fe - Fixed bugreport:6588, grammatical errors here and there. (other/pvp.txt & cities/morocc.txt)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16756 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-07 05:06:24 +00:00
euphyy
31d2fe26b3 * Follow-up r16742, revised quest sample (doc\sample\npc_test_quest.txt) and whisper system documentation (doc\whisper_sys.txt)
* Follow-up r16745, fixed a few typos in atcommand documentation (doc\atcommands.txt)
* Minor cleaning - spacing, tabulation, comments, dividers

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16746 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-05 02:42:20 +00:00
euphyy
773fd84ad4 * Follow-up r16618, fixed SQL entry as well (sql-files/mob_db_re.sql)
* Follow-up r16616, forgot the pre-re/re split files... (npc/(pre-)re/kafras/)
* Merged changes in eAthena 15164 and 15165 (doc/packet_struct_notation.txt)
* Removed unreadable characters in various files

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16619 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-10 15:58:07 +00:00
brianluau
0d06193b29 - Follow up to r16545: fixed unreadable character at the beginning of jawaii.txt
and fixed duplicate npc names.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16549 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-01 05:29:32 +00:00
daegaladh
f49b3d6f55 Full npc folder reorganization. (I hope I didn't break anything D:)
-Now common scripts goes to the main npc folder, and pre-re-only/re-only ones goes to their respective folders.
-NPCs with practically the same script but little differences have been left in the main folder and uses the command checkre() for the differences.
-For those NPCs with different coordinates but same script, the script has been left in the main folder but the NPCs splitted as duplicates.
-All pre-renewal files has been reverted back to their pre-renewal behavior.

TODO:
-Correct pre-re quest rewards.
-Check for pre-re/re differences in mapflags.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16545 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-01 04:29:56 +00:00
shennetsind
086af74531 Okie ladies and gentleman if this commit breaks anything it's jman's and maki's fault, yes, blame them.
Fixing pre-re / re npc support, moving /config/ folder to src root so other servers may also make use of the #define renewal dir and other stuff.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16382 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-08 19:30:07 +00:00
brianluau
ccdc1a396c - Added svn:eol-style=native property on some recently added text files.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16258 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-10 06:34:50 +00:00
euphyy
71cb492631 Follow-up to r16234: New city files
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16235 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-06 00:35:28 +00:00
brianluau
a43212a2f4 - Reduced 300+ copy-paste lines to 1 duplicated npc in eden_common.txt (suggestion bugreport:5795)
- Replaced more unconverted 'inputstr' in several npc scripts, and changed to scope variables.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16149 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-25 15:45:31 +00:00
masao87
c61f99302b - Updated some Alberta NPC Locations to match with the new Map. Also updated the coordinates in the Alberta Guide NPC. bugreport:5273
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16125 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-17 14:05:14 +00:00
brianluau
ad26f30c65 - Removed duplicate Bismarc NPC in Hugel, since r10973. (bugreport:5271)
Bismarc#BLS is located in /npc/jobs/2-1/blacksmith.txt

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15815 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-28 19:19:33 +00:00
brianluau
00367cd7b7 - Removed more trailing tabs.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15527 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-30 20:17:55 +00:00
brianluau
3aede46965 - Removed trailing tabs, and fixed some spacing.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15524 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-30 16:02:55 +00:00
jmanfffreak
49c1ee5f84 Fixed issue in niflheim quest where the script set a variable not related to the quest at all (bugreport:4104).
Added check in Knight job change test to prevent repeating the quest (bugreport:4099).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15292 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-28 16:41:45 +00:00
mercurial123
0f47604f2d - Replaced all occurrences of "eAthena" to "rAthena" string
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15251 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-24 21:30:42 +00:00
brianluau
d90c239808 - Changed Sweet_Potato --> Potato to avoid confusion with the taming item. (bugreport:2150)
- Changed duplicates in /npc/custom/ so the source is a floating/mapless npc. (bugreport:1335)
- Fixed some bad English in Biological Weapon Quest. (bugreport:1745)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15075 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-12 14:52:31 +00:00
brianluau
fdc4f040c7 - Fixed some script typos (bugreport:4861, bugreport:5028).
- Fixed a typo in Blacksmith Quest (fixes issue 5012).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14936 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-08-19 22:58:11 +00:00
L0ne_W0lf
ebfc42b8d5 * Implemented remaining Brasilis NPCs.
* Added remaining database modifications for Brasilis.
- Added the skills for the Brasilis monsters.
- Added remaining entries for Bathroom Ghost quest.
- Added stats for the Suspicious Hydra monsters.
- Corrected the capture rate for Suspicious Hydra.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14928 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-08-09 20:08:47 +00:00
L0ne_W0lf
a49d7f6afd * Added missing Hair Dressers and Hair Dyer to Lighthalzen.
- Hair Dresser will change hair styles ranging between 20 to 27
- Assistant Beautician changes to a random style and colour between 1-23.
* Updated the Cursed Spirit quest, and added some more town NPCs.
* Added more town NPCs to Splendide and Manuk.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14780 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-04-08 19:03:24 +00:00
L0ne_W0lf
e4ae836f44 Updated some more cash shop boxes to use rentitem instead of getitem.
Added mercenary skills for Mimic, Disguise, Alice, Doppelganger, and Egnigem.
Removed duplicate NPCs in Lighthalzen and Morroc. (bugreport:4555)
Corrected typo (Sit -> Suit) in enhcant_arm NPC. (bugreport:4586)
Corrected a typo in the christmas_2008 event. (bugreport:4600)
Changed which White Lady spawns in endless tower. (bugreport:4601)
Also added Quest Log Entries to Endless Tower, please test.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14552 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-03 02:24:34 +00:00
Gepard
8ae23f01e2 Fixed KvM announcements showing during WoE:SE (bugreport:4335).
Added missing Lighthalzen NPC (bugreport:4319).
Fixed checkweights in Manuk & Splendide shops.
Fixed some condition checks in Moscovia quests.
Fixed some typos in Sealed Shrine and Manuk quests dialogues.
Added missing global var check in Yggdrasil Dungeon Floor 2 puzzle.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14360 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-07-03 11:29:29 +00:00
L0ne_W0lf
e7e55d4e06 * Added support for NPC names in the 'specialeffect' script command, go go copy/paste!
* Updated several NPCs to use the updated specialeffect command, updated more NPCs to use the updated emotion command.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14353 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-22 22:09:11 +00:00
L0ne_W0lf
84cf9ff2c9 Applied patch from Dani to change NPC emotion events to use the updated emotion command. (bugreport:4318)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14347 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-18 16:19:48 +00:00
brianluau
7dcad16f3c - Fixed some emotions triggering on the wrong npc. (bugreport:4303)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14346 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-18 05:05:33 +00:00
Kisuka
01e785eb2d - Fixed issue with Brute Sailor not taking zeny (bugreport:4244).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14303 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-05-21 17:49:57 +00:00
L0ne_W0lf
74550d0792 Added more misc NPCs to Splendide and Manuk city files.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14300 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-05-21 02:04:46 +00:00
L0ne_W0lf
f48c41a1c1 Added some Brasilis basic NPCs.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14299 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-05-21 01:30:36 +00:00
L0ne_W0lf
821713a26e * More bug fixing! Lots of little things, really.
- Corrected some condition errors in quests_veins. (bugreport:4088)
- Corrected specialeffects so they play on the right NPC. (bugreport:4090)
- Corrected an item ID in the reward NPC in monster races. (bugreport:4092)
- Corrected NPCs overlapping with quests in msg_boards (bugreport:4093)
- Corrected some of the given errors in the 2007_relay quest. (bugreport:4094)
- Corrected hideonnpc to disablenpc in ice dungeon 4 warps. (bugreport:4102)
- Commented out duplicate library curator in prontera city. (bugreport:4105)
- Corrected cutins not being removed on NPC end in sealed shrine. (bugreport:4117)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14262 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-03-13 05:12:15 +00:00
L0ne_W0lf
7475720d25 - Corrected a minor issue in sealed shrine, lock out should work now.* Added some 13.2 content, and more 13.1 content.
- Added "Otherworld language" quest.
- Added Cat Hand Trading NPCs for 13.2 maps.
- Added warps for Splendide and Manuk (town and field.)
- Added basic town NPCs for Manuk and Splendide.
- Added the guild dungeon SE events, though the pierre boxes do nothing.
- Corrected a minor issue in sealed shrine, lock out should work now.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14257 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-03-03 19:59:24 +00:00
brianluau
75bc9caf0e - Clarified documentation for 'addtimer'.
- Fixed a typo in a gonryun NPC (Wi -> Wu).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14047 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-09-08 00:50:14 +00:00
Kisuka
4d718f3bfd - Updates to several npc files to match AEGIS standards.
- Added Cash Hair Stylist (disabled by default).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14040 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-09-05 03:51:49 +00:00
Kisuka
7866d5536f - Fixed typo in payon.txt (bugreport:3461)
- Fixed multiple bugs/issues in quests_moscovia.txt (bugreport:3471)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13997 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-08-10 14:46:44 +00:00
brianluau
9cc789d234 - Added svn:eol-style native for some conf/css/html/pl/sql/txt files.
- Added svn:executable property for several batch/shell scripts.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13972 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-07-27 16:56:26 +00:00
L0ne_W0lf
84ddfa85bb * Implemented rewrite of the quest "The Sign".
- Attempts to save player progress when quest npcs are talked too. This is Untested.
- Talking to any quest related NPC will remove all out-dated quest vars.
* Fixed incorrect sprite ID used in some Niflheim quest npcs.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13878 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-06-10 01:44:22 +00:00
L0ne_W0lf
0143414445 * Completely rescripted the DTS warp service based on the aegis 11.3 file.
- Updated F_ClearGarbage to erase obsolete DTS player variables.
- Moved Cool Corp. Staff NPCs to Lighthalzen (cities/lighthalzen.txt.)
- Now everyone can enjoy the global broadcast "every-hour-nag" to vote!
- Note: Upon loading ALL prior DTS global variables are erased.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13764 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-05-12 21:52:11 +00:00
brianluau
1b588722ad - Added a missing zeny check in the Jawaii Bartender. (bugreport:2897)
- Added a missing 'close' in the Mage quest Bookshelf. (bugreport:2873)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13727 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-05-04 04:24:50 +00:00
Playtester
da39fb587d * A few quest updates due to bugreports
- added a missing close in the Kiel Hyre Quest (bugreport:2885)
- added L0ne_W0lf's Cool Event Corp script + a few fixes to it (bugreport:3019)
- fixed a small typo in rachel.txt (bugreport:3029)

Also I really have to ask the developers again to document all the changes they do on item bonuses!

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13704 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-04-28 16:16:11 +00:00
Playtester
dbb95438b0 * Fixed wrong coordinates of the Prontera Bartender (bugreport:3000)
* Fixed a chat window not being closeable in the Training Grounds (bugreport:3009)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13691 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-04-23 19:29:52 +00:00
Playtester
dea692f95a * Various script updates
- Removed the Acorn repeatable quest (got removed on iRO)
- Re-enabled Umbala bungee jumping (bugreport:2978)
- Fixed a reward in monster race (bugreport:2990)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13682 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-04-20 18:49:51 +00:00
Kisuka
7c28a47642 * Moscovia Update!
- Added Moscovia quests.
- Uncommented mosk_dun & added field spawns.
- Updated moscovia & mosk_dun warps.
- Removed most the npcs from cities/moscovia.txt (they are part of the quests).
- Added some more moscovia quest items to item_trade.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13605 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-03-19 19:57:49 +00:00
L0ne_W0lf
76397f8bc7 * Another round of bug fixes to various scripts.
- Added Satan Morroc spawn and corrected shadow spawn timers. (bugreport:2690)
- Fixed Group of Evil NPC not reactivating  when it should. (bugreport:2696)
- Fixed the Zeny check when summoning guardians in agits. (bugreport:2712)
- Added zeny check to Jawaii bartender (hung the script.) (bugreport:2747)
- Corrected a mapwarp assosiated with the z-gang quest. (bugreport:2757)
- Fixed warps in ice dungeon 3 being usable all the time. (bugreport:2776)
- Corrected impossible condition if in Keil Hyre quest. (bugreport:2789)
- Corrected leftover aegis variables in several scripts. (bugreport:2794)
- Removed duplicate line from nameless quest. (bugreport:2795)
* Implemented official behaviour/Cost for investing in economy and defence
- Eco/Def will be modified on the turn of the day instead of immediately.
- Cost has been updated to official values. Investing twice now costs 4 times the first investment.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13559 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-03-03 04:11:22 +00:00
Kisuka
df1e61b6e0 - Fixed typo on Sprint Set item (bugreport:2679)
- Fixed typo on Poison Bottle Box item (bugreport:2715)
- Fixed Kafra coordinates for moc_ruins kafra (bugreport:2714)
- Added items 14228 - 14241 (bugreport:2716)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13496 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-01-26 21:46:50 +00:00
Kisuka
64f56705f8 - Added 'Acorn Dealer' NPC to Moscovia (forgot to add it).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13489 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-01-25 19:35:06 +00:00