Commit Graph

54 Commits

Author SHA1 Message Date
Ray Greenwell 0ecfaac648 Added EZGame.getPlayerCount().
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@98 c613c5cb-e716-0410-b11b-feb51c14d237
2006-10-05 01:45:16 +00:00
Michael Bayne 451218a1a4 Updated using the code generator.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@96 c613c5cb-e716-0410-b11b-feb51c14d237
2006-10-05 00:47:20 +00:00
Michael Bayne 8b8a8120c2 Added some ActionScript annotations.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@92 c613c5cb-e716-0410-b11b-feb51c14d237
2006-10-05 00:16:25 +00:00
Michael Bayne 022f77a08b We'll be needing a proper controller.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@89 c613c5cb-e716-0410-b11b-feb51c14d237
2006-10-04 21:10:22 +00:00
Michael Bayne 51281a9d49 Let's just call clearOccupant() clearOccupantByOid() to avoid differences
between the Java and ActionScript version since ActionScript doesn't support
method overloading. We only have to observe this limitation in Streamable
classes.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@88 c613c5cb-e716-0410-b11b-feb51c14d237
2006-10-04 21:10:00 +00:00
Michael Bayne d896041553 Regenerated with updated templates.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@87 c613c5cb-e716-0410-b11b-feb51c14d237
2006-10-04 20:48:15 +00:00
Ray Greenwell 1459306393 We need to send the tick out with a different message identifier
because otherwise the EZGameController will try to unmarshall the value.
The marshalling/unmarshalling is purely clientside, the server doesn't
understand how to do it, so it must dispatch a different event that just
contains a nice normal integer.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@85 c613c5cb-e716-0410-b11b-feb51c14d237
2006-10-02 21:11:10 +00:00
Ray Greenwell f48a48436d Regeneration of generated files.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@84 c613c5cb-e716-0410-b11b-feb51c14d237
2006-10-02 07:46:47 +00:00
Ray Greenwell a32f71bcda Let's name the method the way gendobj wants to.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@83 c613c5cb-e716-0410-b11b-feb51c14d237
2006-10-02 07:43:48 +00:00
Ray Greenwell 6472cf6f80 Added tick services to EZGame.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@82 c613c5cb-e716-0410-b11b-feb51c14d237
2006-10-02 07:39:31 +00:00
Mike Thomas a82fc55fa4 We don't want to force a restart if we're not supposed to, but we really don't want to veto it either. This could end up on the penders with the very thing we're waiting for, at which point vetoing that game restart would be bad and result in the puzzle not starting up.
Hopefully this'll fix yohoho's problem with the puzzles sometimes not restarting after stars are filled.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@81 c613c5cb-e716-0410-b11b-feb51c14d237
2006-09-29 18:28:59 +00:00
Ray Greenwell 2f8a14bdb8 Use a library method to check equality with possible nulls.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@78 c613c5cb-e716-0410-b11b-feb51c14d237
2006-09-26 02:38:19 +00:00
Michael Bayne d673b120be We need not to define createPlaceObject() so that backwards compatibility is
preserved with old games that only override getPlaceObjectClass(). Nothing
should be using PuzzleObject directly anyway.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@76 c613c5cb-e716-0410-b11b-feb51c14d237
2006-09-25 05:22:55 +00:00
Michael Bayne b0d148f107 Allow "draw" text to be provided as well. Also nixed the green because it was
really ugly...


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@75 c613c5cb-e716-0410-b11b-feb51c14d237
2006-09-25 04:06:35 +00:00
Mike Thomas 6611e60c1c We cannot check this here - the cluster is guaranteed to be size == 0 on the first insertion since we can't have called addBody until the constructor finishes. It used to be in objectAvailable which worked because it happened after the addBody calls were allowed to happen.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@74 c613c5cb-e716-0410-b11b-feb51c14d237
2006-09-19 20:56:20 +00:00
Ray Greenwell 8647002b71 Use an observer list.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@73 c613c5cb-e716-0410-b11b-feb51c14d237
2006-09-18 21:43:18 +00:00
Ray Greenwell 8703f5b0a8 Don't allow scene resolution to continue if the updates couldn't load.
They *are* just updates, but if it's ok for them to not load then a
game-specific scene repository needs to make that decision and just
return a blank update list rather than throwing an exception.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@68 c613c5cb-e716-0410-b11b-feb51c14d237
2006-09-01 21:07:27 +00:00
Ray Greenwell b1ae928811 Added a note explaining the difference between an ideal implementation and
the one we have now.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@67 c613c5cb-e716-0410-b11b-feb51c14d237
2006-08-28 22:30:46 +00:00
Ray Greenwell ba1d173a30 Use varargs to make construction plainer.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@66 c613c5cb-e716-0410-b11b-feb51c14d237
2006-08-28 22:26:17 +00:00
Ray Greenwell 4b9ec23221 - Use samskivert Predicate.
- Type safety.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@65 c613c5cb-e716-0410-b11b-feb51c14d237
2006-08-28 18:53:03 +00:00
Ray Greenwell ebcaedeb5a Ez game stuff, javafied.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@63 c613c5cb-e716-0410-b11b-feb51c14d237
2006-08-25 01:58:11 +00:00
Ray Greenwell 64550318e9 A little type safety.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@62 c613c5cb-e716-0410-b11b-feb51c14d237
2006-08-25 01:57:38 +00:00
Mark Johnson 3182d9d7a9 Let's make sure these compile
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@61 c613c5cb-e716-0410-b11b-feb51c14d237
2006-08-25 00:52:45 +00:00
Michael Bayne aad235c7f2 Nixed GameService as it can be more simply implemented with the new dynamically
dispatched message event system. Rearranged the methods in GameManager into
some semblance of order.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@60 c613c5cb-e716-0410-b11b-feb51c14d237
2006-08-24 17:37:25 +00:00
Michael Bayne e03ffd02bc To preserve backwards compatibility, GameManager cannot define
createPlaceObject() because it needs to fall back to PlaceManager's
createPlaceObject() which calls getPlaceObjectClass() which all GG games
currently use.

