184 Commits

Author SHA1 Message Date
Lemongrass3110
9040613fa6 Added missing empty newlines to a lot of files 2016-11-23 13:54:45 +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
Lemongrass3110
644e294699 Merge branch 'master' into woe_te-restrictions
# Conflicts:
#	npc/re/mapflag/nobranch.txt
#	npc/re/mapflag/nomemo.txt
#	npc/re/mapflag/noteleport.txt
#	npc/re/scripts_athena.conf
#	src/map/atcommand.c
#	src/map/map.h
#	src/map/script.c
#	src/map/script_constants.h
2016-09-29 08:13:31 +02:00
Cydh Ramdh
7d72a70c5c Follow up 61a57668ed30b30b2eb43798e97d5f82e3610cde
* Missing semicolon

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2016-09-15 09:38:19 +07:00
Lemongrass3110
61a57668ed Nightmare Glastheim (#1541)
Originally released by @Ridley8819 on HerculesWS/Hercules@114767c

Additions:
Added drops for Baphomet and Chimera
Removed duplicated champion monsters

@aleos89 cleaned up NPC dialogue and some of the grammar.
2016-09-14 08:19:14 +02:00
Jittapan Pluemsumran
8d60ed2205
Adjusted Nightmare Clock Tower warper to use scope variable instead of temporary char variable 2016-09-09 08:46:31 +07:00
Jittapan Pluemsumran
d074cf67a7
Revert "Corrected Mora Daily Quest Job EXP formula"
This reverts commit 3607efd5c692faa783e85cc56aa69b3a209da7d9.
2016-09-08 13:18:52 +07: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
Lemongrass3110
a7be32f754 Nightmare clocktower (#1518)
* Nightmare clocktower

This is a merge from HerculesWS/Hercules@88c5a47 originally done by @Ridley8819.
All the credits belong to him.

@aleos89 cleaned up some of the grammar and removed duplicate texts.
@secretdataz added the missing mapflags.
@Atemo adjusted Cursed Book item script
2016-09-04 22:41:47 +02:00
Jittapan Pluemsumran
fb85ce207d
Fixed a bug in Theore's Request quest that allows the player to bypass some steps.
Closes #1533. Thanks to @Indigo000
2016-09-03 22:35:58 +07:00
Jittapan Pluemsumran
3607efd5c6
Corrected Mora Daily Quest Job EXP formula 2016-09-03 15:18:17 +07:00
Atemo
2995ba0908 Mapflag:
- added monster_noteleport in TE castle (need official info)
Missions:
- corrected playtime check value
God quest TE:
- Changed $@2012_tegod_kafra -> $2012_tegod_kafra ; $@2012_tegod_gloria -> $2012_tegod_gloria as it should be
- Corrected lowest economy set to 1
- Minor debug and standardise script
WOE main script:
- Added a condition for mobs spawn (case guildbreak)
2016-09-02 01:36:16 +02:00
Atemo
58c0920e5d Applied new npctalk syntax to the existing scripts 2016-08-31 19:12:12 +02:00
Atemo
55b30623fc Fix a small typo 2016-08-31 19:02:09 +02:00
Cydh Ramdh
0df1ba0a20 TE Updates
* Implemented `job_noenter_map.txt` for TE maps.
* Added job list that cannot enter TE Castles and Guild Dungeons.
* Replaced `getpermissionwoete` with `jobcanentermap`.
* Added missing quest `7516`.
* Fixed typo in TE Mission NPC.

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2016-08-31 14:42:49 +07:00
Cydh Ramdh
fa16e30593 TE updates:
* Change God Item final broadcast from `mapannounce` to `announce`.
* Fixed variable typo in `#tequest_master_prt01` NPC. `$@2012_tegod_kafra` to `$@2012_tegod_gloria`
* Missing `OnMyMobDead` label in `#tequest_master_prt01` NPC.
* Corrected the castle Economy and Defense lowest level is 1, not 0.

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2016-08-30 19:36:13 +07:00
Cydh Ramdh
8805e7e1d8 Merge branch 'master' into woe_te-restrictions 2016-08-27 07:04:41 +07: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
85f44a587d Removed useless lines 2016-06-22 15:50:40 +02:00
AtlantisRO
cfe7e3efc6 Added use of F_HasEdenGroupMark function. 2016-06-21 03:44:31 -06:00
AtlantisRO
3a526c7ca0 Added support to Para_Team_Mark_ in Eden Group. 2016-06-20 21:28:20 -06:00
Atemo
aed00e0b33 Fix issue #1361
Pintados Festival never ends.
2016-06-13 15:42:14 +02:00
Atemo
3a558ff83b Rename canParticipateSiegeTE into getpermissionwoete 2016-04-04 20:35:58 +02:00
Atemo
b3d150c3a5 Merge branch 'master' into woe_te-restrictions 2016-04-04 20:22:25 +02:00
Jittapan Pluemsumran
bd6539a9ba Follow up to c23688c
Unify all checks into one function.
Suggested by @Cydh.
2016-03-26 10:52:30 +07:00
Jittapan Pluemsumran
c23688cea4 Clean up basic skill checks 2016-03-23 21:11:57 +07:00
Atemo
15d27a4ad9 Corrected the announce of the party name when entering MalangdoCulvert instance
Updated dialog to offical for Eden 140
2016-03-17 03:38:14 +01:00
Atemo
bb66035048 Removed duplicate of canParticipateSiegeTE
Added some mapflag
Corrected typo in god quest
2016-03-12 16:27:47 +01:00
Lemongrass3110
614a010f59 Fixed two missing color markers
Fixes #1017
2016-03-06 16:08:43 +01:00
Atemo
db53e580af Typo update 2016-02-29 20:06:24 +01:00
Atemo
883b5cc919 Little update 2016-02-24 04:45:47 +01:00
Atemo
a27a545332 Fixed dialog 2016-02-23 21:58:30 +01:00
Atemo
cc645c7e00 Fixed issue #966
Thanks @Tokeiburu
2016-02-17 03:14:17 +01:00
aleos89
0a77835029 Unit Controller Updates
* Added missing UMOB_CANMOVETICK option.
* Restructured script command getunittype return values to match the order of script command getmapxy to allow for more universal usage.
* Created constants for script commands getmapxy and getunittype.
* Updated NPCs using script command getmapxy to use the new constant values.
* Updated Battleground NPCs to use constant value for script command setunitdata.
2016-02-04 10:47:16 -05:00
Atemo
6a62aab6d4 Merged Hercules@de7a8c0eaaeeb0994f58c8b419e5d2523c7df5a7, Eden quest were giving wrong equipments.
Merged Hercules@c7c956f71e63c9dd477c59d778c25690c6267b83 and fixed another bug in Collect Poison Spores case
2016-01-12 23:02:08 +01:00
Atemo
d6343fba9e Fixed issue #840 2015-12-15 02:19:49 +01:00
Atemo
0af2a80d06 Fixed some typo and change classchange to setnpcdisplay in novice adacemie #800 2015-12-11 00:44:39 +01:00
Atemo
3a45dd97f9 Another clean-up 2015-12-09 23:09:17 +01:00
Atemo
d46cf4b35e Corrected Tutorial Instructor dialog 2015-11-24 19:34:08 +01:00
Atemo
031c522c8a - Fixed F_CashSiegeTele typo in item_db.
- Moved VIP_Third_Class function from other/CashShop_Functions into other/re/CashShop_Functions (only used in re folder).
- Fixed a mistake in quests/quests_nameless.txt blame me  36f337ea41a876ef471bfbb78128e35fa0d9aa56
- re/quest/quests_eclage clean-up and bug fix

Signed-off-by: Atemo <capucrath@gmail.com>
2015-08-04 15:16:56 +02:00
Cydh Ramdh
6ad4ed13d1 * Added script command showscript "<message>"{,<GID>}; by using clif_showscript.
* Removed hardcoded message that displayed clif_showscript for `transform` script, replaced its usage for item script by using `showscript`.
* Changed unittalk usage on `F_Cat_Hard_Biscuit` and `F_Rice_Weevil_Bug` function in quests_malangdo.txt.

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2015-06-19 00:37:48 +07:00
Atemo
36f337ea41 Corrected :
-	variable typo in quests_nameless.txt
-	Suspicious Man#1 NPC localization and Xtrigger/Ytrigger in quests_nameless.txt
-	redundant message in eden_quests.txt

Merged :
-	warp eclage Hercules 64dfaf2c8c8be7ff288ea88a64eddfeae1e364a4
-	Deadman NPC localization in quest_disguiseloliruri.txt Hercules 450b0a3aeb6b472805c470712a0e6ebd9d04eb2a
-	NPC name in eclage Hercules 87beda59c824e9be6db6f86c02983ed2a44c4016 and daf5312ee4d1de6dd43b23f719e94427aeb33e5d

Signed-off-by: Atemo <capucrath@gmail.com>
2015-06-06 20:36:02 +02:00
Capuche
dd3e7e1710 Corrected typo in adven_boards.txt thanks grammatic@aleos89
Update lvl4_weapon_quest.txt, Hercules 169b3faae19e23a303a094fe26e181a8c1b1c6c7
Fix delitem bug in Ep13.1 quest. Hercules 9d1853aebd3ff34ed7869a3b1188943624078b8e
Corrected Tree Roots Location Hercules ca9cd51e683d39c8a7f099a46747ff166d632230

Signed-off-by: Capuche <capucrath@gmail.com>
2015-04-06 23:24:12 +02:00
nanakiwurtz
5eede89b49 Minor Typo 2015-04-07 00:26:21 +07:00
nanakiwurtz
36462526a9 Eden Mace and Eden Staff swapped
* Thanks to @Desground

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-04-04 09:53:39 +07:00
musashi076
82767650d1 Corrected Tiucknuc mob name into Tiyanak
To avoid confusion in Tiyanak Mob Hunt.
2015-03-20 13:41:52 +08:00
Capuche
001e6967d4 Fixed some variables issues and cleaned Instructor Boya and Michael
Signed-off-by: Capuche <capucrath@gmail.com>
2015-02-19 01:09:30 +01:00
Capuche
6552a184f6 Follow up 7e997bf267e937d314ec594650284fa7f82358cd fixed a mistake 2015-02-16 18:59:00 +01:00
Capuche
7e997bf267 Updated Blacksmith Thorn and Weapons Expert NPC
Signed-off-by: Capuche <capucrath@gmail.com>
2015-02-16 01:31:18 +01:00
Capuche
90d9da18e1 Updated instructor Ur's quests
Signed-off-by: Capuche <capucrath@gmail.com>
2015-02-08 00:57:01 +01:00