65 Commits

Author SHA1 Message Date
Sapito Sucio
8be1f819d9
General typos (#8000)
* Fixes typos in several NPC.

Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
Co-authored-by: Aleos <aleos89@users.noreply.github.com>
2023-11-10 12:51:01 -05:00
Aleos
b804120246
Fixes Battlegrounds and atcommand reloadscript (#7002)
* Fixes #6175.
* Fixes an issue where the Battleground Queue System could become stuck if a GM uses atcommand reloadscript.
Thanks to @roSBK!
2022-06-02 20:38:26 -04:00
Everade
3b5c2ee127
Fixes wrong novice checks when entering battleground queues. (#6081)
Fixes #5965
2021-07-09 00:12:59 +02:00
Daegaladh
0e4b36dbb8
Fixed battlegrounds not resetting on reloadscript (#5255)
* Thanks to @aleos89
2020-08-19 18:05:52 +02:00
Aleos
14c388b401
Resolves some Battleground issues (#4725)
* Queue data will now be kept available until a Battleground event is over.
* Players can now join an active Battleground.
* Adds a more detailed queue state tracking feature.
* When a battleground is being prepared and not enough players click accept, stop the battleground from beginning.
* When a player logs off or leaves a queue they will now properly be removed from the queue.
* Cleans up MinPlayers and MaxPlayers parsing to not accept values less than 1.
* Resolves players not being able to join an active battleground (up to MaxPlayers) unless someone quit early.
* Adds a team size priority check to avoid adding more players to a larger team.
* Fixes battlechat messages.
* Adds a battle_config to disable the ability for players on maps with MF_NOWARP to join Battlegrounds.
* Adds a new optional ActiveEvent label to the database.
* Fixes a typo in Flavius 2 during unbooking process.
* Cleans up the behavior of the Battle Therapists to use areapercentheal and areawarp.
* Fixes KVM score not properly set on the first Battleground.
* Fixes the global timer checks not ending the main timers on Flavius and Tierra Gorge.
* Added an extra bg_reserve on global timer checks in case someone tries to join the battleground just before it's ended.
* Fixed OnReadyCheck being called on global timer checks, causing the battlegrounds to start when there were no players on the map.
* Fixed a bug on Tierra Gorge where multiple barricade walls could be stacked.
* Fixes Croix also receiving 9 badges when Guillaume wins.
* Adjusts StartDelay default to 0.
* Add a database setting to give the ability to enable or disable joining as an individual, party, or guild.
* Add a database setting to restrict jobs from entering Battlegrounds.
* Better documents script commands bg_reserve and bg_unbook.
* Other fixes and cleanups.
Thanks to @roSBK and @Daegaladh, @admkakaroto, @Artuvazro, and @Atemo!
Co-authored-by: Daegaladh <Daegaladh@users.noreply.github.com>
Co-authored-by: Atemo <Atemo@users.noreply.github.com>
2020-05-25 12:39:36 -04:00
Aleos
1fc4b8de20
Battleground Queue fixes (#4648)
* Fixes #4644.
* Initialize all battleground queues at startup to reduce overhead of creation/deletion during live server.
* Removes lots of duplicate code between team checks.
* Adds missing checks for script commands bg_leave and bg_desert to only warp players out using the Battleground Queue System.
* Adds documentation for script commands bg_leave and bg_desert to state players will be warped out after when using the Battleground Queue System.
* Optimizes join logic to add new players to the end of the queue rather than the front.
* Cleans up the client messages so certain responses are cleared when they need to be.
Thanks to @Balferian and @Lemongrass3110!
2020-02-20 22:25:14 -05:00
Aleos
2931c00bd4
Implemented the Battleground Queue System (#3995)
* Fixes #1310.
* Added a battle config which allows toggling of the Battleground Queue client feature and also toggles between the modes of scripts.
* Added script commands bg_reserve, bg_unbook, and bg_desert.
* Removed old custom Battleground scripts.
Thanks to @Lemongrass3110, @Locien, @secretdataz, @InusualZ, @Normynator, @Atemo, @iubantot, @admkakaroto, and @noobzter003!
2020-02-12 08:26:59 -05:00
Atemo
cc11869a93
Corrected KVM Logistic Officer item ID (#4014)
* The npc traded the wrong item to point
2019-03-15 15:28:28 +01:00
Aleos
26720f041a
Updated script command getmapxy parameters (#3890)
* Fixes #3100.
* Script command getmapxy will now allow integer values for the search value.
* Deprecated UNITTYPE constants as they were replaced by BL.
* Defaulted BL_PC as the target for script command getmapxpy.
* Updated script command getunittype return value to return BL constants.
* Updated scripts to new BL constants.
Thanks to @pajodex's suggestion and @Lemongrass3110!
2019-01-30 17:10:33 -05:00
zackdreaver
91667a9a11 Update Renewal and Pre-renewal Morocc NPCs (#2977)
Fixes #3392 

Thanks to @zackdreaver, @AzarthMZintos and @Lemongrass3110
2018-08-17 10:27:26 +02:00
Atemo
3d8104d7fb
Suggestion: checkwall script command (#3393)
* Added checkwall script command
- Included the checkwall in npc folder
2018-08-14 20:58:49 +02:00
Lemongrass3110
d0ca637ddd Fixed vip_status command (#2184)
Fixed different return types for the same function call
Also introduced constants for better function usage.

Fixes #2183
Thanks to @anacondaqq
2017-06-20 19:22:46 +02: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
Lemongrass3110
cdc0527b71 Converted some scripts to warps (#1947)
Credits to @Atemo!
2017-04-24 23:54:43 +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
Jittapan Pluemsumran
2f9d44c3b1
Changed Job_SuperNovice to Job_Super_Novice in scripts to match source-side constant. 2016-07-08 14:32:10 +07:00
aleos89
0a77835029 Unit Controller Updates
* Added missing UMOB_CANMOVETICK option.
* Restructured script command getunittype return values to match the order of script command getmapxy to allow for more universal usage.
* Created constants for script commands getmapxy and getunittype.
* Updated NPCs using script command getmapxy to use the new constant values.
* Updated Battleground NPCs to use constant value for script command setunitdata.
2016-02-04 10:47:16 -05:00
Atemo
3a45dd97f9 Another clean-up 2015-12-09 23:09:17 +01:00
Atemo
63b076ef96 Fixed issue #614 blame 1f147f207d0f323cd6dcfe6f8fc36ea99fdd5fa7
Fixed typo in re/mobs/academy
2015-09-02 22:34:49 +02:00
aleos89
176f3daa93 Follow up to ec4f1f8
* Adjusted the *unitdata parameter (changed in 2dc38e7) when making Guardians immune to attacks.
2015-03-26 13:02:26 -04:00
aleos89
f6df76bb15 Follow up to ec4f1f8
- Fixed script errors.
2015-03-19 21:26:49 -04:00
aleos89
ec4f1f8f80 Fixed #231 - Flavius Battleground Crystals can no longer be attacked while Guardians are still alive. Thanks to @cydh. 2015-03-19 21:02:59 -04:00
Capuche
1f147f207d Quick fix in kvm battleground
Signed-off-by: Capuche <capucrath@gmail.com>
2015-01-26 18:40:52 +01:00
Jeric
156c5c848d Minor fix on BG script.
Based on this report.
http://rathena.org/board/tracker/issue-8813-minor-warning-on-battleground-script/
2014-03-24 10:15:08 +08:00
Euphy
cad0a57865 Replaced 'getserverdef' command with 'script_hardcoded_constants' function in source. These constants can now be directly accessed in scripts. (Hercules 950e3eb)
- Relocated 'Option_*' constants from 'db/const.txt' to source; added OPTION_COSTUME compound. (Hercules a5728fd)
- Added MAX_CHAT_USERS define. (Hercules 950e3eb)
- Follow-up ca9642a: applied 'Loc' changes to Pre-Renewal database.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-03-01 15:42:49 -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
Euphy
d2ee0dd55f * Implemented VIP system in many official scripts.
- VIP players gain two more badges after Battleground matches.
- VIP players pay ten times less for transportation to Brasilis and Dewata.
- VIP players get free buffs and mercenary rentals in the Eden Group Headquarters. (iRO only, disabled)
- Non-VIP players must use a Reset Stone to begin the third job quests.
- Non-VIP players must have a Marriage Covenant to get married.
- Non-VIP players pay double for Kafra and Cool Event Corp. Teleport Services.
- Non-VIP players pay considerably more for refining equipment.
- Non-VIP players gain less quest reward items in Port Malaya quests.
- Non-VIP players gain less EXP rewards in Brasilis quests.
- Non-VIP players cannot access all towns in Acolyte Warpers script. (iRO only, disabled)
- A Reset Stone is required for Bossnia entry.
Note that official servers run different VIP/premium systems; the changes above are based on euRO, unless otherwise stated.

* Other script changes:
- Adding Marriage Covenant item in marriage script.
- Fixed some EXP values in Brasilis quests.
- Minor updates to Kafra functions.
- Turned Cool Event Corp. scripts into a basic function.
- Turned Battleground badge rewards into basic functions.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2013-11-18 23:54:17 -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
euphyy
fdd0fd1d72 * Standardized label names and converted all labels to Pascal case. (temp. fix for bugreport:6988)
* Many fixes to Izlude Arena scripts.
* Other misc. standardization.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17410 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-07-10 07:25:44 +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
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
3671aa4a13 * Optimized "Erundek" NPC (battleground\bg_common.txt)
* More general cleaning...

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16329 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-23 16:16:08 +00:00
brianluau
03fe187f95 - Added missing BB and VB in Battlegrounds Badge Exchanger menu. (bugreport:5519)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15804 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-27 18:31:07 +00:00
masao87
3dd81371f8 - Follow up r15281.
- Removed MaxLvl check in BG Waitingrooms.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15401 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-06 20:51:07 +00:00
xantara
7bba350eb2 ` Updated Refiners and Repairers
- Updated several NPC names and locations.
- Added WoE map Refiners.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15282 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-26 08:14:48 +00:00
mercurial123
2c14355535 - Fixed bugreport:4567. (Taekwons can hit the crystal with whirlwind Kick while the guardians are still alive.)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15281 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-26 06:49:53 +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
Kisuka
bf12d754cc - Completed L0ne's 2007 request for 'waitingroom' to support required zeny and level.
- Updated NPC files which required the waitingroom update.
- Added Poring War script.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14765 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-04-05 06:00:20 +00:00
ai4rei
d94a5ff6d0 * Fixed battleground kvm02 and kvm03 scripts referring to NPCs in the custom battleground kvm (bugreport:4812, since r14369).
- Fixed kvm02 printing different amount of points, than it actually gives.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14750 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-03-20 20:10:33 +00:00
L0ne_W0lf
6e837a5214 * Added bard/dancer songs and duets to the nodispell list. (bugreport:4411)
* Applied Ai4rei's patch for the skill WE_CALLPARTNER (bugreport:4437)
* Lots of updates to monster stats/drops, all fairly minor.
* Updated the price and weight of a handful of etc items.
* Removed drops for quest-spawned Satan Morroc. (bugreport:4425)
* Changed weight on novice consumable items to 0 (bugreport:4442)
* Updated Sage quest skill quest with the file curtosy of 5511.
* Fixed the Pink Crystal being named Blue Crystal in Flavius.
* Touched up the archer tutorial, and phantasmic arrow quests.
* Fixed Turbo Track records for 8 and 16 normal saving as expert. (bugreport:4433)
* Corrected the positions for the arug castle 04 exterior flags. (bugreport:4436)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14409 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-09-18 17:15:37 +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
brianluau
239a74fc2c - Fixed duration of Box_Of_Sunlight. (bugreport:4408)
- Fixed some small typos in KVM scripts. (bugreport:4403)
- Fixed @refresh leaving you stuck if you had a chat window open.
- Changed @refresh to also send your facing direction.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14394 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-26 14:27:19 +00:00
L0ne_W0lf
7869596502 Fixed silly copy paste errors in Tierra Gorge entrance npcs. (bugreport:4401)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14391 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-21 16:01:12 +00:00
L0ne_W0lf
271c2201f2 * Fixed wrong events being called for flavius02 BG waiting rooms. (bugreport:4395)
* Fixed the setwalls in Tierra gorge, again. Removed extra mapflags.
* Moved overlapping guild flags outside arug_cas05 to proper points.
* Fixed kRO Name for Women's Bundle. (bugreport:4398)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14385 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-20 15:53:35 +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
L0ne_W0lf
1c1353e59e * Fixed error in bg_common, and duplicate warp names.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14375 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-14 16:11:50 +00:00
L0ne_W0lf
dc0977ed37 * Quest log kill count now updated properly. (Added from topic 253813)
* More battleground editing, and some bug fixes.
- * ALL BATTLEGROUNDS ARE NOW ACTIVE BY DEFAULT. PLEASE CONTINUE TESTING *
- Rewrote the Badge Exchange NPC in bg_common.txt, is official now.
- Other changes to the bg_common folder, including disabled GM NPC.
- Completely rewrote Flavius for the most part, from ground up.
- Moved old Flavius battlegrounds to /custom/battleground folder.
- Restored original bg_common, and KVM to /custom/battleground
- Fixed wall bugs in Tierra Gorge, and added an oninit to the timers.
- Other minor tweaks to both Tierra Gorge and KVM scripts.
- Fixed the pseudo-cooldown on KVM not working properly, I hope.
- Added global time2str function which will be used later in Endless tower.
* Applied Epoque's mapflag clean up, which removes flags from scripts.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14374 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-14 16:06:23 +00:00
L0ne_W0lf
a9a0d68dca * Documented Battleground commands with as much information as I've got.
* Another rather large overhaul of the battlegrounds.
- in bg_common.txt, stripped out several more NPCs, split them off.
- Most of the NPCs in bg_common.txt are now official Aegis versions.
- Completely rewrote Tierra Gorge for the most part, from ground up.
- Moved old Tierra Valley battlegrounds to /custom/battleground.
- Added Tierra scripts, Flavius, and bg_common to scripts_athena.
- Tierra, KvM, and bg_common scripts are now enabled by default.
- To use custom Flavius, you must enable /flavius/flavius_enter.txt
- * TIERRA GORGE AND KVM BOTH REQUIRE TESTING *


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14373 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-11 18:17:26 +00:00