131 Commits

Author SHA1 Message Date
Jittapan Pluemsumran
bd6539a9ba Follow up to c23688c
Unify all checks into one function.
Suggested by @Cydh.
2016-03-26 10:52:30 +07:00
Jittapan Pluemsumran
c23688cea4 Clean up basic skill checks 2016-03-23 21:11:57 +07:00
Atemo
befc6123be Fixes some bug in npc/cities folder and corrected syntax
Corrected some npc view
2016-02-11 02:06:10 +01:00
Euphy
4889699376 Bug fixes.
- Fixed guild names for payg_cas02 and payg_cas04. (bugreport:8763)
http://rathena.org/board/tracker/issue-8763-castle-db-wrong-castle-names/
- Fixed OnTouch issues in Old Glast Heim instance. (bugreport:8738)
http://rathena.org/board/tracker/issue-8738-oldglastheim/
- Fixed a minor documentation issue with 'pcblockmove'. (bugreport:8706)
http://rathena.org/board/tracker/issue-8706-pcblockmove-description-incorrect/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-03-13 15:47:02 -04: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
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
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
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
glighta
8d605f89c3 - Follow up r17296
-- capped CAMOUFLAGE effect, (defs should be lower then 0, atk bonus max 300, fix cri bonus  (base is 1000 not 100))
-- fix bugreport:7601 and add new mapflad for clif_maptypeproperty2 (nomineeffect, nolockon, noitemconsumption, nousecart, nosumstarmiracle) still investgating full effect
-- harmonize script_ref source


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17297 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-04-26 14:38:54 +00:00
euphyy
b2a3bdd1c9 > Guild fixes:
* Added a check to prevent double Emperium spawns in WOE SE castles (since r16571).
* Added guild disbanding events for WOE SE castles (since r12531).
* Fixed an incorrect parameter in WOE FE guild disbanding event (since r12673).

