Changeset 10622 for code/trunk/data/levels/templates

Timestamp:

Oct 4, 2015, 3:45:56 PM (9 years ago)

Author:

landauf

Message:

merged branch presentationFS15merge back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• data/levels/templates/enemytowerdefense.oxt (modified) (1 diff)
• data/levels/templates/orbStation.oxt (copied) (copied from code/branches/presentationFS15merge/data/levels/templates/orbStation.oxt)
• data/levels/templates/spaceshipFS15.oxt (copied) (copied from code/branches/presentationFS15merge/data/levels/templates/spaceshipFS15.oxt)
• data/levels/templates/spaceshipHeartAttack.oxt (copied) (copied from code/branches/presentationFS15merge/data/levels/templates/spaceshipHeartAttack.oxt)
• data/levels/templates/spaceshipRing.oxt (copied) (copied from code/branches/presentationFS15merge/data/levels/templates/spaceshipRing.oxt)
• data/levels/templates/tower.oxt (deleted)
• data/levels/templates/towerdefensetower.oxt (copied) (copied from code/branches/presentationFS15merge/data/levels/templates/towerdefensetower.oxt)

code/trunk/data/levels/templates/enemytowerdefense.oxt

@@ -167 +167 @@
    maxhealth         = 200
    initialhealth     = 100
-
+   
    shieldhealth        = 30
    initialshieldhealth = 30