3259 Commits

Author SHA1 Message Date
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
Lemongrass3110
b7fd4dd274 Unneeded semicolons removed
Removed duplicate slashes
2014-01-14 23:38:12 +01: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
Akkarinage
c611840fab - http://forums.irowiki.org/showpost.php?p=1372693&postcount=743
- Added monster spawns for halloween_2013.txt
2014-01-13 09:53:42 +00:00
Euphy
2f45d8c7ea Some minor edits.
Follow-up c0e87af: changed file encoding.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-12 17:39:43 -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
645e110a77 A few follow-ups.
- Follow-up to pull request #36: some cleanup of the file.
- Follow-up to 3f8dd48: updated Pre-Renewal file.

Added Rebellion class to custom Job Master script. (credits: Elias)

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-12 15:24:22 -05:00
Akkarinage
3bd3b81749 Merge remote-tracking branch 'remotes/rAthena/master'
Conflicts:
	src/map/guild.c
2014-01-12 19:19:05 +00:00
Akkarinage
7093d92d88 fml fat-fingers. 2014-01-12 18:26:43 +00:00
Akkarinage
264c27ba54 Added iRO's Halloween Event 2013 2014-01-12 18:17:22 +00:00
Akkarinage
7b66a53b4a Adding npc: for halloween_2013.txt 2014-01-12 16:59:46 +00:00
Euphy
b2d96cbc7f Implemented Kagerou/Oboro job change quest.
Uses official script structure, with iRO dialogue taken from M45T3Ryu/KO-Proyect@d78f847.

Added Kagerou/Oboro support to other Ninja-related files.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-11 22:37:36 -05:00
lighta
4af314500e Check_db
Add a check_db on char-serv startup to ensure all sql-tables was loaded
correctly and avoid error on runtime.
Fix OnInterIfInitOnce being executed on reloadscript, (now only done at
server startup)
2014-01-09 00:08:00 -05:00
Euphy
45c2a3a839 Follow-up to Global_Functino updates (834f3ba).
"F_GetPlural" now works for most item/mob cases, but still does not detect inputs that are already pluralized.
- For formats "... of|in|on ..." (ex. Piece of Cake), preceding word will be pluralized (ex. Pieces).
- Added some additional checks to prevent common errors.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-05 18:19:40 -05:00
Euphy
834f3baa05 Follow-up to Global_Function updates (97687ca).
* Added format string to "F_InsertPlural" for added flexibility.
* Added more checks to "F_GetPlural" for better handling of multi-word arguments (e.g. items).
* Updated some more scripts with new functions.

