Browse Source

Remove unneeded Custom Area

Sam Jaffe 8 years ago
parent
commit
234c2c8e7e

+ 4 - 2
resources/spells/default.json

@@ -106,9 +106,11 @@
     "components":["V","S","DF"],
     "castingTime":"Standard",
     "range":"Long",
+    "target":"All plants in area",
     "area":{
-      "@type":"Custom",
-      "value":"Plants in a 40-ft.-radius spread"
+      "@type":"Sphere",
+      "radius":40,
+      "emit":"SPREAD"
     },
     "duration":{
       "unit":"minute",

+ 1 - 11
src/main/lombok/org/leumasjaffe/charsheet/model/magic/dimension/Area.java

@@ -14,7 +14,6 @@ import lombok.experimental.FieldDefaults;
 
 @JsonTypeInfo(use=Id.NAME)
 @JsonSubTypes({
-	@Type(value=Area.Custom.class, name="Custom"),
 	@Type(value=Area.Line.class, name="Line"),
 	@Type(value=Area.Cone.class, name="Cone"),
 	@Type(value=Area.Sphere.class, name="Sphere"),
@@ -24,15 +23,6 @@ public interface Area {
 	public static enum Emission { BURST, EMANATION, SPREAD, NONE }
 	public static enum Shape { CONE, CYLINDER, LINE, SPHERE }
 
-	@RequiredArgsConstructor
-	@FieldDefaults(level=AccessLevel.PRIVATE, makeFinal=true)
-	public static class Custom implements Area {
-		String value;
-		public String toString() {
-			return value;
-		}
-	}
-	
 	@RequiredArgsConstructor
 	@FieldDefaults(level=AccessLevel.PRIVATE, makeFinal=true)
 	public static class Line implements Area {
@@ -74,7 +64,7 @@ public interface Area {
 			switch (emit) {
 			case NONE: return "sphere";
 			case EMANATION:	return "spherical " + emit;
-			default: return emit.toString();
+			default: return emit.toString().toLowerCase();
 			}
 		}
 	}