Skip to content

Commit

Permalink
Stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
@mp1011
mp1011 committed Sep 27, 2015
1 parent e542eab commit 3f2d81b
Show file tree
Hide file tree
Showing 106 changed files with 2,398 additions and 990 deletions.
19 changes: 19 additions & 0 deletions Data/Info/Graphics.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Name,Texture,FrameDuration,Frames
RockBlockBreak,woods_specialtiles,,7
RockBlockFragment,woods_specialtiles, ,8
RockBlock,woods_specialtiles, ,6
IceBlockBreak,woods_specialtiles, ,4
MetalBlockShine,metalblock,4,0 1 2 3 4 4 4 4 4
RubberBlockBounce,woods_specialtiles,2,29 30
VRBackground1,vrbackground1,2,0 1 2 3 4 5
VRBackground2,vrbackground2,2,0 1 2 3 4
VRBackground3,vrbackground3,2,0 1 2 3 4
HealthGuage,items,,7 8
LivesCounter,items,8,4 4 4 4 4 4 4 4 4 4 4 4 5 6 5
GemsCounter,items,4,0 1 2 3
IronKnightHelmet,ironknight,,28
RedStealthHelmet,redstealth,,0
VanishingBlock,woods_specialtiles,2,12 18
MushroomGrow,woods_specialtiles,8,11 10 9.
MushroomShrink,woods_specialtiles,8,9 10 11.
Mushroom,woods_specialtiles,8,9
20 changes: 20 additions & 0 deletions Data/Info/Graphics.csv.over
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Name,Texture,FrameDuration,Frames,Direction,Speed,Behaviors
RockBlockBreak,woods_specialtiles,,7,,,
RockBlockFragment,woods_specialtiles, ,8,,,
RockBlock,woods_specialtiles, ,6,,,
IceBlockBreak,woods_specialtiles, ,4,,,
IceFragment,woods_specialtiles,0,5,Down,4,DestroyWhenOutOfFrame;BlockBreaker;DestroyOnCollision;
MetalBlockShine,metalblock,4,0 1 2 3 4 4 4 4 4,,,
RubberBlockBounce,woods_specialtiles,2,29 30,,,
VRBackground1,vrbackground1,2,0 1 2 3 4 5,,,
VRBackground2,vrbackground2,2,0 1 2 3 4,,,
VRBackground3,vrbackground3,2,0 1 2 3 4,,,
HealthGuage,items,,7 8,,,
LivesCounter,items,8,4 4 4 4 4 4 4 4 4 4 4 4 5 6 5,,,
GemsCounter,items,4,0 1 2 3,,,
IronKnightHelmet,ironknight,,28,,,
RedStealthHelmet,redstealth,,0,,,
VanishingBlock,woods_specialtiles,2,12 18,,,
MushroomGrow,woods_specialtiles,8,11 10 9.,,,
MushroomShrink,woods_specialtiles,8,9 10 11.,,,
Mushroom,woods_specialtiles,8,9,,,
2 changes: 2 additions & 0 deletions Data/Info/Objects.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Name,Texture,FrameDuration,Frames,Direction,Speed,Behaviors
IceFragment,woods_specialtiles,0,5,Down,4,DestroyWhenOutOfFrame;BlockBreaker;DestroyOnCollision;
3 changes: 3 additions & 0 deletions Data/Info/Transformations.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
HelmetType,PlayerType,TransformSound,WalkSpeed,WalkAccel,RunSpeed,RunAccel,StopAccel,AirDecel,TurnAccel,AirTurnAccel,CrawlSpeed,CrawlAccel,CrawlDecel,UpHillSpeedMod,DownhillSpeedMod,JumpSpeed,RunJumpSpeedMod,LongJumpDuration,ShortJumpDuration,IceMod,SideBounceDecel,SideBounceSpeed,VerticalBounceStrength
None,JamesKid,None,2.2,0.1,3,0.1,0.1,0.01,0.2,0.5,0.1,0.1,0.1,-1.3,0.1,4.2,0.1,12,6,0.3,0.15,2,7
IronKnightHelmet,IronKnight,IronKnightTransform,2.2,0.1,3,0.1,0.1,0.01,0.2,0.5,0.1,0.1,0.1,-1.3,0.1,4.2,0.1,12,6,0.3,0.15,2,7
3 changes: 3 additions & 0 deletions Data/Info/Transformations.csv.over
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
HelmetType,PlayerType,TransformSound,WalkSpeed,WalkAccel,RunSpeed,RunAccel,StopAccel,AirDecel,TurnAccel,AirTurnAccel,CrawlSpeed,CrawlAccel,CrawlDecel,UpHillSpeedMod,DownhillSpeedMod,JumpSpeed,RunJumpSpeedMod,LongJumpDuration,ShortJumpDuration,IceMod,SideBounceDecel,SideBounceSpeed,VerticalBounceStrength
None,JamesKid,None,2.2,0.1,3,0.1,0.1,0.01,0.2,0.5,0.1,0.1,0.1,-1.3,0.1,4.2,0.1,12,6,0.3,0.15,2,7
IronKnightHelmet,IronKnight,IronKnightTransform,2.2,0.1,3,0.1,0.1,0.01,0.2,0.5,0.1,0.1,0.1,-1.3,0.1,4.2,0.1,12,6,0.3,0.15,2,7
2 changes: 1 addition & 1 deletion Data/Maps/woods.map
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Data/SpriteSheets/woods_specialtiles.sprite
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"Frames":[{"Source":{"X":0,"Y":0,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":16,"Y":0,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":32,"Y":0,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":48,"Y":0,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":64,"Y":0,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":80,"Y":0,"Width":16,"Height":16},"HitBox":{"X":6,"Y":3,"Width":4,"Height":9},"Origin":{"X":8,"Y":7},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":96,"Y":0,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":112,"Y":0,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":128,"Y":0,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":144,"Y":0,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":160,"Y":0,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":176,"Y":0,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":192,"Y":0,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":208,"Y":0,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":224,"Y":0,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":240,"Y":0,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":256,"Y":0,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":272,"Y":0,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":288,"Y":0,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":0,"Y":16,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":16,"Y":16,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":32,"Y":16,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":48,"Y":16,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":64,"Y":16,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":80,"Y":16,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":96,"Y":16,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":112,"Y":16,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":128,"Y":16,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":144,"Y":16,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":160,"Y":16,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}},{"Source":{"X":176,"Y":16,"Width":16,"Height":16},"HitBox":{"X":0,"Y":0,"Width":0,"Height":0},"Origin":{"X":0,"Y":0},"SecondaryHitbox":{"X":0,"Y":0,"Width":0,"Height":0}}],"Image":{"Type":2,"Name":"SpriteSheets_woods_specialtiles"}}
5 changes: 0 additions & 5 deletions Data/Stats/Bounce.txt
View file

This file was deleted.

19 changes: 0 additions & 19 deletions Data/Stats/IronKnight_stats.txt
View file

This file was deleted.

19 changes: 0 additions & 19 deletions Data/Stats/JamesKid_stats.txt
View file

This file was deleted.

18 changes: 0 additions & 18 deletions Data/Stats/base.txt
View file

This file was deleted.

1 change: 0 additions & 1 deletion Data/Stats/test.txt
View file

This file was deleted.

Binary file removed Data/Textures/SpriteSheets_rockblock.png
View file
Binary file not shown.
Binary file removed Data/Textures/SpriteSheets_rubberblock.png
View file
Binary file not shown.
Binary file added Data/Textures/SpriteSheets_woods_specialtiles.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Data/Textures/scorefont.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Data/Textures/woods.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Data/Textures/woodtemp.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Data/Tilesets/woods.tileset
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Data/Tilesets/woodtemp.tileset
View file

Large diffs are not rendered by default.

81 changes: 81 additions & 0 deletions Editor/Forms/GraphicsExtractor.Designer.cs
View file

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

25 changes: 25 additions & 0 deletions Editor/Forms/GraphicsExtractor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -652,6 +652,31 @@ private void rdoSetOrigin_CheckedChanged(object sender, EventArgs e)
{
this.ResetOverlay();
}

#region Grid Collapse
private void btnCollapseGrid_Click(object sender, EventArgs e)
{
var diff = (int)gridCollapseActual.Value - (int)gridCollapseDesired.Value;

var tiles = this.CurrentImage.ExtractGrid((int)gridCollapseActual.Value).ToArray();
foreach(var tile in tiles)
tile.Crop(RGRectangleI.FromXYWH(tile.Region.X, tile.Region.Y, tile.Region.Width - diff, tile.Region.Height - diff));

TilesetEditor.GetOrOpen().AddNewTiles(tiles);

}

#endregion

private void button1_Click(object sender, EventArgs e)
{
var tiles = this.CurrentImage.ExtractGrid(16);
var sel = new ImageSelector(this);
sel.AddImages(tiles);
sel.Show();

}

}
}

6 changes: 6 additions & 0 deletions Editor/Forms/ImageSelector.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -668,6 +668,12 @@ public BitmapPortion CloneImage(BitmapPortion original)
this.CurrentImage = original;
return clone;
}

