Skip to content

Commit

Permalink
Removed unused template, messing around with MPV template (probably j…
Browse files Browse the repository at this point in the history 
…ust needs redrawing)
  • Loading branch information
@audigex
audigex committed Apr 29, 2024
1 parent 70229da commit b7834f6
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 67 deletions.
38 changes: 6 additions & 32 deletions src/templates.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ template template_purchase_anim(x,y){


// VAGUELY SURVIVABLE FOR NOW
// Should be redrawn thoug
// Should be redrawn though, it's aligned but the units are a funny scale

template template_train28px_old_pacer(x,y){
//left_x, upper_y, width, height, offset_x, offset_y
Expand All @@ -179,20 +179,6 @@ template template_train28px_old_pacer(x,y){
// ANYTHING BELOW THIS SHOULD BE REPLACED ASAP
// ANYTHING BELOW THIS SHOULD BE REPLACED ASAP


// THIS VIEW IS 8 FROM 4, IT REPEATS THE SECOND SET FOR OFFSET PURPOSES
template template_train20px_4view(x,y){ // Clone to 8view when changed
//left_x, upper_y, width, height, offset_x, offset_y
[ x, y, 8, 18, -3, -11] // n
[ x+9, y, 15, 15, -8, -10] // ne
[ x+25, y, 20, 12, -4, -8] // e
[ x+46, y, 15, 15, 1, -7] // se
[ x, y, 8, 18, -3, -11] //s
[ x+9, y, 15, 15, -8, -9] //swr
[ x+25, y, 20, 12, -4, -8] //w
[ x+46, y, 15, 15, 1, -7] //nw
}

template template_trainBRMk2(x,y){
//left_x, upper_y, width, height, offset_x, offset_y
[ x, y, 8, 24, -3, -12, NOANIM|NOWHITE]
Expand All @@ -217,28 +203,16 @@ template template_450(x,y){
[ x+153, y, 22, 21, -3, -10]
}

// Only used by MPV
template template_train170pt(x,y){
//left_x, upper_y, width, height, offset_x, offset_y
[ x, y, 8, 26, -3, -9, NOANIM|NOWHITE]
[ x+9, y, 22, 21, -16, -12, NOANIM|NOWHITE]
[ x+32, y, 32, 12, -15, -7, NOANIM|NOWHITE]
[ x+65, y, 22, 21, -4, -11, NOANIM|NOWHITE]
[ x+88, y, 8, 26, -3, -11, NOANIM|NOWHITE]
[ x+97, y, 22, 21, -15, -12, NOANIM|NOWHITE]
[ x+120, y, 32, 12, -12, -7, NOANIM|NOWHITE]
[ x+153, y, 22, 21, -4, -11, NOANIM|NOWHITE]
}

// Now only used by MPV
template template_train170ptF(x,y){
//left_x, upper_y, width, height, offset_x, offset_y
[ x, y, 8, 26, -3, -9, NOANIM|NOWHITE]
[ x+9, y, 22, 21, -16, -12, NOANIM|NOWHITE]
[ x+32, y, 32, 12, -13, -7, NOANIM|NOWHITE]
[ x+65, y, 22, 21, -4, -11, NOANIM|NOWHITE]
[ x+32, y, 32, 12, -20, -7, NOANIM|NOWHITE]
[ x+65, y, 22, 21, -5, -11, NOANIM|NOWHITE]
[ x+88, y, 8, 26, -3, -11, NOANIM|NOWHITE]
[ x+97, y, 22, 21, -15, -12, NOANIM|NOWHITE]
[ x+120, y, 32, 12, -14, -7, NOANIM|NOWHITE]
[ x+97, y, 22, 21, -14, -12, NOANIM|NOWHITE]
[ x+120, y, 32, 12, -20, -7, NOANIM|NOWHITE]
[ x+153, y, 22, 21, -4, -11, NOANIM|NOWHITE]
}

Expand Down
70 changes: 35 additions & 35 deletions src/trains/dmu/BRMPV.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ spriteset(spriteset_DR98_9_NRWhite, "gfx/DR98_9.png") {
}

spriteset(spriteset_DR98_9_NRWhiteF, "gfx/DR98_9.png") {
template_train170ptF(176, 14)
template_train170pt(176, 14)
}

spriteset(spriteset_DR98_9_NRWhite_GOOD, "gfx/DR98_9_GOOD.png") {
template_train170pt(0, 14)
}

spriteset(spriteset_DR98_9_NRWhite_GOODF, "gfx/DR98_9_GOOD.png") {
template_train170ptF(176, 14)
template_train170pt(176, 14)
}

spriteset(spriteset_DR98_9_NRWhite_WOOD_empty, "gfx/DR98_9_WOOD.png") {
Expand All @@ -31,31 +31,31 @@ spriteset(spriteset_DR98_9_NRWhite_WOOD_full, "gfx/DR98_9_WOOD.png") {
}

spriteset(spriteset_DR98_9_NRWhite_WOOD_emptyF, "gfx/DR98_9_WOOD.png") {
template_train170ptF(176, 14)
template_train170pt(176, 14)
}

spriteset(spriteset_DR98_9_NRWhite_WOOD_halfF, "gfx/DR98_9_WOOD.png") {
template_train170ptF(528, 14)
template_train170pt(528, 14)
}

spriteset(spriteset_DR98_9_NRWhite_WOOD_fullF, "gfx/DR98_9_WOOD.png") {
template_train170ptF(880, 14)
template_train170pt(880, 14)
}

spriteset(spriteset_DR98_9_NRYellow, "gfx/DR98_9.png") {
template_train170pt(0, 41)
}

spriteset(spriteset_DR98_9_NRYellowF, "gfx/DR98_9.png") {
template_train170ptF(176, 41)
template_train170pt(176, 41)
}

spriteset(spriteset_DR98_9_NRYellow_GOOD, "gfx/DR98_9_GOOD.png") {
template_train170pt(0, 41)
}

spriteset(spriteset_DR98_9_NRYellow_GOODF, "gfx/DR98_9_GOOD.png") {
template_train170ptF(176, 41)
template_train170pt(176, 41)
}

spriteset(spriteset_DR98_9_NRYellow_WOOD_empty, "gfx/DR98_9_WOOD.png") {
Expand All @@ -71,31 +71,31 @@ spriteset(spriteset_DR98_9_NRYellow_WOOD_full, "gfx/DR98_9_WOOD.png") {
}

spriteset(spriteset_DR98_9_NRYellow_WOOD_emptyF, "gfx/DR98_9_WOOD.png") {
template_train170ptF(176, 41)
template_train170pt(176, 41)
}

spriteset(spriteset_DR98_9_NRYellow_WOOD_halfF, "gfx/DR98_9_WOOD.png") {
template_train170ptF(528, 41)
template_train170pt(528, 41)
}

spriteset(spriteset_DR98_9_NRYellow_WOOD_fullF, "gfx/DR98_9_WOOD.png") {
template_train170ptF(880, 41)
template_train170pt(880, 41)
}

spriteset(spriteset_DR98_9_NROrange, "gfx/DR98_9.png") {
template_train170pt(0, 68)
}

spriteset(spriteset_DR98_9_NROrangeF, "gfx/DR98_9.png") {
template_train170ptF(176, 68)
template_train170pt(176, 68)
}

spriteset(spriteset_DR98_9_NROrange_GOOD, "gfx/DR98_9_GOOD.png") {
template_train170pt(0, 68)
}

spriteset(spriteset_DR98_9_NROrange_GOODF, "gfx/DR98_9_GOOD.png") {
template_train170ptF(176, 68)
template_train170pt(176, 68)
}

spriteset(spriteset_DR98_9_NROrange_WOOD_empty, "gfx/DR98_9_WOOD.png") {
Expand All @@ -111,31 +111,31 @@ spriteset(spriteset_DR98_9_NROrange_WOOD_full, "gfx/DR98_9_WOOD.png") {
}

spriteset(spriteset_DR98_9_NROrange_WOOD_emptyF, "gfx/DR98_9_WOOD.png") {
template_train170ptF(176, 68)
template_train170pt(176, 68)
}

spriteset(spriteset_DR98_9_NROrange_WOOD_halfF, "gfx/DR98_9_WOOD.png") {
template_train170ptF(528, 68)
template_train170pt(528, 68)
}

spriteset(spriteset_DR98_9_NROrange_WOOD_fullF, "gfx/DR98_9_WOOD.png") {
template_train170ptF(880, 68)
template_train170pt(880, 68)
}

spriteset(spriteset_DR98_9_NRBlue, "gfx/DR98_9.png") {
template_train170pt(0, 95)
}

spriteset(spriteset_DR98_9_NRBlueF, "gfx/DR98_9.png") {
template_train170ptF(176, 95)
template_train170pt(176, 95)
}

spriteset(spriteset_DR98_9_NRBlue_GOOD, "gfx/DR98_9_GOOD.png") {
template_train170pt(0, 95)
}

spriteset(spriteset_DR98_9_NRBlue_GOODF, "gfx/DR98_9_GOOD.png") {
template_train170ptF(176, 95)
template_train170pt(176, 95)
}

spriteset(spriteset_DR98_9_NRBlue_WOOD_empty, "gfx/DR98_9_WOOD.png") {
Expand All @@ -151,31 +151,31 @@ spriteset(spriteset_DR98_9_NRBlue_WOOD_full, "gfx/DR98_9_WOOD.png") {
}

spriteset(spriteset_DR98_9_NRBlue_WOOD_emptyF, "gfx/DR98_9_WOOD.png") {
template_train170ptF(176, 95)
template_train170pt(176, 95)
}

spriteset(spriteset_DR98_9_NRBlue_WOOD_halfF, "gfx/DR98_9_WOOD.png") {
template_train170ptF(528, 95)
template_train170pt(528, 95)
}

spriteset(spriteset_DR98_9_NRBlue_WOOD_fullF, "gfx/DR98_9_WOOD.png") {
template_train170ptF(880, 95)
template_train170pt(880, 95)
}

spriteset(spriteset_DR98_9_Railtrack, "gfx/DR98_9.png") {
template_train170pt(0, 122)
}

spriteset(spriteset_DR98_9_RailtrackF, "gfx/DR98_9.png") {
template_train170ptF(176, 122)
template_train170pt(176, 122)
}

spriteset(spriteset_DR98_9_Railtrack_GOOD, "gfx/DR98_9_GOOD.png") {
template_train170pt(0, 122)
}

spriteset(spriteset_DR98_9_Railtrack_GOODF, "gfx/DR98_9_GOOD.png") {
template_train170ptF(176, 122)
template_train170pt(176, 122)
}

spriteset(spriteset_DR98_9_Railtrack_WOOD_empty, "gfx/DR98_9_WOOD.png") {
Expand All @@ -191,31 +191,31 @@ spriteset(spriteset_DR98_9_Railtrack_WOOD_full, "gfx/DR98_9_WOOD.png") {
}

spriteset(spriteset_DR98_9_Railtrack_WOOD_emptyF, "gfx/DR98_9_WOOD.png") {
template_train170ptF(176, 122)
template_train170pt(176, 122)
}

spriteset(spriteset_DR98_9_Railtrack_WOOD_halfF, "gfx/DR98_9_WOOD.png") {
template_train170ptF(528, 122)
template_train170pt(528, 122)
}

spriteset(spriteset_DR98_9_Railtrack_WOOD_fullF, "gfx/DR98_9_WOOD.png") {
template_train170ptF(880, 122)
template_train170pt(880, 122)
}

spriteset(spriteset_DR98_9_SWTPink, "gfx/DR98_9.png") {
template_train170pt(0, 149)
}

spriteset(spriteset_DR98_9_SWTPinkF, "gfx/DR98_9.png") {
template_train170ptF(176, 149)
template_train170pt(176, 149)
}

spriteset(spriteset_DR98_9_SWTPink_GOOD, "gfx/DR98_9_GOOD.png") {
template_train170pt(0, 149)
}

spriteset(spriteset_DR98_9_SWTPink_GOODF, "gfx/DR98_9_GOOD.png") {
template_train170ptF(176, 149)
template_train170pt(176, 149)
}

spriteset(spriteset_DR98_9_SWTPink_WOOD_empty, "gfx/DR98_9_WOOD.png") {
Expand All @@ -231,31 +231,31 @@ spriteset(spriteset_DR98_9_SWTPink_WOOD_full, "gfx/DR98_9_WOOD.png") {
}

spriteset(spriteset_DR98_9_SWTPink_WOOD_emptyF, "gfx/DR98_9_WOOD.png") {
template_train170ptF(176, 149)
template_train170pt(176, 149)
}

spriteset(spriteset_DR98_9_SWTPink_WOOD_halfF, "gfx/DR98_9_WOOD.png") {
template_train170ptF(528, 149)
template_train170pt(528, 149)
}

spriteset(spriteset_DR98_9_SWTPink_WOOD_fullF, "gfx/DR98_9_WOOD.png") {
template_train170ptF(880, 149)
template_train170pt(880, 149)
}

spriteset(spriteset_DR98_9_SWTOrange, "gfx/DR98_9.png") {
template_train170pt(0, 176)
}

spriteset(spriteset_DR98_9_SWTOrangeF, "gfx/DR98_9.png") {
template_train170ptF(176, 176)
template_train170pt(176, 176)
}

spriteset(spriteset_DR98_9_SWTOrange_GOOD, "gfx/DR98_9_GOOD.png") {
template_train170pt(0, 176)
}

spriteset(spriteset_DR98_9_SWTOrange_GOODF, "gfx/DR98_9_GOOD.png") {
template_train170ptF(176, 176)
template_train170pt(176, 176)
}

spriteset(spriteset_DR98_9_SWTOrange_WOOD_empty, "gfx/DR98_9_WOOD.png") {
Expand All @@ -271,15 +271,15 @@ spriteset(spriteset_DR98_9_SWTOrange_WOOD_full, "gfx/DR98_9_WOOD.png") {
}

spriteset(spriteset_DR98_9_SWTOrange_WOOD_emptyF, "gfx/DR98_9_WOOD.png") {
template_train170ptF(176, 176)
template_train170pt(176, 176)
}

spriteset(spriteset_DR98_9_SWTOrange_WOOD_halfF, "gfx/DR98_9_WOOD.png") {
template_train170ptF(528, 176)
template_train170pt(528, 176)
}

spriteset(spriteset_DR98_9_SWTOrange_WOOD_fullF, "gfx/DR98_9_WOOD.png") {
template_train170ptF(880, 176)
template_train170pt(880, 176)
}

switch(FEAT_TRAINS,SELF,sw_DR98_9_NRWhite,var[0xc8]){
Expand Down

0 comments on commit b7834f6

Please sign in to comment.