Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added dynamic status for custom speed/health/etc

Browse Source
This commit is contained in:
Anuken
2023-10-31 11:24:03 -04:00
parent 968fa2f9b1
commit e5047d752d
6 changed files with 139 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
core/src/mindustry/io/TypeIO.java
View File

@@ -711,12 +711,57 @@ public class TypeIO{
}
public static void writeStatus(Writes write, StatusEntry entry){
write.s(entry.effect.id);
write.s(entry.effect.id | (entry.effect.dynamic ? 1 << 15 : 0));
write.f(entry.time);
//write dynamic fields
if(entry.effect.dynamic){
//write a byte with bits set based on which field is actually used
write.b(
(entry.damageMultiplier != 1f ? (1 << 0) : 0) |
(entry.healthMultiplier != 1f ? (1 << 1) : 0) |
(entry.speedMultiplier != 1f ? (1 << 2) : 0) |
(entry.reloadMultiplier != 1f ? (1 << 3) : 0) |
(entry.buildSpeedMultiplier != 1f ? (1 << 4) : 0) |
(entry.dragMultiplier != 1f ? (1 << 5) : 0) |
(entry.armorOverride >= 0f ? (1 << 6) : 0)
);
if(entry.damageMultiplier != 1f) write.f(entry.damageMultiplier);
if(entry.healthMultiplier != 1f) write.f(entry.healthMultiplier);
if(entry.speedMultiplier != 1f) write.f(entry.speedMultiplier);
if(entry.reloadMultiplier != 1f) write.f(entry.reloadMultiplier);
if(entry.buildSpeedMultiplier != 1f) write.f(entry.buildSpeedMultiplier);
if(entry.dragMultiplier != 1f) write.f(entry.dragMultiplier);
if(entry.armorOverride >= 0f) write.f(entry.armorOverride);
}
}
public static StatusEntry readStatus(Reads read){
return new StatusEntry().set(content.getByID(ContentType.status, read.s()), read.f());
short id = read.s();
float time = read.f();
StatusEntry result = new StatusEntry();
if((id & (1 << 15)) != 0){
//it's a dynamic effect
id ^= (1 << 15);
//read flags that store which fields are set
int flags = read.ub();
if((flags & (1 << 0)) != 0) result.damageMultiplier = read.f();
if((flags & (1 << 1)) != 0) result.healthMultiplier = read.f();
if((flags & (1 << 2)) != 0) result.speedMultiplier = read.f();
if((flags & (1 << 3)) != 0) result.reloadMultiplier = read.f();
if((flags & (1 << 4)) != 0) result.buildSpeedMultiplier = read.f();
if((flags & (1 << 5)) != 0) result.dragMultiplier = read.f();
if((flags & (1 << 6)) != 0) result.armorOverride = read.f();
}
result.set(content.getByID(ContentType.status, id), time);
return result;
}
public static void writeItems(Writes write, ItemStack stack){