Commits

Daniel Pope committed 93e0bb0

Final commit - added balloons, but they don't work :((

Comments (0)

Files changed (4)

korovic/components/__init__.py

 from .wings import *
 from .fuel import *
 from .obstacles import *
+from .balloons import *
 
 
 def load_all():

korovic/components/base.py

 
     def bodies_and_shapes(self):
         bs = [self.body] + self.shapes
+        for c in self.components:
+            try:
+                bs.extend(c.bodies_and_shapes())
+            except Exception:
+                pass
         return bs
 
     def is_enabled(self):

korovic/editor_hud.py

     Item('Propeller', 100, components.Propeller, 'Contact!'),
     Item('Small Fuel Tank', 40, components.SmallFuelTank, 'A little fuel goes a long way!'),
     Item('Large Fuel Tank', 75, components.LargeFuelTank, 'Is zis too much fuel for you?'),
+#    Item('Balloon', 10, components.Balloon, 'Ninety-nine Luftballoons...'),
     Item('Pulsejet', 150, components.PulseJet, 'Vould you like to cruise like a V-1, Susie?'),
     Item('Rotor', 500, components.Rotor, 'You are Susie, not Huey, yes?'),
 ]
Add a comment to this file

source/concepts.svg

Old
Old image
New
New image
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="988.61702"
+     inkscape:cx="628.61702"
      inkscape:cy="654.1413"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
     </g>
     <g
        id="g3780"
-       transform="translate(-243,325)"
+       transform="translate(-238,326)"
        inkscape:export-filename="/home/mauve/dev/flying/data/sprites/balloon.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90">
          style="color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <path
          transform="matrix(1.1666667,0,0,1.1666667,-55.154329,-7.8093899)"
-         d="m 330.92596,42.613697 c 0,2.343146 -1.8995,4.242641 -4.24264,4.242641 -2.34315,0 -4.24264,-1.899495 -4.24264,-4.242641 0,-2.343146 1.89949,-4.24264 4.24264,-4.24264 2.34314,0 4.24264,1.899494 4.24264,4.24264 z"
+         d="m 330.92596,42.613697 a 4.2426405,4.2426405 0 1 1 -8.48528,0 4.2426405,4.2426405 0 1 1 8.48528,0 z"
          sodipodi:ry="4.2426405"
          sodipodi:rx="4.2426405"
          sodipodi:cy="42.613697"
              sodipodi:cy="242.28297"
              sodipodi:rx="2.1213202"
              sodipodi:ry="2.7400389"
-             d="m 438.75975,242.28297 a 2.1213202,2.7400389 0 1 1 -4.24264,0 2.1213202,2.7400389 0 1 1 4.24264,0 z"
+             d="m 438.75975,242.28297 c 0,1.51329 -0.94975,2.74004 -2.12132,2.74004 -1.17158,0 -2.12132,-1.22675 -2.12132,-2.74004 0,-1.51328 0.94974,-2.74003 2.12132,-2.74003 1.17157,0 2.12132,1.22675 2.12132,2.74003 z"
              transform="matrix(-0.7841732,-0.11143342,0.0906171,0.85416666,704.21467,99.792715)" />
           <path
              transform="matrix(-0.7841732,-0.11143342,0.0906171,0.85416666,700.90373,99.470945)"
-             d="m 438.75975,242.28297 a 2.1213202,2.7400389 0 1 1 -4.24264,0 2.1213202,2.7400389 0 1 1 4.24264,0 z"
+             d="m 438.75975,242.28297 c 0,1.51329 -0.94975,2.74004 -2.12132,2.74004 -1.17158,0 -2.12132,-1.22675 -2.12132,-2.74004 0,-1.51328 0.94974,-2.74003 2.12132,-2.74003 1.17157,0 2.12132,1.22675 2.12132,2.74003 z"
              sodipodi:ry="2.7400389"
              sodipodi:rx="2.1213202"
              sodipodi:cy="242.28297"
              sodipodi:type="arc" />
           <path
              transform="matrix(-0.73282796,0.00397459,0.53095182,0.70912992,571.42639,79.273646)"
