11763 Commits

Author SHA1 Message Date
Cydh Ramdh
14a096a5a2 Follow up d6caec1: changed RC_NONE to RC_NONE_ in map.h because it confilcts with RC_NONE in WinGDI.h
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-01-08 13:07:35 +07:00
lighta
d6caec1c51 Various fixs
Fix bugreport:8418 (possible mapcrash from custom instance script)
Fix bugreport:8439 (pc_bonus_item_drop typos) thx to Baalberith
Fix some errors detected by cppcheck
upd install.sh (leftover of svn and wrong simlink)
2014-01-07 20:15:40 -05:00
Mike Langford
b8f6c37f5a Merge pull request #15 from Akkarinage/master
English update in /conf/battle/feature.conf
2014-01-07 13:26:35 -08:00
Lilith
b5a7035261 * Fixed bug: http://rathena.org/board/tracker/issue-8427-use-reload-mobdb-crash-the-map-server/ 2014-01-07 03:36:10 -08:00
aleos89
eca4fa0e38 Bug Fixes
* Fixed an operator check for WE_MALE and WE_FEMALE. Thanks Baalberith.
Optimizations
* Fixed a possible null pointer dereference in Spirit Ball check, Change Cart check, WE_BABY, MH_PYROCLASTIC, and MH_LIGHT_OF_REGENE.
* Fixed a reassigned value being reset before being checked.
* Fixed a homunculus expression always being false because of prior check.
* Fixed sprintf specifier output trying to display int value when return value is unsigned int.
* Fixed a redundant check for when monster's HP is less than 0 when HP is declared as an unsigned int.
* Fixed a redundant check for when uAccLen or uTokenLen are less then 0 when both are declared as unsigned int.
* Various other clean ups.
2014-01-06 14:20:50 -05:00
Cydh Ramdh
780b9d33d2 * pc_combocheck fix. *combo_idx should be has -1 as the init value, not 0. Thx Daegaladh
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-01-07 01:16:39 +07:00
Euphy
45c2a3a839 Follow-up to Global_Functino updates (834f3ba).
"F_GetPlural" now works for most item/mob cases, but still does not detect inputs that are already pluralized.
- For formats "... of|in|on ..." (ex. Piece of Cake), preceding word will be pluralized (ex. Pieces).
- Added some additional checks to prevent common errors.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-05 18:19:40 -05:00
Cydh Ramdh
22cfb75276 * Fixed item_combo bug, related bugreport http://rathena.org/board/tracker/issue-8321-maximum-hp-bug/
Thank lighta and everyone who told how to reproduce

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-01-05 16:22:21 +07:00
Euphy
834f3baa05 Follow-up to Global_Function updates (97687ca).
* Added format string to "F_InsertPlural" for added flexibility.
* Added more checks to "F_GetPlural" for better handling of multi-word arguments (e.g. items).
* Updated some more scripts with new functions.

Some misc. cleanup of constants in scripts.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-04 13:42:16 -05:00
Euphy
2ab4d8c276 DB Import Visual Studio updates.
Also dropped folder db/import, which should be user-created.
[Follow-up to ff29c23, credits @Lemongrass3110.]

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-04 11:59:23 -05:00
Cydh Ramdh
be516cb53b * Fixed bugreport http://rathena.org/board/tracker/issue-8408-script-line-931-data-too-long-for-column-atkmatk-at-row-1/
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-01-04 21:51:12 +07:00
Lilith
a053ccea3f * Fixed bug: http://rathena.org/board/tracker/issue-8345-specialeffect-target-self-doesnt-work
* Fixed bug: http://rathena.org/board/tracker/issue-8169-hiding
* Fixed bug: http://rathena.org/board/tracker/issue-8366-egg-type-monster-issue
* Fixed bug: http://rathena.org/board/tracker/issue-8406-item-bonus-not-working
* Added fix with mob_hp update when mob get healed (Hercules merge)
2014-01-03 23:56:13 -08:00
Euphy
357f1fd16c Minor bug fixes.
* Added itemscript for WoE Weapon Supply Box (12675). (bugreport:8421)
http://rathena.org/board/tracker/issue-8421-woe-weapon-supply-box12675-missing-item-script/
* Fixed two block comment errors. (bugreport:8409)
http://rathena.org/board/tracker/issue-8409-script-error-on-item-db-re-line-6123/
* Follow-ups to 97687ca.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-03 20:53:43 -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
Cydh Ramdh
2d35b03bf7 * Fixed itemgroup_db that being reseted when read import file. http://rathena.org/board/tracker/issue-8419-cant-not-open-any-itemgroup/
* Fixed typo for maxsp bonus as follow up of 96443cd. Thank Baalberith

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-01-03 02:58:23 +07:00
lighta
b9aae13340 Db import3
Remove map_index.txt as this ain't overwrittable
add missings newlines at end of file
2014-01-01 21:45:40 -05:00
lighta
ff29c234cc DB Import2
Add db/import-tmpl/ and add all file that could currently be
overwritten, (please add note if a db is missing)

