diff --git a/HEADS b/HEADS index bc5180b..1610794 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"master": "fd7bcb43cbf925731fee5c1b96166bf207dcbdd7"}} \ No newline at end of file +{"engine": {"master": "f9dcd088d0af77ac83ff3fb629131d254d2d2f9f"}} \ No newline at end of file diff --git a/Mourne-CI/sql/db_13_04_23.sql b/Mourne-CI/sql/db_13_04_23.sql index a286d23..e86b958 100644 --- a/Mourne-CI/sql/db_13_04_23.sql +++ b/Mourne-CI/sql/db_13_04_23.sql @@ -138,6 +138,7 @@ CREATE TABLE IF NOT EXISTS `attacks` ( -- Table structure for table `buildings` -- +--done CREATE TABLE IF NOT EXISTS `buildings` ( `id` int(11) NOT NULL AUTO_INCREMENT, `name` text NOT NULL, @@ -683,6 +684,7 @@ CREATE TABLE IF NOT EXISTS `news` ( -- Table structure for table `resources` -- +--done CREATE TABLE IF NOT EXISTS `resources` ( `id` int(11) NOT NULL AUTO_INCREMENT, `villageid` int(11) NOT NULL, @@ -725,6 +727,7 @@ CREATE TABLE IF NOT EXISTS `resources` ( -- Table structure for table `sessions` -- +--done CREATE TABLE IF NOT EXISTS `sessions` ( `session_id` varchar(40) NOT NULL DEFAULT '0', `ip_address` varchar(45) NOT NULL DEFAULT '0', @@ -976,6 +979,7 @@ INSERT INTO `units` (`id`, `type`, `name`, `icon`, `score`, `can_defend`, `defen -- Table structure for table `users` -- +--done CREATE TABLE IF NOT EXISTS `users` ( `id` int(11) NOT NULL AUTO_INCREMENT, `username` varchar(32) NOT NULL, @@ -996,6 +1000,7 @@ CREATE TABLE IF NOT EXISTS `users` ( -- Table structure for table `villages` -- +--done CREATE TABLE IF NOT EXISTS `villages` ( `id` int(11) NOT NULL AUTO_INCREMENT, `userid` int(11) NOT NULL, @@ -1021,6 +1026,7 @@ CREATE TABLE IF NOT EXISTS `villages` ( -- Table structure for table `village_buildings` -- +--done CREATE TABLE IF NOT EXISTS `village_buildings` ( `id` int(11) NOT NULL AUTO_INCREMENT, `villageid` int(11) NOT NULL, @@ -1040,6 +1046,7 @@ CREATE TABLE IF NOT EXISTS `village_buildings` ( -- Table structure for table `village_technologies` -- +--done CREATE TABLE IF NOT EXISTS `village_technologies` ( `id` int(11) NOT NULL AUTO_INCREMENT, `villageid` int(11) NOT NULL, @@ -1060,6 +1067,7 @@ CREATE TABLE IF NOT EXISTS `village_technologies` ( -- Table structure for table `village_units` -- +--done CREATE TABLE IF NOT EXISTS `village_units` ( `id` int(11) NOT NULL AUTO_INCREMENT, `userid` int(11) NOT NULL, diff --git a/SConstruct b/SConstruct index 2f068a5..a91e75c 100644 --- a/SConstruct +++ b/SConstruct @@ -35,6 +35,7 @@ folders = [ 'app', 'app/buildings', 'app/village', + 'app/assignments', ] module_folders = [ diff --git a/app/assignments/assignment.cpp b/app/assignments/assignment.cpp new file mode 100644 index 0000000..f97f715 --- /dev/null +++ b/app/assignments/assignment.cpp @@ -0,0 +1,127 @@ +#include "assignment.h" + +void Assignment::set_strings(const String &p_name, const String &p_description, const String &p_icon) { + name = p_name; + description = p_description; + icon = p_icon; +} +void Assignment::set_base_data(int p_rank, int p_next_rank, int p_time_to_build, int p_creates, int p_num_creates, int p_score, int p_defense, int p_ability) { + rank = p_rank; + next_rank = p_next_rank; + time_to_build = p_time_to_build; + creates = p_creates; + num_creates = p_num_creates; + score = p_score; + defense = p_defense; + ability = p_ability; +} +void Assignment::set_cost(int p_cost_food, int p_cost_wood, int p_cost_stone, int p_cost_iron, int p_cost_mana) { + cost_food = p_cost_food; + cost_wood = p_cost_wood; + cost_stone = p_cost_stone; + cost_iron = p_cost_iron; + cost_mana = p_cost_mana; +} +void Assignment::set_mod_max(int p_mod_max_food, int p_mod_max_wood, int p_mod_max_stone, int p_mod_max_iron, int p_mod_max_mana) { + mod_max_food = p_mod_max_food; + mod_max_wood = p_mod_max_wood; + mod_max_stone = p_mod_max_stone; + mod_max_iron = p_mod_max_iron; + mod_max_mana = p_mod_max_mana; +} +void Assignment::set_mod_rate(double p_mod_rate_food, double p_mod_rate_wood, double p_mod_rate_stone, double p_mod_rate_iron, double p_mod_rate_mana) { + mod_rate_food = p_mod_rate_food; + mod_rate_wood = p_mod_rate_wood; + mod_rate_stone = p_mod_rate_stone; + mod_rate_iron = p_mod_rate_iron; + mod_rate_mana = p_mod_rate_mana; +} +void Assignment::set_mod_percent(int p_mod_percent_food, int p_mod_percent_wood, int p_mod_percent_stone, int p_mod_percent_iron, int p_mod_percent_mana) { + mod_percent_food = p_mod_percent_food; + mod_percent_wood = p_mod_percent_wood; + mod_percent_stone = p_mod_percent_stone; + mod_percent_iron = p_mod_percent_iron; + mod_percent_mana = p_mod_percent_mana; +} +void Assignment::set_assignments(int p_assignment1, int p_assignment2, int p_assignment3, int p_assignment4, int p_assignment5) { + assignment1 = p_assignment1; + assignment2 = p_assignment2; + assignment3 = p_assignment3; + assignment4 = p_assignment4; + assignment5 = p_assignment5; +} +void Assignment::set_technologies(int p_req_tech, int p_tech_group, int p_tech_secondary_group) { + req_tech = p_req_tech; + tech_group = p_tech_group; + tech_secondary_group = p_tech_secondary_group; +} + +void Assignment::set_all( + const String &p_name, const String &p_description, const String &p_icon, + int p_rank, int p_next_rank, int p_time_to_build, int p_creates, int p_num_creates, int p_score, int p_defense, int p_ability, + int p_cost_food, int p_cost_wood, int p_cost_stone, int p_cost_iron, int p_cost_mana, + int p_mod_max_food, int p_mod_max_wood, int p_mod_max_stone, int p_mod_max_iron, int p_mod_max_mana, + double p_mod_rate_food, double p_mod_rate_wood, double p_mod_rate_stone, double p_mod_rate_iron, double p_mod_rate_mana, + int p_mod_percent_food, int p_mod_percent_wood, int p_mod_percent_stone, int p_mod_percent_iron, int p_mod_percent_mana, + int p_assignment1, int p_assignment2, int p_assignment3, int p_assignment4, int p_assignment5, + int p_req_tech, int p_tech_group, int p_tech_secondary_group) { + + set_strings(p_name, p_description, p_icon); + set_base_data(p_rank, p_next_rank, p_time_to_build, p_creates, p_num_creates, p_score, p_defense, p_ability); + set_cost(p_cost_food, p_cost_wood, p_cost_stone, p_cost_iron, p_cost_mana); + set_mod_max(p_mod_max_food, p_mod_max_wood, p_mod_max_stone, p_mod_max_iron, p_mod_max_mana); + set_mod_rate(p_mod_rate_food, p_mod_rate_wood, p_mod_rate_stone, p_mod_rate_iron, p_mod_rate_mana); + set_mod_percent(p_mod_percent_food, p_mod_percent_wood, p_mod_percent_stone, p_mod_percent_iron, p_mod_percent_mana); + set_assignments(p_assignment1, p_assignment2, p_assignment3, p_assignment4, p_assignment5); + set_technologies(p_req_tech, p_tech_group, p_tech_secondary_group); +} + +Assignment::Assignment() : + Resource() { + + rank = 0; + next_rank = 0; + time_to_build = 0; + creates = 0; + num_creates = 0; + score = 0; + defense = 0; + ability = 0; + + cost_food = 0; + cost_wood = 0; + cost_stone = 0; + cost_iron = 0; + cost_mana = 0; + + mod_max_food = 0; + mod_max_wood = 0; + mod_max_stone = 0; + mod_max_iron = 0; + mod_max_mana = 0; + + mod_rate_food = 0; + mod_rate_wood = 0; + mod_rate_stone = 0; + mod_rate_iron = 0; + mod_rate_mana = 0; + + mod_percent_food = 0; + mod_percent_wood = 0; + mod_percent_stone = 0; + mod_percent_iron = 0; + mod_percent_mana = 0; + + assignment1 = 0; + assignment2 = 0; + assignment3 = 0; + assignment4 = 0; + assignment5 = 0; + + req_tech = 0; + tech_group = 0; + tech_secondary_group = 0; +} + +Assignment::~Assignment() { +} diff --git a/app/assignments/assignment.h b/app/assignments/assignment.h new file mode 100644 index 0000000..5e92709 --- /dev/null +++ b/app/assignments/assignment.h @@ -0,0 +1,82 @@ +#ifndef ASSIGNMENT_H +#define ASSIGNMENT_H + +#include "core/string.h" + +#include "core/resource.h" + +class Assignment : public Resource { + RCPP_OBJECT(Assignment, Resource); + +public: + String name; + String description; + String icon; + + int rank; + int next_rank; + int time_to_build; + int creates; + int num_creates; + int score; + int defense; + int ability; + + int cost_food; + int cost_wood; + int cost_stone; + int cost_iron; + int cost_mana; + + int mod_max_food; + int mod_max_wood; + int mod_max_stone; + int mod_max_iron; + int mod_max_mana; + + double mod_rate_food; + double mod_rate_wood; + double mod_rate_stone; + double mod_rate_iron; + double mod_rate_mana; + + int mod_percent_food; + int mod_percent_wood; + int mod_percent_stone; + int mod_percent_iron; + int mod_percent_mana; + + int assignment1; + int assignment2; + int assignment3; + int assignment4; + int assignment5; + + int req_tech; + int tech_group; + int tech_secondary_group; + + void set_strings(const String &p_name, const String &p_description, const String &p_icon); + void set_base_data(int p_rank, int p_next_rank, int p_time_to_build, int p_creates, int p_num_creates, int p_score, int p_defense, int p_ability); + void set_cost(int p_cost_food, int p_cost_wood, int p_cost_stone, int p_cost_iron, int p_cost_mana); + void set_mod_max(int p_mod_max_food, int p_mod_max_wood, int p_mod_max_stone, int p_mod_max_iron, int p_mod_max_mana); + void set_mod_rate(double p_mod_rate_food, double p_mod_rate_wood, double p_mod_rate_stone, double p_mod_rate_iron, double p_mod_rate_mana); + void set_mod_percent(int p_mod_percent_food, int p_mod_percent_wood, int p_mod_percent_stone, int p_mod_percent_iron, int p_mod_percent_mana); + void set_assignments(int p_assignment1, int p_assignment2, int p_assignment3, int p_assignment4, int p_assignment5); + void set_technologies(int p_req_tech, int p_tech_group, int p_tech_secondary_group); + + void set_all( + const String &p_name, const String &p_description, const String &p_icon, + int p_rank, int p_next_rank, int p_time_to_build, int p_creates, int p_num_creates, int p_score, int p_defense, int p_ability, + int p_cost_food, int p_cost_wood, int p_cost_stone, int p_cost_iron, int p_cost_mana, + int p_mod_max_food, int p_mod_max_wood, int p_mod_max_stone, int p_mod_max_iron, int p_mod_max_mana, + double p_mod_rate_food, double p_mod_rate_wood, double p_mod_rate_stone, double p_mod_rate_iron, double p_mod_rate_mana, + int p_mod_percent_food, int p_mod_percent_wood, int p_mod_percent_stone, int p_mod_percent_iron, int p_mod_percent_mana, + int p_assignment1, int p_assignment2, int p_assignment3, int p_assignment4, int p_assignment5, + int p_req_tech, int p_tech_group, int p_tech_secondary_group); + + Assignment(); + ~Assignment(); +}; + +#endif \ No newline at end of file diff --git a/app/assignments/assignment_controller.cpp b/app/assignments/assignment_controller.cpp new file mode 100644 index 0000000..9a6864c --- /dev/null +++ b/app/assignments/assignment_controller.cpp @@ -0,0 +1,304 @@ +#include "assignment_controller.h" + +#include "core/html/form_validator.h" +#include "core/html/html_builder.h" +#include "core/http/cookie.h" +#include "core/http/http_enums.h" +#include "core/http/http_session.h" +#include "core/http/request.h" +#include "core/http/session_manager.h" + +#include "assignment_model.h" + +#include "../html_macros.h" + +void AssignmentController::handle_request_default(Request *request) { +} + +void AssignmentController::admin_handle_request_main(Request *request) { + String seg = request->get_current_path_segment(); + + if (seg == "") { + admin_render_assignment_list(request); + return; + } else if (seg == "new") { + request->push_path(); + Ref b; + b.instance(); + + admin_render_assignment(request, b); + return; + } else if (seg == "edit") { + request->push_path(); + + String seg_assignment_id = request->get_current_path_segment(); + + if (!seg_assignment_id.is_int()) { + request->send_error(HTTP_STATUS_CODE_404_NOT_FOUND); + return; + } + + int bid = seg_assignment_id.to_int(); + + Ref b = AssignmentModel::get_singleton()->get_assignment(bid); + + if (!b.is_valid()) { + request->send_error(HTTP_STATUS_CODE_404_NOT_FOUND); + return; + } + + admin_render_assignment(request, b); + return; + } + + request->send_error(404); +} +String AssignmentController::admin_get_section_name() { + return "Assignments"; +} +void AssignmentController::admin_add_section_links(Vector *links) { + links->push_back(AdminSectionLinkInfo("- Assignment Editor", "")); +} +bool AssignmentController::admin_full_render() { + return false; +} + +void AssignmentController::admin_render_assignment_list(Request *request) { + Vector > assignments = AssignmentModel::get_singleton()->get_all(); + + HTMLBuilder b; + + b.div("back")->f()->fa(request->get_url_root_parent(), "<--- Back")->cdiv(); + b.br(); + b.fdiv("Assignment Editor", "top_menu"); + b.br(); + b.div("top_menu")->f()->fa(request->get_url_root("new"), "Create New")->cdiv(); + b.br(); + + b.div("list_container"); + + for (int i = 0; i < assignments.size(); ++i) { + Ref assignment = assignments[i]; + + if (!assignment.is_valid()) { + continue; + } + + if (i % 2 == 0) { + b.div("row"); + } else { + b.div("row second"); + } + { + b.fdiv(String::num(assignment->id), "attr_box"); + b.fdiv(String::num(assignment->rank), "attr_box"); + b.fdiv(String::num(assignment->next_rank), "attr_box"); + b.fdiv(assignment->name, "name"); + + b.div("actionbox")->f()->fa(request->get_url_root("edit/" + String::num(assignment->id)), "Edit")->cdiv(); + } + b.cdiv(); + } + + b.cdiv(); + + request->body += b.result; +} + +void AssignmentController::admin_render_assignment(Request *request, Ref assignment) { + if (!assignment.is_valid()) { + RLOG_ERR("admin_render_assignment: !assignment.is_valid()\n"); + request->send_error(HTTP_STATUS_CODE_500_INTERNAL_SERVER_ERROR); + return; + } + + Vector > assignments = AssignmentModel::get_singleton()->get_all(); + + HTMLBuilder b; + + b.div("back")->f()->fa(request->get_url_root_parent(), "<--- Back")->cdiv(); + b.br(); + b.fdiv("Assignment Editor", "top_menu"); + b.br(); + + b.form_post(request->get_url_root()); + + bool show_post = false; //request->get_method() == HTTP_METHOD_POST && validation errors; + + ADMIN_EDIT_INPUT_TEXT("Name:", "name", show_post, assignment->name, request->get_parameter("name")); + ADMIN_EDIT_INPUT_TEXTAREA("Description:", "description", show_post, assignment->description, request->get_parameter("description")); + + b.div("row_edit"); + b.fdiv("Icon:", "edit_name"); + //todo I'm not sure yet how this worked originally + //b.div("edit_input")->f()->input_image("icon", assignment->icon)->f()->cdiv(); + b.div("edit_input")->f()->w("TODO")->cdiv(); + b.cdiv(); + + ADMIN_EDIT_INPUT_TEXT("Rank:", "rank", show_post, String::num(assignment->rank), request->get_parameter("rank")); + + Vector > nrbs = AssignmentModel::get_singleton()->get_all(); + b.div("row_edit"); + b.fdiv("Next Rank:", "edit_name"); + b.div("edit_input"); + { + b.select("next_rank", "drop"); + { + int current_id = assignment->id; + int current_nr = assignment->next_rank; + + b.foption(String::num(0), "- None -", current_nr == 0); + + for (int i = 0; i < nrbs.size(); ++i) { + Ref build = nrbs[i]; + + int id = build->id; + + if (id == current_id) { + continue; + } + + b.foption(String::num(id), build->name + " R" + String::num(build->rank), current_nr == id); + } + } + b.cselect(); + } + b.cdiv(); + b.cdiv(); + + ADMIN_EDIT_INPUT_TEXT("Time to Build:", "time_to_build", show_post, String::num(assignment->time_to_build), request->get_parameter("time_to_build")); + + ADMIN_EDIT_LINE_SPACER(); + + ADMIN_EDIT_INPUT_TEXT("Score:", "score", show_post, String::num(assignment->score), request->get_parameter("score")); + ADMIN_EDIT_INPUT_TEXT("Defense:", "defense", show_post, String::num(assignment->defense), request->get_parameter("defense")); + + //TODO + /* + int ability; + +
+
+ Ability: +
+
+ +
+
+ */ + + b.div("row_edit"); + b.fdiv("Ability:", "edit_name"); + b.div("edit_input")->f()->w("TODO")->cdiv(); + b.cdiv(); + + ADMIN_EDIT_LINE_SPACER(); + + ADMIN_EDIT_INPUT_TEXT("Cost Food:", "cost_food", show_post, String::num(assignment->cost_food), request->get_parameter("cost_food")); + ADMIN_EDIT_INPUT_TEXT("Cost Wood:", "cost_wood", show_post, String::num(assignment->cost_wood), request->get_parameter("cost_wood")); + ADMIN_EDIT_INPUT_TEXT("Cost Stone:", "cost_stone", show_post, String::num(assignment->cost_stone), request->get_parameter("cost_stone")); + ADMIN_EDIT_INPUT_TEXT("Cost Iron:", "cost_iron", show_post, String::num(assignment->cost_iron), request->get_parameter("cost_iron")); + ADMIN_EDIT_INPUT_TEXT("Cost Mana:", "cost_mana", show_post, String::num(assignment->cost_food), request->get_parameter("cost_mana")); + + ADMIN_EDIT_LINE_SPACER(); + +/* + int creates; + int num_creates; + +
+
+ Creates: +
+
+ + X (max) +
+
+*/ + + b.div("row_edit"); + b.fdiv("Creates:", "edit_name"); + b.div("edit_input")->f()->w("TODO")->cdiv(); + b.cdiv(); + + ADMIN_EDIT_LINE_SPACER(); + + ADMIN_EDIT_INPUT_TEXT("Mod Max Food:", "mod_max_food", show_post, String::num(assignment->mod_max_food), request->get_parameter("mod_max_food")); + ADMIN_EDIT_INPUT_TEXT("Mod Max Wood:", "mod_max_wood", show_post, String::num(assignment->mod_max_wood), request->get_parameter("mod_max_wood")); + ADMIN_EDIT_INPUT_TEXT("Mod Max Stone:", "mod_max_stone", show_post, String::num(assignment->mod_max_stone), request->get_parameter("mod_max_stone")); + ADMIN_EDIT_INPUT_TEXT("Mod Max Iron:", "mod_max_iron", show_post, String::num(assignment->mod_max_iron), request->get_parameter("mod_max_iron")); + ADMIN_EDIT_INPUT_TEXT("Mod Max Mana:", "mod_max_mana", show_post, String::num(assignment->mod_max_mana), request->get_parameter("mod_max_mana")); + + ADMIN_EDIT_LINE_SPACER(); + + ADMIN_EDIT_INPUT_TEXT("Mod Rate Food:", "mod_rate_food", show_post, String::num(assignment->mod_rate_food), request->get_parameter("mod_rate_food")); + ADMIN_EDIT_INPUT_TEXT("Mod Rate Wood:", "mod_rate_wood", show_post, String::num(assignment->mod_rate_wood), request->get_parameter("mod_rate_wood")); + ADMIN_EDIT_INPUT_TEXT("Mod Rate Stone:", "mod_rate_stone", show_post, String::num(assignment->mod_rate_stone), request->get_parameter("mod_rate_stone")); + ADMIN_EDIT_INPUT_TEXT("Mod Rate Iron:", "mod_rate_iron", show_post, String::num(assignment->mod_rate_iron), request->get_parameter("mod_rate_iron")); + ADMIN_EDIT_INPUT_TEXT("Mod Rate Mana:", "mod_rate_mana", show_post, String::num(assignment->mod_rate_mana), request->get_parameter("mod_rate_mana")); + + ADMIN_EDIT_LINE_SPACER(); + + ADMIN_EDIT_INPUT_TEXT("Mod Percent Food:", "mod_percent_food", show_post, String::num(assignment->mod_percent_food), request->get_parameter("mod_percent_food")); + ADMIN_EDIT_INPUT_TEXT("Mod Percent Wood:", "mod_percent_wood", show_post, String::num(assignment->mod_percent_wood), request->get_parameter("mod_percent_wood")); + ADMIN_EDIT_INPUT_TEXT("Mod Percent Stone:", "mod_percent_stone", show_post, String::num(assignment->mod_percent_stone), request->get_parameter("mod_percent_stone")); + ADMIN_EDIT_INPUT_TEXT("Mod Percent Iron:", "mod_percent_iron", show_post, String::num(assignment->mod_percent_iron), request->get_parameter("mod_percent_iron")); + ADMIN_EDIT_INPUT_TEXT("Mod Percent Mana:", "mod_percent_mana", show_post, String::num(assignment->mod_percent_mana), request->get_parameter("mod_percent_mana")); + + ADMIN_EDIT_LINE_SPACER(); + + //TODO + + ADMIN_EDIT_INPUT_TEXT("Assignment 1:", "assignment1", show_post, String::num(assignment->assignment1), request->get_parameter("assignment1")); + ADMIN_EDIT_INPUT_TEXT("Assignment 2:", "assignment2", show_post, String::num(assignment->assignment2), request->get_parameter("assignment2")); + ADMIN_EDIT_INPUT_TEXT("Assignment 3:", "assignment3", show_post, String::num(assignment->assignment3), request->get_parameter("assignment3")); + ADMIN_EDIT_INPUT_TEXT("Assignment 4:", "assignment4", show_post, String::num(assignment->assignment4), request->get_parameter("assignment4")); + ADMIN_EDIT_INPUT_TEXT("Assignment 5:", "assignment5", show_post, String::num(assignment->assignment5), request->get_parameter("assignment5")); + + ADMIN_EDIT_LINE_SPACER(); + + //TODO + ADMIN_EDIT_INPUT_TEXT("Required Technology:", "req_tech", show_post, String::num(assignment->req_tech), request->get_parameter("req_tech")); + ADMIN_EDIT_LINE_SPACER(); + //TODO + ADMIN_EDIT_INPUT_TEXT("Technology Group:", "tech_group", show_post, String::num(assignment->tech_group), request->get_parameter("tech_group")); + ADMIN_EDIT_LINE_SPACER(); + //TODO + ADMIN_EDIT_INPUT_TEXT("Secondary Technology Group:", "tech_secondary_group", show_post, String::num(assignment->tech_secondary_group), request->get_parameter("tech_secondary_group")); + + b.div("edit_submit")->f()->input_submit("Save", "submit")->f()->cdiv(); + + b.cform(); + + request->body += b.result; +} + +void AssignmentController::migrate() { + AssignmentModel::get_singleton()->migrate(); +} +void AssignmentController::add_default_data() { + AssignmentModel::get_singleton()->add_default_data(); +} + +AssignmentController *AssignmentController::get_singleton() { + return _self; +} + +AssignmentController::AssignmentController() : + AdminController() { + + if (_self) { + printf("AssignmentController::AssignmentController(): Error! self is not null!/n"); + } + + _self = this; +} + +AssignmentController::~AssignmentController() { + if (_self == this) { + _self = nullptr; + } +} + +AssignmentController *AssignmentController::_self = nullptr; diff --git a/app/assignments/assignment_controller.h b/app/assignments/assignment_controller.h new file mode 100644 index 0000000..1cd8419 --- /dev/null +++ b/app/assignments/assignment_controller.h @@ -0,0 +1,40 @@ +#ifndef ASSIGNMENT_CONTROLLER_H +#define ASSIGNMENT_CONTROLLER_H + +#include "core/string.h" +#include "core/containers/vector.h" + +#include "modules/admin_panel/admin_controller.h" + +#include "assignment.h" + +class Request; +class FormValidator; + +class AssignmentController : public AdminController { + RCPP_OBJECT(AssignmentController, AdminController); + +public: + void handle_request_default(Request *request); + + void admin_handle_request_main(Request *request); + String admin_get_section_name(); + void admin_add_section_links(Vector *links); + bool admin_full_render(); + + void admin_render_assignment_list(Request *request); + void admin_render_assignment(Request *request, Ref assignment); + + void migrate(); + virtual void add_default_data(); + + static AssignmentController *get_singleton(); + + AssignmentController(); + ~AssignmentController(); + +protected: + static AssignmentController *_self; +}; + +#endif \ No newline at end of file diff --git a/app/assignments/assignment_initializer.cpp b/app/assignments/assignment_initializer.cpp new file mode 100644 index 0000000..81142c0 --- /dev/null +++ b/app/assignments/assignment_initializer.cpp @@ -0,0 +1,37 @@ +#include "assignment_initializer.h" + +void AssignmentInitializer::allocate_controller() { + ERR_FAIL_COND(_controller); + + _controller = new AssignmentController(); +} +void AssignmentInitializer::free_controller() { + if (_controller) { + delete _controller; + _controller = nullptr; + } +} + +void AssignmentInitializer::allocate_model() { + ERR_FAIL_COND(_model); + + _model = new AssignmentModel(); +} +void AssignmentInitializer::free_model() { + if (_model) { + delete _model; + _model = nullptr; + } +} + +void AssignmentInitializer::allocate_all() { + allocate_model(); + allocate_controller(); +} +void AssignmentInitializer::free_all() { + free_controller(); + free_model(); +} + +AssignmentController *AssignmentInitializer::_controller = nullptr; +AssignmentModel *AssignmentInitializer::_model = nullptr; \ No newline at end of file diff --git a/app/assignments/assignment_initializer.h b/app/assignments/assignment_initializer.h new file mode 100644 index 0000000..60e7207 --- /dev/null +++ b/app/assignments/assignment_initializer.h @@ -0,0 +1,23 @@ +#ifndef ASSIGNMENT_INITIALIZER_H +#define ASSIGNMENT_INITIALIZER_H + +#include "assignment_model.h" +#include "assignment_controller.h" + +class AssignmentInitializer { +public: + static void allocate_controller(); + static void free_controller(); + + static void allocate_model(); + static void free_model(); + + static void allocate_all(); + static void free_all(); + +protected: + static AssignmentController *_controller; + static AssignmentModel *_model; +}; + +#endif \ No newline at end of file diff --git a/app/assignments/assignment_model.cpp b/app/assignments/assignment_model.cpp new file mode 100644 index 0000000..fe5f5da --- /dev/null +++ b/app/assignments/assignment_model.cpp @@ -0,0 +1,357 @@ +#include "assignment_model.h" + +#include "core/database/database.h" +#include "core/database/database_manager.h" +#include "core/database/query_builder.h" +#include "core/database/query_result.h" +#include "core/database/table_builder.h" + +#include "core/hash/sha256.h" + +#include "assignment.h" + +#define BUILDING_TABLE_NAME "assignments" + +#define BUILDING_TABLE_COLUMNS "id, name, description, icon, rank, next_rank, time_to_build, creates, num_creates, score, defense, ability, cost_food, cost_wood, cost_stone, cost_iron, cost_mana, mod_max_food, mod_max_wood, mod_max_stone, mod_max_iron, mod_max_mana, mod_rate_food, mod_rate_wood, mod_rate_stone, mod_rate_iron, mod_rate_mana, mod_percent_food, mod_percent_wood, mod_percent_stone, mod_percent_iron, mod_percent_mana, assignment1, assignment2, assignment3, assignment4, assignment5, req_tech, tech_group, tech_secondary_group" +#define BUILDING_TABLE_COLUMNS_NOID "name, description, icon, rank, next_rank, time_to_build, creates, num_creates, score, defense, ability, cost_food, cost_wood, cost_stone, cost_iron, cost_mana, mod_max_food, mod_max_wood, mod_max_stone, mod_max_iron, mod_max_mana, mod_rate_food, mod_rate_wood, mod_rate_stone, mod_rate_iron, mod_rate_mana, mod_percent_food, mod_percent_wood, mod_percent_stone, mod_percent_iron, mod_percent_mana, assignment1, assignment2, assignment3, assignment4, assignment5, req_tech, tech_group, tech_secondary_group" + +Ref AssignmentModel::get_assignment(const int id) { + if (id == 0) { + return Ref(); + } + + Ref b = DatabaseManager::get_singleton()->ddb->get_query_builder(); + + b->select(BUILDING_TABLE_COLUMNS); + b->from(BUILDING_TABLE_NAME); + + b->where()->wp("id", id); + + b->end_command(); + + Ref r = b->run(); + + if (!r->next_row()) { + return Ref(); + } + + Ref assignment; + assignment.instance(); + + parse_row(r, assignment); + + return assignment; +} + +Vector > AssignmentModel::get_all() { + Ref b = DatabaseManager::get_singleton()->ddb->get_query_builder(); + + b->select(BUILDING_TABLE_COLUMNS); + b->from(BUILDING_TABLE_NAME); + b->end_command(); + //b->print(); + + Vector > assignments; + + Ref r = b->run(); + + while (r->next_row()) { + Ref assignment; + assignment.instance(); + + parse_row(r, assignment); + + assignments.push_back(assignment); + } + + return assignments; +} + +void AssignmentModel::save_assignment(Ref &assignment) { + Ref b = DatabaseManager::get_singleton()->ddb->get_query_builder(); + + if (assignment->id == 0) { + b->insert(BUILDING_TABLE_NAME, BUILDING_TABLE_COLUMNS_NOID); + + b->values(); + + b->val(assignment->name); + b->val(assignment->description); + b->val(assignment->icon); + + b->val(assignment->rank); + b->val(assignment->next_rank); + b->val(assignment->time_to_build); + b->val(assignment->creates); + b->val(assignment->num_creates); + b->val(assignment->score); + b->val(assignment->defense); + b->val(assignment->ability); + + b->val(assignment->cost_food); + b->val(assignment->cost_wood); + b->val(assignment->cost_stone); + b->val(assignment->cost_iron); + b->val(assignment->cost_mana); + + b->val(assignment->mod_max_food); + b->val(assignment->mod_max_wood); + b->val(assignment->mod_max_stone); + b->val(assignment->mod_max_iron); + b->val(assignment->mod_max_mana); + + b->vald(assignment->mod_rate_food); + b->vald(assignment->mod_rate_wood); + b->vald(assignment->mod_rate_stone); + b->vald(assignment->mod_rate_iron); + b->vald(assignment->mod_rate_mana); + + b->val(assignment->mod_percent_food); + b->val(assignment->mod_percent_wood); + b->val(assignment->mod_percent_stone); + b->val(assignment->mod_percent_iron); + b->val(assignment->mod_percent_mana); + + b->val(assignment->assignment1); + b->val(assignment->assignment2); + b->val(assignment->assignment3); + b->val(assignment->assignment4); + b->val(assignment->assignment5); + + b->val(assignment->req_tech); + b->val(assignment->tech_group); + b->val(assignment->tech_secondary_group); + + b->cvalues(); + + b->end_command(); + b->select_last_insert_id(); + //b->print(); + + Ref r = b->run(); + + assignment->id = r->get_last_insert_rowid(); + } else { + b->update(BUILDING_TABLE_NAME); + b->set(); + + b->setp("name", assignment->name); + b->setp("description", assignment->description); + b->setp("icon", assignment->icon); + + b->setp("userankrname", assignment->rank); + b->setp("next_rank", assignment->next_rank); + b->setp("time_to_build", assignment->time_to_build); + b->setp("creates", assignment->creates); + b->setp("num_creates", assignment->num_creates); + b->setp("score", assignment->score); + b->setp("defense", assignment->defense); + b->setp("ability", assignment->ability); + + b->setp("cost_food", assignment->cost_food); + b->setp("cost_wood", assignment->cost_wood); + b->setp("cost_stone", assignment->cost_stone); + b->setp("cost_iron", assignment->cost_iron); + b->setp("cost_mana", assignment->cost_mana); + + b->setp("mod_max_food", assignment->mod_max_food); + b->setp("mod_max_wood", assignment->mod_max_wood); + b->setp("mod_max_stone", assignment->mod_max_stone); + b->setp("mod_max_iron", assignment->mod_max_iron); + b->setp("mod_max_mana", assignment->mod_max_mana); + + b->setpd("mod_rate_food", assignment->mod_rate_food); + b->setpd("mod_rate_wood", assignment->mod_rate_wood); + b->setpd("mod_rate_stone", assignment->mod_rate_stone); + b->setpd("mod_rate_iron", assignment->mod_rate_iron); + b->setpd("mod_rate_mana", assignment->mod_rate_mana); + + b->setp("mod_percent_food", assignment->mod_percent_food); + b->setp("mod_percent_wood", assignment->mod_percent_wood); + b->setp("mod_percent_stone", assignment->mod_percent_stone); + b->setp("mod_percent_iron", assignment->mod_percent_iron); + b->setp("mod_percent_mana", assignment->mod_percent_mana); + + b->setp("assignment1", assignment->assignment1); + b->setp("assignment2", assignment->assignment2); + b->setp("assignment3", assignment->assignment3); + b->setp("assignment4", assignment->assignment4); + b->setp("assignment5", assignment->assignment5); + + b->setp("req_tech", assignment->req_tech); + b->setp("tech_group", assignment->tech_group); + b->setp("tech_secondary_group", assignment->tech_secondary_group); + + b->cset(); + b->where()->wp("id", assignment->id); + + //b->print(); + + b->run_query(); + } +} + +void AssignmentModel::parse_row(Ref &result, Ref &assignment) { + + assignment->id = result->get_cell_int(0); + + assignment->name = result->get_cell(1); + assignment->description = result->get_cell(2); + assignment->icon = result->get_cell(3); + + assignment->rank = result->get_cell_int(4); + assignment->next_rank = result->get_cell_int(5); + assignment->time_to_build = result->get_cell_int(6); + assignment->creates = result->get_cell_int(7); + assignment->num_creates = result->get_cell_int(8); + assignment->score = result->get_cell_int(9); + assignment->defense = result->get_cell_int(10); + assignment->ability = result->get_cell_int(11); + + assignment->cost_food = result->get_cell_int(12); + assignment->cost_wood = result->get_cell_int(13); + assignment->cost_stone = result->get_cell_int(14); + assignment->cost_iron = result->get_cell_int(15); + assignment->cost_mana = result->get_cell_int(16); + + assignment->mod_max_food = result->get_cell_int(17); + assignment->mod_max_wood = result->get_cell_int(18); + assignment->mod_max_stone = result->get_cell_int(19); + assignment->mod_max_iron = result->get_cell_int(20); + assignment->mod_max_mana = result->get_cell_int(21); + + assignment->mod_rate_food = result->get_cell_double(22); + assignment->mod_rate_wood = result->get_cell_double(23); + assignment->mod_rate_stone = result->get_cell_double(24); + assignment->mod_rate_iron = result->get_cell_double(25); + assignment->mod_rate_mana = result->get_cell_double(26); + + assignment->mod_percent_food = result->get_cell_int(27); + assignment->mod_percent_wood = result->get_cell_int(28); + assignment->mod_percent_stone = result->get_cell_int(29); + assignment->mod_percent_iron = result->get_cell_int(30); + assignment->mod_percent_mana = result->get_cell_int(31); + + assignment->assignment1 = result->get_cell_int(32); + assignment->assignment2 = result->get_cell_int(33); + assignment->assignment3 = result->get_cell_int(34); + assignment->assignment4 = result->get_cell_int(35); + assignment->assignment5 = result->get_cell_int(36); + + assignment->req_tech = result->get_cell_int(37); + assignment->tech_group = result->get_cell_int(38); + assignment->tech_secondary_group = result->get_cell_int(39); +} + +void AssignmentModel::create_table() { + Ref tb = DatabaseManager::get_singleton()->ddb->get_table_builder(); + + tb->create_table(BUILDING_TABLE_NAME); + tb->integer("id", 11)->auto_increment()->next_row(); + tb->varchar("name", 200)->not_null()->next_row(); + tb->varchar("description", 500)->not_null()->next_row(); + tb->varchar("icon", 500)->not_null()->next_row(); + tb->integer("rank", 11)->not_null()->next_row(); + tb->integer("next_rank", 11)->not_null()->next_row(); + tb->integer("time_to_build", 11)->not_null()->next_row(); + tb->integer("creates", 11)->not_null()->defval("0")->next_row(); + tb->integer("num_creates", 11)->not_null()->defval("0")->next_row(); + tb->integer("score", 11)->not_null()->next_row(); + tb->integer("defense", 11)->not_null()->next_row(); + tb->integer("ability", 11)->not_null()->defval("0")->next_row(); + + tb->integer("cost_food", 11)->not_null()->next_row(); + tb->integer("cost_wood", 11)->not_null()->next_row(); + tb->integer("cost_stone", 11)->not_null()->next_row(); + tb->integer("cost_iron", 11)->not_null()->next_row(); + tb->integer("cost_mana", 11)->not_null()->next_row(); + + tb->integer("mod_max_food", 11)->not_null()->defval("0")->next_row(); + tb->integer("mod_max_wood", 11)->not_null()->defval("0")->next_row(); + tb->integer("mod_max_stone", 11)->not_null()->defval("0")->next_row(); + tb->integer("mod_max_iron", 11)->not_null()->defval("0")->next_row(); + tb->integer("mod_max_mana", 11)->not_null()->defval("0")->next_row(); + + tb->real_double("mod_rate_food")->not_null()->defval("0")->next_row(); + tb->real_double("mod_rate_wood")->not_null()->defval("0")->next_row(); + tb->real_double("mod_rate_stone")->not_null()->defval("0")->next_row(); + tb->real_double("mod_rate_iron")->not_null()->defval("0")->next_row(); + tb->real_double("mod_rate_mana")->not_null()->defval("0")->next_row(); + + tb->integer("mod_percent_food", 11)->not_null()->defval("0")->next_row(); + tb->integer("mod_percent_wood", 11)->not_null()->defval("0")->next_row(); + tb->integer("mod_percent_stone", 11)->not_null()->defval("0")->next_row(); + tb->integer("mod_percent_iron", 11)->not_null()->defval("0")->next_row(); + tb->integer("mod_percent_mana", 11)->not_null()->defval("0")->next_row(); + + tb->integer("assignment1", 11)->not_null()->defval("0")->next_row(); + tb->integer("assignment2", 11)->not_null()->defval("0")->next_row(); + tb->integer("assignment3", 11)->not_null()->defval("0")->next_row(); + tb->integer("assignment4", 11)->not_null()->defval("0")->next_row(); + tb->integer("assignment5", 11)->not_null()->defval("0")->next_row(); + + tb->integer("req_tech", 11)->not_null()->defval("0")->next_row(); + tb->integer("tech_group", 11)->not_null()->defval("0")->next_row(); + tb->integer("tech_secondary_group", 11)->not_null()->defval("0")->next_row(); + + tb->primary_key("id"); + tb->ccreate_table(); + + tb->run_query(); + //tb->print(); +} +void AssignmentModel::drop_table() { + Ref tb = DatabaseManager::get_singleton()->ddb->get_table_builder(); + + tb->drop_table_if_exists(BUILDING_TABLE_NAME)->cdrop_table(); + + tb->run_query(); +} +void AssignmentModel::migrate() { + drop_table(); + create_table(); +} + +void AssignmentModel::add_default_data() { + String table_columns = "id, name, description, icon, rank, next_rank, time_to_build, creates, num_creates, score, defense, ability, cost_food, cost_wood, cost_stone, cost_iron, cost_mana, mod_max_food, mod_max_wood, mod_max_stone, mod_max_iron, mod_max_mana, mod_rate_food, mod_rate_wood, mod_rate_stone, mod_rate_iron, mod_rate_mana, mod_percent_food, mod_percent_wood, mod_percent_stone, mod_percent_iron, mod_percent_mana, assignment1, assignment2, assignment3, assignment4, assignment5, req_tech, tech_group, tech_secondary_group"; + + Ref qb = DatabaseManager::get_singleton()->ddb->get_query_builder(); + + qb->begin_transaction()->nl(); + qb->insert(BUILDING_TABLE_NAME, table_columns)->nl()->w("VALUES(1, 'empty', '', 'empty/empty.png', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)")->end_command()->nl(); + qb->insert(BUILDING_TABLE_NAME, table_columns)->nl()->w("VALUES(2, 'Build in Progress', '', 'bip/bip.png', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)")->end_command()->nl(); + qb->insert(BUILDING_TABLE_NAME, table_columns)->nl()->w("VALUES(3, 'Corn Field', 'Produces food.', 'corn_field/r1.png', 1, 7, 20, 0, 0, 20, 1, 0, 60, 100, 10, 5, 0, 0, 0, 0, 0, 0, 0.01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 4, 3, 0, 0, 2, 3)")->end_command()->nl(); + qb->insert(BUILDING_TABLE_NAME, table_columns)->nl()->w("VALUES(4, 'Lumber Mill', 'Your main wood producing assignment.', 'lumber_mill/r1.png', 1, 0, 1000, 0, 0, 20, 0, 0, 30, 40, 50, 10, 0, 0, 0, 0, 0, 0, 0, 0.01, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 1, 2)")->end_command()->nl(); + qb->insert(BUILDING_TABLE_NAME, table_columns)->nl()->w("VALUES(5, 'Stone Mine', 'Your main stone producing assignment.', 'stone_mine/r1.png', 1, 0, 1000, 2, 20, 0, 0, 0, 30, 50, 20, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0.01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)")->end_command()->nl(); + qb->insert(BUILDING_TABLE_NAME, table_columns)->nl()->w("VALUES(6, 'House', 'Can create villagers.', 'house/r1.png', 1, 0, 20, 1, 10, 0, 0, 0, 50, 70, 30, 5, 0, 0, 0, 0, 0, 0, -0.005, -0.001, -0.001, -0.001, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)")->end_command()->nl(); + qb->insert(BUILDING_TABLE_NAME, table_columns)->nl()->w("VALUES(7, 'Corn Field', '', 'corn_field/r2.png', 2, 0, 20, 0, 0, 0, 0, 0, 40, 60, 20, 10, 0, 0, 0, 0, 0, 0, 0.2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 2, 0, 0)")->end_command()->nl(); + qb->insert(BUILDING_TABLE_NAME, table_columns)->nl()->w("VALUES(8, 'Farm', 'Creates villagers.', 'farm/r1.png', 1, 0, 80, 1, 20, 0, 0, 0, 50, 60, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)")->end_command()->nl(); + qb->insert(BUILDING_TABLE_NAME, table_columns)->nl()->w("VALUES(9, 'Iron Mine', 'Your main iron producing assignment.', 'iron_mine/r1.png', 1, 0, 1000, 2, 100000, 0, 0, 0, 70, 30, 70, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.01, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0)")->end_command()->nl(); + qb->insert(BUILDING_TABLE_NAME, table_columns)->nl()->w("VALUES(10, 'School', 'School', 'school/r1.png', 1, 0, 60, 2, 60, 0, 0, 0, 300, 300, 300, 300, 20, 0, 0, 0, 0, 0, 0.001, 0.001, 0.001, 0.001, 0.001, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 2)")->end_command()->nl(); + qb->commit(); + + qb->run_query(); + //qb->print(); +} + +AssignmentModel *AssignmentModel::get_singleton() { + return _self; +} + +AssignmentModel::AssignmentModel() : + Object() { + + if (_self) { + printf("AssignmentModel::AssignmentModel(): Error! self is not null!/n"); + } + + _self = this; +} + +AssignmentModel::~AssignmentModel() { + if (_self == this) { + _self = nullptr; + } +} + +AssignmentModel *AssignmentModel::_self = nullptr; diff --git a/app/assignments/assignment_model.h b/app/assignments/assignment_model.h new file mode 100644 index 0000000..c6dae5e --- /dev/null +++ b/app/assignments/assignment_model.h @@ -0,0 +1,37 @@ +#ifndef ASSIGNMENT_MODEL_H +#define ASSIGNMENT_MODEL_H + +#include "core/string.h" +#include "core/containers/vector.h" + +#include "core/object.h" +#include "core/reference.h" + +class Assignment; +class QueryResult; + +class AssignmentModel : public Object { + RCPP_OBJECT(AssignmentModel, Object); + +public: + virtual Ref get_assignment(const int id); + virtual Vector > get_all(); + virtual void save_assignment(Ref &assignment); + + virtual void parse_row(Ref &result, Ref &assignment); + + virtual void create_table(); + virtual void drop_table(); + virtual void migrate(); + virtual void add_default_data(); + + static AssignmentModel *get_singleton(); + + AssignmentModel(); + ~AssignmentModel(); + +protected: + static AssignmentModel *_self; +}; + +#endif \ No newline at end of file