Permalink
Browse files

Merge branch 'master' of https://github.com/frogatto/frogatto

davewx7 committed Feb 19, 2018
2 parents 8560ddd + 3b62e2b commit 6662b649a6fb63a584594318d164727c52732873
@@ -1,7 +1,7 @@
{
id: "squirrel",
prototype: ["ant"],
-solid_area: [17,11,28,27],
+solid_area: [22,19,33,35],
editor_info: {
category: "enemies, forest",
@@ -18,7 +18,7 @@ properties: {
#-------------------------- attacks --------------------------#
- charge_time: "if(level.player.difficulty >= difficulties.challenging, 6, 20)+1d5",
+ charge_time: "if(level.player.difficulty >= difficulties.challenging,0, 10)+0",
_charge_up: { type: "int", default: 0, persistent: false },
throw_acorn: "commands :: if(higher_difficulty, aimed_throw_acorn, normal_throw_acorn)",
@@ -88,97 +88,68 @@ on_process_walk: " if(not is_standing,
set(rotate, slope_standing_on)
)",
+on_process_start_walk: "",
animation: [
{
"@base": true,
no_remove_alpha_borders: true,
- },
- {
- image: "enemies/squirrel-black.png",
- rotate_on_slope: true,
- pad: 3,
+ pad: 0,
accel_x: 0,
accel_y: 80,
body_area: "all",
- id: "stand",
- rect: [1,1,45,29],
- attack_area: [26,18,35,28],
+ rotate_on_slope: true,
},
{
image: "enemies/squirrel-black.png",
- rotate_on_slope: true,
- pad: 3,
- accel_x: 0,
- accel_y: 80,
- body_area: "all",
id: "stand",
-
- #blink variant
- rect: [1,33,45,61],
+ rect: [0,0,61,44],
attack_area: [26,18,35,28],
+ frames: 1,
+ duration: 20,
},
{
image: "enemies/squirrel-black.png",
- rotate_on_slope: true,
- pad: 3,
accel_x: 450,
- accel_y: 80,
- body_area: "all",
id: "walk",
- rect: [193,1,237,29],
+
+ solid_area: [37,19,48,35],
+ rect: [0,90,79,134],
attack_area: [26,18,35,28],
- frames: 6,
- frames_per_row: 3,
- duration: 2,
+ frames: 8,
+ frames_per_row: 4,
+ duration: 5,
},
{
image: "enemies/squirrel-black.png",
- rotate_on_slope: true,
- pad: 3,
- accel_x: 0,
- accel_y: 80,
- body_area: "all",
id: "spring",
- rect: [1,65,45,93],
+ rect: [62,0,123,44],
frames: 1,
+ duration: 20,
},
{
image: "enemies/squirrel-black.png",
- rotate_on_slope: true,
- pad: 3,
- accel_x: 0,
- accel_y: 80,
- body_area: "all",
id: "turn",
- rect: [1,97,45,125],
- frames: 5,
+ rect: [0,45,61,89],
+ frames: 7,
+ duration: 4,
attack_area: [11,18,35,28],
},
{
image: "enemies/squirrel-black.png",
- rotate_on_slope: true,
- pad: 3,
- accel_x: 0,
- accel_y: 80,
- body_area: "all",
id: "hurt",
- rect: [49,65,93,93],
+ rect: [62,0,123,44],
+ duration: 20,
},
{
image: "enemies/squirrel-black.png",
- rotate_on_slope: true,
- pad: 3,
- accel_x: 0,
- accel_y: 80,
- body_area: "all",
id: "toss",
- rect: [1,161,45,189],
- events: "42:throw_acorn",
+ rect: [0,180,61,241],
+ events: "24:throw_acorn",
duration: 6,
- frames: 9,
- frames_per_row: 3,
+ frames: 7,
+ solid_area: [22,27,33,43],
},
],
object_type: {
@@ -195,14 +166,14 @@ object_type: {
id: "thrown",
thrown_area: "all",
duration: 60,
- rect: [97,129,141,157],
+ rect: [463,99,509,129],
frames: 1,
body_area: null,
},
{
image: "enemies/squirrel-red.png",
id: "on_back",
- rect: [1,129,45,157],
+ rect: [369,99,415,129],
frames: 2,
duration: 5,
body_area: "all",
@@ -12,14 +12,14 @@
id: "thrown",
thrown_area: "all",
duration: 60,
- rect: [97,129,141,157],
+ rect: [463,99,509,129],
frames: 1,
body_area: null,
},
{
image: "enemies/squirrel-black.png",
id: "on_back",
- rect: [1,129,45,157],
+ rect: [369,99,415,129],
frames: 2,
duration: 5,
body_area: "all",
@@ -17,18 +17,6 @@ animation: [
image: "enemies/squirrel-red.png",
id: "stand",
},
- {
- image: "enemies/squirrel-red.png",
- id: "stand",
- },
- {
- image: "enemies/squirrel-red.png",
- id: "thrown",
- },
- {
- image: "enemies/squirrel-red.png",
- id: "on_back",
- },
{
image: "enemies/squirrel-red.png",
id: "walk",
@@ -0,0 +1,56 @@
+{
+id: "squirrel_red_alt",
+prototype: ["squirrel"],
+
+properties: {
+ points_value: "14",
+
+ title: "~Red Squirrel~",
+ description: "~The red squirrel throws nuts at passers-by. They are troublemakers of the worst sort, and will destroy any food cache they can get in to.~",
+ taste: "~Stronger than black squirrel. This is probably due to their different diet.~",
+
+ is_able_to_jump: "bool :: true",
+},
+
+
+animation: [
+ {
+ image: "enemies/squirrel-red.png",
+ id: "stand",
+ },
+ {
+ image: "enemies/squirrel-red.png",
+ id: "walk",
+ },
+ {
+ image: "enemies/squirrel-red.png",
+ id: "spring",
+ },
+ {
+ image: "enemies/squirrel-red.png",
+ id: "turn",
+ },
+ {
+ image: "enemies/squirrel-red.png",
+ id: "hurt",
+ },
+ {
+ image: "enemies/squirrel-red.png",
+ id: "toss",
+ },
+],
+object_type: {
+ id: "thrown",
+ prototype: ["squirrel_thrown"],
+ animation: [
+ {
+ image: "enemies/squirrel-red.png",
+ id: "thrown",
+ },
+ {
+ image: "enemies/squirrel-red.png",
+ id: "on_back",
+ },
+ ],
+},
+}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 6662b64

Please sign in to comment.