gold mine: moved animation config to js

Author: s.kushnirenko

src/building/building_raw_material.cpp

@@ -29,7 +29,14 @@ struct clay_pit_t {
     animations_t anim;
 };
 
+struct gold_mine_t {
+    static constexpr e_building_type type = BUILDING_GOLD_MINE;
+    e_labor_category labor_category;
+    animations_t anim;
+};
+
 clay_pit_t clay_pit;
+gold_mine_t gold_mine;
 
 }
 
@@ -38,9 +45,15 @@ 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);
+    });
+
+    g_config_arch.r_section("building_gold_mine", [] (archive arch) {
+        model::gold_mine.labor_category = arch.r_type<e_labor_category>("labor_category");
+        model::gold_mine.anim.load(arch);
+        city_labor_set_category(model::gold_mine);
     });
 
-    city_labor_set_category(model::clay_pit);
 }
 
 static void building_raw_material_draw_info(object_info& c, const char* type, e_resource resource) {
@@ -121,6 +134,13 @@ int building_mine_gold::get_produce_uptick_per_day() const {
     }
 }
 
+bool building_mine_gold::draw_ornaments_and_animations_height(painter &ctx, vec2i point, tile2i tile, color color_mask) {
+    const animation_t &anim = model::gold_mine.anim["work"];
+    building_draw_normal_anim(ctx, point, &base, tile, anim, color_mask);
+
+    return true;
+}
+
 void building_quarry_stone::on_create() {
     base.output_resource_first_id = RESOURCE_STONE;
 }
@@ -146,10 +166,8 @@ int building_clay_pit::get_fire_risk(int value) const {
 }
 
 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);
-    }
+    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

@@ -26,6 +26,7 @@ class building_mine_gold : public building_impl {
     virtual void on_create() override;
     virtual void window_info_background(object_info &c) override;
     virtual int get_produce_uptick_per_day() const override;
+    virtual bool draw_ornaments_and_animations_height(painter &ctx, vec2i point, tile2i tile, color color_mask) override;
 };
 
 class building_quarry_stone : public building_impl {

src/dev/debug.h

@@ -8,6 +8,7 @@
 #include "input/hotkey.h"
 
 #include <functional>
+#include <iosfwd>
 
 extern int debug_range_1;
 extern int debug_range_2;

src/scripts/building_info.js

@@ -59,6 +59,13 @@ building_clay_pit = {
   labor_category : LABOR_CATEGORY_INDUSTRY_COMMERCE,
 }
 
+building_gold_mine = {
+  animations : {
+    work : { pos : [54, 15], anim_id: ANIM_GOLD_MINE, max_frames: 16 }
+  },
+  labor_category : LABOR_CATEGORY_INDUSTRY_COMMERCE,
+}
+
 building_pottery = {
   animations : {
     work : { pos : [-1, -1], anim_id: IMG_POTTERY_WORKSHOP }

src/scripts/common.js

@@ -25,6 +25,7 @@ var main_menu_window = {}
 var building_booth = {}
 var building_conservatory = {}
 var building_pottery = {}
+var building_gold_mine = {}
 var building_clay_pit = {}
 var building_hunting_lodge = {}
 var building_village_palace = {}

src/widget/city/ornaments.cpp

@@ -295,7 +295,6 @@ void draw_ornaments_and_animations_height(vec2i point, tile2i tile, painter &ctx
         draw_water_lift_anim(ctx, b, point.x, point.y, color_mask);
         break;
 
-    case BUILDING_GOLD_MINE:
     case BUILDING_COPPER_MINE:
     case BUILDING_GEMSTONE_MINE:
         building_draw_normal_anim(ctx, point + vec2i{54, 15}, b, tile, image_group(ANIM_GOLD_MINE) - 1, color_mask);