Skip to content
/ Akhenaten Public
forked from Banderi/Ozymandias

  • Sponsor dalerank/Akhenaten

    External links
    patreon
    patreon.com/imspinner

    Learn more about funding links in repositories.

    Report abuse

  • Notifications You must be signed in to change notification settings
  • Fork 16
  • Star 250

Commit a3bfc07

Browse files
dalerankdalerank
committedOct 19, 2024·
debug: simplified debug property draw
1 parent 5228d5e commit a3bfc07

8 files changed

+258
-262
lines changed
 

‎src/building/building_properties.cpp

+64-65
Original file line numberDiff line numberDiff line change
@@ -15,61 +15,60 @@ void game_debug_show_properties_object(pcstr prefix, building *b) {
1515
bool common_open = ImGui::TreeNodeEx("Building", ImGuiTreeNodeFlags_DefaultOpen, "Building");
1616
ImGui::TableSetColumnIndex(1);
1717

18-
int i = 0;
1918
if (common_open) {
20-
game_debug_show_property(i, "Untype/Destroy", [b] { building_destroy_by_collapse(b); });
21-
game_debug_show_property(i, "id", b->id, true);
22-
game_debug_show_property(i, "state", token::find_name(e_building_state_tokens, b->state));
23-
game_debug_show_property(i, "size", b->size);
24-
game_debug_show_property(i, "house_is_merged", b->house_is_merged);
25-
game_debug_show_property(i, "house_size", b->house_size);
26-
game_debug_show_property(i, "tile", b->tile);
19+
game_debug_show_property("Untype/Destroy", [b] { building_destroy_by_collapse(b); });
20+
game_debug_show_property("id", b->id, true);
21+
game_debug_show_property("state", token::find_name(e_building_state_tokens, b->state));
22+
game_debug_show_property("size", b->size);
23+
game_debug_show_property("house_is_merged", b->house_is_merged);
24+
game_debug_show_property("house_size", b->house_size);
25+
game_debug_show_property("tile", b->tile);
2726
bstring256 type_name; type_name.printf("%s [%d]", token::find_name(e_building_type_tokens, b->type), b->type);
28-
game_debug_show_property(i, "type", type_name);
29-
game_debug_show_property(i, "road_network_id", b->road_network_id);
30-
game_debug_show_property(i, "houses_covered", b->houses_covered);
31-
game_debug_show_property(i, "percentage_houses_covered", b->percentage_houses_covered);
32-
game_debug_show_property(i, "house_population", b->house_population);
33-
game_debug_show_property(i, "house_population_room", b->house_population_room);
34-
game_debug_show_property(i, "distance_from_entry", b->distance_from_entry);
35-
game_debug_show_property(i, "house_highest_population", b->house_highest_population);
36-
game_debug_show_property(i, "house_unreachable_ticks", b->house_unreachable_ticks);
37-
game_debug_show_property(i, "road_access", b->road_access);
38-
game_debug_show_property(i, "figure_spawn_delay", b->figure_spawn_delay);
39-
game_debug_show_property(i, "figure_roam_direction", b->figure_roam_direction);
40-
game_debug_show_property(i, "has_water_access", b->has_water_access);
41-
game_debug_show_property(i, "has_open_water_access", b->has_open_water_access);
42-
game_debug_show_property(i, "prev_part_building_id", b->prev_part_building_id);
43-
game_debug_show_property(i, "next_part_building_id", b->next_part_building_id);
44-
game_debug_show_property(i, "stored_full_amount", b->stored_full_amount);
45-
game_debug_show_property(i, "num_workers", b->num_workers);
46-
game_debug_show_property(i, "fancy_state", b->fancy_state);
47-
game_debug_show_property(i, "labor_category", b->labor_category);
48-
game_debug_show_property(i, "output_resource_first_id", b->output_resource_first_id);
49-
game_debug_show_property(i, "output_resource_second_id", b->output_resource_second_id);
50-
game_debug_show_property(i, "output_resource_second_rate", b->output_resource_second_rate);
51-
game_debug_show_property(i, "has_road_access", b->has_road_access);
52-
game_debug_show_property(i, "house_criminal_active", b->house_criminal_active);
53-
game_debug_show_property(i, "disease_days", b->disease_days);
54-
game_debug_show_property(i, "common_health", b->common_health);
55-
game_debug_show_property(i, "malaria_risk", b->malaria_risk);
56-
game_debug_show_property(i, "damage_risk", b->damage_risk);
57-
game_debug_show_property(i, "fire_risk", b->fire_risk);
58-
game_debug_show_property(i, "fire_duration", b->fire_duration);
59-
game_debug_show_property(i, "health_proof", b->health_proof);
60-
game_debug_show_property(i, "fire_proof", b->fire_proof);
61-
game_debug_show_property(i, "damage_proof", b->damage_proof);
62-
game_debug_show_property(i, "house_tax_coverage", b->house_tax_coverage);
63-
game_debug_show_property(i, "tax_collector_id", b->tax_collector_id);
64-
game_debug_show_property(i, "formation_id", b->formation_id);
65-
game_debug_show_property(i, "tax_income_or_storage", b->tax_income_or_storage);
66-
game_debug_show_property(i, "house_days_without_food", b->house_days_without_food);
67-
game_debug_show_property(i, "has_plague", b->has_plague);
68-
game_debug_show_property(i, "desirability", b->desirability);
69-
game_debug_show_property(i, "is_adjacent_to_water", b->is_adjacent_to_water);
70-
game_debug_show_property(i, "storage_id", b->storage_id);
71-
game_debug_show_property(i, "show_on_problem_overlay", b->show_on_problem_overlay);
72-
game_debug_show_property(i, "deben_storage", b->deben_storage);
27+
game_debug_show_property("type", type_name);
28+
game_debug_show_property("road_network_id", b->road_network_id);
29+
game_debug_show_property("houses_covered", b->houses_covered);
30+
game_debug_show_property("percentage_houses_covered", b->percentage_houses_covered);
31+
game_debug_show_property("house_population", b->house_population);
32+
game_debug_show_property("house_population_room", b->house_population_room);
33+
game_debug_show_property("distance_from_entry", b->distance_from_entry);
34+
game_debug_show_property("house_highest_population", b->house_highest_population);
35+
game_debug_show_property("house_unreachable_ticks", b->house_unreachable_ticks);
36+
game_debug_show_property("road_access", b->road_access);
37+
game_debug_show_property("figure_spawn_delay", b->figure_spawn_delay);
38+
game_debug_show_property("figure_roam_direction", b->figure_roam_direction);
39+
game_debug_show_property("has_water_access", b->has_water_access);
40+
game_debug_show_property("has_open_water_access", b->has_open_water_access);
41+
game_debug_show_property("prev_part_building_id", b->prev_part_building_id);
42+
game_debug_show_property("next_part_building_id", b->next_part_building_id);
43+
game_debug_show_property("stored_full_amount", b->stored_full_amount);
44+
game_debug_show_property("num_workers", b->num_workers);
45+
game_debug_show_property("fancy_state", b->fancy_state);
46+
game_debug_show_property("labor_category", b->labor_category);
47+
game_debug_show_property("output_resource_first_id", b->output_resource_first_id);
48+
game_debug_show_property("output_resource_second_id", b->output_resource_second_id);
49+
game_debug_show_property("output_resource_second_rate", b->output_resource_second_rate);
50+
game_debug_show_property("has_road_access", b->has_road_access);
51+
game_debug_show_property("house_criminal_active", b->house_criminal_active);
52+
game_debug_show_property("disease_days", b->disease_days);
53+
game_debug_show_property("common_health", b->common_health);
54+
game_debug_show_property("malaria_risk", b->malaria_risk);
55+
game_debug_show_property("damage_risk", b->damage_risk);
56+
game_debug_show_property("fire_risk", b->fire_risk);
57+
game_debug_show_property("fire_duration", b->fire_duration);
58+
game_debug_show_property("health_proof", b->health_proof);
59+
game_debug_show_property("fire_proof", b->fire_proof);
60+
game_debug_show_property("damage_proof", b->damage_proof);
61+
game_debug_show_property("house_tax_coverage", b->house_tax_coverage);
62+
game_debug_show_property("tax_collector_id", b->tax_collector_id);
63+
game_debug_show_property("formation_id", b->formation_id);
64+
game_debug_show_property("tax_income_or_storage", b->tax_income_or_storage);
65+
game_debug_show_property("house_days_without_food", b->house_days_without_food);
66+
game_debug_show_property("has_plague", b->has_plague);
67+
game_debug_show_property("desirability", b->desirability);
68+
game_debug_show_property("is_adjacent_to_water", b->is_adjacent_to_water);
69+
game_debug_show_property("storage_id", b->storage_id);
70+
game_debug_show_property("show_on_problem_overlay", b->show_on_problem_overlay);
71+
game_debug_show_property("deben_storage", b->deben_storage);
7372

7473
ImGui::TreePop();
7574
}
@@ -84,18 +83,18 @@ void game_debug_show_properties_object(pcstr prefix, building *b) {
8483
ImGui::TableSetColumnIndex(1);
8584

8685
if (anim_open) {
87-
game_debug_show_property(i, "id", b->anim.id, true);
88-
game_debug_show_property(i, "base", b->anim.base);
89-
game_debug_show_property(i, "offset", b->anim.offset);
90-
game_debug_show_property(i, "hashtime", b->anim.hashtime);
91-
game_debug_show_property(i, "pos", b->anim.pos);
92-
game_debug_show_property(i, "frame_duration", b->anim.frame_duration);
93-
game_debug_show_property(i, "max_frames", b->anim.max_frames);
94-
game_debug_show_property(i, "frame", b->anim.frame);
95-
game_debug_show_property(i, "can_reverse", b->anim.can_reverse);
96-
game_debug_show_property(i, "loop", b->anim.loop);
97-
game_debug_show_property(i, "is_reverse", b->anim.is_reverse);
98-
game_debug_show_property(i, "was_finished", b->anim.was_finished);
86+
game_debug_show_property("id", b->anim.id, true);
87+
game_debug_show_property("base", b->anim.base);
88+
game_debug_show_property("offset", b->anim.offset);
89+
game_debug_show_property("hashtime", b->anim.hashtime);
90+
game_debug_show_property("pos", b->anim.pos);
91+
game_debug_show_property("frame_duration", b->anim.frame_duration);
92+
game_debug_show_property("max_frames", b->anim.max_frames);
93+
game_debug_show_property("frame", b->anim.frame);
94+
game_debug_show_property("can_reverse", b->anim.can_reverse);
95+
game_debug_show_property("loop", b->anim.loop);
96+
game_debug_show_property("is_reverse", b->anim.is_reverse);
97+
game_debug_show_property("was_finished", b->anim.was_finished);
9998

10099
ImGui::TreePop();
101100
}

‎src/city/city_religion_properties.cpp

+27-29
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,23 @@ void game_debug_show_properties_religion(pcstr prefix, city_religion_t &religion
1616
bool common_open = ImGui::TreeNodeEx("Religion", ImGuiTreeNodeFlags_DefaultOpen, "Religion");
1717
ImGui::TableSetColumnIndex(1);
1818

19-
int i = 0;
2019
if (common_open) {
2120
bstring256 type_name;
2221
type_name.printf("%s [%d]", token::find_name(e_god_tokens, religion.least_happy_god), religion.least_happy_god);
23-
game_debug_show_property(i, "least_happy_god", type_name);
24-
game_debug_show_property(i, "angry_message_delay", religion.angry_message_delay);
25-
game_debug_show_property(i, "bast_curse_active", religion.bast_curse_active);
26-
game_debug_show_property(i, "ra_150_export_profits_months_left", religion.ra_150_export_profits_months_left);
27-
game_debug_show_property(i, "ra_harshly_reduced_trading_months_left", religion.ra_harshly_reduced_trading_months_left);
28-
game_debug_show_property(i, "ra_no_traders_months_left", religion.ra_no_traders_months_left);
29-
game_debug_show_property(i, "ra_slightly_reduced_trading_months_left", religion.ra_slightly_reduced_trading_months_left);
30-
game_debug_show_property(i, "ra_slightly_increased_trading_months_left", religion.ra_slightly_increased_trading_months_left);
31-
game_debug_show_property(i, "osiris_sank_ships", religion.osiris_sank_ships);
32-
game_debug_show_property(i, "seth_crush_enemy_troops", religion.seth_crush_enemy_troops);
33-
game_debug_show_property(i, "seth_protect_player_troops", religion.seth_protect_player_troops);
34-
game_debug_show_property(i, "osiris_double_farm_yield_days", religion.osiris_double_farm_yield_days);
35-
game_debug_show_property(i, "osiris_flood_will_destroy_active", religion.osiris_flood_will_destroy_active);
36-
game_debug_show_property(i, "coverage_common", religion.coverage_common);
22+
game_debug_show_property("least_happy_god", type_name);
23+
game_debug_show_property("angry_message_delay", religion.angry_message_delay);
24+
game_debug_show_property("bast_curse_active", religion.bast_curse_active);
25+
game_debug_show_property("ra_150_export_profits_months_left", religion.ra_150_export_profits_months_left);
26+
game_debug_show_property("ra_harshly_reduced_trading_months_left", religion.ra_harshly_reduced_trading_months_left);
27+
game_debug_show_property("ra_no_traders_months_left", religion.ra_no_traders_months_left);
28+
game_debug_show_property("ra_slightly_reduced_trading_months_left", religion.ra_slightly_reduced_trading_months_left);
29+
game_debug_show_property("ra_slightly_increased_trading_months_left", religion.ra_slightly_increased_trading_months_left);
30+
game_debug_show_property("osiris_sank_ships", religion.osiris_sank_ships);
31+
game_debug_show_property("seth_crush_enemy_troops", religion.seth_crush_enemy_troops);
32+
game_debug_show_property("seth_protect_player_troops", religion.seth_protect_player_troops);
33+
game_debug_show_property("osiris_double_farm_yield_days", religion.osiris_double_farm_yield_days);
34+
game_debug_show_property("osiris_flood_will_destroy_active", religion.osiris_flood_will_destroy_active);
35+
game_debug_show_property("coverage_common", religion.coverage_common);
3736

3837
ImGui::TreePop();
3938
}
@@ -49,21 +48,20 @@ void game_debug_show_properties_object(pcstr prefix, city_religion_t &religion,
4948
bool common_open = ImGui::TreeNodeEx("God", ImGuiTreeNodeFlags_DefaultOpen, "%s", token::find_name(e_god_tokens, god.type));
5049
ImGui::TableSetColumnIndex(1);
5150

52-
int i = 0;
5351
if (common_open) {
54-
game_debug_show_property(i, "type", god.type, true);
55-
game_debug_show_property(i, "mood", god.mood);
56-
game_debug_show_property(i, "target_mood", god.target_mood);
57-
game_debug_show_property(i, "wrath_bolts", god.wrath_bolts);
58-
game_debug_show_property(i, "happy_ankhs", god.happy_ankhs);
59-
game_debug_show_property(i, "blessing_done", god.blessing_done);
60-
game_debug_show_property(i, "curse_done", god.curse_done);
61-
game_debug_show_property(i, "months_since_festival", god.months_since_festival);
62-
game_debug_show_property(i, "unused1", god.unused1);
63-
game_debug_show_property(i, "unused2", god.unused2);
64-
game_debug_show_property(i, "unused3", god.unused3);
65-
game_debug_show_property(i, "is_known", god.is_known);
66-
game_debug_show_property(i, "coverage", religion.coverage[god.type]);
52+
game_debug_show_property("type", god.type, true);
53+
game_debug_show_property("mood", god.mood);
54+
game_debug_show_property("target_mood", god.target_mood);
55+
game_debug_show_property("wrath_bolts", god.wrath_bolts);
56+
game_debug_show_property("happy_ankhs", god.happy_ankhs);
57+
game_debug_show_property("blessing_done", god.blessing_done);
58+
game_debug_show_property("curse_done", god.curse_done);
59+
game_debug_show_property("months_since_festival", god.months_since_festival);
60+
game_debug_show_property("unused1", god.unused1);
61+
game_debug_show_property("unused2", god.unused2);
62+
game_debug_show_property("unused3", god.unused3);
63+
game_debug_show_property("is_known", god.is_known);
64+
game_debug_show_property("coverage", religion.coverage[god.type]);
6765

6866
ImGui::TreePop();
6967
}

‎src/empire/empire_city_properties.cpp

+18-19
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,24 @@ void game_debug_show_properties_object(pcstr prefix, empire_city *c) {
1919
bool common_open = ImGui::TreeNodeEx(city_name, ImGuiTreeNodeFlags_DefaultOpen, city_name);
2020
ImGui::TableSetColumnIndex(1);
2121

22-
int i = 0;
2322
if (common_open) {
24-
game_debug_show_property(i, "in_use", c->in_use);
23+
game_debug_show_property("in_use", c->in_use);
2524
bstring256 type_name; type_name.printf("%s [%d]", token::find_name(e_empire_city_tokens, c->type), c->type);
26-
game_debug_show_property(i, "type<name>", type_name);
27-
game_debug_show_property(i, "type", c->type);
28-
game_debug_show_property(i, "name_id", c->name_id);
29-
game_debug_show_property(i, "name", ui::str(195, c->name_id));
30-
game_debug_show_property(i, "route_id", c->route_id);
31-
game_debug_show_property(i, "is_open", c->is_open);
32-
game_debug_show_property(i, "cost_to_open", c->cost_to_open);
33-
game_debug_show_property(i, "ph_unk01", c->ph_unk01);
34-
game_debug_show_property(i, "ph_unk02", c->ph_unk02);
35-
game_debug_show_property(i, "trader_entry_delay", c->trader_entry_delay);
36-
game_debug_show_property(i, "empire_object_id", c->empire_object_id);
37-
game_debug_show_property(i, "is_sea_trade", c->is_sea_trade);
38-
game_debug_show_property(i, "trader_figure_ids[0]", c->trader_figure_ids[0], true);
39-
game_debug_show_property(i, "trader_figure_ids[1]", c->trader_figure_ids[1], true);
40-
game_debug_show_property(i, "trader_figure_ids[2]", c->trader_figure_ids[2], true);
25+
game_debug_show_property("type<name>", type_name);
26+
game_debug_show_property("type", c->type);
27+
game_debug_show_property("name_id", c->name_id);
28+
game_debug_show_property("name", ui::str(195, c->name_id));
29+
game_debug_show_property("route_id", c->route_id);
30+
game_debug_show_property("is_open", c->is_open);
31+
game_debug_show_property("cost_to_open", c->cost_to_open);
32+
game_debug_show_property("ph_unk01", c->ph_unk01);
33+
game_debug_show_property("ph_unk02", c->ph_unk02);
34+
game_debug_show_property("trader_entry_delay", c->trader_entry_delay);
35+
game_debug_show_property("empire_object_id", c->empire_object_id);
36+
game_debug_show_property("is_sea_trade", c->is_sea_trade);
37+
game_debug_show_property("trader_figure_ids[0]", c->trader_figure_ids[0], true);
38+
game_debug_show_property("trader_figure_ids[1]", c->trader_figure_ids[1], true);
39+
game_debug_show_property("trader_figure_ids[2]", c->trader_figure_ids[2], true);
4140

4241
{
4342
ImGui::PushID(0x81000000 | c->name_id);
@@ -50,7 +49,7 @@ void game_debug_show_properties_object(pcstr prefix, empire_city *c) {
5049

5150
if (buy_res_open) {
5251
for (const auto r : resource_list::all) {
53-
game_debug_show_property(i, ui::resource_name(r.type), c->buys_resource[r.type]);
52+
game_debug_show_property(ui::resource_name(r.type), c->buys_resource[r.type]);
5453
}
5554

5655
ImGui::TreePop();
@@ -69,7 +68,7 @@ void game_debug_show_properties_object(pcstr prefix, empire_city *c) {
6968

7069
if (sell_res_open) {
7170
for (const auto r : resource_list::all) {
72-
game_debug_show_property(i, ui::resource_name(r.type), c->sells_resource[r.type]);
71+
game_debug_show_property(ui::resource_name(r.type), c->sells_resource[r.type]);
7372
}
7473

7574
ImGui::TreePop();

0 commit comments

Comments
 (0)
Please sign in to comment.