ich777/cdogs-sdl
1
0
Fork 0
mirror of https://github.com/cxong/cdogs-sdl.git synced 2025-07-23 07:23:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Inkvine

Browse Source 
Fix dropdowns too tall in char editor
This commit is contained in:
Cong
2017-06-05 00:17:22 +10:00
parent 9277e50b8c
commit ad07037db4
25 changed files with 108 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
data/particles.json
View File

@@ -7,11 +7,21 @@
},
{
"Name": "spark_blue",
"Pic": "spark_blue"
"Pic": "spark_classic",
"Mask": "00ffff",
"Range": 2
},
{
"Name": "spark_red",
"Pic": "spark_red"
"Pic": "spark_classic",
"Mask": "ff0000",
"Range": 2
},
{
"Name": "spark_green",
"Pic": "spark_classic",
"Mask": "00ff00",
"Range": 2
},
{
"Name": "boom",

2
graphics/LICENSE.md
View File

@@ -1,5 +1,3 @@
All .px files are freeware, copyright Ronny Wester. See doc/README_DATA
Unless otherwise specified, all artwork is licensed CC0 "Public Domain Dedication", copyright Cong Xu.
But please let me know if you like or use this artwork :)

BIN
graphics/biogun.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 507 B

5
graphics/biogun.txt Normal file
View File

@@ -0,0 +1,5 @@
Derived from Various inventory 24 pixel icon set
by OceansDream
https://opengameart.org/content/various-inventory-24-pixel-icon-set
http://creativecommons.org/licenses/by/3.0/
http://creativecommons.org/licenses/by-sa/3.0/

3
graphics/originals.txt
View File

@@ -102,8 +102,7 @@ safe.png
safe_wreck.png
scratch.png
skull.png
spark_blue.png
spark_red.png
spark_classic.png
statue_ogre.png
table_clothed.png
table_lab.png

BIN
graphics/spark_blue.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 202 B

BIN
graphics/spark_classic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 231 B

BIN
graphics/spark_red.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 198 B

BIN
graphics/wave_11x11.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 818 B

4
graphics/wave_11x11.txt Normal file
View File

@@ -0,0 +1,4 @@
Derived from Bullet Collection 2 (M484 Games)
by Master484 (http://m484games.ucoz.com/)
https://opengameart.org/content/bullet-collection-2-m484-games
http://creativecommons.org/publicdomain/zero/1.0/

20
missions/Sand.cdogscpn/bullets.json
View File

@@ -8,6 +8,26 @@
"Object": "knife_hard",
"Flesh": "monster-2"
}
},
{
"Name": "inkvine",
"Pic": {
"Type": "Directional",
"Sprites": "wave",
"Mask": "00ff00"
},
"Speed": 640,
"Range": 50,
"Power": 40,
"Mass": 0.1,
"Size": [8, 8],
"Special": "Poison",
"Spark": "spark_inkvine",
"HitSounds": {
"Object": "splat",
"Flesh": "splat",
"Wall": "splat"
}
}
]
}

10
missions/Sand.cdogscpn/characters.json
View File

@@ -54,7 +54,7 @@
"Arms": "b79536",
"Body": "b79536",
"Legs": "b79536",
"Hair": "ff0000",
"Hair": "b98c00",
"speed": 256,
"Gun": "Machine gun",
"maxHealth": 30,
@@ -86,7 +86,7 @@
"Arms": "363636",
"Body": "363636",
"Legs": "363636",
"Hair": "ff0000",
"Hair": "00ffff",
"speed": 320,
"Gun": "Sniper rifle",
"maxHealth": 40,
@@ -230,9 +230,9 @@
"Arms": "363636",
"Body": "363636",
"Legs": "363636",
"Hair": "ff0000",
"Hair": "00ff00",
"speed": 320,
"Gun": "Powergun",
"Gun": "Inkvine",
"maxHealth": 50,
"flags": 1966080,
"probabilityToMove": 40,
@@ -240,4 +240,4 @@
"probabilityToShoot": 25,
"actionDelay": 8
}]
}
}

4
missions/Sand.cdogscpn/graphics/spark_spray.txt Normal file
View File

@@ -0,0 +1,4 @@
Derived from Sparks (Fire, Ice, Blood)
by Clint Bellanger
https://opengameart.org/content/sparks-fire-ice-blood
http://creativecommons.org/licenses/by/3.0/

BIN
missions/Sand.cdogscpn/graphics/spark_spray_16x16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

11
missions/Sand.cdogscpn/guns.json
View File

@@ -23,6 +23,17 @@
"SwitchSound": "knife_switch",
"SoundLockLength": 10,
"CanShoot": false
},
{
"Name": "Inkvine",
"Icon": "biogun",
"Bullet": "inkvine",
"Cost": 5,
"Lock": 50,
"Sound": "inkvine",
"SwitchSound": "inkvine_r",
"MuzzleFlashParticle": "muzzle_flash_inkvine",
"Ammo": "Gas tank"
}
]
}

26
missions/Sand.cdogscpn/missions.json
View File

