building: clay pit building makes with new model system

Author: s.kushnirenko

src/building/building.cpp

@@ -170,9 +170,6 @@ static void building_new_fill_in_data_for_type(building* b, e_building_type type
         b->output_resource_first_id = RESOURCE_TIMBER;
         b->data.industry.max_gatheres = 1;
         break;
-    case BUILDING_CLAY_PIT:
-        b->output_resource_first_id = RESOURCE_CLAY;
-        break;
     case BUILDING_WEAVER_WORKSHOP:
         b->data.industry.first_material_id = RESOURCE_FLAX;
         b->output_resource_first_id = RESOURCE_LINEN;
@@ -334,6 +331,7 @@ building_impl *building::dcast() {
     case BUILDING_STONE_QUARRY: _ptr = new building_quarry_stone(*this); break;
     case BUILDING_GOLD_MINE: _ptr = new building_mine_gold(*this); break;
     case BUILDING_WATER_SUPPLY: _ptr = new building_water_supply(*this); break;
+    case BUILDING_CLAY_PIT: _ptr = new building_clay_pit(*this); break;
 
     case BUILDING_VILLAGE_PALACE:
     case BUILDING_TOWN_PALACE:

src/building/building.h

@@ -359,7 +359,6 @@ class building {
     void update_road_access();
     void update_month();
     bool figure_generate();
-    int get_fire_risk(int value);
 
     void school_add_papyrus(int amount);
 
@@ -391,6 +390,7 @@ class building_impl {
     virtual e_sound_channel_city sound_channel() const { return SOUND_CHANNEL_CITY_NONE; }
     virtual int animation_speed(int speed) const { return speed; }
     virtual int get_produce_uptick_per_day() const { return base.num_workers; }
+    virtual int get_fire_risk(int value) const { return value; }
 
     inline bool is_main() { return base.is_main(); }
     inline void check_labor_problem() { base.check_labor_problem(); }

src/building/building_animation.cpp

@@ -1,5 +1,3 @@
-#include "building_animation.h"
-
 #include "building/building_type.h"
 #include "grid/water_supply.h"
 

src/building/building_bandstand.h

@@ -10,4 +10,5 @@ class building_bandstand : public building_impl {
     virtual void window_info_background(object_info &c) override;
     virtual bool draw_ornaments_and_animations_height(painter &ctx, vec2i point, tile2i tile, color mask) override;
     virtual int animation_speed(int speed) const override { return 4; }
+    virtual int get_fire_risk(int value) const override { return value / 10; }
 };

src/building/building_booth.h

@@ -8,4 +8,5 @@ class building_booth : public building_impl {
     virtual void window_info_background(object_info &c) override;
     virtual void spawn_figure() override;
     virtual bool draw_ornaments_and_animations_height(painter &ctx, vec2i point, tile2i tile, color mask) override;
+    virtual int get_fire_risk(int value) const override { return value / 10; }
 };

src/building/building_palace.cpp

@@ -33,7 +33,7 @@ void config_load_building_palace_model() {
         village_palace_model.anim.load(arch);
     });
 
-    city_labor_set_category(village_palace_model.type, village_palace_model.labor_category);
+    city_labor_set_category(village_palace_model);
 }
 
 void building_palace::on_create() {

src/building/building_raw_material.cpp

@@ -16,6 +16,32 @@
 #include "graphics/text.h"
 #include "sound/sound_building.h"
 #include "game/game.h"
+#include "city/labor.h"
+#include "widget/city/ornaments.h"
+
+#include "graphics/animation.h"
+
+namespace model {
+
+struct clay_pit_t {
+    static constexpr e_building_type type = BUILDING_CLAY_PIT;
+    e_labor_category labor_category;
+    animations_t anim;
+};
+
+clay_pit_t clay_pit;
+
+}
+
+ANK_REGISTER_CONFIG_ITERATOR(config_load_building_raw_materials);
+void config_load_building_raw_materials() {
+    g_config_arch.r_section("building_clay_pit", [] (archive arch) {
+        model::clay_pit.labor_category = arch.r_type<e_labor_category>("labor_category");
+        model::clay_pit.anim.load(arch);
+    });
+
+    city_labor_set_category(model::clay_pit);
+}
 
 static void building_raw_material_draw_info(object_info& c, const char* type, e_resource resource) {
     auto &meta = building::get_info(type);
@@ -69,9 +95,6 @@ void building_copper_mine_draw_info(object_info& c) {
 void building_timber_yard_draw_info(object_info& c) {
     building_raw_material_draw_info(c, "timber_yard", RESOURCE_TIMBER);
 }
-void building_clay_pit_draw_info(object_info& c) {
-    building_raw_material_draw_info(c, "clay_pit", RESOURCE_CLAY);
-}
 void building_reed_gatherer_draw_info(object_info& c) {
     building_raw_material_draw_info(c, "reed_farm", RESOURCE_REEDS);
 }
@@ -105,3 +128,28 @@ void building_quarry_stone::on_create() {
 void building_quarry_stone::window_info_background(object_info &c) {
     building_raw_material_draw_info(c, "plainstone_quarry", RESOURCE_STONE);
 }
+
+void building_clay_pit::on_create() {
+    base.output_resource_first_id = RESOURCE_CLAY;
+}
+
+void building_clay_pit::window_info_background(object_info &c) {
+    building_raw_material_draw_info(c, "clay_pit", RESOURCE_CLAY);
+}
+
+int building_clay_pit::get_fire_risk(int value) const {
+    if (config_get(CONFIG_GP_CH_CLAY_PIT_FIRE_RISK_REDUCED)) {
+        return value / 2;
+    }
+
+    return value;
+}
+
+bool building_clay_pit::draw_ornaments_and_animations_height(painter &ctx, vec2i point, tile2i tile, color color_mask) {
+    if (worker_percentage() > 50) {
+        const animation_t &anim = model::clay_pit.anim["work"];
+        building_draw_normal_anim(ctx, point, &base, tile, anim, color_mask);
+    }
+
+    return true;
+}

src/building/building_raw_material.h

@@ -5,12 +5,21 @@
 void building_marble_quarry_draw_info(object_info& c);
 void building_limestone_quarry_draw_info(object_info& c);
 void building_timber_yard_draw_info(object_info& c);
-void building_clay_pit_draw_info(object_info& c);
 void building_copper_mine_draw_info(object_info &c);
 void building_reed_gatherer_draw_info(object_info& c);
 void building_sandstone_quarry_draw_info(object_info &c);
 void building_granite_quarry_draw_info(object_info &c);
 
+class building_clay_pit : public building_impl {
+public:
+    building_clay_pit(building &b) : building_impl(b) {}
+    virtual void on_create() override;
+    virtual void window_info_background(object_info &c) override;
+    virtual int get_fire_risk(int value) const override;
+    virtual e_sound_channel_city sound_channel() const override { return SOUND_CHANNEL_CITY_CLAY_PIT; }
+    virtual bool draw_ornaments_and_animations_height(painter &ctx, vec2i point, tile2i tile, color color_mask) override;
+};
+
 class building_mine_gold : public building_impl {
 public:
     building_mine_gold(building &b) : building_impl(b) {}

src/building/figure.cpp

@@ -1132,20 +1132,6 @@ void building::school_add_papyrus(int amount) {
     }
 }
 
-int building::get_fire_risk(int value) {
-    switch (type) {
-    case BUILDING_CLAY_PIT:
-        if (config_get(CONFIG_GP_CH_CLAY_PIT_FIRE_RISK_REDUCED))
-            return value / 2;
-
-    case BUILDING_BOOTH:
-    case BUILDING_BANDSTAND:
-        return value / 10;
-    }
-
-    return value;
-}
-
 void building_figure_generate() {
     OZZY_PROFILER_SECTION("Game/Run/Tick/Figure Generate");
     building_barracks_decay_tower_sentry_request();

src/building/maintenance.cpp

@@ -210,7 +210,7 @@ void building_maintenance_check_fire_collapse(void) {
                 expected_fire_risk += 50;
             }
 
-            expected_fire_risk = b.get_fire_risk(expected_fire_risk);
+            expected_fire_risk = b.dcast()->get_fire_risk(expected_fire_risk);
             b.fire_risk += expected_fire_risk;
             //            if (climate == CLIMATE_NORTHERN)
             //                b->fire_risk = 0;

src/building/properties.cpp

@@ -115,7 +115,7 @@ static building_properties properties[400] = {
     {2, 0, 0, 0},     // stone
     {2, 0, GROUP_BUILDING_LIMESTONE_QUARRY}, // limestone
     {2, 0, GROUP_BUILDING_TIMBER_YARD},      // wood
-    {2, 0, GROUP_BUILDING_CLAY_PIT},         // clay
+    {2, 0, 0, 0},         // clay
     {2, 0, 0, 0},    // beer
     {2, 0, GROUP_BUILDING_LINEN_WORKSHOP},   // linen
     {2, 0, GROUP_BUILDING_WEAPONS_WORKSHOP}, // weapons
@@ -269,6 +269,7 @@ void building_properties_init() {
     properties[BUILDING_VILLAGE_PALACE] = {4, 0, 0, 0, 0, IMG_VILLAGE_PALACE};
     properties[BUILDING_JUGGLER_SCHOOL] = {2, 0, 0, 0, 0, IMG_JUGGLER_SCHOOL};
     properties[BUILDING_HUNTING_LODGE] = {2, 0, 0, 0, 0, IMG_HUNTING_LODGE};
+    properties[BUILDING_CLAY_PIT] = {2, 0, 0, 0, 0, IMG_CLAY_PIT};
 }
 
 const building_properties* building_properties_for_type(e_building_type type) {

src/city/labor.h

@@ -43,6 +43,11 @@ e_labor_category category_for_building(building* b);
 const labor_category_data* city_labor_category(int category);
 void city_labor_set_category(e_building_type type, int category);
 
+template<class T>
+void city_labor_set_category(const T &model) {
+    city_labor_set_category(model.type, model.labor_category);
+}
+
 void city_labor_calculate_workers(int num_plebs, int num_patricians);
 
 void city_labor_allocate_workers(void);

src/graphics/image_groups.h

@@ -105,7 +105,7 @@ enum e_pack {
 #define GROUP_BUILDING_HOUSE_PALATIAL PACK_GENERAL, 35
 #define GROUP_BUILDING_HOUSE_VACANT_LOT PACK_GENERAL, 36
 #define GROUP_BUILDING_FARM_HOUSE PACK_GENERAL, 225 // 37
-#define GROUP_BUILDING_CLAY_PIT PACK_GENERAL, 40
+//#define GROUP_BUILDING_CLAY_PIT PACK_GENERAL, 40
 //#define GROUP_BUILDING_SCRIBAL_SCHOOL PACK_GENERAL, 42  // 41
 #define GROUP_BUILDING_LIBRARY PACK_GENERAL, 43 // 42
 #define GROUP_BUILDING_ACADEMY PACK_GENERAL, 43 // this isn't in Pharaoh

src/graphics/indexes.h

@@ -134,3 +134,4 @@ REGISTER_IMG(IMG_ADVISOR_BACKGROUND, 132)
 REGISTER_IMG(IMG_VILLAGE_PALACE, 133)
 REGISTER_IMG(IMG_JUGGLER_SCHOOL, 134)
 REGISTER_IMG(IMG_HUNTING_LODGE, 135)
+REGISTER_IMG(IMG_CLAY_PIT, 136)

src/scripts/building_info.js

@@ -52,6 +52,13 @@ building_village_palace = {
   labor_category : LABOR_CATEGORY_GOVERNMENT,
 }
 
+building_clay_pit = {
+  animations : {
+    work : { pos : [-1, -1], anim_id: IMG_CLAY_PIT }
+  },
+  labor_category : LABOR_CATEGORY_INDUSTRY_COMMERCE,
+}
+
 building_hunting_lodge = {
   animations : {
     work : { pos : [-1, -1], anim_id: IMG_HUNTING_LODGE }

src/scripts/common.js

@@ -23,6 +23,7 @@ var big_statue_images = []
 var top_menu_bar = {}
 var main_menu_window = {}
 var building_booth = {}
+var building_clay_pit = {}
 var building_hunting_lodge = {}
 var building_village_palace = {}
 var building_personal_mansion = {}

src/scripts/images.js

@@ -155,6 +155,7 @@ images = [
 	{img: IMG_VILLAGE_PALACE, pack:PACK_GENERAL, id:47, offset:0},
 	{img: IMG_JUGGLER_SCHOOL, pack:PACK_GENERAL, id:46, offset:0},
 	{img: IMG_HUNTING_LODGE, pack:PACK_GENERAL, id:176, offset:0},
+	{img: IMG_CLAY_PIT, pack:PACK_GENERAL, id:40, offset:0},
 ]
 
 cart_offsets = [

src/sound/city.cpp

@@ -153,7 +153,6 @@ int building_type_to_channel(building *b) {
     case BUILDING_WOOD_CUTTERS:
         return 0;
 
-    case BUILDING_CLAY_PIT: return SOUND_CHANNEL_CITY_CLAY_PIT;
     case BUILDING_POTTERY_WORKSHOP: return  SOUND_CHANNEL_CITY_POTTERY_WORKSHOP;
     }
 

src/widget/city/ornaments.cpp

@@ -1,6 +1,5 @@
 #include "ornaments.h"
 
-#include "building/building_animation.h"
 #include "building/building.h"
 #include "building/model.h"
 #include "building/dock.h"

src/window/window_building_info.cpp

@@ -544,7 +544,6 @@ static void draw_refresh_background() {
 
             case BUILDING_LIMESTONE_QUARRY: building_limestone_quarry_draw_info(context); break;
             case BUILDING_WOOD_CUTTERS: building_timber_yard_draw_info(context); break;
-            case BUILDING_CLAY_PIT: building_clay_pit_draw_info(context); break;
             case BUILDING_REED_GATHERER: building_reed_gatherer_draw_info(context); break;
             case BUILDING_COPPER_MINE: building_copper_mine_draw_info(context); break;
             case BUILDING_SANDSTONE_QUARRY: building_sandstone_quarry_draw_info(context); break;