Skip to content

Commit 789132e

Browse files
committed
Update examples and fix up SecParticle
1 parent 10578b9 commit 789132e

12 files changed

Lines changed: 73 additions & 51 deletions

File tree

src/main/java/com/sovdee/skriptparticles/elements/expressions/ExprDrawnShapes.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
@Name("Drawn Shape")
1515
@Description("Returns the shape that is being drawn by the draw section.")
1616
@Examples({
17-
"draw {_shapes::*} at player's head with radius 1:",
18-
"\t# only affects the drawn version, the original shape is not changed",
19-
"\tset radius of drawn shape to 2"
17+
"draw the shapes {_shapes::*} at player's head with radius 1:",
18+
"\t# only affects the drawn version, the original shape is not changed",
19+
"\tset radius of drawn shape to 2"
2020
})
2121
@Since("1.0.0")
2222
public class ExprDrawnShapes extends EventValueExpression<Shape> {

src/main/java/com/sovdee/skriptparticles/elements/expressions/constructors/ExprCuboid.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
@Examples({
3030
"set {_shape} to a solid cuboid with length 10, width 10, and height 10",
3131
"set {_shape} to a hollow cuboid from vector(-5, -5, -5) to vector(5, 5, 5)",
32-
"draw a cuboid from player to player's target"
32+
"draw the shape of a cuboid from player to player's target"
3333
})
3434
@Since("1.0.0")
3535
public class ExprCuboid extends SimpleExpression<Cuboid> {

src/main/java/com/sovdee/skriptparticles/elements/expressions/constructors/ExprHeart.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
@Examples({
2828
"set {_heart} to heart with width 5 and length 4",
2929
"set {_heart} to heart shape with width 5, length 7, and eccentricity 2",
30-
"draw a heart of width 2 and length 2 at player"
30+
"draw the shape of a heart of width 2 and length 2 at player"
3131
})
3232
@Since("1.0.1")
3333
public class ExprHeart extends SimpleExpression<Heart> {

src/main/java/com/sovdee/skriptparticles/elements/expressions/constructors/ExprLine.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434
@Examples({
3535
"set {_shape} to line from vector(0, 0, 0) to vector(10, 10, 10)",
3636
"set {_shape} to a line in direction vector(1, 1, 1) and length 10",
37-
"draw a line from vector(0, 0, 0) to vector(10, 10, 10) at player",
37+
"draw the shape of a line from vector(0, 0, 0) to vector(10, 10, 10) at player",
3838
"",
3939
"# note that the following does not require a location to be drawn at",
40-
"draw a line from player to player's target",
41-
"draw a line from player to (all players in radius 10 of player)",
42-
"draw a line connecting {_locations::*}"
40+
"draw the shape of a line from player to player's target",
41+
"draw the shape of a line from player to (all players in radius 10 of player)",
42+
"draw the shape of a line connecting {_locations::*}"
4343
})
4444
@Since("1.0.0")
4545
public class ExprLine extends SimpleExpression<Line> {

src/main/java/com/sovdee/skriptparticles/elements/expressions/constructors/ExprRectangle.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
@Examples({
3131
"set {_shape} to rectangle with length 10 and width 5",
3232
"set {_shape} to a yz rectangle from vector(0, 0, 0) to vector(10, 10, 10)",
33-
"draw a rectangle with length 10 and width 5 at player",
33+
"draw the shape of a rectangle with length 10 and width 5 at player",
3434
"",
3535
"# note that the following does not require a location to be drawn at",
36-
"draw a rectangle from player to player's target"
36+
"draw the shape of a rectangle from player to player's target"
3737
})
3838
@Since("1.0.0")
3939
public class ExprRectangle extends SimpleExpression<Rectangle> {

src/main/java/com/sovdee/skriptparticles/elements/expressions/constructors/ExprRegularPolygon.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
@Examples({
2626
"set {_shape} to a regular polygon with 5 sides and radius 10",
2727
"set {_shape} to a solid regular polygon with 6 sides and side length 3",
28-
"draw a triangle with side length 5 at player"
28+
"draw the shape of a triangle with side length 5 at player"
2929
})
3030
public class ExprRegularPolygon extends SimpleExpression<RegularPolygon> {
3131

src/main/java/com/sovdee/skriptparticles/elements/expressions/constructors/ExprRegularPolyhedron.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
@Examples({
2727
"set {_shape} to a tetrahedron with radius 1",
2828
"set {_shape} to a solid icosahedron with radius 2",
29-
"draw a tetrahedron with radius 5 at player"
29+
"draw the shape of a tetrahedron with radius 5 at player"
3030
})
3131
public class ExprRegularPolyhedron extends SimpleExpression<RegularPolyhedron> {
3232

src/main/java/com/sovdee/skriptparticles/elements/expressions/constructors/ExprStar.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
})
2424
@Examples({
2525
"set {_shape} to star with 5 points, inner radius 1, and outer radius 2",
26-
"draw a star with 4 points, inner radius 2, and outer radius 4 at player"
26+
"draw the shape of a star with 4 points, inner radius 2, and outer radius 4 at player"
2727
})
2828
public class ExprStar extends SimpleExpression<Star> {
2929

src/main/java/com/sovdee/skriptparticles/elements/expressions/properties/ExprShapeParticle.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
"reset {_shape}'s particle",
2626
"",
2727
"create a new custom particle:",
28-
"\tparticle: soul fire flame",
29-
"\tvelocity: inwards",
30-
"\textra: 0.5",
31-
"\tforce: true",
28+
"\tparticle: soul fire flame",
29+
"\tvelocity: inwards",
30+
"\textra: 0.5",
31+
"\tforce: true",
3232
"set {_shape}'s particle to the last created particle"
3333
})
3434
@Since("1.0.0")

src/main/java/com/sovdee/skriptparticles/elements/sections/EffSecDrawShape.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,24 +55,24 @@
5555
"Drawing a shape for a duration is async only."
5656
})
5757
@Examples({
58-
"draw a sphere with radius 1 at player's location",
59-
"draw (a sphere with radius 1 and a cube with radius 1) at player's location for (all players in radius 10 of player)",
60-
"synchronously draw a sphere with radius 1 at player's location",
58+
"draw the shape (sphere with radius 1) at player's location",
59+
"draw the shapes of (a sphere with radius 1 and a cube with radius 1) at player's location for (all players in radius 10 of player)",
60+
"synchronously draw the shape of a sphere with radius 1 at player's location",
6161
"",
62-
"draw {_shape} at player's location:",
63-
"\tset event-shape's particle to dust using dustOption(red, 1)",
62+
"draw the shape {_shape} at player's location:",
63+
"\tset event-shape's particle to dust using dustOption(red, 1)",
6464
"",
65-
"synchronously draw (a sphere with radius 1 and a cube with radius 1) at player's location:",
66-
"\tset event-shape's radius to 2",
65+
"synchronously draw shape (a sphere with radius 1 and a cube with radius 1) at player's location:",
66+
"\tset event-shape's radius to 2",
6767
})
6868
@Since("1.0.0")
6969
public class EffSecDrawShape extends EffectSection {
7070
public static final Timespan ONE_TICK = Timespan.fromTicks_i(1);
7171

7272
static {
7373
Skript.registerSection(EffSecDrawShape.class,
74-
"[sync:sync[hronously]] draw shape[s] %shapes% [%-directions% %-locations/entities%] [to %-players%]",
75-
"draw shape[s] %shapes% [%-directions% %-locations/entities%] [to %-players%] (duration:for) [duration] %timespan% [with (delay|refresh [rate]) [of] %-timespan%]"
74+
"[sync:sync[hronously]] draw [the] shape[s] [of] %shapes% [%-directions% %-locations/entities%] [to %-players%]",
75+
"draw [the] shape[s] [of] %shapes% [%-directions% %-locations/entities%] [to %-players%] (duration:for) [duration] %timespan% [with (delay|refresh [rate]) [of] %-timespan%]"
7676
);
7777
EventValues.registerEventValue(EffSecDrawShape.DrawEvent.class, Shape.class, new Getter<>() {
7878
@Override

0 commit comments

Comments
 (0)