34 Commits

Author SHA1 Message Date
Daegaladh
354c632732
Fixed place names and other typos (#4475)
* Fixed common misspelled names from iRO and other typos.
2019-12-15 20:55:19 +01:00
Lemongrass3110
fdc48770aa
Fixed a few typos and language mistakes (#2781)
Thanks to @Everade, @zackdreaver, @Atemo, @Akkarinage and @aleos89.
2018-04-04 10:13:00 +02:00
Atemo
ea88ea5054
Emoticons constant name (#2527)
This PR change the emoticons constant name to match emoticonlist from client side.
Note: the previous emoticons names are now deprecated.

Additionnally emotion and unitemote scripts commands are being merged together to the new format
-> emotion <emotion number>{,<target>};
Where target use the target Game ID (GID) of the unit (npc, pet, character etc..).

* unitemote is now deprecated.
* Additionnally fixed incorrect variable in quests_brasilis.txt

Thanks to @aleos89 and @Lemongrass3110 !
2017-11-10 18:35:21 +01:00
Lemongrass3110
9b1b7b1a2b Replaced hardcoded genders with constants (#1730)
* Replaced hardcoded gender codes in source

Introduced a new constant for the account based gender and replaced all hardcoded gender references to code 99 with it.

* Replaced hardcoded gender codes in npcs

Exported the gender constants into the script engine and replaced all usages with references to the constants instead of expecting a value behind them.

* Corrected a typo

Thanks to Machiezmo from Discord.

* Fixed an inverted gender logic

Thanks to @secretdataz
2016-11-22 21:20:03 +01:00
Atemo
d62f422e3d Corrected OnTouch/OnTouch_ in NPC script (#1548)
Some leftover from aegis convertion..

Skipped pre-re folder, I don't have old data.
2016-09-07 21:35:14 +02:00
Atemo
befc6123be Fixes some bug in npc/cities folder and corrected syntax
Corrected some npc view
2016-02-11 02:06:10 +01: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
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
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
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
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
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
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
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
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
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
L0ne_W0lf
6ef5c37fd3 * Continues replacing of specialeffect/2 numerics with constants.
- A lot of files still remain, but they don't have the proper effect names in commented in beside the ID. ;P
	

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13238 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-09-25 22:41:48 +00:00
L0ne_W0lf
a554d00483 Implemented several "checkweights" in other NPCs.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12258 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-02-28 05:59:53 +00:00
samuray22
baa7b8a1ac * Fixed a Problem in Mage Quest. (bugreport:489)
* Change a "+ name +" to "+ strcharinfo +" in a jawaii NPC.
* Change to non-capital letters StarGladiator and SoulLinker Quests Name.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11805 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-25 21:48:50 +00:00
L0ne_W0lf
571f2db6e0 Minor fixes here and there to a few scripts.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11574 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-25 23:59:32 +00:00
L0ne_W0lf
37e98485d1 * Added a return at the end of several scripts. Should deal with errors being shown in due to a recent commit by FlavioJS
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11495 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-16 23:40:07 +00:00
L0ne_W0lf
48fc2d2e23 *Fixed the Kafra function, which was screwing up teleporting.
* Undid come of the changes to the Jawaii and Izlude NPCs.
- Changed ispartneton() back to getpartnerid()
- Added Cebalis' dialog back in, and fixed a problem with Dega.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10777 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-16 15:48:08 +00:00
Lupus
cac4afb74f fixed bug in divorce, fixed many bugs in new Jawaii
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10771 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-15 08:53:28 +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
ultramage
0dc548c5f7 npc header consistency update
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10759 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-14 08:29:20 +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
evera
b9c2dc8185 Small fix in npc/cities/jawaii.txt and added a simple NPC in my devel folder to aid NPC scripters dealing with variables
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6866 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-30 23:56:50 +00:00
Lupus
b8b64672fa fixed jawaii script
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5296 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-02-16 09:18:00 +00:00
Valaris
2178a86317 AS OF SVN REV. 5901, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.  EVERYTHING ELSE
GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5094 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-01-29 16:10:48 +00:00