Skip to content

Commit

Permalink
Objects resolved
Browse files Browse the repository at this point in the history
  • Loading branch information
dpeter99 committed Jul 24, 2015
2 parents 114b1fd + f793b96 commit affd329
Show file tree
Hide file tree
Showing 89 changed files with 1,185 additions and 758 deletions.
2 changes: 1 addition & 1 deletion Assets/Ore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public Ore(OreType gettype, int xpos, int ypos)
public Ore(System.Random rnk, int xpos, int ypos)
: base(xpos, ypos)
{
this.type = (OreType)rnk.Next(1, 7);
this.type = (OreType)rnk.Next(1, 6);


}
Expand Down
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
Binary file removed Assets/Resources/Texturas/gold_ore.png
Binary file not shown.
55 changes: 0 additions & 55 deletions Assets/Resources/Texturas/gold_ore.png.meta

This file was deleted.

4 changes: 2 additions & 2 deletions Assets/TerrainGen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ public class TerrainGen{
StreamWriter wf = new StreamWriter(file);

int gen = 50;
float[,] h2 = new float[,] { {0.3f, 15f}, {0.25f,20f}, {0.2f,22f}, {0.15f,25f}, {0.1f,30f}, {0.07f,33f}, {0.03f,37f} };
System.Random rand = new System.Random(seed);
float[,] h2 = new float[,] { {3f, 15f}, {2f,20f}, {1f,22f}, {0.2f,30f}, {0.1f,40f}, {0.001f,45}};
System.Random rand = new System.Random(5000);

Tile[,] map = new Tile[50, 50];
Tile initial;
Expand Down
17 changes: 17 additions & 0 deletions Assets/scripts/Assembler.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

namespace civmain
{
public class Assembler:Producer
{
public int speed;

public void Production()
{
throw new System.NotImplementedException();
}
}
}
12 changes: 12 additions & 0 deletions Assets/scripts/Assembler.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions Assets/scripts/Building.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

namespace civmain
{
public abstract class Building
{
public void Usage()
{
throw new System.NotImplementedException();
}
}
}
12 changes: 12 additions & 0 deletions Assets/scripts/Building.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions Assets/scripts/Class1.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using System.Collections.Generic;


namespace civmain
{
public class MainBuilding
{

public int Inventory;
}
}
12 changes: 12 additions & 0 deletions Assets/scripts/Class1.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions Assets/scripts/Food.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

namespace civmain
{
public class Food:Item
{
}
}
12 changes: 12 additions & 0 deletions Assets/scripts/Food.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions Assets/scripts/Furnace.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

namespace civmain
{
public class Furnace:Producer
{
public int speed;

public void Production()
{
throw new System.NotImplementedException();
}
}
}
12 changes: 12 additions & 0 deletions Assets/scripts/Furnace.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 26 additions & 0 deletions Assets/scripts/Generato.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

namespace civmain
{
public class Generator:Building
{

public MainBuilding main;
public int a;

public void Gen()
{}


public void Transfer()
{
if (this.a > 1)
{
main.Inventory =+ this.a;
}
}
}
}
12 changes: 12 additions & 0 deletions Assets/scripts/Generato.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions Assets/scripts/GlassPLane.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

namespace civmain
{
public class GlassPlane:Item
{
}
}
12 changes: 12 additions & 0 deletions Assets/scripts/GlassPLane.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/scripts/IInventory.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

namespace civmain
{
}
12 changes: 12 additions & 0 deletions Assets/scripts/IInventory.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions Assets/scripts/InteriorPlate.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

namespace civmain
{
public class InteriorPlate:Item
{
}
}
12 changes: 12 additions & 0 deletions Assets/scripts/InteriorPlate.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions Assets/scripts/Iron.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

namespace civmain
{
public class Iron:Ore
{
}
}
12 changes: 12 additions & 0 deletions Assets/scripts/Iron.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions Assets/scripts/IronIngot.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

namespace civmain
{
public class IronIngot:Item
{
}
}
12 changes: 12 additions & 0 deletions Assets/scripts/IronIngot.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions Assets/scripts/IronPipe.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

namespace civmain
{
public class IronPipe:Item
{
}
}
Loading

0 comments on commit affd329

Please sign in to comment.