db/import folder is created by "make import" just like conf/import and
msg_conff/import, (didn't found the visual equivalent)
2014-01-01 21:33:08 -05:00
aleos89
dd24149060 Merge pull request #31 from Baalberith6/master
pc_get_child can return NULL > segfault
2014-01-01 16:40:19 -08:00
Matej Pristak
07727d50bc pc_get_child can return NULL > segfault 2014-01-02 00:33:26 +01:00
lighta
79fc389489 Merge pull request #30 from Baalberith6/master
We can't use unsigned int for equip index since we put -1 in sd->equip_index[i] as sign of an empty place.
2014-01-01 15:16:10 -08:00
pori
8eaac0a29c This is definitely wrong - sd->equip_index can be - 1 and we can't use unsigned for it... 2014-01-01 23:39:53 +01:00
Cydh Ramdh
0104aef878 Fixed bugreport:8415, missplaced WM_LESSON bonus http://rathena.org/board/tracker/issue-8415-wandererminstrel-lesson-skill-bug/ Thank euphoria
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-01-02 03:13:12 +07:00
Cydh Ramdh
6900a3a30f Just updated some reverted items
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-01-01 21:37:13 +07:00
Cydh Ramdh
6e9796b023 * Follow up 28ecab5, added misisng db/import files
* Follow up 96443cd, seems like for final MaxSP use round() instead floor(). Removed unecessary floor() (Isn't by default, rounding from double to int will be rounded down like floor()?)
* A little clean up on skill_co_copy()

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-01-01 16:43:40 +07:00
lighta
28ecab5712 DB Import
Add folder import/ into db/ to load all customs
This folder is meant to hold all the customs file you wish override rA
one.
(In short it work like conf import)
related to tid:90199
2013-12-31 18:21:45 -05:00
Lilith
3f4c389cef Follow up dae8122 , b695ab3 , 8120164
Added missing line, removed item bonus from item_id:1602
2013-12-31 00:12:14 -08:00
Cydh Ramdh
ce518600f3 * Added and modified some item script
* Warped itemdb_re_split_atoi with #ifdef RENEWAL

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-31 13:09:27 +07:00
Lilith
8120164575 Follow up dae8122 , thanks Cydh. 2013-12-30 21:30:43 -08:00
lighta
b695ab3f41 Fix compilation issue
Follow up dae81222 (AEGIS class system) fix out of bound issue for
array.
(didn't check the x_ALL option system yet)
Follow up 7a9aa7fb Fix possible mapcrash due to offline player
Follow up 12007fef Fix some invalide string check and remove the
reverted sqlfiles
2013-12-30 15:21:25 -05:00
Cydh Ramdh
e18bf43547 * Revert this 487f84e, please import upgrade_20131231.sql. Thank Lemongrass3110 and Toshiro90
* Follow up 7a9aa7f, enum errors
* Follow up 12007fe, function return type error
* Follow up dae8122, 'skill' to 'skill_learnlv'?

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-31 01:52:14 +07:00
aleos89
7a9aa7fbcf Bugfixes
* Fixed WE_MALE and WE_FEMALE up to You to not consume HP/SP when it's below 10%. (bugreport:3546)
* Fixed WE_CALLPARTNER, WE_CALLPARENT, and WE_CALLBABY to not recall target if they are autotrading. (bugreport:2479)
* Fixed WE_BABY not checking for parents if they are in the same party and in the area. (bugreport:2518)
* Fixed Dragon Breath - Water not requiring a dragon. (bugreport:8237)
* Added a new config 'char_del_option' to set whether email or birthdate should be used for deleting characters. (bugreport:8240)
* Follow up to 9a5a6b9. Fixed a missing define check for 2013 clients when deleting a character. (bugreport:8399)
* Fixed Weapon Refining to use clif_upgrademessage. (bugreport:2135)
* Fixed script command 'prompt' not ending script state when player selects Cancel from menu. (bugreport:7932)
* Fixed nomineeffect display on GvG enabled maps. (bugreport:7754)
Others
* All items, except for Cash items, can no longer be used when storage is open.
* Defined constants for a lot of item and monster IDs used throughout the source.
* Follow up to 0f2dd7f. Corrected a change to the wrong hostname array.
2013-12-30 13:20:33 -05:00
Lilith
dae81222a8 * Added AEGIS 'CLASS_' enum
- Removed RC_BOSS, RC_NONBOSS, RC_NONDEMIHUMAN.
 - Added CLASS_NORMAL, CLASS_BOSS, CLASS_GUARDIAN enum.
 - Added CLASS_ALL, RC_ALL, ELE_ALL, SZ_ALL.
 - Item bonuses 'bAddDefClass' and 'bAddMdefClass' replaced by 'bAddDefMonster' and 'bAddMdefMonster'.
 - Item bonuses 'bIgnoreMdefRate' and 'bIgnoreDefRate' replaced by 'bIgnoreMdefRaceRate' and 'bIgnoreDefRaceRate'.
 - Added new item bonuses: bIgnoreDefClass, bIgnoreMdefRaceRate, bDefRatioAtkClass, bAddClass, bSubClass, bMagicAddClass, bWeaponComaClass, bHpDrainValueClass, bSpDrainValueClass, bIgnoreMdefClassRate.
 - Updated doc/item_bonus.txt
 - Updated db/re/level_penalty.txt & 'pc_level_penalty_mod' function.
 - Updated 'battle_calc_cardfix' function.
 - 'md->class_' replaced by 'md->mob_id'
2013-12-30 08:46:24 -08:00
Cydh Ramdh
12007fef7e * Follow ups of:
-- 51074a0: Moved the 'group' check when make 'must' item also as random item
-- 96443cd: Leftover, fixed @allstats issue
-- 7083ecf: 7083ecf079 (commitcomment-4952745)
-- 744195a
* Added 'get_githash' script command.
* Fixed overflowed parameters calculation will gives 32767 stat effect instead 1 (ex. overflowed LUK will gives crit 32767)

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-30 20:03:21 +07:00
lighta
744195a931 Leak and Optimisation
Fix many typo and optimisation found by :
http://rathena.org/cppreport/index.html
Fix multiple unsafe scanf of string
Fix multiple battle wrong check (elemental bonus)
Fix camouflage defense reduction and cap expiato def reduction
Fix geoip leak
Upd few documentation in doxygen style
Fix path working directory issue to start servers
(now you won't need to be in maindir to launch server)
2013-12-30 02:05:34 -05:00
Euphy
7083ecf079 Standardized formatting of database files.
Signed-off-by: Euphy <euphy.raliel@rathena.org>
2013-12-29 15:58:17 -05:00
Cydh Ramdh
cf1798265c Follow up 487f84e, another typos
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-30 00:46:49 +07:00
Cydh Ramdh
aa66cdc724 Follow up 96443cd:
* Updated status bonus for job level 50 until 60 for 3rd Classes, also fixed Minstrel & Wanderer bonus
* Updated status bonus for Rebellion
Ref: http://ro.gnjoy.com/guide/runemidgarts/joblist.asp?lineseq=2
Thank reigneil, http://rathena.org/board/topic/90964-updated-calculation-for-max-hpsp-max-level-cap-and-parameters/#entry237760

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-29 23:55:13 +07:00
Cydh Ramdh
96443cd710 Updated calculation for Max HP/SP, Max level cap, and parameters!
* Renamed job_maxhpsp_db to job_basehpsp_db.txt and add new values according to the base HP/SP calculation. Ref: http://irowiki.org/wiki/Max_HP, http://irowiki.org/wiki/Max_SP
* Updated the Max HP/SP calculation. Ref: http://irowiki.org/wiki/Max_HP, http://irowiki.org/wiki/Max_SP
* Changed Max Level for 3rd classes become 175/60. Ref: http://forums.irowiki.org/showpost.php?p=1344057&postcount=217
* Changed Max Parameters for 3rd classes from 125 to 130. Ref: http://forums.irowiki.org/showpost.php?p=1344057&postcount=217
* Changed Max Parameters for Baby 3rd Classes from 107 to 118: Ref: http://forums.irowiki.org/showpost.php?p=1344057&postcount=217
* Oboro/Kagerou and Rebellion, are 160/50 and max param is still 125
* Added and separated configs on conf/player.conf, becomes:
-- max_parameter,
-- max_trans_parameter,
-- max_third_parameter,
-- max_third_trans_parameter,
-- max_baby_parameter,
-- max_baby_third_parameter,
-- max_extended_parameter,
* Added new db file job_param_db.txt for RE and PRE-RE, which allow you to modify the max param for each job
* HP_SP_TABLES on core.h is disable by default

NOTE:
* Still need official value to add bonus status for 3rd classes from Job Level 50 to 60
* Still need official value for total status point from Base Level up to 175 also the EXP values
* I hope the calculations results are closer with Max HP/SP values with official servers

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-29 16:12:30 +07:00
lighta
676d00796b Merge branch 'master' of github.com:rathena/rathena 2013-12-29 01:28:58 -05:00
lighta
cb7e4b44cd Misc Upd
Fix pneuma display for pre-re mode
Add char_maintenance mode to check trought gm_allow_group as a minimum
groupid to enter. (thx to SuperHulk)
Fix UB warning on bonus_script check by type
Properly initialize combo_idx check
2013-12-29 01:28:15 -05:00
Euphy
1d64b8f9e1 Script/database bug fixes.
* Fixed an issue in "Message Delivery" quest blocking level 100+ characters. (bugreport:8373)
http://rathena.org/board/tracker/issue-8373-message-delivery/
* Added Renewal quest items to Ayothaya Dungeon Entrance quest. (bugreport:8375)
http://rathena.org/board/tracker/issue-8375-ayothaya-dungeon-entrance-quest/
* Temporarily moved the Renewal location of "Strange Machine" in the "Muff's Loan" quest; confirmation needed. (bugreport:8370)
http://rathena.org/board/tracker/issue-8370-muffs-loan/
* Updated Blacksmith job quest with some extra conditions. (fixes bugreport:8347)
http://rathena.org/board/tracker/issue-8347-about-blacksmith-job-quest/
* Changed all 'bAtk' bonuses to 'bBaseAtk', a continuation of r17149. (fixes bugreport:8372)
http://rathena.org/board/tracker/issue-8372-daehyon-card-is-not-working/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2013-12-28 22:47:32 -05:00
Cydh Ramdh
487f84ef92 * Changed some item_db's fields on MySQL table to use char types rather than numeric types (those fields are never been used for calculation)
* Added missing config on inter_athena.conf for MySQL database (use_sql_db: yes)
* Please upgrade your MySQL database with upgrade_20131229.sql

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-29 06:44:48 +07:00
Cydh Ramdh
5d77ab2b68 Follow up 5363a8d (thank Lemongrass3110)
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-29 03:46:39 +07:00
Cydh Ramdh
f0c798846d Changed Sleep chance of Lullaby's effect. Chance is increased with INT, http://irowiki.org/wiki/Lullaby
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-29 02:02:37 +07:00
Cydh Ramdh
3ee970a0e0 * Renamed SI_CARTSBOOST for Genetic to SI_GN_CARTBOOST
* Fixed Crimson Marker icon that doesn't show when it's casted to mob

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-29 01:29:46 +07:00
Cydh Ramdh
5363a8d771 * Added some items (thank Ziu)
* Fixed some missing view id (thank Ziu)

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-28 16:10:33 +07:00
Cydh Ramdh
be05bc399b *Added 'status_icon' param for *bonus_script script, thank QQfoolsorellina for the suggestion (https://github.com/rathena/rathena/commit/99098c1#commitcomment-4558795)
--> bonus_script "<script code>",<duration>{,<flag>{,<type>{,<status_icon>{,<char_id>}}}};
* Please update your sql database (main database) with upgrade_20131227.sql

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-27 18:17:41 +07:00
lighta
90ced830a4 Eleanor Tinder combo
Fix Eleanor Tinder-CBC-EQC being broken since hash:a506c7f due to a
little requirement check typo.
2013-12-27 04:13:30 -05:00
lighta
4212080bd9 Storagelist fix
Follow up hash:0f2dd7f (adding support to map<=>client to allow longer
storagelist)
Fix most of : [Error]: WFIFOSET: Maximum write buffer size for client
connection 7 exceeded, most likely caused by packet 0x0996 (len=11932,
ip=127.0.140733193388032.1). Still remain some if you openup the list
like 5time/s, see tid:90541
2013-12-26 04:13:32 -05:00
Cydh Ramdh
af319f9eb5 Added item script for Underripe Yggseed, http://rathena.org/board/tracker/issue-8384-item-script-of-12405-underripe-yggseed/
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-26 15:39:05 +07:00