Skip to content

Commit

Permalink
prison SLA is here
Browse files Browse the repository at this point in the history
  • Loading branch information
@Stachelbeere1248
Stachelbeere1248 committed Jun 24, 2024
1 parent f6a3d32 commit c3947d8
Show file tree
Hide file tree
Showing 5 changed files with 112 additions and 11 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# zombies-utils
##### Download latest release: [v1.3.3](https://github.com/Stachelbeere1248/zombies-utils/releases/tag/v1.3.3).
##### Download latest release: [v1.3.4](https://github.com/Stachelbeere1248/zombies-utils/releases/tag/v1.3.4).
Hello, I am currently working on this mod. More features will come. For now it has:
- An accurate timer + Automatic splitting
- Tracking of splits & segment PBs (with custom categories)
Expand Down Expand Up @@ -34,7 +34,7 @@ The timer automatically splits every round. The PB/Segment recorder automaticall
- note: you do NOT need to make your own categories to seperate difficulties or map
- /sla \<off|map|quick|rotate|mirror|offset>
- /sla off - Disables the SLA hud
- /sla map \<de|bb|aa> - forcefully set the map
- /sla map \<de|bb|aa|p> - forcefully set the map
- /sla quick \<mogi_a|ghxula|ghxula-garden>
- /sla rotate - rotates all windows around the axis (0,y,0)
- /sla mirror \<x|z> - mirrors all windows along the plane (0,y,z) or (x,y,0)
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ org.gradle.jvmargs=-Xmx2g
baseGroup = com.github.stachelbeere1248.zombiesutils
mcVersion = 1.8.9
modid = zombiesutils
version = 1.3.3
version = 1.3.4
9 changes: 6 additions & 3 deletions src/main/java/com/github/stachelbeere1248/zombiesutils/commands/SlaCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public String getCommandName() {

@Override
public String getCommandUsage(ICommandSender sender) {
return "/sla off\n/sla offset [x] [x] [x]\n/sla rotate\n/sla mirror\n/sla map <de|bb|aa>\n/sla quick";
return "/sla off\n/sla offset [x] [x] [x]\n/sla rotate\n/sla mirror\n/sla map <de|bb|aa|p>\n/sla quick";
}

@Override
Expand Down Expand Up @@ -83,9 +83,12 @@ else if (args.length != 4) throw new WrongUsageException(
case "aa":
SLA.instance = new SLA(Map.ALIEN_ARCADIUM);
break;
case "p":
SLA.instance = new SLA(Map.PRISON);
break;
default:
throw new WrongUsageException(
"[Invalid option] options: de, bb, aa", args[1]);
"[Invalid option] options: de, bb, aa, p", args[1]);
}
break;
case "quick":
Expand Down Expand Up @@ -124,7 +127,7 @@ public List<String> addTabCompletionOptions(ICommandSender sender, String @NotNu
if (args.length < 5) options.add("0");
break;
case "map":
options.addAll(Arrays.asList("de", "bb", "aa"));
options.addAll(Arrays.asList("de", "bb", "aa", "p"));
break;
case "mirror":
options.addAll(Arrays.asList("x", "z"));
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/github/stachelbeere1248/zombiesutils/game/SLA.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ public SLA(@NotNull Map map) {
this.rooms = Room.getAA();
break;
case PRISON:
this.rooms = new Room[0];
Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("§cThis map has no SLA database yet. Contribute by dming Stachelbeere1248 coordinates for windows on Discord."));
this.rooms = Room.getP();
break;
default:
throw new IllegalStateException("Unexpected value: " + map);
Expand Down
105 changes: 102 additions & 3 deletions src/main/java/com/github/stachelbeere1248/zombiesutils/game/windows/Room.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,109 @@ public Room(String name, String alias, Window[] windows) {
})
};
}

@Contract(" -> new")
public static Room @NotNull [] getPrison() {
return new Room[0];
public static Room @NotNull [] getP() {
return new Room[]{
new Room("Cell Blocks", "cb", new Window[]{
new Window(1, 109, 144, 21),
new Window(2, 109, 144, -19),
new Window(3, 193, 158, -17),
new Window(4, 193, 158, 19),
}),
new Room("Corridors", "co", new Window[]{
new Window(1, 189, 144, 21),
new Window(2, 251, 144, 31),
new Window(3, 219, 144, -21),
new Window(4, 233, 144, -49),
new Window(5, 221, 158, -21),
new Window(6, 255, 158, 9),
new Window(7, 273, 158, 51),
}),
new Room("Cafeteria", "ca", new Window[]{
new Window(1, 249, 144, 73),
new Window(2, 189, 144, 25),
}),
new Room("Visitor's Room", "v", new Window[]{
new Window(1, 261, 146, -45),
}),
new Room("Library", "l", new Window[]{
new Window(1, 265, 158, 9),
new Window(2, 263, 158, -47),
}),
new Room("Monitor Room", "mt", new Window[]{
new Window(1, 201, 158, 25),
new Window(2, 197, 158, 3),
}),
new Room("Medical Bay", "mt", new Window[]{
new Window(1, 249, 158, 31),
new Window(2, 223, 158, 53),
}),
new Room("The Courts", "cs", new Window[]{
new Window(1, 285, 144, 81),
new Window(2, 211, 144, 157),
}),
new Room("Offices", "o", new Window[]{
new Window(1, 153, 144, 161),
new Window(2, 151, 144, 191),
new Window(3, 99, 144, 181),
new Window(4, 123, 144, 163),
new Window(5, 71, 144, 163),
}),
new Room("Head Manager's Office", "h", new Window[]{
new Window(1, 179, 158, 169),
new Window(2, 179, 158, 177),
new Window(3, 79, 158, 177),
new Window(4, 79, 158, 169),
}),
new Room("Basement Corridor", "bc", new Window[]{
new Window(1, 231, 130, 29),
}),
new Room("The Deep", "d", new Window[]{
new Window(1, 167, 126, -45),
new Window(2, 163, 122, 13),
new Window(3, 193, 122, 13),
}),
new Room("Boiler Room", "b", new Window[]{
new Window(1, 107, 126, -11),
new Window(2, 125, 126, 25),
new Window(3, 163, 130, -45),
new Window(4, 107, 130, -45),
}),
new Room("Yard", "y", new Window[]{
new Window(1, 185, 144, 79),
new Window(2, 189, 144, 119),
new Window(3, 107, 144, 121),
}),
new Room("Alleyway", "a", new Window[]{
new Window(1, 101, 144, 133),
}),
new Room("Guard's Gunroom", "gr", new Window[]{
new Window(1, 29, 148, 75),
new Window(2, 29, 144, 43),
new Window(3, 65, 126, 5),
}),
new Room("Guard's Quarters", "q", new Window[]{
new Window(1, 83, 148, 83),
new Window(2, 57, 148, 35),
}),
new Room("Stockage", "st", new Window[]{
new Window(1, 241, 130, -25),
new Window(2, 227, 130, -45),
}),
new Room("Kitchen", "k", new Window[]{
new Window(1, 261, 144, 33),
new Window(2, 271, 144, 45),
}),
new Room("Isolation", "i", new Window[]{
new Window(1, 75, 144, 91),
new Window(2, 29, 144, 87),
}),
new Room("Showers", "sh", new Window[]{
new Window(1, 37, 144, 15),
new Window(2, 37, 144, -11),
}),

};
}

public String getName() {
Expand Down

0 comments on commit c3947d8

Please sign in to comment.