buildings: create copper mine class, moved config to js

Author: s.kushnirenko

src/building/building.cpp

@@ -216,9 +216,6 @@ static void building_new_fill_in_data_for_type(building* b, e_building_type type
     case BUILDING_GRANITE_QUARRY:
         b->output_resource_first_id = RESOURCE_GRANITE;
         break;
-    case BUILDING_COPPER_MINE:
-        b->output_resource_first_id = RESOURCE_COPPER;
-        break;
     case BUILDING_SANDSTONE_QUARRY:
         b->output_resource_first_id = RESOURCE_SANDSTONE;
         break;
@@ -325,6 +322,7 @@ building_impl *building::dcast() {
     case BUILDING_CONSERVATORY: _ptr = new building_conservatory(*this); break;
     case BUILDING_PHYSICIAN: _ptr = new building_physician(*this); break;
     case BUILDING_GEMSTONE_MINE: _ptr = new building_mine_gems(*this); break;
+    case BUILDING_COPPER_MINE: _ptr = new building_mine_copper(*this); break;
 
     case BUILDING_VILLAGE_PALACE:
     case BUILDING_TOWN_PALACE:

src/building/building_raw_material.cpp

@@ -23,49 +23,39 @@
 
 namespace model {
 
-struct clay_pit_t {
-    static constexpr e_building_type type = BUILDING_CLAY_PIT;
+struct raw_building_t {
+    const e_building_type type;
+    const pcstr name;
+    bstring64 meta_id;
+    e_resource output_resource;
     e_labor_category labor_category;
     animations_t anim;
 };
 
-struct gold_mine_t {
-    static constexpr e_building_type type = BUILDING_GOLD_MINE;
-    e_labor_category labor_category;
-    animations_t anim;
-};
-
-struct gems_mine_t {
-    static constexpr e_building_type type = BUILDING_GEMSTONE_MINE;
-    e_labor_category labor_category;
-    animations_t anim;
-};
-
-clay_pit_t clay_pit;
-gold_mine_t gold_mine;
-gems_mine_t gems_mine;
+raw_building_t clay_pit{BUILDING_CLAY_PIT, "building_clay_pit"};
+raw_building_t gold_mine{BUILDING_GOLD_MINE, "building_gold_mine"};
+raw_building_t gems_mine{BUILDING_GEMSTONE_MINE, "building_gems_mine"};
+raw_building_t copper_mine{BUILDING_COPPER_MINE, "building_copper_mine"};
 
 }
 
 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);
-    });
+    auto load_raw_material_model = [] (model::raw_building_t &model) {
+        g_config_arch.r_section(model.name, [&model] (archive arch) {
+            model.labor_category = arch.r_type<e_labor_category>("labor_category");
+            model.output_resource = arch.r_type<e_resource>("output_resource");
+            model.meta_id = arch.r_string("meta_id");
+            model.anim.load(arch);
+            city_labor_set_category(model);
+        });
 
-    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);
-    });
+    };
 
