Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 12018


Ignore:
Timestamp:
May 30, 2018, 2:44:47 PM (7 years ago)
Author:
patricwi
Message:

Merged TowerDefense

Location:
code/branches/PresentationFS18
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • code/branches/PresentationFS18

  • code/branches/PresentationFS18/data/levels/towerDefense.oxw

    r11052 r12018  
    2323  <TowerDefenseSelecter>
    2424    <camerapositions>
    25       <CameraPosition position="0,0,1300" lookat="0,0,0" absolute=true drag=true mouselook=true/>
     25      <CameraPosition position="0,0,1600" lookat="0,0,0" absolute=true drag=true mouselook=true/>
    2626    </camerapositions>
    2727  </TowerDefenseSelecter>
    … …  
    499499            F1F1F1I2F1F1F1F1F1F1F1F1F1F1F1F1
    500500            F1F1F1I2F1F1F1F1F1F1F1Y1Y1Y1F1F1
    501             F1F1F1I2F1F1F1F1F1F1F1F1F1F1F1F1
     501            F1F1F1I2F1F1F1F1F1F1F1Y1F1Y1F1F1
    502502            F1F1F1I2F1F1F1F1F1F1F1Y1Y1Y1F1F1
    503             F1F1F1R2I3I3I3I3L3F1F1F1F1F1F1F1
    504             F1F1F1F1F1F1F1F1I2F1F1F1F1F1F1F1
    505             F1F1F1F1F1F1F1F1I2F1F1F1F1F1F1F1
    506             X1I1I1I1R0F1F1F1I2F1F1F1F1F1F1F1
     503            F1F1F1R2I3I3I3I3I3I3I3I3I3I3L3F1
     504            F1F1F1F1F1F1F1F1F1F1F1F1F1F1I2F1
     505            F1F1F1F1F1F1F1F1F1F1F1F1F1F1I2F1
     506            X1I1I1I1R0F1F1F1F1F1F1F1F1F1I2F1
     507            F1F1F1F1I0F1F1F1F1F1F1F1F1F1I2F1
     508            F1F1F1F1I0F1F1F1F1F1F1F1F1F1I2F1
     509            F1F1F1F1I0F1F1F1R1I1I1I1I1I1L2F1
    507510            F1F1F1F1I0F1F1F1I2F1F1F1F1F1F1F1
    508511            F1F1F1F1I0F1F1F1I2F1F1F1F1F1F1F1
    509             F1F1F1F1L1I1I1I1L2F1F1F1F1F1F1F1
    510             F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1
    511             F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1
    512             F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1"
    513     width=16
     512            F1F1F1F1L1I1I1I1L2F1F1F1F1F1F1F1"
     513    width=18
    514514    height=16
    515515    tileScale=100

  • code/branches/PresentationFS18/src/modules/towerdefense/TowerDefense.cc

    r11716 r12018  
    142142        this->setLifes(100);       
    143143        this->timeSinceLastSpawn_ = 0.0;
    144         this->timeUntilNextWave_ = 5.0;
     144        // Veraenderung1: timeuntilnextwave von 5.0 auf 1.0 abgesetzt
     145        this->timeUntilNextWave_ = 1.0;
    145146        this->waveSize_ = 0;
    146147        this->setWaveNumber(0);
    … …  
    242243        if (fields_[x][y]->isFree() == true && getCredit() >= cost)
    243244        {
    244             payCredit(cost);
     245            // Veraenderung 2 Paycredit von cost auf 0 gesetzt
     246            payCredit(0);
    245247            fields_[x][y]->createTower(1);
    246248        }
    … …  
    261263        if (fields_[x][y]->isFree() == false && fields_[x][y]->canUpgrade() == true && getCredit() >= cost)
    262264        {
    263             payCredit(cost);
     265             // Veraenderung 3 Paycredit von cost auf 0 gesetzt
     266            payCredit(0);
    264267            fields_[x][y]->upgrade();
    265268        }

  • code/branches/PresentationFS18/src/modules/towerdefense/TowerDefenseEnemy.cc

    r11099 r12018  
    4848        if (getGame() && once_ == false && getHealth() <= 0)
    4949        {
     50           
    5051            getGame()->addCredit(1);
    5152            once_ = true;
Note: See TracChangeset for help on using the changeset viewer.