Skip to content

Commit

Permalink
Found faster horses
Browse files Browse the repository at this point in the history
  • Loading branch information
2TallTyler committed Dec 3, 2020
1 parent f06ef61 commit 37a8be0
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 35 deletions.
6 changes: 6 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Sal's Canalboats
## Changelog

### 1.4.0

- Change: Horse-drawn boats now travel at 18 mph, increased from 6.
Binary file modified sals_canalboats.grf
Binary file not shown.
2 changes: 1 addition & 1 deletion src/custom_tags.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
VERSION :0.3.0
VERSION :0.4.0
TITLE :Sal's Canalboats
64 changes: 32 additions & 32 deletions src/merged/sals_canalboats.nml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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]
Expand All @@ -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 */
Expand All @@ -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]
Expand All @@ -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]
Expand All @@ -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 */
Expand All @@ -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;
}
}
2 changes: 1 addition & 1 deletion src/narrow_packetboat.nml
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/narrowboat.nml
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 37a8be0

Please sign in to comment.