Skip to content

Commit

Permalink
fix stone step graphics, change "Grey" spelling to "Gray" as it is in…
Browse files Browse the repository at this point in the history
… in game, and add "aka: Aqua Wool" to Light Blue Wool to create the connection
  • Loading branch information
codewarrior0 committed Oct 30, 2011
1 parent e3f9077 commit 58514cc
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 7 deletions.
14 changes: 14 additions & 0 deletions classic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -242,12 +242,26 @@ blocks:
aka: Step
mapcolor: [200, 200, 200]
tex: [5, 0]
tex_direction:
TOP: [6, 0]
BOTTOM: [6, 0]
FORWARD: [5, 0]
BACKWARD: [5, 0]
SIDES: [5, 0]


- id: 44
name: Stone Slab
aka: Single Half Step
mapcolor: [200, 200, 200]
tex: [6, 0]
tex_direction:
TOP: [6, 0]
BOTTOM: [6, 0]
FORWARD: [5, 0]
BACKWARD: [5, 0]
SIDES: [5, 0]


- id: 45
name: Brick
Expand Down
4 changes: 2 additions & 2 deletions materials.py
Original file line number Diff line number Diff line change
Expand Up @@ -697,8 +697,8 @@ def defineShroomFaces(Shroom, id, name):
pocketMaterials.BlueWool = pocketMaterials[105,0]
pocketMaterials.PurpleWool = pocketMaterials[106,0]
pocketMaterials.CyanWool = pocketMaterials[107,0]
pocketMaterials.LightGreyWool = pocketMaterials[108,0]
pocketMaterials.GreyWool = pocketMaterials[109,0]
pocketMaterials.LightGrayWool = pocketMaterials[108,0]
pocketMaterials.GrayWool = pocketMaterials[109,0]
pocketMaterials.PinkWool = pocketMaterials[110,0]
pocketMaterials.LimeWool = pocketMaterials[111,0]
pocketMaterials.YellowWool = pocketMaterials[112,0]
Expand Down
18 changes: 15 additions & 3 deletions minecraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -659,12 +659,10 @@ blocks:
7:
tex: [2, 7]
name: Gray Wool
aka: Grey Wool
mapcolor: [66, 66, 66]
8:
tex: [1, 14]
name: Light Gray Wool
aka: Light Grey Wool
mapcolor: [166, 166, 166]
9:
tex: [1, 13]
Expand Down Expand Up @@ -745,7 +743,14 @@ blocks:
name: Double Slab
aka: Step
mapcolor: [200, 200, 200]
tex: [5, 0]
tex: [6, 0]
tex_direction:
TOP: [6, 0]
BOTTOM: [6, 0]
FORWARD: [5, 0]
BACKWARD: [5, 0]
SIDES: [5, 0]

data:
0:
tex: [5, 0]
Expand All @@ -772,6 +777,13 @@ blocks:
aka: Half Step
mapcolor: [200, 200, 200]
tex: [6, 0]
tex_direction:
TOP: [6, 0]
BOTTOM: [6, 0]
FORWARD: [5, 0]
BACKWARD: [5, 0]
SIDES: [5, 0]

data:
0:
tex: [6, 0]
Expand Down
19 changes: 17 additions & 2 deletions pocket.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,13 @@ blocks:
aka: Step
mapcolor: [200, 200, 200]
tex: [5, 0]
tex_direction:
TOP: [6, 0]
BOTTOM: [6, 0]
FORWARD: [5, 0]
BACKWARD: [5, 0]
SIDES: [5, 0]

# data:
# 0:
# tex: [5, 0]
Expand All @@ -431,6 +438,13 @@ blocks:
aka: Half Step
mapcolor: [200, 200, 200]
tex: [6, 0]
tex_direction:
TOP: [6, 0]
BOTTOM: [6, 0]
FORWARD: [5, 0]
BACKWARD: [5, 0]
SIDES: [5, 0]

type: HALFHEIGHT
# data:
# 0:
Expand Down Expand Up @@ -833,13 +847,13 @@ blocks:

- id: 108
tex: [1, 14]
name: Light Grey Wool
name: Light Gray Wool
aka: White Wool
mapcolor: [166, 166, 166]

- id: 109
tex: [2, 7]
name: Grey Wool
name: Gray Wool
mapcolor: [66, 66, 66]

- id: 110
Expand All @@ -860,6 +874,7 @@ blocks:
- id: 113
tex: [2, 11]
name: Light Blue Wool
aka: Aqua Wool
mapcolor: [104, 139, 212]

- id: 114
Expand Down

0 comments on commit 58514cc

Please sign in to comment.