41 Commits

Author SHA1 Message Date
Daegaladh
4bac434357 Revert "Fixed reentering Sealed Shrine instance on pre-re"
This reverts commit b51a87146f070753d8082e19642a0ca4fdb909e7.

*This caused an exploit also present in the official pre-re script. NPC dialog suggests it was never intended to reenter this instance after players leaver or die.
2020-09-14 12:24:32 +02:00
Daegaladh
634e1b3991
Fixed Sealed Shrine timer not being disabled (#5389) 2020-09-09 16:20:52 +02:00
Daegaladh
b51a87146f Fixed reentering Sealed Shrine instance on pre-re 2020-07-08 14:48:22 +02:00
Atemo
b7f38cf85e
Updated instance_warpall script side
Follow-up 21a5854c16 (#4298)

Thanks to @Indigo000
2019-08-14 15:48:15 +02:00
Atemo
78edf851a0
Suggestion of implementation of is_party_leader and is_guild_leader script commands. (#3617)
* Implemented is_party_leader and is_guild_leader script commands.

Thanks to @cydh !
2018-11-06 16:28:09 +01: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
b9a8ab722e Added an additional parameter to instance_enter (#1720)
Added an additional parameter to instance_enter

This allows easier usage for instances in IM_NONE, where a player will never be attached to the instance.
All you have to do is remember the created instance id and supply this command with it. That way you do not have to use any workaround like the following anymore:
warp instance_mapname( <mapname>, <instance id> ), <hardcoded enter x coordinate>, <hardcoded enter y coordinate>;

Added usage of the new constants in the existing scripts

Fixed default checks and null pointer output
Thanks to @Atemo
2016-12-10 12:38:57 +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
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
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
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
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
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
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
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
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
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
470a089218 * Have been working on this for months: Added Nidhoggr's Nest instance.
* Tweaks to how checkquest is used in orc's memory and sealed shrine.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14909 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-16 19:23:36 +00:00
L0ne_W0lf
d05e97b7a1 Tweaked the sealed shrine entrance NPCs. Hopefully the damn thing works now.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14905 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-13 18:01:07 +00:00
L0ne_W0lf
d68eeba638 Corrected incorrect bonuses relating to bAddMonsterDropItem/Group. (burgerport:4569)
Updated the IG_Ore, IG_Food, IG_Recovery and IG_Jewel item groups to official items/rates.
As a result bAddMonsterDropItemGroup now uses the highest rate in group as it's base rate.
Updated instances with more proper English, care of Resplendent.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14555 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-03 16:14:07 +00:00
L0ne_W0lf
f9f50d8c09 * Fixed Flavius only needing 1 person on either side to start.
* Updated the level 4 weapon quest to aegis conversion.
* Corrected a variable typo in the dts_warper script.
* Fixed a script hang in Hugel Temple Excavation quest.
* Fixed Cat Hand Agent checks, and mysterious rock#31.
* Corrected the two hour time limit for Sealed Shrine.
* Corrected a few other minor issues in Sealed Shrine.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14376 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-16 17:09:33 +00:00
Gepard
8ae23f01e2 Fixed KvM announcements showing during WoE:SE (bugreport:4335).
Added missing Lighthalzen NPC (bugreport:4319).
Fixed checkweights in Manuk & Splendide shops.
Fixed some condition checks in Moscovia quests.
Fixed some typos in Sealed Shrine and Manuk quests dialogues.
Added missing global var check in Yggdrasil Dungeon Floor 2 puzzle.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14360 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-07-03 11:29:29 +00:00
L0ne_W0lf
821713a26e * More bug fixing! Lots of little things, really.
- Corrected some condition errors in quests_veins. (bugreport:4088)
- Corrected specialeffects so they play on the right NPC. (bugreport:4090)
- Corrected an item ID in the reward NPC in monster races. (bugreport:4092)
- Corrected NPCs overlapping with quests in msg_boards (bugreport:4093)
- Corrected some of the given errors in the 2007_relay quest. (bugreport:4094)
- Corrected hideonnpc to disablenpc in ice dungeon 4 warps. (bugreport:4102)
- Commented out duplicate library curator in prontera city. (bugreport:4105)
- Corrected cutins not being removed on NPC end in sealed shrine. (bugreport:4117)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14262 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-03-13 05:12:15 +00:00
L0ne_W0lf
ec29baaa99 * Some bug fixing! Hoorah for me not feeling lazy!
- Fixed some issues related to the guild relay quests. (bugreport:3934)
- Disabled the warp back to moc_fild22b from mid_camp. (bugreport:3985)
- Loop in sealed shrine should disable all thorches. (bugreport:4044)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14258 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-03-03 21:28:22 +00:00
L0ne_W0lf
7475720d25 - Corrected a minor issue in sealed shrine, lock out should work now.* Added some 13.2 content, and more 13.1 content.
- Added "Otherworld language" quest.
- Added Cat Hand Trading NPCs for 13.2 maps.
- Added warps for Splendide and Manuk (town and field.)
- Added basic town NPCs for Manuk and Splendide.
- Added the guild dungeon SE events, though the pierre boxes do nothing.
- Corrected a minor issue in sealed shrine, lock out should work now.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14257 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-03-03 19:59:24 +00:00
L0ne_W0lf
6f91dfe451 Implemented the first version of Sealed Shrine.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14189 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-12-05 03:17:52 +00:00