Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Item starfish #422

Merged
merged 1 commit into from
May 14, 2022
+553 −73
Merged

Item starfish #422

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions assets/items.json
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,8 @@
"items/grenades.json",
"items/machine_gun.json",
"items/mines.json",
"items/starfish.json",
"items/starfish_launcher.json",
"items/musket.json",
"items/sniper_rifle.json",
"items/sword.json",
105 changes: 105 additions & 0 deletions assets/items/starfish.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
{
"id": "starfish",
"name": "Starfish",
"type": "weapon",
"can_rotate": true,
"cooldown": 0.5,
"uses": 1,
"deplete_behavior": "destroy",
"effects": [
{
"type": "triggered_effect",
"trigger": ["player", "enemy", "explosion", "projectile"],
"expire_time": 3.0,
"expire_effects": [
{
"type": "spawn_item",
"item": "starfish",
"offset": {
"x": 0,
"y": -10
},
"inherit_spawner_velocity": true
}
],
"can_rotate": true,
"angular_velocity": -620,
"velocity": {
"x": 12.0,
"y": 0.0
},
"gravity": 0.01,
"bouncyness": 1.0,
"size": {
"x": 19,
"y": 18
},
"activation_delay": 0.1,
"grab_options": {
"zone_size": {
"x": 60,
"y": 18
},
"zone_offset": {
"x": 0,
"y": -9
},
"equips_item": "starfish"
},
"effects": [
{
"type": "circle_collider",
"radius": 25,
"is_explosion": true,
"sound_effect": "bullet_hit_dull"
},
{
"type": "spawn_item",
"item": "starfish",
"offset": {
"x": 20,
"y": -10
},
"inherit_spawner_velocity": true
}
],
"collide_with_platforms": true,
"sprite": {
"texture": "starfish",
"autoplay_id": "effect",
"animations": [
{
"id": "effect",
"row": 0,
"frames": 1,
"fps": 1
}
]
}
}
],
"collider_size": {
"x": 19,
"y": 18
},
"mount_offset": {
"x": -25,
"y": 5
},
"effect_offset": {
"x": 10,
"y": 9
},
"sprite": {
"texture": "starfish",
"autoplay_id": "idle",
"animations": [
{
"id": "idle",
"row": 0,
"frames": 1,
"fps": 1
}
]
}
}
84 changes: 84 additions & 0 deletions assets/items/starfish_launcher.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
{
"id": "starfish_launcher",
"name": "Starfish Launcher",
"type": "weapon",
"cooldown": 0.75,
"uses": 4,
"effects": [
{
"type": "triggered_effect",
"trigger": ["player", "enemy", "explosion", "projectile"],
"expire_time": 3.0,
"can_rotate": true,
"angular_velocity": -620,
"velocity": {
"x": 12.0,
"y": 0.0
},
"spread": 30,
"gravity": 0.01,
"bouncyness": 1.0,
"size": {
"x": 19,
"y": 18
},
"activation_delay": 0.1,
"grab_options": {
"zone_size": {
"x": 50,
"y": 18
},
"zone_offset": {
"x": 0,
"y": -9
},
"equips_item": "starfish"
},
"effects": [
{
"type": "circle_collider",
"radius": 25,
"is_explosion": true,
"sound_effect": "bullet_hit_dull"
}
],
"collide_with_platforms": true,
"sprite": {
"texture": "starfish",
"autoplay_id": "effect",
"animations": [
{
"id": "effect",
"row": 0,
"frames": 1,
"fps": 1
}
]
}
}
],
"collider_size": {
"x": 37,
"y": 20
},
"mount_offset": {
"x": -17,
"y": -5
},
"effect_offset": {
"x": 10,
"y": 9
},
"sprite": {
"texture": "starfish_launcher",
"autoplay_id": "idle",
"animations": [
{
"id": "idle",
"row": 0,
"frames": 1,
"fps": 1
}
]
}
}
102 changes: 55 additions & 47 deletions assets/maps/test_level.json
View file
Original file line number Diff line number Diff line change
@@ -809,6 +809,14 @@
"kind": "object_layer",
"has_collision": false,
"objects": [
{
"id": "starfish_launcher",
"kind": "item",
"position": {
"x": 782.8819,
"y": 675.5
}
},
{
"id": "fish_school",
"kind": "environment",
@@ -1055,22 +1063,22 @@
],
"tilesets": [
{
"id": "decorations1",
"texture_id": "default_decoration",
"id": "tileset",
"texture_id": "default_tileset",
"texture_size": {
"x": 240,
"y": 102
"x": 224,
"y": 288
},
"tile_size": {
"x": 48.0,
"y": 51.0
"x": 32.0,
"y": 32.0
},
"grid_size": {
"x": 5,
"y": 2
"x": 7,
"y": 9
},
"first_tile_id": 64,
"tile_cnt": 10,
"first_tile_id": 1,
"tile_cnt": 63,
"tile_subdivisions": {
"x": 3,
"y": 3
@@ -1165,31 +1173,6 @@
false,
false,
false,
false
]
},
{
"id": "tileset",
"texture_id": "default_tileset",
"texture_size": {
"x": 224,
"y": 288
},
"tile_size": {
"x": 32.0,
"y": 32.0
},
"grid_size": {
"x": 7,
"y": 9
},
"first_tile_id": 1,
"tile_cnt": 63,
"tile_subdivisions": {
"x": 3,
"y": 3
},
"autotile_mask": [
false,
false,
false,
@@ -1667,6 +1650,42 @@
false,
false,
false,
false
],
"tile_attributes": {
"56": [
"jumpthrough"
],
"60": [
"jumpthrough"
],
"58": [
"jumpthrough"
]
}
},
{
"id": "decorations1",
"texture_id": "default_decoration",
"texture_size": {
"x": 240,
"y": 102
},
"tile_size": {
"x": 48.0,
"y": 51.0
},
"grid_size": {
"x": 5,
"y": 2
},
"first_tile_id": 64,
"tile_cnt": 10,
"tile_subdivisions": {
"x": 3,
"y": 3
},
"autotile_mask": [
false,
false,
false,
@@ -1757,18 +1776,7 @@
false,
false,
false
],
"tile_attributes": {
"58": [
"jumpthrough"
],
"60": [
"jumpthrough"
],
"56": [
"jumpthrough"
]
}
]
}
],
"spawn_points": [
4 changes: 4 additions & 0 deletions assets/sounds.json
View file
Original file line number Diff line number Diff line change
@@ -38,5 +38,9 @@
{
"id": "explode",
"path": "sounds/explode_m.wav"
},
{
"id": "bullet_hit_dull",
"path": "sounds/bullet_hit_dull.wav"
}
]
18 changes: 18 additions & 0 deletions assets/textures.json
View file
Original file line number Diff line number Diff line change
@@ -517,6 +517,24 @@
"y": 9
}
},
{
"id": "starfish",
"path": "textures/items/StarFish(19x18).png",
"type": "spritesheet",
"sprite_size": {
"x": 19,
"y": 18
}
},
{
"id": "starfish_launcher",
"path": "textures/items/StarfishLauncher(37x20).png",
"type": "spritesheet",
"sprite_size": {
"x": 37,
"y": 20
}
},
{
"id": "fish_school_icon",
"path": "textures/items/FishSchoolIcon(64x64).png",
Binary file added assets/textures/items/StarFish(19x18).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.
Binary file added assets/textures/items/StarfishLauncher(37x20).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.
Loading