> Other:
* Fixed .@atcmd_numparameters, code by Zephyr (bugreport:7198).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17106 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-27 06:37:20 +00:00
j-tkay
dd130860d3 - Fixed partially bugreport:6572, where WoE:SE Flag Emblem not showing. (npc/guild2)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16733 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-02 17:42:33 +00:00
euphyy
13642716af * Fixed a typo in guild scripts, bugreport:6517 (guild\gefg_cas02.txt)
* Misc. standardization...

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16672 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-20 20:16:42 +00:00
cookiecrumbs
89917d2150 Follow up to r16557 fixed duplicate errors on the console due to a typo where geffen treasure protection duplicates were named alde.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16607 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-08 12:44:51 +00:00
daegaladh
629b4aa612 Follow up r16557, fixed tabs in my commit (copy/paste fail, sorry).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16558 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-02 11:00:24 +00:00
daegaladh
47e59df253 Reverted and optimized treasure room protection script, and disabled by default since isn't working anymore on official servers.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16557 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-02 10:44:36 +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
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
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
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
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
gepard1984
f810293de3 - Guild Castle code cleanup:
- 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://svn.code.sf.net/p/rathena/svn/trunk@15657 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-03-04 18:37:29 +00:00
gepard1984
fc400a1838 Removed gvg_eliminate_time battle config, as it was only used by scripts. Replaced its occurences in War of Emperium script with default value (7000ms) (bugreport:137).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15538 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-02-02 21:16:23 +00:00
brianluau
00367cd7b7 - Removed more trailing tabs.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15527 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-30 20:17:55 +00:00
masao87
b2324030b6 - Lot's of Bugreport fixes and stuff.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15352 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-02 19:37:08 +00:00
brianluau
e8b07466ec - Changed Gld_Trea_Protect: guild members (who aren't the Guild Master) ARE allowed in the treasure room. (bugreport:4839)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15339 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-31 21:56:42 +00:00
mercurial123
0f47604f2d - Replaced all occurrences of "eAthena" to "rAthena" string
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15251 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-24 21:30:42 +00:00
brianluau
b6e6bec3c6 - Fixed .@GID not being set in Gld_Trea_Spawn, since r13559. (bugreport:5067)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14974 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-10-15 22:40:00 +00:00
brianluau
1c0abe84ef - Fixed a possible exploit in guild castle investment. (bugreport:4929, topic:272783)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14833 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-05-24 07:59:43 +00:00
ai4rei
e560ba458b * Revised argument declaration of all script commands according to the 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://svn.code.sf.net/p/rathena/svn/trunk@14573 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-10 22:29:12 +00:00
Inkfish
c3f733849c Random fixes to some script typos
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14153 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-11-18 15:39:24 +00:00
Gepard
de0efc5bbd Fixed WoE:FE castles spawning too many Treasure Boxes.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14141 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-11-10 19:09:00 +00:00
L0ne_W0lf
82fd1bd8be * Added new broadcasting support from r14120 to WoE scripts.
- "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://svn.code.sf.net/p/rathena/svn/trunk@14122 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-11-03 19:41:37 +00:00
Playtester
f8ef62df87 * Applied BrianL's castle switch fix (bugreport:2969)
* Fixed slotted Memory Book not giving the combo bonus (bugreport:2997)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13683 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-04-20 19:11:16 +00:00
Playtester
c8d8f1e3c0 * Optimized the renters.txt thanks to various people
* Fixed an Aldebaran castle flag thanks to BrianL

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13650 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-04-01 15:48:47 +00:00
L0ne_W0lf
4dd82cd1e8 Follow up to r13559, r13560 and r13561. Moved some stuff around in the WoESE agits, and corrected a few mistakes I made.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13566 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-03-04 18:28:22 +00:00
L0ne_W0lf
ee268541d4 * Applied the updated eco/def investment system to Rachel WoESE castles, Juno's next.
* Corrected the conditions in the if block that I goofed up, in agit_template.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13560 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-03-03 05:41:17 +00:00
L0ne_W0lf
76397f8bc7 * Another round of bug fixes to various scripts.
- 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://svn.code.sf.net/p/rathena/svn/trunk@13559 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-03-03 04:11:22 +00:00
L0ne_W0lf
23f6662b0b Fixed Econ values in agit_template. Commited by accident, as it's not finished.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13423 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-12-29 21:28:26 +00:00
L0ne_W0lf
0f671dc55a - Corrected issues with the Keil Hyre quest. (bugreport:2511)
- Corrected minor typo in alchemsit quest. (bugreport:2530)
- High Aco is now given skills on change. (bugreport:2552)
- Added item checks to Ice Necklace quest.
- Uncommented a warp in morroc_fild.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13422 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-12-29 21:22:35 +00:00
zephyrus
c830a56da3 - Item Rental System.
Script Usage:
- rentitem <itemid>,<seconds>;
- rentitem <itemname>,<seconds>;

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13370 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-11-16 16:14:30 +00:00
zephyrus
d2d38d0d53 - Little optimization on agit_template.txt
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13234 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-09-23 17:59:23 +00:00
L0ne_W0lf
d412bbc60d * 13026 Added iRO Repeatable EXP quests care of Kisuka.
* Updated guild scripts, removed interior flag dialog.
* Applied some Payon 1 script fixes from bugreport:1941.
* Cost is now doubled when investing a second time in eco or defence.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13026 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-31 14:24:26 +00:00
shadow
a98253bcc4 Converted skill commands integers to strings. Follow up on r12814
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12819 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-06-13 10:13:14 +00:00
Lupus
f7cb030349 Fixed more +name+ garbage to +strcharinfo(0)+
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12756 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-06-04 06:00:48 +00:00
L0ne_W0lf
93e85de290 Fixed variable typo in guild scripts. (bugreport:1514)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12712 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-05-16 11:11:10 +00:00
L0ne_W0lf
1ac9289217 * Fixed a loading flag emblem for Payon 1.
- Also fixed two typos regarding Guild Steward name.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12708 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-05-13 21:21:25 +00:00
L0ne_W0lf
966618bee0 * Fixed guild manager charging twice for invest
- Corrected some treasure room switch sent-to spawns.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12701 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-05-11 14:30:17 +00:00