Singularity #5960
Singularity #5960
Conversation
ThatDan123
added
the
Status: DNM
ThatDan123
removed
the
Status: DNM
ThatDan123
added
the
Status: Awaiting Review
| @@ -246,6 +248,12 @@ public void MergeInto(SpriteChange spriteChange, bool pool = false) | |||
| PushClear = spriteChange.PushClear; | |||
| } | |||
|
|
|||
| if (spriteChange.AnimateOnce) | |||
| { | |||
| if (AnimateOnce) AnimateOnce = false; | |||
There was a problem hiding this comment.
so, this is just for late clients, idk how should be handled to get the correct state but if I think if push texture has been applied Then cancel AnimateOnce it's a little bit more complex this bit
There was a problem hiding this comment.
note there may be more times when other stuff overrides it
UnityProject/Assets/Scripts/Messages/Server/SpritesMessages/SpriteUpdateMessage.cs
Show resolved
Hide resolved
| @@ -82,6 +83,14 @@ public override void Process() | |||
| SP.ChangeSprite(int.Parse(SerialiseData.Substring(Start, Scanning - Start)), false); | |||
| } | |||
|
|
|||
| if (SerialiseData.Length > Scanning && SerialiseData[Scanning] == '#') | |||
There was a problem hiding this comment.
also need to add for the SkipSection so it can skip messages properly for a sprite manipulation (yeah is Messy idk what I was thinking when making this what I was thinking when making this, probably could just replace with json serialise and deserialise object)
There was a problem hiding this comment.
Does that change seem correct?
UnityProject/Assets/Scripts/Objects/Engineering/AntiBreachingShield.cs
Outdated
Show resolved
Hide resolved
github-actions
bot
added
the
Status: Merge Conflicts
|
I'll finish the rest at some point tomorrow unless you want to do it as you know the spritehandler better than me :p |
ThatDan123
added
the
Status: DNM
ThatDan123
removed
the
Status: DNM
|
Assuming the sprite handler changes are good, then its good to merge whenever |
-Adds singularity
-Adds functioning field generators and emitters, can be brought from cargo
-Adds radiation collectors
Todo:
-Animate radiation collectors-Balance energy consumption of emitters and energy generation of radiation collectors, this will probably happen after the PR has been merged and so can be play tested on staging.
Out of Scope for this PR:
-Particle accelerator as we need a proper multi tile machine system
-Therefore spawning singularity in game via PA is not possible, you'll need to beg admins
-Radiation collector fuel canister interaction
NOTE TO MERGER: please squash commits
-Lightning is invisible for clients bug: #5962-All bullets including emitter shots are invisible for clients bug: #5961
CL: Adds singularity
CL: Adds field generators, emitters and radiation collectors