36 Commits

Author SHA1 Message Date
Atemo
ea88ea5054
Emoticons constant name (#2527)
This PR change the emoticons constant name to match emoticonlist from client side.
Note: the previous emoticons names are now deprecated.

Additionnally emotion and unitemote scripts commands are being merged together to the new format
-> emotion <emotion number>{,<target>};
Where target use the target Game ID (GID) of the unit (npc, pet, character etc..).

* unitemote is now deprecated.
* Additionnally fixed incorrect variable in quests_brasilis.txt

Thanks to @aleos89 and @Lemongrass3110 !
2017-11-10 18:35:21 +01:00
Lemongrass3110
2043c95e66 Refactored hardcoded npc event names (#1767)
While refactoring those events the following other changes were made:

Introducing OnInstanceDestroy event. This event can be used to hook script code right in front of the instance destruction. This can be useful if you have any stored references to an instance id for example.

The script command cmdothernpc will now check if the target event exists and report failures. Therefore it now returns true or false.

All agit(FE,SE,TE) start and end commands from atcommand and script commands have been merged in their respective guild function which now returns a bool value of true for successful actions and false if it did not succeed(if the specific WoE was [not] running).

All global triggered events with mapserver status output now call the same function and therefore have the same mapserver output(including their respective event name of course).

Renamed a few events in the script configuration to match the other names

Added constants for months and weekdays

Additionally added constants for gettime types to make it easier to read.

Replaced all existing usages I found with their proper new syntax or better fitting functions.
2017-01-10 22:58:04 +01:00
Atemo
d62f422e3d Corrected OnTouch/OnTouch_ in NPC script (#1548)
Some leftover from aegis convertion..

Skipped pre-re folder, I don't have old data.
2016-09-07 21:35:14 +02:00
Lemongrass3110
d017e24cd2 Adjusted some scripts to the new syntax
Follow up to fd48238
Thanks to @Everade and @Jeybla for reporting this problem in #1468
2016-08-05 00:28:23 +02: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
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
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
2adc9cdf28 * Follow-up r16726, more standardization on docs.
* Replaced and added dividers in many script files with one standard divider.
* Other misc. cleaning...

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16727 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-01 00:37: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
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
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
L0ne_W0lf
84cf9ff2c9 Applied patch from Dani to change NPC emotion events to use the updated emotion command. (bugreport:4318)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14347 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-18 16:19:48 +00:00
brianluau
5a87510f2c - Fixed a Assassin Quest question having all correct answers. (bugreport:3260)
- Fixed lots of random typos, thanks to BloodWist for pointing them out.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13898 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-06-19 15:14:43 +00:00
L0ne_W0lf
25933ddfdf Follow up to r13091, fixed weight check in stone dismantler.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13102 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-20 21:10:05 +00:00
L0ne_W0lf
57a39c5ecc * Fixed bugs in some items. (bugrepot:2059)
* Added stats for some mobs, and fixed some others.

* Rather large update to the Keil Hyre quest.
- Update does not add any of the changes made by iRO.
- Many updates, see script or tracker for details.
* Fixed condition check in turtle island warper. (bugreport:1943)
* Removed the duplicate NPC "Mudie" from Hugel City. (bugreport:2079)
* Corrected Umbala Dismantle/create Essence NPC. (bugreport:2089)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13091 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-19 00:16:37 +00:00
L0ne_W0lf
c8d4cc6a2d Updated Umbala npcs, quests, and warps.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12403 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-03-20 18:48:27 +00:00
SinSloth
c88d0544cb * Updated hack check and added a weight check to Umbala Elemental Dismantler.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10523 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-05-10 15:17:32 +00:00
SinSloth
ace83da641 * Players can now dismantle more than one elemental stone at once from Umbala Shaman.
* Alchemists are now able to purchase up to 2000 Medicine Bowl.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10519 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-05-10 09:12:40 +00:00
ultramage
45c732b05d More eof eols (followup to r10401); skipping /npc/custom and /npc/samples
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10402 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-29 08:39:36 +00:00
Lupus
c6d5f38b75 removed all .GAT from all the scripts and tested
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10018 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-03-15 20:32:55 +00:00
FlavioJS
637ae9a4dc - Massive EOL normalization & 'svn:eol-style native' flag setting for all txt/conf/h/c files.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9410 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-05 13:23:07 +00:00
Lance
d4e444ebd4 - Removed security check since source level patch is applied. Reverted select(), created prompt().
modified   Changelog-Trunk.txt
modified   npc/airports/airships.txt
modified   npc/cities/amatsu.txt
modified   npc/cities/gonryun.txt
modified   npc/cities/hugel.txt
modified   npc/cities/lighthalzen.txt
modified   npc/cities/niflheim.txt
modified   npc/cities/valkyrie.txt
modified   npc/custom/eAAC_Scripts/disguiser.txt
modified   npc/custom/eAAC_Scripts/quest_warper.txt
modified   npc/custom/jobs/jobmaster.txt
modified   npc/events/idul_fitri.txt
modified   npc/jobs/1-1e/gunslinger.txt
modified   npc/jobs/1-1e/ninja.txt
modified   npc/jobs/novice/novice.txt
modified   npc/merchants/kunai_maker.txt
modified   npc/merchants/novice_exchange.txt
modified   npc/merchants/refine.txt
modified   npc/other/comodo_gambling.txt
modified   npc/other/dts_warper.txt
modified   npc/other/marriage.txt
modified   npc/other/powernpc.txt
modified   npc/quests/Lvl4_weapon_quest.txt
modified   npc/quests/gunslinger_quests.txt
modified   npc/quests/quests_ein.txt
modified   npc/quests/quests_umbala.txt
modified   npc/sample/monster_controller.cpp
modified   src/map/script.c



git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9267 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-11-20 10:11:20 +00:00
Lupus
c14578bf17 Small fix for Lance's security patches
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9263 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-11-19 22:30:03 +00:00
Lance
e291dd077e Applied security patches. PLEASE CHECK THEM ALL.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9260 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-11-19 05:12:30 +00:00
Vicious
af52fbb828 Fixed typo
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8936 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-10-05 08:14:55 +00:00
Lupus
b8f362eebd Added official chance of failure to Create Essence (u may get a Garlet instead).Added official random amount to Dismantle Stone
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8935 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-10-05 04:29:13 +00:00
Lupus
b5031d4255 extracted custom umbalian quests to custom folder
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8704 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-09-11 11:16:31 +00:00
evera
10160ebcfc standardized npc headers for quests/quests_city
fixed small typos in those files

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7546 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-06 05:44:16 +00:00
evera
c25735b2fa split some quests from cities/umbala.txt to quests/quests_umbala.txt
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7335 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-26 02:54:21 +00:00
Vicious
261c79eca2 constant-fied!
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5763 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-03-27 02:15:34 +00:00
Valaris
2178a86317 AS OF SVN REV. 5901, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.  EVERYTHING ELSE
GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5094 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-01-29 16:10:48 +00:00
Valaris
fd99753f8e Clearing trunk.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5091 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-01-29 16:00:45 +00:00
amber
d479e29aee Fixed some file types
git-svn-id: https://svn.code.sf.net/p/rathena/svn/athena@172 54d463be-8e91-2dee-dedb-b68131a5f0ec
2004-11-14 16:18:26 +00:00
Lupus
afdd9c05d8 Fixed Umbala, Umbalian Quests (Fabius' Umbalian language, Turban Thief Quest), Niflheim (fixed some bugs and fixed one big exploit 8)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/athena@20 54d463be-8e91-2dee-dedb-b68131a5f0ec
2004-11-05 22:54:52 +00:00
(no author)
706e785091 git-svn-id: https://svn.code.sf.net/p/rathena/svn/athena@2 54d463be-8e91-2dee-dedb-b68131a5f0ec 2004-11-04 23:25:09 +00:00