3259 Commits

Author SHA1 Message Date
aleos89
d3625e5c10 Cleaned up merge issues. 2015-02-21 15:43:58 -05: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
Atemo
9849945756 Merge pull request #286 from emistry/patch-2
Fixed Issue #283
2015-02-16 22:31:17 +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
Cydh Ramdh
9d3d34205f Skill DB clean ups
* Changed skill_db array to better memory allocation.
* Reduced MAX_SKILL_LEVEL from 100 to 10 (part of Hercules 0f4a50d135), also has changes on skill_get checks for skill level that more than 10.
* Reduced MAX_SKILL from 5020 to 1200 (actually only 1109 skills are used).
* Added macros for checking Homunculus, Guild, Mercenary, & Elemental skill ranges.
* Added skill check & index validation when player logged in and when @reloadskilldb.
* Corrected `enum e_skill_flag` order for SKILL_FLAG_REPLACED_LV_0's sake.
* Merged 'addtoskill' script command just as alias of 'skill' script command.
* Fixed #277
* Changed 'skill' script command flag to constant value

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>

NOTE:
* Decreased memory usage by map-server reduced up to 50 MB.
* Decreased memory for each player because of mmo_charstatus::skill[] only has 1200 array, before is 5020.
* Please use skill_get_index() for accessing sd->status.skill[] or skill_db[], don't reckless use skill_id as array index.
* Please import upgrade_20150211_skillset.sql

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-02-12 15:50:50 +07:00
Emistry
9fa7a5fd50 Issue #283
Enable same items to be added to different category.
2015-02-12 08:59:16 +08:00
Capuche
cc1e89012f Follow up abc78e51f7de938c881d45720da67e3fef3450a5
Signed-off-by: Capuche <capucrath@gmail.com>
2015-02-11 23:11:47 +01:00
Lemongrass3110
abc78e51f7 Fixed friendship quest questlog
Added a check if the quest was already added to the questlog.
Additionally removed some AEGIS logic that was converted without thinking.

Fixes #241
2015-02-10 23:50:26 +01:00
Aleos
0e533fa7ab Revert "Skill DB clean ups" 2015-02-10 09:33:00 -05:00
Capuche
90d9da18e1 Updated instructor Ur's quests
Signed-off-by: Capuche <capucrath@gmail.com>
2015-02-08 00:57:01 +01:00
Capuche
0bebbe6c05 Typo in lv4_weapon_quest (Hercules 3d47fdff7ddae8e5f028425c653dccc4ecfcfed5)
Fixes Biolab Enchant (Hercules 265ec7e012d3414e5fc4b3360c0795b4697663f6)
Fixed Eclage Quests (Hercules 1b0eacd770b128b02d3300b7efe05da136bbed3d and 7d93099232dcf3c74349a99d9fa891927f2351d6)
2015-02-08 00:14:26 +01:00
Aleos
da081129d5 Merge pull request #264 from rathena/cleanup/skill_db
Skill array clean up
- Changed skill_db array to better memory allocation.
- Reduced MAX_SKILL_LEVEL from 100 to 10 (part of Hercules HerculesWS/Hercules@0f4a50d), also has changes on skill_get checks for skill levels greater than 10.
- Reduced MAX_SKILL from 5020 to 1200 (only 1109 skills are used).
- Added macros for checking Homunculus, Guild, Mercenary, and Elemental skill ranges.
- Added skill check and index validation when player logs in and on use of @reloadskilldb.
- Corrected enum e_skill_flag order for SKILL_FLAG_REPLACED_LV_0's sake.
- Merged 'addtoskill' script command just as alias of 'skill' script command.
Summary:
- Decreased memory usage by map-server up to 50 MB.
- Decreased memory for each player because of mmo_charstatus::skill[] array size from 5020 to 1200.
- Please use skill_get_index() for accessing sd->status.skill[] or skill_db[], don't recklessly use skill_id as array index.
NOTE:
- Please import upgrade_20150131_skillset.sql
2015-02-07 01:12:21 -05:00
Radian
dba0ab07f1 Custom Job Master Fixed
Thanks @Cydh !
2015-02-03 15:24:17 -08:00
Cydh Ramdh
72617ac98b Skill DB clean ups
* Changed skill_db array to better memory allocation.
* Reduced MAX_SKILL_LEVEL from 100 to 10 (part of Hercules 0f4a50d135), also has changes on skill_get checks for skill level that more than 10.
* Reduced MAX_SKILL from 5020 to 1200 (actually only 1109 skills are used).
* Added macros for checking Homunculus, Guild, Mercenary, & Elemental skill ranges.
* Added skill check & index validation when player logged in and when @reloadskilldb.
* Corrected `enum e_skill_flag` order for SKILL_FLAG_REPLACED_LV_0's sake.
* Merged 'addtoskill' script command just as alias of 'skill' script command.