Some misc. cleanup of constants in scripts.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-04 13:42:16 -05:00
Euphy
357f1fd16c Minor bug fixes.
* Added itemscript for WoE Weapon Supply Box (12675). (bugreport:8421)
http://rathena.org/board/tracker/issue-8421-woe-weapon-supply-box12675-missing-item-script/
* Fixed two block comment errors. (bugreport:8409)
http://rathena.org/board/tracker/issue-8409-script-error-on-item-db-re-line-6123/
* Follow-ups to 97687ca.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-03 20:53:43 -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
1d64b8f9e1 Script/database bug fixes.
* Fixed an issue in "Message Delivery" quest blocking level 100+ characters. (bugreport:8373)
http://rathena.org/board/tracker/issue-8373-message-delivery/
* Added Renewal quest items to Ayothaya Dungeon Entrance quest. (bugreport:8375)
http://rathena.org/board/tracker/issue-8375-ayothaya-dungeon-entrance-quest/
* Temporarily moved the Renewal location of "Strange Machine" in the "Muff's Loan" quest; confirmation needed. (bugreport:8370)
http://rathena.org/board/tracker/issue-8370-muffs-loan/
* Updated Blacksmith job quest with some extra conditions. (fixes bugreport:8347)
http://rathena.org/board/tracker/issue-8347-about-blacksmith-job-quest/
* Changed all 'bAtk' bonuses to 'bBaseAtk', a continuation of r17149. (fixes bugreport:8372)
http://rathena.org/board/tracker/issue-8372-daehyon-card-is-not-working/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2013-12-28 22:47:32 -05:00
nanakiwurtz
f62100ae70 Fixed some minor typo
Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2013-12-21 15:49:10 +07:00
Cydh Ramdh
2330caaf0c * Fixed bugreport http://rathena.org/board/tracker/issue-8360-error-report-0000-still-images/
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-19 11:33:10 +07:00
Rekiem
a872bd2fb4 Update bard_quest.txt 2013-12-14 20:32:47 -05:00
Cydh Ramdh
dab21907b6 Fixed bugreport http://rathena.org/board/tracker/issue-8334-the-mapflag-of-monk-in-should-exclude-nosavesavepoint/
Thank t79979119 and exneval

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-13 13:27:32 +07:00
Euphy
c4d94f7b1c * Quick fixes.
- Fixed Eclage mob drops. (incl. bugreport:8220)
http://rathena.org/board/tracker/issue-8220-menblatt-bakonawa/
- Fixed typo in Sura quest. (bugreport:8283, blame d2ee0dd)
http://rathena.org/board/tracker/issue-8283-sura-quest-rev-17693/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2013-11-23 11:37:49 -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
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
cd3cb9fa95 * Follow-up to pull request #8 and #10.
* Fixed a missing 'delitem' in Port Malaya quests. (bugreport:8168)
http://rathena.org/board/tracker/issue-8168-secret-in-the-woods-port-malaya-quest/
* Fixed an official quest time message mistake in El Dicastes quests. (bugreport:8167)
http://rathena.org/board/tracker/issue-8167-bouy-from-dicastes/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2013-10-20 12:15:10 -04:00
Cahyadi Ramadhan Togihon
0c5f83ba54 Fixed bugreport:8164 http://rathena.org/board/tracker/issue-8164-dicastestxt/ 2013-10-20 22:50:48 +07:00
Akinari1087
a7588d79ed Quick follow-up to 01677cf33. Fix a veriable in penal_servitude. 2013-10-19 14:46:18 -07:00
Akinari1087
01677cf333 Merge pull request #8 from Atemo/master
Message conf fr update.
2013-10-19 14:43:41 -07:00
Akinari1087
08603402d5 Merge pull request #10 from SkittleNugget/master
Updates to Various Files
2013-10-19 14:40:53 -07:00
Euphy
100bd4a28a * Split item_delay.txt into pre-re/re paths.
* Fixed a typo in "Father Bamph" NPC. (bugreport:8163)
http://rathena.org/board/tracker/issue-8163-father-bamph/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2013-10-19 10:46:22 -04:00
j-tkay
4d67a38da6 Fixed bug #8110:
- Fixed an issue where Castle Manager couldn't be fired accordingly.

http://rathena.org/board/tracker/issue-8110-overly-attached-kafra-employee/

Signed-off-by: j-tkay <joseph.tk.ea@gmail.com>
2013-10-09 00:37:09 +08:00
SkittleNugget
90f6221719 Updates to Dicastes 2013-09-15 02:48:42 +01:00
SkittleNugget
eb872a9b37 Updates to eden_iro.txt 2013-09-09 21:10:42 +01:00
Atemo
86c552d3b4 Update rpsroulette.txt 2013-09-09 01:05:59 +02:00
Atemo
db55442a0f Update penal_servitude.txt 2013-09-09 00:53:43 +02:00
Capuche
bf6e025592 Bugs fix and some changes in custom/etc files. 2013-09-08 04:44:40 +02:00
Euphy
7cb4145691 * Cleaned up some unnecessary global ($) and temporary character (@) variables in scripts.
* Removed unnecessary labels, particularly those in warp scripts.
* Some optimization of the Hugel Bingo script.
* Fixed a mob_db error. (bugreport:8051)
* Fixed incorrect/incomplete random Glast Heim warp.
* Removed useless 'getJobName' function from GlobalFunctions.txt.

Signed-off-by: Euphy <euphy@rathena.org>
2013-09-06 19:37:14 -04: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
Brian
d7742937a8 - Updated F_RandMes with getargcount().
Follow up to 66a2bfd7c24bb617d27cc0a3e8db903cb000f3de
2013-09-05 13:07:54 -07:00
nanakiwurtz
f44ae34734 Updated to the new 'F_RandMes' command.
Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2013-09-05 14:12:42 +07:00
Euphy
17d000640d * Added 'breakequip' script command. (tid:86732)
* Fixed return value for delequip. (since r17469/8bd0985)
* Fixed a bug with Mercenary Rentals. (credits: TTest)

Signed-off-by: Euphy <euphy@rathena.org>
2013-09-04 15:07:26 -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