make xHighLevelStarTrekDoor.py to be less bad #1470
Conversation
|
I did have one bug happen during my local testing (two clients on the same computer connecting to my local dockersand) |
Yeah, one is a script SDL and the other a class variable. I should probably just use the script SDL |
|
Added the requested changes |
|
Tested this change on minkata alpha server. |
Is "minkata alpha server" now on H'uru? 😮 |
Im ready to test this on trolland :) |
There was a problem hiding this comment.
Because we've now changed the SDL tracking and door animations to be done locally, we no longer need to acquire the exclusive server lock when someone enters the door region sensor. Each player is responsible for doing their own book-keeping, so there is no message storm or race condition concerns. I haven't looked at the PRPs yet, so I don't know if these are plVolumeSensorConditionalObject (requests exclusive server lock) or plVolumeSensorConditionalObjectNoArbitration (no server lock) in your fixed PRPs. We can fix the issue by, in the OnServerInitComplete() or OnInit() routines doing
rgnSensor.volumeSensorNoArbitration(True)to force the issue. This should improve the reliability when many players are crossing the region boundary.
Further, since we are making the script "less bad", I think we should convert the doorSDLstates dict to something more Pythonic, like an IntEnum.
| def UpdateDoorState (self, StateNum): | ||
| if StateNum != self.DoorState: | ||
| if StateNum != self.SDL['DoorState'][0]: | ||
| ageSDL = PtGetAgeSDL() | ||
| self.DoorState = StateNum | ||
| self.SDL['DoorState'] = (StateNum,) | ||
| self.SendNote('DoorState='+str(StateNum)) | ||
| PtClearTimerCallbacks(self.key) | ||
| PtAtTimeCallback(self.key, 30, 1) | ||
| if self.DoorEnabled == 0: | ||
| return | ||
|
|
||
| if self.DoorState == doorSDLstates['opening']: | ||
| self.SendNote("respOpenDoor;0") | ||
| PtDebugPrint("xHighLevelStarTrekDoor: Notifying Clients to play Open Door Responder") | ||
|
|
||
| elif self.DoorState == doorSDLstates['closing']: | ||
| self.SendNote("respCloseDoor;0") | ||
| PtDebugPrint("xHighLevelStarTrekDoor: Notifying Clients to play Close Door Responder") | ||
|
|
||
| elif self.DoorState == doorSDLstates['open']: | ||
| PtDebugPrint("xHighLevelStarTrekDoor: Updating Age SDL to Open") | ||
| return | ||
| if self.SDL['DoorState'][0] == doorSDLstates['opening']: | ||
| ageSDL[strDoorClosedVar.value] = (0,) | ||
|
|
||
| elif self.DoorState == doorSDLstates['closed']: | ||
| PtDebugPrint("xHighLevelStarTrekDoor: Updating Age SDL to Closed") | ||
| elif self.SDL['DoorState'][0] == doorSDLstates['closing']: | ||
| ageSDL[strDoorClosedVar.value] = (1,) |
There was a problem hiding this comment.
This could be improved greatly by making the door state into a property.
| playerID = PtGetLocalPlayer().getPlayerID() | ||
| triggerstr = "rgnTriggerEnter%d" % playerID | ||
| self.SendNote(triggerstr) | ||
| if event[0] == 1 and event[1] == 1: |
There was a problem hiding this comment.
I wonder if there is a less tedious way to do this?
| elif self.DoorState == doorSDLstates['open']: | ||
| respOpenDoor.run(self.key,fastforward=1) | ||
|
|
||
| if self.SDL['DoorState'][0] in (doorSDLstates['opening'], doorSDLstates['movingopen'], doorSDLstates['opentoclose']): |
There was a problem hiding this comment.
| if self.SDL['DoorState'][0] in (doorSDLstates['opening'], doorSDLstates['movingopen'], doorSDLstates['opentoclose']): | |
| if self.SDL['DoorState'][0] in (doorSDLstates.opening, doorSDLstates.movingopen, doorSDLstates.opentoclose): |
doorSDLstates should now be using members thusly. You'll need to apply these changes throughout the file.
| class doorSDLstates(IntEnum): | ||
| closed = 0 | ||
| opening = 1 | ||
| open = 2 | ||
| closing = 3 | ||
| opentoclose = 4 | ||
| closetoopen = 5 | ||
| movingopen = 6 | ||
| movingclosed = 7 |
There was a problem hiding this comment.
I think I want us to work on these state names so that what is going on is a little more clear. I know that I still need to open this file in VS Code (instead of viewing the diff, which is basically useless) to really understand what all is going on here.
removes sendnote()
Co-authored-by: Adam Johnson <AdamJohnso@gmail.com>
Co-authored-by: Adam Johnson <AdamJohnso@gmail.com>
Co-authored-by: Adam Johnson <AdamJohnso@gmail.com>
Hazado
force-pushed
the
LessComplicatedStarTrekDoors
branch
from
28dacb6
to
9f872d0
Compare
Not saying this is better but its less bad
Removes age owner from controlling the triggering of the doors
Removes the SendNote() stuff it was doing
Removes the doorstack tracking
Makes the door opening and closing rely on the SDL triggering
Makes the SDL trigger only happen by the person who set off the door sensor
I think ive fixed some of the race conditions but this is a multiplayer script and those are hard to troubleshoot