Skip to content

Commit

Permalink
cap effect to national tech level, remove music player from ui
Browse files Browse the repository at this point in the history
  • Loading branch information
@schombert
schombert committed Nov 25, 2023
1 parent 41aec8e commit a5c897f
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 40 deletions.
31 changes: 1 addition & 30 deletions assets/alice.gui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -629,36 +629,7 @@ guiTypes = {
position = { 0 236}
}
}
# Change current song
instantTextBoxType = {
position = { 58 308 }
name = "music_player_label"
font = "Arial16"
borderSize = { 0 0}
maxsize = { 236 18 }
text = "music_player"
orientation = "UPPER_LEFT"
format = centre
}
instantTextBoxType={
position = { 58 328 }
name = "music_player_value"
font = "Arial14"
borderSize = { 0 0}
maxsize = { 236 18 }
orientation = "UPPER_LEFT"
format = centre
}
guiButtonType = {
name = "music_player_left"
position = { 51 326 }
quadTextureSprite = "option_prev"
}
guiButtonType = {
name = "music_player_right"
position = { 269 326 }
quadTextureSprite = "option_next"
}

}
}

Expand Down
26 changes: 16 additions & 10 deletions src/scripting/effects.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2342,13 +2342,17 @@ uint32_t ef_change_controller_state_from_province(EFFECT_PARAMTERS) {
}
uint32_t ef_infrastructure(EFFECT_PARAMTERS) {
auto& building_level = ws.world.province_get_building_level(trigger::to_prov(primary_slot), economy::province_building_type::railroad);
building_level = uint8_t(std::clamp(int32_t(building_level) + int32_t(trigger::payload(tval[1]).signed_value), 0, 255));
building_level = uint8_t(std::clamp(int32_t(building_level) + int32_t(trigger::payload(tval[1]).signed_value),
0,
int32_t(ws.world.nation_get_max_building_level(ws.world.province_get_nation_from_province_ownership(trigger::to_prov(primary_slot)), economy::province_building_type::railroad))));
return 0;
}
uint32_t ef_infrastructure_state(EFFECT_PARAMTERS) {
province::for_each_province_in_state_instance(ws, trigger::to_state(primary_slot), [&](dcon::province_id p) {
auto& building_level = ws.world.province_get_building_level(p, economy::province_building_type::railroad);
building_level = uint8_t(std::clamp(int32_t(building_level) + int32_t(trigger::payload(tval[1]).signed_value), 0, 255));
building_level = uint8_t(std::clamp(int32_t(building_level) + int32_t(trigger::payload(tval[1]).signed_value),
0,
int32_t(ws.world.nation_get_max_building_level(ws.world.province_get_nation_from_province_ownership(p), economy::province_building_type::railroad))));
});
return 0;
}
Expand Down Expand Up @@ -3170,49 +3174,51 @@ uint32_t ef_rgo_size(EFFECT_PARAMTERS) {
}
uint32_t ef_fort(EFFECT_PARAMTERS) {
auto& building_level = ws.world.province_get_building_level(trigger::to_prov(primary_slot), economy::province_building_type::fort);
building_level = uint8_t(std::clamp(int32_t(building_level) + int32_t(trigger::payload(tval[1]).signed_value), 0, 255));
building_level = uint8_t(std::clamp(int32_t(building_level) + int32_t(trigger::payload(tval[1]).signed_value),
0,
int32_t(ws.world.nation_get_max_building_level(ws.world.province_get_nation_from_province_ownership(trigger::to_prov(primary_slot)), economy::province_building_type::fort))));
return 0;
}
uint32_t ef_naval_base(EFFECT_PARAMTERS) {
auto& building_level = ws.world.province_get_building_level(trigger::to_prov(primary_slot), economy::province_building_type::naval_base);
building_level = uint8_t(std::clamp(int32_t(building_level) + int32_t(trigger::payload(tval[1]).signed_value), 0, 255));
building_level = uint8_t(std::clamp(int32_t(building_level) + int32_t(trigger::payload(tval[1]).signed_value), 0, int32_t(ws.world.nation_get_max_building_level(ws.world.province_get_nation_from_province_ownership(trigger::to_prov(primary_slot)), economy::province_building_type::naval_base))));
return 0;
}
uint32_t ef_bank(EFFECT_PARAMTERS) {
auto& building_level = ws.world.province_get_building_level(trigger::to_prov(primary_slot), economy::province_building_type::bank);
building_level = uint8_t(std::clamp(int32_t(building_level) + int32_t(trigger::payload(tval[1]).signed_value), 0, 255));
building_level = uint8_t(std::clamp(int32_t(building_level) + int32_t(trigger::payload(tval[1]).signed_value), 0, int32_t(ws.world.nation_get_max_building_level(ws.world.province_get_nation_from_province_ownership(trigger::to_prov(primary_slot)), economy::province_building_type::bank))));
return 0;
}
uint32_t ef_university(EFFECT_PARAMTERS) {
auto& building_level = ws.world.province_get_building_level(trigger::to_prov(primary_slot), economy::province_building_type::university);
building_level = uint8_t(std::clamp(int32_t(building_level) + int32_t(trigger::payload(tval[1]).signed_value), 0, 255));
building_level = uint8_t(std::clamp(int32_t(building_level) + int32_t(trigger::payload(tval[1]).signed_value), 0, int32_t(ws.world.nation_get_max_building_level(ws.world.province_get_nation_from_province_ownership(trigger::to_prov(primary_slot)), economy::province_building_type::university))));
return 0;
}
uint32_t ef_fort_state(EFFECT_PARAMTERS) {
province::for_each_province_in_state_instance(ws, trigger::to_state(primary_slot), [&](dcon::province_id p) {
auto& building_level = ws.world.province_get_building_level(p, economy::province_building_type::fort);
building_level = uint8_t(std::clamp(int32_t(building_level) + int32_t(trigger::payload(tval[1]).signed_value), 0, 255));
building_level = uint8_t(std::clamp(int32_t(building_level) + int32_t(trigger::payload(tval[1]).signed_value), 0, int32_t(ws.world.nation_get_max_building_level(ws.world.province_get_nation_from_province_ownership(p), economy::province_building_type::fort))));
});
return 0;
}
uint32_t ef_naval_base_state(EFFECT_PARAMTERS) {
province::for_each_province_in_state_instance(ws, trigger::to_state(primary_slot), [&](dcon::province_id p) {
auto& building_level = ws.world.province_get_building_level(p, economy::province_building_type::naval_base);
building_level = uint8_t(std::clamp(int32_t(building_level) + int32_t(trigger::payload(tval[1]).signed_value), 0, 255));
building_level = uint8_t(std::clamp(int32_t(building_level) + int32_t(trigger::payload(tval[1]).signed_value), 0, int32_t(ws.world.nation_get_max_building_level(ws.world.province_get_nation_from_province_ownership(p), economy::province_building_type::naval_base))));
});
return 0;
}
uint32_t ef_bank_state(EFFECT_PARAMTERS) {
province::for_each_province_in_state_instance(ws, trigger::to_state(primary_slot), [&](dcon::province_id p) {
auto& building_level = ws.world.province_get_building_level(p, economy::province_building_type::bank);
building_level = uint8_t(std::clamp(int32_t(building_level) + int32_t(trigger::payload(tval[1]).signed_value), 0, 255));
building_level = uint8_t(std::clamp(int32_t(building_level) + int32_t(trigger::payload(tval[1]).signed_value), 0, int32_t(ws.world.nation_get_max_building_level(ws.world.province_get_nation_from_province_ownership(p), economy::province_building_type::bank))));
});
return 0;
}
uint32_t ef_university_state(EFFECT_PARAMTERS) {
province::for_each_province_in_state_instance(ws, trigger::to_state(primary_slot), [&](dcon::province_id p) {
auto& building_level = ws.world.province_get_building_level(p, economy::province_building_type::university);
building_level = uint8_t(std::clamp(int32_t(building_level) + int32_t(trigger::payload(tval[1]).signed_value), 0, 255));
building_level = uint8_t(std::clamp(int32_t(building_level) + int32_t(trigger::payload(tval[1]).signed_value), 0, int32_t(ws.world.nation_get_max_building_level(ws.world.province_get_nation_from_province_ownership(p), economy::province_building_type::university))));
});
return 0;
}
Expand Down

0 comments on commit a5c897f

Please sign in to comment.