Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
@m5m7n5
m5m7n5 committed Dec 20, 2017
2 parents d067b73 + 69bf5a5 commit 6e855be
Show file tree
Hide file tree
Showing 19 changed files with 374 additions and 113 deletions.
Binary file added Exe.zip
View file
Binary file not shown.
Binary file added SlimeGame/Slimes/Assets/Resources/Slimes/Faces/ultimateSlime.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
76 changes: 76 additions & 0 deletions SlimeGame/Slimes/Assets/Resources/Slimes/Faces/ultimateSlime.png.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

189 changes: 108 additions & 81 deletions SlimeGame/Slimes/Assets/Resources/stats.txt
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,56 @@
{
"Ultimate":{
"name":"Ultimate",
"picDirection":"Slimes/Faces/ultimateSlime",

"minBaseAttack":100,
"maxBaseAttack":100,
"minAttackDrain":0.00,
"maxAttackDrain":0.00,
"minAttackMultiplier":10.0,
"maxAttackMultiplier":10.0,
"splitDrain":0.0,
"maxSlimes":12,
"plainMassGain":50,
"scalingMassGain":0.5,
"conquerMassDrain":0.0,
"slimeCountActionGain":4,
"minCalcMass":110,
"maxCalcMass":110,
"minDamageReduction":0.75,
"maxDamageReduction":0.80,
"maxMass":150,
"movement":10,
"range":10,
"baseActions":2,
"baseMass":100


},
"Lust":{
"name":"Lust",
"picDirection":"Slimes/Faces/lust",

"minBaseAttack":2,
"maxBaseAttack":10,
"maxBaseAttack":6,
"minAttackDrain":0.02,
"maxAttackDrain":0.15,
"minAttackMultiplier":2.0,
"maxAttackMultiplier":5.0,
"maxAttackDrain":0.12,
"minAttackMultiplier":3.0,
"maxAttackMultiplier":6.0,
"splitDrain":0.5,
"maxSlimes":8,
"plainMassGain":10,
"scalingMassGain":0.05,
"maxSlimes":10,
"plainMassGain":5,
"scalingMassGain":0.08,
"conquerMassDrain":0.0,
"slimeCountActionGain":4,
"minCalcMass":15,
"maxCalcMass":110,
"minDamageReduction":0.05,
"maxDamageReduction":0.10,
"maxMass":150,
"movement":3,
"range":4,
"baseActions":2,
"slimeCountActionGain":5,
"minCalcMass":10,
"maxCalcMass":140,
"minDamageReduction":0.10,
"maxDamageReduction":0.20,
"maxMass":160,
"movement":4,
"range":3,
"baseActions":3,
"baseMass":50


Expand All @@ -33,27 +60,27 @@
"name":"Greed",
"picDirection":"Slimes/Faces/greed",

"minBaseAttack":2,
"maxBaseAttack":10,
"minAttackDrain":0.02,
"minBaseAttack":5,
"maxBaseAttack":12,
"minAttackDrain":0.08,
"maxAttackDrain":0.15,
"minAttackMultiplier":2.0,
"maxAttackMultiplier":5.0,
"minAttackMultiplier":1.5,
"maxAttackMultiplier":4.5,
"splitDrain":0.5,
"maxSlimes":8,
"plainMassGain":10,
"scalingMassGain":0.05,
"scalingMassGain":0.06,
"conquerMassDrain":0.0,
"slimeCountActionGain":4,
"minCalcMass":15,
"maxCalcMass":110,
"minDamageReduction":0.05,
"maxDamageReduction":0.10,
"maxMass":150,
"movement":3,
"range":4,
"minCalcMass":20,
"maxCalcMass":150,
"minDamageReduction":0.10,
"maxDamageReduction":0.25,
"maxMass":170,
"movement":5,
"range":2,
"baseActions":2,
"baseMass":50
"baseMass":80


},
Expand All @@ -62,27 +89,27 @@
"name":"Pride",
"picDirection":"Slimes/Faces/pride",

"minBaseAttack":2,
"minBaseAttack":5,
"maxBaseAttack":10,
"minAttackDrain":0.02,
"maxAttackDrain":0.15,
"minAttackMultiplier":2.0,
"maxAttackMultiplier":5.0,
"minAttackDrain":0.05,
"maxAttackDrain":0.10,
"minAttackMultiplier":1.5,
"maxAttackMultiplier":6.5,
"splitDrain":0.5,
"maxSlimes":8,
"plainMassGain":10,
"plainMassGain":18,
"scalingMassGain":0.05,
"conquerMassDrain":0.0,
"slimeCountActionGain":4,
"minCalcMass":15,
"maxCalcMass":110,
"minCalcMass":20,
"maxCalcMass":140,
"minDamageReduction":0.05,
"maxDamageReduction":0.10,
"maxMass":150,
"maxDamageReduction":0.15,
"maxMass":160,
"movement":3,
"range":4,
"range":3,
"baseActions":2,
"baseMass":50
"baseMass":55


},
Expand All @@ -91,26 +118,26 @@
"name":"Envy",
"picDirection":"Slimes/Faces/envy",

