76 Commits

Author SHA1 Message Date
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
82f5908bb5 Correct typo follow up 109b30dd5184e06806253e692fa0d893b24282e5 2016-07-05 20:50:20 +02:00
Atemo
109b30dd51 Fixed EndlessTower.txt : officially a player can't enter in endless tower if he has changed party and he already entered in the instance with his previous party. Thanks to RagEmu/Renewal@73ec00faa5
Fixed potential quest warning in SealedShrine.txt and quests/quests_13_1.txt
2016-07-03 02:06:52 +02:00
aleos89
161a4c01c9 Small adjustments for the instance system
* Follow up to 32c829d.
* Added a missing break on guild type instance creation.
- Thanks to @Canoe!
* Added instance name back to script command instance_enter.
- This will present the proper error message when trying to enter another instance.
2016-05-26 09:06:49 -04:00
aleos89
c591586f2b Adjusted instance script's instance_enter to new format
* Follow up to c97be60.
* No longer requires instance name.
2016-05-23 14:20:55 -04:00
aleos89
9c89b0e06e Revert "Adjusted instance scripts to new format"
This reverts commit 8f7d2208a972d2bee603364a6069bf1e8127e59d.
2016-05-23 12:56:11 -04:00
aleos89
8f7d2208a9 Adjusted instance scripts to new format
* Follow up to c97be60.
* Adjusted script command instance_create to include owner ID.
2016-05-14 12:01:22 -04:00
Lemongrass3110
eec88365e1 Merged HerculesWS/Hercules@5b4d1ac
Fixes two bugs in sealed shrine which existed since the instance system was rewritten in cd95d1c.

Thanks to @Ancyker and @MishimaHaruna.
2015-12-20 12:14:53 +01:00
Atemo
1b303d32ab Fixed issue #648 2015-09-27 20:36:28 +02:00
Atemo
031c522c8a - Fixed F_CashSiegeTele typo in item_db.
- Moved VIP_Third_Class function from other/CashShop_Functions into other/re/CashShop_Functions (only used in re folder).
- Fixed a mistake in quests/quests_nameless.txt blame me  36f337ea41a876ef471bfbb78128e35fa0d9aa56
- re/quest/quests_eclage clean-up and bug fix

Signed-off-by: Atemo <capucrath@gmail.com>
2015-08-04 15:16:56 +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
97687ca10c Global_Function updates.
* Added the following functions:
  - "F_GetPlural" (returns plural of noun) / "F_InsertPlural" (returns plural if arg != 1)  [credits: EnglishClub for formation rules]
  - "F_InsertArticle" (returns 'a' or 'an' preceding word)
  - "F_InsertComma" (formats number with commas)
  - "F_GetNumSuffix" (formats number with '-st', '-nd', '-rd', or '-th' suffix)
* Added and removed new functions where necessary. (incomplete)
* Added new types to "F_GetArmorType" function, and weapons will now pass to "F_GetWeaponType".
* Reformatted comments.

Other changes:
* Removed some garbage text from scripts.
* Slight edits to custom warper script.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-03 20:13:44 -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
5ab4d5ea90 * Script updates:
- Updated Nameless Island quests and added questlog support in quests_nameless and quests_prontera. (fixes bugreport:7992)
- Updated "God Item Creation" scripts to their latest versions: seals roll at 25/50 instead of 50/100 in Renewal.
- Updated Soul Linker job quest with new checks.
- Fixed an untranslated Manuk NPC.
- Some follow-ups to previous commits.

* GM Management System:
- Enabled all official GM Management NPCs and wrote a function to control their usage.
- Implemented some missing GM Management NPCs (still incomplete).

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-25 20:56:46 -04:00
Euphy
d32e3c89ae * Renewal Izlude updates:
- Updated warp scripts and removed disabled warps.
- Implemented Renewal Hypnotist, which resets stats and skills; moved old file to Pre-Renewal path.
- Moved and added Bullet Dealer and Magazine Dealer duplicates. (bugreport:6410)
- Moved Dorian (quests_nameless) NPC to Pre-Renewal/Renewal paths and shifted Cuskoal (izlude) RE NPC.
- Corrected some coordinates and NPC facing directions.

