From 67630776eedc096f4386b515a6d856602d070f93 Mon Sep 17 00:00:00 2001 From: Alexander Gavrilov Date: Sun, 2 Sep 2012 17:17:18 +0400 Subject: [PATCH] Tweak steam engine raws. --- ...m_engine.txt => building_steam_engine.txt} | 54 ++++++++++--------- plugins/devel/item_trapcomp_steam_engine.txt | 12 +++++ ...m_engine.txt => reaction_steam_engine.txt} | 5 +- plugins/devel/steam-engine.cpp | 14 ++--- 4 files changed, 52 insertions(+), 33 deletions(-) rename plugins/devel/{building_zsteam_engine.txt => building_steam_engine.txt} (57%) create mode 100644 plugins/devel/item_trapcomp_steam_engine.txt rename plugins/devel/{reaction_zsteam_engine.txt => reaction_steam_engine.txt} (57%) diff --git a/plugins/devel/building_zsteam_engine.txt b/plugins/devel/building_steam_engine.txt similarity index 57% rename from plugins/devel/building_zsteam_engine.txt rename to plugins/devel/building_steam_engine.txt index 572eb4074..48657b0c1 100644 --- a/plugins/devel/building_zsteam_engine.txt +++ b/plugins/devel/building_steam_engine.txt @@ -1,4 +1,4 @@ -building_zsteam_engine +building_steam_engine [OBJECT:BUILDING] @@ -15,35 +15,36 @@ building_zsteam_engine [TILE:0:1:240:' ':254] [TILE:0:2:' ':' ':128] [TILE:0:3:246:' ':' '] - [COLOR:0:1:MAT:0:0:0:7:0:0] + [COLOR:0:1:6:0:0:0:0:0:7:0:0] [COLOR:0:2:0:0:0:0:0:0:7:0:0] - [COLOR:0:3:6:0:0:0:0:0:0:0:0] + [COLOR:0:3:MAT:0:0:0:0:0:0] [TILE:1:1:246:128:' '] [TILE:1:2:' ':' ':254] - [TILE:1:3:254:240:240] - [COLOR:1:1:6:0:0:7:0:0:0:0:0] + [TILE:1:3:254:'/':240] + [COLOR:1:1:MAT:7:0:0:0:0:0] [COLOR:1:2:0:0:0:0:0:0:7:0:0] - [COLOR:1:3:7:0:0:MAT:MAT] + [COLOR:1:3:7:0:0:6:0:0:6:0:0] [TILE:2:1:21:' ':128] [TILE:2:2:128:' ':246] [TILE:2:3:177:19:177] [COLOR:2:1:6:0:0:0:0:0:7:0:0] - [COLOR:2:2:7:0:0:0:0:0:6:0:0] - [COLOR:2:3:7:0:0:MAT:7:0:0] - Tile 15 marks places where machines can connect: + [COLOR:2:2:7:0:0:0:0:0:MAT] + [COLOR:2:3:7:0:0:6:0:0:7:0:0] + Tile 15 marks places where machines can connect. + Tile 19 marks the hearth (color changed to reflect power). [TILE:3:1:15:246:15] [TILE:3:2:'\':19:'/'] [TILE:3:3:7:' ':7] - Color 0:?:1 marks hearth, 1:?:1 water indicator, 4:?:1 magma indicator: - [COLOR:3:1:6:0:0:6:0:0:6:0:0] - [COLOR:3:2:6:7:0:0:0:1:6:7:0] + Color 1:?:1 water indicator, 4:?:1 magma indicator: + [COLOR:3:1:7:0:0:MAT:7:0:0] + [COLOR:3:2:6:0:0:0:0:1:6:0:0] [COLOR:3:3:1:7:1:0:0:0:4:7:1] [BUILD_ITEM:1:BARREL:NONE:INORGANIC:NONE][EMPTY][CAN_USE_ARTIFACT] [BUILD_ITEM:1:PIPE_SECTION:NONE:INORGANIC:NONE][CAN_USE_ARTIFACT] - [BUILD_ITEM:1:WEAPON:WEAPON_MACE:INORGANIC:NONE][CAN_USE_ARTIFACT] + [BUILD_ITEM:1:TRAPCOMP:ITEM_TRAPCOMP_STEAM_PISTON:INORGANIC:NONE][CAN_USE_ARTIFACT] [BUILD_ITEM:1:CHAIN:NONE:INORGANIC:NONE][CAN_USE_ARTIFACT] [BUILD_ITEM:1:TRAPPARTS:NONE:NONE:NONE][CAN_USE_ARTIFACT] - [BUILD_ITEM:2:BLOCKS:NONE:NONE:NONE][BUILDMAT][FIRE_BUILD_SAFE] + [BUILD_ITEM:1:BLOCKS:NONE:NONE:NONE][BUILDMAT][FIRE_BUILD_SAFE] [BUILDING_WORKSHOP:MAGMA_STEAM_ENGINE] [NAME:Magma Steam Engine] @@ -59,30 +60,33 @@ building_zsteam_engine [TILE:0:1:240:' ':254] [TILE:0:2:' ':' ':128] [TILE:0:3:246:' ':' '] - [COLOR:0:1:MAT:0:0:0:7:0:0] + [COLOR:0:1:6:0:0:0:0:0:7:0:0] [COLOR:0:2:0:0:0:0:0:0:7:0:0] - [COLOR:0:3:6:0:0:0:0:0:0:0:0] + [COLOR:0:3:MAT:0:0:0:0:0:0] [TILE:1:1:246:128:' '] [TILE:1:2:' ':' ':254] - [TILE:1:3:254:240:240] - [COLOR:1:1:6:0:0:7:0:0:0:0:0] + [TILE:1:3:254:'/':240] + [COLOR:1:1:MAT:7:0:0:0:0:0] [COLOR:1:2:0:0:0:0:0:0:7:0:0] - [COLOR:1:3:7:0:0:MAT:MAT] + [COLOR:1:3:7:0:0:6:0:0:6:0:0] [TILE:2:1:21:' ':128] [TILE:2:2:128:' ':246] [TILE:2:3:177:19:177] [COLOR:2:1:6:0:0:0:0:0:7:0:0] - [COLOR:2:2:7:0:0:0:0:0:6:0:0] - [COLOR:2:3:7:0:0:MAT:7:0:0] + [COLOR:2:2:7:0:0:0:0:0:MAT] + [COLOR:2:3:7:0:0:6:0:0:7:0:0] + Tile 15 marks places where machines can connect. + Tile 19 marks the hearth (color changed to reflect power). [TILE:3:1:15:246:15] [TILE:3:2:'\':19:'/'] [TILE:3:3:7:' ':7] - [COLOR:3:1:6:0:0:6:0:0:6:0:0] - [COLOR:3:2:6:7:0:0:0:1:6:7:0] + Color 1:?:1 water indicator, 4:?:1 magma indicator: + [COLOR:3:1:7:0:0:MAT:7:0:0] + [COLOR:3:2:6:0:0:0:0:1:6:0:0] [COLOR:3:3:1:7:1:0:0:0:4:7:1] [BUILD_ITEM:1:BARREL:NONE:INORGANIC:NONE][EMPTY][CAN_USE_ARTIFACT] [BUILD_ITEM:1:PIPE_SECTION:NONE:INORGANIC:NONE][CAN_USE_ARTIFACT] - [BUILD_ITEM:1:WEAPON:WEAPON_MACE:INORGANIC:NONE][CAN_USE_ARTIFACT] + [BUILD_ITEM:1:TRAPCOMP:ITEM_TRAPCOMP_STEAM_PISTON:INORGANIC:NONE][CAN_USE_ARTIFACT] [BUILD_ITEM:1:CHAIN:NONE:INORGANIC:NONE][CAN_USE_ARTIFACT] [BUILD_ITEM:1:TRAPPARTS:NONE:NONE:NONE][CAN_USE_ARTIFACT] - [BUILD_ITEM:2:BLOCKS:NONE:NONE:NONE][BUILDMAT][MAGMA_BUILD_SAFE] + [BUILD_ITEM:1:BLOCKS:NONE:NONE:NONE][BUILDMAT][MAGMA_BUILD_SAFE] diff --git a/plugins/devel/item_trapcomp_steam_engine.txt b/plugins/devel/item_trapcomp_steam_engine.txt new file mode 100644 index 000000000..bae6f5b22 --- /dev/null +++ b/plugins/devel/item_trapcomp_steam_engine.txt @@ -0,0 +1,12 @@ +item_trapcomp_steam_engine + +[OBJECT:ITEM] + +[ITEM_TRAPCOMP:ITEM_TRAPCOMP_STEAM_PISTON] +[NAME:piston:pistons] +[ADJECTIVE:huge] +[SIZE:1600] +[HITS:1] +[MATERIAL_SIZE:6] +[METAL] +[ATTACK:BLUNT:40:200:bash:bashes:NO_SUB:2000] diff --git a/plugins/devel/reaction_zsteam_engine.txt b/plugins/devel/reaction_steam_engine.txt similarity index 57% rename from plugins/devel/reaction_zsteam_engine.txt rename to plugins/devel/reaction_steam_engine.txt index 1018510f4..175ffdd50 100644 --- a/plugins/devel/reaction_zsteam_engine.txt +++ b/plugins/devel/reaction_steam_engine.txt @@ -1,4 +1,4 @@ -reaction_other +reaction_steam_engine [OBJECT:REACTION] @@ -9,5 +9,6 @@ reaction_other [FUEL] [SKILL:SMELT] Dimension is the number of days it can produce 100 power * 100. - [PRODUCT:100:1:LIQUID_MISC:NONE:WATER][PRODUCT_DIMENSION:1500] + I.e. with 2000 it means energy of 1 job = 1 water wheel for 20 days. + [PRODUCT:100:1:LIQUID_MISC:NONE:WATER][PRODUCT_DIMENSION:2000] diff --git a/plugins/devel/steam-engine.cpp b/plugins/devel/steam-engine.cpp index ac317687e..edaba0e82 100644 --- a/plugins/devel/steam-engine.cpp +++ b/plugins/devel/steam-engine.cpp @@ -807,24 +807,26 @@ static bool find_engines() { for (int y = 0; y < ws.def->dim_y; y++) { - if (ws.def->tile[bs][x][y] == 15) + switch (ws.def->tile[bs][x][y]) + { + case 15: ws.gear_tiles.push_back(df::coord2d(x,y)); + break; + case 19: + ws.hearth_tile = df::coord2d(x,y); + break; + } if (ws.def->tile_color[2][bs][x][y]) { switch (ws.def->tile_color[0][bs][x][y]) { - case 0: - ws.hearth_tile = df::coord2d(x,y); - break; case 1: ws.water_tile = df::coord2d(x,y); break; case 4: ws.magma_tile = df::coord2d(x,y); break; - default: - break; } } }