181 Commits

Author SHA1 Message Date
Lemongrass3110
d1e184e46c
Initial version of cashmall (#7450)
Introduces the cashmall
Added Cachua_Coupon exchange NPC
Enabled Devil Enchant Master and moved to Cash Mall
Moved Mergician
Added Basta, Mighty Hammer and Brock
Moved Shadow Blacksmith
Added Cash Hair Stylist
Added a feature switch for Stylist UI
Updated Hair Stylist

Thanks to @aleos89, @Atemo and @eppc0330!

Co-authored-by: aleos <aleos89@users.noreply.github.com>
Co-authored-by: Atemo <Atemo@users.noreply.github.com>
2022-12-18 00:39:50 +01:00
Aleos
87032fc95a
Updated Gunslinger/Rebellion Bullet behavior (#3459)
* Fixes #2745.
* Disabled the ability to equip old spheres and old slugs.
* Corrected some of the newer bullets name, weight, price, and effects.
* Updated the ASPD for Gunslinger/Rebellion when equipping guns.
* Spread Attack and Ground Drift now only use bullets.
* Adjusted Slug Shot skill item requirement to the new Slug Bullet.
* Separated pre-renewal and renewal ammo NPC (Kenny and Tony).
-- Renewal no longer has Tony.
-- Kenny can now trade in the Sphere bullets for new bullets.
-- Kenny can now trade in the old Slugs for Slug Bullet.
-- Added new bullets into Kenny.
Thanks to @cydh and @exneval!
2018-10-29 10:18:19 -04:00
Euphy
3813aaaadb Added 2013 iRO/kRO Christmas Event.
Updated item database with many new costumes.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-24 15:19:27 -05:00
Akkarinage
7093d92d88 fml fat-fingers. 2014-01-12 18:26:43 +00:00
Akkarinage
7b66a53b4a Adding npc: for halloween_2013.txt 2014-01-12 16:59:46 +00: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
1083475207 * Some follow-ups to 5ab4d5e:
- Added Renewal changes to "God Seal Status" signpost and moved from "npc/other/sealstatus.txt" to "npc/quests/seals/seal_status.txt".
- Applied item_db changes to Pre-Renewal and SQL databases.
* Fixed issue in Cursed Spirit quest where an OnTouch NPC wouldn't activate.

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-26 11:34:18 -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
400d0f0319 * Restored Izlude Arena into root directory - it should never have been disabled in Renewal. (blame: r16382)
- Note: Renewal updates will follow.

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-06 02:58:43 -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
2981bac2de * Implemented 2010 Easter script, disabled by default.
* Players can no longer block whispers from a higher group level. (Hercules 3d0fba0)
* Added two missing quest_db entries for Mora. (credits: TTest)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17401 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-07-05 18:48:44 +00:00
euphyy
ec00251511 * Implemented 2011 RWC Golden Poring script, disabled by default.
* Added 7 new item groups (equipment card albums).
* Some minor updates to Renewal item database. (incl. bugreport:7761)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17400 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-07-02 18:28:01 +00:00
euphyy
f488861298 * Implemented Buwaya Cave instance.
* Implemented Bakonawa Lake instance.
* Monsters can now spawn on unwalkable cells, as required by the new instances. (credits: Akinari)
* Implemented 2012 RWC Enchants script, disabled by default.
* Reverted change to Mora Enchants from r17387, as the additional items are only present on iRO. (credits: Ziu)
* Fixed some errors from recent updates.
* Applied eol-style:native property to newly added files.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17397 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-07-01 00:16:43 +00:00
euphyy
3a234d787a * Implemented Mora Enchants.
* Updated Episode 14.1 item database entries.
* Removed party size check for Malangdo Culverts, as there is none on official servers.
* Added THA map_msg translation - thanks, boneskung, for translating!
* Updated IDN map_msg translation. (credits: Cydh)
* Code by Lighta:
-- Updated configure, add enable-warn [yes/no] and remove wno-parentheses, wno-unused from default compilation
-- Cleanup small warnings
* Crash fix for bugreport:7688 (code by Akinari).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17342 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-06-03 02:07:41 +00:00
euphyy
87c832625c * Added more Port Malaya NPCs, adapted from Masao's conversion.
* Optimized Sage skills quest and cleaned Rogue skills quest.
* Small edit to mapflag documentation - thanks, Lighta!
* Code by Zopokx:
-- Optimized Eden Quests 56-70 (adapted).
-- Moved "Dollshoi" and "Ponka-Hontas" NPCs (Morroc and Payon Solutions) out of Pre-Renewal directory to npc/quests/mage_solution.txt.
-- Added support for Baby Novices in Novice Skills quest.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17335 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-05-27 05:54:54 +00:00
euphyy
df14f01842 * Added "Hunting Missions" custom script (npc\custom\quests\hunting_missions.txt)
* Small updates to "readme" files and atcommands documentation
* Deleted a misleading 'notice' file as we have no stable branch or official release (\notice.txt)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16779 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-15 19:41:18 +00:00
euphyy
884e6a1390 * Optimized Splendide coin merchant and merged it to a template with Manuk's (merchants\coin_exchange.txt)
* Fixed and enabled a Manuk NPC (cities\manuk.txt)
* Other small changes and fixes.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16773 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-10 20:33:57 +00:00
j-tkay
897797722b - Merged and cleaned up Kafras. (kafras/kafras.txt)
- Added Warp Points / View Points Function. (kafras/functions_kafras.txt)
- Updated dialogue for Shadow Chaser Job Change Quest. (jobs/3-2/shadow_chaser.txt)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16699 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-24 18:30:31 +00:00
euphyy
fb0a39fe3e * Optimized Eden Quest lv. 11-25 (re\quests\eden\)
* Fixed bugreport:6427 with new Alchemist quest (jobs\2-2\alchemist.txt)
* Other misc changes/fixes...

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16615 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-10 04:55:08 +00:00
j-tkay
4984ef5493 - Follow up r16597 accidentally disabled Turbo Track. (npc/scripts_athena.conf)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16598 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-07 19:51:47 +00:00
j-tkay
7b6268fb52 - Merged other/turbotrack into one template. (other/Turbo_Track.txt)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16597 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-07 19:47:14 +00:00
j-tkay
57f320c8dd - Merged Falicious Okolnir Quest in quests/okolnir into one template. (quests/okolnir.txt)
- Removed an unofficial event. (events/quiz_qt.txt)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16569 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-03 17:59:44 +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
fb2d484d14 * Follow-up r16291: Standardized "Valentine's Day 2012" script (events\valentinesday_2012.txt)
* Added entry to scripts_athena.conf, with slight re-ordering of the event list

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16293 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-13 20:49:48 +00:00
euphyy
c0fb1a9630 * Added Dewata and El Dicastes town (\cities\) and quest (\quests\) NPCs.
* db\quest_db.txt updated with Dewata and El Dicastes quests.
* Fixed minor bug with Arch Bishop check in Thanatos Tower (bugreport:5942)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16234 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-06 00:34:10 +00:00
masao87
7cee7996e8 - Added Instructor Ur to Eden Quest Quests. bugreport:5742
- Added Mission Boards 86-90 and 91-99 to Eden Group. bugreport:5742
- Updated quest_db.txt to match the new Quests in the new Eden Group Quests.
* Special thanks to Chilly for providing the base of the scripts! <3
- Updated Rune Knight Job change Quest for the last time to finally work as official as possible.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16213 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-02 01:55:34 +00:00
masao87
cbd577d069 - Added BaseClass explanation to script_commands.txt .
- Some updates to the custom folder / the old eAAC Scripts which are now in there.
- Fixed custom/warper.txt prontera location to not collide with Ash Vacuum warper. bugreport:5857
- Fixed Platinum Skill Quests properly checking for BaseClass now. bugreport:5853
- Fixed some typos in Ranger Job change Quest & Eden Paradise. bugreport:5858
- Fixed a typo in scripts_athena.conf . bugreport:5852

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16165 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-29 12:08:59 +00:00
masao87
3f554a4b93 - Added missing repeatable EXP Quests. bugreport:4450
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16162 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-28 14:59:02 +00:00
masao87
1cf866c740 - Added Pile Bunker Quest. bugreport:5397
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16112 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-14 12:40:15 +00:00
masao87
e31be3cd2c - Added Magic Book Quest for Warlocks.
- Followup r16102
* Correctly fixed bugreport:5030 now.
* Restorded scripts_custom.conf since mine accidently got commited with my last commit.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16103 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-12 16:07:52 +00:00
masao87
16e1bb4ab5 - Added Falcon Flute Trader NPC.
- Added Falcon Flute to db/pre-re/item_db.txt, db/re/item_db.txt and item_db.sql.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16095 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-10 23:59:28 +00:00
masao87
4b1e9d1d55 - Added Bossnia Event.
- Added new Town cleaners.
- Added mobs to sec_pri02 .

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15673 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-10 19:22:27 +00:00
gepard1984
202909582c Updated Airship NPCs to official.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15636 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-02-28 20:11:46 +00:00
og2
18b21d63e1 * Updated Mail.
* Fixed Waitroom MaxLevel from poring_war (bugreport:5262).
* Added card_trader.
* Added card_trader to scripts_athena (disabled by default).
* Added MidCamp Warper/Ash-Vacuum from quest_13_1 (gogoash).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15514 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-24 16:50:59 +00:00
xantara
2d6b145508 ` Added (Cash) Headgear Dyer (cashheadgear_dye.txt)
-- Aegis Conversion

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15493 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-18 22:28:27 +00:00
script-Z3R0
7ee1dd0052 Added cupet.txt (Cute Pet Manager) - Aegis Convert - Commented Out in scripts_athena.conf
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15440 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-13 17:33:14 +00:00
script-z3r0
d011bfae8a Added Rare Diamond Merchant, converted from AEGIS script
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15422 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-11 20:46:47 +00:00
masao87
8e4c5a3366 - Fixed NPC Position in 2006_headgears.txt
- Added new Headgear Quests and Cute Ribbon Dyer.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15344 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-01 18:05:40 +00:00
masao87
ad5a13c3e5 - Added first Version of Mechanic Job change Quest and 3rd_trader which sells 3rd Job related Items.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15220 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-23 01:55:20 +00:00
L0ne_W0lf
0031e22f16 * Raised MAX_MERCENARY_CLASS to 44 for new mercenaries.
* Raised max_lv to allow values up to 150 in battle.conf.
* Raised MAX_SKILL_TREE 77 in prep for 3rd class skill trees.
* Upped max_lv and max_aura to 150, and max_aspd to 193.
* Added Brasilis database updates from trunk r14928.
* Added scripts and NPC Brasilis updates from trunk r14928.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14931 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-08-10 20:46:27 +00:00
L0ne_W0lf
8a67d57b75 Added Renewal Guides, and made the filenames uniform.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14922 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-26 15:32:21 +00:00
ai4rei
96a6a43e85 * Merged changes from trunk [14742:14782/trunk].
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14783 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-04-09 09:09:35 +00:00
Kisuka
f5acf265dd - Eden Group Quests and Services added.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14768 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-04-06 13:38:07 +00:00
Kisuka
6a32bd6c31 - Added Buying Shop NPCs
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14722 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-02-21 06:57:22 +00:00
L0ne_W0lf
0c14edaeb0 * Updating spawns as a precursor for Eden group quests.
* Updated spawns for Juno fields to Renewal.
* Updated spawns for Umbala fields to Renewal.
* Updated spawns for Comodo fields to Renewal
* Updated spawns for Mjolnir fields to Renewal.
* Updated spawns for Payon fields to Renewal.
* Updated spawns for Morroc fields to Renewal.
* Commented out repeatable EXP quests.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14462 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-14 20:07:55 +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
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
L0ne_W0lf
9bb87169be * A rather large overhaul of the battlegrounds.
- in bg_common.txt, stripped out KvM npcs, fixed coordinates.
- Needs to be tested, none of the BG files are on by default.
- Created subfolder battleground/KvM/ which now holds KVM files.
- Added kvm_enter.txt, which warps players to the waiting rooms.
- Added kvm_item_pay.txt, which holds the point redemption NPC.
- Made the KvM battlegrounds work closer to official, needs work.
* Corrected variable typos in the acolyte arena. (bugreport:4374)
* Corrected donpcevent typo in the party arena. (bugreport:4374)
* Added two global functions which will return equip data as strings.
- F_GetWeaponType: returns the type of weapon by 'look', (ie "Dagger")
- F_GetArmorType: returns the kind of armor via 'equip loc'. (ie "Armor")
* Fixed duplicate documentation for getitemslot. (bugreport:4362)

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