diff options
| -rw-r--r-- | content/encyclopediae/crops.json | 23 | ||||
| -rw-r--r-- | content/encyclopediae/default_encyclopedia.json | 24 | ||||
| -rw-r--r-- | content/encyclopediae/npcs.json | 11 | ||||
| -rw-r--r-- | content/maps/begin.json | 2 | ||||
| -rw-r--r-- | content/maps/room.json | 2 | ||||
| -rw-r--r-- | content/maps/town.json | 29 |
6 files changed, 67 insertions, 24 deletions
diff --git a/content/encyclopediae/crops.json b/content/encyclopediae/crops.json index 29901d9..7e493b3 100644 --- a/content/encyclopediae/crops.json +++ b/content/encyclopediae/crops.json @@ -133,13 +133,15 @@ }, "carrotplant": { "sprite": "smallplant", - "name": "carrotplant", + "name": "cottonplant", "height": 1.0, "components": [ ["Interactable", {"typ": "trigger", "arg": "die"}], ["Loot", {"loot": ["list", [ - ["list", [{"type": "carrotseed"}, 1.0]], - ["list", [{"type": "carrot"}, 1.0]] + ["list", [{"type": "cottonseed"}, 0.92]], + ["list", [{"type": "cottonseed"}, 0.20]], + ["list", [{"type": "cotton"}, 0.8]], + ["list", [{"type": "cotton"}, 0.4]] ]]}] ], "flags": ["Occupied"] @@ -154,11 +156,18 @@ "radishes": {"sprite": "food", "name": "radish", "entity": "radish", "action": ["eat", 3]}, "eldritch_radish": {"sprite": "food", "name": "eldritch_radish", "action": ["eat", 20]}, "carrotseed": {"sprite": "seed", "action": ["build", ["plantedcarrotseed", ["Floor", "Soil"], ["Occupied", "Blocking"]]]}, - "carrot": {"sprite": "food", "action": ["eat", 5]} + "carrot": {"sprite": "food", "action": ["eat", 5]}, + "cottonseed": {"sprite": "seed", "action": ["build", ["plantedcottonseed", ["Floor", "Soil"], ["Occupied", "Blocking"]]]}, + "cotton": {"sprite": "cotton"}, + "cottonyarn": {"sprite": "cottonyarn"}, + "cottoncloth": {"sprite": "cottoncloth"} }, "templates":{ - "plantedcarrotseed": ["plantedseed", {"delay": 60, "next": "carrotseedling"}], - "carrotseedling": ["seedling", {"delay": 60, "next": "youngcarrotplant"}], - "youngcarrotplant": ["youngplant", {"crop": "carrot", "delay": 60, "next": "carrotplant"}] + "plantedcarrotseed": ["plantedseed", {"delay": 1800, "next": "carrotseedling"}], + "carrotseedling": ["seedling", {"delay": 3000, "next": "youngcarrotplant"}], + "youngcarrotplant": ["youngplant", {"crop": "carrot", "delay": 6000, "next": "carrotplant"}], + "plantedcottonseed": ["plantedseed", {"delay": 6000, "next": "cottonseedling"}], + "cottonseedling": ["seedling", {"delay": 18000, "next": "youngcottonplant"}], + "youngcottonplant": ["youngplant", {"crop": "cotton", "delay": 36000, "next": "cottonplant"}] } } diff --git a/content/encyclopediae/default_encyclopedia.json b/content/encyclopediae/default_encyclopedia.json index d4f7094..1317d85 100644 --- a/content/encyclopediae/default_encyclopedia.json +++ b/content/encyclopediae/default_encyclopedia.json @@ -100,6 +100,30 @@ ["list", [{"type": "stone"}, 1.0]] ]]}] ] + }, + "spinningwheel": { + "sprite": "spinningwheel", + "height": 1.0, + "components": [ + ["Interactable", {"typ": "exchange", "arg": ["list", [ + "spin ", + ["list", [ + ["list", ["cotton yarn", ["list", ["cotton", "cotton"]], ["list", ["cottonyarn"]]]] + ]] + ]]}] + ] + }, + "loom": { + "sprite": "loom", + "height": 1.0, + "components": [ + ["Interactable", {"typ": "exchange", "arg": ["list", [ + "weave ", + ["list", [ + ["list", ["cotton cloth", ["list", ["cottonyarn", "cottonyarn", "cottonyarn", "cottonyarn", "cottonyarn"]], ["list", ["cottoncloth"]]]] + ]] + ]]}] + ] } }, "items": { diff --git a/content/encyclopediae/npcs.json b/content/encyclopediae/npcs.json index 26c2c4a..ffc60cf 100644 --- a/content/encyclopediae/npcs.json +++ b/content/encyclopediae/npcs.json @@ -91,9 +91,16 @@ ["list", [ ["list", ["pebble", ["list", ["radish", "radish"]], ["list", ["pebble"]]]], ["list", ["radishseed", ["list", ["radish"]], ["list", ["radishseed", "radishseed"]]]], - ["list", ["carrotseed", ["list", ["radish"]], ["list", ["carrotseed"]]]] + ["list", ["carrotseed", ["list", ["radish"]], ["list", ["carrotseed"]]]], + ["list", ["cottonseed", ["list", ["stone"]], ["list", ["cottonseed"]]]] ]] - ]]}] + ]]}], + ["MonsterAI", { + "view_distance": 1, + "move_chance": 0.01, + "homesickness": 0.3 + }], + ["Movable", {"cooldown": 3}] ] }, "toolsmith": { diff --git a/content/maps/begin.json b/content/maps/begin.json index 36ca8ac..2fabb3a 100644 --- a/content/maps/begin.json +++ b/content/maps/begin.json @@ -41,7 +41,7 @@ ",~~~~~,,,,'..''',,,,,,,,,,,,,,,,,,,,,,,,,,'''''''',,,,,,,,,,,,'1", ",~~~~~,,,,''.''',,,,,,,,,,,,,,,,,,,,,,,,,,'''''''',,,,,,,,,,,,'1", ",~~~~~,,,,,'..'',,,,,,,,,,,,,,,,,,,,,,,,,,'''''''',,,,,,,,,,,,'1", - ",~~~~~,,,,,''.'E,,,,,,,,,,,,,,,,,,,,,,,,,,'''T'''',,,,,,,,,,,,'1", + ",~~~~~,,,,,''.'',,,,,,,,,,,,,,,,,,,,,,,,,,'''T'''',,,,,,,,,,,,'1", ",~~~~~,,,,,'..''''''#####################''''''''',,,,,,,,,,,,'1", ",~~~~~,,,,,''..'''''#+++++++++++++#+++++#''''''''',,,,,,,,,,,,'1", ",~~~~~'''''''..'''.'#+++++++++++++#+++++#''''''''',,,,,,,,,,,,'1", diff --git a/content/maps/room.json b/content/maps/room.json index 84201a0..b13a951 100644 --- a/content/maps/room.json +++ b/content/maps/room.json @@ -15,7 +15,7 @@ " X,,,,,.,,,,,,,,,,,,~~~,,,,,,,,,,,,,,,,,,,X", " X,,,,,.,u,,,,,,,,,,~~~,,,,,T,,,,######,,,X", " X,,,,,.,,,,,,,,,,,,bbb,,,,,,,,,,#++++#,,,X", - " X,,,t..............bbb..........D++++#,,,X", + " X,,,...............bbb..........D++++#,,,X", " X,,,,,.,,,,,,,,,,,,bbb,,,,,,,,,,#++++#,,,X", " X,,,,,.,,,,,,,,,,,,~~~,,,T,,,T,,#++++#,,,X", " X,,,,,.,,,,,,,,,,,,~~~,,,,,,,,,,######,,,X", diff --git a/content/maps/town.json b/content/maps/town.json index cd75e51..7a74be3 100644 --- a/content/maps/town.json +++ b/content/maps/town.json @@ -39,22 +39,22 @@ ",h,,,,,,,,,,,,,,,,,======.....................,,,,,,,,,,,,,,,,h,", ",h,,,,,,,,,,,,,,,,,======.....................,,,,,,,,,,,,,,,,h,", ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,,,,,,,,...,,,,,,,,,,,,,,,,h,", - ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,,,,,,,,...,,,,,,,,,,,,,,,,h,", - ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,,,,,,,,...,,,,,,,,,,,,,,,,h,", - ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,,,,,,,,...,,,,,,,,,,,,,,,,h,", - ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,,,,,,,,...,,,,,,,,,,,,,,,,h%", - ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,,,,,,,,....................%", - ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,,,,,,,,....................%", + ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,######,...,,,,,,,,,,,,,,,,h,", + ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,#++++#,...,,,,,,,,,,,,,,,,h,", + ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,#t+++#,...,,,,,,,,,,,,,,,,h,", + ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,#+++++....,,,,,,,,,,,,,,,,h%", + ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,#++++#,....................%", + ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,######,....................%", ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,,,,,,,,....................%", ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,,,,,,,,....................%", ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,,,,,,,,...,,,,,,,,,..,,,,,h%", - ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,,,,,,,,...,,,,,####++##,,,h,", - ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,,,,,,,,...,,,,,#++++++#,,,h,", - ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,,,,,,,,...,,,,,#++++++#,,,h,", - ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,,,,,,,,...,,,,,#++++++#,,,h,", - ",h,,,,,,,,,,,,,,,,,~~~~~~~,,,,,,,,,,,,,,,,,...,,,,,#++++++#,,,h,", - ",h,,,,,,,,,,,,,,,,,~~~~~~~~~~~,,,,,,,,,,,,,...,,,,,#+++S++#,,,h,", - ",h,,,,,,,,,,,,,,,,,~~~~~~~~~~~~~~,,,,,,,,,,...,,,,,#++++++#,,,h,", + ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,#######,...,,,,,####+###,,,h,", + ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,#+++++#,...,,,,,#++++++#,,,h,", + ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,#4++++#,...,,,,,#++++++#,,,h,", + ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,#++++++....,,,,,#++++++#,,,h,", + ",h,,,,,,,,,,,,,,,,,~~~~~~~,,,,,,,,,#+++++#,...,,,,,#++++++#,,,h,", + ",h,,,,,,,,,,,,,,,,,~~~~~~~~~~~,,,,,#+++5+#,...,,,,,#+++S++#,,,h,", + ",h,,,,,,,,,,,,,,,,,~~~~~~~~~~~~~~,,#######,...,,,,,#++++++#,,,h,", ",h,,,,,,,,,,,,,,,,,~~~~~~~~~~~~~~~~~,,,,,,,...,,,,,########,,,h,", ",h,,,,,,,,,,,,,,,,,,~~~~~~~~~~~~~~~~~~~~~~,...,,,,,,,,,,,,,,,,h,", ",h,,,,,,,,,,,,,,,,,,,~~~~~~~~~~~~~~~~~~~~~~===~~~,,,,,,,,,,,,,h,", @@ -90,6 +90,9 @@ }, "ground"], "r": ["grass", "rabbit"], "S": ["floor", "toolsmith"], + "t": ["floor", "trader"], + "4": ["floor", "loom"], + "5": ["floor", "spinningwheel"], " ": [] } } |