summaryrefslogtreecommitdiff
path: root/npc/guild
AgeCommit message (Collapse)AuthorFilesLines
2014-11-02Replaced 'set' with direct assignment where applicable (common folder)Haru23-126/+126
Signed-off-by: Haru <haru@dotalux.com>
2014-05-23Merge pull request #288 from pois8n/masterStreusel1-2/+2
Minor spelling correction in agit_main.txt
2014-05-24Minor spelling correction in agit_main.txtPoison1-2/+2
2014-05-13Removed trailing whitespace (scripts)Haru2-23/+23
Signed-off-by: Haru <haru@dotalux.com>
2014-05-13Fixed several files with a missing EOL at EOFHaru1-1/+1
- All text files should end with an EOL. Period. - See http://robots.thoughtbot.com/no-newline-at-end-of-file for info on how to configure the most common text editors to do it automatically for you. Signed-off-by: Haru <haru@dotalux.com>
2013-11-30Re-commit of 4faa0ec9df7067cee3eb1c1953fccc6c2f842179Taylor Locke1-6/+6
Cleaned up Zeny manipulation in scripts. - It is now finally safe to re-commit. - Removed some unwanted parts of the original commit, that broke the character set in some scripts. [Haru] - Corrected spacing in some edited lines. [Haru]
2013-11-28Revert "Cleaned up Zeny manipulation in scripts."Haru1-6/+6
Reverted due to a serious regression. I'll commit this again once I fixed the issue in the script engine. Sorry for the inconvenience. This reverts commit 4faa0ec9df7067cee3eb1c1953fccc6c2f842179. Signed-off-by: Haru <haru@dotalux.com>
2013-11-25Cleaned up Zeny manipulation in scripts.Taylor Locke1-6/+6
2013-11-10Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4Haru1-27/+27
- Consolidated case in variables, labels, constants. Signed-off-by: Haru <haru@dotalux.com>
2013-11-09Consolidated commands called in scripts to their lowercase versionHaru22-203/+203
- Added a note about variables and command scripts case sensitivity. Even though the engine still accepts variable, function and command names in a case insensitive way, it is discouraged to rely on such behavior. Please update your custom scripts as soon as possible. Signed-off-by: Haru <haru@dotalux.com>
2013-10-28Added ability to use constants instead of sprite IDs for NPCs. Converted all ↵Kisuka20-414/+414
npcs to use this.
2013-10-24Update to last rAthena npc.Michieru2-8/+10
Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt
2013-09-16Corrected line endings and BOM issues with several filesHaru1-1/+1
- Ensured final end-of-line character in every file. - Corrected cases of mixed line endings (mostly CR and CRLF within the same file.) - Removed extra BOM from some scripts, since it causes a parsing error. Signed-off-by: Haru <haru@dotalux.com>
2013-05-31Update payg_cas04.txtStreusel1-16/+17
Fixed Bug #7304 Part 2 Thanks to Xgear for spotting this.
2013-05-31Update payg_cas02.txtStreusel1-16/+17
Fixed Bug #7304 Part 1 Thanks to Xgear for spotting this.
2013-02-18-Updated map_cache.datStreusel1-5/+4
-Updated Izlude -Added Fly Wing to Lunatic & Poring -Added new Quests (Thanks Flaid) --Expanded MAX_QUEST_DB for the newly added quests Signed-off-by: Streusel
2013-02-04Merged some commits from rAthena.Matheus Macabu1-2/+3
2013-02-03Updated more placeholders and fixed some spacing issues.Mysteries23-55/+23
2013-01-29Updated placeholders.Mysteries7-21/+7
2012-09-02- Fixed partially bugreport:6572, where WoE:SE Flag Emblem not showing. ↵j-tkay1-1/+0
(npc/guild2) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16733 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-20* Fixed a typo in guild scripts, bugreport:6517 (guild\gefg_cas02.txt)euphyy1-1/+1
* Misc. standardization... git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16672 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-08Follow up to r16557 fixed duplicate errors on the console due to a typo ↵cookiecrumbs1-5/+5
where geffen treasure protection duplicates were named alde. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16607 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-02Follow up r16557, fixed tabs in my commit (copy/paste fail, sorry).daegaladh1-12/+12
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16558 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-02Reverted and optimized treasure room protection script, and disabled by ↵daegaladh1-64/+39
default since isn't working anymore on official servers. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16557 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-01Full npc folder reorganization. (I hope I didn't break anything D:)daegaladh23-0/+4250
-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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16545 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-08Okie ladies and gentleman if this commit breaks anything it's jman's and ↵shennetsind23-4250/+0
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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16382 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-24- Fixed guild emblems not showing on flags at server start. (bugreport:5796, ↵brianluau21-20/+21
since r15657) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16144 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-12- Added Magic Book Quest for Warlocks.masao871-2/+2
- Followup r16102 * Correctly fixed bugreport:5030 now. * Restorded scripts_custom.conf since mine accidently got commited with my last commit. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16103 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-12- Updated town.txt to allow Mailbox access in all the newer cities. ↵masao871-6/+7
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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16102 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-22- Follow-up to r15923: fixed renamed file not being svn-copied (and lacking ↵brianluau2-1430/+1430
svn history). - Added svn:eol-style=native property for some recently added text files. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15924 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-22- Guild folder update.masao8722-2768/+2819
* 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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15923 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-21- Fixed emperium coordinates in Payon Holy Shadow (payg_cas03).brianluau1-2/+2
- Also enforce sd->emotionlasttime for pet emotions. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15901 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-04- Guild Castle code cleanup:gepard19841-10/+4
- removed `MAX_GUILDCASTLE` limit - char-server now caches guild castles in `DBMap` - improved guild castle SQL queries to support non-default values of `MAX_GUARDIANS` - disallowed declaring guild castles on maps that are on other map-servers - map-server now requests data for all guild castles from char-server on initial connect (bugreport:287) - removed ''guildcastleinfo events'' as they were esentially duplicated ''OnAgitInit'' - optimized castle data load packets (bugreport:287) - updated WoE scripts to reflect source changes (scripts no longer need or should request castle or guild data) - updated related docs - Added `db_size` macro. - Replaced manual counting of castles occupied by a guild with `guild_checkcastles()` calls. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15657 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-02-02Removed `gvg_eliminate_time` battle config, as it was only used by scripts. ↵gepard19841-2/+2
Replaced its occurences in War of Emperium script with default value (7000ms) (bugreport:137). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15538 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-30- Removed more trailing tabs.brianluau2-4/+4
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15527 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-02- Lot's of Bugreport fixes and stuff.masao871-8/+6
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15352 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-31- Changed Gld_Trea_Protect: guild members (who aren't the Guild Master) ARE ↵brianluau1-1/+1
allowed in the treasure room. (bugreport:4839) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15339 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-24- Replaced all occurrences of "eAthena" to "rAthena" stringmercurial12322-44/+44
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15251 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-10-15- Fixed .@GID not being set in Gld_Trea_Spawn, since r13559. (bugreport:5067)brianluau1-1/+3
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14974 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-05-24- Fixed a possible exploit in guild castle investment. (bugreport:4929, ↵brianluau1-3/+14
topic:272783) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14833 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-10* Revised argument declaration of all script commands according to the ↵ai4rei1-1/+1
actual functions' argument usage. - Fixed many script commands with fixed amount of optional parameters to no longer accept any amount of arguments (faulty declaration). - Corrected use of dummy parameter for guildopenstorage in scripts. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14573 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-11-18Random fixes to some script typosInkfish1-0/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14153 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-11-10Fixed WoE:FE castles spawning too many Treasure Boxes. Gepard1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14141 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-11-03* Added new broadcasting support from r14120 to WoE scripts.L0ne_W0lf2-6/+9
- "Conquered" messages can now be effectively toggled off in Battle log - Added fontsizes for WoESE messages. (At least the non-default sizes.) * Added font weight constants, although they don't seem to do anything. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14122 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-04-20* Applied BrianL's castle switch fix (bugreport:2969)Playtester20-140/+40
* Fixed slotted Memory Book not giving the combo bonus (bugreport:2997) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13683 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-04-01* Optimized the renters.txt thanks to various peoplePlaytester1-1/+1
* Fixed an Aldebaran castle flag thanks to BrianL git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13650 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-03-04Follow up to r13559, r13560 and r13561. Moved some stuff around in the WoESE ↵L0ne_W0lf1-13/+15
agits, and corrected a few mistakes I made. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13566 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-03-03* Applied the updated eco/def investment system to Rachel WoESE castles, ↵L0ne_W0lf1-41/+42
Juno's next. * Corrected the conditions in the if block that I goofed up, in agit_template. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13560 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-03-03* Another round of bug fixes to various scripts.L0ne_W0lf1-32/+65
- Added Satan Morroc spawn and corrected shadow spawn timers. (bugreport:2690) - Fixed Group of Evil NPC not reactivating when it should. (bugreport:2696) - Fixed the Zeny check when summoning guardians in agits. (bugreport:2712) - Added zeny check to Jawaii bartender (hung the script.) (bugreport:2747) - Corrected a mapwarp assosiated with the z-gang quest. (bugreport:2757) - Fixed warps in ice dungeon 3 being usable all the time. (bugreport:2776) - Corrected impossible condition if in Keil Hyre quest. (bugreport:2789) - Corrected leftover aegis variables in several scripts. (bugreport:2794) - Removed duplicate line from nameless quest. (bugreport:2795) * Implemented official behaviour/Cost for investing in economy and defence - Eco/Def will be modified on the turn of the day instead of immediately. - Cost has been updated to official values. Investing twice now costs 4 times the first investment. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13559 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-12-29Fixed Econ values in agit_template. Commited by accident, as it's not finished.L0ne_W0lf1-21/+12
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13423 54d463be-8e91-2dee-dedb-b68131a5f0ec