diff --git a/TODO.md b/TODO.md index 33c103a..d64ea82 100644 --- a/TODO.md +++ b/TODO.md @@ -1,6 +1,14 @@ -- Integrate caco plush -- Caco plush spawnflags -- Makefile for caco plush sprites -- Brightmaps for caco plush -- Fix wiring kit brightmaps +- ~~Integrate caco plush~~ +- ~~Makefile for caco plush sprites~~ + +- Jumper cables + - ~~Jumper cables ammohandler stuff~~ + - ~~Fix wiring kit brightmaps~~ + +- Caco plush + - Caco plush documentation + - Caco plush spawnflags + - Brightmaps for caco plush + - Organize source_data + diff --git a/gldefs.txt b/gldefs.txt index 48be2d1..77cd279 100644 --- a/gldefs.txt +++ b/gldefs.txt @@ -42,19 +42,19 @@ brightmap sprite kgcpb0 brightmap sprite jmppa0 { - map "sprites/bright_jmpr_1.png" + map "sprites/jumpercables/bright_jmpr_1.png" disablefullbright } brightmap sprite jmppb0 { - map "sprites/bright_jmpr_2.png" + map "sprites/jumpercables/bright_jmpr_2.png" disablefullbright } brightmap sprite jmppc0 { - map "sprites/bright_jmpr_3.png" + map "sprites/jumpercables/bright_jmpr_3.png" disablefullbright } diff --git a/source_data/povsprite.aseprite b/source_data/povsprite.aseprite index 7394133..b9d6fed 100644 Binary files a/source_data/povsprite.aseprite and b/source_data/povsprite.aseprite differ diff --git a/sprites/jumpercables/bright_jmpr_1.png b/sprites/jumpercables/bright_jmpr_1.png index e4f8832..dd2bfd1 100644 Binary files a/sprites/jumpercables/bright_jmpr_1.png and b/sprites/jumpercables/bright_jmpr_1.png differ diff --git a/sprites/jumpercables/bright_jmpr_2.png b/sprites/jumpercables/bright_jmpr_2.png index 117f827..362d848 100644 Binary files a/sprites/jumpercables/bright_jmpr_2.png and b/sprites/jumpercables/bright_jmpr_2.png differ diff --git a/sprites/jumpercables/bright_jmpr_3.png b/sprites/jumpercables/bright_jmpr_3.png index 3a33d73..4799e47 100644 Binary files a/sprites/jumpercables/bright_jmpr_3.png and b/sprites/jumpercables/bright_jmpr_3.png differ diff --git a/sprites/jumpercables/jmila0.png b/sprites/jumpercables/jmila0.png index 33a259a..9252485 100644 Binary files a/sprites/jumpercables/jmila0.png and b/sprites/jumpercables/jmila0.png differ diff --git a/sprites/jumpercables/jmilb0.png b/sprites/jumpercables/jmilb0.png index b6d13b9..c8bef72 100644 Binary files a/sprites/jumpercables/jmilb0.png and b/sprites/jumpercables/jmilb0.png differ diff --git a/sprites/jumpercables/jmilc0.png b/sprites/jumpercables/jmilc0.png index cd4fead..11a6cba 100644 Binary files a/sprites/jumpercables/jmilc0.png and b/sprites/jumpercables/jmilc0.png differ diff --git a/sprites/jumpercables/jmild0.png b/sprites/jumpercables/jmild0.png index 0b396ed..b11bece 100644 Binary files a/sprites/jumpercables/jmild0.png and b/sprites/jumpercables/jmild0.png differ diff --git a/sprites/jumpercables/jmile0.png b/sprites/jumpercables/jmile0.png index 9d6dbd8..a640a47 100644 Binary files a/sprites/jumpercables/jmile0.png and b/sprites/jumpercables/jmile0.png differ diff --git a/sprites/jumpercables/jmilf0.png b/sprites/jumpercables/jmilf0.png index 347a964..cb2b0a5 100644 Binary files a/sprites/jumpercables/jmilf0.png and b/sprites/jumpercables/jmilf0.png differ diff --git a/sprites/jumpercables/jmilg0.png b/sprites/jumpercables/jmilg0.png index 7ce9ba6..5b0c589 100644 Binary files a/sprites/jumpercables/jmilg0.png and b/sprites/jumpercables/jmilg0.png differ diff --git a/sprites/jumpercables/jmilh0.png b/sprites/jumpercables/jmilh0.png index 95f82ca..25b0d4c 100644 Binary files a/sprites/jumpercables/jmilh0.png and b/sprites/jumpercables/jmilh0.png differ diff --git a/sprites/jumpercables/jmili0.png b/sprites/jumpercables/jmili0.png index aaf99ae..379fe6e 100644 Binary files a/sprites/jumpercables/jmili0.png and b/sprites/jumpercables/jmili0.png differ diff --git a/sprites/jumpercables/jmilj0.png b/sprites/jumpercables/jmilj0.png index a853268..dfb600f 100644 Binary files a/sprites/jumpercables/jmilj0.png and b/sprites/jumpercables/jmilj0.png differ diff --git a/sprites/jumpercables/jmilk0.png b/sprites/jumpercables/jmilk0.png index ce7245e..8dd38d4 100644 Binary files a/sprites/jumpercables/jmilk0.png and b/sprites/jumpercables/jmilk0.png differ diff --git a/sprites/jumpercables/jmill0.png b/sprites/jumpercables/jmill0.png index e985253..79488c5 100644 Binary files a/sprites/jumpercables/jmill0.png and b/sprites/jumpercables/jmill0.png differ diff --git a/sprites/jumpercables/jmilm0.png b/sprites/jumpercables/jmilm0.png index c6df72f..904a729 100644 Binary files a/sprites/jumpercables/jmilm0.png and b/sprites/jumpercables/jmilm0.png differ diff --git a/sprites/jumpercables/jmiln0.png b/sprites/jumpercables/jmiln0.png index 7cefa10..93e5789 100644 Binary files a/sprites/jumpercables/jmiln0.png and b/sprites/jumpercables/jmiln0.png differ diff --git a/sprites/jumpercables/jmilo0.png b/sprites/jumpercables/jmilo0.png index fd8816c..0945d8e 100644 Binary files a/sprites/jumpercables/jmilo0.png and b/sprites/jumpercables/jmilo0.png differ diff --git a/sprites/jumpercables/jmilp0.png b/sprites/jumpercables/jmilp0.png index cc9d9e8..36a1526 100644 Binary files a/sprites/jumpercables/jmilp0.png and b/sprites/jumpercables/jmilp0.png differ diff --git a/sprites/jumpercables/jmira0.png b/sprites/jumpercables/jmira0.png index 5708bc5..8f147bd 100644 Binary files a/sprites/jumpercables/jmira0.png and b/sprites/jumpercables/jmira0.png differ diff --git a/sprites/jumpercables/jmirb0.png b/sprites/jumpercables/jmirb0.png index 8f2f0e0..80154e9 100644 Binary files a/sprites/jumpercables/jmirb0.png and b/sprites/jumpercables/jmirb0.png differ diff --git a/sprites/jumpercables/jmirc0.png b/sprites/jumpercables/jmirc0.png index 4f9a023..46ac5d4 100644 Binary files a/sprites/jumpercables/jmirc0.png and b/sprites/jumpercables/jmirc0.png differ diff --git a/sprites/jumpercables/jmird0.png b/sprites/jumpercables/jmird0.png index eed875c..dab4651 100644 Binary files a/sprites/jumpercables/jmird0.png and b/sprites/jumpercables/jmird0.png differ diff --git a/sprites/jumpercables/jmire0.png b/sprites/jumpercables/jmire0.png index 50c26f3..ee01cef 100644 Binary files a/sprites/jumpercables/jmire0.png and b/sprites/jumpercables/jmire0.png differ diff --git a/sprites/jumpercables/jmirf0.png b/sprites/jumpercables/jmirf0.png index 34507b6..c39e4d3 100644 Binary files a/sprites/jumpercables/jmirf0.png and b/sprites/jumpercables/jmirf0.png differ diff --git a/sprites/jumpercables/jmirg0.png b/sprites/jumpercables/jmirg0.png index 1fa2041..d98ffc6 100644 Binary files a/sprites/jumpercables/jmirg0.png and b/sprites/jumpercables/jmirg0.png differ diff --git a/sprites/jumpercables/jmirh0.png b/sprites/jumpercables/jmirh0.png index 59294b6..e852301 100644 Binary files a/sprites/jumpercables/jmirh0.png and b/sprites/jumpercables/jmirh0.png differ diff --git a/sprites/jumpercables/jmiri0.png b/sprites/jumpercables/jmiri0.png index 03675ec..9bedece 100644 Binary files a/sprites/jumpercables/jmiri0.png and b/sprites/jumpercables/jmiri0.png differ diff --git a/sprites/jumpercables/jmirj0.png b/sprites/jumpercables/jmirj0.png index 871d179..7b3f76f 100644 Binary files a/sprites/jumpercables/jmirj0.png and b/sprites/jumpercables/jmirj0.png differ diff --git a/sprites/jumpercables/jmirk0.png b/sprites/jumpercables/jmirk0.png index 6601a7b..28a1218 100644 Binary files a/sprites/jumpercables/jmirk0.png and b/sprites/jumpercables/jmirk0.png differ diff --git a/sprites/jumpercables/jmirl0.png b/sprites/jumpercables/jmirl0.png index dc80254..e06d88a 100644 Binary files a/sprites/jumpercables/jmirl0.png and b/sprites/jumpercables/jmirl0.png differ diff --git a/sprites/jumpercables/jmirm0.png b/sprites/jumpercables/jmirm0.png index 353e2ef..0bbf394 100644 Binary files a/sprites/jumpercables/jmirm0.png and b/sprites/jumpercables/jmirm0.png differ diff --git a/sprites/jumpercables/jmirn0.png b/sprites/jumpercables/jmirn0.png index f02d1c0..efd8537 100644 Binary files a/sprites/jumpercables/jmirn0.png and b/sprites/jumpercables/jmirn0.png differ diff --git a/sprites/jumpercables/jmiro0.png b/sprites/jumpercables/jmiro0.png index f17fbcd..5766c78 100644 Binary files a/sprites/jumpercables/jmiro0.png and b/sprites/jumpercables/jmiro0.png differ diff --git a/sprites/jumpercables/jmirp0.png b/sprites/jumpercables/jmirp0.png index ec2c4ab..eafd80a 100644 Binary files a/sprites/jumpercables/jmirp0.png and b/sprites/jumpercables/jmirp0.png differ diff --git a/zscript/snektech.zs b/zscript/snektech.zs index ffba9a7..a03c105 100644 --- a/zscript/snektech.zs +++ b/zscript/snektech.zs @@ -54,6 +54,7 @@ class SnekTechEventHandler : EventHandler HDBattery bat = HDBattery(e.Thing); if(bat) { bat.ItemsThatUseThis.Push("GretchenCounter"); + bat.ItemsThatUseThis.Push("JumperCablesUsable"); } // Delete disabled items from backpacks that just spawned.