Skip to content

Commit

Permalink
goblinpedia and new items
Browse files Browse the repository at this point in the history
Varanus nests spawn interval increased from every 8 hours to once a day
Added Goblinpedia and its interactive manual
Added chest
Added input bin
Added ground shelf
Added wall shelf
Added crafter output storage
Added fiber rug
Added pole banner
Added window plant box

Fixed varanus not dropping items
Fixed Beast Tamer summons appearing in pet traders
  • Loading branch information
BrunoSupremo committed Feb 8, 2019
1 parent 27d2171 commit 902863a
Show file tree
Hide file tree
Showing 95 changed files with 1,210 additions and 136 deletions.
2 changes: 1 addition & 1 deletion components/monster_spawner/monster_spawner_component.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function SwampGoblins_Monster_Spawner:activate()
local json = radiant.entities.get_json(self)
self.monster = json.monster or "stonehearth:loot:gold"
self.player_id = json.player_id or "forest"
self.interval = json.interval or "8h"
self.interval = json.interval or "1d"

if not self._on_removed_from_world_listener then
self._on_removed_from_world_listener = radiant.events.listen(self._entity, 'stonehearth:on_removed_from_world', self, self.spawner_removed)
Expand Down
12 changes: 12 additions & 0 deletions data/commands/goblinpedia/goblinpedia.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"type": "command",
"name": "goblinpedia",
"display_name": "i18n(swamp_goblins:data.commands.goblinpedia.display_name)",
"description": "i18n(swamp_goblins:data.commands.goblinpedia.description)",
"icon": "file(goblinpedia.png)",
"ordinal": 9,
"action": "fire_event",
"event_name": "swamp_goblins:goblinpedia",
"event_data": {},
"visible_to_all_players": true
}
Binary file added data/commands/goblinpedia/goblinpedia.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions data/personality/dreams.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
{
"substitution_table": [
{
"namespace": "stonehearth",
"keys": {
"teacher": {
"type": "parametrized_value",
"entries": {
"swamp_goblins:kingdoms:firefly_clan": "Big G"
}
Expand Down
Binary file modified entities/construction/wooden_door/wooden_door.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified entities/construction/wooden_window_frame/wooden_window_frame.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions entities/containers/chest/chest.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"region": [
{
"min": { "x": -1, "y": 0, "z": -1 },
"max": { "x": 1, "y": 2, "z": 1 }
"max": { "x": 1, "y": 1, "z": 1 }
}
],
"adjacency_flags": [
Expand All @@ -28,24 +28,24 @@
"region": [
{
"min": { "x": -1, "y": 0, "z": -1 },
"max": { "x": 1, "y": 2, "z": 1 }
"max": { "x": 1, "y": 1, "z": 1 }
}
]
}
},
"entity_data": {
"stonehearth:net_worth": {
"value_in_gold": 10,
"value_in_gold": 3,
"rarity": "common",
"shop_info": {
"buyable": false,
"buyable": true,
"sellable": true,
"shopkeeper_level": 2,
"shopkeeper_type": "caravan"
}
},
"stonehearth:appeal": {
"appeal": 16
"appeal": 6
},
"stonehearth:item_quality": {
"variable_quality": true
Expand Down
Binary file modified entities/containers/chest/chest.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified entities/containers/chest/chest.qb
Binary file not shown.
4 changes: 2 additions & 2 deletions entities/containers/chest/chest_ghost.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"scale": 0.1
},
"mob": {
"model_origin": { "x": 0, "y": 0, "z": 0 },
"model_origin": { "x": -0.05, "y": 0, "z": 0 },
"region_origin": { "x": 0, "y": 0, "z": 0 },
"align_to_grid": [
"x",
Expand All @@ -27,7 +27,7 @@
"description": "i18n(swamp_goblins:entities.containers.chest.description)",
"icon": "file(chest.png)",
"category": "storage",
"material_tags": ["fiber", "containers", "furniture", "crafted", "crate", "leather", "stockpile_furniture"]
"material_tags": ["fiber", "wood", "containers", "furniture", "crafted", "crate", "stockpile_furniture"]
}
}
}
Binary file modified entities/containers/chest/chest_iconic.qb
Binary file not shown.
55 changes: 55 additions & 0 deletions entities/containers/input_bin_wood/input_bin_wood.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"type": "entity",
"mixins": "file(input_bin_wood_ghost.json)",
"components": {
"stonehearth:entity_forms": {
"iconic_form": "file(input_bin_wood_iconic.json)",
"ghost_form": "file(input_bin_wood_ghost.json)",
"placeable_on_ground": true
},
"destination": {
"region": [
{
"min": { "x": 0, "y": 0, "z": 0 },
"max": { "x": 2, "y": 1, "z": 2 }
}
]
},
"region_collision_shape": {
"region": [
{
"min": { "x": 0, "y": 0, "z": 0 },
"max": { "x": 2, "y": 2, "z": 2 }
}
]
},
"stonehearth:storage": {
"type": "input_crate",
"capacity": 12,
"render_contents": true,
"filter_list": "stonehearth:ui:input_box:filters",
"is_single_filter": true
},
"effect_list": {
"default": "/stonehearth/data/rigs/entities/containers/input_bin/effects/idle.json"
}
},
"entity_data": {
"stonehearth:net_worth": {
"value_in_gold": 4,
"rarity": "common",
"shop_info": {
"buyable": true,
"sellable": true,
"shopkeeper_level": 2,
"shopkeeper_type": "caravan"
}
},
"stonehearth:appeal": {
"appeal": 4
},
"stonehearth:item_quality": {
"variable_quality": true
}
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
29 changes: 29 additions & 0 deletions entities/containers/input_bin_wood/input_bin_wood_ghost.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"mixins": "stonehearth:mixins:placed_object",
"components": {
"model_variants": {
"default": {
"models": [
"file(input_bin_wood.qb)"
]
}
},
"mob": {
"model_origin": { "x": -0.5, "y": 0, "z": -0.5 },
"region_origin": { "x": 0.5, "y": 0, "z": 0.5 }
},
"render_info": {
"scale": 0.1,
"animation_table": "/stonehearth/data/rigs/entities/containers/input_bin/input_bin.json"
}
},
"entity_data": {
"stonehearth:catalog": {
"display_name": "i18n(stonehearth:entities.containers.input_bin_wood.input_bin_wood_ghost.display_name)",
"description": "i18n(stonehearth:entities.containers.input_bin_wood.input_bin_wood_ghost.description)",
"icon": "file(input_bin_wood.png)",
"category": "storage",
"material_tags": ["wood", "containers", "crafted", "furniture", "stockpile_furniture"]
}
}
}
22 changes: 22 additions & 0 deletions entities/containers/input_bin_wood/input_bin_wood_iconic.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"mixins": "stonehearth:mixins:item_properties",
"type": "entity",
"components": {
"model_variants": {
"default": {
"models": [
"file(input_bin_wood_iconic.qb)"
]
}
},
"mob": {
"model_origin": { "x": 0, "y": 0, "z": 0 }
}
},
"entity_data": {
"stonehearth:catalog": {
"is_item": true,
"category": "storage"
}
}
}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"type": "entity",
"mixins": "file(input_shelf_ground_wood_ghost.json)",
"components": {
"stonehearth:entity_forms": {
"iconic_form": "file(input_shelf_ground_wood_iconic.json)",
"ghost_form": "file(input_shelf_ground_wood_ghost.json)",
"placeable_on_ground": true
},
"destination": {
"region": [
{
"min": { "x": -1, "y": 0, "z": 0 },
"max": { "x": 2, "y": 2, "z": 1 }
}
],
"adjacency_flags": [
"front",
"back"
]
},
"region_collision_shape": {
"region": [
{
"min": { "x": -1, "y": 0, "z": 0 },
"max": { "x": 2, "y": 2, "z": 1 }
}
]
},
"stonehearth:storage": {
"type": "input_crate",
"capacity": 12,
"render_contents": true,
"filter_list": "stonehearth:ui:input_box:filters",
"is_single_filter": true
}
},
"entity_data": {
"stonehearth:net_worth": {
"value_in_gold": 5,
"rarity": "common",
"shop_info": {
"buyable": true,
"sellable": true,
"shopkeeper_level": 2,
"shopkeeper_type": "caravan"
}
},
"stonehearth:appeal": {
"appeal": 4
},
"stonehearth:item_quality": {
"variable_quality": true
}
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"mixins": "stonehearth:mixins:placed_object",
"components": {
"model_variants": {
"default": {
"models": [
"file(input_shelf_ground_wood.qb)"
]
}
},
"mob": {
"model_origin": { "x": 0, "y": 0, "z": 0 },
"region_origin": { "x": 0.5, "y": 0, "z": 0.5 }
},
"render_info": {
"scale": 0.1,
"animation_table": "/stonehearth/data/rigs/entities/containers/input_shelf/input_shelf.json"
},
"effect_list": {
"default": "/stonehearth/data/rigs/entities/containers/input_shelf/effects/idle.json"
}
},
"entity_data": {
"stonehearth:catalog": {
"display_name": "i18n(stonehearth:entities.containers.input_shelf_ground_wood.input_shelf_ground_wood_ghost.display_name)",
"description": "i18n(stonehearth:entities.containers.input_shelf_ground_wood.input_shelf_ground_wood_ghost.description)",
"icon": "file(input_shelf_ground_wood.png)",
"category": "storage",
"material_tags": ["wood", "containers", "crafted", "furniture", "stockpile_furniture"]
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"mixins": "stonehearth:mixins:item_properties",
"type": "entity",
"components": {
"model_variants": {
"default": {
"models": [
"file(input_shelf_ground_wood_iconic.qb)"
]
}
},
"mob": {
"model_origin": { "x": 0, "y": 0, "z": 0 }
}
},
"entity_data": {
"stonehearth:catalog": {
"is_item": true,
"category": "storage"
}
}
}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"type": "entity",
"mixins": "file(input_shelf_wall_wood_ghost.json)",
"components": {
"stonehearth:entity_forms": {
"iconic_form": "file(input_shelf_wall_wood_iconic.json)",
"ghost_form": "file(input_shelf_wall_wood_ghost.json)",
"placeable_on_walls": true
},
"destination": {
"region": [
{
"min": { "x": -1, "y": -2, "z": 0 },
"max": { "x": 2, "y": 2, "z": 1 }
}
],
"adjacency_flags": [
"front",
"left",
"right"
]
},
"region_collision_shape": {
"region": [
{
"min": { "x": -1, "y": 0, "z": 0 },
"max": { "x": 2, "y": 2, "z": 1 }
}
]
},
"stonehearth:storage": {
"type": "input_crate",
"capacity": 12,
"render_contents": true,
"filter_list": "stonehearth:ui:input_box:filters",
"is_single_filter": true
}
},
"entity_data": {
"stonehearth:net_worth": {
"value_in_gold": 4,
"rarity": "common",
"shop_info": {
"buyable": true,
"sellable": true,
"shopkeeper_level": 2,
"shopkeeper_type": "caravan"
}
},
"stonehearth:appeal": {
"appeal": 4
},
"stonehearth:item_quality": {
"variable_quality": true
}
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading

0 comments on commit 902863a

Please sign in to comment.