Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 12398 for code


Ignore:
Timestamp:
May 17, 2019, 4:29:11 PM (6 years ago)
Author:
cwaupoti
Message:

temorary

Location:
code/branches/Boxhead_FS19
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • code/branches/Boxhead_FS19/data/levels/Hover.oxw

    r12397 r12398  
    2121MAZE_NUM_CELLS = 10
    2222MAZE_CELL_SIZE = 100
    23 MAZE_CELL_HEIGHT = 100
     23MAZE_CELL_HEIGHT = 400000
    2424MAZE_SIZE = MAZE_NUM_CELLS*MAZE_CELL_SIZE
    2525?>
    … …  
    3737    ambientlight = "0.8, 0.8, 0.8"
    3838    skybox       = "Orxonox/Starbox"
    39     gravity      = "0, -200, 0"
     39    gravity      = "0, -80, 0"
    4040  >
    4141
    … …  
    8181    />
    8282
    83     <SpaceShip position="500,20,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="200" >
    84       <templates>
    85               <Template link=spaceshipzombie />
    86       </templates>
    87     </SpaceShip>
    88 
    89     <SpaceShip position="500,10000,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="200" >
    90       <templates>
    91               <Template link=spaceshipzombie />
    92       </templates>
    93     </SpaceShip>
    94 
     83    <SpaceShip position="400,20,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     84      <templates>
     85              <Template link=spaceshipzombie />
     86      </templates>
     87      <sleep seconds="10"/>
     88    </SpaceShip>
     89
     90    <SpaceShip position="400,200,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     91      <templates>
     92              <Template link=spaceshipzombie />
     93      </templates>
     94      <sleep seconds="10"/>
     95    </SpaceShip>
     96
     97    <SpaceShip position="400,800,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     98      <templates>
     99              <Template link=spaceshipzombie />
     100      </templates>
     101      <sleep seconds="10"/>
     102    </SpaceShip>
     103
     104    <SpaceShip position="400,1000,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     105      <templates>
     106              <Template link=spaceshipzombie />
     107      </templates>
     108      <sleep seconds="10"/>
     109    </SpaceShip>
     110
     111    <SpaceShip position="400,1200,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     112      <templates>
     113              <Template link=spaceshipzombie />
     114      </templates>
     115      <sleep seconds="10"/>
     116    </SpaceShip>
     117   
     118
     119    <SpaceShip position="300,3000,400" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     120      <templates>
     121              <Template link=spaceshipzombie />
     122      </templates>
     123    </SpaceShip>
     124
     125    <SpaceShip position="300,4000,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     126      <templates>
     127              <Template link=spaceshipzombie />
     128      </templates>
     129      <sleep seconds="10"/>
     130    </SpaceShip>
     131
     132    <SpaceShip position="300,4000,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     133      <templates>
     134              <Template link=spaceshipzombie />
     135      </templates>
     136      <sleep seconds="10"/>
     137    </SpaceShip>
     138
     139    <SpaceShip position="300,5000,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     140      <templates>
     141              <Template link=spaceshipzombie />
     142      </templates>
     143      <sleep seconds="10"/>
     144    </SpaceShip>
     145
     146    <SpaceShip position="300,6000,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     147      <templates>
     148              <Template link=spaceshipzombie />
     149      </templates>
     150      <sleep seconds="10"/>
     151    </SpaceShip>
     152
     153    <SpaceShip position="300,6050,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     154      <templates>
     155              <Template link=spaceshipzombie />
     156      </templates>
     157      <sleep seconds="10"/>
     158    </SpaceShip>
     159
     160    <SpaceShip position="300,6100,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     161      <templates>
     162              <Template link=spaceshipzombie />
     163      </templates>
     164      <sleep seconds="10"/>
     165    </SpaceShip>
     166
     167    <SpaceShip position="300,6200,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     168      <templates>
     169              <Template link=spaceshipzombie />
     170      </templates>
     171      <sleep seconds="10"/>
     172    </SpaceShip>
     173
     174    <SpaceShip position="300,6300,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     175      <templates>
     176              <Template link=spaceshipzombie />
     177      </templates>
     178      <sleep seconds="10"/>
     179    </SpaceShip>
     180
     181    <SpaceShip position="300,6400,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     182      <templates>
     183              <Template link=spaceshipzombie />
     184      </templates>
     185      <sleep seconds="10"/>
     186    </SpaceShip>
     187
     188    <SpaceShip position="300,10000,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     189      <templates>
     190              <Template link=spaceshipzombie />
     191      </templates>
     192      <sleep seconds="10"/>
     193    </SpaceShip>
     194    <SpaceShip position="300,10000,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     195      <templates>
     196              <Template link=spaceshipzombie />
     197      </templates>
     198      <sleep seconds="10"/>
     199    </SpaceShip>
     200    <SpaceShip position="300,10000,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     201      <templates>
     202              <Template link=spaceshipzombie />
     203      </templates>
     204      <sleep seconds="10"/>
     205    </SpaceShip>
     206    <SpaceShip position="300,10000,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     207      <templates>
     208              <Template link=spaceshipzombie />
     209      </templates>
     210      <sleep seconds="10"/>
     211    </SpaceShip>
     212    <SpaceShip position="300,10000,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     213      <templates>
     214              <Template link=spaceshipzombie />
     215      </templates>
     216      <sleep seconds="10"/>
     217    </SpaceShip>
     218    <SpaceShip position="300,10000,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     219      <templates>
     220              <Template link=spaceshipzombie />
     221      </templates>
     222      <sleep seconds="10"/>
     223    </SpaceShip>
     224    <SpaceShip position="300,10000,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     225      <templates>
     226              <Template link=spaceshipzombie />
     227      </templates>
     228      <sleep seconds="10"/>
     229    </SpaceShip>
     230    <SpaceShip position="300,10000,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     231      <templates>
     232              <Template link=spaceshipzombie />
     233      </templates>
     234      <sleep seconds="10"/>
     235    </SpaceShip>
     236
     237    <SpaceShip position="400,30000,400" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     238      <templates>
     239              <Template link=spaceshipzombie />
     240      </templates>
     241      <sleep seconds="10"/>
     242    </SpaceShip>
     243
     244    <SpaceShip position="400,40000,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     245      <templates>
     246              <Template link=spaceshipzombie />
     247      </templates>
     248      <sleep seconds="10"/>
     249    </SpaceShip>
     250
     251    <SpaceShip position="300,50000,400" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     252      <templates>
     253              <Template link=spaceshipzombie />
     254      </templates>
     255      <sleep seconds="10"/>
     256    </SpaceShip>
     257
     258    <SpaceShip position="300,60000,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     259      <templates>
     260              <Template link=spaceshipzombie />
     261      </templates>
     262      <sleep seconds="10"/>
     263    </SpaceShip>
     264
     265    <SpaceShip position="400,70000,400" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     266      <templates>
     267              <Template link=spaceshipzombie />
     268      </templates>
     269      <sleep seconds="10"/>
     270    </SpaceShip>
     271
     272    <SpaceShip position="200,80000,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     273      <templates>
     274              <Template link=spaceshipzombie />
     275      </templates>
     276      <sleep seconds="10"/>
     277    </SpaceShip>
     278
     279    <SpaceShip position="300,90000,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     280      <templates>
     281              <Template link=spaceshipzombie />
     282      </templates>
     283      <sleep seconds="10"/>
     284    </SpaceShip>
     285
     286    <SpaceShip position="400,90000,400" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     287      <templates>
     288              <Template link=spaceshipzombie />
     289      </templates>
     290      <sleep seconds="10"/>
     291    </SpaceShip>
     292
     293    <SpaceShip position="400,90000,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     294      <templates>
     295              <Template link=spaceshipzombie />
     296      </templates>
     297      <sleep seconds="10"/>
     298    </SpaceShip>
     299
     300    <SpaceShip position="300,90000,400" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     301      <templates>
     302              <Template link=spaceshipzombie />
     303      </templates>
     304      <sleep seconds="10"/>
     305    </SpaceShip>
     306
     307    <SpaceShip position="300,90000,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     308      <templates>
     309              <Template link=spaceshipzombie />
     310      </templates>
     311      <sleep seconds="10"/>
     312    </SpaceShip>
     313
     314    <SpaceShip position="400,90000,400" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     315      <templates>
     316              <Template link=spaceshipzombie />
     317      </templates>
     318      <sleep seconds="10"/>
     319    </SpaceShip>
     320
     321    <SpaceShip position="400,90000,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     322      <templates>
     323              <Template link=spaceshipzombie />
     324      </templates>
     325      <sleep seconds="10"/>
     326    </SpaceShip>
     327
     328    <SpaceShip position="300,90000,400" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     329      <templates>
     330              <Template link=spaceshipzombie />
     331      </templates>
     332      <sleep seconds="10"/>
     333    </SpaceShip>
     334
     335    <SpaceShip position="300,90000,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     336      <templates>
     337              <Template link=spaceshipzombie />
     338      </templates>
     339      <sleep seconds="10"/>
     340    </SpaceShip>
     341
     342    <SpaceShip position="400,90000,400" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     343      <templates>
     344              <Template link=spaceshipzombie />
     345      </templates>
     346      <sleep seconds="10"/>
     347    </SpaceShip>
     348
     349    <SpaceShip position="400,90000,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     350      <templates>
     351              <Template link=spaceshipzombie />
     352      </templates>
     353      <sleep seconds="10"/>
     354    </SpaceShip>
     355
     356    <SpaceShip position="300,90000,400" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     357      <templates>
     358              <Template link=spaceshipzombie />
     359      </templates>
     360      <sleep seconds="10"/>
     361    </SpaceShip>
     362
     363    <SpaceShip position="300,90000,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     364      <templates>
     365              <Template link=spaceshipzombie />
     366      </templates>
     367      <sleep seconds="10"/>
     368    </SpaceShip>
     369
     370    <SpaceShip position="400,90000,400" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     371      <templates>
     372              <Template link=spaceshipzombie />
     373      </templates>
     374      <sleep seconds="10"/>
     375    </SpaceShip>
     376
     377    <SpaceShip position="400,90000,300" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     378      <templates>
     379              <Template link=spaceshipzombie />
     380      </templates>
     381      <sleep seconds="10"/>
     382    </SpaceShip>
     383
     384    <SpaceShip position="300,90000,400" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="60" >
     385      <templates>
     386              <Template link=spaceshipzombie />
     387      </templates>
     388      <sleep seconds="10"/>
     389    </SpaceShip>
    95390
    96391

  • code/branches/Boxhead_FS19/data/levels/templates/spaceshipzombie.oxt

    r12390 r12398  
    99   health            = 200
    1010   maxhealth         = 200
    11    initialhealth     = 100
     11   initialhealth     = 30
    1212
    1313   shieldhealth        = 25
    … …  
    3333
    3434   collisionType     = "dynamic"
    35    mass              = 100
     35   mass              = 1000
    3636   linearDamping     = 0
    3737   angularDamping    = 0

  • code/branches/Boxhead_FS19/src/modules/hover/Hover.cc

    r12397 r12398  
    5151
    5252
    53 
    5453namespace orxonox
    5554{
    … …  
    6564        this->setHUDTemplate("HoverHUD");
    6665    }
    67 
     66    // void Hover::spawnZombie(std::string id)
     67    // {
     68    //     Identifier *identifier = ClassByString("SpaceShip");
     69
     70    //       if(!identifier)
     71    //     {
     72    //         orxout(user_error) << "Script tried to spawn unknown object" << std::endl;
     73    //         return;
     74    //     }
     75
     76    //     if(!identifier->isLoadable())
     77    //     {
     78    //         orxout(user_error) << "Script tried to spawn unloadable object" << std::endl;
     79    //         return;
     80    //     }
     81       
     82   
     83    //     WorldEntity *entity;
     84    //     Identifiable *obj = identifier->fabricate(this->controller_->getWorldEntityByID("Player")->getContext());
     85
     86
     87
     88    //     orxout(user_status) << "First hit!" << std::endl;
     89
     90    //    if(obj->isA(ClassIdentifier<WorldEntity>::getIdentifier()))
     91    //     {
     92    //         orxout(user_status) << "Is WorldEntity!" << std::endl;
     93    //         entity = orxonox_cast<WorldEntity*>(obj);
     94    //     }
     95    //     else if(obj->isA(ClassIdentifier<PlayerInfo>::getIdentifier()))
     96    //     {
     97    //         // TODO This does not work yet because somehow the controllable entity is not set
     98    //         // yet at this stage.
     99    // //        entity = orxonox_cast<PlayerInfo*>(obj)->getControllableEntity();
     100
     101    //         orxout(user_status) << "Is PlayerInfo!" << std::endl;
     102
     103    //         //use TEMPLATES in the map to define objects that are not present on the map yet
     104    //         return;
     105    //     }
     106    //     else
     107    //     {
     108    //         orxout(user_warning) << "Script tried to spawn an object that is neither a WorldEntity, nor a PlayerInfo" << std::endl;
     109           
     110    //         return;
     111    //     }
     112       
     113    //     if(entity->isA(ClassIdentifier<MobileEntity>::getIdentifier())) {
     114    //         orxout(user_status) << "Is MobileEntity!" << std::endl;
     115    //         this->controller_->registerMobileEntity(id, orxonox_cast<MobileEntity*>(entity));
     116    //     }
     117
     118       
     119
     120    //     if(entity->isA(ClassIdentifier<Pawn>::getIdentifier())) {
     121    //         orxout(user_status) << "Is Pawn!" << std::endl;
     122    //         this->controller_->registerPawn(id, orxonox_cast<Pawn*>(entity));
     123    //     }
     124       
     125    //     this->controller_->registerWorldEntity(id, orxonox_cast<WorldEntity*>(entity));
     126
     127
     128    //     ///////////////GOLD!!!!!!!!!!!!!!!////////////////////////
     129    //     Pawn* pawn = this->controller_->getPawnByID(id);
     130
     131    //     //Attach to pawn
     132    //     SpaceShip* drone = new SpaceShip(pawn->getContext()); // this is neccessary because the projectiles fired need a valid creator for the particlespawner (when colliding against something)
     133       
     134    //     drone->addTemplate("spaceshipzombie"); //ScriptableControllerDroneTemplate spaceshipescort
     135
     136    //     Vector3 spawnPosition = pawn->getWorldPosition() + Vector3(500,20,500);
     137    //     drone->setPosition(spawnPosition);
     138    // }
    68139
    69140    void Hover::tick(float dt)
    … …  
    132203
    133204        //Spawn Zombies
    134         //spawnZombie(1);
     205        //spawnZombie(z1);
    135206
    136207

  • code/branches/Boxhead_FS19/src/modules/hover/Hover.h

    r12390 r12398  
    6262                { return this->numberOfFlags_; }
    6363
    64              void spawnZombie(std::string id);
    65 
    66             /**
    67              * @brief Set the position of an object
    68              * @param id The ID of the object
    69              * @param x The position on the x-axis
    70              * @param y The position on the y-axis
    71              * @param z The position on the z-axis
    72              */
    7364
    7465        private:

  • code/branches/Boxhead_FS19/src/modules/hover/HoverShip.cc

    r12397 r12398  
    113113        if(otherObject->isA(Class(SpaceShip)))
    114114        {
    115             removeHealth(0.1);
     115            removeHealth(0.2);
    116116        }
    117117

  • code/branches/Boxhead_FS19/src/modules/hover/HoverWall.cc

    r12267 r12398  
    109109
    110110        cs_ = new BoxCollisionShape(this->getContext());
    111         cs_->setHalfExtents(Vector3(xSize_*1.0f, cellHeight*1.0f, zSize_*1.0f));
     111        cs_->setHalfExtents(Vector3(xSize_*1.0f, cellHeight*100000.0f, zSize_*1.0f));
    112112        cs_->setPosition(Vector3(xPos_*1.0f, 0.0f, zPos_*1.0f));
    113113

  • code/branches/Boxhead_FS19/src/orxonox/scriptablecontroller/scriptable_controller_api.cc

    r12390 r12398  
    7676    //    new Timer(timeout, false, callback, true);
    7777    //}
    78 
    79 
    80 
    81 
    82 
    83 
    84 
    8578
    8679    void ScriptableControllerAPI::registerAtNearObject(std::function<void (std::string, std::string)> callback, std::string id1, std::string id2, double distance)
    … …  
    565558
    566559
    567 
    568 
    569 
    570560    void ScriptableControllerAPI::moveControllableEntity(std::string id, double x, double y, double z)
    571561    {
Note: See TracChangeset for help on using the changeset viewer.