diff --git a/TODO.md b/TODO.md index ab83033..d12c116 100644 --- a/TODO.md +++ b/TODO.md @@ -1,7 +1,7 @@ - ~~Integrate caco plush~~ - ~~Makefile for caco plush sprites~~ - -- Jumper cables +- ~~Fix upper/lowercase consistency between objects~~ +- ~~Jumper cables~~ - ~~Jumper cables ammohandler stuff~~ - ~~Fix wiring kit brightmaps~~ @@ -14,4 +14,4 @@ - Organize source_data -- Fix upper/lowercase consistency between objects + diff --git a/gldefs.txt b/gldefs.txt index 77cd279..dfa7033 100644 --- a/gldefs.txt +++ b/gldefs.txt @@ -58,5 +58,36 @@ brightmap sprite jmppc0 disablefullbright } +// ---------------------------------------------------------------------- +// Caco plushie brightmaps +brightmap sprite kcplb0 +{ + map "sprites/cacoplush/bright_cacoplushie_idle.png" + disablefullbright +} + +brightmap sprite kcpld0 +{ + map "sprites/cacoplush/bright_cacoplushie_pickup.png" + disablefullbright +} + +brightmap sprite kcple0 +{ + map "sprites/cacoplush/bright_cacoplushie_glowing1.png" + disablefullbright +} + +brightmap sprite kcplf0 +{ + map "sprites/cacoplush/bright_cacoplushie_glowing2.png" + disablefullbright +} + +brightmap sprite kcplg0 +{ + map "sprites/cacoplush/bright_cacoplushie_glowing3.png" + disablefullbright +} diff --git a/source_data/Makefile b/source_data/Makefile index f59c22d..946f4ca 100644 --- a/source_data/Makefile +++ b/source_data/Makefile @@ -23,7 +23,12 @@ all : \ ../sprites/cacoplush/cacoplushie_glowing1.png \ ../sprites/cacoplush/cacoplushie_glowing2.png \ ../sprites/cacoplush/cacoplushie_glowing3.png \ - ../sprites/cacoplush/cacoplushie_pickup.png + ../sprites/cacoplush/cacoplushie_pickup.png \ + ../sprites/cacoplush/bright_cacoplushie_idle.png \ + ../sprites/cacoplush/bright_cacoplushie_pickup.png \ + ../sprites/cacoplush/bright_cacoplushie_glowing1.png \ + ../sprites/cacoplush/bright_cacoplushie_glowing2.png \ + ../sprites/cacoplush/bright_cacoplushie_glowing3.png # Base frames ../sprites/gretchencounter/kgcma0.png : gretchencounter_weaponsprite.aseprite @@ -392,3 +397,26 @@ brightmaps : povsprite.aseprite --ignore-layer "brightmap" \ --frame-range 1,3 --save-as ../sprites/cacoplush/cacoplushie_glowing.png + +# Brightmaps +../sprites/cacoplush/bright_cacoplushie_idle.png : cacoplushie.aseprite + aseprite -b $^ \ + --layer "brightmap" \ + --scale 0.77 \ + --frame-range 0,0 --save-as $@ + +../sprites/cacoplush/bright_cacoplushie_pickup.png : cacoplushie.aseprite + aseprite -b $^ \ + --layer "brightmap" \ + --frame-range 0,0 \ + --scale 0.25 \ + --save-as $@ + +../sprites/cacoplush/bright_cacoplushie_glowing1.png \ +../sprites/cacoplush/bright_cacoplushie_glowing2.png \ +../sprites/cacoplush/bright_cacoplushie_glowing3.png : cacoplushie.aseprite + aseprite -b $^ \ + --scale 0.77 \ + --layer "brightmap" \ + --frame-range 1,3 --save-as ../sprites/cacoplush/bright_cacoplushie_glowing.png + diff --git a/source_data/cacoplushie.aseprite b/source_data/cacoplushie.aseprite index 5d93efd..78a183a 100644 Binary files a/source_data/cacoplushie.aseprite and b/source_data/cacoplushie.aseprite differ diff --git a/sprites/cacoplush/bright_cacoplushie_glowing1.png b/sprites/cacoplush/bright_cacoplushie_glowing1.png new file mode 100644 index 0000000..ada0e8d Binary files /dev/null and b/sprites/cacoplush/bright_cacoplushie_glowing1.png differ diff --git a/sprites/cacoplush/bright_cacoplushie_glowing2.png b/sprites/cacoplush/bright_cacoplushie_glowing2.png new file mode 100644 index 0000000..166854a Binary files /dev/null and b/sprites/cacoplush/bright_cacoplushie_glowing2.png differ diff --git a/sprites/cacoplush/bright_cacoplushie_glowing3.png b/sprites/cacoplush/bright_cacoplushie_glowing3.png new file mode 100644 index 0000000..face163 Binary files /dev/null and b/sprites/cacoplush/bright_cacoplushie_glowing3.png differ diff --git a/sprites/cacoplush/bright_cacoplushie_idle.png b/sprites/cacoplush/bright_cacoplushie_idle.png new file mode 100644 index 0000000..add2e84 Binary files /dev/null and b/sprites/cacoplush/bright_cacoplushie_idle.png differ diff --git a/sprites/cacoplush/bright_cacoplushie_pickup.png b/sprites/cacoplush/bright_cacoplushie_pickup.png new file mode 100644 index 0000000..2ac9db3 Binary files /dev/null and b/sprites/cacoplush/bright_cacoplushie_pickup.png differ diff --git a/zscript/cacoplushie.zs b/zscript/cacoplushie.zs index 853f0ed..fa5de04 100644 --- a/zscript/cacoplushie.zs +++ b/zscript/cacoplushie.zs @@ -32,6 +32,7 @@ class KiriCacodemonPlushieProjectile : SlowProjectile { mass 500; scale 0.3; + +bright; } // What item threw this? @@ -130,7 +131,7 @@ class KiriCacodemonPlushie : HDWeapon { scale 0.63; - tag "cacodemon plushie"; + tag "Cacodemon Plushie"; } states @@ -548,6 +549,21 @@ class KiriCacodemonPlushie : HDWeapon { } } + // Spawn green balls. + if(spawned_creature) { + if(level.time & 1) { + double mrad = spawned_creature.radius * 0.3; + spawned_creature.A_SpawnParticle( + "green", SPF_FULLBRIGHT, 50, + frandom(4, 8), 0, + frandom(-mrad, mrad), frandom(-mrad, mrad), frandom(0.1, 0.9) * spawned_creature.height, + frandom(-0.2, 0.2), frandom(-0.2, 0.2), frandom(0.05, 0.2), + frandom(-0.05, 0.05), frandom(-0.05, 0.05), 0.06, + startalphaf : 0.8, + sizestep : 0.1); + } + } + } else { // Monster is inside plushie. Sloooooooooooooowly @@ -720,9 +736,6 @@ class KiriCacodemonPlushie : HDWeapon { shieldItem.amount = invoker.getMonsterShield(); } - // Copy player colors over. - spawned_thing.translation = invoker.owner.translation; - // Set the name. spawned_thing.setTag(invoker.getMonsterName()); @@ -745,6 +758,10 @@ class KiriCacodemonPlushie : HDWeapon { // distinct! // // spawned_thing.A_SetTranslation("AllPurple"); + // + // This would just copy the player colors over. + // + // spawned_thing.translation = invoker.owner.translation; // Spawn flash. spawn_ball.A_SpawnItemEx(