Changeset 5433


Ignore:
Timestamp:
2014-07-04 11:58:54 (7 years ago)
Author:
mijoilmo
Message:
 
Location:
2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Hud.cs

    r5395 r5433  
    2121        radar = new Radar(parent); 
    2222        radar.Bottom = this.Bottom + 20 / parent.Camera.ZoomFactor; 
     23        radar.Right = this.Right - 20 / parent.Camera.ZoomFactor; 
    2324        Add(radar); 
    2425    } 

  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor.cs

    r5427 r5433  
    5050        images["player"] = LoadImage("graphics/ships/player"); 
    5151        images["galaxy_map"] = LoadImage("graphics/HUD/galaxy_map"); 
    52         imageLists["planet_map"] = LoadImages("graphics/HUD/RadarPlaneetta1.0","graphics/HUD/RadarPlaneetta1.1","graphics/HUD/RadarPlaneetta1.2"); 
     52        imageLists["planet_map"] = LoadImages("graphics/HUD/RadarPlaneetta1.0", "graphics/HUD/RadarPlaneetta1.1"); 
    5353 
    5454        //kaikki tilet 
    … …  
    254254        this.levels["space"] = new ProtoLevel(this, "!space", false, "space_background"); 
    255255        this.levels["planet2"] = new ProtoLevel(this, "planet2", true, "planet1_background"); 
     256        this.levels["planet1"] = new ProtoLevel(this, "planet1", true, "planet1_background"); 
    256257    } 
    257258    public override void Begin() 

  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Radar.cs

    r5427 r5433  
    1313    Proto236b parent; 
    1414    public Radar(Proto236b parent) 
    15         : base(200 / parent.Camera.ZoomFactor, 200 / parent.Camera.ZoomFactor) 
     15        : base(300 / parent.Camera.ZoomFactor, 300 / parent.Camera.ZoomFactor) 
    1616    { 
    1717        this.parent = parent; 
    … …  
    2222        { 
    2323            //planet radar 
    24             this.mapObject = new GameObject(100 / parent.Camera.ZoomFactor, 100 / parent.Camera.ZoomFactor); 
     24            this.mapObject = new GameObject(200 / parent.Camera.ZoomFactor, 200 / parent.Camera.ZoomFactor); 
    2525            mapObject.Shape = Shape.Circle; 
    2626            mapObject.Animation = new Animation(parent.ImageLists["planet_map"]); 
    … …  
    3232        { 
    3333            //space radar 
    34             this.mapObject = new GameObject(160 / parent.Camera.ZoomFactor, 160 / parent.Camera.ZoomFactor); 
     34            this.mapObject = new GameObject(200 / parent.Camera.ZoomFactor, 200 / parent.Camera.ZoomFactor); 
    3535            mapObject.Image = parent.Images["galaxy_map"]; 
    3636            Add(mapObject); 
    3737        } 
    38         this.shipObject = new GameObject(15 / parent.Camera.ZoomFactor, 15 / parent.Camera.ZoomFactor); 
     38        this.shipObject = new GameObject(25 / parent.Camera.ZoomFactor, 25 / parent.Camera.ZoomFactor); 
    3939        shipObject.Image = parent.Images["HUD_ship"]; 
    4040        Add(shipObject); 
    … …  
    4646            //laske pelaajan positio planeettamapissa 
    4747            //jos haluaa joku selityksen näille kahdelle niin selitän mielelläni T:Mikko 
    48             double length = ((parent.Player.Y - (parent.Level.Top - 150 * 40)) / parent.Level.Width) * 73 + 50; 
     48            double length = ((parent.Player.Y - (parent.Level.Top - 150 * 40)) / parent.Level.Width) * 60 / parent.Camera.ZoomFactor + 90 / parent.Camera.ZoomFactor; 
    4949            Angle shipAngle = Angle.FromRadians((Math.PI * 2) * ((parent.Player.X + parent.Level.Width / 2) / parent.Level.Width)); 
    5050            this.shipObject.Position = Vector.FromLengthAndAngle(length, shipAngle); 

  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/obj/x86/Debug/ContentPipeline-{5156C658-EF8C-4216-BA6D-9928D133FE72}.xml

    r5427 r5433  
    234234      <Options>None</Options> 
    235235      <Output>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\tiles\tilepuu.xnb</Output> 
    236       <Time>2014-07-03T13:40:04.9005559+03:00</Time> 
     236      <Time>2014-07-04T11:45:07.4619039+03:00</Time> 
    237237    </Item> 
    238238    <Item> 
    … …  
    415415      <Options>None</Options> 
    416416      <Output>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\HUD\RadarPlaneetta1.0.xnb</Output> 
    417       <Time>2014-07-04T10:33:09.0577297+03:00</Time> 
     417      <Time>2014-07-04T11:51:24.8140504+03:00</Time> 
    418418    </Item> 
    419419    <Item> 
    … …  
    424424      <Options>None</Options> 
    425425      <Output>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\HUD\RadarPlaneetta1.1.xnb</Output> 
    426       <Time>2014-07-04T10:33:09.0577297+03:00</Time> 
     426      <Time>2014-07-04T11:51:42.4973705+03:00</Time> 
    427427    </Item> 
    428428    <Item> 
    … …  
    433433      <Options>None</Options> 
    434434      <Output>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\HUD\RadarPlaneetta1.2.xnb</Output> 
    435       <Time>2014-07-04T10:33:09.0577297+03:00</Time> 
     435      <Time>2014-07-04T11:45:07.4463038+03:00</Time> 
    436436    </Item> 
    437437    <Item> 
Note: See TracChangeset for help on using the changeset viewer.