Skip to content

Commit

Permalink
updateses
Browse files Browse the repository at this point in the history
  • Loading branch information
sayterdarkwynd committed Oct 30, 2016
1 parent 46e4164 commit bda70f7
Show file tree
Hide file tree
Showing 17 changed files with 322 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .metadata
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
"priority" : 100,
"requires" : [],
"steamContentId" : "729480149",
"version" : "4.20.3"
"version" : "4.20.4"
}
11 changes: 10 additions & 1 deletion biomes/surface/savannah.biome.patch
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,16 @@
]
}
},

{"op":"add","path":"/spawnProfile/groups/-",
"value":{

"select" : 1,
"pool" : [

[ 0.08, "fugiraffecritter" ]
]
}
},
{"op":"add","path":"/surfacePlaceables/items/-","value":{
"mode" : "floor",
"priority" : 3.0,
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"description" : "Made from the depths. And hate. Lots and lots of hate.",
"shortdescription" : "Coral Cleaver",
"tooltipKind" : "sword",
"category" : "war blade",
"category" : "warblade",
"twoHanded" : true,
"itemTags" : ["weapon","melee","broadsword"],

Expand Down
8 changes: 4 additions & 4 deletions items/active/weapons/melee/spear/siliconspear.activeitem
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"level" : 3,
"maxStack" : 1,
"rarity" : "Uncommon",
"description" : "Tungsten and silicon make up this swift weapon",
"shortdescription" : "Tek Spear",
"description" : "This heavy spear will puncture even well-armored foes.",
"shortdescription" : "Tek Lance",
"tooltipKind" : "sword",
"category" : "War Spear",
"category" : "fu_lance",
"twoHanded" : true,
"itemTags" : ["weapon","melee","spear"],

Expand All @@ -33,7 +33,7 @@
"primaryAbility" : {
"scripts" : [],

"fireTime" : 0.85,
"fireTime" : 1,
"baseDps" : 12.5,
"damageConfig" : {
"damageSourceKind" : "spear",
Expand Down
9 changes: 9 additions & 0 deletions items/categories.config.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[
{"op": "add","path": "/fu_warspear","value": "War Spear"},
{"op": "add","path": "/fu_lance","value": "Lance"},
{"op": "add","path": "/fu_pierce","value": "Fencing Blade"},
{"op": "add","path": "/fu_scythe","value": "Scythe"},
{"op": "add","path": "/quarterstaff","value": "Quarterstaff"},
{"op": "add","path": "/warblade","value": "War Blade"},
{"op": "add","path": "/fu_keening","value": "Keen Blade"}
]
12 changes: 12 additions & 0 deletions liquids/sludge.liquid
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"name" : "sludge",
"liquidId" : 69,
"description" : "Some sort of stench-ridden, putrid sludge.",
"tickDelta" : 4,
"color" : [49, 32, 20, 225],
"statusEffects" : [ "swimming", "wet" ],
"itemDrop" : "liquidwastewater",
"texture" : "/liquids/sludgetex.png",
"bottomLightMix" : [0, 0, 0],
"textureMovementFactor" : 0.65
}
Binary file added liquids/sludgetex.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions monsters/critter/fugiraffecritter/body.frames
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"frameGrid" : {
"size" : [36, 60],
"dimensions" : [8, 2],

"names" : [
[ "idle.1", null, null, null, null, null, null, null ],
[ "walk.1", "walk.2", "walk.3", "walk.4", "walk.5", "walk.6", "walk.7", "walk.8"]
]
}
}
9 changes: 9 additions & 0 deletions monsters/critter/fugiraffecritter/body.monsterpart
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"name" : "fugiraffecritter",
"category" : "fugiraffecritter",
"type" : "body",

"frames" : {
"body" : "body.png"
}
}
Binary file added monsters/critter/fugiraffecritter/body.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
134 changes: 134 additions & 0 deletions monsters/critter/fugiraffecritter/fugiraffecritter.animation
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
{
"animatedParts" : {
"stateTypes" : {
"damage" : {
"priority" : 3,
"default" : "none",
"states" : {
"none" : {
"frames" : 1
},
"stunned" : {
"frames" : 1
}
}
},
"movement" : {
"priority" : 0,
"default" : "idle",
"states" : {
"idle" : {
"frames" : 1,
"cycle" : 0.2,
"mode" : "loop"
},
"walk" : {
"frames" : 8,
"cycle" : 0.5,
"mode" : "loop"
}
}
},
"releaseParticles" : {
"default" : "off",
"states" : {
"off" : {
"frames" : 1,
"properties" : {
"particleEmittersOff" : [ "releaseParticles" ]
}
},
"on" : {
"frames" : 1,
"cycle" : 0.1,
"mode" : "transition",
"transition" : "off",
"properties" : {
"particleEmittersOn" : [ "releaseParticles" ]
}
}
}
}
},

"parts" : {
"body" : {
"properties" : {
"rotationGroup" : "body"
},
"partStates" : {
"movement" : {
"idle" : {
"properties" : {
"image" : "<partImage>:idle.<frame>"
}
},
"walk" : {
"properties" : {
"image" : "<partImage>:walk.<frame>"
}
}
}
}
}
}
},

"rotationGroups" : {
"body" : {
"rotationCenter" : [0, 0],
"angularVelocity" : 5
}
},

"particleEmitters" : {
"deathPoof" : {
"particles" : [
{ "particle" : "monstersplosion" },
{ "particle" : "deathfizz1left" },
{ "particle" : "deathfizz1right" },
{ "particle" : "deathfizz2left" },
{ "particle" : "deathfizz2right" },
{ "particle" : "deathfizz3left" },
{ "particle" : "deathfizz3right" },
{ "particle" : "deathfizz4left" },
{ "particle" : "deathfizz4right" }
]
},


"captureParticles":{
"particles" : [
{ "particle" : "monstercapture" }
]
},
"releaseParticles":{
"particles" : [
{ "particle" : "monsterrelease" }
]
},
"teleportOut":{
"particles" : [
{ "particle" : "monstercapture" }
]
},
"teleportIn":{
"particles" : [
{ "particle" : "monsterrelease" }
]
}
},

"effects" : {
"blink" : {
"type" : "flash",
"time" : 0,
"directives" : "fade=ffffff;0.5"
}
},

"sounds" : {
"turnHostile" : [ ],
"deathPuff" : [ "/sfx/npc/enemydeathpuff.ogg" ]
}
}
91 changes: 91 additions & 0 deletions monsters/critter/fugiraffecritter/fugiraffecritter.monstertype
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
{
"type" : "fugiraffecritter",

"categories" : [ "fugiraffecritter" ],
"parts" : [ "body" ],

"animation" : "fugiraffecritter.animation",
"reversed" : true,

"dropPools" : [ { "default" : "empty" } ],

"baseParameters" : {
"scripts" : [
"/monsters/monster.lua"
],

"behavior" : "walkingcritter",

"metaBoundBox" : [-4, -4, 4, 4],
"scale" : 1.0,

"movementSettings" : {
"collisionPoly" : [ [0.3075, 1.5], [0.75, 1.06], [0.75, -2.93], [0.3075, -3.375], [-0.3075, -3.375], [-0.75, -2.93], [-0.75, 1.06], [-0.3075, 1.5] ],

"mass" : 0.5,
"walkSpeed" : 5,
"runSpeed" : 5,
"jumpSpeed" : 5
},

"bodyMaterialKind" : "organic",

"knockoutTime" : 0.1,
"knockoutEffect" : "",

"damageTeamType" : "passive",

"statusSettings" : {
"statusProperties" : {
"targetMaterialKind" : "organic"
},

"appliesEnvironmentStatusEffects" : false,
"minimumLiquidStatusEffectPercentage" : 0.1,

"primaryScriptSources" : [
"/stats/monster_primary.lua"
],
"primaryScriptDelta" : 0,

"stats" : {
"knockbackStunTime" : {
"baseValue" : 0.25
},
"knockbackThreshold" : {
"baseValue" : 9
},
"maxHealth" : {
"baseValue" : 40
},
"protection" : {
"baseValue" : 0.0
},
"healthRegen" : {
"baseValue" : 0.0
},
"powerMultiplier" : {
"baseValue" : 1.0
}
},

"resources" : {
"stunned" : {
"deltaValue" : -1.0,
"initialValue" : 0.0
},
"health" : {
"maxStat" : "maxHealth",
"deltaStat" : "healthRegen",
"defaultPercentage" : 100
}
}
},

"mouthOffset" : [0, 0],
"feetOffset" : [0, -8],
"capturable" : true,
"captureHealthFraction" : 1.0,
"nametagColor" : [64, 200, 255]
}
}
16 changes: 16 additions & 0 deletions spawntypes/fucritter.spawntypes
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
[
{
"name" : "fugiraffecritter",

"spawnParameters" : {
"area" : "surface",
"region" : "all",
"time" : "all"
},

"groupSize" : [1, 3],
"spawnChance" : 0.04,
"monsterType" : "fugiraffecritter",
"monsterParameters" : {
"aggressive" : false
}
},
{
"name" : "fubat",

Expand Down
Loading

0 comments on commit bda70f7

Please sign in to comment.