11894 Commits

Author SHA1 Message Date
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
Cydh Ramdh
1fd10b13da Merge branch 'rathena/master'
Conflicts:
	src/map/script.c
2013-12-26 13:34:07 +07:00
Cydh Ramdh
6ccc9757f2 Follow up 2211ea1
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-25 12:28:08 +07:00
Cydh Ramdh
716de547dc Added newline at end of file, http://rathena.org/board/tracker/issue-8380-warnings-warnings/
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-25 12:17:48 +07:00
Cydh Ramdh
2211ea156a * Follow up 51074a0, 2bf2216, 432cdb7
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-25 12:13:02 +07:00
Cydh Ramdh
2bf221679f Merge pull request #28 from nanakiwurtz/master
Fixed some minor typo
2013-12-24 21:04:09 -08:00
nanakiwurtz
e797f085e5 Merge branch 'Upstream/master' 2013-12-25 04:23:29 +07:00
Cydh Ramdh
51074a0637 Added some official item packages!
- Added db/re/item_package.txt, imported file for item_group_db.txt
- Added doc/item_group.txt for more details about item group
- Added new IG_ids on db/const.txt, up to 300 additions
- Added 'getgroupitem' script command to get item from specified item group (see doc/script_commands.txt)
- Modified 'grouprandomitem', added an optional parameter: 'sub_group' (see doc/script_commands.txt)
- Modified 'getrandgroupitem', added an optional parameter: 'sub_group' (see doc/script_commands.txt)
- Updated db/re/item_db.txt
- Updated sql-files/item_db_re.sql, so for MySQL user, please udate your item db
NOTE:
- I ocmmented some lines because some items aren't exist yet on rAthena db (or maybe have different name?)
- For pre-re, maybe I can do it later, or will someone do it?
- If there's something I forget to tell you, it's habit

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-23 23:37:27 +07:00
Cydh Ramdh
4cfaba055d * Follow up 74740b4
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-23 11:10:34 +07:00
Cydh Ramdh
74740b4491 * Follow up 9cca188, change enum of IT_WEAPON and IT_ARMOR on src files
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-23 11:07:49 +07:00
lighta
00e63be81c Upd Documentation
Update some src documentation for doxygen
Fix typo in [hash:9cca188] in clif, making it uncompilable
2013-12-21 04:41:11 -05:00
nanakiwurtz
207c696f50 Changed quantity for "Siege Violet Potion Box (200)" ID:12683 to 200 instead of 50
Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2013-12-21 16:16:46 +07:00
nanakiwurtz
5b75c045cc Merge branch 'Upstream/master' 2013-12-21 15:51:15 +07:00
nanakiwurtz
f62100ae70 Fixed some minor typo
Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2013-12-21 15:49:10 +07:00
lighta
9cca188908 Itemtype
Fix itemtype IT_ARMOR and IT_WEAPON being inverted, bugreport:8180
please run tools/convert_itemtype.pl to update your dbs.
Upd athena-start having some issue for some os.
Fix a typo on DC_SERVICEFORYOU for val1 assignment.
2013-12-21 01:02:41 -05:00
Cydh Ramdh
e6b0acfb9d Follow up 4ec6925, thx lighta
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-21 11:57:46 +07:00
Cydh Ramdh
4ec69254c3 * Updated Dancer skill's effect: Service For You / Gypsy's Kiss, according to http://irowiki.org/wiki/Gypsy%27s_Kiss
* Fixed bugreport:8363, http://rathena.org/board/tracker/issue-8363-identify/

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-20 16:35:06 +07:00
Cydh Ramdh
5c3a1abd34 Merge pull request #24 from nanakiwurtz/master
Added new Items from http://forums.irowiki.org/showpost.php?p=1368518&postcount=660
2013-12-20 01:30:47 -08:00
lighta
3b5e527c7f Vip_followup
Fix bugreport:8301 were groupid wasn't keeping in vip state at new
logon.
Fix groupid wasn't reload without logout when we wasn't vip anymore
Fix decreasing vip_time scenario
Add a timer so vip_member doesn't keep status until they logout.
2013-12-20 02:01:51 -05:00
Cydh Ramdh
5ed0a5bf99 Merge branch 'rathena/master' 2013-12-20 11:17:25 +07:00
lighta
854f8fc502 Quickfix
Follow up hash:0f2dd7fcf, fixed a typo on packet lenght for storagelist
this should fix bugreport:8344
Hotfix for bugreport:8333, (we're now checking if we fully add object on
map before attempting to spawn it)
2013-12-19 18:27:01 -05:00
nanakiwurtz
e531b972dc Added 2 item scripts for Shadow item combo.
Source: http://forums.irowiki.org/showpost.php?p=1368518&postcount=660

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2013-12-19 14:11:25 +07:00
nanakiwurtz
49b034e6f5 Merge branch 'Upstream/master' 2013-12-19 13:48:03 +07:00
Cydh Ramdh
432cdb7686 Implemented 'devotion_rdamage' on conf/battle/skill.conf for suggestion on http://rathena.org/board/topic/78620-renewal-devotion/
// Using 'old' behavior for devotion vs reflect damage? (Note 2)
// Default is 0 (official). If 'devotion_rdamage' is > 0 (chance to devot the reflected damage),
// when player with devotion attacks player with reflect damage ability (item bonus or skill),
// the damage will be taken by the person who provides devotion instead the attacker.
devotion_rdamage: 0

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-19 12:59:26 +07:00
Cydh Ramdh
2330caaf0c * Fixed bugreport http://rathena.org/board/tracker/issue-8360-error-report-0000-still-images/
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-19 11:33:10 +07:00
nanakiwurtz
5c7e1fa683 Merge branch 'Upstream/master' 2013-12-19 00:04:50 +07:00
Cydh Ramdh
b7fd7468bb Fixed query for '18766' on item_db_re.sql
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-18 18:40:19 +07:00
Lilith-
a29aace9c5 Follow up bd2503e,7355677 and fef6307. Merged Hercules e115c30 2013-12-16 06:46:21 -08:00
Lilith-
54dfc67925 * Fixed bug http://rathena.org/board/tracker/issue-8330-secure-npctimeout-bug-for-those-npc-who-have-no-dialog-window/
Merged Hercules adc2e6e
2013-12-16 05:04:52 -08:00
Cydh Ramdh
4d8558489b [db/re/item_db.txt] Fixed 18742 and 18744 class. 7 to 63
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-16 10:57:40 +07:00