From ffd6f239b7d00307a792d680359d070573587685 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 26 Mar 2024 23:39:21 +0000 Subject: [PATCH] Moved in-use graphics to /Trains subfolder --- gfx/{ => Trains}/Edward_James.png | Bin gfx/{ => Trains}/Express_Coaches.png | Bin gfx/{ => Trains}/Gordon.png | Bin gfx/{ => Trains}/Henry.png | Bin gfx/{ => Trains}/Pip_Emma.png | Bin gfx/{ => Trains}/Thomas_Percy_AnnieClarabel.png | Bin gfx/{ => Trains}/Toby.png | Bin src/spritesets/AnnieClarabel.pnml | 8 ++++---- src/spritesets/Edward.pnml | 6 +++--- src/spritesets/ExpressCoach.pnml | 12 ++++++------ src/spritesets/Gordon.pnml | 6 +++--- src/spritesets/Henry.pnml | 6 +++--- src/spritesets/James.pnml | 6 +++--- src/spritesets/Percy.pnml | 4 ++-- src/spritesets/PipEmmaSprites.pnml | 8 ++++---- src/spritesets/Thomas.pnml | 4 ++-- src/spritesets/Toby.pnml | 12 ++++++------ 17 files changed, 36 insertions(+), 36 deletions(-) rename gfx/{ => Trains}/Edward_James.png (100%) rename gfx/{ => Trains}/Express_Coaches.png (100%) rename gfx/{ => Trains}/Gordon.png (100%) rename gfx/{ => Trains}/Henry.png (100%) rename gfx/{ => Trains}/Pip_Emma.png (100%) rename gfx/{ => Trains}/Thomas_Percy_AnnieClarabel.png (100%) rename gfx/{ => Trains}/Toby.png (100%) diff --git a/gfx/Edward_James.png b/gfx/Trains/Edward_James.png similarity index 100% rename from gfx/Edward_James.png rename to gfx/Trains/Edward_James.png diff --git a/gfx/Express_Coaches.png b/gfx/Trains/Express_Coaches.png similarity index 100% rename from gfx/Express_Coaches.png rename to gfx/Trains/Express_Coaches.png diff --git a/gfx/Gordon.png b/gfx/Trains/Gordon.png similarity index 100% rename from gfx/Gordon.png rename to gfx/Trains/Gordon.png diff --git a/gfx/Henry.png b/gfx/Trains/Henry.png similarity index 100% rename from gfx/Henry.png rename to gfx/Trains/Henry.png diff --git a/gfx/Pip_Emma.png b/gfx/Trains/Pip_Emma.png similarity index 100% rename from gfx/Pip_Emma.png rename to gfx/Trains/Pip_Emma.png diff --git a/gfx/Thomas_Percy_AnnieClarabel.png b/gfx/Trains/Thomas_Percy_AnnieClarabel.png similarity index 100% rename from gfx/Thomas_Percy_AnnieClarabel.png rename to gfx/Trains/Thomas_Percy_AnnieClarabel.png diff --git a/gfx/Toby.png b/gfx/Trains/Toby.png similarity index 100% rename from gfx/Toby.png rename to gfx/Trains/Toby.png diff --git a/src/spritesets/AnnieClarabel.pnml b/src/spritesets/AnnieClarabel.pnml index 7884aa8..398e2d5 100644 --- a/src/spritesets/AnnieClarabel.pnml +++ b/src/spritesets/AnnieClarabel.pnml @@ -1,15 +1,15 @@ -spriteset(spriteset_Annie_Purchase, "gfx/Thomas_Percy_AnnieClarabel.png") { +spriteset(spriteset_Annie_Purchase, "gfx/Trains/Thomas_Percy_AnnieClarabel.png") { tmpl_purchase(178, 0) } -spriteset(spriteset_Clarabel_Purchase, "gfx/Thomas_Percy_AnnieClarabel.png") { +spriteset(spriteset_Clarabel_Purchase, "gfx/Trains/Thomas_Percy_AnnieClarabel.png") { tmpl_purchase(267, 0) } -spriteset(spriteset_Annie, "gfx/Thomas_Percy_AnnieClarabel.png") { +spriteset(spriteset_Annie, "gfx/Trains/Thomas_Percy_AnnieClarabel.png") { tmpl_coach_33(0, 66) } -spriteset(spriteset_Clarabel, "gfx/Thomas_Percy_AnnieClarabel.png") { +spriteset(spriteset_Clarabel, "gfx/Trains/Thomas_Percy_AnnieClarabel.png") { tmpl_coach_33(0, 91) } \ No newline at end of file diff --git a/src/spritesets/Edward.pnml b/src/spritesets/Edward.pnml index 2959a93..4721752 100644 --- a/src/spritesets/Edward.pnml +++ b/src/spritesets/Edward.pnml @@ -1,11 +1,11 @@ -spriteset(spriteset_Edward_Purchase, "gfx/Edward_James.png") { +spriteset(spriteset_Edward_Purchase, "gfx/Trains/Edward_James.png") { tmpl_purchase(0, 0) } -spriteset(spriteset_Edward, "gfx/Edward_James.png") { +spriteset(spriteset_Edward, "gfx/Trains/Edward_James.png") { tmpl_Edward(0, 13) } -spriteset(spriteset_Edward_Tender, "gfx/Edward_James.png") { +spriteset(spriteset_Edward_Tender, "gfx/Trains/Edward_James.png") { tmpl_tender_16(0, 33) } diff --git a/src/spritesets/ExpressCoach.pnml b/src/spritesets/ExpressCoach.pnml index fe1858f..99e72c6 100644 --- a/src/spritesets/ExpressCoach.pnml +++ b/src/spritesets/ExpressCoach.pnml @@ -1,24 +1,24 @@ -spriteset(spriteset_ExpressCoach_RWS_Purchase, "gfx/Express_Coaches.png") { +spriteset(spriteset_ExpressCoach_RWS_Purchase, "gfx/Trains/Express_Coaches.png") { tmpl_purchase(0, 0) } -spriteset(spriteset_ExpressCoach_Second_Purchase, "gfx/Express_Coaches.png") { +spriteset(spriteset_ExpressCoach_Second_Purchase, "gfx/Trains/Express_Coaches.png") { tmpl_purchase(89, 0) } -spriteset(spriteset_ExpressCoach_First_Purchase, "gfx/Express_Coaches.png") { +spriteset(spriteset_ExpressCoach_First_Purchase, "gfx/Trains/Express_Coaches.png") { tmpl_purchase(178, 0) } -spriteset(spriteset_ExpressCoach_RWS, "gfx/Express_Coaches.png") { +spriteset(spriteset_ExpressCoach_RWS, "gfx/Trains/Express_Coaches.png") { tmpl_coach_33(0, 13) } -spriteset(spriteset_ExpressCoach_Second, "gfx/Express_Coaches.png") { +spriteset(spriteset_ExpressCoach_Second, "gfx/Trains/Express_Coaches.png") { tmpl_coach_33(0, 38) } -spriteset(spriteset_ExpressCoach_First, "gfx/Express_Coaches.png") { +spriteset(spriteset_ExpressCoach_First, "gfx/Trains/Express_Coaches.png") { tmpl_coach_33(0, 63) } \ No newline at end of file diff --git a/src/spritesets/Gordon.pnml b/src/spritesets/Gordon.pnml index f9bf47b..ebcf06c 100644 --- a/src/spritesets/Gordon.pnml +++ b/src/spritesets/Gordon.pnml @@ -1,11 +1,11 @@ -spriteset(spriteset_Gordon_Purchase, "gfx/Gordon.png") { +spriteset(spriteset_Gordon_Purchase, "gfx/Trains/Gordon.png") { tmpl_purchase(0, 0) } -spriteset(spriteset_Gordon, "gfx/Gordon.png") { +spriteset(spriteset_Gordon, "gfx/Trains/Gordon.png") { tmpl_loco_29(0, 13) } -spriteset(spriteset_Gordon_Tender, "gfx/Gordon.png") { +spriteset(spriteset_Gordon_Tender, "gfx/Trains/Gordon.png") { tmpl_tender_16(0, 36) } diff --git a/src/spritesets/Henry.pnml b/src/spritesets/Henry.pnml index d1178fa..5a18065 100644 --- a/src/spritesets/Henry.pnml +++ b/src/spritesets/Henry.pnml @@ -1,11 +1,11 @@ -spriteset(spriteset_Henry_Purchase, "gfx/Henry.png") { +spriteset(spriteset_Henry_Purchase, "gfx/Trains/Henry.png") { tmpl_purchase(0, 0) } -spriteset(spriteset_Henry, "gfx/Henry.png") { +spriteset(spriteset_Henry, "gfx/Trains/Henry.png") { tmpl_loco_29(0, 13) } -spriteset(spriteset_Henry_Tender, "gfx/Henry.png") { +spriteset(spriteset_Henry_Tender, "gfx/Trains/Henry.png") { tmpl_tender_16(0, 36) } diff --git a/src/spritesets/James.pnml b/src/spritesets/James.pnml index 4300206..2a130e2 100644 --- a/src/spritesets/James.pnml +++ b/src/spritesets/James.pnml @@ -1,11 +1,11 @@ -spriteset(spriteset_James_Purchase, "gfx/Edward_James.png") { +spriteset(spriteset_James_Purchase, "gfx/Trains/Edward_James.png") { tmpl_purchase(89, 0) } -spriteset(spriteset_James, "gfx/Edward_James.png") { +spriteset(spriteset_James, "gfx/Trains/Edward_James.png") { tmpl_James(0, 48) } -spriteset(spriteset_James_Tender, "gfx/Edward_James.png") { +spriteset(spriteset_James_Tender, "gfx/Trains/Edward_James.png") { tmpl_tender_16(0, 67) } diff --git a/src/spritesets/Percy.pnml b/src/spritesets/Percy.pnml index e9c7dc2..25c55a2 100644 --- a/src/spritesets/Percy.pnml +++ b/src/spritesets/Percy.pnml @@ -1,8 +1,8 @@ -spriteset(spriteset_Percy_Purchase, "gfx/Thomas_Percy_AnnieClarabel.png") { +spriteset(spriteset_Percy_Purchase, "gfx/Trains/Thomas_Percy_AnnieClarabel.png") { tmpl_purchase(89, 0) } -spriteset(spriteset_Percy, "gfx/Thomas_Percy_AnnieClarabel.png") { +spriteset(spriteset_Percy, "gfx/Trains/Thomas_Percy_AnnieClarabel.png") { tmpl_percy(0, 31) } diff --git a/src/spritesets/PipEmmaSprites.pnml b/src/spritesets/PipEmmaSprites.pnml index e1c09e9..57da7d8 100644 --- a/src/spritesets/PipEmmaSprites.pnml +++ b/src/spritesets/PipEmmaSprites.pnml @@ -1,13 +1,13 @@ -spriteset(spriteset_PipEmma_Purchase, "gfx/Pip_Emma.png") { +spriteset(spriteset_PipEmma_Purchase, "gfx/Trains/Pip_Emma.png") { tmpl_purchase_dual_head(0, 0, 28) } -spriteset(spriteset_PipEmma_Coach_Purchase, "gfx/Pip_Emma.png") { +spriteset(spriteset_PipEmma_Coach_Purchase, "gfx/Trains/Pip_Emma.png") { tmpl_purchase(89, 0) } -spriteset(spriteset_PipEmma, "gfx/Pip_Emma.png") { +spriteset(spriteset_PipEmma, "gfx/Trains/Pip_Emma.png") { //leftx, topy, width, height, offsetx, offsety [0, 13, 8, 20, -3, -4] // N [9, 13, 18, 15, -16, -5] // NE @@ -19,7 +19,7 @@ spriteset(spriteset_PipEmma, "gfx/Pip_Emma.png") { [133, 13, 18, 15, -2, -6] // NW } -spriteset(spriteset_PipEmma_Coach, "gfx/Pip_Emma.png") { +spriteset(spriteset_PipEmma_Coach, "gfx/Trains/Pip_Emma.png") { tmpl_coach_33(0, 34) } diff --git a/src/spritesets/Thomas.pnml b/src/spritesets/Thomas.pnml index ea28635..c3047c2 100644 --- a/src/spritesets/Thomas.pnml +++ b/src/spritesets/Thomas.pnml @@ -1,8 +1,8 @@ -spriteset(spriteset_Thomas_Purchase, "gfx/Thomas_Percy_AnnieClarabel.png") { +spriteset(spriteset_Thomas_Purchase, "gfx/Trains/Thomas_Percy_AnnieClarabel.png") { tmpl_purchase(0, 0) } -spriteset(spriteset_Thomas, "gfx/Thomas_Percy_AnnieClarabel.png") { +spriteset(spriteset_Thomas, "gfx/Trains/Thomas_Percy_AnnieClarabel.png") { tmpl_thomas(0, 13) } diff --git a/src/spritesets/Toby.pnml b/src/spritesets/Toby.pnml index db51471..4dbfb18 100644 --- a/src/spritesets/Toby.pnml +++ b/src/spritesets/Toby.pnml @@ -1,24 +1,24 @@ -spriteset(spriteset_Toby_Purchase, "gfx/Toby.png") { +spriteset(spriteset_Toby_Purchase, "gfx/Trains/Toby.png") { tmpl_purchase(0, 0) } -spriteset(spriteset_Henrietta_Purchase, "gfx/Toby.png") { +spriteset(spriteset_Henrietta_Purchase, "gfx/Trains/Toby.png") { tmpl_purchase(89, 0) } -spriteset(spriteset_Elsie_Purchase, "gfx/Toby.png") { +spriteset(spriteset_Elsie_Purchase, "gfx/Trains/Toby.png") { tmpl_purchase(178, 0) } -spriteset(spriteset_Toby, "gfx/Toby.png") { +spriteset(spriteset_Toby, "gfx/Trains/Toby.png") { tmpl_toby(0, 13) } -spriteset(spriteset_Henrietta, "gfx/Toby.png") { +spriteset(spriteset_Henrietta, "gfx/Trains/Toby.png") { tmpl_coach_21(0, 28) } -spriteset(spriteset_Elsie, "gfx/Toby.png") { +spriteset(spriteset_Elsie, "gfx/Trains/Toby.png") { tmpl_brake_van(0, 45) } \ No newline at end of file