Skip to content

Commit 292a3a6

Browse files
Refactor ability and passive metadata to use milliseconds and consistent naming
Co-authored-by: rdbailey.dev <rdbailey.dev@gmail.com>
1 parent d49a973 commit 292a3a6

File tree

3 files changed

+56
-24
lines changed

3 files changed

+56
-24
lines changed

plugin/src/main/resources/data/abilities.yml

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ abilities:
66
usage: right_click
77
hotbarItem: iron_axe
88
displayItem: coal
9+
metadata:
10+
projectileKnockbackModifier: 2.5
11+
projectileDamage: 6.5
912

1013
- id: explode
1114
cooldown: 8.0
@@ -14,6 +17,10 @@ abilities:
1417
usage: right_click
1518
hotbarItem: iron_shovel
1619
displayItem: creeper_spawn_egg
20+
metadata:
21+
fuseTimeTicks: 30
22+
explosionRadius: 8.0
23+
explosionKnockbackMultiplier: 2.5
1724

1825
- id: bone_explosion
1926
cooldown: 10.0
@@ -22,6 +29,9 @@ abilities:
2229
usage: right_click
2330
hotbarItem: iron_axe
2431
displayItem: bone
32+
metadata:
33+
explosionRadius: 7.0
34+
baseDamage: 6.0
2535

2636
- id: roped_arrow
2737
cooldown: 5.0
@@ -30,6 +40,9 @@ abilities:
3040
usage: left_click
3141
hotbarItem: bow
3242
displayItem: arrow
43+
metadata:
44+
arrowVelocityModifier: 2.4
45+
arrowDamage: 6.0
3346

3447
- id: angry_herd
3548
cooldown: 13.0
@@ -39,13 +52,15 @@ abilities:
3952
hotbarItem: iron_axe
4053
displayItem: cow_spawn_egg
4154
metadata:
42-
cowsCount: 5
43-
cowSpeed: 0.9
44-
contactRadius: 1.2
45-
durationTicks: 60
46-
damagePerHit: 5.0
47-
knockbackMultiplier: 1.25
48-
hitCooldownTicks: 10
55+
cowAmountRadius: 3
56+
cowAmountHeight: 1
57+
stuckTimeMs: 300
58+
forceMoveTimeMs: 350
59+
durationMs: 2500
60+
hitboxRadius: 2.2
61+
damageCooldownMs: 600
62+
damage: 5.0
63+
knockback: 1.25
4964

5065
- id: milk_spiral
5166
cooldown: 9.0
@@ -55,14 +70,12 @@ abilities:
5570
hotbarItem: iron_shovel
5671
displayItem: milk_bucket
5772
metadata:
58-
durationTicks: 160
59-
propelTicks: 80
60-
helixRadius: 1.5
61-
centerSpeed: 0.9
62-
playerSpeed: 1.0
73+
spiralDurationMs: 3000
74+
velocityDurationMs: 1800
75+
hitboxRadius: 2.0
6376
damage: 5.0
64-
maxTargets: 2
65-
hitCooldownTicks: 10
77+
maxTimesHit: 2
78+
damageCooldownMs: 250
6679

6780
- id: blink
6881
cooldown: 6.0
@@ -81,4 +94,9 @@ abilities:
8194
usage: right_click
8295
hotbarItem: iron_sword
8396
displayItem: grass_block
84-
metadata:
97+
metadata:
98+
chargeTimeMs: 1200
99+
maxCharge: 1.4
100+
maxDamage: 9.0
101+
damage: 8.0
102+
knockbackMultiplier: 2.5

plugin/src/main/resources/data/kits.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ kits:
2626
- id: regeneration
2727
overrides:
2828
metadata:
29-
regenRate: 0.4
29+
healAmount: 0.4
3030
- id: hunger
3131
abilities:
3232
- id: sulphur_bomb
@@ -52,7 +52,7 @@ kits:
5252
- id: regeneration
5353
overrides:
5454
metadata:
55-
regenRate: 0.25
55+
healAmount: 0.25
5656
- id: hunger
5757
- id: arrow_recharge
5858
overrides:
@@ -81,7 +81,7 @@ kits:
8181
- id: regeneration
8282
overrides:
8383
metadata:
84-
regenRate: 0.25
84+
healAmount: 0.25
8585
- id: stampede
8686
- id: hunger
8787
abilities:
@@ -106,7 +106,7 @@ kits:
106106
- id: regeneration
107107
overrides:
108108
metadata:
109-
regenRate: 0.25
109+
healAmount: 0.25
110110
- id: hunger
111111
abilities:
112112
- id: blink
Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,42 @@
11
passives:
22
- id: double_jump
33
userFacing: false
4+
metadata:
5+
# Motion tuning
6+
horizontalMultiplier: 0.9
7+
verticalBoost: 0.9
8+
allowMidairReset: false
49

510
- id: hunger
611
userFacing: false
12+
metadata:
13+
hungerRestoreDelayMs: 250
714

815
- id: regeneration
916
userFacing: false
17+
metadata:
18+
healAmount: 1.0
19+
healIntervalTicks: 60
1020

1121
- id: arrow_recharge
1222
displayItem: bundle
1323
userFacing: true
1424
metadata:
15-
arrowIntervalTicks: 20
25+
arrowHotbarSlot: 2
26+
maximumArrowCount: 3
27+
arrowIntervalTicks: 40
1628

1729
- id: barrage
1830
displayItem: spectral_arrow
1931
userFacing: true
32+
metadata:
33+
maxCharge: 5
34+
arrowDamage: 6.0
2035

2136
- id: stampede
2237
displayItem: leather
2338
userFacing: true
2439
metadata:
25-
maxLevel: 4
26-
ticksPerLevel: 60
27-
extraDamagePerLevel: 0.5
28-
extraKnockbackPerLevel: 0.1
40+
stackIncreaseTimeMs: 3000
41+
maxStacks: 3
42+
stopSprintDamage: 3

0 commit comments

Comments
 (0)