@@ -53,7 +53,7 @@
"EnemyDensity": 26,
"Weapons": ["Kindjal",
"Machine gun",
"Flamer",
"Inkvine",
"Sniper rifle"],
"Song": "",
"WallMask": "301e0a",
@@ -159,7 +159,7 @@
"EnemyDensity": 11,
"Weapons": ["Kindjal",
"Machine gun",
"Flamer",
"Inkvine",
"Shotgun",
"Sniper rifle",
"Dynamite"],
@@ -214,7 +214,8 @@
"Flags": 0
}],
"Enemies": [5,
6],
6,
14],
"SpecialChars": [2,
3,
4],
@@ -261,7 +262,7 @@
"EnemyDensity": 12,
"Weapons": ["Kindjal",
"Machine gun",
"Flamer",
"Inkvine",
"Shotgun",
"Sniper rifle"],
"Song": "",
@@ -341,7 +342,7 @@
"Weapons": ["Kindjal",
"Machine gun",
"Grenades",
"Flamer",
"Inkvine",
"Shotgun",
"Shrapnel bombs",
"Sniper rifle"],
@@ -412,7 +413,7 @@
"Weapons": ["Kindjal",
"Machine gun",
"Grenades",
"Flamer",
"Inkvine",
"Shotgun",
"Shrapnel bombs",
"Sniper rifle"],
@@ -473,7 +474,7 @@
"Weapons": ["Kindjal",
"Machine gun",
"Grenades",
"Flamer",
"Inkvine",
"Shotgun",
"Shrapnel bombs",
"Sniper rifle"],
@@ -541,7 +542,7 @@
"Weapons": ["Kindjal",
"Machine gun",
"Grenades",
"Flamer",
"Inkvine",
"Shotgun",
"Shrapnel bombs",
"Sniper rifle"],
@@ -602,7 +603,8 @@
"Required": 0,
"Flags": 0
}],
"Enemies": [5],
"Enemies": [5,
14],
"SpecialChars": [8,
10,
11],
@@ -626,7 +628,7 @@
"Weapons": ["Kindjal",
"Machine gun",
"Grenades",
"Flamer",
"Inkvine",
"Shotgun",
"Shrapnel bombs",
"Molotovs",
@@ -814,7 +816,7 @@
"Weapons": ["Kindjal",
"Machine gun",
"Grenades",
"Flamer",
"Inkvine",
"Shotgun",
"Powergun",
"Shrapnel bombs",
@@ -852,4 +854,4 @@
"Max": 3
}
}]
}
}

18
missions/Sand.cdogscpn/particles.json Normal file
View File

@@ -0,0 +1,18 @@
{
"Version": 1,
"Particles": [
{
"Name": "muzzle_flash_inkvine",
"Sprites": "muzzle_flash_big",
"Mask": "00ff00",
"Range": 8
},
{
"Name": "spark_inkvine",
"Sprites": "spark_spray",
"Mask": "00ff00",
"Range": 16,
"TicksPerFrame": 4
}
]
}

BIN
missions/Sand.cdogscpn/sounds/inkvine.ogg Normal file
View File

Binary file not shown.

4
missions/Sand.cdogscpn/sounds/inkvine.txt Normal file
View File

@@ -0,0 +1,4 @@
Derived from Footsteps » Sludge Footsteps 1.wav
by morganpurkis
https://www.freesound.org/people/morganpurkis/sounds/384658/
http://creativecommons.org/licenses/by/3.0/

BIN
missions/Sand.cdogscpn/sounds/inkvine_r.ogg Normal file
View File

Binary file not shown.

4
missions/Sand.cdogscpn/sounds/inkvine_r.txt Normal file
View File

@@ -0,0 +1,4 @@
Derived from Cocking M16.aif
by maurosama
http://freesound.org/people/maurosama/sounds/133814/
http://creativecommons.org/publicdomain/zero/1.0/

BIN
missions/Sand.cdogscpn/sounds/splat.ogg Normal file
View File

Binary file not shown.

4
missions/Sand.cdogscpn/sounds/splat.txt Normal file
View File

@@ -0,0 +1,4 @@
splat.ogg
by gprosser
https://www.freesound.org/people/gprosser/sounds/360942/
http://creativecommons.org/publicdomain/zero/1.0/

2
src/cdogs/bullet_class.c
View File

@@ -686,7 +686,7 @@ static void LoadBullet(
LoadBool(&b->Persists, node, "Persists");
tmp = NULL;
LoadStr(&tmp, node, "Spark");
if (tmp != NULL)
if (tmp != NULL && strlen(tmp) > 0)
{
b->Spark = StrParticleClass(&gParticleClasses, tmp);
CFREE(tmp);

2
src/cdogsed/char_editor.c
View File

@@ -672,7 +672,7 @@ static int DrawClassSelection(
nk_label(ec->ctx, label, NK_TEXT_LEFT);
const int selectedNew = nk_combo_separator_image(
ec->ctx, texids, items, '\0', selected, len,
ROW_HEIGHT, nk_vec2(nk_widget_width(ec->ctx), 10 * ROW_HEIGHT));
ROW_HEIGHT, nk_vec2(nk_widget_width(ec->ctx), 8 * ROW_HEIGHT));
if (selectedNew != selected)
{
*ec->FileChanged = true;