From d82dded108ce22b7f5af3f37dbff2e086a5f4391 Mon Sep 17 00:00:00 2001 From: Bruno Date: Mon, 28 Jan 2019 21:49:10 -0200 Subject: [PATCH] fixed outfits 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 --- data/biome/swamp_generation.json | 2 +- entities/gizmos/goblinpedia/goblinpedia.json | 2 +- entities/trees/bogger/bogger.json | 3 ++ entities/trees/bogger/bogger_stump.qb | Bin 0 -> 445 bytes entities/trees/bogger/stump.json | 40 +++++++++++++++ entities/trees/cypress/cypress_large.json | 3 ++ .../trees/cypress/cypress_large_stump.json | 40 +++++++++++++++ entities/trees/cypress/cypress_medium.json | 3 ++ .../trees/cypress/cypress_medium_stump.json | 40 +++++++++++++++ entities/trees/cypress/large_stump.qb | Bin 0 -> 654 bytes entities/trees/cypress/medium_stump.qb | Bin 0 -> 265 bytes entities/trees/dead/dead.json | 3 ++ entities/trees/dead/dead_large.json | 3 ++ entities/trees/dead/dead_large_stump.json | 44 ++++++++++++++++ entities/trees/dead/dead_large_stump.qb | Bin 0 -> 4753 bytes entities/trees/dead/dead_medium.json | 3 ++ entities/trees/dead/dead_medium_stump.json | 45 ++++++++++++++++ entities/trees/dead/dead_medium_stump.qb | Bin 0 -> 1649 bytes entities/trees/dead/dead_stump.json | 48 ++++++++++++++++++ entities/trees/dead/dead_stump.qb | Bin 0 -> 3510 bytes .../scavenger_helmet/female_helmet.qb | Bin 0 -> 9292 bytes .../scavenger/scavenger_helmet/male_helmet.qb | Bin 0 -> 9292 bytes .../scavenger_helmet/scavenger_helmet.json | 14 +++++ .../scavenger/scavenger_outfit/male_outfit.qb | Bin 0 -> 5068 bytes .../scavenger_outfit/scavenger_outfit.json | 14 +++++ .../trapper_outfit/trapper_outfit.json | 13 +++++ .../trapper_outfit/trapper_outfit_goblin.qb | Bin 0 -> 26482 bytes locales/en.json | 14 +++-- manifest.json | 38 ++++++++------ .../entities/critters/crab/crab.qb | Bin 0 -> 942 bytes swamp_biome_selected/manifest.json | 7 +-- 31 files changed, 354 insertions(+), 25 deletions(-) create mode 100644 entities/trees/bogger/bogger_stump.qb create mode 100644 entities/trees/bogger/stump.json create mode 100644 entities/trees/cypress/cypress_large_stump.json create mode 100644 entities/trees/cypress/cypress_medium_stump.json create mode 100644 entities/trees/cypress/large_stump.qb create mode 100644 entities/trees/cypress/medium_stump.qb create mode 100644 entities/trees/dead/dead_large_stump.json create mode 100644 entities/trees/dead/dead_large_stump.qb create mode 100644 entities/trees/dead/dead_medium_stump.json create mode 100644 entities/trees/dead/dead_medium_stump.qb create mode 100644 entities/trees/dead/dead_stump.json create mode 100644 entities/trees/dead/dead_stump.qb create mode 100644 jobs/scavenger/scavenger_helmet/female_helmet.qb create mode 100644 jobs/scavenger/scavenger_helmet/male_helmet.qb create mode 100644 jobs/scavenger/scavenger_outfit/male_outfit.qb create mode 100644 jobs/trapper/trapper_outfit/trapper_outfit.json create mode 100644 jobs/trapper/trapper_outfit/trapper_outfit_goblin.qb create mode 100644 swamp_biome_selected/entities/critters/crab/crab.qb diff --git a/data/biome/swamp_generation.json b/data/biome/swamp_generation.json index f20b7f2..7e4c66a 100644 --- a/data/biome/swamp_generation.json +++ b/data/biome/swamp_generation.json @@ -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, diff --git a/entities/gizmos/goblinpedia/goblinpedia.json b/entities/gizmos/goblinpedia/goblinpedia.json index 2d9fac7..cba73f8 100644 --- a/entities/gizmos/goblinpedia/goblinpedia.json +++ b/entities/gizmos/goblinpedia/goblinpedia.json @@ -21,7 +21,7 @@ "value_in_gold": 3, "rarity": "common", "shop_info": { - "buyable": true, + "buyable": false, "sellable": true, "shopkeeper_level": 1, "shopkeeper_type": "caravan" diff --git a/entities/trees/bogger/bogger.json b/entities/trees/bogger/bogger.json index b96ab9a..432fbad 100644 --- a/entities/trees/bogger/bogger.json +++ b/entities/trees/bogger/bogger.json @@ -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)" diff --git a/entities/trees/bogger/bogger_stump.qb b/entities/trees/bogger/bogger_stump.qb new file mode 100644 index 0000000000000000000000000000000000000000..9c4312cf40ee06acd535bca95e5a977087aa0afd GIT binary patch literal 445 zcmZQ%WB>yw1!uG5CYBhm1G!8<45I)3|NkE(3!_175b$ue0E1}+1v`2~~2qL1sLONeLY@Cn@A0Yt?50;soxt;qdio`+CHaw%sHLP)jO^wd_;t{8pVh95-#;z)`ir?|9RBSJ?oxGuc^=B(jK0( y+^2AHUfjBnp0envr%#XimP}{wnd$pDlkeyK_-E9`=_$uW?>pBsMrK+w{_>u30R#8| literal 0 HcmV?d00001 diff --git a/entities/trees/cypress/medium_stump.qb b/entities/trees/cypress/medium_stump.qb new file mode 100644 index 0000000000000000000000000000000000000000..42c2e9220e7afa60044272ed6e86ed3fb09bc109 GIT binary patch literal 265 zcmZQ%WB>yw1!oK7rlw?;=EfIf=B37$6s4xJ0;QOM7)1a3|NlQoC5#5K3o^sNVjwmQ upo@X{Fbq@EP?`E4hCyO5d2|}2#>3eHtQI7Pt`?VhFmae37$2q|#s>fvFi2_u literal 0 HcmV?d00001 diff --git a/entities/trees/dead/dead.json b/entities/trees/dead/dead.json index b9f27e0..e2dfd94 100644 --- a/entities/trees/dead/dead.json +++ b/entities/trees/dead/dead.json @@ -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)", diff --git a/entities/trees/dead/dead_large.json b/entities/trees/dead/dead_large.json index 2c4d7dd..f751888 100644 --- a/entities/trees/dead/dead_large.json +++ b/entities/trees/dead/dead_large.json @@ -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)", diff --git a/entities/trees/dead/dead_large_stump.json b/entities/trees/dead/dead_large_stump.json new file mode 100644 index 0000000..528664c --- /dev/null +++ b/entities/trees/dead/dead_large_stump.json @@ -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)" + } + } +} \ No newline at end of file diff --git a/entities/trees/dead/dead_large_stump.qb b/entities/trees/dead/dead_large_stump.qb new file mode 100644 index 0000000000000000000000000000000000000000..f166b0ef45a0d7f18dd38f89b7762e8b7d2aec68 GIT binary patch literal 4753 zcmeIzJx;_h5Cveiq2xdm)UmS?dAwI&|&)lcs?^^vFeTS{uV{fG6OXlUZ`|)A$!ZY6K(Rwem z`0hD1_UaquHPWdw^YU68d>FjiyWjFtd?@}1@!^Q?93R>rAwJ~GR2@DHUF~Pg4LuvN zYW^rzoXZbR(X2r?wN7>6!>ECudb7qjtNpBXEsw;3_^_pE`G^mb<85Cl+=s5nxJ)U@FO+#;vp1SvTOHJ3?YJXW6a*#cawu(X<;ng3_k_IA5j zoMyjdPP2rpZzXB-%F*B#+O@ja6Y70j&qY~Z~1%}z5d^5qwj79*4#DwW$wGr*|Q6MyRP@>+UpL#>Ez4+ literal 0 HcmV?d00001 diff --git a/entities/trees/dead/dead_stump.json b/entities/trees/dead/dead_stump.json new file mode 100644 index 0000000..1114ee3 --- /dev/null +++ b/entities/trees/dead/dead_stump.json @@ -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)" + } + } +} \ No newline at end of file diff --git a/entities/trees/dead/dead_stump.qb b/entities/trees/dead/dead_stump.qb new file mode 100644 index 0000000000000000000000000000000000000000..ce2c6233944ed79a157494716432b0e7cdd3ce8b GIT binary patch literal 3510 zcmd6jv5f*T6ht9_h>9*CCWQtl0O^7gPz@CjQU@``kQfGT(396+y9+GKO6CvW&*S+X z4hOgIzdZD4{kQpDO|JjP*QI(+DQVkPTHk#3lS=EpTm3Du>Q%{mr!61(^wn>hziYm) zcZlxodfvAFQO-~Hqs)EvIXg2f7t`cLhPn%$p08+UZ|V{8UC*2QpN_l4rCd2vnn_%# zAN8Vn+w!Gs%5VQXe~H(fO?i1A_S@U?J&~tpk+*eSb&fjD`*l3CnN?MGdyt_fZ&sBI zwSDu|SZ}$@)-`zf3OsliW&L=yW>~gZx$;NL#Ch+$1^f_nG_cy;V+$`mNyuWU7 z_%yFITw$UHclg7dK&lyOuVg9K*DczL;!9`hHPRk+HvgM6$NF$z@vv@&P9nF0gYV&@ zw+Poc(piKX#h1>$zIqJRb-em7otxWtuE#lSy63e#PI0-l*NSo-FMZ_BFYSTfMOWf_ z52aeZFFd>+E}W>w9Pcyt-b%6KJucyW-|_VB`C9B;k82!qUdvkZ)GTY17cXJ|4qx&6Yfp-I(reYH-^InnQ4RKu-34czh**hQ0QE7Fy8 z1y6C53n!|vC_d8Hz%Dxh=|dJd6%N{paEB%%)B2xS^cA^19DEN~+T@$p%6CrmyBEc` z_B3$IPXJxv^>!r#lk@1M=ABo=&E+(Ov`3wt?xpMHr#DXgs|mPPJl31C_E>xLLLM(Y P5tlsNIql{0aC`k1Yvlf; literal 0 HcmV?d00001 diff --git a/jobs/scavenger/scavenger_helmet/male_helmet.qb b/jobs/scavenger/scavenger_helmet/male_helmet.qb new file mode 100644 index 0000000000000000000000000000000000000000..b71bea81028d8616495d6320cf47abe82e9030e2 GIT binary patch literal 9292 zcmeH{F-`FbF2^d6%XrX=p=G0IQSke zdW&$KBb`OKQGDs_>#N65UB|2c(z&^P=X#vOrh8t?;}n-$d#xzf@zO``{L&uyU34X` z_fV?k`@+NP;lhb(%<(>R@2wO&-s2M9_Z?5~p0CBu^|;0%=e0a0U-Moo%5^*%tJU%x zc)gXsmt#sX9JE!!<@VJxJnuh;P4|R{)6+BO`OMj?dB=NPbXr@Ytl zxP|MrqFl$Lv6h;`fS2!iU-4w#LrZPp;q`Fg^z_`)-@vRtfi*NKU15<4I47z}-7`{a zVAq?#E}C?WwB7&?zLh7ObA~1(liM%s8k$s1*H`ProD==-MK#>o)4(l1fn79-wjy0g zSMU@^xp1Nyi{c}F4eYWLkUnIQQ{kYk2zO{QGOhoKMPHHI!@>7(rA@wht$gQ1zk5-9 zYfl5W`~=VyUT;@2FgcH2YTkJ@++0pmNPE=T>0Y{CetP4?znXw+#bdoGYmc=@FXZvk Q6LHDIozq?}54YEU0kkCkr2qf` literal 0 HcmV?d00001 diff --git a/jobs/scavenger/scavenger_helmet/scavenger_helmet.json b/jobs/scavenger/scavenger_helmet/scavenger_helmet.json index b302587..0026dba 100644 --- a/jobs/scavenger/scavenger_helmet/scavenger_helmet.json +++ b/jobs/scavenger/scavenger_helmet/scavenger_helmet.json @@ -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": [ diff --git a/jobs/scavenger/scavenger_outfit/male_outfit.qb b/jobs/scavenger/scavenger_outfit/male_outfit.qb new file mode 100644 index 0000000000000000000000000000000000000000..bddf5e39bdb3fd1d11d233bef948573539a9fed7 GIT binary patch literal 5068 zcmeH~zityj5XK3R#QBFPK=gh9P&h;b1(r+%DWD*tqJStSw&cXpku$Yf6jQkm%Bp|vJfjxzMYwGW@rE0W<57|C2u3h`!~bi`NKhaFjx$|g&@M! zAj=~RkhjxspECrTP`1s7+hdWA|03VnkK^pk(@$fOPMlD>;=SE+s`gut?oH$-4!h8c z5&<`NH7tcBSd78D`?aX3~Bfk~Tu@^i27{?wYyR>j~e=EtJ+L2tJGYD zquLlZhSXk$u~={WoAWAL>;L=ZcV}9!x?lF3HMf3^&y(!PboO(LIG4R&vGaO9;;<(U z=RhdEE{EE6Un0sSJGmGqhIKe_X9-z1i@rYVV-4V}_B-#RZ;D%i!J8uX|DFU&uD%lU z-jHtX#Ctn@{OI6H{^Hr{9_?+f>%D_CLSMhy^uXY?_j2PwCP9Du>|%s~~vILOGvF^DY-UW2zl z;tj|Pu;6KiIXC`Dxo&q)chB71YrC)1Io(xtPFGjYl&>S7IkPtV9Kvk=V*l^CgT4Jn zds`b}z!$@hKe*b( zhBzS~S}C9M`1RA9{|~L<3FW*0<@+-~_K+Sn#W1&+;^Ir?LJs7rb!;#8jrrM+IE(mN zE=Qj?TNl;F4t%;3KjgFZ_4Ak?O&_l{KAQt`d_E7Jmsj>5+}}C)YG?1~-S4*dw>CDO z>lqqq02ll5^5N)V_M!?!)&_{=tUdqI?)LX)-)nZ?SNmZ0)jsTrhTWTkl1pf9`4_bB zNBckaeeU_*u5q>>ul3_xKh*Ddr-Z&|`E?&Y_p$sT4Uy4A=(O=UH+XUOOwR6T!`{*C zhg2V=J5tSTov0xwE#^Y4?ZgT-=H#?0~ez)&@(`lq)j-xO24UO~U#PAkagn#4Rx4NOB*i;N!#|`~YXXWp0tnX}I z>ol~sbNoY?s$YrkxYamR(~!;9)z_KzP>tm;sbwm*)%oZ*XkYtO?Mi&D&aKX|XTU#m zt#8CCHO`(}XCGIy&gl(0O)75OX&1*P=hzPT!B8ANaFH>eeD+0WM`$nE9^SgyX~g_f z#*j~HuT*Ws!w-hE@PUhr;Y?s?FWFY9&S!V-9c*2{@p_-urNg0L6*bp?ytGfNz-g<% zUw5x`r6adSf8V>_m5x=?e*ExuH#9h3Zr)z+pWnaj{O~ck+AXeCpjBYCDp1;6ZT!$l z=sh)fQnh{WELjiLM1HI1`?g)%xE$RU(<(4jfh(8a=+@WQlfSaYG{h4>yQ} z?H{tk8PZn&Q_S0!-^?EBv+zQD%Vzs(iMHkCXxsRb`7*R^U#p$R@|L|;Q@oU}^|6QT z*M3fn<+b_AuK+!#=A=X1A%AMmAufJlO2_+hc#2V9D(Qj5ikHfXen)%>!u4ljjeiWH z<#CKAT(8NR-ZKW#3gM!3*-QF5qtN$NyS8y~pB4W5_|MLcDfhLynop_i-;XJ^c`m_4 zYNvWaYG3jE_gL};$7p*lnxOnXCY7&za6Au9i~fFd*5Z3@n-lsuT0RD@)w6T_W6cR2p=q&33%=!Ivq=3*5Wdyc96MN|Ni1Bi%^Lq0 zM9bqCO}Ji@bxrT{9JE5{V@uW{J#Ukq&WNt>ty<$F&TFtafoOtLXrjTh z4`QDJbr9UvfIb&)s8w2-QA^i`Wa$hvTDYbd_!6~)553p&^_bJt;rY@nH zVzbD-mLU9CUieEiiG@3)O0K%5t;C9#(&il`z69aM>V|&|Er_7r-5&ij#Un=gH9at;ZQsQjZSh0rlFe$@&X=KG((_`m zvAkuEadPY_UF*xyBF6ICyj5V8D^S}-=4ll; h85O8`?{iPywC5{DO>%k`vGXcnOOB?G2`e2>>woVusz?9; literal 0 HcmV?d00001 diff --git a/locales/en.json b/locales/en.json index 33c200e..15e4181 100644 --- a/locales/en.json +++ b/locales/en.json @@ -524,10 +524,6 @@ "description": "Growing" } }, - "swirl": { - "display_name": "Swirl Tree", - "description": "An impressive specimen." - }, "cypress": { "display_name": "Swamp Cypress", "description": "Deep roots into the soil", @@ -547,6 +543,14 @@ "display_name": "Cypress stem", "description": "Growing" } + }, + "stump": { + "display_name": "Tree Stump", + "description": "The remains of a tree." + }, + "swirl": { + "display_name": "Swirl Tree", + "description": "An impressive specimen." } }, "weapons": { @@ -810,7 +814,7 @@ "beast_tamer_flute_talisman": { "display_name": "Beast Tamer Flute", "description": "Communicates with animals", - "flavor": "Promotes a goblin to Beast Tamer" + "flavor": "Promotes to Beast Tamer" } }, "beast_tamer_claw": { diff --git a/manifest.json b/manifest.json index aa085ae..7e00ccc 100644 --- a/manifest.json +++ b/manifest.json @@ -258,24 +258,30 @@ "traits:passion_spirit_walker": "file(data/traits/passion_spirit_walker)", "traits:passion_warrior": "file(data/traits/passion_warrior)", - "trees:dead:small": "file(entities/trees/dead)", - "trees:dead:medium":"file(entities/trees/dead/dead_medium.json)", - "trees:dead:large": "file(entities/trees/dead/dead_large.json)", - "trees:bogger:small": "file(entities/trees/bogger)", - "trees:bogger:bud": "file(entities/trees/bogger/bud/bogger_plant_bud.json)", - "trees:bogger:seed": "file(entities/trees/bogger/seed/bogger_seed.json)", - "trees:bogger:sprout": "file(entities/trees/bogger/sprout/bogger_sprout.json)", - "trees:bogger:stem": "file(entities/trees/bogger/stem/bogger_plant_stem.json)", + "trees:dead:small": "file(entities/trees/dead)", + "trees:dead:small:stump": "file(entities/trees/dead/dead_stump.json)", + "trees:dead:medium": "file(entities/trees/dead/dead_medium.json)", + "trees:dead:medium:stump": "file(entities/trees/dead/dead_medium_stump.json)", + "trees:dead:large": "file(entities/trees/dead/dead_large.json)", + "trees:dead:large:stump": "file(entities/trees/dead/dead_large_stump.json)", + "trees:bogger:small": "file(entities/trees/bogger)", + "trees:bogger:small:stump": "file(entities/trees/bogger/stump.json)", + "trees:bogger:bud": "file(entities/trees/bogger/bud/bogger_plant_bud.json)", + "trees:bogger:seed": "file(entities/trees/bogger/seed/bogger_seed.json)", + "trees:bogger:sprout": "file(entities/trees/bogger/sprout/bogger_sprout.json)", + "trees:bogger:stem": "file(entities/trees/bogger/stem/bogger_plant_stem.json)", "trees:swirl:small": "file(entities/trees/swirl)", "trees:swirl:medium": "file(entities/trees/swirl/swirl_medium.json)", "trees:swirl:large": "file(entities/trees/swirl/swirl_large.json)", - "trees:cypress:small": "file(entities/trees/cypress)", - "trees:cypress:medium": "file(entities/trees/cypress/cypress_medium.json)", - "trees:cypress:large": "file(entities/trees/cypress/cypress_large.json)", - "trees:cypress:bud": "file(entities/trees/cypress/bud/cypress_plant_bud.json)", - "trees:cypress:seed": "file(entities/trees/cypress/seed/cypress_seed.json)", - "trees:cypress:sprout": "file(entities/trees/cypress/sprout/cypress_sprout.json)", - "trees:cypress:stem": "file(entities/trees/cypress/stem/cypress_plant_stem.json)", + "trees:cypress:small": "file(entities/trees/cypress)", + "trees:cypress:medium": "file(entities/trees/cypress/cypress_medium.json)", + "trees:cypress:medium:stump": "file(entities/trees/cypress/cypress_medium_stump.json)", + "trees:cypress:large": "file(entities/trees/cypress/cypress_large.json)", + "trees:cypress:large:stump": "file(entities/trees/cypress/cypress_large_stump.json)", + "trees:cypress:bud": "file(entities/trees/cypress/bud/cypress_plant_bud.json)", + "trees:cypress:seed": "file(entities/trees/cypress/seed/cypress_seed.json)", + "trees:cypress:sprout": "file(entities/trees/cypress/sprout/cypress_sprout.json)", + "trees:cypress:stem": "file(entities/trees/cypress/stem/cypress_plant_stem.json)", "warrior:talisman": "file(jobs/warrior/warrior_horn/warrior_horn_talisman.json)", "warrior:abilities:multiple_targets": "file(jobs/warrior/warrior_abilities/multiple_targets.json)", @@ -368,6 +374,8 @@ "stonehearth:traits_index":"file(data/traits/traits_index_to_merge.json)", + "stonehearth:trapper:outfit": "file(jobs/trapper/trapper_outfit)", + "stonehearth:worker:outfit": "file(jobs/worker/worker_outfit.json)" }, "functions": { diff --git a/swamp_biome_selected/entities/critters/crab/crab.qb b/swamp_biome_selected/entities/critters/crab/crab.qb new file mode 100644 index 0000000000000000000000000000000000000000..ba13ed2b15c3bd50162cba7d77c0316e58c0b205 GIT binary patch literal 942 zcmdT>Ne+TQ5Olw&=$HI}i3cBm4qHS>5KTOJ^5De>yJYN|Opyr^_39)|H&9hw)7@^j z%(2PTLwWXAxjGJ{=t}e@o?7dUWJ&sRxSBX`P8z{?HTN|j%h|#NYWq#f7XI;=n!F|* z@ah3FzEPjr|EA;m=N&j0H&4dsgNX zeNrS*Z2G_R@6z^L`)S2*@PGS3U