-    g_config_arch.r_section("building_gems_mine", [] (archive arch) {
-        model::gems_mine.labor_category = arch.r_type<e_labor_category>("labor_category");
-        model::gems_mine.anim.load(arch);
-        city_labor_set_category(model::gems_mine);
-    });
+    load_raw_material_model(model::clay_pit);
+    load_raw_material_model(model::gold_mine);
+    load_raw_material_model(model::gems_mine);
+    load_raw_material_model(model::copper_mine);
 }
 
 static void building_raw_material_draw_info(object_info& c, const char* type, e_resource resource) {
@@ -114,9 +104,7 @@ void building_marble_quarry_draw_info(object_info& c) {
 void building_limestone_quarry_draw_info(object_info& c) {
     building_raw_material_draw_info(c, "limestone_quarry", RESOURCE_LIMESTONE);
 }
-void building_copper_mine_draw_info(object_info& c) {
-    building_raw_material_draw_info(c, "copper_mine", RESOURCE_COPPER);
-}
+
 void building_timber_yard_draw_info(object_info& c) {
     building_raw_material_draw_info(c, "timber_yard", RESOURCE_TIMBER);
 }
@@ -130,12 +118,19 @@ void building_granite_quarry_draw_info(object_info& c) {
     building_raw_material_draw_info(c, "granite_quarry", RESOURCE_SANDSTONE);
 }
 
-void building_mine_gold::on_create() {
-    base.output_resource_first_id = RESOURCE_GOLD;
+void building_mine::on_create() {
+    base.output_resource_first_id = params().output_resource;
+}
+
+void building_mine::window_info_background(object_info &c) {
+    building_raw_material_draw_info(c, params().meta_id.c_str(), params().output_resource);
 }
 
-void building_mine_gold::window_info_background(object_info &c) {
-    building_raw_material_draw_info(c, "gold_mine", RESOURCE_GOLD);
+bool building_mine::draw_ornaments_and_animations_height(painter &ctx, vec2i point, tile2i tile, color color_mask) {
+    const animation_t &anim = params().anim["work"];
+    building_draw_normal_anim(ctx, point, &base, tile, anim, color_mask);
+
+    return true;
 }
 
 int building_mine_gold::get_produce_uptick_per_day() const {
@@ -146,12 +141,9 @@ 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;
-}
+const model::raw_building_t &building_mine_gold::params() const { return model::gold_mine; }
+const model::raw_building_t &building_mine_copper::params() const { return model::copper_mine; }
+const model::raw_building_t &building_mine_gems::params() const { return model::gems_mine; }
 
 void building_quarry_stone::on_create() {
     base.output_resource_first_id = RESOURCE_STONE;
@@ -162,11 +154,11 @@ void building_quarry_stone::window_info_background(object_info &c) {
 }
 
 void building_clay_pit::on_create() {
-    base.output_resource_first_id = RESOURCE_CLAY;
+    base.output_resource_first_id = model::clay_pit.output_resource;
 }
 
 void building_clay_pit::window_info_background(object_info &c) {
-    building_raw_material_draw_info(c, "clay_pit", RESOURCE_CLAY);
+    building_raw_material_draw_info(c, model::clay_pit.meta_id, model::clay_pit.output_resource);
 }
 
 int building_clay_pit::get_fire_risk(int value) const {
@@ -183,22 +175,3 @@ bool building_clay_pit::draw_ornaments_and_animations_height(painter &ctx, vec2i
 
     return true;
 }
-
-void building_mine_gems::on_create() {
-    base.output_resource_first_id = RESOURCE_GEMS;
-}
-
-int building_mine_gems::get_produce_uptick_per_day() const {
-    return base.num_workers / 10.f;
-}
-
-void building_mine_gems::window_info_background(object_info &c) {
-    building_raw_material_draw_info(c, "gems_mine", RESOURCE_GEMS);
-}
-
-bool building_mine_gems::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;
-}

src/building/building_raw_material.h

@@ -5,11 +5,14 @@
 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_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);
 
+namespace model {
+    struct raw_building_t;
+}
+
 class building_clay_pit : public building_impl {
 public:
     building_clay_pit(building &b) : building_impl(b) {}
@@ -20,22 +23,27 @@ class building_clay_pit : public building_impl {
     virtual bool draw_ornaments_and_animations_height(painter &ctx, vec2i point, tile2i tile, color color_mask) override;
 };
 
-class building_mine_gold : public building_impl {
+class building_mine : public building_impl {
 public:
-    building_mine_gold(building &b) : building_impl(b) {}
+    building_mine(building &b) : building_impl(b) {}
     virtual void on_create() override;
+    virtual const model::raw_building_t &params() const = 0;
     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_mine_gems : public building_impl {
+class building_mine_gold : public building_mine {
 public:
-    building_mine_gems(building &b) : building_impl(b) {}
-    virtual void on_create() override;
-    virtual void window_info_background(object_info &c) override;
+    building_mine_gold(building &b) : building_mine(b) {}
+    virtual const model::raw_building_t &params() const 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_mine_gems : public building_mine {
+public:
+    building_mine_gems(building &b) : building_mine(b) {}
+    virtual const model::raw_building_t &params() const override;
+    virtual int get_produce_uptick_per_day() const override { return base.num_workers / 10.f; }
 };
 
 class building_quarry_stone : public building_impl {
@@ -45,3 +53,10 @@ class building_quarry_stone : public building_impl {
     virtual void window_info_background(object_info &c) override;
     virtual int get_produce_uptick_per_day() const override { return base.num_workers / 2.f; }
 };
+
+class building_mine_copper : public building_mine {
+public:
+    building_mine_copper(building &b) : building_mine(b) {}
+    virtual const model::raw_building_t &params() const override;
+    virtual int get_produce_uptick_per_day() const override { return base.num_workers / 2.f; }
+};

src/js/js.cpp

@@ -242,6 +242,7 @@ void js_reset_vm_state() {
     js_register_city_images(vm.J);
     js_register_collection_images(vm.J);
     js_register_ui_fonts(vm.J);
+    js_register_city_resources(vm.J);
 
     int ok = js_vm_load_file_and_exec(":modules.js");
     if (ok) {

src/js/js_constants.cpp

@@ -187,4 +187,49 @@ void js_register_city_overlays(js_State *J) {
    REGISTER_GLOBAL_CONSTANT(J, OVERLAY_HEALTH);
    REGISTER_GLOBAL_CONSTANT(J, OVERLAY_LABOR);
    REGISTER_GLOBAL_CONSTANT(J, OVERLAY_COUTHOUSE);
+}
+
+void js_register_city_resources(js_State *J) {
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_NONE);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_MIN);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_FOOD_MIN);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_GRAIN);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_MEAT);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_LETTUCE);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_CHICKPEAS);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_POMEGRANATES);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_FIGS);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_FISH);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_GAMEMEAT);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCES_FOODS_MAX);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_STRAW);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_WEAPONS);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_CLAY);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_BRICKS);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_POTTERY);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_BARLEY);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_BEER);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_FLAX);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_LINEN);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_GEMS);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_LUXURY_GOODS);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_TIMBER);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_GOLD);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_REEDS);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_PAPYRUS);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_STONE);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_LIMESTONE);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_GRANITE);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_UNUSED12);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_CHARIOTS);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_COPPER);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_SANDSTONE);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_OIL);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_HENNA);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_PAINT);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_LAMPS);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_MARBLE);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCES_MAX);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_DEBEN);
+    REGISTER_GLOBAL_CONSTANT(J, RESOURCE_TROOPS);
 }

