Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
corrinr committed Feb 16, 2020
1 parent 2a7ab86 commit 470365b
Show file tree
Hide file tree
Showing 20 changed files with 306 additions and 49 deletions.
Binary file modified MoreGrass/MoreGrass.dll
Binary file not shown.
Binary file modified MoreGrass/MoreGrass.pdb
Binary file not shown.
2 changes: 1 addition & 1 deletion MoreGrass/manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Name": "More Grass",
"Author": "EpicBellyFlop45",
"Version": "1.0.2",
"Version": "1.0.3",
"Description": "Loads custom grass sprites",
"UniqueID": "EpicBellyFlop45.MoreGrass",
"EntryDll": "MoreGrass.dll",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"MrG_Fairytales": "$p 910#You know the story of the Frog Prince? I asked the Goddess if that would work...#$b#She gave me the saddest smile. So I guess that was a 'no'.$2|Hey, if you fall out of a tree, do YOU land on your feet? Thought not! Superior species over here.$4",
"winter_Sun10": "The Goddess keeps mostly to herself, but I've seen her with that recluse in the woods.#$b#You know, Linus? The man that smells like rich earth and fish-meat.",
"Sun": "The woman in the woods proves most agreable company. Why yes, you are too, @. Agreeable. Yes, quite agreeable.$1"

}
75 changes: 62 additions & 13 deletions NPCs/[CP] MrGinger (Non-datable)/content.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion NPCs/[CP] MrGinger (Non-datable)/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Name": "NPC Mr Ginger",
"Author": "Lemurkat",
"Description": "Adds the cat Mr Ginger",
"Version": "1.0.0",
"Version": "1.0.1",
"UniqueID": "LemurKat.Mr.Ginger.NPC",
"UpdateKeys": [ "Nexus:5295" ],
"ContentPackFor": {
Expand Down
Binary file added NPCs/[TMX] MisterGinger/assets/LemurCustom.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
76 changes: 76 additions & 0 deletions NPCs/[TMX] MisterGinger/assets/SpouseRoomMisterGinger.tmx
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.2" tiledversion="1.3.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="7" height="10" tilewidth="16" tileheight="16" infinite="0" nextlayerid="11" nextobjectid="5">
<tileset firstgid="1" name="townInterior" tilewidth="16" tileheight="16" tilecount="2176" columns="32">
<image source="townInterior.png" width="512" height="1088"/>
</tileset>
<tileset firstgid="2177" name="LemurCustom" tilewidth="16" tileheight="16" tilecount="224" columns="16">
<image source="LemurCustom.png" width="256" height="225"/>
</tileset>
<layer id="1" name="BackSpouse" width="7" height="10">
<data encoding="csv">
78,79,77,78,79,77,1,
110,111,109,110,111,109,1,
119,107,107,107,107,120,1,
200,201,200,201,200,201,1,
232,264,265,264,233,233,1,
264,249,250,251,265,265,1,
232,281,282,283,233,233,1,
232,264,265,264,265,233,1,
264,265,264,265,264,265,1,
1,1,1,1,1,1,1
</data>
</layer>
<layer id="2" name="BuildingsSpouse" width="7" height="10">
<data encoding="csv">
55,0,0,0,0,56,69,
87,75,75,75,75,88,69,
2231,493,494,495,369,0,69,
2247,525,526,527,401,2242,69,
2215,676,0,0,587,588,69,
368,0,0,0,619,620,69,
0,0,0,0,1394,2244,69,
0,2233,0,0,0,0,69,
364,2249,402,352,1518,2255,0,
1,1,1,1,1,1,1
</data>
</layer>
<layer id="3" name="FrontSpouse" width="7" height="10">
<data encoding="csv">
311,2185,2186,279,412,0,0,
0,2201,2202,336,337,338,0,
0,0,0,0,0,2226,0,
0,0,0,0,555,556,0,
0,0,0,0,0,0,0,
1257,0,0,0,0,2228,0,
0,0,0,0,0,0,0,
332,0,370,320,1486,2239,0,
0,0,0,0,0,167,168,
0,0,0,0,0,0,0
</data>
</layer>
<layer id="4" name="AlwaysFrontSpouse" width="7" height="10">
<data encoding="csv">
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
166,166,166,166,166,0,0,
0,0,0,0,0,0,0
</data>
</layer>
<objectgroup id="6" name="BackSpouse"/>
<objectgroup id="7" name="BuildingsSpouse">
<object id="3" name="TileData" x="16" y="64" width="16" height="16">
<properties>
<property name="Action" value="message &quot;MrGinger.1&quot;"/>
</properties>
</object>
</objectgroup>
<objectgroup id="8" name="FrontSpouse"/>
<objectgroup id="9" name="AlwaysFrontSpouse"/>
<objectgroup id="10" name="AlwaysFront" visible="0" locked="1"/>
</map>
76 changes: 76 additions & 0 deletions NPCs/[TMX] MisterGinger/assets/SpouseRoomTristan.tmx
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.2" tiledversion="1.3.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="7" height="10" tilewidth="16" tileheight="16" infinite="0" nextlayerid="11" nextobjectid="5">
<tileset firstgid="1" name="townInterior" tilewidth="16" tileheight="16" tilecount="2176" columns="32">
<image source="townInterior.png" width="512" height="1088"/>
</tileset>
<tileset firstgid="2177" name="LemurCustom" tilewidth="16" tileheight="16" tilecount="224" columns="16">
<image source="LemurCustom.png" width="256" height="225"/>
</tileset>
<layer id="1" name="BackSpouse" width="7" height="10">
<data encoding="csv">
78,79,77,78,79,77,1,
110,111,109,110,111,109,1,
119,107,107,107,107,120,1,
200,201,200,201,200,201,1,
232,264,265,264,233,233,1,
264,249,250,251,265,265,1,
232,281,282,283,233,233,1,
232,264,265,264,265,233,1,
264,265,264,265,264,265,1,
1,1,1,1,1,1,1
</data>
</layer>
<layer id="2" name="BuildingsSpouse" width="7" height="10">
<data encoding="csv">
55,0,0,0,0,56,69,
87,75,75,75,75,88,69,
2231,493,494,495,369,0,69,
2247,525,526,527,401,2242,69,
0,676,0,0,587,588,69,
0,0,0,0,619,620,69,
0,0,0,0,1394,2244,69,
0,2233,0,0,0,0,69,
364,2249,402,352,1518,2255,0,
1,1,1,1,1,1,1
</data>
</layer>
<layer id="3" name="FrontSpouse" width="7" height="10">
<data encoding="csv">
311,2185,2186,279,412,0,0,
0,2201,2202,336,337,338,0,
0,0,0,0,0,2226,0,
0,0,0,0,555,556,0,
835,0,0,0,0,0,0,
0,0,0,0,0,2228,0,
0,0,0,0,0,0,0,
332,0,370,320,1486,2239,0,
0,0,0,0,0,167,168,
0,0,0,0,0,0,0
</data>
</layer>
<layer id="4" name="AlwaysFrontSpouse" width="7" height="10">
<data encoding="csv">
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
166,166,166,166,166,0,0,
0,0,0,0,0,0,0
</data>
</layer>
<objectgroup id="6" name="BackSpouse"/>
<objectgroup id="7" name="BuildingsSpouse">
<object id="3" name="TileData" x="16" y="64" width="16" height="16">
<properties>
<property name="Action" value="message &quot;MrGinger.1&quot;"/>
</properties>
</object>
</objectgroup>
<objectgroup id="8" name="FrontSpouse"/>
<objectgroup id="9" name="AlwaysFrontSpouse"/>
<objectgroup id="10" name="AlwaysFront" visible="0" locked="1"/>
</map>
Binary file added NPCs/[TMX] MisterGinger/assets/townInterior.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
44 changes: 22 additions & 22 deletions [BFAV] [JA] [PFM] So Many Horses/[BFAV] So Many Horses/content.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,167 +7,167 @@
"Types": [
{
"Type": "Draft Horse 1",
"Data": "1/5/Horseshoe/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Data": "1/5/Manure/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Sprites": {
"Adult": "assets/draft bay 1.png",
"Baby": "assets/draft bay 1 baby.png",
},
},
{
"Type": "Draft Horse 2",
"Data": "1/5/Horseshoe/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Data": "1/5/Manure/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Sprites": {
"Adult": "assets/draft bay 2.png",
"Baby": "assets/draft bay 2 baby.png",
},
},
{
"Type": "Draft Horse 3",
"Data": "1/5/Horseshoe/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Data": "1/5/Manure/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Sprites": {
"Adult": "assets/draft bay 3.png",
"Baby": "assets/draft bay 3 baby.png",
},
},
{
"Type": "Draft Horse 4",
"Data": "1/5/Horseshoe/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Data": "1/5/Manure/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Sprites": {
"Adult": "assets/draft black 1.png",
"Baby": "assets/draft black 1 baby.png",
},
},
{
"Type": "Draft Horse 5",
"Data": "1/5/Horseshoe/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Data": "1/5/Manure/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Sprites": {
"Adult": "assets/draft black 2.png",
"Baby": "assets/draft black 2 baby.png",
},
},
{
"Type": "Draft Horse 6",
"Data": "1/5/Horseshoe/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Data": "1/5/Manure/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Sprites": {
"Adult": "assets/draft black 3.png",
"Baby": "assets/draft black 3 baby.png",
},
},
{
"Type": "Draft Horse 7",
"Data": "1/5/Horseshoe/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Data": "1/5/Manure/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Sprites": {
"Adult": "assets/draft chestnut 1.png",
"Baby": "assets/draft chestnut 1 baby.png",
},
},
{
"Type": "Draft Horse 8",
"Data": "1/5/Horseshoe/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Data": "1/5/Manure/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Sprites": {
"Adult": "assets/draft chestnut 2.png",
"Baby": "assets/draft chestnut 2 baby.png",
},
},
{
"Type": "Draft Horse 9",
"Data": "1/5/Horseshoe/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Data": "1/5/Manure/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Sprites": {
"Adult": "assets/draft chestnut 3.png",
"Baby": "assets/draft chestnut 3 baby.png",
},
},
{
"Type": "Draft Horse 10",
"Data": "1/5/Horseshoe/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Data": "1/5/Manure/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Sprites": {
"Adult": "assets/draft dk grey 1.png",
"Baby": "assets/draft dk grey 1 baby.png",
},
},
{
"Type": "Draft Horse 11",
"Data": "1/5/Horseshoe/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Data": "1/5/Manure/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Sprites": {
"Adult": "assets/draft dk grey 2.png",
"Baby": "assets/draft dk grey 2 baby.png",
},
},
{
"Type": "Draft Horse 12",
"Data": "1/5/Horseshoe/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Data": "1/5/Manure/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Sprites": {
"Adult": "assets/draft dk grey 3.png",
"Baby": "assets/draft dk grey 3 baby.png",
},
},
{
"Type": "Draft Horse 13",
"Data": "1/5/Horseshoe/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Data": "1/5/Manure/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Sprites": {
"Adult": "assets/draft dun 1.png",
"Baby": "assets/draft dun 1 baby.png",
},
},
{
"Type": "Draft Horse 14",
"Data": "1/5/Horseshoe/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Data": "1/5/Manure/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Sprites": {
"Adult": "assets/draft dun 2.png",
"Baby": "assets/draft dun 2 baby.png",
},
},
{
"Type": "Draft Horse 15",
"Data": "1/5/Horseshoe/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Data": "1/5/Manure/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Sprites": {
"Adult": "assets/draft dun 3.png",
"Baby": "assets/draft dun 3 baby.png",
},
},
{
"Type": "Draft Horse 16",
"Data": "1/5/Horseshoe/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Data": "1/5/Manure/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Sprites": {
"Adult": "assets/draft lt grey 1.png",
"Baby": "assets/draft lt grey 1 baby.png",
},
},
{
"Type": "Draft Horse 17",
"Data": "1/5/Horseshoe/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Data": "1/5/Manure/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Sprites": {
"Adult": "assets/draft lt grey 2.png",
"Baby": "assets/draft lt grey 2 baby.png",
},
},
{
"Type": "Draft Horse 18",
"Data": "1/5/Horseshoe/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Data": "1/5/Manure/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Sprites": {
"Adult": "assets/draft lt grey 3.png",
"Baby": "assets/draft lt grey 3 baby.png",
},
},
{
"Type": "Draft Horse 19",
"Data": "1/5/Horseshoe/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Data": "1/5/Manure/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Sprites": {
"Adult": "assets/draft palomino 1.png",
"Baby": "assets/draft palomino 1 baby.png",
},
},
{
"Type": "Draft Horse 20",
"Data": "1/5/Horseshoe/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Data": "1/5/Manure/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Sprites": {
"Adult": "assets/draft palomino 2.png",
"Baby": "assets/draft palomino 2 baby.png",
},
},
{
"Type": "Draft Horse 21",
"Data": "1/5/Horseshoe/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Data": "1/5/Manure/Horse Hair/leafrustle/36/64/64/64/36/64/64/64/0/false/Barn/32/32/32/32/15/5/null/639/4000/Draft Horse/Barn",
"Sprites": {
"Adult": "assets/draft palomino 3.png",
"Baby": "assets/draft palomino 3 baby.png",
Expand All @@ -179,7 +179,7 @@
],
"AnimalShop": {
"Name": "Draft Horse",
"Description": "Adult Draft Horses produce Horseshoe each day. They may shed valuable horse hair on occasion, which can be used for cloth.",
"Description": "Adult Draft Horses produce manure each day. They may shed valuable horse hair on occasion, which can be used for cloth.",
"Price": 8000,
"Icon": "assets\\draft horse animal shop.png",
"Exclude": []
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Name": "[BFAV] So Many Horses",
"Author": "Ivycrowned",
"Version": "1.1.2",
"Version": "1.1.3",
"Description": "Adds Standardbred and Draft horses as farm animals.",
"UniqueID": "Ivycrowned.BFAVSoManyHorses",
"MinimumApiVersion": "2.5",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"Name": "Manure",
"Description": "Manure can be processed into fertilizer.",
"Category": "AnimalGoods",
"Edibility": -300,
"Price": 50,
"IsColored": false,
"Recipe": null,
"DisableWithMod": "BFAVBulls"
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 470365b

Please sign in to comment.