misc

CaranudLapin · Feb 6, 2021 · 031a30b · 031a30b
1 parent 36cff0b
commit 031a30b
Show file tree

Hide file tree

Showing 34 changed files with 1,203 additions and 73 deletions.
diff --git a/CraftableGrangeDisplay/CraftableGrangeDisplay.csproj b/CraftableGrangeDisplay/CraftableGrangeDisplay.csproj
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>c286ad4d-f42a-4665-9800-afd4af6aa9ec</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>CraftableGrangeDisplay</RootNamespace>
+    <AssemblyName>CraftableGrangeDisplay</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System"/>
+
+    <Reference Include="System.Core"/>
+    <Reference Include="System.Xml.Linq"/>
+    <Reference Include="System.Data.DataSetExtensions"/>
+
+
+    <Reference Include="Microsoft.CSharp"/>
+
+    <Reference Include="System.Data"/>
+
+    <Reference Include="System.Net.Http"/>
+
+    <Reference Include="System.Xml"/>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Class1.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ </Project>
diff --git a/CraftableGrangeDisplay/Properties/AssemblyInfo.cs b/CraftableGrangeDisplay/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("CraftableGrangeDisplay")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("CraftableGrangeDisplay")]
+[assembly: AssemblyCopyright("Copyright ©  2021")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("c286ad4d-f42a-4665-9800-afd4af6aa9ec")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/CustomOreNodes/EXAMPLEcustom_ore_nodes.json b/CustomOreNodes/EXAMPLEcustom_ore_nodes.json
@@ -1,10 +1,164 @@
 {
-    nodes:[
-        // nodes: Description/texturePath/relativeTexturePathLocation/spriteX,spriteY/spriteWidth,SpriteHeight/minMineLevel,maxMineLevel/spawnChance/durability/experience/dropItems
-        // dropItems(seperated by "|"): objectIndexOrName;dropChance;minDrop,maxDrop;luckyAdditionalDropNum;minerAdditionalDropNum
-        "This stone is rich in coal./assets\\CoalStone.png/mod/0,0/16,16/1,120/5/4/12/382;100;1,4;1;1|390;75;1,2;1;1", // 5% chance of coal stone in mine levels 1-120
-        "This stone is rich in coal./assets\\CoalStone.png/mod/0,0/16,16/121,-1/10/4/12/382;100;1,4;1;1|390;75;1,2;1;1", // 10% chance of coal stone in mine levels 120+
-        "This stone smells like pizza./Maps\\springobjects/game/160,432/16,16/-1,-1/0/2/12/206;100;1,2;1;1", // no chance of pizza stone
-        "This stone shines like stardust./LooseSprites\\Cursors/game/597,1888/16,16/-1,-1/0/12/48/Prismatic Shard;100;1,1;0;0" // no chance of rainbow stone
-    ]
+  "nodes": [
+    {
+      "parentSheetIndex": 0,
+      "dropItems": [
+        {
+          "itemIdOrName": "382",
+          "dropChance": 100.0,
+          "minAmount": 1,
+          "maxAmount": 4,
+          "luckyAmount": 1,
+          "minerAmount": 1
+        },
+        {
+          "itemIdOrName": "390",
+          "dropChance": 75.0,
+          "minAmount": 1,
+          "maxAmount": 2,
+          "luckyAmount": 1,
+          "minerAmount": 1
+        }
+      ],
+      "oreLevelRanges": [
+        {
+          "minLevel": 1,
+          "maxLevel": 120,
+          "spawnChanceMult": 1.0,
+          "expMult": 1.0,
+          "dropChanceMult": 1.0,
+          "dropMult": 1.0,
+          "minDifficulty": -1,
+          "maxDifficulty": -1
+        }
+      ],
+      "nodeDesc": "This stone is rich in coal.",
+      "spritePath": "assets\\CoalStone.png",
+      "spriteType": "mod",
+      "spriteX": 0,
+      "spriteY": 0,
+      "spriteW": 16,
+      "spriteH": 16,
+      "spawnChance": 5.0,
+      "durability": 4,
+      "exp": 12,
+      "texture": null
+    },
+    {
+      "parentSheetIndex": 0,
+      "dropItems": [
+        {
+          "itemIdOrName": "382",
+          "dropChance": 100.0,
+          "minAmount": 1,
+          "maxAmount": 4,
+          "luckyAmount": 1,
+          "minerAmount": 1
+        },
+        {
+          "itemIdOrName": "390",
+          "dropChance": 75.0,
+          "minAmount": 1,
+          "maxAmount": 2,
+          "luckyAmount": 1,
+          "minerAmount": 1
+        }
+      ],
+      "oreLevelRanges": [
+        {
+          "minLevel": 121,
+          "maxLevel": -1,
+          "spawnChanceMult": 1.0,
+          "expMult": 1.0,
+          "dropChanceMult": 1.0,
+          "dropMult": 1.0,
+          "minDifficulty": -1,
+          "maxDifficulty": -1
+        }
+      ],
+      "nodeDesc": "This stone is rich in coal.",
+      "spritePath": "assets\\CoalStone.png",
+      "spriteType": "mod",
+      "spriteX": 0,
+      "spriteY": 0,
+      "spriteW": 16,
+      "spriteH": 16,
+      "spawnChance": 10.0,
+      "durability": 4,
+      "exp": 12,
+      "texture": null
+    },
+    {
+      "parentSheetIndex": 0,
+      "dropItems": [
+        {
+          "itemIdOrName": "206",
+          "dropChance": 100.0,
+          "minAmount": 1,
+          "maxAmount": 2,
+          "luckyAmount": 1,
+          "minerAmount": 1
+        }
+      ],
+      "oreLevelRanges": [
+        {
+          "minLevel": -1,
+          "maxLevel": -1,
+          "spawnChanceMult": 1.0,
+          "expMult": 1.0,
+          "dropChanceMult": 1.0,
+          "dropMult": 1.0,
+          "minDifficulty": -1,
+          "maxDifficulty": -1
+        }
+      ],
+      "nodeDesc": "This stone smells like pizza.",
+      "spritePath": "Maps\\springobjects",
+      "spriteType": "game",
+      "spriteX": 160,
+      "spriteY": 432,
+      "spriteW": 16,
+      "spriteH": 16,
+      "spawnChance": 0.0,
+      "durability": 2,
+      "exp": 12,
+      "texture": null
+    },
+    {
+      "parentSheetIndex": 0,
+      "dropItems": [
+        {
+          "itemIdOrName": "Prismatic Shard",
+          "dropChance": 100.0,
+          "minAmount": 1,
+          "maxAmount": 1,
+          "luckyAmount": 0,
+          "minerAmount": 0
+        }
+      ],
+      "oreLevelRanges": [
+        {
+          "minLevel": -1,
+          "maxLevel": -1,
+          "spawnChanceMult": 1.0,
+          "expMult": 1.0,
+          "dropChanceMult": 1.0,
+          "dropMult": 1.0,
+          "minDifficulty": -1,
+          "maxDifficulty": -1
+        }
+      ],
+      "nodeDesc": "This stone shines like stardust.",
+      "spritePath": "LooseSprites\\Cursors",
+      "spriteType": "game",
+      "spriteX": 597,
+      "spriteY": 1888,
+      "spriteW": 16,
+      "spriteH": 16,
+      "spawnChance": 0.0,
+      "durability": 12,
+      "exp": 48,
+      "texture": null
+    }
+  ]
 }
diff --git a/CustomOreNodes/manifest.json b/CustomOreNodes/manifest.json
@@ -1,7 +1,7 @@
 {
   "Name": "Custom Ore Nodes",
   "Author": "aedenthorn",
-  "Version": "2.0.0",
+  "Version": "2.0.1",
   "Description": "Spawns custom ore nodes in mines.",
   "UniqueID": "aedenthorn.CustomOreNodes",
   "EntryDll": "CustomOreNodes.dll",

diff --git a/FishingChestsExpanded/ModConfig.cs b/FishingChestsExpanded/ModConfig.cs
@@ -5,7 +5,8 @@ namespace FishingChestsExpanded
     public class ModConfig
     {
         public bool EnableMod { get; set; } = true;
-        public float BaseChanceForTreasureChest { get; set; } = -1f;
+        public int VanillaLootChance { get; set; } = 0;
+        public int ChanceForTreasureChest { get; set; } = -1;
         public int MaxItems { get; set; } = 5;
         public int ItemsBaseMaxValue { get; set; } = 100;
         public int MinItemValue { get; set; } = 20;