Skip to content

Commit

Permalink
Version 1.3 PR4
Browse files Browse the repository at this point in the history 
Change overrides to mixin, and big filters cleaning
  • Loading branch information
Shinsaka committed Apr 18, 2018
1 parent 33b6ad3 commit d379e10
Show file tree
Hide file tree
Showing 8 changed files with 169 additions and 415 deletions.
Binary file modified betterstorage.smod
View file
Binary file not shown.
10 changes: 9 additions & 1 deletion betterstorage/locales/en.json
View file
Expand Up @@ -5,7 +5,8 @@
"cooking_ingredients": "Ingredients",
"equipment": "Equipment",
"garbage": "Garbage",
"pile": "Items Piles",
"goods": "Refined Goods",
"pile": "Item Piles",
"prepared_meat": "Cooked Meat",
"prepared_veggie": "Cooked Veggie",
"raw_meat": "Raw Meat",
Expand All @@ -20,16 +21,23 @@
"tooltip_farm_seed": "Farm Seeds",
"tooltip_fence": "Fences",
"tooltip_gate": "Gates",
"tooltip_gear": "Gears",
"tooltip_gizmo": "Traps & Turrets",
"tooltip_healing_item": "Bandages & Healing Tonic",
"tooltip_heavy_armor": "Heavy Armor",
"tooltip_herb": "Herbs",
"tooltip_ingot": "Ingots",
"tooltip_light_armor": "Light Armor",
"tooltip_log": "Wood Log",
"tooltip_meat_stew": "Meat Stew & Tagine",
"tooltip_melee_weapon": "Melee Weapons",
"tooltip_pelt": "Pelts",
"tooltip_prepared_meat": "Cooked Meat Foods",
"tooltip_prepared_vegetarian": "Cooked Vegetarian Foods",
"tooltip_quest_items": "Quest Items",
"tooltip_ranged_weapon": "Ranged Weapons",
"tooltip_raw_meat": "Raw Meat Foods",
"tooltip_raw_vegetarian": "Raw Vegetarian Foods",
"tooltip_rotten_food": "Rotten Food",
"tooltip_seed": "Seeds",
"tooltip_table": "Tables",
Expand Down
10 changes: 9 additions & 1 deletion betterstorage/locales/fr-FR.json
View file
Expand Up @@ -3,8 +3,9 @@
"animal_feed": "Pâtures",
"consumables": "Consommables",
"cooking_ingredients": "Ingrédients",
"equipment": "Équipement",
"equipment": "Équipements",
"garbage": "Déchets",
"goods": "Produits rafinés",
"pile": "Piles d'objets",
"prepared_meat": "Plats Viande",
"prepared_veggie": "Plats Végé.",
Expand All @@ -20,16 +21,23 @@
"tooltip_farm_seed": "Graines de cultures",
"tooltip_fence": "Barrières",
"tooltip_gate": "Portails",
"tooltip_gear": "Engrenages",
"tooltip_gizmo": "Pièges & Tourelles",
"tooltip_healing_item": "Bandages & Potions de soin",
"tooltip_heavy_armor": "Armures lourdes",
"tooltip_herb": "Herbes",
"tooltip_ingot": "Lingots",
"tooltip_light_armor": "Armures légères",
"tooltip_log": "Rondins de bois",
"tooltip_meat_stew": "Ragoût et Tajine de viande",
"tooltip_melee_weapon": "Armes de mêlée",
"tooltip_pelt": "Peaux",
"tooltip_prepared_meat": "Plats Viande",
"tooltip_prepared_vegetarian": "Plats Végé.",
"tooltip_quest_items": "Objets de quête",
"tooltip_ranged_weapon": "Armes à distance",
"tooltip_raw_meat": "Viande crue",
"tooltip_raw_vegetarian": "Végé. crus",
"tooltip_rotten_food": "Nourriture pourrie",
"tooltip_seed": "Graines",
"tooltip_table": "Tables",
Expand Down
6 changes: 3 additions & 3 deletions betterstorage/manifest.json
View file
Expand Up @@ -113,11 +113,11 @@
"stonehearth/jobs/potter/potter_workbench/potter_workbench_ghost.json": "betterstorage:furniture:workbench",
"stonehearth/jobs/weaver/weaver_loom/weaver_loom_ghost.json": "betterstorage:furniture:workbench",
"stonehearth/jobs/weaver/weaver_spinning_wheel/weaver_spinning_wheel_ghost.json": "betterstorage:furniture:workbench",
"stonehearth/jobs/weaver/weaver_workbench/weaver_workbench_ghost.json": "betterstorage:furniture:workbench"
"stonehearth/jobs/weaver/weaver_workbench/weaver_workbench_ghost.json": "betterstorage:furniture:workbench",
"stonehearth/ui/data/input_box_filters.json": "file(ui/input_box_filters.json)",
"stonehearth/ui/data/stockpile_filters.json": "file(ui/stockpile_filters.json)"
},
"overrides": {
"stonehearth/ui/data/input_box_filters.json": "file(ui/input_box_filters.json)",
"stonehearth/ui/data/stockpile_filters.json": "file(ui/stockpile_filters.json)",
"stonehearth/ui/game/modes/zones_mode/stockpile/stockpile.js": "file(ui/stockpile.js)",
"stonehearth/ui/game/modes/zones_mode/stockpile/stockpile.less": "file(ui/stockpile.less)"
},
Expand Down
2 changes: 1 addition & 1 deletion betterstorage/mixins/wealth/quest_items.json
View file
@@ -1,7 +1,7 @@
{
"entity_data": {
"stonehearth:catalog": {
"material_tags": "stockpile_quest_items"
"material_tags": "quest_items"
}
}
}
94 changes: 51 additions & 43 deletions betterstorage/ui/input_box_filters.json
View file
Expand Up @@ -8,19 +8,19 @@
"categories": {
"wood": {
"ordinal": 1,
"display_name": "i18n(betterstorage:filters.tooltip_log)",
"display_name": "i18n(stonehearth:ui.game.zones_mode.stockpile.filters.tooltip_wood)",
"icon": "/stonehearth/entities/resources/wood/log.png",
"filter": "stockpile_wood wood resource"
},
"stone": {
"ordinal": 2,
"display_name": "i18n(stonehearth:entities.resources.stone.hunk_of_stone.display_name)",
"display_name": "i18n(stonehearth:ui.game.zones_mode.stockpile.filters.tooltip_stone)",
"icon": "/stonehearth/entities/resources/stone/stone.png",
"filter": "stockpile_stone stone resource"
},
"clay": {
"ordinal": 3,
"display_name": "i18n(stonehearth:entities.resources.clay.clay_mound.display_name)",
"display_name": "i18n(stonehearth:ui.game.zones_mode.stockpile.filters.tooltip_clay)",
"icon": "/stonehearth/entities/resources/clay/clay.png",
"filter": "stockpile_clay clay resource"
},
Expand Down Expand Up @@ -75,8 +75,8 @@
}
}
},
"refined_ore": {
"display_name": "i18n(stonehearth:ui.game.zones_mode.stockpile.filters.tooltip_refined_ore)",
"ingots": {
"display_name": "i18n(betterstorage:filters.tooltip_ingot)",
"icon": "/stonehearth/ui/game/modes/zones_mode/stockpile/images/taxonomy/refined_ore.png",
"ordinal": 3,
"categories": {
Expand Down Expand Up @@ -122,23 +122,8 @@
"icon": "/stonehearth/entities/refined/gold_ingot/gold_ingot.png",
"filter": "stockpile_refined_ore gold ingot"
},
"bronze_gear": {
"ordinal": 8,
"display_name": "i18n(stonehearth:entities.refined.bronze_gear.display_name)",
"icon": "/stonehearth/entities/refined/bronze_gear/bronze_gear.png",
"filter": "stockpile_refined_ore bronze gear"
},
"iron_gear": {
"ordinal": 9,
"display_name": "i18n(stonehearth:entities.refined.iron_gear.display_name)",
"icon": "/stonehearth/entities/refined/iron_gear/iron_gear.png",
"filter": "stockpile_refined_ore iron gear"
},
"gold_flakes": {
"ordinal": 10,
"display_name": "i18n(stonehearth:entities.resources.refined.gold_flakes.display_name)",
"icon": "/stonehearth/entities/refined/gold_flakes/gold_flakes.png",
"filter": "stockpile_refined_ore gold_flakes"
"mixintypes": {
"gold_flakes": "remove"
}
}
},
Expand Down Expand Up @@ -198,8 +183,8 @@
}
}
},
"refined_weaver": {
"display_name": "i18n(stonehearth:ui.game.zones_mode.stockpile.filters.tooltip_refined_weaver)",
"cloth": {
"display_name": "i18n(betterstorage:filters.goods)",
"icon": "/stonehearth/ui/game/modes/zones_mode/stockpile/images/taxonomy/refined_cloth.png",
"ordinal": 6,
"categories": {
Expand All @@ -220,38 +205,56 @@
"display_name": "i18n(stonehearth:entities.refined.leather_bolt.display_name)",
"icon": "/stonehearth/entities/refined/leather_bolt/leather_bolt.png",
"filter": "stockpile_refined_weaver leather"
},
"bronze_gear": {
"ordinal": 4,
"display_name": "i18n(stonehearth:entities.refined.bronze_gear.display_name)",
"icon": "/stonehearth/entities/refined/bronze_gear/bronze_gear.png",
"filter": "stockpile_refined_ore bronze gear"
},
"iron_gear": {
"ordinal": 5,
"display_name": "i18n(stonehearth:entities.refined.iron_gear.display_name)",
"icon": "/stonehearth/entities/refined/iron_gear/iron_gear.png",
"filter": "stockpile_refined_ore iron gear"
},
"gold_flakes": {
"ordinal": 6,
"display_name": "i18n(stonehearth:entities.resources.refined.gold_flakes.display_name)",
"icon": "/stonehearth/entities/refined/gold_flakes/gold_flakes.png",
"filter": "stockpile_refined_ore gold_flakes"
}
}
},
"raw_veggie": {
"raw_foods": {
"display_name": "i18n(betterstorage:filters.raw_veggie)",
"icon": "/stonehearth/ui/game/modes/zones_mode/stockpile/images/taxonomy/fruit.png",
"ordinal": 7,
"categories": {
"berries": {
"turnip": {
"ordinal": 1,
"display_name": "i18n(stonehearth:entities.food.berries.berry_basket.display_name)",
"icon": "/stonehearth/entities/food/berries/berry_basket/berry_basket.png",
"filter": "stockpile_raw_food berry"
"display_name": "i18n(stonehearth:entities.plants.turnip.turnip_basket.display_name)",
"icon": "/stonehearth/entities/food/turnip/turnip_basket/turnip_basket.png",
"filter": "stockpile_raw_food turnip"
},
"carrot": {
"ordinal": 2,
"display_name": "i18n(stonehearth:entities.plants.carrot.carrot_basket.display_name)",
"icon": "/stonehearth/entities/food/carrot/carrot_basket/carrot_basket.png",
"filter": "stockpile_raw_food carrot"
},
"corn": {
"pumpkin": {
"ordinal": 3,
"display_name": "i18n(stonehearth:entities.food.pumpkin.pumpkin_basket.display_name)",
"icon": "/stonehearth/entities/food/pumpkin/pumpkin_basket/pumpkin_basket.png",
"filter": "stockpile_raw_food pumpkin"
},
"corn": {
"ordinal": 4,
"display_name": "i18n(stonehearth:entities.food.corn.corn_basket.display_name)",
"icon": "/stonehearth/entities/food/corn/corn_basket/corn_basket.png",
"filter": "stockpile_raw_food corn"
},
"turnip": {
"ordinal": 4,
"display_name": "i18n(stonehearth:entities.plants.turnip.turnip_basket.display_name)",
"icon": "/stonehearth/entities/food/turnip/turnip_basket/turnip_basket.png",
"filter": "stockpile_raw_food turnip"
},
"gourd": {
"ordinal": 5,
"display_name": "i18n(stonehearth:entities.food.golden_gourd.golden_gourd_basket.display_name)",
Expand All @@ -264,17 +267,17 @@
"icon": "/stonehearth/entities/food/prickly_pear/prickly_pear_basket/prickly_pear_basket.png",
"filter": "stockpile_raw_food pear"
},
"pumpkin": {
"ordinal": 7,
"display_name": "i18n(stonehearth:entities.food.pumpkin.pumpkin_basket.display_name)",
"icon": "/stonehearth/entities/food/pumpkin/pumpkin_basket/pumpkin_basket.png",
"filter": "stockpile_raw_food pumpkin"
},
"watermelon": {
"ordinal": 8,
"ordinal": 7,
"display_name": "i18n(stonehearth:entities.food.watermelon.watermelon_basket.display_name)",
"icon": "/stonehearth/entities/food/watermelon/watermelon_basket/watermelon_basket.png",
"filter": "stockpile_raw_food watermelon"
},
"berries": {
"ordinal": 8,
"display_name": "i18n(stonehearth:entities.food.berries.berry_basket.display_name)",
"icon": "/stonehearth/entities/food/berries/berry_basket/berry_basket.png",
"filter": "stockpile_raw_food berry"
}
}
},
Expand Down Expand Up @@ -385,6 +388,11 @@
"display_name": "i18n(stonehearth:entities.food.wheat_bale.display_name)",
"icon": "/stonehearth/entities/food/wheat_bale/wheat_bale.png",
"filter": "stockpile_cooking_ingredient wheat"
},
"mixintypes": {
"jerky": "remove",
"mutton": "remove",
"poyo_meat": "remove"
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions betterstorage/ui/stockpile.less
View file
@@ -1,21 +1,21 @@
#stockpileWindow {
position: absolute;
top: 200px;
left: 20px;
top: 100px;

.title {
.handCursor
}

.window {
width: 750px;
height: 650px;
width: 760px;
height: 715px;
position: relative;
}

.tabPage {
display: none;
height: 515px;
height: 580px;
margin-bottom: 4px;
margin-top: 10px;
}
Expand All @@ -28,7 +28,7 @@
.downSection {
overflow-y: auto;
overflow-x: hidden;
height: 437px;
height: 502px;
}

#taxonomyGrid {
Expand Down

0 comments on commit d379e10

Please sign in to comment.