2369 Commits

Author SHA1 Message Date
brianluau
a43212a2f4 - Reduced 300+ copy-paste lines to 1 duplicated npc in eden_common.txt (suggestion bugreport:5795)
- Replaced more unconverted 'inputstr' in several npc scripts, and changed to scope variables.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16149 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-25 15:45:31 +00:00
brianluau
79767f97bd - Fixed guild emblems not showing on flags at server start. (bugreport:5796, since r15657)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16144 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-24 17:32:14 +00:00
masao87
c0a3c94ce5 - Added probably all 3rd Class related Shops. bugreport:5781 bugreport:5782 bugreport:5783
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16138 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-21 19:41:49 +00:00
masao87
c3bbe80dae - Fixed check quest in Brasilis puppy quest. bugreport:5376
- An little update to the new script command "instance_check_party" in script_commands.txt

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16136 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-21 17:04:23 +00:00
masao87
5b9994b9ec - Added 'instance_check_party' command to all instance scripts for proper checking if the invoking party meets the requirements to join the Memorial Dungeon. Thanks to malufett for creating the command.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16135 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-21 15:02:41 +00:00
tr0n93
3acd50f74c Fixed (bugreport:5758). Quests should be checked correctly now.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16133 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-21 11:42:28 +00:00
masao87
df766d8374 - Added +11 and above refiner NPC.
- Added NPC to refine Oridecons / Eluniums to Cardium / Bradium.
- Added downrefitem script command and updated script_commands.txt with it.
- Updated refine_db.txt with probably custom values for +11 to +20 values. Source : http://ratemyserver.net/index.php?page=misc_table_refine
- Some little script improvements to Suhnbi. (Enriched Elunium / Oridecon Upgrader.)
* Further improvements for the refinement system and refinement NPC's will come within the next few days.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16126 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-17 20:39:42 +00:00
masao87
c61f99302b - Updated some Alberta NPC Locations to match with the new Map. Also updated the coordinates in the Alberta Guide NPC. bugreport:5273
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16125 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-17 14:05:14 +00:00
masao87
f8b0c2426d - Updated Monster spawns in Job change Quests to renewal. bugreport:5574
- Some minor changes to the Arch Bishop Job change Quest.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16124 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-17 12:53:16 +00:00
shennetsind
e5c38902de follow up r16115, accidentally committed debug thing
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16116 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-17 06:02:11 +00:00
shennetsind
df2f149052 Fixed bugreport:5757 Added missing Sorcerer Insignias, Credits to brAthena
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16115 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-17 06:01:15 +00:00
masao87
5a006df5c0 - Made some NPC's into duplicates and fixed some && / || checks in the Arch Bishop Job change Quest. bugreport:5437
- Bomb poring is now aggressive and explodes right away after it has been summoned. bugreport:5575
- Added some more checks tot he Pile Bunker NPC.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16113 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-14 16:49:17 +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
47dc26c6cb - Follow up r16107 .
* Fixed the additional check for Players in a Party.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16111 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-13 21:37:44 +00:00
masao87
bf1f8a237f - Added an extra check to all instance script if there are actually 2 Players online in the Party to be able to enter the Dungeon. bugreport:3970
- Added a few new statuses to not disappear upon death. bugreport:2652


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16107 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-12 20:49:09 +00:00
masao87
2b95b5bfef - Added 2 new Shops to Comodo. bugreport:5732
- Added check for Baby Warlock to Magic Book Quest. bugreport:5527

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16104 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-12 16:49:16 +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
cfa8d5c68e - Updated town.txt to allow Mailbox access in all the newer cities. bugreport:4457
- Removed easter.txt event and the corresponding mobs in mob_db2.txt  and mob_db2.sql since they collide with Satan Morroc minions Mob ID's. bugreport:1240
- Updated Magical Amplify Power cast time to only be affected by item bonuses. bugreport:2777
- Added missing Economy check in agit_main and some missing close; also fixed bugreport:5030
- Added Credits for Ziu in Falcon Flute NPC.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16102 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-12 14:28:16 +00:00
masao87
069b16546f - Added Baby Hunter and Baby Ranger check. bugreport:5728
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16097 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-11 11:29:01 +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
brianluau
bbc55e9589 - Updated "gained exp" dialog, follow-up to r14920. (bugreport:5662)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16024 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-01 20:07:32 +00:00
mandark022
a5d70a0749 Revert the amount of Base Exp reward.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16023 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-01 17:06:27 +00:00
mandark022
8db69ca6a7 Fixed (bugreport:5570) added break and continue in switch-case block
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16022 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-30 19:23:05 +00:00
mandark022
2803af9777 Fixed (bugreport:5662) base experience rewards.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16021 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-30 18:24:13 +00:00
brianluau
ac925c6f28 - Updated Novice WoE script, follow-up to r15657 (bugreport:5653)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16012 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-30 05:58:34 +00:00
brianluau
9d4db5d5ae - Fixed a spelling and grammar typo in quests_13_2.txt (bugreport:5665)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15999 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-29 01:09:03 +00:00
og2
de96ee0457 Fixed (bugreport:5661) - Thanks to Toshiro
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15996 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-28 21:15:29 +00:00
masao87
b04cf80fda - Some more 1st Class Platinum Skill NPC optimizations.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15958 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-24 20:30:24 +00:00
kenpachi2k11
9f9dd5f6a6 Updated locations for colored Butterfly Wings (14582-14585) to official.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15955 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-24 19:42:07 +00:00
masao87
a358c64671 - Follow up r15949 .
* Removed some unneeded perm. char. variables.
* And i meant [bugreport:5607] got fixed NOT [bugreport:5606] since Brian already fixed that Bugreport.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15950 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-23 14:33:25 +00:00
masao87
46a800ad3b - Updated 1st class platinum skill NPC's.
- Fixed [bugreport:5606] .

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15949 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-23 14:14:20 +00:00
brianluau
a2eef3aa15 - BuildBot: separated Debian and Ubuntu builders, and made only one trigger the map-server_sql test.
- Reverted accidental changes to heal_payment.txt (bugreport:5606)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15925 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-22 16:49:39 +00:00
brianluau
a5b8772792 - Follow-up to r15923: fixed renamed file not being svn-copied (and lacking svn history).
- Added svn:eol-style=native property for some recently added text files.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15924 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-22 15:17:49 +00:00
masao87
49459d342e - Guild folder update.
* Partially rewrote all castle files and updated all Castle flags, NPC's and warp coordinations to latest available official file.
* Renamed agit_template to agit_main and also updated it to latest available official file.
* Removed the Treasure Room Protection from agit_template and separated it into another file which will now be known as trs_rp.txt
- trs_rp.txt will allow that only the Guildleader can be in the Treasure Room, if you want to disable this protection just set an // in scripts_guild.conf before npc: npc/guild/trs_rp.txt .
- Moved payon castle map warps from warps/cities/payon.txt to warps/guild/guildcastles.txt .

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15923 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-22 14:48:03 +00:00
xazax-hun
551c9c7966 * Made branding more consistent.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15905 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-21 10:37:44 +00:00
brianluau
5c60eb69e5 - Fixed emperium coordinates in Payon Holy Shadow (payg_cas03).
- Also enforce sd->emotionlasttime for pet emotions.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15901 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-21 08:26:58 +00:00
brianluau
878c99e4d8 - Follow up to r15060.
- Fixed some grammar in Kiel Quest.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15858 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-13 02:31:51 +00:00
tr0n93
e71387fc38 Fixed some typos. (bugreport:5562)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15840 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-10 15:15:11 +00:00
technote24
fb6262a990 =General
*Added some jobs with ID's and MAPID's masks to prepare for the adding of more jobs in const.txt
*Fixed a typo on JOBL_THIRD check in const.txt
*Added all currently known tags and ID's support for NPC's, skills, status, and units.
*Changed SI_SITTING to official name SI_SIT.
*Increased MAX_SKILL to 3040.

