41 Commits

Author SHA1 Message Date
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
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
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
Atemo
1b303d32ab Fixed issue #648 2015-09-27 20:36:28 +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
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
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
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
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
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
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
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
Gepard
c8bff5a3be * Endless Tower fixes:
- Added missing end's to prevent accidental disabling of warps between floors. (bugreport:4623)
- Added missing end's to prevent infinite mobspawn (bugreport:4540)
- Commented out remaining GM-only NPCs.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14747 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-03-17 16:04:34 +00:00
L0ne_W0lf
25e986bc8a - Changed some duplicates so they use a floating NPC as their original. (bugreport:1395)
- Fixed the NPC looking for missing label in the Cursed Spirit quest. (bugreport:4654)
- Applied Uno's fix for the cooldown condition in Endless Tower. (bugreport:4677)
- Removed level requirement for the Viens Stone gathering quest. (bugreport:4678)
- Added the missing restricted skills to zone 6 for Endless Tower. (bugreport:4707)
  It's worth noting how much I hate the system for restricting skills per zone.
- Fixed Cat Hand warp service warping players to all warp options. (bugreport:4709)
- Fixed floor 75 warp in endless tower disabling the wrong warp. (bugreport:4711)
- Added a condition for Chungwolmang to only delete items if a certain ID is specified. (bugreport:4719)
- Corrected a mobcount specifying the wrong NPC in the Moscovia Ship quest. (bugreport:4736)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14697 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-02-06 22:10:54 +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
e4ae836f44 Updated some more cash shop boxes to use rentitem instead of getitem.
Added mercenary skills for Mimic, Disguise, Alice, Doppelganger, and Egnigem.
Removed duplicate NPCs in Lighthalzen and Morroc. (bugreport:4555)
Corrected typo (Sit -> Suit) in enhcant_arm NPC. (bugreport:4586)
Corrected a typo in the christmas_2008 event. (bugreport:4600)
Changed which White Lady spawns in endless tower. (bugreport:4601)
Also added Quest Log Entries to Endless Tower, please test.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14552 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-03 02:24:34 +00:00
L0ne_W0lf
4ebd58b32d * Some more Endless tower bugfixes.
- Fixed some copy/paste errors (1@orc -> 1@tower)
- No longer resets entrance time when re-entering.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14407 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-09-13 14:31:36 +00:00
L0ne_W0lf
a41b86bfdc * Implemented Icescope's fix for devotion, reflect damage is no longer absorbed by the devoter. (bugreport:3189)
* As a folow up to r14301, increased MAX_REG_NUM to 256, to prevent possible data loss.
* Touched up the endless tower script slightly.
- Added ends to several NPCs which would allow you to restart timers.
- Added some missing stopnpctimers to npcs. (bugreport:4418)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14400 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-09-06 19:15:17 +00:00
L0ne_W0lf
7fb5455c0a Removed a disablenpc from #102FShadowDust1. (bugreport:4415)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14397 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-28 17:06:14 +00:00
L0ne_W0lf
aa9990ec16 * instance_npcname will now error if the NPC being looked up is not found, care of ramsey.
* delitem/2 will now send the close button when failing to find all neccecary items to delete.
- Still do to, items should not be deleted as-found, and should be deleted once counted
and in the event of delitem failure, nothing should be consumed. This is a design flaw
in eathena, and should be fixed as soon as possible.
* Implemented the Endless Tower instance.
* Updated announces and dialogs in KVM.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14395 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-26 22:47:28 +00:00