-             d="m 438.75975,242.28297 a 2.1213202,2.7400389 0 1 1 -4.24264,0 2.1213202,2.7400389 0 1 1 4.24264,0 z"
+             d="m 438.75975,242.28297 c 0,1.51329 -0.94975,2.74004 -2.12132,2.74004 -1.17158,0 -2.12132,-1.22675 -2.12132,-2.74004 0,-1.51328 0.94974,-2.74003 2.12132,-2.74003 1.17157,0 2.12132,1.22675 2.12132,2.74003 z"
              sodipodi:ry="2.7400389"
              sodipodi:rx="2.1213202"
              sodipodi:cy="242.28297"
              sodipodi:cy="242.28297"
              sodipodi:rx="2.1213202"
              sodipodi:ry="2.7400389"
-             d="m 438.75975,242.28297 a 2.1213202,2.7400389 0 1 1 -4.24264,0 2.1213202,2.7400389 0 1 1 4.24264,0 z"
+             d="m 438.75975,242.28297 c 0,1.51329 -0.94975,2.74004 -2.12132,2.74004 -1.17158,0 -2.12132,-1.22675 -2.12132,-2.74004 0,-1.51328 0.94974,-2.74003 2.12132,-2.74003 1.17157,0 2.12132,1.22675 2.12132,2.74003 z"
              transform="matrix(-0.73282796,0.00397459,0.53095182,0.70912992,568.41113,79.415856)" />
         </g>
         <g
              style="color:#000000;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
           <path
              transform="translate(-3.1819805,-2.4748737)"
-             d="m 438.75975,242.28297 a 2.1213202,2.7400389 0 1 1 -4.24264,0 2.1213202,2.7400389 0 1 1 4.24264,0 z"
+             d="m 438.75975,242.28297 c 0,1.51329 -0.94975,2.74004 -2.12132,2.74004 -1.17158,0 -2.12132,-1.22675 -2.12132,-2.74004 0,-1.51328 0.94974,-2.74003 2.12132,-2.74003 1.17157,0 2.12132,1.22675 2.12132,2.74003 z"
              sodipodi:ry="2.7400389"
              sodipodi:rx="2.1213202"
              sodipodi:cy="242.28297"
              sodipodi:cy="242.28297"
              sodipodi:rx="2.1213202"
              sodipodi:ry="2.7400389"
-             d="m 438.75975,242.28297 a 2.1213202,2.7400389 0 1 1 -4.24264,0 2.1213202,2.7400389 0 1 1 4.24264,0 z"
+             d="m 438.75975,242.28297 c 0,1.51329 -0.94975,2.74004 -2.12132,2.74004 -1.17158,0 -2.12132,-1.22675 -2.12132,-2.74004 0,-1.51328 0.94974,-2.74003 2.12132,-2.74003 1.17157,0 2.12132,1.22675 2.12132,2.74003 z"
              transform="translate(1.0606602,-2.298097)" />
           <path
              sodipodi:type="arc"
              sodipodi:cy="242.28297"
              sodipodi:rx="2.1213202"
              sodipodi:ry="2.7400389"
-             d="m 438.75975,242.28297 a 2.1213202,2.7400389 0 1 1 -4.24264,0 2.1213202,2.7400389 0 1 1 4.24264,0 z"
+             d="m 438.75975,242.28297 c 0,1.51329 -0.94975,2.74004 -2.12132,2.74004 -1.17158,0 -2.12132,-1.22675 -2.12132,-2.74004 0,-1.51328 0.94974,-2.74003 2.12132,-2.74003 1.17157,0 2.12132,1.22675 2.12132,2.74003 z"
              transform="matrix(0.85416666,0.11143342,0,-0.85416666,61.24576,404.83543)" />
           <path
              transform="matrix(0.85416666,0.11143342,0,-0.85416666,64.869682,405.1572)"
