27 Commits

Author SHA1 Message Date
Lemongrass3110
644e294699 Merge branch 'master' into woe_te-restrictions
# Conflicts:
#	npc/re/mapflag/nobranch.txt
#	npc/re/mapflag/nomemo.txt
#	npc/re/mapflag/noteleport.txt
#	npc/re/scripts_athena.conf
#	src/map/atcommand.c
#	src/map/map.h
#	src/map/script.c
#	src/map/script_constants.h
2016-09-29 08:13:31 +02: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
b3d150c3a5 Merge branch 'master' into woe_te-restrictions 2016-04-04 20:22:25 +02:00
Atemo
883b5cc919 Little update 2016-02-24 04:45:47 +01: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
nanakiwurtz
2fec0a881a Reverted npc/re/guides_alberta.txt to original state 2015-04-07 00:32:21 +07:00
nanakiwurtz
5eede89b49 Minor Typo 2015-04-07 00:26:21 +07:00
Skormie
03249a0430 Eclage update with minor error fix and added optimizations. 2015-01-13 20:38:54 -05:00
Skormie
a4cac34dc6 Eclage update with minor error fix. 2015-01-13 18:19:32 -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
Cydh Ramdh
2330caaf0c * Fixed bugreport http://rathena.org/board/tracker/issue-8360-error-report-0000-still-images/
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-19 11:33:10 +07:00
Euphy
ff86b75d26 * Standardization of new Upgrade Weapon Enchants script. (follow-up 5debd8c)
* Fixed some bugs related to Nidhoggur's Nest. (bugreport:7990)
* Follow-up ba6b57b:
- Added 'is_clientver' command to Navigation system function.
- Documented @item change.

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-17 22:56:40 -04:00
Euphy
11860e2e1f * Script updates:
- Added warpers and duplicates for Izlude (izlude_[a-d]) and Prontera Field 8 (prt_fild08[a-d]) maps.
- Updated Eden Group warpers and added new duplicates.
- Changed "Kelitula Academy" to "Cryptura Academy".
- Added a missing OnMyMobDead label in Buwaya Cave instance. (bugreport:7929)
- Added version information to Airport script headers.

* Mob spawn organization:
- Split "City Cleaners" into Pre-Renewal and Renewal directories.
- Restored Thief Bug (Pre-Renewal) vs. Thief Bug Egg (Renewal) spawns.
- Created "Town" spawn files, holding all city spawns not in "City Cleaners" files.
- Added Prontera Training Dummies and Alberta Ship Mouses.
- Moved Jawaii spawns from "fields/" into "towns.txt".
- Moved Brasilis spawns from its own directory into "towns.txt".

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-05 19:42:00 -04:00
Euphy
6bed814550 * Implemented new Guides with Navigation. (source: Muad_Dib)
- If your client does not support them (anything below 2011-10-10), disable the feature in npc/re/guides/navigation.txt.

Signed-off-by: Euphy <euphy@rathena.org>
2013-07-24 18:37:36 -04:00
euphyy
cc701c83bb * Implemented Eclage town NPCs from iRO.
* Implemented Eclage guides.
* Implemented Eclage coin traders (equipment NPCs and herb seller).
* Implemented Eclage skills. (3CeAM 705)
* Added Eclage quest_db entries (missing times).
* Added placeholder NPCs for Eclage quests -- most quests are not functional.
* Moved custom Warper and Healer coordinates for Eclage.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17373 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-06-18 01:13:19 +00:00
euphyy
112030451a * Implemented all Mora quests (excluding instance-related quests and Mora Enchants).
* Updated Mora town NPCs, Quiver Maker, and guides.
* Updated Bifrost spawns and warps.
* Fixed a small error in the new refiners - thanks, Joseph!
* Other misc. changes.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17340 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-06-01 02:28:42 +00: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
f967a8de53 * Implemented Mora town NPCs from iRO.
* Implemented Mora guides.
* Implemented Mora official warp scripts.
* Added Mora Points NPC and removed a wrong shop item.
* Added placeholder NPCs for Mora quests -- no quests are currently functional.
* Rewrote documentation for 'recovery' command. (follow-up r17321)
* Updated RUS, SPN, IDN map_msg translations. (credits: Jarek, Leeg, Cydh)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17325 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-05-10 00:10:45 +00:00
lemongrass3110
0acdc668f0 Updated dewata to match the official scripts.
This commit includes a optional SQL upgrade file, that will reset all the dewata quests and the related variables, that your users have done.

Thanks to Euphy for helping me and additionally thanks to Flaid for taking his time to test our conversion.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17178 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-03-06 21:38:39 +00:00
euphyy
f3e4ef5067 * Updated "Calyon" NPC in El Dicastes quests, fixing an incorrect condition.
> Hercules merges:
* 2bc8562, 126225b:
Skills granted through scripts are now permanent, until this date they were not relog persistent. (bugreport:5018)
Note that you will need to execute /sql-files/upgrades/upgrade_svn17136.sql for this change.

* b8379d2:
@skillid now supports partial search.

* d7ce0c1:
Character's online states are now updated as soon as they attempt a char select, instead of at the end of the procedure. This improves reliability with 3rd party software e.g. control panels. (bugreport:7269)

* d828000:
Login and Char servers will now exit when failing to bind to the port (as map server has always done).

* 003ed2c:
Moved "Honeymoon Helper" and "Odgnalam" NPCs to official RE coordinates.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17136 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-02-17 21:13:33 +00:00
euphyy
711e5009da * Added a missing 'close' in El Dicastes quests (bugreport:7273).
> Hercules merges:
* ac78454:
Extending readparam functionality: Added many more bonuses including missing key stuff such as def/mdef.

* 4983181:
Script commands relying on equipment slot may now access the 3 following types:
EQI_COSTUME_HEAD_LOW (11)
EQI_COSTUME_HEAD_MID (12)
EQI_COSTUME_HEAD_TOP (13)

* b305c1f, e5cc221:
Updated EXP rewards in 13-1 and 13-2 quests.

* a244b61:
Status effects no longer propagate with magical reflection (e.g. when frost diver is reflected there is no chance that target will be frozen)

* f825d79:
Database and script updates. (bugreport:6957, bugreport:6834)

* a2b070b:
Various typo fixes.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17131 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-02-15 04:24:14 +00:00
euphyy
618a449636 * Renewal item updates, mostly misc items (incl. bugreport:7167).
* A couple of quest_db updates.
* Moved El Dicastes Guide to a separate file and fixed viewpoint syntax.
* Fixed bugreport:7238, two mob skill mode changes.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17122 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-02-07 01:07:46 +00:00
j-tkay
78ee33ddda - Fixed bugreport:6979, added missing case in Ayothaya Guide NPC. (re/guides/guides_ayothaya.txt)
- Standardized headers.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17007 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-06 16:25:09 +00:00
euphyy
5ccf2f288f * Standardized Kafra Employee headers and comments (/kafras/)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16616 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-10 05:26:23 +00:00
euphyy
fb0a39fe3e * Optimized Eden Quest lv. 11-25 (re\quests\eden\)
* Fixed bugreport:6427 with new Alchemist quest (jobs\2-2\alchemist.txt)
* Other misc changes/fixes...

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16615 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-10 04:55:08 +00:00
masao87
580e505137 - First try to commit something into this whole new Mess Ind created ^^
* Added the Izlude Town Map Update some of you may already know from me from the download section. Moving all NPC's and Warps around to match the new Izlude Town Map.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16384 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-08 20:47:30 +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