73 Commits

Author SHA1 Message Date
Euphy
3b2762ca3c Enable NPC logging through 'logmes' by default.
- Commented some unnecessary log messages.

Bug fixes:
- M_DOPPELGANGER had too much HP. (Hercules 9cd3ec0)
- Huuma_Swirling_Petal should not have an element. (bugreport:9073)
http://rathena.org/board/tracker/issue-9073-huuma-swirling-petal/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-08-22 16:06:32 -04: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
957f49563a Added 'preg_match' script command to match regular expressions.
The command is only available if the PCRE library is installed.

Updated indefinite articles in Global_Functions with regex. (credits: Kaivosukeltaja/php-indefinite-article/863f1d5)

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-29 16:33:27 -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
45c2a3a839 Follow-up to Global_Functino updates (834f3ba).
"F_GetPlural" now works for most item/mob cases, but still does not detect inputs that are already pluralized.
- For formats "... of|in|on ..." (ex. Piece of Cake), preceding word will be pluralized (ex. Pieces).
- Added some additional checks to prevent common errors.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-05 18:19:40 -05:00
Euphy
834f3baa05 Follow-up to Global_Function updates (97687ca).
* Added format string to "F_InsertPlural" for added flexibility.
* Added more checks to "F_GetPlural" for better handling of multi-word arguments (e.g. items).
* Updated some more scripts with new functions.

Some misc. cleanup of constants in scripts.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-04 13:42:16 -05:00
Euphy
357f1fd16c Minor bug fixes.
* Added itemscript for WoE Weapon Supply Box (12675). (bugreport:8421)
http://rathena.org/board/tracker/issue-8421-woe-weapon-supply-box12675-missing-item-script/
* Fixed two block comment errors. (bugreport:8409)
http://rathena.org/board/tracker/issue-8409-script-error-on-item-db-re-line-6123/
* Follow-ups to 97687ca.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-03 20:53:43 -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
7cb4145691 * Cleaned up some unnecessary global ($) and temporary character (@) variables in scripts.
* Removed unnecessary labels, particularly those in warp scripts.
* Some optimization of the Hugel Bingo script.
* Fixed a mob_db error. (bugreport:8051)
* Fixed incorrect/incomplete random Glast Heim warp.
* Removed useless 'getJobName' function from GlobalFunctions.txt.

Signed-off-by: Euphy <euphy@rathena.org>
2013-09-06 19:37:14 -04:00
Euphy
c610f5b15c * Added some iRO Eden Group NPCs. (credits: -SkittleNugget-)
- This consists of a few traders, warpers, cashshop-related scripts, and duplicates from various locations.
- There are a lot of placeholders and some entirely missing scripts; these may be added later, but we don't intend to implement all of iRO's custom features.
- Some of the item sprites may be unviewable without iRO's data.grf.

* Minor database updates:
- Corrected all *_C (rental) equipment entries; to be updated later on with VIP bonuses.
- Fixed some bHpDrainRate item_db entries. (incl. bugreport:8049)
- Fixed a mob_skill_db entry. (bugreport:8050)

* Other changes:
- Renamed 'F_RandMes' to 'F_Rand', to clear up any confusion. (follow-up 66a2bfd)
- Small changes in Armor Enchanter script (thanks to Emistry for pointing it out :p).

