Merge moul scripts #645
Merge moul scripts #645
Conversation
This is a mostly non-working preview of the changes to come. Several parts are unfinished or interrupted, but a great deal of the work has already been done. Subsequent commits will continue the restructuration and try to modularize xKI some more.
Continuation of the restructuration work. This is a mostly-working model: basic KI operations work (creating notes, taking pictures, etc.) but it has not yet been extensively tested. Known bugs so far include: - F2 not opening BigKI (but able to open miniKI and close the BigKI), - Options Menu not showing, - Updating the KI to kNormalKI does not remove the old Blackbar. More to come later on...
This consists mostly of bug fixes, especially in the chat module.
Address some of the issues raised.
Clean-up xKI code.
This major oops was seen in the serverlog. I guess it caused the spiral cloths to not work at all.
Move the avatar to the subworld before warping. Don't attach the avatar to the VogDummy - Subworlds are now quite solid and doing so causes unnecessary instability in the simulation.
This fixes an issue found by Christoph which crashes the Python on localized debug messages, so I converted every debug string to unicode to fix this.
Loosely ported from MOULSCRIPT-ou 087cb86
Remove the legacy AgeStartedIn hack and throw away some redundant PtGetAgeSDL() calls.
Localization fix for xKI PtDebugPrint messages.
Neighborhood Randomization
In external builds, the python pak thinks xKI.py == xKI. This is understanable--having two modules with the same name is naughty.
Fix xKI insanity
Fix randint misuse
Fix some typos in xKI.
Generators aren't subscriptable, you doofus.
I saw some tracebacks on DS where PtFindAvatar would return None and cause a traceback. So, I changed the notification testing to ensure that the local avatar is the event avatar (local avatar should never be None). Also, whitespace fixes.
Fix imager bug when using the miniKI.
Normalize line endings.
Usage: Players type `/party` to be warped to the party. Admins include a link in point sceneobject parameter to set the warp information in the vault. Supplying an invalid object (eg `x`) will cause the party to be killed, disabling the command for players.
replace `type(x) == y` checks by `isinstance(x, y)` and clean up resulting code
convert all remaining dos line endings to unix
zrax
force-pushed
the
merge-moul-scripts
branch
from
a85a929 to
26a45e7
Compare
|
Thanks for pulling these all over with history intact, @zrax! This is a pretty big change. Maybe we should go over the pros/cons of doing this, for future reference? |
|
My thought process was how interrelated the Python API is with the engine itself - we wind up having several situations where we have to make changes in two repositories. The downside is that we have more data-dependent things in the engine repository... but were we ever going to make the engine truly data-independent? |
|
Looking at the progress we need to make to upgrade to Python 3... I think it would be nice to have this PR merged before work begins on Python 3. In terms of the scripts side, H-uru/moul-scripts#118 and H-uru/moul-scripts#121 are ready to be merged. H-uru/moul-scripts#119 needs to be reviewed, but it is basically a requirement before any useful work can begin on Py3. I think those three PRs should be merged in the legacy moul-scripts repository and this PR should be updated to reflect those changes. Any other PRs or future work should proceed on top of this PR. Thoughts? |
|
I'm fine with rebasing this after those PRs are merged upstream |
replace dict methods by py3-equivalent views
replace old bools by new bools
…trs', 'raise', 'except'
Run 'safe' 2to3 fixers and convert print to PtDebugPrint
remove unused cPickle imports
|
All prerequisite PRs have been merged! @aqua-uru When this is merged, can you apply the breaking 2to3 passes in a new PR on this repository? |
|
Rebase applied! |
|
Per @aqua-uru in IRC:
|
|
💥 💥 💥 |
This merges moul-scripts into Plasma, making the latter a Plasma "monorepo"
To be merged upstream before merging:
To be migrated after merging: