diff --git a/games/Pong-bots/bots.sh b/games/Pong-bots/bots.sh new file mode 100755 index 0000000..8c18205 --- /dev/null +++ b/games/Pong-bots/bots.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +for (( i = 0; i < 2; i++ )); do + ./pong-bot.rb & +done \ No newline at end of file diff --git a/games/Pong-bots/ggs-network.rb b/games/Pong-bots/ggs-network.rb index b8cac8d..2a2c9e0 100644 --- a/games/Pong-bots/ggs-network.rb +++ b/games/Pong-bots/ggs-network.rb @@ -29,8 +29,8 @@ class GGSNetwork protected def write(message) + puts message.inspect @socket.write(message) - puts message end def read @@ -58,7 +58,6 @@ class GGSNetwork def receivedCommand(headers, data) puts [headers, data].inspect - if headers.has_key? "Client-Command" command = headers["Client-Command"] case command diff --git a/games/Pong-bots/pong-bot.rb b/games/Pong-bots/pong-bot.rb index 98b172f..04aa172 100755 --- a/games/Pong-bots/pong-bot.rb +++ b/games/Pong-bots/pong-bot.rb @@ -17,18 +17,12 @@ class PongBot @send_start = false @ggs_network = GGSNetwork.new(self) + #@ggs_network.connect("10.42.43.1") @ggs_network.connect() end - + def ggsNetworkReady(ggs_network, ready) @ggs_network.sendCommand("ready") - - t = Thread.new { - loop do - gameTick() - sleep 0.3 - end - } end def ggsNetworkDefined(ggs_network, defined) @@ -56,7 +50,6 @@ class PongBot @send_start = true end else - puts "#{@ball.y}:#{@me.y}" if @ball.y < @me.y - 5 @ggs_network.sendCommand("up") elsif @ball.y > @me.y - 5 @@ -71,6 +64,13 @@ class PongBot else @me = @player2 end + + Thread.new { + loop do + gameTick() + sleep 0.3 + end + } end def ball(pos_s) @@ -88,7 +88,6 @@ class PongBot def game(wait_or_start) if wait_or_start == "wait" - puts "Other ready" else @game_paused = false end diff --git a/games/Pong/Classes/GGSNetwork.m b/games/Pong/Classes/GGSNetwork.m index 191b058..32f53f0 100644 --- a/games/Pong/Classes/GGSNetwork.m +++ b/games/Pong/Classes/GGSNetwork.m @@ -11,7 +11,7 @@ @implementation GGSNetwork -#define GGS_HOST @"home.jeena.net" +#define GGS_HOST @"localhost" #define GGS_PORT 9000 #define NO_TIMEOUT -1 diff --git a/games/Pong/Pong.xcodeproj/project.xcworkspace/xcuserdata/jeena.xcuserdatad/UserInterfaceState.xcuserstate b/games/Pong/Pong.xcodeproj/project.xcworkspace/xcuserdata/jeena.xcuserdatad/UserInterfaceState.xcuserstate index 4d0530f..f79dc54 100644 --- a/games/Pong/Pong.xcodeproj/project.xcworkspace/xcuserdata/jeena.xcuserdatad/UserInterfaceState.xcuserstate +++ b/games/Pong/Pong.xcodeproj/project.xcworkspace/xcuserdata/jeena.xcuserdatad/UserInterfaceState.xcuserstate @@ -11,7 +11,7 @@ $class CF$UID - 195 + 183 NS.keys @@ -32,7 +32,7 @@ CF$UID - 120 + 121 @@ -115,11 +115,11 @@ CF$UID - 106 + 107 CF$UID - 107 + 108 CF$UID @@ -217,7 +217,7 @@ CF$UID - 58 + 54 CF$UID @@ -449,7 +449,7 @@ PrimaryDocumentVisibleCharacterRange HideAllIssues PrimaryDocumentSelectedCharacterRange - 324349224.47908998 + 324400742.528961 {0, 910} {797, 0} @@ -507,8 +507,8 @@ - 324351348.42624801 - {1190, 1757} + 324400739.20572603 + {204, 801} {953, 0} $class @@ -555,61 +555,9 @@ - 324349919.87820297 - {1453, 2127} - {2942, 0} - - $class - - CF$UID - 41 - - NS.keys - - - CF$UID - 51 - - - CF$UID - 52 - - - CF$UID - 53 - - - CF$UID - 54 - - - NS.objects - - - CF$UID - 55 - - - CF$UID - 56 - - - CF$UID - 15 - - - CF$UID - 57 - - - - PrimaryDocumentTimestamp - PrimaryDocumentVisibleCharacterRange - HideAllIssues - PrimaryDocumentSelectedCharacterRange - 324248959.37454498 - {0, 531} - {0, 0} + 324402616.78700799 + {0, 678} + {207, 0} $class @@ -636,6 +584,54 @@ NS.objects + + + CF$UID + 51 + + + CF$UID + 52 + + + CF$UID + 15 + + + CF$UID + 53 + + + + 324400740.10611397 + {0, 531} + {0, 0} + + $class + + CF$UID + 41 + + NS.keys + + + CF$UID + 55 + + + CF$UID + 56 + + + CF$UID + 57 + + + CF$UID + 58 + + + NS.objects CF$UID @@ -651,10 +647,14 @@ CF$UID - 57 + 53 + PrimaryDocumentTimestamp + PrimaryDocumentVisibleCharacterRange + HideAllIssues + PrimaryDocumentSelectedCharacterRange 324347076.57831001 {328, 2297} @@ -667,19 +667,19 @@ CF$UID - 51 + 55 CF$UID - 52 + 56 CF$UID - 53 + 57 CF$UID - 54 + 58 NS.objects @@ -698,7 +698,7 @@ CF$UID - 57 + 53 @@ -794,7 +794,7 @@ CF$UID - 84 + 106 @@ -1059,7 +1059,7 @@ 102 NS.time - 324351343.54201001 + 324402614.75854403 $classes @@ -1070,7 +1070,7 @@ $classname NSDate - Today at 03:35 + Today at 17:50 $classes @@ -1082,6 +1082,7 @@ NSMutableArray 106 + Pong $class @@ -1106,27 +1107,27 @@ CF$UID - 108 + 109 CF$UID - 110 + 111 CF$UID - 112 + 113 CF$UID - 114 + 115 CF$UID - 116 + 117 CF$UID - 118 + 119 @@ -1144,25 +1145,7 @@ NS.relative CF$UID - 109 - - - file://localhost/Users/jeena/Student/GGS/games/Pong/Classes/PongViewController.m - - $class - - CF$UID - 22 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 111 + 110 file://localhost/Users/jeena/Student/GGS/games/Pong/Classes/GGSNetwork.m @@ -1180,7 +1163,7 @@ NS.relative CF$UID - 113 + 112 file://localhost/Users/jeena/Student/GGS/games/Pong/Classes/GGSNetwork.h @@ -1198,25 +1181,7 @@ NS.relative CF$UID - 115 - - - file://localhost/Users/jeena/Student/GGS/games/Pong/Classes/PongAppDelegate.m - - $class - - CF$UID - 22 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 117 + 114 file://localhost/Users/jeena/Student/GGS/games/Pong/Classes/GGSDelegate.h @@ -1234,7 +1199,43 @@ NS.relative CF$UID - 119 + 116 + + + file://localhost/Users/jeena/Student/GGS/games/Pong/Classes/PongViewController.m + + $class + + CF$UID + 22 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 118 + + + file://localhost/Users/jeena/Student/GGS/games/Pong/Classes/PongAppDelegate.m + + $class + + CF$UID + 22 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 120 file://localhost/Users/jeena/Student/GGS/games/Pong/Classes/PongAppDelegate.h @@ -1246,10 +1247,6 @@ NS.keys - - CF$UID - 121 - CF$UID 122 @@ -1270,29 +1267,33 @@ CF$UID 126 + + CF$UID + 127 + NS.objects CF$UID - 127 - - - CF$UID - 295 - - - CF$UID - 137 - - - CF$UID - 121 + 128 CF$UID 296 + + CF$UID + 146 + + + CF$UID + 122 + + + CF$UID + 297 + CF$UID 3 @@ -1313,10 +1314,6 @@ NS.keys - - CF$UID - 128 - CF$UID 129 @@ -1345,20 +1342,24 @@ CF$UID 135 - - NS.objects - CF$UID 136 + + NS.objects + CF$UID 137 CF$UID - 138 + 146 + + + CF$UID + 64 CF$UID @@ -1378,20 +1379,18 @@ CF$UID - 64 + 295 - IDETabLabel - IDEShowNavigator IDEEditorArea + IDEShowNavigator + AssistantEditorsLayout IDEWorkspaceTabControllerUtilityAreaSplitView IDENavigatorArea IDEWorkspaceTabControllerDesignAreaSplitView IDEShowUtilities - AssistantEditorsLayout - PongViewController.m - + IDETabLabel $class @@ -1400,6 +1399,10 @@ NS.keys + + CF$UID + 138 + CF$UID 139 @@ -1428,28 +1431,24 @@ CF$UID 145 + + NS.objects + CF$UID 146 - - NS.objects - CF$UID 147 CF$UID - 167 + 190 CF$UID - 202 - - - CF$UID - 137 + 146 CF$UID @@ -1457,94 +1456,222 @@ CF$UID - 231 + 219 CF$UID - 239 + 227 CF$UID - 137 + 228 - layoutTree + ShowDebuggerArea IDEEditorMode_Standard IDEEDitorArea_DebugArea IDEShowEditor EditorMode DebuggerSplitView DefaultPersistentRepresentations - ShowDebuggerArea + layoutTree + $class CF$UID - 166 + 41 - geniusEditorContextNode + NS.keys + + + CF$UID + 148 + + + NS.objects + + + CF$UID + 149 + + + + EditorLayout_PersistentRepresentation + + $class CF$UID - 0 + 41 - primaryEditorContextNode + NS.keys + + + CF$UID + 150 + + + NS.objects + + + CF$UID + 151 + + + + Main + + $class CF$UID - 148 + 183 - rootLayoutTreeNode + NS.keys + + + CF$UID + 152 + + + CF$UID + 153 + + + CF$UID + 154 + + + NS.objects + + + CF$UID + 155 + + + CF$UID + 64 + + + CF$UID + 188 + + + + EditorLayout_StateSavingStateDictionaries + EditorLayout_Selected + EditorLayout_Geometry + + $class CF$UID - 163 + 175 + NS.objects + + + CF$UID + 156 + + $class CF$UID - 165 - - children - - CF$UID - 0 - - contentType - 1 - documentArchivableRepresentation - - CF$UID - 149 - - orientation - 0 - parent - - CF$UID - 163 + 41 + NS.keys + + + CF$UID + 157 + + + CF$UID + 158 + + + CF$UID + 159 + + + CF$UID + 160 + + + CF$UID + 161 + + + CF$UID + 162 + + + CF$UID + 163 + + + NS.objects + + + CF$UID + 164 + + + CF$UID + 165 + + + CF$UID + 179 + + + CF$UID + 184 + + + CF$UID + 169 + + + CF$UID + 185 + + + CF$UID + 186 + + + FileDataType + ArchivableRepresentation + EditorState + NavigableItemName + DocumentNavigableItemName + DocumentExtensionIdentifier + DocumentURL + public.objective-c-source $class CF$UID - 162 + 178 DocumentLocation CF$UID - 160 + 176 DomainIdentifier CF$UID - 150 + 166 IdentifierPath CF$UID - 151 + 167 IndexOfDocumentIdentifier @@ -1557,21 +1684,21 @@ $class CF$UID - 159 + 175 NS.objects CF$UID - 152 + 168 CF$UID - 155 + 171 CF$UID - 157 + 173 @@ -1579,15 +1706,15 @@ $class CF$UID - 154 + 170 Identifier CF$UID - 153 + 169 - PongViewController.m + GGSNetwork.m $classes @@ -1601,12 +1728,12 @@ $class CF$UID - 154 + 170 Identifier CF$UID - 156 + 172 Classes @@ -1614,12 +1741,12 @@ $class CF$UID - 154 + 170 Identifier CF$UID - 158 + 174 Pong @@ -1636,12 +1763,12 @@ $class CF$UID - 161 + 177 documentURL CF$UID - 24 + 26 timestamp @@ -1671,12 +1798,665 @@ $class CF$UID - 165 + 183 + + NS.keys + + + CF$UID + 34 + + + CF$UID + 35 + + + CF$UID + 36 + + + CF$UID + 37 + + + NS.objects + + + CF$UID + 180 + + + CF$UID + 181 + + + CF$UID + 15 + + + CF$UID + 182 + + + + 324402616.78781998 + {0, 678} + {207, 0} + + $classes + + NSDictionary + NSObject + + $classname + NSDictionary + + @implementation GGSNetwork + Xcode.IDEKit.EditorDocument.SourceCode + + $class + + CF$UID + 22 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 187 + + + file://localhost/Users/jeena/Student/GGS/games/Pong/Classes/GGSNetwork.m + + $class + + CF$UID + 175 + + NS.objects + + + CF$UID + 189 + + + + {{0, 0}, {902, 456}} + + $class + + CF$UID + 41 + + NS.keys + + + CF$UID + 191 + + + CF$UID + 192 + + + CF$UID + 193 + + + CF$UID + 194 + + + CF$UID + 195 + + + CF$UID + 196 + + + NS.objects + + + CF$UID + 100 + + + CF$UID + 197 + + + CF$UID + 199 + + + CF$UID + 100 + + + CF$UID + 210 + + + CF$UID + 216 + + + + LayoutFocusMode + console + IDEDebuggerAreaSplitView + LayoutMode + IDEDebugArea_SplitView + variables + + $class + + CF$UID + 41 + + NS.keys + + + CF$UID + 198 + + + NS.objects + + + CF$UID + 64 + + + + ConsoleFilterMode + + $class + + CF$UID + 41 + + NS.keys + + + CF$UID + 200 + + + NS.objects + + + CF$UID + 201 + + + + DVTSplitViewItems + + $class + + CF$UID + 104 + + NS.objects + + + CF$UID + 202 + + + CF$UID + 207 + + + + + $class + + CF$UID + 183 + + NS.keys + + + CF$UID + 203 + + + CF$UID + 204 + + + NS.objects + + + CF$UID + 205 + + + CF$UID + 206 + + + + DVTIdentifier + DVTViewMagnitude + VariablesView + 307 + + $class + + CF$UID + 183 + + NS.keys + + + CF$UID + 203 + + + CF$UID + 204 + + + NS.objects + + + CF$UID + 208 + + + CF$UID + 209 + + + + ConsoleArea + 594 + + $class + + CF$UID + 41 + + NS.keys + + + CF$UID + 200 + + + NS.objects + + + CF$UID + 211 + + + + + $class + + CF$UID + 104 + + NS.objects + + + CF$UID + 212 + + + CF$UID + 214 + + + + + $class + + CF$UID + 183 + + NS.keys + + + CF$UID + 203 + + + CF$UID + 204 + + + NS.objects + + + CF$UID + 205 + + + CF$UID + 213 + + + + 307 + + $class + + CF$UID + 183 + + NS.keys + + + CF$UID + 203 + + + CF$UID + 204 + + + NS.objects + + + CF$UID + 208 + + + CF$UID + 215 + + + + 594 + + $class + + CF$UID + 41 + + NS.keys + + + CF$UID + 217 + + + NS.objects + + + CF$UID + 218 + + + + DBGVariablesViewFilterMode + 2 + + $class + + CF$UID + 41 + + NS.keys + + + CF$UID + 200 + + + NS.objects + + + CF$UID + 220 + + + + + $class + + CF$UID + 104 + + NS.objects + + + CF$UID + 221 + + + CF$UID + 224 + + + + + $class + + CF$UID + 183 + + NS.keys + + + CF$UID + 203 + + + CF$UID + 204 + + + NS.objects + + + CF$UID + 222 + + + CF$UID + 223 + + + + IDEEditor + 478 + + $class + + CF$UID + 183 + + NS.keys + + + CF$UID + 203 + + + CF$UID + 204 + + + NS.objects + + + CF$UID + 225 + + + CF$UID + 226 + + + + IDEDebuggerArea + 224 + + $class + + CF$UID + 41 + + NS.keys + + NS.objects + + + + $class + + CF$UID + 239 + + geniusEditorContextNode + + CF$UID + 0 + + primaryEditorContextNode + + CF$UID + 229 + + rootLayoutTreeNode + + CF$UID + 236 + + + + $class + + CF$UID + 238 children CF$UID - 164 + 0 + + contentType + 1 + documentArchivableRepresentation + + CF$UID + 230 + + orientation + 0 + parent + + CF$UID + 236 + + + + $class + + CF$UID + 178 + + DocumentLocation + + CF$UID + 176 + + DomainIdentifier + + CF$UID + 166 + + IdentifierPath + + CF$UID + 231 + + IndexOfDocumentIdentifier + + CF$UID + 64 + + + + $class + + CF$UID + 175 + + NS.objects + + + CF$UID + 232 + + + CF$UID + 233 + + + CF$UID + 234 + + + + + $class + + CF$UID + 170 + + Identifier + + CF$UID + 169 + + + + $class + + CF$UID + 170 + + Identifier + + CF$UID + 172 + + + + $class + + CF$UID + 170 + + Identifier + + CF$UID + 235 + + + Pong + + $class + + CF$UID + 238 + + children + + CF$UID + 237 contentType 0 @@ -1697,13 +2477,13 @@ $class CF$UID - 159 + 175 NS.objects CF$UID - 148 + 229 @@ -1733,791 +2513,11 @@ NS.keys - - CF$UID - 168 - - - NS.objects - - - CF$UID - 169 - - - - EditorLayout_PersistentRepresentation - - $class - - CF$UID - 41 - - NS.keys - - - CF$UID - 170 - - - NS.objects - - - CF$UID - 171 - - - - Main - - $class - - CF$UID - 195 - - NS.keys - - - CF$UID - 172 - - - CF$UID - 173 - - - CF$UID - 174 - - - NS.objects - - - CF$UID - 175 - - - CF$UID - 64 - CF$UID 200 - - EditorLayout_StateSavingStateDictionaries - EditorLayout_Selected - EditorLayout_Geometry - - $class - - CF$UID - 159 - - NS.objects - - - CF$UID - 176 - - - - - $class - - CF$UID - 41 - - NS.keys - - - CF$UID - 177 - - - CF$UID - 178 - - - CF$UID - 179 - - - CF$UID - 180 - - - CF$UID - 181 - - - CF$UID - 182 - - - CF$UID - 183 - - - NS.objects - - - CF$UID - 184 - - - CF$UID - 185 - - - CF$UID - 191 - - - CF$UID - 196 - - - CF$UID - 153 - - - CF$UID - 197 - - - CF$UID - 198 - - - - FileDataType - ArchivableRepresentation - EditorState - NavigableItemName - DocumentNavigableItemName - DocumentExtensionIdentifier - DocumentURL - public.objective-c-source - - $class - - CF$UID - 162 - - DocumentLocation - - CF$UID - 160 - - DomainIdentifier - - CF$UID - 150 - - IdentifierPath - - CF$UID - 186 - - IndexOfDocumentIdentifier - - CF$UID - 64 - - - - $class - - CF$UID - 159 - - NS.objects - - - CF$UID - 187 - - - CF$UID - 188 - - - CF$UID - 189 - - - - - $class - - CF$UID - 154 - - Identifier - - CF$UID - 153 - - - - $class - - CF$UID - 154 - - Identifier - - CF$UID - 156 - - - - $class - - CF$UID - 154 - - Identifier - - CF$UID - 190 - - - Pong - - $class - - CF$UID - 195 - - NS.keys - - - CF$UID - 34 - - - CF$UID - 35 - - - CF$UID - 36 - - - CF$UID - 37 - - - NS.objects - - - CF$UID - 192 - - - CF$UID - 193 - - - CF$UID - 15 - - - CF$UID - 194 - - - - 324351348.42674202 - {1190, 1757} - {953, 0} - - $classes - - NSDictionary - NSObject - - $classname - NSDictionary - - @implementation PongViewController - Xcode.IDEKit.EditorDocument.SourceCode - - $class - - CF$UID - 22 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 199 - - - file://localhost/Users/jeena/Student/GGS/games/Pong/Classes/PongViewController.m - - $class - - CF$UID - 159 - - NS.objects - - - CF$UID - 201 - - - - {{0, 0}, {902, 842}} - - $class - - CF$UID - 41 - - NS.keys - - - CF$UID - 203 - - - CF$UID - 204 - - - CF$UID - 205 - - - CF$UID - 206 - - - CF$UID - 207 - - - CF$UID - 208 - - - NS.objects - - - CF$UID - 100 - - - CF$UID - 209 - - - CF$UID - 211 - - - CF$UID - 100 - - - CF$UID - 214 - - - CF$UID - 225 - - - - LayoutFocusMode - console - variables - LayoutMode - IDEDebugArea_SplitView - IDEDebuggerAreaSplitView - - $class - - CF$UID - 41 - - NS.keys - - - CF$UID - 210 - - - NS.objects - - - CF$UID - 64 - - - - ConsoleFilterMode - - $class - - CF$UID - 41 - - NS.keys - - - CF$UID - 212 - - - NS.objects - - - CF$UID - 213 - - - - DBGVariablesViewFilterMode - 2 - - $class - - CF$UID - 41 - - NS.keys - - - CF$UID - 215 - - - NS.objects - - - CF$UID - 216 - - - - DVTSplitViewItems - - $class - - CF$UID - 104 - - NS.objects - - - CF$UID - 217 - - - CF$UID - 222 - - - - - $class - - CF$UID - 195 - - NS.keys - - - CF$UID - 218 - - - CF$UID - 219 - - - NS.objects - - - CF$UID - 220 - - - CF$UID - 221 - - - - DVTIdentifier - DVTViewMagnitude - VariablesView - 307 - - $class - - CF$UID - 195 - - NS.keys - - - CF$UID - 218 - - - CF$UID - 219 - - - NS.objects - - - CF$UID - 223 - - - CF$UID - 224 - - - - ConsoleArea - 594 - - $class - - CF$UID - 41 - - NS.keys - - - CF$UID - 215 - - - NS.objects - - - CF$UID - 226 - - - - - $class - - CF$UID - 104 - - NS.objects - - - CF$UID - 227 - - - CF$UID - 229 - - - - - $class - - CF$UID - 195 - - NS.keys - - - CF$UID - 218 - - - CF$UID - 219 - - - NS.objects - - - CF$UID - 220 - - - CF$UID - 228 - - - - 307 - - $class - - CF$UID - 195 - - NS.keys - - - CF$UID - 218 - - - CF$UID - 219 - - - NS.objects - - - CF$UID - 223 - - - CF$UID - 230 - - - - 594 - - $class - - CF$UID - 41 - - NS.keys - - - CF$UID - 215 - - - NS.objects - - - CF$UID - 232 - - - - - $class - - CF$UID - 104 - - NS.objects - - - CF$UID - 233 - - - CF$UID - 236 - - - - - $class - - CF$UID - 195 - - NS.keys - - - CF$UID - 218 - - - CF$UID - 219 - - - NS.objects - - - CF$UID - 234 - - - CF$UID - 235 - - - - IDEEditor - 864 - - $class - - CF$UID - 195 - - NS.keys - - - CF$UID - 218 - - - CF$UID - 219 - - - NS.objects - - - CF$UID - 237 - - - CF$UID - 238 - - - - IDEDebuggerArea - 224 - - $class - - CF$UID - 41 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 41 - - NS.keys - - - CF$UID - 215 - - NS.objects @@ -2548,17 +2548,17 @@ $class CF$UID - 195 + 183 NS.keys CF$UID - 218 + 203 CF$UID - 219 + 204 NS.objects @@ -2574,22 +2574,22 @@ - 877 + 464 $class CF$UID - 195 + 183 NS.keys CF$UID - 218 + 203 CF$UID - 219 + 204 NS.objects @@ -2604,7 +2604,7 @@ - 211 + 238 $class @@ -2634,17 +2634,17 @@ CF$UID - 250 + 248 CF$UID - 269 + 268 - Xcode.IDEKit.Navigator.Issues - SelectedNavigator Xcode.IDEKit.Navigator.Structure + SelectedNavigator + Xcode.IDEKit.Navigator.Issues $class @@ -2681,21 +2681,25 @@ CF$UID 258 + + NS.objects + CF$UID 259 + + CF$UID + 15 + CF$UID 260 CF$UID - 261 + 15 - - NS.objects - CF$UID 15 @@ -2704,56 +2708,25 @@ CF$UID 262 - - CF$UID - 263 - CF$UID 265 - - CF$UID - 266 - - - CF$UID - 15 - - - CF$UID - 15 - - - CF$UID - 267 - - - CF$UID - 15 - - - CF$UID - 268 - - IDEErrorFilteringEnabled IDEVisibleRect - IDECollapsedFiles - IDEExpandedIssues - IDESelectedNavigables - IDEShowsByType - IDESchemeFilteringEnabled - IDECollapsedTypes - IDERecentFilteringEnabled - IDECollapsedGroups - {{0, 0}, {213, 1022}} + IDEUnsavedDocumentFilteringEnabled + IDENavigatorExpandedItemsBeforeFilteringSet + IDERecentDocumentFilteringEnabled + IDESCMStatusFilteringEnabled + IDESelectedObjects + IDEExpandedItemsSet + {{0, 0}, {213, 658}} $class CF$UID - 264 + 261 NS.objects @@ -2761,21 +2734,25 @@ $classes - NSMutableSet NSSet NSObject $classname - NSMutableSet + NSSet $class CF$UID - 264 + 175 NS.objects - + + + CF$UID + 263 + + $class @@ -2784,25 +2761,71 @@ 104 NS.objects - + + + CF$UID + 264 + + + CF$UID + 172 + + + CF$UID + 169 + + + + Pong + + $class + + CF$UID + 261 + + NS.objects + + + CF$UID + 266 + + + CF$UID + 267 + + $class CF$UID - 264 + 104 NS.objects - + + + CF$UID + 264 + + $class CF$UID - 264 + 104 NS.objects - + + + CF$UID + 264 + + + CF$UID + 172 + + $class @@ -2812,6 +2835,10 @@ NS.keys + + CF$UID + 269 + CF$UID 270 @@ -2840,133 +2867,97 @@ CF$UID 276 - - NS.objects - CF$UID 277 - - CF$UID - 15 - CF$UID 278 + + NS.objects + CF$UID 15 CF$UID - 15 + 279 CF$UID 280 - - CF$UID - 283 - - - - IDEVisibleRect - IDEUnsavedDocumentFilteringEnabled - IDENavigatorExpandedItemsBeforeFilteringSet - IDERecentDocumentFilteringEnabled - IDESCMStatusFilteringEnabled - IDESelectedObjects - IDEExpandedItemsSet - {{0, 0}, {213, 1044}} - - $class - - CF$UID - 279 - - NS.objects - - - - $classes - - NSSet - NSObject - - $classname - NSSet - - - $class - - CF$UID - 159 - - NS.objects - - - CF$UID - 281 - - - - - $class - - CF$UID - 104 - - NS.objects - CF$UID 282 CF$UID - 156 + 283 CF$UID - 153 + 15 + + + CF$UID + 15 - - - Pong - - $class - - CF$UID - 279 - - NS.objects - CF$UID 284 + + CF$UID + 15 + CF$UID 285 + IDEErrorFilteringEnabled + IDEVisibleRect + IDECollapsedFiles + IDEExpandedIssues + IDESelectedNavigables + IDEShowsByType + IDESchemeFilteringEnabled + IDECollapsedTypes + IDERecentFilteringEnabled + IDECollapsedGroups + {{0, 0}, {213, 636}} $class CF$UID - 104 + 281 NS.objects + + + + $classes - - CF$UID - 282 - + NSMutableSet + NSSet + NSObject + $classname + NSMutableSet + + + $class + + CF$UID + 281 + + NS.objects + $class @@ -2975,16 +2966,25 @@ 104 NS.objects - - - CF$UID - 282 - - - CF$UID - 156 - - + + + + $class + + CF$UID + 281 + + NS.objects + + + + $class + + CF$UID + 281 + + NS.objects + $class @@ -2996,7 +2996,7 @@ CF$UID - 215 + 200 NS.objects @@ -3033,24 +3033,24 @@ $class CF$UID - 195 + 183 NS.keys CF$UID - 218 + 203 CF$UID - 219 + 204 NS.objects CF$UID - 132 + 133 CF$UID @@ -3063,24 +3063,24 @@ $class CF$UID - 195 + 183 NS.keys CF$UID - 218 + 203 CF$UID - 219 + 204 NS.objects CF$UID - 130 + 129 CF$UID @@ -3093,17 +3093,17 @@ $class CF$UID - 195 + 183 NS.keys CF$UID - 218 + 203 CF$UID - 219 + 204 NS.objects @@ -3120,21 +3120,22 @@ IDEUtilitiesArea 260 + GGSNetwork.m $class CF$UID - 159 + 175 NS.objects CF$UID - 121 + 122 - {{2603, 7}, {1116, 1186}} + {{160, 0}, {1116, 778}} $top diff --git a/src/ggs_gamevm_p.erl b/src/ggs_gamevm_p.erl index fc4700f..dc669bf 100644 --- a/src/ggs_gamevm_p.erl +++ b/src/ggs_gamevm_p.erl @@ -121,21 +121,22 @@ intern_add_player(Table, Player) -> 1 -> erlang:display("A player joined"); 2 -> - [P1,P2] = PlayerList, - erlang:display(PlayerList), - erlang:display("P1: joining"), - ggs_db:setItem(Table, local_storage, P1, player1), - erlang:display(ggs_db:getItem(Table, local_storage, Player)), - ggs_db:setItem(Table, local_storage, player1_y, 50), - ggs_table:send_command(Table, Player, {"welcome", int2str(1)}), - ggs_table:notify_all_players(Table, {"player1_y", int2str(50)}), - erlang:display("P2: joining"), - ggs_db:setItem(Table, local_storage, P2, player2), - erlang:display(ggs_db:getItem(Table, local_storage, Player)), - ggs_db:setItem(Table, local_storage, player2_y, 50), - ggs_table:send_command(Table, Player, {"welcome", int2str(2)}), - ggs_table:send_command(Table, Player, {"player1_y", int2str(50)}), - ggs_table:notify_all_players(Table, {"player2_y", int2str(50)}); + erlang:display("Player 2 joined"), + [P1,P2] = PlayerList, + erlang:display(PlayerList), + erlang:display("P1: joining"), + ggs_db:setItem(Table, local_storage, P1, player1), + erlang:display(ggs_db:getItem(Table, local_storage, P1)), + ggs_db:setItem(Table, local_storage, player1_y, 50), + ggs_table:send_command(Table, P1, {"welcome", int2str(1)}), + ggs_table:notify_all_players(Table, {"player1_y", int2str(50)}), + erlang:display("P2: joining"), + ggs_db:setItem(Table, local_storage, P2, player2), + erlang:display(ggs_db:getItem(Table, local_storage, P2)), + ggs_db:setItem(Table, local_storage, player2_y, 50), + ggs_table:send_command(Table, P2, {"welcome", int2str(2)}), + ggs_table:send_command(Table, P2, {"player1_y", int2str(50)}), + ggs_table:notify_all_players(Table, {"player2_y", int2str(50)}); _Other -> ggs_table:send_command(Table, Player, {"not_welcome", ""}) end.