Skip to content

Commit

Permalink
Resolve #116 - Able to Click Ship to Track it (in Tracking Mode)
Browse files Browse the repository at this point in the history
Update Usage/Changelog from last changes
  • Loading branch information
hawkerm committed May 17, 2016
1 parent 64757c5 commit bd3a984
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 3 deletions.
10 changes: 9 additions & 1 deletion SBA_Serv/GUI/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -406,10 +406,18 @@ def centerViewOnWorld(pos):
if event.button != 2:
mousemode = None
world.causeExplosion((x, y), 256, 1000)
elif mousemode != None and mousemode.startswith("Add"):
elif mousemode != None and mousemode.startswith("Add"):
game.spawnmanager.spawn_entity(mousemode[3:], (x, y), False)
if event.button != 2:
mousemode = None
elif trackplayer != None:
v = Vec2d(x, y)
for obj in objects:
if isinstance(obj, ShipGUI) and math.sqrt(obj._worldobj.body.position.get_dist_sqrd(v)) <= 32:
logging.info("[GUI] Click Tracking Object #%d", obj._worldobj.id)
trackplayer = obj._worldobj.player
dynamiccamera = False
break
elif zoomout and event.button == 1:
# zoom in
zoomout = False
Expand Down
2 changes: 1 addition & 1 deletion SBA_Serv/buildnum
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1116
1118
4 changes: 4 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,19 @@ v1.2 : Planned - May 2016 [Season 5]
* Added **getPointAt** for point projections based on angles and distance
* Added **isInEllipse** check method
* Added **getClosestMappedPoint** for world bounds assistance
* **ThrustCommand** now has a parameter to allow it to block.
* Added ability for client to get info on ship's running commands **getCommandQueue** in the environment *getShipStatus*.
* Command Queue and Current Energy Properties are now only available to its own ship (can't be seen with radar).
* Updated Find the Middle Basic Game
* Added new *reset_timer* option
* Better Generation of Spawn Points and other Bug Fixes
* *Optimized Network Code to half required Threads*
* Added option for Torpedoes to be effected by gravity
* Added *enable_commands* [Server] config option.
* Split 'explodable' from 'gravitable' for Entities, two separate object flags now.
* Can click ships in tracking mode to switch tracking to the clicked ship.
* Separated option for 'showip' in Application settings to decouple from showing statistics, no longer always show IP in Debug mode.
* 2 New Ship Graphics
* **Breaking Changes:**
* Made **Hungry Hungry Baubles** a Basic Game by creating a *getObjectiveLocation()* method on BasicGameInfo (instead of *getGoldenBaublePosition()*). This is now also used by **Bauble Hunt** and **Discovery Quest** instead of *getHomeBasePosition()*.
* Hungry Hungry Baubles has new options for configuration (default is similar to previous incarnation).
Expand Down
5 changes: 4 additions & 1 deletion doc/server/usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ The following information will explain keyboard shortcuts as well as various inf
|------- |-------------------------------------------- |
| **D** | Debug Mode |
| **L** | In Debug Mode, Toggles Log Message Display |
| **H** | Show Application Threads |

### View Keys

Expand Down Expand Up @@ -93,7 +94,9 @@ Using PageUp/PageDown, you can select a specific player to track. In this mode

When a player is being tracked, a display will be shown in the bottom-right corner with information about the ship's current status as well as the commands it is currently trying to execute.

The Dynamic camera mode will switch between ships to show whoever happens to have the highest score in the current game.
The **Dynamic Ship Tracking** mode will switch between ships to show whoever happens to have the highest score in the current game.

When in tracking mode, clicking another ship will switch tracking to that ship instead. (It will turn off dynamic camera mode as well.)


<a name="god"></a>'God' Modes
Expand Down

0 comments on commit bd3a984

Please sign in to comment.