Summary:
* Decreased memory usage by map-server reduced up to 50 MB.
* Decreased memory for each player because of mmo_charstatus::skill[] only has 1200 array, before is 5020.
* Please use skill_get_index() for accessing sd->status.skill[] or skill_db[], don't reckless use skill_id as array index.

NOTE:
* Please import upgrade_20150131_skillset.sql

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-31 19:45:52 +07:00
Capuche
1f147f207d Quick fix in kvm battleground
Signed-off-by: Capuche <capucrath@gmail.com>
2015-01-26 18:40:52 +01:00
Lemongrass3110
bffabe9c75 3rd Job Quest compatibility fix
The job quests now (all) support servers where the 2nd classes can be over baselevel 99.
Most of them were correct anyway, because they check for BaseLevel > 98 and JobLevel > 49.
2015-01-25 23:04:25 +01:00
Capuche
b72162f095 Follow up f2621eec605fee7135e424dd3d466635988b2600
Signed-off-by: Capuche <capucrath@gmail.com>
2015-01-20 15:37:25 +01:00
Emistry
e134c76859 Issue #232
https://github.com/rathena/rathena/issues/232

Just like @Cydh said:
somehow, += for a string in iteration is fail. /hmm
temp fix is .@foo$ = .@foo$+"bar";
2015-01-17 15:14:28 +08:00
Cydh Ramdh
c7dcca3b6e Follow up 48d8389d27af8400e1048d2c626e259686357865
* No UTF-8 BOM for npc/re/quests/quests_eclage.txt

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-16 12:49:52 +07:00
Euphy
df6fb01739 Small fixes in Eclage scripts and code style changes.
- Fixed some minor bugs.
- Added GM NPC function.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2015-01-15 13:01:12 -05:00
Capuche
89d436f53f Follow up 48d8389d27af8400e1048d2c626e259686357865 2015-01-15 15:00:59 +01:00
Skormie
e8d0d35324 Eclage update with minor error fix. r2 2015-01-14 10:54:03 -05:00
Skormie
03249a0430 Eclage update with minor error fix and added optimizations. 2015-01-13 20:38:54 -05:00
Skormie
a4cac34dc6 Eclage update with minor error fix. 2015-01-13 18:19:32 -05:00
Capuche
d1a1029316 Added Eden quests 100-140.
Thanks to Euphy.