-             d="m 438.75975,242.28297 a 2.1213202,2.7400389 0 1 1 -4.24264,0 2.1213202,2.7400389 0 1 1 4.24264,0 z"
+             d="m 438.75975,242.28297 c 0,1.51329 -0.94975,2.74004 -2.12132,2.74004 -1.17158,0 -2.12132,-1.22675 -2.12132,-2.74004 0,-1.51328 0.94974,-2.74003 2.12132,-2.74003 1.17157,0 2.12132,1.22675 2.12132,2.74003 z"
              sodipodi:ry="2.7400389"
              sodipodi:rx="2.1213202"
              sodipodi:cy="242.28297"
              sodipodi:type="arc" />
           <path
              transform="matrix(0.7841732,0.11143342,-0.0906171,-0.85416666,115.1565,411.02261)"
-             d="m 438.75975,242.28297 a 2.1213202,2.7400389 0 1 1 -4.24264,0 2.1213202,2.7400389 0 1 1 4.24264,0 z"
+             d="m 438.75975,242.28297 c 0,1.51329 -0.94975,2.74004 -2.12132,2.74004 -1.17158,0 -2.12132,-1.22675 -2.12132,-2.74004 0,-1.51328 0.94974,-2.74003 2.12132,-2.74003 1.17157,0 2.12132,1.22675 2.12132,2.74003 z"
              sodipodi:ry="2.7400389"
              sodipodi:rx="2.1213202"
              sodipodi:cy="242.28297"
              sodipodi:cy="242.28297"
              sodipodi:rx="2.1213202"
              sodipodi:ry="2.7400389"
-             d="m 438.75975,242.28297 a 2.1213202,2.7400389 0 1 1 -4.24264,0 2.1213202,2.7400389 0 1 1 4.24264,0 z"
+             d="m 438.75975,242.28297 c 0,1.51329 -0.94975,2.74004 -2.12132,2.74004 -1.17158,0 -2.12132,-1.22675 -2.12132,-2.74004 0,-1.51328 0.94974,-2.74003 2.12132,-2.74003 1.17157,0 2.12132,1.22675 2.12132,2.74003 z"
              transform="matrix(0.7841732,0.11143342,-0.0906171,-0.85416666,118.46744,411.34438)" />
           <path
              sodipodi:type="arc"
              sodipodi:cy="242.28297"
              sodipodi:rx="2.1213202"
              sodipodi:ry="2.7400389"
-             d="m 438.75975,242.28297 a 2.1213202,2.7400389 0 1 1 -4.24264,0 2.1213202,2.7400389 0 1 1 4.24264,0 z"
+             d="m 438.75975,242.28297 c 0,1.51329 -0.94975,2.74004 -2.12132,2.74004 -1.17158,0 -2.12132,-1.22675 -2.12132,-2.74004 0,-1.51328 0.94974,-2.74003 2.12132,-2.74003 1.17157,0 2.12132,1.22675 2.12132,2.74003 z"
              transform="matrix(0.73282796,-0.00397459,-0.53095182,-0.70912992,247.94478,432.33717)" />
           <path
              transform="matrix(0.73282796,-0.00397459,-0.53095182,-0.70912992,250.96004,432.19496)"
-             d="m 438.75975,242.28297 a 2.1213202,2.7400389 0 1 1 -4.24264,0 2.1213202,2.7400389 0 1 1 4.24264,0 z"
+             d="m 438.75975,242.28297 c 0,1.51329 -0.94975,2.74004 -2.12132,2.74004 -1.17158,0 -2.12132,-1.22675 -2.12132,-2.74004 0,-1.51328 0.94974,-2.74003 2.12132,-2.74003 1.17157,0 2.12132,1.22675 2.12132,2.74003 z"
              sodipodi:ry="2.7400389"
              sodipodi:rx="2.1213202"
              sodipodi:cy="242.28297"
              sodipodi:type="arc" />
           <path
              transform="matrix(0.73282796,-0.00397459,-0.53095182,-0.70912992,277.99682,428.27131)"
