From bd1da23cf18960b36f8683c09899044d64b4bd83 Mon Sep 17 00:00:00 2001 From: troido Date: Thu, 21 May 2020 12:25:36 +0200 Subject: made Talk its own component/system instead of part of interact --- content/encyclopediae/default_encyclopedia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'content/encyclopediae/default_encyclopedia.json') diff --git a/content/encyclopediae/default_encyclopedia.json b/content/encyclopediae/default_encyclopedia.json index 18cf967..fdaa42f 100644 --- a/content/encyclopediae/default_encyclopedia.json +++ b/content/encyclopediae/default_encyclopedia.json @@ -22,7 +22,7 @@ "arguments": [["health", "int", 100]], "components": [ ["Health", {"health": ["arg", "health"], "maxhealth": 100}], - ["Loot", {"loot": ["list", [{"type": "stone"}]]}] + ["Loot", {"loot": ["list", [["list", [{"type": "stone"}, 1.0]]]]}] ], "sprite": "builtwall", "height": 2, @@ -87,7 +87,7 @@ "height": 1, "flags": ["Occupied"], "components": [ - ["Interactable", {"action": ["interaction", ["say", "Good morning there, World"]]}] + ["Talkable", {"text": "Good morning there, World"}] ] }, "quarry": { -- cgit From 5eda37efbd1b34851364923069c0c3effdc32ca8 Mon Sep 17 00:00:00 2001 From: troido Date: Sun, 20 Sep 2020 23:33:13 +0200 Subject: create interactions from parameter instead of json --- content/encyclopediae/default_encyclopedia.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'content/encyclopediae/default_encyclopedia.json') diff --git a/content/encyclopediae/default_encyclopedia.json b/content/encyclopediae/default_encyclopedia.json index fdaa42f..9a9b526 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}}] ] }, @@ -94,7 +94,7 @@ "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]] -- cgit From 92e437e50498f7705e33a556535ba39a2b918f9d Mon Sep 17 00:00:00 2001 From: troido Date: Mon, 21 Sep 2020 00:59:38 +0200 Subject: made talk and reply a form of interact again --- content/encyclopediae/default_encyclopedia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'content/encyclopediae/default_encyclopedia.json') diff --git a/content/encyclopediae/default_encyclopedia.json b/content/encyclopediae/default_encyclopedia.json index 9a9b526..d4f7094 100644 --- a/content/encyclopediae/default_encyclopedia.json +++ b/content/encyclopediae/default_encyclopedia.json @@ -87,7 +87,7 @@ "height": 1, "flags": ["Occupied"], "components": [ - ["Talkable", {"text": "Good morning there, World"}] + ["Interactable", {"typ": "say", "arg": "Good morning there, World"}] ] }, "quarry": { -- cgit