57 Commits

Author SHA1 Message Date
Sapito Sucio
f000e76ba4
Fixed some typos in several city scripts (#7995)
Co-authored-by: Daegaladh <Daegaladh@users.noreply.github.com>
2023-10-30 09:43:27 +01: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
Atemo
3a8814ac4e
Fixed Regenschirm Guard Laboratory Permit issue (#3056)
Thanks to @juanfus !
2018-04-16 17:01:01 +02: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
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
Atemo
88635c010a Updated the second entrance to Biolabs. 2016-05-28 20:45:36 +02: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
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
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
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
a49d7f6afd * Added missing Hair Dressers and Hair Dyer to Lighthalzen.
- Hair Dresser will change hair styles ranging between 20 to 27
- Assistant Beautician changes to a random style and colour between 1-23.
* Updated the Cursed Spirit quest, and added some more town NPCs.
* Added more town NPCs to Splendide and Manuk.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14780 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-04-08 19:03:24 +00:00
L0ne_W0lf
e4ae836f44 Updated some more cash shop boxes to use rentitem instead of getitem.
Added mercenary skills for Mimic, Disguise, Alice, Doppelganger, and Egnigem.
Removed duplicate NPCs in Lighthalzen and Morroc. (bugreport:4555)
Corrected typo (Sit -> Suit) in enhcant_arm NPC. (bugreport:4586)
Corrected a typo in the christmas_2008 event. (bugreport:4600)
Changed which White Lady spawns in endless tower. (bugreport:4601)
Also added Quest Log Entries to Endless Tower, please test.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14552 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-03 02:24:34 +00:00
Gepard
8ae23f01e2 Fixed KvM announcements showing during WoE:SE (bugreport:4335).
Added missing Lighthalzen NPC (bugreport:4319).
Fixed checkweights in Manuk & Splendide shops.
Fixed some condition checks in Moscovia quests.
Fixed some typos in Sealed Shrine and Manuk quests dialogues.
Added missing global var check in Yggdrasil Dungeon Floor 2 puzzle.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14360 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-07-03 11:29:29 +00:00
brianluau
7dcad16f3c - Fixed some emotions triggering on the wrong npc. (bugreport:4303)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14346 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-18 05:05:33 +00:00
L0ne_W0lf
0143414445 * Completely rescripted the DTS warp service based on the aegis 11.3 file.
- Updated F_ClearGarbage to erase obsolete DTS player variables.
- Moved Cool Corp. Staff NPCs to Lighthalzen (cities/lighthalzen.txt.)
- Now everyone can enjoy the global broadcast "every-hour-nag" to vote!
- Note: Upon loading ALL prior DTS global variables are erased.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13764 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-05-12 21:52:11 +00:00
L0ne_W0lf
6ef5c37fd3 * Continues replacing of specialeffect/2 numerics with constants.
- A lot of files still remain, but they don't have the proper effect names in commented in beside the ID. ;P
	

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13238 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-09-25 22:41:48 +00:00
shadow
f1ef7aee29 Another fix to Lucius (trivial) on /cities/lighthalzen.txt. (bugreport:1125)
Fixed Inn Employee#Ahlma warping to same destination as save point, bugreport: 191.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12777 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-06-07 15:07:49 +00:00
L0ne_W0lf
60db8e94f3 Another fix to Lucius. (bugreport:1118)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12309 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-03-06 18:19:09 +00:00
L0ne_W0lf
b018ddb3d2 Added Auction file. (Disabled until auctions work)
Removed auction NPCs from Lighthalzen, and fixed bugreport:1103.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12283 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-03-03 16:37:57 +00:00
L0ne_W0lf
1e2c57d2c3 Updated Lighthalzen Town NPCs and Speed Potion quest.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12155 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-02-01 00:07:20 +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
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
SinSloth
949d0cb44e * Added President quest aka. Schwartzvalt Trilogy. Please encourage your players to test it.
- Moved some NPC and fixed some typos in Lighthalzen and Einbroch due to the quest.
- Updated Yuno Government Buildings warps according to the quest.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10540 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-05-14 10:05:11 +00:00
SinSloth
31d9352326 * Added Cursed Spirit Quest.
- Moved some NPCs and warps related to the quest in proper file.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10503 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-05-08 11:39:03 +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
Lupus
d8ad119135 updated Lighthalzen, merged some files, added new NPC
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10247 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-13 15:57:18 +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
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
Lupus
b0ff60c47b git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8806 54d463be-8e91-2dee-dedb-b68131a5f0ec 2006-09-19 11:08:21 +00:00
MasterOfMuppets
b1a05212b2 Added a missing feature to the donation NPC in Lighthalzen.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8655 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-09-06 16:01:18 +00:00
toms
d7156f2f21 Tried to remove all duplicates (in default NPCs)
( hope nothing is broken ;) )

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8581 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-09-01 22:11:36 +00:00
DracoRPG
94f427f6c3 Various NPC fixes
* LUPUS, REMEMBER TO ACTUALLY ADD THE DIVORCE NPC, THANKS :P *

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8571 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-09-01 10:59:14 +00:00
DracoRPG
d42fb96de3 Random Homunculus cleanup
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7857 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-24 16:58:29 +00:00
Playtester
db2a9e7c96 * Commited Silent's Fix to the duplicate NPCs
- needs testing
- can't be fully fixed because of length limitation of names

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7200 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-16 10:02:18 +00:00
Playtester
6efcf5a2f2 Fixed some typos in Lighthalzen
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6988 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-05 20:39:59 +00:00
MasterOfMuppets
b0e6eb1cd0 Implemented the Lighthalzen guides, added some missing warps and a tool dealer.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6846 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-30 15:25:37 +00:00
MasterOfMuppets
695c50d514 Implemented the second entrance to biolabs and added some crap NPCs. The sewer pipe does no longer require a lab passport, but it requires completion of the cube quest. The second entrance to biolabs does not require completion of the cube quest, but it does require a lab passport.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6804 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-28 17:05:19 +00:00
MasterOfMuppets
d86077034d Bah, fixed..
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6800 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-28 12:52:19 +00:00
MasterOfMuppets
afcc753c69 Revert.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6799 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-28 12:51:08 +00:00
MasterOfMuppets
140c52ba99 Fixed a mistake causing an NPC to appear in bio labs 3 instead of Lighthalzen
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6798 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-28 11:54:32 +00:00