-             d="m 438.75975,242.28297 a 2.1213202,2.7400389 0 1 1 -4.24264,0 2.1213202,2.7400389 0 1 1 4.24264,0 z"
+             d="m 438.75975,242.28297 c 0,1.51329 -0.94975,2.74004 -2.12132,2.74004 -1.17158,0 -2.12132,-1.22675 -2.12132,-2.74004 0,-1.51328 0.94974,-2.74003 2.12132,-2.74003 1.17157,0 2.12132,1.22675 2.12132,2.74003 z"
              sodipodi:ry="2.7400389"
              sodipodi:rx="2.1213202"
              sodipodi:cy="242.28297"
              sodipodi:cy="242.28297"
              sodipodi:rx="2.1213202"
              sodipodi:ry="2.7400389"
-             d="m 438.75975,242.28297 a 2.1213202,2.7400389 0 1 1 -4.24264,0 2.1213202,2.7400389 0 1 1 4.24264,0 z"
+             d="m 438.75975,242.28297 c 0,1.51329 -0.94975,2.74004 -2.12132,2.74004 -1.17158,0 -2.12132,-1.22675 -2.12132,-2.74004 0,-1.51328 0.94974,-2.74003 2.12132,-2.74003 1.17157,0 2.12132,1.22675 2.12132,2.74003 z"
              transform="matrix(0.73282796,-0.00397459,-0.53095182,-0.70912992,281.01208,428.1291)" />
           <path
              transform="matrix(0.67788523,-0.27843174,-0.75808644,-0.45834488,362.86147,490.74222)"
-             d="m 438.75975,242.28297 a 2.1213202,2.7400389 0 1 1 -4.24264,0 2.1213202,2.7400389 0 1 1 4.24264,0 z"
+             d="m 438.75975,242.28297 c 0,1.51329 -0.94975,2.74004 -2.12132,2.74004 -1.17158,0 -2.12132,-1.22675 -2.12132,-2.74004 0,-1.51328 0.94974,-2.74003 2.12132,-2.74003 1.17157,0 2.12132,1.22675 2.12132,2.74003 z"
              sodipodi:ry="2.7400389"
              sodipodi:rx="2.1213202"
              sodipodi:cy="242.28297"
           </g>
           <path
              transform="matrix(0.83522727,0,0,0.83522727,60.191973,40.397467)"
-             d="m 502,206.36218 a 10,10 0 1 1 -20,0 10,10 0 1 1 20,0 z"
+             d="m 502,206.36218 c 0,5.52285 -4.47715,10 -10,10 -5.52285,0 -10,-4.47715 -10,-10 0,-5.52284 4.47715,-10 10,-10 5.52285,0 10,4.47716 10,10 z"
              sodipodi:ry="10"
              sodipodi:rx="10"
              sodipodi:cy="206.36218"
              sodipodi:cy="206.36218"
              sodipodi:rx="10"
              sodipodi:ry="10"
-             d="m 502,206.36218 a 10,10 0 1 1 -20,0 10,10 0 1 1 20,0 z"
+             d="m 502,206.36218 c 0,5.52285 -4.47715,10 -10,10 -5.52285,0 -10,-4.47715 -10,-10 0,-5.52284 4.47715,-10 10,-10 5.52285,0 10,4.47716 10,10 z"
              transform="matrix(0.48087035,0,0,0.48087035,235.71676,113.52333)" />
           <path
              transform="matrix(2.25,0,-0.875,1.9375,-435.87059,-192.65205)"
