kyush/principia
1
0
Fork 0
forked from mirrors/principia
Code Pull requests Activity Actions

Merge pull request #48 from rollerozxa/remove-unlocking-items

Browse source 
Remove having to unlock items on desktop
This commit is contained in:
Emil Romanus 2022-08-22 11:24:01 +02:00 • committed by GitHub
commit bc85e2dd45
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 224 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/src/creature.cc
View file

@ -2105,10 +2105,6 @@ creature::apply_destruction()
this->set_creature_flag(_equipment_destruction_flags[x], false);
this->equipments[x]->separate();
if (this->last_attacker_id == 0 || this->last_attacker_was_player()) {
item::unlock(item_id);
}
}
}
}
@ -2125,10 +2121,6 @@ creature::apply_destruction()
if (w) {
uint32_t item_id = w->get_item_id();
if (this->last_attacker_id == 0 || this->last_attacker_was_player()) {
item::unlock(item_id);
}
this->drop_item(item_id);
this->remove_weapon(this->get_weapon());
@ -2143,10 +2135,6 @@ creature::apply_destruction()
if (t) {
uint32_t item_id = t->get_item_id();
if (this->last_attacker_id == 0 || this->last_attacker_was_player()) {
item::unlock(item_id);
}
this->drop_item(item_id);
this->remove_tool(this->get_tool());

3
src/src/gentype.cc
View file

@ -416,9 +416,6 @@ randomize_equipment(struct enemy_random_equipment *equipments, int num_equipment
{
int index = 0;
for (int n = num_equipments-1; n != 1; --n) {
if (G->state.new_adventure == false && !item::is_unlocked(equipments[n].item_id)) {
continue;
}
if (rand()%equipments[n].prob == 0) {
index = n;
break;

127
src/src/item.cc
View file

@ -26,7 +26,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_menu_scale(2.f)
.set_mesh_offset(-.0125f, 0.f)
.set_magnetic(true)
.set_unlocked(true)
.add_worth(RESOURCE_IRON, 18)
.add_worth(RESOURCE_RUBY, 4)
,
@ -42,7 +41,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_menu_scale(2.f)
.set_mesh_offset(-.0125f, 0.f)
.set_magnetic(true)
.set_unlocked(true)
.add_worth(RESOURCE_IRON, 12)
.add_worth(RESOURCE_TOPAZ, 2)
,
@ -58,7 +56,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_menu_scale(2.0f)
.set_mesh_offset(-.0125f, 0.f)
.set_magnetic(true)
.set_unlocked(true)
.add_worth(RESOURCE_IRON, 22)
.add_worth(RESOURCE_RUBY, 8)
.add_worth(RESOURCE_EMERALD, 2)
@ -74,7 +71,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_data_id(WEAPON_RAILGUN)
.set_mesh_offset(-.025f, 0.f)
.set_magnetic(true)
.set_unlocked(true)
.add_worth(RESOURCE_IRON, 7)
.add_worth(RESOURCE_ALUMINIUM, 7)
.add_worth(RESOURCE_EMERALD, 10)
@ -145,7 +141,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_menu_scale(2.0f)
.set_mesh_offset(-.0125f, 0.f)
.set_magnetic(true)
.set_unlocked(true)
.add_worth(RESOURCE_IRON, 7)
.add_worth(RESOURCE_ALUMINIUM, 7)
.add_worth(RESOURCE_EMERALD, 10)
@ -206,7 +201,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_magnetic(true)
.set_rot_offs(-.175f)
.set_menu_scale(1.125f)
.set_unlocked(true)
.add_worth(RESOURCE_IRON, 15)
.add_worth(RESOURCE_COPPER, 15)
.add_worth(RESOURCE_EMERALD, 5)
@ -277,7 +271,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_magnetic(true)
.set_menu_scale(1.35f)
.set_menu_scale(1.35f)
.set_unlocked(true)
.add_worth(RESOURCE_ALUMINIUM, 7)
.add_worth(RESOURCE_IRON, 14)
.add_worth(RESOURCE_DIAMOND, 1)
@ -294,7 +287,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_can_rotate(true)
.set_magnetic(true)
.set_menu_scale(1.25f)
.set_unlocked(true)
.add_worth(RESOURCE_ALUMINIUM, 2)
.add_worth(RESOURCE_IRON, 19)
.add_worth(RESOURCE_TOPAZ, 1)
@ -311,7 +303,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_can_rotate(true)
.set_menu_scale(1.25f)
.set_magnetic(true)
.set_unlocked(true)
.add_worth(RESOURCE_ALUMINIUM, 2)
.add_worth(RESOURCE_IRON, 24)
.add_worth(RESOURCE_TOPAZ, 1)
@ -331,7 +322,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_magnetic(true)
.set_rot_offs(.175f)
.set_menu_scale(1.5f)
.set_unlocked(true)
.add_worth(RESOURCE_ALUMINIUM, 10)
.add_worth(RESOURCE_IRON, 20)
,
@ -594,7 +584,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_magnetic(true)
.set_rot_offs(-.175f)
.set_menu_scale(1.5f)
.set_unlocked(true)
.add_worth(RESOURCE_ALUMINIUM, 10)
.add_worth(RESOURCE_IRON, 20)
,
@ -611,7 +600,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_mesh_offset(0,.1)
.set_magnetic(true)
.set_menu_scale(1.5f)
.set_unlocked(true)
.add_worth(RESOURCE_ALUMINIUM, 3)
.add_worth(RESOURCE_IRON, 3)
.add_worth(RESOURCE_DIAMOND, 1)
@ -683,7 +671,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_menu_scale(2.5f)
.set_can_rotate(true)
.set_mesh_offset(0,-.14)
.set_unlocked(true)
.add_worth(RESOURCE_WOOD, 15)
,
@ -697,7 +684,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_data_id(HEAD_OSTRICH)
.set_can_rotate(true)
.set_magnetic(true)
.set_unlocked(true)
,
item_option("Circuit of Regeneration")
@ -710,7 +696,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_data_id(CREATURE_CIRCUIT_REGENERATION)
.set_menu_scale(2.25f)
.set_magnetic(true)
.set_unlocked(true)
.add_worth(RESOURCE_COPPER, 15)
.add_worth(RESOURCE_RUBY, 5)
.add_worth(RESOURCE_EMERALD, 5)
@ -787,7 +772,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_menu_scale(2.f)
.set_mesh_offset(.115f, 0.f)
.set_magnetic(true)
.set_unlocked(true)
.add_worth(RESOURCE_IRON, 7)
.add_worth(RESOURCE_ALUMINIUM, 7)
.add_worth(RESOURCE_TOPAZ, 1)
@ -804,7 +788,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_menu_scale(2.5f)
.set_can_rotate(true)
.set_mesh_offset(0.f,-.1f)
.set_unlocked(false)
,
item_option("Dummy head")
@ -832,7 +815,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_menu_scale(2.5f)
.set_can_rotate(true)
.set_mesh_offset(.1f,-.1f)
.set_unlocked(false)
,
item_option("Training sword")
@ -845,7 +827,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_data_id(WEAPON_TRAINING_SWORD)
.set_menu_scale(0.75f)
.set_mesh_offset(-.0125f, -.5f)
.set_unlocked(true)
,
item_option("Witch Hat")
@ -859,7 +840,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_menu_scale(2.5f)
.set_can_rotate(true)
.set_mesh_offset(0,-.4)
.set_unlocked(false)
,
item_option("War hammer")
@ -872,7 +852,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_data_id(WEAPON_WAR_HAMMER)
.set_menu_scale(0.75f)
.set_mesh_offset(-.0125f, -.5f)
.set_unlocked(true)
,
item_option("Simple axe")
@ -885,7 +864,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_data_id(WEAPON_SIMPLE_AXE)
.set_menu_scale(0.75f)
.set_mesh_offset(-.0125f, -.3f)
.set_unlocked(true)
,
item_option("Chainsaw")
@ -898,7 +876,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_data_id(WEAPON_CHAINSAW)
.set_menu_scale(0.75f)
.set_mesh_offset(.2f, .1f)
.set_unlocked(false)
,
item_option("Spiked Club")
@ -911,7 +888,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_data_id(WEAPON_SPIKED_CLUB)
.set_menu_scale(0.75f)
.set_mesh_offset(-.0125f, -.5f)
.set_unlocked(true)
,
item_option("Steel Sword")
@ -924,7 +900,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_data_id(WEAPON_STEEL_SWORD)
.set_menu_scale(0.75f)
.set_mesh_offset(-.0125f, -.5f)
.set_unlocked(true)
,
item_option("Baseball bat")
@ -937,7 +912,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_data_id(WEAPON_BASEBALLBAT)
.set_menu_scale(0.75f)
.set_mesh_offset(-.0125f, -.45f)
.set_unlocked(true)
,
item_option("Spear")
@ -950,7 +924,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_data_id(WEAPON_SPEAR)
.set_menu_scale(0.75f)
.set_mesh_offset(0.f, -.45f)
.set_unlocked(true)
,
item_option("War axe")
@ -963,7 +936,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_data_id(WEAPON_WAR_AXE)
.set_menu_scale(0.75f)
.set_mesh_offset(.0125f, -.5f)
.set_unlocked(false)
,
item_option("Pixel sword")
@ -976,7 +948,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_data_id(WEAPON_PIXEL_SWORD)
.set_menu_scale(0.75f)
.set_mesh_offset(-.0125f, -.5f)
.set_unlocked(false)
,
item_option("Hard hat")
@ -990,7 +961,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_menu_scale(2.5f)
.set_can_rotate(true)
.set_mesh_offset(0.f,-.1f)
.set_unlocked(true)
,
item_option("Serpent Sword")
@ -1003,7 +973,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_data_id(WEAPON_SERPENT_SWORD)
.set_menu_scale(0.75f)
.set_mesh_offset(-.0125f, -.5f)
.set_unlocked(false)
,
item_option("Pioneer front")
@ -1017,7 +986,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_menu_scale(2.5f)
.set_can_rotate(true)
.set_magnetic(true)
.set_unlocked(false)
,
item_option("Pioneer back")
@ -1035,7 +1003,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_menu_scale(1.5f)
.add_worth(RESOURCE_ALUMINIUM, 10)
.add_worth(RESOURCE_IRON, 20)
.set_unlocked(false)
,
item_option("Viking Helmet")
@ -1049,7 +1016,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_menu_scale(2.5f)
.set_can_rotate(true)
.set_mesh_offset(0.f,-.1f)
.set_unlocked(false)
,
item_option("Pickaxe")
@ -1062,7 +1028,6 @@ struct item_option item_options[NUM_ITEMS] = {
.set_data_id(WEAPON_PICKAXE)
.set_menu_scale(0.75f)
.set_mesh_offset(-.0125f, -.38f)
.set_unlocked(false)
,
};
@ -1195,13 +1160,7 @@ item::item(int32_t initial_item_id/*=-1*/)
this->set_num_properties(2);
this->properties[0].type = P_INT;
if (initial_item_id < 0) {
if (progress::initialized) {
do {
initial_item_id = rand()%NUM_ITEMS;
} while (!item::is_unlocked(initial_item_id));
} else {
initial_item_id = ITEM_ARM_CANNON;
}
initial_item_id = rand()%NUM_ITEMS;
}
this->set_item_type(initial_item_id);
@ -1862,91 +1821,11 @@ item::_init()
}
}
bool
item::is_unlocked(uint32_t item_type)
{
/* As a security measure, we do not call any progress-related functions
* unless we know progress is initialized. */
if (!progress::initialized) {
return false;
}
const struct item_option &io = item_options[item_type];
/* If the item is unlocked by default */
if (io.unlocked) {
return true;
}
/* If the item category is one that we do not lock */
switch (io.category) {
case ITEM_CATEGORY_GENERIC:
case ITEM_CATEGORY_FEET:
case ITEM_CATEGORY_POWERUP:
case ITEM_CATEGORY_BOLT_SET:
case ITEM_CATEGORY_BULLET:
return true;
}
uint32_t level_id = UNLOCKED_ITEM_LEVEL_ID + item_type;
lvl_progress *lp = progress::get_level_progress(LEVEL_MAIN, level_id);
if (lp) {
return lp->completed;
}
return false;
}
void
item::unlock(uint32_t item_type, bool signal/*=true*/)
{
/* As a security measure, we do not call any progress-related functions
* unless we know progress is initialized. */
if (!progress::initialized) {
return;
}
/* Require the item to be unlocked using the "Start new adventure" button. */
if (!G->state.new_adventure) {
return;
}
/* An item can not be unlocked if it has already been unlocked.
* This is mainly here to prevent the notification to run rampant. */
if (item::is_unlocked(item_type)) {
return;
}
const struct item_option &io = item_options[item_type];
uint32_t level_id = UNLOCKED_ITEM_LEVEL_ID + item_type;
lvl_progress *lp = progress::get_level_progress(LEVEL_MAIN, level_id);
lp->completed = 1;
lp->top_score = 123;
char tmp[512];
snprintf(tmp, 511, "You unlocked the %s!!!", io.name);
ui::message(tmp);
sm::play(&sm::happy, 0, 0, 0, 1.0f, false, 0, true);
if (signal) {
ui::emit_signal(SIGNAL_QUICKADD_REFRESH);
}
}
const char*
item::get_ui_name(uint32_t item_type)
{
if (item::is_unlocked(item_type)) {
const struct item_option &io = item_options[item_type];
return io.name;
} else {
return "???";
}
const struct item_option &io = item_options[item_type];
return io.name;
}
void

11
src/src/item.hh
View file

@ -27,7 +27,6 @@ struct item_option {
float rot_offs;
struct worth worth;
bool zappable;
bool unlocked;
float activator_radius;
struct tms_sprite image;
@ -46,7 +45,6 @@ struct item_option {
this->data_id = 0;
this->ef = 0;
this->menu_scale = 1.f;
this->unlocked = false;
this->mesh = 0;
@ -72,14 +70,6 @@ struct item_option {
return *this;
}
struct item_option&
set_unlocked(bool val)
{
this->unlocked = val;
return *this;
}
struct item_option&
set_layer_mask(int v)
{
@ -413,7 +403,6 @@ class item : public entity, public activator
void set_item_type(uint32_t item_type);
static void _init();
static bool is_unlocked(uint32_t item_type);
static void unlock(uint32_t item_type, bool signal=true);
static const char *get_ui_name(uint32_t item_type);

9
src/src/pscreen.cc
View file

@ -232,15 +232,6 @@ pscreen::handle_input(tms::event *ev, int action)
ui::messagef("Played sound: %s", snd->name);
++ snd_counter;
} else if (ev->data.key.mod & TMS_MOD_CTRL) {
#ifdef DEBUG
bool old = G->state.new_adventure;
G->state.new_adventure = true;
for (int x=0; x<NUM_ITEMS; ++x) {
item::unlock(x, false);
}
G->state.new_adventure = old;
#endif
}
}
break;

1
src/src/treasure_chest.cc
View file

@ -649,7 +649,6 @@ treasure_chest::emit_item(struct treasure_chest_item &tci)
for (; tci.count > 0; --tci.count) {
item *i = static_cast<item*>(of::create(tci.g_id));
item::unlock(tci.sub_id);
if (i) {
i->set_item_type(tci.sub_id);
i->set_position(rx, ry);

75
src/src/ui.cc
View file

@ -4141,41 +4141,6 @@ add_text_column(GtkTreeView *tv, const char *title, int id)
return renderer;
}
static void
item_cb_renderer(GtkCellLayout *cell_layout, GtkCellRenderer *cell,
GtkTreeModel *model, GtkTreeIter *iter, gpointer data) {
gchar *label;
gtk_tree_model_get (model, iter, 0, &label, -1);
if (label) {
bool sensitive = true;
if (strcmp(label, "???") == 0) {
sensitive = false;
}
g_object_set (cell, "sensitive", sensitive ? TRUE : FALSE, NULL);
}
}
static void
item_tbl_renderer(GtkCellLayout *cell_layout, GtkCellRenderer *cell,
GtkTreeModel *model, GtkTreeIter *iter, gpointer data) {
gchar *label;
gtk_tree_model_get (model, iter, 1, &label, -1);
if (label) {
bool sensitive = true;
if (strcmp(label, "???") == 0) {
sensitive = false;
}
g_object_set (cell, "sensitive", sensitive ? TRUE : FALSE, NULL);
g_object_set (cell, "activatable", sensitive ? TRUE : FALSE, NULL);
}
}
static GtkWidget*
new_lbl(const char *text)
{
@ -4202,9 +4167,6 @@ new_item_cb()
gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(cb), renderer,
"text", 0,
NULL);
gtk_cell_layout_set_cell_data_func(GTK_CELL_LAYOUT(cb), renderer,
item_cb_renderer, NULL,
NULL);
return cb;
}
@ -6644,11 +6606,7 @@ on_tchest_entity_changed(GtkComboBox *cb, gpointer user_data)
item_cb_append(tchest_sub_entity, x, false);
}
int item_id;
do {
item_id = rand()%NUM_ITEMS;
} while (!item::is_unlocked(item_id));
int item_id = rand()%NUM_ITEMS;
gtk_combo_box_set_active(GTK_COMBO_BOX(tchest_sub_entity), item_id);
}
@ -9263,21 +9221,18 @@ refresh_quickadd()
}
}
for (int x=0; x<NUM_ITEMS; ++x) {
if (item::is_unlocked(x)) {
const struct item_option &io = item_options[x];
const struct item_option &io = item_options[x];
char tmp[512];
snprintf(tmp, 511, "%s (Item)", io.name);
gtk_list_store_append(list, &iter);
gtk_list_store_set(list, &iter,
0, x,
1, tmp,
2, LF_ITEM,
-1
);
}
char tmp[512];
snprintf(tmp, 511, "%s (Item)", io.name);
gtk_list_store_append(list, &iter);
gtk_list_store_set(list, &iter,
0, x,
1, tmp,
2, LF_ITEM,
-1
);
}
for (int x=0; x<NUM_DECORATIONS; ++x) {
const struct decoration_info &di = decorations[x];
@ -9344,10 +9299,6 @@ activate_quickadd(GtkWidget *i, gpointer unused)
case LF_ITEM:
{
for (int x=0; x<NUM_ITEMS; ++x) {
if (!item::is_unlocked(x)) {
continue;
}
const struct item_option &io = item_options[x];
int diff = strncasecmp(search, io.name, len);
@ -12335,10 +12286,6 @@ int _gtk_loop(void *p)
ROBOT_COLUMN_EQUIPPED,
NULL);
gtk_cell_layout_set_cell_data_func(GTK_CELL_LAYOUT(column), renderer,
item_tbl_renderer, NULL,
NULL);
gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column),
GTK_TREE_VIEW_COLUMN_FIXED);
gtk_tree_view_column_set_fixed_width(GTK_TREE_VIEW_COLUMN(column), 75);