Signed-off-by: Euphy <euphy@rathena.org>
2013-09-06 00:22:41 -04:00
Brian
d7742937a8 - Updated F_RandMes with getargcount().
Follow up to 66a2bfd7c24bb617d27cc0a3e8db903cb000f3de
2013-09-05 13:07:54 -07:00
nanakiwurtz
f44ae34734 Updated to the new 'F_RandMes' command.
Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2013-09-05 14:12:42 +07: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
3f514b442d * Switched some 'close' commands to 'end' in custom scripts. (follow-up r17280)
* Deleted some code in Global_Functions that really shouldn't have been there. (blame: r15262)
* Other documentation changes and cleaning...

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17282 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-04-22 05:00:27 +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
f8c4e952a3 - Standardized script headers, starting with /npc/custom/
http://rathena.org/wiki/Script_header

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15262 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-25 06:54:26 +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
6db17907b0 - Removed extra slashes in item_db.txt (bugreport:4686)
- Removed punctuation from Time2Str script function.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14655 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-01-08 08:55:02 +00:00
brianluau
6b106aeb56 - Fixed some small typos.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14382 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-18 23:32:03 +00:00
L0ne_W0lf
dc0977ed37 * Quest log kill count now updated properly. (Added from topic 253813)
* More battleground editing, and some bug fixes.
- * ALL BATTLEGROUNDS ARE NOW ACTIVE BY DEFAULT. PLEASE CONTINUE TESTING *
- Rewrote the Badge Exchange NPC in bg_common.txt, is official now.
- Other changes to the bg_common folder, including disabled GM NPC.
- Completely rewrote Flavius for the most part, from ground up.
- Moved old Flavius battlegrounds to /custom/battleground folder.
- Restored original bg_common, and KVM to /custom/battleground
- Fixed wall bugs in Tierra Gorge, and added an oninit to the timers.
- Other minor tweaks to both Tierra Gorge and KVM scripts.
- Fixed the pseudo-cooldown on KVM not working properly, I hope.
- Added global time2str function which will be used later in Endless tower.
* Applied Epoque's mapflag clean up, which removes flags from scripts.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14374 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-14 16:06:23 +00:00
L0ne_W0lf
9bb87169be * A rather large overhaul of the battlegrounds.
- in bg_common.txt, stripped out KvM npcs, fixed coordinates.
- Needs to be tested, none of the BG files are on by default.
- Created subfolder battleground/KvM/ which now holds KVM files.
- Added kvm_enter.txt, which warps players to the waiting rooms.
- Added kvm_item_pay.txt, which holds the point redemption NPC.
- Made the KvM battlegrounds work closer to official, needs work.
* Corrected variable typos in the acolyte arena. (bugreport:4374)
* Corrected donpcevent typo in the party arena. (bugreport:4374)
* Added two global functions which will return equip data as strings.
- F_GetWeaponType: returns the type of weapon by 'look', (ie "Dagger")
- F_GetArmorType: returns the kind of armor via 'equip loc'. (ie "Armor")
* Fixed duplicate documentation for getitemslot. (bugreport:4362)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14369 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-03 18:27:00 +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
L0ne_W0lf
59350e3bc3 * Uncommented all novice map, and added mapflags.
* Additionally; changed starting map from new_zone to new_1-1.

