Skip to content

Commit

Permalink
Cyberdogs guns #268
Browse files Browse the repository at this point in the history
Fix no-max ammo issues
Add obvious placeholder gun sound
  • Loading branch information
cxong committed Apr 30, 2022
1 parent a1dc56b commit 621fbfa
Show file tree
Hide file tree
Showing 17 changed files with 193 additions and 147 deletions.
Binary file modified graphics/font.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: 10 additions & 1 deletion missions/custom/techdemo/cyberdogs.cdogscpn/ammo.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"Pic": "grenade_pickup"
},
"Sound": "grenade_pickup",
"Amount": 5
"Amount": 10
},
{
"Name": "Cells",
Expand Down Expand Up @@ -46,6 +46,15 @@
"Pic": "rockets"
},
"Sound": "grenade_pickup",
"Amount": 10
},
{
"Name": "Gas tank",
"Pic": {
"Type": "Normal",
"Pic": "gas_tank"
},
"Sound": "gas_tank_pickup",
"Amount": 100
}
]
Expand Down
56 changes: 29 additions & 27 deletions missions/custom/techdemo/cyberdogs.cdogscpn/bullets.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"Power": 2,
"Hit": {
"Flesh": {
"Sound": "hits/chainsaw"
"Sound": "chainsaw"
}
}
},
Expand All @@ -40,7 +40,7 @@
"Power": 4,
"Hit": {
"Flesh": {
"Sound": "hits/chainsaw"
"Sound": "chainsaw"
}
}
},
Expand All @@ -49,7 +49,7 @@
"Power": 6,
"Hit": {
"Flesh": {
"Sound": "hits/chainsaw"
"Sound": "chainsaw"
}
}
},
Expand All @@ -58,7 +58,7 @@
"Power": 8,
"Hit": {
"Flesh": {
"Sound": "hits/chainsaw"
"Sound": "chainsaw"
}
}
},
Expand All @@ -67,7 +67,7 @@
"Power": 10,
"Hit": {
"Flesh": {
"Sound": "hits/chainsaw"
"Sound": "chainsaw"
}
}
},
Expand Down Expand Up @@ -170,23 +170,25 @@
},
"OutOfRangeGuns": [
"blast_weak",
"demo_weak",
"explosion_spread"
"explosion"
],
"HitGuns": [
"blast_weak",
"demo_weak",
"explosion_spread"
"explosion"
],
"Size": [1, 1]
},
{
"Name": "megagrenade",
"Name": "megarocket",
"Pic": {
"Type": "Animated",
"Sprites": "grenade",
"TicksPerFrame": 2,
"Mask": "808080"
"Type": "Directional",
"Sprites": "rocket"
},
"Trail": {
"Particle": "smoke_trail_small",
"Width": 0,
"TicksPerEmit": 4
},
"ShadowSize": [6, 4],
"Speed": 384,
Expand All @@ -202,13 +204,12 @@
},
"OutOfRangeGuns": [
"blast_strong",
"demo_strong",
"explosion_spread"
"explosion"
],
"HitGuns": [
"blast_strong",
"demo_strong",
"explosion_spread"
"explosion"
],
"Size": [1, 1]
},
Expand Down Expand Up @@ -281,7 +282,7 @@
{
"Name": "blast_strong",
"Range": 1,
"Power": 40,
"Power": 200,
"Size": [32, 32],
"Persists": true,
"Spark": "",
Expand All @@ -293,27 +294,28 @@
"Name": "demo_weak",
"Range": 1,
"Power": 40,
"Size": [1, 1],
"Size": [2, 2],
"Spark": "",
"Hit": {
"Object": {}
}
},
{
"Name": "explosion_spread",
"SpeedLow": -256,
"SpeedHigh": 256,
"Name": "demo_strong",
"Range": 1,
"Hit": {},
"OutOfRangeGuns": [
"explosion"
]
"Power": 200,
"Size": [2, 2],
"Spark": "",
"Hit": {
"Object": {}
}
},
{
"Name": "explosion_cast",
"SpeedLow": 0,
"SpeedHigh": 4096,
"SpeedLow": 4096,
"SpeedHigh": 8192,
"Range": 1,
"Hit": {},
"OutOfRangeGuns": [
"explosion_ball"
]
Expand Down
20 changes: 20 additions & 0 deletions missions/custom/techdemo/cyberdogs.cdogscpn/characters.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"Version": 13,
"Characters": [{
"Class": "Ogre",
"Skin": "00ff00ff",
"Arms": "404040ff",
"Body": "404040ff",
"Legs": "404040ff",
"Hair": "000000ff",
"Feet": "404040ff",
"speed": 256,
"Gun": "DumbGun",
"maxHealth": 40,
"flags": 1024,
"probabilityToMove": 50,
"probabilityToTrack": 25,
"probabilityToShoot": 0,
"actionDelay": 15
}]
}
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.
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.
33 changes: 27 additions & 6 deletions missions/custom/techdemo/cyberdogs.cdogscpn/guns.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,12 @@
{
"Pic": "",
"Icon": "fist",
"Name": "Fists",
"Description": "A melee weapon of last resort",
"Name": "Barehanded",
"Bullet": "fist",
"Cost": 0,
"Lock": 0,
"Sound": "",
"SoundLockLength": 50,
"SoundLockLength": 20,
"SwitchSound": "knuckles",
"CanShoot": false,
"CanDrop": false
Expand All @@ -90,7 +89,7 @@
"Lock": 30,
"Sound": "bottle_pop",
"SwitchSound": "swarmer_switch",
"Elevation": 24,
"Elevation": 12,
"Ammo": "Grenades"
},
{
Expand Down Expand Up @@ -152,7 +151,7 @@
"Grips": 2,
"Name": "MegaGun",
"Icon": "megagun",
"Bullet": "megagrenade",
"Bullet": "megarocket",
"Lock": 30,
"Sound": "swell",
"SwitchSound": "heatseeker_switch",
Expand All @@ -178,9 +177,30 @@
}
],
"PseudoGuns" : [
{
"Name": "blast_weak",
"Bullet": "blast_weak",
"Sound": "explosion_small"
},
{
"Name": "demo_weak",
"Bullet": "demo_weak",
"Sound": ""
},
{
"Name": "blast_strong",
"Bullet": "blast_strong",
"Sound": "explosion"
},
{
"Name": "demo_strong",
"Bullet": "demo_strong",
"Sound": ""
},
{
"Name": "explosion",
"Bullet": "explosion_cast",
"Sound": "",
"Recoil": 6.28,
"SpreadCount": 5,
"Shake": {
Expand All @@ -189,7 +209,8 @@
},
{
"Name": "explosion_ball",
"Bullet": "explosion_ball"
"Bullet": "explosion_ball",
"Sound": ""
}
]
}
Loading

0 comments on commit 621fbfa

Please sign in to comment.