public void AddImages(IEnumerable<BitmapPortion> images)
{
foreach (var image in images)
AddImagePanel(image);
}


#region Extra Images
Expand Down
3 changes: 2 additions & 1 deletion Editor/Forms/TilesetEditor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,8 @@ private void matchDirectionPicker_DirectionChanged(DirectionSelector sender, Eve

private void RefreshMatches(TileDef tile)
{

if (mMatchesMap == null)
return;

//do this better later
RGPointI cursor = RGPointI.Empty;
Expand Down
12 changes: 12 additions & 0 deletions Editor/Image/BitmapPortion.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,18 @@ public IEnumerable<BitmapPortion> ExtractGrid(RGPointI origin, int gridSize)
yield return Extract(RGRectangleI.FromXYWH(x, y, gridSize, gridSize));
}

public IEnumerable<BitmapPortion> ExtractGrid(int gridSize)
{
int oX = this.Region.X;
int oY = this.Region.Y;
while (oX >= gridSize) oX -= gridSize;
while (oY >= gridSize) oY -= gridSize;

for (int y = oY; y <= this.Region.Bottom - gridSize; y += gridSize)
for (int x = oX; x <= this.Region.Right - gridSize; x += gridSize)
yield return Extract(RGRectangleI.FromXYWH(x, y, gridSize, gridSize));
}

#endregion

#region Flood Fill
Expand Down
2 changes: 1 addition & 1 deletion Engine/Behavior/BehaviorPresets.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public static Sprite Create(Sprite origin, Animation graphic)
var debris = new Sprite(origin.Context, origin.DrawLayer, ObjectType.Thing);
debris.SetSingleAnimation(graphic);
debris.Location = origin.Location;
new DestroyWhenOutOfFrame<Sprite>(debris, false);
new DestroyWhenOutOfFrame(debris);

var gravity = new GravityController(debris);
gravity.CurrentYSpeed = -5f;
Expand Down
Loading

0 comments on commit 3f2d81b

Please sign in to comment.