From 37b8aab9065d7e4e3ca0fe8bab3bb1ab173783e5 Mon Sep 17 00:00:00 2001 From: Cameron Reikes Date: Sat, 1 Apr 2023 05:01:16 -0700 Subject: [PATCH] Many small fixes --- Session.vim | 143 +++++++++++++++++++++++++++++++--------------------- main.c | 10 ++-- todo.txt | 9 ++-- 3 files changed, 99 insertions(+), 63 deletions(-) diff --git a/Session.vim b/Session.vim index c8ca4e1..51fbdac 100644 --- a/Session.vim +++ b/Session.vim @@ -13,22 +13,81 @@ if &shortmess =~ 'A' else set shortmess=aoO endif -badd +0 codegen.c +badd +1 codegen.c badd +0 main.c +badd +0 maketraining.c +badd +0 thirdparty/md.c +badd +0 assets.mdesk +badd +0 elements.mdesk +badd +0 gen/assets.gen.c +badd +0 gen/training_data.jsonl +badd +0 server/main.go +badd +0 server/codes/codes.go +badd +0 server/codes/codes_test.go +badd +0 server/rpgpt.service +badd +0 server/install_service.sh +badd +0 API_KEY.bat +badd +0 build_desktop_debug.bat +badd +0 build_web_debug.bat +badd +0 build_web_release.bat +badd +0 run_codegen.bat badd +0 buff.h badd +0 makeprompt.h badd +0 profiling.h -badd +0 term://~/Documents/rpgpt//42668:C:/Windows/system32/cmd.exe +badd +0 thirdparty/dr_wav.h +badd +0 thirdparty/HandmadeMath.h +badd +0 thirdparty/md.h +badd +0 thirdparty/md_stb_sprintf.h +badd +0 thirdparty/sokol_app.h +badd +0 thirdparty/sokol_audio.h +badd +0 thirdparty/sokol_gfx.h +badd +0 thirdparty/sokol_glue.h +badd +0 thirdparty/sokol_log.h +badd +0 thirdparty/sokol_time.h +badd +0 thirdparty/spall.h +badd +0 thirdparty/stb_image.h +badd +0 thirdparty/stb_truetype.h +badd +0 gen/characters.gen.h +badd +0 gen/quad-sapp.glsl.h argglobal %argdel $argadd codegen.c $argadd main.c +$argadd maketraining.c +$argadd thirdparty/md.c +$argadd assets.mdesk +$argadd elements.mdesk +$argadd gen/assets.gen.c +$argadd gen/training_data.jsonl +$argadd server/main.go +$argadd server/codes/codes.go +$argadd server/codes/codes_test.go +$argadd server/rpgpt.service +$argadd server/install_service.sh +$argadd API_KEY.bat +$argadd build_desktop_debug.bat +$argadd build_web_debug.bat +$argadd build_web_release.bat +$argadd run_codegen.bat $argadd buff.h $argadd makeprompt.h $argadd profiling.h -set stal=2 -tabnew +setlocal\ bufhidden=wipe -tabrewind +$argadd thirdparty/dr_wav.h +$argadd thirdparty/HandmadeMath.h +$argadd thirdparty/md.h +$argadd thirdparty/md_stb_sprintf.h +$argadd thirdparty/sokol_app.h +$argadd thirdparty/sokol_audio.h +$argadd thirdparty/sokol_gfx.h +$argadd thirdparty/sokol_glue.h +$argadd thirdparty/sokol_log.h +$argadd thirdparty/sokol_time.h +$argadd thirdparty/spall.h +$argadd thirdparty/stb_image.h +$argadd thirdparty/stb_truetype.h +$argadd gen/characters.gen.h +$argadd gen/quad-sapp.glsl.h +edit main.c let s:save_splitbelow = &splitbelow let s:save_splitright = &splitright set splitbelow splitright @@ -45,24 +104,14 @@ set winminheight=0 set winheight=1 set winminwidth=0 set winwidth=1 -exe 'vert 1resize ' . ((&columns * 124 + 104) / 209) -exe 'vert 2resize ' . ((&columns * 84 + 104) / 209) -argglobal -enew -setlocal fdm=manual -setlocal fde=0 -setlocal fmr={{{,}}} -setlocal fdi=# -setlocal fdl=0 -setlocal fml=1 -setlocal fdn=20 -setlocal fen -wincmd w +exe 'vert 1resize ' . ((&columns * 104 + 104) / 209) +exe 'vert 2resize ' . ((&columns * 104 + 104) / 209) argglobal -if bufexists(fnamemodify("term://~/Documents/rpgpt//42668:C:/Windows/system32/cmd.exe", ":p")) | buffer term://~/Documents/rpgpt//42668:C:/Windows/system32/cmd.exe | else | edit term://~/Documents/rpgpt//42668:C:/Windows/system32/cmd.exe | endif +if bufexists(fnamemodify("main.c", ":p")) | buffer main.c | else | edit main.c | endif if &buftype ==# 'terminal' - silent file term://~/Documents/rpgpt//42668:C:/Windows/system32/cmd.exe + silent file main.c endif +balt codegen.c setlocal fdm=manual setlocal fde=0 setlocal fmr={{{,}}} @@ -71,6 +120,8 @@ setlocal fdl=0 setlocal fml=1 setlocal fdn=20 setlocal fen +silent! normal! zE +let &fdl = &fdl let s:l = 1 - ((0 * winheight(0) + 24) / 49) if s:l < 1 | let s:l = 1 | endif keepjumps exe s:l @@ -78,42 +129,12 @@ normal! zt keepjumps 1 normal! 0 wincmd w -exe 'vert 1resize ' . ((&columns * 124 + 104) / 209) -exe 'vert 2resize ' . ((&columns * 84 + 104) / 209) -tabnext -let s:save_splitbelow = &splitbelow -let s:save_splitright = &splitright -set splitbelow splitright -wincmd _ | wincmd | -vsplit -1wincmd h -wincmd w -let &splitbelow = s:save_splitbelow -let &splitright = s:save_splitright -wincmd t -let s:save_winminheight = &winminheight -let s:save_winminwidth = &winminwidth -set winminheight=0 -set winheight=1 -set winminwidth=0 -set winwidth=1 -exe 'vert 1resize ' . ((&columns * 104 + 104) / 209) -exe 'vert 2resize ' . ((&columns * 104 + 104) / 209) -argglobal -enew -balt term://~/Documents/rpgpt//42668:C:/Windows/system32/cmd.exe -setlocal fdm=manual -setlocal fde=0 -setlocal fmr={{{,}}} -setlocal fdi=# -setlocal fdl=0 -setlocal fml=1 -setlocal fdn=20 -setlocal fen -wincmd w argglobal -enew -balt term://~/Documents/rpgpt//42668:C:/Windows/system32/cmd.exe +if bufexists(fnamemodify("makeprompt.h", ":p")) | buffer makeprompt.h | else | edit makeprompt.h | endif +if &buftype ==# 'terminal' + silent file makeprompt.h +endif +balt codegen.c setlocal fdm=manual setlocal fde=0 setlocal fmr={{{,}}} @@ -122,11 +143,19 @@ setlocal fdl=0 setlocal fml=1 setlocal fdn=20 setlocal fen +silent! normal! zE +let &fdl = &fdl +let s:l = 1 - ((0 * winheight(0) + 24) / 49) +if s:l < 1 | let s:l = 1 | endif +keepjumps exe s:l +normal! zt +keepjumps 1 +normal! 0 wincmd w +2wincmd w exe 'vert 1resize ' . ((&columns * 104 + 104) / 209) exe 'vert 2resize ' . ((&columns * 104 + 104) / 209) -tabnext 2 -set stal=1 +tabnext 1 if exists('s:wipebuf') && len(win_findbuf(s:wipebuf)) == 0 && getbufvar(s:wipebuf, '&buftype') isnot# 'terminal' silent exe 'bwipe ' . s:wipebuf endif diff --git a/main.c b/main.c index b561b61..7e7ac1e 100644 --- a/main.c +++ b/main.c @@ -2250,7 +2250,10 @@ void frame(void) (float)keydown[SAPP_KEYCODE_D] - (float)keydown[SAPP_KEYCODE_A], (float)keydown[SAPP_KEYCODE_W] - (float)keydown[SAPP_KEYCODE_S] ); - attack = keydown[SAPP_KEYCODE_SPACE] || keydown[SAPP_KEYCODE_LEFT_CONTROL]; + attack = keydown[SAPP_KEYCODE_SPACE]; +#ifdef DEVTOOLS + attack = attack || keydown[SAPP_KEYCODE_LEFT_CONTROL]; +#endif roll = keydown[ROLL_KEY]; } if(LenV2(movement) > 1.0) @@ -3155,8 +3158,8 @@ void frame(void) } else if(it->prop_kind == TREE1) { - Vec2 prop_size = V2(102.0f, 145.0f); - d = ((DrawParams){true, quad_centered(AddV2(it->pos, V2(-4.0f, 55.0)), prop_size), image_props_atlas, aabb_at_yplusdown(V2(5.0f, 684.0f), prop_size), WHITE, .y_coord_sorting = y_coord_sorting_at(AddV2(it->pos, V2(0.0f, 20.0f))), .alpha_clip_threshold = 0.4f}); + Vec2 prop_size = V2(94.0f, 120.0f); + d = ((DrawParams){true, quad_centered(AddV2(it->pos, V2(-4.0f, 55.0)), prop_size), image_props_atlas, aabb_at_yplusdown(V2(105.0f, 4.0f), prop_size), WHITE, .y_coord_sorting = y_coord_sorting_at(AddV2(it->pos, V2(0.0f, 20.0f))), .alpha_clip_threshold = 0.4f}); } else if(it->prop_kind == TREE2) { @@ -3280,6 +3283,7 @@ void cleanup(void) void event(const sapp_event *e) { + if(e->key_repeat) return; if(e->type == SAPP_EVENTTYPE_TOUCHES_BEGAN) { if(!mobile_controls) diff --git a/todo.txt b/todo.txt index 8bebefd..7210115 100644 --- a/todo.txt +++ b/todo.txt @@ -11,7 +11,7 @@ DON'T NEED - Old man in beginning is invincible DONE - Add cancel button DONE - Style buttons - Make map better, add new characters/items from fate - - nocheckin git thing +DONE - nockin git thing - Animate text characters coming in - Make TREE1 prop work - Instead of roll animation, 5 sprite long trail of past moves for juice @@ -20,8 +20,11 @@ DONE - Style buttons - Sword combat for sword npcs - Third button for dialog/item stuff, not roll button. E on desktop. Touchscreen button only visible when appropriate to let player know what it's for - Clamp camera to boundaries of level - - Ignore keyrepeat events - - Remove control attack key as devtools +DONE - Ignore keyrepeat events +DONE - Remove control attack key as devtools + - Cells interlinked (interlinked) + - Tune fade popping at dist when you go too far awy + - - Particle fx and sound fx for when hit - Max text length on text input DONE - Fade dialog with distance