Akinari Posted June 23, 2013 Posted June 23, 2013 Before continuing I'm aware this post probably doesn't belong here, but I'm assuming this will get the most views and will also get our development of this huge modification on a roll. Essentially the only portion that needs major testing is the Pre-Renewal. Renewal attack has been tested for the last month by the writers of this mod and on their servers. Please report your findings back to us so this isn't put on hold any longer. Credits: Baalberith - Broke apart all of the battle.c functions and started the mod Helvetica - Fixed many bugs within the initial stages of mod Without wasting anymore time, here's a diff updated to our latest SVN. Edit: I've been told to release some more information on what to test. Like above, we mostly just want to make sure we didn't break pre-renewal, but I'm bringing this to the public for any extra testing. I'm aware the things most wanted in renewal are EDP and Acid Demonstration working correctly, so if you use renewal in your server, you're free to use this before we actually release. We ask that users of pre-renewal see if there are any differences in the attack when this is implemented. Edit2: New diff posted. Fixes a bunch of linux warnings and windows error. renewalattack.diff 6
ursow94 Posted June 24, 2013 Posted June 24, 2013 trying here 1>------ Rebuild All started: Project: char-server_sql, Configuration: Release Win32 ------ 2>------ Rebuild All started: Project: login-server_sql, Configuration: Release Win32 ------ 3>------ Rebuild All started: Project: map-server_sql, Configuration: Release Win32 ------ 4>------ Rebuild All started: Project: mapcache, Configuration: Release Win32 ------ 4> core.c 1> grammar.c 3> grammar.c 3> libconfig.c 3> scanctx.c 1> libconfig.c 4> des.c 4> grfio.c 3> scanner.c 1> scanctx.c 4> malloc.c 1> scanner.c 2> grammar.c 2> libconfig.c 2> scanctx.c 2> scanner.c 4> showmsg.c 4> strlib.c 4> utils.c 4> mapcache.c 3> strbuf.c 1> strbuf.c 1> mt19937ar.c 2> strbuf.c 2> mempool.c 3> mt19937ar.c 2> mutex.c 1> core.c 1> db.c 3> conf.c 1> ers.c 3> core.c 2> raconf.c 1> malloc.c 3> db.c 3> des.c 1> mapindex.c 2> thread.c 1> mempool.c 3> ers.c 1> mutex.c 3> grfio.c 2> account_sql.c 1> nullpo.c 3> malloc.c 1> raconf.c 2> ipban_sql.c 1> random.c 3> mapindex.c 2> login.c 2> loginlog_sql.c 2> core.c 3> md5calc.c 1> showmsg.c 3> mempool.c 1> socket.c 3> mutex.c 3> nullpo.c 3> raconf.c 1> sql.c 3> random.c 3> showmsg.c 2> db.c 1> strlib.c 2> ers.c 1> thread.c 2> malloc.c 2> md5calc.c 3> socket.c 2> nullpo.c 2> random.c 4> Generating code 3> sql.c 2> showmsg.c 1> timer.c 2> socket.c 2> sql.c 4> Finished generating code 1> utils.c 3> strlib.c 3> thread.c 1> cli.c 3> timer.c 1> msg_conf.c 2> strlib.c 2> timer.c 1> char.c 3> utils.c 1> int_auction.c 1> int_elemental.c 1> int_guild.c 2> utils.c 2> cli.c 3> cli.c 3> msg_conf.c 2> msg_conf.c 3> atcommand.c 3> battle.c 3> battleground.c 2> mt19937ar.c 1> int_homun.c 3> buyingstore.c 1> int_mail.c 1> int_mercenary.c 1> int_party.c 3> cashshop.c 3> channel.c 1> int_pet.c 3>..\src\map\battle.c(2933): warning C4244: '+=' : conversion from 'float' to 'int', possible loss of data 1> int_quest.c 3>..\src\map\battle.c(3747): warning C4101: 'skill' : unreferenced local variable 3>..\src\map\battle.c(4219): warning C4244: '=' : conversion from 'int64' to 'int', possible loss of data 3>..\src\map\battle.c(4221): warning C4244: '=' : conversion from 'int64' to 'int', possible loss of data 3>..\src\map\battle.c(5097): error C2143: syntax error : missing ';' before 'type' 1> int_storage.c 3>..\src\map\battle.c(5100): error C2065: 'matk' : undeclared identifier 3>..\src\map\battle.c(5100): error C2224: left of '.damage' must have struct/union type 3> chat.c 4> mapcache.vcxproj -> C:\Users\Lucas\Desktop\rathena\vcproj-12\..\mapcache.exe 2> Generating code 1> inter.c 3> chrif.c 3> clif.c 3> date.c 3> duel.c 3> elemental.c 3> guild.c 3> intif.c 3> itemdb.c 2> Finished generating code 3> log.c 1> Generating code 3> mail.c 3> map.c 3> mapreg_sql.c 3> homunculus.c 3> instance.c 2> login-server_sql.vcxproj -> C:\Users\Lucas\Desktop\rathena\vcproj-12\..\login-server_sql.exe 3> mercenary.c 3> mob.c 3> npc.c 3> npc_chat.c 3> party.c 3> path.c 3> pc.c 3> pc_groups.c 3> pet.c 3> quest.c 1> Finished generating code 3> script.c 3> searchstore.c 3> skill.c 3> status.c 3> storage.c 3>..\src\map\status.c(1925): warning C4244: 'return' : conversion from 'float' to 'unsigned int', possible loss of data 3> trade.c 1> char-server_sql.vcxproj -> C:\Users\Lucas\Desktop\rathena\vcproj-12\..\char-server_sql.exe 3> unit.c 3> vending.c ========== Rebuild All: 3 succeeded, 1 failed, 0 skipped ==========
LatSo Posted June 24, 2013 Posted June 24, 2013 trying here 1>------ Rebuild All started: Project: char-server_sql, Configuration: Release Win32 ------ 2>------ Rebuild All started: Project: login-server_sql, Configuration: Release Win32 ------ 3>------ Rebuild All started: Project: map-server_sql, Configuration: Release Win32 ------ 4>------ Rebuild All started: Project: mapcache, Configuration: Release Win32 ------ 4> core.c 1> grammar.c 3> grammar.c 3> libconfig.c 3> scanctx.c 1> libconfig.c 4> des.c 4> grfio.c 3> scanner.c 1> scanctx.c 4> malloc.c 1> scanner.c 2> grammar.c 2> libconfig.c 2> scanctx.c 2> scanner.c 4> showmsg.c 4> strlib.c 4> utils.c 4> mapcache.c 3> strbuf.c 1> strbuf.c 1> mt19937ar.c 2> strbuf.c 2> mempool.c 3> mt19937ar.c 2> mutex.c 1> core.c 1> db.c 3> conf.c 1> ers.c 3> core.c 2> raconf.c 1> malloc.c 3> db.c 3> des.c 1> mapindex.c 2> thread.c 1> mempool.c 3> ers.c 1> mutex.c 3> grfio.c 2> account_sql.c 1> nullpo.c 3> malloc.c 1> raconf.c 2> ipban_sql.c 1> random.c 3> mapindex.c 2> login.c 2> loginlog_sql.c 2> core.c 3> md5calc.c 1> showmsg.c 3> mempool.c 1> socket.c 3> mutex.c 3> nullpo.c 3> raconf.c 1> sql.c 3> random.c 3> showmsg.c 2> db.c 1> strlib.c 2> ers.c 1> thread.c 2> malloc.c 2> md5calc.c 3> socket.c 2> nullpo.c 2> random.c 4> Generating code 3> sql.c 2> showmsg.c 1> timer.c 2> socket.c 2> sql.c 4> Finished generating code 1> utils.c 3> strlib.c 3> thread.c 1> cli.c 3> timer.c 1> msg_conf.c 2> strlib.c 2> timer.c 1> char.c 3> utils.c 1> int_auction.c 1> int_elemental.c 1> int_guild.c 2> utils.c 2> cli.c 3> cli.c 3> msg_conf.c 2> msg_conf.c 3> atcommand.c 3> battle.c 3> battleground.c 2> mt19937ar.c 1> int_homun.c 3> buyingstore.c 1> int_mail.c 1> int_mercenary.c 1> int_party.c 3> cashshop.c 3> channel.c 1> int_pet.c 3>..\src\map\battle.c(2933): warning C4244: '+=' : conversion from 'float' to 'int', possible loss of data 1> int_quest.c 3>..\src\map\battle.c(3747): warning C4101: 'skill' : unreferenced local variable 3>..\src\map\battle.c(4219): warning C4244: '=' : conversion from 'int64' to 'int', possible loss of data 3>..\src\map\battle.c(4221): warning C4244: '=' : conversion from 'int64' to 'int', possible loss of data 3>..\src\map\battle.c(5097): error C2143: syntax error : missing ';' before 'type' 1> int_storage.c 3>..\src\map\battle.c(5100): error C2065: 'matk' : undeclared identifier 3>..\src\map\battle.c(5100): error C2224: left of '.damage' must have struct/union type 3> chat.c 4> mapcache.vcxproj -> C:\Users\Lucas\Desktop\rathena\vcproj-12\..\mapcache.exe 2> Generating code 1> inter.c 3> chrif.c 3> clif.c 3> date.c 3> duel.c 3> elemental.c 3> guild.c 3> intif.c 3> itemdb.c 2> Finished generating code 3> log.c 1> Generating code 3> mail.c 3> map.c 3> mapreg_sql.c 3> homunculus.c 3> instance.c 2> login-server_sql.vcxproj -> C:\Users\Lucas\Desktop\rathena\vcproj-12\..\login-server_sql.exe 3> mercenary.c 3> mob.c 3> npc.c 3> npc_chat.c 3> party.c 3> path.c 3> pc.c 3> pc_groups.c 3> pet.c 3> quest.c 1> Finished generating code 3> script.c 3> searchstore.c 3> skill.c 3> status.c 3> storage.c 3>..\src\map\status.c(1925): warning C4244: 'return' : conversion from 'float' to 'unsigned int', possible loss of data 3> trade.c 1> char-server_sql.vcxproj -> C:\Users\Lucas\Desktop\rathena\vcproj-12\..\char-server_sql.exe 3> unit.c 3> vending.c ========== Rebuild All: 3 succeeded, 1 failed, 0 skipped ========== Is this error alrdy fixed?
Akinari Posted June 24, 2013 Author Posted June 24, 2013 Yes. I just posted a new diff. Also fixed a bunch of linux warnings that weren't there before the configuration update. Thanks for testing!
Baalberith Posted June 25, 2013 Posted June 25, 2013 Thanks Akinari! I do explicitly request testing of these skills/damage pre-renewal that are in some way "special": - Acid Demo - Breaker (renewal too please) - Shield boomerang and other shield skills - Martyr Reckoning - Spiral Pierce - Issen (Ninja) Thanks in advance, if anyone can confirm they do work/do not work.
reigneil Posted June 25, 2013 Posted June 25, 2013 are the warnings wont affect? ... 1>c:\games\ragnarok server\src\map\battle.c(2932): warning C4244: '+=' : conversion from 'float' to 'int', possible loss of data1>c:\games\ragnarok server\src\map\battle.c(4210): warning C4244: '=' : conversion from 'int64' to 'int', possible loss of data1>c:\games\ragnarok server\src\map\battle.c(4212): warning C4244: '=' : conversion from 'int64' to 'int', possible loss of data... 1>c:\games\ragnarok server\src\map\status.c(1925): warning C4244: 'return' : conversion from 'float' to 'unsigned int', possible loss of data...
Baalberith Posted June 25, 2013 Posted June 25, 2013 I Can't Compile on Linux T^T What error? I am OK with gcc 4.7.
ursow94 Posted June 26, 2013 Posted June 26, 2013 CC pc.c CC status.c CC npc.c CC npc_chat.c CC chat.c CC path.c CC itemdb.c CC mob.c CC script.c CC storage.c CC skill.c CC atcommand.c CC battle.c battle.c:2476:1: error: unterminated #else battle.c: In function âbattle_calc_skill_base_damageâ: battle.c:2486: error: expected declaration or statement at end of input battle.c:2486: error: expected declaration or statement at end of input battle.c:2486: error: expected declaration or statement at end of input battle.c:2384: warning: unused variable ânkâ battle.c:2379: warning: unused variable âskillâ make[1]: *** [obj_sql/battle.o] Error 1 make[1]: Leaving directory `/home/emulador2/src/map' make: *** [map_sql] Error 2 got this trying to compile in linux
Mpsmith Posted June 26, 2013 Posted June 26, 2013 I Can't Compile on Linux T^T What error? I am OK with gcc 4.7. Ok Compiled Successfully & Workin Fine
helvetica Posted June 26, 2013 Posted June 26, 2013 Renewal behaviors should be more or less on target. The only known broken renewal skill is Envenom. I need to do more research to see how exactly the +ATK bonus is applied as it's not a percentage based like most other skills. Renewal skills and behaviors themselves have been EXTENSIVELY tested, but please feel free to pipe up if something seems off. What we really need help with is pre-renewal, and making sure we didn't break anything in the process, as we did some major rewrites to the core of the whole damage calculation process to bring it in line with official. Please test pre-renewal and let me know of any regressions or differences of ANY kind. There may be some changes in terms of overall damage numbers as some "quirks" on official have been documented and implemented but overall it shouldn't vary that much from what rAthena had previously. If there's any significant change in damage output please indicate what skill and equipment/stats you're testing with. I'll have a writeup detailing exactly what changes have been made in renewal in terms of overall gameplay mechanics and skills soon. 3
ursow94 Posted June 26, 2013 Posted June 26, 2013 CC pc.c CC status.c CC npc.c CC npc_chat.c CC chat.c CC path.c CC itemdb.c CC mob.c CC script.c CC storage.c CC skill.c CC atcommand.c CC battle.c battle.c:2476:1: error: unterminated #else battle.c: In function âbattle_calc_skill_base_damageâ: battle.c:2486: error: expected declaration or statement at end of input battle.c:2486: error: expected declaration or statement at end of input battle.c:2486: error: expected declaration or statement at end of input battle.c:2384: warning: unused variable ânkâ battle.c:2379: warning: unused variable âskillâ make[1]: *** [obj_sql/battle.o] Error 1 make[1]: Leaving directory `/home/emulador2/src/map' make: *** [map_sql] Error 2 got this trying to compile in linux someone know how can i fix that?
helvetica Posted June 27, 2013 Posted June 27, 2013 Are you using a clean SVN pull? There are a SIGNIFICANT amount of changes and it's highly recommended you apply this diff first to a clean copy from SVN before adding on any other source modifications.
Lighta Posted June 27, 2013 Posted June 27, 2013 Please let not turn this topic into a support section for this test but really some data or remarque of some behaviour / calc change.
Akinari Posted June 30, 2013 Author Posted June 30, 2013 Updated diff to latest revision. Fixed compile errors under pre-re settings. Fixed compile errors when pre-re and renewal_edp are configured together. Fixed warnings under pre-renewal settings as well. 1
FutureGazer Posted July 1, 2013 Posted July 1, 2013 how to fix this? battle.c: In function ‘battle_calc_base_damage’: battle.c:1661: error: expected expression before ‘}’ token battle.c:1627: warning: unused variable ‘damage’ battle.c:1661: warning: no return statement in function returning non-void battle.c: At top level: battle.c:1668: error: expected identifier or ‘(’ before ‘return’ battle.c:1670: error: expected identifier or ‘(’ before ‘if’ battle.c:1672: error: expected identifier or ‘(’ before ‘else’ battle.c:1675: error: expected identifier or ‘(’ before ‘if’ battle.c:1688: error: expected identifier or ‘(’ before ‘if’ battle.c:1694: error: expected identifier or ‘(’ before ‘else’ battle.c:1699: error: expected identifier or ‘(’ before ‘if’ battle.c:1718: error: expected identifier or ‘(’ before ‘return’ battle.c:1719: error: expected identifier or ‘(’ before ‘}’ token battle.c: In function ‘is_attack_critical’: battle.c:1906: error: ‘flag’ undeclared (first use in this function) battle.c:1906: error: (Each undeclared identifier is reported only once battle.c:1906: error: for each function it appears in.) battle.c:1927: error: ‘wflag’ undeclared (first use in this function) battle.c:2020: error: ‘skill’ undeclared (first use in this function) battle.c:2079:52: error: macro "ATK_ADDRATE" passed 3 arguments, but takes just 1 battle.c:2079: error: ‘ATK_ADDRATE’ undeclared (first use in this function) battle.c:2084: error: ‘i’ undeclared (first use in this function) battle.c:2086:37: error: macro "ATK_ADD" passed 3 arguments, but takes just 1 battle.c:2086: error: ‘ATK_ADD’ undeclared (first use in this function) battle.c:2089:42: error: macro "ATK_RATE" passed 3 arguments, but takes just 1 battle.c:2089: error: ‘ATK_RATE’ undeclared (first use in this function) battle.c:2090: warning: implicit declaration of function ‘RE_ALLATK_ADDRATE’ battle.c:2094:41: error: macro "ATK_RATE" passed 3 arguments, but takes just 1 battle.c:2113:47: error: macro "ATK_ADD" passed 3 arguments, but takes just 1 battle.c:2129:74: error: macro "ATK_ADD" passed 3 arguments, but takes just 1 battle.c:2131:54: error: macro "ATK_ADD" passed 3 arguments, but takes just 1 battle.c:2178: error: ‘nk’ undeclared (first use in this function) battle.c:2206: error: ‘skillratio’ undeclared (first use in this function) battle.c:3088: error: ‘s_ele’ undeclared (first use in this function) battle.c:3097: warning: implicit declaration of function ‘damage_div_fix’ battle.c:3139:64: error: macro "ATK_ADDRATE" passed 3 arguments, but takes just 1 battle.c:3150:73: error: macro "ATK_ADD" passed 3 arguments, but takes just 1 battle.c:3153: error: incompatible types when returning type ‘struct Damage’ but ‘bool’ was expected battle.c:3284:3: error: macro "ATK_RATE2" passed 4 arguments, but takes just 2 battle.c: In function ‘battle_calc_defense_reduction’: battle.c:3281: error: ‘ATK_RATE2’ undeclared (first use in this function) battle.c:3288:3: error: macro "ATK_ADD2" passed 4 arguments, but takes just 2 battle.c:3285: error: ‘ATK_ADD2’ undeclared (first use in this function) battle.c:3314:40: error: macro "ATK_ADD" passed 3 arguments, but takes just 1 battle.c: In function ‘battle_calc_attack_post_defense’: battle.c:3310: warning: unused variable ‘lv’ battle.c:3320:119: error: macro "ATK_ADD" passed 3 arguments, but takes just 1 battle.c:3326: warning: implicit declaration of function ‘battle_calc_attack_masteries’ battle.c:3326: error: incompatible types when assigning to type ‘struct Damage’ from type ‘int’ battle.c:3329: warning: implicit declaration of function ‘battle_skill_stacks_masteries_vvs’ battle.c:3333:88: error: macro "ATK_ADD2" passed 4 arguments, but takes just 2 battle.c:3333: error: ‘ATK_ADD2’ undeclared (first use in this function) battle.c:3335:72: error: macro "ATK_ADD2" passed 4 arguments, but takes just 2 battle.c:3344: warning: implicit declaration of function ‘RE_ALLATK_ADD’ battle.c:3345:36: error: macro "ATK_ADD" passed 3 arguments, but takes just 1 battle.c:3352:42: error: macro "ATK_ADDRATE" passed 3 arguments, but takes just 1 battle.c:3357:42: error: macro "ATK_ADDRATE" passed 3 arguments, but takes just 1 battle.c: In function ‘battle_calc_attack_plant’: battle.c:3370: warning: implicit declaration of function ‘is_attack_hitting’ battle.c:3372: warning: implicit declaration of function ‘battle_get_weapon_element’ battle.c:3420:44: error: macro "ATK_RATER" passed 2 arguments, but takes just 1 battle.c: In function ‘battle_calc_attack_left_right_hands’: battle.c:3420: error: ‘ATK_RATER’ undeclared (first use in this function) battle.c:3421: error: expected ‘;’ before ‘}’ token battle.c:3424:44: error: macro "ATK_RATER" passed 2 arguments, but takes just 1 battle.c:3425: error: expected ‘;’ before ‘}’ token battle.c:3431:45: error: macro "ATK_RATEL" passed 2 arguments, but takes just 1 battle.c:3431: error: ‘ATK_RATEL’ undeclared (first use in this function) battle.c:3432: error: expected ‘;’ before ‘}’ token battle.c:3435:45: error: macro "ATK_RATEL" passed 2 arguments, but takes just 1 battle.c:3436: error: expected ‘;’ before ‘}’ token battle.c:3517:26: error: macro "ATK_RATER" passed 2 arguments, but takes just 1 battle.c: In function ‘battle_calc_weapon_final_atk_modifiers’: battle.c:3517: error: ‘ATK_RATER’ undeclared (first use in this function) battle.c:3518: error: expected ‘;’ before ‘status_damage’ battle.c:3561:128: error: macro "ATK_ADD" passed 3 arguments, but takes just 1 battle.c: In function ‘is_attack_critical’: battle.c:3583: error: invalid storage class for function ‘initialize_weapon_data’ battle.c:3666: error: invalid storage class for function ‘battle_calc_weapon_attack’ battle.c: In function ‘battle_calc_weapon_attack’: battle.c:3705: warning: implicit declaration of function ‘battle_calc_multi_attack’ battle.c:3705: error: incompatible types when assigning to type ‘struct Damage’ from type ‘int’ battle.c:3714: warning: implicit declaration of function ‘battle_calc_skill_base_damage’ battle.c:3714: error: incompatible types when assigning to type ‘struct Damage’ from type ‘int’ battle.c:3715: warning: implicit declaration of function ‘battle_calc_attack_skill_ratio’ battle.c:3717:40: error: macro "ATK_RATE" passed 3 arguments, but takes just 1 battle.c:3718: warning: implicit declaration of function ‘RE_ALLATK_RATE’ battle.c:3720: warning: implicit declaration of function ‘battle_calc_skill_constant_addition’ battle.c:3722:39: error: macro "ATK_ADD" passed 3 arguments, but takes just 1 battle.c:3728:40: error: macro "ATK_ADDRATE" passed 3 arguments, but takes just 1 battle.c:3748: warning: implicit declaration of function ‘battle_attack_sc_bonus’ battle.c:3748: error: incompatible types when assigning to type ‘struct Damage’ from type ‘int’ battle.c:3751: warning: implicit declaration of function ‘attack_ignores_def’ battle.c:3761:45: error: macro "ATK_ADD" passed 3 arguments, but takes just 1 battle.c:3766: warning: implicit declaration of function ‘battle_calc_element_damage’ battle.c:3766: error: incompatible types when assigning to type ‘struct Damage’ from type ‘int’ battle.c:3783:95: error: macro "ATK_ADD2" passed 4 arguments, but takes just 2 battle.c:3783: error: ‘ATK_ADD2’ undeclared (first use in this function) battle.c:3785:63: error: macro "ATK_ADD" passed 3 arguments, but takes just 1 battle.c:3787:59: error: macro "ATK_ADD" passed 3 arguments, but takes just 1 battle.c:3794:73: error: macro "ATK_ADD" passed 3 arguments, but takes just 1 battle.c:3799: warning: implicit declaration of function ‘battle_skill_get_damage_properties’ battle.c:5173:54: error: macro "ATK_RATER" passed 2 arguments, but takes just 1 battle.c: In function ‘battle_weapon_attack’: battle.c:5173: error: ‘ATK_RATER’ undeclared (first use in this function) battle.c:5174: error: expected ‘;’ before ‘status_change_end_’ battle.c: In function ‘is_attack_critical’: battle.c:6330: error: invalid storage class for function ‘rAthena_report_timer’ battle.c:2145:1: error: unterminated #else battle.c:2064:1: error: unterminated #ifndef battle.c:6471: error: expected declaration or statement at end of input make[1]: *** [obj_sql/battle.o] Error 1
kangfredy Posted July 3, 2013 Posted July 3, 2013 i think it's close for renewal attack..but for CR_ACIDDEMONSTRATION i feel it's not affected if im using archer_skeleton card.for edp with new attack renewal not tested i will give u information ASAP 1
eleriaqueen Posted July 3, 2013 Posted July 3, 2013 Nice work ! I was wondering if Ranged Attack is correctly implemented ? (more or less correct Arrow Storm damage ?)
Recommended Posts