112 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
809754379b Added 'warp2' NPC
Unlike 'warp', 'warp2' NPC will also be triggered by hidden player.
Thanks @secretdataz and @Lemongrass3110 !

* Replace script using OnTouch:([\r\n\t]+)warp by warp2

* Removed sprite id from warp duplicates in Bangungot instance

* Fixed a bug where warp/warp2 parsing is too greedy
2017-05-09 23:45:34 +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
Capuche
5dc6b749e1 Bug fixes in quests/quests_moscovia.txt
-- Added questlog support on The Moving Island, Help Mikhail, Banish Winter quests
-- fixed bugreport 8532

Signed-off-by: Capuche <capucrath@gmail.com>
2014-07-22 03:30:21 +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
7cb4145691 * Cleaned up some unnecessary global ($) and temporary character (@) variables in scripts.
* Removed unnecessary labels, particularly those in warp scripts.
* Some optimization of the Hugel Bingo script.
* Fixed a mob_db error. (bugreport:8051)
* Fixed incorrect/incomplete random Glast Heim warp.
* Removed useless 'getJobName' function from GlobalFunctions.txt.

Signed-off-by: Euphy <euphy@rathena.org>
2013-09-06 19:37:14 -04: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
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
glighta
8d605f89c3 - Follow up r17296
-- capped CAMOUFLAGE effect, (defs should be lower then 0, atk bonus max 300, fix cri bonus  (base is 1000 not 100))
-- fix bugreport:7601 and add new mapflad for clif_maptypeproperty2 (nomineeffect, nolockon, noitemconsumption, nousecart, nosumstarmiracle) still investgating full effect
-- harmonize script_ref source


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17297 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-04-26 14:38:54 +00:00
euphyy
0dc920284d * Added Somotology Laboratory F4 quest (written by Ziu, translated by Heris, uses some iRO dialogues).
* Updated quest_db with Somotology Laboratory F4 entries (5113-5125 are placeholders, may be incorrect).
* Moving of warp files, reducing the number of duplicates in pre-re/re paths.
* Added a note to documentation (bugreport:7065) and fixed a small mistake (bugreport:7068).
* Follow-up r17056, missing $ (bugreport:7067) and added a missing item.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17063 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-30 02:05:43 +00:00
euphyy
35683b8f8c * Fixed errors with warp portal/mob spawns in Renewal Yggdrasil Dungeon, bugreport:6422
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16594 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-07 16:36:29 +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
29749ceaa8 - Replaced more -> rAthena (follow up to r15251).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16195 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-01 04:06:10 +00:00
masao87
3f33f566f0 - Fixed a little leftover in socket_enchant2.txt .
- Added warp to iz_dun05 bugreport:5395 .
- Fixed a little typo in clif.c .
- Moved "int clif_status_load_single" from clif.c to clif.h .

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15665 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-07 23:50:38 +00:00
brianluau
a48f5d68d0 - Added svn:eol-style=native property to some recently added text files.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15413 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-09 18:46:57 +00:00
Chilly0123
7ceabb2bc1 *Fixed bug in 13.1 quest which caused quest log to remain after completion.
*Added warps up to Episode 14.2.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15400 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-06 09:20:37 +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
90c355108c - Merged /branches/renewal/conf (partial)
- Merged /branches/renewal/db (only mob_db.txt and mob_skill_db.txt)
- Merged /branches/renewal/npc (full)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15060 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-11 19:24:13 +00:00
brianluau
75010f0a3a - Set svn:eol-style=native for some recently added text files (follow up to r15009).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15044 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-09 03:53:41 +00:00
brianluau
9aa3a700a7 - Removed .gat from map names.
- Removed trailing tabs in some warp portal files.
- Removed `loginlog` table from convert_engine SQL scripts, because it's in the log database.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14987 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-10-31 23:19:36 +00:00
L0ne_W0lf
f755dd18b3 - Implemented first version of Archbishop skills. Preliminary version, see doc/3rd_job_notes.txt for details/bugs/issues with skills.
- Implemented fixed cast time, old cast time mechanics no longer available. Added bFixedCastRate used for reducing fixed cast time mechanic.
  Cast time calculations probably still needs work, as the cast rate reductions are probably additive and multiplicative as they used to be.
- As a result, skill_delayfix_sc() has been removed, status effects that modify cast time are now calculated DURING cast time, not after.
- Implemented skill cooldown in skill_cast_db.txt. Known issue is that the cooldowns should save on logout/server shutdown/etc.
- Implemented new heal calculation and started work on MATK. Added bWeaponMatk, and bEquipmentMatk for use with new MATK mechanic.
- Removed custom features and their config settings: delay_dependon_dex, delay_dependon_agi, castrate_dex_scale.
- Increased max_def to 9999 for now, as that is by default the largest defense increase found in the Renewal database (Ahura_mazdah, GM item)
- Added shield aspd reduction from job_db1.txt-- Not 100% sure on this one yet. Should be considered a WIP.
- Modified updatestatus(), to display information more in line with the client's status window.
- Updated some calculations in status_calc_misc to match renewal, needs a lot of work still.
- ST_CHASEWALK and HP_BASILICA no longer have 0 cast time while being canceled.
* Implemented 'Boss' Decrease AGI, like 'Boss' Heal - editable in skill.conf
* clif_skill_fail() now accepts a new parameter, to be used in later messages.
* status_change_start() now stores tick as duration upon being called, which fixes timers calling the function from showing negative durations.
* Implemented skill ALL_PARTYFLEE. 1 level, increases party member flee by 10.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14941 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-08-27 03:25:00 +00:00
L0ne_W0lf
ebfc42b8d5 * Implemented remaining Brasilis NPCs.
* Added remaining database modifications for Brasilis.
- Added the skills for the Brasilis monsters.
- Added remaining entries for Bathroom Ghost quest.
- Added stats for the Suspicious Hydra monsters.
- Corrected the capture rate for Suspicious Hydra.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14928 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-08-09 20:08:47 +00:00
ai4rei
96a6a43e85 * Merged changes from trunk [14742:14782/trunk].
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14783 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-04-09 09:09:35 +00:00
Gepard
f268ce1577 * Fixed and commented out old Anthell entrance warps (bugreport:3589).
- Moved entrance to cmd_fild08 to match mapcache updates.
* Fixed an issue in Resurrection of Satan Morroc (Continental Guard Quest) when player dying/logging out during conversation could prevent summoning of Satan Morroc until server reboot (bugreport:3437).


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14753 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-03-20 23:18:07 +00:00
L0ne_W0lf
80df86d7f7 * Wot's dis? Missed a warp in morroc field! THIS WILL NOT DO.
- ...corrected the versions in the file headers as well. :P