=NPC
*Corrected a typo in the jobmaster script.
-Fixed required job level for changing to 3rd to 50.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15836 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-08 23:41:53 +00:00
mandark022
8caffe12b8 Fixed (bugreport:5554) where scatter stuff cant be executed or acrquired.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15835 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-08 14:03:15 +00:00
mandark022
68e150f151 Fixed (bugreport:5293) door closes and does not give the quest requirement when you talk to it.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15834 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-08 11:53:18 +00:00
mandark022
10c576102b Fixed (bugreport:5429) corrected requirements checking before job change to Minstrel.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15832 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-04 03:21:23 +00:00
brianluau
ad26f30c65 - Removed duplicate Bismarc NPC in Hugel, since r10973. (bugreport:5271)
Bismarc#BLS is located in /npc/jobs/2-1/blacksmith.txt

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15815 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-28 19:19:33 +00:00
og2
075af3d29e Changed PvPNarrator and GateKeeper to Floating NPC (bugreport:5512) Thanks to Daegaladh.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15805 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-27 22:14:31 +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
og2
e56ee37184 ~ Updated a few Descriptions
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15803 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-27 03:26:13 +00:00
brianluau
61d6762338 - Changed scripted MVPs (Bio3 and Lord of Death) to spawn instantly on server start, just like other permanent monster spawns.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15802 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-27 03:04:34 +00:00
brianluau
ca15420e0e - Renamed some variables.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15801 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-27 02:53:37 +00:00
og2
3e0f2eb8e7 - Updated Narrators/GateKeepers, etc.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15800 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-27 01:51:39 +00:00
brianluau
a3b76bc7a8 - Fixed some spelling typos in Novice Zone. (bugreport:5285)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15799 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-26 19:28:07 +00:00