some blacksmith bandage (#483)

* anvil

* iron and copper ore walls + procedural cave update

* vladimirs rocks

* furnace

* Revert "furnace"

This reverts commit f378e4fb85.

* Revert "vladimirs rocks"

This reverts commit b2c6a193fc.

* Revert "iron and copper ore walls + procedural cave update"

This reverts commit dc6d70b10e.

* Revert "anvil"

This reverts commit 3ab1649992.

* Reapply "anvil"

This reverts commit 91c226d18d.

* huh

* fuck anvil

* Revert "fuck anvil"

This reverts commit 3c3a87c25e.

* Revert "huh"

This reverts commit 7fb44b4908.

* fix comment

* Reapply "iron and copper ore walls + procedural cave update"

This reverts commit 891c3ba0aa.

* Reapply "vladimirs rocks"

This reverts commit 4f2eaef6c1.

* Reapply "furnace"

This reverts commit 9d7e042ddf.

* Update anvil.yml

* Update workbenchs.yml

* Update workbenchs.yml

* Update workbenchs.yml

* Update workbenchs.yml

* Update workbenchs.yml

* Update workbenchs.yml

* Update workbenchs.yml

* Update workbenchs.yml

* Update workbenchs.yml

* EVIL anvil

* Update workbenchs.yml
This commit is contained in:
Ed
2024-10-09 13:40:06 +03:00
committed by GitHub
parent 1ca7456363
commit b9df2a495a
31 changed files with 588 additions and 127 deletions

View File

@@ -24,7 +24,7 @@
- type: IncreaseDamageOnWield
damage:
types:
Blunt: 4
Blunt: 3
- type: MeleeWeapon
angle: 100
attackRate: 1.3
@@ -33,12 +33,12 @@
wideAnimation: CP14WeaponArcSlash
damage:
types:
Blunt: 4
Blunt: 3
soundHit:
collection: MetalThud
cPAnimationLength: 0.3
cPAnimationOffset: -1.3
- type: StaminaDamageOnHit
damage: 9
damage: 4
- type: CP14Currency
currency: 20

View File

@@ -19,9 +19,9 @@
!type:DamageTrigger
damage: 250
behaviors:
#- !type:PlaySoundBehavior
# sound:
# collection: WoodDestroy
- !type:PlaySoundBehavior
sound:
collection: MetalBreak
- !type:DoActsBehavior
acts: [ "Destruction" ]

View File

@@ -0,0 +1,115 @@
- type: entity
id: CP14BaseRock
name: rock
description: A piece of rock. Hard, heavy, useless.
abstract: true
placement:
mode: SnapgridCenter
components:
- type: Clickable
- type: Sprite
drawdepth: Mobs
snapCardinals: true
- type: Physics
bodyType: Static
- type: Damageable
damageContainer: StructuralInorganic
damageModifierSet: Rock
- type: entity
id: CP14RockSmall
parent: CP14BaseRock
suffix: Small
components:
- type: Climbable
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeCircle
radius: 0.4
density: 500
layer:
- HalfWallLayer
- Opaque
- type: Sprite
sprite: _CP14/Structures/Flora/Rocks/rocks_small.rsi
offset: 0,0.2
layers:
- state: rock0
map: ["random"]
- type: RandomSprite
available:
- random:
rock0: ""
rock1: ""
rock2: ""
rock3: ""
rock4: ""
rock5: ""
rock7: ""
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 75
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/break_stone.ogg
params:
volume: -6
- !type:SpawnEntitiesBehavior
spawn:
CP14StoneBlock1:
min: 2
max: 3
- type: entity
id: CP14RockBig
parent: CP14BaseRock
suffix: Big
components:
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeCircle
radius: 0.5
density: 1500
layer:
- WallLayer
- type: Sprite
sprite: _CP14/Structures/Flora/Rocks/rocks_big.rsi
offset: 0,0.5
layers:
- state: rock0
map: ["random"]
- type: RandomSprite
available:
- random:
rock0: ""
rock1: ""
rock2: ""
rock3: ""
rock4: ""
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 150
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/break_stone.ogg
params:
volume: -6
- !type:SpawnEntitiesBehavior
spawn:
CP14StoneBlock1:
min: 5
max: 8

View File

@@ -105,7 +105,6 @@
description: A table with embroidery tools to create different clothing and materials.
components:
- type: Sprite
snapCardinals: true
state: sewing_table
- type: Icon
state: sewing_table
@@ -114,3 +113,65 @@
collection: CP14Sawing #TODO
recipeTags:
- CP14RecipeSewing
- type: entity
id: CP14WorkbenchAnvil
parent:
- CP14BaseWorkbench
name: anvil
description: I feel really bad, please someone fix this.
components:
- type: Sprite
state: anvil
- type: Icon
state: anvil
- type: Damageable
damageContainer: StructuralInorganic
damageModifierSet: StructuralMetallic
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 250
behaviors:
- !type:PlaySoundBehavior
sound:
collection: MetalBreak
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: CP14Workbench
craftSound:
collection: CP14Sawing #TODO
recipeTags:
- CP14RecipeAnvil
- type: entity
id: CP14WorkbenchFurnace
parent:
- CP14BaseWorkbench
name: melting furnace
description: I feel really bad, please someone fix this.
components:
- type: Sprite
state: furnace
- type: Icon
state: furnace
- type: Damageable
damageContainer: StructuralInorganic
damageModifierSet: StructuralMetallic
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 150
behaviors:
- !type:PlaySoundBehavior
sound:
collection: MetalBreak
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: CP14Workbench
craftSound:
collection: CP14Sawing #TODO
recipeTags:
- CP14RecipeMeltingFurnace

View File

@@ -69,97 +69,63 @@
graph: CP14WallDirt
node: WallDirt
#- type: entity
# id: CP14WallStoneCopperOre
# suffix: copper ore
# parent: CP14WallStone
# description: A solid stone natural wall. You can see the sharp flecks of copper in it.
# components:
# - type: Sprite
# sprite: _CP14/Structures/Walls/cave_stone_copper.rsi
# - type: Icon
# sprite: _CP14/Structures/Walls/cave_stone_copper.rsi
# - type: Destructible
# thresholds:
# - trigger:
# !type:DamageTrigger
# damage: 100
# behaviors:
# - !type:DoActsBehavior
# acts: ["Destruction"]
# - !type:PlaySoundBehavior
# sound:
# path: /Audio/Effects/break_stone.ogg
# params:
# volume: -6
# - !type:SpawnEntitiesBehavior
# spawn:
# CP14OreCopper:
# min: 1
# max: 5
#
#- type: entity
# id: CP14WallStoneIronOre
# suffix: iron ore
# parent: CP14WallStone
# description: A solid stone natural wall. You can see the sharp flecks of iron in it.
# components:
# - type: Sprite
# sprite: _CP14/Structures/Walls/cave_stone_iron.rsi
# - type: Icon
# sprite: _CP14/Structures/Walls/cave_stone_iron.rsi
# - type: Destructible
# thresholds:
# - trigger:
# !type:DamageTrigger
# damage: 100
# behaviors:
# - !type:DoActsBehavior
# acts: ["Destruction"]
# - !type:PlaySoundBehavior
# sound:
# path: /Audio/Effects/break_stone.ogg
# params:
# volume: -6
# - !type:SpawnEntitiesBehavior
# spawn:
# CP14OreIron:
# min: 1
# max: 5
#
#- type: entity
# id: CP14WallStoneSilverOre
# suffix: silver ore
# parent: CP14WallStone
# description: A solid stone natural wall. You see the tantalizing particles of silver in it.
# components:
# - type: Sprite
# sprite: _CP14/Structures/Walls/Natural/cave_stone_silver.rsi
# - type: Icon
# sprite: _CP14/Structures/Walls/Natural/cave_stone_silver.rsi
# - type: Destructible
# thresholds:
# - trigger:
# !type:DamageTrigger
# damage: 100
# behaviors:
# - !type:DoActsBehavior
# acts: ["Destruction"]
# - !type:PlaySoundBehavior
# sound:
# path: /Audio/Effects/break_stone.ogg
# params:
# volume: -6
# - !type:SpawnEntitiesBehavior
# spawn:
# CP14OreSilver:
# min: 1
# max: 5
# CP14StoneBlock1:
# min: 2
# max: 3
# - type: IconSmooth
# base: wall
- type: entity
id: CP14WallStoneCopperOre
suffix: copper ore
parent: CP14WallStone
description: A solid stone natural wall. You can see the sharp flecks of copper in it.
components:
- type: Sprite
sprite: _CP14/Structures/Walls/Natural/cave_stone_copper.rsi
- type: Icon
sprite: _CP14/Structures/Walls/Natural/cave_stone_copper.rsi
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 100
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/break_stone.ogg
params:
volume: -6
- !type:SpawnEntitiesBehavior
spawn:
CP14OreCopper:
min: 1
max: 5
- type: entity
id: CP14WallStoneIronOre
suffix: iron ore
parent: CP14WallStone
description: A solid stone natural wall. You can see the sharp flecks of iron in it.
components:
- type: Sprite
sprite: _CP14/Structures/Walls/Natural/cave_stone_iron.rsi
- type: Icon
sprite: _CP14/Structures/Walls/Natural/cave_stone_iron.rsi
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 100
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/break_stone.ogg
params:
volume: -6
- !type:SpawnEntitiesBehavior
spawn:
CP14OreIron:
min: 1
max: 5
- type: entity
id: CP14WallStoneGoldOre
@@ -193,4 +159,40 @@
min: 2
max: 3
- type: IconSmooth
base: wall
base: wall
# We dont have silver now
#- type: entity
# id: CP14WallStoneSilverOre
# suffix: silver ore
# parent: CP14WallStone
# description: A solid stone natural wall. You see the tantalizing particles of silver in it.
# components:
# - type: Sprite
# sprite: _CP14/Structures/Walls/Natural/cave_stone_silver.rsi
# - type: Icon
# sprite: _CP14/Structures/Walls/Natural/cave_stone_silver.rsi
# - type: Destructible
# thresholds:
# - trigger:
# !type:DamageTrigger
# damage: 100
# behaviors:
# - !type:DoActsBehavior
# acts: ["Destruction"]
# - !type:PlaySoundBehavior
# sound:
# path: /Audio/Effects/break_stone.ogg
# params:
# volume: -6
# - !type:SpawnEntitiesBehavior
# spawn:
# CP14OreSilver:
# min: 1
# max: 5
# CP14StoneBlock1:
# min: 2
# max: 3
# - type: IconSmooth
# base: wall

View File

@@ -28,30 +28,8 @@
allowedTiles:
- CP14FloorBase
entities:
- FloraGreyStalagmite1
- FloraGreyStalagmite2
- FloraGreyStalagmite3
- FloraGreyStalagmite4
- FloraGreyStalagmite5
- FloraRockSolid01
- FloraRockSolid02
- FloraRockSolid03
- FloraGreyStalagmite1
- FloraGreyStalagmite2
- FloraGreyStalagmite3
- FloraGreyStalagmite4
- FloraGreyStalagmite5
- FloraRockSolid01
- FloraRockSolid02
- FloraRockSolid03
- FloraGreyStalagmite1
- FloraGreyStalagmite2
- FloraGreyStalagmite3
- FloraGreyStalagmite4
- FloraGreyStalagmite5
- FloraRockSolid01
- FloraRockSolid02
- FloraRockSolid03
- CP14RockSmall
- CP14RockSmall
- CP14QuartzCrystal
- !type:BiomeEntityLayer # lumishroom sage
threshold: 0.6
@@ -118,7 +96,7 @@
- CP14WallStone
#Ores
- !type:BiomeEntityLayer
threshold: 0.6
threshold: 0.7
noise:
seed: 10
noiseType: OpenSimplex2
@@ -127,4 +105,26 @@
allowedTiles:
- CP14FloorBase
entities:
- CP14WallStoneGoldOre
- CP14WallStoneGoldOre
- !type:BiomeEntityLayer
threshold: 0.6
noise:
seed: 15
noiseType: OpenSimplex2
fractalType: FBm
frequency: 3
allowedTiles:
- CP14FloorBase
entities:
- CP14WallStoneIronOre
- !type:BiomeEntityLayer
threshold: 0.5
noise:
seed: 20
noiseType: OpenSimplex2
fractalType: FBm
frequency: 3
allowedTiles:
- CP14FloorBase
entities:
- CP14WallStoneCopperOre

View File

@@ -208,6 +208,32 @@
- CP14FloorGrass
entities:
- CP14GatherableWildSage
- !type:BiomeEntityLayer # More Rocks
threshold: 0.7
noise:
seed: 18
noiseType: OpenSimplex2
fractalType: FBm
frequency: 3
allowedTiles:
- CP14FloorGrass
- CP14FloorGrassLight
- CP14FloorGrassTall
entities:
- CP14RockSmall
- !type:BiomeEntityLayer # More Rocks
threshold: 0.8
noise:
seed: 27
noiseType: OpenSimplex2
fractalType: FBm
frequency: 2
allowedTiles:
- CP14FloorGrass
- CP14FloorGrassLight
- CP14FloorGrassTall
entities:
- CP14RockBig
# Подбиомы лугов
@@ -225,6 +251,8 @@
frequency: 2
allowedTiles:
- CP14FloorGrass
- CP14FloorGrassLight
- CP14FloorGrassTall
entities:
- CP14FloraTree01
- CP14FloraTree02

View File

@@ -0,0 +1,148 @@
- type: CP14Recipe
id: CP14BaseBattleHammer
tag: CP14RecipeAnvil
craftTime: 4
stacks:
CP14WoodenPlanks: 1
CP14IronBar: 3
result: CP14BaseBattleHammer
- type: CP14Recipe
id: CP14BaseDagger
tag: CP14RecipeAnvil
craftTime: 4
stacks:
CP14WoodenPlanks: 1
CP14IronBar: 1
result: CP14BaseDagger
- type: CP14Recipe
id: CP14BaseHandheldAxe
tag: CP14RecipeAnvil
craftTime: 4
stacks:
CP14WoodenPlanks: 1
CP14IronBar: 1
result: CP14BaseHandheldAxe
- type: CP14Recipe
id: CP14BaseLightHammer
tag: CP14RecipeAnvil
craftTime: 4
stacks:
CP14WoodenPlanks: 1
CP14IronBar: 1
result: CP14BaseLightHammer
- type: CP14Recipe
id: CP14BaseMace
tag: CP14RecipeAnvil
craftTime: 4
stacks:
CP14WoodenPlanks: 1
CP14IronBar: 2
result: CP14BaseMace
- type: CP14Recipe
id: CP14BaseShield
tag: CP14RecipeAnvil
craftTime: 4
stacks:
CP14WoodenPlanks: 2
CP14IronBar: 2
result: CP14BaseShield
- type: CP14Recipe
id: CP14BaseSickle
tag: CP14RecipeAnvil
craftTime: 4
stacks:
CP14WoodenPlanks: 1
CP14IronBar: 2
result: CP14BaseSickle
- type: CP14Recipe
id: CP14BaseThrowableSpear
tag: CP14RecipeAnvil
craftTime: 4
stacks:
CP14WoodenPlanks: 2
CP14IronBar: 1
result: CP14BaseThrowableSpear
- type: CP14Recipe
id: CP14BaseSword
tag: CP14RecipeAnvil
craftTime: 4
stacks:
CP14WoodenPlanks: 1
CP14IronBar: 3
result: CP14BaseSword
- type: CP14Recipe
id: CP14BaseTwoHandedSword
tag: CP14RecipeAnvil
craftTime: 4
stacks:
CP14WoodenPlanks: 1
CP14IronBar: 4
result: CP14BaseTwoHandedSword
- type: CP14Recipe
id: CP14BaseHoe
tag: CP14RecipeAnvil
craftTime: 4
stacks:
CP14WoodenPlanks: 1
CP14IronBar: 2
result: CP14BaseHoe
- type: CP14Recipe
id: CP14BasePickaxe
tag: CP14RecipeAnvil
craftTime: 4
stacks:
CP14WoodenPlanks: 1
CP14IronBar: 2
result: CP14BasePickaxe
- type: CP14Recipe
id: CP14BaseShovel
tag: CP14RecipeAnvil
craftTime: 4
stacks:
CP14WoodenPlanks: 1
CP14IronBar: 2
result: CP14BaseShovel
- type: CP14Recipe
id: CP14ClothingCloakCuirass
tag: CP14RecipeAnvil
craftTime: 4
stacks:
CP14IronBar: 5
result: CP14ClothingCloakCuirass
- type: CP14Recipe
id: CP14ClothingCloakInfantryCuirass
tag: CP14RecipeAnvil
craftTime: 4
stacks:
CP14IronBar: 6
result: CP14ClothingCloakInfantryCuirass
- type: CP14Recipe
id: CP14ClothingCloakCuirassLoincloth
tag: CP14RecipeAnvil
craftTime: 4
stacks:
CP14IronBar: 6
result: CP14ClothingCloakCuirassLoincloth
- type: CP14Recipe
id: CP14ClothingCloakCuirassLeg
tag: CP14RecipeAnvil
craftTime: 4
stacks:
CP14IronBar: 7
result: CP14ClothingCloakCuirassLeg

View File

@@ -0,0 +1,23 @@
- type: CP14Recipe
id: CP14CopperBar1
tag: CP14RecipeMeltingFurnace
craftTime: 4
entities:
CP14OreCopper: 2
result: CP14CopperBar1
- type: CP14Recipe
id: CP14IronBar1
tag: CP14RecipeMeltingFurnace
craftTime: 4
entities:
CP14OreIron: 2
result: CP14IronBar1
- type: CP14Recipe
id: CP14GoldBar1
tag: CP14RecipeMeltingFurnace
craftTime: 4
entities:
CP14OreGold: 2
result: CP14GoldBar1

View File

@@ -51,4 +51,12 @@
CP14Wheat: 2
stacks:
CP14WoodenPlanks: 2
result: CP14BaseBroom
result: CP14BaseBroom
- type: CP14Recipe
id: CP14BaseBattleStaff
tag: CP14RecipeWorkbench
craftTime: 4
stacks:
CP14WoodenPlanks: 3
result: CP14BaseBattleStaff

View File

@@ -42,3 +42,9 @@
- type: Tag
id: CP14RecipeWorkbench
- type: Tag
id: CP14RecipeAnvil
- type: Tag
id: CP14RecipeMeltingFurnace

View File

@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CLA",
"copyright": "created by vladimir.s",
"size": {
"x": 48,
"y": 64
},
"states": [
{
"name": "rock0"
},
{
"name": "rock1"
},
{
"name": "rock2"
},
{
"name": "rock3"
},
{
"name": "rock4"
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1014 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1009 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -0,0 +1,38 @@
{
"version": 1,
"license": "CLA",
"copyright": "created by vladimir.s",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "rock0"
},
{
"name": "rock1"
},
{
"name": "rock2"
},
{
"name": "rock3"
},
{
"name": "rock4"
},
{
"name": "rock5"
},
{
"name": "rock6"
},
{
"name": "rock7"
},
{
"name": "rock8"
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 753 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 607 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 652 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 539 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 440 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 673 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 277 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 712 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 248 B

View File

@@ -9,7 +9,7 @@
"states": [
{
"name": "mannequin",
"directions": 4
"directions": 4
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 391 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 412 B

View File

@@ -18,6 +18,12 @@
},
{
"name": "sewing_table"
},
{
"name": "furnace"
},
{
"name": "anvil"
}
]
}