Skip to content

Commit

Permalink
Autobonus on ground skill and Angelic Ring fixed
Browse files Browse the repository at this point in the history 
- Autobonus3 will now also trigger when using ground skills (bugreport:6434)
- Fixed trigger chance of the Angelic Ring auto-bonuses (5% -> 10%) and that they didn't display any effect
  • Loading branch information
@Playtester
Playtester committed Nov 17, 2014
1 parent 796b974 commit a0bd016
Show file tree
Hide file tree
Showing 5 changed files with 16,645 additions and 16,645 deletions.
2 changes: 1 addition & 1 deletion db/pre-re/item_db.txt
View file
Expand Up @@ -1561,7 +1561,7 @@
2740,Rusty_Coin,Rusty Coin,4,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus2 bAddClass,Class_All,3; bonus bMatkRate,3; },{},{}
2741,All_In_One_Ring,All In One Ring,4,20,,0,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus bAllStats,1; bonus bNoCastCancel,0; bonus bCastRate,10; skill "AL_HEAL",1; skill "AL_TELEPORT",1; },{},{}
//2742,Lucky_Clip,Lucky Clip,4,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{},{},{}
2743,Angelic_Ring,Angelic Ring,4,20,,100,,0,,0,0x00CFFF80,2,2,136,,70,0,0,{ bonus bInt,2; bonus bDex,1; bonus bMdef,2; autobonus3 "{ bonus bHealPower,20; }",50,3000,"AL_HEAL"; autobonus3 "{ bonus bHealPower,20; }",50,3000,"AM_POTIONPITCHER"; autobonus3 "{ bonus bHealPower,20; }",50,3000,"PR_SANCTUARY"; },{},{}
2743,Angelic_Ring,Angelic Ring,4,20,,100,,0,,0,0x00CFFF80,2,2,136,,70,0,0,{ bonus bInt,2; bonus bDex,1; bonus bMdef,2; autobonus3 "{ bonus bHealPower,20; }",100,3000,"AL_HEAL","{ specialeffect2 EF_HEAL3; }"; autobonus3 "{ bonus bHealPower,20; }",100,3000,"AM_POTIONPITCHER","{ specialeffect2 EF_HEAL3; }"; autobonus3 "{ bonus bHealPower,20; }",100,3000,"PR_SANCTUARY","{ specialeffect2 EF_HEAL3; }"; },{},{}
2744,Sprint_Ring,Sprint Ring,4,20,,100,,0,,0,0x00CFFF80,2,2,136,,70,0,0,{ bonus bCastrate,-10; bonus bDelayRate,-5; },{},{}
2745,Pinguicula_Corsage,Pinguicula Corsage,4,20,,200,,0,,1,0x00CFFF80,2,2,136,,70,0,0,{ bonus bMdef,2; bonus bMaxSP,25; },{},{}
2746,Cold_Heart,Cold Heart,4,20,,100,,1,,0,0x00001000,2,2,136,,80,0,0,{ bonus bAgi,3; },{},{}
Expand Down
2 changes: 1 addition & 1 deletion db/re/item_db.txt
View file
Expand Up @@ -1816,7 +1816,7 @@
2740,Rusty_Coin,Rusty Coin,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus2 bAddClass,Class_All,3; bonus bMatkRate,3; },{},{}
2741,All_In_One_Ring,All In One Ring,4,20,,0,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus bAllStats,1; bonus bNoCastCancel,0; bonus bVariableCastrate,10; skill "AL_HEAL",1; skill "AL_TELEPORT",1; },{},{}
2742,Lucky_Clip,Lucky Clip,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{},{},{}
2743,Angelic_Ring,Angelic Ring,4,20,,100,,0,,0,0x00CFFF80,18,2,136,,70,0,0,{ bonus bInt,2; bonus bDex,1; bonus bMdef,2; autobonus3 "{ bonus bHealPower,20; }",50,3000,"AL_HEAL"; autobonus3 "{ bonus bHealPower,20; }",50,3000,"AM_POTIONPITCHER"; autobonus3 "{ bonus bHealPower,20; }",50,3000,"PR_SANCTUARY"; },{},{}
2743,Angelic_Ring,Angelic Ring,4,20,,100,,0,,0,0x00CFFF80,18,2,136,,70,0,0,{ bonus bInt,2; bonus bDex,1; bonus bMdef,2; autobonus3 "{ bonus bHealPower,20; }",100,3000,"AL_HEAL","{ specialeffect2 EF_HEAL3; }"; autobonus3 "{ bonus bHealPower,20; }",100,3000,"AM_POTIONPITCHER","{ specialeffect2 EF_HEAL3; }"; autobonus3 "{ bonus bHealPower,20; }",100,3000,"PR_SANCTUARY","{ specialeffect2 EF_HEAL3; }"; },{},{}
2744,Sprint_Ring,Sprint Ring,4,20,,100,,0,,0,0x00CFFF80,18,2,136,,70,0,0,{ bonus bVariableCastrate,-10; bonus bDelayRate,5; },{},{}
2745,Pinguicula_Corsage,Pinguicula Corsage,4,20,,200,,0,,1,0x00CFFF80,18,2,136,,70,0,0,{ bonus bMdef,2; bonus bMaxSP,25; },{},{}
2746,Cold_Heart,Cold Heart,4,20,,100,,1,,0,0x00001000,18,2,136,,80,0,0,{ bonus bAgi,3; },{},{}
Expand Down

7 comments on commit a0bd016

@RadianFord
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No update on the sql files? or its correct?

@Playtester
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The files were updated. For some reason Git thinks the Perl conversion scripts changed all lines so it doesn't show them here but it lists the files above.

@RadianFord
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Playtester I see thank you. I think my trunk is 5 days old.

@cydh
Copy link
Contributor

@cydh cydh commented on a0bd016 Nov 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Playtester, and... previously, people (me included) update the .sql using that perl tool, nothing wrong with that

in the end, I ended can't merge/update my locals after this change because that item_db.sql & item_db_re.sql. It also makes me can't update my fork.
For the locals, at least I need to re-clone. Hope noone get same issue or maybe help me to solve this. xD

platform issue? my local config?

Windows 7, git version 1.9.0.msysgit.0

> git config --global --list
branch.autosetuprebase=always

> git config --system --list
core.symlinks=false
core.autocrlf=true
rebase.autosquash=true

> git config --local --list
core.repositoryformatversion=0
core.bare=false
core.logallrefupdates=true
core.symlinks=false
core.hidedotfiles=dotGitOnly
core.filemode=false

@Playtester
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm using Tortoise SVN to commit and Active Perl to execute the perl script. I assume the perl script uses the format of Windows when executed in windows so it adds carriage return next to new line.

I'd suggest we just drop the SQL files and only keep the TXT files because that means a lot less work for devs. Server owners would simply need to execute the Perl script once to create the SQL files and done. And then there are no conflicts when the format changes.

Edit: Alternatively, I just don't update SQL files at all and let someone with a Linux system do it indead.

@Akkarinage
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or we drop the *_db.txt files ;)

@Playtester
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No way. They are much easier to edit and read than the SQL files.

Please sign in to comment.