From 232af5e949420a54a83ca3c64764817dae327816 Mon Sep 17 00:00:00 2001
From: Ben Kurtovic <ben.kurtovic@verizon.net>
Date: Sat, 24 Dec 2011 21:28:21 -0500
Subject: [PATCH] Playing around with acceleration a bit more, and sprites for
 tanks and bullets

---
 bullet.nls |   5 +-
 lobo.nlogo | 311 +++++--------------------------------------------------------
 player.nls |  21 +++--
 tank.nls   |  25 +++--
 4 files changed, 60 insertions(+), 302 deletions(-)

diff --git a/bullet.nls b/bullet.nls
index 0136ecf..d5f8e76 100644
--- a/bullet.nls
+++ b/bullet.nls
@@ -11,10 +11,13 @@ bullets-own [
 
 to fire
   hatch-bullets 1 [
-    set color white
     set max-travel-distance 8
     set speed 1
     set travel-distance 0
+
+    set color white
+    set shape "bullet"
+    set size 0.5
   ]
 end
 
diff --git a/lobo.nlogo b/lobo.nlogo
index d01e38b..979db38 100644
--- a/lobo.nlogo
+++ b/lobo.nlogo
@@ -31,11 +31,10 @@ to setup
   no-display
   setup-defaults
   ask patches [
-    set pcolor random 3
+    set pcolor (random 3) - 5 + green
   ]
   spawn-player
-  display
-  no-display
+  render
   set last-tick-time timer
 end
 
@@ -224,291 +223,31 @@ true
 0
 Polygon -7500403 true true 150 5 40 250 150 205 260 250
 
-airplane
-true
-0
-Polygon -7500403 true true 150 0 135 15 120 60 120 105 15 165 15 195 120 180 135 240 105 270 120 285 150 270 180 285 210 270 165 240 180 180 285 195 285 165 180 105 180 60 165 15
-
-arrow
-true
-0
-Polygon -7500403 true true 150 0 0 150 105 150 105 293 195 293 195 150 300 150
-
-box
-false
-0
-Polygon -7500403 true true 150 285 285 225 285 75 150 135
-Polygon -7500403 true true 150 135 15 75 150 15 285 75
-Polygon -7500403 true true 15 75 15 225 150 285 150 135
-Line -16777216 false 150 285 150 135
-Line -16777216 false 150 135 15 75
-Line -16777216 false 150 135 285 75
-
-bug
-true
-0
-Circle -7500403 true true 96 182 108
-Circle -7500403 true true 110 127 80
-Circle -7500403 true true 110 75 80
-Line -7500403 true 150 100 80 30
-Line -7500403 true 150 100 220 30
-
-butterfly
-true
-0
-Polygon -7500403 true true 150 165 209 199 225 225 225 255 195 270 165 255 150 240
-Polygon -7500403 true true 150 165 89 198 75 225 75 255 105 270 135 255 150 240
-Polygon -7500403 true true 139 148 100 105 55 90 25 90 10 105 10 135 25 180 40 195 85 194 139 163
-Polygon -7500403 true true 162 150 200 105 245 90 275 90 290 105 290 135 275 180 260 195 215 195 162 165
-Polygon -16777216 true false 150 255 135 225 120 150 135 120 150 105 165 120 180 150 165 225
-Circle -16777216 true false 135 90 30
-Line -16777216 false 150 105 195 60
-Line -16777216 false 150 105 105 60
-
-car
-false
-0
-Polygon -7500403 true true 300 180 279 164 261 144 240 135 226 132 213 106 203 84 185 63 159 50 135 50 75 60 0 150 0 165 0 225 300 225 300 180
-Circle -16777216 true false 180 180 90
-Circle -16777216 true false 30 180 90
-Polygon -16777216 true false 162 80 132 78 134 135 209 135 194 105 189 96 180 89
-Circle -7500403 true true 47 195 58
-Circle -7500403 true true 195 195 58
-
-circle
-false
-0
-Circle -7500403 true true 0 0 300
-
-circle 2
-false
-0
-Circle -7500403 true true 0 0 300
-Circle -16777216 true false 30 30 240
-
-cow
-false
-0
-Polygon -7500403 true true 200 193 197 249 179 249 177 196 166 187 140 189 93 191 78 179 72 211 49 209 48 181 37 149 25 120 25 89 45 72 103 84 179 75 198 76 252 64 272 81 293 103 285 121 255 121 242 118 224 167
-Polygon -7500403 true true 73 210 86 251 62 249 48 208
-Polygon -7500403 true true 25 114 16 195 9 204 23 213 25 200 39 123
-
-cylinder
-false
-0
-Circle -7500403 true true 0 0 300
-
-dot
-false
-0
-Circle -7500403 true true 90 90 120
-
-face happy
-false
-0
-Circle -7500403 true true 8 8 285
-Circle -16777216 true false 60 75 60
-Circle -16777216 true false 180 75 60
-Polygon -16777216 true false 150 255 90 239 62 213 47 191 67 179 90 203 109 218 150 225 192 218 210 203 227 181 251 194 236 217 212 240
-
-face neutral
-false
-0
-Circle -7500403 true true 8 7 285
-Circle -16777216 true false 60 75 60
-Circle -16777216 true false 180 75 60
-Rectangle -16777216 true false 60 195 240 225
-
-face sad
-false
-0
-Circle -7500403 true true 8 8 285
-Circle -16777216 true false 60 75 60
-Circle -16777216 true false 180 75 60
-Polygon -16777216 true false 150 168 90 184 62 210 47 232 67 244 90 220 109 205 150 198 192 205 210 220 227 242 251 229 236 206 212 183
-
-fish
-false
-0
-Polygon -1 true false 44 131 21 87 15 86 0 120 15 150 0 180 13 214 20 212 45 166
-Polygon -1 true false 135 195 119 235 95 218 76 210 46 204 60 165
-Polygon -1 true false 75 45 83 77 71 103 86 114 166 78 135 60
-Polygon -7500403 true true 30 136 151 77 226 81 280 119 292 146 292 160 287 170 270 195 195 210 151 212 30 166
-Circle -16777216 true false 215 106 30
-
-flag
-false
-0
-Rectangle -7500403 true true 60 15 75 300
-Polygon -7500403 true true 90 150 270 90 90 30
-Line -7500403 true 75 135 90 135
-Line -7500403 true 75 45 90 45
-
-flower
-false
-0
-Polygon -10899396 true false 135 120 165 165 180 210 180 240 150 300 165 300 195 240 195 195 165 135
-Circle -7500403 true true 85 132 38
-Circle -7500403 true true 130 147 38
-Circle -7500403 true true 192 85 38
-Circle -7500403 true true 85 40 38
-Circle -7500403 true true 177 40 38
-Circle -7500403 true true 177 132 38
-Circle -7500403 true true 70 85 38
-Circle -7500403 true true 130 25 38
-Circle -7500403 true true 96 51 108
-Circle -16777216 true false 113 68 74
-Polygon -10899396 true false 189 233 219 188 249 173 279 188 234 218
-Polygon -10899396 true false 180 255 150 210 105 210 75 240 135 240
-
-house
-false
-0
-Rectangle -7500403 true true 45 120 255 285
-Rectangle -16777216 true false 120 210 180 285
-Polygon -7500403 true true 15 120 150 15 285 120
-Line -16777216 false 30 120 270 120
-
-leaf
-false
-0
-Polygon -7500403 true true 150 210 135 195 120 210 60 210 30 195 60 180 60 165 15 135 30 120 15 105 40 104 45 90 60 90 90 105 105 120 120 120 105 60 120 60 135 30 150 15 165 30 180 60 195 60 180 120 195 120 210 105 240 90 255 90 263 104 285 105 270 120 285 135 240 165 240 180 270 195 240 210 180 210 165 195
-Polygon -7500403 true true 135 195 135 240 120 255 105 255 105 285 135 285 165 240 165 195
-
-line
-true
-0
-Line -7500403 true 150 0 150 300
-
-line half
+bullet
 true
-0
-Line -7500403 true 150 0 150 150
-
-pentagon
-false
-0
-Polygon -7500403 true true 150 15 15 120 60 285 240 285 285 120
-
-person
-false
-0
-Circle -7500403 true true 110 5 80
-Polygon -7500403 true true 105 90 120 195 90 285 105 300 135 300 150 225 165 300 195 300 210 285 180 195 195 90
-Rectangle -7500403 true true 127 79 172 94
-Polygon -7500403 true true 195 90 240 150 225 180 165 105
-Polygon -7500403 true true 105 90 60 150 75 180 135 105
-
-plant
-false
-0
-Rectangle -7500403 true true 135 90 165 300
-Polygon -7500403 true true 135 255 90 210 45 195 75 255 135 285
-Polygon -7500403 true true 165 255 210 210 255 195 225 255 165 285
-Polygon -7500403 true true 135 180 90 135 45 120 75 180 135 210
-Polygon -7500403 true true 165 180 165 210 225 180 255 120 210 135
-Polygon -7500403 true true 135 105 90 60 45 45 75 105 135 135
-Polygon -7500403 true true 165 105 165 135 225 105 255 45 210 60
-Polygon -7500403 true true 135 90 120 45 150 15 180 45 165 90
-
-sheep
-false
-0
-Rectangle -7500403 true true 151 225 180 285
-Rectangle -7500403 true true 47 225 75 285
-Rectangle -7500403 true true 15 75 210 225
-Circle -7500403 true true 135 75 150
-Circle -16777216 true false 165 76 116
-
-square
-false
-0
-Rectangle -7500403 true true 30 30 270 270
-
-square 2
-false
-0
-Rectangle -7500403 true true 30 30 270 270
-Rectangle -16777216 true false 60 60 240 240
-
-star
-false
-0
-Polygon -7500403 true true 151 1 185 108 298 108 207 175 242 282 151 216 59 282 94 175 3 108 116 108
-
-target
-false
-0
-Circle -7500403 true true 0 0 300
-Circle -16777216 true false 30 30 240
-Circle -7500403 true true 60 60 180
-Circle -16777216 true false 90 90 120
-Circle -7500403 true true 120 120 60
-
-tree
-false
-0
-Circle -7500403 true true 118 3 94
-Rectangle -6459832 true false 120 195 180 300
-Circle -7500403 true true 65 21 108
-Circle -7500403 true true 116 41 127
-Circle -7500403 true true 45 90 120
-Circle -7500403 true true 104 74 152
-
-triangle
-false
-0
-Polygon -7500403 true true 150 30 15 255 285 255
-
-triangle 2
-false
-0
-Polygon -7500403 true true 150 30 15 255 285 255
-Polygon -16777216 true false 151 99 225 223 75 224
-
-truck
-false
-0
-Rectangle -7500403 true true 4 45 195 187
-Polygon -7500403 true true 296 193 296 150 259 134 244 104 208 104 207 194
-Rectangle -1 true false 195 60 195 105
-Polygon -16777216 true false 238 112 252 141 219 141 218 112
-Circle -16777216 true false 234 174 42
-Rectangle -7500403 true true 181 185 214 194
-Circle -16777216 true false 144 174 42
-Circle -16777216 true false 24 174 42
-Circle -7500403 false true 24 174 42
-Circle -7500403 false true 144 174 42
-Circle -7500403 false true 234 174 42
-
-turtle
+5
+Rectangle -16777216 true false 135 30 165 90
+Rectangle -1 true false 135 90 165 150
+Rectangle -1 true false 135 150 165 210
+Polygon -16777216 true false 135 30 150 0 165 30 135 30
+Rectangle -16777216 true false 120 270 120 270
+Rectangle -2674135 true false 135 210 165 270
+Rectangle -16777216 true false 120 270 180 300
+Polygon -7500403 true false 195 210 165 150 165 210 195 210
+Rectangle -7500403 true false 165 210 195 268
+Rectangle -7500403 true false 105 210 135 268
+Polygon -7500403 true false 105 210 135 150 135 210 105 210
+
+tank
 true
-0
-Polygon -10899396 true false 215 204 240 233 246 254 228 266 215 252 193 210
-Polygon -10899396 true false 195 90 225 75 245 75 260 89 269 108 261 124 240 105 225 105 210 105
-Polygon -10899396 true false 105 90 75 75 55 75 40 89 31 108 39 124 60 105 75 105 90 105
-Polygon -10899396 true false 132 85 134 64 107 51 108 17 150 2 192 18 192 52 169 65 172 87
-Polygon -10899396 true false 85 204 60 233 54 254 72 266 85 252 107 210
-Polygon -7500403 true true 119 75 179 75 209 101 224 135 220 225 175 261 128 261 81 224 74 135 88 99
-
-wheel
-false
-0
-Circle -7500403 true true 3 3 294
-Circle -16777216 true false 30 30 240
-Line -7500403 true 150 285 150 15
-Line -7500403 true 15 150 285 150
-Circle -7500403 true true 120 120 60
-Line -7500403 true 216 40 79 269
-Line -7500403 true 40 84 269 221
-Line -7500403 true 40 216 269 79
-Line -7500403 true 84 40 221 269
-
-x
-false
-0
-Polygon -7500403 true true 270 75 225 30 30 225 75 270
-Polygon -7500403 true true 30 75 75 30 270 225 225 270
+1
+Rectangle -7500403 true false 78 85 116 103
+Polygon -7500403 true false 105 270 210 271 210 105 180 105 180 135 120 135 120 105 90 105 89 270
+Polygon -2674135 true true 120 105 120 105 90 105 90 180 120 180 120 195 180 195 180 180 210 180 210 105 180 105 180 105 165 105 165 135 135 135 135 105 120 105
+Polygon -1 true false 135 15 135 150 165 150 165 15
+Polygon -1 true false 67 105 67 255 97 255 97 105
+Polygon -1 true false 202 105 202 255 232 255 232 105
+Rectangle -7500403 true false 184 85 222 103
 
 @#$#@#$#@
 NetLogo 4.1.3
diff --git a/player.nls b/player.nls
index a6a76c1..db89e41 100644
--- a/player.nls
+++ b/player.nls
@@ -17,9 +17,9 @@ end
 to do-player-logic
   if mouse-inside? [
     if mouse-down? and not mouse-was-down? [
-      set player-accelerate-for player-accelerate-for + 5
-      if player-accelerate-for > 30 [
-        set player-accelerate-for 30
+      set player-accelerate-for player-accelerate-for + 10
+      if player-accelerate-for > 60 [
+        set player-accelerate-for 60
       ]
     ]
     set mouse-was-down? mouse-down?
@@ -27,11 +27,16 @@ to do-player-logic
 
     ; Slow down the tank a bit more than usual if we're
     ; very close to the mouse:
-    if distancexy mouse-xcor mouse-ycor < 2.5 [
-      set speed speed - friction
-      if speed < 0 [
-        set speed 0
-      ]
+    let mouse-dist distancexy mouse-xcor mouse-ycor
+    if mouse-dist < 3 [
+      decelerate friction
+    ]
+    if mouse-dist < 1.5 [
+      decelerate friction * 6.5
+    ]
+    if mouse-dist < 0.35 [
+      set speed 0
+      set player-accelerate-for 0
     ]
 
     facexy mouse-xcor mouse-ycor
diff --git a/tank.nls b/tank.nls
index 8f4c5bd..bacef89 100644
--- a/tank.nls
+++ b/tank.nls
@@ -15,7 +15,6 @@ tanks-own [
 ]
 
 to set-tank-vars [tank-team player-tank?]
-  set heading 0
   set acceleration 0.03
   set friction 0.0075
   set is-accelerating? false
@@ -24,25 +23,37 @@ to set-tank-vars [tank-team player-tank?]
   set max-turn 24
   set speed 0
   set team tank-team
+
   set color get-tank-color
+  set heading 0
+  set shape "tank"
+  set size 1.5
 end
 
 to do-tank-logic
   if is-accelerating? [
-    set speed speed + acceleration
-    if speed > max-speed [
-      set speed max-speed
-    ]
+    accelerate acceleration
   ]
   fd speed
-  set speed speed - friction
+  decelerate friction
+end
+
+to accelerate [amount]
+  set speed speed + amount
+  if speed > max-speed [
+    set speed max-speed
+  ]
+end
+
+to decelerate [amount]
+  set speed speed - amount
   if speed < 0 [
     set speed 0
   ]
 end
 
 to-report get-tank-color
-  if is-player? [ report gray ]
+  if is-player? [ report black ]
   if team = 0 [ report green ]
   report red
 end