45 Commits

Author SHA1 Message Date
zackdreaver
91667a9a11 Update Renewal and Pre-renewal Morocc NPCs (#2977)
Fixes #3392 

Thanks to @zackdreaver, @AzarthMZintos and @Lemongrass3110
2018-08-17 10:27:26 +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
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
1d64b8f9e1 Script/database bug fixes.
* Fixed an issue in "Message Delivery" quest blocking level 100+ characters. (bugreport:8373)
http://rathena.org/board/tracker/issue-8373-message-delivery/
* Added Renewal quest items to Ayothaya Dungeon Entrance quest. (bugreport:8375)
http://rathena.org/board/tracker/issue-8375-ayothaya-dungeon-entrance-quest/
* Temporarily moved the Renewal location of "Strange Machine" in the "Muff's Loan" quest; confirmation needed. (bugreport:8370)
http://rathena.org/board/tracker/issue-8370-muffs-loan/
* Updated Blacksmith job quest with some extra conditions. (fixes bugreport:8347)
http://rathena.org/board/tracker/issue-8347-about-blacksmith-job-quest/
* Changed all 'bAtk' bonuses to 'bBaseAtk', a continuation of r17149. (fixes bugreport:8372)
http://rathena.org/board/tracker/issue-8372-daehyon-card-is-not-working/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2013-12-28 22:47:32 -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
fdd0fd1d72 * Standardized label names and converted all labels to Pascal case. (temp. fix for bugreport:6988)
* Many fixes to Izlude Arena scripts.
* Other misc. standardization.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17410 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-07-10 07:25:44 +00: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
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
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
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
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
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
jmanfffreak
eed5fc395a Fixed location error in Blacksmith quest. NPC said Alberta, NPC location in Einbech (bugreport:2401)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13335 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-10-28 23:48:16 +00:00
Yommy
f48fda465f fixed bug reports bugreport::2029 bugreport::2023 bugreport::1923
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13060 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-09 23:01: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
L0ne_W0lf
edd19c4e08 * Several small fixes to scripts, and updates.
- Updated City warps for Lighthalzen, and dugneon warps.
- Updated castle warps for Schwaltzvalt Castles Map.
- "The Sign" quest is now enabled by default. (bugreport:1011)
- Added Dimensional Gorge map spawns (According to RO Future Wiki)
- Updated Lighthalzen boss spawning mechanisim to official.
- Fixed a small error in the novice potion exchanger.
- Resolves the following: bugreport:879 bugreport:973 bugreport:983 bugreport:1013 bugreport:1021 bugreport:1024 bugreport:1026

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12227 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-02-22 06:16:21 +00:00
L0ne_W0lf
3fd5ba0c7d Started fixing bugreport:899 and fixed bugreport:875
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12156 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-02-01 00:38:56 +00:00
L0ne_W0lf
831ea50ba8 * Fixed an incorrect answer in the blacksmith quiz. (Trojal)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11635 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-02 02:15:42 +00:00
L0ne_W0lf
8189c99319 * Blacksmith job quest bug fixes care of Micktu.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11088 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-08-29 21:41:54 +00:00
L0ne_W0lf
9728e18cc3 * Fixed typos in the Blacksmith quest and whitesmith NPC. Thanks to Barron-Monster.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11001 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-08-14 03:09:01 +00:00
L0ne_W0lf
3c54ef2dff * More bug fixes to the 2-1 quests. Priest and Blacksmith specifically.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10987 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-08-12 19:32:13 +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
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
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
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
7367e7aa5f Many small scripts fixes - tabs, parenthesis, typo
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9137 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-11-04 22:59:57 +00:00
Playtester
794703e24c Small fix in the Blacksmith Quest
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7557 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-07 13:23:17 +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
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
db2a9e7c96 * Commited Silent's Fix to the duplicate NPCs
- needs testing
- can't be fully fixed because of length limitation of names

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7200 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-16 10:02:18 +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
Poki#3
955f2bbf68 Fixed some reference to old locations of the Blacksmith NPC's, Thanks to Neouni.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5491 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-03-07 19:09:35 +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
celest
c94c71d282 * Fixed some typos and exploits in the Blacksmith and Hunter job quest
* Modified 'wedding' script command to work with "OnTimer" scripts
* Added 'attachnpctimer' and 'detachnpctimer' script command

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@944 54d463be-8e91-2dee-dedb-b68131a5f0ec
2005-01-10 10:16:06 +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
(no author)
706e785091 git-svn-id: https://svn.code.sf.net/p/rathena/svn/athena@2 54d463be-8e91-2dee-dedb-b68131a5f0ec 2004-11-04 23:25:09 +00:00