src/js/js_constants.h

@@ -9,4 +9,5 @@ void js_register_city_walkers(js_State *J);
 void js_register_city_images(js_State *J);
 void js_register_city_labor_category(js_State *J);
 void js_register_collection_images(js_State *J);
-void js_register_ui_fonts(js_State *J);
+void js_register_ui_fonts(js_State *J);
+void js_register_city_resources(js_State *J);

src/scripts/building_info.js

@@ -84,20 +84,35 @@ building_clay_pit = {
   animations : {
     work : { pos : [-1, -1], anim_id: IMG_CLAY_PIT }
   },
+  output_resource : RESOURCE_CLAY,
+  meta_id : "clay_pit",
+  labor_category : LABOR_CATEGORY_INDUSTRY_COMMERCE,
+}
+
+building_copper_mine = {
+  animations : {
+    work : { pos : [54, 15], anim_id: ANIM_GOLD_MINE, max_frames: 16 }
+  },
+  output_resource : RESOURCE_COPPER,
+  meta_id : "copper_mine",
   labor_category : LABOR_CATEGORY_INDUSTRY_COMMERCE,
 }
 
 building_gems_mine = {
   animations : {
     work : { pos : [54, 15], anim_id: ANIM_GOLD_MINE, max_frames: 16 }
   },
+  output_resource : RESOURCE_GEMS,
+  meta_id : "gems_mine",
   labor_category : LABOR_CATEGORY_INDUSTRY_COMMERCE,
 }
 
 building_gold_mine = {
   animations : {
     work : { pos : [54, 15], anim_id: ANIM_GOLD_MINE, max_frames: 16 }
   },
+  output_resource : RESOURCE_GOLD,
+  meta_id : "gold_mine",
   labor_category : LABOR_CATEGORY_INDUSTRY_COMMERCE,
 }
 

src/scripts/common.js

@@ -22,6 +22,7 @@ var medium_statue_images = []
 var big_statue_images = []
 var top_menu_bar = {}
 var main_menu_window = {}
+var building_copper_mine = {}
 var building_gems_mine = {}
 var building_physician = {}
 var building_small_statue = {}

src/widget/city/ornaments.cpp

@@ -295,10 +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_COPPER_MINE:
-        building_draw_normal_anim(ctx, point + vec2i{54, 15}, b, tile, image_group(ANIM_GOLD_MINE) - 1, color_mask);
-        break;
-
     case BUILDING_STONE_QUARRY:
     case BUILDING_LIMESTONE_QUARRY:
     case BUILDING_GRANITE_QUARRY:

src/window/window_building_info.cpp

@@ -545,7 +545,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_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;
             case BUILDING_GRANITE_QUARRY: building_granite_quarry_draw_info(context); break;;
             case BUILDING_WEAVER_WORKSHOP: building_flax_workshop_draw_info(context); break;