summaryrefslogtreecommitdiff
path: root/content
diff options
context:
space:
mode:
authortroido <troido@protonmail.com>2020-09-26 14:05:14 +0200
committertroido <troido@protonmail.com>2020-09-26 14:05:14 +0200
commit9b7e3d14b3f35163199ed704ae35544fa658931e (patch)
tree9ad3623420f34b48f538ff2ceca6e3a277f16758 /content
parent450cf9331803532cb0e3a002fec17d12be18abd6 (diff)
spawned entities are now saved but not spawned again until removed
Diffstat (limited to 'content')
-rw-r--r--content/encyclopediae/default_encyclopedia.json29
-rw-r--r--content/encyclopediae/npcs.json2
-rw-r--r--content/maps/begin.json2
-rw-r--r--content/maps/smallview.json2
4 files changed, 27 insertions, 8 deletions
diff --git a/content/encyclopediae/default_encyclopedia.json b/content/encyclopediae/default_encyclopedia.json
index 2c88f45..25e3d32 100644
--- a/content/encyclopediae/default_encyclopedia.json
+++ b/content/encyclopediae/default_encyclopedia.json
@@ -7,14 +7,13 @@
],
"flags": ["Floor"]
},
- "homeportal": {
- "arguments": [["dedup_id", "string"], ["allowed", "list", ["list", []]], ["dedup_priority", "int", 0]],
- "extract": {"allowed": ["Whitelist", "allowed"], "dedup_priority": ["Dedup", "priority"]},
+ "_homeportal": {
+ "arguments": [["allowed", "list", ["list", []]]],
+ "extract": {"allowed": ["Whitelist", "allowed"]},
"components": [
["RoomExit", {"destination": "_home+{player}", "dest_pos": ""}],
["Interactable", {"typ": "visit", "arg": "_home+{player}"}],
- ["Whitelist", {"allowed": ["arg", "allowed"]}],
- ["Dedup", {"id": ["arg", "dedup_id"], "priority": ["arg", "dedup_priority"]}]
+ ["Whitelist", {"allowed": ["arg", "allowed"]}]
],
"flags": ["Floor"]
},
@@ -65,6 +64,23 @@
}]
]
},
+ "singleton": {
+ "arguments": [["ent", "template"], ["clan", "string", ""]],
+ "components": [
+ ["Spawner", {
+ "template": ["arg", "ent"],
+ "amount": 1,
+ "clan": ["arg", "clan"],
+ "radius": 0
+ }],
+ ["Timer", {
+ "delay": 999999999,
+ "spread": 0.0,
+ "trigger": "spawn",
+ "target_time": 0
+ }]
+ ]
+ },
"closeddoor": {
"sprite": "closeddoor",
"height": 2,
@@ -221,5 +237,8 @@
"sprite": "blueplayer"
}}
}
+ },
+ "templates": {
+ "homeportal": ["singleton", {"ent": {"type": "_homeportal"}}]
}
}
diff --git a/content/encyclopediae/npcs.json b/content/encyclopediae/npcs.json
index 02f13ad..592417c 100644
--- a/content/encyclopediae/npcs.json
+++ b/content/encyclopediae/npcs.json
@@ -68,7 +68,7 @@
["MonsterAI", {
"view_distance": 3,
"move_chance": 0.08,
- "homesickness": 0.1
+ "homesickness": 0.01
}],
["Movable", {"cooldown": 3}],
["Faction", {"faction": "neutral"}]
diff --git a/content/maps/begin.json b/content/maps/begin.json
index e01e866..d8f8efe 100644
--- a/content/maps/begin.json
+++ b/content/maps/begin.json
@@ -116,7 +116,7 @@
{"type": "img", "kwargs": {"sprite": "stairdown"}},
"floor"
],
- "r": ["grass", "rabbit"],
+ "r": ["grass", {"type": "singleton", "kwargs": {"ent": {"type": "rabbit"}}}],
"3": [{
"type": "portal",
"kwargs": {"destination": "smallview", "destpos": "begin"}
diff --git a/content/maps/smallview.json b/content/maps/smallview.json
index 49f48b4..3ddd9ac 100644
--- a/content/maps/smallview.json
+++ b/content/maps/smallview.json
@@ -61,7 +61,7 @@
"type": "portal",
"kwargs": {"destination": "town", "destpos": "gate"}
}, "floor"],
- "3": [{"type": "homeportal", "kwargs": {"dedup_id": "homeportal"}, "save": true}, "floor", {"type": "img", "kwargs": {"sprite": "portal", "height": 1.0}}],
+ "3": ["homeportal", "floor", {"type": "img", "kwargs": {"sprite": "portal", "height": 1.0}}],
"4": [{
"type": "portal",
"kwargs": {"destination": "room"}