"minBaseAttack":2,
"maxBaseAttack":10,
"minBaseAttack":5,
"maxBaseAttack":20,
"minAttackDrain":0.02,
"maxAttackDrain":0.15,
"minAttackMultiplier":2.0,
"maxAttackMultiplier":5.0,
"maxAttackDrain":0.08,
"minAttackMultiplier":1.0,
"maxAttackMultiplier":6.0,
"splitDrain":0.5,
"maxSlimes":8,
"plainMassGain":10,
"maxSlimes":10,
"plainMassGain":12,
"scalingMassGain":0.05,
"conquerMassDrain":0.0,
"slimeCountActionGain":4,
"minCalcMass":15,
"maxCalcMass":110,
"slimeCountActionGain":5,
"minCalcMass":10,
"maxCalcMass":150,
"minDamageReduction":0.05,
"maxDamageReduction":0.10,
"maxMass":150,
"maxDamageReduction":0.15,
"maxMass":170,
"movement":3,
"range":4,
"baseActions":2,
"baseActions":3,
"baseMass":50


Expand All @@ -122,24 +149,24 @@

"minBaseAttack":2,
"maxBaseAttack":10,
"minAttackDrain":0.02,
"maxAttackDrain":0.15,
"minAttackDrain":0.05,
"maxAttackDrain":0.20,
"minAttackMultiplier":2.0,
"maxAttackMultiplier":5.0,
"maxAttackMultiplier":3.0,
"splitDrain":0.5,
"maxSlimes":8,
"plainMassGain":10,
"scalingMassGain":0.05,
"maxSlimes":14,
"plainMassGain":5,
"scalingMassGain":0.04,
"conquerMassDrain":0.0,
"slimeCountActionGain":4,
"minCalcMass":15,
"maxCalcMass":110,
"minDamageReduction":0.05,
"maxDamageReduction":0.10,
"maxMass":150,
"movement":3,
"slimeCountActionGain":2,
"minCalcMass":20,
"maxCalcMass":130,
"minDamageReduction":0.10,
"maxDamageReduction":0.15,
"maxMass":100,
"movement":4,
"range":4,
"baseActions":2,
"baseActions":3,
"baseMass":50
},

Expand All @@ -154,7 +181,7 @@
"minAttackMultiplier":2.0,
"maxAttackMultiplier":5.0,
"splitDrain":0.5,
"maxSlimes":8,
"maxSlimes":10,
"plainMassGain":10,
"scalingMassGain":0.05,
"conquerMassDrain":0.0,
Expand Down Expand Up @@ -184,15 +211,15 @@
"maxAttackMultiplier":5.5,
"splitDrain":0.5,
"maxSlimes":10,
"plainMassGain":15,
"plainMassGain":12,
"scalingMassGain":0.1,
"conquerMassDrain":0.0,
"slimeCountActionGain":3,
"minCalcMass":30,
"maxCalcMass":120,
"minDamageReduction":0.15,
"maxDamageReduction":0.30,
"maxMass":180,
"maxDamageReduction":0.45,
"maxMass":220,
"movement":2,
"range":1,
"baseActions":2,
Expand All @@ -211,15 +238,15 @@
"maxAttackMultiplier":5.5,
"splitDrain":0.5,
"maxSlimes":12,
"plainMassGain":20,
"scalingMassGain":0.2,
"plainMassGain":25,
"scalingMassGain":0.25,
"conquerMassDrain":0.0,
"slimeCountActionGain":4,
"minCalcMass":10,
"maxCalcMass":210,
"maxCalcMass":250,
"minDamageReduction":0.2,
"maxDamageReduction":0.4,
"maxMass":230,
"maxDamageReduction":0.25,
"maxMass":300,
"movement":2,
"range":3,
"baseActions":2,
Expand Down Expand Up @@ -408,7 +435,7 @@
"maxCalcMass":0,
"minDamageReduction":0.00,
"maxDamageReduction":0.00,
"maxMass":0,
"maxMass":40,
"movement":1,
"range":1,
"baseActions":0,
Expand All @@ -435,7 +462,7 @@
"maxCalcMass":0,
"minDamageReduction":-0.05,
"maxDamageReduction":-0.08,
"maxMass":0,
"maxMass":60,
"movement":-1,
"range":2,
"baseActions":0,
Expand All @@ -462,7 +489,7 @@
"maxCalcMass":0,
"minDamageReduction":0.1,
"maxDamageReduction":0.15,
"maxMass":0,
"maxMass":100,
"movement":2,
"range":-1,
"baseActions":0,
Expand Down
Loading

0 comments on commit 6e855be

Please sign in to comment.