Take card bonus into account

nmeylan · Feb 13, 2024 · 7dc8115 · 7dc8115
1 parent 55a9579
commit 7dc8115
Show file tree

Hide file tree

Showing 7 changed files with 171 additions and 161 deletions.
diff --git a/doc/progress/each-bonus_progress.md b/doc/progress/each-bonus_progress.md
@@ -1,4 +1,4 @@
-68/88 tests passed
+69/88 tests passed
 
 fixture file was [src/tests/common/fixtures/data/stats-for-each-stats.json](/server/src/tests/common/fixtures/data/stats-for-each-stats.json)
 
@@ -11,14 +11,13 @@ fixture file was [src/tests/common/fixtures/data/stats-for-each-stats.json](/ser
 |ugvq4y|Knight(95/50)|**<ul><li>Gelerdria<ul><li>*ElementWeapon(Earth)*</li><li>*Maxhp(800)*</li><li>*Maxsp(-50)*</li></ul></li></ul>**|**<ul><li>Gelerdria<ul><li>*ElementWeapon(Earth)*</li><li>*Maxhp(800)*</li><li>*Maxsp(-50)*</li></ul></li></ul>**|*false*|**50+8/50+8**|**50+2/50+2**|**50+10/50+10**|**50+6/50+6**|**50+0/50+0**|**50+4/50+4**|**155.7/155.7**|**249/249**|**0/0**|**99/99**|**150/150**|**0/0**|**0/0**|**151/151**|**147/147**|**17.2/17.2**|*11795/12595*|*442/392*|**Neutral/Neutral**|
 |mkzun8|Knight(95/50)|*<ul><li>Twin_Ribbon<ul><li>*Maxsp(30)*</li><li>*Mdef(3)*</li></ul></li></ul>*|*<ul><li>Maiden's Twin Ribbon<ul><li>*Maxsp(30)*</li><li>*Mdef(3)*</li><li>*NaturalSpRecoveryPercentage(5)*</li></ul></li></ul>*|*false*|**50+8/50+8**|**50+2/50+2**|**50+10/50+10**|**50+6/50+6**|**50+0/50+0**|**50+4/50+4**|**170.5/170.5**|**104/104**|**0/0**|**99/99**|**150/150**|**0/0**|**3/3**|**151/151**|**147/147**|**17.2/17.2**|**11795/11795**|*442/472*|**Neutral/Neutral**|
 |bcp5tc|Knight(95/50)|*<ul><li>Bird_Nest<ul><li>*Agi(2)*</li><li>*ResistanceDamageFromRaceBrutePercentage(10)*</li></ul></li></ul>*|*<ul><li>Bird's Nest<ul><li>*Agi(1)*</li><li>*Dex(1)*</li><li>*ResistanceToStatusStunPercentage(10)*</li></ul></li></ul>*|*false*|**50+8/50+8**|*50+4/50+3*|**50+10/50+10**|*50+6/50+7*|**50+0/50+0**|**50+4/50+4**|**170.8/170.6**|**104/104**|**0/0**|**99/99**|**150/150**|*1/2*|**0/0**|*151/152*|*149/148*|**17.2/17.2**|**11795/11795**|**442/442**|**Neutral/Neutral**|
-|n7t612|Knight(95/50)|*<ul><li>Spectral_Spear<ul><li>*PhysicalDamageAgainstElementDarkPercentage(20)*</li><li>*PhysicalDamageAgainstRaceDemonPercentage(20)*</li><li>*PhysicalDamageAgainstRaceUndeadPercentage(20)*</li><li>*ResistanceDamageFromElementDarkPercentage(10)*</li><li>*ResistanceDamageFromRaceDemonPercentage(10)*</li><li>*ResistanceDamageFromRaceUndeadPercentage(10)*</li><li>*ChanceToInflictStatusConfuseToSelfOnAttackPercentage(10.0)*</li><li>*GainHpWhenKillingEnemy(50)*</li></ul></li></ul>*|*<ul><li>Phantom Spear<ul><li>*PhysicalDamageAgainstRaceUndeadPercentage(20)*</li><li>*PhysicalDamageAgainstRaceDemonPercentage(20)*</li><li>*PhysicalDamageAgainstElementDarkPercentage(20)*</li><li>*PhysicalDamageAgainstRaceUndeadPercentage(20)*</li><li>*ResistanceDamageFromRaceUndeadPercentage(10)*</li><li>*ResistanceDamageFromRaceDemonPercentage(10)*</li></ul></li></ul>*|*false*|**50+8/50+8**|**50+2/50+2**|**50+10/50+10**|**50+6/50+6**|**50+0/50+0**|**50+4/50+4**|**155.7/155.7**|**274/274**|**0/0**|**99/99**|**150/150**|**0/0**|**0/0**|**151/151**|**147/147**|**17.2/17.2**|**11795/11795**|**442/442**|**Neutral/Neutral**|
+|n7t612|Knight(95/50)|*<ul><li>Spectral_Spear<ul><li>*PhysicalDamageAgainstElementDarkPercentage(20)*</li><li>*PhysicalDamageAgainstRaceDemonPercentage(20)*</li><li>*PhysicalDamageAgainstRaceUndeadPercentage(20)*</li><li>*ResistanceDamageFromElementDarkPercentage(10)*</li><li>*ResistanceDamageFromRaceDemonPercentage(10)*</li><li>*ResistanceDamageFromRaceUndeadPercentage(10)*</li><li>*ChanceToInflictStatusChaosToSelfOnAttackPercentage(10.0)*</li><li>*GainHpWhenKillingEnemy(50)*</li></ul></li></ul>*|*<ul><li>Phantom Spear<ul><li>*PhysicalDamageAgainstRaceUndeadPercentage(20)*</li><li>*PhysicalDamageAgainstRaceDemonPercentage(20)*</li><li>*PhysicalDamageAgainstElementDarkPercentage(20)*</li><li>*PhysicalDamageAgainstRaceUndeadPercentage(20)*</li><li>*ResistanceDamageFromRaceUndeadPercentage(10)*</li><li>*ResistanceDamageFromRaceDemonPercentage(10)*</li></ul></li></ul>*|*false*|**50+8/50+8**|**50+2/50+2**|**50+10/50+10**|**50+6/50+6**|**50+0/50+0**|**50+4/50+4**|**155.7/155.7**|**274/274**|**0/0**|**99/99**|**150/150**|**0/0**|**0/0**|**151/151**|**147/147**|**17.2/17.2**|**11795/11795**|**442/442**|**Neutral/Neutral**|
 |lnj8wd|Knight(95/50)|*<ul><li>Pole_Axe<ul><li>*Str(1)*</li><li>*Int(2)*</li><li>*Dex(1)*</li></ul></li></ul>*|*<ul><li>Bardiche<ul><li>*ResistanceDamageFromSizeMediumPercentage(13)*</li><li>*ResistanceDamageFromSizeLargePercentage(15)*</li></ul></li></ul>*|*false*|*50+9/50+8*|**50+2/50+2**|**50+10/50+10**|*50+7/50+6*|*50+2/50+0*|**50+4/50+4**|**155.8/148.4**|*265/304*|**0/0**|*101/99*|*152/150*|**0/0**|**0/0**|*152/151*|**147/147**|**17.2/17.2**|**11795/11795**|*448/442*|**Neutral/Neutral**|
 |djidqk|Assassin(95/50)|**<ul><li>Infiltrator<ul><li>*PhysicalDamageAgainstRaceDemiHumanPercentage(50)*</li><li>*Def(3)*</li><li>*Flee(5)*</li><li>*PerfectDodge(2)*</li></ul></li></ul>**|**<ul><li>Infiltrator<ul><li>*PhysicalDamageAgainstRaceDemiHumanPercentage(50)*</li><li>*Def(3)*</li><li>*Flee(5)*</li><li>*PerfectDodge(2)*</li></ul></li></ul>**|*false*|**50+6/50+6**|**50+10/50+10**|**50+2/50+2**|**50+8/50+8**|**50+4/50+4**|**50+0/50+0**|**59.600006/164.9**|**242/242**|**0/0**|**103/103**|**154/154**|**3/3**|**0/0**|**153/153**|**160/160**|*16/32*|**8404/8404**|**600/600**|**Neutral/Neutral**|
 |28p4uh|Assassin(95/50)|**<ul><li>Nail_Of_Loki<ul><li>*ChanceToInflictStatusBleedingOnAttackPercentage(3.0)*</li></ul></li></ul>**|**<ul><li>Loki's Nail<ul><li>*ChanceToInflictStatusBleedingOnAttackPercentage(3.0)*</li></ul></li></ul>**|*false*|**50+6/50+6**|**50+10/50+10**|**50+2/50+2**|**50+8/50+8**|**50+4/50+4**|**50+0/50+0**|**59.600006/164.9**|**217/217**|**0/0**|**103/103**|**154/154**|**0/0**|**0/0**|**153/153**|**155/155**|*16/32*|**8404/8404**|**600/600**|**Neutral/Neutral**|
 |dr7hgy|Priest(95/50)|*<ul><li>Rod<ul><li>*MatkPercentage(15)*</li></ul></li></ul>*|*<ul><li>Rod<ul><li>*MatkBasedOnStaffPercentage(15)*</li></ul></li></ul>*|*false*|**50+5/50+5**|**50+4/50+4**|**50+5/50+5**|**50+4/50+4**|**50+5/50+5**|**50+7/50+7**|**156.1/156.1**|**116/116**|**0/0**|**119/119**|**202/202**|**0/0**|**0/0**|**149/149**|**149/149**|**18.1/18.1**|**6108/6108**|**1193/1193**|**Neutral/Neutral**|
 |ndy521|Priest(95/50)|*<ul><li>Staff_Of_Soul<ul><li>*Int(5)*</li><li>*Agi(2)*</li><li>*MatkPercentage(15)*</li></ul></li></ul>*|*<ul><li>Staff of Soul<ul><li>*Int(5)*</li><li>*Agi(2)*</li><li>*MatkBasedOnStaffPercentage(15)*</li></ul></li></ul>*|*false*|**50+5/50+5**|**50+6/50+6**|**50+5/50+5**|**50+4/50+4**|**50+10/50+10**|**50+7/50+7**|**55.600006/156.6**|**126/126**|**0/0**|**142/142**|**234/234**|**0/0**|**0/0**|**149/149**|**151/151**|**18.1/18.1**|**6108/6108**|**1232/1237**|**Neutral/Neutral**|
 |ckeb7f|Priest(95/50)|*<ul><li>Wizardy_Staff<ul><li>*Int(6)*</li><li>*Dex(2)*</li><li>*MatkPercentage(15)*</li></ul></li></ul>*|*<ul><li>Wizardry Staff<ul><li>*Int(6)*</li><li>*Dex(2)*</li><li>*MatkBasedOnStaffPercentage(15)*</li></ul></li></ul>*|*false*|**50+5/50+5**|**50+4/50+4**|**50+5/50+5**|**50+6/50+6**|**50+11/50+11**|**50+7/50+7**|**54.399994/156.2**|**222/222**|**0/0**|**143/143**|**235/235**|**0/0**|**0/0**|**151/151**|**149/149**|**18.1/18.1**|**6108/6108**|**1239/1245**|**Neutral/Neutral**|
-|1arirb|Hunter(95/50)|*<ul><li>Bow_Of_Rudra<ul><li>*ElementWeapon(Holy)*</li><li>*Int(5)*</li><li>*EnableSkillId(35, 1)*</li><li>*EnableSkillId(28, 1)*</li><li>*ResistanceToStatusPoisonPercentage(50)*</li><li>*ResistanceToStatusCursePercentage(50)*</li><li>*ResistanceToStatusSilencePercentage(50)*</li><li>*ResistanceToStatusConfusePercentage(50)*</li><li>*ResistanceToStatusBlindPercentage(50)*</li></ul></li></ul>*|*<ul><li>Rudra's Bow<ul><li>*Int(5)*</li><li>*ResistanceToStatusPoisonPercentage(50)*</li><li>*ResistanceToStatusCursePercentage(50)*</li><li>*ResistanceToStatusBlindPercentage(50)*</li><li>*ResistanceToStatusSilencePercentage(50)*</li><li>*ResistanceToStatusChaosPercentage(50)*</li><li>*EnableSkillId(28, 1)*</li><li>*EnableSkillId(35, 1)*</li></ul></li></ul>*|*false*|**50+4/50+4**|**50+6/50+6**|**50+2/50+2**|**50+10/50+10**|**50+9/50+9**|**50+4/50+4**|**157/157**|**266/266**|**0/0**|**123/123**|**180/180**|**0/0**|**0/0**|**155/155**|**151/151**|**17.2/17.2**|**6669/6669**|**620/625**|**Neutral/Neutral**|
 |osm7vu|Wizard(95/50)|**<ul><li>Wizardry_Hat<ul><li>*Int(2)*</li><li>*Maxsp(150)*</li></ul></li></ul>**|**<ul><li>Mage Hat<ul><li>*Int(2)*</li><li>*Maxsp(150)*</li></ul></li></ul>**|*false*|**50+1/50+1**|**50+8/50+8**|**50+1/50+1**|**50+6/50+6**|**50+14/50+14**|**50+2/50+2**|**164.4/164.4**|**97/97**|**0/0**|**145/145**|**208/208**|**1/1**|**0/0**|**151/151**|**153/153**|**16.6/16.6**|**4560/4560**|*1418/1570*|**Neutral/Neutral**|
 |fued9f|Blacksmith(95/50)|*<ul><li>Weapon_Exchange<ul></ul></li></ul>*|*<ul><li>�n�ڃ}�X�N<ul><li>*ResistanceDamageFromElementFirePercentage(10)*</li></ul></li></ul>*|*false*|**50+6/50+6**|**50+2/50+2**|**50+6/50+6**|**50+12/50+12**|**50+2/50+2**|**50+2/50+2**|**170.7/170.7**|**103/103**|**0/0**|**101/101**|**152/152**|*0/2*|**0/0**|**157/157**|**147/147**|**16.6/16.6**|**7205/7205**|**592/592**|**Neutral/Neutral**|
 |787ojv|Dancer(95/50)|**<ul><li>Rapture_Rose<ul><li>*ElementWeapon(Poison)*</li><li>*ChanceToInflictStatusPoisonOnAttackPercentage(50.0)*</li></ul></li></ul>**|**<ul><li>Rapture Rose<ul><li>*ElementWeapon(Poison)*</li><li>*ChanceToInflictStatusPoisonOnAttackPercentage(50.0)*</li></ul></li></ul>**|*false*|**50+2/50+2**|**50+7/50+7**|**50+3/50+3**|**50+5/50+5**|**50+5/50+5**|**50+8/50+8**|**158.7/158.7**|*214/216*|**0/0**|**104/104**|**176/176**|**0/0**|**0/0**|**150/150**|**152/152**|**18.4/18.4**|**5739/5739**|**899/899**|**Neutral/Neutral**|
