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

Teddy #71

Browse Source
This commit is contained in:
Cong
2023-04-08 11:08:11 +10:00
parent 34cb238f80
commit ea1a2ac151
6 changed files with 91 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/pickups.json
View File

@@ -205,6 +205,14 @@
},
"Type": "Score"
},
{
"Name": "teddy",
"Pic": {
"Type": "Normal",
"Pic": "teddy"
},
"Type": "Score"
},
{
"Name": "health",
"Pic": {

0
graphics/folder.txt → graphics/folder2.txt
View File

BIN
graphics/teddy.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 291 B

1
missions/custom/techdemo/cyberdogs.cdogscpn/campaign.json
View File

@@ -8,6 +8,7 @@
"BuyAndSell": true,
"RandomPickups": false,
"DoorOpenTicks": 0,
"Lives": 0,
"MaxLives": 4,
"PlayerHP": 20,
"PlayerMaxHP": 50,

217
missions/custom/techdemo/cyberdogs.cdogscpn/missions.json
View File

@@ -2,17 +2,40 @@
"Missions": [{
"Title": "Test",
"Description": "Testing mission",
"Type": "Static",
"Width": 21,
"Height": 20,
"Type": "Classic",
"Width": 100,
"Height": 100,
"ExitStyle": "hazard",
"KeyStyle": "office",
"Objectives": [],
"Objectives": [{
"Description": "",
"Type": "Collect",
"Pickup": "teddy",
"Count": 8,
"Required": 0,
"Flags": 0
}],
"Enemies": [0],
"SpecialChars": [],
"MapObjectDensities": [{
"MapObject": "crate",
"Density": 75
"Density": 45
},
{
"MapObject": "box",
"Density": 45
},
{
"MapObject": "fan",
"Density": 20
},
{
"MapObject": "barrel_blue",
"Density": 30
},
{
"MapObject": "box3_gray",
"Density": 30
}],
"EnemyDensity": 13,
"Weapons": ["Barehanded",
@@ -30,11 +53,11 @@
"WeaponPersist": true,
"SkipDebrief": false,
"TileClasses": {
"0": {
"Wall": {
"Name": "wall",
"Type": "Wall",
"Style": "steel",
"Mask": "848484ff",
"Style": "brick",
"Mask": "acacacff",
"MaskAlt": "008400ff",
"CanWalk": false,
"IsOpaque": true,
@@ -42,144 +65,68 @@
"IsRoom": false,
"DamageBullet": ""
},
"1": {
"Floor": {
"Name": "tile",
"Type": "Floor",
"Style": "recessed",
"Mask": "484848ff",
"Style": "wood",
"Mask": "303030ff",
"MaskAlt": "008400ff",
"CanWalk": true,
"IsOpaque": false,
"Shootable": false,
"IsRoom": false,
"DamageBullet": ""
},
"Room": {
"Name": "tile",
"Type": "Floor",
"Style": "recessed",
"Mask": "707070ff",
"MaskAlt": "008400ff",
"CanWalk": true,
"IsOpaque": false,
"Shootable": false,
"IsRoom": true,
"DamageBullet": ""
},
"Door": {
"Name": "door",
"Type": "Door",
"Style": "office",
"Mask": "ffffffff",
"MaskAlt": "ffffffff",
"CanWalk": false,
"IsOpaque": true,
"Shootable": true,
"IsRoom": true,
"DamageBullet": ""
}
},
"Tiles": ["0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0",
"0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0",
"0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0",
"0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0",
"0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0",
"0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0",
"0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0",
"0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0",
"0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0",
"0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0",
"0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0",
"0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0",
"0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0",
"0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0",
"0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0",
"0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0",
"0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0",
"0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0",
"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"],
"Access": ["0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"],
"StaticItems": [{
"MapObject": "Chainsaw spawner",
"Positions": [[7, 3]]
"Walls": 140,
"WallLength": 20,
"CorridorWidth": 2,
"Rooms": {
"Count": 30,
"Min": 7,
"Max": 10,
"Edge": false,
"Overlap": false,
"Walls": 0,
"WallLength": 1,
"WallPad": 1
},
{
"MapObject": "Barehanded spawner",
"Positions": [[7, 13]]
"Squares": 1,
"ExitEnabled": true,
"Doors": {
"Enabled": false,
"Min": 2,
"Max": 2,
"RandomPos": false
},
{
"MapObject": "MiniGun spawner",
"Positions": [[9, 3]]
},
{
"MapObject": "Launcher spawner",
"Positions": [[9, 5]]
},
{
"MapObject": "Flamer spawner",
"Positions": [[9, 7]]
},
{
"MapObject": "Powergun spawner",
"Positions": [[9, 9]]
},
{
"MapObject": "Lazer spawner",
"Positions": [[11, 7]]
},
{
"MapObject": "TurboLazer spawner",
"Positions": [[11, 9]]
},
{
"MapObject": "DumbGun spawner",
"Positions": [[11, 3]]
},
{
"MapObject": "Gun spawner",
"Positions": [[11, 5]]
},
{
"MapObject": "MegaGun spawner",
"Positions": [[9, 11]]
},
{
"MapObject": "Blaster spawner",
"Positions": [[9, 13]]
},
{
"MapObject": "Bullets ammo spawner",
"Positions": [[10, 3]]
},
{
"MapObject": "Grenades ammo spawner",
"Positions": [[10, 5]]
},
{
"MapObject": "Gas tank ammo spawner",
"Positions": [[10, 7]]
},
{
"MapObject": "Cells ammo spawner",
"Positions": [[10, 9]]
},
{
"MapObject": "Rockets ammo spawner",
"Positions": [[10, 11]]
},
{
"MapObject": "Mini cells ammo spawner",
"Positions": [[10, 13]]
}],
"StaticCharacters": [],
"StaticObjectives": [],
"StaticKeys": [],
"StaticPickups": [],
"Start": [0, 0],
"Exits": [{
"Rect": [28,
2,
9,
9],
"Mission": 1,
"Hidden": false
}],
"AltFloorsEnabled": true
"Pillars": {
"Count": 0,
"Min": 2,
"Max": 3
}
}]
}

4
src/nuklear/nuklear.h
View File

@@ -8345,7 +8345,6 @@ nk_str_append_str_utf8(struct nk_str *str, const char *text)
{
int runes = 0;
int byte_len = 0;
int num_runes = 0;
int glyph_len = 0;
nk_rune unicode;
if (!str || !text) return 0;
@@ -8354,7 +8353,6 @@ nk_str_append_str_utf8(struct nk_str *str, const char *text)
while (unicode != '\0' && glyph_len) {
glyph_len = nk_utf_decode(text+byte_len, &unicode, 4);
byte_len += glyph_len;
num_runes++;
}
nk_str_append_text_char(str, text, byte_len);
return runes;
@@ -8474,7 +8472,6 @@ nk_str_insert_str_utf8(struct nk_str *str, int pos, const char *text)
{
int runes = 0;
int byte_len = 0;
int num_runes = 0;
int glyph_len = 0;
nk_rune unicode;
if (!str || !text) return 0;
@@ -8483,7 +8480,6 @@ nk_str_insert_str_utf8(struct nk_str *str, int pos, const char *text)
while (unicode != '\0' && glyph_len) {
glyph_len = nk_utf_decode(text+byte_len, &unicode, 4);
byte_len += glyph_len;
num_runes++;
}
nk_str_insert_at_rune(str, pos, text, byte_len);
return runes;