It doesn't really make sense for GameManager to implement that method anyway
because no one will ever just use a GameObject, they'll need some sort of
derivation if they want to have any game state at all.

Really that method should be abstract in PlaceManager and GameManager but I'm
not sure we could change that now without breaking things (certainly we
couldn't preserve backwards compability which renders the idea moot anyway).


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@59 c613c5cb-e716-0410-b11b-feb51c14d237
2006-08-24 01:05:18 +00:00
Michael Bayne 86e594ed5e I swear I got all of these. This should really be the last one. :)
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@58 c613c5cb-e716-0410-b11b-feb51c14d237
2006-08-24 00:47:51 +00:00
Michael Bayne 37dd31ad75 More spots, missed.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@57 c613c5cb-e716-0410-b11b-feb51c14d237
2006-08-24 00:28:04 +00:00
Michael Bayne eed4d67b9e Restructured things to work with the new mechanism for creating distributed
objects.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@53 c613c5cb-e716-0410-b11b-feb51c14d237
2006-08-23 23:48:07 +00:00
Ray Greenwell 77c51c95d8 For now, the EZGameConfig contains a String called configData that
simply contains the game url or classname.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@51 c613c5cb-e716-0410-b11b-feb51c14d237
2006-08-23 21:17:25 +00:00
Michael Bayne 7d870d5eb6 Resource bundle jockeying.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@50 c613c5cb-e716-0410-b11b-feb51c14d237
2006-08-23 18:18:30 +00:00
Ray Greenwell 70b0d759c0 Moved the serverless game stuff out of msoy and back into the vilya library.
We'll be using this in game gardens, at least.
Note that the actionscript side currently doesn't compile because of
limitations in building a .swc file, but that'll be fixed soon.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@47 c613c5cb-e716-0410-b11b-feb51c14d237
2006-08-23 02:28:36 +00:00
Ray Greenwell f171848695 Use GameObject.isInPlay() to determine in-play status.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@41 c613c5cb-e716-0410-b11b-feb51c14d237
2006-08-16 00:09:05 +00:00
Ray Greenwell e10a3ae94d Let's rename that, because it will only return the index if the
player is actually in the game.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@39 c613c5cb-e716-0410-b11b-feb51c14d237
2006-08-11 23:30:45 +00:00
Ray Greenwell fc57d9bb8f Added a method to get player index by Oid.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@38 c613c5cb-e716-0410-b11b-feb51c14d237
2006-08-11 21:25:33 +00:00
Michael Bayne 9be1f1db14 This should be using getVisibleName().
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@37 c613c5cb-e716-0410-b11b-feb51c14d237
2006-08-11 02:22:03 +00:00
Ray Greenwell 6f10fc445f Occam's razor.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@33 c613c5cb-e716-0410-b11b-feb51c14d237
2006-07-29 01:10:59 +00:00
Ray Greenwell b82ab59b1d - Changed Table to just have an int as its key and use autoboxing to make
that a Comparable. It's a slight performance hit, as when a DSet is
  binary searched, it will be boxing up an int for every entry examined.
  Oh well.
