# HG changeset patch # User Adrianna PiƄska # Date 1378570592 -7200 # Node ID 6ca8fc93a40d4b9889508fc5856539dfbfd367a6 # Parent e08f4ba62944f0056d3cab7dca9e81e1b2c44beb split out first alien chamber diff -r e08f4ba62944 -r 6ca8fc93a40d data/images/creatures/alien_C_1.png Binary file data/images/creatures/alien_C_1.png has changed diff -r e08f4ba62944 -r 6ca8fc93a40d data/images/creatures/alien_C_2.png Binary file data/images/creatures/alien_C_2.png has changed diff -r e08f4ba62944 -r 6ca8fc93a40d data/images/creatures/alien_C_dead.png Binary file data/images/creatures/alien_C_dead.png has changed diff -r e08f4ba62944 -r 6ca8fc93a40d data/levels/alientunnel1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/levels/alientunnel1 Sat Sep 07 18:16:32 2013 +0200 @@ -0,0 +1,91 @@ +base_tile: tiles/alien_tile.png +enemies: +- args: + - [600, 300] + - [900, 300] + classname: PatrollingAlien + name: alien_1_1 +- args: + - [900, 300] + - [600, 300] + classname: PatrollingAlien + name: alien_1_2 +- args: + - [500, 300] + - [1300, 500] + classname: PatrollingAlien + name: alien_1_3 +- args: + - [300, 500] + - [500, 300] + classname: PatrollingAlien + name: alien_1_4 +- args: + - [300, 600] + - [300, 900] + classname: PatrollingAlien + name: alien_1_5 +- args: + - [300, 900] + - [300, 600] + classname: PatrollingAlien + name: alien_1_6 +- args: + - [300, 800] + - [500, 1100] + classname: PatrollingAlien + name: alien_1_7 +- args: + - [500, 1100] + - [300, 800] + classname: PatrollingAlien + name: alien_1_8 +- args: + - [600, 1100] + - [900, 1100] + classname: PatrollingAlien + name: alien_1_9 +- args: + - [900, 1100] + - [600, 1100] + classname: PatrollingAlien + name: alien_1_10 +game_objects: +- args: + - [2000, 2400] + - - [1200, 600] + - [1000, 400] + - [600, 400] + - [400, 600] + - [400, 800] + - [600, 1000] + - [1000, 1000] + - [1200, 800] + classname: AcidFloor + name: acid_floor_1 +- args: + - [1050, 1050] + - alientunnel1 + - [1025, 1025] + - 45 + classname: Door + name: entrance +- args: + - [1050, 350] + - alientunnel2 + - [350, 1050] + - 135 + classname: Door + name: 1to2 +polygons: + 1: + - [500, 1200] + - [900, 1200] + - [1200, 900] + - [1200, 500] + - [900, 200] + - [500, 200] + - [200, 500] + - [200, 900] + - [500, 1200] +size: [1400, 1400] diff -r e08f4ba62944 -r 6ca8fc93a40d data/levels/alientunnels --- a/data/levels/alientunnels Sat Sep 07 18:10:05 2013 +0200 +++ b/data/levels/alientunnels Sat Sep 07 18:16:32 2013 +0200 @@ -50,6 +50,76 @@ - [1400, 2700] classname: PatrollingAlien name: alien_1_10 +- args: + - [2000, 1600] + - 300 + classname: ChargingAlien + name: alien_2_1 +- args: + - [2200, 1800] + - 300 + classname: ChargingAlien + name: alien_2_2 +- args: + - [2400, 1800] + - 300 + classname: ChargingAlien + name: alien_2_3 +- args: + - [2600, 1600] + - 300 + classname: ChargingAlien + name: alien_2_4 +- args: + - [2600, 1400] + - 300 + classname: ChargingAlien + name: alien_2_5 +- args: + - [2400, 1200] + - 300 + classname: ChargingAlien + name: alien_2_6 +- args: + - [2200, 1200] + - 300 + classname: ChargingAlien + name: alien_2_7 +- args: + - [2000, 1400] + - 300 + classname: ChargingAlien + name: alien_2_8 +- args: + - [1900, 900] + - 300 + classname: RunAndGunAlien + name: alien_3_1 +- args: + - [1900, 700] + - 300 + classname: RunAndGunAlien + name: alien_3_2 +- args: + - [1900, 500] + - 300 + classname: RunAndGunAlien + name: alien_3_3 +- args: + - [1100, 500] + - 300 + classname: RunAndGunAlien + name: alien_3_4 +- args: + - [1100, 700] + - 300 + classname: RunAndGunAlien + name: alien_3_5 +- args: + - [1100, 900] + - 300 + classname: RunAndGunAlien + name: alien_3_6 game_objects: - args: - [2000, 2400] @@ -119,6 +189,38 @@ - 135 classname: Door name: exit +- args: + - [2100, 1700] + - - [2100, 1700] + - [2500, 1700] + - [2500, 1300] + - [2100, 1300] + classname: ForceWolfFloor + name: moonlight_2 +- args: + - [1200, 1100] + - - [1300, 1200] + - [1300, 300] + - [1200, 400] + - [1200, 1100] + classname: AcidFloor + name: acid_3_1 +- args: + - [1700, 1200] + - - [1800, 1100] + - [1800, 400] + - [1700, 300] + - [1700, 1200] + classname: AcidFloor + name: acid_3_3 +- args: + - [1400, 1100] + - - [1400, 1100] + - [1600, 1100] + - [1600, 200] + - [1400, 200] + classname: AcidFloor + name: acid_3_2 lines: [] polygons: 1: diff -r e08f4ba62944 -r 6ca8fc93a40d nagslang/enemies.py --- a/nagslang/enemies.py Sat Sep 07 18:10:05 2013 +0200 +++ b/nagslang/enemies.py Sat Sep 07 18:16:32 2013 +0200 @@ -276,7 +276,10 @@ class RunAndGunAlien(ChargingAlien): # Simplistic shooter # Move until we're in range, and then randomly + enemy_type = "C" impulse_factor = 90 + health = 42 + enemy_damage = 25 is_moving = True def make_physics(self, space, position): diff -r e08f4ba62944 -r 6ca8fc93a40d source/images/creatures/alien_C_1.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/source/images/creatures/alien_C_1.svg Sat Sep 07 18:16:32 2013 +0200 @@ -0,0 +1,284 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff -r e08f4ba62944 -r 6ca8fc93a40d source/images/creatures/alien_C_2.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/source/images/creatures/alien_C_2.svg Sat Sep 07 18:16:32 2013 +0200 @@ -0,0 +1,284 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff -r e08f4ba62944 -r 6ca8fc93a40d source/images/creatures/alien_C_dead.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/source/images/creatures/alien_C_dead.svg Sat Sep 07 18:16:32 2013 +0200 @@ -0,0 +1,550 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r e08f4ba62944 -r 6ca8fc93a40d source/levels/alientunnels.svg --- a/source/levels/alientunnels.svg Sat Sep 07 18:10:05 2013 +0200 +++ b/source/levels/alientunnels.svg Sat Sep 07 18:16:32 2013 +0200 @@ -9,8 +9,8 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="3000" - height="3000" + width="1400" + height="1400" id="svg2" version="1.1" inkscape:version="0.48.4 r9939" @@ -23,8 +23,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" - inkscape:cx="1296.5714" - inkscape:cy="2488.8946" + inkscape:cx="966.5714" + inkscape:cy="660.32317" inkscape:document-units="px" inkscape:current-layer="layer3" showgrid="true" @@ -54,43 +54,20 @@ image/svg+xml - + - + inkscape:label="Layer" + transform="translate(0,-1600)"> - - -