197 Commits

Author SHA1 Message Date
Atemo
5695dc57e2 Update & fix.
- Updated script_commands.txt
- Fixed typo in bio4_reward.txt
- Fixed getexp command giving 1 exp with 0 value
2015-11-29 16:57:04 +01:00
Atemo
88e522060a Moved the NPCs from WolfchevLaboratory.txt (Issue #774) 2015-11-24 17:12:25 +01:00
Cydh Ramdh
006f6d46de * Follow up b4bdaebeebafcdb5a9d79cfff40dd93ce9be6a09, duplicate names.
* Added idRO Cashshop special sale.

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2015-08-24 20:51:09 +07:00
Cydh Ramdh
c005ebc3ff Misc update: Added (idRO) Cash Trader location at Pharos Beacon.
Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2015-07-27 20:25:12 +07:00
Atemo
36f337ea41 Corrected :
-	variable typo in quests_nameless.txt
-	Suspicious Man#1 NPC localization and Xtrigger/Ytrigger in quests_nameless.txt
-	redundant message in eden_quests.txt

Merged :
-	warp eclage Hercules 64dfaf2c8c8be7ff288ea88a64eddfeae1e364a4
-	Deadman NPC localization in quest_disguiseloliruri.txt Hercules 450b0a3aeb6b472805c470712a0e6ebd9d04eb2a
-	NPC name in eclage Hercules 87beda59c824e9be6db6f86c02983ed2a44c4016 and daf5312ee4d1de6dd43b23f719e94427aeb33e5d

Signed-off-by: Atemo <capucrath@gmail.com>
2015-06-06 20:36:02 +02:00
Capuche
0bebbe6c05 Typo in lv4_weapon_quest (Hercules 3d47fdff7ddae8e5f028425c653dccc4ecfcfed5)
Fixes Biolab Enchant (Hercules 265ec7e012d3414e5fc4b3360c0795b4697663f6)
Fixed Eclage Quests (Hercules 1b0eacd770b128b02d3300b7efe05da136bbed3d and 7d93099232dcf3c74349a99d9fa891927f2351d6)
2015-02-08 00:14:26 +01:00
Emistry
e134c76859 Issue #232
https://github.com/rathena/rathena/issues/232

Just like @Cydh said:
somehow, += for a string in iteration is fail. /hmm
temp fix is .@foo$ = .@foo$+"bar";
2015-01-17 15:14:28 +08:00
Euphy
df6fb01739 Small fixes in Eclage scripts and code style changes.
- Fixed some minor bugs.
- Added GM NPC function.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2015-01-15 13:01:12 -05:00
Skormie
e8d0d35324 Eclage update with minor error fix. r2 2015-01-14 10:54:03 -05:00
Skormie
03249a0430 Eclage update with minor error fix and added optimizations. 2015-01-13 20:38:54 -05:00
Skormie
a4cac34dc6 Eclage update with minor error fix. 2015-01-13 18:19:32 -05:00
nanakiwurtz
229d15db87 /npc/re/merchants/coin_exchange.txt item update
-- Added Costume Hahoe Mask (19554). Thanks to rayn
2014-12-17 17:45:27 +07:00
Euphy
1d2160758c Fixed Ticket Refiner refining above ticket level.
http://rathena.org/board/topic/98997-safe-refine-ticket-refiner/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-11-07 18:33:32 -05:00
Euphy
30b4d578a7 Some script cleaning.
- Replaced lots of numerics with constants.
- Added spacing to make some scripts more readable.

Fixed a mistake in 14fddd3.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-08-23 15:17:59 -04:00
Euphy
14fddd3790 Added script checks against swapping items using third-party hacks.
- Follow-up to 416f6d7, as further protection against item exploits.

Contains a few other fixes.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-08-22 15:36:23 -04:00
Euphy
880903bdab Updated Renewal Izlude Magazine & Bullet dealer locations.
- Coordinates taken from a recent iRO update.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-08-17 15:13:24 -04: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
Euphy
5e261ba415 Minor cleanup of riding script commands.
- The 'checkriding()' function no longer checks for wargs and dragons, ONLY Pecos, Grand Pecos, and Gryphons (as documented). (bugreport:9024)
http://rathena.org/board/tracker/issue-9024-about-renters-from-rathenanpcremerchants/
- Replaced 'checkoption()' warg checks with 'checkwug()'.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-06-10 22:58:09 -04:00
Euphy
e1903cb97a Fixed some equip location itemscripts. (bugreport:8821)
http://rathena.org/board/tracker/issue-8821-general-daehyon-card/

Added official names as comments in many newer scripts.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-03-26 01:47:37 -04:00
Euphy
c7e020ad18 Added pRO/twRO "Card Exchange" NPC.
Information: http://richkidherbert.blogspot.com/2013/08/card-exchanger.html

Fixed incorrect position and view for item 18771. (bugreport:8657)
http://rathena.org/board/tracker/issue-8657-item-18771-enchanced-opera-phantom-mask-is-incorrect/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-02-16 01:40:29 -05:00
Euphy
a2d095f5c4 Item database update.
- Added/edited itemscripts for some new items.
- Corrected the persistence of many Hit- and Flee-increasing consumables, as they should dispel upon death. (incl. bugreport:8626)
http://rathena.org/board/tracker/issue-8626-accuracy-30-scroll-effect-when-death/

Hercules merges:
- Added optional 'count' parameter to script command 'successrefitem'. (9d1f80e)
- Atcommand bindings are now case-insensitive, like normal atcommands. (92be98c)
- Consumables without expire time no longer stack with rental items. (afcb4bc, bugreport:8458)
http://rathena.org/board/tracker/issue-8458-rent-item-bug/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-02-10 16:13:53 -05:00
Cydh Ramdh
b4bdaebeeb * Replaced INF2_NO_AUTOSHADOWSPELL with INF2_AUTOSHADOWSPELL following AEGIS standard, reverted c9cf222.
* Fixed bugreport:8596 http://rathena.org/board/tracker/issue-8596-compile-warnings-with-fresh-svn/
* Removed temporary array while parsing shop NPC, makes remove the limit 100 items each NPC
* Added idRO cash trader according to Chinese New Year event

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-02-04 12:32:38 +07:00
Euphy
21122d7a87 Some bug fixes.
* Ninja Cutter (13074) is not refineable, causing KG/OB quest to halt. (bugreport:8542)
http://rathena.org/board/tracker/issue-8542-ninja-cutter-cannot-be-refined/
* Treasure Chest (2335) in Bakonawa's Lake instance drops incorrect spirit piece. (bugreport:8294)
http://rathena.org/board/tracker/issue-8294-treasure/
* Slightly edited coordinates of two RE Izlude traders.
* Follow-up 3813aaa: fixed a typo on item 22669.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-24 21:44:36 -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
Rekiem
5899bef2ce Update cash_trader-idRO.txt
change einbeich to einbech.
2014-01-21 21:13:14 -05:00
Euphy
8c24dc899b Follow-up 4226a23: added a missing trader.
Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-18 12:32:41 -05:00
Euphy
4226a23683 Updated Renewal Ninja shops. (incl. bugreport:8507)
http://rathena.org/board/tracker/issue-8507-ninja-merchant/

Fixed an NPC name length. (bugreport:8512)
http://rathena.org/board/tracker/issue-8512-riding-creature-master-shows-warning-in-console/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-18 11:48:43 -05:00
Cydh Ramdh
5a7d4a58e6 Follow up d35ac5a, 18b3e15
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-01-18 11:58:00 +07:00
Euphy
2ec01da4d6 Added Mail Annex Station scripts to iRO Eden.
Corrected a few lines in KG/OB Gear Enchants. (follow-up 9b5798d)

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-15 17:26:58 -05:00
Euphy
9b5798dc39 Implemented Kagerou/Oboro Gear Enchants.
Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-15 16:25:58 -05:00
Euphy
d569d288bd Added 'strcmp' script command.
Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-13 19:07:01 -05:00
Euphy
b92b6be5b5 Merge pull request #39 from Rekiem/patch-6
Added Rebellion Machine shops to npc/re/merchants/shops.txt.
2014-01-13 16:02:25 -08:00
Euphy
18b3e15ed6 Merge pull request #38 from Rekiem/patch-5
Update npc/re/renters.txt with Riding Creature duplicates.
2014-01-13 16:01:18 -08:00
Cydh Ramdh
d35ac5a601 * Initial release idRO Cash trader NPC. npc: npc/re/merchants/cash_trader-idRO.txt (disabled by default)
* Added some items following idRO Cash trader NPC (added on db/re/item_db.txt)
* Updated documentation on doc/script_command.txt and npc.c
* Follow up d4128ce

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-01-14 01:54:38 +07:00
Rekiem
389ac2ac15 Update shops.txt
They can add machines that sell weapons of rebellion?
i check one by one the slots for cards and price
the actual name is too long when it becomes in english

prontera,96,209,4	shop	리벨리온 소품 자판기
                               Rebellion Accesory Vending Machine

prontera,92,209,4	shop	리벨리온 무기 자판기
                            Rebellion WWeapons Vending Machine
2014-01-13 13:24:11 -05:00
Rekiem
5040b2ac6b Update renters.txt
I've seen this npc in aldebaran, geffen and payon
not found in alberta and morroc

only need to look at rachel, veins, lightalzen, einbroch, yuno, hugel and comodo

I put 2,3 and 6 concerning @go number

can put in the emulator?
2014-01-13 13:08:35 -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
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
4527b66a5d * Documented 'transform' script command. (follow-up 9c438ce)
* Fixed errors in 'getmonsterinfo' sample script. (bugreport:8200)
http://rathena.org/board/tracker/issue-8200-getmonsterinfo-sample/
* Added correct refine rates above +10. (Hercules 6577a59)
* Merged extra 'downrefitem' argument.	(Hercules)

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2013-11-06 14:51:26 -05:00
Euphy
c610f5b15c * Added some iRO Eden Group NPCs. (credits: -SkittleNugget-)
- This consists of a few traders, warpers, cashshop-related scripts, and duplicates from various locations.
- There are a lot of placeholders and some entirely missing scripts; these may be added later, but we don't intend to implement all of iRO's custom features.
- Some of the item sprites may be unviewable without iRO's data.grf.

* Minor database updates:
- Corrected all *_C (rental) equipment entries; to be updated later on with VIP bonuses.
- Fixed some bHpDrainRate item_db entries. (incl. bugreport:8049)
- Fixed a mob_skill_db entry. (bugreport:8050)

* Other changes:
- Renamed 'F_RandMes' to 'F_Rand', to clear up any confusion. (follow-up 66a2bfd)
- Small changes in Armor Enchanter script (thanks to Emistry for pointing it out :p).

Signed-off-by: Euphy <euphy@rathena.org>
2013-09-06 00:22:41 -04:00
Euphy
e5d9fc8fa5 * Script updates.
- Updated dialogue for advanced and Renewal refiners.
- Added an extra check in the main refiner scripts to prevent empty menus from appearing.
- Renamed Renewal NPCs to "Vestri" and "Austri".
- Slightly updated dialogue for the Catalog Magician script.

Signed-off-by: Euphy <euphy@rathena.org>
2013-09-03 12:53:39 -04: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
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
ff86b75d26 * Standardization of new Upgrade Weapon Enchants script. (follow-up 5debd8c)
* Fixed some bugs related to Nidhoggur's Nest. (bugreport:7990)
* Follow-up ba6b57b:
- Added 'is_clientver' command to Navigation system function.
- Documented @item change.

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-17 22:56:40 -04:00
unknown
5debd8c5c8 Added Upgrade Weapon Enchants 2013-08-17 17:03:45 -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
32b8d2e713 * Implemented Bakonawa Extermination quest.
* Misc. cleaning.

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-07 02:47:45 -04:00
Deadly Silence
7beb7edc77 Minor bug fixes
[npc/cities/geffen.txt]
- fixed bug with Psychic Advisor (bugreport:7928)

[npc/quests/seals/megingard_seal.txt]
- fixed small bug with Librarian where he would spam the NPC dialogue
  because of a misplaced "next"

[npc/re/merchants/enchan_mora.txt]
- fixed bug with wrong enchants (bugreport:7930)
2013-08-06 23:46:24 +02: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