From 9cdac2b47ee56378973cc810a28b9f712ed5fc23 Mon Sep 17 00:00:00 2001
From: the me <alexanderzemans@gmail.com>
Date: Mon, 15 Aug 2022 20:25:26 -0700
Subject: [PATCH] yeah pretty good.

---
 .../objects/ARTICULATOR/Create_0.gml          |  3 +-
 eastern flames/objects/o_unit/Create_0.gml    |  3 ++
 eastern flames/scripts/stat/stat.gml          | 14 +++----
 eastern flames/scripts/weapon/weapon.gml      | 38 ++++++++++++++++---
 4 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/eastern flames/objects/ARTICULATOR/Create_0.gml b/eastern flames/objects/ARTICULATOR/Create_0.gml
index c32a2b4..b518530 100644
--- a/eastern flames/objects/ARTICULATOR/Create_0.gml	
+++ b/eastern flames/objects/ARTICULATOR/Create_0.gml	
@@ -3,6 +3,7 @@ var i;
 /*for (i=0; i<array_length(global.units[ARMY.US]); i++) {
 	c_inheritunit(2+i, 2, un.chara);
 }*/
-c_inheritunit(2, 2, un.chara);
+var chara = c_inheritunit(2, 2, un.chara);
+c_addweapon(chara, wp.knife, true);
 c_inheritunit(3, 2, un.kris);
 selectedunit = noone;
\ No newline at end of file
diff --git a/eastern flames/objects/o_unit/Create_0.gml b/eastern flames/objects/o_unit/Create_0.gml
index f721575..cdb7b21 100644
--- a/eastern flames/objects/o_unit/Create_0.gml	
+++ b/eastern flames/objects/o_unit/Create_0.gml	
@@ -8,6 +8,9 @@ returnpos = new vec2(0, 0);
 dir = DIR.NONE;
 attacks = 0;
 attacked = 0;
+inventory = [];
+c_addweapon(id, wp.nothing);
+equippedweapon = noone;
 
 continuecombat = function(me, them) {
 	//if stamina returnable = true stamina-- return true
diff --git a/eastern flames/scripts/stat/stat.gml b/eastern flames/scripts/stat/stat.gml
index 9167ef3..915f166 100644
--- a/eastern flames/scripts/stat/stat.gml	
+++ b/eastern flames/scripts/stat/stat.gml	
@@ -18,27 +18,27 @@ function unitstat(val_, name_, fullname_, desc_, replacements_) : stat(name_, fu
 	modifier = 0;
 }
 
-function statmod(stat__, amount_, operation_=add) {
+function statmod(stat__, val_, operation_=add) constructor {
 	name = stat__.name;
 	stat_ = stat__;
-	amount = amount_;
+	val = val_;
 	operation = operation_;
 }
 
 function add(val1, val2) {
-	return val1*val2;
+	return val1 + val2;
 }
 function sub(val1, val2) {
-	return val1*val2;
+	return val1 - val2;
 }
 function mult(val1, val2) {
-	return val1*val2;
+	return val1 * val2;
 }
 function divide(val1, val2) {
-	return val1*val2;
+	return val1 / val2;
 }
 function modulo(val1, val2) {
-	return val1*val2;
+	return val1 % val2;
 }
 
 nu stat("hp", "health", "vitality");
diff --git a/eastern flames/scripts/weapon/weapon.gml b/eastern flames/scripts/weapon/weapon.gml
index 4183512..5fe5b09 100644
--- a/eastern flames/scripts/weapon/weapon.gml	
+++ b/eastern flames/scripts/weapon/weapon.gml	
@@ -1,19 +1,43 @@
 global.weapons = {};
 #macro wp global.weapons
-function weapon(name_, description_, statmods) constructor {
+function weapon(name_, description_, type_, statmods=[]) constructor {
 	name = name_;
 	description = description_;
 	modifiers = {};
+	type = WPTYPE.SWORD;
 	var i;
 	for (i=0; i<array_length(statmods); i++) {
 		modifiers[$statmods[i].name] = statmods[i];
 	}
+	global.weapons[$name] = self;
 }
 
-function c_addweapon(target, weapon_) {
-	array_push(target.inventory, deep_copy(weapon_));
+enum WPTYPE {
+	NULL,
+	SWORD,
+	LEAF,
+	GUN,
 }
 
+function c_addweapon(target, weapon_, equip=false) {
+	//array_push(target.inventory, deep_copy(weapon_));
+	array_push(target.inventory, weapon_);
+	if equip {
+		target.equippedweapon = array_length(target.inventory)-1;
+		c_equipweapon(target, target.inventory[target.equippedweapon]);
+	}
+}
+
+function c_equipweapon(target, weapon_) {
+	log(target.data.str.val);
+	c_modifierreset(target);
+	log(target.data.str.val);
+	c_wpeval(target, weapon_);
+	log(target.data.str.val);
+}
+nu weapon("nothing", "it's literally nothing", WPTYPE.NULL);
+nu weapon("knife", "bleed, bleed", WPTYPE.SWORD, [new statmod(st.str, 20, add)]);
+
 function c_modifierreset(target) {
 	var dudes = variable_struct_get_names(target.data);
 	var lads = variable_struct_get_names(st);
@@ -21,8 +45,9 @@ function c_modifierreset(target) {
 	for (i=0; i<array_length(dudes); i++) {
 		while !array_contains(lads, dudes[i]) || dudes[i] == "hp" {
 			array_delete(dudes, i, 1);
+			if i >= array_length(dudes) break;
 		}
-		if i > array_length(dudes) break;
+		if i >= array_length(dudes) break;
 		target.data[$dudes[i]].val = target.data[$dudes[i]].cap;
 	}
 }
@@ -33,7 +58,10 @@ function c_wpeval(target, weapon_) {
 	var i;
 	for (i=0; i<array_length(dudes); i++) {
 		if array_contains(lads, dudes[i]) {
-			target.data[$dudes[i]].val = weapon_[$dudes[i]].operation(target.data[$dudes[i]].val, weapon_[$dudes[i]].val);
+			target.data[$dudes[i]].val = weapon_.modifiers[$dudes[i]].operation(
+				target.data[$dudes[i]].val,
+				weapon_.modifiers[$dudes[i]].val
+			);
 		}
 	}
 }