* Large update to the novice grounds. Fixed bugreport:1666
- Updated notice ground warps to reflect the above map-usage change.
- Additionally; NPCs now give EXP (base/job) dependant on your level.
- All prior novice ground progress will be lost, and variables cleared.
- NPCs give class specific items, but not the soulbound ones, yet.
- Fixed the mob count for the novice ground maps.
- Added all the old novice training ground vars to F_ClearGarbage

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12833 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-06-14 11:57:10 +00:00
Lupus
cc74ee4126 fixed 4 bugs in Blacksmith job quest, put some garbage var to clear. Fixed a typo in Bard Job q
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12791 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-06-08 12:53:48 +00:00
Lupus
c70703e473 Updated Valkirye, Global_Functions, Turtle Island Quest vars
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12463 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-03 09:15:22 +00:00
ultramage
9c07918456 Added proper checks to adoption processing (followup to r12428).
Cleaned up some code / fixed some typos.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12432 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-03-25 09:56:18 +00:00
Paradox924X
61c61b6fe9 Updated Poring Tower to not refinable. (bugreport: 1050)
Renamed custom Stylist to Stylist#customstylist to avoid conflicts with official one. (bugreport: 1042
Updated Airship Typing Challenge to not fail you when you get both strings correct. (bugreport: 1008)
Fixed Job_Change Function to properly jobchange babies. (bugreport: 943)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12368 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-03-15 18:51:07 +00:00
L0ne_W0lf
66071c3330 * Removed "F_CheckMaxCount" as it seems "checkweight". preforms the aforementioned check in addition to checking weight.
* Updated 2004 headgear quests to use checkweight.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12256 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-02-28 04:46:29 +00:00
L0ne_W0lf
5b5caa7043 * Implemented new function F_CheckMaxCount.
- Checks if you have enough room in your inventory to accept items
* Updated 2004 headgear quests to fully official.
- Implemented usage of F_checkMaxCount in the 2004 headgear quests.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12255 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-02-28 03:32:45 +00:00
ultramage
a6cd45f05d * Fixed north prontera kafra having an empty warp list
* Removed junk &#1038;A text from the 2004 headgears
* Changed deprecated Job_Alchem to Job_Alchemist (see r10904)
* Fixed a typo in a geffen city npc (Job_Merhcant)
* Fixed a typo in the Jobmaster custom script (Job_Gunsliger)
* Fixed one old eAAC Quest Warper bug (warp to nonwalkable coords)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10940 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-07-31 21:27:01 +00:00
L0ne_W0lf
feb66f53d3 * Added the "F_BlockHigh" function back in, as it's still used by 2-x job quests.
- Fix the assassin job quest item reward bug. Cheap fix until it's rewritten. 
* Added official Pang Voice skill quest for bards. Further official 2-x skill quests to come.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10938 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-07-31 09:11:38 +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
Lupus
a431acd416 Added npc/sample/npc_live_dialogues.txt how to use Global_Functions.txt
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10035 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-03-20 06:48:26 +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
skotlex
fa1c4b2e47 - Simplified the global function "getJobName"
- Simplified function agitcheck so it isn't crash prone. Now it takes no arguments, and will return whether WoE is on or not.
- Updated bundled scripts as required for this change.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9559 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-22 15:38:30 +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
ecb547edc2 Removed garbage vars from Shinokas quest
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9372 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-11-30 13:09:14 +00:00
KarLaeda
78d9c69d88 Cleaned up global permanent variables in Airship Quest
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9306 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-11-24 11:24:21 +00:00
Lupus
c88fbc0e16 Added official Ninja Job quest
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9224 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-11-16 09:47:08 +00:00
Lupus
e00e768228 Cleared a bit 'clear garbage' function. Update novice grounds with correct kafra tickets
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9115 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-11-01 11:34:38 +00:00
Lupus
f5d4fd6aea added new TK job quest, added Rachel city NPC!, added louyang guide
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9074 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-10-26 05:38:39 +00:00
Lupus
9b9890e91c 2 typos fixed
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8834 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-09-21 14:36:42 +00:00
Lupus
001711c37a freed 15 more perm variables. Fixed bugs in Cube Room
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8831 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-09-21 11:12:52 +00:00
Lupus
6cd8533bc3 fixed Cube Room quest bug, more optimizations
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8821 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-09-20 09:39:11 +00:00
Lupus
2f788df6b6 1s job skill quests optimization. now using @temp vars
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8820 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-09-20 08:28:08 +00:00
Lupus
a402eb2a81 fixed typos, added missing NEXT;, optimized Niflheim. Clear nif vars garbage
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8819 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-09-20 05:43:48 +00:00
evera
3cef575197 updated header of other/Global_Functions.txt
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8282 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-15 03:59:59 +00:00
evera
0486ae7b2b updated dts_warper.txt to use MISC_QUEST|128 instead of dtseligible,2
Added that to garbage cleaning
Added garbage cleaning func call to dts_warper.txt (only makes sense)
And I did this at 1am, so look for bugs before I merge to stable, and report on forums.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8266 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-14 08:13:21 +00:00
Lupus
63ea289b99 updated gunslinger quest/ updated 2006 headgears. fixed lighthalzen quest
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7996 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-31 09:27:15 +00:00