Compare commits

..

No commits in common. "2949c4ac755557dff37abd995c7b8b2e4784fcf6" and "8aa3ca4444395aa4b448835eef5db86cdeaac77f" have entirely different histories.

9 changed files with 6 additions and 7 deletions

BIN
Sprite-0002.aseprite Normal file

Binary file not shown.

View File

@ -1,3 +1,2 @@
kiri/gretchencounter_click "sounds/kirigretchencounter_click.ogg" kiri/gretchencounter_click "sounds/kirigretchencounter_click.ogg"
kiri/gretchencounter_blip "sounds/kirigretchencounter_blip.ogg" kiri/gretchencounter_blip "sounds/kirigretchencounter_blip.ogg"
kiri/gretchencounter_onoff "sounds/kirigretchencounter_onoff.ogg"

Binary file not shown.

View File

@ -7,7 +7,6 @@ all : \
../sprites/bright_kgcmb0.png \ ../sprites/bright_kgcmb0.png \
../sounds/kirigretchencounter_click.ogg \ ../sounds/kirigretchencounter_click.ogg \
../sounds/kirigretchencounter_blip.ogg \ ../sounds/kirigretchencounter_blip.ogg \
../sounds/kirigretchencounter_onoff.ogg \
../sprites/kgcpa0.png \ ../sprites/kgcpa0.png \
../sprites/kgcpb0.png \ ../sprites/kgcpb0.png \
../sprites/bright_kgcpa0.png \ ../sprites/bright_kgcpa0.png \
@ -86,6 +85,3 @@ all : \
../sounds/kirigretchencounter_blip.ogg : kirigretchencounter_blip.wav ../sounds/kirigretchencounter_blip.ogg : kirigretchencounter_blip.wav
ffmpeg -i $^ "-filter:a" "volume=1.0" $@ ffmpeg -i $^ "-filter:a" "volume=1.0" $@
../sounds/kirigretchencounter_onoff.ogg : on_off_switch.wav
ffmpeg -i $^ "-filter:a" "volume=1.0" $@

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -86,7 +86,8 @@ class GretchenCounter : HDWeapon
KGCM # 1 { KGCM # 1 {
invoker.onSwitch = !invoker.onSwitch; invoker.onSwitch = !invoker.onSwitch;
A_PlaySound("kiri/gretchencounter_onoff"); console.printf("onswitch: %d", int(invoker.onSwitch));
// TODO: Play sound.
updateOverlay(); updateOverlay();
} }
@ -149,7 +150,8 @@ class GretchenCounter : HDWeapon
// Scale distance. // Scale distance.
dist *= distance_scale; dist *= distance_scale;
// Apply inverse-square falloff.
// console.printf("%s", type_name);
totalReading += 1.0 / (dist * dist); totalReading += 1.0 / (dist * dist);
} }
@ -170,6 +172,8 @@ class GretchenCounter : HDWeapon
referenceActor = self; referenceActor = self;
} }
console.printf("kjsdcsjkdcnsdjkcnsdkjcnsdc, %d", int(onSwitch));
// ThinkerIterator iter = ThinkerIterator.Create("BFGNecroShard"); // ThinkerIterator iter = ThinkerIterator.Create("BFGNecroShard");
// Actor mo; // Actor mo;
// int shardCount = 0; // int shardCount = 0;