313 Commits

Author SHA1 Message Date
Atemo
befc6123be Fixes some bug in npc/cities folder and corrected syntax
Corrected some npc view
2016-02-11 02:06:10 +01:00
Atemo
3a45dd97f9 Another clean-up 2015-12-09 23:09:17 +01:00
Euphy
14fddd3790 Added script checks against swapping items using third-party hacks.
- Follow-up to 416f6d7, as further protection against item exploits.

Contains a few other fixes.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-08-22 15:36:23 -04:00
Euphy
ad13f26fc2 'consumeitem' no longer requires npc_id to run. (bugreport:8563, credits: AnnieRuru)
Second part of the bug report is not yet fixed.
http://rathena.org/board/tracker/issue-8563-consumeitem-doesnt-work-if-the-npc-id-is-0-example-bonus-script/

Replaced a few 'consumeitem' commands in scripts that were broken.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-28 03:00:48 -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
97687ca10c Global_Function updates.
* Added the following functions:
  - "F_GetPlural" (returns plural of noun) / "F_InsertPlural" (returns plural if arg != 1)  [credits: EnglishClub for formation rules]
  - "F_InsertArticle" (returns 'a' or 'an' preceding word)
  - "F_InsertComma" (formats number with commas)
  - "F_GetNumSuffix" (formats number with '-st', '-nd', '-rd', or '-th' suffix)
* Added and removed new functions where necessary. (incomplete)
* Added new types to "F_GetArmorType" function, and weapons will now pass to "F_GetWeaponType".
* Reformatted comments.

Other changes:
* Removed some garbage text from scripts.
* Slight edits to custom warper script.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-03 20:13:44 -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
Euphy
5ab4d5ea90 * Script updates:
- Updated Nameless Island quests and added questlog support in quests_nameless and quests_prontera. (fixes bugreport:7992)
- Updated "God Item Creation" scripts to their latest versions: seals roll at 25/50 instead of 50/100 in Renewal.
- Updated Soul Linker job quest with new checks.
- Fixed an untranslated Manuk NPC.
- Some follow-ups to previous commits.

* GM Management System:
- Enabled all official GM Management NPCs and wrote a function to control their usage.
- Implemented some missing GM Management NPCs (still incomplete).

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-25 20:56:46 -04:00
Euphy
0202126185 * Script updates.
- Added questlog support for Amatsu, Ayothaya, Hugel, Louyang, Lighthalzen, Niflheim, and Rachel quests.
- Updated Turbo Track with Renewal mounts; file split due to an NPC rename.
- Added missing cutins to Rekenber Job Quest.
- Added new "Stone Change" script (RE).
- Added Renewal coordinates to Juno's Airship Representative.
- Added Renewal sprites for Juno Soldiers (8W_SOLDIER -> 4_M_EIN_SOLDIER).
- Added Renewal Izlude Bulletin Board, but disabled unless valid coordinates are found.
- Minor updates to Malangdo Enchants dialogue.

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-13 18:24:01 -04:00
Euphy
32b8d2e713 * Implemented Bakonawa Extermination quest.
* Misc. cleaning.

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-07 02:47:45 -04:00
Deadly Silence
7beb7edc77 Minor bug fixes
[npc/cities/geffen.txt]
- fixed bug with Psychic Advisor (bugreport:7928)

[npc/quests/seals/megingard_seal.txt]
- fixed small bug with Librarian where he would spam the NPC dialogue
  because of a misplaced "next"

[npc/re/merchants/enchan_mora.txt]
- fixed bug with wrong enchants (bugreport:7930)
2013-08-06 23:46:24 +02:00
Euphy
d32e3c89ae * Renewal Izlude updates:
- Updated warp scripts and removed disabled warps.
- Implemented Renewal Hypnotist, which resets stats and skills; moved old file to Pre-Renewal path.
- Moved and added Bullet Dealer and Magazine Dealer duplicates. (bugreport:6410)
- Moved Dorian (quests_nameless) NPC to Pre-Renewal/Renewal paths and shifted Cuskoal (izlude) RE NPC.
- Corrected some coordinates and NPC facing directions.

* Updated all 3rd_trader scripts:
- Players can now purchase multiple items at once.
- Added many new Point Merchants.
- Moved Poison Herb Merchant in Morroc out of a wall (temp. fix).

* Other script updates:
- Added Eden Group Kafra (storage only).
- Added some missing announcements in Endless Tower.
- Added exit warp scripts to three 2nd job quests (Renewal only).
- Added official Morroc coordinates in Warlock job quest. (follow-up r17224)
- Minor updates to Comodo Gambling script.
- Fixed a Zeny bug in Payon town script, and changed some 'close' commands to 'end'. (bugreport:7893)
- Renamed npc/pre-re/kafras/kafras_izl.txt to .../kafras.txt.

Signed-off-by: Euphy <euphy@rathena.org>
2013-07-25 02:32:30 -04:00
euphyy
112030451a * Implemented all Mora quests (excluding instance-related quests and Mora Enchants).
* Updated Mora town NPCs, Quiver Maker, and guides.
* Updated Bifrost spawns and warps.
* Fixed a small error in the new refiners - thanks, Joseph!
* Other misc. changes.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17340 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-06-01 02:28:42 +00:00
euphyy
af8ef75a53 * Added "Cat Gamers" to Malangdo quests. This marks the completion of the Malangdo episode.
* Implemented Port Malaya Kafras, guides, sailors, and Eden teleporter.
* Edited documentation for 'sc_start' and 'addmonsterdrop'/'delmonsterdrop' commands. (follow-up r17326, r17237)
* Updated atcommand documentation and help file.
* Minor organizing of script locations.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17328 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-05-15 05:16:19 +00:00
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