88 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
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
BrOgBr
fa4021d217 Fixed a mistake in 2008 headgear quest (#3344)
Fixes  #3343

Thank you @Kutikuti
2018-07-25 21:04:16 +02: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
9b1b7b1a2b Replaced hardcoded genders with constants (#1730)
* Replaced hardcoded gender codes in source

Introduced a new constant for the account based gender and replaced all hardcoded gender references to code 99 with it.

* Replaced hardcoded gender codes in npcs

Exported the gender constants into the script engine and replaced all usages with references to the constants instead of expecting a value behind them.

* Corrected a typo

Thanks to Machiezmo from Discord.

* Fixed an inverted gender logic

Thanks to @secretdataz
2016-11-22 21:20:03 +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
Jittapan Pluemsumran
2f9d44c3b1
Changed Job_SuperNovice to Job_Super_Novice in scripts to match source-side constant. 2016-07-08 14:32:10 +07:00
Atemo
3a45dd97f9 Another clean-up 2015-12-09 23:09:17 +01:00
Euphy
3813aaaadb Added 2013 iRO/kRO Christmas Event.
Updated item database with many new costumes.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-24 15:19:27 -05:00
Euphy
5d08795837 Implemented 2012 Headgear Quests.
Credits to @cydh for helping out with the quest bonus.
Follow-up 1a9b54: added missing SQL item_db entries.

Clarified description of "delayed consumption" item type (11) in item_db documentation. (tid:91187, thanks Annie!)

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-21 16:01:57 -05: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
Euphy
20153af6e0 * Script updates:
- Added new Renewal warpers for Satan Morroc maps.
- Updated "Succession of the Prince" quest with some new cases, and fixed checkquests.
- Updated portions of Ecology quest in 13.1 quests with new checks and cases.
- Added some missing 'disable_items' commands to 2004 Headgear quests.

* Other changes:
- Changed some strnpcinfo(1) -> strnpcinfo(0) in 13.2 quests. (bugreport:7853)
- Moved Rune Knight Kafra into main Kafras file.
- Revised documentation for 'addrid'. (follow-up 6572a9f)
- 'instance_id()' no longer throws an error upon failure.
- Fixed Desert Twilight/Sandstorm combo. (bugreport:7897, credits: Playtester)

Signed-off-by: Euphy <euphy@rathena.org>
2013-07-27 16:36:00 -04:00
Euphy
be95412ae2 * Updated Renewal EXP and re-added Pre-Renewal EXP support to lots of scripts. (blame: r15060, fixes bugreport:6288, completes r16545 update)
- Local quests: Alberta, Ayothaya, Einbroch/Einbech, Hugel, Lighthalzen, Louyang, Morroc, Moscovia, Nameless Island, Prontera, Rachel, Veins, Episode 13.1, Episode 13.2
- Other quests: Airship, Eye of Hellion, Kiel Hyre, Wandering Minstrel, Juperos, Brisingamen Seal, Megingard Seal, The Sign, Party Relay
- Mini-games: Hugel Monster Races, Turbo Track
* Deleted some useless 'break' commands and replaced some 'menu' commands in scripts.
* Documented the <NAVI> and <URL> tags. (Hercules 7e58225)
* Added documentation for "OnTouchNPC" in the special labels section.

Signed-off-by: Euphy <euphy@rathena.org>
2013-07-20 02:48:46 -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
3a330a455a * Part one of fixing bugreport:6527. This does not yet change functionality.
-- Added 'disable_items' to all applicable scripts.
-- Added preliminary source modifications. (Hercules 137cc43)
* Raised max stat for third jobs to 125 (follow-up r17133, bugreport:7295).
* Fixed logical issue with r17151. (Hercules 5c667cc)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17160 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-02-25 03:04:33 +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
29749ceaa8 - Replaced more -> rAthena (follow up to r15251).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16195 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-01 04:06:10 +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
8e4c5a3366 - Fixed NPC Position in 2006_headgears.txt
- Added new Headgear Quests and Cute Ribbon Dyer.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15344 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-01 18:05:40 +00:00
xantara
c31360c493 ` Updated 2005 Headgears Official Quests. Thanks to [Muad_Dib]
-- Fixed item check bugs
-- Added missing airport NPC
-- Took out unneeded breaks

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15299 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-29 00:38:52 +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
script-z3r0
c6da5906f8 Zealotus Mask Update (bugreport:4874)
Modified to use next; instead of close;

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15076 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-12 15:53:39 +00:00
calciumkid
9119423735 Quest bugfixes.
bugreport:4089, bugreport:3600, bugreport:5046

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15023 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-08 11:03:24 +00:00
L0ne_W0lf
25e986bc8a - Changed some duplicates so they use a floating NPC as their original. (bugreport:1395)
- Fixed the NPC looking for missing label in the Cursed Spirit quest. (bugreport:4654)
- Applied Uno's fix for the cooldown condition in Endless Tower. (bugreport:4677)
- Removed level requirement for the Viens Stone gathering quest. (bugreport:4678)
- Added the missing restricted skills to zone 6 for Endless Tower. (bugreport:4707)
  It's worth noting how much I hate the system for restricting skills per zone.
- Fixed Cat Hand warp service warping players to all warp options. (bugreport:4709)
- Fixed floor 75 warp in endless tower disabling the wrong warp. (bugreport:4711)
- Added a condition for Chungwolmang to only delete items if a certain ID is specified. (bugreport:4719)
- Corrected a mobcount specifying the wrong NPC in the Moscovia Ship quest. (bugreport:4736)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14697 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-02-06 22:10:54 +00:00
L0ne_W0lf
e7e55d4e06 * Added support for NPC names in the 'specialeffect' script command, go go copy/paste!
* Updated several NPCs to use the updated specialeffect command, updated more NPCs to use the updated emotion command.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14353 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-22 22:09:11 +00:00
L0ne_W0lf
0a11f3157f Replacing specialeffect/2 numerics with constants in quests.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13237 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-09-25 22:36:22 +00:00
Lupus
926ea62377 fixed wrong item names. minor
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12435 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-03-26 10:27:16 +00:00
L0ne_W0lf
66071c3330 * Removed "F_CheckMaxCount" as it seems "checkweight". preforms the aforementioned check in addition to checking weight.
* Updated 2004 headgear quests to use checkweight.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12256 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-02-28 04:46:29 +00:00
L0ne_W0lf
5b5caa7043 * Implemented new function F_CheckMaxCount.
- Checks if you have enough room in your inventory to accept items
* Updated 2004 headgear quests to fully official.
- Implemented usage of F_checkMaxCount in the 2004 headgear quests.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12255 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-02-28 03:32:45 +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
Playtester
e5c2908dce Fixed a typo
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11457 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-13 23:50:22 +00:00
L0ne_W0lf
2c61369250 * Fixed an assortment of typos and bugs care of yyCC.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11343 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-01 14:37:17 +00:00
ultramage
a6cd45f05d * Fixed north prontera kafra having an empty warp list
* Removed junk &#1038;A text from the 2004 headgears
* Changed deprecated Job_Alchem to Job_Alchemist (see r10904)
* Fixed a typo in a geffen city npc (Job_Merhcant)
* Fixed a typo in the Jobmaster custom script (Job_Gunsliger)
* Fixed one old eAAC Quest Warper bug (warp to nonwalkable coords)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10940 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-07-31 21:27:01 +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
L0ne_W0lf
2b54700d14 * Updated "Name" fields for 11.2 headgears.
* Updated NPCs for Al De Baran
- Added Inn NPC for Al De Baran
* Fixed problems with Hahoe/Lion/Bride masks quests.
* Added Zairik's fix for the wizard quest.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10879 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-07-13 18:32:28 +00:00
L0ne_W0lf
8bc79d319d * Updated 2006 headgear quests to semi-official dialog.
* Various updates to the various guild Castle scripts.
- Added Guild Master Room protection. Further security so only the master of the current castle can enter the treasure room.
- Updated Guild Castle Flags  again. Updated remaining dialogs to official.
- Updated a couple announces for when the Emperium breaks. Both are now up to par with iRO.
- Moved nguild to the events folder and commented it out, as it was a kRO event that was used twice. Updated .confs to reflect this change.
* Added the first class skill resetter into Prontera. She resets players under base level 40 who are first or expanded class.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10669 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-04 01:11:21 +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
ultramage
8d21e81cf9 My attempt at fixing the zealotus mask npc, now correctly requires a whip
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10078 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-03-27 10:24:06 +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
ultramage
3266ced856 More typo fixes
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9714 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-01-26 15:01:39 +00:00
ultramage
e034ce07bb Typo hunt
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9684 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-01-21 12:12:04 +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
7935fd82c4 Fixed event's label for many quest-spawned monsters
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9386 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-02 02:20:32 +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
Lupus
cb360fa59c amatsu field hydra id fix
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9125 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-11-03 06:19:29 +00:00
Lupus
e4a1ac01ae merged from trunk to stable. Fixed item names in 2006 headgear quest, DTS warper typos
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9122 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-11-02 11:01:17 +00:00
MasterOfMuppets
5eac0942c6 A small fix to the 2006 headgears quest, thanks to Belle for telling me about the problem.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8549 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-30 14:51:48 +00:00