52 Commits

Author SHA1 Message Date
Aleos
fd148a6783
Adjusts disabled NPC with waiting rooms (#5289)
* Fixes #5288.
* Follow up to 1c6270f.
* Changes NPC that have waiting rooms to not be disabled, but be hidden.
Thanks to @Forte22!
Co-authored-by: Atemo <Atemo@users.noreply.github.com>
2020-08-07 20:35:36 -04:00
Daegaladh
34cb15ec04
Fixed a couple of answers on Knight job quest test (#4724) 2020-03-27 15:31:24 +01:00
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
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
j-tkay
de9950737d - Fixed bugreport:6785, missing changequest in Knight Job Quest. (npc/jobs/2-1/knight.txt)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16819 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-10-15 15:06:41 +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
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
euphyy
36c9f0887b * Optimization of Knight job change quest, and fixed bugreport:6163 (jobs\2-1\knight.txt)
* Follow-up r16373: added another missing entry (bugreport:6162)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16374 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-04 03:31:55 +00:00
masao87
a1c12384fa - Fixed a bug in Eden Group Quests where a variable was set which was supposed to be converted and give the player certain gears. bugreport:6143
- Fixed an Priest Quest cutin which would result in getting an missing file error of the MvP Mistress Card illustration. bugreport:6144
- Fixed EXP Values in Eden Group Quest Boards 86 - 90 and 91 - 99. Source: http://irowiki.org/wiki/Eden_Group_Leveling_Quests
* 3 Hours cooldown isn't added yet since some testing is needed. bugreport:6110
- Some minor paranthesis fix in Knight Jobchange Quest.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16362 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-01 14:13:56 +00:00
masao87
f8b0c2426d - Updated Monster spawns in Job change Quests to renewal. bugreport:5574
- Some minor changes to the Arch Bishop Job change Quest.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16124 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-17 12:53:16 +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
L0ne_W0lf
f77b5c0727 * Removed usage of the 'goto' command from job quests.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14351 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-21 15:25:44 +00:00
Kisuka
bcc93a061b - Fixed typo in WoE:SE Castle announcements (bugreport:3714).
- Fixed typo of a check in god_weapon_creation.txt (bugreport:3613).
- Fixed missing changequest in Knight Job Quest (bugreport:3757).
- Fixed placement of Control Device01#aru04 (bugreport:3716).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14178 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-11-29 23:23:42 +00:00
Kisuka
d594bc38ae - Fixed typo on item 6079 (bugreport:3581).
- Fixed issue with Knight Quest.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14058 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-09-13 10:55:14 +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
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
39d2d8fba7 * Corrected a bad duplicate name in Kafra Bank (Custom). (bugeport:921)
* Corrected a lot of ";;" Typo errors.
-Some of this are in the bugreport:919
* Corrected a Cutin Problem in Cooking Quest and a Delitem. (bugreport:911)
* Corrected some typo error with "rouge". (bugreport:909)
* Moved Custom Event folder to Custom Folder.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12177 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-02-05 17:54:03 +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
d8fc315f1e Removed duplicate Morroc city npc (bugreport:277)
Fix to the knight job quest. (bad areawarp destination)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11568 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-24 03:59:22 +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
432aff6863 * Knight job quest bug fixes.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11081 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-08-28 22:23:59 +00:00
L0ne_W0lf
1818c47749 * Changed the Keil Hyre Black Keycard distributing NPCs slightly.
Changes to the Keil Hyre quest were mirrored on Stable as well.
* Bug fixes to the Wizard and Knight job quests. 


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11076 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-08-24 22:28:36 +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
L0ne_W0lf
31731bd129 * 2-1 Job quest update. Needs in-depth testing.
- Because of a change of variables, players currently undergoing the job change quests may find themselves in a slightly different position in the quest.
- This update reverts the hunter job quest timer BACK to 3 minutes.
* Corrected some Acolyte job quest issues.
- Removed Priest quest specific text from acolyte quest file.
* Bard Pang Voice quest was checking for the wrong variable.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10973 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-08-10 00:03:11 +00:00
ultramage
9bea875b80 fixed minor npc file typos
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10855 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-07-04 14:54:49 +00:00
ultramage
6867d93866 typos: recieve -> receive
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10163 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-05 19:02:52 +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
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
72bebf27fc - Now root script functions calls can have parenthesis (will take any parenthesis after the function as the start of the argument list).
This means "func (exp),exp;" isn't valid anymore and has to be changed to "func exp,exp;" or "func((exp),exp);" or something like that.
- Updated swordman.txt and knight.txt accordingly.

Only changed this because it was very annoying when I was creating the sample localized npc.
Don't expect more changes unless something similar happens again. Bottom line: we're in soft feature freeze and moving to eApp...

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9536 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-20 11:50:44 +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
caca2976df fixed missing tabs, extra params. thanks to irmin i CAHTEXHuK. fixed warp coord of DTS warper. added missing next; to priest
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9078 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-10-26 18:14:09 +00:00
Lupus
91f6da3017 merged jFunc 2-1
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7305 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-23 06:32:30 +00:00
Playtester
ab4b65926f Updated several job quests so they work again
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6400 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-04-30 15:04:06 +00:00
Lance
2a6dc10d0b Fixed scripts relying on older event calling methods.. Still searching for other scripts..
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6396 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-04-30 09:24:46 +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
Valaris
fd99753f8e Clearing trunk.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5091 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-01-29 16:00:45 +00:00
ajarn
e92f591372 git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@715 54d463be-8e91-2dee-dedb-b68131a5f0ec 2004-12-22 07:33:09 +00:00
mc_cameri
025b4ac2d3 git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@714 54d463be-8e91-2dee-dedb-b68131a5f0ec 2004-12-21 22:44:37 +00:00
codemaster
ed9ff63ee4 * Fixed a few NPCs that were giving curly errors. It seems to be caused by a bug that the NPCs' last line isn't read or something [Codemaster]
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@712 54d463be-8e91-2dee-dedb-b68131a5f0ec
2004-12-21 21:52:17 +00:00
amber
d479e29aee Fixed some file types
git-svn-id: https://svn.code.sf.net/p/rathena/svn/athena@172 54d463be-8e91-2dee-dedb-b68131a5f0ec
2004-11-14 16:18:26 +00:00