* Updated all 3rd_trader scripts:
- Players can now purchase multiple items at once.
- Added many new Point Merchants.
- Moved Poison Herb Merchant in Morroc out of a wall (temp. fix).

* Other script updates:
- Added Eden Group Kafra (storage only).
- Added some missing announcements in Endless Tower.
- Added exit warp scripts to three 2nd job quests (Renewal only).
- Added official Morroc coordinates in Warlock job quest. (follow-up r17224)
- Minor updates to Comodo Gambling script.
- Fixed a Zeny bug in Payon town script, and changed some 'close' commands to 'end'. (bugreport:7893)
- Renamed npc/pre-re/kafras/kafras_izl.txt to .../kafras.txt.

Signed-off-by: Euphy <euphy@rathena.org>
2013-07-25 02:32:30 -04:00
euphyy
78eb7d3793 * Added documentation for the instance system rewrite and modified some return values. (follow-up r17386)
* Gathered remaining dialogues for Pyramids Nightmare script. (follow-up r17382)
* Added missing items to "Guardian of Power" NPC from Mora Enchants.
* Updated Hunting Missions script to v1.3a, which adds some mission reset options.
* Added newline at end of files.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17387 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-06-26 20:36:30 +00:00
akinari1087
cd95d1cada Instance System Rewrite!
- Removed a bunch of script commands and replaced others
- Rewrote the way instances are created
- Added Instance Database files
- Fixed and rewrote instances scripts (Euphy)
- Added reloading to instancedb
- Instances are now persistent through @reloadscript
- Special thanks to Auriga (emulator) for the base of their system
- Special thanks to Euphy for doing major testing and script rewrites for this
- Special thanks to Lemongrass and Lighta for some help along the way

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17386 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-06-26 17:33:59 +00:00
euphyy
91475315b8 * Implemented HD ore refiners "Mighty Hammer" and "Basta" (hd_refiner). (bugreport:6577)
* Fixed coordinates of "Suhnbi" (advanced_refiner).
* Merged Hercules b17e2b7 (adapted):
-- Implemented official Port Malaya warps.
-- Fixed bug where players could not take the "Ring of the Wise King" and "Finding a Fairy" quests using the Cat Hand Agent warper inside Eden Group Headquarters.
-- Fixed bug where players could not complete the "Guardian of Yggdrasil" quest. (bugreport:6855)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17337 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-05-28 06:36:55 +00:00
euphyy
722560f551 * Updated Endless Tower instance to latest official script.
-- String "Floor" changed to "Level".
-- Warp portals open after a 5 second delay.
* Renewal item database fixes (bugreport:7301, bugreport:7308).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17165 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-02-27 20:47:32 +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
c4ba335c08 - Fixed bugreport:6747, removed extra setquest (quest id:3040). (npc/instances/SealedShrine.txt)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16859 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-05 07:02:17 +00:00
j-tkay
0e341c9e5b - Reverted to r16796. (npc/instances/EndlessTower.txt)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16797 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-24 20:18:47 +00:00
j-tkay
c4f1ee6fe0 - Fixed Endless Tower OnTouch label typo. (npc/instances/EndlessTower.txt)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16796 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-24 19:28:26 +00:00
j-tkay
9ddcd7010f - Fixed bugreport:6658, quest being removed before the 12 hours cool down.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16774 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-10 23:43:10 +00:00
euphyy
f5cd388d85 * Some optimization of Sealed Shrine instance (npc\instances\SealedShrine.txt)
* Updated 'waitingroom' documentation, bugreport:6610 (doc\script_commands.txt)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16740 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-03 16:50:10 +00:00
euphyy
2adc9cdf28 * Follow-up r16726, more standardization on docs.
* Replaced and added dividers in many script files with one standard divider.
* Other misc. cleaning...

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16727 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-01 00:37:36 +00:00
j-tkay
0d6a1d9c58 - Fixed bugreport:6460 where players can enter instances without generating it. (EndlessTower.txt & SealedShrine.txt)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16628 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-13 12:03:21 +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
383dcfaf16 * Fixed a minor label typo in "Endless Tower" script, bugreport:5973 (instances\EndlessTower.txt)
* Fixed reset on Baby job change in custom "Job Master", bugreport:6101 (custom\jobmaster.txt)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16347 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-25 20:46:31 +00:00
euphyy
0c62fa58c0 * Some cleaning of Thanatos Tower quest script (quests\thana_quest.txt)
* Minor cleaning of Nidhoggr's Nest instance script (instances\NydhoggsNest.txt)
* Fixed warp to abyss_01, as per bugreport:6002 (custom\warper.txt)
* Fixed View ID for #18613 (bugreport:6003)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16289 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-13 18:32:49 +00:00
tr0n93
2083c0552c - Fixed 'instance_check_party' (bugreport:5948)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16260 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-10 13:59:48 +00:00
tr0n93
03116b1b21 - Fixed a bug in security check
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16159 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-27 23:59:40 +00:00
masao87
aa162958b4 - Added an security check for each player which is entering an instance to make sure that the cool down time can't be bypassed which would lead to abuses of the according instance dungeons. bugreport:5768
- Some minor additions to the Magic Gear renter NPC.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16158 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-27 23:53:46 +00:00
masao87
fe82161d32 - Some minor improvements in the instance Scripts.
- Some minor improvements in the Eden Group NPC's.
- Fixed typo in Wanderer Pet Food NPC. bugreport:5823

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16151 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-26 14:30:12 +00:00
masao87
5b9994b9ec - Added 'instance_check_party' command to all instance scripts for proper checking if the invoking party meets the requirements to join the Memorial Dungeon. Thanks to malufett for creating the command.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16135 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-21 15:02:41 +00:00
tr0n93
3acd50f74c Fixed (bugreport:5758). Quests should be checked correctly now.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16133 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-21 11:42:28 +00:00
shennetsind
e5c38902de follow up r16115, accidentally committed debug thing
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16116 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-17 06:02:11 +00:00
shennetsind
df2f149052 Fixed bugreport:5757 Added missing Sorcerer Insignias, Credits to brAthena
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16115 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-17 06:01:15 +00:00
masao87
47dc26c6cb - Follow up r16107 .
* Fixed the additional check for Players in a Party.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16111 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-13 21:37:44 +00:00
masao87
bf1f8a237f - Added an extra check to all instance script if there are actually 2 Players online in the Party to be able to enter the Dungeon. bugreport:3970
- Added a few new statuses to not disappear upon death. bugreport:2652


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16107 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-12 20:49:09 +00:00
jmanfffreak
d586c11059 Disabled a debug NPC in the Endless Tower script. I don't see any mention of this NPC in any guide I've seen...
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15464 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-15 21:58:31 +00:00
masao87
b2324030b6 - Lot's of Bugreport fixes and stuff.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15352 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-02 19:37:08 +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
cc9ee1697e - Fixed some typos in quest_13 files. (bugreport:5023)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15123 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-14 23:22:03 +00:00
script-z3r0
659c792a99 Fixed (bugreport:4983)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15077 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-12 18:55:26 +00:00
jmanfffreak
1752b766c9 Corrected an event mob being summoned in Endless tower (bugreport:4942)
Added @go locations for new maps (not official, but they're there) (bugreport:4457)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15070 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-12 02:33:14 +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
df757a04ed - Fixed a typo in Nidhoggr's Nest. (bugreport:5041)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14952 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-09-03 21:49:18 +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