47 Commits

Author SHA1 Message Date
Lemongrass3110
016d15b79a
Unified infinite tick usage (#3755)
Introducing a new constant INFINITE_TICK
Changed current usages in items, npcs and source to use the new and correct constant.
Replaced some invalid usages of INVALID_TIMER and replaced them with the new constant.
2018-12-18 17:46:56 +01:00
vykimo
dbf2f23253 Prevent duplicate npc (#3682)
* Fixes #3677.
* Hide second "chatting" NPC at initialization.
Thanks to @vykimo!
2018-11-19 10:19:11 -05:00
Atemo
fce5919bce
Corrected npc's name (warnings from emotion command) (#3388) 2018-08-05 00:00:11 +02:00
Lemongrass3110
a16fe436e3
Disabled achievement NPCs if feature is disabled (#2986)
Fixes #2983

Thanks to @zackdreaver
2018-03-15 07:27:08 +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
anity99
c71f105083 Fix typo in achievements.txt (#2433)
* Resolves some typos in the AG_ADVENTURE script resulting in some not being able to be completed.
Thanks to @anity99!
2017-09-20 14:39:23 -04:00
Aleos
7f5411da07 Initial release of the Achievement System (#2044)
* Information based on kRO patch notes.
- http://ro.gnjoy.com/news/update/View.asp?seq=163&curpage=1
* Includes Title System which is integrated into the Achievement System.
* Includes RODEX integration for rewards.
* Added new atcommand reloadachievementdb.
* Added new script commands achievementinfo, achievementadd, achievementremove, achievementcomplete, and achievementexists.
Thanks to @Lux-uri, @RagnarokNova, @Lemongrass3110, and @Tokeiburu for their help!
2017-07-27 09:33:03 -04:00
Lemongrass3110
45e91e2a3a Added clan emblems to the NPCs (#2221)
* Added clan emblems to the NPCs
* Partial merge of/based on idathena/trunk@1f84c5d
Thanks to @exneval
2017-06-30 12:31:06 -04: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
1e1d7e54f0 Merged Faceworm Instance from idathena https://github.com/idathena/tr… (#1889)
* Merged Faceworm Instance from idathena 20f71d8c62

Credits to @exneval !
2017-05-09 13:34:19 +02:00
Lemongrass3110
2043c95e66 Refactored hardcoded npc event names (#1767)
While refactoring those events the following other changes were made:

Introducing OnInstanceDestroy event. This event can be used to hook script code right in front of the instance destruction. This can be useful if you have any stored references to an instance id for example.

The script command cmdothernpc will now check if the target event exists and report failures. Therefore it now returns true or false.

All agit(FE,SE,TE) start and end commands from atcommand and script commands have been merged in their respective guild function which now returns a bool value of true for successful actions and false if it did not succeed(if the specific WoE was [not] running).

All global triggered events with mapserver status output now call the same function and therefore have the same mapserver output(including their respective event name of course).

Renamed a few events in the script configuration to match the other names

Added constants for months and weekdays

Additionally added constants for gettime types to make it easier to read.

Replaced all existing usages I found with their proper new syntax or better fitting functions.
2017-01-10 22:58:04 +01:00
Lemongrass3110
9040613fa6 Added missing empty newlines to a lot of files 2016-11-23 13:54:45 +01:00
Lemongrass3110
ecc8cf9f0b Initial release of the clan system
Thanks to @cydh, @RagnarokNova and @aleos89 for their help.
2016-11-16 15:36:08 +01:00
Atemo
14628e2d4d Corrected function name in the comment 2016-09-29 20:15:30 +02:00
Lemongrass3110
30647011e2 Small cleanups 2016-09-29 15:04:35 +02:00
Lemongrass3110
644e294699 Merge branch 'master' into woe_te-restrictions
# Conflicts:
#	npc/re/mapflag/nobranch.txt
#	npc/re/mapflag/nomemo.txt
#	npc/re/mapflag/noteleport.txt
#	npc/re/scripts_athena.conf
#	src/map/atcommand.c
#	src/map/map.h
#	src/map/script.c
#	src/map/script_constants.h
2016-09-29 08:13:31 +02:00
Jittapan Pluemsumran
64e15932aa
Cleaned up Dimensional Gap NPCs 2016-09-12 20:55:43 +07:00
RagnarokNova
7d0c7d8b24
Initial Release of Dimensional Gap (dali) NPCs 2016-09-08 22:54:15 +07:00
Cydh Ramdh
8805e7e1d8 Merge branch 'master' into woe_te-restrictions 2016-08-27 07:04:41 +07:00
Lemongrass3110
d017e24cd2 Adjusted some scripts to the new syntax
Follow up to fd48238
Thanks to @Everade and @Jeybla for reporting this problem in #1468
2016-08-05 00:28:23 +02:00
Atemo
b3d150c3a5 Merge branch 'master' into woe_te-restrictions 2016-04-04 20:22:25 +02:00
Atemo
db53e580af Typo update 2016-02-29 20:06:24 +01:00
Atemo
883b5cc919 Little update 2016-02-24 04:45:47 +01:00
Atemo
befc6123be Fixes some bug in npc/cities folder and corrected syntax
Corrected some npc view
2016-02-11 02:06:10 +01: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
Capuche
dd3e7e1710 Corrected typo in adven_boards.txt thanks grammatic@aleos89
Update lvl4_weapon_quest.txt, Hercules 169b3faae19e23a303a094fe26e181a8c1b1c6c7
Fix delitem bug in Ep13.1 quest. Hercules 9d1853aebd3ff34ed7869a3b1188943624078b8e
Corrected Tree Roots Location Hercules ca9cd51e683d39c8a7f099a46747ff166d632230

Signed-off-by: Capuche <capucrath@gmail.com>
2015-04-06 23:24:12 +02:00
Capuche
1e8aa4bdc4 Added adven_boards.txt dungeon signposts
Signed-off-by: Capuche <capucrath@gmail.com>
2015-03-28 00:31:36 +01:00
Cydh Ramdh
5ce80555a7 Corrected guid implementation of item package in 51074a0
* GUID
  - `guid` field in official PackageItem.lua supposed to make item will be separated even item is stackable item.
  - Currently `guid` usage is using item Unique ID that generated when item with GUID flag is appear from package.
  - Some item containers in official PackageItem.lua are also separated, not stacked when player obtain it. Example when using atcommand "@item Xmas_Bless". For current implementation, the items are flagged in item_flag.txt (db folder) with flag 4.
  - `isNamed` field in item group is replaced by `GUID` and move the `isNamed` as new additional field. See doc/item_group.txt or db/re/item_package.txt.
* NPC:
  - Enabled npc/re/other/item_merge.txt and it's now usable.
* Script Command:
  - Added `mergeitem` to merge separated items in player's inventory. See doc/script_commands.txt.
* Misc:
  - Changed how to broadcast the item that obtained from package with flag `isAnnounced` to intif_broadcast, so it will be announced to all connected map-servers.
  - Added some items that flagged as 'item group container' in db/re/item_flag.txt

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-11-30 13:52:52 +07:00
Capuche
ec485afe4c Bug fixes and clean-up :
-- Miscs follow up af266777402e07428388e80db35544fbb9bcbe8e
-- Another clean-up in comodo_gambling.txt (thx @SkittleNugget)
-- Replaced occurrence of PcName and clean-up in tu_magician01.txt

Signed-off-by: Capuche <capucrath@gmail.com>
2014-07-13 21:48:09 +02:00
Capuche
af26677740 Bugfix and clean-up
- Added NPC const
- Added checkdragon() in F_CashReset
- Clean-up books.txt, fortune.txt, card_trader.txt, 3rd_trader.txt, stone_change.txt, quests_brasilis.txt
- Minor fix about Weight in comodo_gambling.txt
- Change to F_GM_NPC function in Mercenary Guild Switch follow up bdab851129ceee57a38ccc9d819b42011ef19fb7
- added Mercenary Switch in gm_npcs.txt list
- change to common green maiden in 2010 Headgear Quests

Signed-off-by: Capuche <capucrath@gmail.com>
2014-07-04 02:14:30 +02:00
Capuche
bdab851129 - Added mercenary guild switch npc from aegis
- Fixed a bug to rent a mercenary in izlude duplicate (it gave a wrong mercenary)
- added a missing delitem in cupet.txt (forgot to delete the 2nd item)
- change the rand part in Mysterious Documents npc in magic_books.txt to match aegis
- little clean up in quests/ninja_quests.txt
- replace the npc id to the constant in theses files

Signed-off-by: Capuche <capucrath@gmail.com>
2014-06-30 17:07:05 +02:00
Euphy
944e7d041f Minor bug fixes.
- Changed 'bIgnoreDefRate' to 'bIgnoreDefRaceRate' in Pre-Renewal item database. (bugreport:8674)
http://rathena.org/board/tracker/issue-8674-item-bonus-error-or-not/
- Added missing 'bFixedCastrate' bonus for item 1832. (bugreport:8422)
http://rathena.org/board/tracker/issue-8422-vellum-claw-not-giving-insta-cast-on-10/
- Clarified 'getgmlevel()' and 'getgroupid()' functions in script documentation. (bugreport:8586, pull #46)
http://rathena.org/board/tracker/issue-8586-script-commandstxt-doc-getgroupid/
- Added Buying Store tables to source documentation.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-02-18 19:09:37 -05:00
Euphy
364c7edb90 Added official names as comments in many newer scripts.
Signed-off-by: Euphy <euphy@rathena.org>
2014-01-22 15:59:21 -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
02d67498b1 * Script updates.
- Added Renewal features to PVP script and removed duplicate warps.
- Added "Acolyte Warpers" script (Keiki and Isalei), disabled since it may be an event script.
- Added "Mergician" NPC, but it currently doesn't function and is disabled.
- Moved "Stone Change" script from merchants/ to other/.
- Follow-up 8acde7e: further bug fixes.

Signed-off-by: Euphy <euphy@rathena.org>
2013-09-02 00:18:49 -04:00
Euphy
cbdbda1f0e * Script updates.
- Added Malangdo Card Separation NPC "Richard", who refines weapons and shields.
- Added new "Job Repair" script, which fixes potential errors with job data (RE).
- Marriage script changes:
-- Permanent global variables are now temporary.
-- Added GM NPCs (The King of Midgart, Divorce Staff, Remarry Staff), commented. (bugreport:6795)
- Added some missing [Official Conversion] comments.

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-14 02:19:57 -04:00
Euphy
0202126185 * Script updates.
- Added questlog support for Amatsu, Ayothaya, Hugel, Louyang, Lighthalzen, Niflheim, and Rachel quests.
- Updated Turbo Track with Renewal mounts; file split due to an NPC rename.
- Added missing cutins to Rekenber Job Quest.
- Added new "Stone Change" script (RE).
- Added Renewal coordinates to Juno's Airship Representative.
- Added Renewal sprites for Juno Soldiers (8W_SOLDIER -> 4_M_EIN_SOLDIER).
- Added Renewal Izlude Bulletin Board, but disabled unless valid coordinates are found.
- Minor updates to Malangdo Enchants dialogue.

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-13 18:24:01 -04:00
Euphy
11860e2e1f * Script updates:
- Added warpers and duplicates for Izlude (izlude_[a-d]) and Prontera Field 8 (prt_fild08[a-d]) maps.
- Updated Eden Group warpers and added new duplicates.
- Changed "Kelitula Academy" to "Cryptura Academy".
- Added a missing OnMyMobDead label in Buwaya Cave instance. (bugreport:7929)
- Added version information to Airport script headers.

* Mob spawn organization:
- Split "City Cleaners" into Pre-Renewal and Renewal directories.
- Restored Thief Bug (Pre-Renewal) vs. Thief Bug Egg (Renewal) spawns.
- Created "Town" spawn files, holding all city spawns not in "City Cleaners" files.
- Added Prontera Training Dummies and Alberta Ship Mouses.
- Moved Jawaii spawns from "fields/" into "towns.txt".
- Moved Brasilis spawns from its own directory into "towns.txt".

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-05 19:42:00 -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
j-tkay
b69f0ad825 - Fixed bugreport:6993, invalid item id in mercenary script. (other/mercenary_rent.txt)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17016 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-11 18:38:42 +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
daegaladh
c1990d8893 Fixed an old bug in waitingroom where NPCs weren't appearing into their chatrooms.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16461 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-21 04:08:44 +00:00
euphyy
ec79a1b50d * Some cleaning of "Novice Training Grounds" script (npc\jobs\novice\novice.txt)
* Cleaned up "PvP NPCs" script a little bit (npc\other\pvp.txt)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16438 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-18 02:30:53 +00:00
euphyy
75f0852925 * Optimization of Hugel's "Monster Race" script, 4000+ lines removed (other\monster_race.txt)
* Deleted "Wandering Poets" custom script (custom\etc\wandering_poets.txt)
* Deleted "Iron Cane" custom quest (custom\quests\ironcane.txt)
* Deleted custom Poring Track script, what did this even do...? (custom\etc\p_track.txt)
* Moved custom wedding script into /etc/

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16405 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-12 00:44:42 +00:00
masao87
f2730d6026 - Added some missing Eden Group Teleport Officers. bugreport:6160
- Some Kafra location and dialog updates. bugreport:6160
- Added missing Sorcerer Point Shop NPC's. bugreport:6160
- Fixed Bulletin Board Locations in Payon Archer Village. bugreport:6160
* Special thanks to Baneado who provided the locations.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16401 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-11 20:38:22 +00:00
masao87
580e505137 - First try to commit something into this whole new Mess Ind created ^^
* Added the Izlude Town Map Update some of you may already know from me from the download section. Moving all NPC's and Warps around to match the new Izlude Town Map.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16384 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-08 20:47:30 +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