Skip to content

Commit

Permalink
fixed outfits
Browse files Browse the repository at this point in the history 
Fixed tree stumps
Fixed human trapper outfit
Fixed text "Promote a goblin" being used for humans

Added goblin trapper outfit
Added custom crab (from fisher mod) for the Swamp
  • Loading branch information
@BrunoSupremo
BrunoSupremo committed Jan 28, 2019
1 parent 9633c0e commit d82dded
Show file tree
Hide file tree
Showing 31 changed files with 354 additions and 25 deletions.
2 changes: 1 addition & 1 deletion data/biome/swamp_generation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@
"water_1":{
"none":2,
"swamp_goblins:plants:lilypad":2.4,
"swamp_goblins:plants:cattail":5,
"swamp_goblins:plants:cattail":4.9,
"swamp_goblins:plants:log":1.5,
"swamp_goblins:plants:giant_flower":1.25,
"swamp_goblins:trees:cypress:small":1,
Expand Down
2 changes: 1 addition & 1 deletion entities/gizmos/goblinpedia/goblinpedia.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"value_in_gold": 3,
"rarity": "common",
"shop_info": {
"buyable": true,
"buyable": false,
"sellable": true,
"shopkeeper_level": 1,
"shopkeeper_type": "caravan"
Expand Down
3 changes: 3 additions & 0 deletions entities/trees/bogger/bogger.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@
}
},
"entity_data": {
"stonehearth:stump_data": {
"stump_alias": "swamp_goblins:trees:bogger:small:stump"
},
"stonehearth:catalog": {
"display_name": "i18n(swamp_goblins:entities.trees.bogger.display_name)",
"description": "i18n(swamp_goblins:entities.trees.bogger.description)"
Expand Down
Binary file added entities/trees/bogger/bogger_stump.qb
View file
Binary file not shown.
40 changes: 40 additions & 0 deletions entities/trees/bogger/stump.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"mixins": "stonehearth:mixins:tree",
"type": "entity",
"components": {
"mob": {
"model_origin": {"x": -0.5, "y": 0, "z": 0.5 },
"region_origin": {"x": 0.5, "y": 0, "z": 0.5 }
},
"model_variants": {
"default": {
"models": [
{
"type": "one_of",
"items": [
"file(bogger_stump.qb)"
]
}
]
}
},
"stonehearth:resource_node": {
"resource": "stonehearth:resources:wood:oak_log",
"durability": 1
},
"region_collision_shape": {
"region": [
{
"min": {"x": -2, "y": 0, "z": -2 },
"max": {"x": 3, "y": 2, "z": 3 }
}
]
}
},
"entity_data": {
"stonehearth:catalog": {
"display_name": "i18n(swamp_goblins:entities.trees.stump.display_name)",
"description": "i18n(swamp_goblins:entities.trees.stump.description)"
}
}
}
3 changes: 3 additions & 0 deletions entities/trees/cypress/cypress_large.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@
}
},
"entity_data": {
"stonehearth:stump_data": {
"stump_alias": "swamp_goblins:trees:cypress:large:stump"
},
"stonehearth:catalog": {
"display_name": "i18n(swamp_goblins:entities.trees.cypress.display_name)",
"description": "i18n(swamp_goblins:entities.trees.cypress.description)"
Expand Down
40 changes: 40 additions & 0 deletions entities/trees/cypress/cypress_large_stump.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"mixins": "stonehearth:mixins:tree",
"type": "entity",
"components": {
"mob": {
"model_origin": { "x": -0.5, "y": 0, "z": 0.5 },
"region_origin": { "x": 0.5, "y": 0, "z": 0.5 }
},
"model_variants": {
"default": {
"models": [
{
"type": "one_of",
"items": [
"file(large_stump.qb)"
]
}
]
}
},
"stonehearth:resource_node": {
"resource": "stonehearth:resources:wood:oak_log",
"durability": 1
},
"region_collision_shape": {
"region": [
{
"min": {"x": -3, "y": 0, "z": -3 },
"max": {"x": 4, "y": 3, "z": 4 }
}
]
}
},
"entity_data": {
"stonehearth:catalog": {
"display_name": "i18n(swamp_goblins:entities.trees.stump.display_name)",
"description": "i18n(swamp_goblins:entities.trees.stump.description)"
}
}
}
3 changes: 3 additions & 0 deletions entities/trees/cypress/cypress_medium.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@
}
},
"entity_data": {
"stonehearth:stump_data": {
"stump_alias": "swamp_goblins:trees:cypress:medium:stump"
},
"stonehearth:catalog": {
"display_name": "i18n(swamp_goblins:entities.trees.cypress.display_name)",
"description": "i18n(swamp_goblins:entities.trees.cypress.description)"
Expand Down
40 changes: 40 additions & 0 deletions entities/trees/cypress/cypress_medium_stump.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"mixins": "stonehearth:mixins:tree",
"type": "entity",
"components": {
"mob": {
"model_origin": { "x": -0.5, "y": 0, "z": 0.5 },
"region_origin": { "x": 0.5, "y": 0, "z": 0.5 }
},
"model_variants": {
"default": {
"models": [
{
"type": "one_of",
"items": [
"file(medium_stump.qb)"
]
}
]
}
},
"stonehearth:resource_node": {
"resource": "stonehearth:resources:wood:oak_log",
"durability": 1
},
"region_collision_shape": {
"region": [
{
"min": {"x": -2, "y": 0, "z": -2 },
"max": {"x": 3, "y": 2, "z": 3 }
}
]
}
},
"entity_data": {
"stonehearth:catalog": {
"display_name": "i18n(swamp_goblins:entities.trees.stump.display_name)",
"description": "i18n(swamp_goblins:entities.trees.stump.description)"
}
}
}
Binary file added entities/trees/cypress/large_stump.qb
View file
Binary file not shown.
Binary file added entities/trees/cypress/medium_stump.qb
View file
Binary file not shown.
3 changes: 3 additions & 0 deletions entities/trees/dead/dead.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
}
},
"entity_data": {
"stonehearth:stump_data": {
"stump_alias": "swamp_goblins:trees:dead:small:stump"
},
"stonehearth:catalog": {
"display_name": "i18n(stonehearth:entities.trees.oak_tree.small_oak_tree.display_name)",
"description": "i18n(stonehearth:entities.trees.oak_tree.small_oak_tree.description)",
Expand Down
3 changes: 3 additions & 0 deletions entities/trees/dead/dead_large.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@
}
},
"entity_data": {
"stonehearth:stump_data": {
"stump_alias": "swamp_goblins:trees:dead:large:stump"
},
"stonehearth:catalog": {
"display_name": "i18n(stonehearth:entities.trees.oak_tree.large_oak_tree.display_name)",
"description": "i18n(stonehearth:entities.trees.oak_tree.large_oak_tree.description)",
Expand Down
44 changes: 44 additions & 0 deletions entities/trees/dead/dead_large_stump.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"mixins": "stonehearth:mixins:tree",
"type": "entity",
"components": {
"model_variants": {
"default": {
"models": [
"file(dead_large_stump.qb)"
]
}
},
"render_info": {
"scale": 0.5
},
"stonehearth:resource_node": {
"resource": "stonehearth:resources:wood:oak_log"
},
"mob": {
"region_origin": { "x": 0.5, "y": 0, "z": 0.5 }
},
"destination": {
"region": [
{
"min": { "x": -3, "y": 0, "z": -3 },
"max": { "x": 4, "y": 1, "z": 4 }
}
]
},
"region_collision_shape": {
"region": [
{
"min": { "x": -3, "y": 0, "z": -3 },
"max": { "x": 4, "y": 3, "z": 4 }
}
]
}
},
"entity_data": {
"stonehearth:catalog": {
"display_name": "i18n(swamp_goblins:entities.trees.stump.display_name)",
"description": "i18n(swamp_goblins:entities.trees.stump.description)"
}
}
}
Binary file added entities/trees/dead/dead_large_stump.qb
View file
Binary file not shown.
3 changes: 3 additions & 0 deletions entities/trees/dead/dead_medium.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@
}
},
"entity_data": {
"stonehearth:stump_data": {
"stump_alias": "swamp_goblins:trees:dead:medium:stump"
},
"stonehearth:catalog": {
"display_name": "i18n(stonehearth:entities.trees.oak_tree.medium_oak_tree.display_name)",
"description": "i18n(stonehearth:entities.trees.oak_tree.medium_oak_tree.description)",
Expand Down
45 changes: 45 additions & 0 deletions entities/trees/dead/dead_medium_stump.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"mixins": "stonehearth:mixins:tree",
"type": "entity",
"components": {
"render_info": {
"scale": 0.5
},
"model_variants": {
"default": {
"models": [
"file(dead_medium_stump.qb)"
]
}
},
"stonehearth:resource_node": {
"resource": "stonehearth:resources:wood:oak_log"
},
"mob": {
"model_origin": { "x": 0, "y": 0, "z": 0 },
"region_origin": { "x": 0.5, "y": 0, "z": 0.5 }
},
"destination": {
"region": [
{
"min": { "x": -2, "y": 0, "z": -2 },
"max": { "x": 3, "y": 1, "z": 3 }
}
]
},
"region_collision_shape": {
"region": [
{
"min": { "x": -2, "y": 0, "z": -2 },
"max": { "x": 3, "y": 2, "z": 3 }
}
]
}
},
"entity_data": {
"stonehearth:catalog": {
"display_name": "i18n(swamp_goblins:entities.trees.stump.display_name)",
"description": "i18n(swamp_goblins:entities.trees.stump.description)"
}
}
}
Binary file added entities/trees/dead/dead_medium_stump.qb
View file
Binary file not shown.
48 changes: 48 additions & 0 deletions entities/trees/dead/dead_stump.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"mixins": [
"stonehearth:mixins:tree",
"stonehearth:mixins:align_to_grid"
],
"type": "entity",
"components": {
"render_info": {
"scale": 0.333
},
"model_variants": {
"default": {
"models": [
"file(dead_stump.qb)"
]
}
},
"stonehearth:resource_node": {
"resource": "stonehearth:resources:wood:oak_log"
},
"mob": {
"model_origin": { "x": 0, "y": 0, "z": 0 },
"region_origin": { "x": 0, "y": 0, "z": 0 }
},
"destination": {
"region": [
{
"min": { "x": -2, "y": 0, "z": -2 },
"max": { "x": 2, "y": 1, "z": 2 }
}
]
},
"region_collision_shape": {
"region": [
{
"min": {"x": -2, "y": 0, "z": -2 },
"max": {"x": 2, "y": 2, "z": 2 }
}
]
}
},
"entity_data": {
"stonehearth:catalog": {
"display_name": "i18n(swamp_goblins:entities.trees.stump.display_name)",
"description": "i18n(swamp_goblins:entities.trees.stump.description)"
}
}
}
Binary file added entities/trees/dead/dead_stump.qb
View file
Binary file not shown.
Binary file added jobs/scavenger/scavenger_helmet/female_helmet.qb
View file
Binary file not shown.
Binary file added jobs/scavenger/scavenger_helmet/male_helmet.qb
View file
Binary file not shown.
14 changes: 14 additions & 0 deletions jobs/scavenger/scavenger_helmet/scavenger_helmet.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,20 @@
"components": {
"model_variants": {
"default": {
"layer": "hat",
"transparent": "true",
"models": [
"file(male_helmet.qb)"
]
},
"female": {
"layer": "hat",
"transparent": "true",
"models": [
"file(female_helmet.qb)"
]
},
"firefly_goblin": {
"layer": "hat",
"transparent": "true",
"models": [
Expand Down
Binary file added jobs/scavenger/scavenger_outfit/male_outfit.qb
View file
Binary file not shown.
14 changes: 14 additions & 0 deletions jobs/scavenger/scavenger_outfit/scavenger_outfit.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,20 @@
"components": {
"model_variants": {
"default": {
"layer": "armor",
"transparent": "true",
"models": [
"file(male_outfit.qb)"
]
},
"female": {
"layer": "armor",
"transparent": "true",
"models": [
"file(scavenger_outfit.qb)"
]
},
"firefly_goblin": {
"layer": "armor",
"transparent": "true",
"models": [
Expand Down
Loading

0 comments on commit d82dded

Please sign in to comment.