More training & small build system fixes

main
Cameron Murphy Reikes 2 years ago
parent d9c48ecfd7
commit c323c5789f

@ -359,8 +359,8 @@
"rotation":0,
"visible":true,
"width":32,
"x":539.81818181818,
"y":633.090909090913
"x":1324.48484848485,
"y":749.75757575758
},
{
"class":"",

@ -2087,6 +2087,12 @@ float draw_wrapped_text(bool dry_run, Vec2 at_point, float max_width, char *text
sentence_to_draw += chars_from_sentence;
colors += chars_from_sentence;
cursor = V2(drawn_bounds.upper_left.X, drawn_bounds.lower_right.Y);
// caught a random infinite loop in the debugger, maybe this will stop it. Need to test and make sure it doesn't early out on valid text cases
if(!has_point(clip_to, cursor))
{
break;
}
}
return cursor.Y;

@ -324,6 +324,17 @@ TrainingSample samples[] = {
PlayerSay("That's more like it"),
},
},
{
.npc_kind = NPC_OldMan,
.elems = {
PlayerSay("WJFldskla"),
NPCSay("You speak of gibberish young traveler"),
PlayerSay("Fuck bitch"),
NPCSay("Crude!"),
PlayerSay("Give me gold or I'll kill you"),
NPCSay("I have nothing to give! Besides, I'll never give into tyrrany"),
},
}
};

@ -3,11 +3,13 @@
echo Asset packs which must be bought and unzipped into root directory before running this script:
echo https://rafaelmatos.itch.io/epic-rpg-world-pack-ancient-ruins
echo https://sventhole.itch.io/undead-pixel-art-characters
echo https://immunitys.itch.io/fm32x32
echo You must also get access to the rpgpt_private_assets megasync folder from creikey, and put it in this repo under that exact filename. Contact him for access
rmdir /S /q assets\copyrighted
mkdir assets\copyrighted
@echo on
copy "EPIC RPG World Pack - Ancient Ruins V 1.7\EPIC RPG World Pack - Ancient Ruins V 1.7\Characters\NPC Merchant-idle.png" "assets\copyrighted\merchant.png" || goto :error
copy "EPIC RPG World Pack - Ancient Ruins V 1.7\EPIC RPG World Pack - Ancient Ruins V 1.7\Tilesets\wall-1 - 3 tiles tall.png" "assets\copyrighted\wall-1 - 3 tiles tall.png" || goto :error
copy "EPIC RPG World Pack - Ancient Ruins V 1.7\EPIC RPG World Pack - Ancient Ruins V 1.7\Tilesets\Tileset-Animated Terrains-16 frames.png" "assets\copyrighted\animated_terrain.png" || goto :error
@ -25,6 +27,7 @@ copy "ForgottenMemories\WaterTiles-6frames.png" "assets\copyrighted\WaterTiles-6
copy "rpgpt_private_assets\knight_idle.png" "assets\copyrighted\knight_idle.png" || goto :error
copy "rpgpt_private_assets\knight_attack.png" "assets\copyrighted\knight_attack.png" || goto :error
copy "rpgpt_private_assets\knight_run_start.png" "assets\copyrighted\knight_run_start.png" || goto :error
@echo off
rmdir /S /q gen
mkdir gen

Loading…
Cancel
Save