Signed-off-by: Capuche <capucrath@gmail.com>
2015-01-12 01:08:44 +01:00
Euphy
8c3bc4fda4 Changed some hardcoded script values to MAX_LEVEL. (fixes #161)
Fixes various bugs with higher level players not gaining experience.

Also properly fixed Renewal EXP reward in Turbo Track script (incorrectly fixed in be95412).

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-12-31 01:05:33 -05:00
Lemongrass3110
d49f21a8ce Fixed a small typo in 2005's christmas event. 2014-12-28 12:48:12 +01:00
nanakiwurtz
9f3c81c65f Merge pull request #162 from rathena/item_db
/npc/re/merchants/coin_exchange.txt item update
2014-12-17 17:59:17 +07:00
nanakiwurtz
229d15db87 /npc/re/merchants/coin_exchange.txt item update
-- Added Costume Hahoe Mask (19554). Thanks to rayn
2014-12-17 17:45:27 +07:00
Cydh Ramdh
7295bdc925 Merge pull request #143 from rathena/feature/separated_item_guid
Corrected `guid` implementation of item package in 51074a0. See http://rathena.org/board/topic/99743-item-guid/
2014-12-16 20:26:16 +07:00
Luciar
57d4e6718d Sura Job Quest Fix Bug #97
Updates Sura Job Quest by adjusting how some events are triggered
2014-12-04 00:04:30 -04:00
Euphy
4e376c49b7 Merge pull request #150 from balrogsamson/patch-2
Update scripts_custom.conf
2014-12-02 22:54:40 -05:00
Peter Derouen
9302969a9f Update scripts_custom.conf
Update THQS_ChatingNPC.txt field due to incorrect spelling.
2014-12-02 18:35:33 -08:00
Peter Derouen
01baeec58c Rename THQS_ChatingNPC.txt to THQS_ChattingNPC.txt
Typo.
2014-12-02 18:33:25 -08:00
Cydh Ramdh
5ce80555a7 Corrected guid implementation of item package in 51074a0
* GUID
  - `guid` field in official PackageItem.lua supposed to make item will be separated even item is stackable item.
  - Currently `guid` usage is using item Unique ID that generated when item with GUID flag is appear from package.
  - Some item containers in official PackageItem.lua are also separated, not stacked when player obtain it. Example when using atcommand "@item Xmas_Bless". For current implementation, the items are flagged in item_flag.txt (db folder) with flag 4.
  - `isNamed` field in item group is replaced by `GUID` and move the `isNamed` as new additional field. See doc/item_group.txt or db/re/item_package.txt.
* NPC:
  - Enabled npc/re/other/item_merge.txt and it's now usable.
* Script Command:
  - Added `mergeitem` to merge separated items in player's inventory. See doc/script_commands.txt.
* Misc:
  - Changed how to broadcast the item that obtained from package with flag `isAnnounced` to intif_broadcast, so it will be announced to all connected map-servers.
  - Added some items that flagged as 'item group container' in db/re/item_flag.txt

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-11-30 13:52:52 +07:00
Emistry
69f08f7028 Wrong info in NPC message. 2014-11-22 01:04:02 +08:00
Capuche
0edb5c7ff8 Fixed dialog in quests/eden/eden_quests.txt
Thanks to Phenex

Signed-off-by: Capuche <capucrath@gmail.com>
2014-11-15 18:52:45 +01:00
Euphy
1d2160758c Fixed Ticket Refiner refining above ticket level.
http://rathena.org/board/topic/98997-safe-refine-ticket-refiner/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-11-07 18:33:32 -05:00
Euphy
b735103505 Follow-up to 9cf01b2.
Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-10-29 12:05:04 -04:00
Euphy
9cf01b2812 Misc fixes.
- Updated turn-in requirements for Tripatriate Union's Feud. (incl. bugreport:9339)
http://rathena.org/board/tracker/issue-9339-the-tripartite-unions-feud/
- Moved "Voyage log" NPC coordinates. (bugreport:9225)
http://rathena.org/board/tracker/issue-9225-turtle-island-quest-voyage-log/
- Updated "Immuned Shield" (2168) item script. (bugreport:9319)
http://rathena.org/board/tracker/issue-9319-immuned-shield-is-using-the-pre-renewal-effect/
- Added Wolfchev's Laboratory warp to custom warper.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-10-29 12:01:00 -04:00
Capuche
5cfd3bd537 Corrected Ancient Gold Decoration description (bugreport 9154)
Signed-off-by: Capuche <capucrath@gmail.com>
2014-10-20 22:25:14 +02:00
Cydh Ramdh
c6ba813994 Bug Fixes:
* Wrong calls, should be callfunc. Thank @raynra
* Follow up 8256194, updated const.txt following new MAPID values for Super Novices
  * EAJL_SUPER_NOVICE	0x8000, for Super Novice masking
  * EAJ_SUPER_NOVICE	0x8100
  * EAJ_SUPER_BABY	0xA100
  * EAJ_SUPER_NOVICE_E	0xC100
  * EAJ_SUPER_BABY_E	0xE100

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-09-30 09:52:29 +07:00
lighta
7bedf4353b Add gdb check for configure suggestion on bugreport:4645.
Add the missing update in infinite_warp.txt
2014-09-07 09:01:19 -04:00
Euphy
3c24f458ce Hunting Missions script update.
- Added check for deleted characters. (credits: @AnnieRuru)
- Modernized script syntax and improved readability.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-09-01 13:33:39 -04:00
Euphy
403c22bc4b Documentation cleaning.
- Formatting and grammar edits on recently added docs.
- Added missing NPC header and script conf include from ea8ccfc.
- Moved ER model files to a separate folder ('doc/model/').

Fixed a typo in Wolfchev instance. (bugreport:9263)
http://rathena.org/board/tracker/issue-9263-wolfchevlaboratory-script-error/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-08-31 12:09:38 -04:00
lighta
ea8ccfc82e Add rewarp_count counter to prevent infinite warp loop.
bugreport:9130 (cpu-usage-goes-to-100)
2014-08-29 16:05:41 -04:00
Euphy
30b4d578a7 Some script cleaning.
- Replaced lots of numerics with constants.
- Added spacing to make some scripts more readable.

Fixed a mistake in 14fddd3.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-08-23 15:17:59 -04:00
Euphy
3b2762ca3c Enable NPC logging through 'logmes' by default.
- Commented some unnecessary log messages.

Bug fixes:
- M_DOPPELGANGER had too much HP. (Hercules 9cd3ec0)
- Huuma_Swirling_Petal should not have an element. (bugreport:9073)
http://rathena.org/board/tracker/issue-9073-huuma-swirling-petal/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-08-22 16:06:32 -04: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