37 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
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
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
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
af8ef75a53 * Added "Cat Gamers" to Malangdo quests. This marks the completion of the Malangdo episode.
* Implemented Port Malaya Kafras, guides, sailors, and Eden teleporter.
* Edited documentation for 'sc_start' and 'addmonsterdrop'/'delmonsterdrop' commands. (follow-up r17326, r17237)
* Updated atcommand documentation and help file.
* Minor organizing of script locations.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17328 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-05-15 05:16:19 +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
f54be649cd > Pre-Renewal fixes, major credits to Deep Forest for his detailed reports:
* Separated Renewal Alberta features with checkre() and new files, follow-up r16125 (bugreport:7041).
* Moved remaining Renewal shops out of pre-Renewal file, follow-up r16138 / r16104 (bugreport:7042).
* Moved Renewal refining features to a separate file, and made some changes, follow-up r16126 (bugreport:7043).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17042 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-24 17:30:14 +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
masao87
c61f99302b - Updated some Alberta NPC Locations to match with the new Map. Also updated the coordinates in the Alberta Guide NPC. bugreport:5273
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16125 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-17 14:05:14 +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
be6df0dc11 * Updated Kunlun NPCs and warps.
- Didn't update the Kunlun 'Power' npcs
- Updated Lutie and Comodo warps.
* Fixed some slight inconsistencies with the some script headers.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12014 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-01-05 21:32:34 +00:00
L0ne_W0lf
3c65f35146 Updated Amatsu NPCs, Quests, and Warps.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11887 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-11 18:38:55 +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
ultramage
0826609dbd NPC typo fixes, eol style definitons, newline at end of file
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10738 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-06-10 08:45:19 +00:00
Lupus
ccf78f9c6b revised 1/3 of cities scripts
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10456 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-05-04 19:34:39 +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
ultramage
06f0d60116 Some generic typo fixes (src and npc)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10054 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-03-22 21:03:19 +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
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
evera
ec04511231 * Added missing NPC name in text and next;'s in npc/quests/bongunsword.txt,
- npc/cities/amatsu.txt, and npc/merchants/socket_enchant.txt. (Thanks $ephiroth) [Evera]

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8603 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-09-04 00:36:56 +00:00
evera
4c3ada69c7 split quests from cities/amatsu.txt to quests/quests_amatsu.txt
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7789 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-21 00:30:34 +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
MasterOfMuppets
c24697b09a Implemented a missing npc in Amatsu and the momotaro event.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7114 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-13 00:53:28 +00:00
MasterOfMuppets
1124594e67 Implemented Amatsu guides and changed/removed some Amatsu warps.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7097 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-12 13:00:36 +00:00
eaac
686cba8151 * Added kunai_maker.txt to make elemental kunais. [erKURITA]
* Added new npcs @ que_ng.gat ninja map portion. [erKURITA]
* Added new shops @ que_ng.gat ninja map portion. [erKURITA]
* Commented wrong shops @ amatsu.txt. [erKURITA]
* Added que_ng.gat ninja map portion's warp. [erKURITA]
* Modified and corrected the gunslinger quest. [erKURITA]
* Changed the prices of the ninja stones according to kRO. [erKURITA]

All the kRO related info is thanks to RockmanEXE

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6448 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-02 17:52:11 +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
(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