@@ -87,6 +86,7 @@ fixture file was [src/tests/common/fixtures/data/stats-for-each-stats.json](/ser
 |49nysk|Priest(95/50)|**<ul><li>Girl's_Diary<ul></ul></li></ul>**|**<ul><li>Girl's Diary<ul></ul></li></ul>**|**true**|**50+5/50+5**|**50+4/50+4**|**50+5/50+5**|**50+4/50+4**|**50+5/50+5**|**50+7/50+7**|**54/156.1**|**161/161**|**0/0**|**104/104**|**176/176**|**0/0**|**0/0**|**149/149**|**149/149**|**18.1/18.1**|**6108/6108**|**1193/1193**|**Neutral/Neutral**|
 |ifvdyb|Priest(95/50)|**<ul><li>Book_Of_The_Apocalypse<ul><li>*ElementWeapon(Dark)*</li><li>*PhysicalDamageAgainstElementHolyPercentage(5)*</li><li>*PhysicalDamageAgainstElementWaterPercentage(7)*</li><li>*PhysicalDamageAgainstElementEarthPercentage(7)*</li><li>*PhysicalDamageAgainstElementFirePercentage(7)*</li><li>*PhysicalDamageAgainstElementWindPercentage(7)*</li></ul></li></ul>**|**<ul><li>Book of the Appocalypse<ul><li>*ElementWeapon(Dark)*</li><li>*PhysicalDamageAgainstElementWaterPercentage(7)*</li><li>*PhysicalDamageAgainstElementEarthPercentage(7)*</li><li>*PhysicalDamageAgainstElementFirePercentage(7)*</li><li>*PhysicalDamageAgainstElementWindPercentage(7)*</li></ul></li></ul>**|**true**|**50+5/50+5**|**50+4/50+4**|**50+5/50+5**|**50+4/50+4**|**50+5/50+5**|**50+7/50+7**|**54/156.1**|**221/221**|**0/0**|**104/104**|**176/176**|**0/0**|**0/0**|**149/149**|**149/149**|**18.1/18.1**|**6108/6108**|**1193/1193**|**Neutral/Neutral**|
 |j8pysc|Priest(95/50)|**<ul><li>Kaiser_Knuckle<ul><li>*ElementWeapon(Wind)*</li><li>*PhysicalDamageAgainstRaceUndeadPercentage(5)*</li><li>*PhysicalDamageAgainstElementWaterPercentage(10)*</li><li>*PhysicalDamageAgainstElementEarthPercentage(10)*</li><li>*PhysicalDamageAgainstElementFirePercentage(10)*</li><li>*PhysicalDamageAgainstElementWindPercentage(10)*</li></ul></li></ul>**|**<ul><li>Kaizer Knuckle<ul><li>*ElementWeapon(Wind)*</li><li>*PhysicalDamageAgainstRaceUndeadPercentage(5)*</li><li>*PhysicalDamageAgainstElementWaterPercentage(10)*</li><li>*PhysicalDamageAgainstElementEarthPercentage(10)*</li><li>*PhysicalDamageAgainstElementFirePercentage(10)*</li><li>*PhysicalDamageAgainstElementWindPercentage(10)*</li></ul></li></ul>**|**true**|**50+5/50+5**|**50+4/50+4**|**50+5/50+5**|**50+4/50+4**|**50+5/50+5**|**50+7/50+7**|**163.5/53.81**|**211/211**|**0/0**|**104/104**|**176/176**|**0/0**|**0/0**|**149/149**|**149/149**|**18.1/18.1**|**6108/6108**|**1193/1193**|**Neutral/Neutral**|
+|1arirb|Hunter(95/50)|**<ul><li>Bow_Of_Rudra<ul><li>*ElementWeapon(Holy)*</li><li>*Int(5)*</li><li>*EnableSkillId(35, 1)*</li><li>*EnableSkillId(28, 1)*</li><li>*ResistanceToStatusPoisonPercentage(50)*</li><li>*ResistanceToStatusCursePercentage(50)*</li><li>*ResistanceToStatusSilencePercentage(50)*</li><li>*ResistanceToStatusChaosPercentage(50)*</li><li>*ResistanceToStatusBlindPercentage(50)*</li></ul></li></ul>**|**<ul><li>Rudra's Bow<ul><li>*Int(5)*</li><li>*ResistanceToStatusPoisonPercentage(50)*</li><li>*ResistanceToStatusCursePercentage(50)*</li><li>*ResistanceToStatusBlindPercentage(50)*</li><li>*ResistanceToStatusSilencePercentage(50)*</li><li>*ResistanceToStatusChaosPercentage(50)*</li><li>*EnableSkillId(28, 1)*</li><li>*EnableSkillId(35, 1)*</li></ul></li></ul>**|**true**|**50+4/50+4**|**50+6/50+6**|**50+2/50+2**|**50+10/50+10**|**50+9/50+9**|**50+4/50+4**|**157/157**|**266/266**|**0/0**|**123/123**|**180/180**|**0/0**|**0/0**|**155/155**|**151/151**|**17.2/17.2**|**6669/6669**|**620/625**|**Neutral/Neutral**|
 |4xmus4|Hunter(95/50)|**<ul><li>Thimble_Of_Archer<ul><li>*DamageRangedAtkPercentage(3)*</li></ul></li></ul>**|**<ul><li>Bow Thimble<ul><li>*DamageRangedAtkPercentage(3)*</li></ul></li></ul>**|**true**|**50+4/50+4**|**50+6/50+6**|**50+2/50+2**|**50+10/50+10**|**50+4/50+4**|**50+4/50+4**|**171.3/171.3**|**101/101**|**0/0**|**103/103**|**154/154**|**0/0**|**0/0**|**155/155**|**151/151**|**17.2/17.2**|**6669/6669**|**600/600**|**Neutral/Neutral**|
 |ptf7lb|Wizard(95/50)|**<ul><li>Robe_Of_Casting<ul><li>*CastTimePercentage(-3)*</li><li>*Mdef(4)*</li></ul></li></ul>**|**<ul><li>Casting Robe<ul><li>*Mdef(4)*</li><li>*CastTimePercentage(-3)*</li></ul></li></ul>**|**true**|**50+1/50+1**|**50+8/50+8**|**50+1/50+1**|**50+6/50+6**|**50+12/50+12**|**50+2/50+2**|**164.4/164.4**|**97/97**|**0/0**|**126/126**|**206/206**|**5/5**|**4/4**|**151/151**|**153/153**|**16.6/16.6**|**4560/4560**|**1401/1401**|**Neutral/Neutral**|
 |wkobz8|Super Novice(95/71)|**<ul><li>Novice_Manteau<ul><li>*ResistanceDamageFromElementNeutralPercentage(10)*</li></ul></li></ul>**|**<ul><li>Novice Manteau<ul><li>*ResistanceDamageFromElementNeutralPercentage(10)*</li></ul></li></ul>**|**true**|**50+15/50+15**|**50+15/50+15**|**50+15/50+15**|**50+15/50+15**|**50+15/50+15**|**50+15/50+15**|**166.2/166.2**|**127/127**|**0/0**|**146/146**|**234/234**|**2/2**|**0/0**|**160/160**|**160/160**|**20.5/20.5**|**841/841**|**173/173**|**Neutral/Neutral**|