diff options
| author | troido <troido@protonmail.com> | 2020-09-21 02:33:19 +0200 |
|---|---|---|
| committer | troido <troido@protonmail.com> | 2020-09-21 02:33:19 +0200 |
| commit | 5ce9b012a7987f4085057f4f0b0af35e76810a7a (patch) | |
| tree | a99418b5aec06d6be28e22150bce85d3c40b8ee7 /content | |
| parent | b6a4c7b2d383755402e5e2c6f60d9a75a899b809 (diff) | |
| parent | 455867294cc849bff2c0829a7464e71e79a0dcae (diff) | |
Merge branch 'interact' into master
Diffstat (limited to 'content')
| -rw-r--r-- | content/encyclopediae/crops.json | 4 | ||||
| -rw-r--r-- | content/encyclopediae/default_encyclopedia.json | 10 | ||||
| -rw-r--r-- | content/encyclopediae/npcs.json | 15 | ||||
| -rw-r--r-- | content/maps/room.json | 2 |
4 files changed, 17 insertions, 14 deletions
diff --git a/content/encyclopediae/crops.json b/content/encyclopediae/crops.json index 2d2b5ce..29901d9 100644 --- a/content/encyclopediae/crops.json +++ b/content/encyclopediae/crops.json @@ -5,7 +5,7 @@ "name": "radishplant", "height": 0.5, "components": [ - ["Interactable", {"action": ["interaction", ["trigger", "die"]]}], + ["Interactable", {"typ": "trigger", "arg": "die"}], ["Loot", {"loot": ["list", [ ["list", [{"type": "radishseed"}, 0.92]], ["list", [{"type": "radishseed"}, 0.20]], @@ -136,7 +136,7 @@ "name": "carrotplant", "height": 1.0, "components": [ - ["Interactable", {"action": ["interaction", ["trigger", "die"]]}], + ["Interactable", {"typ": "trigger", "arg": "die"}], ["Loot", {"loot": ["list", [ ["list", [{"type": "carrotseed"}, 1.0]], ["list", [{"type": "carrot"}, 1.0]] diff --git a/content/encyclopediae/default_encyclopedia.json b/content/encyclopediae/default_encyclopedia.json index f6a3e48..d4f7094 100644 --- a/content/encyclopediae/default_encyclopedia.json +++ b/content/encyclopediae/default_encyclopedia.json @@ -12,7 +12,7 @@ "extract": {"allowed": ["Whitelist", "allowed"], "dedup_priority": ["Dedup", "priority"]}, "components": [ ["RoomExit", {"destination": "_home+{player}", "dest_pos": ""}], - ["Interactable", {"action": ["interaction", ["visit", "_home+{player}"]]}], + ["Interactable", {"typ": "visit", "arg": "_home+{player}"}], ["Whitelist", {"allowed": ["arg", "allowed"]}], ["Dedup", {"id": ["arg", "dedup_id"], "priority": ["arg", "dedup_priority"]}] ], @@ -69,7 +69,7 @@ "height": 2, "flags": ["Blocking"], "components": [ - ["Interactable", {"action": ["interaction", ["trigger", "change"]]}], + ["Interactable", {"typ": "trigger", "arg": "change"}], ["Build", {"obj": {"type": "opendoor", "save": false}}] ] }, @@ -78,7 +78,7 @@ "height": 0.8, "flags": ["Occupied"], "components": [ - ["Interactable", {"action": ["interaction", ["trigger", "change"]]}], + ["Interactable", {"typ": "trigger", "arg": "change"}], ["Build", {"obj": {"type": "closeddoor", "save": false}}] ] }, @@ -87,14 +87,14 @@ "height": 1, "flags": ["Occupied"], "components": [ - ["Interactable", {"action": ["interaction", ["say", "Good morning there, World"]]}] + ["Interactable", {"typ": "say", "arg": "Good morning there, World"}] ] }, "quarry": { "sprite": "quarry", "height": 2, "components": [ - ["Interactable", {"action": ["interaction", ["mine", "mining"]]}], + ["Interactable", {"typ": "mine", "arg": "mining"}], ["Minable", {"total": 20, "trigger": "loot"}], ["Loot", {"loot": ["list", [ ["list", [{"type": "stone"}, 1.0]] diff --git a/content/encyclopediae/npcs.json b/content/encyclopediae/npcs.json index bfaa6fe..00c45d6 100644 --- a/content/encyclopediae/npcs.json +++ b/content/encyclopediae/npcs.json @@ -79,18 +79,21 @@ "height": 1.5, "flags": ["Occupied"], "components": [ - ["Interactable", {"action": ["interaction", ["reply", "did you say '{}'?"]]}] + ["Interactable", {"typ": "say", "arg": "Hey there, welcome to Asciifarm"}] ] }, "trader": { "sprite": "human", "height": 1.5, "components": [ - ["Interactable", {"action": ["interaction", ["exchange", ["buy ", { - "pebble": [["radish", "radish"], ["pebble"]], - "radishseed": [["radish"], ["radishseed", "radishseed"]], - "carrotseed": [["radish"], ["carrotseed"]] - }]]]}] + ["Interactable", {"typ": "exchange", "arg": ["list", [ + "buy ", + ["list", [ + ["list", ["pebble", ["list", ["radish", "radish"]], ["list", ["pebble"]]]], + ["list", ["radishseed", ["list", ["radish"]], ["list", ["radishseed", "radishseed"]]]], + ["list", ["carrotseed", ["list", ["radish"]], ["list", ["carrotseed"]]]] + ]] + ]]}] ] } } diff --git a/content/maps/room.json b/content/maps/room.json index b923986..84201a0 100644 --- a/content/maps/room.json +++ b/content/maps/room.json @@ -13,7 +13,7 @@ " ~~,,,,.,,,,,,,,,,,~~~,,,,,,,,,,,,,,,,,,,,X", " X,,,,,.,,,,,,,,,,,~~~~,,,,,,T,,,,,,,,,,,,X", " X,,,,,.,,,,,,,,,,,,~~~,,,,,,,,,,,,,,,,,,,X", - " X,,,,,.,,,,,,,,,,,,~~~,,,,,T,,,,######,,,X", + " X,,,,,.,u,,,,,,,,,,~~~,,,,,T,,,,######,,,X", " X,,,,,.,,,,,,,,,,,,bbb,,,,,,,,,,#++++#,,,X", " X,,,t..............bbb..........D++++#,,,X", " X,,,,,.,,,,,,,,,,,,bbb,,,,,,,,,,#++++#,,,X", |