-             d="m 500,209.36218 a 1.875,2 0 1 1 -3.75,0 1.875,2 0 1 1 3.75,0 z"
+             d="m 500,209.36218 c 0,1.10457 -0.83947,2 -1.875,2 -1.03553,0 -1.875,-0.89543 -1.875,-2 0,-1.10457 0.83947,-2 1.875,-2 1.03553,0 1.875,0.89543 1.875,2 z"
              sodipodi:ry="2"
              sodipodi:rx="1.875"
              sodipodi:cy="209.36218"
              sodipodi:cy="209.36218"
              sodipodi:rx="1.875"
              sodipodi:ry="2"
-             d="m 500,209.36218 a 1.875,2 0 1 1 -3.75,0 1.875,2 0 1 1 3.75,0 z"
+             d="m 500,209.36218 c 0,1.10457 -0.83947,2 -1.875,2 -1.03553,0 -1.875,-0.89543 -1.875,-2 0,-1.10457 0.83947,-2 1.875,-2 1.03553,0 1.875,0.89543 1.875,2 z"
              transform="matrix(2.25,0,-0.125,1.9375,-626.64223,-213.40205)" />
           <path
              transform="matrix(2.25,0,-0.125,1.9375,-688.01444,-186.20015)"
-             d="m 500,209.36218 a 1.875,2 0 1 1 -3.75,0 1.875,2 0 1 1 3.75,0 z"
+             d="m 500,209.36218 c 0,1.10457 -0.83947,2 -1.875,2 -1.03553,0 -1.875,-0.89543 -1.875,-2 0,-1.10457 0.83947,-2 1.875,-2 1.03553,0 1.875,0.89543 1.875,2 z"
              sodipodi:ry="2"
              sodipodi:rx="1.875"
              sodipodi:cy="209.36218"
              sodipodi:cy="209.36218"
              sodipodi:rx="1.875"
              sodipodi:ry="2"
-             d="m 500,209.36218 a 1.875,2 0 1 1 -3.75,0 1.875,2 0 1 1 3.75,0 z"
+             d="m 500,209.36218 c 0,1.10457 -0.83947,2 -1.875,2 -1.03553,0 -1.875,-0.89543 -1.875,-2 0,-1.10457 0.83947,-2 1.875,-2 1.03553,0 1.875,0.89543 1.875,2 z"
              transform="matrix(2.25,0,-0.125,1.9375,-729.64223,-204.90205)" />
           <path
              style="color:#000000;fill:#9a4530;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          d="m 1022,413.36218 c 14,23 115,133 115,133 l 86,-123"
          style="color:#000000;fill:none;stroke:#000000;stroke-width:1.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     </g>
+    <g
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/mauve/dev/flying/korovic/data/sprites/balloon.png"
+       transform="matrix(2.2027885,0,0,2.2027885,157.25083,0.606)"
+       id="g3369">
+      <path
+         style="color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.90794015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 331.52061,82.200756 c 10.47561,0 -17.41403,-13.639487 -17.41403,-30.86634 0,-11.858795 7.79653,-21.472237 17.41403,-21.472237 9.6175,0 17.41403,9.613442 17.41403,21.472237 0,16.555846 -27.88964,30.86634 -17.41403,30.86634 z"
+         id="path3371"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="zsssz" />
+      <path
+         sodipodi:type="arc"
+         style="opacity:0.75;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path3373"
+         sodipodi:cx="326.68332"
+         sodipodi:cy="42.613697"
+         sodipodi:rx="4.2426405"
+         sodipodi:ry="4.2426405"
+         d="m 330.92596,42.613697 c 0,2.343146 -1.8995,4.242641 -4.24264,4.242641 -2.34315,0 -4.24264,-1.899495 -4.24264,-4.242641 0,-2.343146 1.89949,-4.24264 4.24264,-4.24264 2.34314,0 4.24264,1.899494 4.24264,4.24264 z"
+         transform="matrix(1.1666667,0,0,1.1666667,-55.154329,-7.8093899)" />
+    </g>
   </g>
 </svg>
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.