38 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
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
befc6123be Fixes some bug in npc/cities folder and corrected syntax
Corrected some npc view
2016-02-11 02:06:10 +01:00
Euphy
14fddd3790 Added script checks against swapping items using third-party hacks.
- Follow-up to 416f6d7, as further protection against item exploits.

Contains a few other fixes.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-08-22 15:36:23 -04: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
32b8d2e713 * Implemented Bakonawa Extermination quest.
* Misc. cleaning.

Signed-off-by: Euphy <euphy@rathena.org>
2013-08-07 02:47:45 -04:00
Deadly Silence
7beb7edc77 Minor bug fixes
[npc/cities/geffen.txt]
- fixed bug with Psychic Advisor (bugreport:7928)

[npc/quests/seals/megingard_seal.txt]
- fixed small bug with Librarian where he would spam the NPC dialogue
  because of a misplaced "next"

[npc/re/merchants/enchan_mora.txt]
- fixed bug with wrong enchants (bugreport:7930)
2013-08-06 23:46:24 +02: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
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
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
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
samuray22
f78f7d20f6 * Continues replacing of specialeffect/2 numerics with constants.
* Corrected an If to continue the President's Quest. (bugreport:2276)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13241 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-09-27 12:41:13 +00:00
DZeroX
f45a8f2c82 - Optimized several NPCs
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12562 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-11 08:48:41 +00:00
Lupus
2ceaa360e2 fixed broken dialogues
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12466 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-03 17:22:46 +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
07a22ae76c * Small bug fix in the Geffen NPCs (end -> next) care of Lesbian.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11376 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-07 17:02:10 +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
L0ne_W0lf
4f506125ab * Updated header for Morroc City.
* Finished updating Geffen awhile back, and forgot to commit it.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10863 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-07-07 19:00:20 +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
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
evera
1a5ce835a6 Split quests from cities/einbroch.txt
+ quests/quests_einbroch.txt
Fixed some small typos
Added $talk to garbage clean-up

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7457 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-03 18:35:29 +00:00
musashiden
6a94ba5e7e * Fixed some typos and coordinates
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7328 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-24 16:26:36 +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
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
ajarn
e92f591372 git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@715 54d463be-8e91-2dee-dedb-b68131a5f0ec 2004-12-22 07:33:09 +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