Skip to content

Commit

Permalink
SB: 1.7.0 UI update.
Browse files Browse the repository at this point in the history
  • Loading branch information
AlanDavison committed Jul 14, 2022
1 parent 350d1c4 commit b5f66cc
Show file tree
Hide file tree
Showing 10 changed files with 421 additions and 202 deletions.
2 changes: 1 addition & 1 deletion SmartBuilding/SmartBuilding.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\Build\SDV-1.5.6_SMAPI-3.15.x.targets" />

<PropertyGroup>
<Version>1.7.0-beta</Version>
<Version>1.7.0</Version>
<TargetFramework>net5.0</TargetFramework>
<IgnoreModFilePatterns>\.aseprite$</IgnoreModFilePatterns>
<Nullable>enable</Nullable>
Expand Down
13 changes: 9 additions & 4 deletions SmartBuilding/i18n/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@
"smart-building.settings.cheaty-options.title": "The Slightly Cheaty Zone",
"smart-building.settings.cheaty-options.crab-pots-in-any-water-tile": "Place crab pots in any water tile",
"smart-building.settings.cheaty-options.enable-planting-crops": "Allow planting crops",
"smart-building.settings.cheaty-options.enable-crop-fertilisers": "Allow fertilising crops",
"smart-building.settings.cheaty-options.enable-tree-fertilisers": "Allow fertilising trees",
"smart-building.settings.cheaty-options.enable-fertilisers": "Allow the use of fertilisers",
"smart-building.settings.cheaty-options.enable-tree-tappers": "Allow tree tappers",
"smart-building.settings.cheaty-options.enable-inserting-items-into-machines": "Enable placing items into machines",

Expand Down Expand Up @@ -117,14 +116,20 @@
"smart-building.message.storage-furniture.adding-item": "Adding item",
"smart-building.message.storage-furniture.retrieval-tip": "You can use the name and (primarily) ParentSheetId to help get the items back if something goes wrong.",
"smart-buikding.message.trying-to-grab": "Trying to grab",
"smart-buikding.message.dga-furniture-less-lax": "Cannot place DGA furniture using less lax placement. Normal placement rules apply.",

"smart-building.message.cheaty-options.floor-replacement.disabled": "Replacing floors in-place is disabled in the settings.",
"smart-building.message.cheaty-options.fence-replacement.disabled": "Replacing fences in-place is disabled in the settings.",
"smart-building.message.cheaty-options.crab-pots-in-any-water-tile.disabled": "Allowing crab pots in any water tile is disabled in the mod's settings.",
"smart-building.message.cheaty-options.enable-planting-crops.disabled": "Crop planting is disabled in the mod's settings.",
"smart-building.message.cheaty-options.enable-crop-fertilisers.disabled": "Crop fertilisation is disabled in the mod's settings.",
"smart-building.message.cheaty-options.enable-tree-fertilisers.disabled": "Tree fertilisation is disabled in the mod's settings.",
"smart-building.message.cheaty-options.enable-fertilisers.disabled": "Fertilisation is disabled in the mod's settings.",
"smart-building.message.cheaty-options.enable-tree-tappers.disabled": "Tree tappers are disabled in the mod's settings.",
"smart-building.message.cheaty-options.enable-inserting-items-into-machines.disabled": "Inserting items into machines is disabled in the mod's settings.",
"smart-building.message.cheaty-options.can-pick-up-chests.disabled": "Picking up chests is disabled in the mod's settings.",
"smart-building.message.cheaty-options.more-lax-object-placement.disabled": "This cannot be placed here because more lax object placement is disabled in the settings.",
"smart-building.message.cheaty-options.more-lax-floor-placement.disabled": "This cannot be placed here because more lax floor placement is disabled in the settings.",
"smart-building.message.cheaty-options.more-lax-furniture-placement.disabled": "This cannot be placed here because more lax furniture placement is disabled in the settings, or it's DGA furniture.",
"smart-building.message.cheaty-options.more-lax-bed-placement.disabled": "This cannot be placed here because more lax bed placement is disabled in the settings.",

// Commands
"smart-building.commands.debug.sb-test": "If you need to read this, it is not for you. Here be dragons.",
Expand Down
2 changes: 1 addition & 1 deletion SmartBuilding/manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Name": "Smart Building",
"Author": "DecidedlyHuman",
"Version": "1.7.0-beta",
"Version": "1.7.0",
"Description": "Allows you to build fences/walls/paths, etc. in a much more streamlined way.",
"UniqueID": "DecidedlyHuman.SmartBuilding",
"EntryDll": "SmartBuilding.dll",
Expand Down
49 changes: 49 additions & 0 deletions SmartBuilding/release-checklist.md
Original file line number Diff line number Diff line change
Expand Up @@ -297,4 +297,53 @@ Checklist

### Torches — "torches"

### Rectangle drawing — "rectangle"

# 1.7.0 — UI update, and massive refactoring

### UI

### Interaction blocking

### Misc
* Leftover debug gubbins
* Version bump

### I18n Translations
* Ensure other languages (zh right now) function correctly

### Mod Integration

### Known prior bugs. Ensure no regression — "regression"

### Object and producer identification — "identification"

### Flooring — "flooring"

### Furniture — "furniture"

### TV Furniture — "tv"

### Storage furniture — "storage"

### Bed furniture — "bed"

### Furniture catalogue?

### Chests — "chests"

### Trees — "trees"

### Crops — "crops"

### Fences — "fences"

### Modded objects — "modded"

### Item insertion — "insertion"

### Item insertion (modded; PFM)

### Torches — "torches"

### Rectangle drawing — "rectangle"
20 changes: 14 additions & 6 deletions SmartBuilding/src/ConsoleCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,20 @@ public void IdentifyItemsCommand(string command, string[] args)
{
if (item != null)
{
ItemType type = identificationUtils.IdentifyItemType(item as StardewValley.Object);
logger.Log($"ItemType of {item.Name}: {type}.", LogLevel.Info);

if (dgaApi.GetDGAItemId(item) != null)
try
{
ItemType type = identificationUtils.IdentifyItemType(item as StardewValley.Object);
logger.Log($"ItemType of {item.Name}: {type}.", LogLevel.Info);

if (dgaApi?.GetDGAItemId(item) != null)
{
// This did not return null, so we know this is a DGA item.
logger.Log($"{item.Name} is a DGA item.");
}
}
catch (Exception e)
{
// This did not return null, so we know this is a DGA item.
logger.Log($"{item.Name} is a DGA item.");
logger.Log($"{e.Message}");
}
}
}
Expand Down Expand Up @@ -383,6 +390,7 @@ public void TestCommand(string command, string[] args)
Utility.fuzzyItemSearch("Mahogany Seed", 10),
Utility.fuzzyItemSearch("Tapper", 10),
Utility.fuzzyItemSearch("Heavy Tapper", 10),
Utility.fuzzyItemSearch("Tree Fertilizer", 100),
};

foreach (Item item in items)
Expand Down
3 changes: 1 addition & 2 deletions SmartBuilding/src/ModConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ public class ModConfig
public bool EnablePlacingStorageFurniture = false;
// The cheesy zone.
public bool EnablePlantingCrops = false;
public bool EnableCropFertilizers = false;
public bool EnableTreeFertilizers = false;
public bool EnableFertilizers = false;
public bool EnableTreeTappers = false;
public bool EnableInsertingItemsIntoMachines = false;
// Debug zone.
Expand Down
Loading

0 comments on commit b5f66cc

Please sign in to comment.