48 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
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
Atemo
7e2dedc828 Corrected areamonster from aegis conversion 2017-01-25 20:04:41 +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
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
Euphy
c2bdd52865 * Kareka now offers to reset enchantments on Light of El Dicastes. (bugreport:7890)
* Fixed Malangdo rentals lasting for 1 day instead of 1 hour. (bugreport:7889)
* Added Old Glast Heim location to custom warper.
* @mobinfo now displays slots for MVP drops.
* Fixed a label execution in Dancer job quest.

Signed-off-by: Euphy <euphy@rathena.org>
2013-07-23 15:21:32 -04:00
euphyy
62dee5b8c7 * Updated Geneticist, Warlock, and Sura job quests to their latest versions.
* Added a clearer example for party_even_share_bonus (tid:58005).
* Standardized job headers.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17010 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-08 18:18:36 +00:00
euphyy
9800b743e6 * Raw revert of all job files back to r16578, prior to the rewrite in r16579. The updates will be re-applied after more testing is done.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16621 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-10 18:45:05 +00:00
masao87
44327805ca - This should fix all job quests which didn't work after the update.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16584 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-05 15:26:07 +00:00
masao87
93d361847e - Some little adjustments to the job change quests, also reverted some variables to the old job change files.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16582 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-05 11:19:56 +00:00
masao87
9a71512a79 - Follow up r16579 .
* Added some missing Baby checks... This Update really started great didn't it ;)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16581 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-04 22:15:29 +00:00
masao87
b2dd8c722e - Here comes the big Job folder Update.
* Updated all 1-1, 2-1, 2-2 and the expanded files to the latest available official files and also added support for baby job change.
* There might be some optimizations still needed at some places and there maybe occur some errors as well or the job change isn't fully working anymore since I didn't test all the jobs through the end (Me = Lazy), if so then please fill out a bug report in our bug tracker: http://rathena.org/board/tracker/project-4-scripts/
* Ninja, Gunslinger and the other files will follow within the next days.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16579 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-04 21:45:50 +00:00
daegaladh
52a4de498e Fixed some bugs on jobs and merchants scripts.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16559 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-02 12:17:06 +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
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
Kisuka
7ba1afd5c5 - Added quest log commands to all job quests.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14054 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-09-11 04:52:10 +00:00
samuray22
9e404c6d1b * Fixed a little Exploit to bug the Dancer Job Quest. (bugreport:2252)
* Fixed a Little Bug with Whispers Summoned in the Sage Job Quest. (bugreport:2253)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13231 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-09-22 20:28:15 +00:00
L0ne_W0lf
dd8e1e1bf3 * Slew up NPC bug fixes and other updates.
- Corrected item checking in Dancer job quest. (buggreport:1987)
- Fixed infinite dialog in novice grounds. (buggreport:1998)
- Fixed overlapping warps in ice dungeon.  (buggreport:2009)
- Corrected super novice script checks. (buggreport:2016)
- Corrected bug in alchemist dealer. (bugreport:2020)
- Commented out message board NPCs.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13052 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-08 19:54:07 +00:00
zephyrus
ec69a21210 - Fixed a bug in Dancer Quest.
- Some fixes on guild2/schg_cas03.txt

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12937 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-11 10:16:35 +00:00
L0ne_W0lf
963559a42c * Various fixes to NPCs, from bugreports.
- Fixed condition error in old pharmacist. (bugreport:597)
- Fixed missing function in novice WoE (bugreport:1728)
- Fixed a minor errors in dancer quest (bugreport:1766)
- Corrected duration of wedding status (bugreport:1775)
- Fixed missing function in novice WoE (bugreport:1788)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12925 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-08 15:01:29 +00:00
shadow
4e1d094db0 Fixed AM_PHARMACY produce chances based on info gathered by flaviojs, aegis zone ep 11.2, of 20070629
Added missing version on my last commit on dancer.txt script (added by akrus on stable branch already)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12913 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-05 00:21:16 +00:00
shadow
e2fc5e0869 Fixed bad variables on dancer job quest, bugreport:1685
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12835 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-06-14 23:45:41 +00:00
L0ne_W0lf
adf85cc8cc * Changed how waiting rooms work in the job quests.
- Implemented a checkweight in the alchemist job quest.
- Various other small updates to the 2-1 and 2-2 quests.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12262 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-02-28 20:04:16 +00:00
samuray22
1aa71f445e * Deleted unused variables in some Job Quest (2-1 & 2-2).
-Thanks to Ai4rei

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11726 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-12 13:47:54 +00:00
L0ne_W0lf
7fd5c0f918 2-2 job quest update. Although completable, further testing (and optimizing) required.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11278 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-09-23 00:36:51 +00:00
ultramage
c9ee6987e6 - Patched the MAX_STATUSCHANGE startup error
- Fixed a compiler warning
- Really removed duplicate Noyee npc

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10033 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-03-19 22:17:44 +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
Lupus
f38d3e495e updated alchemist & dancer job quests
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9918 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-02-25 18:57:36 +00:00
ultramage
46508c6c6e Fixed a parenthesis typo in the dance quest
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9894 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-02-21 16:46:57 +00:00
Lupus
9f5e46c78a updated Dance Job Quest. Optimized, Fixed typos, added missing text
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9883 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-02-21 10:48:57 +00:00
Lupus
dac22bc4e9 changed 'Improved Concentration' to 'Attention Concentrate'
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9882 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-02-20 23:04:04 +00:00
Lupus
435356fe51 final fix of Dancer Job Quest. Works on TRUNK only, due to latest initnpctimer changes
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9881 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-02-20 23:00:49 +00:00
Lupus
0a9018f80b fixed Dancer quest
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9880 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-02-19 16:37:44 +00:00
skotlex
5ed686f6a8 - Updated the Dancer job quest to attach a player to the main timer script.
- Updated script commands startnpctimer, stopnpctimer, initnpctimer so you can attach a player to them, this is done because the attach/detach functions can't be used to attach to a different script than the one currently running.
- Some script code cleaning
- Updated the script_command reference with the new flag values of [start/stop/init]npctimer.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9872 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-02-16 20:53:05 +00:00
ultramage
3266ced856 More typo fixes
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9714 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-01-26 15:01:39 +00:00
ultramage
e034ce07bb Typo hunt
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9684 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-01-21 12:12:04 +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
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
Lupus
6b2a738709 fixed dance jq
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7555 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-07 05:03:43 +00:00
Lupus
1a87e739bd turned the rest of job numbers to constants
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7554 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-07 04:52:02 +00:00
skotlex
2e0c3cb20d - Fixed some typos and grammatical errors on the Job Dancer quest.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6551 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-10 16:00:40 +00:00
Lance
95cee853fa Patched up dancer.txt abit.. still VERY messy. Someone needs to figure out a better algorithm for the dance test T.T
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6422 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-01 02:35:11 +00:00
Playtester
6c49b01601 Added the updated dancer.txt script from sodaboy581, it still gives error messages though, can someone check that?
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6409 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-04-30 19:30:00 +00:00
Vicious
261c79eca2 constant-fied!
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5763 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-03-27 02:15:34 +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