git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14423 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-11 03:59:15 +00:00
L0ne_W0lf
a9de18e42d * Renewal Update to warp portals, and deleted disabled_warps.txt.
- Only disabled warps, some coordinates might have slipped past me.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14421 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-11 03:51:07 +00:00
Gepard
8b8556c220 Corrected Einbech Mine warps.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14350 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-20 21:13:59 +00:00
Kisuka
bf6a9426af - Fixed cords on milestone 1-3. (was bugged on aegis too)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13607 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-03-19 21:00:28 +00:00
Kisuka
7c28a47642 * Moscovia Update!
- Added Moscovia quests.
- Uncommented mosk_dun & added field spawns.
- Updated moscovia & mosk_dun warps.
- Removed most the npcs from cities/moscovia.txt (they are part of the quests).
- Added some more moscovia quest items to item_trade.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13605 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-03-19 19:57:49 +00:00
L0ne_W0lf
8ac8481d25 Happy boxing day, eAthena! Here have a massive update.
* Implemented the first round of episode 12.1 change which include:
- Many Morroc NPCs have been moved to Morroc Ruins.
- The addition of new of NPCs to the ruins of Morroc.
- Several warp points leading around Morroc altered.
- The implementation of the continental Guard Quest.
- The removal of the 'Dandelion's Request" quest.
- This update contains several changes, as Morroc and several fields no longer exist in one sense of the word. AS such, many NPCs have been moved, there may be quests that no longer function because of NPCs on inaccessable maps.
* Commented out maps no longer accessable with 12.1 in maps_athena.conf
* Updated mob_skill_db episode 12.1 skills to official.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13415 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-12-26 06:58:19 +00:00
Lupus
25ec536b55 updated mosk warps
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12837 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-06-15 11:21:41 +00:00
Lupus
8a8825e736 * Updated moscovia.txt inn.txt mosk_dun.txt shops.txt from jA
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12823 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-06-13 15:00:53 +00:00
shadow
b6d223b8b4 Removed duplicated quest warp portal on /warps/dungeons/juperos.txt, bugreport:1486
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12788 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-06-08 11:03:19 +00:00
L0ne_W0lf
c8d4cc6a2d Updated Umbala npcs, quests, and warps.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12403 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-03-20 18:48:27 +00:00
L0ne_W0lf
8e690db7c9 Fixed bugreport:1057 and bugreport:1058
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12244 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-02-26 23:39:13 +00:00
L0ne_W0lf
953d580f97 Corrected Labs level 3 warp.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12240 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-02-25 01:48:43 +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
ultramage
c53f4f1955 Some random cleaning
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12141 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-01-26 09:44:10 +00:00
L0ne_W0lf
9b9332759d * Added Veins town NPCs, mail box, and second guide.
- Updated warps for Veins. Outstanding warps are quest related.
* Minor updates to other warp files.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12056 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-01-11 18:46:26 +00:00
L0ne_W0lf
be6df0dc11 * Updated Kunlun NPCs and warps.
- Didn't update the Kunlun 'Power' npcs
- Updated Lutie and Comodo warps.
* Fixed some slight inconsistencies with the some script headers.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12014 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-01-05 21:32:34 +00:00
L0ne_W0lf
f53f2a4d05 Updated Louyang NPCs, quests, and warps.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11921 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-16 22:51:19 +00:00
L0ne_W0lf
1d4d4feee2 Updated Ayothaya NPCs, Quests, and Warps.
- Should also fix bugreport:586 (Footprint2 error)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11903 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-14 00:38:41 +00:00
L0ne_W0lf
3c65f35146 Updated Amatsu NPCs, Quests, and Warps.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11887 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-11 18:38:55 +00:00
FlavioJS
b3fe52fa6b * Removed double tabs from mapflag/warp/script/function/duplicate declarations.
(avoid script errors in a future commit)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11871 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-08 17:14:57 +00:00
L0ne_W0lf
6e7b655600 Fixed a bad warp in ice dungeon.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11815 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-27 04:35:41 +00:00
L0ne_W0lf
966634766b * Rev. 11742 Renamed several dungeon warp scripts to match their map names, split up a couple files as well.
* Moved Ninja and Gunslinger warps to the proper file.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11742 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-17 03:37:39 +00:00
L0ne_W0lf
00426a29e1 Fixed the error sin the recent change to the Juperos warps.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11524 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-20 03:45:20 +00:00
L0ne_W0lf
179fa873a1 * Implemented proper Juperos Core event-driven access.
- Bug testing and further optimization required.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11523 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-20 02:02:55 +00:00
L0ne_W0lf
1607b50c59 Uncommented the ShowWarning and ShowDebug from rev. 11508, and cleaned up the warnings it produced.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11516 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-18 22:04:47 +00:00