61 Commits

Author SHA1 Message Date
Sapito Sucio
8be1f819d9
General typos (#8000)
* Fixes typos in several NPC.

Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
Co-authored-by: Aleos <aleos89@users.noreply.github.com>
2023-11-10 12:51:01 -05:00
Atemo
69802a23fb
Suggestion: NPC name as parameter in enablenpc (#6233)
* The required NPC name parameter is now optional for the following script commands:
    enablenpc
    disablenpc
    hideonnpc
    hideoffnpc
    cloakonnpc
    cloakoffnpc
    isnpccloaked
* Updated docs

Co-authored-by: Aleos <aleos89@users.noreply.github.com>
2021-09-09 14:50:24 +02:00
Daegaladh
354c632732
Fixed place names and other typos (#4475)
* Fixed common misspelled names from iRO and other typos.
2019-12-15 20:55:19 +01:00
Lemongrass3110
fdc48770aa
Fixed a few typos and language mistakes (#2781)
Thanks to @Everade, @zackdreaver, @Atemo, @Akkarinage and @aleos89.
2018-04-04 10:13:00 +02:00
Lemongrass3110
16780638be
Fixed a few name typos with Niflheim (#2782)
Thanks to @Daegaladh for his input
2018-01-09 23:36:20 +01:00
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
Lemongrass3110
9040613fa6 Added missing empty newlines to a lot of files 2016-11-23 13:54:45 +01:00
Yohanes Edwin
162c5a2c86 Fixed issue #1622: If player and NPC get same number of dice but the total is lower than 8 (#1650)
* Resolves players getting stuck in Airship Dice Quest.
Thanks to @MuzTank!
2016-11-11 16:25:28 -05: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
Atemo
3a45dd97f9 Another clean-up 2015-12-09 23:09:17 +01: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
97687ca10c Global_Function updates.
* Added the following functions:
  - "F_GetPlural" (returns plural of noun) / "F_InsertPlural" (returns plural if arg != 1)  [credits: EnglishClub for formation rules]
  - "F_InsertArticle" (returns 'a' or 'an' preceding word)
  - "F_InsertComma" (formats number with commas)
  - "F_GetNumSuffix" (formats number with '-st', '-nd', '-rd', or '-th' suffix)
* Added and removed new functions where necessary. (incomplete)
* Added new types to "F_GetArmorType" function, and weapons will now pass to "F_GetWeaponType".
* Reformatted comments.

Other changes:
* Removed some garbage text from scripts.
* Slight edits to custom warper script.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-03 20:13:44 -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
Euphy
11860e2e1f * Script updates:
- Added warpers and duplicates for Izlude (izlude_[a-d]) and Prontera Field 8 (prt_fild08[a-d]) maps.
- Updated Eden Group warpers and added new duplicates.
- Changed "Kelitula Academy" to "Cryptura Academy".
- Added a missing OnMyMobDead label in Buwaya Cave instance. (bugreport:7929)
- Added version information to Airport script headers.

* Mob spawn organization:
- Split "City Cleaners" into Pre-Renewal and Renewal directories.
- Restored Thief Bug (Pre-Renewal) vs. Thief Bug Egg (Renewal) spawns.
- Created "Town" spawn files, holding all city spawns not in "City Cleaners" files.
- Added Prontera Training Dummies and Alberta Ship Mouses.
- Moved Jawaii spawns from "fields/" into "towns.txt".
- Moved Brasilis spawns from its own directory into "towns.txt".

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-05 19:42:00 -04:00
brianluau
36e361c36b - Fixed a small typo in Airship announcements. (bugreport:6687)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16777 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-09-13 17:17: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
gepard1984
9e913e885f Updated Apple Gambling script to official.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15637 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-02-28 22:28:19 +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
brianluau
3aede46965 - Removed trailing tabs, and fixed some spacing.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15524 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-30 16:02:55 +00:00
og2
361a3ea771 * Fixed variables in order to work with the invasion (bugreport:5231)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15512 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-23 18:26:16 +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
e84ca342c0 - Fixed a divide-by-zero error in airships.txt (bugreport:651)
- Fixed a typo in Crusader jobchange quiz. (bugreport:443)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15074 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-12 13:02:55 +00:00
brianluau
27fce212ed - airship.txt: changed temporary char variables to scope,
changed temporary global variables to NPC variables.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15073 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-12 12:58:54 +00:00
L0ne_W0lf
56def26c05 Mob chat now strips "#unique" names off monsters, curtosy of Daegaladh.
Touched up the Airship scripts. Fixed up some content based on official files.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14392 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-22 02:31:17 +00:00
brianluau
926d6f8a06 - Fixed an unconverted variable in an airship npc. (bugreport:4329)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14354 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-24 17:32:40 +00:00
Kisuka
d95ad1e02a - Small fix to zeny check in airships.txt (bugreport:2763)
- Fixed a typo in thana_quest.txt (bugreport:2783)
- Added missing dialog to Biological Weapon Quest. (bugreport:2778)
- Optimized and fixed getequipname() in card_remover.txt (bugreport:2156)
- Added missing npc name in Lvl4_weapon_quest.txt (bugreport:2764)
- Updated item scripts for 12294 to 12297. (bugreport:2766)
- Updated item 1483 (Ivory Lance). (bugreport:2753)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13537 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-02-18 23:57:29 +00:00
Paradox924X
61c61b6fe9 Updated Poring Tower to not refinable. (bugreport: 1050)
Renamed custom Stylist to Stylist#customstylist to avoid conflicts with official one. (bugreport: 1042
Updated Airship Typing Challenge to not fail you when you get both strings correct. (bugreport: 1008)
Fixed Job_Change Function to properly jobchange babies. (bugreport: 943)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12368 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-03-15 18:51:07 +00:00
Paradox924X
9ffa57318e Fixed Hugel Airship Staff from teleporting you to the wrong airplane.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12226 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-02-21 20:51:57 +00:00
L0ne_W0lf
a9cc8dbed6 Updated some Airship/port npcs
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12182 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-02-07 06:29:22 +00:00
L0ne_W0lf
5550180be2 * Updated NPC headers to fix errors caused by rev. 11603.
- Note: non-standard loaded scripts need to be checked for errors/duplicates.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11605 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-28 23:36:53 +00:00
L0ne_W0lf
1607b50c59 Uncommented the ShowWarning and ShowDebug from rev. 11508, and cleaned up the warnings it produced.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11516 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-18 22:04:47 +00:00
ultramage
1069e3524c * the mapserver won't exit when no mapcache is found, with use_grf: yes
* Fixed some \r uses, now looks better; /thx to Ai4rei (topic:165952)
 * Removed that ridiculous spinner that displays during map/npc loading, and added a more informative progress indicator (idea from jA/eapp)

 * Checked/fixed/removed some old script and npc commands
  * cmdothernpc - a specialized 'donpcevent' with the event specified as two arguments
  * enablearena/disablearena - completely equivalent to enablewaitingroomevent & co.
  * inittimer/stoptimer - removed since its logic was incompatible with the code it depended on
 * Removed loads of code that supported these functions. Result: -100b per npc => -1,5MB of wasted memory
 * Fixed related npcs that erroneously used 'stoptimer'

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11374 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-06 15:35:31 +00:00
ultramage
4814888f0d * Moved quest_variables.txt to /doc
* Added comments to some getitem/delitem calls
* Disabled nightmare drop in the custom mvp arena script
* Fixed problem with baby novice + swordsman quest (topic:160247)
* Fixed a typo and problem in the airship typing challenge

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11138 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-09-07 20:41:23 +00:00
ultramage
e7e0ddde9d Fixed certain typos in src/npc/doc files
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11102 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-09-01 08:14:36 +00:00
samuray22
d21f32aa73 * Rev. 10893 Correct some typos error like "next;ing".
-Thank to theultradamage

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10893 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-07-22 18:12:12 +00:00
samuray22
a0267ae9f1 * Rev. 10891 Fixed a Little bug on "How does the Airship Works" Quest.
-Thanks to Tantarian

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10891 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-07-22 18:01:36 +00:00
samuray22
926206dd08 * Fixed a Little Bug with the "How Does the Airship Work" Quest.
-Thanks to Playtester ^^U.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10778 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-17 22:01:48 +00:00
SinSloth
2c86752e59 * Added all Hugel-related quests. Thanks to MasterOfMuppets for scripting most of them.
- Updated some Hugel, Lighthalzen, Einbroch and Airship NPCs regarding those new quests.
- Moved a lot of Hugel NPCs to proper quest file.
* Added Odin Temple Excavation quest.
- Updated Hugel warps and Odin Temple Sailor according to the quest.
* Added Heart Fragment quest.
* Updated Ayothaya's Ring quest to official. Credits to MasterOfMuppets.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10772 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-15 16:01:40 +00:00
samuray22
53e54581de * Added Few missing NPCs to the Airplane
- Changed name form girl#10 to the Official name "Dianne".
* Added "How Does the Airship Work" Quest.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10422 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-30 19:43:44 +00:00
ultramage
a6e61e1d2f Gave each file an empty last line, to make svn happier
Added svn:eol-style native where missing
Removed remaining .gats

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10401 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-29 08:17:53 +00:00
Playtester
c667825023 * Added Rachel to the airship route
- why was it still missing?
- thanks to Articulus for scripting most of it

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10305 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-21 23:59:49 +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
ultramage
a66e23aa18 Corrected all Schwarzwald typos (except for the WIP one)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9867 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-02-15 13:43:09 +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
KarLaeda
78d9c69d88 Cleaned up global permanent variables in Airship Quest
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9306 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-11-24 11:24:21 +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
Lance
42e26b0423 Updated scripts with select().. THERE ARE TONS OF THEM!! Will somebody give me a hand or something? :B
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9259 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-11-19 04:46:50 +00:00
Lupus
7367e7aa5f Many small scripts fixes - tabs, parenthesis, typo
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9137 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-11-04 22:59:57 +00:00