Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added destructibles and speed/slow zones to Units enum #51

Merged
merged 1 commit into from
Nov 17, 2021
Merged

Added destructibles and speed/slow zones to Units enum #51

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 47 additions & 5 deletions ocraft-s2client-protocol/src/main/java/com/github/ocraft/s2client/protocol/data/Units.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,8 @@ public enum Units implements UnitType {
NEUTRAL_COLLAPSIBLE_ROCK_TOWER_DEBRIS(490),
NEUTRAL_COLLAPSIBLE_ROCK_TOWER_DIAGONAL(588),
NEUTRAL_COLLAPSIBLE_ROCK_TOWER_PUSH_UNIT(561),
NEUTRAL_COLLAPSIBLE_ROCK_TOWER_RAMP_RIGHT(663),
NEUTRAL_COLLAPSIBLE_ROCK_TOWER_RAMP_LEFT(664),
NEUTRAL_COLLAPSIBLE_TERRAN_TOWER_DEBRIS(485),
NEUTRAL_COLLAPSIBLE_TERRAN_TOWER_DIAGONAL(589),
NEUTRAL_COLLAPSIBLE_TERRAN_TOWER_PUSH_UNIT(562),
Expand All @@ -292,11 +294,40 @@ public enum Units implements UnitType {
NEUTRAL_COLLAPSIBLE_TERRAN_TOWER_RAMP_RIGHT(591),
NEUTRAL_DEBRIS_RAMP_LEFT(486),
NEUTRAL_DEBRIS_RAMP_RIGHT(487),
NEUTRAL_DESTRUCTIBLE_DEBRIS4X4(364),
NEUTRAL_DESTRUCTIBLE_DEBRIS6X6(365),
NEUTRAL_DESTRUCTIBLE_DEBRIS_RAMP_DIAGONAL_HUGE_BL_UR(377),
NEUTRAL_DESTRUCTIBLE_DEBRIS_RAMP_DIAGONAL_HUGE_UL_BR(376),
NEUTRAL_DESTRUCTIBLE_ROCK6X6(371),
NEUTRAL_DESTRUCTIBLE_RAMP_DIAGONAL_HUGE_ULBR(372),
NEUTRAL_DESTRUCTIBLE_RAMP_DIAGONAL_HUGE_BLUR(373),
NEUTRAL_DESTRUCTIBLE_RAMP_VERTICAL_HUGE(374),
NEUTRAL_DESTRUCTIBLE_RAMP_HORIZONTAL_HUGE(375),
NEUTRAL_DESTRUCTIBLE_DEBRIS_RAMP_DIAGONAL_HUGE_UL_BR(376),
NEUTRAL_DESTRUCTIBLE_DEBRIS_RAMP_DIAGONAL_HUGE_BL_UR(377),
NEUTRAL_DESTRUCTIBLE_ROCK_EX1_DIAGONAL_HUGE_BL_UR(641),
NEUTRAL_DESTRUCTIBLE_ROCKEX12X4_VERTICAL(634),
NEUTRAL_DESTRUCTIBLE_ROCKEX12X4_HORIZONTAL(635),
NEUTRAL_DESTRUCTIBLE_ROCKEX12X6_VERTICAL(636),
NEUTRAL_DESTRUCTIBLE_ROCKEX12X6_HORIZONTAL(637),
NEUTRAL_DESTRUCTIBLE_ROCKEX14X4(638),
NEUTRAL_DESTRUCTIBLE_ROCKEX16X6(639),
NEUTRAL_DESTRUCTIBLE_ROCKEX1_DIAGONAL_HUGE_ULBR(640),
NEUTRAL_DESTRUCTIBLE_ROCKEX1_DIAGONAL_HUGE_BLUR(641),
NEUTRAL_DESTRUCTIBLE_ROCKEX1_VERTICAL_HUGE(642),
NEUTRAL_DESTRUCTIBLE_ROCKEX1_HORIZONTAL_HUGE(643),
NEUTRAL_DESTRUCTIBLE_ICE2X4_VERTICAL(644),
NEUTRAL_DESTRUCTIBLE_ICE2X4_HORIZONTAL(645),
NEUTRAL_DESTRUCTIBLE_ICE2X6_VERTICAL(646),
NEUTRAL_DESTRUCTIBLE_ICE2X6_HORIZONTAL(647),
NEUTRAL_DESTRUCTIBLE_ICE4X4(648),
NEUTRAL_DESTRUCTIBLE_ICE6X6(649),
NEUTRAL_DESTRUCTIBLE_ICE_DIAGONAL_HUGE_ULBR(650),
NEUTRAL_DESTRUCTIBLE_ICE_DIAGONAL_HUGE_BLUR(651),
NEUTRAL_DESTRUCTIBLE_ICE_VERTICAL_HUGE(652),
NEUTRAL_DESTRUCTIBLE_ICE_HORIZONTAL_HUGE(653),
NEUTRAL_UNBUILDABLE_ROCKS_DESTRUCTIBLE(472),
NEUTRAL_UNBUILDABLE_BRICKS_DESTRUCTIBLE(473),
NEUTRAL_UNBUILDABLE_PLATES_DESTRUCTIBLE(474),

NEUTRAL_FORCE_FIELD(135),
NEUTRAL_KARAK_FEMALE(324),
NEUTRAL_LAB_MINERAL_FIELD(665),
Expand All @@ -308,8 +339,6 @@ public enum Units implements UnitType {
NEUTRAL_RICH_MINERAL_FIELD750(147),
NEUTRAL_SCANTIPEDE(335),
NEUTRAL_SPACE_PLATFORM_GEYSER(343),
NEUTRAL_UNBUILDABLE_BRICKS_DESTRUCTIBLE(473),
NEUTRAL_UNBUILDABLE_PLATES_DESTRUCTIBLE(474),
NEUTRAL_UTILITY_BOT(330),
NEUTRAL_VESPENE_GEYSER(342),
NEUTRAL_XELNAGA_TOWER(149),
Expand All @@ -324,7 +353,19 @@ public enum Units implements UnitType {
NEUTRAL_SHAKURAS_VESPENE_GEYSER(881),
NEUTRAL_MINERAL_FIELD450(1982),
NEUTRAL_MINERAL_FIELD_OPAQUE(1983),
NEUTRAL_MINERAL_FIELD_OPAQUE900(1984);
NEUTRAL_MINERAL_FIELD_OPAQUE900(1984),
NEUTRAL_INHIBITOR_ZONE_SMALL(-1982), //-1982 is arbitrary id. It's 1982, but 1982 is taken in older versions
NEUTRAL_INHIBITOR_ZONE_MEDIUM(1983),
NEUTRAL_INHIBITOR_ZONE_LARGE(1984),
NEUTRAL_ACCELERATION_ZONE_SMALL(1985),
NEUTRAL_ACCELERATION_ZONE_MEDIUM(1986),
NEUTRAL_ACCELERATION_ZONE_LARGE(1987),
NEUTRAL_ACCELERATION_ZONE_FLYING_SMALL(1988),
NEUTRAL_ACCELERATION_ZONE_FLYING_MEDIUM(1989),
NEUTRAL_ACCELERATION_ZONE_FLYING_LARGE(1990),
NEUTRAL_INHIBITOR_ZONE_FLYING_SMALL(1991),
NEUTRAL_INHIBITOR_ZONE_FLYING_MEDIUM(1992),
NEUTRAL_INHIBITOR_ZONE_FLYING_LARGE(1993);

public static final class Other implements UnitType {

Expand Down Expand Up @@ -390,6 +431,7 @@ public static void remapForBuild(Integer build) {
updateId(1982, 1996);
updateId(1983, 1997);
updateId(1984, 1998);
updateId(-1982, 1982);
} else if (build >= 75689) {
updateId(1943, 1960);
updateId(1981, 1956);
Expand Down