- Use some generics.
- Some other cleanups I spotted while writing actionscript versions.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@29 c613c5cb-e716-0410-b11b-feb51c14d237
2006-07-28 02:03:53 +00:00
Michael Bayne 4914a11160 Nixed my earlier fiddling and replaced it with a sensible addition to the turn
game logic which is that we won't try to start the next turn if the game
reports being over. If we still see problems with infinite loops in GG games,
then we'll reinstate the fiddling.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@28 c613c5cb-e716-0410-b11b-feb51c14d237
2006-07-19 06:26:54 +00:00
Michael Bayne db8125271b I hate adding random booleans, but it is an easy mistake to miss a case where
turnDidStart() results in an immediate call to endTurn() and things then spiral
off into infinite loop land. If someone genuinely does want to end a turn
mmediately in turnDidStart() they can queue up a dobj unit to do so.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@27 c613c5cb-e716-0410-b11b-feb51c14d237
2006-07-19 02:55:08 +00:00
Mike Thomas 19e5b04b41 Need to abstract out the assignment of the starting location of a body. We use this in yohoho for pets to put them somewhere other than a portal.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@26 c613c5cb-e716-0410-b11b-feb51c14d237
2006-07-17 21:41:19 +00:00
Ray Greenwell e76a54c18f If a client somehow has a higher version scene than we do, tell them all
about the current scene model instead of informing them that the version
they have is OK. It's not ok!


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@25 c613c5cb-e716-0410-b11b-feb51c14d237
2006-07-13 22:15:37 +00:00
Ray Greenwell d93c79cfd0 A standard portal modification scene update. Will be used by msoy, but
could be used by other games as well.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@24 c613c5cb-e716-0410-b11b-feb51c14d237
2006-07-13 21:45:21 +00:00
Ray Greenwell b0c7ddf861 Log the version of the new model if persistence fails.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@22 c613c5cb-e716-0410-b11b-feb51c14d237
2006-07-13 18:37:51 +00:00
Ray Greenwell 6404d3e0ab Preserve the stack trace when CloneNotSupportedException impossibly happens.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@21 c613c5cb-e716-0410-b11b-feb51c14d237
2006-07-13 18:10:55 +00:00
Ray Greenwell 5b5fddfb50 A bit of type safety.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@20 c613c5cb-e716-0410-b11b-feb51c14d237
2006-07-13 18:08:42 +00:00
Ray Greenwell 19f22b01f1 When a scene update is received while in the scene, apply it immediately
and also save the new updated model.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@19 c613c5cb-e716-0410-b11b-feb51c14d237
2006-07-13 17:47:55 +00:00
Michael Bayne 50c7b2b8dd Added new ClientObserver method.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@13 c613c5cb-e716-0410-b11b-feb51c14d237
2006-07-07 04:02:57 +00:00
Ray Greenwell c9a8c1d117 Allow portals to have a targetPortalId of -1, which means simply
"whatever the default entrance is of the target scene".


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@12 c613c5cb-e716-0410-b11b-feb51c14d237
2006-07-07 00:36:02 +00:00
Michael Bayne 2933846516 Allow the path to the server's resource manager properties to be adjusted.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@11 c613c5cb-e716-0410-b11b-feb51c14d237
2006-07-07 00:34:16 +00:00
Ray Greenwell 1c7ac6d3b9 Utility class to assist in SceneUpdate management.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@10 c613c5cb-e716-0410-b11b-feb51c14d237
2006-07-06 22:40:19 +00:00