82 Commits

Author SHA1 Message Date
zackdreaver
91667a9a11 Update Renewal and Pre-renewal Morocc NPCs (#2977)
Fixes #3392 

Thanks to @zackdreaver, @AzarthMZintos and @Lemongrass3110
2018-08-17 10:27:26 +02:00
Euphy
4226a23683 Updated Renewal Ninja shops. (incl. bugreport:8507)
http://rathena.org/board/tracker/issue-8507-ninja-merchant/

Fixed an NPC name length. (bugreport:8512)
http://rathena.org/board/tracker/issue-8512-riding-creature-master-shows-warning-in-console/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-18 11:48:43 -05:00
Euphy
90b187ff3e Changed all "Compatible With" fields to "rAthena Project".
Edited a handful separately, as appropriate.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-12 16:24:38 -05:00
Euphy
bf68ccefa3 * Script style standardization.
- Standardized cases on constants (Zeny, Sex, BaseLevel, etc.).
- Replaced numerics with constants.
- Standardized parts of script headers.
- Changed some script styles to K&R.
- Added some official script file names as comments.
- Replaced most 'misceffect' commands with 'specialeffect'.

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-27 03:28:41 -04:00
euphyy
fa88107a9e * Some optimization of 13-1 quests.
* Updated SQL databases from r17134, r17149.

> Hercules merges:
* 2f72676, 06883a7:
Renewal item_db updates, mostly new headgears and costumes.

* b38c660:
Fixed Trick Dead not being removed on job change.

* 55134e8:
Modified @mi exclusion criteria so that it requires a monster to not have a fixed spawn point as well as no base/job exp. It was excluding things such as red/blue/whatever plant from search results.

* bf76055:
#autotrade now relogs the target, not the caster.

* c6882c7, 412efb9:
Updated Renewal Izlude warps.
Moved various Izlude NPCs to Renewal coordinates.

* 064dad8:
Fixed bug where Kagerou and Oboro could hit their Zanzoe.
Follow-up on bugreport:4832, Ankle Snare now works properly in GvG.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17151 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-02-22 01:28:46 +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
spre123
cc4f755901 Updated Items, Uncommented the Traditional Cookie as it works fine and is needed for a pet. Also updated The Groomers That sell it. Bugreport:6734 [Spre]
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16798 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-26 05:40:18 +00:00
spre123
1c39176170 Updated Pet Groomer Shops.txt with the new Items they were missing.(Prontera, Payon, and Yuno) Bugreport:6680 [Spre]
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16795 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-24 18:59:31 +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
euphyy
7bd7f81dae * Corrected and optimized 12 guide NPCs (/guides/)
* Fixed a small typo in Warlock quest, bugreport:6164 (jobs\3-1\warlock.txt)
* Fixed a couple of job constant typos in "Nameless Island Quests" (quests\quests_nameless.txt)
* Removed non-RE changelogs from RE scripts

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16376 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-04 15:26:16 +00:00
kenpachi2k11
8ac22b2526 Moved a few merchants and mob spawns to separate files to prevent error message when running server in pre-RE mode and with TXT databases. (bugreport:5846)
Fixed Tao Gunka Cards (#4302) renewal effect. (bugreport:5866)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16247 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-09 18:48:50 +00:00
masao87
c0a3c94ce5 - Added probably all 3rd Class related Shops. bugreport:5781 bugreport:5782 bugreport:5783
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16138 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-21 19:41:49 +00:00
masao87
2b95b5bfef - Added 2 new Shops to Comodo. bugreport:5732
- Added check for Baby Warlock to Magic Book Quest. bugreport:5527

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16104 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-12 16:49:16 +00:00
tr0n93
a048dc4bd2 Added missing Cooking Items for Material Seller. (bugreport:5334)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15794 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-26 10:07:09 +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
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
631a1b45b5 * Corrected Brasilis Fruit Merchant. (bugreport:4278)
* Implemented some new items, most 13.2 equipment.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14331 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-05 17:27:44 +00:00
L0ne_W0lf
1d703d19ff * Actually applied the right update to the comodo weapon shop.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14330 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-02 01:55:40 +00:00
L0ne_W0lf
a61a077dd6 * Shop update, and added Wanderer pet food maker NPC.
- Added Trading merchants, (ninja& gunslinger) to Izlude and Alberta.
- Made Brasilis shop names unique, and uncommented.
- Changed the whip sold in comodo weapon shop. (1956 ->1960)
- Added Fire and Silver arrow to Einbroch tool dealer.
- Re-added Bill of Birds to Morroc Item Collectors.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14315 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-05-30 18:14:44 +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
brianluau
a47eaa02d9 - Fixed a small typo in a shop name. (bugreport:4235)
- Removed a duplicate 'next' in Kiel Hyre Quest. (bugreport:4222)
- Fixed pc_checkitem() running before sending the client the inventory list, resulting in "Unknown Item is taken off" messages. (topic:245385)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14295 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-05-16 15:22:16 +00:00
Kisuka
de3008f248 - Moscovia NPCs. (All the generic, kafra, and guide NPCs.)
(Moscovia quest npcs still have horrible english, so that's why they aren't being committed yet.)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13466 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-01-21 02:35:38 +00:00
L0ne_W0lf
8ac8481d25 Happy boxing day, eAthena! Here have a massive update.
* Implemented the first round of episode 12.1 change which include:
- Many Morroc NPCs have been moved to Morroc Ruins.
- The addition of new of NPCs to the ruins of Morroc.
- Several warp points leading around Morroc altered.
- The implementation of the continental Guard Quest.
- The removal of the 'Dandelion's Request" quest.
- This update contains several changes, as Morroc and several fields no longer exist in one sense of the word. AS such, many NPCs have been moved, there may be quests that no longer function because of NPCs on inaccessable maps.
* Commented out maps no longer accessable with 12.1 in maps_athena.conf
* Updated mob_skill_db episode 12.1 skills to official.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13415 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-12-26 06:58:19 +00:00
Lupus
8a8825e736 * Updated moscovia.txt inn.txt mosk_dun.txt shops.txt from jA
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12823 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-06-13 15:00:53 +00:00
ultramage
c53f4f1955 Some random cleaning
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12141 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-01-26 09:44:10 +00:00
L0ne_W0lf
c743f14153 Corrected the Jawaii Ice Cream salesman. bugreport:285
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11566 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-24 02:49:09 +00:00
L0ne_W0lf
1607b50c59 Uncommented the ShowWarning and ShowDebug from rev. 11508, and cleaned up the warnings it produced.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11516 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-18 22:04:47 +00:00
L0ne_W0lf
ab73822fc1 * Added Veins shops to shops.txt.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11298 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-09-25 20:21:01 +00:00
L0ne_W0lf
24a0c184ab * Bug fixes to the updated 2-2 job quests.
- Testing and fixes courtesy of Barron-Monster and Samaury22.
* Corrected the second "Line" selling in the Comodo shop to "Whip".

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10985 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-08-12 18:43:37 +00:00
Lupus
579f303c2f updated file versions
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10941 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-08-01 05:36:42 +00:00
L0ne_W0lf
f62a9b7362 * Fixed missing item from "Fresh Fish" from cooking addition shops.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10882 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-07-14 23:48:51 +00:00
L0ne_W0lf
942687c211 * Rather large Kafra update. (May need further testing)
- Updated a good portion of the kafra functions.
- Added proper dialog for most functions.
- Updated guild Kafras and some o f their locations. 
* Updated all Guide NPCs. They are now mostly 100% official.
- Renamed some of the old files to make them look better, IE: yun to juno.
- Added Kunlun and Ayotaya guides.
* Added the Einbech tool Dealer since it seemed to had gotten lost when I updated shops.
* Updated Dye Maker and Hair Dyer to official. 

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10810 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-25 20:22:54 +00:00
L0ne_W0lf
c92f6a69ee * Updated cities: Morroc, Jawaii, and Izlude
- Moved an NPC out of Prontera because of the Jawaii update.
* Updated Wedding script to official. (Moved previous to custom.)
- Updated the Divorce NPC to Official as well.
* Changed some dialog in the Kafra Functions.
* Updated the Message boards to iRO standards.
* Added the Mail box NPCs even though the mail system is not implemented.
* Near total rewrite of the shops.txt file. Lots of corrections and such.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10766 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-14 20:34:13 +00:00
L0ne_W0lf
5ccf97cbc0 * Implemented Official Cooking Quest.
- Optimized Rachel donation quest, and added Rachel Guide.
- Fixed the name of one of Rachel's shops. (Tool Dealer -> Fruit Gardener)
- Fixed some typos in the Kyle Hyre Quest's additional comments.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10714 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-07 20:40:38 +00:00
Lupus
05aa029541 updated some headers in 3 merchants scripts
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10693 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-05 07:19:01 +00:00
Playtester
21e91dc46d * Added 11.2 guns to gunslinger shop
- updated gun prices
- updated sql files

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10682 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-04 12:23:05 +00:00
Playtester
e33c4b7b22 Updated Food Seller to official
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10466 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-05-05 13:42:37 +00:00
ultramage
45c732b05d More eof eols (followup to r10401); skipping /npc/custom and /npc/samples
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10402 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-29 08:39:36 +00:00
Playtester
51e6402f29 Fixed up some shops
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10312 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-22 10:18:34 +00:00
Playtester
2a402b2bb7 Added Gunslinger quest for slotted Butcher
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10159 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-04 21:50:03 +00:00
Playtester
1a8274c655 Officialized Kunai/Shuriken traders
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10123 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-02 17:25:40 +00:00
Lupus
c6d5f38b75 removed all .GAT from all the scripts and tested
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10018 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-03-15 20:32:55 +00:00
FlavioJS
637ae9a4dc - Massive EOL normalization & 'svn:eol-style native' flag setting for all txt/conf/h/c files.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9410 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-05 13:23:07 +00:00
Lupus
03d70e9dc8 fixed Lighthalzen, Swaltzwalt Quest Part 1, added Hugel-Bingo warps, added Airship mobs, fixed Hunte job quest typos, added pet shop into Light
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9182 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-11-09 09:30:36 +00:00
Playtester
71fb3f4c57 Fixed Einbroch Headgear shop
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8677 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-09-08 17:25:37 +00:00
evera
0782951279 enabled homunculus shop
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8358 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-19 09:04:39 +00:00
Playtester
7a5a7e7b13 * Added Violin[3] to the Comodo Weapon seller
* Optimized a warp near Gunslinger weapon shop
* Extended the Garrison quest to slot the Garrison

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8247 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-12 08:44:52 +00:00
Playtester
6eb305c5a9 Fixed the Morroc ingredient seller to not appear
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7911 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-27 10:40:29 +00:00
eaac
d4f3010f51 * Added Rachel NPCs:
~ Added Official warps of Rachel. About 50% of them. Will get the rest soon. [erKURITA]
	~ Added the Tool/Armor/Weapon dealer, aswell as a Vegetable Gardener. [erKURITA]
	~ Added the guards + guide locations. Also added the Zondaman location. [erKURITA]
	~ Added Rachel Inn npc. [erKURITA]
\- Special thanks to RockmanEXE for all the info above.
* eAAC update to the vending machine, disguiser and quest warper. [erKURITA]

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7349 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-27 00:50:05 +00:00