mse / ConfectionerEngine (public) (License: Confectioner Engine license) (since 2021-04-24) (hash sha1)
Farming RPG engine
Clone URLs: https://rocketgit.com/user/mse/ConfectionerEngine ssh://rocketgit@ssh.rocketgit.com/user/mse/ConfectionerEngine git://git.rocketgit.com/user/mse/ConfectionerEngine
master
List of commits:
Subject Hash Author Date (UTC)
Add item translation system & change trading text de19b57c624f0317b4fe57086eff3e57f16e3361 mse 2021-12-17 22:32:45
Fix fg3 depth buffer format 65eef1b171eb937c6c213f7af1f1206053183832 mse 2021-12-16 00:57:55
Upgrade fg3 depth precision 153ff3855ec6f47b18eef4b262e42e4c4ccee90b mse 2021-12-15 16:20:26
Translate confec_select and confec_name to Greek 285a98c703de8afd92129cd08147562573785a29 mse 2021-12-15 01:51:04
Update game controller DB 1bc318197ae0f77693da7b7b4f754d7c89f800f6 mse 2021-12-14 14:22:51
Bump version to v0.7.6 53d47f1b30d2e87a4b72456220b813848af22ba1 mse 2021-12-14 14:03:20
Bump version to v0.7.5 97863be956f3af1cd5fb76fdc304d69a343289fc mse 2021-12-12 05:40:46
Update fg2/fg3 lighting functionality d46bc128f5d2ff38193c26d1465ef6f33a83f7bb mse 2021-12-12 05:20:39
Support function calls from Talk::go d20c5a67477446ba3676d9a47610c3fa03e185b9 mse 2021-12-09 08:42:57
Clear minimap background 644696f99298c8ed0fd0b5544cefcf15074ac23e mse 2021-12-08 15:42:53
Pause game on focus loss 2357bfbdc13df8caa49da487ab2094803458aec5 mse 2021-12-08 15:32:58
Hide minimap during character select & text input 14baf3d18e3e3a1f012064e04386279d920b6c75 mse 2021-12-07 12:59:19
Add tileset mipmap support & bump version to 0.7.4 9b10dbc7ae66493b87c53feddc600a8dda514802 mse 2021-12-06 11:38:53
Change UV behavior 7817fbe285427dd2c71a8460cf9a6adc5b58628c mse 2021-12-06 02:46:32
Bump version to v0.7.3 d5ec7a787af02be5e4e89236b62f7c69326a7166 mse 2021-12-06 00:50:25
Add a minimap 3da6d1001bcd89a903cd761492eab1cc23dbd0d6 mse 2021-12-05 16:04:36
Fix special item increment bug 8e7425924c63f56351357e6690d25ee6ecf3048a mse 2021-12-04 06:41:02
Bump version to v0.7.2 a4ccb6ce137ec34ec5852d95f8bff545f8b4b85c mse 2021-12-02 11:41:27
Make interact button also place items 3f1f27d32e162fc9e0cbe5e420b0ec78ef705d15 mse 2021-12-01 13:33:37
Switch entity button to interact a409b707d3e704e4370702bdb77a2a9841e624d3 mse 2021-11-30 06:37:25
Commit de19b57c624f0317b4fe57086eff3e57f16e3361 - Add item translation system & change trading text
Author: mse
Author date (UTC): 2021-12-17 22:32
Committer name: mse
Committer date (UTC): 2021-12-17 22:32
Parent(s): 65eef1b171eb937c6c213f7af1f1206053183832
Signer:
Signing key:
Signing status: N
Tree: 44843703d201500ba91baf9d1e9a1e2b89eddfee
File Lines added Lines deleted
base/items.json 10 0
confec.cpp 22 5
include/fworld.h 12 0
File base/items.json changed (mode: 100644) (index ac3bff4..5a3ce84)
77 77 "icon": "icons/fire.png" "icon": "icons/fire.png"
78 78 }, },
79 79 "Apple": { // This is an unbaked apple with an entity that overrides the default entity when placed in the world. "Apple": { // This is an unbaked apple with an entity that overrides the default entity when placed in the world.
80 "name_el": "Greek translation here",
81 "name_zh": "Chinese translation here",
80 82 "icon": "icons/apple-raw.png", "icon": "icons/apple-raw.png",
81 83 "stack": 9, "stack": 9,
82 84 "flavor": 20, "flavor": 20,
 
116 118 } }
117 119 }, },
118 120 "Baked Apple": { // Baked version of the above. "Baked Apple": { // Baked version of the above.
121 "name_el": "Greek translation here",
122 "name_zh": "Chinese translation here",
119 123 "icon": "icons/apple-baked.png", "icon": "icons/apple-baked.png",
120 124 "stack": 9, "stack": 9,
121 125 "flavor": 25, "flavor": 25,
 
157 161 } }
158 162 }, },
159 163 "Raw Fillet": { // A simple non-edible item with a recipe and a byproduct. Set flavor to > 0 to make it edible. "Raw Fillet": { // A simple non-edible item with a recipe and a byproduct. Set flavor to > 0 to make it edible.
164 "name_el": "Greek translation here",
165 "name_zh": "Chinese translation here",
160 166 "icon": "icons/fillet-raw.png", "icon": "icons/fillet-raw.png",
161 167 "stack": 9, "stack": 9,
162 168 "flavor": 0, "flavor": 0,
 
169 175 "byproducts": { "Lard": 1 } "byproducts": { "Lard": 1 }
170 176 }, },
171 177 "Pastry Crust": { // A simple edible item with a recipe. "Pastry Crust": { // A simple edible item with a recipe.
178 "name_el": "Greek translation here",
179 "name_zh": "Chinese translation here",
172 180 "icon": "icons/pastrycrust.png", "icon": "icons/pastrycrust.png",
173 181 "stack": 9, "stack": 9,
174 182 "flavor": 20, "flavor": 20,
 
180 188 "recipe": { "Flour": 1, "Lard": 1 } "recipe": { "Flour": 1, "Lard": 1 }
181 189 }, },
182 190 "Ghost Pepper": { // When eaten, damages health (because sweetness is -9999) and runs a script. (See calculations in the Eat function in confec.cpp.) "Ghost Pepper": { // When eaten, damages health (because sweetness is -9999) and runs a script. (See calculations in the Eat function in confec.cpp.)
191 "name_el": "Greek translation here",
192 "name_zh": "Chinese translation here",
183 193 "icon": "icons/pepper-ghost.png", "icon": "icons/pepper-ghost.png",
184 194 "stack": 9, "stack": 9,
185 195 "flavor": 30, "flavor": 30,
File confec.cpp changed (mode: 100644) (index 955e382..6af9113)
... ... void DrawInventory(
5530 5530 && fgl::mouseX >= item_x && fgl::mouseX >= item_x
5531 5531 && fgl::mouseX < item_x + tex.width * scale ){ && fgl::mouseX < item_x + tex.width * scale ){
5532 5532 // Display item name. // Display item name.
5533 target_name = item.first;
5533 auto it = world.items[item.first].names.find( language );
5534 if( it == world.items[item.first].names.end() ){
5535 target_name = item.first;
5536 }else{
5537 target_name = it->second;
5538 }
5534 5539 if( mouseDownLeft && selections.size() > i ){ if( mouseDownLeft && selections.size() > i ){
5535 5540 // Toggle item selection. // Toggle item selection.
5536 5541 selections[i] = !selections[i]; selections[i] = !selections[i];
 
... ... void DrawSpecialItems(
5587 5592 && fgl::mouseX < item_x + tex.width * scale ){ && fgl::mouseX < item_x + tex.width * scale ){
5588 5593 selected = true; selected = true;
5589 5594 // Display the item name. // Display the item name.
5595 // Special item names are set in localized scripts.
5590 5596 target_name = item.name; target_name = item.name;
5591 5597 if( mouseDownLeft ){ if( mouseDownLeft ){
5592 5598 // Do not propagate the click. // Do not propagate the click.
 
... ... void GameLoop( double d ){
6392 6398 if( fgl::mouseX >= offset_x && fgl::mouseY >= offset_y if( fgl::mouseX >= offset_x && fgl::mouseY >= offset_y
6393 6399 && fgl::mouseX < ingredient_x && fgl::mouseX < ingredient_x
6394 6400 && fgl::mouseY < offset_y + item.icon.height * round_scale ){ && fgl::mouseY < offset_y + item.icon.height * round_scale ){
6395 target_name = r.first;
6401 // Display the item name.
6402 auto it = world.items[r.first].names.find( language );
6403 if( it == world.items[r.first].names.end() ){
6404 target_name = r.first;
6405 }else{
6406 target_name = it->second;
6407 }
6396 6408 } }
6397 6409 for( auto &ingredient : item.recipe ){ for( auto &ingredient : item.recipe ){
6398 6410 auto &tex = world.items[ingredient.first].icon; auto &tex = world.items[ingredient.first].icon;
 
... ... void GameLoop( double d ){
6453 6465 ); );
6454 6466 int total = GetTradingTotal(); int total = GetTradingTotal();
6455 6467 fgl::drawText( fgl::drawText(
6456 " You gain: " + std::string( total < 0 ? "-$" : "$" )
6468 " You will be payed: " + std::string( total < 0 ? "-$" : "$" )
6457 6469 + std::to_string( std::abs( total ) ), + std::to_string( std::abs( total ) ),
6458 6470 font_vn, font_vn,
6459 6471 offset_x, offset_x,
 
... ... void GameLoop( double d ){
6593 6605 if( show_cursor if( show_cursor
6594 6606 && fgl::mouseY < tex_boxes.height * round_scale && fgl::mouseY < tex_boxes.height * round_scale
6595 6607 && fgl::mouseX >= itemOffX && fgl::mouseX < itemOffX + tex.width * round_scale ){ && fgl::mouseX >= itemOffX && fgl::mouseX < itemOffX + tex.width * round_scale ){
6596 // Display item name.
6597 target_name = item.first;
6608 // Display the item name.
6609 auto it = world.items[item.first].names.find( language );
6610 if( it == world.items[item.first].names.end() ){
6611 target_name = item.first;
6612 }else{
6613 target_name = it->second;
6614 }
6598 6615 if( mouseDownLeft ){ if( mouseDownLeft ){
6599 6616 // Do not propagate the click. // Do not propagate the click.
6600 6617 mouseDownLeft = false; mouseDownLeft = false;
File include/fworld.h changed (mode: 100755) (index 3815fd2..a85836b)
... ... struct EntityIndex {
155 155 }; };
156 156
157 157 struct Item { struct Item {
158 std::map<std::string,std::string> names;
158 159 fgl::Texture icon; fgl::Texture icon;
159 160 int stack; int stack;
160 161 int flavor; int flavor;
 
... ... void World::loadItems( std::string filePath ){
936 937 // Loop through the item definitions. // Loop through the item definitions.
937 938 for( auto &itemDef : allocatedDocument.document.root.getObject() ){ for( auto &itemDef : allocatedDocument.document.root.getObject() ){
938 939 std::string itemName = viewToString( itemDef.name ); std::string itemName = viewToString( itemDef.name );
940 // Find localized names for the item, starting with English.
941 std::map<std::string,std::string> localizedNames;
942 localizedNames["en"] = itemName;
943 for( auto &prop : itemDef.value.getObject() ){
944 std::string propName = viewToString( prop.name );
945 if( propName.length() > 5 && propName.substr( 0, 5 ) == "name_" ){
946 localizedNames[propName.substr( 5 )] =
947 viewToString( prop.value.getString() );
948 }
949 }
939 950 std::string itemIcon = viewToString( itemDef.value["icon"].getString() ); std::string itemIcon = viewToString( itemDef.value["icon"].getString() );
940 951 std::map<std::string,int> itemRecipe, itemByproducts; std::map<std::string,int> itemRecipe, itemByproducts;
941 952 // Read the recipe. // Read the recipe.
 
... ... void World::loadItems( std::string filePath ){
960 971 } }
961 972 // Add the item. // Add the item.
962 973 items[itemName] = { items[itemName] = {
974 localizedNames,
963 975 getTexture( dataPath, itemIcon, false ), getTexture( dataPath, itemIcon, false ),
964 976 itemDef.value["stack"] ? itemDef.value["stack"].getInt() : 1, itemDef.value["stack"] ? itemDef.value["stack"].getInt() : 1,
965 977 itemDef.value["flavor"].getInt(), itemDef.value["flavor"].getInt(),
Hints:
Before first commit, do not forget to setup your git environment:
git config --global user.name "your_name_here"
git config --global user.email "your@email_here"

Clone this repository using HTTP(S):
git clone https://rocketgit.com/user/mse/ConfectionerEngine

Clone this repository using ssh (do not forget to upload a key first):
git clone ssh://rocketgit@ssh.rocketgit.com/user/mse/ConfectionerEngine

Clone this repository using git:
git clone git://git.rocketgit.com/user/mse/ConfectionerEngine

You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a merge request:
... clone the repository ...
... make some changes and some commits ...
git push origin main