diff --git a/changelog.md b/changelog.md new file mode 100644 index 0000000..76473cb --- /dev/null +++ b/changelog.md @@ -0,0 +1,6 @@ +# Sal's Canalboats +## Changelog + +### 1.4.0 + +- Change: Horse-drawn boats now travel at 18 mph, increased from 6. \ No newline at end of file diff --git a/sals_canalboats.grf b/sals_canalboats.grf index 57dae06..2718049 100644 Binary files a/sals_canalboats.grf and b/sals_canalboats.grf differ diff --git a/src/custom_tags.txt b/src/custom_tags.txt index a7c78c4..3473a19 100644 --- a/src/custom_tags.txt +++ b/src/custom_tags.txt @@ -1,2 +1,2 @@ -VERSION :0.3.0 +VERSION :0.4.0 TITLE :Sal's Canalboats diff --git a/src/merged/sals_canalboats.nml b/src/merged/sals_canalboats.nml index 09867c1..f247d08 100644 --- a/src/merged/sals_canalboats.nml +++ b/src/merged/sals_canalboats.nml @@ -21,7 +21,7 @@ basecost { // Building, clearing, and maintaining canals costs 1/16 normal } /* Narrowboat - WaterWay Roads (coming soon) */ -template template_wway_narrowboat(x, y) { +template template_wway_narrow_packetboat(x, y) { //left_x, upper_y, width, height, offset_x, offset_y [ x, y, 5, 22, -2, -11] [ x+6, y, 20, 16, -10, -9] @@ -35,7 +35,7 @@ template template_wway_narrowboat(x, y) { /* Narrowboat - Ship */ -template template_ship_narrowboat(x, y) { +template template_ship_narrow_packetboat(x, y) { //left_x, upper_y, width, height, offset_x, offset_y [ x+20, y+10, 28, 89, -14, -40] [ x+60, y+10, 113, 66, -78, -21] @@ -47,31 +47,27 @@ template template_ship_narrowboat(x, y) { [ x+762, y+10, 113, 66, -32, -21] } -spriteset(spriteset_narrowboat_tarp_loaded, "src\gfx\narrowboat_ship_v2.png") { - template_ship_narrowboat(0,0) -} - -spriteset(spriteset_narrowboat_tarp_loading, "src\gfx\narrowboat_ship_v2.png") { - template_ship_narrowboat(0,100) +spriteset(spriteset_narrow_packetboat, "src\gfx\narrow_packetboat.png") { + template_ship_narrow_packetboat(0,0) } -spritegroup spritegroup_narrowboat_tarp { - loaded: [spriteset_narrowboat_tarp_loaded]; - loading: [spriteset_narrowboat_tarp_loading]; +spritegroup spritegroup_narrow_packetboat { + loaded: [spriteset_narrow_packetboat]; + loading: [spriteset_narrow_packetboat]; } -item(FEAT_SHIPS, narrowboat) { +item(FEAT_SHIPS, narrow_packetboat) { property { /* Common properties */ - name: string(STR_NAME_NARROWBOAT); + name: string(STR_NAME_PACKETBOAT); climates_available: ALL_CLIMATES; introduction_date: date(1700,01,01); model_life: VEHICLE_NEVER_EXPIRES; vehicle_life: 15; reliability_decay: 5; - refittable_cargo_classes: bitmask(CC_EXPRESS, CC_ARMOURED, CC_BULK, CC_PIECE_GOODS, CC_LIQUID, CC_REFRIGERATED, CC_HAZARDOUS, CC_COVERED, CC_OVERSIZED, CC_POWDERIZED, CC_NON_POURABLE, CC_NEO_BULK); + refittable_cargo_classes: bitmask(CC_PASSENGERS, CC_MAIL, CC_EXPRESS, CC_ARMOURED); loading_speed: 10; - cost_factor: 5; + cost_factor: 6; running_cost_factor: 5; /* Ship-specific porperties */ @@ -80,16 +76,16 @@ item(FEAT_SHIPS, narrowboat) { misc_flags: bitmask(ROADVEH_FLAG_2CC); refit_cost: 0; is_refittable: 1; - default_cargo_type: COAL; - cargo_capacity: 27; + default_cargo_type: PASS; + cargo_capacity: 30; } graphics { - default: spritegroup_narrowboat_tarp; + default: spritegroup_narrow_packetboat; } } /* Narrowboat - WaterWay Roads (coming soon) */ -template template_wway_narrow_packetboat(x, y) { +template template_wway_narrowboat(x, y) { //left_x, upper_y, width, height, offset_x, offset_y [ x, y, 5, 22, -2, -11] [ x+6, y, 20, 16, -10, -9] @@ -103,7 +99,7 @@ template template_wway_narrow_packetboat(x, y) { /* Narrowboat - Ship */ -template template_ship_narrow_packetboat(x, y) { +template template_ship_narrowboat(x, y) { //left_x, upper_y, width, height, offset_x, offset_y [ x+20, y+10, 28, 89, -14, -40] [ x+60, y+10, 113, 66, -78, -21] @@ -115,27 +111,31 @@ template template_ship_narrow_packetboat(x, y) { [ x+762, y+10, 113, 66, -32, -21] } -spriteset(spriteset_narrow_packetboat, "src\gfx\narrow_packetboat.png") { - template_ship_narrow_packetboat(0,0) +spriteset(spriteset_narrowboat_tarp_loaded, "src\gfx\narrowboat_ship_v2.png") { + template_ship_narrowboat(0,0) } -spritegroup spritegroup_narrow_packetboat { - loaded: [spriteset_narrow_packetboat]; - loading: [spriteset_narrow_packetboat]; +spriteset(spriteset_narrowboat_tarp_loading, "src\gfx\narrowboat_ship_v2.png") { + template_ship_narrowboat(0,100) } -item(FEAT_SHIPS, narrow_packetboat) { +spritegroup spritegroup_narrowboat_tarp { + loaded: [spriteset_narrowboat_tarp_loaded]; + loading: [spriteset_narrowboat_tarp_loading]; +} + +item(FEAT_SHIPS, narrowboat) { property { /* Common properties */ - name: string(STR_NAME_PACKETBOAT); + name: string(STR_NAME_NARROWBOAT); climates_available: ALL_CLIMATES; introduction_date: date(1700,01,01); model_life: VEHICLE_NEVER_EXPIRES; vehicle_life: 15; reliability_decay: 5; - refittable_cargo_classes: bitmask(CC_PASSENGERS, CC_MAIL, CC_EXPRESS, CC_ARMOURED); + refittable_cargo_classes: bitmask(CC_EXPRESS, CC_ARMOURED, CC_BULK, CC_PIECE_GOODS, CC_LIQUID, CC_REFRIGERATED, CC_HAZARDOUS, CC_COVERED, CC_OVERSIZED, CC_POWDERIZED, CC_NON_POURABLE, CC_NEO_BULK); loading_speed: 10; - cost_factor: 6; + cost_factor: 5; running_cost_factor: 5; /* Ship-specific porperties */ @@ -144,10 +144,10 @@ item(FEAT_SHIPS, narrow_packetboat) { misc_flags: bitmask(ROADVEH_FLAG_2CC); refit_cost: 0; is_refittable: 1; - default_cargo_type: PASS; - cargo_capacity: 30; + default_cargo_type: COAL; + cargo_capacity: 27; } graphics { - default: spritegroup_narrow_packetboat; + default: spritegroup_narrowboat_tarp; } } \ No newline at end of file diff --git a/src/narrow_packetboat.nml b/src/narrow_packetboat.nml index b8d6f97..4455200 100644 --- a/src/narrow_packetboat.nml +++ b/src/narrow_packetboat.nml @@ -51,7 +51,7 @@ item(FEAT_SHIPS, narrow_packetboat) { /* Ship-specific porperties */ sprite_id: SPRITE_ID_NEW_ROADVEH; //enable new graphics - speed: 6 mph; + speed: 18 mph; misc_flags: bitmask(ROADVEH_FLAG_2CC); refit_cost: 0; is_refittable: 1; diff --git a/src/narrowboat.nml b/src/narrowboat.nml index 2ba87df..e066651 100644 --- a/src/narrowboat.nml +++ b/src/narrowboat.nml @@ -55,7 +55,7 @@ item(FEAT_SHIPS, narrowboat) { /* Ship-specific porperties */ sprite_id: SPRITE_ID_NEW_ROADVEH; //enable new graphics - speed: 6 mph; + speed: 18 mph; misc_flags: bitmask(ROADVEH_FLAG_2CC); refit_cost: 0; is_refittable: 1;